nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb: port usb_hid control request handling to new API 

Change-Id: I9028cf06e91c9fcbe271f6ad81d6b252cb4e7cec
This commit is contained in:
Aidan MacDonald 2021-09-20 02:10:12 +01:00
parent 3318ba4795
commit 1b2cc053d3
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
firmware/usbstack/usb_hid.c
View File

@ -664,7 +664,7 @@ void usb_hid_transfer_complete(int ep, int dir, int status, int length)
* In order to allow sending info to the DAP, the Set Report mechanism can be
* used by defining vendor specific output reports and send them from the host
* to the DAP using the host's custom driver */
static int usb_hid_set_report(struct usb_ctrlrequest *req)
static int usb_hid_set_report(struct usb_ctrlrequest *req, void *reqdata)
{
static unsigned char buf[SET_REPORT_BUF_LEN] USB_DEVBSS_ATTR
__attribute__((aligned(32)));
@ -692,8 +692,11 @@ static int usb_hid_set_report(struct usb_ctrlrequest *req)
return 4;
}
memset(buf, 0, length);
usb_drv_recv_nonblocking(EP_CONTROL, buf, length);
if(!reqdata) {
memset(buf, 0, length);
usb_drv_control_response(USB_CONTROL_RECEIVE, buf, length);
return 0;
}
#ifdef LOGF_ENABLE
if (buf[1] & 0x01)
@ -710,10 +713,11 @@ static int usb_hid_set_report(struct usb_ctrlrequest *req)
/* Defining other LEDs and setting them from the USB host (OS) can be used
* to send messages to the DAP */
usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
return 0;
}
static int usb_hid_get_report(struct usb_ctrlrequest *req, unsigned char** dest)
static int usb_hid_get_report(struct usb_ctrlrequest *req, unsigned char* dest)
{
if ((req->wValue >> 8) != REPORT_TYPE_FEATURE)
{
@ -739,10 +743,9 @@ static int usb_hid_get_report(struct usb_ctrlrequest *req, unsigned char** dest)
return 4;
}
(*dest)[0] = 0;
(*dest)[1] = battery_level();
*dest += GET_REPORT_BUF_LEN;
dest[0] = 0;
dest[1] = battery_level();
usb_drv_control_response(USB_CONTROL_ACK, dest, 2);
return 0;
}
@ -774,8 +777,7 @@ bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata, unsigne
if (dest != orig_dest)
{
usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); /* ack */
usb_drv_send(EP_CONTROL, orig_dest, dest - orig_dest);
usb_drv_control_response(USB_CONTROL_ACK, orig_dest, dest - orig_dest);
return true;
}
break;
@ -792,34 +794,21 @@ bool usb_hid_control_request(struct usb_ctrlrequest *req, void *reqdata, unsigne
switch (req->bRequest)
{
case USB_HID_SET_REPORT:
rc = usb_hid_set_report(req);
rc = usb_hid_set_report(req, reqdata);
break;
case USB_HID_GET_REPORT:
rc = usb_hid_get_report(req, &dest);
rc = usb_hid_get_report(req, dest);
break;
case USB_HID_SET_IDLE:
rc = 0;
break;
usb_drv_control_response(USB_CONTROL_ACK, NULL, 0);
return true;
default:
/* all other requests are errors */
rc = -1;
break;
return false;
}
if(rc != 0)
break;
if (dest != orig_dest)
{
usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); /* ack */
usb_drv_send(EP_CONTROL, orig_dest, dest - orig_dest);
}
else
{
usb_drv_send(EP_CONTROL, NULL, 0); /* ack */
}
return true;
if(rc == 0)
return true;
}
case USB_TYPE_VENDOR: