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

Composite setup: Remove useless board_cdc* wrapper.

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-15 08:20:02 -06:00
parent 82129cf8c6
commit 919877191d
5 changed files with 16 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
configs/mcu123-lpc214x/src/lpc2148_composite.c
View File

@ -74,53 +74,6 @@
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: board_cdcclassobject
*
* Description:
* If the CDC serial class driver is part of composite device, then
* board-specific logic must provide board_cdcclassobject(). In the
* simplest case, board_cdcclassobject() is simply a wrapper around
* cdcacm_classobject() that provides the correct device minor number.
*
* Input Parameters:
* classdev - The location to return the CDC serial class' device
* instance.
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
static int board_cdcclassobject(int minor,
FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev)
{
return cdcacm_classobject(minor, devdesc, classdev);
}
/****************************************************************************
* Name: board_cdcuninitialize
*
* Description:
* Un-initialize the USB serial class driver. This is just an application-
* specific wrapper around cdcadm_unitialize() that is called form the
* composite device logic.
*
* Input Parameters:
* classdev - The class driver instance previously given to the composite
* driver by board_cdcclassobject().
*
* Returned Value:
* None
*
****************************************************************************/
static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
{
cdcacm_uninitialize(classdev);
}
/************************************************************************************ /************************************************************************************
* Name: board_mscclassobject * Name: board_mscclassobject
* *
@ -133,7 +86,7 @@ static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
* board_mscclassobject() is called from the composite driver. It must * board_mscclassobject() is called from the composite driver. It must
* encapsulate the instantiation and configuration of the mass storage * encapsulate the instantiation and configuration of the mass storage
* class and the return the mass storage device's class driver instance * class and the return the mass storage device's class driver instance
* to the composite dirver. * to the composite driver.
* *
* Input Parameters: * Input Parameters:
* classdev - The location to return the mass storage class' device * classdev - The location to return the mass storage class' device
@ -159,7 +112,7 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
return ret; return ret;
} }
/************************************************************************************ /************************************************************************************
* Name: board_mscuninitialize * Name: board_mscuninitialize
* *
* Description: * Description:
@ -285,8 +238,8 @@ FAR void *board_composite_connect(int port, int configid)
/* Overwrite and correct some values... */ /* Overwrite and correct some values... */
/* The callback functions for the CDC/ACM class */ /* The callback functions for the CDC/ACM class */
dev[0].classobject = board_cdcclassobject; dev[0].classobject = cdcacm_classobject;
dev[0].uninitialize = board_cdcuninitialize; dev[0].uninitialize = cdcacm_uninitialize;
/* Interfaces */ /* Interfaces */

53
configs/olimexino-stm32/src/stm32_composite.c
View File

@ -85,53 +85,6 @@
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: board_cdcclassobject
*
* Description:
* If the CDC serial class driver is part of composite device, then
* board-specific logic must provide board_cdcclassobject(). In the
* simplest case, board_cdcclassobject() is simply a wrapper around
* cdcacm_classobject() that provides the correct device minor number.
*
* Input Parameters:
* classdev - The location to return the CDC serial class' device
* instance.
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
static int board_cdcclassobject(int minor,
FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev)
{
return cdcacm_classobject(minor, devdesc, classdev);
}
/****************************************************************************
* Name: board_cdcuninitialize
*
* Description:
* Un-initialize the USB serial class driver. This is just an application-
* specific wrapper around cdcadm_unitialize() that is called form the
* composite device logic.
*
* Input Parameters:
* classdev - The class driver instance previously given to the composite
* driver by board_cdcclassobject().
*
* Returned Value:
* None
*
****************************************************************************/
static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
{
cdcacm_uninitialize(classdev);
}
/************************************************************************************ /************************************************************************************
* Name: board_mscclassobject * Name: board_mscclassobject
* *
@ -144,7 +97,7 @@ static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
* board_mscclassobject() is called from the composite driver. It must * board_mscclassobject() is called from the composite driver. It must
* encapsulate the instantiation and configuration of the mass storage * encapsulate the instantiation and configuration of the mass storage
* class and the return the mass storage device's class driver instance * class and the return the mass storage device's class driver instance
* to the composite dirver. * to the composite driver.
* *
* Input Parameters: * Input Parameters:
* classdev - The location to return the mass storage class' device * classdev - The location to return the mass storage class' device
@ -291,8 +244,8 @@ FAR void *board_composite_connect(int port, int configid)
/* Overwrite and correct some values... */ /* Overwrite and correct some values... */
/* The callback functions for the CDC/ACM class */ /* The callback functions for the CDC/ACM class */
dev[0].classobject = board_cdcclassobject; dev[0].classobject = cdcacm_classobject;
dev[0].uninitialize = board_cdcuninitialize; dev[0].uninitialize = cdcacm_uninitialize;
/* Interfaces */ /* Interfaces */

53
configs/samv71-xult/src/sam_composite.c
View File

@ -53,53 +53,6 @@
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: board_cdcclassobject
*
* Description:
* If the CDC serial class driver is part of composite device, then
* board-specific logic must provide board_cdcclassobject(). In the
* simplest case, board_cdcclassobject() is simply a wrapper around
* cdcacm_classobject() that provides the correct device minor number.
*
* Input Parameters:
* classdev - The location to return the CDC serial class' device
* instance.
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
static int board_cdcclassobject(int minor,
FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev)
{
return cdcacm_classobject(minor, devdesc, classdev);
}
/****************************************************************************
* Name: board_cdcuninitialize
*
* Description:
* Un-initialize the USB serial class driver. This is just an application-
* specific wrapper around cdcadm_unitialize() that is called form the
* composite device logic.
*
* Input Parameters:
* classdev - The class driver instance previously given to the composite
* driver by board_cdcclassobject().
*
* Returned Value:
* None
*
****************************************************************************/
static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
{
cdcacm_uninitialize(classdev);
}
/************************************************************************************ /************************************************************************************
* Name: board_mscclassobject * Name: board_mscclassobject
* *
@ -112,7 +65,7 @@ static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
* board_mscclassobject() is called from the composite driver. It must * board_mscclassobject() is called from the composite driver. It must
* encapsulate the instantiation and configuration of the mass storage * encapsulate the instantiation and configuration of the mass storage
* class and the return the mass storage device's class driver instance * class and the return the mass storage device's class driver instance
* to the composite dirver. * to the composite driver.
* *
* Input Parameters: * Input Parameters:
* classdev - The location to return the mass storage class' device * classdev - The location to return the mass storage class' device
@ -219,8 +172,8 @@ FAR void *board_composite_connect(int port, int configid)
/* Overwrite and correct some values... */ /* Overwrite and correct some values... */
/* The callback functions for the CDC/ACM class */ /* The callback functions for the CDC/ACM class */
dev[0].classobject = board_cdcclassobject; dev[0].classobject = cdcacm_classobject;
dev[0].uninitialize = board_cdcuninitialize; dev[0].uninitialize = cdcacm_uninitialize;
/* Interfaces */ /* Interfaces */

53
configs/spark/src/stm32_composite.c
View File

@ -285,53 +285,6 @@ static int stm32_composite_initialize(void)
} }
#endif #endif
/****************************************************************************
* Name: board_cdcclassobject
*
* Description:
* If the CDC serial class driver is part of composite device, then
* board-specific logic must provide board_cdcclassobject(). In the
* simplest case, board_cdcclassobject() is simply a wrapper around
* cdcacm_classobject() that provides the correct device minor number.
*
* Input Parameters:
* classdev - The location to return the CDC serial class' device
* instance.
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
static int board_cdcclassobject(int minor,
FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev)
{
return cdcacm_classobject(minor, devdesc, classdev);
}
/****************************************************************************
* Name: board_cdcuninitialize
*
* Description:
* Un-initialize the USB serial class driver. This is just an application-
* specific wrapper around cdcadm_unitialize() that is called form the
* composite device logic.
*
* Input Parameters:
* classdev - The class driver instance previously given to the composite
* driver by board_cdcclassobject().
*
* Returned Value:
* None
*
****************************************************************************/
static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
{
cdcacm_uninitialize(classdev);
}
/************************************************************************************ /************************************************************************************
* Name: board_mscclassobject * Name: board_mscclassobject
* *
@ -344,7 +297,7 @@ static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
* board_mscclassobject() is called from the composite driver. It must * board_mscclassobject() is called from the composite driver. It must
* encapsulate the instantiation and configuration of the mass storage * encapsulate the instantiation and configuration of the mass storage
* class and the return the mass storage device's class driver instance * class and the return the mass storage device's class driver instance
* to the composite dirver. * to the composite driver.
* *
* Input Parameters: * Input Parameters:
* classdev - The location to return the mass storage class' device * classdev - The location to return the mass storage class' device
@ -453,8 +406,8 @@ FAR void *board_composite_connect(int port, int configid)
/* Overwrite and correct some values... */ /* Overwrite and correct some values... */
/* The callback functions for the CDC/ACM class */ /* The callback functions for the CDC/ACM class */
dev[0].classobject = board_cdcclassobject; dev[0].classobject = cdcacm_classobject;
dev[0].uninitialize = board_cdcuninitialize; dev[0].uninitialize = cdcacm_uninitialize;
/* Interfaces */ /* Interfaces */

53
configs/stm3210e-eval/src/stm32_composite.c
View File

@ -83,53 +83,6 @@
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
/****************************************************************************
* Name: board_cdcclassobject
*
* Description:
* If the CDC serial class driver is part of composite device, then
* board-specific logic must provide board_cdcclassobject(). In the
* simplest case, board_cdcclassobject() is simply a wrapper around
* cdcacm_classobject() that provides the correct device minor number.
*
* Input Parameters:
* classdev - The location to return the CDC serial class' device
* instance.
*
* Returned Value:
* 0 on success; a negated errno on failure
*
****************************************************************************/
static int board_cdcclassobject(int minor,
FAR struct usbdev_description_s *devdesc,
FAR struct usbdevclass_driver_s **classdev)
{
return cdcacm_classobject(minor, devdesc, classdev);
}
/****************************************************************************
* Name: board_cdcuninitialize
*
* Description:
* Un-initialize the USB serial class driver. This is just an application-
* specific wrapper around cdcadm_unitialize() that is called form the
* composite device logic.
*
* Input Parameters:
* classdev - The class driver instance previously given to the composite
* driver by board_cdcclassobject().
*
* Returned Value:
* None
*
****************************************************************************/
static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
{
cdcacm_uninitialize(classdev);
}
/************************************************************************************ /************************************************************************************
* Name: board_mscclassobject * Name: board_mscclassobject
* *
@ -142,7 +95,7 @@ static void board_cdcuninitialize(FAR struct usbdevclass_driver_s *classdev)
* board_mscclassobject() is called from the composite driver. It must * board_mscclassobject() is called from the composite driver. It must
* encapsulate the instantiation and configuration of the mass storage * encapsulate the instantiation and configuration of the mass storage
* class and the return the mass storage device's class driver instance * class and the return the mass storage device's class driver instance
* to the composite dirver. * to the composite driver.
* *
* Input Parameters: * Input Parameters:
* classdev - The location to return the mass storage class' device * classdev - The location to return the mass storage class' device
@ -296,8 +249,8 @@ FAR void *board_composite_connect(int port, int configid)
/* Overwrite and correct some values... */ /* Overwrite and correct some values... */
/* The callback functions for the CDC/ACM class */ /* The callback functions for the CDC/ACM class */
dev[0].classobject = board_cdcclassobject; dev[0].classobject = cdcacm_classobject;
dev[0].uninitialize = board_cdcuninitialize; dev[0].uninitialize = cdcacm_uninitialize;
/* Interfaces */ /* Interfaces */