From e2b108cb166790a13db9fa66f85486aa50c544bc Mon Sep 17 00:00:00 2001 From: skrll Date: Tue, 11 Jan 2005 18:41:59 +0000 Subject: [PATCH] Add iwi(4). --- sys/arch/i386/conf/GENERIC | 5 +++-- sys/arch/i386/conf/GENERIC_LAPTOP | 5 +++-- sys/arch/i386/conf/INSTALL_LAPTOP | 3 ++- sys/dev/pci/files.pci | 7 ++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index f2e62e80629c..7570d95aea90 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.647 2005/01/07 01:31:14 perry Exp $ +# $NetBSD: GENERIC,v 1.648 2005/01/11 18:43:42 skrll Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.647 $" +#ident "GENERIC-$Revision: 1.648 $" maxusers 32 # estimated number of users @@ -755,6 +755,7 @@ ex* at pci? dev ? function ? # 3Com 90x[BC] fpa* at pci? dev ? function ? # DEC DEFPA FDDI fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 +iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet #hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ le* at pci? dev ? function ? # PCnet-PCI Ethernet diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index 2046a2cb1985..7cbeeaed560e 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.125 2004/12/06 19:28:12 cube Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.126 2005/01/11 18:43:42 skrll Exp $ # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.125 $" +#ident "GENERIC-$Revision: 1.126 $" maxusers 32 # estimated number of users @@ -557,6 +557,7 @@ bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet ex* at pci? dev ? function ? # 3Com 90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 +iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG ne* at pci? dev ? function ? # NE2000-compatible Ethernet re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP index 72d422b4b319..fcac0cbae8a7 100644 --- a/sys/arch/i386/conf/INSTALL_LAPTOP +++ b/sys/arch/i386/conf/INSTALL_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_LAPTOP,v 1.76 2004/12/06 19:28:12 cube Exp $ +# $NetBSD: INSTALL_LAPTOP,v 1.77 2005/01/11 18:43:42 skrll Exp $ # # INSTALL - Installation kernel. # @@ -430,6 +430,7 @@ bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet ex* at pci? dev ? function ? # 3Com 90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 +iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG ne* at pci? dev ? function ? # NE2000-compatible Ethernet re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index c45f9170a83c..e65f57b989ca 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.226 2004/12/06 19:23:09 cube Exp $ +# $NetBSD: files.pci,v 1.227 2005/01/11 18:41:59 skrll Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -751,3 +751,8 @@ file dev/pci/if_ipw.c ipw # device declaration in sys/conf/files attach njs at pci with njs_pci file dev/pci/njs_pci.c njs_pci + +# Intel PRO/Wireless 2200BG/2915ABG +device iwi: ifnet, wlan +attach iwi at pci +file dev/pci/if_iwi.c iwi