diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2016-06-09 09:53:15 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2016-06-09 09:53:15 +0900 |
| commit | 4d7e97028eb967df21c0015ca5f4f4bf9c9a58cd (patch) | |
| tree | b33c85e1c640967e5a6b793fd6e1b8a1cefda529 /example-fs-bb48 | |
| parent | d061e6f931f0228158d5a4b72fce501e6219540d (diff) | |
More update of USB API
Diffstat (limited to 'example-fs-bb48')
| -rw-r--r-- | example-fs-bb48/usb-cdc.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/example-fs-bb48/usb-cdc.c b/example-fs-bb48/usb-cdc.c index 119e6ae..8e5fd9e 100644 --- a/example-fs-bb48/usb-cdc.c +++ b/example-fs-bb48/usb-cdc.c @@ -274,7 +274,6 @@ usb_ctrl_write_finish (struct usb_dev *dev) } - static int vcom_port_data_setup (struct usb_dev *dev) { @@ -285,8 +284,8 @@ vcom_port_data_setup (struct usb_dev *dev) struct tty *t = tty_get (arg->index, 0); if (arg->request == USB_CDC_REQ_GET_LINE_CODING) - return usb_lld_reply_request (dev, &t->line_coding, - sizeof (struct line_coding)); + return usb_lld_ctrl_send (dev, &t->line_coding, + sizeof (struct line_coding)); } else /* USB_SETUP_SET (req) */ { @@ -295,11 +294,11 @@ vcom_port_data_setup (struct usb_dev *dev) { struct tty *t = tty_get (arg->index, 0); - return usb_lld_set_data_to_recv (dev, &t->line_coding, - sizeof (struct line_coding)); + return usb_lld_ctrl_recv (dev, &t->line_coding, + sizeof (struct line_coding)); } else if (arg->request == USB_CDC_REQ_SET_CONTROL_LINE_STATE) - return 0; + return usb_lld_ctrl_ack (dev); } return -1; @@ -329,11 +328,11 @@ usb_get_descriptor (struct usb_dev *dev) return -1; if (desc_type == DEVICE_DESCRIPTOR) - return usb_lld_reply_request (dev, - vcom_device_desc, sizeof (vcom_device_desc)); + return usb_lld_ctrl_send (dev, + vcom_device_desc, sizeof (vcom_device_desc)); else if (desc_type == CONFIG_DESCRIPTOR) - return usb_lld_reply_request (dev, - vcom_config_desc, sizeof (vcom_config_desc)); + return usb_lld_ctrl_send (dev, + vcom_config_desc, sizeof (vcom_config_desc)); else if (desc_type == STRING_DESCRIPTOR) { const uint8_t *str; @@ -361,7 +360,7 @@ usb_get_descriptor (struct usb_dev *dev) return -1; } - return usb_lld_reply_request (dev, str, size); + return usb_lld_ctrl_send (dev, str, size); } return -1; @@ -428,7 +427,7 @@ usb_set_configuration (struct usb_dev *dev) chopstx_mutex_unlock (&tty0.mtx); } - return 0; + return usb_lld_ctrl_ack (dev); } @@ -446,7 +445,7 @@ usb_set_interface (struct usb_dev *dev) else { vcom_setup_endpoints_for_interface (dev, interface, 0); - return 0; + return usb_lld_ctrl_ack (dev); } } @@ -460,8 +459,9 @@ usb_get_interface (struct usb_dev *dev) return -1; /* We don't have alternate interface, so, always return 0. */ - return usb_lld_reply_request (dev, &zero, 1); + return usb_lld_ctrl_send (dev, &zero, 1); } + static int usb_get_status_interface (struct usb_dev *dev) { @@ -471,7 +471,7 @@ usb_get_status_interface (struct usb_dev *dev) if (interface >= NUM_INTERFACES) return -1; - return usb_lld_reply_request (dev, &status_info, 2); + return usb_lld_ctrl_send (dev, &status_info, 2); } @@ -743,23 +743,17 @@ tty_main (void *arg) case USB_EVENT_SET_CONFIGURATION: if (usb_set_configuration (&dev) < 0) usb_lld_ctrl_error (&dev); - else - usb_lld_ctrl_good (&dev); continue; case USB_EVENT_SET_INTERFACE: if (usb_set_interface (&dev) < 0) usb_lld_ctrl_error (&dev); - else - usb_lld_ctrl_good (&dev); continue; /* Non standard device request. */ case USB_EVENT_CTRL_REQUEST: if (usb_setup (&dev) < 0) usb_lld_ctrl_error (&dev); - else - usb_lld_ctrl_good (&dev); continue; /* Control WRITE transfer finished. */ |