diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-12 02:12:41 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-12 02:12:41 +0000 |
commit | cd909fc9cfe7d728c3b6a3c91d5cf3a1a2eb88b6 (patch) | |
tree | 907ff4362e134a5fdfc4c5eb7ce7766778d5ffc2 | |
parent | eedfb898274adffee3882b6dfc45b96c369c2343 (diff) | |
download | px4-nuttx-cd909fc9cfe7d728c3b6a3c91d5cf3a1a2eb88b6.tar.gz px4-nuttx-cd909fc9cfe7d728c3b6a3c91d5cf3a1a2eb88b6.tar.bz2 px4-nuttx-cd909fc9cfe7d728c3b6a3c91d5cf3a1a2eb88b6.zip |
Rename usb_storage.h to storage.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3243 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_scsi.c | 2 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_storage.c | 2 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_storage.h | 2 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_storage.c | 13 | ||||
-rw-r--r-- | nuttx/include/nuttx/usb/storage.h (renamed from nuttx/include/nuttx/usb/usb_storage.h) | 10 |
5 files changed, 14 insertions, 15 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c index c35a50183..3d5201209 100644 --- a/nuttx/drivers/usbdev/usbdev_scsi.c +++ b/nuttx/drivers/usbdev/usbdev_scsi.c @@ -69,7 +69,7 @@ #include <nuttx/arch.h> #include <nuttx/scsi.h> -#include <nuttx/usb/usb_storage.h> +#include <nuttx/usb/storage.h> #include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev_trace.h> diff --git a/nuttx/drivers/usbdev/usbdev_storage.c b/nuttx/drivers/usbdev/usbdev_storage.c index 17509c13e..fc61670d2 100644 --- a/nuttx/drivers/usbdev/usbdev_storage.c +++ b/nuttx/drivers/usbdev/usbdev_storage.c @@ -75,7 +75,7 @@ #include <nuttx/arch.h> #include <nuttx/fs.h> #include <nuttx/usb/usb.h> -#include <nuttx/usb/usb_storage.h> +#include <nuttx/usb/storage.h> #include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev_trace.h> diff --git a/nuttx/drivers/usbdev/usbdev_storage.h b/nuttx/drivers/usbdev/usbdev_storage.h index e9702b8dd..320c78ccd 100644 --- a/nuttx/drivers/usbdev/usbdev_storage.h +++ b/nuttx/drivers/usbdev/usbdev_storage.h @@ -51,7 +51,7 @@ #include <queue.h> #include <nuttx/fs.h> -#include <nuttx/usb/usb_storage.h> +#include <nuttx/usb/storage.h> #include <nuttx/usb/usbdev.h> /**************************************************************************** diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 5c44fd9f6..bef82ba3a 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/drivers/usbhost/usbhost_storage.c @@ -54,7 +54,7 @@ #include <nuttx/usb/usb.h> #include <nuttx/usb/usbhost.h> -#include <nuttx/usb/usb_storage.h> +#include <nuttx/usb/storage.h> #if defined(CONFIG_USBHOST) && !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 @@ -1109,9 +1109,8 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, * completes the initialization operations. It is first called after the * configuration descriptor has been received. * - * This function is called from the connect() method. It may either - * execute on (1) the thread of the caller of connect(), or (2) if - * connect() was called from an interrupt handler, on the worker thread. + * This function is called from the connect() method. This function always + * executes on the thread of the caller of connect(). * * Input Parameters: * priv - A reference to the class instance. @@ -1366,7 +1365,7 @@ static void usbhost_putbe16(uint8_t *dest, uint16_t val) } /**************************************************************************** - * Name: usbhost_getbe32 + * Name: usbhost_getle32 * * Description: * Get a (possibly unaligned) 32-bit little endian value. @@ -1707,8 +1706,8 @@ static int usbhost_disconnected(struct usbhost_class_s *class) DEBUGASSERT(priv != NULL); - /* Nullify the driver instance. This will be our indication to any users - * of the mass storage device that the device is no longer available. + /* Set an indication to any users of the mass storage device that the device + * is no longer available. */ flags = irqsave(); diff --git a/nuttx/include/nuttx/usb/usb_storage.h b/nuttx/include/nuttx/usb/storage.h index 030b10bc2..150149c83 100644 --- a/nuttx/include/nuttx/usb/usb_storage.h +++ b/nuttx/include/nuttx/usb/storage.h @@ -1,7 +1,7 @@ /************************************************************************************ - * include/nuttx/usb/usb_storage.h + * include/nuttx/usb/storage.h * - * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * References: @@ -40,8 +40,8 @@ * ************************************************************************************/ -#ifndef __NUTTX_USB_USB_STORAGE_H -#define __NUTTX_USB_USB_STORAGE_H +#ifndef __NUTTX_USB_STORAGE_H +#define __NUTTX_USB_STORAGE_H /************************************************************************************ * Included Files @@ -128,4 +128,4 @@ struct usbstrg_csw_s * Public Functions ************************************************************************************/ -#endif /* __NUTTX_USB_USB_STORAGE_H */ +#endif /* __NUTTX_USB_STORAGE_H */ |