diff options
Diffstat (limited to 'sys/dev/usb/serial/ubsa.c')
| -rw-r--r-- | sys/dev/usb/serial/ubsa.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c index 78b0fd5..c0c1965 100644 --- a/sys/dev/usb/serial/ubsa.c +++ b/sys/dev/usb/serial/ubsa.c @@ -148,11 +148,11 @@ enum { }; struct ubsa_softc { - struct usb2_com_super_softc sc_super_ucom; - struct usb2_com_softc sc_ucom; + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom; - struct usb2_xfer *sc_xfer[UBSA_N_TRANSFER]; - struct usb2_device *sc_udev; + struct usb_xfer *sc_xfer[UBSA_N_TRANSFER]; + struct usb_device *sc_udev; struct mtx sc_mtx; uint8_t sc_iface_no; /* interface number */ @@ -170,19 +170,19 @@ static usb2_callback_t ubsa_read_callback; static usb2_callback_t ubsa_intr_callback; static void ubsa_cfg_request(struct ubsa_softc *, uint8_t, uint16_t); -static void ubsa_cfg_set_dtr(struct usb2_com_softc *, uint8_t); -static void ubsa_cfg_set_rts(struct usb2_com_softc *, uint8_t); -static void ubsa_cfg_set_break(struct usb2_com_softc *, uint8_t); -static int ubsa_pre_param(struct usb2_com_softc *, struct termios *); -static void ubsa_cfg_param(struct usb2_com_softc *, struct termios *); -static void ubsa_start_read(struct usb2_com_softc *); -static void ubsa_stop_read(struct usb2_com_softc *); -static void ubsa_start_write(struct usb2_com_softc *); -static void ubsa_stop_write(struct usb2_com_softc *); -static void ubsa_cfg_get_status(struct usb2_com_softc *, uint8_t *, +static void ubsa_cfg_set_dtr(struct ucom_softc *, uint8_t); +static void ubsa_cfg_set_rts(struct ucom_softc *, uint8_t); +static void ubsa_cfg_set_break(struct ucom_softc *, uint8_t); +static int ubsa_pre_param(struct ucom_softc *, struct termios *); +static void ubsa_cfg_param(struct ucom_softc *, struct termios *); +static void ubsa_start_read(struct ucom_softc *); +static void ubsa_stop_read(struct ucom_softc *); +static void ubsa_start_write(struct ucom_softc *); +static void ubsa_stop_write(struct ucom_softc *); +static void ubsa_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *); -static const struct usb2_config ubsa_config[UBSA_N_TRANSFER] = { +static const struct usb_config ubsa_config[UBSA_N_TRANSFER] = { [UBSA_BULK_DT_WR] = { .type = UE_BULK, @@ -212,7 +212,7 @@ static const struct usb2_config ubsa_config[UBSA_N_TRANSFER] = { }, }; -static const struct usb2_com_callback ubsa_callback = { +static const struct ucom_callback ubsa_callback = { .usb2_com_cfg_get_status = &ubsa_cfg_get_status, .usb2_com_cfg_set_dtr = &ubsa_cfg_set_dtr, .usb2_com_cfg_set_rts = &ubsa_cfg_set_rts, @@ -225,7 +225,7 @@ static const struct usb2_com_callback ubsa_callback = { .usb2_com_stop_write = &ubsa_stop_write, }; -static const struct usb2_device_id ubsa_devs[] = { +static const struct usb_device_id ubsa_devs[] = { /* AnyData ADU-500A */ {USB_VPI(USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_500A, 0)}, /* AnyData ADU-E100A/H */ @@ -266,7 +266,7 @@ MODULE_DEPEND(ubsa, usb, 1, 1, 1); static int ubsa_probe(device_t dev) { - struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb_attach_arg *uaa = device_get_ivars(dev); if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); @@ -283,7 +283,7 @@ ubsa_probe(device_t dev) static int ubsa_attach(device_t dev) { - struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb_attach_arg *uaa = device_get_ivars(dev); struct ubsa_softc *sc = device_get_softc(dev); int error; @@ -339,7 +339,7 @@ ubsa_detach(device_t dev) static void ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value) { - struct usb2_device_request req; + struct usb_device_request req; usb2_error_t err; req.bmRequestType = UT_WRITE_VENDOR_DEVICE; @@ -358,7 +358,7 @@ ubsa_cfg_request(struct ubsa_softc *sc, uint8_t index, uint16_t value) } static void -ubsa_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) +ubsa_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; @@ -368,7 +368,7 @@ ubsa_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) } static void -ubsa_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) +ubsa_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; @@ -378,7 +378,7 @@ ubsa_cfg_set_rts(struct usb2_com_softc *ucom, uint8_t onoff) } static void -ubsa_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) +ubsa_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) { struct ubsa_softc *sc = ucom->sc_parent; @@ -388,7 +388,7 @@ ubsa_cfg_set_break(struct usb2_com_softc *ucom, uint8_t onoff) } static int -ubsa_pre_param(struct usb2_com_softc *ucom, struct termios *t) +ubsa_pre_param(struct ucom_softc *ucom, struct termios *t) { struct ubsa_softc *sc = ucom->sc_parent; @@ -415,7 +415,7 @@ ubsa_pre_param(struct usb2_com_softc *ucom, struct termios *t) } static void -ubsa_cfg_param(struct usb2_com_softc *ucom, struct termios *t) +ubsa_cfg_param(struct ucom_softc *ucom, struct termios *t) { struct ubsa_softc *sc = ucom->sc_parent; uint16_t value = 0; @@ -486,7 +486,7 @@ ubsa_cfg_param(struct usb2_com_softc *ucom, struct termios *t) } static void -ubsa_start_read(struct usb2_com_softc *ucom) +ubsa_start_read(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; @@ -498,7 +498,7 @@ ubsa_start_read(struct usb2_com_softc *ucom) } static void -ubsa_stop_read(struct usb2_com_softc *ucom) +ubsa_stop_read(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; @@ -510,7 +510,7 @@ ubsa_stop_read(struct usb2_com_softc *ucom) } static void -ubsa_start_write(struct usb2_com_softc *ucom) +ubsa_start_write(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; @@ -518,7 +518,7 @@ ubsa_start_write(struct usb2_com_softc *ucom) } static void -ubsa_stop_write(struct usb2_com_softc *ucom) +ubsa_stop_write(struct ucom_softc *ucom) { struct ubsa_softc *sc = ucom->sc_parent; @@ -526,7 +526,7 @@ ubsa_stop_write(struct usb2_com_softc *ucom) } static void -ubsa_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) +ubsa_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr) { struct ubsa_softc *sc = ucom->sc_parent; @@ -537,7 +537,7 @@ ubsa_cfg_get_status(struct usb2_com_softc *ucom, uint8_t *lsr, uint8_t *msr) } static void -ubsa_write_callback(struct usb2_xfer *xfer) +ubsa_write_callback(struct usb_xfer *xfer) { struct ubsa_softc *sc = xfer->priv_sc; uint32_t actlen; @@ -566,7 +566,7 @@ tr_setup: } static void -ubsa_read_callback(struct usb2_xfer *xfer) +ubsa_read_callback(struct usb_xfer *xfer) { struct ubsa_softc *sc = xfer->priv_sc; @@ -592,7 +592,7 @@ tr_setup: } static void -ubsa_intr_callback(struct usb2_xfer *xfer) +ubsa_intr_callback(struct usb_xfer *xfer) { struct ubsa_softc *sc = xfer->priv_sc; uint8_t buf[4]; |
