diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2016-03-08 20:20:49 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2016-03-08 20:20:49 +0900 |
| commit | 90ac7f7c137fbddbf0725be68d9ee8776f777aa9 (patch) | |
| tree | 2da59bec33363aaf9167ff2376c3442e9b013067 /example-cdc/usb_lld.h | |
| parent | fd8aee3cb0f9243f600b9576863ad5c8457529b6 (diff) | |
update usb stack from Gnuk development branch
Diffstat (limited to 'example-cdc/usb_lld.h')
| -rw-r--r-- | example-cdc/usb_lld.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/example-cdc/usb_lld.h b/example-cdc/usb_lld.h index fd4bc08..34a1068 100644 --- a/example-cdc/usb_lld.h +++ b/example-cdc/usb_lld.h @@ -1,9 +1,3 @@ -#define USB_DEVICE_DESCRIPTOR_TYPE 0x01 -#define USB_CONFIGURATION_DESCRIPTOR_TYPE 0x02 -#define USB_STRING_DESCRIPTOR_TYPE 0x03 -#define USB_INTERFACE_DESCRIPTOR_TYPE 0x04 -#define USB_ENDPOINT_DESCRIPTOR_TYPE 0x05 - #define STANDARD_ENDPOINT_DESC_SIZE 0x09 /* endpoints enumeration */ @@ -24,7 +18,7 @@ enum RECIPIENT_TYPE { - DEVICE_RECIPIENT, /* Recipient device */ + DEVICE_RECIPIENT = 0, /* Recipient device */ INTERFACE_RECIPIENT, /* Recipient interface */ ENDPOINT_RECIPIENT, /* Recipient endpoint */ OTHER_RECIPIENT @@ -55,19 +49,20 @@ enum USB_SUCCESS = 1, }; -struct control_info { +struct req_args { uint16_t value; uint16_t index; uint16_t len; }; void usb_cb_device_reset (void); -int usb_cb_setup (uint8_t req, uint8_t req_no, struct control_info *detail); -int usb_cb_interface (uint8_t cmd, struct control_info *detail); +int usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg); +int usb_cb_interface (uint8_t cmd, struct req_args *arg); int usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index, - struct control_info *detail); + struct req_args *arg); int usb_cb_handle_event (uint8_t event_type, uint16_t value); -void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value); +void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, + struct req_args *arg); enum { USB_EVENT_ADDRESS, @@ -103,7 +98,7 @@ void usb_lld_txcpy (const void *src, int ep_num, int offset, size_t len); void usb_lld_tx_enable (int ep_num, size_t len); void usb_lld_write (uint8_t ep_num, const void *buf, size_t len); int usb_lld_reply_request (const void *buf, size_t buflen, - struct control_info *ctrl); + struct req_args *arg); void usb_lld_rx_enable (int ep_num); int usb_lld_rx_data_len (int ep_num); void usb_lld_rxcpy (uint8_t *dst, int ep_num, int offset, size_t len); @@ -114,7 +109,7 @@ void usb_lld_setup_endpoint (int ep_num, int ep_type, int ep_kind, void usb_lld_set_configuration (uint8_t config); uint8_t usb_lld_current_configuration (void); void usb_lld_set_feature (uint8_t feature); -void usb_lld_set_data_to_recv (const void *p, size_t len); +void usb_lld_set_data_to_recv (void *p, size_t len); void usb_lld_prepare_shutdown (void); void usb_lld_shutdown (void); |