aboutsummaryrefslogtreecommitdiff
path: root/lib/usb/usb_control.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/usb/usb_control.c')
-rw-r--r--lib/usb/usb_control.c162
1 files changed, 73 insertions, 89 deletions
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c
index f410dfa..c85a962 100644
--- a/lib/usb/usb_control.c
+++ b/lib/usb/usb_control.c
@@ -22,27 +22,25 @@
#include "usb_private.h"
static struct usb_control_state {
- enum { IDLE, STALLED,
- DATA_IN, LAST_DATA_IN, STATUS_IN,
- DATA_OUT, LAST_DATA_OUT, STATUS_OUT
+ enum {
+ IDLE, STALLED,
+ DATA_IN, LAST_DATA_IN, STATUS_IN,
+ DATA_OUT, LAST_DATA_OUT, STATUS_OUT,
} state;
-
struct usb_setup_data req;
-
u8 *ctrl_buf;
u16 ctrl_len;
-
void (*complete)(struct usb_setup_data *req);
} control_state;
-/** Register application callback function for handling of usb control
- * request. */
+/* Register application callback function for handling USB control requests. */
int usbd_register_control_callback(u8 type, u8 type_mask,
- usbd_control_callback callback)
+ usbd_control_callback callback)
{
int i;
- for(i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) {
- if(_usbd_device.user_control_callback[i].cb)
+
+ for (i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) {
+ if (_usbd_device.user_control_callback[i].cb)
continue;
_usbd_device.user_control_callback[i].type = type;
@@ -50,25 +48,24 @@ int usbd_register_control_callback(u8 type, u8 type_mask,
_usbd_device.user_control_callback[i].cb = callback;
return 0;
}
+
return -1;
}
static void usb_control_send_chunk(void)
{
- if(_usbd_device.desc->bMaxPacketSize0 < control_state.ctrl_len) {
+ if (_usbd_device.desc->bMaxPacketSize0 < control_state.ctrl_len) {
/* Data stage, normal transmission */
- usbd_ep_write_packet(0, control_state.ctrl_buf,
+ usbd_ep_write_packet(0, control_state.ctrl_buf,
_usbd_device.desc->bMaxPacketSize0);
control_state.state = DATA_IN;
-
control_state.ctrl_buf += _usbd_device.desc->bMaxPacketSize0;
control_state.ctrl_len -= _usbd_device.desc->bMaxPacketSize0;
} else {
/* Data stage, end of transmission */
- usbd_ep_write_packet(0, control_state.ctrl_buf,
+ usbd_ep_write_packet(0, control_state.ctrl_buf,
control_state.ctrl_len);
control_state.state = LAST_DATA_IN;
-
control_state.ctrl_len = 0;
control_state.ctrl_buf = NULL;
}
@@ -76,12 +73,10 @@ static void usb_control_send_chunk(void)
static int usb_control_recv_chunk(void)
{
- u16 packetsize = MIN(_usbd_device.desc->bMaxPacketSize0,
- control_state.req.wLength -
- control_state.ctrl_len);
- u16 size = usbd_ep_read_packet(0,
- control_state.ctrl_buf + control_state.ctrl_len,
- packetsize);
+ u16 packetsize = MIN(_usbd_device.desc->bMaxPacketSize0,
+ control_state.req.wLength - control_state.ctrl_len);
+ u16 size = usbd_ep_read_packet(0, control_state.ctrl_buf +
+ control_state.ctrl_len, packetsize);
if (size != packetsize) {
usbd_ep_stall_set(0, 1);
@@ -95,65 +90,64 @@ static int usb_control_recv_chunk(void)
static int usb_control_request_dispatch(struct usb_setup_data *req)
{
- int result = 0;
- int i;
+ int i, result = 0;
struct user_control_callback *cb = _usbd_device.user_control_callback;
- /* Call user command hook function */
- for(i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) {
- if(cb[i].cb == NULL)
+ /* Call user command hook function. */
+ for (i = 0; i < MAX_USER_CONTROL_CALLBACK; i++) {
+ if (cb[i].cb == NULL)
break;
- if((req->bmRequestType & cb[i].type_mask) == cb[i].type) {
- result = cb[i].cb(req, &control_state.ctrl_buf,
- &control_state.ctrl_len,
- &control_state.complete);
- if(result)
+ if ((req->bmRequestType & cb[i].type_mask) == cb[i].type) {
+ result = cb[i].cb(req, &control_state.ctrl_buf,
+ &control_state.ctrl_len,
+ &control_state.complete);
+ if (result)
return result;
}
}
- /* Try standard request if not already handled */
- return _usbd_standard_request(req, &control_state.ctrl_buf,
- &control_state.ctrl_len);
+ /* Try standard request if not already handled. */
+ return _usbd_standard_request(req, &control_state.ctrl_buf,
+ &control_state.ctrl_len);
}
/* Handle commands and read requests. */
static void usb_control_setup_read(struct usb_setup_data *req)
{
-
control_state.ctrl_buf = _usbd_device.ctrl_buf;
- control_state.ctrl_len = req->wLength;
+ control_state.ctrl_len = req->wLength;
- if(usb_control_request_dispatch(req)) {
- if(control_state.ctrl_len) {
- /* Go to data out stage if handled */
+ if (usb_control_request_dispatch(req)) {
+ if (control_state.ctrl_len) {
+ /* Go to data out stage if handled. */
usb_control_send_chunk();
} else {
- /* Go to status stage if handled */
+ /* Go to status stage if handled. */
usbd_ep_write_packet(0, NULL, 0);
control_state.state = STATUS_IN;
}
- } else {
- /* Stall endpoint on failure */
+ } else {
+ /* Stall endpoint on failure. */
usbd_ep_stall_set(0, 1);
}
}
static void usb_control_setup_write(struct usb_setup_data *req)
{
- if(req->wLength > _usbd_device.ctrl_buf_len) {
+ if (req->wLength > _usbd_device.ctrl_buf_len) {
usbd_ep_stall_set(0, 1);
return;
}
-
- /* Buffer into which to write received data */
+
+ /* Buffer into which to write received data. */
control_state.ctrl_buf = _usbd_device.ctrl_buf;
control_state.ctrl_len = 0;
- /* Wait for DATA OUT Stage */
- if(req->wLength > _usbd_device.desc->bMaxPacketSize0)
+ /* Wait for DATA OUT stage. */
+ if (req->wLength > _usbd_device.desc->bMaxPacketSize0)
control_state.state = DATA_OUT;
- else control_state.state = LAST_DATA_OUT;
+ else
+ control_state.state = LAST_DATA_OUT;
}
void _usbd_control_setup(u8 ea)
@@ -163,91 +157,81 @@ void _usbd_control_setup(u8 ea)
control_state.complete = NULL;
- if(usbd_ep_read_packet(0, req, 8) != 8) {
+ if (usbd_ep_read_packet(0, req, 8) != 8) {
usbd_ep_stall_set(0, 1);
return;
}
- if(req->wLength == 0) {
+ if (req->wLength == 0) {
usb_control_setup_read(req);
- } else if(req->bmRequestType & 0x80) {
+ } else if (req->bmRequestType & 0x80) {
usb_control_setup_read(req);
} else {
usb_control_setup_write(req);
- }
+ }
}
void _usbd_control_out(u8 ea)
{
(void)ea;
- switch(control_state.state) {
- case DATA_OUT:
- if(usb_control_recv_chunk() < 0) break;
- if((control_state.req.wLength - control_state.ctrl_len) <=
- _usbd_device.desc->bMaxPacketSize0)
+ switch (control_state.state) {
+ case DATA_OUT:
+ if (usb_control_recv_chunk() < 0)
+ break;
+ if ((control_state.req.wLength - control_state.ctrl_len) <=
+ _usbd_device.desc->bMaxPacketSize0)
control_state.state = LAST_DATA_OUT;
break;
-
- case LAST_DATA_OUT: {
- int result = 0;
-
- if(usb_control_recv_chunk() < 0) break;
+ case LAST_DATA_OUT:
+ if (usb_control_recv_chunk() < 0)
+ break;
/* We have now received the full data payload.
* Invoke callback to process.
*/
- if(usb_control_request_dispatch(&control_state.req)) {
- /* Got to status stage on success */
+ if (usb_control_request_dispatch(&control_state.req)) {
+ /* Got to status stage on success. */
usbd_ep_write_packet(0, NULL, 0);
control_state.state = STATUS_IN;
} else {
usbd_ep_stall_set(0, 1);
}
-
break;
- }
-
- case STATUS_OUT: {
+ case STATUS_OUT:
usbd_ep_read_packet(0, NULL, 0);
control_state.state = IDLE;
- if (control_state.complete)
+ if (control_state.complete)
control_state.complete(&control_state.req);
control_state.complete = NULL;
break;
- }
-
- default:
- usbd_ep_stall_set(0, 1);
+ default:
+ usbd_ep_stall_set(0, 1);
}
}
void _usbd_control_in(u8 ea)
{
(void)ea;
- switch(control_state.state) {
- case DATA_IN:
+ struct usb_setup_data *req = &control_state.req;
+
+ switch (control_state.state) {
+ case DATA_IN:
usb_control_send_chunk();
break;
-
- case LAST_DATA_IN:
+ case LAST_DATA_IN:
control_state.state = STATUS_OUT;
break;
-
- case STATUS_IN: {
- struct usb_setup_data *req = &control_state.req;
-
- if (control_state.complete)
+ case STATUS_IN:
+ if (control_state.complete)
control_state.complete(&control_state.req);
/* Exception: Handle SET ADDRESS function here... */
- if((req->bmRequestType == 0) &&
- (req->bRequest == USB_REQ_SET_ADDRESS))
+ if ((req->bmRequestType == 0) &&
+ (req->bRequest == USB_REQ_SET_ADDRESS))
_usbd_hw_set_address(req->wValue);
control_state.state = IDLE;
break;
- }
-
- default:
- usbd_ep_stall_set(0, 1);
+ default:
+ usbd_ep_stall_set(0, 1);
}
}