diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-11-30 15:56:49 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-11-30 15:56:49 +0000 |
commit | f235f1d4c0c222402d0e8b64cdf50533ef4dc9c9 (patch) | |
tree | d77f3ed7c5c2b30424ea159426f32a3644854562 /firmware | |
parent | b9c49fd474b7ce0111d3e5e4de6498e8ade96bba (diff) | |
download | rockbox-f235f1d4c0c222402d0e8b64cdf50533ef4dc9c9.tar.gz rockbox-f235f1d4c0c222402d0e8b64cdf50533ef4dc9c9.zip |
Remove usb_drv_wait from the public usb api, and remove the implementation from usb-drv-arc.c, as it is not actually used
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19275 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/isp1583.c | 30 | ||||
-rw-r--r-- | firmware/export/usb_drv.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/usb-drv-arc.c | 11 |
3 files changed, 15 insertions, 27 deletions
diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c index 62c16e880c..2d986384e6 100644 --- a/firmware/drivers/isp1583.c +++ b/firmware/drivers/isp1583.c | |||
@@ -545,6 +545,21 @@ int usb_drv_send_nonblocking(int ep, void* ptr, int length) | |||
545 | return usb_drv_send(ep, ptr, length); | 545 | return usb_drv_send(ep, ptr, length); |
546 | } | 546 | } |
547 | 547 | ||
548 | static void usb_drv_wait(int ep, bool send) | ||
549 | { | ||
550 | logf("usb_drv_wait(%d, %d)", ep, send); | ||
551 | if(send) | ||
552 | { | ||
553 | while (endpoints[ep].out_in_progress) | ||
554 | nop_f(); | ||
555 | } | ||
556 | else | ||
557 | { | ||
558 | while (endpoints[ep].in_ack) | ||
559 | nop_f(); | ||
560 | } | ||
561 | } | ||
562 | |||
548 | int usb_drv_send(int ep, void* ptr, int length) | 563 | int usb_drv_send(int ep, void* ptr, int length) |
549 | { | 564 | { |
550 | logf("usb_drv_send_nb(%d, 0x%x, %d)", ep, &ptr, length); | 565 | logf("usb_drv_send_nb(%d, 0x%x, %d)", ep, &ptr, length); |
@@ -578,21 +593,6 @@ void usb_drv_reset_endpoint(int ep, bool send) | |||
578 | usb_enable_endpoint(ep_index(ep, (int)send)); | 593 | usb_enable_endpoint(ep_index(ep, (int)send)); |
579 | } | 594 | } |
580 | 595 | ||
581 | void usb_drv_wait(int ep, bool send) | ||
582 | { | ||
583 | logf("usb_drv_wait(%d, %d)", ep, send); | ||
584 | if(send) | ||
585 | { | ||
586 | while (endpoints[ep].out_in_progress) | ||
587 | nop_f(); | ||
588 | } | ||
589 | else | ||
590 | { | ||
591 | while (endpoints[ep].in_ack) | ||
592 | nop_f(); | ||
593 | } | ||
594 | } | ||
595 | |||
596 | void usb_drv_cancel_all_transfers(void) | 596 | void usb_drv_cancel_all_transfers(void) |
597 | { | 597 | { |
598 | logf("usb_drv_cancel_all_tranfers()"); | 598 | logf("usb_drv_cancel_all_tranfers()"); |
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h index 3bd8e1fdf4..3d2e689050 100644 --- a/firmware/export/usb_drv.h +++ b/firmware/export/usb_drv.h | |||
@@ -35,7 +35,6 @@ int usb_drv_recv(int endpoint, void* ptr, int length); | |||
35 | void usb_drv_ack(struct usb_ctrlrequest* req); | 35 | void usb_drv_ack(struct usb_ctrlrequest* req); |
36 | void usb_drv_set_address(int address); | 36 | void usb_drv_set_address(int address); |
37 | void usb_drv_reset_endpoint(int endpoint, bool send); | 37 | void usb_drv_reset_endpoint(int endpoint, bool send); |
38 | void usb_drv_wait(int endpoint, bool send); | ||
39 | bool usb_drv_powered(void); | 38 | bool usb_drv_powered(void); |
40 | int usb_drv_port_speed(void); | 39 | int usb_drv_port_speed(void); |
41 | void usb_drv_cancel_all_transfers(void); | 40 | void usb_drv_cancel_all_transfers(void); |
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index 914d220233..1cdc0f9e90 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c | |||
@@ -581,17 +581,6 @@ int usb_drv_recv(int endpoint, void* ptr, int length) | |||
581 | return prime_transfer(endpoint&0x7f, ptr, length, false, false); | 581 | return prime_transfer(endpoint&0x7f, ptr, length, false, false); |
582 | } | 582 | } |
583 | 583 | ||
584 | void usb_drv_wait(int endpoint, bool send) | ||
585 | { | ||
586 | int pipe = (endpoint&0x7f) * 2 + (send ? 1 : 0); | ||
587 | struct queue_head* qh = &qh_array[pipe]; | ||
588 | |||
589 | while (qh->dtd.size_ioc_sts & QH_STATUS_ACTIVE) { | ||
590 | if (REG_USBSTS & USBSTS_RESET) | ||
591 | break; | ||
592 | } | ||
593 | } | ||
594 | |||
595 | int usb_drv_port_speed(void) | 584 | int usb_drv_port_speed(void) |
596 | { | 585 | { |
597 | return (REG_PORTSC1 & 0x08000000) ? 1 : 0; | 586 | return (REG_PORTSC1 & 0x08000000) ? 1 : 0; |