*BSD News Article 20043


Return to BSD News archive

Xref: sserve comp.os.386bsd.bugs:1284 comp.os.386bsd.misc:773
Path: sserve!newshost.anu.edu.au!munnari.oz.au!news.Hawaii.Edu!ames!agate!eden.CS.Berkeley.EDU!cgd
From: cgd@eden.CS.Berkeley.EDU (Chris G. Demetriou)
Newsgroups: comp.os.386bsd.bugs,comp.os.386bsd.misc
Subject: Patch 001 to NetBSD 0.9 -- add an 'ed' interface for 3c503
Followup-To: comp.os.386bsd.misc
Date: 26 Aug 1993 06:41:12 GMT
Organization: Kernel Hackers 'r' Us
Lines: 138
Message-ID: <25hlu8$e3@agate.berkeley.edu>
NNTP-Posting-Host: eden.cs.berkeley.edu
Summary: i screwed it up, here's a fix!
Keywords: NetBSD, NetBSD 0.9, 3c503, ed, goofball

the following is contained in the file "patch001" in .../NetBSD-0.9/patches
on your fave ftp site.  note also that there are some new kc-floppy disks.

=================================
THIS IS PATCH 1 TO NetBSD 0.9

(1)	added support for ed1 in both generic kernels at:
	device ed1 at isa? port 0x250 net irq 9 iomem 0xd8000 vector edintr
(2)	brought if_ed.c up to DG's 1.19 rev.

in addition to this patch, the kernel-copy floppies have been upgraded
to have names of the form: kc-*-09p1.fs.  If your favorite FTP site does
not have them, then you should use a more up-to-date FTP site.

If you are using a 3c503 ethernet board with the GENERICAHA or GENERICAHBBT
kernels (i.e. those found on the kernel-copy floppies), your ethernet
board should be set ast noted above, and the interface will be configured
as ed1.  (NOTE THAT: ed1, NOT ed0.)

cgd

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX START OF PATCH 001
diff -c src/sys/arch/i386/conf/GENERICAHA:1.20.2.3 src/sys/arch/i386/conf/GENERICAHA:1.20.2.4
*** src/sys/arch/i386/conf/GENERICAHA:1.20.2.3	Wed Aug 25 17:15:08 1993
--- src/sys/arch/i386/conf/GENERICAHA	Wed Aug 25 17:15:08 1993
***************
*** 1,7 ****
  #
  # GENERICAHA -- Generic machine w/aha driver -- distribution floppy
  #
! #	$Id: GENERICAHA,v 1.20.2.3 1993/08/05 02:45:02 cgd Exp $
  #
  
  machine		"i386"
--- 1,7 ----
  #
  # GENERICAHA -- Generic machine w/aha driver -- distribution floppy
  #
! #	$Id: GENERICAHA,v 1.20.2.4 1993/08/25 23:58:11 cgd Exp $
  #
  
  machine		"i386"
***************
*** 64,69 ****
--- 64,70 ----
  device		lpa1	at isa? port "IO_LPT2" tty
  
  device ed0 at isa? port 0x280 net irq 9 iomem 0xd0000 vector edintr
+ device ed1 at isa? port 0x250 net irq 9 iomem 0xd8000 vector edintr
  #device we0 at isa? port 0x280 net irq 9 iomem 0xd0000 iosiz 8192 vector weintr
  #device ec0 at isa? port 0x250 net irq 9 iomem 0xd8000 iosiz 8192 vector ecintr
  device ne0 at isa? port 0x300 net irq 9 vector neintr
diff -c src/sys/arch/i386/conf/GENERICAHBBT:1.16.2.3 src/sys/arch/i386/conf/GENERICAHBBT:1.16.2.4
*** src/sys/arch/i386/conf/GENERICAHBBT:1.16.2.3	Wed Aug 25 17:15:09 1993
--- src/sys/arch/i386/conf/GENERICAHBBT	Wed Aug 25 17:15:09 1993
***************
*** 1,7 ****
  #
  # GENERICAHBBT -- Generic machine w/ahb and bt drivers -- distribution floppy
  #
! #	$Id: GENERICAHBBT,v 1.16.2.3 1993/08/05 02:45:05 cgd Exp $
  #
  
  machine		"i386"
--- 1,7 ----
  #
  # GENERICAHBBT -- Generic machine w/ahb and bt drivers -- distribution floppy
  #
! #	$Id: GENERICAHBBT,v 1.16.2.4 1993/08/25 23:58:14 cgd Exp $
  #
  
  machine		"i386"
***************
*** 73,78 ****
--- 73,79 ----
  device		lpa1	at isa? port "IO_LPT2" tty
  
  device ed0 at isa? port 0x280 net irq 9 iomem 0xd0000 vector edintr
+ device ed1 at isa? port 0x250 net irq 9 iomem 0xd8000 vector edintr
  #device we0 at isa? port 0x280 net irq 9 iomem 0xd0000 iosiz 8192 vector weintr
  #device ec0 at isa? port 0x250 net irq 9 iomem 0xd8000 iosiz 8192 vector ecintr
  device ne0 at isa? port 0x300 net irq 9 vector neintr
diff -c src/sys/arch/i386/isa/if_ed.c:1.2.2.5 src/sys/arch/i386/isa/if_ed.c:1.2.2.6
*** src/sys/arch/i386/isa/if_ed.c:1.2.2.5	Wed Aug 25 17:15:21 1993
--- src/sys/arch/i386/isa/if_ed.c	Wed Aug 25 17:15:22 1993
***************
*** 14,20 ****
   */
  
  /*
!  *	$Id: if_ed.c,v 1.2.2.5 1993/07/27 06:00:45 cgd Exp $
   */
   
  #include "ed.h"
--- 14,20 ----
   */
  
  /*
!  *	$Id: if_ed.c,v 1.2.2.6 1993/08/25 23:58:34 cgd Exp $
   */
   
  #include "ed.h"
***************
*** 809,822 ****
  	if (sc->memwidth == 16) {
  		/*
  		 * Set FIFO threshold to 8, No auto-init Remote DMA,
! 		 *	byte order=80x86, word-wide DMA xfers
  		 */
! 		outb(sc->nic_addr + ED_P0_DCR, ED_DCR_FT1|ED_DCR_WTS);
  	} else {
  		/*
  		 * Same as above, but byte-wide DMA xfers
  		 */
! 		outb(sc->nic_addr + ED_P0_DCR, ED_DCR_FT1);
  	}
  
  	/*
--- 809,822 ----
  	if (sc->memwidth == 16) {
  		/*
  		 * Set FIFO threshold to 8, No auto-init Remote DMA,
! 		 *	byte order=80x86, word-wide DMA xfers,
  		 */
! 		outb(sc->nic_addr + ED_P0_DCR, ED_DCR_FT1|ED_DCR_WTS|ED_DCR_LS);
  	} else {
  		/*
  		 * Same as above, but byte-wide DMA xfers
  		 */
! 		outb(sc->nic_addr + ED_P0_DCR, ED_DCR_FT1|ED_DCR_LS);
  	}
  
  	/*
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX END OF PATCH 001
-- 
chris g. demetriou                                   cgd@cs.berkeley.edu

                    smarter than your average clam.