From 56635f6bd3b14654919f320ebf1ef8107e44a9ac Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 6 Sep 2006 23:44:25 +0000 Subject: s/Static/static/g s/device_ptr_t/device_t/g No md5 changes in the .o's # Note to the md5 tracking club: $FreeBSD$ changes md5 after every commit # so you need to checkout -kk to get $FreeBSD$ instead of the actual value # of the keyword. --- sys/dev/usb/ohci.c | 266 ++++++++++++++++++++++++++--------------------------- 1 file changed, 133 insertions(+), 133 deletions(-) (limited to 'sys/dev/usb/ohci.c') diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 7156f7ebcfa2..9cdbe1685dc6 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -132,116 +132,116 @@ SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW, struct ohci_pipe; -Static ohci_soft_ed_t *ohci_alloc_sed(ohci_softc_t *); -Static void ohci_free_sed(ohci_softc_t *, ohci_soft_ed_t *); +static ohci_soft_ed_t *ohci_alloc_sed(ohci_softc_t *); +static void ohci_free_sed(ohci_softc_t *, ohci_soft_ed_t *); -Static ohci_soft_td_t *ohci_alloc_std(ohci_softc_t *); -Static void ohci_free_std(ohci_softc_t *, ohci_soft_td_t *); +static ohci_soft_td_t *ohci_alloc_std(ohci_softc_t *); +static void ohci_free_std(ohci_softc_t *, ohci_soft_td_t *); -Static ohci_soft_itd_t *ohci_alloc_sitd(ohci_softc_t *); -Static void ohci_free_sitd(ohci_softc_t *,ohci_soft_itd_t *); +static ohci_soft_itd_t *ohci_alloc_sitd(ohci_softc_t *); +static void ohci_free_sitd(ohci_softc_t *,ohci_soft_itd_t *); #if 0 -Static void ohci_free_std_chain(ohci_softc_t *, ohci_soft_td_t *, +static void ohci_free_std_chain(ohci_softc_t *, ohci_soft_td_t *, ohci_soft_td_t *); #endif -Static usbd_status ohci_alloc_std_chain(struct ohci_pipe *, +static usbd_status ohci_alloc_std_chain(struct ohci_pipe *, ohci_softc_t *, int, int, usbd_xfer_handle, ohci_soft_td_t *, ohci_soft_td_t **); #if defined(__NetBSD__) || defined(__OpenBSD__) -Static void ohci_shutdown(void *v); -Static void ohci_power(int, void *); +static void ohci_shutdown(void *v); +static void ohci_power(int, void *); #endif -Static usbd_status ohci_open(usbd_pipe_handle); -Static void ohci_poll(struct usbd_bus *); -Static void ohci_softintr(void *); -Static void ohci_waitintr(ohci_softc_t *, usbd_xfer_handle); -Static void ohci_add_done(ohci_softc_t *, ohci_physaddr_t); -Static void ohci_rhsc(ohci_softc_t *, usbd_xfer_handle); - -Static usbd_status ohci_device_request(usbd_xfer_handle xfer); -Static void ohci_add_ed(ohci_soft_ed_t *, ohci_soft_ed_t *); -Static void ohci_rem_ed(ohci_soft_ed_t *, ohci_soft_ed_t *); -Static void ohci_hash_add_td(ohci_softc_t *, ohci_soft_td_t *); -Static void ohci_hash_rem_td(ohci_softc_t *, ohci_soft_td_t *); -Static ohci_soft_td_t *ohci_hash_find_td(ohci_softc_t *, ohci_physaddr_t); -Static void ohci_hash_add_itd(ohci_softc_t *, ohci_soft_itd_t *); -Static void ohci_hash_rem_itd(ohci_softc_t *, ohci_soft_itd_t *); -Static ohci_soft_itd_t *ohci_hash_find_itd(ohci_softc_t *, ohci_physaddr_t); - -Static usbd_status ohci_setup_isoc(usbd_pipe_handle pipe); -Static void ohci_device_isoc_enter(usbd_xfer_handle); - -Static usbd_status ohci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t); -Static void ohci_freem(struct usbd_bus *, usb_dma_t *); - -Static usbd_xfer_handle ohci_allocx(struct usbd_bus *); -Static void ohci_freex(struct usbd_bus *, usbd_xfer_handle); - -Static usbd_status ohci_root_ctrl_transfer(usbd_xfer_handle); -Static usbd_status ohci_root_ctrl_start(usbd_xfer_handle); -Static void ohci_root_ctrl_abort(usbd_xfer_handle); -Static void ohci_root_ctrl_close(usbd_pipe_handle); -Static void ohci_root_ctrl_done(usbd_xfer_handle); - -Static usbd_status ohci_root_intr_transfer(usbd_xfer_handle); -Static usbd_status ohci_root_intr_start(usbd_xfer_handle); -Static void ohci_root_intr_abort(usbd_xfer_handle); -Static void ohci_root_intr_close(usbd_pipe_handle); -Static void ohci_root_intr_done(usbd_xfer_handle); - -Static usbd_status ohci_device_ctrl_transfer(usbd_xfer_handle); -Static usbd_status ohci_device_ctrl_start(usbd_xfer_handle); -Static void ohci_device_ctrl_abort(usbd_xfer_handle); -Static void ohci_device_ctrl_close(usbd_pipe_handle); -Static void ohci_device_ctrl_done(usbd_xfer_handle); - -Static usbd_status ohci_device_bulk_transfer(usbd_xfer_handle); -Static usbd_status ohci_device_bulk_start(usbd_xfer_handle); -Static void ohci_device_bulk_abort(usbd_xfer_handle); -Static void ohci_device_bulk_close(usbd_pipe_handle); -Static void ohci_device_bulk_done(usbd_xfer_handle); - -Static usbd_status ohci_device_intr_transfer(usbd_xfer_handle); -Static usbd_status ohci_device_intr_start(usbd_xfer_handle); -Static void ohci_device_intr_abort(usbd_xfer_handle); -Static void ohci_device_intr_close(usbd_pipe_handle); -Static void ohci_device_intr_done(usbd_xfer_handle); - -Static usbd_status ohci_device_isoc_transfer(usbd_xfer_handle); -Static usbd_status ohci_device_isoc_start(usbd_xfer_handle); -Static void ohci_device_isoc_abort(usbd_xfer_handle); -Static void ohci_device_isoc_close(usbd_pipe_handle); -Static void ohci_device_isoc_done(usbd_xfer_handle); - -Static usbd_status ohci_device_setintr(ohci_softc_t *sc, +static usbd_status ohci_open(usbd_pipe_handle); +static void ohci_poll(struct usbd_bus *); +static void ohci_softintr(void *); +static void ohci_waitintr(ohci_softc_t *, usbd_xfer_handle); +static void ohci_add_done(ohci_softc_t *, ohci_physaddr_t); +static void ohci_rhsc(ohci_softc_t *, usbd_xfer_handle); + +static usbd_status ohci_device_request(usbd_xfer_handle xfer); +static void ohci_add_ed(ohci_soft_ed_t *, ohci_soft_ed_t *); +static void ohci_rem_ed(ohci_soft_ed_t *, ohci_soft_ed_t *); +static void ohci_hash_add_td(ohci_softc_t *, ohci_soft_td_t *); +static void ohci_hash_rem_td(ohci_softc_t *, ohci_soft_td_t *); +static ohci_soft_td_t *ohci_hash_find_td(ohci_softc_t *, ohci_physaddr_t); +static void ohci_hash_add_itd(ohci_softc_t *, ohci_soft_itd_t *); +static void ohci_hash_rem_itd(ohci_softc_t *, ohci_soft_itd_t *); +static ohci_soft_itd_t *ohci_hash_find_itd(ohci_softc_t *, ohci_physaddr_t); + +static usbd_status ohci_setup_isoc(usbd_pipe_handle pipe); +static void ohci_device_isoc_enter(usbd_xfer_handle); + +static usbd_status ohci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t); +static void ohci_freem(struct usbd_bus *, usb_dma_t *); + +static usbd_xfer_handle ohci_allocx(struct usbd_bus *); +static void ohci_freex(struct usbd_bus *, usbd_xfer_handle); + +static usbd_status ohci_root_ctrl_transfer(usbd_xfer_handle); +static usbd_status ohci_root_ctrl_start(usbd_xfer_handle); +static void ohci_root_ctrl_abort(usbd_xfer_handle); +static void ohci_root_ctrl_close(usbd_pipe_handle); +static void ohci_root_ctrl_done(usbd_xfer_handle); + +static usbd_status ohci_root_intr_transfer(usbd_xfer_handle); +static usbd_status ohci_root_intr_start(usbd_xfer_handle); +static void ohci_root_intr_abort(usbd_xfer_handle); +static void ohci_root_intr_close(usbd_pipe_handle); +static void ohci_root_intr_done(usbd_xfer_handle); + +static usbd_status ohci_device_ctrl_transfer(usbd_xfer_handle); +static usbd_status ohci_device_ctrl_start(usbd_xfer_handle); +static void ohci_device_ctrl_abort(usbd_xfer_handle); +static void ohci_device_ctrl_close(usbd_pipe_handle); +static void ohci_device_ctrl_done(usbd_xfer_handle); + +static usbd_status ohci_device_bulk_transfer(usbd_xfer_handle); +static usbd_status ohci_device_bulk_start(usbd_xfer_handle); +static void ohci_device_bulk_abort(usbd_xfer_handle); +static void ohci_device_bulk_close(usbd_pipe_handle); +static void ohci_device_bulk_done(usbd_xfer_handle); + +static usbd_status ohci_device_intr_transfer(usbd_xfer_handle); +static usbd_status ohci_device_intr_start(usbd_xfer_handle); +static void ohci_device_intr_abort(usbd_xfer_handle); +static void ohci_device_intr_close(usbd_pipe_handle); +static void ohci_device_intr_done(usbd_xfer_handle); + +static usbd_status ohci_device_isoc_transfer(usbd_xfer_handle); +static usbd_status ohci_device_isoc_start(usbd_xfer_handle); +static void ohci_device_isoc_abort(usbd_xfer_handle); +static void ohci_device_isoc_close(usbd_pipe_handle); +static void ohci_device_isoc_done(usbd_xfer_handle); + +static usbd_status ohci_device_setintr(ohci_softc_t *sc, struct ohci_pipe *pipe, int ival); -Static usbd_status ohci_device_intr_insert(ohci_softc_t *sc, +static usbd_status ohci_device_intr_insert(ohci_softc_t *sc, usbd_xfer_handle xfer); -Static int ohci_str(usb_string_descriptor_t *, int, const char *); +static int ohci_str(usb_string_descriptor_t *, int, const char *); -Static void ohci_timeout(void *); -Static void ohci_timeout_task(void *); -Static void ohci_rhsc_able(ohci_softc_t *, int); -Static void ohci_rhsc_enable(void *); +static void ohci_timeout(void *); +static void ohci_timeout_task(void *); +static void ohci_rhsc_able(ohci_softc_t *, int); +static void ohci_rhsc_enable(void *); -Static void ohci_close_pipe(usbd_pipe_handle, ohci_soft_ed_t *); -Static void ohci_abort_xfer(usbd_xfer_handle, usbd_status); +static void ohci_close_pipe(usbd_pipe_handle, ohci_soft_ed_t *); +static void ohci_abort_xfer(usbd_xfer_handle, usbd_status); -Static void ohci_device_clear_toggle(usbd_pipe_handle pipe); -Static void ohci_noop(usbd_pipe_handle pipe); +static void ohci_device_clear_toggle(usbd_pipe_handle pipe); +static void ohci_noop(usbd_pipe_handle pipe); -Static usbd_status ohci_controller_init(ohci_softc_t *sc); +static usbd_status ohci_controller_init(ohci_softc_t *sc); #ifdef USB_DEBUG -Static void ohci_dumpregs(ohci_softc_t *); -Static void ohci_dump_tds(ohci_soft_td_t *); -Static void ohci_dump_td(ohci_soft_td_t *); -Static void ohci_dump_ed(ohci_soft_ed_t *); -Static void ohci_dump_itd(ohci_soft_itd_t *); -Static void ohci_dump_itds(ohci_soft_itd_t *); +static void ohci_dumpregs(ohci_softc_t *); +static void ohci_dump_tds(ohci_soft_td_t *); +static void ohci_dump_td(ohci_soft_td_t *); +static void ohci_dump_ed(ohci_soft_ed_t *); +static void ohci_dump_itd(ohci_soft_itd_t *); +static void ohci_dump_itds(ohci_soft_itd_t *); #endif #define OBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->sc_size, \ @@ -257,7 +257,7 @@ Static void ohci_dump_itds(ohci_soft_itd_t *); #define OREAD4(sc, r) (OBARR(sc), bus_space_read_4((sc)->iot, (sc)->ioh, (r))) /* Reverse the bits in a value 0 .. 31 */ -Static u_int8_t revbits[OHCI_NO_INTRS] = +static u_int8_t revbits[OHCI_NO_INTRS] = { 0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0c, 0x1c, 0x02, 0x12, 0x0a, 0x1a, 0x06, 0x16, 0x0e, 0x1e, 0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0d, 0x1d, @@ -298,7 +298,7 @@ struct ohci_pipe { #define OHCI_INTR_ENDPT 1 -Static struct usbd_bus_methods ohci_bus_methods = { +static struct usbd_bus_methods ohci_bus_methods = { ohci_open, ohci_softintr, ohci_poll, @@ -308,7 +308,7 @@ Static struct usbd_bus_methods ohci_bus_methods = { ohci_freex, }; -Static struct usbd_pipe_methods ohci_root_ctrl_methods = { +static struct usbd_pipe_methods ohci_root_ctrl_methods = { ohci_root_ctrl_transfer, ohci_root_ctrl_start, ohci_root_ctrl_abort, @@ -317,7 +317,7 @@ Static struct usbd_pipe_methods ohci_root_ctrl_methods = { ohci_root_ctrl_done, }; -Static struct usbd_pipe_methods ohci_root_intr_methods = { +static struct usbd_pipe_methods ohci_root_intr_methods = { ohci_root_intr_transfer, ohci_root_intr_start, ohci_root_intr_abort, @@ -326,7 +326,7 @@ Static struct usbd_pipe_methods ohci_root_intr_methods = { ohci_root_intr_done, }; -Static struct usbd_pipe_methods ohci_device_ctrl_methods = { +static struct usbd_pipe_methods ohci_device_ctrl_methods = { ohci_device_ctrl_transfer, ohci_device_ctrl_start, ohci_device_ctrl_abort, @@ -335,7 +335,7 @@ Static struct usbd_pipe_methods ohci_device_ctrl_methods = { ohci_device_ctrl_done, }; -Static struct usbd_pipe_methods ohci_device_intr_methods = { +static struct usbd_pipe_methods ohci_device_intr_methods = { ohci_device_intr_transfer, ohci_device_intr_start, ohci_device_intr_abort, @@ -344,7 +344,7 @@ Static struct usbd_pipe_methods ohci_device_intr_methods = { ohci_device_intr_done, }; -Static struct usbd_pipe_methods ohci_device_bulk_methods = { +static struct usbd_pipe_methods ohci_device_bulk_methods = { ohci_device_bulk_transfer, ohci_device_bulk_start, ohci_device_bulk_abort, @@ -353,7 +353,7 @@ Static struct usbd_pipe_methods ohci_device_bulk_methods = { ohci_device_bulk_done, }; -Static struct usbd_pipe_methods ohci_device_isoc_methods = { +static struct usbd_pipe_methods ohci_device_isoc_methods = { ohci_device_isoc_transfer, ohci_device_isoc_start, ohci_device_isoc_abort, @@ -364,7 +364,7 @@ Static struct usbd_pipe_methods ohci_device_isoc_methods = { #if defined(__NetBSD__) || defined(__OpenBSD__) int -ohci_activate(device_ptr_t self, enum devact act) +ohci_activate(device_t self, enum devact act) { struct ohci_softc *sc = (struct ohci_softc *)self; int rv = 0; @@ -661,7 +661,7 @@ ohci_alloc_std_chain(struct ohci_pipe *opipe, ohci_softc_t *sc, } #if 0 -Static void +static void ohci_free_std_chain(ohci_softc_t *sc, ohci_soft_td_t *std, ohci_soft_td_t *stdend) { @@ -876,7 +876,7 @@ ohci_init(ohci_softc_t *sc) return (err); } -Static usbd_status +static usbd_status ohci_controller_init(ohci_softc_t *sc) { int i; @@ -1167,7 +1167,7 @@ ohci_dumpregs(ohci_softc_t *sc) } #endif -Static int ohci_intr1(ohci_softc_t *); +static int ohci_intr1(ohci_softc_t *); void ohci_intr(void *p) @@ -1188,7 +1188,7 @@ ohci_intr(void *p) ohci_intr1(sc); } -Static int +static int ohci_intr1(ohci_softc_t *sc) { u_int32_t intrs, eintrs; @@ -2404,7 +2404,7 @@ ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) /* * Data structures and routines to emulate the root hub. */ -Static usb_device_descriptor_t ohci_devd = { +static usb_device_descriptor_t ohci_devd = { USB_DEVICE_DESCRIPTOR_SIZE, UDESC_DEVICE, /* type */ {0x00, 0x01}, /* USB version */ @@ -2417,7 +2417,7 @@ Static usb_device_descriptor_t ohci_devd = { 1 /* # of configurations */ }; -Static usb_config_descriptor_t ohci_confd = { +static usb_config_descriptor_t ohci_confd = { USB_CONFIG_DESCRIPTOR_SIZE, UDESC_CONFIG, {USB_CONFIG_DESCRIPTOR_SIZE + @@ -2430,7 +2430,7 @@ Static usb_config_descriptor_t ohci_confd = { 0 /* max power */ }; -Static usb_interface_descriptor_t ohci_ifcd = { +static usb_interface_descriptor_t ohci_ifcd = { USB_INTERFACE_DESCRIPTOR_SIZE, UDESC_INTERFACE, 0, @@ -2442,7 +2442,7 @@ Static usb_interface_descriptor_t ohci_ifcd = { 0 }; -Static usb_endpoint_descriptor_t ohci_endpd = { +static usb_endpoint_descriptor_t ohci_endpd = { USB_ENDPOINT_DESCRIPTOR_SIZE, UDESC_ENDPOINT, UE_DIR_IN | OHCI_INTR_ENDPT, @@ -2451,7 +2451,7 @@ Static usb_endpoint_descriptor_t ohci_endpd = { 255 }; -Static usb_hub_descriptor_t ohci_hubd = { +static usb_hub_descriptor_t ohci_hubd = { USB_HUB_DESCRIPTOR_SIZE, UDESC_HUB, 0, @@ -2461,7 +2461,7 @@ Static usb_hub_descriptor_t ohci_hubd = { {0}, }; -Static int +static int ohci_str(usb_string_descriptor_t *p, int l, const char *s) { int i; @@ -2481,7 +2481,7 @@ ohci_str(usb_string_descriptor_t *p, int l, const char *s) /* * Simulate a hardware hub by handling all the necessary requests. */ -Static usbd_status +static usbd_status ohci_root_ctrl_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2495,7 +2495,7 @@ ohci_root_ctrl_transfer(usbd_xfer_handle xfer) return (ohci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ohci_root_ctrl_start(usbd_xfer_handle xfer) { ohci_softc_t *sc = (ohci_softc_t *)xfer->pipe->device->bus; @@ -2803,21 +2803,21 @@ ohci_root_ctrl_start(usbd_xfer_handle xfer) } /* Abort a root control request. */ -Static void +static void ohci_root_ctrl_abort(usbd_xfer_handle xfer) { /* Nothing to do, all transfers are synchronous. */ } /* Close the root pipe. */ -Static void +static void ohci_root_ctrl_close(usbd_pipe_handle pipe) { DPRINTF(("ohci_root_ctrl_close\n")); /* Nothing to do. */ } -Static usbd_status +static usbd_status ohci_root_intr_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2831,7 +2831,7 @@ ohci_root_intr_transfer(usbd_xfer_handle xfer) return (ohci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ohci_root_intr_start(usbd_xfer_handle xfer) { usbd_pipe_handle pipe = xfer->pipe; @@ -2846,7 +2846,7 @@ ohci_root_intr_start(usbd_xfer_handle xfer) } /* Abort a root interrupt request. */ -Static void +static void ohci_root_intr_abort(usbd_xfer_handle xfer) { int s; @@ -2862,7 +2862,7 @@ ohci_root_intr_abort(usbd_xfer_handle xfer) } /* Close the root pipe. */ -Static void +static void ohci_root_intr_close(usbd_pipe_handle pipe) { ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus; @@ -2874,7 +2874,7 @@ ohci_root_intr_close(usbd_pipe_handle pipe) /************************/ -Static usbd_status +static usbd_status ohci_device_ctrl_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2888,7 +2888,7 @@ ohci_device_ctrl_transfer(usbd_xfer_handle xfer) return (ohci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ohci_device_ctrl_start(usbd_xfer_handle xfer) { ohci_softc_t *sc = (ohci_softc_t *)xfer->pipe->device->bus; @@ -2915,7 +2915,7 @@ ohci_device_ctrl_start(usbd_xfer_handle xfer) } /* Abort a device control request. */ -Static void +static void ohci_device_ctrl_abort(usbd_xfer_handle xfer) { DPRINTF(("ohci_device_ctrl_abort: xfer=%p\n", xfer)); @@ -2923,7 +2923,7 @@ ohci_device_ctrl_abort(usbd_xfer_handle xfer) } /* Close a device control pipe. */ -Static void +static void ohci_device_ctrl_close(usbd_pipe_handle pipe) { struct ohci_pipe *opipe = (struct ohci_pipe *)pipe; @@ -2936,7 +2936,7 @@ ohci_device_ctrl_close(usbd_pipe_handle pipe) /************************/ -Static void +static void ohci_device_clear_toggle(usbd_pipe_handle pipe) { struct ohci_pipe *opipe = (struct ohci_pipe *)pipe; @@ -2944,12 +2944,12 @@ ohci_device_clear_toggle(usbd_pipe_handle pipe) opipe->sed->ed.ed_headp &= htole32(~OHCI_TOGGLECARRY); } -Static void +static void ohci_noop(usbd_pipe_handle pipe) { } -Static usbd_status +static usbd_status ohci_device_bulk_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -2963,7 +2963,7 @@ ohci_device_bulk_transfer(usbd_xfer_handle xfer) return (ohci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ohci_device_bulk_start(usbd_xfer_handle xfer) { struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe; @@ -3065,7 +3065,7 @@ ohci_device_bulk_start(usbd_xfer_handle xfer) return (USBD_IN_PROGRESS); } -Static void +static void ohci_device_bulk_abort(usbd_xfer_handle xfer) { DPRINTF(("ohci_device_bulk_abort: xfer=%p\n", xfer)); @@ -3075,7 +3075,7 @@ ohci_device_bulk_abort(usbd_xfer_handle xfer) /* * Close a device bulk pipe. */ -Static void +static void ohci_device_bulk_close(usbd_pipe_handle pipe) { struct ohci_pipe *opipe = (struct ohci_pipe *)pipe; @@ -3088,7 +3088,7 @@ ohci_device_bulk_close(usbd_pipe_handle pipe) /************************/ -Static usbd_status +static usbd_status ohci_device_intr_transfer(usbd_xfer_handle xfer) { usbd_status err; @@ -3102,7 +3102,7 @@ ohci_device_intr_transfer(usbd_xfer_handle xfer) return (ohci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue))); } -Static usbd_status +static usbd_status ohci_device_intr_start(usbd_xfer_handle xfer) { struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe; @@ -3134,7 +3134,7 @@ ohci_device_intr_start(usbd_xfer_handle xfer) /* * Insert an interrupt transfer into an endpoint descriptor list */ -Static usbd_status +static usbd_status ohci_device_intr_insert(ohci_softc_t *sc, usbd_xfer_handle xfer) { struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe; @@ -3208,7 +3208,7 @@ ohci_device_intr_insert(ohci_softc_t *sc, usbd_xfer_handle xfer) } /* Abort a device control request. */ -Static void +static void ohci_device_intr_abort(usbd_xfer_handle xfer) { if (xfer->pipe->intrxfer == xfer) { @@ -3219,7 +3219,7 @@ ohci_device_intr_abort(usbd_xfer_handle xfer) } /* Close a device interrupt pipe. */ -Static void +static void ohci_device_intr_close(usbd_pipe_handle pipe) { struct ohci_pipe *opipe = (struct ohci_pipe *)pipe; @@ -3261,7 +3261,7 @@ ohci_device_intr_close(usbd_pipe_handle pipe) ohci_free_sed(sc, opipe->sed); } -Static usbd_status +static usbd_status ohci_device_setintr(ohci_softc_t *sc, struct ohci_pipe *opipe, int ival) { int i, j, s, best; -- cgit v1.2.3