usb-discover-1.11/0000755000000000000000000000000011515471410010726 5ustar usb-discover-1.11/uhci-pci.lst0000644000000000000000000000000011515471410013141 0ustar usb-discover-1.11/README0000644000000000000000000000073211515471410011610 0ustar This is a small module to automatically discover USB modules. It uses a list of PCI ids for host bridges for USB, taken from discover-data, and uses these to decide when to modprobe the OHCI, UHCI, and EHCI modules. (This is necessary because probing the wrong one will cause the system to hang). Note that the lst files in the source are only for adding data; most of the data is pulled directly from the discover1 database. - Alastair McKinstry usb-discover-1.11/S33usb-linux0000644000000000000000000000014711515471410013072 0ustar #!/bin/sh if [ "$(debconf-get debian-installer/probe/usb)" != false ]; then /usr/sbin/usb-discover fi usb-discover-1.11/TODO0000644000000000000000000000004411515471410011414 0ustar Use the discover2 database instead? usb-discover-1.11/ehci-pci.lst0000644000000000000000000000000011515471410013121 0ustar usb-discover-1.11/Makefile0000644000000000000000000000041311515471410012364 0ustar pkglibdir := /usr/lib/usb-discover all: install: install -d $(DESTDIR)$(pkglibdir) sort -u ohci-pci.lst > $(DESTDIR)$(pkglibdir)/ohci-pci.lst sort -u uhci-pci.lst > $(DESTDIR)$(pkglibdir)/uhci-pci.lst sort -u ehci-pci.lst > $(DESTDIR)$(pkglibdir)/ehci-pci.lst usb-discover-1.11/ohci-pci.lst0000644000000000000000000000000011515471410013133 0ustar usb-discover-1.11/usb-discover0000755000000000000000000000266511515471410013272 0ustar #!/bin/sh # Probe and setup USB if [ -e /proc/bus/pci/devices ]; then OHCI=no UHCI=no EHCI=no # Probe for OHCI first while read REPLY ; do if grep -q $REPLY /proc/bus/pci/devices ; then OHCI=yes fi done < /usr/lib/usb-discover/ohci-pci.lst while read REPLY ; do if grep -q $REPLY /proc/bus/pci/devices ; then UHCI=yes fi done < /usr/lib/usb-discover/uhci-pci.lst while read REPLY ; do if grep -q $REPLY /proc/bus/pci/devices ; then EHCI=yes fi done < /usr/lib/usb-discover/ehci-pci.lst # Also try PCI class detection using sysfs on 2.6. for classfile in /sys/bus/pci/devices/*/class; do [ -e "$classfile" ] || continue class="$(cat "$classfile")" || continue case $class in 0x0c0300) UHCI=yes ;; 0x0c0310) OHCI=yes ;; 0x0c0320) EHCI=yes ;; esac done kver=`uname -r | cut -d. -f1,2` # Kernel version (e.g. 2.4) if [ "$OHCI" = yes ] ; then if [ "$kver" = 2.6 ]; then modprobe ohci-hcd else modprobe usb-ohci fi fi if [ "$UHCI" = yes ] ; then if [ "$kver" = 2.6 ]; then modprobe uhci-hcd else modprobe usb-uhci fi fi if [ "$EHCI" = yes ] ; then # Same in 2.4 and 2.6 modprobe ehci-hcd fi if [ "$kver" = 2.6 ]; then modprobe usbkbd || true modprobe hid 2>/dev/null || true # ... which changed in 2.6.6 to: modprobe usbhid || true else modprobe usbkbd || true modprobe hid || true modprobe keybdev || true fi modprobe usbserial || true fi usb-discover-1.11/debian/0000755000000000000000000000000012170504023012143 5ustar usb-discover-1.11/debian/control0000644000000000000000000000100212170474477013562 0ustar Source: usb-discover Section: debian-installer Priority: optional Maintainer: Debian Install System Team Uploaders: Colin Watson , Christian Perrier Build-Depends: debhelper (>= 9) Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/usb-discover.git Vcs-Git: git://anonscm.debian.org/d-i/usb-discover.git Package: usb-discover Architecture: all Package-Type: udeb Depends: ${misc:Depends} Description: Discover USB and load kernel modules usb-discover-1.11/debian/usb-discover.templates0000644000000000000000000000021111515471410016467 0ustar Template: debian-installer/probe/usb Type: boolean Default: true Description: for internal use; can be preseeded Probe for USB devices? usb-discover-1.11/debian/copyright0000644000000000000000000000042211515471410014101 0ustar This module provides USB detection and configuration for the Debian/GNU Linux installer. Author(s): Alastair McKinstry Copyright (c) 2002,2003 Alastair McKinstry The copyright of this package is GPL, version 2 or later. usb-discover-1.11/debian/source/0000755000000000000000000000000012170222703013445 5ustar usb-discover-1.11/debian/source/format0000644000000000000000000000001512170222703014654 0ustar 3.0 (native) usb-discover-1.11/debian/changelog0000644000000000000000000002251212170504016014021 0ustar usb-discover (1.11) unstable; urgency=low * Add myself to Uploaders -- Christian Perrier Sun, 14 Jul 2013 13:14:22 +0200 usb-discover (1.10) unstable; urgency=low [ Dmitrijs Ledkovs ] * Set debian source format to '3.0 (native)'. * Bump debhelper compat level to 9. * Set Vcs-* to canonical format. * Drop XC- from Package-Type field. -- Colin Watson Thu, 13 Jun 2013 12:40:34 +0100 usb-discover (1.09) unstable; urgency=low * Remove PCI ID handling based on discover1-data, which is no longer in the archive; instead, rely entirely on PCI class detection and on the kernel's built-in device tables, which are currently also based on PCI classes (closes: #587133). * Add myself to Uploaders. -- Colin Watson Thu, 05 Aug 2010 20:26:01 +0100 usb-discover (1.08) unstable; urgency=low [ Colin Watson ] * Upgrade to debhelper v7. [ Frans Pop ] * Remove no longer needed Lintian override for missing Standards- Version field. -- Colin Watson Thu, 11 Mar 2010 02:25:54 +0000 usb-discover (1.07) unstable; urgency=low [ Frans Pop ] * Remove Alastair McKinstry and Bdale Garbee as Uploaders with many thanks for their past contributions. -- Otavio Salvador Thu, 08 May 2008 13:51:09 -0300 usb-discover (1.06) unstable; urgency=low [ Colin Watson ] * Put debhelper in Build-Depends rather than in Build-Depends-Indep. [ Frans Pop ] * Add missing debconf dependency. * Add Lintian override for standards-version. -- Frans Pop Tue, 24 Oct 2006 16:42:55 +0200 usb-discover (1.05) unstable; urgency=low * Handle new location of discover's pci.lst in /lib/discover. -- Colin Watson Fri, 5 May 2006 13:36:46 +0100 usb-discover (1.04) unstable; urgency=low [ Colin Watson ] * Suppress an error message on systems without PCI. -- Frans Pop Wed, 25 Jan 2006 19:42:02 +0100 usb-discover (1.03) unstable; urgency=low * Christian Perrier - Rename the templates file to help out translators working on a single file (in the future) * Colin Watson - Silence errors from 'modprobe hid' on 2.6, since that was renamed to usbhid in 2.6.6. -- Colin Watson Fri, 15 Apr 2005 13:42:54 +0100 usb-discover (1.02) unstable; urgency=low * Joey Hess - Remove four pci ids in uhci-pci.lst, since they've been in discover1-data for a while. * Colin Watson - Add USB HCI detection using PCI classes read from sysfs (from Ubuntu). -- Bdale Garbee Thu, 20 Jan 2005 14:09:30 -0700 usb-discover (1.01) unstable; urgency=low * Move startup script again, to S33. This puts it after env2debconf is run (at 30), allowing usb to be disabled again, and is still before the lowmem dialog at 38. Closes: #274991 -- Joey Hess Tue, 5 Oct 2004 10:56:43 -0400 usb-discover (1.00) unstable; urgency=low * Colin Watson - Uniquify PCI lists written to $(DESTDIR), to cope with slight desync between us and discover1-data. * Joey Hess - Gratuitous version number bumpage. -- Joey Hess Sun, 3 Oct 2004 18:29:56 -0400 usb-discover (0.22) unstable; urgency=low * Remove dependency on rootskel, which will always be available, unless rootskel-bootfloppy is available instead. -- Joey Hess Sat, 4 Sep 2004 17:01:42 -0400 usb-discover (0.21) unstable; urgency=low * Temporarily add four pci ids for uhci controllers (80862658, 80862659, 8086265a, 8086265b), reported in #268434. -- Joey Hess Mon, 30 Aug 2004 16:06:24 -0400 usb-discover (0.20) unstable; urgency=low * Martin Michlmayr - Also try to load the hid module under 2.4. -- Martin Michlmayr Thu, 19 Aug 2004 01:10:43 +0100 usb-discover (0.19) unstable; urgency=low * Joey Hess - Move startup script into debian-installer-startup.d/S25usb-linux so it will run before lowmem. Closes: #261070 - Built with current discover1-data. - Remove all local PCI ids from local lists as they're now in discover1-data. -- Joey Hess Mon, 16 Aug 2004 12:09:36 +0100 usb-discover (0.18) unstable; urgency=low * Colin Watson - hid changed to usbhid in 2.6.6, so probe both until all architectures move to 2.6.6. -- Colin Watson Mon, 28 Jun 2004 16:13:18 +0100 usb-discover (0.17) unstable; urgency=low * Joey Hess - Add 80862482, 80862484, 80862487 (UHCI) for a Intel 82801CA/CAM controller. (#254448) - Fix the ehci extraction from discover1-data, which names the module "ehci_hcd". Though there's only one ID in there so far.. - Build-depend on discover1-data, and extract all its info on the fly. The .lst files in the source are now used only for local additions of modules before they get into discover1-data. - Built against discover1-data 1.2004.02.08-7 (no changes). -- Joey Hess Tue, 15 Jun 2004 21:53:48 -0400 usb-discover (0.16) unstable; urgency=low * Joey Hess - Add 10de0067 (OHCI) and 10de0068 (EHCI) pci ids for a nForce2 USB controller. (#252962) -- Joey Hess Tue, 8 Jun 2004 13:10:06 -0400 usb-discover (0.15) unstable; urgency=low * Colin Watson - Add EHCI support. * Joey Hess - Fix apparently innocuous Default: typo. -- Joey Hess Wed, 5 May 2004 00:15:54 -0400 usb-discover (0.14) unstable; urgency=low * Martin Michlmayr - Fix typo (s/tre/true/). -- Colin Watson Mon, 19 Apr 2004 01:40:25 +0100 usb-discover (0.13) unstable; urgency=low * Updated to support 2.6 kernel. -- Joey Hess Tue, 13 Apr 2004 16:49:46 -0400 usb-discover (0.12) unstable; urgency=low * Add another IBM blade PCI id: 11660221 for ServerWorks CSB6 OHCI USB Controller. Closes: #241559 -- Joey Hess Sun, 4 Apr 2004 00:02:32 -0500 usb-discover (0.11) unstable; urgency=low * Joey Hess - Simplified the rules file. * Thiemo Seufer - Build fix. -- Joey Hess Sun, 21 Mar 2004 23:04:50 -0500 usb-discover (0.10) unstable; urgency=low * Joey Hess - Correct override disparity. Should indeed be optional. - Don't source confmodule, that interacts badly with the rest of libdebian-installer.d. -- Joey Hess Sat, 20 Mar 2004 23:04:00 -0500 usb-discover (0.09) unstable; urgency=low * Add a new internal debconf question, debian-installer/probe/usb, don't probe if it's false. To be used at boot if probing causes problems. Closes: #233856 * Add myself to uploaders. * Update to debhelper v4 and use its new udeb support. -- Joey Hess Sat, 20 Mar 2004 22:02:15 -0500 usb-discover (0.08) unstable; urgency=low * The debian-installer.d item need not be executable. * Add new pci-ids for USB bridges on a PIV-based abit motherboard: 808624de, 808624d7, 808624d4, and 808624d2. -- Joey Hess Mon, 8 Mar 2004 14:19:25 -0500 usb-discover (0.07) unstable; urgency=low * Move 11660220 from usb-uhci where I wrongly put it, to usb-ohci. -- Joey Hess Sat, 31 Jan 2004 19:09:25 -0500 usb-discover (0.06) unstable; urgency=low * Add PCI ids (808624c2, 808624c4, 808624c7) of the USB controllers in a Linux Certified LC2000 laptop. (Bug also filed against discover-data, but for now this change is not in that package.) -- Joey Hess Sat, 13 Dec 2003 19:48:34 -0500 usb-discover (0.05) unstable; urgency=low * Joey Hess - Remove unnecessary hard-coded path to modprobe. - Add PCI id (11660220) of the USB controller in a IBM Bladecenter. Closes: #220230 (Bug also filed against discover-data, but for now this change is not in that package.) -- Joey Hess Mon, 10 Nov 2003 11:55:41 -0500 usb-discover (0.04) unstable; urgency=low * Moved the code to a program in PATH, named usb-discover, and make the S45 script just run that program. This is to support the linuxrc.bootfloppy, which does not run init scripts and needs to be able to call usb-discover manually. -- Joey Hess Fri, 10 Oct 2003 17:26:47 -0400 usb-discover (0.03) unstable; urgency=low * Sebastian Ley - S45usb-linux: Do not die if something goes wrong (in this case, no pci detected) because the file is sourced. This was responsible for the endless loop when testing d-i with bochs. Thanks Steinar H. Gunderson. (Closes: #210818) * Alastair McKinstry - Move to Standards-Versiob 3.6.1.0; no changes required. - Move Build-Depends to Build-Depends-Indep; no arch-dependent pkgs. -- Alastair McKinstry Sun, 14 Sep 2003 16:46:37 +0200 usb-discover (0.02) unstable; urgency=low * Add makefile rules to generate ohci-pci.lst and uhci-pci.lst from discover-data. * Add new ohci ID 108e1103. * Change uploader email address to mckinstry@debian.org * Latest Standards-Version is 3.6.0, not 3.6.10 -- Alastair McKinstry Mon, 28 Jul 2003 14:34:05 +0100 usb-discover (0.01) unstable; urgency=low * Initial Release. -- Alastair McKinstry Thu, 17 Jul 2003 20:28:31 +1100 usb-discover-1.11/debian/compat0000644000000000000000000000000212170222703013343 0ustar 9 usb-discover-1.11/debian/install0000644000000000000000000000010211515471410013532 0ustar S33usb-linux lib/debian-installer-startup.d usb-discover usr/sbin usb-discover-1.11/debian/rules0000755000000000000000000000003611515471410013227 0ustar #! /usr/bin/make -f %: dh $@