Refresh all composite configurations.

This commit is contained in:
Gregory Nutt 2017-07-15 08:56:33 -06:00
parent 246afcaa10
commit f1cc168a5c
8 changed files with 19 additions and 13 deletions

View File

@ -51,11 +51,8 @@ CONFIG_USBDEV=y
CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKINREQLEN=256
CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256
CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_EPBULKIN=5
CONFIG_USBMSC_EPBULKOUT=4
CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USBMSC_VERSIONNO=0x0399
CONFIG_USBMSC=y CONFIG_USBMSC=y

View File

@ -97,6 +97,7 @@
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc, static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev) FAR struct usbdevclass_driver_s **classdev)
{ {
@ -111,6 +112,7 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
return ret; return ret;
} }
#endif
/************************************************************************************ /************************************************************************************
* Name: board_mscuninitialize * Name: board_mscuninitialize
@ -129,10 +131,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
{ {
usbmsc_uninitialize(classdev); usbmsc_uninitialize(classdev);
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

View File

@ -134,8 +134,6 @@ CONFIG_USART2_RXBUFSIZE=32
CONFIG_USART2_TXBUFSIZE=32 CONFIG_USART2_TXBUFSIZE=32
CONFIG_USBDEV_COMPOSITE=y CONFIG_USBDEV_COMPOSITE=y
CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_EPBULKIN=5
CONFIG_USBMSC_EPBULKOUT=4
CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_REMOVABLE=y

View File

@ -108,6 +108,7 @@
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc, static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev) FAR struct usbdevclass_driver_s **classdev)
{ {
@ -122,8 +123,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
return ret; return ret;
} }
#endif
/************************************************************************************ /************************************************************************************
* Name: board_mscuninitialize * Name: board_mscuninitialize
* *
* Description: * Description:
@ -140,10 +142,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
{ {
usbmsc_uninitialize(classdev); usbmsc_uninitialize(classdev);
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

View File

@ -76,6 +76,7 @@
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc, static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev) FAR struct usbdevclass_driver_s **classdev)
{ {
@ -90,8 +91,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
return ret; return ret;
} }
#endif
/************************************************************************************ /************************************************************************************
* Name: board_mscuninitialize * Name: board_mscuninitialize
* *
* Description: * Description:
@ -108,10 +110,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
{ {
usbmsc_uninitialize(classdev); usbmsc_uninitialize(classdev);
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions

View File

@ -110,8 +110,6 @@ CONFIG_USBDEV_COMPOSITE=y
CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USBDEV_TRACE_NRECORDS=32
CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE=y
CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_EPBULKIN=5
CONFIG_USBMSC_EPBULKOUT=4
CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_SCSI_STACKSIZE=340 CONFIG_USBMSC_SCSI_STACKSIZE=340

View File

@ -58,11 +58,8 @@ CONFIG_USBDEV_COMPOSITE=y
CONFIG_USBMSC_BULKINREQLEN=256 CONFIG_USBMSC_BULKINREQLEN=256
CONFIG_USBMSC_BULKOUTREQLEN=256 CONFIG_USBMSC_BULKOUTREQLEN=256
CONFIG_USBMSC_COMPOSITE=y CONFIG_USBMSC_COMPOSITE=y
CONFIG_USBMSC_EPBULKIN=5
CONFIG_USBMSC_EPBULKOUT=4
CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_NRDREQS=2
CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_NWRREQS=2
CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_REMOVABLE=y
CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USBMSC_VERSIONNO=0x0399
CONFIG_USBMSC=y CONFIG_USBMSC=y

View File

@ -106,6 +106,7 @@
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc, static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev) FAR struct usbdevclass_driver_s **classdev)
{ {
@ -120,8 +121,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
return ret; return ret;
} }
#endif
/************************************************************************************ /************************************************************************************
* Name: board_mscuninitialize * Name: board_mscuninitialize
* *
* Description: * Description:
@ -138,10 +140,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_USBMSC_COMPOSITE
void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
{ {
usbmsc_uninitialize(classdev); usbmsc_uninitialize(classdev);
} }
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions