minix-2.0.4-fix.diff

diff -ur sys/src/kernel/pci.c fix/src/kernel/pci.c
--- sys/src/kernel/pci.c  2003-09-11 02:37:40 +0900
+++ fix/src/kernel/pci.c	2003-11-30 19:40:38 +0900
@@ -617,20 +617,13 @@
 
 	if (unknown_bridge == -1)
 	{
-		if (debug)
-		{
-			printf("do_isabridge: no ISA bridge found for bus %d",
-				busind);
-		}
+		printf("do_isabridge: no ISA bridge found for bus %d", busind);
 		return -1;
 	}
-	if (debug)
-	{
-		printf("Unsupported ISA bridge %04X/%04X for bus %d\n",
-			pcidev[unknown_bridge].pd_vid,
-			pcidev[unknown_bridge].pd_did,
-			busind);
-	}
+	printf("Unsupported ISA bridge %04X/%04X for bus %d\n",
+		pcidev[unknown_bridge].pd_vid,
+		pcidev[unknown_bridge].pd_did,
+		busind);
 	return -1;
 }
 
diff -ur sys/src/kernel/pci_table.c fix/src/kernel/pci_table.c
--- sys/src/kernel/pci_table.c	2003-09-05 19:53:33 +0900
+++ fix/src/kernel/pci_table.c	2003-11-30 19:39:30 +0900
@@ -85,6 +85,7 @@
 	{ 0x1106, 0x8305, "VIA VT8365 [KM133 AGP]" },
 	{ 0x1106, 0xB099, "VIA VT8367 [KT266 AGP]" },
 	{ 0x110A, 0x0005, "Siemens Nixdorf Tulip Cntlr., Power Management" },
+	{ 0x1186, 0x1300, "D-Link RTL8139" },
 	{ 0x125D, 0x1969, "ESS ES1969 Solo-1 Audiodrive" },
 	{ 0x1274, 0x1371, "Ensoniq ES1371 [AudioPCI-97]" },
 	{ 0x1274, 0x5000, "Ensoniq ES1370" },
diff -ur sys/src/kernel/rtl8139.c fix/src/kernel/rtl8139.c
--- sys/src/kernel/rtl8139.c	2003-11-08 23:05:07 +0900
+++ fix/src/kernel/rtl8139.c	2003-11-30 19:34:03 +0900
@@ -118,6 +118,7 @@
 } pcitab[]=
 {
 	{ 0x10ec, 0x8139, 0 },		/* Realtek RTL8139 */
+	{ 0x1186, 0x1300, 0 },		/* D-Link RTL8139 */
 
 	{ 0x0000, 0x0000, 0 }
 };
@@ -395,7 +396,7 @@
 			rl_watchdog_f, t_arg);
 #else
 		tmr_arg(&rl_watchdog)->ta_int= 0;
-		tmr_settimer(&rl_watchdog, rl_tasknr, get_uptime()+HZ,
+		tmr_settimer(&rl_watchdog, CLOCK, get_uptime()+HZ,
 			rl_watchdog_f);
 #endif
 	}
@@ -2205,7 +2206,7 @@
 	tmra_settimer(&rl_watchdog, get_uptime()+HZ, rl_watchdog_f, t_arg);
 #else
 	tmr_arg(&rl_watchdog)->ta_int= 0;
-	tmr_settimer(&rl_watchdog, rl_tasknr, get_uptime()+HZ, rl_watchdog_f);
+	tmr_settimer(&rl_watchdog, CLOCK, get_uptime()+HZ, rl_watchdog_f);
 #endif
 
 	for (i= 0, rep = &re_table[0]; i<RE_PORT_NR; i++, rep++)
@@ -2223,7 +2224,7 @@
 			rep->re_tx_alive= FALSE;
 			continue;
 		}
-		printf("rl_watchdog_f: reseting port %d\n", i);
+		printf("rl_watchdog_f: resetting port %d\n", i);
 		printf(
 	"TSAD: 0x%04x, TSD: 0x%08x, 0x%08x, 0x%08x, 0x%08x\n",
 			rl_inw(rep->re_base_port, RL_TSAD),