From owner-p4-projects@FreeBSD.ORG Wed May 24 21:30:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21E4416A42A; Wed, 24 May 2006 21:30:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C14D516A456 for ; Wed, 24 May 2006 21:30:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 823ED43D4C for ; Wed, 24 May 2006 21:30:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OLTp4q072126 for ; Wed, 24 May 2006 21:29:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OLTp8q072123 for perforce@freebsd.org; Wed, 24 May 2006 21:29:51 GMT (envelope-from jhb@freebsd.org) Date: Wed, 24 May 2006 21:29:51 GMT Message-Id: <200605242129.k4OLTp8q072123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 97766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 21:30:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=97766 Change 97766 by jhb@jhb_mutex on 2006/05/24 21:29:14 Turn on ndis, iwi, ipw, ral, and ural in various NOTES files. Affected files ... .. //depot/projects/smpng/sys/amd64/conf/NOTES#30 edit .. //depot/projects/smpng/sys/i386/conf/NOTES#119 edit .. //depot/projects/smpng/sys/pc98/conf/NOTES#53 edit Differences ... ==== //depot/projects/smpng/sys/amd64/conf/NOTES#30 (text+ko) ==== @@ -221,9 +221,13 @@ # 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) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 @@ -231,7 +235,11 @@ options ED_SIC #XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device lnc +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io ==== //depot/projects/smpng/sys/i386/conf/NOTES#119 (text+ko) ==== @@ -513,14 +513,18 @@ # (requires miibus) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # nve: nVidia nForce MCP on-board Ethernet Networking # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. +# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter # wl: Lucent Wavelan (ISA card only). # Order for ISA/EISA devices is important here @@ -563,12 +567,17 @@ hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" +device iwi +device ipw device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" device nve # nVidia nForce MCP on-board Ethernet Networking +device oltr +hint.oltr.0.at="isa" +device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -579,8 +588,7 @@ hint.sr.0.port="0x300" hint.sr.0.irq="5" hint.sr.0.maddr="0xd0000" -device oltr -hint.oltr.0.at="isa" +device ural device wl hint.wl.0.at="isa" hint.wl.0.port="0x300" @@ -1058,6 +1066,10 @@ options DEBUG_SVR4 # enable verbose debugging device streams # STREAMS network driver (required for svr4). +# Enable NDIS binary driver support +options NDISAPI +device ndis + ##################################################################### # VM OPTIONS ==== //depot/projects/smpng/sys/pc98/conf/NOTES#53 (text+ko) ==== @@ -364,8 +364,10 @@ # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. +# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter # Order for ISA/EISA devices is important here @@ -388,6 +390,8 @@ hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" +device oltr +device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -399,7 +403,7 @@ hint.snc.0.irq="6" hint.snc.0.maddr="0xc0000" device sr -device oltr +device ural # # SCSI host adapters: @@ -670,6 +674,10 @@ options DEBUG_SVR4 # enable verbose debugging device streams # STREAMS network driver (required for svr4). +# Enable NDIS binary driver support +options NDISAPI +device ndis + ##################################################################### # VM OPTIONS