47c47
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci.c 193644 2009-06-07 19:41:11Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci.c 194228 2009-06-15 01:02:43Z thompsa $");
156c156
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
192c192
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
224c224
< 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);
277c277
< usb2_get_page(sc->sc_hw.intr_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.intr_start_pc + i, 0, &buf_res);
345c345
< usb2_get_page(sc->sc_hw.isoc_fs_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.isoc_fs_start_pc + i, 0, &buf_res);
370c370
< usb2_get_page(sc->sc_hw.isoc_hs_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.isoc_hs_start_pc + i, 0, &buf_res);
392c392
< usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
412c412
< usb2_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
448c448
< usb2_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
---
> usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
475c475
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
501c501
< usb2_callout_stop(&sc->sc_tmo_pcd);
---
> usb_callout_stop(&sc->sc_tmo_pcd);
511c511
< usb2_pause_mtx(NULL, hz / 20);
---
> usb_pause_mtx(NULL, hz / 20);
513c513
< usb2_callout_drain(&sc->sc_tmo_pcd);
---
> usb_callout_drain(&sc->sc_tmo_pcd);
546c546
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
560c560
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
583c583
< usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
586c586
< usb2_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
603c603
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
622c622
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
630c630
< usb2_pause_mtx(NULL,
---
> usb_pause_mtx(NULL,
796c796
< usb2_pc_cpu_invalidate(sqtd->page_cache);
---
> usb_pc_cpu_invalidate(sqtd->page_cache);
824c824
< usb2_pc_cpu_invalidate(qh->page_cache);
---
> usb_pc_cpu_invalidate(qh->page_cache);
854c854
< usb2_pc_cpu_invalidate(sitd->page_cache);
---
> usb_pc_cpu_invalidate(sitd->page_cache);
880c880
< usb2_pc_cpu_invalidate(itd->page_cache);
---
> usb_pc_cpu_invalidate(itd->page_cache);
962c962
< usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
---
> usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
966c966
< usb2_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout);
---
> usbd_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout);
983c983
< usb2_pc_cpu_flush(std->page_cache);
---
> usb_pc_cpu_flush(std->page_cache);
991c991
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1009c1009
< usb2_pc_cpu_flush(std->page_cache);
---
> usb_pc_cpu_flush(std->page_cache);
1017c1017
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1040c1040
< usb2_pc_cpu_flush(sqh->page_cache);
---
> usb_pc_cpu_flush(sqh->page_cache);
1049c1049
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1065c1065
< usb2_pc_cpu_flush(std->prev->page_cache);
---
> usb_pc_cpu_flush(std->prev->page_cache);
1069c1069
< usb2_pc_cpu_flush(std->next->page_cache);
---
> usb_pc_cpu_flush(std->next->page_cache);
1085c1085
< usb2_pc_cpu_flush(std->prev->page_cache);
---
> usb_pc_cpu_flush(std->prev->page_cache);
1089c1089
< usb2_pc_cpu_flush(std->next->page_cache);
---
> usb_pc_cpu_flush(std->next->page_cache);
1108c1108
< usb2_pc_cpu_flush(sqh->prev->page_cache);
---
> usb_pc_cpu_flush(sqh->prev->page_cache);
1112c1112
< usb2_pc_cpu_flush(sqh->next->page_cache);
---
> usb_pc_cpu_flush(sqh->next->page_cache);
1118c1118
< usb2_pc_cpu_flush(sqh->page_cache);
---
> usb_pc_cpu_flush(sqh->page_cache);
1140c1140
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1290c1290
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1296c1296
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1309c1309
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1318c1318
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1342c1342
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1478c1478
< usb2_callout_reset(&sc->sc_tmo_pcd, hz,
---
> usb_callout_reset(&sc->sc_tmo_pcd, hz,
1637c1637
< usb2_get_page(temp->pc, buf_offset, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset, &buf_res);
1647c1647
< usb2_get_page(temp->pc, buf_offset, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset, &buf_res);
1664c1664
< usb2_get_page(temp->pc, buf_offset - 1, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset - 1, &buf_res);
1678c1678
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
1720c1720
< xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
---
> xfer->sumlen, usbd_get_speed(xfer->xroot->udev));
1752c1752
< if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
---
> if (usbd_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
1875c1875
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
1901c1901
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
1908c1908
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
1929,1930c1929,1930
< EHCI_QH_SET_CMASK(xfer->usb2_cmask) |
< EHCI_QH_SET_SMASK(xfer->usb2_smask) |
---
> EHCI_QH_SET_CMASK(xfer->usb_cmask) |
> EHCI_QH_SET_SMASK(xfer->usb_smask) |
1958c1958
< usb2_pc_cpu_flush(qh->page_cache);
---
> usb_pc_cpu_flush(qh->page_cache);
2019c2019
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
2074c2074
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
2158c2158
< usb2_transfer_done(xfer, error);
---
> usbd_transfer_done(xfer, error);
2266c2266
< slot = usb2_intr_schedule_adjust
---
> slot = usb_intr_schedule_adjust
2269,2272c2269,2272
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
< xfer->usb2_uframe = slot;
< xfer->usb2_smask = (1 << slot) & 0xFF;
< xfer->usb2_cmask = 0;
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
> xfer->usb_uframe = slot;
> xfer->usb_smask = (1 << slot) & 0xFF;
> xfer->usb_cmask = 0;
2274,2276c2274,2276
< xfer->usb2_uframe = slot;
< xfer->usb2_smask = (1 << slot) & 0x3F;
< xfer->usb2_cmask = (-(4 << slot)) & 0xFE;
---
> xfer->usb_uframe = slot;
> xfer->usb_smask = (1 << slot) & 0x3F;
> xfer->usb_cmask = (-(4 << slot)) & 0xFE;
2314,2315c2314,2315
< slot = usb2_intr_schedule_adjust
< (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb2_uframe);
---
> slot = usb_intr_schedule_adjust
> (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb_uframe);
2387c2387
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2462c2462
< usb2_fs_isoc_schedule_isoc_time_expand
---
> usbd_fs_isoc_schedule_isoc_time_expand
2518c2518
< error = usb2_fs_isoc_schedule_alloc(fss, &sa, *plen);
---
> error = usbd_fs_isoc_schedule_alloc(fss, &sa, *plen);
2528c2528
< * only call "usb2_get_page()" when we have a
---
> * only call "usbd_get_page()" when we have a
2531c2531
< usb2_get_page(xfer->frbuffers, buf_offset, &buf_res);
---
> usbd_get_page(xfer->frbuffers, buf_offset, &buf_res);
2538c2538
< usb2_get_page(xfer->frbuffers, buf_offset - 1,
---
> usbd_get_page(xfer->frbuffers, buf_offset - 1,
2591c2591
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2676c2676
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2748c2748
< usb2_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset +
---
> usb_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset +
2815c2815
< usb2_get_page(xfer->frbuffers, itd_offset[0], &buf_res);
---
> usbd_get_page(xfer->frbuffers, itd_offset[0], &buf_res);
2835c2835
< usb2_get_page(xfer->frbuffers, buf_offset - 1, &buf_res);
---
> usbd_get_page(xfer->frbuffers, buf_offset - 1, &buf_res);
2837c2837
< usb2_get_page(xfer->frbuffers, itd_offset[x + 1], &buf_res);
---
> usbd_get_page(xfer->frbuffers, itd_offset[x + 1], &buf_res);
2858c2858
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
3084c3084
< len = usb2_make_str_desc(
---
> len = usb_make_str_desc(
3159c3159
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
3165c3165
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
3316c3316
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
3324c3324
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
3441c3441
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3454c3454
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3476c3476
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3489c3489
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3500c3500
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3510c3510
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3523c3523
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3533c3533
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3544c3544
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3547c3547
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3557c3557
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3568c3568
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3571c3571
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3581c3581
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3592c3592
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3599c3599
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3609c3609
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3620c3620
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
< __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci.c 193644 2009-06-07 19:41:11Z thompsa $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci.c 194228 2009-06-15 01:02:43Z thompsa $");
156c156
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
192c192
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
224c224
< 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);
277c277
< usb2_get_page(sc->sc_hw.intr_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.intr_start_pc + i, 0, &buf_res);
345c345
< usb2_get_page(sc->sc_hw.isoc_fs_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.isoc_fs_start_pc + i, 0, &buf_res);
370c370
< usb2_get_page(sc->sc_hw.isoc_hs_start_pc + i, 0, &buf_res);
---
> usbd_get_page(sc->sc_hw.isoc_hs_start_pc + i, 0, &buf_res);
392c392
< usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
412c412
< usb2_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
448c448
< usb2_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
---
> usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
475c475
< usb2_pause_mtx(NULL, hz / 1000);
---
> usb_pause_mtx(NULL, hz / 1000);
501c501
< usb2_callout_stop(&sc->sc_tmo_pcd);
---
> usb_callout_stop(&sc->sc_tmo_pcd);
511c511
< usb2_pause_mtx(NULL, hz / 20);
---
> usb_pause_mtx(NULL, hz / 20);
513c513
< usb2_callout_drain(&sc->sc_tmo_pcd);
---
> usb_callout_drain(&sc->sc_tmo_pcd);
546c546
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
560c560
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
583c583
< usb2_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.pframes_pc, 0, &buf_res);
586c586
< usb2_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
---
> usbd_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res);
603c603
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
622c622
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000);
630c630
< usb2_pause_mtx(NULL,
---
> usb_pause_mtx(NULL,
796c796
< usb2_pc_cpu_invalidate(sqtd->page_cache);
---
> usb_pc_cpu_invalidate(sqtd->page_cache);
824c824
< usb2_pc_cpu_invalidate(qh->page_cache);
---
> usb_pc_cpu_invalidate(qh->page_cache);
854c854
< usb2_pc_cpu_invalidate(sitd->page_cache);
---
> usb_pc_cpu_invalidate(sitd->page_cache);
880c880
< usb2_pc_cpu_invalidate(itd->page_cache);
---
> usb_pc_cpu_invalidate(itd->page_cache);
962c962
< usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
---
> usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
966c966
< usb2_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout);
---
> usbd_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout);
983c983
< usb2_pc_cpu_flush(std->page_cache);
---
> usb_pc_cpu_flush(std->page_cache);
991c991
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1009c1009
< usb2_pc_cpu_flush(std->page_cache);
---
> usb_pc_cpu_flush(std->page_cache);
1017c1017
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1040c1040
< usb2_pc_cpu_flush(sqh->page_cache);
---
> usb_pc_cpu_flush(sqh->page_cache);
1049c1049
< usb2_pc_cpu_flush(last->page_cache);
---
> usb_pc_cpu_flush(last->page_cache);
1065c1065
< usb2_pc_cpu_flush(std->prev->page_cache);
---
> usb_pc_cpu_flush(std->prev->page_cache);
1069c1069
< usb2_pc_cpu_flush(std->next->page_cache);
---
> usb_pc_cpu_flush(std->next->page_cache);
1085c1085
< usb2_pc_cpu_flush(std->prev->page_cache);
---
> usb_pc_cpu_flush(std->prev->page_cache);
1089c1089
< usb2_pc_cpu_flush(std->next->page_cache);
---
> usb_pc_cpu_flush(std->next->page_cache);
1108c1108
< usb2_pc_cpu_flush(sqh->prev->page_cache);
---
> usb_pc_cpu_flush(sqh->prev->page_cache);
1112c1112
< usb2_pc_cpu_flush(sqh->next->page_cache);
---
> usb_pc_cpu_flush(sqh->next->page_cache);
1118c1118
< usb2_pc_cpu_flush(sqh->page_cache);
---
> usb_pc_cpu_flush(sqh->page_cache);
1140c1140
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1290c1290
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1296c1296
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1309c1309
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1318c1318
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1342c1342
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
1478c1478
< usb2_callout_reset(&sc->sc_tmo_pcd, hz,
---
> usb_callout_reset(&sc->sc_tmo_pcd, hz,
1637c1637
< usb2_get_page(temp->pc, buf_offset, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset, &buf_res);
1647c1647
< usb2_get_page(temp->pc, buf_offset, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset, &buf_res);
1664c1664
< usb2_get_page(temp->pc, buf_offset - 1, &buf_res);
---
> usbd_get_page(temp->pc, buf_offset - 1, &buf_res);
1678c1678
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
1720c1720
< xfer->sumlen, usb2_get_speed(xfer->xroot->udev));
---
> xfer->sumlen, usbd_get_speed(xfer->xroot->udev));
1752c1752
< if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
---
> if (usbd_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
1875c1875
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
1901c1901
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
1908c1908
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) {
1929,1930c1929,1930
< EHCI_QH_SET_CMASK(xfer->usb2_cmask) |
< EHCI_QH_SET_SMASK(xfer->usb2_smask) |
---
> EHCI_QH_SET_CMASK(xfer->usb_cmask) |
> EHCI_QH_SET_SMASK(xfer->usb_smask) |
1958c1958
< usb2_pc_cpu_flush(qh->page_cache);
---
> usb_pc_cpu_flush(qh->page_cache);
2019c2019
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
2074c2074
< usb2_pc_cpu_invalidate(td->page_cache);
---
> usb_pc_cpu_invalidate(td->page_cache);
2158c2158
< usb2_transfer_done(xfer, error);
---
> usbd_transfer_done(xfer, error);
2266c2266
< slot = usb2_intr_schedule_adjust
---
> slot = usb_intr_schedule_adjust
2269,2272c2269,2272
< if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
< xfer->usb2_uframe = slot;
< xfer->usb2_smask = (1 << slot) & 0xFF;
< xfer->usb2_cmask = 0;
---
> if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
> xfer->usb_uframe = slot;
> xfer->usb_smask = (1 << slot) & 0xFF;
> xfer->usb_cmask = 0;
2274,2276c2274,2276
< xfer->usb2_uframe = slot;
< xfer->usb2_smask = (1 << slot) & 0x3F;
< xfer->usb2_cmask = (-(4 << slot)) & 0xFE;
---
> xfer->usb_uframe = slot;
> xfer->usb_smask = (1 << slot) & 0x3F;
> xfer->usb_cmask = (-(4 << slot)) & 0xFE;
2314,2315c2314,2315
< slot = usb2_intr_schedule_adjust
< (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb2_uframe);
---
> slot = usb_intr_schedule_adjust
> (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb_uframe);
2387c2387
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2462c2462
< usb2_fs_isoc_schedule_isoc_time_expand
---
> usbd_fs_isoc_schedule_isoc_time_expand
2518c2518
< error = usb2_fs_isoc_schedule_alloc(fss, &sa, *plen);
---
> error = usbd_fs_isoc_schedule_alloc(fss, &sa, *plen);
2528c2528
< * only call "usb2_get_page()" when we have a
---
> * only call "usbd_get_page()" when we have a
2531c2531
< usb2_get_page(xfer->frbuffers, buf_offset, &buf_res);
---
> usbd_get_page(xfer->frbuffers, buf_offset, &buf_res);
2538c2538
< usb2_get_page(xfer->frbuffers, buf_offset - 1,
---
> usbd_get_page(xfer->frbuffers, buf_offset - 1,
2591c2591
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2676c2676
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
2748c2748
< usb2_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset +
---
> usb_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset +
2815c2815
< usb2_get_page(xfer->frbuffers, itd_offset[0], &buf_res);
---
> usbd_get_page(xfer->frbuffers, itd_offset[0], &buf_res);
2835c2835
< usb2_get_page(xfer->frbuffers, buf_offset - 1, &buf_res);
---
> usbd_get_page(xfer->frbuffers, buf_offset - 1, &buf_res);
2837c2837
< usb2_get_page(xfer->frbuffers, itd_offset[x + 1], &buf_res);
---
> usbd_get_page(xfer->frbuffers, itd_offset[x + 1], &buf_res);
2858c2858
< usb2_pc_cpu_flush(td->page_cache);
---
> usb_pc_cpu_flush(td->page_cache);
3084c3084
< len = usb2_make_str_desc(
---
> len = usb_make_str_desc(
3159c3159
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50);
3165c3165
< usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250);
3316c3316
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
3324c3324
< usb2_pause_mtx(&sc->sc_bus.bus_mtx,
---
> usb_pause_mtx(&sc->sc_bus.bus_mtx,
3441c3441
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3454c3454
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3476c3476
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3489c3489
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3500c3500
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3510c3510
< usb2_transfer_setup_sub(parm);
---
> usbd_transfer_setup_sub(parm);
3523c3523
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3533c3533
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3544c3544
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3547c3547
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3557c3557
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3568c3568
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3571c3571
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3581c3581
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3592c3592
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);
3599c3599
< if (usb2_transfer_setup_sub_malloc(
---
> if (usbd_transfer_setup_sub_malloc(
3609c3609
< usb2_get_page(pc + n, 0, &page_info);
---
> usbd_get_page(pc + n, 0, &page_info);
3620c3620
< usb2_pc_cpu_flush(pc + n);
---
> usb_pc_cpu_flush(pc + n);