diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-09-19 11:44:38 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-10-16 15:58:43 -0400 |
commit | ec164c389c99d8129f9d6cacda2731bde9b08257 (patch) | |
tree | 224a2f675de8e6ce82f179b38cbe44326db30ddd /firmware/target | |
parent | 71cc1e78fd81818428cbd1b55fcf096979b529ef (diff) | |
download | rockbox-ec164c389c99d8129f9d6cacda2731bde9b08257.tar.gz rockbox-ec164c389c99d8129f9d6cacda2731bde9b08257.zip |
usb: introduce new control request API
Change-Id: I6545d8985ab683c026f28f6a7c0e23b40d0a6506
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/rk27xx/usb-drv-rk27xx.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-drv-arc.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-s3c6400x.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/usb-tcc.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/usb-jz4740.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/usb-jz4760.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c index 8369edc400..d0875ed48c 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525.c +++ b/firmware/target/arm/as3525/usb-drv-as3525.c | |||
@@ -655,7 +655,7 @@ static void handle_out_ep(int ep) | |||
655 | req->wIndex, | 655 | req->wIndex, |
656 | req->wLength); | 656 | req->wLength); |
657 | 657 | ||
658 | usb_core_control_request(&req_copy); | 658 | usb_core_legacy_control_request(&req_copy); |
659 | setup_desc_init(setup_desc); | 659 | setup_desc_init(setup_desc); |
660 | 660 | ||
661 | ep_sts &= ~USB_EP_STAT_SETUP_RCVD; | 661 | ep_sts &= ~USB_EP_STAT_SETUP_RCVD; |
@@ -760,7 +760,7 @@ void INT_USB_FUNC(void) | |||
760 | got_set_configuration = 1; | 760 | got_set_configuration = 1; |
761 | 761 | ||
762 | set_config.wValue = USB_DEV_STS & USB_DEV_STS_MASK_CFG; | 762 | set_config.wValue = USB_DEV_STS & USB_DEV_STS_MASK_CFG; |
763 | usb_core_control_request(&set_config); | 763 | usb_core_legacy_control_request(&set_config); |
764 | intr &= ~USB_DEV_INTR_SET_CONFIG; | 764 | intr &= ~USB_DEV_INTR_SET_CONFIG; |
765 | } | 765 | } |
766 | if (intr & USB_DEV_INTR_EARLY_SUSPEND) {/* idle >3ms detected */ | 766 | if (intr & USB_DEV_INTR_EARLY_SUSPEND) {/* idle >3ms detected */ |
diff --git a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c index aac271c47a..77860b5494 100644 --- a/firmware/target/arm/rk27xx/usb-drv-rk27xx.c +++ b/firmware/target/arm/rk27xx/usb-drv-rk27xx.c | |||
@@ -117,7 +117,7 @@ static void setup_received(void) | |||
117 | setup_data[1] = SETUP2; | 117 | setup_data[1] = SETUP2; |
118 | 118 | ||
119 | /* pass setup data to the upper layer */ | 119 | /* pass setup data to the upper layer */ |
120 | usb_core_control_request((struct usb_ctrlrequest*)setup_data); | 120 | usb_core_legacy_control_request((struct usb_ctrlrequest*)setup_data); |
121 | } | 121 | } |
122 | 122 | ||
123 | static int max_pkt_size(struct endpoint_t *endp) | 123 | static int max_pkt_size(struct endpoint_t *endp) |
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c index f1acc9c964..e5a9000f40 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c +++ b/firmware/target/arm/tms320dm320/sansa-connect/tnetv105_usb_drv.c | |||
@@ -1181,7 +1181,7 @@ void VLYNQ(void) | |||
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | /* Process control packet */ | 1183 | /* Process control packet */ |
1184 | usb_core_control_request(&setup); | 1184 | usb_core_legacy_control_request(&setup); |
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | if (sysIntrStatus.f.ep0_in_ack) | 1187 | if (sysIntrStatus.f.ep0_in_ack) |
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index 4c53108f12..22751f27f0 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c | |||
@@ -877,7 +877,7 @@ static void control_received(void) | |||
877 | } | 877 | } |
878 | } | 878 | } |
879 | 879 | ||
880 | usb_core_control_request((struct usb_ctrlrequest*)tmp); | 880 | usb_core_legacy_control_request((struct usb_ctrlrequest*)tmp); |
881 | } | 881 | } |
882 | 882 | ||
883 | static void transfer_completed(void) | 883 | static void transfer_completed(void) |
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c index 71d04e6f2a..0f3ecf8c00 100644 --- a/firmware/target/arm/usb-s3c6400x.c +++ b/firmware/target/arm/usb-s3c6400x.c | |||
@@ -522,7 +522,7 @@ static void handle_ep_int(int ep, bool out) | |||
522 | ep0_setup_pkt->bRequest == USB_REQ_SET_ADDRESS) | 522 | ep0_setup_pkt->bRequest == USB_REQ_SET_ADDRESS) |
523 | DCFG = (DCFG & ~bitm(DCFG, devadr)) | (ep0_setup_pkt->wValue << DCFG_devadr_bitp); | 523 | DCFG = (DCFG & ~bitm(DCFG, devadr)) | (ep0_setup_pkt->wValue << DCFG_devadr_bitp); |
524 | 524 | ||
525 | usb_core_control_request(ep0_setup_pkt); | 525 | usb_core_legacy_control_request(ep0_setup_pkt); |
526 | } | 526 | } |
527 | } | 527 | } |
528 | 528 | ||
diff --git a/firmware/target/arm/usb-tcc.c b/firmware/target/arm/usb-tcc.c index 8ce75b6764..53f101c471 100644 --- a/firmware/target/arm/usb-tcc.c +++ b/firmware/target/arm/usb-tcc.c | |||
@@ -251,7 +251,7 @@ void handle_control(void) | |||
251 | DEBUG(2, "req: %02x %02d", req->bRequestType, req->bRequest); | 251 | DEBUG(2, "req: %02x %02d", req->bRequestType, req->bRequest); |
252 | } | 252 | } |
253 | 253 | ||
254 | usb_core_control_request(req); | 254 | usb_core_legacy_control_request(req); |
255 | } | 255 | } |
256 | 256 | ||
257 | static | 257 | static |
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c index 8d04c54a68..07d24be380 100644 --- a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c | |||
@@ -239,7 +239,7 @@ static void EP0_handler(void) | |||
239 | { | 239 | { |
240 | readFIFO(ep_recv, REG_USB_REG_COUNT0); | 240 | readFIFO(ep_recv, REG_USB_REG_COUNT0); |
241 | REG_USB_REG_CSR0 = csr0 | USB_CSR0_SVDOUTPKTRDY; /* clear OUTPKTRDY bit */ | 241 | REG_USB_REG_CSR0 = csr0 | USB_CSR0_SVDOUTPKTRDY; /* clear OUTPKTRDY bit */ |
242 | usb_core_control_request((struct usb_ctrlrequest*)ep_recv->buf); | 242 | usb_core_legacy_control_request((struct usb_ctrlrequest*)ep_recv->buf); |
243 | } | 243 | } |
244 | } | 244 | } |
245 | 245 | ||
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c index 5dbf9455e3..6db4a25d5c 100644 --- a/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c +++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4760.c | |||
@@ -335,7 +335,7 @@ static void EP0_handler(void) | |||
335 | ep0_data_requested = true; | 335 | ep0_data_requested = true; |
336 | else ep0_data_supplied = true; | 336 | else ep0_data_supplied = true; |
337 | REG_USB_CSR0 = csr0; | 337 | REG_USB_CSR0 = csr0; |
338 | usb_core_control_request(&ep0_rx.request); | 338 | usb_core_legacy_control_request(&ep0_rx.request); |
339 | ep_transfer_completed(ep_recv); | 339 | ep_transfer_completed(ep_recv); |
340 | } | 340 | } |
341 | } | 341 | } |