tech-userlevel archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: [PATCH] pcictl: simplify its usage
Hi,
per request from Matthew Green, I implemented a compat mode.
Compile pcictl with COMPAT50 defined and pcictl accepts
the old and new syntax.
New patch attached. New patch also contains updated manpage.
It explains the new syntax only.
Christoph
Christoph Egger wrote:
> Hi,
>
> A (shell,perl,python,whatever) script that wants
> a list of all pci devices has something to do like
> this:
>
> for i in 0 1 2 3 4 5 6 7 8 9
> do
> pcictl pci$i list
> done
>
> And that still doesn't even get all devices if
> there's another pci controller starting with
> 128 (found on 4-way Opteron machines).
>
> Attached patch makes pcictl to really enlist all devices
> with:
>
> pcictl list
>
> if you want to have back old functionality, you can (still) do
>
> for i in 0 1 2 3 4 5 6 7 8 9
> do
> pcictl list -b $i
> done
>
>
>
> If you want to dump a PCI device the current way is:
>
> pcictl pci$i dump -d $j -f $k
>
> New way with this patch is:
>
> pcictl dump -b $i -d $j -f $k
>
>
> The main motivation for this work is to have an easy way
> for xen to get the pci-passthrough feature for Xen 3.3 and newer.
>
> Any comments on the patch?
>
>
> Christoph
>
Index: usr.sbin/pcictl/pcictl.c
===================================================================
RCS file: /cvsroot/src/usr.sbin/pcictl/pcictl.c,v
retrieving revision 1.12
diff -u -p -r1.12 pcictl.c
--- usr.sbin/pcictl/pcictl.c 18 Apr 2009 07:17:16 -0000 1.12
+++ usr.sbin/pcictl/pcictl.c 4 Jun 2009 05:38:13 -0000
@@ -59,25 +59,24 @@
struct command {
const char *cmd_name;
const char *arg_names;
- void (*cmd_func)(int, char *[]);
+ void (*cmd_func)(int, char * const []);
int open_flags;
};
-int main(int, char *[]);
+int main(int, char * const []);
void usage(void);
int pcifd;
-struct pciio_businfo pci_businfo;
+#define PCIDEV "/dev/pci"
-const char *dvname;
-char dvname_store[MAXPATHLEN];
-const char *cmdname;
-const char *argnames;
+#ifdef COMPAT50
+int pcibus = -1;
+#endif
int print_numbers = 0;
-void cmd_list(int, char *[]);
-void cmd_dump(int, char *[]);
+void cmd_list(int, char * const []);
+void cmd_dump(int, char * const []);
const struct command commands[] = {
{ "list",
@@ -101,52 +100,69 @@ void scan_pci_list(u_int, u_int, u_int);
void scan_pci_dump(u_int, u_int, u_int);
int
-main(int argc, char *argv[])
+main(int argc, char * const argv[])
{
+#ifdef COMPAT50
+ const char *dvname;
+#endif
+ struct pciio_businfo pci_businfo;
+ const char *cmdname;
+ const char *argnames;
int i;
- /* Must have at least: device command */
- if (argc < 3)
+ /* Must have at least: command */
+ if (argc < 2)
usage();
- /* Skip program name, get and skip device name, get command. */
+#ifdef COMPAT50
dvname = argv[1];
- cmdname = argv[2];
- argv += 2;
- argc -= 2;
+ if (strncmp(dvname, "pci", 3) == 0) {
+ /* Old syntax. Extract bus number. */
+ if (argc < 3)
+ usage();
+ /* Skip program name, get and skip device name, get command. */
+ sscanf(dvname, "pci%u", &pcibus);
+ cmdname = argv[2];
+ argv += 2;
+ argc -= 2;
+ } else
+#endif
+ {
+ /* Skip program name and get command. */
+ cmdname = argv[1];
+ argv++;
+ argc--;
+ }
/* Look up and call the command. */
for (i = 0; commands[i].cmd_name != NULL; i++)
if (strcmp(cmdname, commands[i].cmd_name) == 0)
break;
if (commands[i].cmd_name == NULL)
- errx(1, "unknown command: %s", cmdname);
+ errx(EXIT_FAILURE, "unknown command: %s", cmdname);
argnames = commands[i].arg_names;
/* Open the device. */
- if ((strchr(dvname, '/') == NULL) &&
- (snprintf(dvname_store, sizeof(dvname_store), _PATH_DEV "%s",
- dvname) < (int)sizeof(dvname_store)))
- dvname = dvname_store;
- pcifd = open(dvname, commands[i].open_flags);
- if (pcifd < 0)
- err(1, "%s", dvname);
+ if ((pcifd = open(PCIDEV, commands[i].open_flags)) < 0)
+ err(EXIT_FAILURE, PCIDEV);
/* Make sure the device is a PCI bus. */
if (ioctl(pcifd, PCI_IOC_BUSINFO, &pci_businfo) != 0)
- errx(1, "%s: not a PCI bus device", dvname);
+ errx(EXIT_FAILURE, "%s: not a PCI bus device", PCIDEV);
(*commands[i].cmd_func)(argc, argv);
- exit(0);
+ close(pcifd);
+
+ return EXIT_SUCCESS;
}
void
-usage()
+usage(void)
{
int i;
- fprintf(stderr, "usage: %s device command [arg [...]]\n",
+ fprintf(stderr, "usage: %s command [arg [...]]\n",
getprogname());
fprintf(stderr, " Available commands:\n");
@@ -154,17 +170,17 @@ usage()
fprintf(stderr, "\t%s %s\n", commands[i].cmd_name,
commands[i].arg_names);
- exit(1);
+ exit(EXIT_FAILURE);
+ /* NOTREACHED */
}
void
-cmd_list(int argc, char *argv[])
+cmd_list(int argc, char * const argv[])
{
int bus, dev, func;
int ch;
- bus = pci_businfo.busno;
- dev = func = -1;
+ bus = dev = func = -1;
while ((ch = getopt(argc, argv, "nb:d:f:")) != -1) {
switch (ch) {
@@ -187,6 +203,11 @@ cmd_list(int argc, char *argv[])
argv += optind;
argc -= optind;
+#ifdef COMPAT50
+ if (pcibus != -1)
+ bus = pcibus;
+#endif
+
if (argc != 0)
usage();
@@ -194,13 +215,12 @@ cmd_list(int argc, char *argv[])
}
void
-cmd_dump(int argc, char *argv[])
+cmd_dump(int argc, char * const argv[])
{
int bus, dev, func;
int ch;
- bus = pci_businfo.busno;
- func = 0;
+ bus = func = 0;
dev = -1;
while ((ch = getopt(argc, argv, "b:d:f:")) != -1) {
@@ -221,15 +241,20 @@ cmd_dump(int argc, char *argv[])
argv += optind;
argc -= optind;
+#ifdef COMPAT50
+ if (pcibus != -1)
+ bus = pcibus;
+#endif
+
if (argc != 0)
usage();
if (bus == -1)
- errx(1, "dump: wildcard bus number not permitted");
+ errx(EXIT_FAILURE, "dump: wildcard bus number not permitted");
if (dev == -1)
- errx(1, "dump: must specify a device number");
+ errx(EXIT_FAILURE, "dump: must specify a device number");
if (func == -1)
- errx(1, "dump: wildcard function number not permitted");
+ errx(EXIT_FAILURE, "dump: wildcard function number not
permitted");
scan_pci(bus, dev, func, scan_pci_dump);
}
@@ -245,8 +270,8 @@ parse_bdf(const char *str)
return (-1);
value = strtol(str, &end, 0);
- if(*end != '\0')
- errx(1, "\"%s\" is not a number", str);
+ if (*end != '\0')
+ errx(EXIT_FAILURE, "\"%s\" is not a number", str);
return value;
}
@@ -268,10 +293,7 @@ scan_pci(int busarg, int devarg, int fun
if (devarg == -1) {
devmin = 0;
- if (pci_businfo.maxdevs <= 0)
- devmax = 0;
- else
- devmax = pci_businfo.maxdevs - 1;
+ devmax = 31;
} else
devmin = devmax = devarg;
Index: usr.sbin/pcictl/pcictl.8
===================================================================
RCS file: /cvsroot/src/usr.sbin/pcictl/pcictl.8,v
retrieving revision 1.7
diff -u -p -r1.7 pcictl.8
--- usr.sbin/pcictl/pcictl.8 9 Mar 2009 19:24:33 -0000 1.7
+++ usr.sbin/pcictl/pcictl.8 4 Jun 2009 05:38:13 -0000
@@ -33,7 +33,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 29, 2007
+.Dd June 3, 2009
.Dt PCICTL 8
.Os
.Sh NAME
@@ -41,7 +41,6 @@
.Nd a program to manipulate the PCI bus
.Sh SYNOPSIS
.Nm
-.Ar pcibus
.Ar command
.Oo
.Ar arg Oo ...
@@ -82,7 +81,7 @@ If the bus is not specified, it defaults
PCI bus specified on the command line.
If the function is not specified, it defaults to 0.
.Sh FILES
-.Pa /dev/pci*
+.Pa /dev/pci
- PCI bus device nodes
.Sh SEE ALSO
.Xr pci 3 ,
Index: sys/dev/pci/pci_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pci_usrreq.c,v
retrieving revision 1.16
diff -u -p -r1.16 pci_usrreq.c
--- sys/dev/pci/pci_usrreq.c 11 Jun 2008 19:27:03 -0000 1.16
+++ sys/dev/pci/pci_usrreq.c 4 Jun 2009 05:38:13 -0000
@@ -55,44 +55,59 @@ __KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c
#include <dev/pci/pcivar.h>
#include <dev/pci/pciio.h>
-static int
-pciopen(dev_t dev, int flags, int mode, struct lwp *l)
+static struct pci_softc *
+pci_get_softc(dev_t dev, struct pciio_bdf_cfgreg *bdfr)
{
- device_t dv;
-
- dv = device_lookup(&pci_cd, minor(dev));
- if (dv == NULL)
- return (ENXIO);
+ struct pci_softc *sc;
+ device_t pci;
+ int i;
+
+ for (i = 0; i < pci_cd.cd_ndevs; i++) {
+ pci = pci_cd.cd_devs[i];
+ if (pci == NULL)
+ continue;
+
+ sc = device_private(pci);
+ if (sc != NULL && /* sc->sc_domain == minor(dev) && */
+ sc->sc_bus == bdfr->bus)
+ break;
+ }
+ if (i >= pci_cd.cd_ndevs)
+ return NULL;
- return (0);
+ return sc;
}
static int
pciioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
- struct pci_softc *sc =
- device_lookup_private(&pci_cd, minor(dev));
+ struct pci_softc *sc;
struct pciio_bdf_cfgreg *bdfr = (void *) data;
struct pciio_businfo *binfo = (void *) data;
pcitag_t tag;
+ sc = pci_get_softc(dev, bdfr);
+ if (sc == NULL)
+ return ENXIO;
+
+ /* Check bounds */
+ if (bdfr->bus > 255 || bdfr->device >= sc->sc_maxndevs ||
+ bdfr->function > 7)
+ return EINVAL;
+ tag = pci_make_tag(sc->sc_pc, bdfr->bus, bdfr->device,
+ bdfr->function);
+
switch (cmd) {
case PCI_IOC_BDF_CFGREAD:
+ bdfr->cfgreg.val = pci_conf_read(sc->sc_pc, tag,
+ bdfr->cfgreg.reg);
+ break;
+
case PCI_IOC_BDF_CFGWRITE:
- if (bdfr->bus > 255 || bdfr->device >= sc->sc_maxndevs ||
- bdfr->function > 7)
- return (EINVAL);
- tag = pci_make_tag(sc->sc_pc, bdfr->bus, bdfr->device,
- bdfr->function);
- if (cmd == PCI_IOC_BDF_CFGREAD)
- bdfr->cfgreg.val = pci_conf_read(sc->sc_pc, tag,
- bdfr->cfgreg.reg);
- else {
- if ((flag & FWRITE) == 0)
- return (EBADF);
- pci_conf_write(sc->sc_pc, tag, bdfr->cfgreg.reg,
- bdfr->cfgreg.val);
- }
+ if ((flag & FWRITE) == 0)
+ return EBADF;
+ pci_conf_write(sc->sc_pc, tag, bdfr->cfgreg.reg,
+ bdfr->cfgreg.val);
break;
case PCI_IOC_BUSINFO:
@@ -101,35 +116,15 @@ pciioctl(dev_t dev, u_long cmd, void *da
break;
default:
- return (ENOTTY);
+ return ENOTTY;
}
- return (0);
-}
-
-static paddr_t
-pcimmap(dev_t dev, off_t offset, int prot)
-{
-#if 0
- struct pci_softc *sc = device_lookup_private(&pci_cd, minor(dev));
-
- /*
- * Since we allow mapping of the entire bus, we
- * take the offset to be the address on the bus,
- * and pass 0 as the offset into that range.
- *
- * XXX Need a way to deal with linear/prefetchable/etc.
- */
- return (bus_space_mmap(sc->sc_memt, offset, 0, prot, 0));
-#else
- /* XXX Consider this further. */
- return (-1);
-#endif
+ return 0;
}
const struct cdevsw pci_cdevsw = {
- pciopen, nullclose, noread, nowrite, pciioctl,
- nostop, notty, nopoll, pcimmap, nokqfilter, D_OTHER,
+ nullopen, nullclose, noread, nowrite, pciioctl,
+ nostop, notty, nopoll, nommap, nokqfilter, D_OTHER,
};
/*
@@ -145,19 +140,18 @@ pci_devioctl(pci_chipset_tag_t pc, pcita
switch (cmd) {
case PCI_IOC_CFGREAD:
+ r->val = pci_conf_read(pc, tag, r->reg);
+ break;
+
case PCI_IOC_CFGWRITE:
- if (cmd == PCI_IOC_CFGREAD)
- r->val = pci_conf_read(pc, tag, r->reg);
- else {
- if ((flag & FWRITE) == 0)
- return (EBADF);
- pci_conf_write(pc, tag, r->reg, r->val);
- }
+ if ((flag & FWRITE) == 0)
+ return EBADF;
+ pci_conf_write(pc, tag, r->reg, r->val);
break;
default:
- return (EPASSTHROUGH);
+ return EPASSTHROUGH;
}
- return (0);
+ return 0;
}
Index: etc/MAKEDEV.tmpl
===================================================================
RCS file: /cvsroot/src/etc/MAKEDEV.tmpl,v
retrieving revision 1.122
diff -u -p -r1.122 MAKEDEV.tmpl
--- etc/MAKEDEV.tmpl 23 May 2009 22:29:14 -0000 1.122
+++ etc/MAKEDEV.tmpl 4 Jun 2009 05:38:14 -0000
@@ -255,7 +255,7 @@
# nsmb* SMB requester
# openfirm OpenFirmware accessor
# pad* Pseudo-audio device driver
-# pci* PCI bus access devices
+# pci PCI bus access devices
# pf PF packet filter
# pow* power management device (x68k)
# putter Pass-to-Userspace Transporter
@@ -1436,9 +1436,8 @@ agp*)
fi
;;
-pci*)
- unit=${i#pci}
- mkdev pci$unit c %pci_chr% $unit 644
+pci)
+ mkdev pci c %pci_chr% 0 644
;;
dpti*)
Index: etc/etc.alpha/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.alpha/MAKEDEV.conf,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.conf
--- etc/etc.alpha/MAKEDEV.conf 15 Jan 2007 23:35:11 -0000 1.7
+++ etc/etc.alpha/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -14,7 +14,7 @@ all_md)
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
makedev ttyCZ0 ttyCY0
makedev agp0
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev bktr
makedev radio
Index: etc/etc.amd64/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.amd64/MAKEDEV.conf,v
retrieving revision 1.16
diff -u -p -r1.16 MAKEDEV.conf
--- etc/etc.amd64/MAKEDEV.conf 4 Nov 2008 14:25:10 -0000 1.16
+++ etc/etc.amd64/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -33,7 +33,7 @@ all_md)
makedev bktr
makedev ttyCZ0 ttyCY0
makedev agp0
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev cir0 cir1 irframe0 irframe1
makedev kttcp
Index: etc/etc.cats/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.cats/MAKEDEV.conf,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.conf
--- etc/etc.cats/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.7
+++ etc/etc.cats/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -9,7 +9,7 @@ all_md)
makedev usbs isdns
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
makedev scsibus0 scsibus1 scsibus2 scsibus3
- makedev pci0 pci1
+ makedev pci
makedev audio
makedev cfs
;;
Index: etc/etc.cobalt/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.cobalt/MAKEDEV.conf,v
retrieving revision 1.12
diff -u -p -r1.12 MAKEDEV.conf
--- etc/etc.cobalt/MAKEDEV.conf 12 Nov 2008 15:57:29 -0000 1.12
+++ etc/etc.cobalt/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -12,7 +12,7 @@ all_md)
makedev ses0 ses1 ses2 ses3
makedev ld0 ld1 ld2 ld3
makedev usbs
- makedev pci0
+ makedev pci
makedev panel
makedev altq
makedev nsmb
Index: etc/etc.evbarm/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.evbarm/MAKEDEV.conf,v
retrieving revision 1.3
diff -u -p -r1.3 MAKEDEV.conf
--- etc/etc.evbarm/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.3
+++ etc/etc.evbarm/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -10,7 +10,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev sysmon
makedev dmoverio
- makedev pci0
+ makedev pci
makedev kttcp
makedev cfs
;;
Index: etc/etc.evbmips/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.evbmips/MAKEDEV.conf,v
retrieving revision 1.4
diff -u -p -r1.4 MAKEDEV.conf
--- etc/etc.evbmips/MAKEDEV.conf 15 Jan 2007 23:35:11 -0000 1.4
+++ etc/etc.evbmips/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -13,7 +13,7 @@ all_md)
makedev usbs isdns
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
makedev ttyCZ0 ttyCY0
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
;;
Index: etc/etc.evbppc/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.evbppc/MAKEDEV.conf,v
retrieving revision 1.6
diff -u -p -r1.6 MAKEDEV.conf
--- etc/etc.evbppc/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.6
+++ etc/etc.evbppc/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -11,7 +11,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev isdns
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev sysmon
makedev bktr
makedev radio
Index: etc/etc.hpcmips/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.hpcmips/MAKEDEV.conf,v
retrieving revision 1.4
diff -u -p -r1.4 MAKEDEV.conf
--- etc/etc.hpcmips/MAKEDEV.conf 15 Jan 2007 23:35:12 -0000 1.4
+++ etc/etc.hpcmips/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -12,7 +12,7 @@ all_md)
makedev audio
makedev apm
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
- makedev pci0
+ makedev pci
;;
floppy)
Index: etc/etc.i386/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.i386/MAKEDEV.conf,v
retrieving revision 1.20
diff -u -p -r1.20 MAKEDEV.conf
--- etc/etc.i386/MAKEDEV.conf 4 Nov 2008 14:25:10 -0000 1.20
+++ etc/etc.i386/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -34,7 +34,7 @@ all_md)
makedev bktr
makedev ttyCZ0 ttyCY0
makedev agp0
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev cir0 cir1 irframe0 irframe1
makedev dmoverio
Index: etc/etc.iyonix/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.iyonix/MAKEDEV.conf,v
retrieving revision 1.2
diff -u -p -r1.2 MAKEDEV.conf
--- etc/etc.iyonix/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.2
+++ etc/etc.iyonix/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -10,7 +10,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev sysmon
makedev dmoverio
- makedev pci0
+ makedev pci
makedev kttcp
makedev cfs
;;
Index: etc/etc.landisk/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.landisk/MAKEDEV.conf,v
retrieving revision 1.3
diff -u -p -r1.3 MAKEDEV.conf
--- etc/etc.landisk/MAKEDEV.conf 27 Apr 2009 08:06:02 -0000 1.3
+++ etc/etc.landisk/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -9,7 +9,7 @@ init)
makedev cgd0 cgd1
makedev raid0
makedev usbs
- makedev pci0
+ makedev pci
makedev ipty
makedev sysmon
makedev local
Index: etc/etc.macppc/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.macppc/MAKEDEV.conf,v
retrieving revision 1.8
diff -u -p -r1.8 MAKEDEV.conf
--- etc/etc.macppc/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.8
+++ etc/etc.macppc/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -11,7 +11,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev isdns
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev sysmon
makedev bktr
Index: etc/etc.netwinder/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.netwinder/MAKEDEV.conf,v
retrieving revision 1.4
diff -u -p -r1.4 MAKEDEV.conf
--- etc/etc.netwinder/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.4
+++ etc/etc.netwinder/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -10,7 +10,7 @@ all_md)
makedev openfirm
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
makedev scsibus0 scsibus1 scsibus2 scsibus3
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev cfs
;;
Index: etc/etc.ofppc/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.ofppc/MAKEDEV.conf,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.conf
--- etc/etc.ofppc/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.7
+++ etc/etc.ofppc/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -11,7 +11,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev isdns
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq sysmon bktr radio kttcp
makedev lpt0 lpt1 lpt2 tun0 tun1
makedev speaker joy0 joy1 satlink0
Index: etc/etc.prep/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.prep/MAKEDEV.conf,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.conf
--- etc/etc.prep/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.7
+++ etc/etc.prep/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -13,7 +13,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev isdns
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev nvram
makedev residual
makedev cfs
Index: etc/etc.rs6000/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.rs6000/MAKEDEV.conf,v
retrieving revision 1.1
diff -u -p -r1.1 MAKEDEV.conf
--- etc/etc.rs6000/MAKEDEV.conf 30 Apr 2009 12:47:40 -0000 1.1
+++ etc/etc.rs6000/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -13,7 +13,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev isdns
-# makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+# makedev pci
# makedev nvram
makedev cfs
;;
Index: etc/etc.sandpoint/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.sandpoint/MAKEDEV.conf,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.conf
--- etc/etc.sandpoint/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.7
+++ etc/etc.sandpoint/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -3,7 +3,7 @@
init)
makedev std tty0 tty1 tty2 tty3 opty ptm pty0
makedev md0 wd0 wd1
- makedev pci0 bpf clockctl
+ makedev pci bpf clockctl
;;
all_md)
@@ -11,7 +11,7 @@ all_md)
makedev wd0 wd1
makedev sd0 sd1 sd2 st0 cd0 ss0 ch0 uk0
makedev scsibus0 scsibus1
- makedev pci0
+ makedev pci
makedev cfs
;;
Index: etc/etc.sbmips/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.sbmips/MAKEDEV.conf,v
retrieving revision 1.4
diff -u -p -r1.4 MAKEDEV.conf
--- etc/etc.sbmips/MAKEDEV.conf 2 Dec 2004 16:44:28 -0000 1.4
+++ etc/etc.sbmips/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -27,7 +27,7 @@ all_md)
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev usbs isdns
makedev ttyCZ0 ttyCY0
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev sysmon
makedev kttcp
Index: etc/etc.sgimips/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.sgimips/MAKEDEV.conf,v
retrieving revision 1.8
diff -u -p -r1.8 MAKEDEV.conf
--- etc/etc.sgimips/MAKEDEV.conf 15 Jan 2007 23:35:12 -0000 1.8
+++ etc/etc.sgimips/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -24,7 +24,7 @@ all_md)
makedev audio
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev wscons
makedev lpa0 lpa1 lpa2
makedev lpt0 lpt1 lpt2
Index: etc/etc.sparc/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.sparc/MAKEDEV.conf,v
retrieving revision 1.13
diff -u -p -r1.13 MAKEDEV.conf
--- etc/etc.sparc/MAKEDEV.conf 13 Sep 2008 13:11:38 -0000 1.13
+++ etc/etc.sparc/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -14,7 +14,7 @@ all_md)
makedev sysmon
makedev apm apmctl tctrl0
makedev isdns
- makedev pci0
+ makedev pci
makedev wscons
makedev kttcp
makedev nsmb
Index: etc/etc.sparc64/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.sparc64/MAKEDEV.conf,v
retrieving revision 1.13
diff -u -p -r1.13 MAKEDEV.conf
--- etc/etc.sparc64/MAKEDEV.conf 13 Sep 2008 11:46:18 -0000 1.13
+++ etc/etc.sparc64/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -15,7 +15,7 @@ all_md)
makedev usbs
makedev radio
makedev isdns
- makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
+ makedev pci
makedev altq
makedev wscons
makedev kttcp
Index: etc/etc.zaurus/MAKEDEV.conf
===================================================================
RCS file: /cvsroot/src/etc/etc.zaurus/MAKEDEV.conf,v
retrieving revision 1.6
diff -u -p -r1.6 MAKEDEV.conf
--- etc/etc.zaurus/MAKEDEV.conf 21 Apr 2009 03:00:58 -0000 1.6
+++ etc/etc.zaurus/MAKEDEV.conf 4 Jun 2009 05:38:14 -0000
@@ -11,7 +11,7 @@ all_md)
makedev ses0 ses1 ses2 ses3
makedev sysmon
makedev dmoverio
- makedev pci0
+ makedev pci
makedev kttcp
makedev audio
makedev apm
Home |
Main Index |
Thread Index |
Old Index