sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Additional, trivial changes from review

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-29 17:11:06 -06:00
parent 387dda152c
commit 203589e526
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netutils/pppd/ppp.h
View File

@ -56,7 +56,7 @@
#include "ppp_arch.h" #include "ppp_arch.h"
#ifdef CONFIG_NETUTILS_PPPD_PAP #ifdef CONFIG_NETUTILS_PPPD_PAP
#include "pap.h" # include "pap.h"
#endif /* CONFIG_NETUTILS_PPPD_PAP */ #endif /* CONFIG_NETUTILS_PPPD_PAP */
/**************************************************************************** /****************************************************************************
@ -170,9 +170,9 @@ struct ppp_context_s
/* AHDLC */ /* AHDLC */
u8_t ahdlc_rx_buffer[PPP_RX_BUFFER_SIZE]; u8_t ahdlc_rx_buffer[PPP_RX_BUFFER_SIZE];
u16_t ahdlc_tx_crc; /* running tx CRC */ u16_t ahdlc_tx_crc; /* Running tx CRC */
u16_t ahdlc_rx_crc; /* running rx CRC */ u16_t ahdlc_rx_crc; /* Running rx CRC */
u16_t ahdlc_rx_count; /* number of rx bytes processed, cur frame */ u16_t ahdlc_rx_count; /* Number of rx bytes processed, cur frame */
u8_t ahdlc_flags; /* ahdlc state flags, see above */ u8_t ahdlc_flags; /* ahdlc state flags, see above */
u8_t ahdlc_tx_offline; u8_t ahdlc_tx_offline;

14
netutils/pppd/pppd.c
View File

@ -66,18 +66,6 @@
extern void ppp_arch_modem_reset(const char *tty); extern void ppp_arch_modem_reset(const char *tty);
#endif #endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -286,6 +274,7 @@ time_t ppp_arch_clock_seconds(void)
int ppp_arch_getchar(struct ppp_context_s *ctx, u8_t *c) int ppp_arch_getchar(struct ppp_context_s *ctx, u8_t *c)
{ {
int ret; int ret;
ret = read(ctx->ctl.fd, c, 1); ret = read(ctx->ctl.fd, c, 1);
return ret == 1 ? ret : 0; return ret == 1 ? ret : 0;
} }
@ -345,6 +334,7 @@ int pppd(struct pppd_settings_s *pppd_settings)
free(ctx); free(ctx);
return 2; return 2;
} }
ctx->ctl.echo = true; ctx->ctl.echo = true;
ctx->ctl.verbose = true; ctx->ctl.verbose = true;
ctx->ctl.timeout = 30; ctx->ctl.timeout = 30;