diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-14 12:26:49 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-14 12:26:49 -0600 |
commit | 09c8278b8677125f5160be9593fccfd53286bbfc (patch) | |
tree | 3a9ab0b135a77d6f3c97e134afdb1315699cdc56 /nuttx | |
parent | df4aeab705353232c78e614b56296e585f833fa4 (diff) | |
download | px4-nuttx-09c8278b8677125f5160be9593fccfd53286bbfc.tar.gz px4-nuttx-09c8278b8677125f5160be9593fccfd53286bbfc.tar.bz2 px4-nuttx-09c8278b8677125f5160be9593fccfd53286bbfc.zip |
examples/touchscreen: Add a configuration option to indicate that there is or is not an architecture-specific initialization function
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_otgfshost.c | 10 | ||||
-rw-r--r-- | nuttx/configs/hymini-stm32v/nsh2/defconfig | 1 | ||||
-rw-r--r-- | nuttx/configs/mikroe-stm32f4/fulldemo/defconfig | 1 | ||||
-rw-r--r-- | nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig | 1 | ||||
-rw-r--r-- | nuttx/configs/sim/nsh2/defconfig | 1 | ||||
-rw-r--r-- | nuttx/configs/sim/touchscreen/defconfig | 1 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_enumerate.c | 2 |
7 files changed, 11 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c index b7d39f93f..e43e246a0 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfshost.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfshost.c @@ -640,7 +640,7 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv) /* Search the table of channels */ - for (chidx = 0 ; chidx < STM32_NHOST_CHANNELS ; chidx++) + for (chidx = 0; chidx < STM32_NHOST_CHANNELS; chidx++) { /* Is this channel available? */ @@ -693,7 +693,7 @@ static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv) /* Free all host channels */ - for (chidx = 2; chidx < STM32_NHOST_CHANNELS ; chidx ++) + for (chidx = 2; chidx < STM32_NHOST_CHANNELS; chidx ++) { stm32_chan_free(priv, chidx); } @@ -3232,8 +3232,8 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn, int rhpndx) /* Configure control channels */ - stm32_chan_configure(priv, priv->ep0out) ; - stm32_chan_configure(priv, priv->ep0in) ; + stm32_chan_configure(priv, priv->ep0out); + stm32_chan_configure(priv, priv->ep0in); /* Let the common usbhost_enumerate do all of the real work. Note that the * FunctionAddress (USB address) is hardcoded to one. @@ -3412,7 +3412,7 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, /* Then configure the endpoint */ - stm32_chan_configure(priv, chidx) ; + stm32_chan_configure(priv, chidx); /* Return the index to the allocated channel as the endpoint "handle" */ diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index c95f1618c..b76f27cf2 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -720,6 +720,7 @@ CONFIG_EXAMPLES_NXIMAGE=y CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" +CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set # CONFIG_EXAMPLES_USBSERIAL is not set diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig index 84be85eb6..e51238b92 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig @@ -1009,6 +1009,7 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4 CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" +CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set diff --git a/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig b/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig index c1c437825..f4fd85821 100644 --- a/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig @@ -675,6 +675,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/mouse0" CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE=y +CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_DISCOVER is not set # CONFIG_EXAMPLES_UIP is not set diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig index 87c8c0b6a..efb61a688 100644 --- a/nuttx/configs/sim/nsh2/defconfig +++ b/nuttx/configs/sim/nsh2/defconfig @@ -520,6 +520,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32 CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" +CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig index bdb1b3d30..f9d98cb5e 100644 --- a/nuttx/configs/sim/touchscreen/defconfig +++ b/nuttx/configs/sim/touchscreen/defconfig @@ -515,6 +515,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25 +CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set diff --git a/nuttx/drivers/usbhost/usbhost_enumerate.c b/nuttx/drivers/usbhost/usbhost_enumerate.c index 1857499ed..d8bcc9c02 100644 --- a/nuttx/drivers/usbhost/usbhost_enumerate.c +++ b/nuttx/drivers/usbhost/usbhost_enumerate.c @@ -179,7 +179,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen, configdesc += cfgdesc->len; remaining = cfglen - cfgdesc->len; - /* Loop where there are more dscriptors to examine */ + /* Loop while there are more descriptors to examine */ memset(id, 0, sizeof(FAR struct usb_desc_s)); while (remaining >= sizeof(struct usb_desc_s)) |