Date: Fri, 10 Sep 2010 00:23:44 +0000 (UTC) From: Weongyo Jeong <weongyo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r212404 - in user/weongyo/usb/sys/dev/usb: . input misc net serial storage wlan Message-ID: <201009100023.o8A0NiC0056234@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: weongyo Date: Fri Sep 10 00:23:44 2010 New Revision: 212404 URL: http://svn.freebsd.org/changeset/base/212404 Log: device_set_usb_desc() would be called whenever the USB device is tried to attach if the probe was good. This behaviour was a change between old USB stack and new USB stack. I could not find a reason why it's not called automatically. Modified: user/weongyo/usb/sys/dev/usb/input/atp.c user/weongyo/usb/sys/dev/usb/input/uep.c user/weongyo/usb/sys/dev/usb/input/uhid.c user/weongyo/usb/sys/dev/usb/input/ukbd.c user/weongyo/usb/sys/dev/usb/input/ums.c user/weongyo/usb/sys/dev/usb/misc/udbp.c user/weongyo/usb/sys/dev/usb/misc/ufm.c user/weongyo/usb/sys/dev/usb/net/if_aue.c user/weongyo/usb/sys/dev/usb/net/if_axe.c user/weongyo/usb/sys/dev/usb/net/if_cdce.c user/weongyo/usb/sys/dev/usb/net/if_cue.c user/weongyo/usb/sys/dev/usb/net/if_kue.c user/weongyo/usb/sys/dev/usb/net/if_rue.c user/weongyo/usb/sys/dev/usb/net/if_udav.c user/weongyo/usb/sys/dev/usb/serial/u3g.c user/weongyo/usb/sys/dev/usb/serial/uark.c user/weongyo/usb/sys/dev/usb/serial/ubsa.c user/weongyo/usb/sys/dev/usb/serial/ubser.c user/weongyo/usb/sys/dev/usb/serial/uchcom.c user/weongyo/usb/sys/dev/usb/serial/ucycom.c user/weongyo/usb/sys/dev/usb/serial/ufoma.c user/weongyo/usb/sys/dev/usb/serial/uftdi.c user/weongyo/usb/sys/dev/usb/serial/ugensa.c user/weongyo/usb/sys/dev/usb/serial/uipaq.c user/weongyo/usb/sys/dev/usb/serial/ulpt.c user/weongyo/usb/sys/dev/usb/serial/umct.c user/weongyo/usb/sys/dev/usb/serial/umodem.c user/weongyo/usb/sys/dev/usb/serial/uplcom.c user/weongyo/usb/sys/dev/usb/serial/uslcom.c user/weongyo/usb/sys/dev/usb/serial/uvisor.c user/weongyo/usb/sys/dev/usb/serial/uvscom.c user/weongyo/usb/sys/dev/usb/storage/umass.c user/weongyo/usb/sys/dev/usb/storage/urio.c user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c user/weongyo/usb/sys/dev/usb/usb_compat_linux.c user/weongyo/usb/sys/dev/usb/usb_device.c user/weongyo/usb/sys/dev/usb/usb_hub.c user/weongyo/usb/sys/dev/usb/wlan/if_rum.c user/weongyo/usb/sys/dev/usb/wlan/if_run.c user/weongyo/usb/sys/dev/usb/wlan/if_uath.c user/weongyo/usb/sys/dev/usb/wlan/if_upgt.c user/weongyo/usb/sys/dev/usb/wlan/if_ural.c user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c Modified: user/weongyo/usb/sys/dev/usb/input/atp.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/atp.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/input/atp.c Fri Sep 10 00:23:44 2010 (r212404) @@ -1695,8 +1695,6 @@ atp_attach(device_t dev) goto detach; } - device_set_usb_desc(dev); - sc->sc_params = &atp_dev_params[uaa->driver_info]; sc->sc_hw.buttons = 3; Modified: user/weongyo/usb/sys/dev/usb/input/uep.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/uep.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/input/uep.c Fri Sep 10 00:23:44 2010 (r212404) @@ -315,8 +315,6 @@ uep_attach(device_t dev) struct uep_softc *sc = device_get_softc(dev); int error; - device_set_usb_desc(dev); - mtx_init(&sc->mtx, "uep lock", NULL, MTX_DEF); error = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, Modified: user/weongyo/usb/sys/dev/usb/input/uhid.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/uhid.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/input/uhid.c Fri Sep 10 00:23:44 2010 (r212404) @@ -648,8 +648,6 @@ uhid_attach(device_t dev) DPRINTFN(10, "sc=%p\n", sc); - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, "uhid lock", NULL, MTX_DEF | MTX_RECURSE); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/input/ukbd.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/ukbd.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/input/ukbd.c Fri Sep 10 00:23:44 2010 (r212404) @@ -819,8 +819,6 @@ ukbd_attach(device_t dev) kbd->kb_data = (void *)sc; - device_set_usb_desc(dev); - sc->sc_udev = uaa->device; sc->sc_iface = uaa->iface; sc->sc_iface_index = uaa->info.bIfaceIndex; Modified: user/weongyo/usb/sys/dev/usb/input/ums.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/ums.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/input/ums.c Fri Sep 10 00:23:44 2010 (r212404) @@ -524,8 +524,6 @@ ums_attach(device_t dev) DPRINTFN(11, "sc=%p\n", sc); - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE); usb_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0); Modified: user/weongyo/usb/sys/dev/usb/misc/udbp.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/misc/udbp.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/misc/udbp.c Fri Sep 10 00:23:44 2010 (r212404) @@ -332,8 +332,6 @@ udbp_attach(device_t dev) struct udbp_softc *sc = device_get_softc(dev); int error; - device_set_usb_desc(dev); - snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", device_get_nameunit(dev)); Modified: user/weongyo/usb/sys/dev/usb/misc/ufm.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/misc/ufm.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/misc/ufm.c Fri Sep 10 00:23:44 2010 (r212404) @@ -149,8 +149,6 @@ ufm_attach(device_t dev) mtx_init(&sc->sc_mtx, "ufm lock", NULL, MTX_DEF | MTX_RECURSE); - device_set_usb_desc(dev); - error = usb_fifo_attach(uaa->device, sc, &sc->sc_mtx, &ufm_fifo_methods, &sc->sc_fifo, device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex, Modified: user/weongyo/usb/sys/dev/usb/net/if_aue.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_aue.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_aue.c Fri Sep 10 00:23:44 2010 (r212404) @@ -694,8 +694,6 @@ aue_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb_desc(dev); - sc->sc_flags = USB_GET_DRIVER_INFO(uaa); if (uaa->info.bcdDevice >= 0x0201) { /* XXX currently undocumented */ Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_axe.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_axe.c Fri Sep 10 00:23:44 2010 (r212404) @@ -779,8 +779,6 @@ axe_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb_desc(dev); - sc->sc_flags = USB_GET_DRIVER_INFO(uaa); sc->sc_dev = dev; sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/net/if_cdce.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_cdce.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_cdce.c Fri Sep 10 00:23:44 2010 (r212404) @@ -446,8 +446,6 @@ cdce_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_flags = USB_GET_DRIVER_INFO(uaa); - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); ud = usbd_find_descriptor Modified: user/weongyo/usb/sys/dev/usb/net/if_cue.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_cue.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_cue.c Fri Sep 10 00:23:44 2010 (r212404) @@ -402,8 +402,6 @@ cue_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb_desc(dev); - sc->sc_dev = dev; sc->sc_udev = uaa->device; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); Modified: user/weongyo/usb/sys/dev/usb/net/if_kue.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_kue.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_kue.c Fri Sep 10 00:23:44 2010 (r212404) @@ -469,7 +469,6 @@ kue_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb_desc(dev); sc->sc_dev = dev; sc->sc_udev = uaa->device; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); Modified: user/weongyo/usb/sys/dev/usb/net/if_rue.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_rue.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_rue.c Fri Sep 10 00:23:44 2010 (r212404) @@ -582,7 +582,6 @@ rue_attach(device_t dev) uint8_t iface_index; int error; - device_set_usb_desc(dev); sc->sc_dev = dev; sc->sc_udev = uaa->device; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF); Modified: user/weongyo/usb/sys/dev/usb/net/if_udav.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_udav.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/net/if_udav.c Fri Sep 10 00:23:44 2010 (r212404) @@ -250,8 +250,6 @@ udav_attach(device_t dev) sleepout_init_mtx(&sc->sc_sleepout, &sc->sc_watchdog, &sc->sc_mtx, 0); TASK_INIT(&sc->sc_setmulti, 0, udav_setmulti, sc); - device_set_usb_desc(dev); - iface_index = UDAV_IFACE_INDEX; error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, udav_config, UDAV_N_TRANSFER, sc, &sc->sc_mtx); Modified: user/weongyo/usb/sys/dev/usb/serial/u3g.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/u3g.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/u3g.c Fri Sep 10 00:23:44 2010 (r212404) @@ -745,7 +745,6 @@ u3g_attach(device_t dev) for (n = 0; n != U3G_N_TRANSFER; n++) u3g_config_tmp[n] = u3g_config[n]; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "u3g", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/serial/uark.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uark.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uark.c Fri Sep 10 00:23:44 2010 (r212404) @@ -200,7 +200,6 @@ uark_attach(device_t dev) int32_t error; uint8_t iface_index; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uark", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/serial/ubsa.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ubsa.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ubsa.c Fri Sep 10 00:23:44 2010 (r212404) @@ -305,7 +305,6 @@ ubsa_attach(device_t dev) DPRINTF("sc=%p\n", sc); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "ubsa", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/serial/ubser.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ubser.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ubser.c Fri Sep 10 00:23:44 2010 (r212404) @@ -242,7 +242,6 @@ ubser_attach(device_t dev) uint8_t n; int error; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "ubser", NULL, MTX_DEF); snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", Modified: user/weongyo/usb/sys/dev/usb/serial/uchcom.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uchcom.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uchcom.c Fri Sep 10 00:23:44 2010 (r212404) @@ -318,7 +318,6 @@ uchcom_attach(device_t dev) DPRINTFN(11, "\n"); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uchcom", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/serial/ucycom.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ucycom.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ucycom.c Fri Sep 10 00:23:44 2010 (r212404) @@ -217,7 +217,6 @@ ucycom_attach(device_t dev) sc->sc_udev = uaa->device; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "ucycom", NULL, MTX_DEF); snprintf(sc->sc_name, sizeof(sc->sc_name), Modified: user/weongyo/usb/sys/dev/usb/serial/ufoma.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ufoma.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ufoma.c Fri Sep 10 00:23:44 2010 (r212404) @@ -382,8 +382,6 @@ ufoma_attach(device_t dev) mtx_init(&sc->sc_mtx, "ufoma", NULL, MTX_DEF); cv_init(&sc->sc_cv, "CWAIT"); - device_set_usb_desc(dev); - snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", device_get_nameunit(dev)); Modified: user/weongyo/usb/sys/dev/usb/serial/uftdi.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uftdi.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uftdi.c Fri Sep 10 00:23:44 2010 (r212404) @@ -280,7 +280,6 @@ uftdi_attach(device_t dev) sc->sc_dev = dev; sc->sc_unit = device_get_unit(dev); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uftdi", NULL, MTX_DEF); snprintf(sc->sc_name, sizeof(sc->sc_name), Modified: user/weongyo/usb/sys/dev/usb/serial/ugensa.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ugensa.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ugensa.c Fri Sep 10 00:23:44 2010 (r212404) @@ -191,7 +191,6 @@ ugensa_attach(device_t dev) uint8_t iface_index; int x, cnt; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "ugensa", NULL, MTX_DEF); /* Figure out how many interfaces this device has got */ Modified: user/weongyo/usb/sys/dev/usb/serial/uipaq.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uipaq.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uipaq.c Fri Sep 10 00:23:44 2010 (r212404) @@ -1120,7 +1120,6 @@ uipaq_attach(device_t dev) sc->sc_udev = uaa->device; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uipaq", NULL, MTX_DEF); /* Modified: user/weongyo/usb/sys/dev/usb/serial/ulpt.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/ulpt.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/ulpt.c Fri Sep 10 00:23:44 2010 (r212404) @@ -520,8 +520,6 @@ ulpt_attach(device_t dev) sc->sc_dev = dev; sc->sc_udev = uaa->device; - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, "ulpt lock", NULL, MTX_DEF | MTX_RECURSE); usb_callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0); Modified: user/weongyo/usb/sys/dev/usb/serial/umct.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/umct.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/umct.c Fri Sep 10 00:23:44 2010 (r212404) @@ -250,7 +250,6 @@ umct_attach(device_t dev) sc->sc_udev = uaa->device; sc->sc_unit = device_get_unit(dev); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "umct", NULL, MTX_DEF); snprintf(sc->sc_name, sizeof(sc->sc_name), Modified: user/weongyo/usb/sys/dev/usb/serial/umodem.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/umodem.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/umodem.c Fri Sep 10 00:23:44 2010 (r212404) @@ -292,7 +292,6 @@ umodem_attach(device_t dev) uint8_t i; int error; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "umodem", NULL, MTX_DEF); sc->sc_ctrl_iface_no = uaa->info.bIfaceNum; Modified: user/weongyo/usb/sys/dev/usb/serial/uplcom.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uplcom.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uplcom.c Fri Sep 10 00:23:44 2010 (r212404) @@ -360,7 +360,6 @@ uplcom_attach(device_t dev) DPRINTFN(11, "\n"); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uplcom", NULL, MTX_DEF); DPRINTF("sc = %p\n", sc); Modified: user/weongyo/usb/sys/dev/usb/serial/uslcom.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uslcom.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uslcom.c Fri Sep 10 00:23:44 2010 (r212404) @@ -300,7 +300,6 @@ uslcom_attach(device_t dev) DPRINTFN(11, "\n"); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uslcom", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/serial/uvisor.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uvisor.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uvisor.c Fri Sep 10 00:23:44 2010 (r212404) @@ -314,7 +314,6 @@ uvisor_attach(device_t dev) DPRINTF("sc=%p\n", sc); bcopy(uvisor_config, uvisor_config_copy, sizeof(uvisor_config_copy)); - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uvisor", NULL, MTX_DEF); Modified: user/weongyo/usb/sys/dev/usb/serial/uvscom.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/serial/uvscom.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/serial/uvscom.c Fri Sep 10 00:23:44 2010 (r212404) @@ -291,7 +291,6 @@ uvscom_attach(device_t dev) struct uvscom_softc *sc = device_get_softc(dev); int error; - device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uvscom", NULL, MTX_DEF); sc->sc_udev = uaa->device; Modified: user/weongyo/usb/sys/dev/usb/storage/umass.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/storage/umass.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/storage/umass.c Fri Sep 10 00:23:44 2010 (r212404) @@ -903,8 +903,6 @@ umass_attach(device_t dev) snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", device_get_nameunit(dev)); - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF | MTX_RECURSE); Modified: user/weongyo/usb/sys/dev/usb/storage/urio.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/storage/urio.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/storage/urio.c Fri Sep 10 00:23:44 2010 (r212404) @@ -224,8 +224,6 @@ urio_attach(device_t dev) struct urio_softc *sc = device_get_softc(dev); int error; - device_set_usb_desc(dev); - sc->sc_udev = uaa->device; mtx_init(&sc->sc_mtx, "urio lock", NULL, MTX_DEF | MTX_RECURSE); Modified: user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.c Fri Sep 10 00:23:44 2010 (r212404) @@ -386,8 +386,6 @@ ustorage_fs_attach(device_t dev) sc->sc_lun[0].removable = 1; } - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, "USTORAGE_FS lock", NULL, (MTX_DEF | MTX_RECURSE)); Modified: user/weongyo/usb/sys/dev/usb/usb_compat_linux.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_compat_linux.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/usb_compat_linux.c Fri Sep 10 00:23:44 2010 (r212404) @@ -274,7 +274,6 @@ usb_linux_attach(device_t dev) } if (usb_linux_create_usb_device(uaa->device, dev) != 0) return (ENOMEM); - device_set_usb_desc(dev); sc->sc_fbsd_udev = uaa->device; sc->sc_fbsd_dev = dev; Modified: user/weongyo/usb/sys/dev/usb/usb_device.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_device.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/usb_device.c Fri Sep 10 00:23:44 2010 (r212404) @@ -1170,7 +1170,14 @@ usb_probe_and_attach_sub(struct usb_devi */ iface->subdev = uaa->temp_dev; - if (device_probe_and_attach(iface->subdev) == 0) { + err = device_probe(iface->subdev); + if (err == -1) + goto attached; + else if (err != 0) + goto fail; + device_set_usb_desc(iface->subdev); + if (device_attach(iface->subdev) == 0) { +attached: /* * The USB attach arguments are only available during probe * and attach ! @@ -1184,10 +1191,10 @@ usb_probe_and_attach_sub(struct usb_devi device_printf(iface->subdev, "Suspend failed\n"); } return (0); /* success */ - } else { - /* No USB driver found */ - iface->subdev = NULL; } +fail: + /* No USB driver found */ + iface->subdev = NULL; return (1); /* failure */ } Modified: user/weongyo/usb/sys/dev/usb/usb_hub.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_hub.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/usb_hub.c Fri Sep 10 00:23:44 2010 (r212404) @@ -703,8 +703,6 @@ uhub_attach(device_t dev) snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", device_get_nameunit(dev)); - device_set_usb_desc(dev); - DPRINTFN(2, "depth=%d selfpowered=%d, parent=%p, " "parent->selfpowered=%d\n", udev->depth, Modified: user/weongyo/usb/sys/dev/usb/wlan/if_rum.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_rum.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_rum.c Fri Sep 10 00:23:44 2010 (r212404) @@ -424,7 +424,6 @@ rum_attach(device_t self) uint32_t tmp; int error, ntries; - device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; Modified: user/weongyo/usb/sys/dev/usb/wlan/if_run.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_run.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_run.c Fri Sep 10 00:23:44 2010 (r212404) @@ -546,7 +546,6 @@ run_attach(device_t self) int i, ntries, error; uint8_t iface_index, bands; - device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; Modified: user/weongyo/usb/sys/dev/usb/wlan/if_uath.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_uath.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_uath.c Fri Sep 10 00:23:44 2010 (r212404) @@ -353,7 +353,6 @@ uath_attach(device_t dev) #ifdef UATH_DEBUG sc->sc_debug = uath_debug; #endif - device_set_usb_desc(dev); /* * Only post-firmware devices here. Modified: user/weongyo/usb/sys/dev/usb/wlan/if_upgt.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_upgt.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_upgt.c Fri Sep 10 00:23:44 2010 (r212404) @@ -253,8 +253,6 @@ upgt_attach(device_t dev) #ifdef UPGT_DEBUG sc->sc_debug = upgt_debug; #endif - device_set_usb_desc(dev); - mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, MTX_DEF); callout_init(&sc->sc_led_ch, 0); Modified: user/weongyo/usb/sys/dev/usb/wlan/if_ural.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_ural.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_ural.c Fri Sep 10 00:23:44 2010 (r212404) @@ -427,7 +427,6 @@ ural_attach(device_t self) uint8_t iface_index, bands; int error; - device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; Modified: user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_urtw.c Fri Sep 10 00:23:44 2010 (r212404) @@ -793,8 +793,6 @@ urtw_attach(device_t dev) uint32_t data; usb_error_t error; - device_set_usb_desc(dev); - sc->sc_dev = dev; sc->sc_udev = uaa->device; if (USB_GET_DRIVER_INFO(uaa) == URTW_REV_RTL8187B) Modified: user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c Fri Sep 10 00:00:06 2010 (r212403) +++ user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c Fri Sep 10 00:23:44 2010 (r212404) @@ -343,7 +343,6 @@ zyd_attach(device_t dev) return (EINVAL); } - device_set_usb_desc(dev); sc->sc_dev = dev; sc->sc_udev = uaa->device; sc->sc_macrev = USB_GET_DRIVER_INFO(uaa);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009100023.o8A0NiC0056234>