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

Fix a few issues related to new USB device boardctl() commands

Browse Source
This commit is contained in:
Gregory Nutt 2016-03-25 14:24:01 -06:00
parent a31300cb05
commit e01e664ccb
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -1567,3 +1567,8 @@
* apps/examples/sched_note: Add a simple example to exercise * apps/examples/sched_note: Add a simple example to exercise
the scheduler instrumentation logic. Kind of buggy right now the scheduler instrumentation logic. Kind of buggy right now
(2016-03-17). (2016-03-17).
* apps/system/cdcacm, usbmsc, and composite, apps/examples/usbserial,
composite, usbterm: Use new boardctl() instead of callinig directly
in the OS when possible. There are still a few bad OS calls for
USB device interfaces that do not yet have boardctl() commands
(2016-03-25).

2
system/composite/composite_main.c
View File

@ -514,7 +514,7 @@ static void usbmsc_disconnect(void)
{ {
struct boardioc_usbdev_ctrl_s ctrl; struct boardioc_usbdev_ctrl_s ctrl;
ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; ctrl.usbdev = BOARDIOC_USBDEV_MSC;
ctrl.action = BOARDIOC_USBDEV_DISCONNECT; ctrl.action = BOARDIOC_USBDEV_DISCONNECT;
ctrl.instance = 0; ctrl.instance = 0;
ctrl.handle = &g_composite.mschandle; ctrl.handle = &g_composite.mschandle;

4
system/usbmsc/usbmsc_main.c
View File

@ -410,7 +410,7 @@ static void usbmsc_disconnect(FAR void *handle)
{ {
struct boardioc_usbdev_ctrl_s ctrl; struct boardioc_usbdev_ctrl_s ctrl;
ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; ctrl.usbdev = BOARDIOC_USBDEV_MSC;
ctrl.action = BOARDIOC_USBDEV_DISCONNECT; ctrl.action = BOARDIOC_USBDEV_DISCONNECT;
ctrl.instance = 0; ctrl.instance = 0;
ctrl.handle = &handle; ctrl.handle = &handle;
@ -481,7 +481,7 @@ int msconn_main(int argc, char *argv[])
printf("mcsonn_main: Creating block drivers\n"); printf("mcsonn_main: Creating block drivers\n");
ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; ctrl.usbdev = BOARDIOC_USBDEV_MSC;
ctrl.action = BOARDIOC_USBDEV_INITIALIZE; ctrl.action = BOARDIOC_USBDEV_INITIALIZE;
ctrl.instance = 0; ctrl.instance = 0;
ctrl.handle = NULL; ctrl.handle = NULL;