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

Merged in w8jcik/nuttx (pull request #232)

Browse Source 
some simple typos

Approved-by: Gregory Nutt
This commit is contained in:
Maciej Wójcik 2017-03-01 15:25:42 +00:00 committed by Gregory Nutt
commit 35b2448203
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/pic32mx-starterkit/README.txt
View File

@ -982,7 +982,7 @@ PIC32MX Configuration Options
PIC32MX specific PHY/Ethernet device driver settings PIC32MX specific PHY/Ethernet device driver settings
CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY
CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconductor DP83848C PHY
CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY
CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_AUTONEG - Enable auto-negotion
CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.

2
configs/pic32mx7mmb/README.txt
View File

@ -560,7 +560,7 @@ PIC32MX Configuration Options
PIC32MX specific PHY/Ethernet device driver settings PIC32MX specific PHY/Ethernet device driver settings
CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY CONFIG_ETH0_PHY_KS8721 - Selects the Micrel KS8721 PHY
CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconduction DP83848C PHY CONFIG_ETH0_PHY_DP83848C - Selects the National Semiconductor DP83848C PHY
CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY CONFIG_ETH0_PHY_LAN8720 - Selects the SMSC LAN8720 PHY
CONFIG_PHY_AUTONEG - Enable auto-negotion CONFIG_PHY_AUTONEG - Enable auto-negotion
CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed. CONFIG_PHY_SPEED100 - Select 100Mbit vs. 10Mbit speed.

2
configs/shenzhou/src/stm32_boot.c
View File

@ -64,7 +64,7 @@
* *
* Description: * Description:
* All STM32 architectures must provide the following entry point. This entry point * All STM32 architectures must provide the following entry point. This entry point
* is called early in the intitialization -- after all memory has been configured * is called early in the initialization -- after all memory has been configured
* and mapped but before any devices have been initialized. * and mapped but before any devices have been initialized.
* *
************************************************************************************/ ************************************************************************************/

2
configs/shenzhou/src/stm32_usb.c
View File

@ -54,7 +54,7 @@
#include "up_arch.h" #include "up_arch.h"
#include "stm32.h" #include "stm32.h"
#include "stm32_otgfs.h" #include "stm32_otgfs.h"
#include "shenshou.h" #include "shenzhou.h"
#ifdef CONFIG_STM32_OTGFS #ifdef CONFIG_STM32_OTGFS

4
drivers/net/Kconfig
View File

@ -503,7 +503,7 @@ config ETH0_PHY_KSZ90x1
bool "Micrel KSZ9021/31 PHY" bool "Micrel KSZ9021/31 PHY"
config ETH0_PHY_DP83848C config ETH0_PHY_DP83848C
bool "National Semiconduction DP83848C PHY" bool "National Semiconductor DP83848C PHY"
config ETH0_PHY_LAN8720 config ETH0_PHY_LAN8720
bool "SMSC LAN8720 PHY" bool "SMSC LAN8720 PHY"
@ -552,7 +552,7 @@ config ETH1_PHY_KSZ90x1
bool "Micrel KSZ9021/31 PHY" bool "Micrel KSZ9021/31 PHY"
config ETH1_PHY_DP83848C config ETH1_PHY_DP83848C
bool "National Semiconduction DP83848C PHY" bool "National Semiconductor DP83848C PHY"
config ETH1_PHY_LAN8720 config ETH1_PHY_LAN8720
bool "SMSC LAN8720 PHY" bool "SMSC LAN8720 PHY"

6
drivers/spi/spi_transfer.c
View File

@ -90,7 +90,7 @@ int spi_transfer(FAR struct spi_dev_s *spi, FAR struct spi_sequence_s *seq)
ret = SPI_SETDELAY(spi, seq->a, seq->b, seq->c); ret = SPI_SETDELAY(spi, seq->a, seq->b, seq->c);
if (ret < 0) if (ret < 0)
{ {
spierr("ERROR: SPI_SETDELAY failed: %d\n", ret) spierr("ERROR: SPI_SETDELAY failed: %d\n", ret);
SPI_LOCK(spi, false); SPI_LOCK(spi, false);
return ret; return ret;
} }
@ -115,7 +115,7 @@ int spi_transfer(FAR struct spi_dev_s *spi, FAR struct spi_sequence_s *seq)
ret = SPI_HWFEATURES(spi, trans->hwfeat); ret = SPI_HWFEATURES(spi, trans->hwfeat);
if (ret < 0) if (ret < 0)
{ {
spierr("ERROR: SPI_HWFEATURES failed: %d\n", ret) spierr("ERROR: SPI_HWFEATURES failed: %d\n", ret);
break; break;
} }
#endif #endif
@ -124,7 +124,7 @@ int spi_transfer(FAR struct spi_dev_s *spi, FAR struct spi_sequence_s *seq)
ret = SPI_CMDDATA(spi, seq->dev, trans->cmd); ret = SPI_CMDDATA(spi, seq->dev, trans->cmd);
if (ret < 0) if (ret < 0)
{ {
spierr("ERROR: SPI_CMDDATA failed: %d\n", ret) spierr("ERROR: SPI_CMDDATA failed: %d\n", ret);
break; break;
} }
#endif #endif