From: Erik van der Kouwe <erik@minix3.org>
Date: Wed, 14 Oct 2009 07:20:13 +0000 (+0000)
Subject: Add more identifiers to drivers.conf for orinoco and rtl8137.
X-Git-Tag: v3.1.5~15
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=44a4c8c0d2405909e60619ff19fbe406e2d0de5d;p=minix.git

Add more identifiers to drivers.conf for orinoco and rtl8137.
Increase RSS_NR_PCI_ID and remove dumplicate reference
to /etc/drivers.conf; each such reference uses _PATH_DRIVERS_CONF
from <minix/paths.h> now.
---

diff --git a/commands/scripts/netconf.sh b/commands/scripts/netconf.sh
index 7731e62c0..29928c206 100755
--- a/commands/scripts/netconf.sh
+++ b/commands/scripts/netconf.sh
@@ -98,7 +98,11 @@ cards()
     card 0 "No Ethernet card (no networking)"
     card 1 "Intel Pro/100" "8086:103D" "8086:1064" "8086:1229" "8086:2449"
     card 2 "3Com 501 or 3Com 509 based card"
-    card 3 "Realtek 8139 based card (also emulated by KVM)" "10EC:8139"
+    card 3 "Realtek 8139 based card (also emulated by KVM)"            \
+           "10EC:8139" "02AC:1012" "1065:8139" "1113:1211" "1186:1300" \
+           "1186:1340" "11DB:1234" "1259:A117" "1259:A11E" "126C:1211" \
+           "13D1:AB06" "1432:9130" "14EA:AB06" "14EA:AB07" "1500:1360" \
+           "1743:8139" "4033:1360"
     card 4 "Realtek 8029 based card (also emulated by Qemu)" "10EC:8029"
     card 5 "NE2000, 3com 503 or WD based card (also emulated by Bochs)"
     card 6 "AMD LANCE (also emulated by VMWare and VirtualBox)" "1022:2000"
diff --git a/etc/drivers.conf b/etc/drivers.conf
index 8ea061535..eb0c3e647 100644
--- a/etc/drivers.conf
+++ b/etc/drivers.conf
@@ -92,6 +92,22 @@ driver rtl8139
 		SYSCTL
 	;
 	pci device	10ec/8139;
+	pci device	02ac/1012;
+	pci device	1065/8139;
+	pci device	1113/1211;
+	pci device	1186/1300;
+	pci device	1186/1340;
+	pci device	11db/1234;
+	pci device	1259/a117;
+	pci device	1259/a11e;
+	pci device	126c/1211;
+	pci device	13d1/ab06;
+	pci device	1432/9130;
+	pci device	14ea/ab06;
+	pci device	14ea/ab07;
+	pci device	1500/1360;
+	pci device	1743/8139;
+	pci device	4033/1360;
 	ipc
 		SYSTEM PM RS LOG TTY DS VM
 		pci inet amddev
@@ -341,6 +357,7 @@ driver orinoco
 		SYSCTL
 	;
 	pci device	1260/3873;
+	pci device	1186/1300;
 	uid	0;
 };
 
diff --git a/include/minix/rs.h b/include/minix/rs.h
index 72fbcc3f1..d46e86b1c 100644
--- a/include/minix/rs.h
+++ b/include/minix/rs.h
@@ -8,7 +8,7 @@ Interface to the reincarnation server
 
 #define RSS_NR_IRQ		16
 #define RSS_NR_IO		16
-#define RSS_NR_PCI_ID		16
+#define RSS_NR_PCI_ID		20
 #define RSS_NR_PCI_CLASS	 4
 #define RSS_NR_SYSTEM		 2
 
diff --git a/servers/rs/service.c b/servers/rs/service.c
index ee3729f77..4f2f0a3eb 100644
--- a/servers/rs/service.c
+++ b/servers/rs/service.c
@@ -23,6 +23,7 @@
 #include <minix/syslib.h>
 #include <minix/sysinfo.h>
 #include <minix/bitmap.h>
+#include <minix/paths.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <configfile.h>
@@ -46,7 +47,7 @@ PRIVATE char *known_requests[] = {
 
 #define RUN_CMD		"run"
 #define RUN_SCRIPT	"/etc/rs.single"	/* Default script for 'run' */
-#define PATH_CONFIG	"/etc/drivers.conf"	/* Default config file */
+#define PATH_CONFIG	_PATH_DRIVERS_CONF	/* Default config file */
 
 /* Define names for arguments provided to this utility. The first few 
  * arguments are required and have a known index. Thereafter, some optional