summaryrefslogtreecommitdiff
path: root/nuttx/configs/pic32mx7mmb
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-13 16:22:22 -0600
commit70b6bb22af51defd713adfd452309f32f0e523aa (patch)
treeb483c578cf6ae76888b89188bedb03f539ab4cd3 /nuttx/configs/pic32mx7mmb
parent3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 (diff)
downloadpx4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.gz
px4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.tar.bz2
px4-nuttx-70b6bb22af51defd713adfd452309f32f0e523aa.zip
More trailing whilespace removal
Diffstat (limited to 'nuttx/configs/pic32mx7mmb')
-rw-r--r--nuttx/configs/pic32mx7mmb/README.txt30
-rw-r--r--nuttx/configs/pic32mx7mmb/nsh/Make.defs2
-rw-r--r--nuttx/configs/pic32mx7mmb/src/Makefile2
-rw-r--r--nuttx/configs/pic32mx7mmb/src/up_leds.c2
-rw-r--r--nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c12
-rw-r--r--nuttx/configs/pic32mx7mmb/src/up_spi.c6
-rw-r--r--nuttx/configs/pic32mx7mmb/src/up_touchscreen.c20
-rw-r--r--nuttx/configs/pic32mx7mmb/src/up_usbdev.c2
8 files changed, 38 insertions, 38 deletions
diff --git a/nuttx/configs/pic32mx7mmb/README.txt b/nuttx/configs/pic32mx7mmb/README.txt
index 7e02b901b..133f33f2e 100644
--- a/nuttx/configs/pic32mx7mmb/README.txt
+++ b/nuttx/configs/pic32mx7mmb/README.txt
@@ -75,7 +75,7 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE
41 PMA11/AECRS/AN12/ERXD0/RB12 LCD-YU TFT display
42 PMA10/AECOL/AN13/ERXD1/RB13 LCD-XL TFT display
43 PMA1/AETXD3/AN14/ERXD2/PMALH/RB14 LCD-CS# TFT display, HDR2 pin 3
- 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display
+ 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display
PMALL/RB15
45 VSS (grounded) ---
46 VDD P32_VDD ---
@@ -138,8 +138,8 @@ PIN CONFIGURATIONS SIGNAL NAME ON-BOARD CONNE
85 VCAP/VCORE (capacitor to ground) ---
84 PMD15/CN16/ETXCLK/RD7 PMPD15 TFT display, HDR1 pin 3
83 PMD14/CN15/ETXEN/RD6 PMPD14 TFT display, HDR1 pin 4
- 82 CN14/PMRD/RD5 PMPRD
- 81 CN13/OC5/PMWR/RD4 PMPWR
+ 82 CN14/PMRD/RD5 PMPRD
+ 81 CN13/OC5/PMWR/RD4 PMPWR
80 PMD13/CN19/ETXD3/RD13 PMPD13 TFT display, HDR1 pin 5
79 PMD12/ETXD2/IC5/RD12 PMPD12 TFT display, HDR1 pin 6
78 OC4/RD3 RD3 HDR2 pin 5
@@ -236,7 +236,7 @@ Toolchains
Windows Native Toolchains
-------------------------
-
+
NOTE: There are several limitations to using a Windows based toolchain in a
Cygwin environment. The three biggest are:
@@ -485,7 +485,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
@@ -633,7 +633,7 @@ Where <subdir> is one of the following:
3. SD Card Support
SD card support is built into this example by default:
-
+
CONFIG_PIC32MX_SPI1=y
CONFIG_NSH_ARCHINIT=y
@@ -653,7 +653,7 @@ Where <subdir> is one of the following:
USB device support is enabled by default in this configuration.
The following settings are defined by default (and can be set
to 'n' to disabled USB device support).
-
+
CONFIG_USBDEV=y : Enable basic USB device support
CONFIG_PIC32MX_USBDEV=y : Enable PIC32 USB device support
CONFIG_USBMSC=y : USB supports a mass storage device.
@@ -663,7 +663,7 @@ Where <subdir> is one of the following:
msconn : Connect the mass storage device, exportint the SD
card as the USB mass storage logical unit.
msdis : Disconnect the USB mass storage device
-
+
NOTE: The SD card should *not* be mounted under NSH *and* exported
by the mass storage device!!! That can result in corruption of the
SD card format. This is the sequence of commands that you should
@@ -677,7 +677,7 @@ Where <subdir> is one of the following:
msdis : Disconnect the USB MSC
mount -t vfat /dev/mmcsd0 /mnt/sdcard : Re-mount the SD card
...
-
+
Other USB other device configurations can be enabled and
included as NSH built-in built in functions.
@@ -692,9 +692,9 @@ Where <subdir> is one of the following:
CONFIG_PL2303=y : Enable the Prolifics PL2303 emulation
CONFIG_CDCACM=y : or the CDC/ACM serial driver (not both)
- system/cdcacm - The system/cdcacm program can be included as an
+ system/cdcacm - The system/cdcacm program can be included as an
function by adding the following to the NuttX configuration file:
-
+
CONFIG_SYSTEM_CDCACM=y
and defining the following in your .config file:
@@ -717,7 +717,7 @@ Where <subdir> is one of the following:
CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) : Host IP address 10.0.0.1
This will probably need to be customized for your network.
-
+
NOTES:
a. This logic will assume that a network is connected. During its
@@ -752,7 +752,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
@@ -784,7 +784,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
@@ -808,7 +808,7 @@ Where <subdir> is one of the following:
But you will have to enable a specific graphics example application
in the NuttX configuration file in order to see anything.
-
+
8. Enabling touch screen support in the nsh configuaration
In defconfig (or nuttx/.config), set:
diff --git a/nuttx/configs/pic32mx7mmb/nsh/Make.defs b/nuttx/configs/pic32mx7mmb/nsh/Make.defs
index c2010d2e1..aaf541d7d 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/Make.defs
+++ b/nuttx/configs/pic32mx7mmb/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/pic32mx7mmb/src/Makefile b/nuttx/configs/pic32mx7mmb/src/Makefile
index d3f84745e..d21852aef 100644
--- a/nuttx/configs/pic32mx7mmb/src/Makefile
+++ b/nuttx/configs/pic32mx7mmb/src/Makefile
@@ -37,7 +37,7 @@
CFLAGS += -I$(TOPDIR)/sched
-ASRCS =
+ASRCS =
CSRCS = up_boot.c up_leds.c up_spi.c up_mio283qt2.c
ifeq ($(CONFIG_PIC32MX_USBDEV),y)
diff --git a/nuttx/configs/pic32mx7mmb/src/up_leds.c b/nuttx/configs/pic32mx7mmb/src/up_leds.c
index 333ca0406..964f35387 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_leds.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_leds.c
@@ -151,7 +151,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/pic32mx7mmb/src/up_mio283qt2.c b/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c
index 7ab4353c6..61e861eb3 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_mio283qt2.c
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
**************************************************************************************/
-
+
/**************************************************************************************
* Included Files
**************************************************************************************/
@@ -93,14 +93,14 @@
* 6 RC1/T2CK LCD_RST TFT display
* 43 PMA1/AETXD3/AN14/ERXD2/PMALH/RB14 LCD-CS# TFT display, HDR2 pin 3
* 77 OC3/RD2 LCD_BLED LCD backlight LED
- * 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display
+ * 44 PMA0/AETXD2/AN15/CN12/ERXD3/OCFB/ LCD-RS TFT display
* PMALL/RB15
*
* 34 PMA13/AN10/RB10/CVREFOUT LCD-YD TFT display
* 35 PMA12/AETXERR/AN11/ERXERR/RB11 LCD-XR TFT display
* 41 PMA11/AECRS/AN12/ERXD0/RB12 LCD-YU TFT display
* 42 PMA10/AECOL/AN13/ERXD1/RB13 LCD-XL TFT display
- *
+ *
* 93 PMD0/RE0 PMPD0 TFT display, HDR1 pin 18
* 94 PMD1/RE1 PMPD1 TFT display, HDR1 pin 17
* 98 PMD2/RE2 PMPD2 TFT display, HDR1 pin 16
@@ -117,9 +117,9 @@
* 80 PMD13/CN19/ETXD3/RD13 PMPD13 TFT display, HDR1 pin 5
* 83 PMD14/CN15/ETXEN/RD6 PMPD14 TFT display, HDR1 pin 4
* 84 PMD15/CN16/ETXCLK/RD7 PMPD15 TFT display, HDR1 pin 3
- *
- * 82 CN14/PMRD/RD5 PMPRD
- * 81 CN13/OC5/PMWR/RD4 PMPWR
+ *
+ * 82 CN14/PMRD/RD5 PMPRD
+ * 81 CN13/OC5/PMWR/RD4 PMPWR
*/
/* RC1, Reset -- Low value holds in reset */
diff --git a/nuttx/configs/pic32mx7mmb/src/up_spi.c b/nuttx/configs/pic32mx7mmb/src/up_spi.c
index b5676a0ac..1b7345fc9 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_spi.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_spi.c
@@ -77,7 +77,7 @@
#define GPIO_SD_CD (GPIO_INPUT|GPIO_INT|GPIO_PORTG|GPIO_PIN7)
/* The following enable debug output from this file (needs CONFIG_DEBUG too).
- *
+ *
* CONFIG_DEBUG_SPI - Define to enable basic SPI debug
*/
@@ -123,7 +123,7 @@ void weak_function pic32mx_spiinitialize(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:
*
@@ -139,7 +139,7 @@ void weak_function pic32mx_spiinitialize(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/pic32mx7mmb/src/up_touchscreen.c b/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c
index 2f1bce713..d29111f67 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_touchscreen.c
@@ -146,7 +146,7 @@
#define TC_PENDOWN_POLL_TICKS (60 / MSEC_PER_TICK) /* Active polling rate: 60 MSec */
#define TC_DEBOUNCE_TICKS (30 / MSEC_PER_TICK) /* Delay before re-sampling: 30 MSec */
#define TC_SAMPLE_TICKS (4 / MSEC_PER_TICK) /* Delay for A/D sampling: 4 MSec */
-#define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS
+#define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS
/************************************************************************************
* Private Types
@@ -493,7 +493,7 @@ static void tc_notify(FAR struct tc_dev_s *priv)
* is no longer available.
*/
- sem_post(&priv->waitsem);
+ sem_post(&priv->waitsem);
}
/* If there are threads waiting on poll() for touchscreen data to become available,
@@ -593,7 +593,7 @@ static int tc_waitsample(FAR struct tc_dev_s *priv,
while (tc_sample(priv, sample) < 0)
{
/* Wait for a change in the touchscreen state */
-
+
priv->nwaiters++;
ret = sem_wait(&priv->waitsem);
priv->nwaiters--;
@@ -657,14 +657,14 @@ static void tc_worker(FAR void *arg)
tc_yminus_sample();
/* Allow time for the Y- pend down sampling */
-
+
priv->state = TC_YMPENDOWN;
delay = TC_SAMPLE_TICKS;
}
break;
/* The Y- sampling time has elapsed and the Y- value should be ready
- * for conversion
+ * for conversion
*/
case TC_YMPENDOWN:
@@ -684,7 +684,7 @@ static void tc_worker(FAR void *arg)
else
{
/* Allow time for touch inputs to stabilize */
-
+
priv->state = TC_DEBOUNCE;
delay = TC_DEBOUNCE_TICKS;
}
@@ -703,7 +703,7 @@ static void tc_worker(FAR void *arg)
tc_yminus_sample();
/* Allow time for the Y- sampling */
-
+
priv->state = TC_YMSAMPLE;
delay = TC_SAMPLE_TICKS;
}
@@ -736,7 +736,7 @@ static void tc_worker(FAR void *arg)
tc_yplus_sample();
/* Allow time for the Y+ sampling */
-
+
priv->state = TC_YPSAMPLE;
delay = TC_SAMPLE_TICKS;
}
@@ -778,7 +778,7 @@ static void tc_worker(FAR void *arg)
tc_xplus_sample();
/* Allow time for the X+ sampling */
-
+
priv->state = TC_XPSAMPLE;
delay = TC_SAMPLE_TICKS;
}
@@ -820,7 +820,7 @@ static void tc_worker(FAR void *arg)
tc_xminus_sample();
/* Allow time for the X- pend down sampling */
-
+
priv->state = TC_XMSAMPLE;
delay = TC_SAMPLE_TICKS;
}
diff --git a/nuttx/configs/pic32mx7mmb/src/up_usbdev.c b/nuttx/configs/pic32mx7mmb/src/up_usbdev.c
index 5d82f5f65..c6e4cc3e0 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_usbdev.c
+++ b/nuttx/configs/pic32mx7mmb/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