pciutils/patches/pcimodules-pciutils-2.1.11.patch

diff -Naur pciutils-2.1.11/lspci.c pciutils-2.1.11-magellan/lspci.c
--- pciutils-2.1.11/lspci.c	2002-12-26 21:24:50.000000000 +0100
+++ pciutils-2.1.11-magellan/lspci.c	2010-10-15 11:09:15.000000000 +0200
@@ -108,7 +108,7 @@
   bzero(d, sizeof(*d));
   d->dev = p;
   if (!pci_read_block(p, 0, d->config, how_much))
-    die("Unable to read %d bytes of configuration space.", how_much);
+    fprintf(stderr, "Unable to read %d bytes of configuration space.", how_much);
   if (how_much < 128 && (d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS)
     {
       /* For cardbus bridges, we need to fetch 64 bytes more to get the full standard header... */
diff -Naur pciutils-2.1.11/Makefile pciutils-2.1.11-magellan/Makefile
--- pciutils-2.1.11/Makefile	2003-01-04 13:53:01.000000000 +0100
+++ pciutils-2.1.11-magellan/Makefile	2010-10-15 11:16:24.000000000 +0200
@@ -31,7 +31,7 @@
 
 export
 
-all: lib lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
+all: lib lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 pcimodules.8 pci.ids
 
 lib: lib/config.h
 	$(MAKE) -C lib all
@@ -39,9 +39,11 @@
 lib/config.h:
 	cd lib && ./configure $(SHAREDIR) $(VERSION)
 
+pcimodules: pcimodules.o common.o lib/$(PCILIB)
 lspci: lspci.o common.o lib/$(PCILIB)
 setpci: setpci.o common.o lib/$(PCILIB)
 
+pcimodules.o: pcimodules.c pciutils.h
 lspci.o: lspci.c pciutils.h
 setpci.o: setpci.c pciutils.h
 common.o: common.c pciutils.h
@@ -54,20 +56,20 @@
 
 clean:
 	rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core`
-	rm -f update-pciids lspci setpci lib/config.* *.8 pci.ids.*
+	rm -f update-pciids lspci setpci pcimodules lib/config.* *.8 pci.ids.*
 
 install: all
 # -c is ignored on Linux, but required on FreeBSD
 	$(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
-	$(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
+	$(INSTALL) -c -m 755 -s lspci setpci pcimodules $(SBINDIR)
 	$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
 	$(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
-	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
+	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 pcimodules.8 $(MANDIR)/man8
 
 uninstall: all
-	rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids
+	rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids $(SBINDIR)/pcimodules
 	rm -f $(SHAREDIR)/pci.ids
-	rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8
+	rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8 $(MANDIR)/man8/pcimodules.8
 
 get-ids:
 	cp ~/tree/pciids/pci.ids pci.ids
diff -Naur pciutils-2.1.11/pcimodules.c pciutils-2.1.11-magellan/pcimodules.c
--- pciutils-2.1.11/pcimodules.c	1970-01-01 01:00:00.000000000 +0100
+++ pciutils-2.1.11-magellan/pcimodules.c	2010-10-15 11:12:47.000000000 +0200
@@ -0,0 +1,183 @@
+/*
+ *	pcimodules:  Load all kernel modules for PCI device currently
+ *      plugged into any PCI slot.
+ *
+ *	Copyright 2000 Yggdrasil Computing, Incorporated
+ *	This file may be copied under the terms and conditions of version 
+ *      two of the GNU General Public License, as published by the Free
+ *      Software Foundation (Cambridge, Massachusetts, USA).
+ *
+ *      This file is based on pciutils/lib/example.c, which has the following
+ *      authorship and copyright statement:
+ *
+ *		Written by Martin Mares and put to public domain. You can do
+ *		with it anything you want, but I don't give you any warranty.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <malloc.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/utsname.h>
+#include <sys/param.h>
+#include <sys/types.h>
+
+#define _GNU_SOURCE
+#include <getopt.h>
+
+#include "pciutils.h"
+
+#define MODDIR	"/lib/modules"
+#define PCIMAP	"modules.pcimap"
+
+#define LINELENGTH	8000 
+
+#define DEVICE_ANY	0xffffffff
+#define VENDOR_ANY	0xffffffff
+
+#include "lib/pci.h"
+
+struct pcimap_entry {
+	unsigned int vendor, subsys_vendor, dev, subsys_dev, class, class_mask;
+	char *module;
+	struct pcimap_entry *next;
+};
+
+static struct pcimap_entry *pcimap_list = NULL;
+
+#define OPT_STRING "h"
+static struct option long_options[] = {
+	{"class",	required_argument,	NULL, 'c'},
+	{"classmask",	required_argument,	NULL, 'm'},
+	{"help",	no_argument,		NULL, 'h'},
+	{ 0,		0,			0, 	0}
+};
+
+static unsigned long desired_class;
+static unsigned long desired_classmask; /* Default is 0: accept all classes.*/
+
+void
+read_pcimap(void)
+{
+	struct utsname utsname;
+	char filename[MAXPATHLEN];
+	FILE *pcimap_file;
+	char line[LINELENGTH];
+	struct pcimap_entry *entry;
+	unsigned int driver_data;
+	char *prevmodule = "";
+	char module[LINELENGTH];
+
+	if (uname(&utsname) < 0) {
+		perror("uname");
+		exit(1);
+	}
+	sprintf(filename, "%s/%s/%s", MODDIR, utsname.release, PCIMAP);
+	if ((pcimap_file = fopen(filename, "r")) == NULL) {
+		perror(filename);
+		exit(1);
+	}
+
+	while(fgets(line, LINELENGTH, pcimap_file) != NULL) {
+		if (line[0] == '#')
+			continue;
+
+		entry = xmalloc(sizeof(struct pcimap_entry));
+
+		if (sscanf(line, "%s 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
+			   module,
+			   &entry->vendor, &entry->dev,
+			   &entry->subsys_vendor, &entry->subsys_dev,
+			   &entry->class, &entry->class_mask,
+			   &driver_data) != 8) {
+			fprintf (stderr,
+				"modules.pcimap unparsable line: %s.\n", line);
+			free(entry);
+			continue;
+		}
+
+		/* Optimize memory allocation a bit, in case someday we
+		   have Linux systems with ~100,000 modules.  It also
+		   allows us to just compare pointers to avoid trying
+		   to load a module twice. */
+		if (strcmp(module, prevmodule) != 0) {
+			prevmodule = xmalloc(strlen(module)+1);
+			strcpy(prevmodule, module);
+		}
+		entry->module = prevmodule;
+		entry->next = pcimap_list;
+		pcimap_list = entry;
+	}
+	fclose(pcimap_file);
+}
+
+/* Return a filled in pci_access->dev tree, with the device classes
+   stored in dev->aux.
+*/
+static void
+match_pci_modules(void)
+{
+	struct pci_access *pacc;
+	struct pci_dev *dev;
+	unsigned int class, subsys_dev, subsys_vendor;
+	struct pcimap_entry *map;
+	const char *prevmodule = "";
+
+	pacc = pci_alloc();		/* Get the pci_access structure */
+	/* Set all options you want -- here we stick with the defaults */
+	pci_init(pacc);		/* Initialize the PCI library */
+	pci_scan_bus(pacc);	/* We want to get the list of devices */
+  	for(dev=pacc->devices; dev; dev=dev->next) {
+		pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);
+		class = (pci_read_word(dev, PCI_CLASS_DEVICE) << 8)
+			| pci_read_byte(dev, PCI_CLASS_PROG);
+		subsys_dev = pci_read_word(dev, PCI_SUBSYSTEM_ID);
+		subsys_vendor = pci_read_word(dev,PCI_SUBSYSTEM_VENDOR_ID);
+		for(map = pcimap_list; map != NULL; map = map->next) {
+			if (((map->class ^ class) & map->class_mask) == 0 &&
+			    ((desired_class ^ class) & desired_classmask)==0 &&
+			    (map->dev == DEVICE_ANY ||
+			     map->dev == dev->device_id) &&
+			    (map->vendor == VENDOR_ANY ||
+			     map->vendor == dev->vendor_id) &&
+			    (map->subsys_dev == DEVICE_ANY ||
+			     map->subsys_dev == subsys_dev) &&
+			    (map->subsys_vendor == VENDOR_ANY ||
+			     map->subsys_vendor == subsys_vendor) &&
+			    prevmodule != map->module) {
+				printf("%s\n", map->module);
+				prevmodule = map->module;
+			}
+		}
+
+	}
+	pci_cleanup(pacc);
+}
+
+int
+main (int argc, char **argv)
+{
+	int opt_index = 0;
+	int opt;
+
+	while ((opt = getopt_long(argc, argv, OPT_STRING, long_options,
+		           &opt_index)) != -1) {
+		switch(opt) {
+			case 'c':
+				desired_class = strtol(optarg, NULL, 0);
+				break;
+			case 'm':
+				desired_classmask = strtol(optarg, NULL, 0);
+				break;
+			case 'h':
+				printf ("Usage: pcimodules [--help]\n"
+					"  Lists kernel modules corresponding to PCI devices currently plugged"
+					"  into the computer.\n");
+		}
+	}	
+
+	read_pcimap();
+	match_pci_modules();
+	return 0;
+}
diff -Naur pciutils-2.1.11/pcimodules.man pciutils-2.1.11-magellan/pcimodules.man
--- pciutils-2.1.11/pcimodules.man	1970-01-01 01:00:00.000000000 +0100
+++ pciutils-2.1.11-magellan/pcimodules.man	2010-10-15 11:12:47.000000000 +0200
@@ -0,0 +1,92 @@
+.TH pcimodules 8 "@TODAY@" "@VERSION@" "Linux PCI Utilities"
+.IX pcimodules
+.SH NAME
+pcimodules \- List kernel driver modules available for all currently plugged
+in PCI devices
+.SH SYNOPSIS
+.B pcimodules
+.RB [ --class class_id ]
+.RB [ --classmask mask ]
+.RB [ --help ]
+.SH DESCRIPTION
+.B pcimodules
+lists all driver modules for all currently plugged in PCI devices.
+.B pcimodules
+should be run at boot time, and whenever a PCI device is "hot plugged"
+into the system.  This can be done by the following Bourne shell syntax:
+.IP
+	for module in $(pcimodules) ; do
+.IP
+		modprobe -s -k "$module"
+.IP
+	done
+.PP
+When a PCI device is removed from the system, the Linux kernel will
+decrement a usage count on PCI driver module.  If this count drops
+to zero (i.e., there are no PCI drivers), then the
+.B modprobe -r
+process that is normally configured to run from cron every few minutes
+will eventually remove the unneeded module.
+.PP
+The --class and --classmask arguments can be used to limit the search
+to certain classes of PCI devices.  This is useful, for example, to
+generate a list of ethernet card drivers to be loaded when the kernel
+has indicated that it is trying to resolve an unknown network interface.
+.PP
+Modules are listed in the order in which the PCI devices are physically
+arranged so that the computer owner can arrange things like having scsi
+device 0 be on a controller that is not alphabetically the first scsi
+controller.
+.SH OPTIONS
+.TP
+.B --class class --classmask mask
+.PP
+--class and --classmask limit the search to PCI
+cards in particular classes.  These arguments are always used together.
+The arguments to --class and --classmask
+can be given as hexadecimal numbers by prefixing a leading "0x".
+Note that the classes used by pcimodules are in "Linux" format,
+meaning the class value that you see with lspci would be shifted
+left eight bits, with the new low eight bits programming interface ID.
+An examples of how to use class and classmask is provided below.
+.B --help, -h
+Print a help message and exit.
+.SH EXAMPLES
+.TP
+pcimodules
+lists all modules corresponding to currently plugged in PCI devices.
+.TP
+pcimodules --class 0x200000 --classmask 0xffff00
+lists all modules corresponding to currently plugged in ethernet PCI devices.
+.SH FILES
+.TP
+.B /lib/modules/<kernel-version>/modules.pcimap
+This file is automatically generated by
+.B depmod,
+and used by
+.B pcimodules
+to determine which modules correspond to which PCI ID's.
+.TP
+.B /proc/bus/pci
+An interface to PCI bus configuration space provided by the post-2.1.82 Linux
+kernels. Contains per-bus subdirectories with per-card config space files and a
+.I devices
+file containing a list of all PCI devices.
+
+.SH SEE ALSO
+.BR lspci (8)
+
+.SH MAINTAINER
+The Linux PCI Utilities are maintained by Martin Mares <mj@suse.cz>.
+
+.SH AUTHOR
+.B pcimodules
+was written by Adam J. Richter <adam@yggdrasil.com>, based on public
+domain example code by Martin Mares <mj@suse.cz>.
+
+.SH COPYRIGHT
+.B pcimodules
+is copyright 2000, Yggdrasil Computing, Incorporated, and may
+be copied under the terms and conditions of version 2 of the GNU
+General Public License as published by the Free Software Foundation
+(Cambrige, Massachusetts, United States of America).
1	niro	1179	diff -Naur pciutils-2.1.11/lspci.c pciutils-2.1.11-magellan/lspci.c
2			--- pciutils-2.1.11/lspci.c 2002-12-26 21:24:50.000000000 +0100
3			+++ pciutils-2.1.11-magellan/lspci.c 2010-10-15 11:09:15.000000000 +0200
4			@@ -108,7 +108,7 @@
5			bzero(d, sizeof(*d));
6			d->dev = p;
7			if (!pci_read_block(p, 0, d->config, how_much))
8			- die("Unable to read %d bytes of configuration space.", how_much);
9			+ fprintf(stderr, "Unable to read %d bytes of configuration space.", how_much);
10			if (how_much < 128 && (d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS)
11			{
12			/* For cardbus bridges, we need to fetch 64 bytes more to get the full standard header... */
13			diff -Naur pciutils-2.1.11/Makefile pciutils-2.1.11-magellan/Makefile
14			--- pciutils-2.1.11/Makefile 2003-01-04 13:53:01.000000000 +0100
15			+++ pciutils-2.1.11-magellan/Makefile 2010-10-15 11:16:24.000000000 +0200
16			@@ -31,7 +31,7 @@
17
18			export
19
20			-all: lib lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
21			+all: lib lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 pcimodules.8 pci.ids
22
23			lib: lib/config.h
24			$(MAKE) -C lib all
25			@@ -39,9 +39,11 @@
26			lib/config.h:
27			cd lib && ./configure $(SHAREDIR) $(VERSION)
28
29			+pcimodules: pcimodules.o common.o lib/$(PCILIB)
30			lspci: lspci.o common.o lib/$(PCILIB)
31			setpci: setpci.o common.o lib/$(PCILIB)
32
33			+pcimodules.o: pcimodules.c pciutils.h
34			lspci.o: lspci.c pciutils.h
35			setpci.o: setpci.c pciutils.h
36			common.o: common.c pciutils.h
37			@@ -54,20 +56,20 @@
38
39			clean:
40			rm -f `find . -name "~" -o -name ".[oa]" -o -name "\#*\#" -o -name TAGS -o -name core`
41			- rm -f update-pciids lspci setpci lib/config.* .8 pci.ids.
42			+ rm -f update-pciids lspci setpci pcimodules lib/config.* .8 pci.ids.
43
44			install: all
45			# -c is ignored on Linux, but required on FreeBSD
46			$(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
47			- $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
48			+ $(INSTALL) -c -m 755 -s lspci setpci pcimodules $(SBINDIR)
49			$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
50			$(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
51			- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
52			+ $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 pcimodules.8 $(MANDIR)/man8
53
54			uninstall: all
55			- rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids
56			+ rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids $(SBINDIR)/pcimodules
57			rm -f $(SHAREDIR)/pci.ids
58			- rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8
59			+ rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8 $(MANDIR)/man8/pcimodules.8
60
61			get-ids:
62			cp ~/tree/pciids/pci.ids pci.ids
63			diff -Naur pciutils-2.1.11/pcimodules.c pciutils-2.1.11-magellan/pcimodules.c
64			--- pciutils-2.1.11/pcimodules.c 1970-01-01 01:00:00.000000000 +0100
65			+++ pciutils-2.1.11-magellan/pcimodules.c 2010-10-15 11:12:47.000000000 +0200
66			@@ -0,0 +1,183 @@
67			+/*
68			+ * pcimodules: Load all kernel modules for PCI device currently
69			+ * plugged into any PCI slot.
70			+ *
71			+ * Copyright 2000 Yggdrasil Computing, Incorporated
72			+ * This file may be copied under the terms and conditions of version
73			+ * two of the GNU General Public License, as published by the Free
74			+ * Software Foundation (Cambridge, Massachusetts, USA).
75			+ *
76			+ * This file is based on pciutils/lib/example.c, which has the following
77			+ * authorship and copyright statement:
78			+ *
79			+ * Written by Martin Mares and put to public domain. You can do
80			+ * with it anything you want, but I don't give you any warranty.
81			+ */
82			+
83			+#include <stdlib.h>
84			+#include <stdio.h>
85			+#include <malloc.h>
86			+#include <string.h>
87			+#include <unistd.h>
88			+#include <sys/utsname.h>
89			+#include <sys/param.h>
90			+#include <sys/types.h>
91			+
92			+#define _GNU_SOURCE
93			+#include <getopt.h>
94			+
95			+#include "pciutils.h"
96			+
97			+#define MODDIR "/lib/modules"
98			+#define PCIMAP "modules.pcimap"
99			+
100			+#define LINELENGTH 8000
101			+
102			+#define DEVICE_ANY 0xffffffff
103			+#define VENDOR_ANY 0xffffffff
104			+
105			+#include "lib/pci.h"
106			+
107			+struct pcimap_entry {
108			+ unsigned int vendor, subsys_vendor, dev, subsys_dev, class, class_mask;
109			+ char *module;
110			+ struct pcimap_entry *next;
111			+};
112			+
113			+static struct pcimap_entry *pcimap_list = NULL;
114			+
115			+#define OPT_STRING "h"
116			+static struct option long_options[] = {
117			+ {"class", required_argument, NULL, 'c'},
118			+ {"classmask", required_argument, NULL, 'm'},
119			+ {"help", no_argument, NULL, 'h'},
120			+ { 0, 0, 0, 0}
121			+};
122			+
123			+static unsigned long desired_class;
124			+static unsigned long desired_classmask; /* Default is 0: accept all classes.*/
125			+
126			+void
127			+read_pcimap(void)
128			+{
129			+ struct utsname utsname;
130			+ char filename[MAXPATHLEN];
131			+ FILE *pcimap_file;
132			+ char line[LINELENGTH];
133			+ struct pcimap_entry *entry;
134			+ unsigned int driver_data;
135			+ char *prevmodule = "";
136			+ char module[LINELENGTH];
137			+
138			+ if (uname(&utsname) < 0) {
139			+ perror("uname");
140			+ exit(1);
141			+ }
142			+ sprintf(filename, "%s/%s/%s", MODDIR, utsname.release, PCIMAP);
143			+ if ((pcimap_file = fopen(filename, "r")) == NULL) {
144			+ perror(filename);
145			+ exit(1);
146			+ }
147			+
148			+ while(fgets(line, LINELENGTH, pcimap_file) != NULL) {
149			+ if (line[0] == '#')
150			+ continue;
151			+
152			+ entry = xmalloc(sizeof(struct pcimap_entry));
153			+
154			+ if (sscanf(line, "%s 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x",
155			+ module,
156			+ &entry->vendor, &entry->dev,
157			+ &entry->subsys_vendor, &entry->subsys_dev,
158			+ &entry->class, &entry->class_mask,
159			+ &driver_data) != 8) {
160			+ fprintf (stderr,
161			+ "modules.pcimap unparsable line: %s.\n", line);
162			+ free(entry);
163			+ continue;
164			+ }
165			+
166			+ /* Optimize memory allocation a bit, in case someday we
167			+ have Linux systems with ~100,000 modules. It also
168			+ allows us to just compare pointers to avoid trying
169			+ to load a module twice. */
170			+ if (strcmp(module, prevmodule) != 0) {
171			+ prevmodule = xmalloc(strlen(module)+1);
172			+ strcpy(prevmodule, module);
173			+ }
174			+ entry->module = prevmodule;
175			+ entry->next = pcimap_list;
176			+ pcimap_list = entry;
177			+ }
178			+ fclose(pcimap_file);
179			+}
180			+
181			+/* Return a filled in pci_access->dev tree, with the device classes
182			+ stored in dev->aux.
183			+*/
184			+static void
185			+match_pci_modules(void)
186			+{
187			+ struct pci_access *pacc;
188			+ struct pci_dev *dev;
189			+ unsigned int class, subsys_dev, subsys_vendor;
190			+ struct pcimap_entry *map;
191			+ const char *prevmodule = "";
192			+
193			+ pacc = pci_alloc(); /* Get the pci_access structure */
194			+ /* Set all options you want -- here we stick with the defaults */
195			+ pci_init(pacc); /* Initialize the PCI library */
196			+ pci_scan_bus(pacc); /* We want to get the list of devices */
197			+ for(dev=pacc->devices; dev; dev=dev->next) {
198			+ pci_fill_info(dev, PCI_FILL_IDENT \| PCI_FILL_BASES);
199			+ class = (pci_read_word(dev, PCI_CLASS_DEVICE) << 8)
200			+ \| pci_read_byte(dev, PCI_CLASS_PROG);
201			+ subsys_dev = pci_read_word(dev, PCI_SUBSYSTEM_ID);
202			+ subsys_vendor = pci_read_word(dev,PCI_SUBSYSTEM_VENDOR_ID);
203			+ for(map = pcimap_list; map != NULL; map = map->next) {
204			+ if (((map->class ^ class) & map->class_mask) == 0 &&
205			+ ((desired_class ^ class) & desired_classmask)==0 &&
206			+ (map->dev == DEVICE_ANY \|\|
207			+ map->dev == dev->device_id) &&
208			+ (map->vendor == VENDOR_ANY \|\|
209			+ map->vendor == dev->vendor_id) &&
210			+ (map->subsys_dev == DEVICE_ANY \|\|
211			+ map->subsys_dev == subsys_dev) &&
212			+ (map->subsys_vendor == VENDOR_ANY \|\|
213			+ map->subsys_vendor == subsys_vendor) &&
214			+ prevmodule != map->module) {
215			+ printf("%s\n", map->module);
216			+ prevmodule = map->module;
217			+ }
218			+ }
219			+
220			+ }
221			+ pci_cleanup(pacc);
222			+}
223			+
224			+int
225			+main (int argc, char **argv)
226			+{
227			+ int opt_index = 0;
228			+ int opt;
229			+
230			+ while ((opt = getopt_long(argc, argv, OPT_STRING, long_options,
231			+ &opt_index)) != -1) {
232			+ switch(opt) {
233			+ case 'c':
234			+ desired_class = strtol(optarg, NULL, 0);
235			+ break;
236			+ case 'm':
237			+ desired_classmask = strtol(optarg, NULL, 0);
238			+ break;
239			+ case 'h':
240			+ printf ("Usage: pcimodules [--help]\n"
241			+ " Lists kernel modules corresponding to PCI devices currently plugged"
242			+ " into the computer.\n");
243			+ }
244			+ }
245			+
246			+ read_pcimap();
247			+ match_pci_modules();
248			+ return 0;
249			+}
250			diff -Naur pciutils-2.1.11/pcimodules.man pciutils-2.1.11-magellan/pcimodules.man
251			--- pciutils-2.1.11/pcimodules.man 1970-01-01 01:00:00.000000000 +0100
252			+++ pciutils-2.1.11-magellan/pcimodules.man 2010-10-15 11:12:47.000000000 +0200
253			@@ -0,0 +1,92 @@
254			+.TH pcimodules 8 "@TODAY@" "@VERSION@" "Linux PCI Utilities"
255			+.IX pcimodules
256			+.SH NAME
257			+pcimodules \- List kernel driver modules available for all currently plugged
258			+in PCI devices
259			+.SH SYNOPSIS
260			+.B pcimodules
261			+.RB [ --class class_id ]
262			+.RB [ --classmask mask ]
263			+.RB [ --help ]
264			+.SH DESCRIPTION
265			+.B pcimodules
266			+lists all driver modules for all currently plugged in PCI devices.
267			+.B pcimodules
268			+should be run at boot time, and whenever a PCI device is "hot plugged"
269			+into the system. This can be done by the following Bourne shell syntax:
270			+.IP
271			+ for module in $(pcimodules) ; do
272			+.IP
273			+ modprobe -s -k "$module"
274			+.IP
275			+ done
276			+.PP
277			+When a PCI device is removed from the system, the Linux kernel will
278			+decrement a usage count on PCI driver module. If this count drops
279			+to zero (i.e., there are no PCI drivers), then the
280			+.B modprobe -r
281			+process that is normally configured to run from cron every few minutes
282			+will eventually remove the unneeded module.
283			+.PP
284			+The --class and --classmask arguments can be used to limit the search
285			+to certain classes of PCI devices. This is useful, for example, to
286			+generate a list of ethernet card drivers to be loaded when the kernel
287			+has indicated that it is trying to resolve an unknown network interface.
288			+.PP
289			+Modules are listed in the order in which the PCI devices are physically
290			+arranged so that the computer owner can arrange things like having scsi
291			+device 0 be on a controller that is not alphabetically the first scsi
292			+controller.
293			+.SH OPTIONS
294			+.TP
295			+.B --class class --classmask mask
296			+.PP
297			+--class and --classmask limit the search to PCI
298			+cards in particular classes. These arguments are always used together.
299			+The arguments to --class and --classmask
300			+can be given as hexadecimal numbers by prefixing a leading "0x".
301			+Note that the classes used by pcimodules are in "Linux" format,
302			+meaning the class value that you see with lspci would be shifted
303			+left eight bits, with the new low eight bits programming interface ID.
304			+An examples of how to use class and classmask is provided below.
305			+.B --help, -h
306			+Print a help message and exit.
307			+.SH EXAMPLES
308			+.TP
309			+pcimodules
310			+lists all modules corresponding to currently plugged in PCI devices.
311			+.TP
312			+pcimodules --class 0x200000 --classmask 0xffff00
313			+lists all modules corresponding to currently plugged in ethernet PCI devices.
314			+.SH FILES
315			+.TP
316			+.B /lib/modules/<kernel-version>/modules.pcimap
317			+This file is automatically generated by
318			+.B depmod,
319			+and used by
320			+.B pcimodules
321			+to determine which modules correspond to which PCI ID's.
322			+.TP
323			+.B /proc/bus/pci
324			+An interface to PCI bus configuration space provided by the post-2.1.82 Linux
325			+kernels. Contains per-bus subdirectories with per-card config space files and a
326			+.I devices
327			+file containing a list of all PCI devices.
328			+
329			+.SH SEE ALSO
330			+.BR lspci (8)
331			+
332			+.SH MAINTAINER
333			+The Linux PCI Utilities are maintained by Martin Mares <mj@suse.cz>.
334			+
335			+.SH AUTHOR
336			+.B pcimodules
337			+was written by Adam J. Richter <adam@yggdrasil.com>, based on public
338			+domain example code by Martin Mares <mj@suse.cz>.
339			+
340			+.SH COPYRIGHT
341			+.B pcimodules
342			+is copyright 2000, Yggdrasil Computing, Incorporated, and may
343			+be copied under the terms and conditions of version 2 of the GNU
344			+General Public License as published by the Free Software Foundation
345			+(Cambrige, Massachusetts, United States of America).