PERFORCE change 163610 for review
Andrew Thompson
thompsa at FreeBSD.org
Fri Jun 5 21:22:53 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=163610
Change 163610 by thompsa at thompsa_burger on 2009/06/05 21:22:19
Checkpoint usb buf WIP
- rename functions
- add urb accessors
- move includes
Affected files ...
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#11 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#3 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#7 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_auereg.h#3 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#6 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#6 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#6 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#10 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#5 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#11 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#14 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#13 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#5 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_freebsd.h#2 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#13 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#7 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#12 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#6 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#4 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#13 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#4 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#13 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#6 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.h#2 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#4 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#8 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#5 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#9 edit
Differences ...
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#9 (text+ko) ====
@@ -280,7 +280,7 @@
/* wait 8 milliseconds */
/* Wait for reset to complete. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, 0);
}
@@ -885,7 +885,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.max_frame_size = xfer->max_frame_size;
@@ -1395,7 +1395,7 @@
(sc->sc_clocks_on) (sc->sc_clocks_arg);
}
/* wait a little for things to stabilise */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
/* disable and clear all interrupts */
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 (text+ko) ====
@@ -187,7 +187,7 @@
at91_udp_pull_down(sc);
/* wait 10ms for pulldown to stabilise */
- usb2_pause_mtx(NULL, hz / 100);
+ usb_pause_mtx(NULL, hz / 100);
sc->sc_iclk = at91_pmc_clock_ref("udc_clk");
sc->sc_fclk = at91_pmc_clock_ref("udpck");
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#9 (text+ko) ====
@@ -224,7 +224,7 @@
/* wait 8 milliseconds */
/* Wait for reset to complete. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
/* hardware should have cleared RMWKUP bit */
}
@@ -788,7 +788,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.max_frame_size = xfer->max_frame_size;
@@ -1256,7 +1256,7 @@
if (ATMEGA_READ_1(sc, 0x49) & 0x01)
break;
/* wait a little bit for PLL to start */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
}
/* make sure USB is enabled */
@@ -1272,7 +1272,7 @@
ATMEGA_WRITE_1(sc, ATMEGA_UDCON, ATMEGA_UDCON_DETACH);
/* wait a little for things to stabilise */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
/* enable interrupts */
ATMEGA_WRITE_1(sc, ATMEGA_UDIEN,
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#9 (text+ko) ====
@@ -257,7 +257,7 @@
/* wait 8 milliseconds */
/* Wait for reset to complete. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
/* hardware should have cleared RMWKUP bit */
}
@@ -758,7 +758,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpoint),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.max_frame_size = xfer->max_frame_size;
@@ -1218,7 +1218,7 @@
avr32dci_mod_ctrl(sc, AVR32_CTRL_DEV_DETACH, 0);
/* wait a little for things to stabilise */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20);
/* disable interrupts */
avr32dci_mod_ien(sc, 0, 0xFFFFFFFF);
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#11 (text+ko) ====
@@ -173,7 +173,7 @@
EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
for (i = 0; i < 100; i++) {
- usb2_pause_mtx(NULL, hz / 1000);
+ usb_pause_mtx(NULL, hz / 1000);
hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET;
if (!hcr) {
if (sc->sc_flags & (EHCI_SCFLG_SETMODE | EHCI_SCFLG_BIGEMMIO)) {
@@ -209,7 +209,7 @@
EOWRITE4(sc, EHCI_USBCMD, 0); /* Halt controller */
for (i = 0; i < 100; i++) {
- usb2_pause_mtx(NULL, hz / 1000);
+ usb_pause_mtx(NULL, hz / 1000);
hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
if (hcr)
break;
@@ -241,7 +241,7 @@
DPRINTF("start\n");
- usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0);
#ifdef USB_DEBUG
if (ehcidebug > 2) {
@@ -492,7 +492,7 @@
EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF);
for (i = 0; i < 100; i++) {
- usb2_pause_mtx(NULL, hz / 1000);
+ usb_pause_mtx(NULL, hz / 1000);
hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
if (!hcr) {
break;
@@ -518,7 +518,7 @@
{
USB_BUS_LOCK(&sc->sc_bus);
- usb2_callout_stop(&sc->sc_tmo_pcd);
+ usb_callout_stop(&sc->sc_tmo_pcd);
EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
USB_BUS_UNLOCK(&sc->sc_bus);
@@ -528,9 +528,9 @@
}
/* XXX let stray task complete */
- usb2_pause_mtx(NULL, hz / 20);
+ usb_pause_mtx(NULL, hz / 20);
- usb2_callout_drain(&sc->sc_tmo_pcd);
+ usb_callout_drain(&sc->sc_tmo_pcd);
}
void
@@ -563,7 +563,7 @@
if (hcr == 0) {
break;
}
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
}
if (hcr != 0) {
@@ -577,7 +577,7 @@
if (hcr == EHCI_STS_HCH) {
break;
}
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
}
if (hcr != EHCI_STS_HCH) {
@@ -620,7 +620,7 @@
}
if (hcr) {
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_WAIT));
for (i = 1; i <= sc->sc_noport; i++) {
@@ -639,7 +639,7 @@
if (hcr != EHCI_STS_HCH) {
break;
}
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
}
if (hcr == EHCI_STS_HCH) {
device_printf(sc->sc_bus.bdev, "config timeout\n");
@@ -647,7 +647,7 @@
USB_BUS_UNLOCK(&sc->sc_bus);
- usb2_pause_mtx(NULL,
+ usb_pause_mtx(NULL,
USB_MS_TO_TICKS(USB_RESUME_WAIT));
/* catch any lost interrupts */
@@ -1504,7 +1504,7 @@
ehci_root_intr(sc);
/* do not allow RHSC interrupts > 1 per second */
- usb2_callout_reset(&sc->sc_tmo_pcd, hz,
+ usb_callout_reset(&sc->sc_tmo_pcd, hz,
(void *)&ehci_pcd_enable, sc);
}
status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA);
@@ -1750,7 +1750,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
pipe->address, UE_GET_ADDR(pipe->endpointno),
- urb->sumlen, usb2_get_speed(pipe->xroot->udev));
+ urb->sumlen, usb_get_speed(pipe->xroot->udev));
temp.average = pipe->max_hc_frame_size;
temp.max_frame_size = pipe->max_frame_size;
@@ -1783,7 +1783,7 @@
temp.auto_data_toggle = 1;
}
- if (usb2_get_speed(pipe->udev) != USB_SPEED_HIGH) {
+ if (usb_get_speed(pipe->udev) != USB_SPEED_HIGH) {
/* max 3 retries */
temp.qtd_status |=
htohc32(temp.sc, EHCI_QTD_SET_CERR(3));
@@ -1932,14 +1932,14 @@
EHCI_QH_SET_ENDPT(UE_GET_ADDR(pipe->endpointno)) |
EHCI_QH_SET_MPL(pipe->max_packet_size));
- if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) {
+ if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) {
qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) |
EHCI_QH_DTC);
if (methods != &ehci_device_intr_methods)
qh_endp |= EHCI_QH_SET_NRL(8);
} else {
- if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_FULL) {
+ if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_FULL) {
qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL) |
EHCI_QH_DTC);
} else {
@@ -2202,10 +2202,10 @@
usb2_transfer_done(urb, error);
/* Load next */
- urb = TAILQ_FIRST(&pipe->urb_xmit_q);
+ urb = TAILQ_FIRST(&pipe->urb_hc_q);
if (error == 0 && urb != NULL) {
printf("LOAD NEXT %p\n", urb);
- TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next);
+ TAILQ_REMOVE(&pipe->urb_hc_q, urb, ub_hcnext);
error = (pipe->methods->load)(urb);
if (error)
usb2_transfer_done(urb, error);
@@ -2220,8 +2220,8 @@
USB_BUS_LOCK(pipe->bus);
- if (pipe->urb_curr != NULL || TAILQ_FIRST(&pipe->urb_xmit_q) != NULL) {
- TAILQ_INSERT_TAIL(&pipe->urb_xmit_q, urb, ub_next);
+ if (pipe->urb_curr != NULL || TAILQ_FIRST(&pipe->urb_hc_q) != NULL) {
+ TAILQ_INSERT_TAIL(&pipe->urb_hc_q, urb, ub_hcnext);
USB_BUS_UNLOCK(pipe->bus);
return;
}
@@ -2245,8 +2245,8 @@
pipe->urb_curr = NULL;
}
/* Flush queued urbs */
- while ((urb = TAILQ_FIRST(&pipe->urb_xmit_q)) != NULL) {
- TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next);
+ while ((urb = TAILQ_FIRST(&pipe->urb_hc_q)) != NULL) {
+ TAILQ_REMOVE(&pipe->urb_hc_q, urb, ub_hcnext);
usb2_transfer_done(urb, USB_ERR_CANCELLED);
}
}
@@ -2257,7 +2257,7 @@
static void
ehci_device_bulk_open(struct usb_pipe *pipe)
{
- KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q"));
+ KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q"));
return;
}
@@ -2309,7 +2309,7 @@
static void
ehci_device_ctrl_open(struct usb_pipe *pipe)
{
- KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q"));
+ KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q"));
return;
}
@@ -2355,7 +2355,7 @@
uint16_t x;
uint8_t slot;
- KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q"));
+ KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q"));
/* Allocate a microframe slot first: */
@@ -2363,7 +2363,7 @@
slot = usb2_intr_schedule_adjust
(pipe->xroot->udev, pipe->max_frame_size, USB_HS_MICRO_FRAMES_MAX);
- if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) {
+ if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) {
pipe->usb2_uframe = slot;
pipe->usb2_smask = (1 << slot) & 0xFF;
pipe->usb2_cmask = 0;
@@ -2452,7 +2452,7 @@
uint32_t sitd_portaddr;
uint8_t ds;
- KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q"));
+ KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q"));
USB_BUS_LOCK(pipe->bus);
sitd_portaddr =
@@ -2739,7 +2739,7 @@
uint32_t temp;
uint8_t ds;
- KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q"));
+ KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q"));
/* initialize all TD's */
@@ -3260,13 +3260,13 @@
EOWRITE4(sc, port, v | EHCI_PS_FPR);
}
/* wait 20ms for resume sequence to complete */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
EOWRITE4(sc, port, v & ~(EHCI_PS_SUSP |
EHCI_PS_FPR | (3 << 10) /* High Speed */ ));
/* 4ms settle time */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
break;
case UHF_PORT_POWER:
EOWRITE4(sc, port, v & ~EHCI_PS_PP);
@@ -3417,7 +3417,7 @@
EOWRITE4(sc, port, v | EHCI_PS_PR);
/* Wait for reset to complete. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY));
/* Terminate reset sequence. */
@@ -3425,7 +3425,7 @@
EOWRITE4(sc, port, v);
/* Wait for HC to complete reset. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(EHCI_PORT_RESET_COMPLETE));
v = EOREAD4(sc, port);
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ====
@@ -474,7 +474,7 @@
"timed out waiting for BIOS\n");
break;
}
- usb2_pause_mtx(NULL, hz / 100); /* wait 10ms */
+ usb_pause_mtx(NULL, hz / 100); /* wait 10ms */
}
}
}
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#9 (text+ko) ====
@@ -229,7 +229,7 @@
/* wait 8 milliseconds */
/* Wait for reset to complete. */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125);
temp = MUSB2_READ_1(sc, MUSB2_REG_POWER);
temp &= ~MUSB2_MASK_RESUME;
@@ -1135,7 +1135,7 @@
DPRINTFN(8, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.max_frame_size = xfer->max_frame_size;
@@ -1709,7 +1709,7 @@
(sc->sc_clocks_on) (sc->sc_clocks_arg);
}
/* wait a little for things to stabilise */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
/* disable all interrupts */
@@ -1722,7 +1722,7 @@
musbotg_pull_common(sc, 0);
/* wait a little bit (10ms) */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
/* disable double packet buffering */
MUSB2_WRITE_2(sc, MUSB2_REG_RXDBDIS, 0xFFFF);
@@ -2031,7 +2031,7 @@
*/
temp = (nframes - xfer->endpoint->isoc_next) & MUSB2_MASK_FRAME;
- if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
+ if (usb_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
fs_frames = (xfer->nframes + 7) / 8;
} else {
fs_frames = xfer->nframes;
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#9 (text+ko) ====
@@ -182,7 +182,7 @@
DPRINTF("SMM active, request owner change\n");
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_OCR);
for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) {
- usb2_pause_mtx(NULL, hz / 1000);
+ usb_pause_mtx(NULL, hz / 1000);
ctl = OREAD4(sc, OHCI_CONTROL);
}
if (ctl & OHCI_IR) {
@@ -195,7 +195,7 @@
DPRINTF("cold started\n");
reset:
/* controller was cold started */
- usb2_pause_mtx(NULL,
+ usb_pause_mtx(NULL,
USB_MS_TO_TICKS(USB_BUS_RESET_DELAY));
}
@@ -206,7 +206,7 @@
DPRINTF("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev));
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
- usb2_pause_mtx(NULL,
+ usb_pause_mtx(NULL,
USB_MS_TO_TICKS(USB_BUS_RESET_DELAY));
/* we now own the host controller and the bus has been reset */
@@ -269,7 +269,7 @@
desca = OREAD4(sc, OHCI_RH_DESCRIPTOR_A);
OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca | OHCI_NOCP);
OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */
- usb2_pause_mtx(NULL,
+ usb_pause_mtx(NULL,
USB_MS_TO_TICKS(OHCI_ENABLE_POWER_DELAY));
OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca);
@@ -279,7 +279,7 @@
*/
sc->sc_noport = 0;
for (i = 0; (i < 10) && (sc->sc_noport == 0); i++) {
- usb2_pause_mtx(NULL,
+ usb_pause_mtx(NULL,
USB_MS_TO_TICKS(OHCI_READ_DESC_DELAY));
sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A));
}
@@ -398,7 +398,7 @@
/* set up the bus struct */
sc->sc_bus.methods = &ohci_bus_methods;
- usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0);
#ifdef USB_DEBUG
if (ohcidebug > 15) {
@@ -430,7 +430,7 @@
{
USB_BUS_LOCK(&sc->sc_bus);
- usb2_callout_stop(&sc->sc_tmo_rhsc);
+ usb_callout_stop(&sc->sc_tmo_rhsc);
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS);
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
@@ -438,9 +438,9 @@
USB_BUS_UNLOCK(&sc->sc_bus);
/* XXX let stray task complete */
- usb2_pause_mtx(NULL, hz / 20);
+ usb_pause_mtx(NULL, hz / 20);
- usb2_callout_drain(&sc->sc_tmo_rhsc);
+ usb_callout_drain(&sc->sc_tmo_rhsc);
}
/* NOTE: suspend/resume is called from
@@ -472,7 +472,7 @@
ctl |= OHCI_HCFS_SUSPEND;
OWRITE4(sc, OHCI_CONTROL, ctl);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_WAIT));
USB_BUS_UNLOCK(&sc->sc_bus);
@@ -503,11 +503,11 @@
ctl = OREAD4(sc, OHCI_CONTROL);
ctl |= OHCI_HCFS_RESUME;
OWRITE4(sc, OHCI_CONTROL, ctl);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_DELAY));
ctl = (ctl & ~OHCI_HCFS_MASK) | OHCI_HCFS_OPERATIONAL;
OWRITE4(sc, OHCI_CONTROL, ctl);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_RECOVERY));
sc->sc_control = sc->sc_intre = 0;
@@ -1235,7 +1235,7 @@
ohci_root_intr(sc);
/* do not allow RHSC interrupts > 1 per second */
- usb2_callout_reset(&sc->sc_tmo_rhsc, hz,
+ usb_callout_reset(&sc->sc_tmo_rhsc, hz,
(void *)&ohci_rhsc_enable, sc);
}
}
@@ -1436,7 +1436,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.average = xfer->max_hc_frame_size;
temp.max_frame_size = xfer->max_frame_size;
@@ -2385,7 +2385,7 @@
OWRITE4(sc, port, UPS_RESET);
for (v = 0;; v++) {
if (v < 12) {
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY));
if ((OREAD4(sc, port) & UPS_RESET) == 0) {
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#9 (text+ko) ====
@@ -298,7 +298,7 @@
/* wait 10 milliseconds */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
/* check that controller has started */
@@ -328,7 +328,7 @@
/* wait */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_BUS_RESET_DELAY));
/* terminate all transfers */
@@ -341,7 +341,7 @@
while (n--) {
/* wait one millisecond */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
if (!(UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET)) {
goto done_1;
@@ -357,7 +357,7 @@
while (n--) {
/* wait one millisecond */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
/* check if HC is stopped */
if (UREAD2(sc, UHCI_STS) & UHCI_STS_HCH) {
@@ -377,7 +377,7 @@
USB_BUS_UNLOCK(&sc->sc_bus);
/* stop root interrupt */
- usb2_callout_drain(&sc->sc_root_intr);
+ usb_callout_drain(&sc->sc_root_intr);
USB_BUS_LOCK(&sc->sc_bus);
}
@@ -453,7 +453,7 @@
DPRINTF("start\n");
- usb2_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0);
#ifdef USB_DEBUG
if (uhcidebug > 2) {
@@ -682,7 +682,7 @@
UHCICMD(sc, UHCI_CMD_EGSM);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_WAIT));
USB_BUS_UNLOCK(&sc->sc_bus);
@@ -701,7 +701,7 @@
UHCICMD(sc, UHCI_CMD_FGR);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_RESUME_DELAY));
/* and start traffic again */
@@ -1704,7 +1704,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.average = xfer->max_frame_size;
temp.max_frame_size = xfer->max_frame_size;
@@ -2435,7 +2435,7 @@
x = URWMASK(UREAD2(sc, port));
UWRITE2(sc, port, x | UHCI_PORTSC_PR);
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY));
DPRINTFN(4, "uhci port %d reset, status0 = 0x%04x\n",
@@ -2463,7 +2463,7 @@
for (lim = 0; lim < 12; lim++) {
- usb2_pause_mtx(&sc->sc_bus.bus_mtx,
+ usb_pause_mtx(&sc->sc_bus.bus_mtx,
USB_MS_TO_TICKS(USB_PORT_RESET_DELAY));
x = UREAD2(sc, port);
@@ -2758,14 +2758,14 @@
UWRITE2(sc, port, URWMASK(x));
/* wait 20ms for resume sequence to complete */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
/* clear suspend and resume detect */
UWRITE2(sc, port, URWMASK(x) & ~(UHCI_PORTSC_RD |
UHCI_PORTSC_SUSP));
/* wait a little bit */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 500);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 500);
sc->sc_isresumed |= (1 << index);
@@ -2857,7 +2857,7 @@
}
/* restart timer */
- usb2_callout_reset(&sc->sc_root_intr, hz,
+ usb_callout_reset(&sc->sc_root_intr, hz,
(void *)&uhci_root_intr, sc);
if (sc->sc_hub_idata[0] != 0) {
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#8 (text+ko) ====
@@ -160,7 +160,7 @@
return (0);
}
/* Stop power watchdog */
- usb2_callout_drain(&bus->power_wdog);
+ usb_callout_drain(&bus->power_wdog);
/* Let the USB explore process detach all devices. */
if (bus->bus_roothold != NULL) {
@@ -291,7 +291,7 @@
USB_BUS_LOCK_ASSERT(bus, MA_OWNED);
- usb2_callout_reset(&bus->power_wdog,
+ usb_callout_reset(&bus->power_wdog,
4 * hz, usb2_power_wdog, arg);
USB_BUS_UNLOCK(bus);
@@ -386,7 +386,7 @@
if (err) {
device_printf(bus->bdev, "Root HUB problem, error=%s\n",
- usb2_errstr(err));
+ usb_errstr(err));
}
/* set softc - we are ready */
@@ -563,7 +563,7 @@
mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent),
NULL, MTX_DEF | MTX_RECURSE);
- usb2_callout_init_mtx(&bus->power_wdog,
+ usb_callout_init_mtx(&bus->power_wdog,
&bus->bus_mtx, 0);
TAILQ_INIT(&bus->intr_q.head);
==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#9 (text+ko) ====
@@ -849,7 +849,7 @@
DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n",
xfer->address, UE_GET_ADDR(xfer->endpointno),
- xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
+ xfer->sumlen, usb_get_speed(xfer->xroot->udev));
temp.max_frame_size = xfer->max_frame_size;
@@ -1360,7 +1360,7 @@
uss820dci_pull_down(sc);
/* wait 10ms for pulldown to stabilise */
- usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
+ usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100);
/* check hardware revision */
temp = USS820_READ_1(sc, USS820_REV);
==== //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#8 (text+ko) ====
@@ -631,7 +631,7 @@
DPRINTFN(10, "sc=%p\n", sc);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "uhid lock", NULL, MTX_DEF | MTX_RECURSE);
@@ -645,7 +645,7 @@
UHID_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
- DPRINTF("error=%s\n", usb2_errstr(error));
+ DPRINTF("error=%s\n", usb_errstr(error));
goto detach;
}
if (uaa->info.idVendor == USB_VENDOR_WACOM) {
@@ -673,7 +673,7 @@
if (error) {
DPRINTF("set report failed, error=%s (ignored)\n",
- usb2_errstr(error));
+ usb_errstr(error));
}
sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr);
sc->sc_repdesc_ptr = USB_ADD_BYTES(uhid_graphire3_4x5_report_descr, 0);
@@ -704,7 +704,7 @@
if (error) {
DPRINTF("set idle failed, error=%s (ignored)\n",
- usb2_errstr(error));
+ usb_errstr(error));
}
sc->sc_isize = hid_report_size
(sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_input, &sc->sc_iid);
==== //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#9 (text+ko) ====
@@ -453,7 +453,7 @@
}
ukbd_interrupt(sc);
- usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
+ usb_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc);
}
static uint8_t
@@ -574,7 +574,7 @@
break;
default: /* Error */
- DPRINTF("error=%s\n", usb2_errstr(xfer->error));
+ DPRINTF("error=%s\n", usb_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
@@ -627,7 +627,7 @@
return;
default: /* Error */
- DPRINTFN(0, "error=%s\n", usb2_errstr(xfer->error));
+ DPRINTFN(0, "error=%s\n", usb_errstr(xfer->error));
return;
}
}
@@ -698,7 +698,7 @@
kbd->kb_data = (void *)sc;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
sc->sc_udev = uaa->device;
sc->sc_iface = uaa->iface;
@@ -706,14 +706,14 @@
sc->sc_iface_no = uaa->info.bIfaceNum;
sc->sc_mode = K_XLATE;
- usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0);
+ usb_callout_init_mtx(&sc->sc_callout, &Giant, 0);
err = usb2_transfer_setup(uaa->device,
&uaa->info.bIfaceIndex, sc->sc_xfer, ukbd_config,
UKBD_N_TRANSFER, sc, &Giant);
if (err) {
- DPRINTF("error=%s\n", usb2_errstr(err));
+ DPRINTF("error=%s\n", usb_errstr(err));
goto detach;
}
/* setup default keyboard maps */
@@ -835,7 +835,7 @@
}
sc->sc_flags |= UKBD_FLAG_GONE;
- usb2_callout_stop(&sc->sc_callout);
+ usb_callout_stop(&sc->sc_callout);
ukbd_disable(&sc->sc_kbd);
@@ -861,7 +861,7 @@
usb2_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER);
- usb2_callout_drain(&sc->sc_callout);
+ usb_callout_drain(&sc->sc_callout);
DPRINTF("%s: disconnected\n",
device_get_nameunit(dev));
==== //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#8 (text+ko) ====
@@ -286,11 +286,11 @@
(dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) &&
(dw == 0) && (buttons == 0)) {
- usb2_callout_reset(&sc->sc_callout, hz / 20,
+ usb_callout_reset(&sc->sc_callout, hz / 20,
&ums_put_queue_timeout, sc);
} else {
- usb2_callout_stop(&sc->sc_callout);
+ usb_callout_stop(&sc->sc_callout);
ums_put_queue(sc, dx, dy, dz, dt, buttons);
}
@@ -341,7 +341,7 @@
if (uaa->usb_mode != USB_MODE_HOST)
return (ENXIO);
- id = usb2_get_interface_descriptor(uaa->iface);
+ id = usb_get_interface_descriptor(uaa->iface);
if ((id == NULL) ||
(id->bInterfaceClass != UICLASS_HID))
@@ -478,11 +478,11 @@
DPRINTFN(11, "sc=%p\n", sc);
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE);
- usb2_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
+ usb_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0);
/*
* Force the report (non-boot) protocol.
@@ -498,7 +498,7 @@
UMS_N_TRANSFER, sc, &sc->sc_mtx);
if (err) {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list