From e01e664ccb67e6e888aa81ffdd6c7930ad7301ff Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 25 Mar 2016 14:24:01 -0600 Subject: [PATCH] Fix a few issues related to new USB device boardctl() commands --- ChangeLog.txt | 5 +++++ system/composite/composite_main.c | 2 +- system/usbmsc/usbmsc_main.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index fc1aaf72e..ec95aa01f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1567,3 +1567,8 @@ * apps/examples/sched_note: Add a simple example to exercise the scheduler instrumentation logic. Kind of buggy right now (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). diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c index 410642e13..ab473124b 100644 --- a/system/composite/composite_main.c +++ b/system/composite/composite_main.c @@ -514,7 +514,7 @@ static void usbmsc_disconnect(void) { struct boardioc_usbdev_ctrl_s ctrl; - ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; + ctrl.usbdev = BOARDIOC_USBDEV_MSC; ctrl.action = BOARDIOC_USBDEV_DISCONNECT; ctrl.instance = 0; ctrl.handle = &g_composite.mschandle; diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c index fc8735080..83a2dd9d4 100644 --- a/system/usbmsc/usbmsc_main.c +++ b/system/usbmsc/usbmsc_main.c @@ -410,7 +410,7 @@ static void usbmsc_disconnect(FAR void *handle) { struct boardioc_usbdev_ctrl_s ctrl; - ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; + ctrl.usbdev = BOARDIOC_USBDEV_MSC; ctrl.action = BOARDIOC_USBDEV_DISCONNECT; ctrl.instance = 0; ctrl.handle = &handle; @@ -481,7 +481,7 @@ int msconn_main(int argc, char *argv[]) printf("mcsonn_main: Creating block drivers\n"); - ctrl.usbdev = BOARDIOC_USBDEV_USBMSC; + ctrl.usbdev = BOARDIOC_USBDEV_MSC; ctrl.action = BOARDIOC_USBDEV_INITIALIZE; ctrl.instance = 0; ctrl.handle = NULL;