diff options
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/nuttx/usb/usb.h (renamed from nuttx/include/nuttx/usb.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/usb/usb_storage.h (renamed from nuttx/include/nuttx/usb_storage.h) | 8 | ||||
-rw-r--r-- | nuttx/include/nuttx/usb/usbdev.h (renamed from nuttx/include/nuttx/usbdev.h) | 8 | ||||
-rw-r--r-- | nuttx/include/nuttx/usb/usbdev_trace.h (renamed from nuttx/include/nuttx/usbdev_trace.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/usb/usbhost.h | 77 |
5 files changed, 95 insertions, 18 deletions
diff --git a/nuttx/include/nuttx/usb.h b/nuttx/include/nuttx/usb/usb.h index 1540b57e3..0a075528b 100644 --- a/nuttx/include/nuttx/usb.h +++ b/nuttx/include/nuttx/usb/usb.h @@ -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 diff --git a/nuttx/include/nuttx/usb_storage.h b/nuttx/include/nuttx/usb/usb_storage.h index c980b9f56..1803ee9f0 100644 --- a/nuttx/include/nuttx/usb_storage.h +++ b/nuttx/include/nuttx/usb/usb_storage.h @@ -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 */ diff --git a/nuttx/include/nuttx/usbdev.h b/nuttx/include/nuttx/usb/usbdev.h index 1f425aa2e..bd9a66db8 100644 --- a/nuttx/include/nuttx/usbdev.h +++ b/nuttx/include/nuttx/usb/usbdev.h @@ -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 */ diff --git a/nuttx/include/nuttx/usbdev_trace.h b/nuttx/include/nuttx/usb/usbdev_trace.h index eb53d4d75..b69ff0f17 100644 --- a/nuttx/include/nuttx/usbdev_trace.h +++ b/nuttx/include/nuttx/usb/usbdev_trace.h @@ -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 */ diff --git a/nuttx/include/nuttx/usb/usbhost.h b/nuttx/include/nuttx/usb/usbhost.h new file mode 100644 index 000000000..680ce5c1f --- /dev/null +++ b/nuttx/include/nuttx/usb/usbhost.h @@ -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 */ |