From: David van Moolenbroek <david@minix3.org>
Date: Mon, 1 Dec 2014 17:50:59 +0000 (+0000)
Subject: dp8390: update, allow default port and IRQ
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F2907%2F1;p=minix.git

dp8390: update, allow default port and IRQ

Bochs has switched from port base 0x240 to 0x300 for its default
NE2000 ISA configuration, and QEMU is using the same settings.

Change-Id: Ide6cdb14321eb4324d0bf6d6314c5970b3493e95
---

diff --git a/etc/system.conf b/etc/system.conf
index 6f09d66f4..adb6b4d4d 100644
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -255,7 +255,10 @@ service dp8390
 		SDEVIO		# 22
 	;
 	pci device	10ec:8029;
-	uid	0;
+	io
+		300:20
+	;
+	irq	9;
 };
 
 service dpeth
diff --git a/minix/commands/netconf/netconf.sh b/minix/commands/netconf/netconf.sh
index c9f75ad9f..80f2b3776 100644
--- a/minix/commands/netconf/netconf.sh
+++ b/minix/commands/netconf/netconf.sh
@@ -109,7 +109,7 @@ cards()
     card 0 "No Ethernet card (no networking)"
     card 1 "3Com 501 or 3Com 509 based card"
     card 2 "Realtek 8029 based card (also emulated by Qemu)" "10EC:8029"
-    card 3 "NE2000, 3com 503 or WD based card (also emulated by Bochs)"
+    card 3 "NE2000, 3com 503 or WD based card (also emulated by Qemu, Bochs)"
     card 4 "lan8710a (on BeagleBone, BeagleBone Black)"
     n=$first_pcicard
     for pcicard in $pci_list
@@ -197,10 +197,11 @@ drv_params()
            test "$v" = 1 && echo "Note: After installing, edit $LOCALRC to the right configuration."
 		;;
 	2) driver=dp8390;   driverargs="dp8390_arg='DPETH0=pci'";	;;
-	3) driver=dp8390;   driverargs="dp8390_arg='DPETH0=240:9'"; 
+	3) driver=dp8390;   driverargs="dp8390_arg='DPETH0=300:9'";
 	   test "$v" = 1 && echo ""
            test "$v" = 1 && echo "Note: After installing, edit $LOCALRC to the right configuration."
-           test "$v" = 1 && echo " chose option 4, the defaults for emulation by Bochs have been set."
+           test "$v" = 1 && echo "You may then also have to edit /etc/system.conf ."
+           test "$v" = 1 && echo "For now, the defaults for emulation by Bochs/Qemu have been set."
 		;;
 	4) driver=lan8710a;	;;
         $first_after_pci) driver="psip0"; ;;