summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-12-14 03:33:39 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-12-14 03:33:39 +0000
commitf04dc38cb747d31f9f946e7f78b970a6d9986978 (patch)
treee0c377bfd068d3e65ef76648e994d2d172b55a69
parent3d254a01f781ffc22801b73b07ca954a90613782 (diff)
downloadnuttx-f04dc38cb747d31f9f946e7f78b970a6d9986978.tar.gz
nuttx-f04dc38cb747d31f9f946e7f78b970a6d9986978.tar.bz2
nuttx-f04dc38cb747d31f9f946e7f78b970a6d9986978.zip
Create include/nuttx/usb directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3170 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/ChangeLog4
-rw-r--r--nuttx/Documentation/NuttX.html6
-rw-r--r--nuttx/arch/arm/src/dm320/dm320_usbdev.c8
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c6
-rw-r--r--nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c6
-rwxr-xr-xnuttx/arch/arm/src/lpc313x/lpc313x_internal.h2
-rwxr-xr-xnuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c6
-rwxr-xr-xnuttx/arch/arm/src/stm32/stm32_internal.h2
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_usbdev.c8
-rwxr-xr-xnuttx/configs/sam3u-ek/src/up_usbdev.c6
-rw-r--r--nuttx/configs/stm3210e-eval/src/up_usbdev.c8
-rw-r--r--nuttx/drivers/usbdev/usbdev_scsi.c6
-rw-r--r--nuttx/drivers/usbdev/usbdev_serial.c6
-rw-r--r--nuttx/drivers/usbdev/usbdev_storage.c8
-rw-r--r--nuttx/drivers/usbdev/usbdev_storage.h4
-rw-r--r--nuttx/drivers/usbdev/usbdev_trace.c4
-rwxr-xr-xnuttx/drivers/usbdev/usbdev_trprintf.c4
-rw-r--r--nuttx/examples/usbserial/main.c4
-rw-r--r--nuttx/examples/usbstorage/usbstrg_main.c4
-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.h77
24 files changed, 150 insertions, 65 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index a8f4655b6..06a824954 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -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
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index ac1c486e8..74391630b 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -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>
diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c
index 33049403b..e18ad0ad9 100644
--- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c
+++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c
@@ -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>
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 8633751ad..24a97dd4f 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -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>
diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 4347180e1..1c2b31548 100644
--- a/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/nuttx/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -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>
diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_internal.h b/nuttx/arch/arm/src/lpc313x/lpc313x_internal.h
index 6fdbe9b37..2ba9f94ab 100755
--- a/nuttx/arch/arm/src/lpc313x/lpc313x_internal.h
+++ b/nuttx/arch/arm/src/lpc313x/lpc313x_internal.h
@@ -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.
*
diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c b/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c
index c3faecee1..5f8d48d3e 100755
--- a/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c
+++ b/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c
@@ -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>
diff --git a/nuttx/arch/arm/src/stm32/stm32_internal.h b/nuttx/arch/arm/src/stm32/stm32_internal.h
index 9c13f04ef..a98d579dd 100755
--- a/nuttx/arch/arm/src/stm32/stm32_internal.h
+++ b/nuttx/arch/arm/src/stm32/stm32_internal.h
@@ -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.
*
diff --git a/nuttx/arch/arm/src/stm32/stm32_usbdev.c b/nuttx/arch/arm/src/stm32/stm32_usbdev.c
index 07e3ae417..1a696628c 100644
--- a/nuttx/arch/arm/src/stm32/stm32_usbdev.c
+++ b/nuttx/arch/arm/src/stm32/stm32_usbdev.c
@@ -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>
diff --git a/nuttx/configs/sam3u-ek/src/up_usbdev.c b/nuttx/configs/sam3u-ek/src/up_usbdev.c
index b31a7e669..9d97d65b5 100755
--- a/nuttx/configs/sam3u-ek/src/up_usbdev.c
+++ b/nuttx/configs/sam3u-ek/src/up_usbdev.c
@@ -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.
*
diff --git a/nuttx/configs/stm3210e-eval/src/up_usbdev.c b/nuttx/configs/stm3210e-eval/src/up_usbdev.c
index b1ff79a6a..d77c79887 100644
--- a/nuttx/configs/stm3210e-eval/src/up_usbdev.c
+++ b/nuttx/configs/stm3210e-eval/src/up_usbdev.c
@@ -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.
*
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c
index 0f1d9dd38..4b0a3862d 100644
--- a/nuttx/drivers/usbdev/usbdev_scsi.c
+++ b/nuttx/drivers/usbdev/usbdev_scsi.c
@@ -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"
diff --git a/nuttx/drivers/usbdev/usbdev_serial.c b/nuttx/drivers/usbdev/usbdev_serial.c
index a5a25178d..22b689e16 100644
--- a/nuttx/drivers/usbdev/usbdev_serial.c
+++ b/nuttx/drivers/usbdev/usbdev_serial.c
@@ -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
diff --git a/nuttx/drivers/usbdev/usbdev_storage.c b/nuttx/drivers/usbdev/usbdev_storage.c
index 7aa0a388f..02a2ad467 100644
--- a/nuttx/drivers/usbdev/usbdev_storage.c
+++ b/nuttx/drivers/usbdev/usbdev_storage.c
@@ -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"
diff --git a/nuttx/drivers/usbdev/usbdev_storage.h b/nuttx/drivers/usbdev/usbdev_storage.h
index 75317dcbc..e9702b8dd 100644
--- a/nuttx/drivers/usbdev/usbdev_storage.h
+++ b/nuttx/drivers/usbdev/usbdev_storage.h
@@ -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
diff --git a/nuttx/drivers/usbdev/usbdev_trace.c b/nuttx/drivers/usbdev/usbdev_trace.c
index 3bb396c39..7b258b1cb 100644
--- a/nuttx/drivers/usbdev/usbdev_trace.c
+++ b/nuttx/drivers/usbdev/usbdev_trace.c
@@ -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
/****************************************************************************
diff --git a/nuttx/drivers/usbdev/usbdev_trprintf.c b/nuttx/drivers/usbdev/usbdev_trprintf.c
index 78335a1f2..55c517b2e 100755
--- a/nuttx/drivers/usbdev/usbdev_trprintf.c
+++ b/nuttx/drivers/usbdev/usbdev_trprintf.c
@@ -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
diff --git a/nuttx/examples/usbserial/main.c b/nuttx/examples/usbserial/main.c
index 12ace62ab..17aef1c79 100644
--- a/nuttx/examples/usbserial/main.c
+++ b/nuttx/examples/usbserial/main.c
@@ -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
diff --git a/nuttx/examples/usbstorage/usbstrg_main.c b/nuttx/examples/usbstorage/usbstrg_main.c
index a45f3eacc..47d79fbb4 100644
--- a/nuttx/examples/usbstorage/usbstrg_main.c
+++ b/nuttx/examples/usbstorage/usbstrg_main.c
@@ -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"
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 */