phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Create include/nuttx/usb directory 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3170 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2010-12-14 03:33:39 +00:00
parent aa3052e617
commit deed6d6c8a
24 changed files with 150 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nuttx/ChangeLog
View File

@ -1406,3 +1406,7 @@
This is a very important bug-fix in some usages.
5.16 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* include/nuttx/usb -- Created new directory. Moved all usb-related header
files to this new directory. Created a skeleton for a new USB host header
file

6
nuttx/Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
<p>Last Updated: December 12, 2010</p>
<p>Last Updated: December 13, 2010</p>
</td>
</tr>
</table>
@ -2013,6 +2013,10 @@ buildroot-1.8 2009-12-21 &lt;spudmonkey@racsa.co.cr&gt;
<ul><pre>
nuttx-5.16 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* include/nuttx/usb -- Created new directory. Moved all usb-related header
files to this new directory. Created a skeleton for a new USB host header
file
pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
buildroot-1.9 2010-xx-xx <spudmonkey@racsa.co.cr>

8
nuttx/arch/arm/src/dm320/dm320_usbdev.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
* arch/arm/src/dm320/dm320_usbdev.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -48,9 +48,9 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include <arch/irq.h>
#include <arch/board/board.h>

6
nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
View File

@ -48,9 +48,9 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include <arch/irq.h>
#include <arch/board/board.h>

6
nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
View File

@ -48,9 +48,9 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include <arch/irq.h>
#include <arch/board/board.h>

2
nuttx/arch/arm/src/lpc313x/lpc313x_internal.h
View File

@ -212,7 +212,7 @@ EXTERN int lpc313x_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, b
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide lpc313x_pullup.
* See include/nuttx/usbdev.h for additional description of this method.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*

6
nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c
View File

@ -52,9 +52,9 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include <arch/irq.h>
#include <arch/board/board.h>

2
nuttx/arch/arm/src/stm32/stm32_internal.h
View File

@ -488,7 +488,7 @@ EXTERN int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bo
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide stm32_pullup.
* See include/nuttx/usbdev.h for additional description of this method.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*

8
nuttx/arch/arm/src/stm32/stm32_usbdev.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/stm32/stm32_usbdev.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* References:
@ -52,9 +52,9 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include <arch/irq.h>

6
nuttx/configs/sam3u-ek/src/up_usbdev.c
View File

@ -45,8 +45,8 @@
#include <stdbool.h>
#include <debug.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include "up_arch.h"
#include "sam3u_internal.h"
@ -82,7 +82,7 @@ void sam3u_usbinitialize(void)
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide sam3u_pullup.
* See include/nuttx/usbdev.h for additional description of this method.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*

8
nuttx/configs/stm3210e-eval/src/up_usbdev.c
View File

@ -2,7 +2,7 @@
* configs/stm3210e-eval/src/up_usbdev.c
* arch/arm/src/board/up_boot.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,8 +45,8 @@
#include <stdbool.h>
#include <debug.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include "up_arch.h"
#include "stm32_internal.h"
@ -85,7 +85,7 @@ void stm32_usbinitialize(void)
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide stm32_pullup.
* See include/nuttx/usbdev.h for additional description of this method.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*

6
nuttx/drivers/usbdev/usbdev_scsi.c
View File

@ -69,9 +69,9 @@
#include <nuttx/arch.h>
#include <nuttx/scsi.h>
#include <nuttx/usb_storage.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb_storage.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include "usbdev_storage.h"

6
nuttx/drivers/usbdev/usbdev_serial.c
View File

@ -55,9 +55,9 @@
#include <nuttx/arch.h>
#include <nuttx/serial.h>
#include <nuttx/usb.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
/****************************************************************************
* Pre-processor Definitions

8
nuttx/drivers/usbdev/usbdev_storage.c
View File

@ -74,10 +74,10 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
#include <nuttx/usb.h>
#include <nuttx/usb_storage.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usb_storage.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include "usbdev_storage.h"

4
nuttx/drivers/usbdev/usbdev_storage.h
View File

@ -51,8 +51,8 @@
#include <queue.h>
#include <nuttx/fs.h>
#include <nuttx/usb_storage.h>
#include <nuttx/usbdev.h>
#include <nuttx/usb/usb_storage.h>
#include <nuttx/usb/usbdev.h>
/****************************************************************************
* Definitions

4
nuttx/drivers/usbdev/usbdev_trace.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* drivers/usbdev/usbdev_trace.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <debug.h>
#include <arch/irq.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev_trace.h>
#undef usbtrace
/****************************************************************************

4
nuttx/drivers/usbdev/usbdev_trprintf.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* drivers/usbdev/usbdev_trprintf.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -43,7 +43,7 @@
#include <stdint.h>
#include <debug.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev_trace.h>
/****************************************************************************
* Definitions

4
nuttx/examples/usbserial/main.c
View File

@ -48,8 +48,8 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
/****************************************************************************
* Definitions

4
nuttx/examples/usbstorage/usbstrg_main.c
View File

@ -44,8 +44,8 @@
#include <unistd.h>
#include <debug.h>
#include <nuttx/usbdev.h>
#include <nuttx/usbdev_trace.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
#include "usbstrg.h"

10
nuttx/include/nuttx/usb.h → nuttx/include/nuttx/usb/usb.h
View File

@ -1,7 +1,7 @@
/************************************************************************************
* include/nuttx/usb.h
* include/nuttx/usb/usb.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __NUTTX_USB_H
#define __NUTTX_USB_H
#ifndef __NUTTX_USB_USB_H
#define __NUTTX_USB_USB_H
/************************************************************************************
* Included Files
@ -337,4 +337,4 @@ struct usb_qualdesc_s
* Public Functions
************************************************************************************/
#endif // __NUTTX_USB_H
#endif // __NUTTX_USB_USB_H

8
nuttx/include/nuttx/usb_storage.h → nuttx/include/nuttx/usb/usb_storage.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* include/nuttx/usb_storage.h
* include/nuttx/usb/usb_storage.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -40,8 +40,8 @@
*
************************************************************************************/
#ifndef __NUTTX_USB_STORAGE_H
#define __NUTTX_USB_STORAGE_H
#ifndef __NUTTX_USB_USB_STORAGE_H
#define __NUTTX_USB_USB_STORAGE_H
/************************************************************************************
* Included Files
@ -136,4 +136,4 @@ struct usbstrg_csw_s
* Public Functions
************************************************************************************/
#endif /* __NUTTX_USB_STORAGE_H */
#endif /* __NUTTX_USB_USB_STORAGE_H */

8
nuttx/include/nuttx/usbdev.h → nuttx/include/nuttx/usb/usbdev.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* include/nuttx/usbdev.h
* include/nuttx/usb/usbdev.h
*
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -39,8 +39,8 @@
*
************************************************************************************/
#ifndef _INCLUDE_NUTTX_USBDEV_H
#define _INCLUDE_NUTTX_USBDEV_H
#ifndef _INCLUDE_NUTTX_USB_USBDEV_H
#define _INCLUDE_NUTTX_USB_USBDEV_H
/************************************************************************************
* Included Files
@ -455,4 +455,4 @@ EXTERN void usbstrg_uninitialize(FAR void *handle);
}
#endif
#endif /* _INCLUDE_NUTTX_USBDEV_H */
#endif /* _INCLUDE_NUTTX_USB_USBDEV_H */

10
nuttx/include/nuttx/usbdev_trace.h → nuttx/include/nuttx/usb/usbdev_trace.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/nuttx/usbdev_trace.h
* include/nuttx/usb/usbdev_trace.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_USBDEV_TRACE_H
#define __INCLUDE_NUTTX_USBDEV_TRACE_H
#ifndef __INCLUDE_NUTTX_USB_USBDEV_TRACE_H
#define __INCLUDE_NUTTX_USB_USBDEV_TRACE_H
/****************************************************************************
* Included Files
@ -475,4 +475,4 @@ EXTERN void usbtrace_trprintf(trprintf_t trprintf, uint16_t event, uint16_t valu
}
#endif
#endif /* __INCLUDE_NUTTX_USBDEV_TRACE_H */
#endif /* __INCLUDE_NUTTX_USB_USBDEV_TRACE_H */

77
nuttx/include/nuttx/usb/usbhost.h Normal file
View File

@ -0,0 +1,77 @@
/************************************************************************************
* include/nuttx/usb/usbhost.h
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* References:
* "Universal Serial Bus Mass Storage Class, Specification Overview,"
* Revision 1.2, USB Implementer's Forum, June 23, 2003.
*
* "Universal Serial Bus Mass Storage Class, Bulk-Only Transport,"
* Revision 1.0, USB Implementer's Forum, September 31, 1999.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
#ifndef __NUTTX_USB_USBHOST_H
#define __NUTTX_USB_USBHOST_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/************************************************************************************
* Public Types
************************************************************************************/
/************************************************************************************
* Private Data
************************************************************************************/
/************************************************************************************
* Public Data
************************************************************************************/
/************************************************************************************
* Private Functions
************************************************************************************/
/************************************************************************************
* Public Functions
************************************************************************************/
#endif /* __NUTTX_USB_USBHOST_H */