Expand USB_ATTACH_SETUP inline.

Kill devinfo stuff.
This commit is contained in:
imp 2007-06-09 06:53:27 +00:00
parent ea3321396e
commit 7462ef5293
2 changed files with 2 additions and 8 deletions

View File

@ -313,16 +313,13 @@ USB_ATTACH(ubt)
usb_config_descriptor_t *cd = NULL;
usb_interface_descriptor_t *id = NULL;
usb_endpoint_descriptor_t *ed = NULL;
char devinfo[1024];
usbd_status error;
int i, ai, alt_no, isoc_in, isoc_out,
isoc_isize, isoc_osize;
/* Get USB device info */
sc->sc_dev = self;
sc->sc_udev = uaa->device;
usbd_devinfo(sc->sc_udev, 0, devinfo);
USB_ATTACH_SETUP;
printf("%s: %s\n", device_get_nameunit(sc->sc_dev), devinfo);
/*
* Initialize device softc structure

View File

@ -151,12 +151,9 @@ USB_ATTACH(ubtbcmfw)
USB_ATTACH_START(ubtbcmfw, sc, uaa);
usbd_interface_handle iface;
usbd_status err;
char devinfo[1024];
sc->sc_dev = self;
sc->sc_udev = uaa->device;
usbd_devinfo(sc->sc_udev, 0, devinfo);
USB_ATTACH_SETUP;
printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo);
sc->sc_ctrl_dev = sc->sc_intr_in_dev = sc->sc_bulk_out_dev = NULL;
sc->sc_intr_in_pipe = sc->sc_bulk_out_pipe = NULL;