diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:22:22 -0600 |
commit | 70b6bb22af51defd713adfd452309f32f0e523aa (patch) | |
tree | b483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/configs/pic32-starterkit | |
parent | 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff) | |
download | px4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz px4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2 px4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip |
More trailing whilespace removal
Diffstat (limited to 'nuttx/configs/pic32-starterkit')
-rw-r--r-- | nuttx/configs/pic32-starterkit/README.txt | 52 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/nsh/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/nsh2/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/src/Makefile | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/src/up_leds.c | 2 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/src/up_spi.c | 6 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/src/up_usbdev.c | 2 |
7 files changed, 34 insertions, 34 deletions
diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index f056f5347..4982e72e3 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -5,8 +5,8 @@ configs/pic32-starterkit README This README file discusses the port of NuttX to the Microchip PIC32 Ethernet Starter Kit (DM320004) with either - 1) The Multimedia Expansion Board (MEB, DM320005), or - 2) The Starter Kit I/O Expansion Board + 1) The Multimedia Expansion Board (MEB, DM320005), or + 2) The Starter Kit I/O Expansion Board See www.microchip.com for further information. @@ -58,7 +58,7 @@ Contents PIC32MX795F512L Pin Out MEB Connector PICtail - Serial Output using the + Serial Output using the Toolchains Creating Compatible NuttX HEX files Serial Console: MEB @@ -103,7 +103,7 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE 18 AERXD0/INT1/RE8 ERXD0(2) Ethernet RXD_0/PHYAD1 19 AERXD1/INT2/RE9 ERXD1(2) Ethernet RXD_1/PHYAD2 20 AN5/C1IN+/CN7/RB5/VBUSON VBUSON/C1IN+/AN5/CN7/RB5 USB host power supply, TPS20x1B ~EN, - Low enables power to host port (J4) + Low enables power to host port (J4) USB OTG power supply, MCP1253_MSOP ~SHDN Enables power to device/OTG port (J5) J2 pin 63 (comparator 1) @@ -298,11 +298,11 @@ SDI1 pin 93 SDO1 pin 95 -------------------------- ------- ---------------------------------- RA6 pin 4 CPLD -RA7 pin 6 +RA7 pin 6 RG12 pin 5 RG14 pin 3 SCK2 pin 45 (see MRF24WBOMA) -SDI2 pin 47 (see MRF24WBOMA) +SDI2 pin 47 (see MRF24WBOMA) SDO2 pin 49 (see MRF24WBOMA) RG9 pin 51 (see MRF24WBOMA) SCK3A pin 106 (see PICtail) @@ -310,7 +310,7 @@ SDI3A pin 110 (see PICtail) SDO3A pin 112 (see PICtail) RF12 pin 108 (see PICtail) ~SSI pin 97 (see PICtail) -RD9 pin 54 +RD9 pin 54 -------------------------- ------- ---------------------------------- INT3 pin 81 MRF24WBOMA RA10 pin 115 (also Graphics Controller and PICtail) @@ -323,8 +323,8 @@ SCK2 pin 45 (see CPLD) SDI2 pin 47 (see CPLD) SDO2 pin 49 (see CPLD) RG9 pin 51 (see CPLD) -U1RX pin 88 -U1TX pin 90 +U1RX pin 88 +U1TX pin 90 ~U1RTS pin 92 ~U1CTS pin 94 RB9 pin 73 @@ -468,7 +468,7 @@ Toolchains Windows Native Toolchains ------------------------- - + NOTE: There are several limitations to using a Windows based toolchain in a Cygwin environment. The three biggest are: @@ -511,9 +511,9 @@ Powering the Board is powered up. Ethernet Starter Kit with MEB: - + Power can be supplied to the Multimedia Expansion Board through the DC - connector located on the Multimedia Expansion Board... By connecting + connector located on the Multimedia Expansion Board... By connecting 9-14V power supply to the DC connector, the Multimedia Expansion Board and starter kit will receive the proper voltages. The user can also supply power via the starter kit. However, if the application uses @@ -583,7 +583,7 @@ Serial Console: MEB gotten any serial UART output to work from the MEB.]] A serial console is not required to use NuttX. However, all of the - Nuttx example code in the apps/examples assumes that you have a + Nuttx example code in the apps/examples assumes that you have a serial console. The Ethernet Starter Kit(even with the MEB) does not have any RS-232 connector needed to drive the serial console. @@ -609,7 +609,7 @@ Serial Console: MEB 15 U1RX 17 U1TX 28 GND - + Here is a summary of the tortuous routes taken by the PIC32MX UART pins: --- ---------------------------------- -------------------------- ------------------------- @@ -635,8 +635,8 @@ Serial Console: MEB -------------------------- ------- ---------------------------------- Signal J3 -------------------------- ------- - U1RX pin 88 - U1TX pin 90 + U1RX pin 88 + U1TX pin 90 ~U1RTS pin 92 ~U1CTS pin 94 U2RX pin 110 @@ -682,7 +682,7 @@ Serial Console: Starter Kit I/O Expansion Board 48 AETXD1/CN21/RD15/SCK3/U1RTS/U4TX Not available N/A 52 RF2/SDA3/SDI3/U1RX J2 pin 88 J11 pin 41 53 RF8/SCL3/SDO3/U1TX J2 pin 90 J11 pin 43 - + U2: Ethernet Starter Kit Expansion I/O board --------------------------------------------- ------------------------- @@ -706,7 +706,7 @@ Serial Console: Starter Kit I/O Expansion Board J2 pin 119 J10 pin 56 12 PMA3/AECRSDV/AERXDV/CN10/ECRSDV/ Not available N/A ERXDV/RG8/SCL4/SDO2/U3TX - 14 PMA2/AEREFCLK/AERXCLK/CN11/ + 14 PMA2/AEREFCLK/AERXCLK/CN11/ EREFCLK/ERXCLK/RG9/SS2/U3CTS/ Not available N/A U6RX @@ -907,7 +907,7 @@ PIC32MX Configuration Options CONFIG_PIC32MX_CODEWP - Default 1 (disabled) DEVCFG1: (All settings determined by selections in board.h) DEVCFG2: (All settings determined by selections in board.h) - DEVCFG3: + DEVCFG3: CONFIG_PIC32MX_USBIDO - USB USBID Selection. Default 1 if USB enabled (USBID pin is controlled by the USB module), but 0 (GPIO) otherwise. CONFIG_PIC32MX_VBUSIO - USB VBUSON Selection (Default 1 if USB enabled @@ -1057,7 +1057,7 @@ Where <subdir> is one of the following: 3. SB Configurations Several USB device configurations can be enabled and included - as NSH built-in built in functions. + as NSH built-in built in functions. To use USB device, connect the starter kit to the host using a cable with a Type-B micro-plug to the starter kit’s micro-A/B port J5, located @@ -1067,7 +1067,7 @@ Where <subdir> is one of the following: All USB device configurations require the following basic setup in your NuttX configuration file to enable USB device support: - + CONFIG_USBDEV=y : Enable basic USB device support CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support @@ -1083,7 +1083,7 @@ Where <subdir> is one of the following: system/cdcacm - The system/cdcacm program can be included by adding the following to the configuration file: - + CONFIG_CDCACM=y : Enable the CDCACM device CONFIG_EXAMPLES_CDCACM=y @@ -1139,12 +1139,12 @@ Where <subdir> is one of the following: settings. 2. UART1 is disabled - + CONFIG_PIC32MX_UART1=n : UART1 is disabled (as well as other UARTs) CONFIG_UART1_SERIAL_CONSOLE=n : There is no serial console 3. The RAM log is enabled" - + CONFIG_SYSLOG=y : Enables the System Logging feature. CONFIG_RAMLOG=y : Enable the RAM-based logging feature. CONFIG_RAMLOG_CONSOLE=n : (there is no default console device) @@ -1173,7 +1173,7 @@ Where <subdir> is one of the following: a) Enable support for the PIC32 USB device - -CONFIG_PIC32MX_USBDEV=n + -CONFIG_PIC32MX_USBDEV=n +CONFIG_PIC32MX_USBDEV=y b) Enable NuttX USB device support @@ -1203,7 +1203,7 @@ Where <subdir> is one of the following: nsh> mkrd -s 512 128 b) Put a FAT file system on the RAM disk: - + nsh> mkfatfs /dev/ram0 b) Now the 'msconn' command will connect to the host and diff --git a/nuttx/configs/pic32-starterkit/nsh/Make.defs b/nuttx/configs/pic32-starterkit/nsh/Make.defs index fdecef095..8c5346646 100644 --- a/nuttx/configs/pic32-starterkit/nsh/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pic32-starterkit/nsh2/Make.defs b/nuttx/configs/pic32-starterkit/nsh2/Make.defs index 03c044ea6..d8bd81e0e 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/Make.defs +++ b/nuttx/configs/pic32-starterkit/nsh2/Make.defs @@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh2/ld.script}" else - # Linux/Cygwin-native toolchain + # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx diff --git a/nuttx/configs/pic32-starterkit/src/Makefile b/nuttx/configs/pic32-starterkit/src/Makefile index 0f1fd5ebc..1b1e3536e 100644 --- a/nuttx/configs/pic32-starterkit/src/Makefile +++ b/nuttx/configs/pic32-starterkit/src/Makefile @@ -37,7 +37,7 @@ CFLAGS += -I$(TOPDIR)/sched -ASRCS = +ASRCS = CSRCS = up_boot.c up_leds.c up_spi.c ifeq ($(CONFIG_PIC32MX_USBDEV),y) diff --git a/nuttx/configs/pic32-starterkit/src/up_leds.c b/nuttx/configs/pic32-starterkit/src/up_leds.c index 71e59343f..c7d61d15a 100644 --- a/nuttx/configs/pic32-starterkit/src/up_leds.c +++ b/nuttx/configs/pic32-starterkit/src/up_leds.c @@ -148,7 +148,7 @@ static const struct led_setting_s g_ledoffvalues[LED_NVALUES] = {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_NC, LED_OFF}, - {LED_NC, LED_NC, LED_NC, LED_OFF}, + {LED_NC, LED_NC, LED_NC, LED_OFF}, {LED_NC, LED_NC, LED_OFF, LED_OFF}, {LED_OFF, LED_NC, LED_NC, LED_OFF}, }; diff --git a/nuttx/configs/pic32-starterkit/src/up_spi.c b/nuttx/configs/pic32-starterkit/src/up_spi.c index ca14501cc..962dac33d 100644 --- a/nuttx/configs/pic32-starterkit/src/up_spi.c +++ b/nuttx/configs/pic32-starterkit/src/up_spi.c @@ -60,7 +60,7 @@ ************************************************************************************/ /* The following enable debug output from this file (needs CONFIG_DEBUG too). - * + * * CONFIG_SPI_DEBUG - Define to enable basic SPI debug * CONFIG_SPI_VERBOSE - Define to enable verbose SPI debug */ @@ -107,7 +107,7 @@ void weak_function pic32mx_sspinitialize(void) * Description: * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface - * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods + * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * including up_spiinitialize()) are provided by common PIC32MX logic. To use * this common SPI logic on your board: * @@ -123,7 +123,7 @@ void weak_function pic32mx_sspinitialize(void) * 3. Add a call to up_spiinitialize() in your low level application * initialization logic * 4. The handle returned by up_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling + * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). * diff --git a/nuttx/configs/pic32-starterkit/src/up_usbdev.c b/nuttx/configs/pic32-starterkit/src/up_usbdev.c index 6f04f43cb..4779bd33a 100644 --- a/nuttx/configs/pic32-starterkit/src/up_usbdev.c +++ b/nuttx/configs/pic32-starterkit/src/up_usbdev.c @@ -108,7 +108,7 @@ void weak_function pic32mx_usbdevinitialize(void) #ifdef CONFIG_USBHOST // pic32mx_configgpio(GPIO_USB_VBUSON); #endif - + /* "If the host PC sends a GetStatus (device) request, the firmware must respond * and let the host know if the USB peripheral device is currently bus powered * or self powered. See chapter 9 in the official USB specifications for details |