From a2741940f9a5bf613a488584e298c17981552ea8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 2 Jul 2014 08:54:53 -0600 Subject: [PATCH] SAMA54D-EK: Don't disable any features in the NSH configuration. Comments updated in several files --- arch/arm/src/sam34/sam_emac.c | 18 +++++++++--------- arch/arm/src/sama5/sam_emaca.c | 16 ++++++++-------- arch/arm/src/sama5/sam_emacb.c | 16 ++++++++-------- arch/arm/src/sama5/sam_gmac.c | 18 +++++++++--------- configs/sama5d4-ek/nsh/defconfig | 7 +++++-- fs/procfs/fs_procfsuptime.c | 2 +- 6 files changed, 40 insertions(+), 37 deletions(-) diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 64b3ad6af0..665e6f0948 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -770,8 +770,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* If we have no more available TX descriptors, then we must disable the * RCOMP interrupt to stop further RX processing. Why? Because EACH RX - * packet that is dispatch is also an opportunity to replay with the a TX - * packet. So, if we cannot handle an RX packet replay, then we disable + * packet that is dispatched is also an opportunity to reply with a TX + * packet. So, if we cannot handle an RX packet reply, then we disable * all RX packet processing. */ @@ -1092,8 +1092,8 @@ static int sam_recvframe(struct sam_emac_s *priv) * Function: sam_receive * * Description: - * An interrupt was received indicating the availability of a new RX packet - * in FIFO memory. + * An interrupt was received indicating the availability of one or more + * new RX packets in FIFO memory. * * Parameters: * priv - Reference to the driver state structure @@ -1180,8 +1180,8 @@ static void sam_receive(struct sam_emac_s *priv) * Function: sam_txdone * * Description: - * An interrupt was received indicating that a frame has completed - * transmission. + * An interrupt was received indicating that one or more frames have + * completed transmission. * * Parameters: * priv - Reference to the driver state structure @@ -1198,9 +1198,9 @@ static void sam_txdone(struct sam_emac_s *priv) { struct emac_txdesc_s *txdesc; - /* Are there any outstanding transmssions? Loop until either (1) all of - * the TX have been examined, or (2) until we encounter the first - * descriptor that is still in use by the hardware. + /* Are there any outstanding transmissions? Loop until either (1) all of + * the TX descriptors have been examined, or (2) until we encounter the + * first descriptor that is still in use by the hardware. */ while (priv->txhead != priv->txtail) diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 3d74cf59df..aeecba5278 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -780,8 +780,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* If we have no more available TX descriptors, then we must disable the * RCOMP interrupt to stop further RX processing. Why? Because EACH RX - * packet that is dispatch is also an opportunity to replay with the a TX - * packet. So, if we cannot handle an RX packet replay, then we disable + * packet that is dispatched is also an opportunity to reply with a TX + * packet. So, if we cannot handle an RX packet reply, then we disable * all RX packet processing. */ @@ -1132,8 +1132,8 @@ static int sam_recvframe(struct sam_emac_s *priv) * Function: sam_receive * * Description: - * An interrupt was received indicating the availability of a new RX packet - * in FIFO memory. + * An interrupt was received indicating the availability of one or more + * new RX packets in FIFO memory. * * Parameters: * priv - Reference to the driver state structure @@ -1220,8 +1220,8 @@ static void sam_receive(struct sam_emac_s *priv) * Function: sam_txdone * * Description: - * An interrupt was received indicating that a frame has completed - * transmission. + * An interrupt was received indicating that one or more frames have + * completed transmission. * * Parameters: * priv - Reference to the driver state structure @@ -1239,8 +1239,8 @@ static void sam_txdone(struct sam_emac_s *priv) struct emac_txdesc_s *txdesc; /* Are there any outstanding transmissions? Loop until either (1) all of - * the TX have been examined, or (2) until we encounter the first - * descriptor that is still in use by the hardware. + * the TX descriptors have been examined, or (2) until we encounter the + * first descriptor that is still in use by the hardware. */ while (priv->txhead != priv->txtail) diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index ce2a4f0adc..f3ea86b3a8 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -1102,8 +1102,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* If we have no more available TX descriptors, then we must disable the * RCOMP interrupt to stop further RX processing. Why? Because EACH RX - * packet that is dispatch is also an opportunity to replay with the a TX - * packet. So, if we cannot handle an RX packet replay, then we disable + * packet that is dispatched is also an opportunity to replay with a TX + * packet. So, if we cannot handle an RX packet reply, then we disable * all RX packet processing. */ @@ -1454,8 +1454,8 @@ static int sam_recvframe(struct sam_emac_s *priv) * Function: sam_receive * * Description: - * An interrupt was received indicating the availability of a new RX packet - * in FIFO memory. + * An interrupt was received indicating the availability of one or more + * new RX packets in FIFO memory. * * Parameters: * priv - Reference to the driver state structure @@ -1542,8 +1542,8 @@ static void sam_receive(struct sam_emac_s *priv) * Function: sam_txdone * * Description: - * An interrupt was received indicating that a frame has completed - * transmission. + * An interrupt was received indicating that one or more frames have + * completed transmission. * * Parameters: * priv - Reference to the driver state structure @@ -1561,8 +1561,8 @@ static void sam_txdone(struct sam_emac_s *priv) struct emac_txdesc_s *txdesc; /* Are there any outstanding transmissions? Loop until either (1) all of - * the TX have been examined, or (2) until we encounter the first - * descriptor that is still in use by the hardware. + * the TX descriptors have been examined, or (2) until we encounter the + * first descriptor that is still in use by the hardware. */ while (priv->txhead != priv->txtail) diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 2f8c9a3bf7..25c6741d7a 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -712,8 +712,8 @@ static int sam_transmit(struct sam_gmac_s *priv) /* If we have no more available TX descriptors, then we must disable the * RCOMP interrupt to stop further RX processing. Why? Because EACH RX - * packet that is dispatch is also an opportunity to replay with the a TX - * packet. So, if we cannot handle an RX packet replay, then we disable + * packet that is dispatched is also an opportunity to reply with a TX + * packet. So, if we cannot handle an RX packet reply, then we disable * all RX packet processing. */ @@ -1062,8 +1062,8 @@ static int sam_recvframe(struct sam_gmac_s *priv) * Function: sam_receive * * Description: - * An interrupt was received indicating the availability of a new RX packet - * in FIFO memory. + * An interrupt was received indicating the availability of onr or more + * new RX packets in FIFO memory. * * Parameters: * priv - Reference to the driver state structure @@ -1150,8 +1150,8 @@ static void sam_receive(struct sam_gmac_s *priv) * Function: sam_txdone * * Description: - * An interrupt was received indicating that a frame has completed - * transmission. + * An interrupt was received indicating that one or more frames have + * completed transmission. * * Parameters: * priv - Reference to the driver state structure @@ -1168,9 +1168,9 @@ static void sam_txdone(struct sam_gmac_s *priv) { struct gmac_txdesc_s *txdesc; - /* Are there any outstanding transmssions? Loop until either (1) all of - * the TX have been examined, or (2) until we encounter the first - * descriptor that is still in use by the hardware. + /* Are there any outstanding transmissions? Loop until either (1) all of + * the TX descriptors have been examined, or (2) until we encounter the + * first descriptor that is still in use by the hardware. */ while (priv->txhead != priv->txtail) diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 4212f06a25..9bf1844872 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -401,7 +401,7 @@ CONFIG_NPTHREAD_KEYS=4 CONFIG_DEV_CONSOLE=y # CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_STDIO is not set -CONFIG_SDCLONE_DISABLE=y +# CONFIG_SDCLONE_DISABLE is not set CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 @@ -441,7 +441,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048 # # Device Drivers # -CONFIG_DISABLE_POLL=y +# CONFIG_DISABLE_POLL is not set CONFIG_DEV_NULL=y CONFIG_DEV_ZERO=y CONFIG_ARCH_HAVE_RNG=y @@ -544,6 +544,7 @@ CONFIG_USART3_ISUART=y CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y +CONFIG_SERIAL_NPOLLWAITERS=2 CONFIG_USART3_SERIAL_CONSOLE=y # CONFIG_USART4_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set @@ -590,6 +591,7 @@ CONFIG_RAMLOG_SYSLOG=y CONFIG_RAMLOG_BUFSIZE=16384 # CONFIG_RAMLOG_CRLF is not set CONFIG_RAMLOG_NONBLOCKING=y +CONFIG_RAMLOG_NPOLLWAITERS=4 # # Networking Support @@ -866,6 +868,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y # CONFIG_EXAMPLES_USBSERIAL is not set # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set +# CONFIG_EXAMPLES_XMLRPC is not set # # Graphics Support diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index 50757c134a..8d077b24fa 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -65,7 +65,7 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* Determines the size of an intermeidate buffer that must be large enough +/* Determines the size of an intermediate buffer that must be large enough * to handle the longest line generated by this logic. */