More cosmetic renaming fixes... devdesc to devinfo

This commit is contained in:
Gregory Nutt
2017-07-21 07:51:45 -06:00
parent e4c0b889d7
commit 504d230599
3 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -350,7 +350,7 @@ typedef FAR void (*cdcacm_callback_t)(enum cdcacm_event_e event);
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE) #if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
struct usbdev_devinfo_s; struct usbdev_devinfo_s;
struct usbdevclass_driver_s; struct usbdevclass_driver_s;
int cdcacm_classobject(int minor, FAR struct usbdev_devinfo_s *devdesc, int cdcacm_classobject(int minor, FAR struct usbdev_devinfo_s *devinfo,
FAR struct usbdevclass_driver_s **classdev); FAR struct usbdevclass_driver_s **classdev);
#endif #endif
+5 -5
View File
@@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* include/nuttx/usb/usbdev.h * include/nuttx/usb/usbdev.h
* *
* Copyright (C) 2008-2010, 2012-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2010, 2012-2013, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* NOTE: This interface was inspired by the Linux gadget interface by * NOTE: This interface was inspired by the Linux gadget interface by
@@ -215,16 +215,16 @@ struct composite_devdesc_s
{ {
#ifdef CONFIG_USBDEV_DUALSPEED #ifdef CONFIG_USBDEV_DUALSPEED
CODE int16_t (*mkconfdesc)(FAR uint8_t *buf, CODE int16_t (*mkconfdesc)(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devdesc, FAR struct usbdev_devinfo_s *devinfo,
uint8_t speed, uint8_t type); uint8_t speed, uint8_t type);
#else #else
CODE int16_t (*mkconfdesc)(FAR uint8_t *buf, CODE int16_t (*mkconfdesc)(FAR uint8_t *buf,
FAR struct usbdev_devinfo_s *devdesc); FAR struct usbdev_devinfo_s *devinfo);
#endif #endif
CODE int (*mkstrdesc)(uint8_t id, FAR struct usb_strdesc_s *strdesc); CODE int (*mkstrdesc)(uint8_t id, FAR struct usb_strdesc_s *strdesc);
CODE int (*classobject)(int minor, CODE int (*classobject)(int minor,
FAR struct usbdev_devinfo_s *devdesc, FAR struct usbdev_devinfo_s *devinfo,
FAR struct usbdevclass_driver_s **classdev); FAR struct usbdevclass_driver_s **classdev);
CODE void (*uninitialize)(FAR struct usbdevclass_driver_s *classdev); CODE void (*uninitialize)(FAR struct usbdevclass_driver_s *classdev);
@@ -234,7 +234,7 @@ struct composite_devdesc_s
int cfgdescsize; /* The size of the config descriptor */ int cfgdescsize; /* The size of the config descriptor */
int minor; int minor;
struct usbdev_devinfo_s devdesc; struct usbdev_devinfo_s devinfo;
}; };
#endif #endif
+1 -1
View File
@@ -189,7 +189,7 @@ int usbmsc_exportluns(FAR void *handle);
#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE) #if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_USBMSC_COMPOSITE)
struct usbdevclass_driver_s; struct usbdevclass_driver_s;
int usbmsc_classobject(FAR void *handle, FAR struct usbdev_devinfo_s *devdesc, int usbmsc_classobject(FAR void *handle, FAR struct usbdev_devinfo_s *devinfo,
FAR struct usbdevclass_driver_s **classdev); FAR struct usbdevclass_driver_s **classdev);
#endif #endif