svn commit: r192984 - in head: lib/libusb sys/compat/ndis
sys/dev/ata sys/dev/if_ndis sys/dev/sound/usb sys/dev/usb
sys/dev/usb/controller sys/dev/usb/input sys/dev/usb/misc
sys/dev/usb/net sys/dev...
Andrew Thompson
thompsa at FreeBSD.org
Thu May 28 17:36:37 UTC 2009
Author: thompsa
Date: Thu May 28 17:36:36 2009
New Revision: 192984
URL: http://svn.freebsd.org/changeset/base/192984
Log:
s/usb2_/usb_/ on all C structs for the USB stack.
Modified:
head/lib/libusb/libusb.3
head/lib/libusb/libusb20.c
head/lib/libusb/libusb20.h
head/lib/libusb/libusb20_int.h
head/lib/libusb/libusb20_ugen20.c
head/sys/compat/ndis/subr_usbd.c
head/sys/dev/ata/ata-usb.c
head/sys/dev/if_ndis/if_ndis_usb.c
head/sys/dev/if_ndis/if_ndisvar.h
head/sys/dev/sound/usb/uaudio.c
head/sys/dev/sound/usb/uaudioreg.h
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/at91dci.h
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/atmegadci.h
head/sys/dev/usb/controller/atmegadci_atmelarm.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/avr32dci.h
head/sys/dev/usb/controller/ehci.c
head/sys/dev/usb/controller/ehci.h
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/musb_otg.h
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/ohci.h
head/sys/dev/usb/controller/uhci.c
head/sys/dev/usb/controller/uhci.h
head/sys/dev/usb/controller/usb_controller.c
head/sys/dev/usb/controller/uss820dci.c
head/sys/dev/usb/controller/uss820dci.h
head/sys/dev/usb/input/uhid.c
head/sys/dev/usb/input/ukbd.c
head/sys/dev/usb/input/ums.c
head/sys/dev/usb/misc/udbp.c
head/sys/dev/usb/misc/ufm.c
head/sys/dev/usb/net/if_aue.c
head/sys/dev/usb/net/if_auereg.h
head/sys/dev/usb/net/if_axe.c
head/sys/dev/usb/net/if_axereg.h
head/sys/dev/usb/net/if_cdce.c
head/sys/dev/usb/net/if_cdcereg.h
head/sys/dev/usb/net/if_cue.c
head/sys/dev/usb/net/if_cuereg.h
head/sys/dev/usb/net/if_kue.c
head/sys/dev/usb/net/if_kuereg.h
head/sys/dev/usb/net/if_rue.c
head/sys/dev/usb/net/if_ruereg.h
head/sys/dev/usb/net/if_udav.c
head/sys/dev/usb/net/if_udavreg.h
head/sys/dev/usb/net/usb_ethernet.c
head/sys/dev/usb/net/usb_ethernet.h
head/sys/dev/usb/quirk/usb_quirk.c
head/sys/dev/usb/serial/u3g.c
head/sys/dev/usb/serial/uark.c
head/sys/dev/usb/serial/ubsa.c
head/sys/dev/usb/serial/ubser.c
head/sys/dev/usb/serial/uchcom.c
head/sys/dev/usb/serial/ucycom.c
head/sys/dev/usb/serial/ufoma.c
head/sys/dev/usb/serial/uftdi.c
head/sys/dev/usb/serial/ugensa.c
head/sys/dev/usb/serial/uipaq.c
head/sys/dev/usb/serial/ulpt.c
head/sys/dev/usb/serial/umct.c
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/serial/umoscom.c
head/sys/dev/usb/serial/uplcom.c
head/sys/dev/usb/serial/usb_serial.c
head/sys/dev/usb/serial/usb_serial.h
head/sys/dev/usb/serial/uslcom.c
head/sys/dev/usb/serial/uvisor.c
head/sys/dev/usb/serial/uvscom.c
head/sys/dev/usb/storage/umass.c
head/sys/dev/usb/storage/urio.c
head/sys/dev/usb/storage/ustorage_fs.c
head/sys/dev/usb/template/usb_template.c
head/sys/dev/usb/template/usb_template.h
head/sys/dev/usb/template/usb_template_cdce.c
head/sys/dev/usb/template/usb_template_msc.c
head/sys/dev/usb/template/usb_template_mtp.c
head/sys/dev/usb/usb.h
head/sys/dev/usb/usb_bus.h
head/sys/dev/usb/usb_busdma.c
head/sys/dev/usb/usb_busdma.h
head/sys/dev/usb/usb_cdc.h
head/sys/dev/usb/usb_compat_linux.c
head/sys/dev/usb/usb_compat_linux.h
head/sys/dev/usb/usb_controller.h
head/sys/dev/usb/usb_core.h
head/sys/dev/usb/usb_debug.c
head/sys/dev/usb/usb_debug.h
head/sys/dev/usb/usb_dev.c
head/sys/dev/usb/usb_dev.h
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_device.h
head/sys/dev/usb/usb_dynamic.c
head/sys/dev/usb/usb_dynamic.h
head/sys/dev/usb/usb_generic.c
head/sys/dev/usb/usb_generic.h
head/sys/dev/usb/usb_handle_request.c
head/sys/dev/usb/usb_hid.c
head/sys/dev/usb/usb_hid.h
head/sys/dev/usb/usb_hub.c
head/sys/dev/usb/usb_hub.h
head/sys/dev/usb/usb_ioctl.h
head/sys/dev/usb/usb_lookup.c
head/sys/dev/usb/usb_lookup.h
head/sys/dev/usb/usb_mbuf.c
head/sys/dev/usb/usb_mbuf.h
head/sys/dev/usb/usb_msctest.c
head/sys/dev/usb/usb_msctest.h
head/sys/dev/usb/usb_parse.c
head/sys/dev/usb/usb_parse.h
head/sys/dev/usb/usb_process.c
head/sys/dev/usb/usb_process.h
head/sys/dev/usb/usb_request.c
head/sys/dev/usb/usb_request.h
head/sys/dev/usb/usb_transfer.c
head/sys/dev/usb/usb_transfer.h
head/sys/dev/usb/usb_util.c
head/sys/dev/usb/usbhid.h
head/sys/dev/usb/wlan/if_rum.c
head/sys/dev/usb/wlan/if_rumvar.h
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_uathvar.h
head/sys/dev/usb/wlan/if_upgt.c
head/sys/dev/usb/wlan/if_upgtvar.h
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_uralvar.h
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_urtwvar.h
head/sys/dev/usb/wlan/if_zyd.c
head/sys/dev/usb/wlan/if_zydreg.h
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
Modified: head/lib/libusb/libusb.3
==============================================================================
--- head/lib/libusb/libusb.3 Thu May 28 17:35:35 2009 (r192983)
+++ head/lib/libusb/libusb.3 Thu May 28 17:36:36 2009 (r192984)
@@ -109,7 +109,7 @@ USB access library (libusb -lusb)
.Ft const char *
.Fn libusb20_dev_get_backend_name "struct libusb20_device *"
.Ft int
-.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo"
+.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo"
.Ft int
.Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len"
.Ft const char *
@@ -465,7 +465,7 @@ returns a zero terminated string describ
.Pp
.
.Fn libusb20_dev_get_info
-retrives the BSD specific usb2_device_info structure into the memory location given by
+retrives the BSD specific usb_device_info structure into the memory location given by
.Fa pinfo .
The USB device given by
.Fa pdev
Modified: head/lib/libusb/libusb20.c
==============================================================================
--- head/lib/libusb/libusb20.c Thu May 28 17:35:35 2009 (r192983)
+++ head/lib/libusb/libusb20.c Thu May 28 17:36:36 2009 (r192984)
@@ -925,7 +925,7 @@ libusb20_dev_free(struct libusb20_device
int
libusb20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (pinfo == NULL)
return (LIBUSB20_ERROR_INVALID_PARAM);
Modified: head/lib/libusb/libusb20.h
==============================================================================
--- head/lib/libusb/libusb20.h Thu May 28 17:35:35 2009 (r192983)
+++ head/lib/libusb/libusb20.h Thu May 28 17:36:36 2009 (r192984)
@@ -175,7 +175,7 @@ enum {
LIBUSB20_POWER_RESUME,
};
-struct usb2_device_info;
+struct usb_device_info;
struct libusb20_transfer;
struct libusb20_backend;
struct libusb20_backend_methods;
@@ -253,7 +253,7 @@ int libusb20_dev_reset(struct libusb20_d
int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode);
uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev);
int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
-int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo);
int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev);
Modified: head/lib/libusb/libusb20_int.h
==============================================================================
--- head/lib/libusb/libusb20_int.h Thu May 28 17:35:35 2009 (r192983)
+++ head/lib/libusb/libusb20_int.h Thu May 28 17:36:36 2009 (r192984)
@@ -49,7 +49,7 @@ typedef int (libusb20_root_get_quirk_nam
typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
typedef int (libusb20_close_device_t)(struct libusb20_device *pdev);
-typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo);
+typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo);
typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe);
typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max);
Modified: head/lib/libusb/libusb20_ugen20.c
==============================================================================
--- head/lib/libusb/libusb20_ugen20.c Thu May 28 17:35:35 2009 (r192983)
+++ head/lib/libusb/libusb20_ugen20.c Thu May 28 17:36:36 2009 (r192984)
@@ -126,8 +126,8 @@ static int
ugen20_enumerate(struct libusb20_device *pdev, const char *id)
{
const char *tmp = id;
- struct usb2_device_descriptor ddesc;
- struct usb2_device_info devinfo;
+ struct usb_device_descriptor ddesc;
+ struct usb_device_info devinfo;
uint32_t plugtime;
char buf[64];
int f;
@@ -213,7 +213,7 @@ done:
}
struct ugen20_urd_state {
- struct usb2_read_dir urd;
+ struct usb_read_dir urd;
uint32_t nparsed;
int f;
uint8_t *ptr;
@@ -298,7 +298,7 @@ ugen20_init_backend(struct libusb20_back
static void
ugen20_tr_release(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->nTransfer == 0) {
return;
@@ -316,8 +316,8 @@ ugen20_tr_release(struct libusb20_device
static int
ugen20_tr_renew(struct libusb20_device *pdev)
{
- struct usb2_fs_init fs_init;
- struct usb2_fs_endpoint *pfse;
+ struct usb_fs_init fs_init;
+ struct usb_fs_endpoint *pfse;
int error;
uint32_t size;
uint16_t nMaxTransfer;
@@ -419,7 +419,7 @@ done:
static int
ugen20_close_device(struct libusb20_device *pdev)
{
- struct usb2_fs_uninit fs_uninit;
+ struct usb_fs_uninit fs_uninit;
if (pdev->privBeData) {
memset(&fs_uninit, 0, sizeof(fs_uninit));
@@ -447,8 +447,8 @@ static int
ugen20_get_config_desc_full(struct libusb20_device *pdev,
uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index)
{
- struct usb2_gen_descriptor gen_desc;
- struct usb2_config_descriptor cdesc;
+ struct usb_gen_descriptor gen_desc;
+ struct usb_config_descriptor cdesc;
uint8_t *ptr;
uint16_t len;
int error;
@@ -542,7 +542,7 @@ static int
ugen20_set_alt_index(struct libusb20_device *pdev,
uint8_t iface_index, uint8_t alt_index)
{
- struct usb2_alt_interface alt_iface;
+ struct usb_alt_interface alt_iface;
memset(&alt_iface, 0, sizeof(alt_iface));
@@ -663,7 +663,7 @@ ugen20_do_request_sync(struct libusb20_d
struct LIBUSB20_CONTROL_SETUP_DECODED *setup,
void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags)
{
- struct usb2_ctl_request req;
+ struct usb_ctl_request req;
memset(&req, 0, sizeof(req));
@@ -688,8 +688,8 @@ ugen20_do_request_sync(struct libusb20_d
static int
ugen20_process(struct libusb20_device *pdev)
{
- struct usb2_fs_complete temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_complete temp;
+ struct usb_fs_endpoint *fsep;
struct libusb20_transfer *xfer;
while (1) {
@@ -739,8 +739,8 @@ static int
ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize,
uint32_t MaxFrameCount, uint8_t ep_no)
{
- struct usb2_fs_open temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_open temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -772,7 +772,7 @@ ugen20_tr_open(struct libusb20_transfer
static int
ugen20_tr_close(struct libusb20_transfer *xfer)
{
- struct usb2_fs_close temp;
+ struct usb_fs_close temp;
memset(&temp, 0, sizeof(temp));
@@ -787,7 +787,7 @@ ugen20_tr_close(struct libusb20_transfer
static int
ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer)
{
- struct usb2_fs_clear_stall_sync temp;
+ struct usb_fs_clear_stall_sync temp;
memset(&temp, 0, sizeof(temp));
@@ -804,8 +804,8 @@ ugen20_tr_clear_stall_sync(struct libusb
static void
ugen20_tr_submit(struct libusb20_transfer *xfer)
{
- struct usb2_fs_start temp;
- struct usb2_fs_endpoint *fsep;
+ struct usb_fs_start temp;
+ struct usb_fs_endpoint *fsep;
memset(&temp, 0, sizeof(temp));
@@ -839,7 +839,7 @@ ugen20_tr_submit(struct libusb20_transfe
static void
ugen20_tr_cancel_async(struct libusb20_transfer *xfer)
{
- struct usb2_fs_stop temp;
+ struct usb_fs_stop temp;
memset(&temp, 0, sizeof(temp));
@@ -876,7 +876,7 @@ static int
ugen20_dev_get_iface_desc(struct libusb20_device *pdev,
uint8_t iface_index, char *buf, uint8_t len)
{
- struct usb2_gen_descriptor ugd;
+ struct usb_gen_descriptor ugd;
memset(&ugd, 0, sizeof(ugd));
@@ -892,7 +892,7 @@ ugen20_dev_get_iface_desc(struct libusb2
static int
ugen20_dev_get_info(struct libusb20_device *pdev,
- struct usb2_device_info *pinfo)
+ struct usb_device_info *pinfo)
{
if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) {
return (LIBUSB20_ERROR_INVALID_PARAM);
@@ -904,7 +904,7 @@ static int
ugen20_root_get_dev_quirk(struct libusb20_backend *pbe,
uint16_t quirk_index, struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -931,7 +931,7 @@ static int
ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -954,7 +954,7 @@ static int
ugen20_root_add_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
@@ -978,7 +978,7 @@ static int
ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe,
struct libusb20_quirk *pq)
{
- struct usb2_gen_quirk q;
+ struct usb_gen_quirk q;
int error;
memset(&q, 0, sizeof(q));
Modified: head/sys/compat/ndis/subr_usbd.c
==============================================================================
--- head/sys/compat/ndis/subr_usbd.c Thu May 28 17:35:35 2009 (r192983)
+++ head/sys/compat/ndis/subr_usbd.c Thu May 28 17:36:36 2009 (r192984)
@@ -84,10 +84,10 @@ static usb2_callback_t usbd_ctrl_callbac
#define USBD_CTRL_MAX_PIPE 2
#define USBD_CTRL_READ_BUFFER_SP 256
#define USBD_CTRL_READ_BUFFER_SIZE \
- (sizeof(struct usb2_device_request) + USBD_CTRL_READ_BUFFER_SP)
+ (sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP)
#define USBD_CTRL_WRITE_BUFFER_SIZE \
- (sizeof(struct usb2_device_request))
-static struct usb2_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = {
+ (sizeof(struct usb_device_request))
+static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = {
[USBD_CTRL_READ_PIPE] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* control pipe */
@@ -115,10 +115,10 @@ static int32_t usbd_func_vendorclass(i
static int32_t usbd_func_selconf(irp *);
static int32_t usbd_func_abort_pipe(irp *);
static usb2_error_t usbd_setup_endpoint(irp *, uint8_t,
- struct usb2_endpoint_descriptor *);
+ struct usb_endpoint_descriptor *);
static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t);
static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t,
- struct ndisusb_ep *, struct usb2_config *);
+ struct ndisusb_ep *, struct usb_config *);
static int32_t usbd_func_getdesc(irp *);
static union usbd_urb *usbd_geturb(irp *);
static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *);
@@ -519,8 +519,8 @@ usbd_func_selconf(ip)
device_t dev = IRP_NDIS_DEV(ip);
int i, j;
struct ndis_softc *sc = device_get_softc(dev);
- struct usb2_device *udev = sc->ndisusb_dev;
- struct usb2_pipe *p = NULL;
+ struct usb_device *udev = sc->ndisusb_dev;
+ struct usb_pipe *p = NULL;
struct usbd_interface_information *intf;
struct usbd_pipe_information *pipe;
struct usbd_urb_select_configuration *selconf;
@@ -597,11 +597,11 @@ usbd_setup_endpoint_one(ip, ifidx, ne, e
irp *ip;
uint8_t ifidx;
struct ndisusb_ep *ne;
- struct usb2_config *epconf;
+ struct usb_config *epconf;
{
device_t dev = IRP_NDIS_DEV(ip);
struct ndis_softc *sc = device_get_softc(dev);
- struct usb2_xfer *xfer;
+ struct usb_xfer *xfer;
usb2_error_t status;
InitializeListHead(&ne->ne_active);
@@ -647,13 +647,13 @@ static usb2_error_t
usbd_setup_endpoint(ip, ifidx, ep)
irp *ip;
uint8_t ifidx;
- struct usb2_endpoint_descriptor *ep;
+ struct usb_endpoint_descriptor *ep;
{
device_t dev = IRP_NDIS_DEV(ip);
struct ndis_softc *sc = device_get_softc(dev);
struct ndisusb_ep *ne;
- struct usb2_config cfg;
- struct usb2_xfer *xfer;
+ struct usb_config cfg;
+ struct usb_xfer *xfer;
usb2_error_t status;
/* check for non-supported transfer types */
@@ -670,7 +670,7 @@ usbd_setup_endpoint(ip, ifidx, ep)
KeInitializeSpinLock(&ne->ne_lock);
ne->ne_dirin = UE_GET_DIR(ep->bEndpointAddress) >> 7;
- memset(&cfg, 0, sizeof(struct usb2_config));
+ memset(&cfg, 0, sizeof(struct usb_config));
cfg.type = UE_GET_XFERTYPE(ep->bmAttributes);
cfg.endpoint = UE_GET_ADDR(ep->bEndpointAddress);
cfg.direction = UE_GET_DIR(ep->bEndpointAddress);
@@ -853,7 +853,7 @@ usbd_aq_getfirst(struct ndis_softc *sc,
}
static void
-usbd_non_isoc_callback(struct usb2_xfer *xfer)
+usbd_non_isoc_callback(struct usb_xfer *xfer)
{
irp *ip;
struct ndis_softc *sc = xfer->priv_sc;
@@ -951,7 +951,7 @@ extra:
}
static void
-usbd_ctrl_callback(struct usb2_xfer *xfer)
+usbd_ctrl_callback(struct usb_xfer *xfer)
{
irp *ip;
struct ndis_softc *sc = xfer->priv_sc;
@@ -961,7 +961,7 @@ usbd_ctrl_callback(struct usb2_xfer *xfe
union usbd_urb *urb;
struct usbd_urb_vendor_or_class_request *vcreq;
uint8_t type = 0;
- struct usb2_device_request req;
+ struct usb_device_request req;
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
@@ -1434,7 +1434,7 @@ USBD_ParseConfigurationDescriptorEx(conf
int32_t intfsubclass;
int32_t intfproto;
{
- struct usb2_descriptor *next = NULL;
+ struct usb_descriptor *next = NULL;
usb_interface_descriptor_t *desc;
while ((next = usb2_desc_foreach(conf, next)) != NULL) {
Modified: head/sys/dev/ata/ata-usb.c
==============================================================================
--- head/sys/dev/ata/ata-usb.c Thu May 28 17:35:35 2009 (r192983)
+++ head/sys/dev/ata/ata-usb.c Thu May 28 17:36:36 2009 (r192984)
@@ -108,7 +108,7 @@ struct atausb2_softc {
#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX
- struct usb2_xfer *xfer[ATAUSB_T_MAX];
+ struct usb_xfer *xfer[ATAUSB_T_MAX];
caddr_t ata_data;
device_t dev;
@@ -145,7 +145,7 @@ static usb2_callback_t atausb2_tr_error;
static void atausb2_cancel_request(struct atausb2_softc *sc);
static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no);
-static void atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer);
+static void atausb2_t_bbb_data_clear_stall_callback(struct usb_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer);
static int ata_usbchannel_begin_transaction(struct ata_request *request);
static int ata_usbchannel_end_transaction(struct ata_request *request);
@@ -160,13 +160,13 @@ static ata_locking_t ata_usbchannel_lock
* USB frontend part
*/
-struct usb2_config atausb2_config[ATAUSB_T_BBB_MAX] = {
+struct usb_config atausb2_config[ATAUSB_T_BBB_MAX] = {
[ATAUSB_T_BBB_RESET1] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
+ .mh.bufsize = sizeof(struct usb_device_request),
.mh.flags = {},
.mh.callback = &atausb2_t_bbb_reset1_callback,
.mh.timeout = 5000, /* 5 seconds */
@@ -177,7 +177,7 @@ struct usb2_config atausb2_config[ATAUSB
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
+ .mh.bufsize = sizeof(struct usb_device_request),
.mh.flags = {},
.mh.callback = &atausb2_t_bbb_reset2_callback,
.mh.timeout = 5000, /* 5 seconds */
@@ -188,7 +188,7 @@ struct usb2_config atausb2_config[ATAUSB
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
+ .mh.bufsize = sizeof(struct usb_device_request),
.mh.flags = {},
.mh.callback = &atausb2_t_bbb_reset3_callback,
.mh.timeout = 5000, /* 5 seconds */
@@ -219,7 +219,7 @@ struct usb2_config atausb2_config[ATAUSB
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
+ .mh.bufsize = sizeof(struct usb_device_request),
.mh.flags = {},
.mh.callback = &atausb2_t_bbb_data_rd_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
@@ -239,7 +239,7 @@ struct usb2_config atausb2_config[ATAUSB
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
+ .mh.bufsize = sizeof(struct usb_device_request),
.mh.flags = {},
.mh.callback = &atausb2_t_bbb_data_wr_cs_callback,
.mh.timeout = 5000, /* 5 seconds */
@@ -278,8 +278,8 @@ MODULE_VERSION(atausb, 1);
static int
atausb2_probe(device_t dev)
{
- struct usb2_attach_arg *uaa = device_get_ivars(dev);
- struct usb2_interface_descriptor *id;
+ struct usb_attach_arg *uaa = device_get_ivars(dev);
+ struct usb_interface_descriptor *id;
if (uaa->usb_mode != USB_MODE_HOST) {
return (ENXIO);
@@ -318,10 +318,10 @@ static int
atausb2_attach(device_t dev)
{
struct atausb2_softc *sc = device_get_softc(dev);
- struct usb2_attach_arg *uaa = device_get_ivars(dev);
- struct usb2_interface_descriptor *id;
+ struct usb_attach_arg *uaa = device_get_ivars(dev);
+ struct usb_interface_descriptor *id;
const char *proto, *subclass;
- struct usb2_device_request request;
+ struct usb_device_request request;
device_t child;
uint16_t i;
uint8_t maxlun;
@@ -467,10 +467,10 @@ atausb2_transfer_start(struct atausb2_so
}
static void
-atausb2_t_bbb_reset1_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_reset1_callback(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
- struct usb2_device_request req;
+ struct usb_device_request req;
switch (USB_GET_STATE(xfer)) {
case USB_ST_TRANSFERRED:
@@ -500,21 +500,21 @@ atausb2_t_bbb_reset1_callback(struct usb
}
static void
-atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_reset2_callback(struct usb_xfer *xfer)
{
atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3,
ATAUSB_T_BBB_DATA_READ);
}
static void
-atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_reset3_callback(struct usb_xfer *xfer)
{
atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND,
ATAUSB_T_BBB_DATA_WRITE);
}
static void
-atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer,
+atausb2_t_bbb_data_clear_stall_callback(struct usb_xfer *xfer,
uint8_t next_xfer,
uint8_t stall_xfer)
{
@@ -540,7 +540,7 @@ tr_transferred:
}
static void
-atausb2_t_bbb_command_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_command_callback(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
struct ata_request *request = sc->ata_request;
@@ -590,7 +590,7 @@ atausb2_t_bbb_command_callback(struct us
}
static void
-atausb2_t_bbb_data_read_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_data_read_callback(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
uint32_t max_bulk = xfer->max_data_length;
@@ -640,14 +640,14 @@ atausb2_t_bbb_data_read_callback(struct
}
static void
-atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_data_rd_cs_callback(struct usb_xfer *xfer)
{
atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS,
ATAUSB_T_BBB_DATA_READ);
}
static void
-atausb2_t_bbb_data_write_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_data_write_callback(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
uint32_t max_bulk = xfer->max_data_length;
@@ -693,14 +693,14 @@ atausb2_t_bbb_data_write_callback(struct
}
static void
-atausb2_t_bbb_data_wr_cs_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_data_wr_cs_callback(struct usb_xfer *xfer)
{
atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS,
ATAUSB_T_BBB_DATA_WRITE);
}
static void
-atausb2_t_bbb_status_callback(struct usb2_xfer *xfer)
+atausb2_t_bbb_status_callback(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
struct ata_request *request = sc->ata_request;
@@ -820,7 +820,7 @@ atausb2_cancel_request(struct atausb2_so
}
static void
-atausb2_tr_error(struct usb2_xfer *xfer)
+atausb2_tr_error(struct usb_xfer *xfer)
{
struct atausb2_softc *sc = xfer->priv_sc;
Modified: head/sys/dev/if_ndis/if_ndis_usb.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_usb.c Thu May 28 17:35:35 2009 (r192983)
+++ head/sys/dev/if_ndis/if_ndis_usb.c Thu May 28 17:36:36 2009 (r192984)
@@ -111,7 +111,7 @@ DRIVER_MODULE(ndis, uhub, ndis_driver, n
static int
ndisusb_devcompare(interface_type bustype, struct ndis_usb_type *t, device_t dev)
{
- struct usb2_attach_arg *uaa;
+ struct usb_attach_arg *uaa;
if (bustype != PNPBus)
return (FALSE);
@@ -134,7 +134,7 @@ static int
ndisusb_match(device_t self)
{
struct drvdb_ent *db;
- struct usb2_attach_arg *uaa = device_get_ivars(self);
+ struct usb_attach_arg *uaa = device_get_ivars(self);
if (uaa->usb_mode != USB_MODE_HOST)
return (ENXIO);
@@ -159,7 +159,7 @@ ndisusb_attach(device_t self)
{
const struct drvdb_ent *db;
struct ndisusb_softc *dummy = device_get_softc(self);
- struct usb2_attach_arg *uaa = device_get_ivars(self);
+ struct usb_attach_arg *uaa = device_get_ivars(self);
struct ndis_softc *sc;
struct ndis_usb_type *t;
driver_object *drv;
Modified: head/sys/dev/if_ndis/if_ndisvar.h
==============================================================================
--- head/sys/dev/if_ndis/if_ndisvar.h Thu May 28 17:35:35 2009 (r192983)
+++ head/sys/dev/if_ndis/if_ndisvar.h Thu May 28 17:36:36 2009 (r192984)
@@ -121,7 +121,7 @@ struct ndis_vap {
#define NDISUSB_TX_TIMEOUT 10000
struct ndisusb_xfer;
struct ndisusb_ep {
- struct usb2_xfer *ne_xfer[1];
+ struct usb_xfer *ne_xfer[1];
list_entry ne_active;
list_entry ne_pending;
kspin_lock ne_lock;
@@ -225,7 +225,7 @@ struct ndis_softc {
int ndis_tx_timer;
int ndis_hang_timer;
- struct usb2_device *ndisusb_dev;
+ struct usb_device *ndisusb_dev;
struct mtx ndisusb_mtx;
struct ndisusb_ep ndisusb_dread_ep;
struct ndisusb_ep ndisusb_dwrite_ep;
Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c Thu May 28 17:35:35 2009 (r192983)
+++ head/sys/dev/sound/usb/uaudio.c Thu May 28 17:36:36 2009 (r192984)
@@ -135,11 +135,11 @@ struct uaudio_chan {
struct pcmchan_caps pcm_cap; /* capabilities */
struct snd_dbuf *pcm_buf;
- const struct usb2_config *usb2_cfg;
+ const struct usb_config *usb2_cfg;
struct mtx *pcm_mtx; /* lock protecting this structure */
struct uaudio_softc *priv_sc;
struct pcm_channel *pcm_ch;
- struct usb2_xfer *xfer[UAUDIO_NCHANBUFS];
+ struct usb_xfer *xfer[UAUDIO_NCHANBUFS];
const struct usb2_audio_streaming_interface_descriptor *p_asid;
const struct usb2_audio_streaming_type1_descriptor *p_asf1d;
const struct usb2_audio_streaming_endpoint_descriptor *p_sed;
@@ -171,7 +171,7 @@ struct uaudio_chan {
#define UMIDI_BULK_SIZE 1024 /* bytes */
struct umidi_sub_chan {
- struct usb2_fifo_sc fifo;
+ struct usb_fifo_sc fifo;
uint8_t *temp_cmd;
uint8_t temp_0[4];
uint8_t temp_1[4];
@@ -194,7 +194,7 @@ struct umidi_chan {
struct umidi_sub_chan sub[UMIDI_CABLES_MAX];
struct mtx mtx;
- struct usb2_xfer *xfer[UMIDI_N_TRANSFER];
+ struct usb_xfer *xfer[UMIDI_N_TRANSFER];
uint8_t iface_index;
uint8_t iface_alt_index;
@@ -218,8 +218,8 @@ struct uaudio_softc {
struct uaudio_chan sc_play_chan;
struct umidi_chan sc_midi_chan;
- struct usb2_device *sc_udev;
- struct usb2_xfer *sc_mixer_xfer[1];
+ struct usb_device *sc_udev;
+ struct usb_xfer *sc_mixer_xfer[1];
struct uaudio_mixer_node *sc_mixer_root;
struct uaudio_mixer_node *sc_mixer_curr;
@@ -251,7 +251,7 @@ struct uaudio_search_result {
struct uaudio_terminal_node {
union {
- const struct usb2_descriptor *desc;
+ const struct usb_descriptor *desc;
const struct usb2_audio_input_terminal *it;
const struct usb2_audio_output_terminal *ot;
const struct usb2_audio_mixer_unit_0 *mu;
@@ -317,9 +317,9 @@ static usb2_callback_t umidi_write_clear
static usb2_callback_t umidi_bulk_write_callback;
static void uaudio_chan_fill_info_sub(struct uaudio_softc *,
- struct usb2_device *, uint32_t, uint16_t, uint8_t, uint8_t);
+ struct usb_device *, uint32_t, uint16_t, uint8_t, uint8_t);
static void uaudio_chan_fill_info(struct uaudio_softc *,
- struct usb2_device *);
+ struct usb_device *);
static void uaudio_mixer_add_ctl_sub(struct uaudio_softc *,
struct uaudio_mixer_node *);
static void uaudio_mixer_add_ctl(struct uaudio_softc *,
@@ -357,25 +357,25 @@ static void uaudio_mixer_find_inputs_sub
static void uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *,
uint8_t, uint8_t, struct uaudio_search_result *);
static void uaudio_mixer_fill_info(struct uaudio_softc *,
- struct usb2_device *, void *);
-static uint16_t uaudio_mixer_get(struct usb2_device *, uint8_t,
+ struct usb_device *, void *);
+static uint16_t uaudio_mixer_get(struct usb_device *, uint8_t,
struct uaudio_mixer_node *);
static void uaudio_mixer_ctl_set(struct uaudio_softc *,
struct uaudio_mixer_node *, uint8_t, int32_t val);
-static usb2_error_t uaudio_set_speed(struct usb2_device *, uint8_t, uint32_t);
+static usb2_error_t uaudio_set_speed(struct usb_device *, uint8_t, uint32_t);
static int uaudio_mixer_signext(uint8_t, int);
static int uaudio_mixer_bsd2value(struct uaudio_mixer_node *, int32_t val);
static const void *uaudio_mixer_verify_desc(const void *, uint32_t);
static void uaudio_mixer_init(struct uaudio_softc *);
static uint8_t umidi_convert_to_usb(struct umidi_sub_chan *, uint8_t, uint8_t);
-static struct umidi_sub_chan *umidi_sub_by_fifo(struct usb2_fifo *);
-static void umidi_start_read(struct usb2_fifo *);
-static void umidi_stop_read(struct usb2_fifo *);
-static void umidi_start_write(struct usb2_fifo *);
-static void umidi_stop_write(struct usb2_fifo *);
-static int umidi_open(struct usb2_fifo *, int);
-static int umidi_ioctl(struct usb2_fifo *, u_long cmd, void *, int);
-static void umidi_close(struct usb2_fifo *, int);
+static struct umidi_sub_chan *umidi_sub_by_fifo(struct usb_fifo *);
+static void umidi_start_read(struct usb_fifo *);
+static void umidi_stop_read(struct usb_fifo *);
+static void umidi_start_write(struct usb_fifo *);
+static void umidi_stop_write(struct usb_fifo *);
+static int umidi_open(struct usb_fifo *, int);
+static int umidi_ioctl(struct usb_fifo *, u_long cmd, void *, int);
+static void umidi_close(struct usb_fifo *, int);
static void umidi_init(device_t dev);
static int32_t umidi_probe(device_t dev);
static int32_t umidi_detach(device_t dev);
@@ -388,7 +388,7 @@ static void uaudio_mixer_dump_cluster(ui
static const char *uaudio_mixer_get_terminal_name(uint16_t);
#endif
-static const struct usb2_config
+static const struct usb_config
uaudio_cfg_record[UAUDIO_NCHANBUFS] = {
[0] = {
.type = UE_ISOCHRONOUS,
@@ -411,7 +411,7 @@ static const struct usb2_config
},
};
-static const struct usb2_config
+static const struct usb_config
uaudio_cfg_play[UAUDIO_NCHANBUFS] = {
[0] = {
.type = UE_ISOCHRONOUS,
@@ -434,13 +434,13 @@ static const struct usb2_config
},
};
-static const struct usb2_config
+static const struct usb_config
uaudio_mixer_config[1] = {
[0] = {
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .bufsize = (sizeof(struct usb2_device_request) + 4),
+ .bufsize = (sizeof(struct usb_device_request) + 4),
.callback = &uaudio_mixer_write_cfg_callback,
.timeout = 1000, /* 1 second */
},
@@ -466,7 +466,7 @@ uint8_t umidi_cmd_to_len[16] = {
[0xF] = 1, /* bytes */
};
-static const struct usb2_config
+static const struct usb_config
umidi_config[UMIDI_N_TRANSFER] = {
[0] = {
.type = UE_BULK,
@@ -490,7 +490,7 @@ static const struct usb2_config
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .bufsize = sizeof(struct usb2_device_request),
+ .bufsize = sizeof(struct usb_device_request),
.flags = {},
.callback = &umidi_write_clear_stall_callback,
.timeout = 1000, /* 1 second */
@@ -501,7 +501,7 @@ static const struct usb2_config
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .bufsize = sizeof(struct usb2_device_request),
+ .bufsize = sizeof(struct usb_device_request),
.flags = {},
.callback = &umidi_read_clear_stall_callback,
.timeout = 1000, /* 1 second */
@@ -531,7 +531,7 @@ static driver_t uaudio_driver = {
static int
uaudio_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);
@@ -554,9 +554,9 @@ uaudio_probe(device_t dev)
static int
uaudio_attach(device_t dev)
{
- struct usb2_attach_arg *uaa = device_get_ivars(dev);
+ struct usb_attach_arg *uaa = device_get_ivars(dev);
struct uaudio_softc *sc = device_get_softc(dev);
- struct usb2_interface_descriptor *id;
+ struct usb_interface_descriptor *id;
device_t child;
sc->sc_play_chan.priv_sc = sc;
@@ -767,18 +767,18 @@ uaudio_chan_dump_ep_desc(const usb2_endp
#endif
static void
-uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb2_device *udev,
+uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev,
uint32_t rate, uint16_t fps, uint8_t channels,
uint8_t bit_resolution)
{
- struct usb2_descriptor *desc = NULL;
+ struct usb_descriptor *desc = NULL;
const struct usb2_audio_streaming_interface_descriptor *asid = NULL;
const struct usb2_audio_streaming_type1_descriptor *asf1d = NULL;
const struct usb2_audio_streaming_endpoint_descriptor *sed = NULL;
const usb2_endpoint_descriptor_audio_t *ed1 = NULL;
const usb2_endpoint_descriptor_audio_t *ed2 = NULL;
- struct usb2_config_descriptor *cd = usb2_get_config_descriptor(udev);
- struct usb2_interface_descriptor *id;
+ struct usb_config_descriptor *cd = usb2_get_config_descriptor(udev);
+ struct usb_interface_descriptor *id;
const struct uaudio_format *p_fmt;
struct uaudio_chan *chan;
uint16_t curidx = 0xFFFF;
@@ -1049,7 +1049,7 @@ uaudio_chan_fill_info_sub(struct uaudio_
}
static void
-uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb2_device *udev)
+uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev)
{
uint32_t rate = uaudio_default_rate;
uint32_t z;
@@ -1098,7 +1098,7 @@ done:
}
static void
-uaudio_chan_play_callback(struct usb2_xfer *xfer)
+uaudio_chan_play_callback(struct usb_xfer *xfer)
{
struct uaudio_chan *ch = xfer->priv_sc;
uint32_t *p_len = xfer->frlengths;
@@ -1187,7 +1187,7 @@ tr_transferred:
}
static void
-uaudio_chan_record_callback(struct usb2_xfer *xfer)
+uaudio_chan_record_callback(struct usb_xfer *xfer)
{
struct uaudio_chan *ch = xfer->priv_sc;
uint32_t *p_len = xfer->frlengths;
@@ -1999,7 +1999,7 @@ uaudio_mixer_verify_desc(const void *arg
const struct usb2_audio_processing_unit_1 *u1;
union {
- const struct usb2_descriptor *desc;
+ const struct usb_descriptor *desc;
const struct usb2_audio_input_terminal *it;
const struct usb2_audio_output_terminal *ot;
const struct usb2_audio_mixer_unit_0 *mu;
@@ -2151,7 +2151,7 @@ static struct usb2_audio_cluster
uaudio_mixer_get_cluster(uint8_t id, const struct uaudio_terminal_node *iot)
{
struct usb2_audio_cluster r;
- const struct usb2_descriptor *dp;
+ const struct usb_descriptor *dp;
uint8_t i;
for (i = 0; i < UAUDIO_RECURSE_LIMIT; i++) { /* avoid infinite loops */
@@ -2618,12 +2618,12 @@ uaudio_mixer_find_outputs_sub(struct uau
}
static void
-uaudio_mixer_fill_info(struct uaudio_softc *sc, struct usb2_device *udev,
+uaudio_mixer_fill_info(struct uaudio_softc *sc, struct usb_device *udev,
void *desc)
{
const struct usb2_audio_control_descriptor *acdp;
- struct usb2_config_descriptor *cd = usb2_get_config_descriptor(udev);
- const struct usb2_descriptor *dp;
+ struct usb_config_descriptor *cd = usb2_get_config_descriptor(udev);
+ const struct usb_descriptor *dp;
const struct usb2_audio_unit *au;
struct uaudio_terminal_node *iot = NULL;
uint16_t wTotalLen;
@@ -2866,10 +2866,10 @@ done:
}
static uint16_t
-uaudio_mixer_get(struct usb2_device *udev, uint8_t what,
+uaudio_mixer_get(struct usb_device *udev, uint8_t what,
struct uaudio_mixer_node *mc)
{
- struct usb2_device_request req;
+ struct usb_device_request req;
uint16_t val;
uint16_t len = MIX_SIZE(mc->type);
uint8_t data[4];
@@ -2903,9 +2903,9 @@ uaudio_mixer_get(struct usb2_device *ude
}
static void
-uaudio_mixer_write_cfg_callback(struct usb2_xfer *xfer)
+uaudio_mixer_write_cfg_callback(struct usb_xfer *xfer)
{
- struct usb2_device_request req;
+ struct usb_device_request req;
struct uaudio_softc *sc = xfer->priv_sc;
struct uaudio_mixer_node *mc = sc->sc_mixer_curr;
uint16_t len;
@@ -2988,9 +2988,9 @@ tr_setup:
}
static usb2_error_t
-uaudio_set_speed(struct usb2_device *udev, uint8_t endpt, uint32_t speed)
+uaudio_set_speed(struct usb_device *udev, uint8_t endpt, uint32_t speed)
{
- struct usb2_device_request req;
+ struct usb_device_request req;
uint8_t data[3];
DPRINTFN(6, "endpt=%d speed=%u\n", endpt, speed);
@@ -3182,10 +3182,10 @@ uaudio_mixer_setrecsrc(struct uaudio_sof
*========================================================================*/
static void
-umidi_read_clear_stall_callback(struct usb2_xfer *xfer)
+umidi_read_clear_stall_callback(struct usb_xfer *xfer)
{
struct umidi_chan *chan = xfer->priv_sc;
- struct usb2_xfer *xfer_other = chan->xfer[1];
+ struct usb_xfer *xfer_other = chan->xfer[1];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -3195,7 +3195,7 @@ umidi_read_clear_stall_callback(struct u
}
static void
-umidi_bulk_read_callback(struct usb2_xfer *xfer)
+umidi_bulk_read_callback(struct usb_xfer *xfer)
{
struct umidi_chan *chan = xfer->priv_sc;
struct umidi_sub_chan *sub;
@@ -3261,10 +3261,10 @@ tr_error:
}
static void
-umidi_write_clear_stall_callback(struct usb2_xfer *xfer)
+umidi_write_clear_stall_callback(struct usb_xfer *xfer)
{
struct umidi_chan *chan = xfer->priv_sc;
- struct usb2_xfer *xfer_other = chan->xfer[0];
+ struct usb_xfer *xfer_other = chan->xfer[0];
if (usb2_clear_stall_callback(xfer, xfer_other)) {
DPRINTF("stall cleared\n");
@@ -3407,7 +3407,7 @@ umidi_convert_to_usb(struct umidi_sub_ch
}
static void
-umidi_bulk_write_callback(struct usb2_xfer *xfer)
+umidi_bulk_write_callback(struct usb_xfer *xfer)
{
struct umidi_chan *chan = xfer->priv_sc;
struct umidi_sub_chan *sub;
@@ -3507,7 +3507,7 @@ umidi_bulk_write_callback(struct usb2_xf
}
static struct umidi_sub_chan *
-umidi_sub_by_fifo(struct usb2_fifo *fifo)
+umidi_sub_by_fifo(struct usb_fifo *fifo)
{
struct umidi_chan *chan = fifo->priv_sc0;
struct umidi_sub_chan *sub;
@@ -3521,14 +3521,14 @@ umidi_sub_by_fifo(struct usb2_fifo *fifo
}
}
- panic("%s:%d cannot find usb2_fifo!\n",
+ panic("%s:%d cannot find usb_fifo!\n",
__FILE__, __LINE__);
return (NULL);
}
static void
-umidi_start_read(struct usb2_fifo *fifo)
+umidi_start_read(struct usb_fifo *fifo)
{
struct umidi_chan *chan = fifo->priv_sc0;
@@ -3536,7 +3536,7 @@ umidi_start_read(struct usb2_fifo *fifo)
}
static void
-umidi_stop_read(struct usb2_fifo *fifo)
+umidi_stop_read(struct usb_fifo *fifo)
{
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list