d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/Static/static/g

Browse Source 
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.
This commit is contained in:
Warner Losh 2006-09-06 23:44:25 +00:00
parent f455418269
commit 56635f6bd3
47 changed files with 1376 additions and 1368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
sys/dev/usb/ehci.c
View File

@ -142,105 +142,105 @@ struct ehci_pipe {
} u;
};
Static usbd_status ehci_open(usbd_pipe_handle);
Static void ehci_poll(struct usbd_bus *);
Static void ehci_softintr(void *);
Static int ehci_intr1(ehci_softc_t *);
Static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle);
Static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *);
Static void ehci_idone(struct ehci_xfer *);
Static void ehci_timeout(void *);
Static void ehci_timeout_task(void *);
Static void ehci_intrlist_timeout(void *);
static usbd_status ehci_open(usbd_pipe_handle);
static void ehci_poll(struct usbd_bus *);
static void ehci_softintr(void *);
static int ehci_intr1(ehci_softc_t *);
static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle);
static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *);
static void ehci_idone(struct ehci_xfer *);
static void ehci_timeout(void *);
static void ehci_timeout_task(void *);
static void ehci_intrlist_timeout(void *);
Static usbd_status ehci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
Static void ehci_freem(struct usbd_bus *, usb_dma_t *);
static usbd_status ehci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
static void ehci_freem(struct usbd_bus *, usb_dma_t *);
Static usbd_xfer_handle ehci_allocx(struct usbd_bus *);
Static void ehci_freex(struct usbd_bus *, usbd_xfer_handle);
static usbd_xfer_handle ehci_allocx(struct usbd_bus *);
static void ehci_freex(struct usbd_bus *, usbd_xfer_handle);
Static usbd_status ehci_root_ctrl_transfer(usbd_xfer_handle);
Static usbd_status ehci_root_ctrl_start(usbd_xfer_handle);
Static void ehci_root_ctrl_abort(usbd_xfer_handle);
Static void ehci_root_ctrl_close(usbd_pipe_handle);
Static void ehci_root_ctrl_done(usbd_xfer_handle);
static usbd_status ehci_root_ctrl_transfer(usbd_xfer_handle);
static usbd_status ehci_root_ctrl_start(usbd_xfer_handle);
static void ehci_root_ctrl_abort(usbd_xfer_handle);
static void ehci_root_ctrl_close(usbd_pipe_handle);
static void ehci_root_ctrl_done(usbd_xfer_handle);
Static usbd_status ehci_root_intr_transfer(usbd_xfer_handle);
Static usbd_status ehci_root_intr_start(usbd_xfer_handle);
Static void ehci_root_intr_abort(usbd_xfer_handle);
Static void ehci_root_intr_close(usbd_pipe_handle);
Static void ehci_root_intr_done(usbd_xfer_handle);
static usbd_status ehci_root_intr_transfer(usbd_xfer_handle);
static usbd_status ehci_root_intr_start(usbd_xfer_handle);
static void ehci_root_intr_abort(usbd_xfer_handle);
static void ehci_root_intr_close(usbd_pipe_handle);
static void ehci_root_intr_done(usbd_xfer_handle);
Static usbd_status ehci_device_ctrl_transfer(usbd_xfer_handle);
Static usbd_status ehci_device_ctrl_start(usbd_xfer_handle);
Static void ehci_device_ctrl_abort(usbd_xfer_handle);
Static void ehci_device_ctrl_close(usbd_pipe_handle);
Static void ehci_device_ctrl_done(usbd_xfer_handle);
static usbd_status ehci_device_ctrl_transfer(usbd_xfer_handle);
static usbd_status ehci_device_ctrl_start(usbd_xfer_handle);
static void ehci_device_ctrl_abort(usbd_xfer_handle);
static void ehci_device_ctrl_close(usbd_pipe_handle);
static void ehci_device_ctrl_done(usbd_xfer_handle);
Static usbd_status ehci_device_bulk_transfer(usbd_xfer_handle);
Static usbd_status ehci_device_bulk_start(usbd_xfer_handle);
Static void ehci_device_bulk_abort(usbd_xfer_handle);
Static void ehci_device_bulk_close(usbd_pipe_handle);
Static void ehci_device_bulk_done(usbd_xfer_handle);
static usbd_status ehci_device_bulk_transfer(usbd_xfer_handle);
static usbd_status ehci_device_bulk_start(usbd_xfer_handle);
static void ehci_device_bulk_abort(usbd_xfer_handle);
static void ehci_device_bulk_close(usbd_pipe_handle);
static void ehci_device_bulk_done(usbd_xfer_handle);
Static usbd_status ehci_device_intr_transfer(usbd_xfer_handle);
Static usbd_status ehci_device_intr_start(usbd_xfer_handle);
Static void ehci_device_intr_abort(usbd_xfer_handle);
Static void ehci_device_intr_close(usbd_pipe_handle);
Static void ehci_device_intr_done(usbd_xfer_handle);
static usbd_status ehci_device_intr_transfer(usbd_xfer_handle);
static usbd_status ehci_device_intr_start(usbd_xfer_handle);
static void ehci_device_intr_abort(usbd_xfer_handle);
static void ehci_device_intr_close(usbd_pipe_handle);
static void ehci_device_intr_done(usbd_xfer_handle);
Static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle);
Static usbd_status ehci_device_isoc_start(usbd_xfer_handle);
Static void ehci_device_isoc_abort(usbd_xfer_handle);
Static void ehci_device_isoc_close(usbd_pipe_handle);
Static void ehci_device_isoc_done(usbd_xfer_handle);
static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle);
static usbd_status ehci_device_isoc_start(usbd_xfer_handle);
static void ehci_device_isoc_abort(usbd_xfer_handle);
static void ehci_device_isoc_close(usbd_pipe_handle);
static void ehci_device_isoc_done(usbd_xfer_handle);
Static void ehci_device_clear_toggle(usbd_pipe_handle pipe);
Static void ehci_noop(usbd_pipe_handle pipe);
static void ehci_device_clear_toggle(usbd_pipe_handle pipe);
static void ehci_noop(usbd_pipe_handle pipe);
Static int ehci_str(usb_string_descriptor_t *, int, char *);
Static void ehci_pcd(ehci_softc_t *, usbd_xfer_handle);
Static void ehci_pcd_able(ehci_softc_t *, int);
Static void ehci_pcd_enable(void *);
Static void ehci_disown(ehci_softc_t *, int, int);
static int ehci_str(usb_string_descriptor_t *, int, char *);
static void ehci_pcd(ehci_softc_t *, usbd_xfer_handle);
static void ehci_pcd_able(ehci_softc_t *, int);
static void ehci_pcd_enable(void *);
static void ehci_disown(ehci_softc_t *, int, int);
Static ehci_soft_qh_t *ehci_alloc_sqh(ehci_softc_t *);
Static void ehci_free_sqh(ehci_softc_t *, ehci_soft_qh_t *);
static ehci_soft_qh_t *ehci_alloc_sqh(ehci_softc_t *);
static void ehci_free_sqh(ehci_softc_t *, ehci_soft_qh_t *);
Static ehci_soft_qtd_t *ehci_alloc_sqtd(ehci_softc_t *);
Static void ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *);
Static usbd_status ehci_alloc_sqtd_chain(struct ehci_pipe *,
static ehci_soft_qtd_t *ehci_alloc_sqtd(ehci_softc_t *);
static void ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *);
static usbd_status ehci_alloc_sqtd_chain(struct ehci_pipe *,
ehci_softc_t *, int, int, usbd_xfer_handle,
ehci_soft_qtd_t *, ehci_soft_qtd_t *,
ehci_soft_qtd_t **, ehci_soft_qtd_t **);
Static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *,
static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *,
ehci_soft_qtd_t *, ehci_soft_qtd_t *);
Static usbd_status ehci_device_request(usbd_xfer_handle xfer);
static usbd_status ehci_device_request(usbd_xfer_handle xfer);
Static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *,
static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *,
int ival);
Static void ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *);
Static void ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *,
static void ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *);
static void ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *,
ehci_soft_qh_t *);
Static void ehci_activate_qh(ehci_soft_qh_t *, ehci_soft_qtd_t *);
Static void ehci_sync_hc(ehci_softc_t *);
static void ehci_activate_qh(ehci_soft_qh_t *, ehci_soft_qtd_t *);
static void ehci_sync_hc(ehci_softc_t *);
Static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *);
Static void ehci_abort_xfer(usbd_xfer_handle, usbd_status);
static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *);
static void ehci_abort_xfer(usbd_xfer_handle, usbd_status);
#ifdef EHCI_DEBUG
Static void ehci_dump_regs(ehci_softc_t *);
static void ehci_dump_regs(ehci_softc_t *);
void ehci_dump(void);
Static ehci_softc_t *theehci;
Static void ehci_dump_link(ehci_link_t, int);
Static void ehci_dump_sqtds(ehci_soft_qtd_t *);
Static void ehci_dump_sqtd(ehci_soft_qtd_t *);
Static void ehci_dump_qtd(ehci_qtd_t *);
Static void ehci_dump_sqh(ehci_soft_qh_t *);
static ehci_softc_t *theehci;
static void ehci_dump_link(ehci_link_t, int);
static void ehci_dump_sqtds(ehci_soft_qtd_t *);
static void ehci_dump_sqtd(ehci_soft_qtd_t *);
static void ehci_dump_qtd(ehci_qtd_t *);
static void ehci_dump_sqh(ehci_soft_qh_t *);
#ifdef DIAGNOSTIC
Static void ehci_dump_exfer(struct ehci_xfer *);
static void ehci_dump_exfer(struct ehci_xfer *);
#endif
#endif
@ -257,7 +257,7 @@ Static void ehci_dump_exfer(struct ehci_xfer *);
} while (0)
#define ehci_active_intr_list(ex) ((ex)->inext.le_prev != NULL)
Static struct usbd_bus_methods ehci_bus_methods = {
static struct usbd_bus_methods ehci_bus_methods = {
ehci_open,
ehci_softintr,
ehci_poll,
@ -267,7 +267,7 @@ Static struct usbd_bus_methods ehci_bus_methods = {
ehci_freex,
};
Static struct usbd_pipe_methods ehci_root_ctrl_methods = {
static struct usbd_pipe_methods ehci_root_ctrl_methods = {
ehci_root_ctrl_transfer,
ehci_root_ctrl_start,
ehci_root_ctrl_abort,
@ -276,7 +276,7 @@ Static struct usbd_pipe_methods ehci_root_ctrl_methods = {
ehci_root_ctrl_done,
};
Static struct usbd_pipe_methods ehci_root_intr_methods = {
static struct usbd_pipe_methods ehci_root_intr_methods = {
ehci_root_intr_transfer,
ehci_root_intr_start,
ehci_root_intr_abort,
@ -285,7 +285,7 @@ Static struct usbd_pipe_methods ehci_root_intr_methods = {
ehci_root_intr_done,
};
Static struct usbd_pipe_methods ehci_device_ctrl_methods = {
static struct usbd_pipe_methods ehci_device_ctrl_methods = {
ehci_device_ctrl_transfer,
ehci_device_ctrl_start,
ehci_device_ctrl_abort,
@ -294,7 +294,7 @@ Static struct usbd_pipe_methods ehci_device_ctrl_methods = {
ehci_device_ctrl_done,
};
Static struct usbd_pipe_methods ehci_device_intr_methods = {
static struct usbd_pipe_methods ehci_device_intr_methods = {
ehci_device_intr_transfer,
ehci_device_intr_start,
ehci_device_intr_abort,
@ -303,7 +303,7 @@ Static struct usbd_pipe_methods ehci_device_intr_methods = {
ehci_device_intr_done,
};
Static struct usbd_pipe_methods ehci_device_bulk_methods = {
static struct usbd_pipe_methods ehci_device_bulk_methods = {
ehci_device_bulk_transfer,
ehci_device_bulk_start,
ehci_device_bulk_abort,
@ -312,7 +312,7 @@ Static struct usbd_pipe_methods ehci_device_bulk_methods = {
ehci_device_bulk_done,
};
Static struct usbd_pipe_methods ehci_device_isoc_methods = {
static struct usbd_pipe_methods ehci_device_isoc_methods = {
ehci_device_isoc_transfer,
ehci_device_isoc_start,
ehci_device_isoc_abort,
@ -550,7 +550,7 @@ ehci_intr(void *v)
return (ehci_intr1(sc));
}
Static int
static int
ehci_intr1(ehci_softc_t *sc)
{
u_int32_t intrs, eintrs;
@ -967,7 +967,7 @@ ehci_detach(struct ehci_softc *sc, int flags)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
ehci_activate(device_ptr_t self, enum devact act)
ehci_activate(device_t self, enum devact act)
{
struct ehci_softc *sc = (struct ehci_softc *)self;
int rv = 0;
@ -1208,7 +1208,7 @@ ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
}
Static void
static void
ehci_device_clear_toggle(usbd_pipe_handle pipe)
{
struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
@ -1225,7 +1225,7 @@ ehci_device_clear_toggle(usbd_pipe_handle pipe)
epipe->sqh->qh.qh_qtd.qtd_status &= htole32(~EHCI_QTD_TOGGLE_MASK);
}
Static void
static void
ehci_noop(usbd_pipe_handle pipe)
{
}
@ -1354,7 +1354,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
}
#ifdef DIAGNOSTIC
Static void
static void
ehci_dump_exfer(struct ehci_xfer *ex)
{
printf("ehci_dump_exfer: ex=%p\n", ex);
@ -1608,7 +1608,7 @@ ehci_sync_hc(ehci_softc_t *sc)
/*
* Data structures and routines to emulate the root hub.
*/
Static usb_device_descriptor_t ehci_devd = {
static usb_device_descriptor_t ehci_devd = {
USB_DEVICE_DESCRIPTOR_SIZE,
UDESC_DEVICE, /* type */
{0x00, 0x02}, /* USB version */
@ -1621,7 +1621,7 @@ Static usb_device_descriptor_t ehci_devd = {
1 /* # of configurations */
};
Static usb_device_qualifier_t ehci_odevd = {
static usb_device_qualifier_t ehci_odevd = {
USB_DEVICE_DESCRIPTOR_SIZE,
UDESC_DEVICE_QUALIFIER, /* type */
{0x00, 0x02}, /* USB version */
@ -1633,7 +1633,7 @@ Static usb_device_qualifier_t ehci_odevd = {
0
};
Static usb_config_descriptor_t ehci_confd = {
static usb_config_descriptor_t ehci_confd = {
USB_CONFIG_DESCRIPTOR_SIZE,
UDESC_CONFIG,
{USB_CONFIG_DESCRIPTOR_SIZE +
@ -1646,7 +1646,7 @@ Static usb_config_descriptor_t ehci_confd = {
0 /* max power */
};
Static usb_interface_descriptor_t ehci_ifcd = {
static usb_interface_descriptor_t ehci_ifcd = {
USB_INTERFACE_DESCRIPTOR_SIZE,
UDESC_INTERFACE,
0,
@ -1658,7 +1658,7 @@ Static usb_interface_descriptor_t ehci_ifcd = {
0
};
Static usb_endpoint_descriptor_t ehci_endpd = {
static usb_endpoint_descriptor_t ehci_endpd = {
USB_ENDPOINT_DESCRIPTOR_SIZE,
UDESC_ENDPOINT,
UE_DIR_IN | EHCI_INTR_ENDPT,
@ -1667,7 +1667,7 @@ Static usb_endpoint_descriptor_t ehci_endpd = {
255
};
Static usb_hub_descriptor_t ehci_hubd = {
static usb_hub_descriptor_t ehci_hubd = {
USB_HUB_DESCRIPTOR_SIZE,
UDESC_HUB,
0,
@ -1677,7 +1677,7 @@ Static usb_hub_descriptor_t ehci_hubd = {
{0},
};
Static int
static int
ehci_str(usb_string_descriptor_t *p, int l, char *s)
{
int i;
@ -1697,7 +1697,7 @@ ehci_str(usb_string_descriptor_t *p, int l, char *s)
/*
* Simulate a hardware hub by handling all the necessary requests.
*/
Static usbd_status
static usbd_status
ehci_root_ctrl_transfer(usbd_xfer_handle xfer)
{
usbd_status err;
@ -1711,7 +1711,7 @@ ehci_root_ctrl_transfer(usbd_xfer_handle xfer)
return (ehci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
}
Static usbd_status
static usbd_status
ehci_root_ctrl_start(usbd_xfer_handle xfer)
{
ehci_softc_t *sc = (ehci_softc_t *)xfer->pipe->device->bus;
@ -2129,14 +2129,14 @@ ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
}
/* Abort a root control request. */
Static void
static void
ehci_root_ctrl_abort(usbd_xfer_handle xfer)
{
/* Nothing to do, all transfers are synchronous. */
}
/* Close the root pipe. */
Static void
static void
ehci_root_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(("ehci_root_ctrl_close\n"));
@ -2148,7 +2148,7 @@ ehci_root_intr_done(usbd_xfer_handle xfer)
{
}
Static usbd_status
static usbd_status
ehci_root_intr_transfer(usbd_xfer_handle xfer)
{
usbd_status err;
@ -2162,7 +2162,7 @@ ehci_root_intr_transfer(usbd_xfer_handle xfer)
return (ehci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
}
Static usbd_status
static usbd_status
ehci_root_intr_start(usbd_xfer_handle xfer)
{
usbd_pipe_handle pipe = xfer->pipe;
@ -2177,7 +2177,7 @@ ehci_root_intr_start(usbd_xfer_handle xfer)
}
/* Abort a root interrupt request. */
Static void
static void
ehci_root_intr_abort(usbd_xfer_handle xfer)
{
int s;
@ -2193,7 +2193,7 @@ ehci_root_intr_abort(usbd_xfer_handle xfer)
}
/* Close the root pipe. */
Static void
static void
ehci_root_intr_close(usbd_pipe_handle pipe)
{
ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus;
@ -2485,7 +2485,7 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *epipe, ehci_softc_t *sc,
}
/* Free the chain starting at sqtd and end at the qTD before sqtdend */
Static void
static void
ehci_free_sqtd_chain(ehci_softc_t *sc, ehci_soft_qh_t *sqh,
ehci_soft_qtd_t *sqtd, ehci_soft_qtd_t *sqtdend)
{
@ -2776,7 +2776,7 @@ ehci_intrlist_timeout(void *arg)
/************************/
Static usbd_status
static usbd_status
ehci_device_ctrl_transfer(usbd_xfer_handle xfer)
{
usbd_status err;
@ -2790,7 +2790,7 @@ ehci_device_ctrl_transfer(usbd_xfer_handle xfer)
return (ehci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
}
Static usbd_status
static usbd_status
ehci_device_ctrl_start(usbd_xfer_handle xfer)
{
ehci_softc_t *sc = (ehci_softc_t *)xfer->pipe->device->bus;
@ -2841,7 +2841,7 @@ ehci_device_ctrl_done(usbd_xfer_handle xfer)
}
/* Abort a device control request. */
Static void
static void
ehci_device_ctrl_abort(usbd_xfer_handle xfer)
{
DPRINTF(("ehci_device_ctrl_abort: xfer=%p\n", xfer));
@ -2849,7 +2849,7 @@ ehci_device_ctrl_abort(usbd_xfer_handle xfer)
}
/* Close a device control pipe. */
Static void
static void
ehci_device_ctrl_close(usbd_pipe_handle pipe)
{
ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus;
@ -3019,7 +3019,7 @@ ehci_device_request(usbd_xfer_handle xfer)
/************************/
Static usbd_status
static usbd_status
ehci_device_bulk_transfer(usbd_xfer_handle xfer)
{
usbd_status err;
@ -3140,7 +3140,7 @@ ehci_device_bulk_start(usbd_xfer_handle xfer)
#undef exfer
}
Static void
static void
ehci_device_bulk_abort(usbd_xfer_handle xfer)
{
DPRINTF(("ehci_device_bulk_abort: xfer=%p\n", xfer));
@ -3150,7 +3150,7 @@ ehci_device_bulk_abort(usbd_xfer_handle xfer)
/*
* Close a device bulk pipe.
*/
Static void
static void
ehci_device_bulk_close(usbd_pipe_handle pipe)
{
ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus;
@ -3180,7 +3180,7 @@ ehci_device_bulk_done(usbd_xfer_handle xfer)
/************************/
Static usbd_status
static usbd_status
ehci_device_setintr(ehci_softc_t *sc, ehci_soft_qh_t *sqh, int ival)
{
struct ehci_soft_islot *isp;
@ -3202,7 +3202,7 @@ ehci_device_setintr(ehci_softc_t *sc, ehci_soft_qh_t *sqh, int ival)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
ehci_device_intr_transfer(usbd_xfer_handle xfer)
{
usbd_status err;
@ -3219,7 +3219,7 @@ ehci_device_intr_transfer(usbd_xfer_handle xfer)
return (ehci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
}
Static usbd_status
static usbd_status
ehci_device_intr_start(usbd_xfer_handle xfer)
{
#define exfer EXFER(xfer)
@ -3321,7 +3321,7 @@ ehci_device_intr_start(usbd_xfer_handle xfer)
#undef exfer
}
Static void
static void
ehci_device_intr_abort(usbd_xfer_handle xfer)
{
DPRINTFN(1, ("ehci_device_intr_abort: xfer=%p\n", xfer));
@ -3332,7 +3332,7 @@ ehci_device_intr_abort(usbd_xfer_handle xfer)
ehci_abort_xfer(xfer, USBD_CANCELLED);
}
Static void
static void
ehci_device_intr_close(usbd_pipe_handle pipe)
{
ehci_softc_t *sc = (ehci_softc_t *)pipe->device->bus;
@ -3343,7 +3343,7 @@ ehci_device_intr_close(usbd_pipe_handle pipe)
ehci_close_pipe(pipe, isp->sqh);
}
Static void
static void
ehci_device_intr_done(usbd_xfer_handle xfer)
{
#define exfer EXFER(xfer)
@ -3421,8 +3421,8 @@ ehci_device_intr_done(usbd_xfer_handle xfer)
/************************/
Static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle xfer) { return USBD_IOERROR; }
Static usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { return USBD_IOERROR; }
Static void ehci_device_isoc_abort(usbd_xfer_handle xfer) { }
Static void ehci_device_isoc_close(usbd_pipe_handle pipe) { }
Static void ehci_device_isoc_done(usbd_xfer_handle xfer) { }
static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle xfer) { return USBD_IOERROR; }
static usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { return USBD_IOERROR; }
static void ehci_device_isoc_abort(usbd_xfer_handle xfer) { }
static void ehci_device_isoc_close(usbd_pipe_handle pipe) { }
static void ehci_device_isoc_done(usbd_xfer_handle xfer) { }

4
sys/dev/usb/ehcivar.h
View File

@ -158,7 +158,7 @@ typedef struct ehci_softc {
usb_callout_t sc_tmo_intrlist;
#if defined(__NetBSD__) || defined(__OpenBSD__)
device_ptr_t sc_child; /* /dev/usb# device */
device_t sc_child; /* /dev/usb# device */
#endif
char sc_dying;
#if defined(__NetBSD__)
@ -183,7 +183,7 @@ usbd_status ehci_init(ehci_softc_t *);
int ehci_intr(void *);
int ehci_detach(ehci_softc_t *, int);
#if defined(__NetBSD__) || defined(__OpenBSD__)
int ehci_activate(device_ptr_t, enum devact);
int ehci_activate(device_t, enum devact);
#endif
void ehci_power(int state, void *priv);
void ehci_shutdown(void *v);

4
sys/dev/usb/hid.c
View File

@ -61,7 +61,7 @@ extern int usbdebug;
#define DPRINTFN(n,x)
#endif
Static void hid_clear_local(struct hid_item *);
static void hid_clear_local(struct hid_item *);
#define MAXUSAGE 100
struct hid_data {
@ -77,7 +77,7 @@ struct hid_data {
int kindset;
};
Static void
static void
hid_clear_local(struct hid_item *c)
{

130
sys/dev/usb/if_aue.c
View File

@ -116,7 +116,7 @@ struct aue_type {
#define PII 0x0004 /* Pegasus II chip */
};
Static const struct aue_type aue_devs[] = {
static const struct aue_type aue_devs[] = {
{{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII },
{{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII },
{{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII },
@ -177,43 +177,43 @@ Static const struct aue_type aue_devs[] = {
};
#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
Static int aue_match(device_ptr_t);
Static int aue_attach(device_ptr_t);
Static int aue_detach(device_ptr_t);
static int aue_match(device_t);
static int aue_attach(device_t);
static int aue_detach(device_t);
Static void aue_reset_pegasus_II(struct aue_softc *sc);
Static int aue_encap(struct aue_softc *, struct mbuf *, int);
static void aue_reset_pegasus_II(struct aue_softc *sc);
static int aue_encap(struct aue_softc *, struct mbuf *, int);
#ifdef AUE_INTR_PIPE
Static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
#endif
Static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void aue_tick(void *);
Static void aue_rxstart(struct ifnet *);
Static void aue_start(struct ifnet *);
Static int aue_ioctl(struct ifnet *, u_long, caddr_t);
Static void aue_init(void *);
Static void aue_stop(struct aue_softc *);
Static void aue_watchdog(struct ifnet *);
Static void aue_shutdown(device_ptr_t);
Static int aue_ifmedia_upd(struct ifnet *);
Static void aue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void aue_tick(void *);
static void aue_rxstart(struct ifnet *);
static void aue_start(struct ifnet *);
static int aue_ioctl(struct ifnet *, u_long, caddr_t);
static void aue_init(void *);
static void aue_stop(struct aue_softc *);
static void aue_watchdog(struct ifnet *);
static void aue_shutdown(device_t);
static int aue_ifmedia_upd(struct ifnet *);
static void aue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
Static void aue_eeprom_getword(struct aue_softc *, int, u_int16_t *);
Static void aue_read_eeprom(struct aue_softc *, caddr_t, int, int, int);
Static int aue_miibus_readreg(device_ptr_t, int, int);
Static int aue_miibus_writereg(device_ptr_t, int, int, int);
Static void aue_miibus_statchg(device_ptr_t);
static void aue_eeprom_getword(struct aue_softc *, int, u_int16_t *);
static void aue_read_eeprom(struct aue_softc *, caddr_t, int, int, int);
static int aue_miibus_readreg(device_t, int, int);
static int aue_miibus_writereg(device_t, int, int, int);
static void aue_miibus_statchg(device_t);
Static void aue_setmulti(struct aue_softc *);
Static void aue_reset(struct aue_softc *);
static void aue_setmulti(struct aue_softc *);
static void aue_reset(struct aue_softc *);
Static int aue_csr_read_1(struct aue_softc *, int);
Static int aue_csr_write_1(struct aue_softc *, int, int);
Static int aue_csr_read_2(struct aue_softc *, int);
Static int aue_csr_write_2(struct aue_softc *, int, int);
static int aue_csr_read_1(struct aue_softc *, int);
static int aue_csr_write_1(struct aue_softc *, int, int);
static int aue_csr_read_2(struct aue_softc *, int);
static int aue_csr_write_2(struct aue_softc *, int, int);
Static device_method_t aue_methods[] = {
static device_method_t aue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, aue_match),
DEVMETHOD(device_attach, aue_attach),
@ -232,13 +232,13 @@ Static device_method_t aue_methods[] = {
{ 0, 0 }
};
Static driver_t aue_driver = {
static driver_t aue_driver = {
"aue",
aue_methods,
sizeof(struct aue_softc)
};
Static devclass_t aue_devclass;
static devclass_t aue_devclass;
DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
@ -249,7 +249,7 @@ DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
#define AUE_CLRBIT(sc, reg, x) \
aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) & ~(x))
Static int
static int
aue_csr_read_1(struct aue_softc *sc, int reg)
{
usb_device_request_t req;
@ -278,7 +278,7 @@ aue_csr_read_1(struct aue_softc *sc, int reg)
return (val);
}
Static int
static int
aue_csr_read_2(struct aue_softc *sc, int reg)
{
usb_device_request_t req;
@ -307,7 +307,7 @@ aue_csr_read_2(struct aue_softc *sc, int reg)
return (val);
}
Static int
static int
aue_csr_write_1(struct aue_softc *sc, int reg, int val)
{
usb_device_request_t req;
@ -335,7 +335,7 @@ aue_csr_write_1(struct aue_softc *sc, int reg, int val)
return (0);
}
Static int
static int
aue_csr_write_2(struct aue_softc *sc, int reg, int val)
{
usb_device_request_t req;
@ -366,7 +366,7 @@ aue_csr_write_2(struct aue_softc *sc, int reg, int val)
/*
* Read a word of data stored in the EEPROM at address 'addr.'
*/
Static void
static void
aue_eeprom_getword(struct aue_softc *sc, int addr, u_int16_t *dest)
{
int i;
@ -394,7 +394,7 @@ aue_eeprom_getword(struct aue_softc *sc, int addr, u_int16_t *dest)
/*
* Read a sequence of words from the EEPROM.
*/
Static void
static void
aue_read_eeprom(struct aue_softc *sc, caddr_t dest, int off, int cnt, int swap)
{
int i;
@ -412,8 +412,8 @@ aue_read_eeprom(struct aue_softc *sc, caddr_t dest, int off, int cnt, int swap)
return;
}
Static int
aue_miibus_readreg(device_ptr_t dev, int phy, int reg)
static int
aue_miibus_readreg(device_t dev, int phy, int reg)
{
struct aue_softc *sc = USBGETSOFTC(dev);
int i;
@ -456,8 +456,8 @@ aue_miibus_readreg(device_ptr_t dev, int phy, int reg)
return (val);
}
Static int
aue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
static int
aue_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct aue_softc *sc = USBGETSOFTC(dev);
int i;
@ -482,8 +482,8 @@ aue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
return(0);
}
Static void
aue_miibus_statchg(device_ptr_t dev)
static void
aue_miibus_statchg(device_t dev)
{
struct aue_softc *sc = USBGETSOFTC(dev);
struct mii_data *mii = GET_MII(sc);
@ -518,7 +518,7 @@ aue_miibus_statchg(device_ptr_t dev)
#define AUE_BITS 6
Static void
static void
aue_setmulti(struct aue_softc *sc)
{
struct ifnet *ifp;
@ -558,7 +558,7 @@ aue_setmulti(struct aue_softc *sc)
return;
}
Static void
static void
aue_reset_pegasus_II(struct aue_softc *sc)
{
/* Magic constants taken from Linux driver. */
@ -572,7 +572,7 @@ aue_reset_pegasus_II(struct aue_softc *sc)
aue_csr_write_1(sc, AUE_REG_81, 2);
}
Static void
static void
aue_reset(struct aue_softc *sc)
{
int i;
@ -776,8 +776,8 @@ USB_ATTACH(aue)
USB_ATTACH_SUCCESS_RETURN;
}
Static int
aue_detach(device_ptr_t dev)
static int
aue_detach(device_t dev)
{
struct aue_softc *sc;
struct ifnet *ifp;
@ -813,7 +813,7 @@ aue_detach(device_ptr_t dev)
}
#ifdef AUE_INTR_PIPE
Static void
static void
aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct aue_softc *sc = priv;
@ -854,7 +854,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
#endif
Static void
static void
aue_rxstart(struct ifnet *ifp)
{
struct aue_softc *sc;
@ -887,7 +887,7 @@ aue_rxstart(struct ifnet *ifp)
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
Static void
static void
aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -966,7 +966,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* the list buffers.
*/
Static void
static void
aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -1010,7 +1010,7 @@ aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static void
static void
aue_tick(void *xsc)
{
struct aue_softc *sc = xsc;
@ -1044,7 +1044,7 @@ aue_tick(void *xsc)
return;
}
Static int
static int
aue_encap(struct aue_softc *sc, struct mbuf *m, int idx)
{
int total_len;
@ -1087,7 +1087,7 @@ aue_encap(struct aue_softc *sc, struct mbuf *m, int idx)
return (0);
}
Static void
static void
aue_start(struct ifnet *ifp)
{
struct aue_softc *sc = ifp->if_softc;
@ -1135,7 +1135,7 @@ aue_start(struct ifnet *ifp)
return;
}
Static void
static void
aue_init(void *xsc)
{
struct aue_softc *sc = xsc;
@ -1250,7 +1250,7 @@ aue_init(void *xsc)
/*
* Set media options.
*/
Static int
static int
aue_ifmedia_upd(struct ifnet *ifp)
{
struct aue_softc *sc = ifp->if_softc;
@ -1270,7 +1270,7 @@ aue_ifmedia_upd(struct ifnet *ifp)
/*
* Report current media status.
*/
Static void
static void
aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct aue_softc *sc = ifp->if_softc;
@ -1283,7 +1283,7 @@ aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
return;
}
Static int
static int
aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct aue_softc *sc = ifp->if_softc;
@ -1333,7 +1333,7 @@ aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return (error);
}
Static void
static void
aue_watchdog(struct ifnet *ifp)
{
struct aue_softc *sc = ifp->if_softc;
@ -1359,7 +1359,7 @@ aue_watchdog(struct ifnet *ifp)
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
Static void
static void
aue_stop(struct aue_softc *sc)
{
usbd_status err;
@ -1441,8 +1441,8 @@ aue_stop(struct aue_softc *sc)
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
Static void
aue_shutdown(device_ptr_t dev)
static void
aue_shutdown(device_t dev)
{
struct aue_softc *sc;

104
sys/dev/usb/if_axe.c
View File

@ -110,7 +110,7 @@ __FBSDID("$FreeBSD$");
/*
* Various supported device vendors/products.
*/
Static struct axe_type axe_devs[] = {
static struct axe_type axe_devs[] = {
{ USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172 },
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100 },
{ USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1 },
@ -122,32 +122,32 @@ Static struct axe_type axe_devs[] = {
{ 0, 0 }
};
Static int axe_match(device_ptr_t);
Static int axe_attach(device_ptr_t);
Static int axe_detach(device_ptr_t);
static int axe_match(device_t);
static int axe_attach(device_t);
static int axe_detach(device_t);
Static int axe_encap(struct axe_softc *, struct mbuf *, int);
Static void axe_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void axe_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void axe_tick(void *);
Static void axe_tick_task(void *);
Static void axe_rxstart(struct ifnet *);
Static void axe_start(struct ifnet *);
Static int axe_ioctl(struct ifnet *, u_long, caddr_t);
Static void axe_init(void *);
Static void axe_stop(struct axe_softc *);
Static void axe_watchdog(struct ifnet *);
Static void axe_shutdown(device_ptr_t);
Static int axe_miibus_readreg(device_ptr_t, int, int);
Static int axe_miibus_writereg(device_ptr_t, int, int, int);
Static void axe_miibus_statchg(device_ptr_t);
Static int axe_cmd(struct axe_softc *, int, int, int, void *);
Static int axe_ifmedia_upd(struct ifnet *);
Static void axe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static int axe_encap(struct axe_softc *, struct mbuf *, int);
static void axe_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void axe_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void axe_tick(void *);
static void axe_tick_task(void *);
static void axe_rxstart(struct ifnet *);
static void axe_start(struct ifnet *);
static int axe_ioctl(struct ifnet *, u_long, caddr_t);
static void axe_init(void *);
static void axe_stop(struct axe_softc *);
static void axe_watchdog(struct ifnet *);
static void axe_shutdown(device_t);
static int axe_miibus_readreg(device_t, int, int);
static int axe_miibus_writereg(device_t, int, int, int);
static void axe_miibus_statchg(device_t);
static int axe_cmd(struct axe_softc *, int, int, int, void *);
static int axe_ifmedia_upd(struct ifnet *);
static void axe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
Static void axe_setmulti(struct axe_softc *);
static void axe_setmulti(struct axe_softc *);
Static device_method_t axe_methods[] = {
static device_method_t axe_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, axe_match),
DEVMETHOD(device_attach, axe_attach),
@ -166,20 +166,20 @@ Static device_method_t axe_methods[] = {
{ 0, 0 }
};
Static driver_t axe_driver = {
static driver_t axe_driver = {
"axe",
axe_methods,
sizeof(struct axe_softc)
};
Static devclass_t axe_devclass;
static devclass_t axe_devclass;
DRIVER_MODULE(axe, uhub, axe_driver, axe_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, axe, miibus_driver, miibus_devclass, 0, 0);
MODULE_DEPEND(axe, usb, 1, 1, 1);
MODULE_DEPEND(axe, miibus, 1, 1, 1);
Static int
static int
axe_cmd(struct axe_softc *sc, int cmd, int index, int val, void *buf)
{
usb_device_request_t req;
@ -206,8 +206,8 @@ axe_cmd(struct axe_softc *sc, int cmd, int index, int val, void *buf)
return(0);
}
Static int
axe_miibus_readreg(device_ptr_t dev, int phy, int reg)
static int
axe_miibus_readreg(device_t dev, int phy, int reg)
{
struct axe_softc *sc = USBGETSOFTC(dev);
usbd_status err;
@ -249,8 +249,8 @@ axe_miibus_readreg(device_ptr_t dev, int phy, int reg)
return (val);
}
Static int
axe_miibus_writereg(device_ptr_t dev, int phy, int reg, int val)
static int
axe_miibus_writereg(device_t dev, int phy, int reg, int val)
{
struct axe_softc *sc = USBGETSOFTC(dev);
usbd_status err;
@ -273,8 +273,8 @@ axe_miibus_writereg(device_ptr_t dev, int phy, int reg, int val)
return (0);
}
Static void
axe_miibus_statchg(device_ptr_t dev)
static void
axe_miibus_statchg(device_t dev)
{
#ifdef notdef
struct axe_softc *sc = USBGETSOFTC(dev);
@ -288,7 +288,7 @@ axe_miibus_statchg(device_ptr_t dev)
/*
* Set media options.
*/
Static int
static int
axe_ifmedia_upd(struct ifnet *ifp)
{
struct axe_softc *sc = ifp->if_softc;
@ -308,7 +308,7 @@ axe_ifmedia_upd(struct ifnet *ifp)
/*
* Report current media status.
*/
Static void
static void
axe_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct axe_softc *sc = ifp->if_softc;
@ -321,7 +321,7 @@ axe_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
return;
}
Static void
static void
axe_setmulti(struct axe_softc *sc)
{
struct ifnet *ifp;
@ -365,7 +365,7 @@ axe_setmulti(struct axe_softc *sc)
return;
}
Static void
static void
axe_reset(struct axe_softc *sc)
{
if (sc->axe_dying)
@ -549,8 +549,8 @@ USB_ATTACH(axe)
USB_ATTACH_SUCCESS_RETURN;
}
Static int
axe_detach(device_ptr_t dev)
static int
axe_detach(device_t dev)
{
struct axe_softc *sc;
struct ifnet *ifp;
@ -586,7 +586,7 @@ axe_detach(device_ptr_t dev)
return(0);
}
Static void
static void
axe_rxstart(struct ifnet *ifp)
{
struct axe_softc *sc;
@ -619,7 +619,7 @@ axe_rxstart(struct ifnet *ifp)
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
Static void
static void
axe_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct axe_softc *sc;
@ -685,7 +685,7 @@ axe_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* the list buffers.
*/
Static void
static void
axe_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct axe_softc *sc;
@ -731,7 +731,7 @@ axe_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static void
static void
axe_tick(void *xsc)
{
struct axe_softc *sc = xsc;
@ -745,7 +745,7 @@ axe_tick(void *xsc)
usb_add_task(sc->axe_udev, &sc->axe_tick_task);
}
Static void
static void
axe_tick_task(void *xsc)
{
struct axe_softc *sc;
@ -784,7 +784,7 @@ axe_tick_task(void *xsc)
return;
}
Static int
static int
axe_encap(struct axe_softc *sc, struct mbuf *m, int idx)
{
struct ue_chain *c;
@ -818,7 +818,7 @@ axe_encap(struct axe_softc *sc, struct mbuf *m, int idx)
return(0);
}
Static void
static void
axe_start(struct ifnet *ifp)
{
struct axe_softc *sc;
@ -867,7 +867,7 @@ axe_start(struct ifnet *ifp)
return;
}
Static void
static void
axe_init(void *xsc)
{
struct axe_softc *sc = xsc;
@ -975,7 +975,7 @@ axe_init(void *xsc)
return;
}
Static int
static int
axe_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct axe_softc *sc = ifp->if_softc;
@ -1048,7 +1048,7 @@ axe_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return(error);
}
Static void
static void
axe_watchdog(struct ifnet *ifp)
{
struct axe_softc *sc;
@ -1077,7 +1077,7 @@ axe_watchdog(struct ifnet *ifp)
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
Static void
static void
axe_stop(struct axe_softc *sc)
{
usbd_status err;
@ -1152,8 +1152,8 @@ axe_stop(struct axe_softc *sc)
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
Static void
axe_shutdown(device_ptr_t dev)
static void
axe_shutdown(device_t dev)
{
struct axe_softc *sc;

52
sys/dev/usb/if_cdce.c
View File

@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
#include "usbdevs.h"
#include <dev/usb/if_cdcereg.h>
Static device_shutdown_t cdce_shutdown;
static device_shutdown_t cdce_shutdown;
USB_DECLARE_DRIVER_INIT(cdce,
DEVMETHOD(device_probe, cdce_match),
DEVMETHOD(device_attach, cdce_attach),
@ -83,19 +83,19 @@ USB_DECLARE_DRIVER_INIT(cdce,
DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, usbd_driver_load, 0);
MODULE_VERSION(cdce, 0);
Static int cdce_encap(struct cdce_softc *, struct mbuf *, int);
Static void cdce_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void cdce_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void cdce_start(struct ifnet *);
Static int cdce_ioctl(struct ifnet *, u_long, caddr_t);
Static void cdce_init(void *);
Static void cdce_reset(struct cdce_softc *);
Static void cdce_stop(struct cdce_softc *);
Static void cdce_rxstart(struct ifnet *);
Static int cdce_ifmedia_upd(struct ifnet *ifp);
Static void cdce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr);
static int cdce_encap(struct cdce_softc *, struct mbuf *, int);
static void cdce_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void cdce_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void cdce_start(struct ifnet *);
static int cdce_ioctl(struct ifnet *, u_long, caddr_t);
static void cdce_init(void *);
static void cdce_reset(struct cdce_softc *);
static void cdce_stop(struct cdce_softc *);
static void cdce_rxstart(struct ifnet *);
static int cdce_ifmedia_upd(struct ifnet *ifp);
static void cdce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr);
Static const struct cdce_type cdce_devs[] = {
static const struct cdce_type cdce_devs[] = {
{{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501 }, CDCE_NO_UNION },
{{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500 }, CDCE_ZAURUS },
{{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300 }, CDCE_ZAURUS | CDCE_NO_UNION },
@ -348,7 +348,7 @@ USB_DETACH(cdce)
return (0);
}
Static void
static void
cdce_start(struct ifnet *ifp)
{
struct cdce_softc *sc;
@ -387,7 +387,7 @@ cdce_start(struct ifnet *ifp)
return;
}
Static int
static int
cdce_encap(struct cdce_softc *sc, struct mbuf *m, int idx)
{
struct ue_chain *c;
@ -420,7 +420,7 @@ cdce_encap(struct cdce_softc *sc, struct mbuf *m, int idx)
return (0);
}
Static void
static void
cdce_stop(struct cdce_softc *sc)
{
usbd_status err;
@ -466,8 +466,8 @@ cdce_stop(struct cdce_softc *sc)
return;
}
Static int
cdce_shutdown(device_ptr_t dev)
static int
cdce_shutdown(device_t dev)
{
struct cdce_softc *sc;
@ -477,7 +477,7 @@ cdce_shutdown(device_ptr_t dev)
return (0);
}
Static int
static int
cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct cdce_softc *sc = ifp->if_softc;
@ -512,14 +512,14 @@ cdce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return (error);
}
Static void
static void
cdce_reset(struct cdce_softc *sc)
{
/* XXX Maybe reset the bulk pipes here? */
return;
}
Static void
static void
cdce_init(void *xsc)
{
struct cdce_softc *sc = xsc;
@ -584,7 +584,7 @@ cdce_init(void *xsc)
return;
}
Static void
static void
cdce_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -652,7 +652,7 @@ cdce_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static void
static void
cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -702,7 +702,7 @@ cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static void
static void
cdce_rxstart(struct ifnet *ifp)
{
struct cdce_softc *sc;
@ -736,7 +736,7 @@ cdce_rxstart(struct ifnet *ifp)
return;
}
Static int
static int
cdce_ifmedia_upd(struct ifnet *ifp)
{
@ -744,7 +744,7 @@ cdce_ifmedia_upd(struct ifnet *ifp)
return 0;
}
Static void
static void
cdce_ifmedia_sts(struct ifnet * const ifp, struct ifmediareq *req)
{

100
sys/dev/usb/if_cue.c
View File

@ -86,43 +86,43 @@ __FBSDID("$FreeBSD$");
/*
* Various supported device vendors/products.
*/
Static struct cue_type cue_devs[] = {
static struct cue_type cue_devs[] = {
{ USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE },
{ USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 },
{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK },
{ 0, 0 }
};
Static int cue_match(device_ptr_t);
Static int cue_attach(device_ptr_t);
Static int cue_detach(device_ptr_t);
static int cue_match(device_t);
static int cue_attach(device_t);
static int cue_detach(device_t);
Static int cue_encap(struct cue_softc *, struct mbuf *, int);
Static void cue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void cue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void cue_tick(void *);
Static void cue_rxstart(struct ifnet *);
Static void cue_start(struct ifnet *);
Static int cue_ioctl(struct ifnet *, u_long, caddr_t);
Static void cue_init(void *);
Static void cue_stop(struct cue_softc *);
Static void cue_watchdog(struct ifnet *);
Static void cue_shutdown(device_ptr_t);
static int cue_encap(struct cue_softc *, struct mbuf *, int);
static void cue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void cue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void cue_tick(void *);
static void cue_rxstart(struct ifnet *);
static void cue_start(struct ifnet *);
static int cue_ioctl(struct ifnet *, u_long, caddr_t);
static void cue_init(void *);
static void cue_stop(struct cue_softc *);
static void cue_watchdog(struct ifnet *);
static void cue_shutdown(device_t);
Static void cue_setmulti(struct cue_softc *);
Static uint32_t cue_mchash(const uint8_t *);
Static void cue_reset(struct cue_softc *);
static void cue_setmulti(struct cue_softc *);
static uint32_t cue_mchash(const uint8_t *);
static void cue_reset(struct cue_softc *);
Static int cue_csr_read_1(struct cue_softc *, int);
Static int cue_csr_write_1(struct cue_softc *, int, int);
Static int cue_csr_read_2(struct cue_softc *, int);
static int cue_csr_read_1(struct cue_softc *, int);
static int cue_csr_write_1(struct cue_softc *, int, int);
static int cue_csr_read_2(struct cue_softc *, int);
#ifdef notdef
Static int cue_csr_write_2(struct cue_softc *, int, int);
static int cue_csr_write_2(struct cue_softc *, int, int);
#endif
Static int cue_mem(struct cue_softc *, int, int, void *, int);
Static int cue_getmac(struct cue_softc *, void *);
static int cue_mem(struct cue_softc *, int, int, void *, int);
static int cue_getmac(struct cue_softc *, void *);
Static device_method_t cue_methods[] = {
static device_method_t cue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, cue_match),
DEVMETHOD(device_attach, cue_attach),
@ -132,13 +132,13 @@ Static device_method_t cue_methods[] = {
{ 0, 0 }
};
Static driver_t cue_driver = {
static driver_t cue_driver = {
"cue",
cue_methods,
sizeof(struct cue_softc)
};
Static devclass_t cue_devclass;
static devclass_t cue_devclass;
DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
MODULE_DEPEND(cue, usb, 1, 1, 1);
@ -150,7 +150,7 @@ MODULE_DEPEND(cue, ether, 1, 1, 1);
#define CUE_CLRBIT(sc, reg, x) \
cue_csr_write_1(sc, reg, cue_csr_read_1(sc, reg) & ~(x))
Static int
static int
cue_csr_read_1(struct cue_softc *sc, int reg)
{
usb_device_request_t req;
@ -178,7 +178,7 @@ cue_csr_read_1(struct cue_softc *sc, int reg)
return(val);
}
Static int
static int
cue_csr_read_2(struct cue_softc *sc, int reg)
{
usb_device_request_t req;
@ -206,7 +206,7 @@ cue_csr_read_2(struct cue_softc *sc, int reg)
return(val);
}
Static int
static int
cue_csr_write_1(struct cue_softc *sc, int reg, int val)
{
usb_device_request_t req;
@ -234,7 +234,7 @@ cue_csr_write_1(struct cue_softc *sc, int reg, int val)
}
#ifdef notdef
Static int
static int
cue_csr_write_2(struct cue_softc *sc, int reg, int val)
{
usb_device_request_t req;
@ -262,7 +262,7 @@ cue_csr_write_2(struct cue_softc *sc, int reg, int val)
}
#endif
Static int
static int
cue_mem(struct cue_softc *sc, int cmd, int addr, void *buf, int len)
{
usb_device_request_t req;
@ -292,7 +292,7 @@ cue_mem(struct cue_softc *sc, int cmd, int addr, void *buf, int len)
return(0);
}
Static int
static int
cue_getmac(struct cue_softc *sc, void *buf)
{
usb_device_request_t req;
@ -323,7 +323,7 @@ cue_getmac(struct cue_softc *sc, void *buf)
#define CUE_BITS 9
Static uint32_t
static uint32_t
cue_mchash(const uint8_t *addr)
{
uint32_t crc;
@ -334,7 +334,7 @@ cue_mchash(const uint8_t *addr)
return (crc & ((1 << CUE_BITS) - 1));
}
Static void
static void
cue_setmulti(struct cue_softc *sc)
{
struct ifnet *ifp;
@ -389,7 +389,7 @@ cue_setmulti(struct cue_softc *sc)
return;
}
Static void
static void
cue_reset(struct cue_softc *sc)
{
usb_device_request_t req;
@ -542,8 +542,8 @@ USB_ATTACH(cue)
USB_ATTACH_SUCCESS_RETURN;
}
Static int
cue_detach(device_ptr_t dev)
static int
cue_detach(device_t dev)
{
struct cue_softc *sc;
struct ifnet *ifp;
@ -576,7 +576,7 @@ cue_detach(device_ptr_t dev)
return(0);
}
Static void
static void
cue_rxstart(struct ifnet *ifp)
{
struct cue_softc *sc;
@ -609,7 +609,7 @@ cue_rxstart(struct ifnet *ifp)
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
Static void
static void
cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct cue_softc *sc;
@ -681,7 +681,7 @@ cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* the list buffers.
*/
Static void
static void
cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct cue_softc *sc;
@ -727,7 +727,7 @@ cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static void
static void
cue_tick(void *xsc)
{
struct cue_softc *sc;
@ -756,7 +756,7 @@ cue_tick(void *xsc)
return;
}
Static int
static int
cue_encap(struct cue_softc *sc, struct mbuf *m, int idx)
{
int total_len;
@ -793,7 +793,7 @@ cue_encap(struct cue_softc *sc, struct mbuf *m, int idx)
return(0);
}
Static void
static void
cue_start(struct ifnet *ifp)
{
struct cue_softc *sc;
@ -837,7 +837,7 @@ cue_start(struct ifnet *ifp)
return;
}
Static void
static void
cue_init(void *xsc)
{
struct cue_softc *sc = xsc;
@ -942,7 +942,7 @@ cue_init(void *xsc)
return;
}
Static int
static int
cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct cue_softc *sc = ifp->if_softc;
@ -987,7 +987,7 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return(error);
}
Static void
static void
cue_watchdog(struct ifnet *ifp)
{
struct cue_softc *sc;
@ -1015,7 +1015,7 @@ cue_watchdog(struct ifnet *ifp)
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
Static void
static void
cue_stop(struct cue_softc *sc)
{
usbd_status err;
@ -1088,8 +1088,8 @@ cue_stop(struct cue_softc *sc)
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
Static void
cue_shutdown(device_ptr_t dev)
static void
cue_shutdown(device_t dev)
{
struct cue_softc *sc;

84
sys/dev/usb/if_kue.c
View File

@ -105,7 +105,7 @@ MODULE_DEPEND(kue, ether, 1, 1, 1);
/*
* Various supported device vendors/products.
*/
Static struct kue_type kue_devs[] = {
static struct kue_type kue_devs[] = {
{ USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101 },
{ USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 },
{ USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT },
@ -127,31 +127,31 @@ Static struct kue_type kue_devs[] = {
{ 0, 0 }
};
Static int kue_match(device_ptr_t);
Static int kue_attach(device_ptr_t);
Static int kue_detach(device_ptr_t);
Static void kue_shutdown(device_ptr_t);
Static int kue_encap(struct kue_softc *, struct mbuf *, int);
Static void kue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void kue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void kue_start(struct ifnet *);
Static void kue_rxstart(struct ifnet *);
Static int kue_ioctl(struct ifnet *, u_long, caddr_t);
Static void kue_init(void *);
Static void kue_stop(struct kue_softc *);
Static void kue_watchdog(struct ifnet *);
static int kue_match(device_t);
static int kue_attach(device_t);
static int kue_detach(device_t);
static void kue_shutdown(device_t);
static int kue_encap(struct kue_softc *, struct mbuf *, int);
static void kue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void kue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void kue_start(struct ifnet *);
static void kue_rxstart(struct ifnet *);
static int kue_ioctl(struct ifnet *, u_long, caddr_t);
static void kue_init(void *);
static void kue_stop(struct kue_softc *);
static void kue_watchdog(struct ifnet *);
Static void kue_setmulti(struct kue_softc *);
Static void kue_reset(struct kue_softc *);
static void kue_setmulti(struct kue_softc *);
static void kue_reset(struct kue_softc *);
Static usbd_status kue_do_request(usbd_device_handle,
static usbd_status kue_do_request(usbd_device_handle,
usb_device_request_t *, void *);
Static usbd_status kue_ctl(struct kue_softc *, int, u_int8_t,
static usbd_status kue_ctl(struct kue_softc *, int, u_int8_t,
u_int16_t, char *, int);
Static usbd_status kue_setword(struct kue_softc *, u_int8_t, u_int16_t);
Static int kue_load_fw(struct kue_softc *);
static usbd_status kue_setword(struct kue_softc *, u_int8_t, u_int16_t);
static int kue_load_fw(struct kue_softc *);
Static device_method_t kue_methods[] = {
static device_method_t kue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, kue_match),
DEVMETHOD(device_attach, kue_attach),
@ -161,13 +161,13 @@ Static device_method_t kue_methods[] = {
{ 0, 0 }
};
Static driver_t kue_driver = {
static driver_t kue_driver = {
"kue",
kue_methods,
sizeof(struct kue_softc)
};
Static devclass_t kue_devclass;
static devclass_t kue_devclass;
DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
@ -178,7 +178,7 @@ DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
* to download the firmware to the device, which can take longer
* than the default timeout.
*/
Static usbd_status
static usbd_status
kue_do_request(usbd_device_handle dev, usb_device_request_t *req, void *data)
{
usbd_xfer_handle xfer;
@ -192,7 +192,7 @@ kue_do_request(usbd_device_handle dev, usb_device_request_t *req, void *data)
return(err);
}
Static usbd_status
static usbd_status
kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word)
{
usbd_device_handle dev;
@ -220,7 +220,7 @@ kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word)
return(err);
}
Static usbd_status
static usbd_status
kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
char *data, int len)
{
@ -252,7 +252,7 @@ kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
return(err);
}
Static int
static int
kue_load_fw(struct kue_softc *sc)
{
usbd_status err;
@ -309,7 +309,7 @@ kue_load_fw(struct kue_softc *sc)
return(0);
}
Static void
static void
kue_setmulti(struct kue_softc *sc)
{
struct ifnet *ifp;
@ -366,7 +366,7 @@ kue_setmulti(struct kue_softc *sc)
* done after the firmware is loaded into the adapter in order to
* bring it into proper operation.
*/
Static void
static void
kue_reset(struct kue_softc *sc)
{
if (usbd_set_config_no(sc->kue_udev, KUE_CONFIG_NO, 0) ||
@ -515,8 +515,8 @@ USB_ATTACH(kue)
USB_ATTACH_SUCCESS_RETURN;
}
Static int
kue_detach(device_ptr_t dev)
static int
kue_detach(device_t dev)
{
struct kue_softc *sc;
struct ifnet *ifp;
@ -553,7 +553,7 @@ kue_detach(device_ptr_t dev)
return(0);
}
Static void
static void
kue_rxstart(struct ifnet *ifp)
{
struct kue_softc *sc;
@ -587,7 +587,7 @@ kue_rxstart(struct ifnet *ifp)
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
Static void kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
static void kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct kue_softc *sc;
@ -662,7 +662,7 @@ Static void kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
* the list buffers.
*/
Static void
static void
kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct kue_softc *sc;
@ -709,7 +709,7 @@ kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
Static int
static int
kue_encap(struct kue_softc *sc, struct mbuf *m, int idx)
{
int total_len;
@ -747,7 +747,7 @@ kue_encap(struct kue_softc *sc, struct mbuf *m, int idx)
return(0);
}
Static void
static void
kue_start(struct ifnet *ifp)
{
struct kue_softc *sc;
@ -791,7 +791,7 @@ kue_start(struct ifnet *ifp)
return;
}
Static void
static void
kue_init(void *xsc)
{
struct kue_softc *sc = xsc;
@ -884,7 +884,7 @@ kue_init(void *xsc)
return;
}
Static int
static int
kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct kue_softc *sc = ifp->if_softc;
@ -931,7 +931,7 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return(error);
}
Static void
static void
kue_watchdog(struct ifnet *ifp)
{
struct kue_softc *sc;
@ -958,7 +958,7 @@ kue_watchdog(struct ifnet *ifp)
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
Static void
static void
kue_stop(struct kue_softc *sc)
{
usbd_status err;
@ -1026,8 +1026,8 @@ kue_stop(struct kue_softc *sc)
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
Static void
kue_shutdown(device_ptr_t dev)
static void
kue_shutdown(device_t dev)
{
struct kue_softc *sc;

132
sys/dev/usb/if_rue.c
View File

@ -106,7 +106,7 @@ __FBSDID("$FreeBSD$");
#include "miibus_if.h"
#ifdef USB_DEBUG
Static int ruedebug = 0;
static int ruedebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue");
SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW,
&ruedebug, 0, "rue debug level");
@ -124,49 +124,49 @@ SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW,
* Various supported device vendors/products.
*/
Static struct rue_type rue_devs[] = {
static struct rue_type rue_devs[] = {
{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAKTX },
{ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_USBKR100 },
{ 0, 0 }
};
Static int rue_match(device_ptr_t);
Static int rue_attach(device_ptr_t);
Static int rue_detach(device_ptr_t);
static int rue_match(device_t);
static int rue_attach(device_t);
static int rue_detach(device_t);
Static int rue_encap(struct rue_softc *, struct mbuf *, int);
static int rue_encap(struct rue_softc *, struct mbuf *, int);
#ifdef RUE_INTR_PIPE
Static void rue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void rue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
#endif
Static void rue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void rue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void rue_tick(void *);
Static void rue_rxstart(struct ifnet *);
Static void rue_start(struct ifnet *);
Static int rue_ioctl(struct ifnet *, u_long, caddr_t);
Static void rue_init(void *);
Static void rue_stop(struct rue_softc *);
Static void rue_watchdog(struct ifnet *);
Static void rue_shutdown(device_ptr_t);
Static int rue_ifmedia_upd(struct ifnet *);
Static void rue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static void rue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void rue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void rue_tick(void *);
static void rue_rxstart(struct ifnet *);
static void rue_start(struct ifnet *);
static int rue_ioctl(struct ifnet *, u_long, caddr_t);
static void rue_init(void *);
static void rue_stop(struct rue_softc *);
static void rue_watchdog(struct ifnet *);
static void rue_shutdown(device_t);
static int rue_ifmedia_upd(struct ifnet *);
static void rue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
Static int rue_miibus_readreg(device_ptr_t, int, int);
Static int rue_miibus_writereg(device_ptr_t, int, int, int);
Static void rue_miibus_statchg(device_ptr_t);
static int rue_miibus_readreg(device_t, int, int);
static int rue_miibus_writereg(device_t, int, int, int);
static void rue_miibus_statchg(device_t);
Static void rue_setmulti(struct rue_softc *);
Static void rue_reset(struct rue_softc *);
static void rue_setmulti(struct rue_softc *);
static void rue_reset(struct rue_softc *);
Static int rue_read_mem(struct rue_softc *, u_int16_t, void *, u_int16_t);
Static int rue_write_mem(struct rue_softc *, u_int16_t, void *, u_int16_t);
Static int rue_csr_read_1(struct rue_softc *, int);
Static int rue_csr_write_1(struct rue_softc *, int, u_int8_t);
Static int rue_csr_read_2(struct rue_softc *, int);
Static int rue_csr_write_2(struct rue_softc *, int, u_int16_t);
Static int rue_csr_write_4(struct rue_softc *, int, u_int32_t);
static int rue_read_mem(struct rue_softc *, u_int16_t, void *, u_int16_t);
static int rue_write_mem(struct rue_softc *, u_int16_t, void *, u_int16_t);
static int rue_csr_read_1(struct rue_softc *, int);
static int rue_csr_write_1(struct rue_softc *, int, u_int8_t);
static int rue_csr_read_2(struct rue_softc *, int);
static int rue_csr_write_2(struct rue_softc *, int, u_int16_t);
static int rue_csr_write_4(struct rue_softc *, int, u_int32_t);
Static device_method_t rue_methods[] = {
static device_method_t rue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, rue_match),
DEVMETHOD(device_attach, rue_attach),
@ -185,13 +185,13 @@ Static device_method_t rue_methods[] = {
{ 0, 0 }
};
Static driver_t rue_driver = {
static driver_t rue_driver = {
"rue",
rue_methods,
sizeof(struct rue_softc)
};
Static devclass_t rue_devclass;
static devclass_t rue_devclass;
DRIVER_MODULE(rue, uhub, rue_driver, rue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0);
@ -211,7 +211,7 @@ MODULE_DEPEND(rue, miibus, 1, 1, 1);
#define RUE_CLRBIT_2(sc, reg, x) \
rue_csr_write_2(sc, reg, rue_csr_read_2(sc, reg) & ~(x))
Static int
static int
rue_read_mem(struct rue_softc *sc, u_int16_t addr, void *buf, u_int16_t len)
{
usb_device_request_t req;
@ -241,7 +241,7 @@ rue_read_mem(struct rue_softc *sc, u_int16_t addr, void *buf, u_int16_t len)
return (0);
}
Static int
static int
rue_write_mem(struct rue_softc *sc, u_int16_t addr, void *buf, u_int16_t len)
{
usb_device_request_t req;
@ -271,7 +271,7 @@ rue_write_mem(struct rue_softc *sc, u_int16_t addr, void *buf, u_int16_t len)
return (0);
}
Static int
static int
rue_csr_read_1(struct rue_softc *sc, int reg)
{
int err;
@ -285,7 +285,7 @@ rue_csr_read_1(struct rue_softc *sc, int reg)
return (val);
}
Static int
static int
rue_csr_read_2(struct rue_softc *sc, int reg)
{
int err;
@ -302,7 +302,7 @@ rue_csr_read_2(struct rue_softc *sc, int reg)
return (val);
}
Static int
static int
rue_csr_write_1(struct rue_softc *sc, int reg, u_int8_t val)
{
int err;
@ -315,7 +315,7 @@ rue_csr_write_1(struct rue_softc *sc, int reg, u_int8_t val)
return (0);
}
Static int
static int
rue_csr_write_2(struct rue_softc *sc, int reg, u_int16_t val)
{
int err;
@ -330,7 +330,7 @@ rue_csr_write_2(struct rue_softc *sc, int reg, u_int16_t val)
return (0);
}
Static int
static int
rue_csr_write_4(struct rue_softc *sc, int reg, u_int32_t val)
{
int err;
@ -345,8 +345,8 @@ rue_csr_write_4(struct rue_softc *sc, int reg, u_int32_t val)
return (0);
}
Static int
rue_miibus_readreg(device_ptr_t dev, int phy, int reg)
static int
rue_miibus_readreg(device_t dev, int phy, int reg)
{
struct rue_softc *sc = USBGETSOFTC(dev);
int rval;
@ -389,8 +389,8 @@ rue_miibus_readreg(device_ptr_t dev, int phy, int reg)
return (rval);
}
Static int
rue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
static int
rue_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct rue_softc *sc = USBGETSOFTC(dev);
int ruereg;
@ -431,8 +431,8 @@ rue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
return (0);
}
Static void
rue_miibus_statchg(device_ptr_t dev)
static void
rue_miibus_statchg(device_t dev)
{
/*
* When the code below is enabled the card starts doing weird
@ -473,7 +473,7 @@ rue_miibus_statchg(device_ptr_t dev)
* Program the 64-bit multicast hash filter.
*/
Static void
static void
rue_setmulti(struct rue_softc *sc)
{
struct ifnet *ifp;
@ -532,7 +532,7 @@ rue_setmulti(struct rue_softc *sc)
rue_csr_write_4(sc, RUE_MAR4, hashes[1]);
}
Static void
static void
rue_reset(struct rue_softc *sc)
{
int i;
@ -720,8 +720,8 @@ USB_ATTACH(rue)
USB_ATTACH_ERROR_RETURN;
}
Static int
rue_detach(device_ptr_t dev)
static int
rue_detach(device_t dev)
{
struct rue_softc *sc;
struct ifnet *ifp;
@ -757,7 +757,7 @@ rue_detach(device_ptr_t dev)
}
#ifdef RUE_INTR_PIPE
Static void
static void
rue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct rue_softc *sc = priv;
@ -795,7 +795,7 @@ rue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
#endif
Static void
static void
rue_rxstart(struct ifnet *ifp)
{
struct rue_softc *sc;
@ -828,7 +828,7 @@ rue_rxstart(struct ifnet *ifp)
* the higher level protocols.
*/
Static void
static void
rue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -904,7 +904,7 @@ rue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* the list buffers.
*/
Static void
static void
rue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -947,7 +947,7 @@ rue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
RUE_UNLOCK(sc);
}
Static void
static void
rue_tick(void *xsc)
{
struct rue_softc *sc = xsc;
@ -979,7 +979,7 @@ rue_tick(void *xsc)
RUE_UNLOCK(sc);
}
Static int
static int
rue_encap(struct rue_softc *sc, struct mbuf *m, int idx)
{
int total_len;
@ -1020,7 +1020,7 @@ rue_encap(struct rue_softc *sc, struct mbuf *m, int idx)
return (0);
}
Static void
static void
rue_start(struct ifnet *ifp)
{
struct rue_softc *sc = ifp->if_softc;
@ -1067,7 +1067,7 @@ rue_start(struct ifnet *ifp)
RUE_UNLOCK(sc);
}
Static void
static void
rue_init(void *xsc)
{
struct rue_softc *sc = xsc;
@ -1196,7 +1196,7 @@ rue_init(void *xsc)
* Set media options.
*/
Static int
static int
rue_ifmedia_upd(struct ifnet *ifp)
{
struct rue_softc *sc = ifp->if_softc;
@ -1217,7 +1217,7 @@ rue_ifmedia_upd(struct ifnet *ifp)
* Report current media status.
*/
Static void
static void
rue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct rue_softc *sc = ifp->if_softc;
@ -1228,7 +1228,7 @@ rue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
ifmr->ifm_status = mii->mii_media_status;
}
Static int
static int
rue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
struct rue_softc *sc = ifp->if_softc;
@ -1282,7 +1282,7 @@ rue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
return (error);
}
Static void
static void
rue_watchdog(struct ifnet *ifp)
{
struct rue_softc *sc = ifp->if_softc;
@ -1309,7 +1309,7 @@ rue_watchdog(struct ifnet *ifp)
* RX and TX lists.
*/
Static void
static void
rue_stop(struct rue_softc *sc)
{
usbd_status err;
@ -1392,8 +1392,8 @@ rue_stop(struct rue_softc *sc)
* get confused by errant DMAs when rebooting.
*/
Static void
rue_shutdown(device_ptr_t dev)
static void
rue_shutdown(device_t dev)
{
struct rue_softc *sc;

148
sys/dev/usb/if_udav.c
View File

@ -153,54 +153,54 @@ USB_DECLARE_DRIVER(udav);
#endif
#if defined(__FreeBSD__)
Static int udav_match(device_ptr_t);
Static int udav_attach(device_ptr_t);
Static int udav_detach(device_ptr_t);
Static void udav_shutdown(device_ptr_t);
static int udav_match(device_t);
static int udav_attach(device_t);
static int udav_detach(device_t);
static void udav_shutdown(device_t);
#endif
Static int udav_openpipes(struct udav_softc *);
Static void udav_start(struct ifnet *);
Static int udav_send(struct udav_softc *, struct mbuf *, int);
Static void udav_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static int udav_openpipes(struct udav_softc *);
static void udav_start(struct ifnet *);
static int udav_send(struct udav_softc *, struct mbuf *, int);
static void udav_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
#if defined(__FreeBSD__)
Static void udav_rxstart(struct ifnet *ifp);
static void udav_rxstart(struct ifnet *ifp);
#endif
Static void udav_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void udav_tick(void *);
Static void udav_tick_task(void *);
Static int udav_ioctl(struct ifnet *, u_long, caddr_t);
Static void udav_stop_task(struct udav_softc *);
Static void udav_stop(struct ifnet *, int);
Static void udav_watchdog(struct ifnet *);
Static int udav_ifmedia_change(struct ifnet *);
Static void udav_ifmedia_status(struct ifnet *, struct ifmediareq *);
Static void udav_lock_mii(struct udav_softc *);
Static void udav_unlock_mii(struct udav_softc *);
Static int udav_miibus_readreg(device_ptr_t, int, int);
Static void udav_miibus_writereg(device_ptr_t, int, int, int);
Static void udav_miibus_statchg(device_ptr_t);
static void udav_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void udav_tick(void *);
static void udav_tick_task(void *);
static int udav_ioctl(struct ifnet *, u_long, caddr_t);
static void udav_stop_task(struct udav_softc *);
static void udav_stop(struct ifnet *, int);
static void udav_watchdog(struct ifnet *);
static int udav_ifmedia_change(struct ifnet *);
static void udav_ifmedia_status(struct ifnet *, struct ifmediareq *);
static void udav_lock_mii(struct udav_softc *);
static void udav_unlock_mii(struct udav_softc *);
static int udav_miibus_readreg(device_t, int, int);
static void udav_miibus_writereg(device_t, int, int, int);
static void udav_miibus_statchg(device_t);
#if defined(__NetBSD__)
Static int udav_init(struct ifnet *);
static int udav_init(struct ifnet *);
#elif defined(__FreeBSD__)
Static void udav_init(void *);
static void udav_init(void *);
#endif
Static void udav_setmulti(struct udav_softc *);
Static void udav_reset(struct udav_softc *);
static void udav_setmulti(struct udav_softc *);
static void udav_reset(struct udav_softc *);
Static int udav_csr_read(struct udav_softc *, int, void *, int);
Static int udav_csr_write(struct udav_softc *, int, void *, int);
Static int udav_csr_read1(struct udav_softc *, int);
Static int udav_csr_write1(struct udav_softc *, int, unsigned char);
static int udav_csr_read(struct udav_softc *, int, void *, int);
static int udav_csr_write(struct udav_softc *, int, void *, int);
static int udav_csr_read1(struct udav_softc *, int);
static int udav_csr_write1(struct udav_softc *, int, unsigned char);
#if 0
Static int udav_mem_read(struct udav_softc *, int, void *, int);
Static int udav_mem_write(struct udav_softc *, int, void *, int);
Static int udav_mem_write1(struct udav_softc *, int, unsigned char);
static int udav_mem_read(struct udav_softc *, int, void *, int);
static int udav_mem_write(struct udav_softc *, int, void *, int);
static int udav_mem_write1(struct udav_softc *, int, unsigned char);
#endif
#if defined(__FreeBSD__)
Static device_method_t udav_methods[] = {
static device_method_t udav_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, udav_match),
DEVMETHOD(device_attach, udav_attach),
@ -219,13 +219,13 @@ Static device_method_t udav_methods[] = {
{ 0, 0 }
};
Static driver_t udav_driver = {
static driver_t udav_driver = {
"udav",
udav_methods,
sizeof(struct udav_softc)
};
Static devclass_t udav_devclass;
static devclass_t udav_devclass;
DRIVER_MODULE(udav, uhub, udav_driver, udav_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0);
@ -573,7 +573,7 @@ USB_DETACH(udav)
#if 0
/* read memory */
Static int
static int
udav_mem_read(struct udav_softc *sc, int offset, void *buf, int len)
{
usb_device_request_t req;
@ -610,7 +610,7 @@ udav_mem_read(struct udav_softc *sc, int offset, void *buf, int len)
}
/* write memory */
Static int
static int
udav_mem_write(struct udav_softc *sc, int offset, void *buf, int len)
{
usb_device_request_t req;
@ -647,7 +647,7 @@ udav_mem_write(struct udav_softc *sc, int offset, void *buf, int len)
}
/* write memory */
Static int
static int
udav_mem_write1(struct udav_softc *sc, int offset, unsigned char ch)
{
usb_device_request_t req;
@ -684,7 +684,7 @@ udav_mem_write1(struct udav_softc *sc, int offset, unsigned char ch)
#endif
/* read register(s) */
Static int
static int
udav_csr_read(struct udav_softc *sc, int offset, void *buf, int len)
{
usb_device_request_t req;
@ -721,7 +721,7 @@ udav_csr_read(struct udav_softc *sc, int offset, void *buf, int len)
}
/* write register(s) */
Static int
static int
udav_csr_write(struct udav_softc *sc, int offset, void *buf, int len)
{
usb_device_request_t req;
@ -757,7 +757,7 @@ udav_csr_write(struct udav_softc *sc, int offset, void *buf, int len)
return (err);
}
Static int
static int
udav_csr_read1(struct udav_softc *sc, int offset)
{
u_int8_t val = 0;
@ -775,7 +775,7 @@ udav_csr_read1(struct udav_softc *sc, int offset)
}
/* write a register */
Static int
static int
udav_csr_write1(struct udav_softc *sc, int offset, unsigned char ch)
{
usb_device_request_t req;
@ -811,10 +811,10 @@ udav_csr_write1(struct udav_softc *sc, int offset, unsigned char ch)
}
#if defined(__NetBSD__)
Static int
static int
udav_init(struct ifnet *ifp)
#elif defined(__FreeBSD__)
Static void
static void
udav_init(void *xsc)
#endif
{
@ -942,7 +942,7 @@ udav_init(void *xsc)
#endif
}
Static void
static void
udav_reset(struct udav_softc *sc)
{
int i;
@ -979,7 +979,7 @@ udav_reset(struct udav_softc *sc)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
udav_activate(device_ptr_t self, enum devact act)
udav_activate(device_t self, enum devact act)
{
struct udav_softc *sc = (struct udav_softc *)self;
@ -1004,7 +1004,7 @@ udav_activate(device_ptr_t self, enum devact act)
#define UDAV_CALCHASH(addr) \
(ether_crc32_le((addr), ETHER_ADDR_LEN) & ((1 << UDAV_BITS) - 1))
Static void
static void
udav_setmulti(struct udav_softc *sc)
{
struct ifnet *ifp;
@ -1079,7 +1079,7 @@ udav_setmulti(struct udav_softc *sc)
udav_csr_write(sc, UDAV_MAR, hashes, sizeof(hashes));
}
Static int
static int
udav_openpipes(struct udav_softc *sc)
{
struct ue_chain *c;
@ -1147,7 +1147,7 @@ udav_openpipes(struct udav_softc *sc)
return (error);
}
Static void
static void
udav_start(struct ifnet *ifp)
{
struct udav_softc *sc = ifp->if_softc;
@ -1204,7 +1204,7 @@ udav_start(struct ifnet *ifp)
ifp->if_timer = 5;
}
Static int
static int
udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
{
int total_len;
@ -1256,7 +1256,7 @@ udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
return (0);
}
Static void
static void
udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -1329,7 +1329,7 @@ udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
#endif
}
Static void
static void
udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ue_chain *c = priv;
@ -1452,12 +1452,12 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
#if 0
Static void udav_intr()
static void udav_intr()
{
}
#endif
Static int
static int
udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct udav_softc *sc = ifp->if_softc;
@ -1535,7 +1535,7 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
return (error);
}
Static void
static void
udav_watchdog(struct ifnet *ifp)
{
struct udav_softc *sc = ifp->if_softc;
@ -1572,14 +1572,14 @@ udav_watchdog(struct ifnet *ifp)
#endif
}
Static void
static void
udav_stop_task(struct udav_softc *sc)
{
udav_stop(GET_IFP(sc), 1);
}
/* Stop the adapter and free any mbufs allocated to the RX and TX lists. */
Static void
static void
udav_stop(struct ifnet *ifp, int disable)
{
struct udav_softc *sc = ifp->if_softc;
@ -1650,7 +1650,7 @@ udav_stop(struct ifnet *ifp, int disable)
}
/* Set media options */
Static int
static int
udav_ifmedia_change(struct ifnet *ifp)
{
struct udav_softc *sc = ifp->if_softc;
@ -1673,7 +1673,7 @@ udav_ifmedia_change(struct ifnet *ifp)
}
/* Report current media status. */
Static void
static void
udav_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct udav_softc *sc = ifp->if_softc;
@ -1699,7 +1699,7 @@ udav_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
ifmr->ifm_status = mii->mii_media_status;
}
Static void
static void
udav_tick(void *xsc)
{
struct udav_softc *sc = xsc;
@ -1717,7 +1717,7 @@ udav_tick(void *xsc)
usb_add_task(sc->sc_udev, &sc->sc_tick_task);
}
Static void
static void
udav_tick_task(void *xsc)
{
struct udav_softc *sc = xsc;
@ -1775,7 +1775,7 @@ udav_tick_task(void *xsc)
}
/* Get exclusive access to the MII registers */
Static void
static void
udav_lock_mii(struct udav_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
@ -1789,7 +1789,7 @@ udav_lock_mii(struct udav_softc *sc)
#endif
}
Static void
static void
udav_unlock_mii(struct udav_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
@ -1804,8 +1804,8 @@ udav_unlock_mii(struct udav_softc *sc)
usb_detach_wakeup(USBDEV(sc->sc_dev));
}
Static int
udav_miibus_readreg(device_ptr_t dev, int phy, int reg)
static int
udav_miibus_readreg(device_t dev, int phy, int reg)
{
struct udav_softc *sc;
u_int8_t val[2];
@ -1861,8 +1861,8 @@ udav_miibus_readreg(device_ptr_t dev, int phy, int reg)
return (data16);
}
Static void
udav_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
static void
udav_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct udav_softc *sc;
u_int8_t val[2];
@ -1914,8 +1914,8 @@ udav_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
return;
}
Static void
udav_miibus_statchg(device_ptr_t dev)
static void
udav_miibus_statchg(device_t dev)
{
#ifdef UDAV_DEBUG
struct udav_softc *sc;
@ -1934,8 +1934,8 @@ udav_miibus_statchg(device_ptr_t dev)
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
Static void
udav_shutdown(device_ptr_t dev)
static void
udav_shutdown(device_t dev)
{
struct udav_softc *sc;
@ -1946,7 +1946,7 @@ udav_shutdown(device_ptr_t dev)
return;
}
Static void
static void
udav_rxstart(struct ifnet *ifp)
{
struct udav_softc *sc;

206
sys/dev/usb/if_ural.c
View File

@ -105,72 +105,72 @@ static const struct usb_devno ural_devs[] = {
MODULE_DEPEND(ural, wlan, 1, 1, 1);
Static int ural_alloc_tx_list(struct ural_softc *);
Static void ural_free_tx_list(struct ural_softc *);
Static int ural_alloc_rx_list(struct ural_softc *);
Static void ural_free_rx_list(struct ural_softc *);
Static int ural_media_change(struct ifnet *);
Static void ural_next_scan(void *);
Static void ural_task(void *);
Static int ural_newstate(struct ieee80211com *,
static int ural_alloc_tx_list(struct ural_softc *);
static void ural_free_tx_list(struct ural_softc *);
static int ural_alloc_rx_list(struct ural_softc *);
static void ural_free_rx_list(struct ural_softc *);
static int ural_media_change(struct ifnet *);
static void ural_next_scan(void *);
static void ural_task(void *);
static int ural_newstate(struct ieee80211com *,
enum ieee80211_state, int);
Static int ural_rxrate(struct ural_rx_desc *);
Static void ural_txeof(usbd_xfer_handle, usbd_private_handle,
static int ural_rxrate(struct ural_rx_desc *);
static void ural_txeof(usbd_xfer_handle, usbd_private_handle,
usbd_status);
Static void ural_rxeof(usbd_xfer_handle, usbd_private_handle,
static void ural_rxeof(usbd_xfer_handle, usbd_private_handle,
usbd_status);
Static int ural_ack_rate(struct ieee80211com *, int);
Static uint16_t ural_txtime(int, int, uint32_t);
Static uint8_t ural_plcp_signal(int);
Static void ural_setup_tx_desc(struct ural_softc *,
static int ural_ack_rate(struct ieee80211com *, int);
static uint16_t ural_txtime(int, int, uint32_t);
static uint8_t ural_plcp_signal(int);
static void ural_setup_tx_desc(struct ural_softc *,
struct ural_tx_desc *, uint32_t, int, int);
Static int ural_tx_bcn(struct ural_softc *, struct mbuf *,
static int ural_tx_bcn(struct ural_softc *, struct mbuf *,
struct ieee80211_node *);
Static int ural_tx_mgt(struct ural_softc *, struct mbuf *,
static int ural_tx_mgt(struct ural_softc *, struct mbuf *,
struct ieee80211_node *);
Static int ural_tx_data(struct ural_softc *, struct mbuf *,
static int ural_tx_data(struct ural_softc *, struct mbuf *,
struct ieee80211_node *);
Static void ural_start(struct ifnet *);
Static void ural_watchdog(struct ifnet *);
Static int ural_reset(struct ifnet *);
Static int ural_ioctl(struct ifnet *, u_long, caddr_t);
Static void ural_set_testmode(struct ural_softc *);
Static void ural_eeprom_read(struct ural_softc *, uint16_t, void *,
static void ural_start(struct ifnet *);
static void ural_watchdog(struct ifnet *);
static int ural_reset(struct ifnet *);
static int ural_ioctl(struct ifnet *, u_long, caddr_t);
static void ural_set_testmode(struct ural_softc *);
static void ural_eeprom_read(struct ural_softc *, uint16_t, void *,
int);
Static uint16_t ural_read(struct ural_softc *, uint16_t);
Static void ural_read_multi(struct ural_softc *, uint16_t, void *,
static uint16_t ural_read(struct ural_softc *, uint16_t);
static void ural_read_multi(struct ural_softc *, uint16_t, void *,
int);
Static void ural_write(struct ural_softc *, uint16_t, uint16_t);
Static void ural_write_multi(struct ural_softc *, uint16_t, void *,
static void ural_write(struct ural_softc *, uint16_t, uint16_t);
static void ural_write_multi(struct ural_softc *, uint16_t, void *,
int);
Static void ural_bbp_write(struct ural_softc *, uint8_t, uint8_t);
Static uint8_t ural_bbp_read(struct ural_softc *, uint8_t);
Static void ural_rf_write(struct ural_softc *, uint8_t, uint32_t);
Static void ural_set_chan(struct ural_softc *,
static void ural_bbp_write(struct ural_softc *, uint8_t, uint8_t);
static uint8_t ural_bbp_read(struct ural_softc *, uint8_t);
static void ural_rf_write(struct ural_softc *, uint8_t, uint32_t);
static void ural_set_chan(struct ural_softc *,
struct ieee80211_channel *);
Static void ural_disable_rf_tune(struct ural_softc *);
Static void ural_enable_tsf_sync(struct ural_softc *);
Static void ural_update_slot(struct ifnet *);
Static void ural_set_txpreamble(struct ural_softc *);
Static void ural_set_basicrates(struct ural_softc *);
Static void ural_set_bssid(struct ural_softc *, uint8_t *);
Static void ural_set_macaddr(struct ural_softc *, uint8_t *);
Static void ural_update_promisc(struct ural_softc *);
Static const char *ural_get_rf(int);
Static void ural_read_eeprom(struct ural_softc *);
Static int ural_bbp_init(struct ural_softc *);
Static void ural_set_txantenna(struct ural_softc *, int);
Static void ural_set_rxantenna(struct ural_softc *, int);
Static void ural_init(void *);
Static void ural_stop(void *);
static void ural_disable_rf_tune(struct ural_softc *);
static void ural_enable_tsf_sync(struct ural_softc *);
static void ural_update_slot(struct ifnet *);
static void ural_set_txpreamble(struct ural_softc *);
static void ural_set_basicrates(struct ural_softc *);
static void ural_set_bssid(struct ural_softc *, uint8_t *);
static void ural_set_macaddr(struct ural_softc *, uint8_t *);
static void ural_update_promisc(struct ural_softc *);
static const char *ural_get_rf(int);
static void ural_read_eeprom(struct ural_softc *);
static int ural_bbp_init(struct ural_softc *);
static void ural_set_txantenna(struct ural_softc *, int);
static void ural_set_rxantenna(struct ural_softc *, int);
static void ural_init(void *);
static void ural_stop(void *);
static int ural_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
Static void ural_amrr_start(struct ural_softc *,
static void ural_amrr_start(struct ural_softc *,
struct ieee80211_node *);
Static void ural_amrr_timeout(void *);
Static void ural_amrr_update(usbd_xfer_handle, usbd_private_handle,
static void ural_amrr_timeout(void *);
static void ural_amrr_update(usbd_xfer_handle, usbd_private_handle,
usbd_status status);
Static void ural_ratectl(struct ural_amrr *,
static void ural_ratectl(struct ural_amrr *,
struct ieee80211_node *);
/*
@ -567,7 +567,7 @@ USB_DETACH(ural)
return 0;
}
Static int
static int
ural_alloc_tx_list(struct ural_softc *sc)
{
struct ural_tx_data *data;
@ -604,7 +604,7 @@ fail: ural_free_tx_list(sc);
return error;
}
Static void
static void
ural_free_tx_list(struct ural_softc *sc)
{
struct ural_tx_data *data;
@ -625,7 +625,7 @@ ural_free_tx_list(struct ural_softc *sc)
}
}
Static int
static int
ural_alloc_rx_list(struct ural_softc *sc)
{
struct ural_rx_data *data;
@ -668,7 +668,7 @@ fail: ural_free_tx_list(sc);
return error;
}
Static void
static void
ural_free_rx_list(struct ural_softc *sc)
{
struct ural_rx_data *data;
@ -689,7 +689,7 @@ ural_free_rx_list(struct ural_softc *sc)
}
}
Static int
static int
ural_media_change(struct ifnet *ifp)
{
struct ural_softc *sc = ifp->if_softc;
@ -716,7 +716,7 @@ ural_media_change(struct ifnet *ifp)
* This function is called periodically (every 200ms) during scanning to
* switch from one channel to another.
*/
Static void
static void
ural_next_scan(void *arg)
{
struct ural_softc *sc = arg;
@ -726,7 +726,7 @@ ural_next_scan(void *arg)
ieee80211_next_scan(ic);
}
Static void
static void
ural_task(void *arg)
{
struct ural_softc *sc = arg;
@ -806,7 +806,7 @@ ural_task(void *arg)
sc->sc_newstate(ic, sc->sc_state, -1);
}
Static int
static int
ural_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
{
struct ural_softc *sc = ic->ic_ifp->if_softc;
@ -835,7 +835,7 @@ ural_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
/*
* This function is only used by the Rx radiotap code.
*/
Static int
static int
ural_rxrate(struct ural_rx_desc *desc)
{
if (le32toh(desc->flags) & RAL_RX_OFDM) {
@ -863,7 +863,7 @@ ural_rxrate(struct ural_rx_desc *desc)
return 2; /* should not get there */
}
Static void
static void
ural_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ural_tx_data *data = priv;
@ -899,7 +899,7 @@ ural_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
ural_start(ifp);
}
Static void
static void
ural_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ural_rx_data *data = priv;
@ -993,7 +993,7 @@ ural_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* Return the expected ack rate for a frame transmitted at rate `rate'.
* XXX: this should depend on the destination node basic rate set.
*/
Static int
static int
ural_ack_rate(struct ieee80211com *ic, int rate)
{
switch (rate) {
@ -1028,7 +1028,7 @@ ural_ack_rate(struct ieee80211com *ic, int rate)
* The function automatically determines the operating mode depending on the
* given rate. `flags' indicates whether short preamble is in use or not.
*/
Static uint16_t
static uint16_t
ural_txtime(int len, int rate, uint32_t flags)
{
uint16_t txtime;
@ -1048,7 +1048,7 @@ ural_txtime(int len, int rate, uint32_t flags)
return txtime;
}
Static uint8_t
static uint8_t
ural_plcp_signal(int rate)
{
switch (rate) {
@ -1073,7 +1073,7 @@ ural_plcp_signal(int rate)
}
}
Static void
static void
ural_setup_tx_desc(struct ural_softc *sc, struct ural_tx_desc *desc,
uint32_t flags, int len, int rate)
{
@ -1119,7 +1119,7 @@ ural_setup_tx_desc(struct ural_softc *sc, struct ural_tx_desc *desc,
#define RAL_TX_TIMEOUT 5000
Static int
static int
ural_tx_bcn(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
{
struct ural_tx_desc *desc;
@ -1171,7 +1171,7 @@ ural_tx_bcn(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
return error;
}
Static int
static int
ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -1248,7 +1248,7 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
return 0;
}
Static int
static int
ural_tx_raw(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni,
const struct ieee80211_bpf_params *params)
{
@ -1316,7 +1316,7 @@ ural_tx_raw(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni,
return 0;
}
Static int
static int
ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -1405,7 +1405,7 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
return 0;
}
Static void
static void
ural_start(struct ifnet *ifp)
{
struct ural_softc *sc = ifp->if_softc;
@ -1477,7 +1477,7 @@ ural_start(struct ifnet *ifp)
}
}
Static void
static void
ural_watchdog(struct ifnet *ifp)
{
struct ural_softc *sc = ifp->if_softc;
@ -1508,7 +1508,7 @@ ural_watchdog(struct ifnet *ifp)
* net-mgmt/kismet). In IBSS mode, we must explicitly reset the interface to
* generate a new beacon frame.
*/
Static int
static int
ural_reset(struct ifnet *ifp)
{
struct ural_softc *sc = ifp->if_softc;
@ -1522,7 +1522,7 @@ ural_reset(struct ifnet *ifp)
return 0;
}
Static int
static int
ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct ural_softc *sc = ifp->if_softc;
@ -1561,7 +1561,7 @@ ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
return error;
}
Static void
static void
ural_set_testmode(struct ural_softc *sc)
{
usb_device_request_t req;
@ -1580,7 +1580,7 @@ ural_set_testmode(struct ural_softc *sc)
}
}
Static void
static void
ural_eeprom_read(struct ural_softc *sc, uint16_t addr, void *buf, int len)
{
usb_device_request_t req;
@ -1599,7 +1599,7 @@ ural_eeprom_read(struct ural_softc *sc, uint16_t addr, void *buf, int len)
}
}
Static uint16_t
static uint16_t
ural_read(struct ural_softc *sc, uint16_t reg)
{
usb_device_request_t req;
@ -1622,7 +1622,7 @@ ural_read(struct ural_softc *sc, uint16_t reg)
return le16toh(val);
}
Static void
static void
ural_read_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
{
usb_device_request_t req;
@ -1641,7 +1641,7 @@ ural_read_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
}
}
Static void
static void
ural_write(struct ural_softc *sc, uint16_t reg, uint16_t val)
{
usb_device_request_t req;
@ -1660,7 +1660,7 @@ ural_write(struct ural_softc *sc, uint16_t reg, uint16_t val)
}
}
Static void
static void
ural_write_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
{
usb_device_request_t req;
@ -1679,7 +1679,7 @@ ural_write_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
}
}
Static void
static void
ural_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val)
{
uint16_t tmp;
@ -1698,7 +1698,7 @@ ural_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val)
ural_write(sc, RAL_PHY_CSR7, tmp);
}
Static uint8_t
static uint8_t
ural_bbp_read(struct ural_softc *sc, uint8_t reg)
{
uint16_t val;
@ -1719,7 +1719,7 @@ ural_bbp_read(struct ural_softc *sc, uint8_t reg)
return ural_read(sc, RAL_PHY_CSR7) & 0xff;
}
Static void
static void
ural_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val)
{
uint32_t tmp;
@ -1744,7 +1744,7 @@ ural_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val)
DPRINTFN(15, ("RF R[%u] <- 0x%05x\n", reg & 0x3, val & 0xfffff));
}
Static void
static void
ural_set_chan(struct ural_softc *sc, struct ieee80211_channel *c)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -1848,7 +1848,7 @@ ural_set_chan(struct ural_softc *sc, struct ieee80211_channel *c)
/*
* Disable RF auto-tuning.
*/
Static void
static void
ural_disable_rf_tune(struct ural_softc *sc)
{
uint32_t tmp;
@ -1868,7 +1868,7 @@ ural_disable_rf_tune(struct ural_softc *sc)
* Refer to IEEE Std 802.11-1999 pp. 123 for more information on TSF
* synchronization.
*/
Static void
static void
ural_enable_tsf_sync(struct ural_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -1896,7 +1896,7 @@ ural_enable_tsf_sync(struct ural_softc *sc)
DPRINTF(("enabling TSF synchronization\n"));
}
Static void
static void
ural_update_slot(struct ifnet *ifp)
{
struct ural_softc *sc = ifp->if_softc;
@ -1922,7 +1922,7 @@ ural_update_slot(struct ifnet *ifp)
ural_write(sc, RAL_MAC_CSR12, eifs);
}
Static void
static void
ural_set_txpreamble(struct ural_softc *sc)
{
uint16_t tmp;
@ -1936,7 +1936,7 @@ ural_set_txpreamble(struct ural_softc *sc)
ural_write(sc, RAL_TXRX_CSR10, tmp);
}
Static void
static void
ural_set_basicrates(struct ural_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -1954,7 +1954,7 @@ ural_set_basicrates(struct ural_softc *sc)
}
}
Static void
static void
ural_set_bssid(struct ural_softc *sc, uint8_t *bssid)
{
uint16_t tmp;
@ -1971,7 +1971,7 @@ ural_set_bssid(struct ural_softc *sc, uint8_t *bssid)
DPRINTF(("setting BSSID to %6D\n", bssid, ":"));
}
Static void
static void
ural_set_macaddr(struct ural_softc *sc, uint8_t *addr)
{
uint16_t tmp;
@ -1988,7 +1988,7 @@ ural_set_macaddr(struct ural_softc *sc, uint8_t *addr)
DPRINTF(("setting MAC address to %6D\n", addr, ":"));
}
Static void
static void
ural_update_promisc(struct ural_softc *sc)
{
struct ifnet *ifp = sc->sc_ic.ic_ifp;
@ -2006,7 +2006,7 @@ ural_update_promisc(struct ural_softc *sc)
"entering" : "leaving"));
}
Static const char *
static const char *
ural_get_rf(int rev)
{
switch (rev) {
@ -2021,7 +2021,7 @@ ural_get_rf(int rev)
}
}
Static void
static void
ural_read_eeprom(struct ural_softc *sc)
{
struct ieee80211com *ic = &sc->sc_ic;
@ -2046,7 +2046,7 @@ ural_read_eeprom(struct ural_softc *sc)
ural_eeprom_read(sc, RAL_EEPROM_TXPOWER, sc->txpow, 14);
}
Static int
static int
ural_bbp_init(struct ural_softc *sc)
{
#define N(a) (sizeof (a) / sizeof ((a)[0]))
@ -2080,7 +2080,7 @@ ural_bbp_init(struct ural_softc *sc)
#undef N
}
Static void
static void
ural_set_txantenna(struct ural_softc *sc, int antenna)
{
uint16_t tmp;
@ -2109,7 +2109,7 @@ ural_set_txantenna(struct ural_softc *sc, int antenna)
ural_write(sc, RAL_PHY_CSR6, tmp | (tx & 0x7));
}
Static void
static void
ural_set_rxantenna(struct ural_softc *sc, int antenna)
{
uint8_t rx;
@ -2129,7 +2129,7 @@ ural_set_rxantenna(struct ural_softc *sc, int antenna)
ural_bbp_write(sc, RAL_BBP_RX, rx);
}
Static void
static void
ural_init(void *priv)
{
#define N(a) (sizeof (a) / sizeof ((a)[0]))
@ -2278,7 +2278,7 @@ fail: ural_stop(sc);
#undef N
}
Static void
static void
ural_stop(void *priv)
{
struct ural_softc *sc = priv;
@ -2368,7 +2368,7 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
#define URAL_AMRR_MIN_SUCCESS_THRESHOLD 1
#define URAL_AMRR_MAX_SUCCESS_THRESHOLD 10
Static void
static void
ural_amrr_start(struct ural_softc *sc, struct ieee80211_node *ni)
{
struct ural_amrr *amrr = &sc->amrr;
@ -2392,7 +2392,7 @@ ural_amrr_start(struct ural_softc *sc, struct ieee80211_node *ni)
callout_reset(&sc->amrr_ch, hz, ural_amrr_timeout, sc);
}
Static void
static void
ural_amrr_timeout(void *arg)
{
struct ural_softc *sc = (struct ural_softc *)arg;
@ -2418,7 +2418,7 @@ ural_amrr_timeout(void *arg)
splx(s);
}
Static void
static void
ural_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
@ -2477,7 +2477,7 @@ ural_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv,
((ni)->ni_txrate--)
#define reset_cnt(amrr) \
do { (amrr)->txcnt = (amrr)->retrycnt = 0; } while (0)
Static void
static void
ural_ratectl(struct ural_amrr *amrr, struct ieee80211_node *ni)
{
int need_change = 0;

6
sys/dev/usb/kue_fw.h
View File

@ -85,7 +85,7 @@
#define KUE_QTINTR_LOAD_CODE_HIGH 0x9C
/* Firmware code segment */
Static unsigned char kue_code_seg[] =
static unsigned char kue_code_seg[] =
{
/******************************************/
/* NOTE: B6/C3 is data header signature */
@ -577,7 +577,7 @@ Static unsigned char kue_code_seg[] =
};
/* Firmware fixup (data?) segment */
Static unsigned char kue_fix_seg[] =
static unsigned char kue_fix_seg[] =
{
/******************************************/
/* NOTE: B6/C3 is data header signature */
@ -680,6 +680,6 @@ Static unsigned char kue_fix_seg[] =
/* Fixup command. */
#define KUE_TRIGCMD_OFFSET 5
Static unsigned char kue_trig_seg[] = {
static unsigned char kue_trig_seg[] = {
0xb6, 0xc3, 0x01, 0x00, 0x06, 0x64, 0x00, 0x00
};

244
sys/dev/usb/ohci.c
View File

@ -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_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_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_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_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_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_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_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_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_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_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_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_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;

4
sys/dev/usb/ohcivar.h
View File

@ -147,7 +147,7 @@ typedef struct ohci_softc {
usb_callout_t sc_tmo_rhsc;
#if defined(__NetBSD__) || defined(__OpenBSD__)
device_ptr_t sc_child;
device_t sc_child;
#endif
char sc_dying;
} ohci_softc_t;
@ -166,7 +166,7 @@ usbd_status ohci_init(ohci_softc_t *);
void ohci_intr(void *);
int ohci_detach(ohci_softc_t *, int);
#if defined(__NetBSD__) || defined(__OpenBSD__)
int ohci_activate(device_ptr_t, enum devact);
int ohci_activate(device_t, enum devact);
#endif
#define MS_TO_TICKS(ms) ((ms) * hz / 1000)

76
sys/dev/usb/ubsa.c
View File

@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/ucomvar.h>
#ifdef USB_DEBUG
Static int ubsadebug = 0;
static int ubsadebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa");
SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,
&ubsadebug, 0, "ubsa debug level");
@ -181,23 +181,23 @@ struct ubsa_softc {
struct task sc_task;
};
Static void ubsa_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void ubsa_notify(void *, int count);
static void ubsa_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void ubsa_notify(void *, int count);
Static void ubsa_get_status(void *, int, u_char *, u_char *);
Static void ubsa_set(void *, int, int, int);
Static int ubsa_param(void *, int, struct termios *);
Static int ubsa_open(void *, int);
Static void ubsa_close(void *, int);
static void ubsa_get_status(void *, int, u_char *, u_char *);
static void ubsa_set(void *, int, int, int);
static int ubsa_param(void *, int, struct termios *);
static int ubsa_open(void *, int);
static void ubsa_close(void *, int);
Static int ubsa_request(struct ubsa_softc *, u_int8_t, u_int16_t);
Static void ubsa_dtr(struct ubsa_softc *, int);
Static void ubsa_rts(struct ubsa_softc *, int);
Static void ubsa_baudrate(struct ubsa_softc *, speed_t);
Static void ubsa_parity(struct ubsa_softc *, tcflag_t);
Static void ubsa_databits(struct ubsa_softc *, tcflag_t);
Static void ubsa_stopbits(struct ubsa_softc *, tcflag_t);
Static void ubsa_flow(struct ubsa_softc *, tcflag_t, tcflag_t);
static int ubsa_request(struct ubsa_softc *, u_int8_t, u_int16_t);
static void ubsa_dtr(struct ubsa_softc *, int);
static void ubsa_rts(struct ubsa_softc *, int);
static void ubsa_baudrate(struct ubsa_softc *, speed_t);
static void ubsa_parity(struct ubsa_softc *, tcflag_t);
static void ubsa_databits(struct ubsa_softc *, tcflag_t);
static void ubsa_stopbits(struct ubsa_softc *, tcflag_t);
static void ubsa_flow(struct ubsa_softc *, tcflag_t, tcflag_t);
struct ucom_callback ubsa_callback = {
ubsa_get_status,
@ -210,7 +210,7 @@ struct ucom_callback ubsa_callback = {
NULL
};
Static const struct ubsa_product {
static const struct ubsa_product {
uint16_t vendor;
uint16_t product;
} ubsa_products [] = {
@ -229,11 +229,11 @@ Static const struct ubsa_product {
{ 0, 0 }
};
Static device_probe_t ubsa_match;
Static device_attach_t ubsa_attach;
Static device_detach_t ubsa_detach;
static device_probe_t ubsa_match;
static device_attach_t ubsa_attach;
static device_detach_t ubsa_detach;
Static device_method_t ubsa_methods[] = {
static device_method_t ubsa_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, ubsa_match),
DEVMETHOD(device_attach, ubsa_attach),
@ -241,7 +241,7 @@ Static device_method_t ubsa_methods[] = {
{ 0, 0 }
};
Static driver_t ubsa_driver = {
static driver_t ubsa_driver = {
"ucom",
ubsa_methods,
sizeof (struct ubsa_softc)
@ -441,7 +441,7 @@ USB_DETACH(ubsa)
return (rv);
}
Static int
static int
ubsa_request(struct ubsa_softc *sc, u_int8_t request, u_int16_t value)
{
usb_device_request_t req;
@ -460,7 +460,7 @@ ubsa_request(struct ubsa_softc *sc, u_int8_t request, u_int16_t value)
return (err);
}
Static void
static void
ubsa_dtr(struct ubsa_softc *sc, int onoff)
{
@ -473,7 +473,7 @@ ubsa_dtr(struct ubsa_softc *sc, int onoff)
ubsa_request(sc, UBSA_SET_DTR, onoff ? 1 : 0);
}
Static void
static void
ubsa_rts(struct ubsa_softc *sc, int onoff)
{
@ -486,7 +486,7 @@ ubsa_rts(struct ubsa_softc *sc, int onoff)
ubsa_request(sc, UBSA_SET_RTS, onoff ? 1 : 0);
}
Static void
static void
ubsa_break(struct ubsa_softc *sc, int onoff)
{
@ -495,7 +495,7 @@ ubsa_break(struct ubsa_softc *sc, int onoff)
ubsa_request(sc, UBSA_SET_BREAK, onoff ? 1 : 0);
}
Static void
static void
ubsa_set(void *addr, int portno, int reg, int onoff)
{
struct ubsa_softc *sc;
@ -516,7 +516,7 @@ ubsa_set(void *addr, int portno, int reg, int onoff)
}
}
Static void
static void
ubsa_baudrate(struct ubsa_softc *sc, speed_t speed)
{
u_int16_t value = 0;
@ -555,7 +555,7 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed)
ubsa_request(sc, UBSA_SET_BAUDRATE, value);
}
Static void
static void
ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag)
{
int value;
@ -570,7 +570,7 @@ ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag)
ubsa_request(sc, UBSA_SET_PARITY, value);
}
Static void
static void
ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag)
{
int value;
@ -592,7 +592,7 @@ ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag)
ubsa_request(sc, UBSA_SET_DATA_BITS, value);
}
Static void
static void
ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag)
{
int value;
@ -604,7 +604,7 @@ ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag)
ubsa_request(sc, UBSA_SET_STOP_BITS, value);
}
Static void
static void
ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag)
{
int value;
@ -620,7 +620,7 @@ ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag)
ubsa_request(sc, UBSA_SET_FLOW_CTRL, value);
}
Static int
static int
ubsa_param(void *addr, int portno, struct termios *ti)
{
struct ubsa_softc *sc;
@ -638,7 +638,7 @@ ubsa_param(void *addr, int portno, struct termios *ti)
return (0);
}
Static int
static int
ubsa_open(void *addr, int portno)
{
struct ubsa_softc *sc;
@ -672,7 +672,7 @@ ubsa_open(void *addr, int portno)
return (0);
}
Static void
static void
ubsa_close(void *addr, int portno)
{
struct ubsa_softc *sc;
@ -700,7 +700,7 @@ ubsa_close(void *addr, int portno)
}
}
Static void
static void
ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct ubsa_softc *sc;
@ -733,7 +733,7 @@ ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
/* Handle delayed events. */
Static void
static void
ubsa_notify(void *arg, int count)
{
struct ubsa_softc *sc;
@ -742,7 +742,7 @@ ubsa_notify(void *arg, int count)
ucom_status_change(&sc->sc_ucom);
}
Static void
static void
ubsa_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct ubsa_softc *sc;

36
sys/dev/usb/ubser.c
View File

@ -164,18 +164,18 @@ struct ubser_softc {
struct ubser_port *sc_port;
};
Static int ubserparam(struct tty *, struct termios *);
Static void ubserstart(struct tty *);
Static void ubserstop(struct tty *, int);
Static usbd_status ubserstartread(struct ubser_softc *);
Static void ubserreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void ubserwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void ubser_cleanup(struct ubser_softc *sc);
static int ubserparam(struct tty *, struct termios *);
static void ubserstart(struct tty *);
static void ubserstop(struct tty *, int);
static usbd_status ubserstartread(struct ubser_softc *);
static void ubserreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void ubserwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void ubser_cleanup(struct ubser_softc *sc);
Static t_break_t ubserbreak;
Static t_open_t ubseropen;
Static t_close_t ubserclose;
Static t_modem_t ubsermodem;
static t_break_t ubserbreak;
static t_open_t ubseropen;
static t_close_t ubserclose;
static t_modem_t ubsermodem;
USB_DECLARE_DRIVER(ubser);
@ -456,7 +456,7 @@ USB_DETACH(ubser)
return (0);
}
Static int
static int
ubserparam(struct tty *tp, struct termios *t)
{
struct ubser_softc *sc;
@ -516,7 +516,7 @@ ubserparam(struct tty *tp, struct termios *t)
return (0);
}
Static void
static void
ubserstart(struct tty *tp)
{
struct ubser_softc *sc;
@ -590,7 +590,7 @@ ubserstart(struct tty *tp)
ttwwakeup(tp);
}
Static void
static void
ubserstop(struct tty *tp, int flag)
{
struct ubser_softc *sc;
@ -611,7 +611,7 @@ ubserstop(struct tty *tp, int flag)
DPRINTF(("ubserstop: done\n"));
}
Static void
static void
ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
{
struct tty *tp;
@ -662,7 +662,7 @@ ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
return;
}
Static usbd_status
static usbd_status
ubserstartread(struct ubser_softc *sc)
{
usbd_status err;
@ -687,7 +687,7 @@ ubserstartread(struct ubser_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
{
struct ubser_softc *sc = (struct ubser_softc *)p;
@ -783,7 +783,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
}
Static void
static void
ubser_cleanup(struct ubser_softc *sc)
{
int i;

60
sys/dev/usb/ucom.c
View File

@ -117,23 +117,23 @@ SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW,
#define DPRINTFN(n, x)
#endif
Static void ucom_cleanup(struct ucom_softc *);
Static int ucomparam(struct tty *, struct termios *);
Static void ucomstart(struct tty *);
Static void ucomstop(struct tty *, int);
Static void ucom_shutdown(struct ucom_softc *);
Static void ucom_dtr(struct ucom_softc *, int);
Static void ucom_rts(struct ucom_softc *, int);
Static void ucombreak(struct tty *, int);
Static usbd_status ucomstartread(struct ucom_softc *);
Static void ucomreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void ucomwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void ucomstopread(struct ucom_softc *);
static void ucom_cleanup(struct ucom_softc *);
static int ucomparam(struct tty *, struct termios *);
static void ucomstart(struct tty *);
static void ucomstop(struct tty *, int);
static void ucom_shutdown(struct ucom_softc *);
static void ucom_dtr(struct ucom_softc *, int);
static void ucom_rts(struct ucom_softc *, int);
static void ucombreak(struct tty *, int);
static usbd_status ucomstartread(struct ucom_softc *);
static void ucomreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void ucomwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void ucomstopread(struct ucom_softc *);
Static t_open_t ucomopen;
Static t_close_t ucomclose;
Static t_modem_t ucommodem;
Static t_ioctl_t ucomioctl;
static t_open_t ucomopen;
static t_close_t ucomclose;
static t_modem_t ucommodem;
static t_ioctl_t ucomioctl;
devclass_t ucom_devclass;
@ -199,7 +199,7 @@ ucom_detach(struct ucom_softc *sc)
return (0);
}
Static void
static void
ucom_shutdown(struct ucom_softc *sc)
{
struct tty *tp = sc->sc_tty;
@ -215,7 +215,7 @@ ucom_shutdown(struct ucom_softc *sc)
}
}
Static int
static int
ucomopen(struct tty *tp, struct cdev *dev)
{
struct ucom_softc *sc;
@ -344,7 +344,7 @@ ucomioctl(struct tty *tp, u_long cmd, void *data, int flag, usb_proc_ptr p)
return (error);
}
Static int
static int
ucommodem(struct tty *tp, int sigon, int sigoff)
{
struct ucom_softc *sc;
@ -393,7 +393,7 @@ ucommodem(struct tty *tp, int sigon, int sigoff)
return (0);
}
Static void
static void
ucombreak(struct tty *tp, int onoff)
{
struct ucom_softc *sc;
@ -406,7 +406,7 @@ ucombreak(struct tty *tp, int onoff)
UCOM_SET_BREAK, onoff);
}
Static void
static void
ucom_dtr(struct ucom_softc *sc, int onoff)
{
DPRINTF(("ucom_dtr: onoff = %d\n", onoff));
@ -417,7 +417,7 @@ ucom_dtr(struct ucom_softc *sc, int onoff)
UCOM_SET_DTR, onoff);
}
Static void
static void
ucom_rts(struct ucom_softc *sc, int onoff)
{
DPRINTF(("ucom_rts: onoff = %d\n", onoff));
@ -453,7 +453,7 @@ ucom_status_change(struct ucom_softc *sc)
}
}
Static int
static int
ucomparam(struct tty *tp, struct termios *t)
{
struct ucom_softc *sc;
@ -520,7 +520,7 @@ ucomparam(struct tty *tp, struct termios *t)
return (0);
}
Static void
static void
ucomstart(struct tty *tp)
{
struct ucom_softc *sc;
@ -612,7 +612,7 @@ ucomstart(struct tty *tp)
splx(s);
}
Static void
static void
ucomstop(struct tty *tp, int flag)
{
struct ucom_softc *sc;
@ -644,7 +644,7 @@ ucomstop(struct tty *tp, int flag)
DPRINTF(("ucomstop: done\n"));
}
Static void
static void
ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
{
struct ucom_softc *sc = (struct ucom_softc *)p;
@ -695,7 +695,7 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
return;
}
Static usbd_status
static usbd_status
ucomstartread(struct ucom_softc *sc)
{
usbd_status err;
@ -722,7 +722,7 @@ ucomstartread(struct ucom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
{
struct ucom_softc *sc = (struct ucom_softc *)p;
@ -812,7 +812,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
ucommodem(tp, SER_RTS, 0);
}
Static void
static void
ucom_cleanup(struct ucom_softc *sc)
{
DPRINTF(("ucom_cleanup: closing pipes\n"));
@ -839,7 +839,7 @@ ucom_cleanup(struct ucom_softc *sc)
}
}
Static void
static void
ucomstopread(struct ucom_softc *sc)
{
usbd_status err;

52
sys/dev/usb/udbp.c
View File

@ -159,24 +159,24 @@ typedef struct udbp_softc *udbp_p;
Static ng_constructor_t ng_udbp_constructor;
Static ng_rcvmsg_t ng_udbp_rcvmsg;
Static ng_shutdown_t ng_udbp_rmnode;
Static ng_newhook_t ng_udbp_newhook;
Static ng_connect_t ng_udbp_connect;
Static ng_rcvdata_t ng_udbp_rcvdata;
Static ng_disconnect_t ng_udbp_disconnect;
static ng_constructor_t ng_udbp_constructor;
static ng_rcvmsg_t ng_udbp_rcvmsg;
static ng_shutdown_t ng_udbp_rmnode;
static ng_newhook_t ng_udbp_newhook;
static ng_connect_t ng_udbp_connect;
static ng_rcvdata_t ng_udbp_rcvdata;
static ng_disconnect_t ng_udbp_disconnect;
/* Parse type for struct ngudbpstat */
Static const struct ng_parse_struct_field
static const struct ng_parse_struct_field
ng_udbp_stat_type_fields[] = NG_UDBP_STATS_TYPE_INFO;
Static const struct ng_parse_type ng_udbp_stat_type = {
static const struct ng_parse_type ng_udbp_stat_type = {
&ng_parse_struct_type,
&ng_udbp_stat_type_fields
};
/* List of commands and how to convert arguments to/from ASCII */
Static const struct ng_cmdlist ng_udbp_cmdlist[] = {
static const struct ng_cmdlist ng_udbp_cmdlist[] = {
{
NGM_UDBP_COOKIE,
NGM_UDBP_GET_STATUS,
@ -195,7 +195,7 @@ Static const struct ng_cmdlist ng_udbp_cmdlist[] = {
};
/* Netgraph node type descriptor */
Static struct ng_type ng_udbp_typestruct = {
static struct ng_type ng_udbp_typestruct = {
.version = NG_ABI_VERSION,
.name = NG_UDBP_NODE_TYPE,
.constructor = ng_udbp_constructor,
@ -208,13 +208,13 @@ Static struct ng_type ng_udbp_typestruct = {
.cmdlist = ng_udbp_cmdlist,
};
Static int udbp_setup_in_transfer (udbp_p sc);
Static void udbp_in_transfer_cb (usbd_xfer_handle xfer,
static int udbp_setup_in_transfer (udbp_p sc);
static void udbp_in_transfer_cb (usbd_xfer_handle xfer,
usbd_private_handle priv,
usbd_status err);
Static int udbp_setup_out_transfer (udbp_p sc);
Static void udbp_out_transfer_cb (usbd_xfer_handle xfer,
static int udbp_setup_out_transfer (udbp_p sc);
static void udbp_out_transfer_cb (usbd_xfer_handle xfer,
usbd_private_handle priv,
usbd_status err);
@ -447,7 +447,7 @@ USB_DETACH(udbp)
}
Static int
static int
udbp_setup_in_transfer(udbp_p sc)
{
void *priv = sc; /* XXX this should probably be some pointer to
@ -482,7 +482,7 @@ udbp_setup_in_transfer(udbp_p sc)
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
udbp_in_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status err)
{
@ -519,7 +519,7 @@ udbp_in_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
}
Static int
static int
udbp_setup_out_transfer(udbp_p sc)
{
void *priv = sc; /* XXX this should probably be some pointer to
@ -581,7 +581,7 @@ udbp_setup_out_transfer(udbp_p sc)
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
udbp_out_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status err)
{
@ -617,7 +617,7 @@ MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
* routine and the constructor will return EINVAL as you should not be able
* to create nodes that depend on hardware (unless you can add the hardware :)
*/
Static int
static int
ng_udbp_constructor(node_p node)
{
return (EINVAL);
@ -634,7 +634,7 @@ ng_udbp_constructor(node_p node)
* pointer of each hook points to the appropriate UDBP_hookinfo struct
* so that the source of an input packet is easily identified.
*/
Static int
static int
ng_udbp_newhook(node_p node, hook_p hook, const char *name)
{
const udbp_p sc = NG_NODE_PRIVATE(node);
@ -666,7 +666,7 @@ ng_udbp_newhook(node_p node, hook_p hook, const char *name)
* the cookie in the header didn't match what we consider to be current
* (so that old userland programs could continue to work).
*/
Static int
static int
ng_udbp_rcvmsg(node_p node, item_p item, hook_p lasthook)
{
const udbp_p sc = NG_NODE_PRIVATE(node);
@ -719,7 +719,7 @@ ng_udbp_rcvmsg(node_p node, item_p item, hook_p lasthook)
/*
* Accept data from the hook and queue it for output.
*/
Static int
static int
ng_udbp_rcvdata(hook_p hook, item_p item)
{
const udbp_p sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
@ -770,7 +770,7 @@ ng_udbp_rcvdata(hook_p hook, item_p item)
* We are a persistant device, we refuse to go away, and
* only remove our links and reset ourself.
*/
Static int
static int
ng_udbp_rmnode(node_p node)
{
const udbp_p sc = NG_NODE_PRIVATE(node);
@ -813,7 +813,7 @@ ng_udbp_rmnode(node_p node)
* This is called once we've already connected a new hook to the other node.
* It gives us a chance to balk at the last minute.
*/
Static int
static int
ng_udbp_connect(hook_p hook)
{
/* probably not at splnet, force outward queueing */
@ -827,7 +827,7 @@ ng_udbp_connect(hook_p hook)
*
* For this type, removal of the last link destroys the node
*/
Static int
static int
ng_udbp_disconnect(hook_p hook)
{
const udbp_p sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));

6
sys/dev/usb/ufm.c
View File

@ -88,7 +88,7 @@ d_open_t ufmopen;
d_close_t ufmclose;
d_ioctl_t ufmioctl;
Static struct cdevsw ufm_cdevsw = {
static struct cdevsw ufm_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = ufmopen,
@ -402,7 +402,7 @@ ufmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr td)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
ufm_activate(device_ptr_t self, enum devact act)
ufm_activate(device_t self, enum devact act)
{
struct ufm_softc *sc = (struct ufm_softc *)self;
@ -462,7 +462,7 @@ USB_DETACH(ufm)
#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
#if defined(__FreeBSD__)
Static int
static int
ufm_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));

30
sys/dev/usb/uftdi.c
View File

@ -121,14 +121,14 @@ struct uftdi_softc {
u_int last_lcr;
};
Static void uftdi_get_status(void *, int portno, u_char *lsr, u_char *msr);
Static void uftdi_set(void *, int, int, int);
Static int uftdi_param(void *, int, struct termios *);
Static int uftdi_open(void *sc, int portno);
Static void uftdi_read(void *sc, int portno, u_char **ptr,u_int32_t *count);
Static void uftdi_write(void *sc, int portno, u_char *to, u_char *from,
static void uftdi_get_status(void *, int portno, u_char *lsr, u_char *msr);
static void uftdi_set(void *, int, int, int);
static int uftdi_param(void *, int, struct termios *);
static int uftdi_open(void *sc, int portno);
static void uftdi_read(void *sc, int portno, u_char **ptr,u_int32_t *count);
static void uftdi_write(void *sc, int portno, u_char *to, u_char *from,
u_int32_t *count);
Static void uftdi_break(void *sc, int portno, int onoff);
static void uftdi_break(void *sc, int portno, int onoff);
struct ucom_callback uftdi_callback = {
uftdi_get_status,
@ -363,7 +363,7 @@ USB_ATTACH(uftdi)
}
#if 0
int
uftdi_activate(device_ptr_t self, enum devact act)
uftdi_activate(device_t self, enum devact act)
{
struct uftdi_softc *sc = (struct uftdi_softc *)self;
int rv = 0;
@ -395,7 +395,7 @@ USB_DETACH(uftdi)
return rv;
}
#endif
Static int
static int
uftdi_open(void *vsc, int portno)
{
struct uftdi_softc *sc = vsc;
@ -437,7 +437,7 @@ uftdi_open(void *vsc, int portno)
return (0);
}
Static void
static void
uftdi_read(void *vsc, int portno, u_char **ptr, u_int32_t *count)
{
struct uftdi_softc *sc = vsc;
@ -470,7 +470,7 @@ uftdi_read(void *vsc, int portno, u_char **ptr, u_int32_t *count)
*count -= 2;
}
Static void
static void
uftdi_write(void *vsc, int portno, u_char *to, u_char *from, u_int32_t *count)
{
struct uftdi_softc *sc = vsc;
@ -486,7 +486,7 @@ uftdi_write(void *vsc, int portno, u_char *to, u_char *from, u_int32_t *count)
*count += sc->sc_hdrlen;
}
Static void
static void
uftdi_set(void *vsc, int portno, int reg, int onoff)
{
struct uftdi_softc *sc = vsc;
@ -521,7 +521,7 @@ uftdi_set(void *vsc, int portno, int reg, int onoff)
(void)usbd_do_request(ucom->sc_udev, &req, NULL);
}
Static int
static int
uftdi_param(void *vsc, int portno, struct termios *t)
{
struct uftdi_softc *sc = vsc;
@ -687,7 +687,7 @@ uftdi_break(void *vsc, int portno, int onoff)
(void)usbd_do_request(ucom->sc_udev, &req, NULL);
}
Static device_method_t uftdi_methods[] = {
static device_method_t uftdi_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, uftdi_match),
DEVMETHOD(device_attach, uftdi_attach),
@ -696,7 +696,7 @@ Static device_method_t uftdi_methods[] = {
{ 0, 0 }
};
Static driver_t uftdi_driver = {
static driver_t uftdi_driver = {
"ucom",
uftdi_methods,
sizeof (struct uftdi_softc)

194
sys/dev/usb/uhci.c
View File

@ -177,124 +177,124 @@ struct uhci_pipe {
} u;
};
Static void uhci_globalreset(uhci_softc_t *);
Static usbd_status uhci_portreset(uhci_softc_t*, int);
Static void uhci_reset(uhci_softc_t *);
static void uhci_globalreset(uhci_softc_t *);
static usbd_status uhci_portreset(uhci_softc_t*, int);
static void uhci_reset(uhci_softc_t *);
#if defined(__NetBSD__) || defined(__OpenBSD__)
Static void uhci_shutdown(void *v);
Static void uhci_power(int, void *);
static void uhci_shutdown(void *v);
static void uhci_power(int, void *);
#endif
Static usbd_status uhci_run(uhci_softc_t *, int run);
Static uhci_soft_td_t *uhci_alloc_std(uhci_softc_t *);
Static void uhci_free_std(uhci_softc_t *, uhci_soft_td_t *);
Static uhci_soft_qh_t *uhci_alloc_sqh(uhci_softc_t *);
Static void uhci_free_sqh(uhci_softc_t *, uhci_soft_qh_t *);
Static usbd_status uhci_aux_dma_alloc(uhci_softc_t *, uhci_soft_td_t *,
static usbd_status uhci_run(uhci_softc_t *, int run);
static uhci_soft_td_t *uhci_alloc_std(uhci_softc_t *);
static void uhci_free_std(uhci_softc_t *, uhci_soft_td_t *);
static uhci_soft_qh_t *uhci_alloc_sqh(uhci_softc_t *);
static void uhci_free_sqh(uhci_softc_t *, uhci_soft_qh_t *);
static usbd_status uhci_aux_dma_alloc(uhci_softc_t *, uhci_soft_td_t *,
void *data, int len);
Static uhci_physaddr_t uhci_aux_dma_prepare(uhci_soft_td_t *, int);
Static void uhci_aux_dma_complete(uhci_soft_td_t *, int);
static uhci_physaddr_t uhci_aux_dma_prepare(uhci_soft_td_t *, int);
static void uhci_aux_dma_complete(uhci_soft_td_t *, int);
#if 0
Static void uhci_enter_ctl_q(uhci_softc_t *, uhci_soft_qh_t *,
static void uhci_enter_ctl_q(uhci_softc_t *, uhci_soft_qh_t *,
uhci_intr_info_t *);
Static void uhci_exit_ctl_q(uhci_softc_t *, uhci_soft_qh_t *);
static void uhci_exit_ctl_q(uhci_softc_t *, uhci_soft_qh_t *);
#endif
Static void uhci_free_std_chain(uhci_softc_t *,
static void uhci_free_std_chain(uhci_softc_t *,
uhci_soft_td_t *, uhci_soft_td_t *);
Static usbd_status uhci_alloc_std_chain(struct uhci_pipe *,
static usbd_status uhci_alloc_std_chain(struct uhci_pipe *,
uhci_softc_t *, int, int, u_int16_t,
usbd_xfer_handle xfer,
uhci_soft_td_t **, uhci_soft_td_t **);
Static void uhci_poll_hub(void *);
Static void uhci_waitintr(uhci_softc_t *, usbd_xfer_handle);
Static void uhci_check_intr(uhci_softc_t *, uhci_intr_info_t *);
Static void uhci_idone(uhci_intr_info_t *);
static void uhci_poll_hub(void *);
static void uhci_waitintr(uhci_softc_t *, usbd_xfer_handle);
static void uhci_check_intr(uhci_softc_t *, uhci_intr_info_t *);
static void uhci_idone(uhci_intr_info_t *);
Static void uhci_abort_xfer(usbd_xfer_handle, usbd_status status);
Static void uhci_transfer_complete(usbd_xfer_handle xfer);
static void uhci_abort_xfer(usbd_xfer_handle, usbd_status status);
static void uhci_transfer_complete(usbd_xfer_handle xfer);
Static void uhci_timeout(void *);
Static void uhci_timeout_task(void *);
Static void uhci_add_ls_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
Static void uhci_add_hs_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
Static void uhci_add_bulk(uhci_softc_t *, uhci_soft_qh_t *);
Static void uhci_remove_ls_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
Static void uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
Static void uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
Static int uhci_str(usb_string_descriptor_t *, int, char *);
Static void uhci_add_loop(uhci_softc_t *sc);
Static void uhci_rem_loop(uhci_softc_t *sc);
static void uhci_timeout(void *);
static void uhci_timeout_task(void *);
static void uhci_add_ls_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
static void uhci_add_hs_ctrl(uhci_softc_t *, uhci_soft_qh_t *);
static void uhci_add_bulk(uhci_softc_t *, uhci_soft_qh_t *);
static void uhci_remove_ls_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
static void uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
static void uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
static int uhci_str(usb_string_descriptor_t *, int, char *);
static void uhci_add_loop(uhci_softc_t *sc);
static void uhci_rem_loop(uhci_softc_t *sc);
Static usbd_status uhci_setup_isoc(usbd_pipe_handle pipe);
Static void uhci_device_isoc_enter(usbd_xfer_handle);
static usbd_status uhci_setup_isoc(usbd_pipe_handle pipe);
static void uhci_device_isoc_enter(usbd_xfer_handle);
Static usbd_status uhci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
Static void uhci_freem(struct usbd_bus *, usb_dma_t *);
static usbd_status uhci_allocm(struct usbd_bus *, usb_dma_t *, u_int32_t);
static void uhci_freem(struct usbd_bus *, usb_dma_t *);
Static usbd_xfer_handle uhci_allocx(struct usbd_bus *);
Static void uhci_freex(struct usbd_bus *, usbd_xfer_handle);
static usbd_xfer_handle uhci_allocx(struct usbd_bus *);
static void uhci_freex(struct usbd_bus *, usbd_xfer_handle);
Static usbd_status uhci_device_ctrl_transfer(usbd_xfer_handle);
Static usbd_status uhci_device_ctrl_start(usbd_xfer_handle);
Static void uhci_device_ctrl_abort(usbd_xfer_handle);
Static void uhci_device_ctrl_close(usbd_pipe_handle);
Static void uhci_device_ctrl_done(usbd_xfer_handle);
static usbd_status uhci_device_ctrl_transfer(usbd_xfer_handle);
static usbd_status uhci_device_ctrl_start(usbd_xfer_handle);
static void uhci_device_ctrl_abort(usbd_xfer_handle);
static void uhci_device_ctrl_close(usbd_pipe_handle);
static void uhci_device_ctrl_done(usbd_xfer_handle);
Static usbd_status uhci_device_intr_transfer(usbd_xfer_handle);
Static usbd_status uhci_device_intr_start(usbd_xfer_handle);
Static void uhci_device_intr_abort(usbd_xfer_handle);
Static void uhci_device_intr_close(usbd_pipe_handle);
Static void uhci_device_intr_done(usbd_xfer_handle);
static usbd_status uhci_device_intr_transfer(usbd_xfer_handle);
static usbd_status uhci_device_intr_start(usbd_xfer_handle);
static void uhci_device_intr_abort(usbd_xfer_handle);
static void uhci_device_intr_close(usbd_pipe_handle);
static void uhci_device_intr_done(usbd_xfer_handle);
Static usbd_status uhci_device_bulk_transfer(usbd_xfer_handle);
Static usbd_status uhci_device_bulk_start(usbd_xfer_handle);
Static void uhci_device_bulk_abort(usbd_xfer_handle);
Static void uhci_device_bulk_close(usbd_pipe_handle);
Static void uhci_device_bulk_done(usbd_xfer_handle);
static usbd_status uhci_device_bulk_transfer(usbd_xfer_handle);
static usbd_status uhci_device_bulk_start(usbd_xfer_handle);
static void uhci_device_bulk_abort(usbd_xfer_handle);
static void uhci_device_bulk_close(usbd_pipe_handle);
static void uhci_device_bulk_done(usbd_xfer_handle);
Static usbd_status uhci_device_isoc_transfer(usbd_xfer_handle);
Static usbd_status uhci_device_isoc_start(usbd_xfer_handle);
Static void uhci_device_isoc_abort(usbd_xfer_handle);
Static void uhci_device_isoc_close(usbd_pipe_handle);
Static void uhci_device_isoc_done(usbd_xfer_handle);
static usbd_status uhci_device_isoc_transfer(usbd_xfer_handle);
static usbd_status uhci_device_isoc_start(usbd_xfer_handle);
static void uhci_device_isoc_abort(usbd_xfer_handle);
static void uhci_device_isoc_close(usbd_pipe_handle);
static void uhci_device_isoc_done(usbd_xfer_handle);
Static usbd_status uhci_root_ctrl_transfer(usbd_xfer_handle);
Static usbd_status uhci_root_ctrl_start(usbd_xfer_handle);
Static void uhci_root_ctrl_abort(usbd_xfer_handle);
Static void uhci_root_ctrl_close(usbd_pipe_handle);
Static void uhci_root_ctrl_done(usbd_xfer_handle);
static usbd_status uhci_root_ctrl_transfer(usbd_xfer_handle);
static usbd_status uhci_root_ctrl_start(usbd_xfer_handle);
static void uhci_root_ctrl_abort(usbd_xfer_handle);
static void uhci_root_ctrl_close(usbd_pipe_handle);
static void uhci_root_ctrl_done(usbd_xfer_handle);
Static usbd_status uhci_root_intr_transfer(usbd_xfer_handle);
Static usbd_status uhci_root_intr_start(usbd_xfer_handle);
Static void uhci_root_intr_abort(usbd_xfer_handle);
Static void uhci_root_intr_close(usbd_pipe_handle);
Static void uhci_root_intr_done(usbd_xfer_handle);
static usbd_status uhci_root_intr_transfer(usbd_xfer_handle);
static usbd_status uhci_root_intr_start(usbd_xfer_handle);
static void uhci_root_intr_abort(usbd_xfer_handle);
static void uhci_root_intr_close(usbd_pipe_handle);
static void uhci_root_intr_done(usbd_xfer_handle);
Static usbd_status uhci_open(usbd_pipe_handle);
Static void uhci_poll(struct usbd_bus *);
Static void uhci_softintr(void *);
static usbd_status uhci_open(usbd_pipe_handle);
static void uhci_poll(struct usbd_bus *);
static void uhci_softintr(void *);
Static usbd_status uhci_device_request(usbd_xfer_handle xfer);
static usbd_status uhci_device_request(usbd_xfer_handle xfer);
Static void uhci_add_intr(uhci_softc_t *, uhci_soft_qh_t *);
Static void uhci_remove_intr(uhci_softc_t *, uhci_soft_qh_t *);
Static usbd_status uhci_device_setintr(uhci_softc_t *sc,
static void uhci_add_intr(uhci_softc_t *, uhci_soft_qh_t *);
static void uhci_remove_intr(uhci_softc_t *, uhci_soft_qh_t *);
static usbd_status uhci_device_setintr(uhci_softc_t *sc,
struct uhci_pipe *pipe, int ival);
Static void uhci_device_clear_toggle(usbd_pipe_handle pipe);
Static void uhci_noop(usbd_pipe_handle pipe);
static void uhci_device_clear_toggle(usbd_pipe_handle pipe);
static void uhci_noop(usbd_pipe_handle pipe);
Static __inline uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *,
static __inline uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *,
uhci_soft_qh_t *);
#ifdef USB_DEBUG
Static void uhci_dump_all(uhci_softc_t *);
Static void uhci_dumpregs(uhci_softc_t *);
Static void uhci_dump_qhs(uhci_soft_qh_t *);
Static void uhci_dump_qh(uhci_soft_qh_t *);
Static void uhci_dump_tds(uhci_soft_td_t *);
Static void uhci_dump_td(uhci_soft_td_t *);
Static void uhci_dump_ii(uhci_intr_info_t *ii);
static void uhci_dump_all(uhci_softc_t *);
static void uhci_dumpregs(uhci_softc_t *);
static void uhci_dump_qhs(uhci_soft_qh_t *);
static void uhci_dump_qh(uhci_soft_qh_t *);
static void uhci_dump_tds(uhci_soft_td_t *);
static void uhci_dump_td(uhci_soft_td_t *);
static void uhci_dump_ii(uhci_intr_info_t *ii);
void uhci_dump(void);
#endif
@ -395,7 +395,7 @@ struct usbd_pipe_methods uhci_device_isoc_methods = {
} while (0)
#define uhci_active_intr_info(ii) ((ii)->list.le_prev != NULL)
Static __inline uhci_soft_qh_t *
static __inline uhci_soft_qh_t *
uhci_find_prev_qh(uhci_soft_qh_t *pqh, uhci_soft_qh_t *sqh)
{
DPRINTFN(15,("uhci_find_prev_qh: pqh=%p sqh=%p\n", pqh, sqh));
@ -560,7 +560,7 @@ uhci_init(uhci_softc_t *sc)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
uhci_activate(device_ptr_t self, enum devact act)
uhci_activate(device_t self, enum devact act)
{
struct uhci_softc *sc = (struct uhci_softc *)self;
int rv = 0;
@ -777,7 +777,7 @@ uhci_power(int why, void *v)
}
#ifdef USB_DEBUG
Static void
static void
uhci_dumpregs(uhci_softc_t *sc)
{
DPRINTFN(-1,("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
@ -901,7 +901,7 @@ uhci_dump_tds(uhci_soft_td_t *std)
}
}
Static void
static void
uhci_dump_ii(uhci_intr_info_t *ii)
{
usbd_pipe_handle pipe;
@ -1177,7 +1177,7 @@ uhci_remove_bulk(uhci_softc_t *sc, uhci_soft_qh_t *sqh)
sc->sc_bulk_end = pqh;
}
Static int uhci_intr1(uhci_softc_t *);
static int uhci_intr1(uhci_softc_t *);
int
uhci_intr(void *arg)
@ -1857,7 +1857,7 @@ uhci_alloc_std_chain(struct uhci_pipe *upipe, uhci_softc_t *sc, int len,
* If the usb_dma_t was already allocated this just ensures it is
* large enough for the specified size.
*/
Static usbd_status
static usbd_status
uhci_aux_dma_alloc(uhci_softc_t *sc, uhci_soft_td_t *std, void *data, int len)
{
int err, align;
@ -1882,7 +1882,7 @@ uhci_aux_dma_alloc(uhci_softc_t *sc, uhci_soft_td_t *std, void *data, int len)
return (USBD_NORMAL_COMPLETION);
}
Static uhci_physaddr_t
static uhci_physaddr_t
uhci_aux_dma_prepare(uhci_soft_td_t *std, int isread)
{
if (!isread) {
@ -1894,7 +1894,7 @@ uhci_aux_dma_prepare(uhci_soft_td_t *std, int isread)
return (DMAADDR(&std->aux_dma, 0));
}
Static void
static void
uhci_aux_dma_complete(uhci_soft_td_t *std, int isread)
{
if (isread) {
@ -2130,7 +2130,7 @@ uhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
* Perform any UHCI-specific transfer completion operations, then
* call usb_transfer_complete().
*/
Static void
static void
uhci_transfer_complete(usbd_xfer_handle xfer)
{
uhci_intr_info_t *ii = &UXFER(xfer)->iinfo;
@ -3252,7 +3252,7 @@ uhci_str(usb_string_descriptor_t *p, int l, char *s)
* outstanding "port enable change" and "connection status change"
* events have been reset.
*/
Static usbd_status
static usbd_status
uhci_portreset(uhci_softc_t *sc, int index)
{
int lim, port, x;

4
sys/dev/usb/uhcivar.h
View File

@ -201,7 +201,7 @@ typedef struct uhci_softc {
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__)
device_ptr_t sc_child; /* /dev/usb# device */
device_t sc_child; /* /dev/usb# device */
#endif
} uhci_softc_t;
@ -209,7 +209,7 @@ usbd_status uhci_init(uhci_softc_t *);
int uhci_intr(void *);
int uhci_detach(uhci_softc_t *, int);
#if defined(__NetBSD__) || defined(__OpenBSD__)
int uhci_activate(device_ptr_t, enum devact);
int uhci_activate(device_t, enum devact);
#endif
void uhci_shutdown(void *v);

12
sys/dev/usb/uhid.c
View File

@ -160,7 +160,7 @@ d_ioctl_t uhidioctl;
d_poll_t uhidpoll;
Static struct cdevsw uhid_cdevsw = {
static struct cdevsw uhid_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = uhidopen,
@ -176,12 +176,12 @@ Static struct cdevsw uhid_cdevsw = {
};
#endif
Static void uhid_intr(usbd_xfer_handle, usbd_private_handle,
static void uhid_intr(usbd_xfer_handle, usbd_private_handle,
usbd_status);
Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_ioctl(struct uhid_softc *, u_long, caddr_t, int,
static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
static int uhid_do_ioctl(struct uhid_softc *, u_long, caddr_t, int,
usb_proc_ptr);
USB_DECLARE_DRIVER(uhid);
@ -330,7 +330,7 @@ USB_ATTACH(uhid)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
uhid_activate(device_ptr_t self, enum devact act)
uhid_activate(device_t self, enum devact act)
{
struct uhid_softc *sc = (struct uhid_softc *)self;

14
sys/dev/usb/uhub.c
View File

@ -91,12 +91,12 @@ struct uhub_softc {
#define UHUB_IS_HIGH_SPEED(sc) (UHUB_PROTO(sc) != UDPROTO_FSHUB)
#define UHUB_IS_SINGLE_TT(sc) (UHUB_PROTO(sc) == UDPROTO_HSHUBSTT)
Static usbd_status uhub_explore(usbd_device_handle hub);
Static void uhub_intr(usbd_xfer_handle, usbd_private_handle,usbd_status);
static usbd_status uhub_explore(usbd_device_handle hub);
static void uhub_intr(usbd_xfer_handle, usbd_private_handle,usbd_status);
#if defined(__FreeBSD__)
Static bus_child_location_str_t uhub_child_location_str;
Static bus_child_pnpinfo_str_t uhub_child_pnpinfo_str;
static bus_child_location_str_t uhub_child_location_str;
static bus_child_pnpinfo_str_t uhub_child_pnpinfo_str;
#endif
@ -125,7 +125,7 @@ USB_DECLARE_DRIVER_INIT(uhub,
/* Create the driver instance for the hub connected to usb case. */
devclass_t uhubroot_devclass;
Static device_method_t uhubroot_methods[] = {
static device_method_t uhubroot_methods[] = {
DEVMETHOD(bus_child_location_str, uhub_child_location_str),
DEVMETHOD(bus_child_pnpinfo_str, uhub_child_pnpinfo_str),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
@ -139,7 +139,7 @@ Static device_method_t uhubroot_methods[] = {
{0,0}
};
Static driver_t uhubroot_driver = {
static driver_t uhubroot_driver = {
"uhub",
uhubroot_methods,
sizeof(struct uhub_softc)
@ -553,7 +553,7 @@ uhub_explore(usbd_device_handle dev)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
uhub_activate(device_ptr_t self, enum devact act)
uhub_activate(device_t self, enum devact act)
{
struct uhub_softc *sc = (struct uhub_softc *)self;
struct usbd_hub *hub = sc->sc_hub->hub;

128
sys/dev/usb/ukbd.c
View File

@ -127,9 +127,9 @@ typedef struct ukbd_softc {
typedef void usbd_intr_t(usbd_xfer_handle, usbd_private_handle, usbd_status);
typedef void usbd_disco_t(void *);
Static int ukbd_resume(device_t self);
Static usbd_intr_t ukbd_intr;
Static int ukbd_driver_load(module_t mod, int what, void *arg);
static int ukbd_resume(device_t self);
static usbd_intr_t ukbd_intr;
static int ukbd_driver_load(module_t mod, int what, void *arg);
USB_DECLARE_DRIVER_INIT(ukbd, DEVMETHOD(device_resume, ukbd_resume));
@ -220,7 +220,7 @@ ukbd_detach(device_t self)
return (0);
}
Static int
static int
ukbd_resume(device_t self)
{
keyboard_t *kbd;
@ -262,7 +262,7 @@ DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
#define SCAN_CHAR(c) ((c) & 0x7f)
#define NMOD 8
Static struct {
static struct {
int mask, key;
} ukbd_mods[NMOD] = {
{ MOD_CONTROL_L, 0xe0 },
@ -288,7 +288,7 @@ Static struct {
* 0x69: F14
* 0x6a: F15
*/
Static u_int8_t ukbd_trtab[256] = {
static u_int8_t ukbd_trtab[256] = {
0, 0, 0, 0, 30, 48, 46, 32, /* 00 - 07 */
18, 33, 34, 35, 23, 36, 37, 38, /* 08 - 0F */
50, 49, 24, 25, 16, 19, 31, 20, /* 10 - 17 */
@ -359,24 +359,24 @@ typedef struct ukbd_state {
} ukbd_state_t;
/* keyboard driver declaration */
Static int ukbd_configure(int flags);
Static kbd_probe_t ukbd_probe;
Static kbd_init_t ukbd_init;
Static kbd_term_t ukbd_term;
Static kbd_intr_t ukbd_interrupt;
Static kbd_test_if_t ukbd_test_if;
Static kbd_enable_t ukbd_enable;
Static kbd_disable_t ukbd_disable;
Static kbd_read_t ukbd_read;
Static kbd_check_t ukbd_check;
Static kbd_read_char_t ukbd_read_char;
Static kbd_check_char_t ukbd_check_char;
Static kbd_ioctl_t ukbd_ioctl;
Static kbd_lock_t ukbd_lock;
Static kbd_clear_state_t ukbd_clear_state;
Static kbd_get_state_t ukbd_get_state;
Static kbd_set_state_t ukbd_set_state;
Static kbd_poll_mode_t ukbd_poll;
static int ukbd_configure(int flags);
static kbd_probe_t ukbd_probe;
static kbd_init_t ukbd_init;
static kbd_term_t ukbd_term;
static kbd_intr_t ukbd_interrupt;
static kbd_test_if_t ukbd_test_if;
static kbd_enable_t ukbd_enable;
static kbd_disable_t ukbd_disable;
static kbd_read_t ukbd_read;
static kbd_check_t ukbd_check;
static kbd_read_char_t ukbd_read_char;
static kbd_check_char_t ukbd_check_char;
static kbd_ioctl_t ukbd_ioctl;
static kbd_lock_t ukbd_lock;
static kbd_clear_state_t ukbd_clear_state;
static kbd_get_state_t ukbd_get_state;
static kbd_set_state_t ukbd_set_state;
static kbd_poll_mode_t ukbd_poll;
keyboard_switch_t ukbdsw = {
ukbd_probe,
@ -403,18 +403,18 @@ keyboard_switch_t ukbdsw = {
KEYBOARD_DRIVER(ukbd, ukbdsw, ukbd_configure);
/* local functions */
Static int ukbd_enable_intr(keyboard_t *kbd, int on,
static int ukbd_enable_intr(keyboard_t *kbd, int on,
usbd_intr_t *func);
Static void ukbd_timeout(void *arg);
static void ukbd_timeout(void *arg);
Static int ukbd_getc(ukbd_state_t *state);
Static int probe_keyboard(struct usb_attach_arg *uaa, int flags);
Static int init_keyboard(ukbd_state_t *state, int *type,
static int ukbd_getc(ukbd_state_t *state);
static int probe_keyboard(struct usb_attach_arg *uaa, int flags);
static int init_keyboard(ukbd_state_t *state, int *type,
int flags);
Static void set_leds(ukbd_state_t *state, int leds);
Static int set_typematic(keyboard_t *kbd, int code);
static void set_leds(ukbd_state_t *state, int leds);
static int set_typematic(keyboard_t *kbd, int code);
#ifdef UKBD_EMULATE_ATSCANCODE
Static int keycode2scancode(int keycode, int shift, int up);
static int keycode2scancode(int keycode, int shift, int up);
#endif
/* local variables */
@ -427,11 +427,11 @@ Static int keycode2scancode(int keycode, int shift, int up);
#include <dev/kbd/kbdtables.h>
/* structures for the default keyboard */
Static keyboard_t default_kbd;
Static ukbd_state_t default_kbd_state;
Static keymap_t default_keymap;
Static accentmap_t default_accentmap;
Static fkeytab_t default_fkeytab[NUM_FKEYS];
static keyboard_t default_kbd;
static ukbd_state_t default_kbd_state;
static keymap_t default_keymap;
static accentmap_t default_accentmap;
static fkeytab_t default_fkeytab[NUM_FKEYS];
/*
* The back door to the keyboard driver!
@ -442,7 +442,7 @@ Static fkeytab_t default_fkeytab[NUM_FKEYS];
* NOTE: because of the way the low-level conole is initialized, this routine
* may be called more than once!!
*/
Static int
static int
ukbd_configure(int flags)
{
return 0;
@ -477,7 +477,7 @@ ukbd_configure(int flags)
/* low-level functions */
/* detect a keyboard */
Static int
static int
ukbd_probe(int unit, void *arg, int flags)
{
void **data;
@ -497,7 +497,7 @@ ukbd_probe(int unit, void *arg, int flags)
}
/* reset and initialize the device */
Static int
static int
ukbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
{
keyboard_t *kbd;
@ -599,7 +599,7 @@ ukbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
return 0;
}
Static int
static int
ukbd_enable_intr(keyboard_t *kbd, int on, usbd_intr_t *func)
{
ukbd_state_t *state = (ukbd_state_t *)kbd->kb_data;
@ -631,7 +631,7 @@ ukbd_enable_intr(keyboard_t *kbd, int on, usbd_intr_t *func)
}
/* finish using this keyboard */
Static int
static int
ukbd_term(keyboard_t *kbd)
{
ukbd_state_t *state;
@ -673,7 +673,7 @@ ukbd_term(keyboard_t *kbd)
/* keyboard interrupt routine */
Static void
static void
ukbd_timeout(void *arg)
{
keyboard_t *kbd;
@ -688,7 +688,7 @@ ukbd_timeout(void *arg)
splx(s);
}
Static int
static int
ukbd_interrupt(keyboard_t *kbd, void *arg)
{
usbd_status status = (usbd_status)arg;
@ -814,7 +814,7 @@ ukbd_interrupt(keyboard_t *kbd, void *arg)
return 0;
}
Static int
static int
ukbd_getc(ukbd_state_t *state)
{
int c;
@ -840,7 +840,7 @@ ukbd_getc(ukbd_state_t *state)
}
/* test the interface to the device */
Static int
static int
ukbd_test_if(keyboard_t *kbd)
{
return 0;
@ -850,7 +850,7 @@ ukbd_test_if(keyboard_t *kbd)
* Enable the access to the device; until this function is called,
* the client cannot read from the keyboard.
*/
Static int
static int
ukbd_enable(keyboard_t *kbd)
{
int s;
@ -862,7 +862,7 @@ ukbd_enable(keyboard_t *kbd)
}
/* disallow the access to the device */
Static int
static int
ukbd_disable(keyboard_t *kbd)
{
int s;
@ -874,7 +874,7 @@ ukbd_disable(keyboard_t *kbd)
}
/* read one byte from the keyboard if it's allowed */
Static int
static int
ukbd_read(keyboard_t *kbd, int wait)
{
ukbd_state_t *state;
@ -934,7 +934,7 @@ ukbd_read(keyboard_t *kbd, int wait)
}
/* check if data is waiting */
Static int
static int
ukbd_check(keyboard_t *kbd)
{
if (!KBD_IS_ACTIVE(kbd))
@ -949,7 +949,7 @@ ukbd_check(keyboard_t *kbd)
}
/* read char from the keyboard */
Static u_int
static u_int
ukbd_read_char(keyboard_t *kbd, int wait)
{
ukbd_state_t *state;
@ -1135,7 +1135,7 @@ ukbd_read_char(keyboard_t *kbd, int wait)
}
/* check if char is waiting */
Static int
static int
ukbd_check_char(keyboard_t *kbd)
{
ukbd_state_t *state;
@ -1149,7 +1149,7 @@ ukbd_check_char(keyboard_t *kbd)
}
/* some useful control functions */
Static int
static int
ukbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
{
/* trasnlate LED_XXX bits into the device specific bits */
@ -1266,7 +1266,7 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
}
/* lock the access to the keyboard */
Static int
static int
ukbd_lock(keyboard_t *kbd, int lock)
{
/* XXX ? */
@ -1274,7 +1274,7 @@ ukbd_lock(keyboard_t *kbd, int lock)
}
/* clear the internal state of the keyboard */
Static void
static void
ukbd_clear_state(keyboard_t *kbd)
{
ukbd_state_t *state;
@ -1296,7 +1296,7 @@ ukbd_clear_state(keyboard_t *kbd)
}
/* save the internal state */
Static int
static int
ukbd_get_state(keyboard_t *kbd, void *buf, size_t len)
{
if (len == 0)
@ -1308,7 +1308,7 @@ ukbd_get_state(keyboard_t *kbd, void *buf, size_t len)
}
/* set the internal state */
Static int
static int
ukbd_set_state(keyboard_t *kbd, void *buf, size_t len)
{
if (len < sizeof(ukbd_state_t))
@ -1317,7 +1317,7 @@ ukbd_set_state(keyboard_t *kbd, void *buf, size_t len)
return 0;
}
Static int
static int
ukbd_poll(keyboard_t *kbd, int on)
{
ukbd_state_t *state;
@ -1343,7 +1343,7 @@ ukbd_poll(keyboard_t *kbd, int on)
/* local functions */
Static int
static int
probe_keyboard(struct usb_attach_arg *uaa, int flags)
{
usb_interface_descriptor_t *id;
@ -1362,7 +1362,7 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags)
return EINVAL;
}
Static int
static int
init_keyboard(ukbd_state_t *state, int *type, int flags)
{
usb_endpoint_descriptor_t *ed;
@ -1409,7 +1409,7 @@ bLength=%d bDescriptorType=%d bEndpointAddress=%d-%s bmAttributes=%d wMaxPacketS
return 0;
}
Static void
static void
set_leds(ukbd_state_t *state, int leds)
{
u_int8_t res = leds;
@ -1419,7 +1419,7 @@ set_leds(ukbd_state_t *state, int leds)
usbd_set_report_async(state->ks_iface, UHID_OUTPUT_REPORT, 0, &res, 1);
}
Static int
static int
set_typematic(keyboard_t *kbd, int code)
{
static int delays[] = { 250, 500, 750, 1000 };
@ -1436,7 +1436,7 @@ set_typematic(keyboard_t *kbd, int code)
}
#ifdef UKBD_EMULATE_ATSCANCODE
Static int
static int
keycode2scancode(int keycode, int shift, int up)
{
static int scan[] = {
@ -1465,7 +1465,7 @@ keycode2scancode(int keycode, int shift, int up)
}
#endif /* UKBD_EMULATE_ATSCANCODE */
Static int
static int
ukbd_driver_load(module_t mod, int what, void *arg)
{
switch (what) {

14
sys/dev/usb/ulpt.c
View File

@ -149,14 +149,14 @@ const struct cdevsw ulpt_cdevsw = {
#elif defined(__OpenBSD__)
cdev_decl(ulpt);
#elif defined(__FreeBSD__)
Static d_open_t ulptopen;
Static d_close_t ulptclose;
Static d_write_t ulptwrite;
Static d_read_t ulptread;
Static d_ioctl_t ulptioctl;
static d_open_t ulptopen;
static d_close_t ulptclose;
static d_write_t ulptwrite;
static d_read_t ulptread;
static d_ioctl_t ulptioctl;
Static struct cdevsw ulpt_cdevsw = {
static struct cdevsw ulpt_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = ulptopen,
@ -366,7 +366,7 @@ USB_ATTACH(ulpt)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
ulpt_activate(device_ptr_t self, enum devact act)
ulpt_activate(device_t self, enum devact act)
{
struct ulpt_softc *sc = (struct ulpt_softc *)self;

134
sys/dev/usb/umass.c
View File

@ -319,7 +319,7 @@ struct umass_devdescr_t {
# define RBC_PAD_TO_12 0x1000
};
Static struct umass_devdescr_t umass_devdescrs[] = {
static struct umass_devdescr_t umass_devdescrs[] = {
{ USB_VENDOR_ASAHIOPTICAL, PID_WILDCARD, RID_WILDCARD,
UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
RS_NO_CLEAR_UA
@ -664,108 +664,108 @@ char *states[TSTATE_STATES+1] = {
#endif
/* If device cannot return valid inquiry data, fake it */
Static uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = {
static uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = {
0, /*removable*/ 0x80, SCSI_REV_2, SCSI_REV_2,
/*additional_length*/ 31, 0, 0, 0
};
/* USB device probe/attach/detach functions */
USB_DECLARE_DRIVER(umass);
Static int umass_match_proto (struct umass_softc *sc,
static int umass_match_proto (struct umass_softc *sc,
usbd_interface_handle iface,
usbd_device_handle udev);
/* quirk functions */
Static void umass_init_shuttle (struct umass_softc *sc);
static void umass_init_shuttle (struct umass_softc *sc);
/* generic transfer functions */
Static usbd_status umass_setup_transfer (struct umass_softc *sc,
static usbd_status umass_setup_transfer (struct umass_softc *sc,
usbd_pipe_handle pipe,
void *buffer, int buflen, int flags,
usbd_xfer_handle xfer);
Static usbd_status umass_setup_ctrl_transfer (struct umass_softc *sc,
static usbd_status umass_setup_ctrl_transfer (struct umass_softc *sc,
usbd_device_handle udev,
usb_device_request_t *req,
void *buffer, int buflen, int flags,
usbd_xfer_handle xfer);
Static void umass_clear_endpoint_stall (struct umass_softc *sc,
static void umass_clear_endpoint_stall (struct umass_softc *sc,
u_int8_t endpt, usbd_pipe_handle pipe,
int state, usbd_xfer_handle xfer);
Static void umass_reset (struct umass_softc *sc,
static void umass_reset (struct umass_softc *sc,
transfer_cb_f cb, void *priv);
/* Bulk-Only related functions */
Static void umass_bbb_reset (struct umass_softc *sc, int status);
Static void umass_bbb_transfer (struct umass_softc *sc, int lun,
static void umass_bbb_reset (struct umass_softc *sc, int status);
static void umass_bbb_transfer (struct umass_softc *sc, int lun,
void *cmd, int cmdlen,
void *data, int datalen, int dir, u_int timeout,
transfer_cb_f cb, void *priv);
Static void umass_bbb_state (usbd_xfer_handle xfer,
static void umass_bbb_state (usbd_xfer_handle xfer,
usbd_private_handle priv,
usbd_status err);
Static int umass_bbb_get_max_lun
static int umass_bbb_get_max_lun
(struct umass_softc *sc);
/* CBI related functions */
Static int umass_cbi_adsc (struct umass_softc *sc,
static int umass_cbi_adsc (struct umass_softc *sc,
char *buffer, int buflen,
usbd_xfer_handle xfer);
Static void umass_cbi_reset (struct umass_softc *sc, int status);
Static void umass_cbi_transfer (struct umass_softc *sc, int lun,
static void umass_cbi_reset (struct umass_softc *sc, int status);
static void umass_cbi_transfer (struct umass_softc *sc, int lun,
void *cmd, int cmdlen,
void *data, int datalen, int dir, u_int timeout,
transfer_cb_f cb, void *priv);
Static void umass_cbi_state (usbd_xfer_handle xfer,
static void umass_cbi_state (usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status err);
/* CAM related functions */
Static void umass_cam_action (struct cam_sim *sim, union ccb *ccb);
Static void umass_cam_poll (struct cam_sim *sim);
static void umass_cam_action (struct cam_sim *sim, union ccb *ccb);
static void umass_cam_poll (struct cam_sim *sim);
Static void umass_cam_cb (struct umass_softc *sc, void *priv,
static void umass_cam_cb (struct umass_softc *sc, void *priv,
int residue, int status);
Static void umass_cam_sense_cb (struct umass_softc *sc, void *priv,
static void umass_cam_sense_cb (struct umass_softc *sc, void *priv,
int residue, int status);
Static void umass_cam_quirk_cb (struct umass_softc *sc, void *priv,
static void umass_cam_quirk_cb (struct umass_softc *sc, void *priv,
int residue, int status);
Static void umass_cam_rescan_callback
static void umass_cam_rescan_callback
(struct cam_periph *periph,union ccb *ccb);
Static void umass_cam_rescan (void *addr);
static void umass_cam_rescan (void *addr);
Static int umass_cam_attach_sim (struct umass_softc *sc);
Static int umass_cam_attach (struct umass_softc *sc);
Static int umass_cam_detach_sim (struct umass_softc *sc);
static int umass_cam_attach_sim (struct umass_softc *sc);
static int umass_cam_attach (struct umass_softc *sc);
static int umass_cam_detach_sim (struct umass_softc *sc);
/* SCSI specific functions */
Static int umass_scsi_transform (struct umass_softc *sc,
static int umass_scsi_transform (struct umass_softc *sc,
unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen);
/* UFI specific functions */
#define UFI_COMMAND_LENGTH 12 /* UFI commands are always 12 bytes */
Static int umass_ufi_transform (struct umass_softc *sc,
static int umass_ufi_transform (struct umass_softc *sc,
unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen);
/* ATAPI (8070i) specific functions */
#define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are always 12 bytes */
Static int umass_atapi_transform (struct umass_softc *sc,
static int umass_atapi_transform (struct umass_softc *sc,
unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen);
/* RBC specific functions */
Static int umass_rbc_transform (struct umass_softc *sc,
static int umass_rbc_transform (struct umass_softc *sc,
unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen);
#ifdef USB_DEBUG
/* General debugging functions */
Static void umass_bbb_dump_cbw (struct umass_softc *sc, umass_bbb_cbw_t *cbw);
Static void umass_bbb_dump_csw (struct umass_softc *sc, umass_bbb_csw_t *csw);
Static void umass_cbi_dump_cmd (struct umass_softc *sc, void *cmd, int cmdlen);
Static void umass_dump_buffer (struct umass_softc *sc, u_int8_t *buffer,
static void umass_bbb_dump_cbw (struct umass_softc *sc, umass_bbb_cbw_t *cbw);
static void umass_bbb_dump_csw (struct umass_softc *sc, umass_bbb_csw_t *csw);
static void umass_cbi_dump_cmd (struct umass_softc *sc, void *cmd, int cmdlen);
static void umass_dump_buffer (struct umass_softc *sc, u_int8_t *buffer,
int buflen, int printlen);
#endif
@ -783,7 +783,7 @@ MODULE_DEPEND(umass, cam, 1,1,1);
* probe and attach.
*/
Static int
static int
umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
usbd_device_handle udev)
{
@ -1209,7 +1209,7 @@ USB_DETACH(umass)
return(err);
}
Static void
static void
umass_init_shuttle(struct umass_softc *sc)
{
usb_device_request_t req;
@ -1233,7 +1233,7 @@ umass_init_shuttle(struct umass_softc *sc)
* Generic functions to handle transfers
*/
Static usbd_status
static usbd_status
umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe,
void *buffer, int buflen, int flags,
usbd_xfer_handle xfer)
@ -1256,7 +1256,7 @@ umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe,
}
Static usbd_status
static usbd_status
umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle udev,
usb_device_request_t *req,
void *buffer, int buflen, int flags,
@ -1281,7 +1281,7 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle udev,
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
umass_clear_endpoint_stall(struct umass_softc *sc,
u_int8_t endpt, usbd_pipe_handle pipe,
int state, usbd_xfer_handle xfer)
@ -1305,7 +1305,7 @@ umass_clear_endpoint_stall(struct umass_softc *sc,
umass_setup_ctrl_transfer(sc, udev, &sc->request, NULL, 0, 0, xfer);
}
Static void
static void
umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv)
{
sc->transfer_cb = cb;
@ -1319,7 +1319,7 @@ umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv)
* Bulk protocol specific functions
*/
Static void
static void
umass_bbb_reset(struct umass_softc *sc, int status)
{
usbd_device_handle udev;
@ -1362,7 +1362,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
sc->transfer_xfer[XFER_BBB_RESET1]);
}
Static void
static void
umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
void *data, int datalen, int dir, u_int timeout,
transfer_cb_f cb, void *priv)
@ -1471,7 +1471,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
}
Static void
static void
umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status err)
{
@ -1773,7 +1773,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
}
}
Static int
static int
umass_bbb_get_max_lun(struct umass_softc *sc)
{
usbd_device_handle udev;
@ -1817,7 +1817,7 @@ umass_bbb_get_max_lun(struct umass_softc *sc)
* Command/Bulk/Interrupt (CBI) specific functions
*/
Static int
static int
umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen,
usbd_xfer_handle xfer)
{
@ -1839,7 +1839,7 @@ umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen,
}
Static void
static void
umass_cbi_reset(struct umass_softc *sc, int status)
{
int i;
@ -1888,7 +1888,7 @@ umass_cbi_reset(struct umass_softc *sc, int status)
/* XXX if the command fails we should reset the port on the hub */
}
Static void
static void
umass_cbi_transfer(struct umass_softc *sc, int lun,
void *cmd, int cmdlen, void *data, int datalen, int dir,
u_int timeout, transfer_cb_f cb, void *priv)
@ -1943,7 +1943,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
umass_cbi_reset(sc, STATUS_WIRE_FAILED);
}
Static void
static void
umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status err)
{
@ -2226,7 +2226,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
* CAM specific functions (used by SCSI, UFI, 8070i (ATAPI))
*/
Static int
static int
umass_cam_attach_sim(struct umass_softc *sc)
{
struct cam_devq *devq; /* Per device Queue */
@ -2260,7 +2260,7 @@ umass_cam_attach_sim(struct umass_softc *sc)
return(0);
}
Static void
static void
umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
{
#ifdef USB_DEBUG
@ -2278,7 +2278,7 @@ umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
free(ccb, M_USBDEV);
}
Static void
static void
umass_cam_rescan(void *addr)
{
struct umass_softc *sc = (struct umass_softc *) addr;
@ -2309,7 +2309,7 @@ umass_cam_rescan(void *addr)
/* The scan is in progress now. */
}
Static int
static int
umass_cam_attach(struct umass_softc *sc)
{
#ifndef USB_DEBUG
@ -2339,7 +2339,7 @@ umass_cam_attach(struct umass_softc *sc)
* detach from the CAM layer
*/
Static int
static int
umass_cam_detach_sim(struct umass_softc *sc)
{
if (sc->umass_sim) {
@ -2358,7 +2358,7 @@ umass_cam_detach_sim(struct umass_softc *sc)
* CAM requests for action come through here
*/
Static void
static void
umass_cam_action(struct cam_sim *sim, union ccb *ccb)
{
struct umass_softc *sc = (struct umass_softc *)sim->softc;
@ -2655,7 +2655,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
}
}
Static void
static void
umass_cam_poll(struct cam_sim *sim)
{
struct umass_softc *sc = (struct umass_softc *) sim->softc;
@ -2673,7 +2673,7 @@ umass_cam_poll(struct cam_sim *sim)
* finalise a completed CAM command
*/
Static void
static void
umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
{
union ccb *ccb = (union ccb *) priv;
@ -2755,7 +2755,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
/* Finalise a completed autosense operation
*/
Static void
static void
umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
{
union ccb *ccb = (union ccb *) priv;
@ -2855,7 +2855,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
* after having previously failed a READ CAPACITY with CHECK_COND. Even
* though this command succeeded, we have to tell CAM to retry.
*/
Static void
static void
umass_cam_quirk_cb(struct umass_softc *sc, void *priv, int residue, int status)
{
union ccb *ccb = (union ccb *) priv;
@ -2877,7 +2877,7 @@ umass_cam_quirk_cb(struct umass_softc *sc, void *priv, int residue, int status)
xpt_done(ccb);
}
Static int
static int
umass_driver_load(module_t mod, int what, void *arg)
{
switch (what) {
@ -2892,7 +2892,7 @@ umass_driver_load(module_t mod, int what, void *arg)
* SCSI specific functions
*/
Static int
static int
umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen)
{
@ -2928,7 +2928,7 @@ umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
return 1;
}
/* RBC specific functions */
Static int
static int
umass_rbc_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen)
{
@ -2971,7 +2971,7 @@ umass_rbc_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
/*
* UFI specific functions
*/
Static int
static int
umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen)
{
@ -3032,7 +3032,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
/*
* 8070i (ATAPI) specific functions
*/
Static int
static int
umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
unsigned char **rcmd, int *rcmdlen)
{
@ -3124,7 +3124,7 @@ DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, umass_driver_load, 0);
#ifdef USB_DEBUG
Static void
static void
umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw)
{
int clen = cbw->bCDBLength;
@ -3142,7 +3142,7 @@ umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw)
(flags == CBWFLAGS_OUT? "out":"<invalid>"))));
}
Static void
static void
umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw)
{
int sig = UGETDW(csw->dCSWSignature);
@ -3159,7 +3159,7 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw)
(status == CSWSTATUS_PHASE? "phase":"<invalid>")))));
}
Static void
static void
umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, int cmdlen)
{
u_int8_t *c = cmd;
@ -3176,7 +3176,7 @@ umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, int cmdlen)
(dir == DIR_NONE? "no data phase": "<invalid>")))));
}
Static void
static void
umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen,
int printlen)
{

46
sys/dev/usb/umct.c
View File

@ -85,15 +85,15 @@ struct umct_softc {
struct task sc_task;
};
Static void umct_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void umct_get_status(void *, int, u_char *, u_char *);
Static void umct_set(void *, int, int, int);
Static int umct_param(void *, int, struct termios *);
Static int umct_open(void *, int);
Static void umct_close(void *, int);
Static void umct_notify(void *, int count);
static void umct_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void umct_get_status(void *, int, u_char *, u_char *);
static void umct_set(void *, int, int, int);
static int umct_param(void *, int, struct termios *);
static int umct_open(void *, int);
static void umct_close(void *, int);
static void umct_notify(void *, int count);
Static struct ucom_callback umct_callback = {
static struct ucom_callback umct_callback = {
umct_get_status, /* ucom_get_status */
umct_set, /* ucom_set */
umct_param, /* ucom_param */
@ -104,7 +104,7 @@ Static struct ucom_callback umct_callback = {
NULL /* ucom_write */
};
Static const struct umct_product {
static const struct umct_product {
uint16_t vendor;
uint16_t product;
} umct_products[] = {
@ -116,18 +116,18 @@ Static const struct umct_product {
{ 0, 0 }
};
Static device_probe_t umct_match;
Static device_attach_t umct_attach;
Static device_detach_t umct_detach;
static device_probe_t umct_match;
static device_attach_t umct_attach;
static device_detach_t umct_detach;
Static device_method_t umct_methods[] = {
static device_method_t umct_methods[] = {
DEVMETHOD(device_probe, umct_match),
DEVMETHOD(device_attach, umct_attach),
DEVMETHOD(device_detach, umct_detach),
{ 0, 0 }
};
Static driver_t umct_driver = {
static driver_t umct_driver = {
"ucom",
umct_methods,
sizeof(struct umct_softc)
@ -303,7 +303,7 @@ USB_DETACH(umct)
return (rv);
}
Static int
static int
umct_request(struct umct_softc *sc, uint8_t request, int len, uint32_t value)
{
usb_device_request_t req;
@ -324,7 +324,7 @@ umct_request(struct umct_softc *sc, uint8_t request, int len, uint32_t value)
return (err);
}
Static void
static void
umct_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct umct_softc *sc;
@ -353,7 +353,7 @@ umct_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
taskqueue_enqueue(taskqueue_swi_giant, &sc->sc_task);
}
Static void
static void
umct_notify(void *arg, int count)
{
struct umct_softc *sc;
@ -363,7 +363,7 @@ umct_notify(void *arg, int count)
ucom_status_change(&sc->sc_ucom);
}
Static void
static void
umct_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct umct_softc *sc;
@ -377,7 +377,7 @@ umct_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
return;
}
Static void
static void
umct_set(void *addr, int portno, int reg, int onoff)
{
struct umct_softc *sc;
@ -404,7 +404,7 @@ umct_set(void *addr, int portno, int reg, int onoff)
}
}
Static int
static int
umct_calc_baud(u_int baud)
{
switch(baud) {
@ -426,7 +426,7 @@ umct_calc_baud(u_int baud)
return (0x0);
}
Static int
static int
umct_param(void *addr, int portno, struct termios *ti)
{
struct umct_softc *sc;
@ -463,7 +463,7 @@ umct_param(void *addr, int portno, struct termios *ti)
return (0);
}
Static int
static int
umct_open(void *addr, int portno)
{
struct umct_softc *sc;
@ -491,7 +491,7 @@ umct_open(void *addr, int portno)
return (0);
}
Static void
static void
umct_close(void *addr, int portno)
{
struct umct_softc *sc;

52
sys/dev/usb/umodem.c
View File

@ -172,28 +172,28 @@ struct umodem_softc {
struct task sc_task;
};
Static void *umodem_get_desc(usbd_device_handle dev, int type, int subtype);
Static usbd_status umodem_set_comm_feature(struct umodem_softc *sc,
static void *umodem_get_desc(usbd_device_handle dev, int type, int subtype);
static usbd_status umodem_set_comm_feature(struct umodem_softc *sc,
int feature, int state);
Static usbd_status umodem_set_line_coding(struct umodem_softc *sc,
static usbd_status umodem_set_line_coding(struct umodem_softc *sc,
usb_cdc_line_state_t *state);
Static void umodem_get_caps(usbd_device_handle, int *, int *);
static void umodem_get_caps(usbd_device_handle, int *, int *);
Static void umodem_get_status(void *, int portno, u_char *lsr, u_char *msr);
Static void umodem_set(void *, int, int, int);
Static void umodem_dtr(struct umodem_softc *, int);
Static void umodem_rts(struct umodem_softc *, int);
Static void umodem_break(struct umodem_softc *, int);
Static void umodem_set_line_state(struct umodem_softc *);
Static int umodem_param(void *, int, struct termios *);
Static int umodem_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr );
Static int umodem_open(void *, int portno);
Static void umodem_close(void *, int portno);
Static void umodem_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void umodem_notify(void *, int);
static void umodem_get_status(void *, int portno, u_char *lsr, u_char *msr);
static void umodem_set(void *, int, int, int);
static void umodem_dtr(struct umodem_softc *, int);
static void umodem_rts(struct umodem_softc *, int);
static void umodem_break(struct umodem_softc *, int);
static void umodem_set_line_state(struct umodem_softc *);
static int umodem_param(void *, int, struct termios *);
static int umodem_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr );
static int umodem_open(void *, int portno);
static void umodem_close(void *, int portno);
static void umodem_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void umodem_notify(void *, int);
Static struct ucom_callback umodem_callback = {
static struct ucom_callback umodem_callback = {
umodem_get_status,
umodem_set,
umodem_param,
@ -204,11 +204,11 @@ Static struct ucom_callback umodem_callback = {
NULL,
};
Static device_probe_t umodem_match;
Static device_attach_t umodem_attach;
Static device_detach_t umodem_detach;
static device_probe_t umodem_match;
static device_attach_t umodem_attach;
static device_detach_t umodem_detach;
Static device_method_t umodem_methods[] = {
static device_method_t umodem_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, umodem_match),
DEVMETHOD(device_attach, umodem_attach),
@ -216,7 +216,7 @@ Static device_method_t umodem_methods[] = {
{ 0, 0 }
};
Static driver_t umodem_driver = {
static driver_t umodem_driver = {
"ucom",
umodem_methods,
sizeof (struct umodem_softc)
@ -433,7 +433,7 @@ USB_ATTACH(umodem)
USB_ATTACH_ERROR_RETURN;
}
Static int
static int
umodem_open(void *addr, int portno)
{
struct umodem_softc *sc = addr;
@ -457,7 +457,7 @@ umodem_open(void *addr, int portno)
return 0;
}
Static void
static void
umodem_close(void *addr, int portno)
{
struct umodem_softc *sc = addr;
@ -478,7 +478,7 @@ umodem_close(void *addr, int portno)
}
}
Static void
static void
umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct umodem_softc *sc = priv;
@ -539,7 +539,7 @@ umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
}
Static void
static void
umodem_notify(void *arg, int count)
{
struct umodem_softc *sc;

40
sys/dev/usb/ums.c
View File

@ -137,24 +137,24 @@ struct ums_softc {
#define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE)
#define MOUSE_FLAGS (HIO_RELATIVE)
Static void ums_intr(usbd_xfer_handle xfer,
static void ums_intr(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
Static void ums_add_to_queue(struct ums_softc *sc,
static void ums_add_to_queue(struct ums_softc *sc,
int dx, int dy, int dz, int dt, int buttons);
Static void ums_add_to_queue_timeout(void *priv);
static void ums_add_to_queue_timeout(void *priv);
Static int ums_enable(void *);
Static void ums_disable(void *);
static int ums_enable(void *);
static void ums_disable(void *);
Static d_open_t ums_open;
Static d_close_t ums_close;
Static d_read_t ums_read;
Static d_ioctl_t ums_ioctl;
Static d_poll_t ums_poll;
static d_open_t ums_open;
static d_close_t ums_close;
static d_read_t ums_read;
static d_ioctl_t ums_ioctl;
static d_poll_t ums_poll;
Static struct cdevsw ums_cdevsw = {
static struct cdevsw ums_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = ums_open,
@ -381,7 +381,7 @@ USB_ATTACH(ums)
}
Static int
static int
ums_detach(device_t self)
{
struct ums_softc *sc = device_get_softc(self);
@ -518,7 +518,7 @@ ums_intr(xfer, addr, status)
}
}
Static void
static void
ums_add_to_queue_timeout(void *priv)
{
struct ums_softc *sc = priv;
@ -529,7 +529,7 @@ ums_add_to_queue_timeout(void *priv)
splx(s);
}
Static void
static void
ums_add_to_queue(struct ums_softc *sc, int dx, int dy, int dz, int dt, int buttons)
{
/* Discard data in case of full buffer */
@ -577,7 +577,7 @@ ums_add_to_queue(struct ums_softc *sc, int dx, int dy, int dz, int dt, int butto
selwakeuppri(&sc->rsel, PZERO);
}
}
Static int
static int
ums_enable(v)
void *v;
{
@ -611,7 +611,7 @@ ums_enable(v)
return (0);
}
Static void
static void
ums_disable(priv)
void *priv;
{
@ -629,7 +629,7 @@ ums_disable(priv)
DPRINTF(("Discarded %d bytes in queue\n", sc->qcount));
}
Static int
static int
ums_open(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
{
struct ums_softc *sc;
@ -639,7 +639,7 @@ ums_open(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
return ums_enable(sc);
}
Static int
static int
ums_close(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
{
struct ums_softc *sc;
@ -655,7 +655,7 @@ ums_close(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
return 0;
}
Static int
static int
ums_read(struct cdev *dev, struct uio *uio, int flag)
{
struct ums_softc *sc;
@ -725,7 +725,7 @@ ums_read(struct cdev *dev, struct uio *uio, int flag)
return 0;
}
Static int
static int
ums_poll(struct cdev *dev, int events, usb_proc_ptr p)
{
struct ums_softc *sc;

76
sys/dev/usb/uplcom.c
View File

@ -188,25 +188,25 @@ struct uplcom_softc {
#define UPLCOMIBUFSIZE 256
#define UPLCOMOBUFSIZE 256
Static usbd_status uplcom_reset(struct uplcom_softc *);
Static usbd_status uplcom_set_line_coding(struct uplcom_softc *,
static usbd_status uplcom_reset(struct uplcom_softc *);
static usbd_status uplcom_set_line_coding(struct uplcom_softc *,
usb_cdc_line_state_t *);
Static usbd_status uplcom_set_crtscts(struct uplcom_softc *);
Static void uplcom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static usbd_status uplcom_set_crtscts(struct uplcom_softc *);
static void uplcom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void uplcom_set(void *, int, int, int);
Static void uplcom_dtr(struct uplcom_softc *, int);
Static void uplcom_rts(struct uplcom_softc *, int);
Static void uplcom_break(struct uplcom_softc *, int);
Static void uplcom_set_line_state(struct uplcom_softc *);
Static void uplcom_get_status(void *, int, u_char *, u_char *);
static void uplcom_set(void *, int, int, int);
static void uplcom_dtr(struct uplcom_softc *, int);
static void uplcom_rts(struct uplcom_softc *, int);
static void uplcom_break(struct uplcom_softc *, int);
static void uplcom_set_line_state(struct uplcom_softc *);
static void uplcom_get_status(void *, int, u_char *, u_char *);
#if 0 /* TODO */
Static int uplcom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
static int uplcom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
#endif
Static int uplcom_param(void *, int, struct termios *);
Static int uplcom_open(void *, int);
Static void uplcom_close(void *, int);
Static void uplcom_notify(void *, int);
static int uplcom_param(void *, int, struct termios *);
static int uplcom_open(void *, int);
static void uplcom_close(void *, int);
static void uplcom_notify(void *, int);
struct ucom_callback uplcom_callback = {
uplcom_get_status,
@ -276,11 +276,11 @@ static const struct uplcom_product {
{ 0, 0 }
};
Static device_probe_t uplcom_match;
Static device_attach_t uplcom_attach;
Static device_detach_t uplcom_detach;
static device_probe_t uplcom_match;
static device_attach_t uplcom_attach;
static device_detach_t uplcom_detach;
Static device_method_t uplcom_methods[] = {
static device_method_t uplcom_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, uplcom_match),
DEVMETHOD(device_attach, uplcom_attach),
@ -288,7 +288,7 @@ Static device_method_t uplcom_methods[] = {
{ 0, 0 }
};
Static driver_t uplcom_driver = {
static driver_t uplcom_driver = {
"ucom",
uplcom_methods,
sizeof (struct uplcom_softc)
@ -583,7 +583,7 @@ USB_DETACH(uplcom)
return (rv);
}
Static usbd_status
static usbd_status
uplcom_reset(struct uplcom_softc *sc)
{
usb_device_request_t req;
@ -613,7 +613,7 @@ struct pl2303x_init {
uint16_t length;
};
Static const struct pl2303x_init pl2303x[] = {
static const struct pl2303x_init pl2303x[] = {
{ UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 },
{ UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x0404, 0, 0 },
{ UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 },
@ -628,7 +628,7 @@ Static const struct pl2303x_init pl2303x[] = {
};
#define N_PL2302X_INIT (sizeof(pl2303x)/sizeof(pl2303x[0]))
Static usbd_status
static usbd_status
uplcom_pl2303x_init(struct uplcom_softc *sc)
{
usb_device_request_t req;
@ -654,7 +654,7 @@ uplcom_pl2303x_init(struct uplcom_softc *sc)
return (0);
}
Static void
static void
uplcom_set_line_state(struct uplcom_softc *sc)
{
usb_device_request_t req;
@ -675,7 +675,7 @@ uplcom_set_line_state(struct uplcom_softc *sc)
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
}
Static void
static void
uplcom_set(void *addr, int portno, int reg, int onoff)
{
struct uplcom_softc *sc = addr;
@ -695,7 +695,7 @@ uplcom_set(void *addr, int portno, int reg, int onoff)
}
}
Static void
static void
uplcom_dtr(struct uplcom_softc *sc, int onoff)
{
DPRINTF(("uplcom_dtr: onoff = %d\n", onoff));
@ -707,7 +707,7 @@ uplcom_dtr(struct uplcom_softc *sc, int onoff)
uplcom_set_line_state(sc);
}
Static void
static void
uplcom_rts(struct uplcom_softc *sc, int onoff)
{
DPRINTF(("uplcom_rts: onoff = %d\n", onoff));
@ -719,7 +719,7 @@ uplcom_rts(struct uplcom_softc *sc, int onoff)
uplcom_set_line_state(sc);
}
Static void
static void
uplcom_break(struct uplcom_softc *sc, int onoff)
{
usb_device_request_t req;
@ -739,7 +739,7 @@ uplcom_break(struct uplcom_softc *sc, int onoff)
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
}
Static usbd_status
static usbd_status
uplcom_set_crtscts(struct uplcom_softc *sc)
{
usb_device_request_t req;
@ -766,7 +766,7 @@ uplcom_set_crtscts(struct uplcom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uplcom_set_line_coding(struct uplcom_softc *sc, usb_cdc_line_state_t *state)
{
usb_device_request_t req;
@ -800,7 +800,7 @@ uplcom_set_line_coding(struct uplcom_softc *sc, usb_cdc_line_state_t *state)
return (USBD_NORMAL_COMPLETION);
}
Static const int uplcom_rates[] = {
static const int uplcom_rates[] = {
75, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 14400,
19200, 28800, 38400, 57600, 115200,
/*
@ -811,7 +811,7 @@ Static const int uplcom_rates[] = {
};
#define N_UPLCOM_RATES (sizeof(uplcom_rates)/sizeof(uplcom_rates[0]))
Static int
static int
uplcom_param(void *addr, int portno, struct termios *t)
{
struct uplcom_softc *sc = addr;
@ -870,7 +870,7 @@ uplcom_param(void *addr, int portno, struct termios *t)
return (0);
}
Static int
static int
uplcom_open(void *addr, int portno)
{
struct uplcom_softc *sc = addr;
@ -907,7 +907,7 @@ uplcom_open(void *addr, int portno)
return (0);
}
Static void
static void
uplcom_close(void *addr, int portno)
{
struct uplcom_softc *sc = addr;
@ -934,7 +934,7 @@ uplcom_close(void *addr, int portno)
}
}
Static void
static void
uplcom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct uplcom_softc *sc = priv;
@ -977,7 +977,7 @@ uplcom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
taskqueue_enqueue(taskqueue_swi_giant, &sc->sc_task);
}
Static void
static void
uplcom_notify(void *arg, int count)
{
struct uplcom_softc *sc;
@ -988,7 +988,7 @@ uplcom_notify(void *arg, int count)
ucom_status_change(&sc->sc_ucom);
}
Static void
static void
uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct uplcom_softc *sc = addr;
@ -1002,7 +1002,7 @@ uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
}
#if 0 /* TODO */
Static int
static int
uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
usb_proc_ptr p)
{

6
sys/dev/usb/urio.c
View File

@ -116,7 +116,7 @@ d_write_t uriowrite;
d_ioctl_t urioioctl;
Static struct cdevsw urio_cdevsw = {
static struct cdevsw urio_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = urioopen,
@ -587,7 +587,7 @@ urioioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
urio_activate(device_ptr_t self, enum devact act)
urio_activate(device_t self, enum devact act)
{
struct urio_softc *sc = (struct urio_softc *)self;
@ -671,7 +671,7 @@ USB_DETACH(urio)
#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
#if defined(__FreeBSD__)
Static int
static int
urio_detach(device_t self)
{
struct urio_softc *sc = device_get_softc(self);

46
sys/dev/usb/usb.c
View File

@ -166,21 +166,21 @@ struct cdevsw usb_cdevsw = {
};
#endif
Static void usb_discover(void *);
static void usb_discover(void *);
#ifdef __FreeBSD__
Static bus_child_detached_t usb_child_detached;
static bus_child_detached_t usb_child_detached;
#endif
Static void usb_create_event_thread(void *);
Static void usb_event_thread(void *);
Static void usb_task_thread(void *);
Static struct proc *usb_task_thread_proc = NULL;
static void usb_create_event_thread(void *);
static void usb_event_thread(void *);
static void usb_task_thread(void *);
static struct proc *usb_task_thread_proc = NULL;
#ifdef __FreeBSD__
Static struct cdev *usb_dev; /* The /dev/usb device. */
Static int usb_ndevs; /* Number of /dev/usbN devices. */
Static int usb_taskcreated; /* USB task thread exists. */
static struct cdev *usb_dev; /* The /dev/usb device. */
static int usb_ndevs; /* Number of /dev/usbN devices. */
static int usb_taskcreated; /* USB task thread exists. */
/* Busses to explore at the end of boot-time device configuration. */
Static TAILQ_HEAD(, usb_softc) usb_coldexplist =
static TAILQ_HEAD(, usb_softc) usb_coldexplist =
TAILQ_HEAD_INITIALIZER(usb_coldexplist);
#endif
@ -189,17 +189,17 @@ struct usb_event_q {
struct usb_event ue;
TAILQ_ENTRY(usb_event_q) next;
};
Static TAILQ_HEAD(, usb_event_q) usb_events =
static TAILQ_HEAD(, usb_event_q) usb_events =
TAILQ_HEAD_INITIALIZER(usb_events);
Static int usb_nevents = 0;
Static struct selinfo usb_selevent;
Static struct proc *usb_async_proc; /* process that wants USB SIGIO */
Static int usb_dev_open = 0;
Static void usb_add_event(int, struct usb_event *);
static int usb_nevents = 0;
static struct selinfo usb_selevent;
static struct proc *usb_async_proc; /* process that wants USB SIGIO */
static int usb_dev_open = 0;
static void usb_add_event(int, struct usb_event *);
Static int usb_get_next_event(struct usb_event *);
static int usb_get_next_event(struct usb_event *);
Static const char *usbrev_str[] = USBREV_STR;
static const char *usbrev_str[] = USBREV_STR;
USB_DECLARE_DRIVER_INIT(usb,
DEVMETHOD(bus_child_detached, usb_child_detached),
@ -724,7 +724,7 @@ usbpoll(struct cdev *dev, int events, usb_proc_ptr p)
}
/* Explore device tree from the root. */
Static void
static void
usb_discover(void *v)
{
struct usb_softc *sc = v;
@ -804,7 +804,7 @@ usbd_add_dev_event(int type, usbd_device_handle udev)
}
void
usbd_add_drv_event(int type, usbd_device_handle udev, device_ptr_t dev)
usbd_add_drv_event(int type, usbd_device_handle udev, device_t dev)
{
struct usb_event ue;
@ -883,7 +883,7 @@ usb_schedsoftintr(usbd_bus_handle bus)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
usb_activate(device_ptr_t self, enum devact act)
usb_activate(device_t self, enum devact act)
{
struct usb_softc *sc = (struct usb_softc *)self;
usbd_device_handle dev = sc->sc_port.device;
@ -958,7 +958,7 @@ USB_DETACH(usb)
}
#if defined(__FreeBSD__)
Static void
static void
usb_child_detached(device_t self, device_t child)
{
struct usb_softc *sc = device_get_softc(self);
@ -968,7 +968,7 @@ usb_child_detached(device_t self, device_t child)
}
/* Explore USB busses at the end of device configuration. */
Static void
static void
usb_cold_explore(void *arg)
{
struct usb_softc *sc;

8
sys/dev/usb/usb.h
View File

@ -50,7 +50,15 @@
#endif
#if defined(_KERNEL)
#if 1
#include <dev/usb/usb_port.h>
#else
#include <sys/malloc.h>
MALLOC_DECLARE(M_USB);
MALLOC_DECLARE(M_USBDEV);
MALLOC_DECLARE(M_USBHC);
#endif
#endif /* _KERNEL */
/* These two defines are used by usbd to autoload the usb kld */

10
sys/dev/usb/usb_ethersubr.c
View File

@ -68,13 +68,13 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_ethersubr.h>
Static struct ifqueue usbq_rx;
Static struct ifqueue usbq_tx;
Static int mtx_inited = 0;
static struct ifqueue usbq_rx;
static struct ifqueue usbq_tx;
static int mtx_inited = 0;
Static void usbintr (void);
static void usbintr (void);
Static void usbintr(void)
static void usbintr(void)
{
struct mbuf *m;
struct usb_qdat *q;

18
sys/dev/usb/usb_mem.c
View File

@ -94,19 +94,19 @@ struct usb_frag_dma {
LIST_ENTRY(usb_frag_dma) next;
};
Static bus_dmamap_callback_t usbmem_callback;
Static usbd_status usb_block_allocmem(bus_dma_tag_t, size_t, size_t,
static bus_dmamap_callback_t usbmem_callback;
static usbd_status usb_block_allocmem(bus_dma_tag_t, size_t, size_t,
usb_dma_block_t **);
Static void usb_block_freemem(usb_dma_block_t *);
static void usb_block_freemem(usb_dma_block_t *);
Static LIST_HEAD(, usb_dma_block) usb_blk_freelist =
static LIST_HEAD(, usb_dma_block) usb_blk_freelist =
LIST_HEAD_INITIALIZER(usb_blk_freelist);
Static int usb_blk_nfree = 0;
static int usb_blk_nfree = 0;
/* XXX should have different free list for different tags (for speed) */
Static LIST_HEAD(, usb_frag_dma) usb_frag_freelist =
static LIST_HEAD(, usb_frag_dma) usb_frag_freelist =
LIST_HEAD_INITIALIZER(usb_frag_freelist);
Static void
static void
usbmem_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
int i;
@ -122,7 +122,7 @@ usbmem_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error)
p->segs[i] = segs[i];
}
Static usbd_status
static usbd_status
usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align,
usb_dma_block_t **dmap)
{
@ -215,7 +215,7 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align,
* from an interrupt context and that is BAD.
* XXX when should we really free?
*/
Static void
static void
usb_block_freemem(usb_dma_block_t *p)
{
int s;

26
sys/dev/usb/usb_port.h
View File

@ -70,9 +70,9 @@ MALLOC_DECLARE(M_USBHC);
#define USB_USE_SOFTINTR
#ifdef USB_DEBUG
#define Static
#define static
#else
#define Static static
#define static static
#endif
#define SCSI_MODE_SENSE MODE_SENSE
@ -171,7 +171,7 @@ int __CONCAT(dname,_detach)(struct device *self, int flags)
/*
* OpenBSD
*/
#define Static
#define static
typedef struct proc *usb_proc_ptr;
@ -360,7 +360,7 @@ MALLOC_DECLARE(M_USBHC);
#define USB_USE_SOFTINTR
#endif
#define Static static
#define static static
#define device_ptr_t device_t
#define USBBASEDEVICE device_t
@ -442,13 +442,13 @@ typedef struct callout usb_callout_t;
typedef struct malloc_type *usb_malloc_type;
#define USB_DECLARE_DRIVER_INIT(dname, init...) \
Static device_probe_t __CONCAT(dname,_match); \
Static device_attach_t __CONCAT(dname,_attach); \
Static device_detach_t __CONCAT(dname,_detach); \
static device_probe_t __CONCAT(dname,_match); \
static device_attach_t __CONCAT(dname,_attach); \
static device_detach_t __CONCAT(dname,_detach); \
\
Static devclass_t __CONCAT(dname,_devclass); \
static devclass_t __CONCAT(dname,_devclass); \
\
Static device_method_t __CONCAT(dname,_methods)[] = { \
static device_method_t __CONCAT(dname,_methods)[] = { \
DEVMETHOD(device_probe, __CONCAT(dname,_match)), \
DEVMETHOD(device_attach, __CONCAT(dname,_attach)), \
DEVMETHOD(device_detach, __CONCAT(dname,_detach)), \
@ -456,7 +456,7 @@ Static device_method_t __CONCAT(dname,_methods)[] = { \
{0,0} \
}; \
\
Static driver_t __CONCAT(dname,_driver) = { \
static driver_t __CONCAT(dname,_driver) = { \
#dname, \
__CONCAT(dname,_methods), \
sizeof(struct __CONCAT(dname,_softc)) \
@ -468,7 +468,7 @@ MODULE_DEPEND(dname, usb, 1, 1, 1)
#define USB_DECLARE_DRIVER(dname) USB_DECLARE_DRIVER_INIT(dname, METHODS_NONE)
#define USB_MATCH(dname) \
Static int \
static int \
__CONCAT(dname,_match)(device_t self)
#define USB_MATCH_START(dname, uaa) \
@ -478,7 +478,7 @@ __CONCAT(dname,_match)(device_t self)
sc->sc_dev = self
#define USB_ATTACH(dname) \
Static int \
static int \
__CONCAT(dname,_attach)(device_t self)
#define USB_ATTACH_START(dname, sc, uaa) \
@ -496,7 +496,7 @@ __CONCAT(dname,_attach)(device_t self)
} while (0)
#define USB_DETACH(dname) \
Static int \
static int \
__CONCAT(dname,_detach)(device_t self)
#define USB_DETACH_START(dname, sc) \

2
sys/dev/usb/usb_quirks.c
View File

@ -54,7 +54,7 @@ extern int usbdebug;
#define ANY 0xffff
Static const struct usbd_quirk_entry {
static const struct usbd_quirk_entry {
u_int16_t idVendor;
u_int16_t idProduct;
u_int16_t bcdDevice;

40
sys/dev/usb/usb_subr.c
View File

@ -89,22 +89,22 @@ extern int usbdebug;
#define DPRINTFN(n,x)
#endif
Static usbd_status usbd_set_config(usbd_device_handle, int);
Static void usbd_devinfo_vp(usbd_device_handle, char *, char *, int);
Static int usbd_getnewaddr(usbd_bus_handle bus);
static usbd_status usbd_set_config(usbd_device_handle, int);
static void usbd_devinfo_vp(usbd_device_handle, char *, char *, int);
static int usbd_getnewaddr(usbd_bus_handle bus);
#if defined(__NetBSD__)
Static int usbd_print(void *aux, const char *pnp);
Static int usbd_submatch(device_ptr_t, struct cfdata *cf, void *);
static int usbd_print(void *aux, const char *pnp);
static int usbd_submatch(device_t, struct cfdata *cf, void *);
#elif defined(__OpenBSD__)
Static int usbd_print(void *aux, const char *pnp);
Static int usbd_submatch(device_ptr_t, void *, void *);
static int usbd_print(void *aux, const char *pnp);
static int usbd_submatch(device_t, void *, void *);
#endif
Static void usbd_free_iface_data(usbd_device_handle dev, int ifcno);
Static void usbd_kill_pipe(usbd_pipe_handle);
Static usbd_status usbd_probe_and_attach(device_ptr_t parent,
static void usbd_free_iface_data(usbd_device_handle dev, int ifcno);
static void usbd_kill_pipe(usbd_pipe_handle);
static usbd_status usbd_probe_and_attach(device_t parent,
usbd_device_handle dev, int port, int addr);
Static u_int32_t usb_cookie_no = 0;
static u_int32_t usb_cookie_no = 0;
#ifdef USBVERBOSE
typedef u_int16_t usb_vendor_id_t;
@ -124,7 +124,7 @@ struct usb_knowndev {
#include "usbdevs_data.h"
#endif /* USBVERBOSE */
Static const char * const usbd_error_strs[] = {
static const char * const usbd_error_strs[] = {
"NORMAL_COMPLETION",
"IN_PROGRESS",
"PENDING_REQUESTS",
@ -196,7 +196,7 @@ usbd_get_string_desc(usbd_device_handle dev, int sindex, int langid,
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
usbd_trim_spaces(char *p)
{
char *q, *e;
@ -212,7 +212,7 @@ usbd_trim_spaces(char *p)
*e = 0; /* kill trailing spaces */
}
Static void
static void
usbd_devinfo_vp(usbd_device_handle dev, char *v, char *p, int usedev)
{
usb_device_descriptor_t *udd = &dev->ddesc;
@ -537,7 +537,7 @@ usbd_free_iface_data(usbd_device_handle dev, int ifcno)
free(ifc->endpoints, M_USB);
}
Static usbd_status
static usbd_status
usbd_set_config(usbd_device_handle dev, int conf)
{
usb_device_request_t req;
@ -819,15 +819,15 @@ usbd_getnewaddr(usbd_bus_handle bus)
usbd_status
usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev,
usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
int port, int addr)
{
struct usb_attach_arg uaa;
usb_device_descriptor_t *dd = &dev->ddesc;
int found, i, confi, nifaces;
usbd_status err;
device_ptr_t dv;
device_ptr_t *tmpdv;
device_t dv;
device_t *tmpdv;
usbd_interface_handle ifaces[256]; /* 256 is the absolute max */
char *devinfo;
@ -1026,7 +1026,7 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev,
* and attach a driver.
*/
usbd_status
usbd_new_device(device_ptr_t parent, usbd_bus_handle bus, int depth,
usbd_new_device(device_t parent, usbd_bus_handle bus, int depth,
int speed, int port, struct usbd_port *up)
{
usbd_device_handle dev, adev;
@ -1430,7 +1430,7 @@ usb_free_device(usbd_device_handle dev)
* been disconnected.
*/
void
usb_disconnect_port(struct usbd_port *up, device_ptr_t parent)
usb_disconnect_port(struct usbd_port *up, device_t parent)
{
usbd_device_handle dev = up->device;
const char *hubname = USBDEVPTRNAME(parent);

22
sys/dev/usb/usbdi.c
View File

@ -79,19 +79,19 @@ extern int usbdebug;
#define DPRINTFN(n,x)
#endif
Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe);
Static void usbd_do_request_async_cb
static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe);
static void usbd_do_request_async_cb
(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static void usbd_start_next(usbd_pipe_handle pipe);
Static usbd_status usbd_open_pipe_ival
static void usbd_start_next(usbd_pipe_handle pipe);
static usbd_status usbd_open_pipe_ival
(usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int);
Static int usbd_xfer_isread(usbd_xfer_handle xfer);
Static void usbd_start_transfer(void *arg, bus_dma_segment_t *segs, int nseg,
static int usbd_xfer_isread(usbd_xfer_handle xfer);
static void usbd_start_transfer(void *arg, bus_dma_segment_t *segs, int nseg,
int error);
Static void usbd_alloc_callback(void *arg, bus_dma_segment_t *segs, int nseg,
static void usbd_alloc_callback(void *arg, bus_dma_segment_t *segs, int nseg,
int error);
Static int usbd_nbuses = 0;
static int usbd_nbuses = 0;
void
usbd_init(void)
@ -343,7 +343,7 @@ usbd_transfer(usbd_xfer_handle xfer)
return (xfer->status);
}
Static void
static void
usbd_start_transfer(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
usbd_xfer_handle xfer = arg;
@ -481,7 +481,7 @@ usbd_get_buffer(usbd_xfer_handle xfer)
return (xfer->allocbuf);
}
Static void
static void
usbd_alloc_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
struct usbd_allocstate *allocstate = arg;
@ -852,7 +852,7 @@ usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface)
/*** Internal routines ***/
/* Dequeue all pipe operations, called at splusb(). */
Static usbd_status
static usbd_status
usbd_ar_pipe(usbd_pipe_handle pipe)
{
usbd_xfer_handle xfer;

2
sys/dev/usb/usbdi.h
View File

@ -162,7 +162,7 @@ void usbd_set_polling(usbd_device_handle, int);
const char *usbd_errstr(usbd_status);
void usbd_add_dev_event(int, usbd_device_handle);
void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t);
void usbd_add_drv_event(int, usbd_device_handle, device_t);
void usbd_devinfo(usbd_device_handle, int, char *);
const struct usbd_quirks *usbd_get_quirks(usbd_device_handle);

14
sys/dev/usb/usbdi_util.c
View File

@ -384,7 +384,7 @@ usbd_get_hid_descriptor(usbd_interface_handle ifc)
usbd_status
usbd_read_report_desc(usbd_interface_handle ifc, void **descp, int *sizep,
usb_malloc_type mem)
struct malloc_type *mem)
{
usb_interface_descriptor_t *id;
usb_hid_descriptor_t *hid;
@ -425,9 +425,9 @@ usbd_get_config(usbd_device_handle dev, u_int8_t *conf)
return (usbd_do_request(dev, &req, conf));
}
Static void usbd_bulk_transfer_cb(usbd_xfer_handle xfer,
static void usbd_bulk_transfer_cb(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
Static void
static void
usbd_bulk_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
@ -467,9 +467,9 @@ usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
return (err);
}
Static void usbd_intr_transfer_cb(usbd_xfer_handle xfer,
static void usbd_intr_transfer_cb(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
Static void
static void
usbd_intr_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
@ -510,7 +510,7 @@ usbd_intr_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
}
void
usb_detach_wait(device_ptr_t dv)
usb_detach_wait(device_t dv)
{
DPRINTF(("usb_detach_wait: waiting for %s\n", USBDEVPTRNAME(dv)));
if (tsleep(dv, PZERO, "usbdet", hz * 60))
@ -520,7 +520,7 @@ usb_detach_wait(device_ptr_t dv)
}
void
usb_detach_wakeup(device_ptr_t dv)
usb_detach_wakeup(device_t dv)
{
DPRINTF(("usb_detach_wakeup: for %s\n", USBDEVPTRNAME(dv)));
wakeup(dv);

6
sys/dev/usb/usbdi_util.h
View File

@ -67,7 +67,7 @@ usbd_status usbd_get_report(usbd_interface_handle iface, int type, int id,
void *data, int len);
usbd_status usbd_set_idle(usbd_interface_handle iface, int duration, int id);
usbd_status usbd_read_report_desc(usbd_interface_handle ifc, void **descp,
int *sizep, usb_malloc_type mem);
int *sizep, struct malloc_type *mem);
usbd_status usbd_get_config(usbd_device_handle dev, u_int8_t *conf);
usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex,
int langid,usb_string_descriptor_t *sdesc,
@ -86,8 +86,8 @@ usbd_status usbd_intr_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
u_int16_t flags, u_int32_t timeout, void *buf,
u_int32_t *size, char *lbl);
void usb_detach_wait(device_ptr_t);
void usb_detach_wakeup(device_ptr_t);
void usb_detach_wait(device_t);
void usb_detach_wakeup(device_t);
const usb_descriptor_t *usb_find_desc(usbd_device_handle dev, int type,
int subtype);

6
sys/dev/usb/usbdivar.h
View File

@ -156,7 +156,7 @@ struct usbd_device {
usb_config_descriptor_t *cdesc; /* full config descr */
const struct usbd_quirks *quirks; /* device quirks, always set */
struct usbd_hub *hub; /* only if this is a hub */
device_ptr_t *subdevs; /* sub-devices, 0 terminated */
device_t *subdevs; /* sub-devices, 0 terminated */
uint8_t *ifacenums; /* sub-device interfacenumbers */
};
@ -259,7 +259,7 @@ usbd_status usbd_setup_pipe(usbd_device_handle dev,
usbd_interface_handle iface,
struct usbd_endpoint *, int,
usbd_pipe_handle *pipe);
usbd_status usbd_new_device(device_ptr_t parent,
usbd_status usbd_new_device(device_t parent,
usbd_bus_handle bus, int depth,
int lowspeed, int port,
struct usbd_port *);
@ -270,7 +270,7 @@ void usb_free_device(usbd_device_handle);
usbd_status usb_insert_transfer(usbd_xfer_handle xfer);
void usb_transfer_complete(usbd_xfer_handle xfer);
void usb_disconnect_port(struct usbd_port *up, device_ptr_t);
void usb_disconnect_port(struct usbd_port *up, device_t);
/* Routines from usb.c */
void usb_needs_explore(usbd_device_handle);

14
sys/dev/usb/uscanner.c
View File

@ -281,7 +281,7 @@ d_write_t uscannerwrite;
d_poll_t uscannerpoll;
Static struct cdevsw uscanner_cdevsw = {
static struct cdevsw uscanner_cdevsw = {
.d_version = D_VERSION,
.d_flags = D_NEEDGIANT,
.d_open = uscanneropen,
@ -296,9 +296,9 @@ Static struct cdevsw uscanner_cdevsw = {
};
#endif
Static int uscanner_do_read(struct uscanner_softc *, struct uio *, int);
Static int uscanner_do_write(struct uscanner_softc *, struct uio *, int);
Static void uscanner_do_close(struct uscanner_softc *);
static int uscanner_do_read(struct uscanner_softc *, struct uio *, int);
static int uscanner_do_write(struct uscanner_softc *, struct uio *, int);
static void uscanner_do_close(struct uscanner_softc *);
#define USCANNERUNIT(n) (minor(n))
@ -513,7 +513,7 @@ uscanner_do_close(struct uscanner_softc *sc)
sc->sc_state &= ~USCANNER_OPEN;
}
Static int
static int
uscanner_do_read(struct uscanner_softc *sc, struct uio *uio, int flag)
{
u_int32_t n, tn;
@ -568,7 +568,7 @@ uscannerread(struct cdev *dev, struct uio *uio, int flag)
return (error);
}
Static int
static int
uscanner_do_write(struct uscanner_softc *sc, struct uio *uio, int flag)
{
u_int32_t n;
@ -619,7 +619,7 @@ uscannerwrite(struct cdev *dev, struct uio *uio, int flag)
#if defined(__NetBSD__) || defined(__OpenBSD__)
int
uscanner_activate(device_ptr_t self, enum devact act)
uscanner_activate(device_t self, enum devact act)
{
struct uscanner_softc *sc = (struct uscanner_softc *)self;

18
sys/dev/usb/uvisor.c
View File

@ -175,11 +175,11 @@ struct uvisor_softc {
u_int16_t sc_flags;
};
Static usbd_status uvisor_init(struct uvisor_softc *);
static usbd_status uvisor_init(struct uvisor_softc *);
/*Static usbd_status clie_3_5_init(struct uvisor_softc *);*/
/*static usbd_status clie_3_5_init(struct uvisor_softc *);*/
Static void uvisor_close(void *, int);
static void uvisor_close(void *, int);
struct ucom_callback uvisor_callback = {
NULL,
@ -192,10 +192,10 @@ struct ucom_callback uvisor_callback = {
NULL,
};
Static device_probe_t uvisor_match;
Static device_attach_t uvisor_attach;
Static device_detach_t uvisor_detach;
Static device_method_t uvisor_methods[] = {
static device_probe_t uvisor_match;
static device_attach_t uvisor_attach;
static device_detach_t uvisor_detach;
static device_method_t uvisor_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, uvisor_match),
DEVMETHOD(device_attach, uvisor_attach),
@ -204,7 +204,7 @@ Static device_method_t uvisor_methods[] = {
};
Static driver_t uvisor_driver = {
static driver_t uvisor_driver = {
"ucom",
uvisor_methods,
sizeof (struct uvisor_softc)
@ -389,7 +389,7 @@ USB_ATTACH(uvisor)
#if 0
int
uvisor_activate(device_ptr_t self, enum devact act)
uvisor_activate(device_t self, enum devact act)
{
struct uvisor_softc *sc = (struct uvisor_softc *)self;
int rv = 0;

76
sys/dev/usb/uvscom.c
View File

@ -190,26 +190,26 @@ struct uvscom_softc {
#define UVSCOM_DEFAULT_OPKTSIZE 8
#endif
Static usbd_status uvscom_shutdown(struct uvscom_softc *);
Static usbd_status uvscom_reset(struct uvscom_softc *);
Static usbd_status uvscom_set_line_coding(struct uvscom_softc *,
static usbd_status uvscom_shutdown(struct uvscom_softc *);
static usbd_status uvscom_reset(struct uvscom_softc *);
static usbd_status uvscom_set_line_coding(struct uvscom_softc *,
uint16_t, uint16_t);
Static usbd_status uvscom_set_line(struct uvscom_softc *, uint16_t);
Static usbd_status uvscom_set_crtscts(struct uvscom_softc *);
Static void uvscom_get_status(void *, int, u_char *, u_char *);
Static void uvscom_dtr(struct uvscom_softc *, int);
Static void uvscom_rts(struct uvscom_softc *, int);
Static void uvscom_break(struct uvscom_softc *, int);
static usbd_status uvscom_set_line(struct uvscom_softc *, uint16_t);
static usbd_status uvscom_set_crtscts(struct uvscom_softc *);
static void uvscom_get_status(void *, int, u_char *, u_char *);
static void uvscom_dtr(struct uvscom_softc *, int);
static void uvscom_rts(struct uvscom_softc *, int);
static void uvscom_break(struct uvscom_softc *, int);
Static void uvscom_set(void *, int, int, int);
Static void uvscom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void uvscom_set(void *, int, int, int);
static void uvscom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
#if 0 /* TODO */
Static int uvscom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
static int uvscom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
#endif
Static int uvscom_param(void *, int, struct termios *);
Static int uvscom_open(void *, int);
Static void uvscom_close(void *, int);
Static void uvscom_notify(void *, int);
static int uvscom_param(void *, int, struct termios *);
static int uvscom_open(void *, int);
static void uvscom_close(void *, int);
static void uvscom_notify(void *, int);
struct ucom_callback uvscom_callback = {
uvscom_get_status,
@ -236,11 +236,11 @@ static const struct usb_devno uvscom_devs [] = {
};
#define uvscom_lookup(v, p) usb_lookup(uvscom_devs, v, p)
Static device_probe_t uvscom_match;
Static device_attach_t uvscom_attach;
Static device_detach_t uvscom_detach;
static device_probe_t uvscom_match;
static device_attach_t uvscom_attach;
static device_detach_t uvscom_detach;
Static device_method_t uvscom_methods[] = {
static device_method_t uvscom_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, uvscom_match),
DEVMETHOD(device_attach, uvscom_attach),
@ -248,7 +248,7 @@ Static device_method_t uvscom_methods[] = {
{ 0, 0 }
};
Static driver_t uvscom_driver = {
static driver_t uvscom_driver = {
"ucom",
uvscom_methods,
sizeof (struct uvscom_softc)
@ -474,7 +474,7 @@ USB_DETACH(uvscom)
return (rv);
}
Static usbd_status
static usbd_status
uvscom_readstat(struct uvscom_softc *sc)
{
usb_device_request_t req;
@ -502,7 +502,7 @@ uvscom_readstat(struct uvscom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uvscom_shutdown(struct uvscom_softc *sc)
{
usb_device_request_t req;
@ -526,7 +526,7 @@ uvscom_shutdown(struct uvscom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uvscom_reset(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_reset\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
@ -534,7 +534,7 @@ uvscom_reset(struct uvscom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uvscom_set_crtscts(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_set_crtscts\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
@ -542,7 +542,7 @@ uvscom_set_crtscts(struct uvscom_softc *sc)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uvscom_set_line(struct uvscom_softc *sc, uint16_t line)
{
usb_device_request_t req;
@ -567,7 +567,7 @@ uvscom_set_line(struct uvscom_softc *sc, uint16_t line)
return (USBD_NORMAL_COMPLETION);
}
Static usbd_status
static usbd_status
uvscom_set_line_coding(struct uvscom_softc *sc, uint16_t lsp, uint16_t ls)
{
usb_device_request_t req;
@ -605,7 +605,7 @@ uvscom_set_line_coding(struct uvscom_softc *sc, uint16_t lsp, uint16_t ls)
return (USBD_NORMAL_COMPLETION);
}
Static void
static void
uvscom_dtr(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_dtr: onoff = %d\n",
@ -624,7 +624,7 @@ uvscom_dtr(struct uvscom_softc *sc, int onoff)
uvscom_set_line(sc, sc->sc_lcr);
}
Static void
static void
uvscom_rts(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_rts: onoff = %d\n",
@ -643,7 +643,7 @@ uvscom_rts(struct uvscom_softc *sc, int onoff)
uvscom_set_line(sc, sc->sc_lcr);
}
Static void
static void
uvscom_break(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_break: onoff = %d\n",
@ -653,7 +653,7 @@ uvscom_break(struct uvscom_softc *sc, int onoff)
uvscom_set_line(sc, SET(sc->sc_lcr, UVSCOM_BREAK));
}
Static void
static void
uvscom_set(void *addr, int portno, int reg, int onoff)
{
struct uvscom_softc *sc = addr;
@ -673,7 +673,7 @@ uvscom_set(void *addr, int portno, int reg, int onoff)
}
}
Static int
static int
uvscom_param(void *addr, int portno, struct termios *t)
{
struct uvscom_softc *sc = addr;
@ -767,7 +767,7 @@ uvscom_param(void *addr, int portno, struct termios *t)
return (0);
}
Static int
static int
uvscom_open(void *addr, int portno)
{
struct uvscom_softc *sc = addr;
@ -839,7 +839,7 @@ uvscom_open(void *addr, int portno)
return (0);
}
Static void
static void
uvscom_close(void *addr, int portno)
{
struct uvscom_softc *sc = addr;
@ -868,7 +868,7 @@ uvscom_close(void *addr, int portno)
}
}
Static void
static void
uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
{
struct uvscom_softc *sc = priv;
@ -913,7 +913,7 @@ uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
taskqueue_enqueue(taskqueue_swi_giant, &sc->sc_task);
}
Static void
static void
uvscom_notify(void *arg, int count)
{
struct uvscom_softc *sc;
@ -924,7 +924,7 @@ uvscom_notify(void *arg, int count)
ucom_status_change(&sc->sc_ucom);
}
Static void
static void
uvscom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct uvscom_softc *sc = addr;
@ -936,7 +936,7 @@ uvscom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
}
#if 0 /* TODO */
Static int
static int
uvscom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
usb_proc_ptr p)
{