forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/usb/host/fhci-sched.c
....@@ -677,7 +677,7 @@
677677 enable_irq(fhci_to_hcd(fhci)->irq);
678678 }
679679
680
-DECLARE_TASKLET(fhci_tasklet, process_done_list, 0);
680
+DECLARE_TASKLET_OLD(fhci_tasklet, process_done_list);
681681
682682 /* transfer complted callback */
683683 u32 fhci_transfer_confirm_callback(struct fhci_hcd *fhci)
....@@ -701,7 +701,6 @@
701701 u32 data_len = urb->transfer_buffer_length;
702702 int urb_state = 0;
703703 int toggle = 0;
704
- struct td *td;
705704 u8 *data;
706705 u16 cnt = 0;
707706
....@@ -727,8 +726,7 @@
727726 }
728727 ed->speed = (urb->dev->speed == USB_SPEED_LOW) ?
729728 FHCI_LOW_SPEED : FHCI_FULL_SPEED;
730
- ed->max_pkt_size = usb_maxpacket(urb->dev,
731
- urb->pipe, usb_pipeout(urb->pipe));
729
+ ed->max_pkt_size = usb_endpoint_maxp(&urb->ep->desc);
732730 urb->ep->hcpriv = ed;
733731 fhci_dbg(fhci, "new ep speed=%d max_pkt_size=%d\n",
734732 ed->speed, ed->max_pkt_size);
....@@ -768,11 +766,10 @@
768766 if (urb->transfer_flags & URB_ZERO_PACKET &&
769767 urb->transfer_buffer_length > 0 &&
770768 ((urb->transfer_buffer_length %
771
- usb_maxpacket(urb->dev, urb->pipe,
772
- usb_pipeout(urb->pipe))) == 0))
769
+ usb_endpoint_maxp(&urb->ep->desc)) == 0))
773770 urb_state = US_BULK0;
774771 while (data_len > 4096) {
775
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
772
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
776773 usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
777774 FHCI_TA_IN,
778775 cnt ? USB_TD_TOGGLE_CARRY :
....@@ -783,7 +780,7 @@
783780 cnt++;
784781 }
785782
786
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
783
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
787784 usb_pipeout(urb->pipe) ? FHCI_TA_OUT : FHCI_TA_IN,
788785 cnt ? USB_TD_TOGGLE_CARRY : toggle,
789786 data, data_len, 0, 0, true);
....@@ -791,7 +788,7 @@
791788
792789 if (urb->transfer_flags & URB_ZERO_PACKET &&
793790 cnt < urb_priv->num_of_tds) {
794
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
791
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
795792 usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
796793 FHCI_TA_IN,
797794 USB_TD_TOGGLE_CARRY, NULL, 0, 0, 0, true);
....@@ -800,22 +797,22 @@
800797 break;
801798 case FHCI_TF_INTR:
802799 urb->start_frame = get_frame_num(fhci) + 1;
803
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
800
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
804801 usb_pipeout(urb->pipe) ? FHCI_TA_OUT : FHCI_TA_IN,
805802 USB_TD_TOGGLE_DATA0, data, data_len,
806803 urb->interval, urb->start_frame, true);
807804 break;
808805 case FHCI_TF_CTRL:
809806 ed->dev_addr = usb_pipedevice(urb->pipe);
810
- ed->max_pkt_size = usb_maxpacket(urb->dev, urb->pipe,
811
- usb_pipeout(urb->pipe));
807
+ ed->max_pkt_size = usb_endpoint_maxp(&urb->ep->desc);
808
+
812809 /* setup stage */
813
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP,
810
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP,
814811 USB_TD_TOGGLE_DATA0, urb->setup_packet, 8, 0, 0, true);
815812
816813 /* data stage */
817814 if (data_len > 0) {
818
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
815
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
819816 usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
820817 FHCI_TA_IN,
821818 USB_TD_TOGGLE_DATA1, data, data_len, 0, 0,
....@@ -824,12 +821,12 @@
824821
825822 /* status stage */
826823 if (data_len > 0)
827
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
824
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
828825 (usb_pipeout(urb->pipe) ? FHCI_TA_IN :
829826 FHCI_TA_OUT),
830827 USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true);
831828 else
832
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
829
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt++,
833830 FHCI_TA_IN,
834831 USB_TD_TOGGLE_DATA1, data, 0, 0, 0, true);
835832
....@@ -846,7 +843,7 @@
846843 */
847844 frame += cnt * urb->interval;
848845 frame &= 0x07ff;
849
- td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
846
+ fhci_td_fill(fhci, urb, urb_priv, ed, cnt,
850847 usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
851848 FHCI_TA_IN,
852849 USB_TD_TOGGLE_DATA0,