diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-08 09:55:12 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-08 09:55:12 -0600 |
| commit | 1ec16044b1b868ac9b29260aa0607e581792a8b5 (patch) | |
| tree | a51a9cbdc80ef62eabfcf82d996694cb417f9950 | |
| parent | 56cde073f2f253ece6ec667158e274dc0c7779ed (diff) | |
| download | px4-nuttx-1ec16044b1b868ac9b29260aa0607e581792a8b5.tar.gz px4-nuttx-1ec16044b1b868ac9b29260aa0607e581792a8b5.tar.bz2 px4-nuttx-1ec16044b1b868ac9b29260aa0607e581792a8b5.zip | |
Minor improvements to comments and debug output
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/open1788/include/board.h | 12 | ||||
| -rw-r--r-- | nuttx/configs/open1788/src/open1788.h | 15 |
3 files changed, 15 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c index 435bf948e..d5ff51f61 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_gpiodbg.c @@ -166,7 +166,7 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg) pinmode, pinmode ? getreg32(pinmode) : 0, g_odmode[port], getreg32(g_odmode[port])); #elif defined(LPC178x) - lldbg(" IOCON[%08x]:\n", getreg32(iocon)); + lldbg(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); #endif base = g_fiobase[port]; diff --git a/nuttx/configs/open1788/include/board.h b/nuttx/configs/open1788/include/board.h index 641cc99fe..e054c5400 100644 --- a/nuttx/configs/open1788/include/board.h +++ b/nuttx/configs/open1788/include/board.h @@ -416,17 +416,17 @@ /* XPT2046 Touchscreen: * - * -------------- -------------------- ------------ -------------- +/* -------------- -------------------- ------------ -------------------------------- * XTPT2046 Module Module Open1788 LED * Signal Connector Connector - * -------------- -------------------- ------------ -------------- + * -------------- -------------------- ------------ --------------------------------- * Pin 11 PENIRQ\ PENIRQ (pulled high) PORT3 Pin 1 P2.15 PENIRQ - * Pin 12 DOUT MISO PORT3 Pin 4 P1.18 MISO1 + * Pin 12 DOUT MISO PORT3 Pin 4 P1.18 MISO1 (Also USB HOST UP LED) * Pin 13 BUSY BUSY (pulled high) PORT3 Pin 9 P2.14 BUSY - * Pin 14 DIN MOSI PORT3 Pin 3 P0.13 MOSI1 - * Pin 15 CS\ SSEL (pulled high) PORT3 Pin 6 P1.8 GPIO + * Pin 14 DIN MOSI PORT3 Pin 3 P0.13 MOSI1 (Also USB Device up LED and SD CD pin) + * Pin 15 CS\ SSEL (pulled high) PORT3 Pin 6 P1.8 GPIO (Also RMII_CRS_DV) * Pin 16 DCLK SCK PORT3 Pin 5 P1.19 SCK1 - * -------------- -------------------- ------------ -------------- + * -------------- -------------------- ------------ --------------------------------- */ diff --git a/nuttx/configs/open1788/src/open1788.h b/nuttx/configs/open1788/src/open1788.h index 3bceee1ec..9c5b49a19 100644 --- a/nuttx/configs/open1788/src/open1788.h +++ b/nuttx/configs/open1788/src/open1788.h @@ -129,19 +129,20 @@ #define GPIO_LCD_BL (GPIO_OUTPUT | GPIO_VALUE_ZERO | GPIO_PORT2 | GPIO_PIN1) /* XPT2046 Touchscreen **************************************************************/ -/* -------------- -------------------- ------------ -------------- +/* -------------- -------------------- ------------ -------------------------------- * XTPT2046 Module Module Open1788 LED * Signal Connector Connector - * -------------- -------------------- ------------ -------------- + * -------------- -------------------- ------------ --------------------------------- * Pin 11 PENIRQ\ PENIRQ (pulled high) PORT3 Pin 1 P2.15 PENIRQ - * Pin 12 DOUT MISO PORT3 Pin 4 P1.18 MISO1 + * Pin 12 DOUT MISO PORT3 Pin 4 P1.18 MISO1 (Also USB HOST UP LED) * Pin 13 BUSY BUSY (pulled high) PORT3 Pin 9 P2.14 BUSY - * Pin 14 DIN MOSI PORT3 Pin 3 P0.13 MOSI1 - * Pin 15 CS\ SSEL (pulled high) PORT3 Pin 6 P1.8 GPIO + * Pin 14 DIN MOSI PORT3 Pin 3 P0.13 MOSI1 (Also USB Device up LED and SD CD pin) + * Pin 15 CS\ SSEL (pulled high) PORT3 Pin 6 P1.8 GPIO (Also RMII_CRS_DV) * Pin 16 DCLK SCK PORT3 Pin 5 P1.19 SCK1 - * -------------- -------------------- ------------ -------------- + * -------------- -------------------- ------------ --------------------------------- * - * Pins are configured as floating because there are pullups on the module. + * Pins should not need to be configured as pull-ups because, according to the LCD + * schematic, the are pulled-up on board the LCD module. */ #define GPIO_TC_PENIRQ (GPIO_INTBOTH | GPIO_FLOAT | GPIO_PORT2 | GPIO_PIN15) |