Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Misc USB storage-related cleanup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3515 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-04-16 19:28:00 +00:00
parent 93be5f368b
commit 19747bb067
15 changed files with 198 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc17xx/lpc17_usbdev.c
-2
View File
@@ -1921,7 +1921,6 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv)
static inline void lpc17_ep0dataoutinterrupt(struct lpc17_usbdev_s *priv) static inline void lpc17_ep0dataoutinterrupt(struct lpc17_usbdev_s *priv)
{ {
struct lpc17_ep_s *ep0;
uint32_t pktlen; uint32_t pktlen;
/* Copy new setup packet into setup buffer */ /* Copy new setup packet into setup buffer */
@@ -1969,7 +1968,6 @@ static inline void lpc17_ep0dataoutinterrupt(struct lpc17_usbdev_s *priv)
lpc17_epstall(&priv->eplist[LPC17_EP0_IN].ep, false); lpc17_epstall(&priv->eplist[LPC17_EP0_IN].ep, false);
lpc17_epstall(&priv->eplist[LPC17_EP0_OUT].ep, false); lpc17_epstall(&priv->eplist[LPC17_EP0_OUT].ep, false);
} }
return;
} }
/******************************************************************************* /*******************************************************************************
configs/ea3131/usbstorage/defconfig
-6
View File
@@ -787,12 +787,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/lpcxpresso-lpc1768/README.txt
+35 -1
View File
@@ -126,17 +126,40 @@ SD Slot
*J55 must be set to provide chip select PIO1_11 signal as the SD slot *J55 must be set to provide chip select PIO1_11 signal as the SD slot
chip select. chip select.
USB Device
----------
Base-board J4/J6 LPC1768 Base-board J4/J6 LPC1768
Signal Pin Pin Signal Pin Pin
------------------- ----- -------- ------------------- ----- --------
PIO0_6-USB_CONNECT* 23 P0.21 PIO0_6-USB_CONNECT* 23 P0.21
USB_DM 36 USB_D- USB_DM 36 USB_D-
USB_DP 37 USB_D+ USB_DP 37 USB_D+
PIO0_3-VBUS_SENSE 39 P0.5 PIO0_3-VBUS_SENSE** 39 P0.5
*J14 must be set to permit GPIO control of the USB connect pin *J14 must be set to permit GPIO control of the USB connect pin
**J12 must be set to permit GPIO control of the USB vbus sense pin
J23 is associated the LEDs used for USB support J23 is associated the LEDs used for USB support
Here is a more detailed pin mapping:
---------------------------------------------+------+-----------------------------------------------
LPCXpresso | J4/6 | Base Board
---------------------------------------------| |-----------------------------------------------
LPC1768 Signal | | Signal Connection
------------------------------ --------------+------+------------------- ---------------------------
P0.29/USB-D+ P0[29]/USB-D+ | 37 | USB_DP USB D+
P0.30/USB-D- P0[30]/USB-D- | 36 | USB_DM USB D-
P1.18/USB-UP-LED/PWM1.1/CAP1.0 PAD1 | N/A | N/A N/A
P1.30/VBUS/AD0.4 P1[30] | 19 | PIO1_3 (Not used on board)
P2.9/USB-CONNECT/RXD2* PAD19 | N/A | N/A N/A
------------------------------ --------------+------+------------------- ---------------------------
P0.21/RI1/RD1 P0[21] | 23 | PIO0_6-USB_CONNECT VBUS via J14 and transistor
P0.5/I2SRX-WS/TD2/CAP2.1 P0[5] | 39 | PIO0_3-VBUS_SENSE VBUS via J12
------------------------------ --------------+------+------------------- ---------------------------
*P2.9 Connect to a transistor driven USB-D+ pullup on the LPCXpresso board.
Development Environment Development Environment
^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
@@ -432,6 +455,8 @@ LEDs
LPCXpresso Configuration Options LPCXpresso Configuration Options
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
General Architecture Settings:
CONFIG_ARCH - Identifies the arch/ subdirectory. This should CONFIG_ARCH - Identifies the arch/ subdirectory. This should
be set to: be set to:
@@ -627,6 +652,11 @@ Where <subdir> is one of the following:
Support for the board's SPI-based MicroSD card is included Support for the board's SPI-based MicroSD card is included
(but not passing tests as of this writing). (but not passing tests as of this writing).
NOTE: At present, the value for the SD SPI frequency is too
high and the SD will failing. Setting that frequency to 400000
removes the problem. TODO: Tune this frequency to some optimal
value.
ostest: ostest:
This configuration directory, performs a simple OS test using This configuration directory, performs a simple OS test using
apps/examples/ostest. apps/examples/ostest.
@@ -655,3 +685,7 @@ Where <subdir> is one of the following:
class driver at apps/examples/usbstorage. See apps/examples/README.txt class driver at apps/examples/usbstorage. See apps/examples/README.txt
for more information. for more information.
NOTE: At present, the value for the SD SPI frequency is too
high and the SD will failing. Setting that frequency to 400000
removes the problem. TODO: Tune this frequency to some optimal
value.
configs/lpcxpresso-lpc1768/nsh/defconfig
-6
View File
@@ -910,12 +910,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/lpcxpresso-lpc1768/ostest/defconfig
-6
View File
@@ -854,12 +854,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/lpcxpresso-lpc1768/src/lpcxpresso_internal.h
+21 -5
View File
@@ -154,13 +154,29 @@
# define LPCXPRESSO_SD_CD (GPIO_INPUT | GPIO_PULLUP | GPIO_PORT2 | GPIO_PIN11) # define LPCXPRESSO_SD_CD (GPIO_INPUT | GPIO_PULLUP | GPIO_PORT2 | GPIO_PIN11)
#endif #endif
/* Base-board J4/J6 LPC1768 /* USB:
*
* Base-board J4/J6 LPC1768
* Signal Pin Pin * Signal Pin Pin
* ------------------- ----- -------- * ------------------- ----- --------
* PIO0_6-USB_CONNECT* 23 P0.21 * USB_DM 36 P0.30/USB-D-
* USB_DM 36 USB_D- * USB_DP 37 P0.29/USB-D+
* USB_DP 37 USB_D+ * N/C N/C P1.18/USB-UP-LED/PWM1.1/CAP1.0
* PIO0_3-VBUS_SENSE 39 P0.5 * PIO1_3 (not used) 19 P1.30/VBUS/AD0.4
* N/C N/C P2.9/USB-CONNECT/RXD2 (See Notes)
* ------------------- ----- --------
* PIO0_6-USB_CONNECT* 23 P0.21/RI1/RD1
* PIO0_3-VBUS_SENSE 39 P0.5/I2SRX-WS/TD2/CAP2.1
*
* Noes:
* - The standard USB CONNECT (P0.9) provides USB D+ pullup on board the
* LPCXpresso card; it should be un-necessary to use the based board
* version of the pullup.
* - J14 must be set to permit GPIO control of the base board USB connect
* pin
* - The standard VBUS (P1.30) is not connected.
* - J12 must be set to permit GPIO control of the USB vbus sense pin
* - The standard USB LED (P1.18) is not connected.
*/ */
#define LPCXPRESSO_USB_CONNECT (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN21) #define LPCXPRESSO_USB_CONNECT (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN21)
configs/lpcxpresso-lpc1768/src/up_usbstrg.c
+1 -1
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/lpcxpresso-lpc1768/src/up_usbstrg.c * configs/lpcxpresso-lpc1768/src/up_usbstrg.c
* *
* Copyright (C) 2010 Gregory Nutt. All rights reserved. * Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Configure and register the LPC17xx MMC/SD SPI block driver. * Configure and register the LPC17xx MMC/SD SPI block driver.
configs/lpcxpresso-lpc1768/thttpd/defconfig
-6
View File
@@ -965,12 +965,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/lpcxpresso-lpc1768/usbstorage/defconfig
-6
View File
@@ -855,12 +855,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/mcu123-lpc214x/usbstorage/defconfig
-6
View File
@@ -656,12 +656,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=y
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=y CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=y
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/nucleus2g/usbstorage/defconfig
-6
View File
@@ -833,12 +833,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/olimex-lpc1766stk/nx/defconfig
-6
View File
@@ -1012,12 +1012,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Settings for examples/nx # Settings for examples/nx
# #
configs/olimex-lpc1766stk/ostest/defconfig
-6
View File
@@ -848,12 +848,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/olimex-lpc1766stk/usbstorage/defconfig
-6
View File
@@ -848,12 +848,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #
configs/stm3210e-eval/usbstorage/defconfig
-6
View File
@@ -818,12 +818,6 @@ CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
CONFIG_EXAMPLES_USBSTRG_TRACEINIT=n
CONFIG_EXAMPLES_USBSTRG_TRACECLASS=n
CONFIG_EXAMPLES_USBSTRG_TRACETRANSFERS=n
CONFIG_EXAMPLES_USBSTRG_TRACECONTROLLER=n
CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
# #
# Stack and heap information # Stack and heap information
# #