From 8d589484903a1f7edc255f46b936a237d5c82876 Mon Sep 17 00:00:00 2001 From: Markus Pfeiffer Date: Mon, 6 Jan 2014 22:08:52 +0000 Subject: [PATCH] Sync uhci with FreeBSD --- sys/bus/u4b/controller/uhci.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/bus/u4b/controller/uhci.c b/sys/bus/u4b/controller/uhci.c index e7da5e3e81..895ec01a61 100644 --- a/sys/bus/u4b/controller/uhci.c +++ b/sys/bus/u4b/controller/uhci.c @@ -143,11 +143,11 @@ struct uhci_std_temp { uint8_t last_frame; }; -extern struct usb_bus_methods uhci_bus_methods; -extern struct usb_pipe_methods uhci_device_bulk_methods; -extern struct usb_pipe_methods uhci_device_ctrl_methods; -extern struct usb_pipe_methods uhci_device_intr_methods; -extern struct usb_pipe_methods uhci_device_isoc_methods; +static const struct usb_bus_methods uhci_bus_methods; +static const struct usb_pipe_methods uhci_device_bulk_methods; +static const struct usb_pipe_methods uhci_device_ctrl_methods; +static const struct usb_pipe_methods uhci_device_intr_methods; +static const struct usb_pipe_methods uhci_device_isoc_methods; static uint8_t uhci_restart(uhci_softc_t *sc); static void uhci_do_poll(struct usb_bus *); @@ -1832,7 +1832,7 @@ uhci_setup_standard_chain(struct usb_xfer *xfer) static void uhci_device_done(struct usb_xfer *xfer, usb_error_t error) { - struct usb_pipe_methods *methods = xfer->endpoint->methods; + const struct usb_pipe_methods *methods = xfer->endpoint->methods; uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus); uhci_qh_t *qh; @@ -1927,7 +1927,7 @@ uhci_device_bulk_start(struct usb_xfer *xfer) uhci_transfer_intr_enqueue(xfer); } -struct usb_pipe_methods uhci_device_bulk_methods = +static const struct usb_pipe_methods uhci_device_bulk_methods = { .open = uhci_device_bulk_open, .close = uhci_device_bulk_close, @@ -1989,7 +1989,7 @@ uhci_device_ctrl_start(struct usb_xfer *xfer) uhci_transfer_intr_enqueue(xfer); } -struct usb_pipe_methods uhci_device_ctrl_methods = +static const struct usb_pipe_methods uhci_device_ctrl_methods = { .open = uhci_device_ctrl_open, .close = uhci_device_ctrl_close, @@ -2076,7 +2076,7 @@ uhci_device_intr_start(struct usb_xfer *xfer) uhci_transfer_intr_enqueue(xfer); } -struct usb_pipe_methods uhci_device_intr_methods = +static const struct usb_pipe_methods uhci_device_intr_methods = { .open = uhci_device_intr_open, .close = uhci_device_intr_close, @@ -2284,7 +2284,7 @@ uhci_device_isoc_start(struct usb_xfer *xfer) uhci_transfer_intr_enqueue(xfer); } -struct usb_pipe_methods uhci_device_isoc_methods = +static const struct usb_pipe_methods uhci_device_isoc_methods = { .open = uhci_device_isoc_open, .close = uhci_device_isoc_close, @@ -3068,7 +3068,7 @@ uhci_device_resume(struct usb_device *udev) { struct uhci_softc *sc = UHCI_BUS2SC(udev->bus); struct usb_xfer *xfer; - struct usb_pipe_methods *methods; + const struct usb_pipe_methods *methods; uhci_qh_t *qh; DPRINTF("\n"); @@ -3110,7 +3110,7 @@ uhci_device_suspend(struct usb_device *udev) { struct uhci_softc *sc = UHCI_BUS2SC(udev->bus); struct usb_xfer *xfer; - struct usb_pipe_methods *methods; + const struct usb_pipe_methods *methods; uhci_qh_t *qh; DPRINTF("\n"); @@ -3205,7 +3205,7 @@ uhci_set_hw_power(struct usb_bus *bus) } -struct usb_bus_methods uhci_bus_methods = +static const struct usb_bus_methods uhci_bus_methods = { .endpoint_init = uhci_ep_init, .xfer_setup = uhci_xfer_setup, -- 2.41.0