Page MenuHomeFreeBSD
Files F107644539

D26104.diff
No OneTemporary
Actions

D26104.diff
View Options

Index: head/sys/dev/usb/controller/xhci.h
===================================================================
--- head/sys/dev/usb/controller/xhci.h
+++ head/sys/dev/usb/controller/xhci.h
@@ -393,7 +393,6 @@
uint8_t trb_halted;
uint8_t trb_running;
uint8_t trb_ep_mode;
- uint8_t trb_ep_maxp;
};
enum {
Index: head/sys/dev/usb/controller/xhci.c
===================================================================
--- head/sys/dev/usb/controller/xhci.c
+++ head/sys/dev/usb/controller/xhci.c
@@ -2398,8 +2398,6 @@
/* store endpoint mode */
pepext->trb_ep_mode = ep_mode;
- /* store bMaxPacketSize for control endpoints */
- pepext->trb_ep_maxp = edesc->wMaxPacketSize[0];
usb_pc_cpu_flush(pepext->page_cache);
if (ep_mode == USB_EP_MODE_STREAMS) {
@@ -2929,17 +2927,6 @@
return (USB_ERR_NOMEM);
}
- /* check if bMaxPacketSize changed */
- if (xfer->flags_int.control_xfr != 0 &&
- pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) {
-
- DPRINTFN(8, "Reconfigure control endpoint\n");
-
- /* force driver to reconfigure endpoint */
- pepext->trb_halted = 1;
- pepext->trb_running = 0;
- }
-
/* check for stopped condition, after putting transfer on interrupt queue */
if (pepext->trb_running == 0) {
struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);
@@ -3917,8 +3904,10 @@
if (!(sc->sc_hw.devs[index].ep_configured & mask)) {
sc->sc_hw.devs[index].ep_configured |= mask;
err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index);
- } else {
+ } else if (epno != 1) {
err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+ } else {
+ err = 0;
}
if (err != 0) {

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 2:03 AM (9 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15844603
Default Alt Text
D26104.diff (1 KB)

Event Timeline