From: Ben Gras <ben@minix3.org>
Date: Fri, 25 Jul 2008 15:08:40 +0000 (+0000)
Subject: Solution/workaround for lance driver under vmware
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=95aa8cf5a5775900ebf5efd64827ff187c44a7c1;p=minix.git

Solution/workaround for lance driver under vmware
---

diff --git a/etc/drivers.conf b/etc/drivers.conf
index 33b1a7f17..f80ab14db 100644
--- a/etc/drivers.conf
+++ b/etc/drivers.conf
@@ -159,38 +159,40 @@ driver mfs
 
 driver printer
 {
-	io	378:4           # LPT1
-		278:4           # LPT2
+	io	408:2		# LPT1
+		40a:2		# LPT2
+		40c:2		# LPT3
+		40e:2		# LPT4
 	;
 	irq
-		7               # PRINTER_IRQ
+		7		# PRINTER_IRQ
 	;
 	system
-		KILL            #  6
-		SETGRANT        # 34
-		UMAP            # 14
-		VIRCOPY         # 15
-       		IRQCTL          # 19
-		DEVIO           # 21
-		VDEVIO          # 23
-		SAFECOPYFROM    # 31
-		SAFECOPYTO      # 32
+		KILL		#  6
+		SETGRANT	# 34
+		UMAP		# 14
+		VIRCOPY		# 15
+		IRQCTL		# 19
+		DEVIO		# 21
+		VDEVIO		# 23
+		SAFECOPYFROM	# 31
+		SAFECOPYTO	# 32
 	;
 };
 
-driver dpeth
+driver lance
 {
 	system
-		IRQCTL          # 19
-		DEVIO           # 21
-		SDEVIO          # 22
-		SETALARM        # 24
-		GETINFO         # 26
-		SAFECOPYFROM    # 31
-		SAFECOPYTO      # 32
-		SETGRANT        # 34
-	;
-	uid     0;
+		UMAP		# 14
+		IRQCTL		# 19
+		DEVIO		# 21
+		#SDEVIO		# 22
+		TIMES		# 25
+		GETINFO		# 26
+		SAFECOPYFROM	# 31
+		SAFECOPYTO	# 32
+		SETGRANT	# 34
+	;
+	pci device	1022/2000;
+	uid	0;
 };
-
-
diff --git a/include/minix/config.h b/include/minix/config.h
index fa9939eba..0ab3e1c5b 100755
--- a/include/minix/config.h
+++ b/include/minix/config.h
@@ -3,7 +3,7 @@
 
 /* Minix release and version numbers. */
 #define OS_RELEASE "3"
-#define OS_VERSION "1.3b"
+#define OS_VERSION "1.3c"
 
 /* This file sets configuration parameters for the MINIX kernel, FS, and PM.
  * It is divided up into two main sections.  The first section contains
@@ -53,7 +53,7 @@
 #endif
 
 #if (MACHINE == IBM_PC && _WORD_SIZE == 4)
-#define NR_BUFS         1200	/* # blocks in the buffer cache */
+#define NR_BUFS          500	/* # blocks in the buffer cache */
 #define NR_BUF_HASH     2048	/* size of buf hash table; MUST BE POWER OF 2*/
 #endif