diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 01:46:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 01:46:31 +0000 |
commit | fb2ef5eeadae97a04f0e35783912f0ecef7dee65 (patch) | |
tree | ef7166d0b2815a0a93e2d44005b131bbc4e6061c /nuttx | |
parent | 20e6ac9a20c53b82b250ce19afb89a737890de0d (diff) | |
download | px4-nuttx-fb2ef5eeadae97a04f0e35783912f0ecef7dee65.tar.gz px4-nuttx-fb2ef5eeadae97a04f0e35783912f0ecef7dee65.tar.bz2 px4-nuttx-fb2ef5eeadae97a04f0e35783912f0ecef7dee65.zip |
Cosmetic changes to fat and mass storage device
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3985 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_storage.c | 5 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_stordesc.c | 10 | ||||
-rw-r--r-- | nuttx/fs/fat/fs_fat32dirent.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_storage.c b/nuttx/drivers/usbdev/usbdev_storage.c index f2bd03b02..360756b12 100644 --- a/nuttx/drivers/usbdev/usbdev_storage.c +++ b/nuttx/drivers/usbdev/usbdev_storage.c @@ -151,11 +151,6 @@ static struct usbdevclass_driverops_s g_driverops = /**************************************************************************** * Public Data ****************************************************************************/ -/* String *******************************************************************/ - -const char g_vendorstr[] = CONFIG_USBSTRG_VENDORSTR; -const char g_productstr[] = CONFIG_USBSTRG_PRODUCTSTR; -const char g_serialstr[] = CONFIG_USBSTRG_SERIALSTR; /**************************************************************************** * Private Functions diff --git a/nuttx/drivers/usbdev/usbdev_stordesc.c b/nuttx/drivers/usbdev/usbdev_stordesc.c index f2791e946..68dffa96c 100644 --- a/nuttx/drivers/usbdev/usbdev_stordesc.c +++ b/nuttx/drivers/usbdev/usbdev_stordesc.c @@ -66,7 +66,6 @@ * Private Data ****************************************************************************/ /* Descriptors **************************************************************/ - /* Device descriptor */ static const struct usb_devdesc_s g_devdesc = @@ -197,6 +196,15 @@ static const struct usb_epdesc_s g_hsepbulkindesc = #endif /**************************************************************************** + * Public Data + ****************************************************************************/ +/* Strings ******************************************************************/ + +const char g_vendorstr[] = CONFIG_USBSTRG_VENDORSTR; +const char g_productstr[] = CONFIG_USBSTRG_PRODUCTSTR; +const char g_serialstr[] = CONFIG_USBSTRG_SERIALSTR; + +/**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/nuttx/fs/fat/fs_fat32dirent.c b/nuttx/fs/fat/fs_fat32dirent.c index 6dfdc2022..6e6d82d10 100644 --- a/nuttx/fs/fat/fs_fat32dirent.c +++ b/nuttx/fs/fat/fs_fat32dirent.c @@ -1133,7 +1133,7 @@ static bool fat_cmplfname(const uint8_t *direntry, const uint8_t *substr) match = fat_cmplfnchunk(chunk, substr, 5); if (match && len >= 5) { - /* Check bytes 6-11. Note that len == 5, the substring passed to + /* Check bytes 6-11. Note that if len == 5, the substring passed to * fat_cmplfnchunk() will point to the NUL terminator of substr. * In this case, fat_cmplfnchunk() will only verify that the * directory entry is also NUL terminated. @@ -1143,7 +1143,7 @@ static bool fat_cmplfname(const uint8_t *direntry, const uint8_t *substr) match = fat_cmplfnchunk(chunk, &substr[5], 6); if (match && len >= 11) { - /* Check bytes 12-13. Note that len == 11, the substring passed to + /* Check bytes 12-13. Note that if len == 11, the substring passed to * fat_cmplfnchunk() will point to the NUL terminator of substr. * In this case, fat_cmplfnchunk() will only verify that the * directory entry is also NUL terminated. |