On 2010/04/20 14:23, Stuart Henderson wrote:
> after reading the N hundredth misc@ post with some USB device
> where device/vendor IDs haven't been shown, it seems that printing
> them in the device attach line might save some trouble.
>
> any comments/suggestions?
note that with PCI, we print canonical strings from pcidevs which
we can map back to the IDs, or if we don't know the device, we print
IDs, so we can identify the device fairly well from the output.
with USB, we can't do this, because the strings come from the
device itself.
>
> Index: usb_subr.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/usb/usb_subr.c,v
> retrieving revision 1.73
> diff -u -p -r1.73 usb_subr.c
> --- usb_subr.c 14 Jan 2009 21:02:57 -0000 1.73
> +++ usb_subr.c 20 Apr 2010 13:08:53 -0000
> @@ -1281,7 +1281,9 @@ usbd_print(void *aux, const char *pnp)
> printf(" interface %d", uaa->ifaceno);
>
> if (!pnp)
> - printf(" %s\n", devinfop);
> + printf(" %s (0x%04x:0x%04x)\n", devinfop,
> + UGETW(uaa->device->ddesc.idVendor),
> + UGETW(uaa->device->ddesc.idProduct));
> usbd_devinfo_free(devinfop);
> return (UNCONF);
> }
>
>
> OpenBSD 4.7-current (GENERIC.MP) #34: Tue Apr 20 14:03:40 BST 2010
> [email protected]:/usr/src/sys/arch/i386/compile/GENERIC.MP
> RTC BIOS diagnostic error 80<clock_battery>
> cpu0: Intel(R) Atom(TM) CPU N270 @ 1.60GHz ("GenuineIntel" 686-class) 1.60 GHz
> cpu0:
> FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,EST,TM2,SSSE3,xTPR,PDCM,MOVBE
> real mem = 1597034496 (1523MB)
> avail mem = 1538363392 (1467MB)
> RTC BIOS diagnostic error 80<clock_battery>
> mainbus0 at root
> bios0 at mainbus0: AT/286+ BIOS, date 10/06/08, SMBIOS rev. 2.4 @ 0xe8e70 (32
> entries)
> bios0: vendor Acer version "v0.3309" date 10/06/2008
> bios0: Acer AOA150
> acpi0 at bios0: rev 2
> acpi0: tables DSDT FACP SSDT HPET APIC MCFG ASF! SLIC BOOT
> acpi0: wakeup devices P32_(S4) UHC1(S3) UHC2(S3) UHC3(S3) UHC4(S3) ECHI(S3)
> EXP1(S4) EXP2(S4) EXP3(S4) EXP4(S4) AZAL(S0) MODM(S0)
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpihpet0 at acpi0: 14318179 Hz
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: apic clock running at 133MHz
> cpu1 at mainbus0: apid 1 (application processor)
> cpu1: Intel(R) Atom(TM) CPU N270 @ 1.60GHz ("GenuineIntel" 686-class) 1.60 GHz
> cpu1:
> FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,EST,TM2,SSSE3,xTPR,PDCM,MOVBE
> ioapic0 at mainbus0: apid 4 pa 0xfec00000, version 20, 24 pins
> ioapic0: misconfigured as apic 0, remapped to apid 4
> acpiprt0 at acpi0: bus 0 (PCI0)
> acpiprt1 at acpi0: bus 5 (P32_)
> acpiprt2 at acpi0: bus 1 (EXP1)
> acpiprt3 at acpi0: bus 2 (EXP2)
> acpiprt4 at acpi0: bus 3 (EXP3)
> acpiprt5 at acpi0: bus 4 (EXP4)
> acpiec0 at acpi0
> acpicpu0 at acpi0: C3, C2, C1, PSS
> acpicpu1 at acpi0: C3, C2, C1, PSS
> acpibtn0 at acpi0: PWRB
> acpibtn1 at acpi0: LID0
> acpibtn2 at acpi0: SLPB
> acpibat0 at acpi0: BAT1 not present
> acpiac0 at acpi0: AC unit offline
> acpivideo0 at acpi0: OVGA
> acpivout0 at acpivideo0: CRT1
> acpivout1 at acpivideo0: DTV1
> acpivout2 at acpivideo0: DFP1
> acpivout3 at acpivideo0: LCD_
> acpivout4 at acpivideo0: DTV2
> acpivout5 at acpivideo0: DFP2
> bios0: ROM list: 0xc0000/0xec00! 0xcf000/0x1000
> cpu0: Enhanced SpeedStep 1597 MHz: speeds: 1600, 1333, 1066, 800 MHz
> pci0 at mainbus0 bus 0: configuration mode 1 (bios)
> pchb0 at pci0 dev 0 function 0 "Intel 82945GME Host" rev 0x03
> vga1 at pci0 dev 2 function 0 "Intel 82945GME Video" rev 0x03
> wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
> wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
> intagp0 at vga1
> agp0 at intagp0: aperture at 0x60000000, size 0x10000000
> inteldrm0 at vga1: apic 4 int 16 (irq 11)
> drm0 at inteldrm0
> "Intel 82945GM Video" rev 0x03 at pci0 dev 2 function 1 not configured
> azalia0 at pci0 dev 27 function 0 "Intel 82801GB HD Audio" rev 0x02: apic 4
> int 16 (irq 11)
> azalia0: codecs: Realtek ALC268
> audio0 at azalia0
> ppb0 at pci0 dev 28 function 0 "Intel 82801GB PCIE" rev 0x02: apic 4 int 16
> (irq 255)
> pci1 at ppb0 bus 1
> ppb1 at pci0 dev 28 function 1 "Intel 82801GB PCIE" rev 0x02: apic 4 int 17
> (irq 255)
> pci2 at ppb1 bus 2
> re0 at pci2 dev 0 function 0 "Realtek 8101E" rev 0x02: RTL8102EL (0x2480),
> apic 4 int 17 (irq 11), address 00:23:8b:43:96:e6
> rlphy0 at re0 phy 7: RTL8201L 10/100 PHY, rev. 1
> ppb2 at pci0 dev 28 function 2 "Intel 82801GB PCIE" rev 0x02: apic 4 int 18
> (irq 255)
> pci3 at ppb2 bus 3
> ral0 at pci3 dev 0 function 0 "Ralink RT2790" rev 0x00: apic 4 int 18 (irq
> 11), address 00:22:43:14:9b:35
> ral0: MAC/BBP RT2872 (rev 0x0200), RF RT2720 (MIMO 1T2R)
> ppb3 at pci0 dev 28 function 3 "Intel 82801GB PCIE" rev 0x02: apic 4 int 19
> (irq 255)
> pci4 at ppb3 bus 4
> uhci0 at pci0 dev 29 function 0 "Intel 82801GB USB" rev 0x02: apic 4 int 16
> (irq 11)
> uhci1 at pci0 dev 29 function 1 "Intel 82801GB USB" rev 0x02: apic 4 int 17
> (irq 11)
> uhci2 at pci0 dev 29 function 2 "Intel 82801GB USB" rev 0x02: apic 4 int 18
> (irq 11)
> uhci3 at pci0 dev 29 function 3 "Intel 82801GB USB" rev 0x02: apic 4 int 19
> (irq 11)
> ehci0 at pci0 dev 29 function 7 "Intel 82801GB USB" rev 0x02: apic 4 int 16
> (irq 11)
> usb0 at ehci0: USB revision 2.0
> uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1 (0x8086:0x0000)
> ppb4 at pci0 dev 30 function 0 "Intel 82801BAM Hub-to-PCI" rev 0xe2
> pci5 at ppb4 bus 5
> ichpcib0 at pci0 dev 31 function 0 "Intel 82801GBM LPC" rev 0x02: PM disabled
> pciide0 at pci0 dev 31 function 2 "Intel 82801GBM SATA" rev 0x02: DMA,
> channel 0 wired to compatibility, channel 1 wired to compatibility
> wd0 at pciide0 channel 0 drive 0: <SAMSUNG MMCRE64G5MXP-0VB>
> wd0: 16-sector PIO, LBA48, 61057MB, 125045424 sectors
> wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 5
> ichiic0 at pci0 dev 31 function 3 "Intel 82801GB SMBus" rev 0x02: apic 4 int
> 17 (irq 11)
> iic0 at ichiic0
> spdmem0 at iic0 addr 0x51: 1GB DDR2 SDRAM non-parity PC2-6400CL5 SO-DIMM
> usb1 at uhci0: USB revision 1.0
> uhub1 at usb1 "Intel UHCI root hub" rev 1.00/1.00 addr 1 (0x8086:0x0000)
> usb2 at uhci1: USB revision 1.0
> uhub2 at usb2 "Intel UHCI root hub" rev 1.00/1.00 addr 1 (0x8086:0x0000)
> usb3 at uhci2: USB revision 1.0
> uhub3 at usb3 "Intel UHCI root hub" rev 1.00/1.00 addr 1 (0x8086:0x0000)
> usb4 at uhci3: USB revision 1.0
> uhub4 at usb4 "Intel UHCI root hub" rev 1.00/1.00 addr 1 (0x8086:0x0000)
> isa0 at ichpcib0
> isadma0 at isa0
> pckbc0 at isa0 port 0x60/5
> pckbd0 at pckbc0 (kbd slot)
> pckbc0: using irq 1 for kbd slot
> wskbd0 at pckbd0: console keyboard, using wsdisplay0
> pms0 at pckbc0 (aux slot)
> pckbc0: using irq 12 for aux slot
> wsmouse0 at pms0 mux 0
> pcppi0 at isa0 port 0x61
> midi0 at pcppi0: <PC speaker>
> spkr0 at pcppi0
> npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
> mtrr: Pentium Pro MTRR support
> uvideo0 at uhub0 port 5 configuration 1 interface 0 "Sonix Technology Co.,
> Ltd. USB 2.0 Camera" rev 2.00/1.00 addr 2 (0x0c45:0x62c0)
> video0 at uvideo0
> umsm0 at uhub3 port 2 configuration 1 interface 0 "Option N.V. Globetrotter
> HSUPA Modem" rev 1.10/0.00 addr 2 (0x0af0:0x7211)
> ucom0 at umsm0
> umsm1 at uhub3 port 2 configuration 1 interface 1 "Option N.V. Globetrotter
> HSUPA Modem" rev 1.10/0.00 addr 2 (0x0af0:0x7211)
> ucom1 at umsm1
> umsm2 at uhub3 port 2 configuration 1 interface 2 "Option N.V. Globetrotter
> HSUPA Modem" rev 1.10/0.00 addr 2 (0x0af0:0x7211)
> ucom2 at umsm2
> vscsi0 at root
> scsibus0 at vscsi0: 256 targets
> softraid0 at root
> root on wd0a swap on wd0b dump on wd0b
> ugen0 at uhub2 port 1 "LIEBERT PowerSure Personal XT" rev 1.10/0.00 addr 2
> (0x06da:0xffff)
> uhidev0 at uhub1 port 1 configuration 1 interface 0 "Ten X Technology, Inc.
> TEMPer sensor" rev 1.10/1.50 addr 2 (0x1130:0x660c)
> uhidev0: iclass 3/1
> uthum0 at uhidev0
> uhidev1 at uhub1 port 1 configuration 1 interface 1 "Ten X Technology, Inc.
> TEMPer sensor" rev 1.10/1.50 addr 2 (0x1130:0x660c)
> uhidev1: iclass 3/0
> uthum1 at uhidev1
> uthum1: sensor0: Temperature sensor (ds75/12bit), calibration offset = -1.0
> deg-C
> uthum1: sensor1: Temperature sensor (NTC), calibration offset = 1.0 deg-C
> uthum0 detached
> uhidev0 detached
> uthum1 detached
> uhidev1 detached
