sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cosmetic changes to fat and mass storage device

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3985 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-09-28 01:46:31 +00:00
parent 4b04e5e54e
commit c4b3e3185f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usbdev/usbdev_storage.c
View File

@ -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

10
drivers/usbdev/usbdev_stordesc.c
View File

@ -66,7 +66,6 @@
* Private Data
****************************************************************************/
/* Descriptors **************************************************************/
/* Device descriptor */
static const struct usb_devdesc_s g_devdesc =
@ -196,6 +195,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
****************************************************************************/

4
fs/fat/fs_fat32dirent.c
View File

@ -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.