Date: Wed, 3 Mar 2004 22:32:45 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48113 for review Message-ID: <200403040632.i246WjMM020004@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48113 Change 48113 by peter@peter_daintree on 2004/03/03 22:32:00 sync with i386 version some more. some notes: pecoff doesn't compile, its not even in files.amd64. stl is a lost cause. I reread it, it needs major surgery, not a mere splitup. It uses the old pci and the old isa shims and does inline i386 asm. (ie: its a linux driver beaten up to compile on freebsd) correct some comments and fix some merge glitches from before, and fix some gratuitous whitespace etc changes relative to i386. I think I can now force integrate this to get a p4 baseline tracking record for the i386_hammer branch. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -184,18 +184,6 @@ # config as well, or you will not have the dependencies. The other option # is to load both as modules. -device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support - -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. -# -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - device tdfx # Enable 3Dfx Voodoo support #X#options TDFX_LINUX # Enable Linuxulator support @@ -248,16 +236,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) #X#device ath #X#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -274,7 +263,6 @@ # ncv: NCR 53C500 based SCSI host adapters. # nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # stg: TMC 18C30, 18C50 based SCSI host adapters. -# device ncv device nsp @@ -305,8 +293,6 @@ # # cy: Cyclades serial driver # digi: Digiboard driver -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -314,6 +300,8 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. +device cy 1 +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -326,8 +314,6 @@ device digi_Xe device digi_Xem device digi_Xr -#XXX# PCI versions exist, but driver needs to be moved and split up. -#XXX#device stl # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -372,7 +358,6 @@ # PCI bus Cards: # -------------- # -# # ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) options ELSA_QS1PCI #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403040632.i246WjMM020004>