summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/usb-drv-arc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index ac34cce6ae..f9aee18234 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -494,7 +494,7 @@ void usb_drv_attach(void)
494{ 494{
495 logf("usb_drv_attach"); 495 logf("usb_drv_attach");
496#if defined(IPOD_VIDEO) 496#if defined(IPOD_VIDEO)
497 /* FIXME: Some iPod Video's need this 2nd call of usb_drv_init() to establish 497 /* FIXME: Some iPod Video's need this 2nd call of usb_drv_init() to establish
498 * an USB connection. */ 498 * an USB connection. */
499 usb_drv_init(); 499 usb_drv_init();
500#endif 500#endif
@@ -899,7 +899,7 @@ static void transfer_completed(void)
899 int pipe = ep * 2 + dir; 899 int pipe = ep * 2 + dir;
900 if (mask & pipe2mask[pipe]) { 900 if (mask & pipe2mask[pipe]) {
901 struct queue_head* qh = &qh_array[pipe]; 901 struct queue_head* qh = &qh_array[pipe];
902 902
903 int length=0; 903 int length=0;
904 struct transfer_descriptor* td=&td_array[pipe*NUM_TDS_PER_EP]; 904 struct transfer_descriptor* td=&td_array[pipe*NUM_TDS_PER_EP];
905 while(td!=(struct transfer_descriptor*)DTD_NEXT_TERMINATE && td!=0) 905 while(td!=(struct transfer_descriptor*)DTD_NEXT_TERMINATE && td!=0)
@@ -921,7 +921,7 @@ static void transfer_completed(void)
921 qh->wait=0; 921 qh->wait=0;
922 semaphore_release(&transfer_completion_signal[pipe]); 922 semaphore_release(&transfer_completion_signal[pipe]);
923 } 923 }
924 924
925 usb_core_transfer_complete(ep, dir?USB_DIR_IN:USB_DIR_OUT, 925 usb_core_transfer_complete(ep, dir?USB_DIR_IN:USB_DIR_OUT,
926 qh->status, length); 926 qh->status, length);
927 Lskip: 927 Lskip:
@@ -985,23 +985,23 @@ static void init_queue_heads(void)
985 985
986 /* TODO: this should take ep_allocation into account */ 986 /* TODO: this should take ep_allocation into account */
987 for (i=1;i<USB_NUM_ENDPOINTS;i++) { 987 for (i=1;i<USB_NUM_ENDPOINTS;i++) {
988 988
989 /* OUT */ 989 /* OUT */
990 if(endpoints[i].type[DIR_OUT] == USB_ENDPOINT_XFER_ISOC) 990 if(endpoints[i].type[DIR_OUT] == USB_ENDPOINT_XFER_ISOC)
991 /* FIXME: we can adjust the number of packets per frame, currently use one */ 991 /* FIXME: we can adjust the number of packets per frame, currently use one */
992 qh_array[i*2].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL | 1 << QH_MULT_POS; 992 qh_array[i*2].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL | 1 << QH_MULT_POS;
993 else 993 else
994 qh_array[i*2].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL; 994 qh_array[i*2].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL;
995 995
996 qh_array[i*2].dtd.next_td_ptr = QH_NEXT_TERMINATE; 996 qh_array[i*2].dtd.next_td_ptr = QH_NEXT_TERMINATE;
997 997
998 /* IN */ 998 /* IN */
999 if(endpoints[i].type[DIR_IN] == USB_ENDPOINT_XFER_ISOC) 999 if(endpoints[i].type[DIR_IN] == USB_ENDPOINT_XFER_ISOC)
1000 /* FIXME: we can adjust the number of packets per frame, currently use one */ 1000 /* FIXME: we can adjust the number of packets per frame, currently use one */
1001 qh_array[i*2+1].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL | 1 << QH_MULT_POS; 1001 qh_array[i*2+1].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL | 1 << QH_MULT_POS;
1002 else 1002 else
1003 qh_array[i*2+1].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL; 1003 qh_array[i*2+1].max_pkt_length = packetsize << QH_MAX_PKT_LEN_POS | QH_ZLT_SEL;
1004 1004
1005 qh_array[i*2+1].dtd.next_td_ptr = QH_NEXT_TERMINATE; 1005 qh_array[i*2+1].dtd.next_td_ptr = QH_NEXT_TERMINATE;
1006 } 1006 }
1007} 1007}