add usb and mtd driver

[openwrt.git] / openwrt / target / linux / linux-2.6 / patches / brcm / 001-bcm947xx.patch

diff -Nur linux-2.6.12.5/arch/mips/Kconfig linux-2.6.12.5-brcm/arch/mips/Kconfig
--- linux-2.6.12.5/arch/mips/Kconfig    2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/Kconfig       2005-08-28 16:21:04.700803432 +0200
@@ -40,6 +40,15 @@
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
         Olivetti M700-10 workstations.
 
+config BCM947XX
+       bool "Support for BCM947xx based boards"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select CPU_LITTLE_ENDIAN
+       help
+        Support for BCM947xx based boards
+        
 config ACER_PICA_61
        bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)"
        depends on MACH_JAZZ && EXPERIMENTAL
@@ -974,7 +983,7 @@
 
 config CPU_LITTLE_ENDIAN
        bool "Generate little endian code"
-       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
+       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA || BCM47XX
        default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
        help
          Some MIPS machines can be configured for either little or big endian
diff -Nur linux-2.6.12.5/arch/mips/Kconfig.orig linux-2.6.12.5-brcm/arch/mips/Kconfig.orig
--- linux-2.6.12.5/arch/mips/Kconfig.orig       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/Kconfig.orig  2005-08-15 02:20:18.000000000 +0200
@@ -0,0 +1,1662 @@
+config MIPS
+       bool
+       default y
+       # Horrible source of confusion.  Die, die, die ...
+       select EMBEDDED
+
+config MIPS64
+       bool "64-bit kernel"
+       help
+         Select this option if you want to build a 64-bit kernel.  You should
+         only select this option if you have hardware that actually has a
+         64-bit processor and if your application will actually benefit from
+         64-bit processing, otherwise say N.  You must say Y for kernels for
+         SGI IP27 (Origin 200 and 2000) and SGI IP32 (O2).  If in doubt say N.
+
+config 64BIT
+       def_bool MIPS64
+
+config MIPS32
+       bool
+       depends on MIPS64 = 'n'
+       default y
+
+mainmenu "Linux/MIPS Kernel Configuration"
+
+source "init/Kconfig"
+
+menu "Machine selection"
+
+config MACH_JAZZ
+       bool "Support for the Jazz family of machines"
+       select ARC
+       select ARC32
+       select GENERIC_ISA_DMA
+       select I8259
+       select ISA
+       help
+        This a family of machines based on the MIPS R4030 chipset which was
+        used by several vendors to build RISC/os and Windows NT workstations.
+        Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
+        Olivetti M700-10 workstations.
+
+config ACER_PICA_61
+       bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)"
+       depends on MACH_JAZZ && EXPERIMENTAL
+       select DMA_NONCOHERENT
+       help
+         This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
+         kernel that runs on these, say Y here. For details about Linux on
+         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+         <http://www.linux-mips.org/>.
+
+config MIPS_MAGNUM_4000
+       bool "Support for MIPS Magnum 4000"
+       depends on MACH_JAZZ
+       select DMA_NONCOHERENT
+       help
+         This is a machine with a R4000 100 MHz CPU. To compile a Linux
+         kernel that runs on these, say Y here. For details about Linux on
+         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+         <http://www.linux-mips.org/>.
+
+config OLIVETTI_M700
+       bool "Support for Olivetti M700-10"
+       depends on MACH_JAZZ
+       select DMA_NONCOHERENT
+       help
+         This is a machine with a R4000 100 MHz CPU. To compile a Linux
+         kernel that runs on these, say Y here. For details about Linux on
+         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
+         <http://www.linux-mips.org/>.
+
+config MACH_VR41XX
+       bool "Support for NEC VR41XX-based machines"
+
+config NEC_CMBVR4133
+       bool "Support for NEC CMB-VR4133"
+       depends on MACH_VR41XX
+       select CPU_VR41XX
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select HW_HAS_PCI
+       select PCI_VR41XX
+
+config ROCKHOPPER
+       bool "Support for Rockhopper baseboard"
+       depends on NEC_CMBVR4133
+       select I8259
+       select HAVE_STD_PC_SERIAL_PORT
+
+config CASIO_E55
+       bool "Support for CASIO CASSIOPEIA E-10/15/55/65"
+       depends on MACH_VR41XX
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select ISA
+
+config IBM_WORKPAD
+       bool "Support for IBM WorkPad z50"
+       depends on MACH_VR41XX
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select ISA
+
+config TANBAC_TB0226
+       bool "Support for TANBAC TB0226 (Mbase)"
+       depends on MACH_VR41XX
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       help
+         The TANBAC TB0226 (Mbase) is a MIPS-based platform manufactured by TANBAC.
+         Please refer to <http://www.tanbac.co.jp/> about Mbase.
+
+config TANBAC_TB0229
+       bool "Support for TANBAC TB0229 (VR4131DIMM)"
+       depends on MACH_VR41XX
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       help
+         The TANBAC TB0229 (VR4131DIMM) is a MIPS-based platform manufactured by TANBAC.
+         Please refer to <http://www.tanbac.co.jp/> about VR4131DIMM.
+
+config VICTOR_MPC30X
+       bool "Support for Victor MP-C303/304"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       depends on MACH_VR41XX
+
+config ZAO_CAPCELLA
+       bool "Support for ZAO Networks Capcella"
+       depends on MACH_VR41XX
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+
+config PCI_VR41XX
+       bool "Add PCI control unit support of NEC VR4100 series"
+       depends on MACH_VR41XX && PCI
+
+config VRC4171
+       tristate "Add NEC VRC4171 companion chip support"
+       depends on MACH_VR41XX && ISA
+       ---help---
+         The NEC VRC4171/4171A is a companion chip for NEC VR4111/VR4121.
+
+config VRC4173
+       tristate "Add NEC VRC4173 companion chip support"
+       depends on MACH_VR41XX && PCI_VR41XX
+       ---help---
+         The NEC VRC4173 is a companion chip for NEC VR4122/VR4131.
+
+config TOSHIBA_JMR3927
+       bool "Support for Toshiba JMR-TX3927 board"
+       depends on MIPS32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select SWAP_IO_SPACE
+
+config MIPS_COBALT
+       bool "Support for Cobalt Server (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select I8259
+       select IRQ_CPU
+
+config MACH_DECSTATION
+       bool "Support for DECstations"
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       depends on MIPS32 || EXPERIMENTAL
+       ---help---
+         This enables support for DEC's MIPS based workstations.  For details
+         see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
+         DECstation porting pages on <http://decstation.unix-ag.org/>.
+
+         If you have one of the following DECstation Models you definitely
+         want to choose R4xx0 for the CPU Type:
+
+               DECstation 5000/50
+               DECstation 5000/150
+               DECstation 5000/260
+               DECsystem 5900/260
+
+         otherwise choose R3000.
+
+config MIPS_EV64120
+       bool "Support for Galileo EV64120 Evaluation board (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_GT64120
+       help
+         This is an evaluation board based on the Galileo GT-64120
+         single-chip system controller that contains a MIPS R5000 compatible
+         core running at 75/100MHz.  Their website is located at
+         <http://www.marvell.com/>.  Say Y here if you wish to build a
+         kernel for this platform.
+
+config EVB_PCI1
+       bool "Enable Second PCI (PCI1)"
+       depends on MIPS_EV64120
+
+config MIPS_EV96100
+       bool "Support for Galileo EV96100 Evaluation board (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select MIPS_GT96100
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         This is an evaluation board based on the Galileo GT-96100 LAN/WAN
+         communications controllers containing a MIPS R5000 compatible core
+         running at 83MHz. Their website is <http://www.marvell.com/>. Say Y
+         here if you wish to build a kernel for this platform.
+
+config MIPS_IVR
+       bool "Support for Globespan IVR board"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       help
+         This is an evaluation board built by Globespan to showcase thir
+         iVR (Internet Video Recorder) design. It utilizes a QED RM5231
+         R5000 MIPS core. More information can be found out their website
+         located at <http://www.globespan.net/>. Say Y here if you wish to
+         build a kernel for this platform.
+
+config LASAT
+       bool "Support for LASAT Networks platforms"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_GT64120
+       select R5000_CPU_SCACHE
+
+config PICVUE
+       tristate "PICVUE LCD display driver"
+       depends on LASAT
+
+config PICVUE_PROC
+       tristate "PICVUE LCD display driver /proc interface"
+       depends on PICVUE
+
+config DS1603
+       bool "DS1603 RTC driver"
+       depends on LASAT
+
+config LASAT_SYSCTL
+       bool "LASAT sysctl interface"
+       depends on LASAT
+
+config MIPS_ITE8172
+       bool "Support for ITE 8172G board"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       help
+         Ths is an evaluation board made by ITE <http://www.ite.com.tw/>
+         with ATX form factor that utilizes a MIPS R5000 to work with its
+         ITE8172G companion internet appliance chip. The MIPS core can be
+         either a NEC Vr5432 or QED RM5231. Say Y here if you wish to build
+         a kernel for this platform.
+
+config IT8172_REVC
+       bool "Support for older IT8172 (Rev C)"
+       depends on MIPS_ITE8172
+       help
+         Say Y here to support the older, Revision C version of the Integrated
+         Technology Express, Inc. ITE8172 SBC.  Vendor page at
+         <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
+         board at <http://www.mvista.com/partners/semiconductor/ite.html>.
+
+config MIPS_ATLAS
+       bool "Support for MIPS Atlas board"
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_GT64120
+       select SWAP_IO_SPACE
+       help
+         This enables support for the QED R5231-based MIPS Atlas evaluation
+         board.
+
+config MIPS_MALTA
+       bool "Support for MIPS Malta board"
+       select BOOT_ELF32
+       select HAVE_STD_PC_SERIAL_PORT
+       select DMA_NONCOHERENT
+       select GENERIC_ISA_DMA
+       select HW_HAS_PCI
+       select I8259
+       select MIPS_GT64120
+       select SWAP_IO_SPACE
+       help
+         This enables support for the VR5000-based MIPS Malta evaluation
+         board.
+
+config MIPS_SEAD
+       bool "Support for MIPS SEAD board (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select IRQ_CPU
+       select DMA_NONCOHERENT
+
+config MOMENCO_OCELOT
+       bool "Support for Momentum Ocelot board"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select MIPS_GT64120
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+         Momentum Computer <http://www.momenco.com/>.
+
+config MOMENCO_OCELOT_G
+       bool "Support for Momentum Ocelot-G board"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select PCI_MARVELL
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+         Momentum Computer <http://www.momenco.com/>.
+
+config MOMENCO_OCELOT_C
+       bool "Support for Momentum Ocelot-C board"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_MV64340
+       select PCI_MARVELL
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+         Momentum Computer <http://www.momenco.com/>.
+
+config MOMENCO_OCELOT_3
+       bool "Support for Momentum Ocelot-3 board"
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select IRQ_MV64340
+       select PCI_MARVELL
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         The Ocelot-3 is based off Discovery III System Controller and
+         PMC-Sierra Rm79000 core.
+
+config MOMENCO_JAGUAR_ATX
+       bool "Support for Momentum Jaguar board"
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select IRQ_MV64340
+       select LIMITED_DMA
+       select PCI_MARVELL
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       help
+         The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by
+         Momentum Computer <http://www.momenco.com/>.
+
+config JAGUAR_DMALOW
+       bool "Low DMA Mode"
+       depends on MOMENCO_JAGUAR_ATX
+       help
+         Select to Y if jump JP5 is set on your board, N otherwise.  Normally
+         the jumper is set, so if you feel unsafe, just say Y.
+
+config PMC_YOSEMITE
+       bool "Support for PMC-Sierra Yosemite eval board"
+       select DMA_COHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select IRQ_CPU_RM9K
+       select SWAP_IO_SPACE
+       help
+         Yosemite is an evaluation board for the RM9000x2 processor
+         manufactured by PMC-Sierra
+
+config HYPERTRANSPORT
+       bool "Hypertransport Support for PMC-Sierra Yosemite"
+       depends on PMC_YOSEMITE
+
+config DDB5074
+       bool "Support for NEC DDB Vrc-5074 (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select DMA_NONCOHERENT
+       select HAVE_STD_PC_SERIAL_PORT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select I8259
+       select ISA
+       help
+         This enables support for the VR5000-based NEC DDB Vrc-5074
+         evaluation board.
+
+config DDB5476
+       bool "Support for NEC DDB Vrc-5476"
+       select DMA_NONCOHERENT
+       select HAVE_STD_PC_SERIAL_PORT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select I8259
+       select ISA
+       help
+         This enables support for the R5432-based NEC DDB Vrc-5476
+         evaluation board.
+
+         Features : kernel debugging, serial terminal, NFS root fs, on-board
+         ether port USB, AC97, PCI, PCI VGA card & framebuffer console,
+         IDE controller, PS2 keyboard, PS2 mouse, etc.
+
+config DDB5477
+       bool "Support for NEC DDB Vrc-5477"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select I8259
+       select IRQ_CPU
+       help
+         This enables support for the R5432-based NEC DDB Vrc-5477,
+         or Rockhopper/SolutionGear boards with R5432/R5500 CPUs.
+
+         Features : kernel debugging, serial terminal, NFS root fs, on-board
+         ether port USB, AC97, PCI, etc.
+
+config DDB5477_BUS_FREQUENCY
+       int "bus frequency (in kHZ, 0 for auto-detect)"
+       depends on DDB5477
+       default 0
+
+config NEC_OSPREY
+       bool "Support for NEC Osprey board"
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+
+config SGI_IP22
+       bool "Support for SGI IP22 (Indy/Indigo2)"
+       select ARC
+       select ARC32
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select IP22_CPU_SCACHE
+       select IRQ_CPU
+       select SWAP_IO_SPACE
+       help
+         This are the SGI Indy, Challenge S and Indigo2, as well as certain
+         OEM variants like the Tandem CMN B006S. To compile a Linux kernel
+         that runs on these, say Y here.
+
+config SGI_IP27
+       bool "Support for SGI IP27 (Origin200/2000)"
+       depends on MIPS64
+       select ARC
+       select ARC64
+       select DMA_IP27
+       select HW_HAS_PCI
+       select PCI_DOMAINS
+       help
+         This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
+         workstations.  To compile a Linux kernel that runs on these, say Y
+         here.
+
+#config SGI_SN0_XXL
+#      bool "IP27 XXL"
+#      depends on SGI_IP27
+#        This options adds support for userspace processes upto 16TB size.
+#        Normally the limit is just .5TB.
+
+config SGI_SN0_N_MODE
+       bool "IP27 N-Mode"
+       depends on SGI_IP27
+       help
+         The nodes of Origin 200, Origin 2000 and Onyx 2 systems can be
+         configured in either N-Modes which allows for more nodes or M-Mode
+         which allows for more memory.  Your system is most probably
+         running in M-Mode, so you should say N here.
+
+config DISCONTIGMEM
+       bool
+       default y if SGI_IP27
+       help
+         Say Y to upport efficient handling of discontiguous physical memory,
+         for architectures which are either NUMA (Non-Uniform Memory Access)
+         or have huge holes in the physical address space for other reasons.
+         See <file:Documentation/vm/numa> for more.
+
+config NUMA
+       bool "NUMA Support"
+       depends on SGI_IP27
+       help
+         Say Y to compile the kernel to support NUMA (Non-Uniform Memory
+         Access).  This option is for configuring high-end multiprocessor
+         server machines.  If in doubt, say N.
+
+config MAPPED_KERNEL
+       bool "Mapped kernel support"
+       depends on SGI_IP27
+       help
+         Change the way a Linux kernel is loaded into memory on a MIPS64
+         machine.  This is required in order to support text replication and
+         NUMA.  If you need to understand it, read the source code.
+
+config REPLICATE_KTEXT
+       bool "Kernel text replication support"
+       depends on SGI_IP27
+       help
+         Say Y here to enable replicating the kernel text across multiple
+         nodes in a NUMA cluster.  This trades memory for speed.
+
+config REPLICATE_EXHANDLERS
+       bool "Exception handler replication support"
+       depends on SGI_IP27
+       help
+         Say Y here to enable replicating the kernel exception handlers
+         across multiple nodes in a NUMA cluster. This trades memory for
+         speed.
+
+config SGI_IP32
+       bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"
+       depends on MIPS64 && EXPERIMENTAL
+       select ARC
+       select ARC32
+       select BOOT_ELF32
+       select OWN_DMA
+       select DMA_IP32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select R5000_CPU_SCACHE
+       select RM7000_CPU_SCACHE
+       help
+         If you want this kernel to run on SGI O2 workstation, say Y here.
+
+config SOC_AU1X00
+       depends on MIPS32
+       bool "Support for AMD/Alchemy Au1X00 SOCs"
+
+choice
+       prompt "Au1X00 SOC Type"
+       depends on SOC_AU1X00
+       help
+         Say Y here to enable support for one of three AMD/Alchemy
+         SOCs. For additional documentation see www.amd.com.
+
+config SOC_AU1000
+       bool "SOC_AU1000"
+config SOC_AU1100
+       bool "SOC_AU1100"
+config SOC_AU1500
+       bool "SOC_AU1500"
+config SOC_AU1550
+       bool "SOC_AU1550"
+
+endchoice
+
+choice
+       prompt "AMD/Alchemy Au1x00 board support"
+       depends on SOC_AU1X00
+       help
+         These are evaluation boards built by AMD/Alchemy to
+         showcase their Au1X00 Internet Edge Processors. The SOC design
+         is based on the MIPS32 architecture running at 266/400/500MHz
+         with many integrated peripherals. Further information can be
+         found at their website, <http://www.amd.com/>. Say Y here if you
+         wish to build a kernel for this platform.
+
+config MIPS_PB1000
+       bool "PB1000 board"
+       depends on SOC_AU1000
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select SWAP_IO_SPACE
+
+config MIPS_PB1100
+       bool "PB1100 board"
+       depends on SOC_AU1100
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select SWAP_IO_SPACE
+
+config MIPS_PB1500
+       bool "PB1500 board"
+       depends on SOC_AU1500
+       select DMA_COHERENT
+       select HW_HAS_PCI
+
+config MIPS_PB1550
+       bool "PB1550 board"
+       depends on SOC_AU1550
+       select DMA_COHERENT
+       select HW_HAS_PCI
+       select MIPS_DISABLE_OBSOLETE_IDE
+
+config MIPS_DB1000
+       bool "DB1000 board"
+       depends on SOC_AU1000
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+
+config MIPS_DB1100
+       bool "DB1100 board"
+       depends on SOC_AU1100
+       select DMA_NONCOHERENT
+
+config MIPS_DB1500
+       bool "DB1500 board"
+       depends on SOC_AU1500
+       select DMA_COHERENT
+       select HW_HAS_PCI
+       select MIPS_DISABLE_OBSOLETE_IDE
+
+config MIPS_DB1550
+       bool "DB1550 board"
+       depends on SOC_AU1550
+       select HW_HAS_PCI
+       select DMA_COHERENT
+       select MIPS_DISABLE_OBSOLETE_IDE
+
+config MIPS_BOSPORUS
+       bool "Bosporus board"
+       depends on SOC_AU1500
+       select DMA_NONCOHERENT
+
+config MIPS_MIRAGE
+       bool "Mirage board"
+       depends on SOC_AU1500
+       select DMA_NONCOHERENT
+
+config MIPS_XXS1500
+       bool "MyCable XXS1500 board"
+       depends on SOC_AU1500
+       select DMA_NONCOHERENT
+
+config MIPS_MTX1
+       bool "4G Systems MTX-1 board"
+       depends on SOC_AU1500
+       select HW_HAS_PCI
+       select DMA_NONCOHERENT
+
+endchoice
+
+config SIBYTE_SB1xxx_SOC
+       bool "Support for Broadcom BCM1xxx SOCs (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT
+       select SWAP_IO_SPACE
+
+choice
+       prompt "BCM1xxx SOC-based board"
+       depends on SIBYTE_SB1xxx_SOC
+       default SIBYTE_SWARM
+       help
+         Enable support for boards based on the SiByte line of SOCs
+         from Broadcom.  There are configurations for the known
+         evaluation boards, or you can choose "Other" and add your
+         own board support code.
+
+config SIBYTE_SWARM
+       bool "BCM91250A-SWARM"
+       select SIBYTE_SB1250
+
+config SIBYTE_SENTOSA
+       bool "BCM91250E-Sentosa"
+       select SIBYTE_SB1250
+
+config SIBYTE_RHONE
+       bool "BCM91125E-Rhone"
+       select SIBYTE_BCM1125H
+
+config SIBYTE_CARMEL
+       bool "BCM91120x-Carmel"
+       select SIBYTE_BCM1120
+
+config SIBYTE_PTSWARM
+       bool "BCM91250PT-PTSWARM"
+       select SIBYTE_SB1250
+
+config SIBYTE_LITTLESUR
+       bool "BCM91250C2-LittleSur"
+       select SIBYTE_SB1250
+
+config SIBYTE_CRHINE
+       bool "BCM91120C-CRhine"
+       select SIBYTE_BCM1120
+
+config SIBYTE_CRHONE
+       bool "BCM91125C-CRhone"
+       select SIBYTE_BCM1125
+
+config SIBYTE_UNKNOWN
+       bool "Other"
+
+endchoice
+
+config SIBYTE_BOARD
+       bool
+       depends on SIBYTE_SB1xxx_SOC && !SIBYTE_UNKNOWN
+       default y
+
+choice
+       prompt "BCM1xxx SOC Type"
+       depends on SIBYTE_UNKNOWN
+       default SIBYTE_UNK_BCM1250
+       help
+         Since you haven't chosen a known evaluation board from
+         Broadcom, you must explicitly pick the SOC this kernel is
+         targetted for.
+
+config SIBYTE_UNK_BCM1250
+       bool "BCM1250"
+       select SIBYTE_SB1250
+
+config SIBYTE_UNK_BCM1120
+       bool "BCM1120"
+       select SIBYTE_BCM1120
+
+config SIBYTE_UNK_BCM1125
+       bool "BCM1125"
+       select SIBYTE_BCM1125
+
+config SIBYTE_UNK_BCM1125H
+       bool "BCM1125H"
+       select SIBYTE_BCM1125H
+
+endchoice
+
+config SIBYTE_SB1250
+       bool
+       select HW_HAS_PCI
+
+config SIBYTE_BCM1120
+       bool
+       select SIBYTE_BCM112X
+
+config SIBYTE_BCM1125
+       bool
+       select HW_HAS_PCI
+       select SIBYTE_BCM112X
+
+config SIBYTE_BCM1125H
+       bool
+       select HW_HAS_PCI
+       select SIBYTE_BCM112X
+
+config SIBYTE_BCM112X
+       bool
+
+choice
+       prompt "SiByte SOC Stepping"
+       depends on SIBYTE_SB1xxx_SOC
+
+config CPU_SB1_PASS_1
+       bool "1250 Pass1"
+       depends on SIBYTE_SB1250
+       select CPU_HAS_PREFETCH
+
+config CPU_SB1_PASS_2_1250
+       bool "1250 An"
+       depends on SIBYTE_SB1250
+       select CPU_SB1_PASS_2
+       help
+         Also called BCM1250 Pass 2
+
+config CPU_SB1_PASS_2_2
+       bool "1250 Bn"
+       depends on SIBYTE_SB1250
+       select CPU_HAS_PREFETCH
+       help
+         Also called BCM1250 Pass 2.2
+
+config CPU_SB1_PASS_4
+       bool "1250 Cn"
+       depends on SIBYTE_SB1250
+       select CPU_HAS_PREFETCH
+       help
+         Also called BCM1250 Pass 3
+
+config CPU_SB1_PASS_2_112x
+       bool "112x Hybrid"
+       depends on SIBYTE_BCM112X
+       select CPU_SB1_PASS_2
+
+config CPU_SB1_PASS_3
+       bool "112x An"
+       depends on SIBYTE_BCM112X
+       select CPU_HAS_PREFETCH
+
+endchoice
+
+config CPU_SB1_PASS_2
+       bool
+
+config SIBYTE_HAS_LDT
+       bool
+       depends on PCI && (SIBYTE_SB1250 || SIBYTE_BCM1125H)
+       default y
+
+config SIMULATION
+       bool "Running under simulation"
+       depends on SIBYTE_SB1xxx_SOC
+       help
+         Build a kernel suitable for running under the GDB simulator.
+         Primarily adjusts the kernel's notion of time.
+
+config SIBYTE_CFE
+       bool "Booting from CFE"
+       depends on SIBYTE_SB1xxx_SOC
+       help
+         Make use of the CFE API for enumerating available memory,
+         controlling secondary CPUs, and possibly console output.
+
+config SIBYTE_CFE_CONSOLE
+       bool "Use firmware console"
+       depends on SIBYTE_CFE
+       help
+         Use the CFE API's console write routines during boot.  Other console
+         options (VT console, sb1250 duart console, etc.) should not be
+         configured.
+
+config SIBYTE_STANDALONE
+       bool
+       depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
+       default y
+
+config SIBYTE_STANDALONE_RAM_SIZE
+       int "Memory size (in megabytes)"
+       depends on SIBYTE_STANDALONE
+       default "32"
+
+config SIBYTE_BUS_WATCHER
+       bool "Support for Bus Watcher statistics"
+       depends on SIBYTE_SB1xxx_SOC
+       help
+         Handle and keep statistics on the bus error interrupts (COR_ECC,
+         BAD_ECC, IO_BUS).
+
+config SIBYTE_BW_TRACE
+       bool "Capture bus trace before bus error"
+       depends on SIBYTE_BUS_WATCHER
+       help
+         Run a continuous bus trace, dumping the raw data as soon as
+         a ZBbus error is detected.  Cannot work if ZBbus profiling
+         is turned on, and also will interfere with JTAG-based trace
+         buffer activity.  Raw buffer data is dumped to console, and
+         must be processed off-line.
+
+config SIBYTE_SB1250_PROF
+       bool "Support for SB1/SOC profiling - SB1/SCD perf counters"
+       depends on SIBYTE_SB1xxx_SOC
+
+config SIBYTE_TBPROF
+       bool "Support for ZBbus profiling"
+       depends on SIBYTE_SB1xxx_SOC
+
+config SNI_RM200_PCI
+       bool "Support for SNI RM200 PCI"
+       select ARC
+       select ARC32
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select GENERIC_ISA_DMA
+       select HAVE_STD_PC_SERIAL_PORT
+       select HW_HAS_PCI
+       select I8259
+       select ISA
+       help
+         The SNI RM200 PCI was a MIPS-based platform manufactured by Siemens
+         Nixdorf Informationssysteme (SNI), parent company of Pyramid
+         Technology and now in turn merged with Fujitsu.  Say Y here to
+         support this machine type.
+
+config TOSHIBA_RBTX4927
+       bool "Support for Toshiba TBTX49[23]7 board"
+       depends on MIPS32
+       select DMA_NONCOHERENT
+       select HAS_TXX9_SERIAL
+       select HW_HAS_PCI
+       select I8259
+       select ISA
+       select SWAP_IO_SPACE
+       help
+         This Toshiba board is based on the TX4927 processor. Say Y here to
+         support this machine type
+
+config TOSHIBA_FPCIB0
+       bool "FPCIB0 Backplane Support"
+       depends on TOSHIBA_RBTX4927
+
+config RWSEM_GENERIC_SPINLOCK
+       bool
+       default y
+
+config RWSEM_XCHGADD_ALGORITHM
+       bool
+
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
+config HAVE_DEC_LOCK
+       bool
+       default y
+
+#
+# Select some configuration options automatically based on user selections.
+#
+config ARC
+       bool
+       depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61
+       default y
+
+config DMA_COHERENT
+       bool
+
+config DMA_IP27
+       bool
+
+config DMA_NONCOHERENT
+       bool
+
+config EARLY_PRINTK
+       bool
+       depends on MACH_DECSTATION
+       default y
+
+config GENERIC_ISA_DMA
+       bool
+       depends on SNI_RM200_PCI || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61 || MIPS_MALTA
+       default y
+
+config I8259
+       bool
+       depends on SNI_RM200_PCI || DDB5477 || DDB5476 || DDB5074 || MACH_JAZZ || MIPS_MALTA || MIPS_COBALT
+       default y
+
+config LIMITED_DMA
+       bool
+       select HIGHMEM
+
+config MIPS_BONITO64
+       bool
+       depends on MIPS_ATLAS || MIPS_MALTA
+       default y
+
+config MIPS_MSC
+       bool
+       depends on MIPS_ATLAS || MIPS_MALTA
+       default y
+
+config MIPS_NILE4
+       bool
+       depends on LASAT
+       default y
+
+config MIPS_DISABLE_OBSOLETE_IDE
+       bool
+
+config CPU_LITTLE_ENDIAN
+       bool "Generate little endian code"
+       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
+       default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
+       help
+         Some MIPS machines can be configured for either little or big endian
+         byte order. These modes require different kernels. Say Y if your
+         machine is little endian, N if it's a big endian machine.
+
+config IRQ_CPU
+       bool
+
+config IRQ_CPU_RM7K
+       bool
+
+config IRQ_MV64340
+       bool
+
+config DDB5XXX_COMMON
+       bool
+       depends on DDB5074 || DDB5476 || DDB5477
+       default y
+
+config MIPS_BOARDS_GEN
+       bool
+       depends on MIPS_ATLAS || MIPS_MALTA || MIPS_SEAD
+       default y
+
+config MIPS_GT64111
+       bool
+       depends on MIPS_COBALT
+       default y
+
+config MIPS_GT64120
+       bool
+       depends on MIPS_EV64120 || MIPS_EV96100 || LASAT || MIPS_ATLAS || MIPS_MALTA || MOMENCO_OCELOT
+       default y
+
+config MIPS_TX3927
+       bool
+       depends on TOSHIBA_JMR3927
+       select HAS_TXX9_SERIAL
+       default y
+
+config PCI_MARVELL
+       bool
+
+config ITE_BOARD_GEN
+       bool
+       depends on MIPS_IVR || MIPS_ITE8172
+       default y
+
+config SWAP_IO_SPACE
+       bool
+
+#
+# Unfortunately not all GT64120 systems run the chip at the same clock.
+# As the user for the clock rate and try to minimize the available options.
+#
+choice
+       prompt "Galileo Chip Clock"
+       #default SYSCLK_83 if MIPS_EV64120
+       depends on MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G
+       default SYSCLK_83 if MIPS_EV64120
+       default SYSCLK_100 if MOMENCO_OCELOT || MOMENCO_OCELOT_G
+
+config SYSCLK_75
+       bool "75" if MIPS_EV64120
+
+config SYSCLK_83
+       bool "83.3" if MIPS_EV64120
+
+config SYSCLK_100
+       bool "100" if MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G
+
+endchoice
+
+config AU1X00_USB_DEVICE
+       bool
+       depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
+       default n
+
+config MIPS_GT96100
+       bool
+       depends on MIPS_EV96100
+       default y
+       help
+         Say Y here to support the Galileo Technology GT96100 communications
+         controller card.  There is a web page at <http://www.galileot.com/>.
+
+config IT8172_CIR
+       bool
+       depends on MIPS_ITE8172 || MIPS_IVR
+       default y
+
+config IT8712
+       bool
+       depends on MIPS_ITE8172
+       default y
+
+config BOOT_ELF32
+       bool
+       depends on MACH_DECSTATION || MIPS_ATLAS || MIPS_MALTA || MOMENCO_JAGUAR_ATX || MOMENCO_OCELOT_3 || SIBYTE_SB1xxx_SOC || SGI_IP32 || SGI_IP22 || SNI_RM200_PCI
+       default y
+
+config MIPS_L1_CACHE_SHIFT
+       int
+       default "4" if MACH_DECSTATION
+       default "7" if SGI_IP27
+       default "5"
+
+config ARC32
+       bool
+       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32
+       default y
+
+config FB
+       bool
+       depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
+       default y
+       ---help---
+         The frame buffer device provides an abstraction for the graphics
+         hardware. It represents the frame buffer of some video hardware and
+         allows application software to access the graphics hardware through
+         a well-defined interface, so the software doesn't need to know
+         anything about the low-level (hardware register) stuff.
+
+         Frame buffer devices work identically across the different
+         architectures supported by Linux and make the implementation of
+         application programs easier and more portable; at this point, an X
+         server exists which uses the frame buffer device exclusively.
+         On several non-X86 architectures, the frame buffer device is the
+         only way to use the graphics hardware.
+
+         The device is accessed through special device nodes, usually located
+         in the /dev directory, i.e. /dev/fb*.
+
+         You need an utility program called fbset to make full use of frame
+         buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
+         and the Framebuffer-HOWTO at <http://www.tldp.org/docs.html#howto>
+         for more information.
+
+         Say Y here and to the driver for your graphics board below if you
+         are compiling a kernel for a non-x86 architecture.
+
+         If you are compiling for the x86 architecture, you can say Y if you
+         want to play with it, but it is not essential. Please note that
+         running graphical applications that directly touch the hardware
+         (e.g. an accelerated X server) and that are not frame buffer
+         device-aware may cause unexpected results. If unsure, say N.
+
+config HAVE_STD_PC_SERIAL_PORT
+       bool
+
+config VR4181
+       bool
+       depends on NEC_OSPREY
+       default y
+
+config ARC_CONSOLE
+       bool "ARC console support"
+       depends on SGI_IP22 || SNI_RM200_PCI
+
+config ARC_MEMORY
+       bool
+       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP32
+       default y
+
+config ARC_PROMLIB
+       bool
+       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32
+       default y
+
+config ARC64
+       bool
+       depends on SGI_IP27
+       default y
+
+config BOOT_ELF64
+       bool
+       depends on SGI_IP27
+       default y
+
+#config MAPPED_PCI_IO y
+#      bool
+#      depends on SGI_IP27
+#      default y
+
+config QL_ISP_A64
+       bool
+       depends on SGI_IP27
+       default y
+
+config TOSHIBA_BOARDS
+       bool
+       depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
+       default y
+
+endmenu
+
+menu "CPU selection"
+
+choice
+       prompt "CPU type"
+       default CPU_R4X00
+
+config CPU_MIPS32
+       bool "MIPS32"
+
+config CPU_MIPS64
+       bool "MIPS64"
+
+config CPU_R3000
+       bool "R3000"
+       depends on MIPS32
+       help
+         Please make sure to pick the right CPU type. Linux/MIPS is not
+         designed to be generic, i.e. Kernels compiled for R3000 CPUs will
+         *not* work on R4000 machines and vice versa.  However, since most
+         of the supported machines have an R4000 (or similar) CPU, R4x00
+         might be a safe bet.  If the resulting kernel does not work,
+         try to recompile with R3000.
+
+config CPU_TX39XX
+       bool "R39XX"
+       depends on MIPS32
+
+config CPU_VR41XX
+       bool "R41xx"
+       help
+         The options selects support for the NEC VR41xx series of processors.
+         Only choose this option if you have one of these processors as a
+         kernel built with this option will not run on any other type of
+         processor or vice versa.
+
+config CPU_R4300
+       bool "R4300"
+       help
+         MIPS Technologies R4300-series processors.
+
+config CPU_R4X00
+       bool "R4x00"
+       help
+         MIPS Technologies R4000-series processors other than 4300, including
+         the R4000, R4400, R4600, and 4700.
+
+config CPU_TX49XX
+       bool "R49XX"
+
+config CPU_R5000
+       bool "R5000"
+       help
+         MIPS Technologies R5000-series processors other than the Nevada.
+
+config CPU_R5432
+       bool "R5432"
+
+config CPU_R6000
+       bool "R6000"
+       depends on MIPS32 && EXPERIMENTAL
+       help
+         MIPS Technologies R6000 and R6000A series processors.  Note these
+         processors are extremly rare and the support for them is incomplete.
+
+config CPU_NEVADA
+       bool "RM52xx"
+       help
+         QED / PMC-Sierra RM52xx-series ("Nevada") processors.
+
+config CPU_R8000
+       bool "R8000"
+       depends on MIPS64 && EXPERIMENTAL
+       help
+         MIPS Technologies R8000 processors.  Note these processors are
+         uncommon and the support for them is incomplete.
+
+config CPU_R10000
+       bool "R10000"
+       help
+         MIPS Technologies R10000-series processors.
+
+config CPU_RM7000
+       bool "RM7000"
+
+config CPU_RM9000
+       bool "RM9000"
+
+config CPU_SB1
+       bool "SB1"
+
+endchoice
+
+choice
+       prompt "Kernel page size"
+       default PAGE_SIZE_4KB
+
+config PAGE_SIZE_4KB
+       bool "4kB"
+       help
+        This option select the standard 4kB Linux page size.  On some
+        R3000-family processors this is the only available page size.  Using
+        4kB page size will minimize memory consumption and is therefore
+        recommended for low memory systems.
+
+config PAGE_SIZE_8KB
+       bool "8kB"
+       depends on EXPERIMENTAL && CPU_R8000
+       help
+         Using 8kB page size will result in higher performance kernel at
+         the price of higher memory consumption.  This option is available
+         only on the R8000 processor.  Not that at the time of this writing
+         this option is still high experimental; there are also issues with
+         compatibility of user applications.
+
+config PAGE_SIZE_16KB
+       bool "16kB"
+       depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
+       help
+         Using 16kB page size will result in higher performance kernel at
+         the price of higher memory consumption.  This option is available on
+         all non-R3000 family processor.  Not that at the time of this
+         writing this option is still high experimental; there are also
+         issues with compatibility of user applications.
+
+config PAGE_SIZE_64KB
+       bool "64kB"
+       depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
+       help
+         Using 64kB page size will result in higher performance kernel at
+         the price of higher memory consumption.  This option is available on
+         all non-R3000 family processor.  Not that at the time of this
+         writing this option is still high experimental; there are also
+         issues with compatibility of user applications.
+
+endchoice
+
+config BOARD_SCACHE
+       bool
+
+config IP22_CPU_SCACHE
+       bool
+       select BOARD_SCACHE
+
+config R5000_CPU_SCACHE
+       bool
+       select BOARD_SCACHE
+
+config RM7000_CPU_SCACHE
+       bool
+       select BOARD_SCACHE
+
+config SIBYTE_DMA_PAGEOPS
+       bool "Use DMA to clear/copy pages"
+       depends on CPU_SB1
+       help
+         Instead of using the CPU to zero and copy pages, use a Data Mover
+         channel.  These DMA channels are otherwise unused by the standard
+         SiByte Linux port.  Seems to give a small performance benefit.
+
+config CPU_HAS_PREFETCH
+       bool "Enable prefetches" if CPU_SB1 && !CPU_SB1_PASS_2
+       default y if CPU_MIPS32 || CPU_MIPS64 || CPU_RM7000 || CPU_RM9000 || CPU_R10000
+
+config VTAG_ICACHE
+       bool "Support for Virtual Tagged I-cache" if CPU_MIPS64 || CPU_MIPS32
+       default y if CPU_SB1
+
+config SB1_PASS_1_WORKAROUNDS
+       bool
+       depends on CPU_SB1_PASS_1
+       default y
+
+config SB1_PASS_2_WORKAROUNDS
+       bool
+       depends on CPU_SB1 && (CPU_SB1_PASS_2_2 || CPU_SB1_PASS_2)
+       default y
+
+config SB1_PASS_2_1_WORKAROUNDS
+       bool
+       depends on CPU_SB1 && CPU_SB1_PASS_2
+       default y
+
+config 64BIT_PHYS_ADDR
+       bool "Support for 64-bit physical address space"
+       depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && MIPS32
+
+config CPU_ADVANCED
+       bool "Override CPU Options"
+       depends on MIPS32
+       help
+         Saying yes here allows you to select support for various features
+         your CPU may or may not have.  Most people should say N here.
+
+config CPU_HAS_LLSC
+       bool "ll/sc Instructions available" if CPU_ADVANCED
+       default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX
+       help
+         MIPS R4000 series and later provide the Load Linked (ll)
+         and Store Conditional (sc) instructions. More information is
+         available at <http://www.go-ecs.com/mips/miptek1.htm>.
+
+         Say Y here if your CPU has the ll and sc instructions.  Say Y here
+         for better performance, N if you don't know.  You must say Y here
+         for multiprocessor machines.
+
+config CPU_HAS_LLDSCD
+       bool "lld/scd Instructions available" if CPU_ADVANCED
+       default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32
+       help
+         Say Y here if your CPU has the lld and scd instructions, the 64-bit
+         equivalents of ll and sc.  Say Y here for better performance, N if
+         you don't know.  You must say Y here for multiprocessor machines.
+
+config CPU_HAS_WB
+       bool "Writeback Buffer available" if CPU_ADVANCED
+       default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION
+       help
+         Say N here for slightly better performance.  You must say Y here for
+         machines which require flushing of write buffers in software.  Saying
+         Y is the safe option; N may result in kernel malfunction and crashes.
+
+config CPU_HAS_SYNC
+       bool
+       depends on !CPU_R3000
+       default y
+
+#
+# - Highmem only makes sense for the 32-bit kernel.
+# - The current highmem code will only work properly on physically indexed
+#   caches such as R3000, SB1, R7000 or those that look like they're virtually
+#   indexed such as R4000/R4400 SC and MC versions or R10000.  So for the
+#   moment we protect the user and offer the highmem option only on machines
+#   where it's known to be safe.  This will not offer highmem on a few systems
+#   such as MIPS32 and MIPS64 CPUs which may have virtual and physically
+#   indexed CPUs but we're playing safe.
+# - We should not offer highmem for system of which we already know that they
+#   don't have memory configurations that could gain from highmem support in
+#   the kernel because they don't support configurations with RAM at physical
+#   addresses > 0x20000000.
+#
+config HIGHMEM
+       bool "High Memory Support"
+       depends on MIPS32 && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(MACH_DECSTATION || MOMENCO_JAGUAR_ATX)
+
+config SMP
+       bool "Multi-Processing support"
+       depends on CPU_RM9000 || (SIBYTE_SB1250 && !SIBYTE_STANDALONE) || SGI_IP27
+       ---help---
+         This enables support for systems with more than one CPU. If you have
+         a system with only one CPU, like most personal computers, say N. If
+         you have a system with more than one CPU, say Y.
+
+         If you say N here, the kernel will run on single and multiprocessor
+         machines, but will use only one CPU of a multiprocessor machine. If
+         you say Y here, the kernel will run on many, but not all,
+         singleprocessor machines. On a singleprocessor machine, the kernel
+         will run faster if you say N here.
+
+         People using multiprocessor machines who say Y here should also say
+         Y to "Enhanced Real Time Clock Support", below.
+
+         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
+         available at <http://www.tldp.org/docs.html#howto>.
+
+         If you don't know what to do here, say N.
+
+config NR_CPUS
+       int "Maximum number of CPUs (2-64)"
+       range 2 64
+       depends on SMP
+       default "64" if SGI_IP27
+       default "2"
+       help
+         This allows you to specify the maximum number of CPUs which this
+         kernel will support.  The maximum supported value is 32 for 32-bit
+         kernel and 64 for 64-bit kernels; the minimum value which makes
+         sense is 2.
+
+         This is purely to save memory - each supported CPU adds
+         approximately eight kilobytes to the kernel image.
+
+config PREEMPT
+       bool "Preemptible Kernel"
+       help
+         This option reduces the latency of the kernel when reacting to
+         real-time or interactive events by allowing a low priority process to
+         be preempted even if it is in kernel mode executing a system call.
+         This allows applications to run more reliably even when the system is
+         under load.
+
+config RTC_DS1742
+       bool "DS1742 BRAM/RTC support"
+       depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
+
+config MIPS_INSANE_LARGE
+       bool "Support for large 64-bit configurations"
+       depends on CPU_R10000 && MIPS64
+       help
+         MIPS R10000 does support a 44 bit / 16TB address space as opposed to
+         previous 64-bit processors which only supported 40 bit / 1TB. If you
+         need processes of more than 1TB virtual address space, say Y here.
+         This will result in additional memory usage, so it is not
+         recommended for normal users.
+
+config RWSEM_GENERIC_SPINLOCK
+       bool
+       default y
+
+endmenu
+
+menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
+
+config HW_HAS_PCI
+       bool
+
+config PCI
+       bool "Support for PCI controller"
+       depends on HW_HAS_PCI
+       help
+         Find out whether you have a PCI motherboard. PCI is the name of a
+         bus system, i.e. the way the CPU talks to the other stuff inside
+         your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
+         say Y, otherwise N.
+
+         The PCI-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>, contains valuable
+         information about which PCI hardware does work under Linux and which
+         doesn't.
+
+config PCI_DOMAINS
+       bool
+       depends on PCI
+
+source "drivers/pci/Kconfig"
+
+#
+# ISA support is now enabled via select.  Too many systems still have the one
+# or other ISA chip on the board that users don't know about so don't expect
+# users to choose the right thing ...
+#
+config ISA
+       bool
+
+config EISA
+       bool "EISA support"
+       depends on SGI_IP22 || SNI_RM200_PCI
+       select ISA
+       ---help---
+         The Extended Industry Standard Architecture (EISA) bus was
+         developed as an open alternative to the IBM MicroChannel bus.
+
+         The EISA bus provided some of the features of the IBM MicroChannel
+         bus while maintaining backward compatibility with cards made for
+         the older ISA bus.  The EISA bus saw limited use between 1988 and
+         1995 when it was made obsolete by the PCI bus.
+
+         Say Y here if you are building a kernel for an EISA-based machine.
+
+         Otherwise, say N.
+
+source "drivers/eisa/Kconfig"
+
+config TC
+       bool "TURBOchannel support"
+       depends on MACH_DECSTATION
+       help
+         TurboChannel is a DEC (now Compaq (now HP)) bus for Alpha and MIPS
+         processors.  Documentation on writing device drivers for TurboChannel
+         is available at:
+         <http://www.cs.arizona.edu/computer.help/policy/DIGITAL_unix/AA-PS3HD-TET1_html/TITLE.html>.
+
+#config ACCESSBUS
+#      bool "Access.Bus support"
+#      depends on TC
+
+config MMU
+       bool
+       default y
+
+config MCA
+       bool
+
+config SBUS
+       bool
+
+source "drivers/pcmcia/Kconfig"
+
+source "drivers/pci/hotplug/Kconfig"
+
+endmenu
+
+menu "Executable file formats"
+
+source "fs/Kconfig.binfmt"
+
+config TRAD_SIGNALS
+       bool
+       default y if MIPS32
+
+config BUILD_ELF64
+       bool "Use 64-bit ELF format for building"
+       depends on MIPS64
+       help
+         A 64-bit kernel is usually built using the 64-bit ELF binary object
+         format as it's one that allows arbitrary 64-bit constructs.  For
+         kernels that are loaded within the KSEG compatibility segments the
+         32-bit ELF format can optionally be used resulting in a somewhat
+         smaller binary, but this option is not explicitly supported by the
+         toolchain and since binutils 2.14 it does not even work at all.
+
+         Say Y to use the 64-bit format or N to use the 32-bit one.
+
+         If unsure say Y.
+
+config BINFMT_IRIX
+       bool "Include IRIX binary compatibility"
+       depends on !CPU_LITTLE_ENDIAN && MIPS32 && BROKEN
+
+config MIPS32_COMPAT
+       bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
+       depends on MIPS64
+       help
+         Select this option if you want Linux/MIPS 32-bit binary
+         compatibility. Since all software available for Linux/MIPS is
+         currently 32-bit you should say Y here.
+
+config COMPAT
+       bool
+       depends on MIPS32_COMPAT
+       default y
+
+config MIPS32_O32
+       bool "Kernel support for o32 binaries"
+       depends on MIPS32_COMPAT
+       help
+         Select this option if you want to run o32 binaries.  These are pure
+         32-bit binaries as used by the 32-bit Linux/MIPS port.  Most of
+         existing binaries are in this format.
+
+         If unsure, say Y.
+
+config MIPS32_N32
+       bool "Kernel support for n32 binaries"
+       depends on MIPS32_COMPAT
+       help
+         Select this option if you want to run n32 binaries.  These are
+         64-bit binaries using 32-bit quantities for addressing and certain
+         data that would normally be 64-bit.  They are used in special
+         cases.
+
+         If unsure, say N.
+
+config BINFMT_ELF32
+       bool
+       default y if MIPS32_O32 || MIPS32_N32
+
+config PM
+       bool "Power Management support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && MACH_AU1X00
+
+endmenu
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "arch/mips/Kconfig.debug"
+
+source "security/Kconfig"
+
+source "crypto/Kconfig"
+
+source "lib/Kconfig"
+
+#
+# Use the generic interrupt handling code in kernel/irq/:
+#
+config GENERIC_HARDIRQS
+       bool
+       default y
+
+config GENERIC_IRQ_PROBE
+       bool
+       default y
+
+config ISA_DMA_API
+       bool
+       default y
diff -Nur linux-2.6.12.5/arch/mips/Makefile linux-2.6.12.5-brcm/arch/mips/Makefile
--- linux-2.6.12.5/arch/mips/Makefile   2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/Makefile      2005-08-28 16:39:59.077334424 +0200
@@ -79,7 +79,7 @@
 cflags-y                       += -I $(TOPDIR)/include/asm/gcc
 cflags-y                       += -G 0 -mno-abicalls -fno-pic -pipe
 cflags-y                       += $(call cc-option, -finline-limit=100000)
-LDFLAGS_vmlinux                        += -G 0 -static -n
+LDFLAGS_vmlinux                        += -G 0 -static -n -nostdlib
 MODFLAGS                       += -mlong-calls
 
 cflags-$(CONFIG_SB1XXX_CORELIS)        += -mno-sched-prolog -fno-omit-frame-pointer
@@ -167,9 +167,10 @@
                        $(call set_gccflags,r4600,mips3,r4600,mips3,mips2)  \
                        -Wa,--trap
 
-cflags-$(CONFIG_CPU_MIPS32)    += \
-                       $(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
-                       -Wa,--trap
+#cflags-$(CONFIG_CPU_MIPS32)   += \
+#                      $(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
+#                      -Wa,--trap
+cflags-$(CONFIG_CPU_MIPS32)    += -mips2 -Wa,--trap
 
 cflags-$(CONFIG_CPU_MIPS64)    += \
                        $(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \
@@ -618,6 +619,14 @@
 load-$(CONFIG_SIBYTE_SWARM)    := 0xffffffff80100000
 
 #
+# Broadcom BCM47XX boards
+#
+core-$(CONFIG_BCM947XX)                += arch/mips/bcm947xx/ arch/mips/bcm947xx/broadcom/
+cflags-$(CONFIG_BCM947XX)      += -Iarch/mips/bcm947xx/include
+load-$(CONFIG_BCM947XX)                := 0xffffffff80001000
+
+
+#
 # SNI RM200 PCI
 #
 core-$(CONFIG_SNI_RM200_PCI)   += arch/mips/sni/
@@ -729,6 +738,7 @@
 archclean:
        @$(MAKE) $(clean)=arch/mips/boot
        @$(MAKE) $(clean)=arch/mips/lasat
+       @$(MAKE) -C arch/mips/bcm47xx/compressed clean
 
 # Generate <asm/offset.h 
 #
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/Makefile linux-2.6.12.5-brcm/arch/mips/bcm947xx/Makefile
--- linux-2.6.12.5/arch/mips/bcm947xx/Makefile  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/Makefile     2005-08-28 11:12:20.406862800 +0200
@@ -0,0 +1,6 @@
+#
+# Makefile for the BCM47xx specific kernel interface routines
+# under Linux.
+#
+
+obj-y := irq.o int-handler.o prom.o setup.o time.o
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/Makefile linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/Makefile
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/Makefile    2005-08-28 11:12:20.407862648 +0200
@@ -0,0 +1,6 @@
+#
+# Makefile for the BCM47xx specific kernel interface routines
+# under Linux.
+#
+
+obj-y   := sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o hnddma.o
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmsrom.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmsrom.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmsrom.c        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmsrom.c   2005-08-28 11:12:20.408862496 +0200
@@ -0,0 +1,685 @@
+/*
+ *  Misc useful routines to access NIC SROM
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ * $Id: bcmsrom.c,v 1.1 2005/02/28 13:33:32 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <osl.h>
+#include <bcmutils.h>
+#include <bcmsrom.h>
+#include <bcmdevs.h>
+#include <bcmendian.h>
+#include <sbpcmcia.h>
+#include <pcicfg.h>
+
+#include <proto/ethernet.h>    /* for sprom content groking */
+
+#define        VARS_MAX        4096    /* should be reduced */
+
+static int initvars_srom_pci(void *curmap, char **vars, int *count);
+static int initvars_cis_pcmcia(void *osh, char **vars, int *count);
+static int sprom_cmd_pcmcia(void *osh, uint8 cmd);
+static int sprom_read_pcmcia(void *osh, uint16 addr, uint16 *data);
+static int sprom_write_pcmcia(void *osh, uint16 addr, uint16 data);
+static int sprom_read_pci(uint16 *sprom, uint byteoff, uint16 *buf, uint nbytes, bool check_crc);
+
+/*
+ * Initialize the vars from the right source for this platform.
+ * Return 0 on success, nonzero on error.
+ */
+int
+srom_var_init(uint bus, void *curmap, void *osh, char **vars, int *count)
+{
+       if (vars == NULL)
+               return (0);
+
+       switch (bus) {
+       case SB_BUS:
+               /* These two could be asserts ... */
+               *vars = NULL;
+               *count = 0;
+               return(0);
+
+       case PCI_BUS:
+               ASSERT(curmap); /* can not be NULL */
+               return(initvars_srom_pci(curmap, vars, count));
+
+       case PCMCIA_BUS:
+               return(initvars_cis_pcmcia(osh, vars, count));
+
+
+       default:
+               ASSERT(0);
+       }
+       return (-1);
+}
+
+
+/* support only 16-bit word read from srom */
+int
+srom_read(uint bus, void *curmap, void *osh, uint byteoff, uint nbytes, uint16 *buf)
+{
+       void *srom;
+       uint i, off, nw;
+
+       /* check input - 16-bit access only */
+       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
+               return 1;
+
+       if (bus == PCI_BUS) {
+               if (!curmap)
+                       return 1;
+               srom = (void *)((uint)curmap + PCI_BAR0_SPROM_OFFSET);
+               if (sprom_read_pci(srom, byteoff, buf, nbytes, FALSE))
+                       return 1;
+       } else if (bus == PCMCIA_BUS) {
+               off = byteoff / 2;
+               nw = nbytes / 2;
+               for (i = 0; i < nw; i++) {
+                       if (sprom_read_pcmcia(osh, (uint16)(off + i), (uint16*)(buf + i)))
+                               return 1;
+               }
+       } else {
+               return 1;
+       }
+
+       return 0;
+}
+
+/* support only 16-bit word write into srom */
+int
+srom_write(uint bus, void *curmap, void *osh, uint byteoff, uint nbytes, uint16 *buf)
+{
+       uint16 *srom;
+       uint i, off, nw, crc_range;
+       uint16 image[SPROM_SIZE], *p;
+       uint8 crc;
+       volatile uint32 val32;
+
+       /* check input - 16-bit access only */
+       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
+               return 1;
+
+       crc_range = ((bus == PCMCIA_BUS) ? SPROM_SIZE : SPROM_CRC_RANGE) * 2;
+
+       /* if changes made inside crc cover range */
+       if (byteoff < crc_range) {
+               nw = (((byteoff + nbytes) > crc_range) ? byteoff + nbytes : crc_range) / 2;
+               /* read data including entire first 64 words from srom */
+               if (srom_read(bus, curmap, osh, 0, nw * 2, image))
+                       return 1;
+               /* make changes */
+               bcopy((void*)buf, (void*)&image[byteoff / 2], nbytes);
+               /* calculate crc */
+               htol16_buf(image, crc_range);
+               crc = ~crc8((uint8 *)image, crc_range - 1, CRC8_INIT_VALUE);
+               ltoh16_buf(image, crc_range);
+               image[(crc_range / 2) - 1] = (crc << 8) | (image[(crc_range / 2) - 1] & 0xff);
+               p = image;
+               off = 0;
+       } else {
+               p = buf;
+               off = byteoff / 2;
+               nw = nbytes / 2;
+       }
+
+       if (bus == PCI_BUS) {
+               srom = (uint16*)((uint)curmap + PCI_BAR0_SPROM_OFFSET);
+               /* enable writes to the SPROM */
+               val32 = OSL_PCI_READ_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32));
+               val32 |= SPROM_WRITEEN;
+               OSL_PCI_WRITE_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32), val32);
+               bcm_mdelay(500);
+               /* write srom */
+               for (i = 0; i < nw; i++) {
+                       W_REG(&srom[off + i], p[i]);
+                       bcm_mdelay(20);
+               }
+               /* disable writes to the SPROM */
+               OSL_PCI_WRITE_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32), val32 & ~SPROM_WRITEEN);
+       } else if (bus == PCMCIA_BUS) {
+               /* enable writes to the SPROM */
+               if (sprom_cmd_pcmcia(osh, SROM_WEN))
+                       return 1;
+               bcm_mdelay(500);
+               /* write srom */
+               for (i = 0; i < nw; i++) {
+                       sprom_write_pcmcia(osh, (uint16)(off + i), p[i]);
+                       bcm_mdelay(20);
+               }
+               /* disable writes to the SPROM */
+               if (sprom_cmd_pcmcia(osh, SROM_WDS))
+                       return 1;
+       } else {
+               return 1;
+       }
+
+       bcm_mdelay(500);
+       return 0;
+}
+
+
+int
+srom_parsecis(uint8 *cis, char **vars, int *count)
+{
+       char eabuf[32];
+       char *vp, *base;
+       uint8 tup, tlen, sromrev = 1;
+       int i, j;
+       uint varsize;
+       bool ag_init = FALSE;
+       uint16 w;
+
+       ASSERT(vars);
+       ASSERT(count);
+
+       base = vp = MALLOC(VARS_MAX);
+       ASSERT(vp);
+
+       i = 0;
+       do {
+               tup = cis[i++];
+               tlen = cis[i++];
+
+               switch (tup) {
+               case CISTPL_MANFID:
+                       vp += sprintf(vp, "manfid=%d", (cis[i + 1] << 8) + cis[i]);
+                       vp++;
+                       vp += sprintf(vp, "prodid=%d", (cis[i + 3] << 8) + cis[i + 2]);
+                       vp++;
+                       break;
+
+               case CISTPL_FUNCE:
+                       if (cis[i] == LAN_NID) {
+                               ASSERT(cis[i + 1] == ETHER_ADDR_LEN);
+                               bcm_ether_ntoa((uchar*)&cis[i + 2], eabuf);
+                               vp += sprintf(vp, "il0macaddr=%s", eabuf);
+                               vp++;
+                       }
+                       break;
+
+               case CISTPL_CFTABLE:
+                       vp += sprintf(vp, "regwindowsz=%d", (cis[i + 7] << 8) | cis[i + 6]);
+                       vp++;
+                       break;
+
+               case CISTPL_BRCM_HNBU:
+                       switch (cis[i]) {
+                       case HNBU_CHIPID:
+                               vp += sprintf(vp, "vendid=%d", (cis[i + 2] << 8) + cis[i + 1]);
+                               vp++;
+                               vp += sprintf(vp, "devid=%d", (cis[i + 4] << 8) + cis[i + 3]);
+                               vp++;
+                               if (tlen == 7) {
+                                       vp += sprintf(vp, "chiprev=%d", (cis[i + 6] << 8) + cis[i + 5]);
+                                       vp++;
+                               }
+                               break;
+
+                       case HNBU_BOARDREV:
+                               vp += sprintf(vp, "boardrev=%d", cis[i + 1]);
+                               vp++;
+                               break;
+
+                       case HNBU_AA:
+                               vp += sprintf(vp, "aa0=%d", cis[i + 1]);
+                               vp++;
+                               break;
+
+                       case HNBU_AG:
+                               vp += sprintf(vp, "ag0=%d", cis[i + 1]);
+                               vp++;
+                               ag_init = TRUE;
+                               break;
+
+                       case HNBU_CC:
+                               vp += sprintf(vp, "cc=%d", cis[i + 1]);
+                               vp++;
+                               break;
+
+                       case HNBU_PAPARMS:
+                               vp += sprintf(vp, "pa0maxpwr=%d", cis[i + tlen - 1]);
+                               vp++;
+                               if (tlen == 9) {
+                                       /* New version */
+                                       for (j = 0; j < 3; j++) {
+                                               vp += sprintf(vp, "pa0b%d=%d", j,
+                                                             (cis[i + (j * 2) + 2] << 8) + cis[i + (j * 2) + 1]);
+                                               vp++;
+                                       }
+                                       vp += sprintf(vp, "pa0itssit=%d", cis[i + 7]);
+                                       vp++;
+                               }
+                               break;
+
+                       case HNBU_OEM:
+                               vp += sprintf(vp, "oem=%02x%02x%02x%02x%02x%02x%02x%02x",
+                                       cis[i + 1], cis[i + 2], cis[i + 3], cis[i + 4],
+                                       cis[i + 5], cis[i + 6], cis[i + 7], cis[i + 8]);
+                               vp++;
+                               break;
+                       case HNBU_BOARDFLAGS:
+                               w = (cis[i + 2] << 8) + cis[i + 1];
+                               if (w == 0xffff) w = 0;
+                               vp += sprintf(vp, "boardflags=%d", w);
+                               vp++;
+                               break;
+                       case HNBU_LED:
+                               if (cis[i + 1] != 0xff) {
+                                       vp += sprintf(vp, "wl0gpio0=%d", cis[i + 1]);
+                                       vp++;
+                               }
+                               if (cis[i + 2] != 0xff) {
+                                       vp += sprintf(vp, "wl0gpio1=%d", cis[i + 2]);
+                                       vp++;
+                               }
+                               if (cis[i + 3] != 0xff) {
+                                       vp += sprintf(vp, "wl0gpio2=%d", cis[i + 3]);
+                                       vp++;
+                               }
+                               if (cis[i + 4] != 0xff) {
+                                       vp += sprintf(vp, "wl0gpio3=%d", cis[i + 4]);
+                                       vp++;
+                               }
+                               break;
+                       }
+                       break;
+
+               }
+               i += tlen;
+       } while (tup != 0xff);
+
+       /* Set the srom version */
+       vp += sprintf(vp, "sromrev=%d", sromrev);
+       vp++;
+
+       /* For now just set boardflags2 to zero */
+       vp += sprintf(vp, "boardflags2=0");
+       vp++;
+
+       /* if there is no antenna gain field, set default */
+       if (ag_init == FALSE) {
+               vp += sprintf(vp, "ag0=%d", 0xff);
+               vp++;
+       }
+
+       /* final nullbyte terminator */
+       *vp++ = '\0';
+       varsize = (uint)vp - (uint)base;
+
+       ASSERT(varsize < VARS_MAX);
+
+       if (varsize == VARS_MAX) {
+               *vars = base;
+       } else {
+               vp = MALLOC(varsize);
+               ASSERT(vp);
+               bcopy(base, vp, varsize);
+               MFREE(base, VARS_MAX);
+               *vars = vp;
+       }
+       *count = varsize;
+
+       return (0);
+}
+
+
+/* set PCMCIA sprom command register */
+static int
+sprom_cmd_pcmcia(void *osh, uint8 cmd)
+{
+       uint8 status;
+       uint wait_cnt = 1000;
+
+       /* write sprom command register */
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_CS, &cmd, 1);
+
+       /* wait status */
+       while (wait_cnt--) {
+               OSL_PCMCIA_READ_ATTR(osh, SROM_CS, &status, 1);
+               if (status & SROM_DONE)
+                       return 0;
+       }
+       return 1;
+}
+
+/* read a word from the PCMCIA srom */
+static int
+sprom_read_pcmcia(void *osh, uint16 addr, uint16 *data)
+{
+       uint8 addr_l, addr_h, data_l, data_h;
+
+       addr_l = (uint8)((addr * 2) & 0xff);
+       addr_h = (uint8)(((addr * 2) >> 8) & 0xff);
+
+       /* set address */
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_ADDRH, &addr_h, 1);
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_ADDRL, &addr_l, 1);
+
+       /* do read */
+       if (sprom_cmd_pcmcia(osh, SROM_READ))
+               return 1;
+
+       /* read data */
+       OSL_PCMCIA_READ_ATTR(osh, SROM_DATAH, &data_h, 1);
+       OSL_PCMCIA_READ_ATTR(osh, SROM_DATAL, &data_l, 1);
+
+       *data = (data_h << 8) | data_l;
+       return 0;
+}
+
+/* write a word to the PCMCIA srom */
+static int
+sprom_write_pcmcia(void *osh, uint16 addr, uint16 data)
+{
+       uint8 addr_l, addr_h, data_l, data_h;
+
+       addr_l = (uint8)((addr * 2) & 0xff);
+       addr_h = (uint8)(((addr * 2) >> 8) & 0xff);
+       data_l = (uint8)(data & 0xff);
+       data_h = (uint8)((data >> 8) & 0xff);
+
+       /* set address */
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_ADDRH, &addr_h, 1);
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_ADDRL, &addr_l, 1);
+
+       /* write data */
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_DATAH, &data_h, 1);
+       OSL_PCMCIA_WRITE_ATTR(osh, SROM_DATAL, &data_l, 1);
+
+       /* do write */
+       return sprom_cmd_pcmcia(osh, SROM_WRITE);
+}
+
+/*
+ * Read in and validate sprom.
+ * Return 0 on success, nonzero on error.
+ */
+static int
+sprom_read_pci(uint16 *sprom, uint byteoff, uint16 *buf, uint nbytes, bool check_crc)
+{
+       int off, nw;
+       uint8 chk8;
+       int i;
+
+       off = byteoff / 2;
+       nw = ROUNDUP(nbytes, 2) / 2;
+
+       /* read the sprom */
+       for (i = 0; i < nw; i++)
+               buf[i] = R_REG(&sprom[off + i]);
+
+       if (check_crc) {
+               /* fixup the endianness so crc8 will pass */
+               htol16_buf(buf, nw * 2);
+               if ((chk8 = crc8((uchar*)buf, nbytes, CRC8_INIT_VALUE)) != CRC8_GOOD_VALUE)
+                       return (1);
+               /* now correct the endianness of the byte array */
+               ltoh16_buf(buf, nw * 2);
+       }
+
+       return (0);
+}
+
+/*
+ * Initialize nonvolatile variable table from sprom.
+ * Return 0 on success, nonzero on error.
+ */
+
+static int
+initvars_srom_pci(void *curmap, char **vars, int *count)
+{
+       uint16 w, b[64];
+       uint8 sromrev;
+       struct ether_addr ea;
+       char eabuf[32];              
+       int c, woff, i;
+       char *vp, *base;
+
+       if (sprom_read_pci((void *)((uint)curmap + PCI_BAR0_SPROM_OFFSET), 0, b, sizeof (b), TRUE))
+               return (-1);
+
+       /* top word of sprom contains version and crc8 */
+       sromrev = b[63] & 0xff;
+       if ((sromrev != 1) && (sromrev != 2)) {
+               return (-2);
+       }
+
+       ASSERT(vars);
+       ASSERT(count);
+
+       base = vp = MALLOC(VARS_MAX);
+       ASSERT(vp);
+
+       vp += sprintf(vp, "sromrev=%d", sromrev);
+       vp++;
+
+       if (sromrev >= 2) {
+               /* New section takes over the 4th hardware function space */
+
+               /* Word 28 is boardflags2 */
+               vp += sprintf(vp, "boardflags2=%d", b[28]);
+               vp++;
+
+               /* Word 29 is max power 11a high/low */
+               w = b[29];
+               vp += sprintf(vp, "pa1himaxpwr=%d", w & 0xff);
+               vp++;
+               vp += sprintf(vp, "pa1lomaxpwr=%d", (w >> 8) & 0xff);
+               vp++;
+
+               /* Words 30-32 set the 11alow pa settings,
+                * 33-35 are the 11ahigh ones.
+                */
+               for (i = 0; i < 3; i++) {
+                       vp += sprintf(vp, "pa1lob%d=%d", i, b[30 + i]);
+                       vp++;
+                       vp += sprintf(vp, "pa1hib%d=%d", i, b[33 + i]);
+                       vp++;
+               }
+               w = b[59];
+               if (w == 0)
+                       vp += sprintf(vp, "ccode=");
+               else
+                       vp += sprintf(vp, "ccode=%c%c", (w >> 8), (w & 0xff));
+               vp++;
+
+       }
+
+       /* parameter section of sprom starts at byte offset 72 */
+       woff = 72/2;
+
+       /* first 6 bytes are il0macaddr */
+       ea.octet[0] = (b[woff] >> 8) & 0xff;
+       ea.octet[1] = b[woff] & 0xff;
+       ea.octet[2] = (b[woff+1] >> 8) & 0xff;
+       ea.octet[3] = b[woff+1] & 0xff;
+       ea.octet[4] = (b[woff+2] >> 8) & 0xff;
+       ea.octet[5] = b[woff+2] & 0xff;
+       woff += ETHER_ADDR_LEN/2 ;
+       bcm_ether_ntoa((uchar*)&ea, eabuf);
+       vp += sprintf(vp, "il0macaddr=%s", eabuf);
+       vp++;
+
+       /* next 6 bytes are et0macaddr */
+       ea.octet[0] = (b[woff] >> 8) & 0xff;
+       ea.octet[1] = b[woff] & 0xff;
+       ea.octet[2] = (b[woff+1] >> 8) & 0xff;
+       ea.octet[3] = b[woff+1] & 0xff;
+       ea.octet[4] = (b[woff+2] >> 8) & 0xff;
+       ea.octet[5] = b[woff+2] & 0xff;
+       woff += ETHER_ADDR_LEN/2 ;
+       bcm_ether_ntoa((uchar*)&ea, eabuf);
+       vp += sprintf(vp, "et0macaddr=%s", eabuf);
+       vp++;
+
+       /* next 6 bytes are et1macaddr */
+       ea.octet[0] = (b[woff] >> 8) & 0xff;
+       ea.octet[1] = b[woff] & 0xff;
+       ea.octet[2] = (b[woff+1] >> 8) & 0xff;
+       ea.octet[3] = b[woff+1] & 0xff;
+       ea.octet[4] = (b[woff+2] >> 8) & 0xff;
+       ea.octet[5] = b[woff+2] & 0xff;
+       woff += ETHER_ADDR_LEN/2 ;
+       bcm_ether_ntoa((uchar*)&ea, eabuf);
+       vp += sprintf(vp, "et1macaddr=%s", eabuf);
+       vp++;
+
+       /*
+        * Enet phy settings one or two singles or a dual
+        * Bits 4-0 : MII address for enet0 (0x1f for not there)
+        * Bits 9-5 : MII address for enet1 (0x1f for not there)
+        * Bit 14   : Mdio for enet0
+        * Bit 15   : Mdio for enet1
+        */
+       w = b[woff];
+       vp += sprintf(vp, "et0phyaddr=%d", (w & 0x1f));
+       vp++;
+       vp += sprintf(vp, "et1phyaddr=%d", ((w >> 5) & 0x1f));
+       vp++;
+       vp += sprintf(vp, "et0mdcport=%d", ((w >> 14) & 0x1));
+       vp++;
+       vp += sprintf(vp, "et1mdcport=%d", ((w >> 15) & 0x1));
+       vp++;
+
+       /* Word 46 has board rev, antennas 0/1 & Country code/control */
+       w = b[46];
+       vp += sprintf(vp, "boardrev=%d", w & 0xff);
+       vp++;
+
+       if (sromrev > 1)
+               vp += sprintf(vp, "cctl=%d", (w >> 8) & 0xf);
+       else
+               vp += sprintf(vp, "cc=%d", (w >> 8) & 0xf);
+       vp++;
+
+       vp += sprintf(vp, "aa0=%d", (w >> 12) & 0x3);
+       vp++;
+
+       vp += sprintf(vp, "aa1=%d", (w >> 14) & 0x3);
+       vp++;
+
+       /* Words 47-49 set the (wl) pa settings */
+       woff = 47;
+
+       for (i = 0; i < 3; i++) {
+               vp += sprintf(vp, "pa0b%d=%d", i, b[woff+i]);
+               vp++;
+               vp += sprintf(vp, "pa1b%d=%d", i, b[woff+i+6]);
+               vp++;
+       }
+
+       /*
+        * Words 50-51 set the customer-configured wl led behavior.
+        * 8 bits/gpio pin.  High bit:  activehi=0, activelo=1;
+        * LED behavior values defined in wlioctl.h .
+        */
+       w = b[50];
+       if ((w != 0) && (w != 0xffff)) {
+               /* gpio0 */
+               vp += sprintf(vp, "wl0gpio0=%d", (w & 0xff));
+               vp++;
+
+               /* gpio1 */
+               vp += sprintf(vp, "wl0gpio1=%d", (w >> 8) & 0xff);
+               vp++;
+       }
+       w = b[51];
+       if ((w != 0) && (w != 0xffff)) {
+               /* gpio2 */
+               vp += sprintf(vp, "wl0gpio2=%d", w & 0xff);
+               vp++;
+
+               /* gpio3 */
+               vp += sprintf(vp, "wl0gpio3=%d", (w >> 8) & 0xff);
+               vp++;
+       }
+       
+       /* Word 52 is max power 0/1 */
+       w = b[52];
+       vp += sprintf(vp, "pa0maxpwr=%d", w & 0xff);
+       vp++;
+       vp += sprintf(vp, "pa1maxpwr=%d", (w >> 8) & 0xff);
+       vp++;
+
+       /* Word 56 is idle tssi target 0/1 */
+       w = b[56];
+       vp += sprintf(vp, "pa0itssit=%d", w & 0xff);
+       vp++;
+       vp += sprintf(vp, "pa1itssit=%d", (w >> 8) & 0xff);
+       vp++;
+
+       /* Word 57 is boardflags, if not programmed make it zero */
+       w = b[57];
+       if (w == 0xffff) w = 0;
+       vp += sprintf(vp, "boardflags=%d", w);
+       vp++;
+
+       /* Word 58 is antenna gain 0/1 */
+       w = b[58];
+       vp += sprintf(vp, "ag0=%d", w & 0xff);
+       vp++;
+
+       vp += sprintf(vp, "ag1=%d", (w >> 8) & 0xff);
+       vp++;
+
+       if (sromrev == 1) {
+               /* set the oem string */
+               vp += sprintf(vp, "oem=%02x%02x%02x%02x%02x%02x%02x%02x",
+                             ((b[59] >> 8) & 0xff), (b[59] & 0xff),
+                             ((b[60] >> 8) & 0xff), (b[60] & 0xff),
+                             ((b[61] >> 8) & 0xff), (b[61] & 0xff),
+                             ((b[62] >> 8) & 0xff), (b[62] & 0xff));
+               vp++;
+       }
+
+       /* final nullbyte terminator */
+       *vp++ = '\0';
+
+       c = vp - base;
+       ASSERT(c <= VARS_MAX);
+
+       if (c == VARS_MAX) {
+               *vars = base;
+       } else {
+               vp = MALLOC(c);
+               ASSERT(vp);
+               bcopy(base, vp, c);
+               MFREE(base, VARS_MAX);
+               *vars = vp;
+       }
+       *count = c;
+
+       return (0);
+}
+
+/*
+ * Read the cis and call parsecis to initialize the vars.
+ * Return 0 on success, nonzero on error.
+ */
+static int
+initvars_cis_pcmcia(void *osh, char **vars, int *count)
+{
+       uint8 *cis = NULL;
+       int rc;
+
+       if ((cis = MALLOC(CIS_SIZE)) == NULL)
+               return (-1);
+
+       OSL_PCMCIA_READ_ATTR(osh, 0, cis, CIS_SIZE);
+
+       rc = srom_parsecis(cis, vars, count);
+
+       MFREE(cis, CIS_SIZE);
+
+       return (rc);
+}
+
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmutils.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmutils.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/bcmutils.c       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/bcmutils.c  2005-08-28 11:12:20.428859456 +0200
@@ -0,0 +1,691 @@
+/*
+ * Misc useful OS-independent routines.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id: bcmutils.c,v 1.1 2005/02/28 13:33:32 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <osl.h>
+#include <bcmutils.h>
+#include <bcmendian.h>
+#include <bcmnvram.h>
+
+unsigned char bcm_ctype[] = {
+       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 0-7 */
+       _BCM_C,_BCM_C|_BCM_S,_BCM_C|_BCM_S,_BCM_C|_BCM_S,_BCM_C|_BCM_S,_BCM_C|_BCM_S,_BCM_C,_BCM_C,             /* 8-15 */
+       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 16-23 */
+       _BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,_BCM_C,                        /* 24-31 */
+       _BCM_S|_BCM_SP,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 32-39 */
+       _BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 40-47 */
+       _BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,_BCM_D,                        /* 48-55 */
+       _BCM_D,_BCM_D,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 56-63 */
+       _BCM_P,_BCM_U|_BCM_X,_BCM_U|_BCM_X,_BCM_U|_BCM_X,_BCM_U|_BCM_X,_BCM_U|_BCM_X,_BCM_U|_BCM_X,_BCM_U,      /* 64-71 */
+       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,                        /* 72-79 */
+       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,                        /* 80-87 */
+       _BCM_U,_BCM_U,_BCM_U,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,                        /* 88-95 */
+       _BCM_P,_BCM_L|_BCM_X,_BCM_L|_BCM_X,_BCM_L|_BCM_X,_BCM_L|_BCM_X,_BCM_L|_BCM_X,_BCM_L|_BCM_X,_BCM_L,      /* 96-103 */
+       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,                        /* 104-111 */
+       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,                        /* 112-119 */
+       _BCM_L,_BCM_L,_BCM_L,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_C,                        /* 120-127 */
+       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 128-143 */
+       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 144-159 */
+       _BCM_S|_BCM_SP,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,   /* 160-175 */
+       _BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,_BCM_P,       /* 176-191 */
+       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,       /* 192-207 */
+       _BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_P,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_U,_BCM_L,       /* 208-223 */
+       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,       /* 224-239 */
+       _BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_P,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L,_BCM_L        /* 240-255 */
+};
+
+uchar
+bcm_toupper(uchar c)
+{
+       if (bcm_islower(c))
+               c -= 'a'-'A';
+       return (c);
+}
+
+ulong
+bcm_strtoul(char *cp, char **endp, uint base)
+{
+       ulong result, value;
+       bool minus;
+       
+       minus = FALSE;
+
+       while (bcm_isspace(*cp))
+               cp++;
+       
+       if (cp[0] == '+')
+               cp++;
+       else if (cp[0] == '-') {
+               minus = TRUE;
+               cp++;
+       }
+       
+       if (base == 0) {
+               if (cp[0] == '0') {
+                       if ((cp[1] == 'x') || (cp[1] == 'X')) {
+                               base = 16;
+                               cp = &cp[2];
+                       } else {
+                               base = 8;
+                               cp = &cp[1];
+                       }
+               } else
+                       base = 10;
+       } else if (base == 16 && (cp[0] == '0') && ((cp[1] == 'x') || (cp[1] == 'X'))) {
+               cp = &cp[2];
+       }
+                  
+       result = 0;
+
+       while (bcm_isxdigit(*cp) &&
+              (value = bcm_isdigit(*cp) ? *cp-'0' : bcm_toupper(*cp)-'A'+10) < base) {
+               result = result*base + value;
+               cp++;
+       }
+
+       if (minus)
+               result = (ulong)(result * -1);
+
+       if (endp)
+               *endp = (char *)cp;
+
+       return (result);
+}
+
+uint
+bcm_atoi(char *s)
+{
+       uint n;
+
+       n = 0;
+
+       while (bcm_isdigit(*s))
+               n = (n * 10) + *s++ - '0';
+       return (n);
+}
+
+void
+deadbeef(char *p, uint len)
+{
+       static uchar meat[] = { 0xde, 0xad, 0xbe, 0xef };
+
+       while (len-- > 0) {
+               *p = meat[((uint)p) & 3];
+               p++;
+       }
+}
+
+/* pretty hex print a contiguous buffer */
+void
+prhex(char *msg, uchar *buf, uint nbytes)
+{
+       char line[256];
+       char* p;
+       uint i;
+
+       if (msg && (msg[0] != '\0'))
+               printf("%s: ", msg);
+
+       p = line;
+       for (i = 0; i < nbytes; i++) {
+               if (i % 16 == 0) {
+                       p += sprintf(p, "%04d: ", i);   /* line prefix */
+               }
+               p += sprintf(p, "%02x ", buf[i]);
+               if (i % 16 == 15) {
+                       printf("%s\n", line);           /* flush line */
+                       p = line;
+               }
+       }
+
+       /* flush last partial line */
+       if (p != line)
+               printf("%s\n", line);
+}
+
+/* pretty hex print a pkt buffer chain */
+void
+prpkt(char *msg, void *drv, void *p0)
+{
+       void *p;
+
+       if (msg && (msg[0] != '\0'))
+               printf("%s: ", msg);
+
+       for (p = p0; p; p = PKTNEXT(drv, p))
+               prhex(NULL, PKTDATA(drv, p), PKTLEN(drv, p));
+}
+
+/* copy a pkt buffer chain into a buffer */
+uint
+pktcopy(void *drv, void *p, uint offset, int len, uchar *buf)
+{
+       uint n, ret = 0;
+
+       if (len < 0)
+               len = 4096;     /* "infinite" */
+
+       /* skip 'offset' bytes */
+       for (; p && offset; p = PKTNEXT(drv, p)) {
+               if (offset < (uint)PKTLEN(drv, p))
+                       break;
+               offset -= PKTLEN(drv, p);
+       }
+
+       if (!p)
+               return 0;
+
+       /* copy the data */
+       for (; p && len; p = PKTNEXT(drv, p)) {
+               n = MIN((uint)PKTLEN(drv, p) - offset, (uint)len);
+               bcopy(PKTDATA(drv, p) + offset, buf, n);
+               buf += n;
+               len -= n;
+               ret += n;
+               offset = 0;
+       }
+
+       return ret;
+}
+
+/* return total length of buffer chain */
+uint
+pkttotlen(void *drv, void *p)
+{
+       uint total;
+
+       total = 0;
+       for (; p; p = PKTNEXT(drv, p))
+               total += PKTLEN(drv, p);
+       return (total);
+}
+
+
+uchar*
+bcm_ether_ntoa(char *ea, char *buf)
+{
+       sprintf(buf,"%02x:%02x:%02x:%02x:%02x:%02x",
+               (uchar)ea[0]&0xff, (uchar)ea[1]&0xff, (uchar)ea[2]&0xff,
+               (uchar)ea[3]&0xff, (uchar)ea[4]&0xff, (uchar)ea[5]&0xff);
+       return (buf);
+}
+
+/* parse a xx:xx:xx:xx:xx:xx format ethernet address */
+int
+bcm_ether_atoe(char *p, char *ea)
+{
+       int i = 0;
+
+       for (;;) {
+               ea[i++] = (char) bcm_strtoul(p, &p, 16);
+               if (!*p++ || i == 6)
+                       break;
+       }
+
+       return (i == 6);
+}
+
+/* 
+ * Traverse a string of 1-byte tag/1-byte length/variable-length value 
+ * triples, returning a pointer to the substring whose first element 
+ * matches tag.  Stop parsing when we see an element whose ID is greater
+ * than the target key. 
+ */
+bcm_tlv_t *
+bcm_parse_ordered_tlvs(void *buf, int buflen, uint key)
+{
+       bcm_tlv_t *elt;
+       int totlen;
+
+       elt = (bcm_tlv_t*)buf;
+       totlen = buflen;
+
+       /* find tagged parameter */
+       while (totlen >= 2) {
+               uint id = elt->id;
+               int len = elt->len;
+               
+               /* Punt if we start seeing IDs > than target key */
+               if (id > key)
+                       return(NULL);
+
+               /* validate remaining totlen */
+               if ((id == key) && (totlen >= (len + 2)))
+                       return (elt);
+
+               elt = (bcm_tlv_t*)((uint8*)elt + (len + 2));
+               totlen -= (len + 2);
+       }
+       return NULL;
+}
+
+
+/* 
+ * Traverse a string of 1-byte tag/1-byte length/variable-length value 
+ * triples, returning a pointer to the substring whose first element 
+ * matches tag
+ */
+bcm_tlv_t *
+bcm_parse_tlvs(void *buf, int buflen, uint key)
+{
+       bcm_tlv_t *elt;
+       int totlen;
+
+       elt = (bcm_tlv_t*)buf;
+       totlen = buflen;
+
+       /* find tagged parameter */
+       while (totlen >= 2) {
+               int len = elt->len;
+
+               /* validate remaining totlen */
+               if ((elt->id == key) && (totlen >= (len + 2)))
+                       return (elt);
+
+               elt = (bcm_tlv_t*)((uint8*)elt + (len + 2));
+               totlen -= (len + 2);
+       }
+       
+       return NULL;
+}
+
+void
+pktqinit(struct pktq *q, int maxlen)
+{
+       q->head = q->tail = NULL;
+       q->maxlen = maxlen;
+       q->len = 0;
+}
+
+void
+pktenq(struct pktq *q, void *p, bool lifo)
+{
+       ASSERT(PKTLINK(p) == NULL);
+
+       PKTSETLINK(p, NULL);
+
+       if (q->tail == NULL) {
+               ASSERT(q->head == NULL);
+               q->head = q->tail = p;
+       }
+       else {
+               ASSERT(q->head);
+               ASSERT(PKTLINK(q->tail) == NULL);
+               if (lifo) {
+                       PKTSETLINK(p, q->head);
+                       q->head = p;
+               } else {
+                       PKTSETLINK(q->tail, p);
+                       q->tail = p;
+               }
+       }
+       q->len++;
+}
+
+void*
+pktdeq(struct pktq *q)
+{
+       void *p;
+
+       if ((p = q->head)) {
+               ASSERT(q->tail);
+               q->head = PKTLINK(p);
+               PKTSETLINK(p, NULL);
+               q->len--;
+               if (q->head == NULL)
+                       q->tail = NULL;
+       }
+       else {
+               ASSERT(q->tail == NULL);
+       }
+
+       return (p);
+}
+
+/*******************************************************************************
+ * crc8
+ *
+ * Computes a crc8 over the input data using the polynomial:
+ *
+ *       x^8 + x^7 +x^6 + x^4 + x^2 + 1
+ *
+ * The caller provides the initial value (either CRC8_INIT_VALUE
+ * or the previous returned value) to allow for processing of 
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC8_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms", 
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint8 crc8_table[256] = {
+    0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
+    0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
+    0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
+    0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
+    0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
+    0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
+    0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
+    0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
+    0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
+    0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
+    0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
+    0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
+    0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
+    0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
+    0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
+    0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
+    0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
+    0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
+    0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
+    0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
+    0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
+    0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
+    0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
+    0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
+    0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
+    0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
+    0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
+    0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
+    0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
+    0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
+    0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
+    0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F
+};
+
+/*
+ * Search the name=value vars for a specific one and return its value.
+ * Returns NULL if not found.
+ */
+char*
+getvar(char *vars, char *name)
+{
+       char *s;
+       int len;
+
+       len = strlen(name);
+
+       /* first look in vars[] */
+       for (s = vars; s && *s; ) {
+               if ((bcmp(s, name, len) == 0) && (s[len] == '='))
+                       return (&s[len+1]);
+
+               while (*s++)
+                       ;
+       }
+
+       /* then query nvram */
+       return (nvram_get(name));
+}
+
+/*
+ * Search the vars for a specific one and return its value as
+ * an integer. Returns 0 if not found.
+ */
+int
+getintvar(char *vars, char *name)
+{
+       char *val;
+
+       if ((val = getvar(vars, name)) == NULL)
+               return (0);
+
+       return (bcm_strtoul(val, NULL, 0));
+}
+
+void
+bcm_mdelay(uint ms)
+{
+       uint i;
+
+       for (i = 0; i < ms; i++) {
+               OSL_DELAY(1000);
+       }
+}
+
+#define CRC_INNER_LOOP(n, c, x) \
+    (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
+
+uint8
+crc8(
+       uint8 *pdata,   /* pointer to array of data to process */
+       uint  nbytes,   /* number of input data bytes to process */
+       uint8 crc       /* either CRC8_INIT_VALUE or previous return value */
+)
+{
+       /* hard code the crc loop instead of using CRC_INNER_LOOP macro
+        * to avoid the undefined and unnecessary (uint8 >> 8) operation. */
+       while (nbytes-- > 0)
+               crc = crc8_table[(crc ^ *pdata++) & 0xff];
+
+       return crc;
+}
+
+/*******************************************************************************
+ * crc16
+ *
+ * Computes a crc16 over the input data using the polynomial:
+ *
+ *       x^16 + x^12 +x^5 + 1
+ *
+ * The caller provides the initial value (either CRC16_INIT_VALUE
+ * or the previous returned value) to allow for processing of 
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC16_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms", 
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint16 crc16_table[256] = {
+    0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
+    0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
+    0x1081, 0x0108, 0x3393, 0x221A, 0x56A5, 0x472C, 0x75B7, 0x643E,
+    0x9CC9, 0x8D40, 0xBFDB, 0xAE52, 0xDAED, 0xCB64, 0xF9FF, 0xE876,
+    0x2102, 0x308B, 0x0210, 0x1399, 0x6726, 0x76AF, 0x4434, 0x55BD,
+    0xAD4A, 0xBCC3, 0x8E58, 0x9FD1, 0xEB6E, 0xFAE7, 0xC87C, 0xD9F5,
+    0x3183, 0x200A, 0x1291, 0x0318, 0x77A7, 0x662E, 0x54B5, 0x453C,
+    0xBDCB, 0xAC42, 0x9ED9, 0x8F50, 0xFBEF, 0xEA66, 0xD8FD, 0xC974,
+    0x4204, 0x538D, 0x6116, 0x709F, 0x0420, 0x15A9, 0x2732, 0x36BB,
+    0xCE4C, 0xDFC5, 0xED5E, 0xFCD7, 0x8868, 0x99E1, 0xAB7A, 0xBAF3,
+    0x5285, 0x430C, 0x7197, 0x601E, 0x14A1, 0x0528, 0x37B3, 0x263A,
+    0xDECD, 0xCF44, 0xFDDF, 0xEC56, 0x98E9, 0x8960, 0xBBFB, 0xAA72,
+    0x6306, 0x728F, 0x4014, 0x519D, 0x2522, 0x34AB, 0x0630, 0x17B9,
+    0xEF4E, 0xFEC7, 0xCC5C, 0xDDD5, 0xA96A, 0xB8E3, 0x8A78, 0x9BF1,
+    0x7387, 0x620E, 0x5095, 0x411C, 0x35A3, 0x242A, 0x16B1, 0x0738,
+    0xFFCF, 0xEE46, 0xDCDD, 0xCD54, 0xB9EB, 0xA862, 0x9AF9, 0x8B70,
+    0x8408, 0x9581, 0xA71A, 0xB693, 0xC22C, 0xD3A5, 0xE13E, 0xF0B7,
+    0x0840, 0x19C9, 0x2B52, 0x3ADB, 0x4E64, 0x5FED, 0x6D76, 0x7CFF,
+    0x9489, 0x8500, 0xB79B, 0xA612, 0xD2AD, 0xC324, 0xF1BF, 0xE036,
+    0x18C1, 0x0948, 0x3BD3, 0x2A5A, 0x5EE5, 0x4F6C, 0x7DF7, 0x6C7E,
+    0xA50A, 0xB483, 0x8618, 0x9791, 0xE32E, 0xF2A7, 0xC03C, 0xD1B5,
+    0x2942, 0x38CB, 0x0A50, 0x1BD9, 0x6F66, 0x7EEF, 0x4C74, 0x5DFD,
+    0xB58B, 0xA402, 0x9699, 0x8710, 0xF3AF, 0xE226, 0xD0BD, 0xC134,
+    0x39C3, 0x284A, 0x1AD1, 0x0B58, 0x7FE7, 0x6E6E, 0x5CF5, 0x4D7C,
+    0xC60C, 0xD785, 0xE51E, 0xF497, 0x8028, 0x91A1, 0xA33A, 0xB2B3,
+    0x4A44, 0x5BCD, 0x6956, 0x78DF, 0x0C60, 0x1DE9, 0x2F72, 0x3EFB,
+    0xD68D, 0xC704, 0xF59F, 0xE416, 0x90A9, 0x8120, 0xB3BB, 0xA232,
+    0x5AC5, 0x4B4C, 0x79D7, 0x685E, 0x1CE1, 0x0D68, 0x3FF3, 0x2E7A,
+    0xE70E, 0xF687, 0xC41C, 0xD595, 0xA12A, 0xB0A3, 0x8238, 0x93B1,
+    0x6B46, 0x7ACF, 0x4854, 0x59DD, 0x2D62, 0x3CEB, 0x0E70, 0x1FF9,
+    0xF78F, 0xE606, 0xD49D, 0xC514, 0xB1AB, 0xA022, 0x92B9, 0x8330,
+    0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
+};
+
+uint16
+crc16(
+    uint8 *pdata,  /* pointer to array of data to process */
+    uint nbytes, /* number of input data bytes to process */
+    uint16 crc     /* either CRC16_INIT_VALUE or previous return value */
+)
+{
+    while (nbytes-- > 0)
+        CRC_INNER_LOOP(16, crc, *pdata++);
+    return crc;
+}
+
+static uint32 crc32_table[256] = {
+    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+};
+
+uint32
+crc32(
+    uint8 *pdata,  /* pointer to array of data to process */
+    uint   nbytes, /* number of input data bytes to process */
+    uint32 crc     /* either CRC32_INIT_VALUE or previous return value */
+)
+{
+    uint8 *pend;
+#ifdef __mips__
+    uint8 tmp[4];
+    ulong *tptr = (ulong *)tmp;
+
+       /* in case the beginning of the buffer isn't aligned */
+       pend = (uint8 *)((uint)(pdata + 3) & 0xfffffffc);
+       nbytes -= (pend - pdata);
+       while (pdata < pend)
+               CRC_INNER_LOOP(32, crc, *pdata++);
+
+    /* handle bulk of data as 32-bit words */
+    pend = pdata + (nbytes & 0xfffffffc);
+    while (pdata < pend) {
+       *tptr = *((ulong *)pdata)++;
+        CRC_INNER_LOOP(32, crc, tmp[0]);
+        CRC_INNER_LOOP(32, crc, tmp[1]);
+        CRC_INNER_LOOP(32, crc, tmp[2]);
+        CRC_INNER_LOOP(32, crc, tmp[3]);
+    }
+
+    /* 1-3 bytes at end of buffer */
+    pend = pdata + (nbytes & 0x03);
+    while (pdata < pend)
+        CRC_INNER_LOOP(32, crc, *pdata++);
+#else
+    pend = pdata + nbytes;
+    while (pdata < pend)
+        CRC_INNER_LOOP(32, crc, *pdata++);
+#endif
+       
+    return crc;
+}
+
+#ifdef notdef
+#define CLEN   1499
+#define CBUFSIZ        (CLEN+4)
+#define CNBUFS         5
+
+void testcrc32(void)
+{
+       uint j,k,l;
+       uint8 *buf;
+       uint len[CNBUFS];
+       uint32 crcr;
+       uint32 crc32tv[CNBUFS] =
+               {0xd2cb1faa, 0xd385c8fa, 0xf5b4f3f3, 0x55789e20, 0x00343110};
+
+       ASSERT((buf = MALLOC(CBUFSIZ*CNBUFS)) != NULL);
+
+       /* step through all possible alignments */
+       for (l=0;l<=4;l++) {
+               for (j=0; j<CNBUFS; j++) {
+                       len[j] = CLEN;
+                       for (k=0; k<len[j]; k++)
+                               *(buf + j*CBUFSIZ + (k+l)) = (j+k) & 0xff;
+               }
+
+               for (j=0; j<CNBUFS; j++) {
+                       crcr = crc32(buf + j*CBUFSIZ + l, len[j], CRC32_INIT_VALUE);
+                       ASSERT(crcr == crc32tv[j]);
+               }
+       }
+
+       MFREE(buf, CBUFSIZ*CNBUFS);
+       return;
+}
+#endif
+
+
+
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/hnddma.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/hnddma.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/hnddma.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/hnddma.c    2005-08-28 11:12:20.430859152 +0200
@@ -0,0 +1,763 @@
+/*
+ * Generic Broadcom Home Networking Division (HND) DMA module.
+ * This supports the following chips: BCM42xx, 44xx, 47xx .
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id: hnddma.c,v 1.1 2005/02/28 13:33:32 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <osl.h>
+#include <bcmendian.h>
+#include <bcmutils.h>
+
+struct dma_info;       /* forward declaration */
+#define di_t struct dma_info
+#include <hnddma.h>
+
+/* debug/trace */
+#define        DMA_ERROR(args)
+#define        DMA_TRACE(args)
+
+/* default dma message level(if input msg_level pointer is null in dma_attach()) */
+static uint dma_msg_level = 0;
+
+#define        MAXNAMEL        8
+#define        MAXDD           (DMAMAXRINGSZ / sizeof (dmadd_t))
+
+/* dma engine software state */
+typedef struct dma_info {
+       hnddma_t        hnddma;         /* exported structure */
+       uint            *msg_level;     /* message level pointer */
+
+       char            name[MAXNAMEL]; /* callers name for diag msgs */
+       void            *drv;           /* driver handle */
+       void            *dev;           /* device handle */
+       dmaregs_t       *regs;          /* dma engine registers */
+
+       dmadd_t         *txd;           /* pointer to chip-specific tx descriptor ring */
+       uint            txin;           /* index of next descriptor to reclaim */
+       uint            txout;          /* index of next descriptor to post */
+       uint            txavail;        /* # free tx descriptors */
+       void            *txp[MAXDD];    /* parallel array of pointers to packets */
+       ulong           txdpa;          /* physical address of descriptor ring */
+       uint            txdalign;       /* #bytes added to alloc'd mem to align txd */
+
+       dmadd_t         *rxd;           /* pointer to chip-specific rx descriptor ring */
+       uint            rxin;           /* index of next descriptor to reclaim */
+       uint            rxout;          /* index of next descriptor to post */
+       void            *rxp[MAXDD];    /* parallel array of pointers to packets */
+       ulong           rxdpa;          /* physical address of descriptor ring */
+       uint            rxdalign;       /* #bytes added to alloc'd mem to align rxd */
+
+       /* tunables */
+       uint            ntxd;           /* # tx descriptors */
+       uint            nrxd;           /* # rx descriptors */
+       uint            rxbufsize;      /* rx buffer size in bytes */
+       uint            nrxpost;        /* # rx buffers to keep posted */
+       uint            rxoffset;       /* rxcontrol offset */
+       uint            ddoffset;       /* add to get dma address of descriptor ring */
+       uint            dataoffset;     /* add to get dma address of data buffer */
+} dma_info_t;
+
+/* descriptor bumping macros */
+#define        NEXTTXD(i)      ((i + 1) & (di->ntxd - 1))
+#define        PREVTXD(i)      ((i - 1) & (di->ntxd - 1))
+#define        NEXTRXD(i)      ((i + 1) & (di->nrxd - 1))
+#define        NTXDACTIVE(h, t)        ((t - h) & (di->ntxd - 1))
+#define        NRXDACTIVE(h, t)        ((t - h) & (di->nrxd - 1))
+
+/* macros to convert between byte offsets and indexes */
+#define        B2I(bytes)      ((bytes) / sizeof (dmadd_t))
+#define        I2B(index)      ((index) * sizeof (dmadd_t))
+
+void*
+dma_attach(void *drv, void *dev, char *name, dmaregs_t *regs, uint ntxd, uint nrxd,
+       uint rxbufsize, uint nrxpost, uint rxoffset, uint ddoffset, uint dataoffset, uint *msg_level)
+{
+       dma_info_t *di;
+       void *va;
+
+       ASSERT(ntxd <= MAXDD);
+       ASSERT(nrxd <= MAXDD);
+
+       /* allocate private info structure */
+       if ((di = MALLOC(sizeof (dma_info_t))) == NULL)
+               return (NULL);
+       bzero((char*)di, sizeof (dma_info_t));
+
+       /* set message level */
+       di->msg_level = msg_level ? msg_level : &dma_msg_level;
+
+       DMA_TRACE(("%s: dma_attach: drv 0x%x dev 0x%x regs 0x%x ntxd %d nrxd %d rxbufsize %d nrxpost %d rxoffset %d ddoffset 0x%x dataoffset 0x%x\n", name, (uint)drv, (uint)dev, (uint)regs, ntxd, nrxd, rxbufsize, nrxpost, rxoffset, ddoffset, dataoffset));
+
+       /* make a private copy of our callers name */
+       strncpy(di->name, name, MAXNAMEL);
+       di->name[MAXNAMEL-1] = '\0';
+
+       di->drv = drv;
+       di->dev = dev;
+       di->regs = regs;
+
+       /* allocate transmit descriptor ring */
+       if (ntxd) {
+               if ((va = DMA_ALLOC_CONSISTENT(dev, (DMAMAXRINGSZ + DMARINGALIGN), &di->txdpa)) == NULL)
+                       goto fail;
+               di->txd = (dmadd_t*) ROUNDUP(va, DMARINGALIGN);
+               di->txdalign = ((uint)di->txd - (uint)va);
+               di->txdpa = di->txdpa + di->txdalign;
+               ASSERT(ISALIGNED(di->txd, DMARINGALIGN));
+       }
+
+       /* allocate receive descriptor ring */
+       if (nrxd) {
+               if ((va = DMA_ALLOC_CONSISTENT(dev, (DMAMAXRINGSZ + DMARINGALIGN), &di->rxdpa)) == NULL)
+                       goto fail;
+               di->rxd = (dmadd_t*) ROUNDUP(va, DMARINGALIGN);
+               di->rxdalign = ((uint)di->rxd - (uint)va);
+               di->rxdpa = di->rxdpa + di->rxdalign;
+               ASSERT(ISALIGNED(di->rxd, DMARINGALIGN));
+       }
+
+       /* save tunables */
+       di->ntxd = ntxd;
+       di->nrxd = nrxd;
+       di->rxbufsize = rxbufsize;
+       di->nrxpost = nrxpost;
+       di->rxoffset = rxoffset;
+       di->ddoffset = ddoffset;
+       di->dataoffset = dataoffset;
+
+       return ((void*)di);
+
+fail:
+       dma_detach((void*)di);
+       return (NULL);
+}
+
+/* may be called with core in reset */
+void
+dma_detach(dma_info_t *di)
+{
+       if (di == NULL)
+               return;
+
+       DMA_TRACE(("%s: dma_detach\n", di->name));
+
+       /* shouldn't be here if descriptors are unreclaimed */
+       ASSERT(di->txin == di->txout);
+       ASSERT(di->rxin == di->rxout);
+
+       /* free dma descriptor rings */
+       if (di->txd)
+               DMA_FREE_CONSISTENT(di->dev, (void *)((uint)di->txd - di->txdalign), (DMAMAXRINGSZ + DMARINGALIGN), di->txdpa);
+       if (di->rxd)
+               DMA_FREE_CONSISTENT(di->dev, (void *)((uint)di->rxd - di->rxdalign), (DMAMAXRINGSZ + DMARINGALIGN), di->rxdpa);
+
+       /* free our private info structure */
+       MFREE((void*)di, sizeof (dma_info_t));
+}
+
+
+void
+dma_txreset(dma_info_t *di)
+{
+       uint32 status;
+
+       DMA_TRACE(("%s: dma_txreset\n", di->name));
+
+       /* suspend tx DMA first */
+       W_REG(&di->regs->xmtcontrol, XC_SE);
+       SPINWAIT((status = (R_REG(&di->regs->xmtstatus) & XS_XS_MASK)) != XS_XS_DISABLED &&
+                status != XS_XS_IDLE &&
+                status != XS_XS_STOPPED,
+                10000);
+
+       W_REG(&di->regs->xmtcontrol, 0);
+       SPINWAIT((status = (R_REG(&di->regs->xmtstatus) & XS_XS_MASK)) != XS_XS_DISABLED,
+                10000);
+
+       if (status != XS_XS_DISABLED) {
+               DMA_ERROR(("%s: dma_txreset: dma cannot be stopped\n", di->name));
+       }
+
+       /* wait for the last transaction to complete */
+       OSL_DELAY(300);
+}
+
+void
+dma_rxreset(dma_info_t *di)
+{
+       uint32 status;
+
+       DMA_TRACE(("%s: dma_rxreset\n", di->name));
+
+       W_REG(&di->regs->rcvcontrol, 0);
+       SPINWAIT((status = (R_REG(&di->regs->rcvstatus) & RS_RS_MASK)) != RS_RS_DISABLED,
+                10000);
+
+       if (status != RS_RS_DISABLED) {
+               DMA_ERROR(("%s: dma_rxreset: dma cannot be stopped\n", di->name));
+       }
+}
+
+void
+dma_txinit(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_txinit\n", di->name));
+
+       di->txin = di->txout = 0;
+       di->txavail = di->ntxd - 1;
+
+       /* clear tx descriptor ring */
+       BZERO_SM((void*)di->txd, (di->ntxd * sizeof (dmadd_t)));
+
+       W_REG(&di->regs->xmtcontrol, XC_XE);
+       W_REG(&di->regs->xmtaddr, (di->txdpa + di->ddoffset));
+}
+
+bool
+dma_txenabled(dma_info_t *di)
+{
+       uint32 xc;
+
+       /* If the chip is dead, it is not enabled :-) */
+       xc = R_REG(&di->regs->xmtcontrol);
+       return ((xc != 0xffffffff) && (xc & XC_XE));
+}
+
+void
+dma_txsuspend(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_txsuspend\n", di->name));
+       OR_REG(&di->regs->xmtcontrol, XC_SE);
+}
+
+void
+dma_txresume(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_txresume\n", di->name));
+       AND_REG(&di->regs->xmtcontrol, ~XC_SE);
+}
+
+bool
+dma_txsuspended(dma_info_t *di)
+{
+       uint32 xc;
+       uint32 xs;
+
+       xc = R_REG(&di->regs->xmtcontrol);
+       if (xc & XC_SE) {
+               xs = R_REG(&di->regs->xmtstatus);
+               return ((xs & XS_XS_MASK) == XS_XS_IDLE);
+       }
+       return 0;
+}
+
+bool
+dma_txstopped(dma_info_t *di)
+{
+       return ((R_REG(&di->regs->xmtstatus) & XS_XS_MASK) == XS_XS_STOPPED);
+}
+
+bool
+dma_rxstopped(dma_info_t *di)
+{
+       return ((R_REG(&di->regs->rcvstatus) & RS_RS_MASK) == RS_RS_STOPPED);
+}
+
+void
+dma_fifoloopbackenable(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_fifoloopbackenable\n", di->name));
+       OR_REG(&di->regs->xmtcontrol, XC_LE);
+}
+
+void
+dma_rxinit(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_rxinit\n", di->name));
+
+       di->rxin = di->rxout = 0;
+
+       /* clear rx descriptor ring */
+       BZERO_SM((void*)di->rxd, (di->nrxd * sizeof (dmadd_t)));
+
+       dma_rxenable(di);
+       W_REG(&di->regs->rcvaddr, (di->rxdpa + di->ddoffset));
+}
+
+void
+dma_rxenable(dma_info_t *di)
+{
+       DMA_TRACE(("%s: dma_rxenable\n", di->name));
+       W_REG(&di->regs->rcvcontrol, ((di->rxoffset << RC_RO_SHIFT) | RC_RE));
+}
+
+bool
+dma_rxenabled(dma_info_t *di)
+{
+       uint32 rc;
+
+       rc = R_REG(&di->regs->rcvcontrol);
+       return ((rc != 0xffffffff) && (rc & RC_RE));
+}
+
+/*
+ * The BCM47XX family supports full 32bit dma engine buffer addressing so
+ * dma buffers can cross 4 Kbyte page boundaries.
+ */
+int
+dma_txfast(dma_info_t *di, void *p0, uint32 coreflags)
+{
+       void *p, *next;
+       uchar *data;
+       uint len;
+       uint txout;
+       uint32 ctrl;
+       uint32 pa;
+
+       DMA_TRACE(("%s: dma_txfast\n", di->name));
+
+       txout = di->txout;
+       ctrl = 0;
+
+       /*
+        * Walk the chain of packet buffers
+        * allocating and initializing transmit descriptor entries.
+        */
+       for (p = p0; p; p = next) {
+               data = PKTDATA(di->drv, p);
+               len = PKTLEN(di->drv, p);
+               next = PKTNEXT(di->drv, p);
+
+               /* return nonzero if out of tx descriptors */
+               if (NEXTTXD(txout) == di->txin)
+                       goto outoftxd;
+
+               if (len == 0)
+                       continue;
+
+               /* get physical address of buffer start */
+               pa = (uint32) DMA_MAP(di->dev, data, len, DMA_TX, p);
+
+               /* build the descriptor control value */
+               ctrl = len & CTRL_BC_MASK;
+
+               ctrl |= coreflags;
+               
+               if (p == p0)
+                       ctrl |= CTRL_SOF;
+               if (next == NULL)
+                       ctrl |= (CTRL_IOC | CTRL_EOF);
+               if (txout == (di->ntxd - 1))
+                       ctrl |= CTRL_EOT;
+
+               /* init the tx descriptor */
+               W_SM(&di->txd[txout].ctrl, BUS_SWAP32(ctrl));
+               W_SM(&di->txd[txout].addr, BUS_SWAP32(pa + di->dataoffset));
+
+               ASSERT(di->txp[txout] == NULL);
+
+               txout = NEXTTXD(txout);
+       }
+
+       /* if last txd eof not set, fix it */
+       if (!(ctrl & CTRL_EOF))
+               W_SM(&di->txd[PREVTXD(txout)].ctrl, BUS_SWAP32(ctrl | CTRL_IOC | CTRL_EOF));
+
+       /* save the packet */
+       di->txp[PREVTXD(txout)] = p0;
+
+       /* bump the tx descriptor index */
+       di->txout = txout;
+
+       /* kick the chip */
+       W_REG(&di->regs->xmtptr, I2B(txout));
+
+       /* tx flow control */
+       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
+
+       return (0);
+
+outoftxd:
+       DMA_ERROR(("%s: dma_txfast: out of txds\n", di->name));
+       PKTFREE(di->drv, p0, TRUE);
+       di->txavail = 0;
+       di->hnddma.txnobuf++;
+       return (-1);
+}
+
+#define        PAGESZ          4096
+#define        PAGEBASE(x)     ((uint)(x) & ~4095)
+
+/*
+ * Just like above except go through the extra effort of splitting
+ * buffers that cross 4Kbyte boundaries into multiple tx descriptors.
+ */
+int
+dma_tx(dma_info_t *di, void *p0, uint32 coreflags)
+{
+       void *p, *next;
+       uchar *data;
+       uint plen, len;
+       uchar *page, *start, *end;
+       uint txout;
+       uint32 ctrl;
+       uint32 pa;
+
+       DMA_TRACE(("%s: dma_tx\n", di->name));
+
+       txout = di->txout;
+       ctrl = 0;
+
+       /*
+        * Walk the chain of packet buffers
+        * splitting those that cross 4 Kbyte boundaries
+        * allocating and initializing transmit descriptor entries.
+        */
+       for (p = p0; p; p = next) {
+               data = PKTDATA(di->drv, p);
+               plen = PKTLEN(di->drv, p);
+               next = PKTNEXT(di->drv, p);
+
+               if (plen == 0)
+                       continue;
+
+               for (page = (uchar*)PAGEBASE(data);
+                       page <= (uchar*)PAGEBASE(data + plen - 1);
+                       page += PAGESZ) {
+
+                       /* return nonzero if out of tx descriptors */
+                       if (NEXTTXD(txout) == di->txin)
+                               goto outoftxd;
+
+                       start = (page == (uchar*)PAGEBASE(data))?  data: page;
+                       end = (page == (uchar*)PAGEBASE(data + plen))?
+                               (data + plen): (page + PAGESZ);
+                       len = end - start;
+
+                       /* build the descriptor control value */
+                       ctrl = len & CTRL_BC_MASK;
+
+                       ctrl |= coreflags;
+
+                       if ((p == p0) && (start == data))
+                               ctrl |= CTRL_SOF;
+                       if ((next == NULL) && (end == (data + plen)))
+                               ctrl |= (CTRL_IOC | CTRL_EOF);
+                       if (txout == (di->ntxd - 1))
+                               ctrl |= CTRL_EOT;
+
+                       /* get physical address of buffer start */
+                       pa = (uint32) DMA_MAP(di->dev, start, len, DMA_TX, p);
+
+                       /* init the tx descriptor */
+                       W_SM(&di->txd[txout].ctrl, BUS_SWAP32(ctrl));
+                       W_SM(&di->txd[txout].addr, BUS_SWAP32(pa + di->dataoffset));
+
+                       ASSERT(di->txp[txout] == NULL);
+
+                       txout = NEXTTXD(txout);
+               }
+       }
+
+       /* if last txd eof not set, fix it */
+       if (!(ctrl & CTRL_EOF))
+               W_SM(&di->txd[PREVTXD(txout)].ctrl, BUS_SWAP32(ctrl | CTRL_IOC | CTRL_EOF));
+
+       /* save the packet */
+       di->txp[PREVTXD(txout)] = p0;
+
+       /* bump the tx descriptor index */
+       di->txout = txout;
+
+       /* kick the chip */
+       W_REG(&di->regs->xmtptr, I2B(txout));
+
+       /* tx flow control */
+       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
+
+       return (0);
+
+outoftxd:
+       DMA_ERROR(("%s: dma_tx: out of txds\n", di->name));
+       PKTFREE(di->drv, p0, TRUE);
+       di->txavail = 0;
+       di->hnddma.txnobuf++;
+       return (-1);
+}
+
+/* returns a pointer to the next frame received, or NULL if there are no more */
+void*
+dma_rx(dma_info_t *di)
+{
+       void *p;
+       uint len;
+       int skiplen = 0;
+
+       while ((p = dma_getnextrxp(di, FALSE))) {
+               /* skip giant packets which span multiple rx descriptors */
+               if (skiplen > 0) {
+                       skiplen -= di->rxbufsize;
+                       if (skiplen < 0)
+                               skiplen = 0;
+                       PKTFREE(di->drv, p, FALSE);
+                       continue;
+               }
+
+               len = ltoh16(*(uint16*)(PKTDATA(di->drv, p)));
+               DMA_TRACE(("%s: dma_rx len %d\n", di->name, len));
+
+               /* bad frame length check */
+               if (len > (di->rxbufsize - di->rxoffset)) {
+                       DMA_ERROR(("%s: dma_rx: bad frame length (%d)\n", di->name, len));
+                       if (len > 0)
+                               skiplen = len - (di->rxbufsize - di->rxoffset);
+                       PKTFREE(di->drv, p, FALSE);
+                       di->hnddma.rxgiants++;
+                       continue;
+               }
+
+               /* set actual length */
+               PKTSETLEN(di->drv, p, (di->rxoffset + len));
+
+               break;
+       }
+
+       return (p);
+}
+
+/* post receive buffers */
+void
+dma_rxfill(dma_info_t *di)
+{
+       void *p;
+       uint rxin, rxout;
+       uint ctrl;
+       uint n;
+       uint i;
+       uint32 pa;
+       uint rxbufsize;
+
+       /*
+        * Determine how many receive buffers we're lacking
+        * from the full complement, allocate, initialize,
+        * and post them, then update the chip rx lastdscr.
+        */
+
+       rxin = di->rxin;
+       rxout = di->rxout;
+       rxbufsize = di->rxbufsize;
+
+       n = di->nrxpost - NRXDACTIVE(rxin, rxout);
+
+       DMA_TRACE(("%s: dma_rxfill: post %d\n", di->name, n));
+
+       for (i = 0; i < n; i++) {
+               if ((p = PKTGET(di->drv, rxbufsize, FALSE)) == NULL) {
+                       DMA_ERROR(("%s: dma_rxfill: out of rxbufs\n", di->name));
+                       di->hnddma.rxnobuf++;
+                       break;
+               }
+
+               *(uint32*)(OSL_UNCACHED(PKTDATA(di->drv, p))) = 0;
+
+               pa = (uint32) DMA_MAP(di->dev, PKTDATA(di->drv, p), rxbufsize, DMA_RX, p);
+               ASSERT(ISALIGNED(pa, 4));
+
+               /* save the free packet pointer */
+               ASSERT(di->rxp[rxout] == NULL);
+               di->rxp[rxout] = p;
+
+               /* prep the descriptor control value */
+               ctrl = rxbufsize;
+               if (rxout == (di->nrxd - 1))
+                       ctrl |= CTRL_EOT;
+
+               /* init the rx descriptor */
+               W_SM(&di->rxd[rxout].ctrl, BUS_SWAP32(ctrl));
+               W_SM(&di->rxd[rxout].addr, BUS_SWAP32(pa + di->dataoffset));
+
+               rxout = NEXTRXD(rxout);
+       }
+
+       di->rxout = rxout;
+
+       /* update the chip lastdscr pointer */
+       W_REG(&di->regs->rcvptr, I2B(rxout));
+}
+
+void
+dma_txreclaim(dma_info_t *di, bool forceall)
+{
+       void *p;
+
+       DMA_TRACE(("%s: dma_txreclaim %s\n", di->name, forceall ? "all" : ""));
+
+       while ((p = dma_getnexttxp(di, forceall)))
+               PKTFREE(di->drv, p, TRUE);
+}
+
+/*
+ * Reclaim next completed txd (txds if using chained buffers) and
+ * return associated packet.
+ * If 'force' is true, reclaim txd(s) and return associated packet
+ * regardless of the value of the hardware "curr" pointer.
+ */
+void*
+dma_getnexttxp(dma_info_t *di, bool forceall)
+{
+       uint start, end, i;
+       void *txp;
+
+       DMA_TRACE(("%s: dma_getnexttxp %s\n", di->name, forceall ? "all" : ""));
+
+       txp = NULL;
+
+       start = di->txin;
+       if (forceall)
+               end = di->txout;
+       else
+               end = B2I(R_REG(&di->regs->xmtstatus) & XS_CD_MASK);
+
+       if ((start == 0) && (end > di->txout))
+               goto bogus;
+
+       for (i = start; i != end && !txp; i = NEXTTXD(i)) {
+               DMA_UNMAP(di->dev, (BUS_SWAP32(R_SM(&di->txd[i].addr)) - di->dataoffset),
+                         (BUS_SWAP32(R_SM(&di->txd[i].ctrl)) & CTRL_BC_MASK), DMA_TX, di->txp[i]);
+               W_SM(&di->txd[i].addr, 0xdeadbeef);
+               txp = di->txp[i];
+               di->txp[i] = NULL;
+       }
+
+       di->txin = i;
+
+       /* tx flow control */
+       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
+
+       return (txp);
+
+bogus:
+/*
+       DMA_ERROR(("dma_getnexttxp: bogus curr: start %d end %d txout %d force %d\n",
+               start, end, di->txout, forceall));
+*/
+       return (NULL);
+}
+
+void
+dma_rxreclaim(dma_info_t *di)
+{
+       void *p;
+
+       DMA_TRACE(("%s: dma_rxreclaim\n", di->name));
+
+       while ((p = dma_getnextrxp(di, TRUE)))
+               PKTFREE(di->drv, p, FALSE);
+}
+
+void *
+dma_getnextrxp(dma_info_t *di, bool forceall)
+{
+       uint i;
+       void *rxp;
+
+       /* if forcing, dma engine must be disabled */
+       ASSERT(!forceall || !dma_rxenabled(di));
+
+       i = di->rxin;
+
+       /* return if no packets posted */
+       if (i == di->rxout)
+               return (NULL);
+
+       /* ignore curr if forceall */
+       if (!forceall && (i == B2I(R_REG(&di->regs->rcvstatus) & RS_CD_MASK)))
+               return (NULL);
+
+       /* get the packet pointer that corresponds to the rx descriptor */
+       rxp = di->rxp[i];
+       ASSERT(rxp);
+       di->rxp[i] = NULL;
+
+       /* clear this packet from the descriptor ring */
+       DMA_UNMAP(di->dev, (BUS_SWAP32(R_SM(&di->rxd[i].addr)) - di->dataoffset),
+                 di->rxbufsize, DMA_RX, rxp);
+       W_SM(&di->rxd[i].addr, 0xdeadbeef);
+
+       di->rxin = NEXTRXD(i);
+
+       return (rxp);
+}
+
+char*
+dma_dumptx(dma_info_t *di, char *buf)
+{
+       buf += sprintf(buf, "txd 0x%lx txdpa 0x%lx txp 0x%lx txin %d txout %d txavail %d\n",
+               (ulong)di->txd, di->txdpa, (ulong)di->txp, di->txin, di->txout, di->txavail);
+       buf += sprintf(buf, "xmtcontrol 0x%x xmtaddr 0x%x xmtptr 0x%x xmtstatus 0x%x\n",
+               R_REG(&di->regs->xmtcontrol),
+               R_REG(&di->regs->xmtaddr),
+               R_REG(&di->regs->xmtptr),
+               R_REG(&di->regs->xmtstatus));
+       return (buf);
+}
+
+char*
+dma_dumprx(dma_info_t *di, char *buf)
+{
+       buf += sprintf(buf, "rxd 0x%lx rxdpa 0x%lx rxp 0x%lx rxin %d rxout %d\n",
+               (ulong)di->rxd, di->rxdpa, (ulong)di->rxp, di->rxin, di->rxout);
+       buf += sprintf(buf, "rcvcontrol 0x%x rcvaddr 0x%x rcvptr 0x%x rcvstatus 0x%x\n",
+               R_REG(&di->regs->rcvcontrol),
+               R_REG(&di->regs->rcvaddr),
+               R_REG(&di->regs->rcvptr),
+               R_REG(&di->regs->rcvstatus));
+       return (buf);
+}
+
+char*
+dma_dump(dma_info_t *di, char *buf)
+{
+       buf = dma_dumptx(di, buf);
+       buf = dma_dumprx(di, buf);
+       return (buf);
+}
+
+uint
+dma_getvar(dma_info_t *di, char *name)
+{
+       if (!strcmp(name, "&txavail"))
+               return ((uint) &di->txavail);
+       else {
+               ASSERT(0);
+       }
+       return (0);
+}
+
+void
+dma_txblock(dma_info_t *di)
+{
+       di->txavail = 0;
+}
+
+void
+dma_txunblock(dma_info_t *di)
+{
+       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
+}
+
+uint
+dma_txactive(dma_info_t *di)
+{
+       return (NTXDACTIVE(di->txin, di->txout));
+}
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/linux_osl.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/linux_osl.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/linux_osl.c      1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/linux_osl.c 2005-08-28 11:12:20.476852160 +0200
@@ -0,0 +1,420 @@
+/*
+ * Linux OS Independent Layer
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id: linux_osl.c,v 1.2 2005/02/28 13:34:25 jolt Exp $
+ */
+
+#define LINUX_OSL
+
+#include <typedefs.h>
+#include <bcmendian.h>
+#include <linuxver.h>
+#include <linux_osl.h>
+#include <bcmutils.h>
+#include <linux/delay.h>
+#ifdef mips
+#include <asm/paccess.h>
+#endif
+#include <pcicfg.h>
+
+#define PCI_CFG_RETRY 10       
+
+void*
+osl_pktget(void *drv, uint len, bool send)
+{
+       struct sk_buff *skb;
+
+       if ((skb = dev_alloc_skb(len)) == NULL)
+               return (NULL);
+
+       skb_put(skb, len);
+
+       /* ensure the cookie field is cleared */ 
+       PKTSETCOOKIE(skb, NULL);
+
+       return ((void*) skb);
+}
+
+void
+osl_pktfree(void *p)
+{
+       struct sk_buff *skb, *nskb;
+
+       skb = (struct sk_buff*) p;
+
+       /* perversion: we use skb->next to chain multi-skb packets */
+       while (skb) {
+               nskb = skb->next;
+               skb->next = NULL;
+               if (skb->destructor) {
+                       /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if destructor exists */
+                       dev_kfree_skb_any(skb);
+               } else {
+                       /* can free immediately (even in_irq()) if destructor does not exist */
+                       dev_kfree_skb(skb);
+               }
+               skb = nskb;
+       }
+}
+
+uint32
+osl_pci_read_config(void *loc, uint offset, uint size)
+{
+       struct pci_dev *pdev;
+       uint val;
+       uint retry=PCI_CFG_RETRY;        
+
+       /* only 4byte access supported */
+       ASSERT(size == 4);
+
+       pdev = (struct pci_dev*)loc;
+       do {
+               pci_read_config_dword(pdev, offset, &val);
+               if (val != 0xffffffff)
+                       break;
+       } while (retry--);
+
+
+       return (val);
+}
+
+void
+osl_pci_write_config(void *loc, uint offset, uint size, uint val)
+{
+       struct pci_dev *pdev;
+       uint retry=PCI_CFG_RETRY;        
+
+       /* only 4byte access supported */
+       ASSERT(size == 4);
+
+       pdev = (struct pci_dev*)loc;
+
+       do {
+               pci_write_config_dword(pdev, offset, val);
+               if (offset!=PCI_BAR0_WIN)
+                       break;
+               if (osl_pci_read_config(loc,offset,size) == val) 
+                       break;
+       } while (retry--);
+
+}
+
+void
+osl_pcmcia_read_attr(void *osh, uint offset, void *buf, int size)
+{
+       ASSERT(0);
+}
+
+void
+osl_pcmcia_write_attr(void *osh, uint offset, void *buf, int size)
+{
+       ASSERT(0);
+}
+
+void
+osl_assert(char *exp, char *file, int line)
+{
+       char tempbuf[255];
+
+       sprintf(tempbuf, "assertion \"%s\" failed: file \"%s\", line %d\n", exp, file, line);
+       panic(tempbuf);
+}
+
+/*
+ * BINOSL selects the slightly slower function-call-based binary compatible osl.
+ */
+#ifdef BINOSL
+
+int
+osl_printf(const char *format, ...)
+{
+       va_list args;
+       char buf[1024];
+       int len;
+
+       /* sprintf into a local buffer because there *is* no "vprintk()".. */
+       va_start(args, format);
+       len = vsprintf(buf, format, args);
+       va_end(args);
+
+       if (len > sizeof (buf)) {
+               printk("osl_printf: buffer overrun\n");
+               return (0);
+       }
+
+       return (printk(buf));
+}
+
+int
+osl_sprintf(char *buf, const char *format, ...)
+{
+       va_list args;
+       int rc;
+
+       va_start(args, format);
+       rc = vsprintf(buf, format, args);
+       va_end(args);
+       return (rc);
+}
+
+int
+osl_strcmp(const char *s1, const char *s2)
+{
+       return (strcmp(s1, s2));
+}
+
+int
+osl_strncmp(const char *s1, const char *s2, uint n)
+{
+       return (strncmp(s1, s2, n));
+}
+
+int
+osl_strlen(char *s)
+{
+       return (strlen(s));
+}
+
+char*
+osl_strcpy(char *d, const char *s)
+{
+       return (strcpy(d, s));
+}
+
+char*
+osl_strncpy(char *d, const char *s, uint n)
+{
+       return (strncpy(d, s, n));
+}
+
+void
+bcopy(const void *src, void *dst, int len)
+{
+       memcpy(dst, src, len);
+}
+
+int
+bcmp(const void *b1, const void *b2, int len)
+{
+       return (memcmp(b1, b2, len));
+}
+
+void
+bzero(void *b, int len)
+{
+       memset(b, '\0', len);
+}
+
+void*
+osl_malloc(uint size)
+{
+       return (kmalloc(size, GFP_ATOMIC));
+}
+
+void
+osl_mfree(void *addr, uint size)
+{
+       kfree(addr);
+}
+
+uint32
+osl_readl(volatile uint32 *r)
+{
+       return (readl(r));
+}
+
+uint16
+osl_readw(volatile uint16 *r)
+{
+       return (readw(r));
+}
+
+uint8
+osl_readb(volatile uint8 *r)
+{
+       return (readb(r));
+}
+
+void
+osl_writel(uint32 v, volatile uint32 *r)
+{
+       writel(v, r);
+}
+
+void
+osl_writew(uint16 v, volatile uint16 *r)
+{
+       writew(v, r);
+}
+
+void
+osl_writeb(uint8 v, volatile uint8 *r)
+{
+       writeb(v, r);
+}
+
+void *
+osl_uncached(void *va)
+{
+#ifdef mips
+       return ((void*)KSEG1ADDR(va));
+#else
+       return ((void*)va);
+#endif
+}
+
+uint
+osl_getcycles(void)
+{
+       uint cycles;
+
+#if defined(mips)
+       cycles = read_c0_count() * 2;
+#elif defined(__i386__)
+       rdtscl(cycles);
+#else
+       cycles = 0;
+#endif
+       return cycles;
+}
+
+void *
+osl_reg_map(uint32 pa, uint size)
+{
+       return (ioremap_nocache((unsigned long)pa, (unsigned long)size));
+}
+
+void
+osl_reg_unmap(void *va)
+{
+       iounmap(va);
+}
+
+int
+osl_busprobe(uint32 *val, uint32 addr)
+{
+#ifdef mips
+       return get_dbe(*val, (uint32*)addr);
+#else
+       *val = readl(addr);
+       return 0;
+#endif
+}
+
+void*
+osl_dma_alloc_consistent(void *dev, uint size, ulong *pap)
+{
+       return (pci_alloc_consistent((struct pci_dev*)dev, size, (dma_addr_t*)pap));
+}
+
+void
+osl_dma_free_consistent(void *dev, void *va, uint size, ulong pa)
+{
+       pci_free_consistent((struct pci_dev*)dev, size, va, (dma_addr_t)pa);
+}
+
+uint
+osl_dma_map(void *dev, void *va, uint size, int direction)
+{
+       int dir;
+
+       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+       return (pci_map_single(dev, va, size, dir));
+}
+
+void
+osl_dma_unmap(void *dev, uint pa, uint size, int direction)
+{
+       int dir;
+
+       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
+       pci_unmap_single(dev, (uint32)pa, size, dir);
+}
+
+void
+osl_delay(uint usec)
+{
+       udelay(usec);
+}
+
+uchar*
+osl_pktdata(void *drv, void *skb)
+{
+       return (((struct sk_buff*)skb)->data);
+}
+
+uint
+osl_pktlen(void *drv, void *skb)
+{
+       return (((struct sk_buff*)skb)->len);
+}
+
+void*
+osl_pktnext(void *drv, void *skb)
+{
+       return (((struct sk_buff*)skb)->next);
+}
+
+void
+osl_pktsetnext(void *skb, void *x)
+{
+       ((struct sk_buff*)skb)->next = (struct sk_buff*)x;
+}
+
+void
+osl_pktsetlen(void *drv, void *skb, uint len)
+{
+       __skb_trim((struct sk_buff*)skb, len);
+}
+
+uchar*
+osl_pktpush(void *drv, void *skb, int bytes)
+{
+       return (skb_push((struct sk_buff*)skb, bytes));
+}
+
+uchar*
+osl_pktpull(void *drv, void *skb, int bytes)
+{
+       return (skb_pull((struct sk_buff*)skb, bytes));
+}
+
+void*
+osl_pktdup(void *drv, void *skb)
+{
+       return (skb_clone((struct sk_buff*)skb, GFP_ATOMIC));
+}
+
+void*
+osl_pktcookie(void *skb)
+{
+       return ((void*)((struct sk_buff*)skb)->csum);
+}
+
+void
+osl_pktsetcookie(void *skb, void *x)
+{
+       ((struct sk_buff*)skb)->csum = (uint)x;
+}
+
+void*
+osl_pktlink(void *skb)
+{
+       return (((struct sk_buff*)skb)->prev);
+}
+
+void
+osl_pktsetlink(void *skb, void *x)
+{
+       ((struct sk_buff*)skb)->prev = (struct sk_buff*)x;
+}
+
+#endif
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbmips.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbmips.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbmips.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbmips.c    2005-08-28 11:12:20.478851856 +0200
@@ -0,0 +1,950 @@
+/*
+ * BCM47XX Sonics SiliconBackplane MIPS core routines
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id: sbmips.c,v 1.1 2005/02/28 13:33:32 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <osl.h>
+#include <sbutils.h>
+#include <bcmdevs.h>
+#include <bcmnvram.h>
+#include <bcmutils.h>
+#include <hndmips.h>
+#include <sbconfig.h>
+#include <sbextif.h>
+#include <sbchipc.h>
+#include <sbmemc.h>
+
+/*
+ * Memory segments (32bit kernel mode addresses)
+ */
+#undef KUSEG
+#undef KSEG0
+#undef KSEG1
+#undef KSEG2
+#undef KSEG3
+#define KUSEG          0x00000000
+#define KSEG0          0x80000000
+#define KSEG1          0xa0000000
+#define KSEG2          0xc0000000
+#define KSEG3          0xe0000000
+
+/*
+ * Map an address to a certain kernel segment
+ */
+#undef KSEG0ADDR
+#undef KSEG1ADDR
+#undef KSEG2ADDR
+#undef KSEG3ADDR
+#define KSEG0ADDR(a)           (((a) & 0x1fffffff) | KSEG0)
+#define KSEG1ADDR(a)           (((a) & 0x1fffffff) | KSEG1)
+#define KSEG2ADDR(a)           (((a) & 0x1fffffff) | KSEG2)
+#define KSEG3ADDR(a)           (((a) & 0x1fffffff) | KSEG3)
+
+/*
+ * The following macros are especially useful for __asm__
+ * inline assembler.
+ */
+#ifndef __STR
+#define __STR(x) #x
+#endif
+#ifndef STR
+#define STR(x) __STR(x)
+#endif
+
+/*  *********************************************************************
+    *  CP0 Registers 
+    ********************************************************************* */
+
+#define C0_INX         0               /* CP0: TLB Index */
+#define C0_RAND                1               /* CP0: TLB Random */
+#define C0_TLBLO0      2               /* CP0: TLB EntryLo0 */
+#define C0_TLBLO       C0_TLBLO0       /* CP0: TLB EntryLo0 */
+#define C0_TLBLO1      3               /* CP0: TLB EntryLo1 */
+#define C0_CTEXT       4               /* CP0: Context */
+#define C0_PGMASK      5               /* CP0: TLB PageMask */
+#define C0_WIRED       6               /* CP0: TLB Wired */
+#define C0_BADVADDR    8               /* CP0: Bad Virtual Address */
+#define C0_COUNT       9               /* CP0: Count */
+#define C0_TLBHI       10              /* CP0: TLB EntryHi */
+#define C0_COMPARE     11              /* CP0: Compare */
+#define C0_SR          12              /* CP0: Processor Status */
+#define C0_STATUS      C0_SR           /* CP0: Processor Status */
+#define C0_CAUSE       13              /* CP0: Exception Cause */
+#define C0_EPC         14              /* CP0: Exception PC */
+#define C0_PRID                15              /* CP0: Processor Revision Indentifier */
+#define C0_CONFIG      16              /* CP0: Config */
+#define C0_LLADDR      17              /* CP0: LLAddr */
+#define C0_WATCHLO     18              /* CP0: WatchpointLo */
+#define C0_WATCHHI     19              /* CP0: WatchpointHi */
+#define C0_XCTEXT      20              /* CP0: XContext */
+#define C0_DIAGNOSTIC  22              /* CP0: Diagnostic */
+#define C0_BROADCOM    C0_DIAGNOSTIC   /* CP0: Broadcom Register */
+#define C0_ECC         26              /* CP0: ECC */
+#define C0_CACHEERR    27              /* CP0: CacheErr */
+#define C0_TAGLO       28              /* CP0: TagLo */
+#define C0_TAGHI       29              /* CP0: TagHi */
+#define C0_ERREPC      30              /* CP0: ErrorEPC */
+
+/*
+ * Macros to access the system control coprocessor
+ */
+
+#define MFC0(source, sel)                                      \
+({                                                             \
+       int __res;                                              \
+       __asm__ __volatile__(                                   \
+       ".set\tnoreorder\n\t"                                   \
+       ".set\tnoat\n\t"                                        \
+       ".word\t"STR(0x40010000 | ((source)<<11) | (sel))"\n\t" \
+       "move\t%0,$1\n\t"                                       \
+       ".set\tat\n\t"                                          \
+       ".set\treorder"                                         \
+       :"=r" (__res)                                           \
+       :                                                       \
+       :"$1");                                                 \
+       __res;                                                  \
+})
+
+#define MTC0(source, sel, value)                               \
+do {                                                           \
+       __asm__ __volatile__(                                   \
+       ".set\tnoreorder\n\t"                                   \
+       ".set\tnoat\n\t"                                        \
+       "move\t$1,%z0\n\t"                                      \
+       ".word\t"STR(0x40810000 | ((source)<<11) | (sel))"\n\t" \
+       ".set\tat\n\t"                                          \
+       ".set\treorder"                                         \
+       :                                                       \
+       :"Jr" (value)                                           \
+       :"$1");                                                 \
+} while (0)
+
+/*
+ * R4x00 interrupt enable / cause bits
+ */
+#undef IE_SW0
+#undef IE_SW1
+#undef IE_IRQ0
+#undef IE_IRQ1
+#undef IE_IRQ2
+#undef IE_IRQ3
+#undef IE_IRQ4
+#undef IE_IRQ5
+#define IE_SW0         (1<< 8)
+#define IE_SW1         (1<< 9)
+#define IE_IRQ0                (1<<10)
+#define IE_IRQ1                (1<<11)
+#define IE_IRQ2                (1<<12)
+#define IE_IRQ3                (1<<13)
+#define IE_IRQ4                (1<<14)
+#define IE_IRQ5                (1<<15)
+
+/*
+ * Bitfields in the R4xx0 cp0 status register
+ */
+#define ST0_IE                 0x00000001
+#define ST0_EXL                        0x00000002
+#define ST0_ERL                        0x00000004
+#define ST0_KSU                        0x00000018
+#  define KSU_USER             0x00000010
+#  define KSU_SUPERVISOR       0x00000008
+#  define KSU_KERNEL           0x00000000
+#define ST0_UX                 0x00000020
+#define ST0_SX                 0x00000040
+#define ST0_KX                         0x00000080
+#define ST0_DE                 0x00010000
+#define ST0_CE                 0x00020000
+
+/*
+ * Status register bits available in all MIPS CPUs.
+ */
+#define ST0_IM                 0x0000ff00
+#define ST0_CH                 0x00040000
+#define ST0_SR                 0x00100000
+#define ST0_TS                 0x00200000
+#define ST0_BEV                        0x00400000
+#define ST0_RE                 0x02000000
+#define ST0_FR                 0x04000000
+#define ST0_CU                 0xf0000000
+#define ST0_CU0                        0x10000000
+#define ST0_CU1                        0x20000000
+#define ST0_CU2                        0x40000000
+#define ST0_CU3                        0x80000000
+#define ST0_XX                 0x80000000      /* MIPS IV naming */
+
+/*
+ * Cache Operations
+ */
+
+#ifndef Fill_I
+#define Fill_I                 0x14
+#endif
+
+#define cache_unroll(base,op)                  \
+       __asm__ __volatile__("                  \
+               .set noreorder;                 \
+               .set mips3;                     \
+               cache %1, (%0);                 \
+               .set mips0;                     \
+               .set reorder"                   \
+               :                               \
+               : "r" (base),                   \
+                 "i" (op));
+
+/* 
+ * These are the UART port assignments, expressed as offsets from the base
+ * register.  These assignments should hold for any serial port based on
+ * a 8250, 16450, or 16550(A).
+ */
+
+#define UART_MCR       4       /* Out: Modem Control Register */
+#define UART_MSR       6       /* In:  Modem Status Register */
+#define UART_MCR_LOOP  0x10    /* Enable loopback test mode */
+
+/* 
+ * Returns TRUE if an external UART exists at the given base
+ * register.
+ */
+static bool
+serial_exists(uint8 *regs)
+{
+       uint8 save_mcr, status1;
+
+       save_mcr = R_REG(&regs[UART_MCR]);
+       W_REG(&regs[UART_MCR], UART_MCR_LOOP | 0x0a);
+       status1 = R_REG(&regs[UART_MSR]) & 0xf0;
+       W_REG(&regs[UART_MCR], save_mcr);
+
+       return (status1 == 0x90);
+}
+
+/* 
+ * Initializes UART access. The callback function will be called once
+ * per found UART.
+*/
+void
+sb_serial_init(void *sbh, void (*add)(void *regs, uint irq, uint baud_base, uint reg_shift))
+{
+       void *regs;
+       ulong base;
+       uint irq;
+       int i, n;
+
+       if ((regs = sb_setcore(sbh, SB_EXTIF, 0))) {
+               extifregs_t *eir = (extifregs_t *) regs;
+               sbconfig_t *sb;
+
+               /* Determine external UART register base */
+               sb = (sbconfig_t *)((ulong) eir + SBCONFIGOFF);
+               base = EXTIF_CFGIF_BASE(sb_base(R_REG(&sb->sbadmatch1)));
+
+               /* Determine IRQ */
+               irq = sb_irq(sbh);
+
+               /* Disable GPIO interrupt initially */
+               W_REG(&eir->gpiointpolarity, 0);
+               W_REG(&eir->gpiointmask, 0);
+
+               /* Search for external UARTs */
+               n = 2;
+               for (i = 0; i < 2; i++) {
+                       regs = (void *) REG_MAP(base + (i * 8), 8);
+                       if (serial_exists(regs)) {
+                               /* Set GPIO 1 to be the external UART IRQ */
+                               W_REG(&eir->gpiointmask, 2);
+                               if (add)
+                                       add(regs, irq, 13500000, 0);
+                       }
+               }
+
+               /* Add internal UART if enabled */
+               if (R_REG(&eir->corecontrol) & CC_UE)
+                       if (add)
+                               add((void *) &eir->uartdata, irq, sb_clock(sbh), 2);
+       } else if ((regs = sb_setcore(sbh, SB_CC, 0))) {
+               chipcregs_t *cc = (chipcregs_t *) regs;
+               uint32 rev, cap, pll, baud_base, div;
+
+               /* Determine core revision and capabilities */
+               rev = sb_corerev(sbh);
+               cap = R_REG(&cc->capabilities);
+               pll = cap & CAP_PLL_MASK;
+
+               /* Determine IRQ */
+               irq = sb_irq(sbh);
+
+               if (pll == PLL_TYPE1) {
+                       /* PLL clock */
+                       baud_base = sb_clock_rate(pll,
+                                                 R_REG(&cc->clockcontrol_n),
+                                                 R_REG(&cc->clockcontrol_m2));
+                       div = 1;
+               } else if (rev >= 3) {
+                       /* Internal backplane clock */
+                       baud_base = sb_clock_rate(pll,
+                                                 R_REG(&cc->clockcontrol_n),
+                                                 R_REG(&cc->clockcontrol_sb));
+                       div = 2;        /* Minimum divisor */
+                       W_REG(&cc->uart_clkdiv, div);
+               } else {
+                       /* Fixed internal backplane clock */
+                       baud_base = 88000000;
+                       div = 48;
+               }
+
+               /* Clock source depends on strapping if UartClkOverride is unset */
+               if ((rev > 0) && ((R_REG(&cc->corecontrol) & CC_UARTCLKO) == 0)) {
+                       if ((cap & CAP_UCLKSEL) == CAP_UINTCLK) {
+                               /* Internal divided backplane clock */
+                               baud_base /= div;
+                       } else {
+                               /* Assume external clock of 1.8432 MHz */
+                               baud_base = 1843200;
+                       }
+               }
+
+               /* Add internal UARTs */
+               n = cap & CAP_UARTS_MASK;
+               for (i = 0; i < n; i++) {
+                       /* Register offset changed after revision 0 */
+                       if (rev)
+                               regs = (void *)((ulong) &cc->uart0data + (i * 256));
+                       else
+                               regs = (void *)((ulong) &cc->uart0data + (i * 8));
+
+                       if (add)
+                               add(regs, irq, baud_base, 0);
+               }
+       }
+}
+
+/* Returns the SB interrupt flag of the current core. */
+uint32
+sb_flag(void *sbh)
+{
+       void *regs;
+       sbconfig_t *sb;
+
+       regs = sb_coreregs(sbh);
+       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+
+       return (R_REG(&sb->sbtpsflag) & SBTPS_NUM0_MASK);
+}
+
+static const uint32 sbips_int_mask[] = {
+       0,
+       SBIPS_INT1_MASK,
+       SBIPS_INT2_MASK,
+       SBIPS_INT3_MASK,
+       SBIPS_INT4_MASK
+};
+
+static const uint32 sbips_int_shift[] = {
+       0,
+       0,
+       SBIPS_INT2_SHIFT,
+       SBIPS_INT3_SHIFT,
+       SBIPS_INT4_SHIFT
+};
+
+/* 
+ * Returns the MIPS IRQ assignment of the current core. If unassigned,
+ * 0 is returned.
+ */
+uint
+sb_irq(void *sbh)
+{
+       uint idx;
+       void *regs;
+       sbconfig_t *sb;
+       uint32 flag, sbipsflag;
+       uint irq = 0;
+
+       flag = sb_flag(sbh);
+
+       idx = sb_coreidx(sbh);
+
+       if ((regs = sb_setcore(sbh, SB_MIPS, 0)) ||
+           (regs = sb_setcore(sbh, SB_MIPS33, 0))) {
+               sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+
+               /* sbipsflag specifies which core is routed to interrupts 1 to 4 */
+               sbipsflag = R_REG(&sb->sbipsflag);
+               for (irq = 1; irq <= 4; irq++) {
+                       if (((sbipsflag & sbips_int_mask[irq]) >> sbips_int_shift[irq]) == flag)
+                               break;
+               }
+               if (irq == 5)
+                       irq = 0;
+       }
+
+       sb_setcoreidx(sbh, idx);
+
+       return irq;
+}
+
+/* Clears the specified MIPS IRQ. */
+static void
+sb_clearirq(void *sbh, uint irq)
+{
+       void *regs;
+       sbconfig_t *sb;
+
+       if (!(regs = sb_setcore(sbh, SB_MIPS, 0)) &&
+           !(regs = sb_setcore(sbh, SB_MIPS33, 0)))
+               ASSERT(regs);
+       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+
+       if (irq == 0)
+               W_REG(&sb->sbintvec, 0);
+       else
+               OR_REG(&sb->sbipsflag, sbips_int_mask[irq]);
+}
+
+/* 
+ * Assigns the specified MIPS IRQ to the specified core. Shared MIPS
+ * IRQ 0 may be assigned more than once.
+ */
+static void
+sb_setirq(void *sbh, uint irq, uint coreid, uint coreunit)
+{
+       void *regs;
+       sbconfig_t *sb;
+       uint32 flag;
+
+       regs = sb_setcore(sbh, coreid, coreunit);
+       ASSERT(regs);
+       flag = sb_flag(sbh);
+
+       if (!(regs = sb_setcore(sbh, SB_MIPS, 0)) &&
+           !(regs = sb_setcore(sbh, SB_MIPS33, 0)))
+               ASSERT(regs);
+       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+
+       if (irq == 0)
+               OR_REG(&sb->sbintvec, 1 << flag);
+       else {
+               flag <<= sbips_int_shift[irq];
+               ASSERT(!(flag & ~sbips_int_mask[irq]));
+               flag |= R_REG(&sb->sbipsflag) & ~sbips_int_mask[irq];
+               W_REG(&sb->sbipsflag, flag);
+       }
+}      
+
+/* 
+ * Initializes clocks and interrupts. SB and NVRAM access must be
+ * initialized prior to calling.
+ */
+void
+sb_mips_init(void *sbh)
+{
+       ulong hz, ns, tmp;
+       extifregs_t *eir;
+       chipcregs_t *cc;
+       char *value;
+       uint irq;
+
+       /* Figure out current SB clock speed */
+       if ((hz = sb_clock(sbh)) == 0)
+               hz = 100000000;
+       ns = 1000000000 / hz;
+
+       /* Setup external interface timing */
+       if ((eir = sb_setcore(sbh, SB_EXTIF, 0))) {
+               /* Initialize extif so we can get to the LEDs and external UART */
+               W_REG(&eir->prog_config, CF_EN);
+
+               /* Set timing for the flash */
+               tmp = CEIL(10, ns) << FW_W3_SHIFT;      /* W3 = 10nS */
+               tmp = tmp | (CEIL(40, ns) << FW_W1_SHIFT); /* W1 = 40nS */
+               tmp = tmp | CEIL(120, ns);              /* W0 = 120nS */
+               W_REG(&eir->prog_waitcount, tmp);       /* 0x01020a0c for a 100Mhz clock */
+
+               /* Set programmable interface timing for external uart */
+               tmp = CEIL(10, ns) << FW_W3_SHIFT;      /* W3 = 10nS */
+               tmp = tmp | (CEIL(20, ns) << FW_W2_SHIFT); /* W2 = 20nS */
+               tmp = tmp | (CEIL(100, ns) << FW_W1_SHIFT); /* W1 = 100nS */
+               tmp = tmp | CEIL(120, ns);              /* W0 = 120nS */
+               W_REG(&eir->prog_waitcount, tmp);       /* 0x01020a0c for a 100Mhz clock */
+       } else if ((cc = sb_setcore(sbh, SB_CC, 0))) {
+               /* Set timing for the flash */
+               tmp = CEIL(10, ns) << FW_W3_SHIFT;      /* W3 = 10nS */
+               tmp |= CEIL(10, ns) << FW_W1_SHIFT;     /* W1 = 10nS */
+               tmp |= CEIL(120, ns);                   /* W0 = 120nS */
+               W_REG(&cc->parallelflashwaitcnt, tmp);
+
+               W_REG(&cc->cs01memwaitcnt, tmp);
+       }
+
+       /* Chip specific initialization */
+       switch (sb_chip(sbh)) {
+       case BCM4710_DEVICE_ID:
+               /* Clear interrupt map */
+               for (irq = 0; irq <= 4; irq++)
+                       sb_clearirq(sbh, irq);
+               sb_setirq(sbh, 0, SB_CODEC, 0);
+               sb_setirq(sbh, 0, SB_EXTIF, 0);
+               sb_setirq(sbh, 2, SB_ENET, 1);
+               sb_setirq(sbh, 3, SB_ILINE20, 0);
+               sb_setirq(sbh, 4, SB_PCI, 0);
+               ASSERT(eir);
+               value = nvram_get("et0phyaddr");
+               if (value && !strcmp(value, "31")) {
+                       /* Enable internal UART */
+                       W_REG(&eir->corecontrol, CC_UE);
+                       /* Give USB its own interrupt */
+                       sb_setirq(sbh, 1, SB_USB, 0);
+               } else {
+                       /* Disable internal UART */
+                       W_REG(&eir->corecontrol, 0);
+                       /* Give Ethernet its own interrupt */
+                       sb_setirq(sbh, 1, SB_ENET, 0);
+                       sb_setirq(sbh, 0, SB_USB, 0);
+               }
+               break;
+       case BCM4310_DEVICE_ID:
+               MTC0(C0_BROADCOM, 0, MFC0(C0_BROADCOM, 0) & ~(1 << 22));
+               break;
+       }
+}
+
+uint32
+sb_mips_clock(void *sbh)
+{
+       extifregs_t *eir;
+       chipcregs_t *cc;
+       uint32 n, m;
+       uint idx;
+       uint32 pll_type, rate = 0;
+
+       /* get index of the current core */
+       idx = sb_coreidx(sbh);
+       pll_type = PLL_TYPE1;
+
+       /* switch to extif or chipc core */
+       if ((eir = (extifregs_t *) sb_setcore(sbh, SB_EXTIF, 0))) {
+               n = R_REG(&eir->clockcontrol_n);
+               m = R_REG(&eir->clockcontrol_sb);
+       } else if ((cc = (chipcregs_t *) sb_setcore(sbh, SB_CC, 0))) {
+               pll_type = R_REG(&cc->capabilities) & CAP_PLL_MASK;
+               n = R_REG(&cc->clockcontrol_n);
+               if ((pll_type == PLL_TYPE2) || (pll_type == PLL_TYPE4))
+                       m = R_REG(&cc->clockcontrol_mips);
+               else if (pll_type == PLL_TYPE3) {
+                       rate = 200000000;
+                       goto out;
+               } else
+                       m = R_REG(&cc->clockcontrol_sb);
+       } else
+               goto out;
+
+       /* calculate rate */
+       rate = sb_clock_rate(pll_type, n, m);
+
+out:
+       /* switch back to previous core */
+       sb_setcoreidx(sbh, idx);
+
+       return rate;
+}
+
+static void
+icache_probe(int *size, int *lsize)
+{
+       uint32 config1;
+       uint sets, ways;
+
+       config1 = MFC0(C0_CONFIG, 1);
+
+       /* Instruction Cache Size = Associativity * Line Size * Sets Per Way */
+       if ((*lsize = ((config1 >> 19) & 7)))
+               *lsize = 2 << *lsize;
+       sets = 64 << ((config1 >> 22) & 7);
+       ways = 1 + ((config1 >> 16) & 7);
+       *size = *lsize * sets * ways;
+}
+
+#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4)
+
+static void
+handler(void)
+{
+       /* Step 11 */
+       __asm__ (
+               ".set\tmips32\n\t"
+               "ssnop\n\t"
+               "ssnop\n\t"
+       /* Disable interrupts */
+       /*      MTC0(C0_STATUS, 0, MFC0(C0_STATUS, 0) & ~(ALLINTS | STO_IE)); */
+               "mfc0 $15, $12\n\t"
+               "and $15, $15, -31746\n\t"
+               "mtc0 $15, $12\n\t"
+               "eret\n\t"
+               "nop\n\t"
+               "nop\n\t"
+               ".set\tmips0"
+       );
+}
+
+/* The following MUST come right after handler() */
+static void
+afterhandler(void)
+{
+}
+
+/*
+ * Set the MIPS, backplane and PCI clocks as closely as possible.
+ */
+bool
+sb_mips_setclock(void *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock)
+{
+       extifregs_t *eir = NULL;
+       chipcregs_t *cc = NULL;
+       mipsregs_t *mipsr = NULL;
+       volatile uint32 *clockcontrol_n, *clockcontrol_sb, *clockcontrol_pci;
+       uint32 orig_n, orig_sb, orig_pci, orig_m2, orig_mips, orig_ratio_parm, new_ratio;
+       uint32 pll_type, sync_mode;
+       uint idx, i;
+       struct {
+               uint32 mipsclock;
+               uint16 n;
+               uint32 sb;
+               uint32 pci33;
+               uint32 pci25;
+       } type1_table[] = {
+               {  96000000, 0x0303, 0x04020011, 0x11030011, 0x11050011 }, /*  96.000 32.000 24.000 */
+               { 100000000, 0x0009, 0x04020011, 0x11030011, 0x11050011 }, /* 100.000 33.333 25.000 */
+               { 104000000, 0x0802, 0x04020011, 0x11050009, 0x11090009 }, /* 104.000 31.200 24.960 */
+               { 108000000, 0x0403, 0x04020011, 0x11050009, 0x02000802 }, /* 108.000 32.400 24.923 */
+               { 112000000, 0x0205, 0x04020011, 0x11030021, 0x02000403 }, /* 112.000 32.000 24.889 */
+               { 115200000, 0x0303, 0x04020009, 0x11030011, 0x11050011 }, /* 115.200 32.000 24.000 */
+               { 120000000, 0x0011, 0x04020011, 0x11050011, 0x11090011 }, /* 120.000 30.000 24.000 */
+               { 124800000, 0x0802, 0x04020009, 0x11050009, 0x11090009 }, /* 124.800 31.200 24.960 */
+               { 128000000, 0x0305, 0x04020011, 0x11050011, 0x02000305 }, /* 128.000 32.000 24.000 */
+               { 132000000, 0x0603, 0x04020011, 0x11050011, 0x02000305 }, /* 132.000 33.000 24.750 */
+               { 136000000, 0x0c02, 0x04020011, 0x11090009, 0x02000603 }, /* 136.000 32.640 24.727 */
+               { 140000000, 0x0021, 0x04020011, 0x11050021, 0x02000c02 }, /* 140.000 30.000 24.706 */
+               { 144000000, 0x0405, 0x04020011, 0x01020202, 0x11090021 }, /* 144.000 30.857 24.686 */
+               { 150857142, 0x0605, 0x04020021, 0x02000305, 0x02000605 }, /* 150.857 33.000 24.000 */
+               { 152000000, 0x0e02, 0x04020011, 0x11050021, 0x02000e02 }, /* 152.000 32.571 24.000 */
+               { 156000000, 0x0802, 0x04020005, 0x11050009, 0x11090009 }, /* 156.000 31.200 24.960 */
+               { 160000000, 0x0309, 0x04020011, 0x11090011, 0x02000309 }, /* 160.000 32.000 24.000 */
+               { 163200000, 0x0c02, 0x04020009, 0x11090009, 0x02000603 }, /* 163.200 32.640 24.727 */
+               { 168000000, 0x0205, 0x04020005, 0x11030021, 0x02000403 }, /* 168.000 32.000 24.889 */
+               { 176000000, 0x0602, 0x04020003, 0x11050005, 0x02000602 }, /* 176.000 33.000 24.000 */
+       };
+       typedef struct {
+               uint32 mipsclock;
+               uint32 sbclock;
+               uint16 n;
+               uint32 sb;
+               uint32 pci33;
+               uint32 m2;
+               uint32 m3;
+               uint32 ratio;
+               uint32 ratio_parm;
+       } n4m_table_t;
+
+       n4m_table_t type2_table[] = {
+               { 180000000,  80000000, 0x0403, 0x01010000, 0x01020300, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 180000000,  90000000, 0x0403, 0x01000100, 0x01020300, 0x01000100, 0x05000100, 0x21, 0x0aaa0555 },
+               { 200000000, 100000000, 0x0303, 0x01000000, 0x01000600, 0x01000000, 0x05000000, 0x21, 0x0aaa0555 },
+               { 211200000, 105600000, 0x0902, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 0x21, 0x0aaa0555 },
+               { 220800000, 110400000, 0x1500, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 0x21, 0x0aaa0555 },
+               { 230400000, 115200000, 0x0604, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 0x21, 0x0aaa0555 },
+               { 234000000, 104000000, 0x0b01, 0x01010000, 0x01010700, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 240000000, 120000000, 0x0803, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 0x21, 0x0aaa0555 },
+               { 252000000, 126000000, 0x0504, 0x01000100, 0x01020500, 0x01000100, 0x05000100, 0x21, 0x0aaa0555 },
+               { 264000000, 132000000, 0x0903, 0x01000200, 0x01020700, 0x01000200, 0x05000200, 0x21, 0x0aaa0555 },
+               { 270000000, 120000000, 0x0703, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 276000000, 122666666, 0x1500, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 280000000, 140000000, 0x0503, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 0x21, 0x0aaa0555 },
+               { 288000000, 128000000, 0x0604, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 288000000, 144000000, 0x0404, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 0x21, 0x0aaa0555 },
+               { 300000000, 133333333, 0x0803, 0x01010000, 0x01020600, 0x01020600, 0x05000100, 0x94, 0x012a0115 },
+               { 300000000, 150000000, 0x0803, 0x01000100, 0x01020600, 0x01000100, 0x05000100, 0x21, 0x0aaa0555 }
+       };
+
+       n4m_table_t type4_table[] = {
+               { 192000000,  96000000, 0x0702, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 0x21, 0x0aaa0555 },
+               { 200000000, 100000000, 0x0009, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 0x21, 0x0aaa0555 },
+               { 216000000, 108000000, 0x0211, 0x11020005, 0x11030303, 0x11020005, 0x04000005, 0x21, 0x0aaa0555 },
+               { 228000000, 101333333, 0x0e02, 0x11030003, 0x11210005, 0x11030305, 0x04000005, 0x94, 0x012a00a9 },
+               { 228000000, 114000000, 0x0e02, 0x11020005, 0x11210005, 0x11020005, 0x04000005, 0x21, 0x0aaa0555 },
+               { 240000000, 120000000, 0x0109, 0x11030002, 0x01050203, 0x11030002, 0x04000003, 0x21, 0x0aaa0555 },
+               { 252000000, 126000000, 0x0203, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 0x21, 0x0aaa0555 },
+               { 264000000, 132000000, 0x0602, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 0x21, 0x0aaa0555 },
+               { 272000000, 116571428, 0x0c02, 0x04000021, 0x02000909, 0x02000221, 0x04000003, 0x73, 0x254a14a9 },
+               { 280000000, 120000000, 0x0209, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 0x73, 0x254a14a9 },
+               { 288000000, 123428571, 0x0111, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 0x73, 0x254a14a9 },
+               { 300000000, 120000000, 0x0009, 0x04000009, 0x01030203, 0x02000902, 0x04000002, 0x52, 0x02520129 }
+       };
+       uint icache_size, ic_lsize;
+       ulong start, end, dst;
+       bool ret = FALSE;
+
+       /* get index of the current core */
+       idx = sb_coreidx(sbh);
+
+       /* switch to extif or chipc core */
+       if ((eir = (extifregs_t *) sb_setcore(sbh, SB_EXTIF, 0))) {
+               pll_type = PLL_TYPE1;
+               clockcontrol_n = &eir->clockcontrol_n;
+               clockcontrol_sb = &eir->clockcontrol_sb;
+               clockcontrol_pci = &eir->clockcontrol_pci;
+       } else if ((cc = (chipcregs_t *) sb_setcore(sbh, SB_CC, 0))) {
+               pll_type = R_REG(&cc->capabilities) & CAP_PLL_MASK;
+               clockcontrol_n = &cc->clockcontrol_n;
+               clockcontrol_sb = &cc->clockcontrol_sb;
+               clockcontrol_pci = &cc->clockcontrol_pci;
+       } else
+               goto done;
+
+       /* Store the current clock register values */
+       orig_n = R_REG(clockcontrol_n);
+       orig_sb = R_REG(clockcontrol_sb);
+       orig_pci = R_REG(clockcontrol_pci);
+
+       if (pll_type == PLL_TYPE1) {
+               /* Keep the current PCI clock if not specified */
+               if (pciclock == 0) {
+                       pciclock = sb_clock_rate(pll_type, R_REG(clockcontrol_n), R_REG(clockcontrol_pci));
+                       pciclock = (pciclock <= 25000000) ? 25000000 : 33000000;
+               }
+
+               /* Search for the closest MIPS clock less than or equal to a preferred value */
+               for (i = 0; i < ARRAYSIZE(type1_table); i++) {
+                       ASSERT(type1_table[i].mipsclock ==
+                              sb_clock_rate(pll_type, type1_table[i].n, type1_table[i].sb));
+                       if (type1_table[i].mipsclock > mipsclock)
+                               break;
+               }
+               if (i == 0) {
+                       ret = FALSE;
+                       goto done;
+               } else {
+                       ret = TRUE;
+                       i--;
+               }
+               ASSERT(type1_table[i].mipsclock <= mipsclock);
+
+               /* No PLL change */
+               if ((orig_n == type1_table[i].n) &&
+                   (orig_sb == type1_table[i].sb) &&
+                   (orig_pci == type1_table[i].pci33))
+                       goto done;
+
+               /* Set the PLL controls */
+               W_REG(clockcontrol_n, type1_table[i].n);
+               W_REG(clockcontrol_sb, type1_table[i].sb);
+               if (pciclock == 25000000)
+                       W_REG(clockcontrol_pci, type1_table[i].pci25);
+               else
+                       W_REG(clockcontrol_pci, type1_table[i].pci33);
+
+               /* Reset */
+               sb_watchdog(sbh, 1);
+               while (1);
+       } else if ((pll_type == PLL_TYPE2) || (pll_type == PLL_TYPE4)) {
+               n4m_table_t *table = (pll_type == PLL_TYPE2) ? type2_table : type4_table;
+               uint tabsz = (pll_type == PLL_TYPE2) ? ARRAYSIZE(type2_table) : ARRAYSIZE(type4_table);
+
+               ASSERT(cc);
+
+               /* Store the current clock register values */
+               orig_m2 = R_REG(&cc->clockcontrol_m2);
+               orig_mips = R_REG(&cc->clockcontrol_mips);
+               orig_ratio_parm = 0;
+
+               /* Look up current ratio */
+               for (i = 0; i < tabsz; i++) {
+                       if ((orig_n == table[i].n) &&
+                           (orig_sb == table[i].sb) &&
+                           (orig_pci == table[i].pci33) &&
+                           (orig_m2 == table[i].m2) &&
+                           (orig_mips == table[i].m3)) {
+                               orig_ratio_parm = table[i].ratio_parm;
+                               break;
+                       }
+               }
+
+               /* Search for the closest MIPS clock greater or equal to a preferred value */
+               for (i = 0; i < tabsz; i++) {
+                       ASSERT(table[i].mipsclock ==
+                              sb_clock_rate(pll_type, table[i].n, table[i].m3));
+                       if ((mipsclock <= table[i].mipsclock) &&
+                           ((sbclock == 0) || (sbclock <= table[i].sbclock)))
+                               break;
+               }
+               if (i == tabsz) {
+                       ret = FALSE;
+                       goto done;
+               } else {
+                       ret = TRUE;
+               }
+
+               /* No PLL change */
+               if ((orig_n == table[i].n) &&
+                   (orig_sb == table[i].sb) &&
+                   (orig_pci == table[i].pci33) &&
+                   (orig_m2 == table[i].m2) &&
+                   (orig_mips == table[i].m3))
+                       goto done;
+
+               /* Set the PLL controls */
+               W_REG(clockcontrol_n, table[i].n);
+               W_REG(clockcontrol_sb, table[i].sb);
+               W_REG(clockcontrol_pci, table[i].pci33);
+               W_REG(&cc->clockcontrol_m2, table[i].m2);
+               W_REG(&cc->clockcontrol_mips, table[i].m3);
+
+               /* No ratio change */
+               if (orig_ratio_parm == table[i].ratio_parm)
+                       goto end_fill;
+
+               new_ratio = table[i].ratio_parm;
+
+               icache_probe(&icache_size, &ic_lsize);
+
+               /* Preload the code into the cache */
+               start = ((ulong) &&start_fill) & ~(ic_lsize - 1);
+               end = ((ulong) &&end_fill + (ic_lsize - 1)) & ~(ic_lsize - 1);
+               while (start < end) {
+                       cache_unroll(start, Fill_I);
+                       start += ic_lsize;
+               }
+
+               /* Copy the handler */
+               start = (ulong) &handler;
+               end = (ulong) &afterhandler;
+               dst = KSEG1ADDR(0x180);
+               for (i = 0; i < (end - start); i += 4)
+                       *((ulong *)(dst + i)) = *((ulong *)(start + i));
+               
+               /* Preload handler into the cache one line at a time */
+               for (i = 0; i < (end - start); i += 4)
+                       cache_unroll(dst + i, Fill_I);
+
+               /* Clear BEV bit */
+               MTC0(C0_STATUS, 0, MFC0(C0_STATUS, 0) & ~ST0_BEV);
+
+               /* Enable interrupts */
+               MTC0(C0_STATUS, 0, MFC0(C0_STATUS, 0) | (ALLINTS | ST0_IE));
+
+               /* Enable MIPS timer interrupt */
+               if (!(mipsr = sb_setcore(sbh, SB_MIPS, 0)) &&
+                   !(mipsr = sb_setcore(sbh, SB_MIPS33, 0)))
+                       ASSERT(mipsr);
+               W_REG(&mipsr->intmask, 1);
+
+       start_fill:
+               /* step 1, set clock ratios */
+               MTC0(C0_BROADCOM, 3, new_ratio);
+               MTC0(C0_BROADCOM, 1, 8);
+
+               /* step 2: program timer intr */
+               W_REG(&mipsr->timer, 100);
+               (void) R_REG(&mipsr->timer);
+
+               /* step 3, switch to async */
+               sync_mode = MFC0(C0_BROADCOM, 4);
+               MTC0(C0_BROADCOM, 4, 1 << 22);
+
+               /* step 4, set cfg active */
+               MTC0(C0_BROADCOM, 2, 0x9);
+
+
+               /* steps 5 & 6 */ 
+               __asm__ __volatile__ (
+                       ".set\tmips3\n\t"
+                       "wait\n\t"
+                       ".set\tmips0"
+               );
+
+               /* step 7, clear cfg_active */
+               MTC0(C0_BROADCOM, 2, 0);
+               
+               /* Additional Step: set back to orig sync mode */
+               MTC0(C0_BROADCOM, 4, sync_mode);
+
+               /* step 8, fake soft reset */
+               MTC0(C0_BROADCOM, 5, MFC0(C0_BROADCOM, 5) | 4);
+
+       end_fill:
+               /* step 9 set watchdog timer */
+               sb_watchdog(sbh, 20);
+               (void) R_REG(&cc->chipid);
+
+               /* step 11 */
+               __asm__ __volatile__ (
+                       ".set\tmips3\n\t"
+                       "sync\n\t"
+                       "wait\n\t"
+                       ".set\tmips0"
+               );
+               while (1);
+       }
+
+done:
+       /* switch back to previous core */
+       sb_setcoreidx(sbh, idx);
+
+       return ret;
+}
+
+
+/* returns the ncdl value to be programmed into sdram_ncdl for calibration */
+uint32
+sb_memc_get_ncdl(void *sbh)
+{
+       sbmemcregs_t *memc;
+       uint32 ret = 0;
+       uint32 config, rd, wr, misc, dqsg, cd, sm, sd;
+       uint idx, rev;
+
+       idx = sb_coreidx(sbh);
+
+       memc = (sbmemcregs_t *)sb_setcore(sbh, SB_MEMC, 0);
+       if (memc == 0)
+               goto out;
+
+       rev = sb_corerev(sbh);
+
+       config = R_REG(&memc->config);
+       wr = R_REG(&memc->wrncdlcor);
+       rd = R_REG(&memc->rdncdlcor);
+       misc = R_REG(&memc->miscdlyctl);
+       dqsg = R_REG(&memc->dqsgatencdl);
+
+       rd &= MEMC_RDNCDLCOR_RD_MASK;
+       wr &= MEMC_WRNCDLCOR_WR_MASK; 
+       dqsg &= MEMC_DQSGATENCDL_G_MASK;
+
+       if (config & MEMC_CONFIG_DDR) {
+               ret = (wr << 16) | (rd << 8) | dqsg;
+       } else {
+               if (rev > 0)
+                       cd = rd;
+               else
+                       cd = (rd == MEMC_CD_THRESHOLD) ? rd : (wr + MEMC_CD_THRESHOLD);
+               sm = (misc & MEMC_MISC_SM_MASK) >> MEMC_MISC_SM_SHIFT;
+               sd = (misc & MEMC_MISC_SD_MASK) >> MEMC_MISC_SD_SHIFT;
+               ret = (sm << 16) | (sd << 8) | cd;
+       }
+
+out:
+       /* switch back to previous core */
+       sb_setcoreidx(sbh, idx);
+
+       return ret;
+}
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbpci.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbpci.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbpci.c  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbpci.c     2005-08-28 11:12:20.479851704 +0200
@@ -0,0 +1,530 @@
+/*
+ * Low-Level PCI and SB support for BCM47xx
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id: sbpci.c,v 1.2 2005/02/28 13:34:25 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <pcicfg.h>
+#include <bcmdevs.h>
+#include <sbconfig.h>
+#include <sbpci.h>
+#include <osl.h>
+#include <bcmendian.h>
+#include <bcmutils.h>
+#include <sbutils.h>
+#include <bcmnvram.h>
+#include <hndmips.h>
+
+/* Can free sbpci_init() memory after boot */
+#ifndef linux
+#define __init
+#endif
+
+/* Emulated configuration space */
+static pci_config_regs sb_config_regs[SB_MAXCORES];
+
+/* Banned cores */
+static uint16 pci_ban[32] = { 0 };
+static uint pci_banned = 0;
+
+/* CardBus mode */
+static bool cardbus = FALSE;
+
+/*
+ * Functions for accessing external PCI configuration space
+ */
+
+/* Assume one-hot slot wiring */
+#define PCI_SLOT_MAX 16
+
+static uint32
+config_cmd(void *sbh, uint bus, uint dev, uint func, uint off)
+{
+       uint coreidx;
+       sbpciregs_t *regs;
+       uint32 addr = 0;
+
+       /* CardBusMode supports only one device */
+       if (cardbus && dev > 1)
+               return 0;
+
+       coreidx = sb_coreidx(sbh);
+       regs = (sbpciregs_t *) sb_setcore(sbh, SB_PCI, 0);
+
+       /* Type 0 transaction */
+       if (bus == 1) {
+               /* Skip unwired slots */
+               if (dev < PCI_SLOT_MAX) {
+                       /* Slide the PCI window to the appropriate slot */
+                       W_REG(&regs->sbtopci1, SBTOPCI_CFG0 | ((1 << (dev + 16)) & SBTOPCI1_MASK));
+                       addr = SB_PCI_CFG | ((1 << (dev + 16)) & ~SBTOPCI1_MASK) |
+                               (func << 8) | (off & ~3);
+               }
+       }
+
+       /* Type 1 transaction */
+       else {
+               W_REG(&regs->sbtopci1, SBTOPCI_CFG1);
+               addr = SB_PCI_CFG | (bus << 16) | (dev << 11) | (func << 8) | (off & ~3);
+       }
+
+       sb_setcoreidx(sbh, coreidx);
+
+       return addr;
+}
+
+static int
+extpci_read_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       uint32 addr, *reg = NULL, val;
+       int ret = 0;
+
+       if (!(addr = config_cmd(sbh, bus, dev, func, off)) ||
+           !(reg = (uint32 *) REG_MAP(addr, len)) ||
+           BUSPROBE(val, reg))
+               val = 0xffffffff;
+
+       val >>= 8 * (off & 3);
+       if (len == 4)
+               *((uint32 *) buf) = val;
+       else if (len == 2)
+               *((uint16 *) buf) = (uint16) val;
+       else if (len == 1)
+               *((uint8 *) buf) = (uint8) val;
+       else
+               ret = -1;
+
+       if (reg)
+               REG_UNMAP(reg);
+
+       return ret;
+}
+
+static int
+extpci_write_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       uint32 addr, *reg = NULL, val;
+       int ret = 0;
+
+       if (!(addr = config_cmd(sbh, bus, dev, func, off)) ||
+           !(reg = (uint32 *) REG_MAP(addr, len)) ||
+           BUSPROBE(val, reg))
+               goto done;
+
+       if (len == 4)
+               val = *((uint32 *) buf);
+       else if (len == 2) {
+               val &= ~(0xffff << (8 * (off & 3)));
+               val |= *((uint16 *) buf) << (8 * (off & 3));
+       } else if (len == 1) {
+               val &= ~(0xff << (8 * (off & 3)));
+               val |= *((uint8 *) buf) << (8 * (off & 3));
+       } else
+               ret = -1;
+
+       W_REG(reg, val);
+
+ done:
+       if (reg)
+               REG_UNMAP(reg);
+
+       return ret;
+}
+
+/*
+ * Functions for accessing translated SB configuration space
+ */
+
+static int
+sb_read_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       pci_config_regs *cfg;
+
+       if (dev >= SB_MAXCORES || (off + len) > sizeof(pci_config_regs))
+               return -1;
+       cfg = &sb_config_regs[dev];
+
+       ASSERT(ISALIGNED(off, len));
+       ASSERT(ISALIGNED(buf, len));
+
+       if (len == 4)
+               *((uint32 *) buf) = ltoh32(*((uint32 *)((ulong) cfg + off)));
+       else if (len == 2)
+               *((uint16 *) buf) = ltoh16(*((uint16 *)((ulong) cfg + off)));
+       else if (len == 1)
+               *((uint8 *) buf) = *((uint8 *)((ulong) cfg + off));
+       else
+               return -1;
+
+       return 0;
+}
+
+static int
+sb_write_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       uint coreidx, n;
+       void *regs;
+       sbconfig_t *sb;
+       pci_config_regs *cfg;
+
+       if (dev >= SB_MAXCORES || (off + len) > sizeof(pci_config_regs))
+               return -1;
+       cfg = &sb_config_regs[dev];
+
+       ASSERT(ISALIGNED(off, len));
+       ASSERT(ISALIGNED(buf, len));
+
+       /* Emulate BAR sizing */
+       if (off >= OFFSETOF(pci_config_regs, base[0]) && off <= OFFSETOF(pci_config_regs, base[3]) &&
+           len == 4 && *((uint32 *) buf) == ~0) {
+               coreidx = sb_coreidx(sbh);
+               if ((regs = sb_setcoreidx(sbh, dev))) {
+                       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+                       /* Highest numbered address match register */
+                       n = (R_REG(&sb->sbidlow) & SBIDL_AR_MASK) >> SBIDL_AR_SHIFT;
+                       if (off == OFFSETOF(pci_config_regs, base[0]))
+                               cfg->base[0] = ~(sb_size(R_REG(&sb->sbadmatch0)) - 1);
+                       /*else if (off == OFFSETOF(pci_config_regs, base[1]) && n >= 1)
+                               cfg->base[1] = ~(sb_size(R_REG(&sb->sbadmatch1)) - 1);
+                       else if (off == OFFSETOF(pci_config_regs, base[2]) && n >= 2)
+                               cfg->base[2] = ~(sb_size(R_REG(&sb->sbadmatch2)) - 1);
+                       else if (off == OFFSETOF(pci_config_regs, base[3]) && n >= 3)
+                               cfg->base[3] = ~(sb_size(R_REG(&sb->sbadmatch3)) - 1);*/
+               }
+               sb_setcoreidx(sbh, coreidx);
+               return 0;
+       }
+
+       if (len == 4)
+               *((uint32 *)((ulong) cfg + off)) = htol32(*((uint32 *) buf));
+       else if (len == 2)
+               *((uint16 *)((ulong) cfg + off)) = htol16(*((uint16 *) buf));
+       else if (len == 1)
+               *((uint8 *)((ulong) cfg + off)) = *((uint8 *) buf);
+       else
+               return -1;
+
+       return 0;
+}
+
+int
+sbpci_read_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       if (bus == 0)
+               return sb_read_config(sbh, bus, dev, func, off, buf, len);
+       else
+               return extpci_read_config(sbh, bus, dev, func, off, buf, len);
+}
+
+int
+sbpci_write_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
+{
+       if (bus == 0)
+               return sb_write_config(sbh, bus, dev, func, off, buf, len);
+       else
+               return extpci_write_config(sbh, bus, dev, func, off, buf, len);
+}
+
+void
+sbpci_ban(uint16 core)
+{
+       if (pci_banned < ARRAYSIZE(pci_ban))
+               pci_ban[pci_banned++] = core;
+}
+
+int __init
+sbpci_init(void *sbh)
+{
+       uint chip, chiprev, chippkg, coreidx, host, i;
+       sbpciregs_t *pci;
+       sbconfig_t *sb;
+       pci_config_regs *cfg;
+       void *regs;
+       char varname[8];
+       uint wlidx = 0;
+       uint16 vendor, core;
+       uint8 class, subclass, progif;
+       uint32 val;
+       uint32 sbips_int_mask[] = { 0, SBIPS_INT1_MASK, SBIPS_INT2_MASK, SBIPS_INT3_MASK, SBIPS_INT4_MASK };
+       uint32 sbips_int_shift[] = { 0, 0, SBIPS_INT2_SHIFT, SBIPS_INT3_SHIFT, SBIPS_INT4_SHIFT };
+
+       chip = sb_chip(sbh);
+       chiprev = sb_chiprev(sbh);
+       chippkg = sb_chippkg(sbh);
+       coreidx = sb_coreidx(sbh);
+
+       if (!(pci = (sbpciregs_t *) sb_setcore(sbh, SB_PCI, 0)))
+               return -1;
+       sb_core_reset(sbh, 0);
+
+       if (((chip == BCM4310_DEVICE_ID) && (chiprev == 0)) ||
+           ((chip == BCM4712_DEVICE_ID) && (chippkg == BCM4712SMALL_PKG_ID)))
+               host = 0;
+       else
+               host = !BUSPROBE(val, &pci->control);
+
+       if (!host) {
+               /* Disable PCI interrupts in client mode */
+               sb = (sbconfig_t *)((ulong) pci + SBCONFIGOFF);
+               W_REG(&sb->sbintvec, 0);
+
+               /* Disable the PCI bridge in client mode */
+               sbpci_ban(SB_PCI);
+               printf("PCI: Disabled\n");
+       } else {
+               /* Reset the external PCI bus and enable the clock */
+               W_REG(&pci->control, 0x5);              /* enable the tristate drivers */
+               W_REG(&pci->control, 0xd);              /* enable the PCI clock */
+               OSL_DELAY(100);                         /* delay 100 us */
+               W_REG(&pci->control, 0xf);              /* deassert PCI reset */
+               W_REG(&pci->arbcontrol, PCI_INT_ARB);   /* use internal arbiter */
+               OSL_DELAY(1);                           /* delay 1 us */
+
+               /* Enable CardBusMode */
+               cardbus = nvram_match("cardbus", "1");
+               if (cardbus) {
+                       printf("PCI: Enabling CardBus\n");
+                       /* GPIO 1 resets the CardBus device on bcm94710ap */
+                       sb_gpioout(sbh, 1, 1);
+                       sb_gpioouten(sbh, 1, 1);
+                       W_REG(&pci->sprom[0], R_REG(&pci->sprom[0]) | 0x400);
+               }
+
+               /* 64 MB I/O access window */
+               W_REG(&pci->sbtopci0, SBTOPCI_IO);
+               /* 64 MB configuration access window */
+               W_REG(&pci->sbtopci1, SBTOPCI_CFG0);
+               /* 1 GB memory access window */
+               W_REG(&pci->sbtopci2, SBTOPCI_MEM | SB_PCI_DMA);
+
+               /* Enable PCI bridge BAR0 prefetch and burst */
+               val = 6;
+               sbpci_write_config(sbh, 1, 0, 0, PCI_CFG_CMD, &val, sizeof(val));
+
+               /* Enable PCI interrupts */
+               W_REG(&pci->intmask, PCI_INTA);
+       }
+
+       /* Scan the SB bus */
+       bzero(sb_config_regs, sizeof(sb_config_regs));
+       for (cfg = sb_config_regs; cfg < &sb_config_regs[SB_MAXCORES]; cfg++) {
+               cfg->vendor = 0xffff;
+               if (!(regs = sb_setcoreidx(sbh, cfg - sb_config_regs)))
+                       continue;
+               sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+
+               /* Read ID register and parse vendor and core */
+               val = R_REG(&sb->sbidhigh);
+               vendor = (val & SBIDH_VC_MASK) >> SBIDH_VC_SHIFT;
+               core = (val & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT;
+               progif = 0;
+
+               /* Check if this core is banned */
+               for (i = 0; i < pci_banned; i++)
+                       if (core == pci_ban[i])
+                               break;
+               if (i < pci_banned)
+                       continue;
+
+               /* Known vendor translations */
+               switch (vendor) {
+               case SB_VEND_BCM:
+                       vendor = VENDOR_BROADCOM;
+                       break;
+               }
+
+               /* Determine class based on known core codes */
+               switch (core) {
+               case SB_ILINE20:
+                       class = PCI_CLASS_NET;
+                       subclass = PCI_NET_ETHER;
+                       core = BCM47XX_ILINE_ID;
+                       break;
+               case SB_ILINE100:
+                       class = PCI_CLASS_NET;
+                       subclass = PCI_NET_ETHER;
+                       core = BCM4610_ILINE_ID;
+                       break;
+               case SB_ENET:
+                       class = PCI_CLASS_NET;
+                       subclass = PCI_NET_ETHER;
+                       core = BCM47XX_ENET_ID;
+                       break;
+               case SB_SDRAM:
+               case SB_MEMC:
+                       class = PCI_CLASS_MEMORY;
+                       subclass = PCI_MEMORY_RAM;
+                       break;
+               case SB_PCI:
+                       class = PCI_CLASS_BRIDGE;
+                       subclass = PCI_BRIDGE_PCI;
+                       //break;
+               case SB_MIPS:
+               case SB_MIPS33:
+                       class = PCI_CLASS_CPU;
+                       subclass = PCI_CPU_MIPS;
+                       break;
+               case SB_CODEC:
+                       class = PCI_CLASS_COMM;
+                       subclass = PCI_COMM_MODEM;
+                       core = BCM47XX_V90_ID;
+                       break;
+               case SB_USB:
+                       class = PCI_CLASS_SERIAL;
+                       subclass = PCI_SERIAL_USB;
+                       progif = 0x10; /* OHCI */
+                       core = BCM47XX_USB_ID;
+                       break;
+               case SB_USB11H:
+                       class = PCI_CLASS_SERIAL;
+                       subclass = PCI_SERIAL_USB;
+                       progif = 0x10; /* OHCI */
+                       core = BCM47XX_USBH_ID;
+                       break;
+               case SB_USB11D:
+                       class = PCI_CLASS_SERIAL;
+                       subclass = PCI_SERIAL_USB;
+                       core = BCM47XX_USBD_ID;
+                       break;
+               case SB_IPSEC:
+                       class = PCI_CLASS_CRYPT;
+                       subclass = PCI_CRYPT_NETWORK;
+                       core = BCM47XX_IPSEC_ID;
+                       break;
+               case SB_EXTIF:
+               case SB_CC:
+                       class = PCI_CLASS_MEMORY;
+                       subclass = PCI_MEMORY_FLASH;
+                       break;
+               case SB_D11:
+                       class = PCI_CLASS_NET;
+                       subclass = PCI_NET_OTHER;
+                       /* Let an nvram variable override this */
+                       sprintf(varname, "wl%did", wlidx);
+                       wlidx++;
+                       if ((core = getintvar(NULL, varname)) == 0) {
+                               if (chip == BCM4712_DEVICE_ID) {
+                                       if (chippkg == BCM4712SMALL_PKG_ID)
+                                               core = BCM4306_D11G_ID;
+                                       else
+                                               core = BCM4306_D11DUAL_ID;
+                               } else {
+                                       /* 4310 */
+                                       core = BCM4310_D11B_ID;
+                               }
+                       }
+                       break;
+
+               default:
+                       class = subclass = progif = 0xff;
+                       break;
+               }
+
+               /* Supported translations */
+               cfg->vendor = htol16(vendor);
+               cfg->device = htol16(core);
+               cfg->rev_id = chiprev;
+               cfg->prog_if = progif;
+               cfg->sub_class = subclass;
+               cfg->base_class = class;
+               cfg->base[0] = htol32(sb_base(R_REG(&sb->sbadmatch0)));
+               cfg->base[1] = 0/*htol32(sb_base(R_REG(&sb->sbadmatch1)))*/;
+               cfg->base[2] = 0/*htol32(sb_base(R_REG(&sb->sbadmatch2)))*/;
+               cfg->base[3] = 0/*htol32(sb_base(R_REG(&sb->sbadmatch3)))*/;
+               cfg->base[4] = 0;
+               cfg->base[5] = 0;
+               if (class == PCI_CLASS_BRIDGE && subclass == PCI_BRIDGE_PCI)
+                       cfg->header_type = PCI_HEADER_BRIDGE;
+               else
+                       cfg->header_type = PCI_HEADER_NORMAL;
+               /* Save core interrupt flag */
+               cfg->int_pin = R_REG(&sb->sbtpsflag) & SBTPS_NUM0_MASK;
+               /* Default to MIPS shared interrupt 0 */
+               cfg->int_line = 0;
+               /* MIPS sbipsflag maps core interrupt flags to interrupts 1 through 4 */
+               if ((regs = sb_setcore(sbh, SB_MIPS, 0)) ||
+                   (regs = sb_setcore(sbh, SB_MIPS33, 0))) {
+                       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
+                       val = R_REG(&sb->sbipsflag);
+                       for (cfg->int_line = 1; cfg->int_line <= 4; cfg->int_line++) {
+                               if (((val & sbips_int_mask[cfg->int_line]) >> sbips_int_shift[cfg->int_line]) == cfg->int_pin)
+                                       break;
+                       }
+                       if (cfg->int_line > 4)
+                               cfg->int_line = 0;
+               }
+               /* Emulated core */
+               *((uint32 *) &cfg->sprom_control) = 0xffffffff;
+       }
+
+       sb_setcoreidx(sbh, coreidx);
+       return 0;
+}
+
+void
+sbpci_check(void *sbh)
+{
+       uint coreidx;
+       sbpciregs_t *pci;
+       uint32 sbtopci1;
+       uint32 buf[64], *ptr, i;
+       ulong pa;
+       volatile uint j;
+
+       coreidx = sb_coreidx(sbh);
+       pci = (sbpciregs_t *) sb_setcore(sbh, SB_PCI, 0);
+
+       /* Clear the test array */
+       pa = (ulong) DMA_MAP(NULL, buf, sizeof(buf), DMA_RX, NULL);
+       ptr = (uint32 *) OSL_UNCACHED(&buf[0]);
+       memset(ptr, 0, sizeof(buf));
+
+       /* Point PCI window 1 to memory */
+       sbtopci1 = R_REG(&pci->sbtopci1);
+       W_REG(&pci->sbtopci1, SBTOPCI_MEM | (pa & SBTOPCI1_MASK));
+
+       /* Fill the test array via PCI window 1 */
+       ptr = (uint32 *) REG_MAP(SB_PCI_CFG + (pa & ~SBTOPCI1_MASK), sizeof(buf));
+       for (i = 0; i < ARRAYSIZE(buf); i++) {
+               for (j = 0; j < 2; j++);
+               W_REG(&ptr[i], i);
+       }
+       REG_UNMAP(ptr);
+
+       /* Restore PCI window 1 */
+       W_REG(&pci->sbtopci1, sbtopci1);
+
+       /* Check the test array */
+       DMA_UNMAP(NULL, pa, sizeof(buf), DMA_RX, NULL);
+       ptr = (uint32 *) OSL_UNCACHED(&buf[0]);
+       for (i = 0; i < ARRAYSIZE(buf); i++) {
+               if (ptr[i] != i)
+                       break;
+       }
+
+       /* Change the clock if the test fails */
+       if (i < ARRAYSIZE(buf)) {
+               uint32 req, cur;
+
+               cur = sb_clock(sbh);
+               printf("PCI: Test failed at %d MHz\n", (cur + 500000) / 1000000);
+               for (req = 104000000; req < 176000000; req += 4000000) {
+                       printf("PCI: Resetting to %d MHz\n", (req + 500000) / 1000000);
+                       /* This will only reset if the clocks are valid and have changed */
+                       sb_mips_setclock(sbh, req, 0, 0);
+               }
+               /* Should not reach here */
+               ASSERT(0);
+       }
+
+       sb_setcoreidx(sbh, coreidx);
+}
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbutils.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbutils.c
--- linux-2.6.12.5/arch/mips/bcm947xx/broadcom/sbutils.c        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/broadcom/sbutils.c   2005-08-28 11:12:20.482851248 +0200
@@ -0,0 +1,1895 @@
+/*
+ * Misc utility routines for accessing chip-specific features
+ * of the SiliconBackplane-based Broadcom chips.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id: sbutils.c,v 1.1 2005/02/28 13:33:32 jolt Exp $
+ */
+
+#include <typedefs.h>
+#include <osl.h>
+#include <bcmutils.h>
+#include <bcmdevs.h>
+#include <sbconfig.h>
+#include <sbchipc.h>
+#include <sbpci.h>
+#include <pcicfg.h>
+#include <sbpcmcia.h>
+#include <sbextif.h>
+#include <sbutils.h>
+#include <bcmsrom.h>
+
+/* debug/trace */
+#define        SB_ERROR(args)
+
+typedef uint32 (*sb_intrsoff_t)(void *intr_arg);
+typedef void (*sb_intrsrestore_t)(void *intr_arg, uint32 arg);
+
+/* misc sb info needed by some of the routines */
+typedef struct sb_info {
+       uint    chip;                   /* chip number */
+       uint    chiprev;                /* chip revision */
+       uint    chippkg;                /* chip package option */
+       uint    boardtype;              /* board type */
+       uint    boardvendor;            /* board vendor id */
+       uint    bus;                    /* what bus type we are going through */
+
+       void    *osh;                   /* osl os handle */
+       void    *sdh;                   /* bcmsdh handle */
+
+       void    *curmap;                /* current regs va */
+       void    *regs[SB_MAXCORES];     /* other regs va */
+
+       uint    curidx;                 /* current core index */
+       uint    dev_coreid;             /* the core provides driver functions */
+       uint    pciidx;                 /* pci core index */
+       uint    pcirev;                 /* pci core rev */
+
+       uint    pcmciaidx;              /* pcmcia core index */
+       uint    pcmciarev;              /* pcmcia core rev */
+       bool    memseg;                 /* flag to toggle MEM_SEG register */
+
+       uint    ccrev;                  /* chipc core rev */
+
+       uint    gpioidx;                /* gpio control core index */
+       uint    gpioid;                 /* gpio control coretype */
+
+       uint    numcores;               /* # discovered cores */
+       uint    coreid[SB_MAXCORES];    /* id of each core */
+
+       void    *intr_arg;              /* interrupt callback function arg */
+       sb_intrsoff_t           intrsoff_fn;            /* function turns chip interrupts off */
+       sb_intrsrestore_t       intrsrestore_fn;        /* function restore chip interrupts */
+} sb_info_t;
+
+/* local prototypes */
+static void* sb_doattach(sb_info_t *si, uint devid, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz);
+static void sb_scan(sb_info_t *si);
+static uint sb_corereg(void *sbh, uint coreidx, uint regoff, uint mask, uint val);
+static uint _sb_coreidx(void *sbh);
+static uint sb_findcoreidx(void *sbh, uint coreid, uint coreunit);
+static uint sb_pcidev2chip(uint pcidev);
+static uint sb_chip2numcores(uint chip);
+
+#define        SB_INFO(sbh)    (sb_info_t*)sbh
+#define        SET_SBREG(sbh, r, mask, val)    W_SBREG((sbh), (r), ((R_SBREG((sbh), (r)) & ~(mask)) | (val)))
+#define        GOODCOREADDR(x) (((x) >= SB_ENUM_BASE) && ((x) <= SB_ENUM_LIM) \
+                               && ISALIGNED((x), SB_CORE_SIZE))
+#define        GOODREGS(regs)  (regs && ISALIGNED(regs, SB_CORE_SIZE))
+#define        REGS2SB(va)     (sbconfig_t*) ((uint)(va) + SBCONFIGOFF)
+#define        GOODIDX(idx)    (((uint)idx) < SB_MAXCORES)
+#define        BADIDX          (SB_MAXCORES+1)
+
+#define        R_SBREG(sbh, sbr)       sb_read_sbreg((sbh), (sbr))
+#define        W_SBREG(sbh, sbr, v)    sb_write_sbreg((sbh), (sbr), (v))
+#define        AND_SBREG(sbh, sbr, v)  W_SBREG((sbh), (sbr), (R_SBREG((sbh), (sbr)) & (v)))
+#define        OR_SBREG(sbh, sbr, v)   W_SBREG((sbh), (sbr), (R_SBREG((sbh), (sbr)) | (v)))
+
+/* 
+ * Macros to disable/restore function core(D11, ENET, ILINE20, etc) interrupts before/
+ * after core switching to avoid invalid register accesss inside ISR.
+ */
+#define INTR_OFF(si, intr_val) \
+       if ((si)->intrsoff_fn && (si)->coreid[(si)->curidx] == (si)->dev_coreid) {      \
+               intr_val = (*(si)->intrsoff_fn)((si)->intr_arg); }
+#define INTR_RESTORE(si, intr_val) \
+       if ((si)->intrsrestore_fn && (si)->coreid[(si)->curidx] == (si)->dev_coreid) {  \
+               (*(si)->intrsrestore_fn)((si)->intr_arg, intr_val); }
+
+/* power control defines */
+#define        PLL_DELAY       150                     /* 150us pll on delay */
+#define        FREF_DELAY      15                      /* 15us fref change delay */
+#define        LPOMINFREQ      25000                   /* low power oscillator min */
+#define        LPOMAXFREQ      43000                   /* low power oscillator max */
+#define        XTALMINFREQ     19800000                /* 20mhz - 1% */
+#define        XTALMAXFREQ     20200000                /* 20mhz + 1% */
+#define        PCIMINFREQ      25000000                /* 25mhz */
+#define        PCIMAXFREQ      34000000                /* 33mhz + fudge */
+
+#define SCC_LOW2FAST_LIMIT     5000    /* turn on fast clock time, in unit of ms */
+
+
+static uint32
+sb_read_sbreg(void *sbh, volatile uint32 *sbr)
+{
+       sb_info_t *si;
+       uint8 tmp;
+       uint32 val, intr_val = 0;
+
+       si = SB_INFO(sbh);
+
+       /* 
+        * compact flash only has 11 bits address, while we needs 12 bits address.
+        * MEM_SEG will be OR'd with other 11 bits address in hardware, 
+        * so we program MEM_SEG with 12th bit when necessary(access sb regsiters).
+        * For normal PCMCIA bus(CFTable_regwinsz > 2k), do nothing special
+        */
+       if(si->memseg) {
+               INTR_OFF(si, intr_val);
+               tmp = 1;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
+               (uint32)sbr &= ~(1 << 11);      /* mask out bit 11*/
+       }
+
+       val = R_REG(sbr);
+       
+       if(si->memseg) {
+               tmp = 0;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
+               INTR_RESTORE(si, intr_val);
+       }
+
+       return (val);
+}
+
+static void
+sb_write_sbreg(void *sbh, volatile uint32 *sbr, uint32 v)
+{
+       sb_info_t *si;
+       uint8 tmp;
+       volatile uint32 dummy;
+       uint32 intr_val = 0;
+
+       si = SB_INFO(sbh);
+
+       /* 
+        * compact flash only has 11 bits address, while we needs 12 bits address.
+        * MEM_SEG will be OR'd with other 11 bits address in hardware, 
+        * so we program MEM_SEG with 12th bit when necessary(access sb regsiters).
+        * For normal PCMCIA bus(CFTable_regwinsz > 2k), do nothing special 
+        */
+       if(si->memseg) {
+               INTR_OFF(si, intr_val);
+               tmp = 1;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
+               (uint32)sbr &= ~(1 << 11);      /* mask out bit 11 */
+       }
+
+       if ((si->bus == PCMCIA_BUS) || (si->bus == PCI_BUS)) {
+#ifdef IL_BIGENDIAN
+               dummy = R_REG(sbr);
+               W_REG((volatile uint16 *)((uint32)sbr + 2), (uint16)((v >> 16) & 0xffff));
+               dummy = R_REG(sbr);
+               W_REG((volatile uint16 *)sbr, (uint16)(v & 0xffff));
+#else
+               dummy = R_REG(sbr);
+               W_REG((volatile uint16 *)sbr, (uint16)(v & 0xffff));
+               dummy = R_REG(sbr);
+               W_REG((volatile uint16 *)((uint32)sbr + 2), (uint16)((v >> 16) & 0xffff));
+#endif
+       } else
+               W_REG(sbr, v);
+
+       if(si->memseg) {
+               tmp = 0;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, MEM_SEG, &tmp, 1);
+               INTR_RESTORE(si, intr_val);
+       }
+}
+
+/*
+ * Allocate a sb handle.
+ * devid - pci device id (used to determine chip#)
+ * osh - opaque OS handle
+ * regs - virtual address of initial core registers
+ * bustype - pci/pcmcia/sb/sdio/etc
+ * vars - pointer to a pointer area for "environment" variables
+ * varsz - pointer to int to return the size of the vars
+ */
+void*
+sb_attach(uint devid, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz)
+{
+       sb_info_t *si;
+
+       /* alloc sb_info_t */
+       if ((si = MALLOC(sizeof (sb_info_t))) == NULL) {
+               SB_ERROR(("sb_attach: malloc failed!\n"));
+               return (NULL);
+       }
+
+       return (sb_doattach(si, devid, osh, regs, bustype, sdh, vars, varsz));
+}
+
+/* global kernel resource */
+static sb_info_t ksi;
+
+/* generic kernel variant of sb_attach() */
+void*
+sb_kattach()
+{
+       uint32 *regs;
+       char *unused;
+       int varsz;
+
+       if (ksi.curmap == NULL) {
+               uint32 cid;
+               regs = (uint32 *)REG_MAP(SB_ENUM_BASE, SB_CORE_SIZE);
+               cid = R_REG((uint32 *)regs);
+               if ((cid == 0x08104712) || (cid == 0x08114712)) {
+                       uint32 *scc, val;
+
+                       scc = (uint32 *)((uint32)regs + OFFSETOF(chipcregs_t, slow_clk_ctl));
+                       val = R_REG(scc);
+                       SB_ERROR(("    initial scc = 0x%x\n", val));
+                       val |= SCC_SS_XTAL;
+                       W_REG(scc, val);
+               }
+
+               sb_doattach(&ksi, BCM4710_DEVICE_ID, NULL, (void*)regs,
+                           SB_BUS, NULL, &unused, &varsz);
+       }
+
+       return &ksi;
+}
+
+static void*
+sb_doattach(sb_info_t *si, uint devid, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz)
+{
+       uint origidx;
+       chipcregs_t *cc;
+       uint32 w;
+
+       ASSERT(GOODREGS(regs));
+
+       bzero((uchar*)si, sizeof (sb_info_t));
+
+       si->pciidx = si->gpioidx = BADIDX;
+
+       si->osh = osh;
+       si->curmap = regs;
+       si->sdh = sdh;
+
+       /* 4317A0 PCMCIA is no longer supported */ 
+       if ((bustype == PCMCIA_BUS) && (R_REG((uint32 *)regs) == 0x04104317))
+               return NULL;
+
+       /* check to see if we are a sb core mimic'ing a pci core */
+       if (bustype == PCI_BUS) {
+               if (OSL_PCI_READ_CONFIG(osh, PCI_SPROM_CONTROL, sizeof (uint32)) == 0xffffffff)
+                       bustype = SB_BUS;
+               else
+                       bustype = PCI_BUS;
+       }
+
+       si->bus = bustype;
+
+       /* kludge to enable the clock on the 4306 which lacks a slowclock */
+       if (si->bus == PCI_BUS)
+               sb_pwrctl_xtal((void*)si, XTAL|PLL, ON);
+
+       /* clear any previous epidiag-induced target abort */
+       sb_taclear((void*)si);
+
+       /* initialize current core index value */
+       si->curidx = _sb_coreidx((void*)si);
+
+       /* keep and reuse the initial register mapping */
+       origidx = si->curidx;
+       if (si->bus == SB_BUS)
+               si->regs[origidx] = regs;
+
+       /* initialize the vars */
+       if (srom_var_init(si->bus, si->curmap, osh, vars, varsz)) {
+               SB_ERROR(("sb_attach: srom_var_init failed\n"));
+               goto bad;
+       }
+       
+       if (si->bus == PCMCIA_BUS) {
+               w = getintvar(*vars, "regwindowsz");
+               si->memseg = (w <= CFTABLE_REGWIN_2K) ? TRUE : FALSE;
+       }
+
+       /* is core-0 a chipcommon core? */
+       si->numcores = 1;
+       cc = (chipcregs_t*) sb_setcoreidx((void*)si, 0);
+       if (sb_coreid((void*)si) != SB_CC)
+               cc = NULL;
+
+       /* determine chip id and rev */
+       if (cc) {
+               /* chip common core found! */
+               si->chip = R_REG(&cc->chipid) & CID_ID_MASK;
+               si->chiprev = (R_REG(&cc->chipid) & CID_REV_MASK) >> CID_REV_SHIFT;
+               si->chippkg = (R_REG(&cc->chipid) & CID_PKG_MASK) >> CID_PKG_SHIFT;
+       } else {
+               /* without chip common core, get devid for PCMCIA */
+               if (si->bus == PCMCIA_BUS)
+                       devid = getintvar(*vars, "devid");
+
+               /* no chip common core -- must convert device id to chip id */
+               if ((si->chip = sb_pcidev2chip(devid)) == 0) {
+                       SB_ERROR(("sb_attach: unrecognized device id 0x%04x\n", devid));
+                       goto bad;
+               }
+
+               /*
+                * The chip revision number is hardwired into all
+                * of the pci function config rev fields and is
+                * independent from the individual core revision numbers.
+                * For example, the "A0" silicon of each chip is chip rev 0.
+                * For PCMCIA we get it from the CIS instead.
+                */
+               if (si->bus == PCMCIA_BUS) {
+                       ASSERT(vars);
+                       si->chiprev = getintvar(*vars, "chiprev");
+               } else if (si->bus == PCI_BUS) {
+                       w = OSL_PCI_READ_CONFIG(osh, PCI_CFG_REV, sizeof (uint32));
+                       si->chiprev = w & 0xff;
+               } else
+                       si->chiprev = 0;
+       }
+
+       /* get chipcommon rev */
+       si->ccrev = cc? sb_corerev((void*)si) : 0;
+       
+       /* determine numcores */
+       if ((si->ccrev == 4) || (si->ccrev >= 6))
+               si->numcores = (R_REG(&cc->chipid) & CID_CC_MASK) >> CID_CC_SHIFT;
+       else
+               si->numcores = sb_chip2numcores(si->chip);
+
+       /* return to original core */
+       sb_setcoreidx((void*)si, origidx);
+
+       /* sanity checks */
+       ASSERT(si->chip);
+       /* 4704A1 is chiprev 8 :-( */
+       ASSERT((si->chiprev < 8) ||
+              ((si->chip == BCM4704_DEVICE_ID) && ((si->chiprev == 8))));
+
+       /* scan for cores */
+       sb_scan(si);
+
+       /* pci core is required */
+       if (!GOODIDX(si->pciidx)) {
+               SB_ERROR(("sb_attach: pci core not found\n"));
+               goto bad;
+       }
+
+       /* gpio control core is required */
+       if (!GOODIDX(si->gpioidx)) {
+               SB_ERROR(("sb_attach: gpio control core not found\n"));
+               goto bad;
+       }
+
+       /* get boardtype and boardrev */
+       switch (si->bus) {
+       case PCI_BUS:
+               /* do a pci config read to get subsystem id and subvendor id */
+               w = OSL_PCI_READ_CONFIG(osh, PCI_CFG_SVID, sizeof (uint32));
+               si->boardvendor = w & 0xffff;
+               si->boardtype = (w >> 16) & 0xffff;
+               break;
+
+       case PCMCIA_BUS:
+       case SDIO_BUS:
+               si->boardvendor = getintvar(*vars, "manfid");
+               si->boardtype = getintvar(*vars, "prodid");
+               break;
+
+       case SB_BUS:
+               si->boardvendor = VENDOR_BROADCOM;
+               si->boardtype = 0xffff;
+               break;
+       }
+
+       if (si->boardtype == 0) {
+               SB_ERROR(("sb_attach: unknown board type\n"));
+               ASSERT(si->boardtype);
+       }
+
+       return ((void*)si);
+
+bad:
+       MFREE(si, sizeof (sb_info_t));
+       return (NULL);
+}
+
+uint
+sb_coreid(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       return ((R_SBREG(sbh, &(sb)->sbidhigh) & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT);
+}
+
+uint
+sb_coreidx(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->curidx);
+}
+
+/* return current index of core */
+static uint
+_sb_coreidx(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+       uint32 sbaddr = 0;
+
+       si = SB_INFO(sbh);
+       ASSERT(si);
+
+       switch (si->bus) {
+       case SB_BUS:
+               sb = REGS2SB(si->curmap);
+               sbaddr = sb_base(R_SBREG(sbh, &sb->sbadmatch0));
+               break;
+
+       case PCI_BUS:
+               sbaddr = OSL_PCI_READ_CONFIG(si->osh, PCI_BAR0_WIN, sizeof (uint32));
+               break;
+
+       case PCMCIA_BUS: {
+               uint8 tmp;
+
+               OSL_PCMCIA_READ_ATTR(si->osh, PCMCIA_ADDR0, &tmp, 1);
+               sbaddr  = (uint)tmp << 12;
+               OSL_PCMCIA_READ_ATTR(si->osh, PCMCIA_ADDR1, &tmp, 1);
+               sbaddr |= (uint)tmp << 16;
+               OSL_PCMCIA_READ_ATTR(si->osh, PCMCIA_ADDR2, &tmp, 1);
+               sbaddr |= (uint)tmp << 24;
+               break;
+       }
+       default:
+               ASSERT(0);
+       }
+
+       ASSERT(GOODCOREADDR(sbaddr));
+       return ((sbaddr - SB_ENUM_BASE)/SB_CORE_SIZE);
+}
+
+uint
+sb_corevendor(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       return ((R_SBREG(sbh, &(sb)->sbidhigh) & SBIDH_VC_MASK) >> SBIDH_VC_SHIFT);
+}
+
+uint
+sb_corerev(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       return (R_SBREG(sbh, &(sb)->sbidhigh) & SBIDH_RC_MASK);
+}
+
+#define        SBTML_ALLOW     (SBTML_PE | SBTML_FGC | SBTML_FL_MASK)
+
+/* set/clear sbtmstatelow core-specific flags */
+uint32
+sb_coreflags(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+       uint32 w;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       ASSERT((val & ~mask) == 0);
+       ASSERT((mask & ~SBTML_ALLOW) == 0);
+
+       /* mask and set */
+       if (mask || val) {
+               w = (R_SBREG(sbh, &sb->sbtmstatelow) & ~mask) | val;
+               W_SBREG(sbh, &sb->sbtmstatelow, w);
+       }
+
+       /* return the new value */
+       return (R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_ALLOW);
+}
+
+/* set/clear sbtmstatehigh core-specific flags */
+uint32
+sb_coreflagshi(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+       uint32 w;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       ASSERT((val & ~mask) == 0);
+       ASSERT((mask & ~SBTMH_FL_MASK) == 0);
+
+       /* mask and set */
+       if (mask || val) {
+               w = (R_SBREG(sbh, &sb->sbtmstatehigh) & ~mask) | val;
+               W_SBREG(sbh, &sb->sbtmstatehigh, w);
+       }
+
+       /* return the new value */
+       return (R_SBREG(sbh, &sb->sbtmstatehigh) & SBTMH_FL_MASK);
+}
+
+bool
+sb_iscoreup(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       return ((R_SBREG(sbh, &(sb)->sbtmstatelow) & (SBTML_RESET | SBTML_REJ | SBTML_CLK)) == SBTML_CLK);
+}
+
+/*
+ * Switch to 'coreidx', issue a single arbitrary 32bit register mask&set operation,
+ * switch back to the original core, and return the new value.
+ */
+static uint
+sb_corereg(void *sbh, uint coreidx, uint regoff, uint mask, uint val)
+{
+       sb_info_t *si;
+       uint origidx;
+       uint32 *r;
+       uint w;
+       uint intr_val = 0;
+
+       ASSERT(GOODIDX(coreidx));
+       ASSERT(regoff < SB_CORE_SIZE);
+       ASSERT((val & ~mask) == 0);
+
+       si = SB_INFO(sbh);
+
+       /* save current core index */
+       origidx = sb_coreidx(sbh);
+
+       /* switch core */
+       INTR_OFF(si, intr_val);
+       r = (uint32*) ((uint) sb_setcoreidx(sbh, coreidx) + regoff);
+
+       /* mask and set */
+       if (mask || val) {
+               if (regoff >= SBCONFIGOFF) {
+                       w = (R_SBREG(sbh, r) & ~mask) | val;
+                       W_SBREG(sbh, r, w);
+               } else {
+                       w = (R_REG(r) & ~mask) | val;
+                       W_REG(r, w);
+               }
+       }
+
+       /* readback */
+       w = R_SBREG(sbh, r);
+
+       /* restore core index */
+       if (origidx != coreidx)
+               sb_setcoreidx(sbh, origidx);
+
+       INTR_RESTORE(si, intr_val);
+       return (w);
+}
+
+/* scan the sb enumerated space to identify all cores */
+static void
+sb_scan(sb_info_t *si)
+{
+       void *sbh;
+       uint origidx;
+       uint i;
+
+       sbh = (void*) si;
+
+       /* numcores should already be set */
+       ASSERT((si->numcores > 0) && (si->numcores <= SB_MAXCORES));
+
+       /* save current core index */
+       origidx = sb_coreidx(sbh);
+
+       si->pciidx = si->gpioidx = BADIDX;
+
+       for (i = 0; i < si->numcores; i++) {
+               sb_setcoreidx(sbh, i);
+               si->coreid[i] = sb_coreid(sbh);
+
+               if (si->coreid[i] == SB_CC)
+                       si->ccrev = sb_corerev(sbh);
+
+               else if (si->coreid[i] == SB_PCI) {
+                       si->pciidx = i;
+                       si->pcirev = sb_corerev(sbh);
+
+               }else if (si->coreid[i] == SB_PCMCIA){
+                       si->pcmciaidx = i;
+                       si->pcmciarev = sb_corerev(sbh);
+               }
+       }
+
+       /*
+        * Find the gpio "controlling core" type and index.
+        * Precedence:
+        * - if there's a chip common core - use that
+        * - else if there's a pci core (rev >= 2) - use that
+        * - else there had better be an extif core (4710 only)
+        */
+       if (GOODIDX(sb_findcoreidx(sbh, SB_CC, 0))) {
+               si->gpioidx = sb_findcoreidx(sbh, SB_CC, 0);
+               si->gpioid = SB_CC;
+       } else if (GOODIDX(si->pciidx) && (si->pcirev >= 2)) {
+               si->gpioidx = si->pciidx;
+               si->gpioid = SB_PCI;
+       } else if (sb_findcoreidx(sbh, SB_EXTIF, 0)) {
+               si->gpioidx = sb_findcoreidx(sbh, SB_EXTIF, 0);
+               si->gpioid = SB_EXTIF;
+       }
+
+       /* return to original core index */
+       sb_setcoreidx(sbh, origidx);
+}
+
+/* may be called with core in reset */
+void
+sb_detach(void *sbh)
+{
+       sb_info_t *si;
+       uint idx;
+
+       si = SB_INFO(sbh);
+
+       if (si == NULL)
+               return;
+
+       if (si->bus == SB_BUS)
+               for (idx = 0; idx < SB_MAXCORES; idx++)
+                       if (si->regs[idx]) {
+                               REG_UNMAP(si->regs[idx]);
+                               si->regs[idx] = NULL;
+                       }
+
+       MFREE(si, sizeof (sb_info_t));
+}
+
+/* use pci dev id to determine chip id for chips not having a chipcommon core */
+static uint
+sb_pcidev2chip(uint pcidev)
+{
+       if ((pcidev >= BCM4710_DEVICE_ID) && (pcidev <= BCM47XX_USB_ID))
+               return (BCM4710_DEVICE_ID);
+       if ((pcidev >= BCM4610_DEVICE_ID) && (pcidev <= BCM4610_USB_ID))
+               return (BCM4610_DEVICE_ID);
+       if ((pcidev >= BCM4402_DEVICE_ID) && (pcidev <= BCM4402_V90_ID))
+               return (BCM4402_DEVICE_ID);
+       if ((pcidev >= BCM4307_V90_ID) && (pcidev <= BCM4307_D11B_ID))
+               return (BCM4307_DEVICE_ID);
+       if (pcidev == BCM4301_DEVICE_ID)
+               return (BCM4301_DEVICE_ID);
+
+       return (0);
+}
+
+/* convert chip number to number of i/o cores */
+static uint
+sb_chip2numcores(uint chip)
+{
+       if (chip == 0x4710)
+               return (9);
+       if (chip == 0x4610)
+               return (9);
+       if (chip == 0x4402)
+               return (3);
+       if ((chip == 0x4307) || (chip == 0x4301))
+               return (5);
+       if (chip == 0x4310)
+               return (8);
+       if (chip == 0x4306)     /* < 4306c0 */
+               return (6);
+       if (chip == 0x4704)
+               return (9);
+       if (chip == 0x5365)
+               return (7);
+
+       SB_ERROR(("sb_chip2numcores: unsupported chip 0x%x\n", chip));
+       ASSERT(0);
+       return (1);
+}
+
+/* return index of coreid or BADIDX if not found */
+static uint
+sb_findcoreidx(void *sbh, uint coreid, uint coreunit)
+{
+       sb_info_t *si;
+       uint found;
+       uint i;
+
+       si = SB_INFO(sbh);
+       found = 0;
+
+       for (i = 0; i < si->numcores; i++)
+               if (si->coreid[i] == coreid) {
+                       if (found == coreunit)
+                               return (i);
+                       found++;
+               }
+
+       return (BADIDX);
+}
+
+/* change logical "focus" to the indiciated core */
+void*
+sb_setcoreidx(void *sbh, uint coreidx)
+{
+       sb_info_t *si;
+       uint32 sbaddr;
+       uint8 tmp;
+
+       si = SB_INFO(sbh);
+
+       if (coreidx >= si->numcores)
+               return (NULL);
+
+       /*
+        * If the user has provided an interrupt mask enabled function,
+        * then assert interrupts are disabled before switching the core.
+        */
+       ASSERT((si->imf == NULL) || !(*si->imf)(si->imfarg));
+
+       sbaddr = SB_ENUM_BASE + (coreidx * SB_CORE_SIZE);
+
+       switch (si->bus) {
+       case SB_BUS:
+               /* map new one */
+               if (!si->regs[coreidx]) {
+                       si->regs[coreidx] = (void*)REG_MAP(sbaddr, SB_CORE_SIZE);
+                       ASSERT(GOODREGS(si->regs[coreidx]));
+               }
+               si->curmap = si->regs[coreidx];
+               break;
+
+       case PCI_BUS:
+               /* point bar0 window */
+               OSL_PCI_WRITE_CONFIG(si->osh, PCI_BAR0_WIN, 4, sbaddr);
+               break;
+
+       case PCMCIA_BUS:
+               tmp = (sbaddr >> 12) & 0x0f;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, PCMCIA_ADDR0, &tmp, 1);
+               tmp = (sbaddr >> 16) & 0xff;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, PCMCIA_ADDR1, &tmp, 1);
+               tmp = (sbaddr >> 24) & 0xff;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, PCMCIA_ADDR2, &tmp, 1);
+               break;
+       }
+
+       si->curidx = coreidx;
+
+       return (si->curmap);
+}
+
+/* change logical "focus" to the indicated core */
+void*
+sb_setcore(void *sbh, uint coreid, uint coreunit)
+{
+       sb_info_t *si;
+       uint idx;
+
+       si = SB_INFO(sbh);
+
+       idx = sb_findcoreidx(sbh, coreid, coreunit);
+       if (!GOODIDX(idx))
+               return (NULL);
+
+       return (sb_setcoreidx(sbh, idx));
+}
+
+/* return chip number */
+uint
+sb_chip(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->chip);
+}
+
+/* return chip revision number */
+uint
+sb_chiprev(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->chiprev);
+}
+
+/* return chip package option */
+uint
+sb_chippkg(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->chippkg);
+}
+
+/* return board vendor id */
+uint
+sb_boardvendor(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->boardvendor);
+}
+
+/* return boardtype */
+uint
+sb_boardtype(void *sbh)
+{
+       sb_info_t *si;
+       char *var;
+
+       si = SB_INFO(sbh);
+
+       if (si->bus == SB_BUS && si->boardtype == 0xffff) {
+               /* boardtype format is a hex string */
+               si->boardtype = getintvar(NULL, "boardtype");
+
+               /* backward compatibility for older boardtype string format */
+               if ((si->boardtype == 0) && (var = getvar(NULL, "boardtype"))) {
+                       if (!strcmp(var, "bcm94710dev"))
+                               si->boardtype = BCM94710D_BOARD;
+                       else if (!strcmp(var, "bcm94710ap"))
+                               si->boardtype = BCM94710AP_BOARD;
+                       else if (!strcmp(var, "bcm94310u"))
+                               si->boardtype = BCM94310U_BOARD;
+                       else if (!strcmp(var, "bu4711"))
+                               si->boardtype = BU4711_BOARD;
+                       else if (!strcmp(var, "bu4710"))
+                               si->boardtype = BU4710_BOARD;
+                       else if (!strcmp(var, "bcm94702mn"))
+                               si->boardtype = BCM94702MN_BOARD;
+                       else if (!strcmp(var, "bcm94710r1"))
+                               si->boardtype = BCM94710R1_BOARD;
+                       else if (!strcmp(var, "bcm94710r4"))
+                               si->boardtype = BCM94710R4_BOARD;
+                       else if (!strcmp(var, "bcm94702cpci"))
+                               si->boardtype = BCM94702CPCI_BOARD;
+                       else if (!strcmp(var, "bcm95380_rr"))
+                               si->boardtype = BCM95380RR_BOARD; 
+               }
+       }
+
+       return (si->boardtype);
+}
+
+/* return board bus style */
+uint
+sb_boardstyle(void *sbh)
+{
+       sb_info_t *si;
+       uint16 w;
+
+       si = SB_INFO(sbh);
+
+       if (si->bus == PCMCIA_BUS)
+               return (BOARDSTYLE_PCMCIA);
+
+       if (si->bus == SB_BUS)
+               return (BOARDSTYLE_SOC);
+
+       /* bus is PCI */
+
+       if (OSL_PCI_READ_CONFIG(si->osh, PCI_CFG_CIS, sizeof (uint32)) != 0)
+               return (BOARDSTYLE_CARDBUS);
+
+       if ((srom_read(si->bus, si->curmap, si->osh, (SPROM_SIZE - 1) * 2, 2, &w) == 0) &&
+           (w == 0x0313))
+               return (BOARDSTYLE_CARDBUS);
+
+       return (BOARDSTYLE_PCI);
+}
+
+/* return boolean if sbh device is in pci hostmode or client mode */
+uint
+sb_bus(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       return (si->bus);
+}
+
+/* return list of found cores */
+uint
+sb_corelist(void *sbh, uint coreid[])
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+
+       bcopy((uchar*)si->coreid, (uchar*)coreid, (si->numcores * sizeof (uint)));
+       return (si->numcores);
+}
+
+/* return current register mapping */
+void *
+sb_coreregs(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       ASSERT(GOODREGS(si->curmap));
+
+       return (si->curmap);
+}
+
+/* Check if a target abort has happened and clear it */
+bool
+sb_taclear(void *sbh)
+{
+       sb_info_t *si;
+       bool rc = FALSE;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+       sb = REGS2SB(si->curmap);
+
+       if (si->bus == PCI_BUS) {
+               uint32 stcmd;
+
+               stcmd = OSL_PCI_READ_CONFIG(si->osh, PCI_CFG_CMD, sizeof(stcmd));
+               rc = (stcmd & 0x08000000) != 0;
+
+               if (rc) {
+                       /* Target abort bit is set, clear it */
+                       OSL_PCI_WRITE_CONFIG(si->osh, PCI_CFG_CMD, sizeof(stcmd), stcmd);
+               }
+       } else if (si->bus == PCMCIA_BUS) {
+               rc = FALSE;
+       }
+       else if (si->bus == SDIO_BUS) {
+               /* due to 4317 A0 HW bug, sdio core wedged on target abort, 
+                  just clear SBSErr bit blindly */
+               if (0x0 != R_SBREG(sbh, &sb->sbtmerrlog)) {
+                       SB_ERROR(("SDIO target abort, clean it"));
+                       W_SBREG(sbh, &sb->sbtmstatehigh, 0);
+               }
+               rc = FALSE;
+       }
+
+       return (rc);
+}
+
+/* do buffered registers update */
+void
+sb_commit(void *sbh)
+{
+       sb_info_t *si;
+       sbpciregs_t *pciregs;
+       uint origidx;
+       uint intr_val = 0;
+
+       si = SB_INFO(sbh);
+
+       origidx = si->curidx;
+       ASSERT(GOODIDX(origidx));
+
+       INTR_OFF(si, intr_val);
+       /* switch over to pci core */
+       pciregs = (sbpciregs_t*) sb_setcore(sbh, SB_PCI, 0);
+
+       /* do the buffer registers update */
+       W_REG(&pciregs->bcastaddr, SB_COMMIT);
+       W_REG(&pciregs->bcastdata, 0x0);
+
+       /* restore core index */
+       sb_setcoreidx(sbh, origidx);
+       INTR_RESTORE(si, intr_val);
+}
+
+/* reset and re-enable a core */
+void
+sb_core_reset(void *sbh, uint32 bits)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+       volatile uint32 dummy;
+
+       si = SB_INFO(sbh);
+       ASSERT(GOODREGS(si->curmap));
+       sb = REGS2SB(si->curmap);
+
+       /*
+        * Must do the disable sequence first to work for arbitrary current core state.
+        */
+       sb_core_disable(sbh, bits);
+
+       /*
+        * Now do the initialization sequence.
+        */
+
+       /* set reset while enabling the clock and forcing them on throughout the core */
+       W_SBREG(sbh, &sb->sbtmstatelow, (SBTML_FGC | SBTML_CLK | SBTML_RESET | bits));
+       dummy = R_SBREG(sbh, &sb->sbtmstatelow);
+
+       if (sb_coreid(sbh) == SB_ILINE100) {
+               bcm_mdelay(50);
+       } else {
+               OSL_DELAY(1);
+       }
+
+       if (R_SBREG(sbh, &sb->sbtmstatehigh) & SBTMH_SERR) {
+               W_SBREG(sbh, &sb->sbtmstatehigh, 0);
+       }
+       if ((dummy = R_SBREG(sbh, &sb->sbimstate)) & (SBIM_IBE | SBIM_TO)) {
+               AND_SBREG(sbh, &sb->sbimstate, ~(SBIM_IBE | SBIM_TO));
+       }
+
+       /* clear reset and allow it to propagate throughout the core */
+       W_SBREG(sbh, &sb->sbtmstatelow, (SBTML_FGC | SBTML_CLK | bits));
+       dummy = R_SBREG(sbh, &sb->sbtmstatelow);
+       OSL_DELAY(1);
+
+       /* leave clock enabled */
+       W_SBREG(sbh, &sb->sbtmstatelow, (SBTML_CLK | bits));
+       dummy = R_SBREG(sbh, &sb->sbtmstatelow);
+       OSL_DELAY(1);
+}
+
+void
+sb_core_tofixup(void *sbh)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+
+       if (si->pcirev >= 5)
+               return;
+
+       ASSERT(GOODREGS(si->curmap));
+       sb = REGS2SB(si->curmap);
+
+       if (si->bus == SB_BUS) {
+               SET_SBREG(sbh, &sb->sbimconfiglow,
+                         SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
+                         (0x5 << SBIMCL_RTO_SHIFT) | 0x3);
+       } else {
+               if (sb_coreid(sbh) == SB_PCI) {
+                       SET_SBREG(sbh, &sb->sbimconfiglow,
+                                 SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
+                                 (0x3 << SBIMCL_RTO_SHIFT) | 0x2);
+               } else {
+                       SET_SBREG(sbh, &sb->sbimconfiglow, (SBIMCL_RTO_MASK | SBIMCL_STO_MASK), 0);
+               }
+       }
+
+       sb_commit(sbh);
+}
+
+void
+sb_core_disable(void *sbh, uint32 bits)
+{
+       sb_info_t *si;
+       volatile uint32 dummy;
+       sbconfig_t *sb;
+
+       si = SB_INFO(sbh);
+
+       ASSERT(GOODREGS(si->curmap));
+       sb = REGS2SB(si->curmap);
+
+       /* must return if core is already in reset */
+       if (R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_RESET)
+               return;
+
+       /* put into reset and return if clocks are not enabled */
+       if ((R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_CLK) == 0)
+               goto disable;
+
+       /* set the reject bit */
+       W_SBREG(sbh, &sb->sbtmstatelow, (SBTML_CLK | SBTML_REJ));
+
+       /* spin until reject is set */
+       while ((R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_REJ) == 0)
+               OSL_DELAY(1);
+
+       /* spin until sbtmstatehigh.busy is clear */
+       while (R_SBREG(sbh, &sb->sbtmstatehigh) & SBTMH_BUSY)
+               OSL_DELAY(1);
+
+       /* set reset and reject while enabling the clocks */
+       W_SBREG(sbh, &sb->sbtmstatelow, (bits | SBTML_FGC | SBTML_CLK | SBTML_REJ | SBTML_RESET));
+       dummy = R_SBREG(sbh, &sb->sbtmstatelow);
+       OSL_DELAY(10);
+
+ disable:
+       /* leave reset and reject asserted */
+       W_SBREG(sbh, &sb->sbtmstatelow, (bits | SBTML_REJ | SBTML_RESET));
+       OSL_DELAY(1);
+}
+
+void
+sb_watchdog(void *sbh, uint ticks)
+{
+       sb_info_t *si = SB_INFO(sbh);
+
+       /* instant NMI */
+       switch (si->gpioid) {
+       case SB_CC:
+               sb_corereg(sbh, si->gpioidx, OFFSETOF(chipcregs_t, watchdog), ~0, ticks);
+               break;
+       case SB_EXTIF:
+               sb_corereg(sbh, si->gpioidx, OFFSETOF(extifregs_t, watchdog), ~0, ticks);
+               break;
+       }
+}
+
+/* initialize the pcmcia core */
+void
+sb_pcmcia_init(void *sbh)
+{
+       sb_info_t *si;
+       uint8 cor;
+
+       si = SB_INFO(sbh);
+
+       /* enable d11 mac interrupts */
+       if (si->chip == BCM4301_DEVICE_ID) {
+               /* Have to use FCR2 in 4301 */
+               OSL_PCMCIA_READ_ATTR(si->osh, PCMCIA_FCR2 + PCMCIA_COR, &cor, 1);
+               cor |= COR_IRQEN | COR_FUNEN;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, PCMCIA_FCR2 + PCMCIA_COR, &cor, 1);
+       } else {
+               OSL_PCMCIA_READ_ATTR(si->osh, PCMCIA_FCR0 + PCMCIA_COR, &cor, 1);
+               cor |= COR_IRQEN | COR_FUNEN;
+               OSL_PCMCIA_WRITE_ATTR(si->osh, PCMCIA_FCR0 + PCMCIA_COR, &cor, 1);
+       }
+
+}
+
+
+/*
+ * Configure the pci core for pci client (NIC) action
+ * and get appropriate dma offset value.
+ * coremask is the bitvec of cores by index to be enabled.
+ */
+void
+sb_pci_setup(void *sbh, uint32 *dmaoffset, uint coremask)
+{
+       sb_info_t *si;
+       sbconfig_t *sb;
+       sbpciregs_t *pciregs;
+       uint32 sbflag;
+       uint32 w;
+       uint idx;
+
+       si = SB_INFO(sbh);
+
+       if (dmaoffset)
+               *dmaoffset = 0;
+
+       /* if not pci bus, we're done */
+       if (si->bus != PCI_BUS)
+               return;
+
+       ASSERT(si->pciidx);
+
+       /* get current core index */
+       idx = si->curidx;
+
+       /* we interrupt on this backplane flag number */
+       ASSERT(GOODREGS(si->curmap));
+       sb = REGS2SB(si->curmap);
+       sbflag = R_SBREG(sbh, &sb->sbtpsflag) & SBTPS_NUM0_MASK;
+
+       /* switch over to pci core */
+       pciregs = (sbpciregs_t*) sb_setcoreidx(sbh, si->pciidx);
+       sb = REGS2SB(pciregs);
+
+       /*
+        * Enable sb->pci interrupts.  Assume
+        * PCI rev 2.3 support was added in pci core rev 6 and things changed..
+        */
+       if (si->pcirev < 6) {
+               /* set sbintvec bit for our flag number */
+               OR_SBREG(sbh, &sb->sbintvec, (1 << sbflag));
+       } else {
+               /* pci config write to set this core bit in PCIIntMask */
+               w = OSL_PCI_READ_CONFIG(si->osh, PCI_INT_MASK, sizeof(uint32));
+               w |= (coremask << PCI_SBIM_SHIFT);
+               OSL_PCI_WRITE_CONFIG(si->osh, PCI_INT_MASK, sizeof(uint32), w);
+       }
+
+       /* enable prefetch and bursts for sonics-to-pci translation 2 */
+       OR_REG(&pciregs->sbtopci2, (SBTOPCI_PREF|SBTOPCI_BURST));
+
+       if (si->pcirev < 5) {
+               SET_SBREG(sbh, &sb->sbimconfiglow, SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
+                       (0x3 << SBIMCL_RTO_SHIFT) | 0x2);
+               sb_commit(sbh);
+       }
+
+       /* switch back to previous core */
+       sb_setcoreidx(sbh, idx);
+
+       /* use large sb pci dma window */
+       if (dmaoffset)
+               *dmaoffset = SB_PCI_DMA;
+}
+
+uint32
+sb_base(uint32 admatch)
+{
+       uint32 base;
+       uint type;
+
+       type = admatch & SBAM_TYPE_MASK;
+       ASSERT(type < 3);
+
+       base = 0;
+
+       if (type == 0) {
+               base = admatch & SBAM_BASE0_MASK;
+       } else if (type == 1) {
+               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
+               base = admatch & SBAM_BASE1_MASK;
+       } else if (type == 2) {
+               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
+               base = admatch & SBAM_BASE2_MASK;
+       }
+
+       return (base);
+}
+
+uint32
+sb_size(uint32 admatch)
+{
+       uint32 size;
+       uint type;
+
+       type = admatch & SBAM_TYPE_MASK;
+       ASSERT(type < 3);
+
+       size = 0;
+
+       if (type == 0) {
+               size = 1 << (((admatch & SBAM_ADINT0_MASK) >> SBAM_ADINT0_SHIFT) + 1);
+       } else if (type == 1) {
+               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
+               size = 1 << (((admatch & SBAM_ADINT1_MASK) >> SBAM_ADINT1_SHIFT) + 1);
+       } else if (type == 2) {
+               ASSERT(!(admatch & SBAM_ADNEG));        /* neg not supported */
+               size = 1 << (((admatch & SBAM_ADINT2_MASK) >> SBAM_ADINT2_SHIFT) + 1);
+       }
+
+       return (size);
+}
+
+/* return the core-type instantiation # of the current core */
+uint
+sb_coreunit(void *sbh)
+{
+       sb_info_t *si;
+       uint idx;
+       uint coreid;
+       uint coreunit;
+       uint i;
+
+       si = SB_INFO(sbh);
+       coreunit = 0;
+
+       idx = si->curidx;
+
+       ASSERT(GOODREGS(si->curmap));
+       coreid = sb_coreid(sbh);
+
+       /* count the cores of our type */
+       for (i = 0; i < idx; i++)
+               if (si->coreid[i] == coreid)
+                       coreunit++;
+
+       return (coreunit);
+}
+
+static INLINE uint32
+factor6(uint32 x)
+{
+       switch (x) {
+       case CC_F6_2:   return 2;
+       case CC_F6_3:   return 3;
+       case CC_F6_4:   return 4;
+       case CC_F6_5:   return 5;
+       case CC_F6_6:   return 6;
+       case CC_F6_7:   return 7;
+       default:        return 0;
+       }
+}
+
+/* calculate the speed the SB would run at given a set of clockcontrol values */
+uint32
+sb_clock_rate(uint32 pll_type, uint32 n, uint32 m)
+{
+       uint32 n1, n2, clock, m1, m2, m3, mc;
+
+       n1 = n & CN_N1_MASK;
+       n2 = (n & CN_N2_MASK) >> CN_N2_SHIFT;
+
+       if ((pll_type == PLL_TYPE1) || (pll_type == PLL_TYPE4)) {
+               n1 = factor6(n1);
+               n2 += CC_F5_BIAS;
+       } else if (pll_type == PLL_TYPE2) {
+               n1 += CC_T2_BIAS;
+               n2 += CC_T2_BIAS;
+               ASSERT((n1 >= 2) && (n1 <= 7));
+               ASSERT((n2 >= 5) && (n2 <= 23));
+       } else if (pll_type == PLL_TYPE3) {
+               return (100000000);
+       } else
+               ASSERT((pll_type >= PLL_TYPE1) && (pll_type <= PLL_TYPE4));
+
+       clock = CC_CLOCK_BASE * n1 * n2;
+
+       if (clock == 0)
+               return 0;
+
+       m1 = m & CC_M1_MASK;
+       m2 = (m & CC_M2_MASK) >> CC_M2_SHIFT;
+       m3 = (m & CC_M3_MASK) >> CC_M3_SHIFT;
+       mc = (m & CC_MC_MASK) >> CC_MC_SHIFT;
+
+       if ((pll_type == PLL_TYPE1) || (pll_type == PLL_TYPE4)) {
+               m1 = factor6(m1);
+               if (pll_type == PLL_TYPE1)
+                       m2 += CC_F5_BIAS;
+               else
+                       m2 = factor6(m2);
+               m3 = factor6(m3);
+
+               switch (mc) {
+               case CC_MC_BYPASS:      return (clock);
+               case CC_MC_M1:          return (clock / m1);
+               case CC_MC_M1M2:        return (clock / (m1 * m2));
+               case CC_MC_M1M2M3:      return (clock / (m1 * m2 * m3));
+               case CC_MC_M1M3:        return (clock / (m1 * m3));
+               default:                return (0);
+               }
+       } else {
+               ASSERT(pll_type == PLL_TYPE2);
+
+               m1 += CC_T2_BIAS;
+               m2 += CC_T2M2_BIAS;
+               m3 += CC_T2_BIAS;
+               ASSERT((m1 >= 2) && (m1 <= 7));
+               ASSERT((m2 >= 3) && (m2 <= 10));
+               ASSERT((m3 >= 2) && (m3 <= 7));
+
+               if ((mc & CC_T2MC_M1BYP) == 0)
+                       clock /= m1;
+               if ((mc & CC_T2MC_M2BYP) == 0)
+                       clock /= m2;
+               if ((mc & CC_T2MC_M3BYP) == 0)
+                       clock /= m3;
+
+               return(clock);
+       }
+}
+
+/* returns the current speed the SB is running at */
+uint32
+sb_clock(void *sbh)
+{
+       sb_info_t *si;
+       extifregs_t *eir;
+       chipcregs_t *cc;
+       uint32 n, m;
+       uint idx;
+       uint32 pll_type, rate;
+       uint intr_val = 0;
+
+       si = SB_INFO(sbh);
+       idx = si->curidx;
+       pll_type = PLL_TYPE1;
+
+       INTR_OFF(si, intr_val);
+
+       /* switch to extif or chipc core */
+       if ((eir = (extifregs_t *) sb_setcore(sbh, SB_EXTIF, 0))) {
+               n = R_REG(&eir->clockcontrol_n);
+               m = R_REG(&eir->clockcontrol_sb);
+       } else if ((cc = (chipcregs_t *) sb_setcore(sbh, SB_CC, 0))) {
+               pll_type = R_REG(&cc->capabilities) & CAP_PLL_MASK;
+               n = R_REG(&cc->clockcontrol_n);
+               m = R_REG(&cc->clockcontrol_sb);
+       } else {
+               INTR_RESTORE(si, intr_val);
+               return 0;
+       }
+
+       /* calculate rate */
+       rate = sb_clock_rate(pll_type, n, m);
+
+       /* switch back to previous core */
+       sb_setcoreidx(sbh, idx);
+
+       INTR_RESTORE(si, intr_val);
+
+       return rate;
+}
+
+/* change logical "focus" to the gpio core for optimized access */
+void*
+sb_gpiosetcore(void *sbh)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+
+       return (sb_setcoreidx(sbh, si->gpioidx));
+}
+
+/* mask&set gpiocontrol bits */
+uint32
+sb_gpiocontrol(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpiocontrol);
+               break;
+
+       case SB_PCI:
+               regoff = OFFSETOF(sbpciregs_t, gpiocontrol);
+               break;
+
+       case SB_EXTIF:
+               return (0);
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, mask, val));
+}
+
+/* mask&set gpio output enable bits */
+uint32
+sb_gpioouten(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpioouten);
+               break;
+
+       case SB_PCI:
+               regoff = OFFSETOF(sbpciregs_t, gpioouten);
+               break;
+
+       case SB_EXTIF:
+               regoff = OFFSETOF(extifregs_t, gpio[0].outen);
+               break;
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, mask, val));
+}
+
+/* mask&set gpio output bits */
+uint32
+sb_gpioout(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpioout);
+               break;
+
+       case SB_PCI:
+               regoff = OFFSETOF(sbpciregs_t, gpioout);
+               break;
+
+       case SB_EXTIF:
+               regoff = OFFSETOF(extifregs_t, gpio[0].out);
+               break;
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, mask, val));
+}
+
+/* return the current gpioin register value */
+uint32
+sb_gpioin(void *sbh)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpioin);
+               break;
+
+       case SB_PCI:
+               regoff = OFFSETOF(sbpciregs_t, gpioin);
+               break;
+
+       case SB_EXTIF:
+               regoff = OFFSETOF(extifregs_t, gpioin);
+               break;
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, 0, 0));
+}
+
+/* mask&set gpio interrupt polarity bits */
+uint32
+sb_gpiointpolarity(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpiointpolarity);
+               break;
+
+       case SB_PCI:
+               /* pci gpio implementation does not support interrupt polarity */
+               ASSERT(0);
+               break;
+
+       case SB_EXTIF:
+               regoff = OFFSETOF(extifregs_t, gpiointpolarity);
+               break;
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, mask, val));
+}
+
+/* mask&set gpio interrupt mask bits */
+uint32
+sb_gpiointmask(void *sbh, uint32 mask, uint32 val)
+{
+       sb_info_t *si;
+       uint regoff;
+
+       si = SB_INFO(sbh);
+       regoff = 0;
+
+       switch (si->gpioid) {
+       case SB_CC:
+               regoff = OFFSETOF(chipcregs_t, gpiointmask);
+               break;
+
+       case SB_PCI:
+               /* pci gpio implementation does not support interrupt mask */
+               ASSERT(0);
+               break;
+
+       case SB_EXTIF:
+               regoff = OFFSETOF(extifregs_t, gpiointmask);
+               break;
+       }
+
+       return (sb_corereg(sbh, si->gpioidx, regoff, mask, val));
+}
+
+
+/*
+ * Return the slowclock min or max frequency.
+ * Three sources of SLOW CLOCK:
+ *     1. On Chip LPO         -     32khz or 160khz
+ *     2. On Chip Xtal OSC    -     20mhz/4*(divider+1) 
+ *     3. External PCI clock  -     66mhz/4*(divider+1)
+ */
+static uint
+slowfreq(void *sbh, bool max)
+{
+       sb_info_t *si;
+       chipcregs_t *cc;
+       uint32 v;
+       uint div;
+
+       si = SB_INFO(sbh);
+
+       ASSERT(sb_coreid(sbh) == SB_CC);
+
+       cc = (chipcregs_t*) sb_setcoreidx(sbh, si->curidx);
+
+       /* shouldn't be here unless we've established the chip has dynamic power control */
+       ASSERT(R_REG(&cc->capabilities) & CAP_PWR_CTL);
+
+       if (si->ccrev < 6) {
+               v = OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32));
+
+               if (v & PCI_CFG_GPIO_SCS)
+                       return (max? (PCIMAXFREQ/64) : (PCIMINFREQ/64));
+               else
+                       return (max? (XTALMAXFREQ/32) : (XTALMINFREQ/32));
+       } else {
+               v = R_REG(&cc->slow_clk_ctl) & SCC_SS_MASK;
+               div = 4 * (((R_REG(&cc->slow_clk_ctl) & SCC_CD_MASK) >> SCC_CD_SHF) + 1);
+               if (v == SCC_SS_LPO)
+                       return (max? LPOMAXFREQ : LPOMINFREQ);
+               else if (v == SCC_SS_XTAL)
+                       return (max? (XTALMAXFREQ/div) : (XTALMINFREQ/div));
+               else if (v == SCC_SS_PCI)
+                       return (max? (PCIMAXFREQ/div) : (PCIMINFREQ/div));
+               else
+                       ASSERT(0);
+       }
+       return (0);
+}
+
+/* initialize power control delay registers */
+void
+sb_pwrctl_init(void *sbh)
+{
+       sb_info_t *si;
+       uint origidx;
+       chipcregs_t *cc;
+       uint slowmaxfreq;
+       uint pll_on_delay, fref_sel_delay;
+
+       si = SB_INFO(sbh);
+
+       if (si->bus == SB_BUS)
+               return;
+
+       origidx = si->curidx;
+
+       if ((cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0)) == NULL)
+               return;
+
+       if (!(R_REG(&cc->capabilities) & CAP_PWR_CTL))
+               goto done;
+
+       slowmaxfreq = slowfreq(sbh, TRUE);
+       pll_on_delay = ((slowmaxfreq * PLL_DELAY) + 999999) / 1000000;
+       fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
+
+       W_REG(&cc->pll_on_delay, pll_on_delay);
+       W_REG(&cc->fref_sel_delay, fref_sel_delay);
+
+       /* 4317pc does not work with SlowClock less than 5Mhz */
+       if (si->bus == PCMCIA_BUS)
+               SET_REG(&cc->slow_clk_ctl, SCC_CD_MASK, (0 << SCC_CD_SHF));
+
+done:
+       sb_setcoreidx(sbh, origidx);
+}
+
+/* return the value suitable for writing to the dot11 core FAST_PWRUP_DELAY register */
+uint16
+sb_pwrctl_fast_pwrup_delay(void *sbh)
+{
+       sb_info_t *si;
+       uint origidx;
+       chipcregs_t *cc;
+       uint slowminfreq;
+       uint16 fpdelay;
+       uint intr_val = 0;
+
+       si = SB_INFO(sbh);
+       fpdelay = 0;
+       origidx = si->curidx;
+
+       if (si->bus == SB_BUS)
+               goto done;
+
+       INTR_OFF(si, intr_val);
+
+       if ((cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0)) == NULL)
+               goto done;
+
+       if (!(R_REG(&cc->capabilities) & CAP_PWR_CTL))
+               goto done;
+
+       slowminfreq = slowfreq(sbh, FALSE);
+       fpdelay = (((R_REG(&cc->pll_on_delay) + 2) * 1000000) + (slowminfreq - 1)) / slowminfreq;
+
+done:
+       sb_setcoreidx(sbh, origidx);
+       INTR_RESTORE(si, intr_val);
+       return (fpdelay);
+}
+
+/* turn primary xtal and/or pll off/on */
+int
+sb_pwrctl_xtal(void *sbh, uint what, bool on)
+{
+       sb_info_t *si;
+       uint32 in, out, outen;
+
+       si = SB_INFO(sbh);
+
+
+       if (si->bus == PCMCIA_BUS) {
+               return (0);
+       }
+
+       if (si->bus != PCI_BUS) 
+               return (-1);
+
+       in = OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_IN, sizeof (uint32));
+       out = OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32));
+       outen = OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_OUTEN, sizeof (uint32));
+
+       /*
+        * We can't actually read the state of the PLLPD so we infer it
+        * by the value of XTAL_PU which *is* readable via gpioin.
+        */
+       if (on && (in & PCI_CFG_GPIO_XTAL))
+               return (0);
+
+       if (what & XTAL)
+               outen |= PCI_CFG_GPIO_XTAL;
+       if (what & PLL)
+               outen |= PCI_CFG_GPIO_PLL;
+
+       if (on) {
+               /* turn primary xtal on */
+               if (what & XTAL) {
+                       out |= PCI_CFG_GPIO_XTAL;
+                       if (what & PLL)
+                               out |= PCI_CFG_GPIO_PLL;
+                       OSL_PCI_WRITE_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32), out);
+                       OSL_PCI_WRITE_CONFIG(si->osh, PCI_GPIO_OUTEN, sizeof (uint32), outen);
+                       OSL_DELAY(200);
+               }
+
+               /* turn pll on */
+               if (what & PLL) {
+                       out &= ~PCI_CFG_GPIO_PLL;
+                       OSL_PCI_WRITE_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32), out);
+                       OSL_DELAY(2000);
+               }
+       } else {
+               if (what & XTAL)
+                       out &= ~PCI_CFG_GPIO_XTAL;
+               if (what & PLL)
+                       out |= PCI_CFG_GPIO_PLL;
+               OSL_PCI_WRITE_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32), out);
+               OSL_PCI_WRITE_CONFIG(si->osh, PCI_GPIO_OUTEN, sizeof (uint32), outen);
+       }
+
+       return (0);
+}
+
+/* set dynamic power control mode (forceslow, forcefast, dynamic) */
+/*   returns true if ignore pll off is set and false if it is not */
+bool
+sb_pwrctl_clk(void *sbh, uint mode)
+{
+       sb_info_t *si;
+       uint origidx;
+       chipcregs_t *cc;
+       uint32 scc;
+       bool forcefastclk=FALSE;
+       uint intr_val = 0;
+
+       si = SB_INFO(sbh);
+
+       /* chipcommon cores prior to rev6 don't support slowclkcontrol */
+       if (si->ccrev < 6)
+               return (FALSE);
+
+       INTR_OFF(si, intr_val);
+
+       origidx = si->curidx;
+
+       cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0);
+       ASSERT(cc != NULL);
+
+       if (!(R_REG(&cc->capabilities) & CAP_PWR_CTL))
+               goto done;
+
+       switch (mode) {
+       case CLK_FAST:  /* force fast (pll) clock */
+               /* don't forget to force xtal back on before we clear SCC_DYN_XTAL.. */
+               sb_pwrctl_xtal(sbh, XTAL, ON);
+
+               SET_REG(&cc->slow_clk_ctl, (SCC_XC | SCC_FS | SCC_IP), SCC_IP);
+               break;
+
+       case CLK_SLOW:  /* force slow clock */
+               if ((si->bus == SDIO_BUS) || (si->bus == PCMCIA_BUS))
+                       return (-1);
+
+               if (si->ccrev >= 6)
+                       OR_REG(&cc->slow_clk_ctl, SCC_FS);
+               break;
+
+       case CLK_DYNAMIC:       /* enable dynamic power control */
+               scc = R_REG(&cc->slow_clk_ctl);
+               scc &= ~(SCC_FS | SCC_IP | SCC_XC);
+               if ((scc & SCC_SS_MASK) != SCC_SS_XTAL)
+                       scc |= SCC_XC;
+               W_REG(&cc->slow_clk_ctl, scc);
+
+               /* for dynamic control, we have to release our xtal_pu "force on" */
+               if (scc & SCC_XC)
+                       sb_pwrctl_xtal(sbh, XTAL, OFF);
+               break;
+       }
+       
+       /* Is the h/w forcing the use of the fast clk */
+       forcefastclk = (bool)((R_REG(&cc->slow_clk_ctl) & SCC_IP) == SCC_IP);
+
+done:
+       sb_setcoreidx(sbh, origidx);
+       INTR_RESTORE(si, intr_val);
+       return (forcefastclk);
+}
+
+/* register driver interrupt disabling and restoring callback functions */
+void
+sb_register_intr_callback(void *sbh, void *intrsoff_fn, void *intrsrestore_fn, void *intr_arg)
+{
+       sb_info_t *si;
+
+       si = SB_INFO(sbh);
+       si->intr_arg = intr_arg;
+       si->intrsoff_fn = (sb_intrsoff_t)intrsoff_fn;
+       si->intrsrestore_fn = (sb_intrsrestore_t)intrsrestore_fn;
+       /* save current core id.  when this function called, the current core
+        * must be the core which provides driver functions(il, et, wl, etc.)
+        */
+       si->dev_coreid = si->coreid[si->curidx];
+}
+
+
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcm4710.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcm4710.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcm4710.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcm4710.h    2005-08-28 11:12:20.430859152 +0200
@@ -0,0 +1,90 @@
+/*
+ * BCM4710 address space map and definitions
+ * Think twice before adding to this file, this is not the kitchen sink
+ * These definitions are not guaranteed for all 47xx chips, only the 4710
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _bcm4710_h_
+#define _bcm4710_h_
+
+/* Address map */
+#define BCM4710_SDRAM          0x00000000      /* Physical SDRAM */
+#define BCM4710_PCI_MEM                0x08000000      /* Host Mode PCI memory access space (64 MB) */
+#define BCM4710_PCI_CFG                0x0c000000      /* Host Mode PCI configuration space (64 MB) */
+#define BCM4710_PCI_DMA                0x40000000      /* Client Mode PCI memory access space (1 GB) */
+#define        BCM4710_SDRAM_SWAPPED   0x10000000      /* Byteswapped Physical SDRAM */
+#define BCM4710_ENUM           0x18000000      /* Beginning of core enumeration space */
+
+/* Core register space */
+#define BCM4710_REG_SDRAM      0x18000000      /* SDRAM core registers */
+#define BCM4710_REG_ILINE20    0x18001000      /* InsideLine20 core registers */
+#define BCM4710_REG_EMAC0      0x18002000      /* Ethernet MAC 0 core registers */
+#define BCM4710_REG_CODEC      0x18003000      /* Codec core registers */
+#define BCM4710_REG_USB                0x18004000      /* USB core registers */
+#define BCM4710_REG_PCI                0x18005000      /* PCI core registers */
+#define BCM4710_REG_MIPS       0x18006000      /* MIPS core registers */
+#define BCM4710_REG_EXTIF      0x18007000      /* External Interface core registers */
+#define BCM4710_REG_EMAC1      0x18008000      /* Ethernet MAC 1 core registers */
+
+#define        BCM4710_EXTIF           0x1f000000      /* External Interface base address */
+#define BCM4710_PCMCIA_MEM     0x1f000000      /* External Interface PCMCIA memory access */
+#define BCM4710_PCMCIA_IO      0x1f100000      /* PCMCIA I/O access */
+#define BCM4710_PCMCIA_CONF    0x1f200000      /* PCMCIA configuration */
+#define BCM4710_PROG           0x1f800000      /* Programable interface */
+#define BCM4710_FLASH          0x1fc00000      /* Flash */
+
+#define        BCM4710_EJTAG           0xff200000      /* MIPS EJTAG space (2M) */
+
+#define        BCM4710_UART            (BCM4710_REG_EXTIF + 0x00000300)
+
+#define        BCM4710_EUART           (BCM4710_EXTIF + 0x00800000)
+#define        BCM4710_LED             (BCM4710_EXTIF + 0x00900000)
+
+#define        SBFLAG_PCI      0
+#define        SBFLAG_ENET0    1
+#define        SBFLAG_ILINE20  2
+#define        SBFLAG_CODEC    3
+#define        SBFLAG_USB      4
+#define        SBFLAG_EXTIF    5
+#define        SBFLAG_ENET1    6
+
+#ifdef CONFIG_HWSIM
+#define        BCM4710_TRACE(trval)        do { *((int *)0xa0000f18) = (trval); } while (0)
+#else
+#define        BCM4710_TRACE(trval)
+#endif
+
+
+/* BCM94702 CPCI -ExtIF used for LocalBus devs */
+
+#define BCM94702_CPCI_RESET_ADDR        BCM4710_EXTIF
+#define BCM94702_CPCI_BOARDID_ADDR     (BCM4710_EXTIF | 0x4000)
+#define BCM94702_CPCI_DOC_ADDR         (BCM4710_EXTIF | 0x6000)
+#define BCM94702_DOC_ADDR                BCM94702_CPCI_DOC_ADDR
+#define BCM94702_CPCI_LED_ADDR         (BCM4710_EXTIF | 0xc000)
+#define BCM94702_CPCI_NVRAM_ADDR       (BCM4710_EXTIF | 0xe000)
+#define BCM94702_CPCI_NVRAM_SIZE         0x1ff0 /* 8K NVRAM : DS1743/STM48txx*/
+#define BCM94702_CPCI_TOD_REG_BASE       (BCM94702_CPCI_NVRAM_ADDR | 0x1ff0)
+
+#define LED_REG(x)      \
+ (*(volatile unsigned char *) (KSEG1ADDR(BCM94702_CPCI_LED_ADDR) + (x)))
+
+/* 
+ * Reset function implemented in PLD.  Read or write should trigger hard reset 
+ */
+#define SYS_HARD_RESET()   \
+    { for (;;) \
+     *( (volatile unsigned char *)\
+      KSEG1ADDR(BCM94702_CPCI_RESET_ADDR) ) = 0x80; \
+    }
+
+#endif /* _bcm4710_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmdevs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmdevs.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmdevs.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmdevs.h    2005-08-28 11:12:20.431859000 +0200
@@ -0,0 +1,238 @@
+/*
+ * Broadcom device-specific manifest constants.
+ *
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ */
+
+#ifndef        _BCMDEVS_H
+#define        _BCMDEVS_H
+
+
+/* Known PCI vendor Id's */
+#define        VENDOR_EPIGRAM          0xfeda
+#define        VENDOR_BROADCOM         0x14e4
+#define        VENDOR_3COM             0x10b7
+#define        VENDOR_NETGEAR          0x1385
+#define        VENDOR_DIAMOND          0x1092
+#define        VENDOR_DELL             0x1028
+#define        VENDOR_HP               0x0e11
+#define        VENDOR_APPLE            0x106b
+
+/* PCI Device Id's */
+#define        BCM4210_DEVICE_ID       0x1072          /* never used */
+#define        BCM4211_DEVICE_ID       0x4211
+#define        BCM4230_DEVICE_ID       0x1086          /* never used */
+#define        BCM4231_DEVICE_ID       0x4231
+
+#define        BCM4410_DEVICE_ID       0x4410          /* bcm44xx family pci iline */
+#define        BCM4430_DEVICE_ID       0x4430          /* bcm44xx family cardbus iline */
+#define        BCM4412_DEVICE_ID       0x4412          /* bcm44xx family pci enet */
+#define        BCM4432_DEVICE_ID       0x4432          /* bcm44xx family cardbus enet */
+
+#define        BCM3352_DEVICE_ID       0x3352          /* bcm3352 device id */
+#define        BCM3360_DEVICE_ID       0x3360          /* bcm3360 device id */
+
+#define        EPI41210_DEVICE_ID      0xa0fa          /* bcm4210 */
+#define        EPI41230_DEVICE_ID      0xa10e          /* bcm4230 */
+
+#define        BCM47XX_ILINE_ID        0x4711          /* 47xx iline20 */
+#define        BCM47XX_V90_ID          0x4712          /* 47xx v90 codec */
+#define        BCM47XX_ENET_ID         0x4713          /* 47xx enet */
+#define        BCM47XX_EXT_ID          0x4714          /* 47xx external i/f */
+#define        BCM47XX_USB_ID          0x4715          /* 47xx usb */
+#define        BCM47XX_USBH_ID         0x4716          /* 47xx usb host */
+#define        BCM47XX_USBD_ID         0x4717          /* 47xx usb device */
+#define        BCM47XX_IPSEC_ID        0x4718          /* 47xx ipsec */
+
+#define        BCM4710_DEVICE_ID       0x4710          /* 4710 primary function 0 */
+
+#define        BCM4610_DEVICE_ID       0x4610          /* 4610 primary function 0 */
+#define        BCM4610_ILINE_ID        0x4611          /* 4610 iline100 */
+#define        BCM4610_V90_ID          0x4612          /* 4610 v90 codec */
+#define        BCM4610_ENET_ID         0x4613          /* 4610 enet */
+#define        BCM4610_EXT_ID          0x4614          /* 4610 external i/f */
+#define        BCM4610_USB_ID          0x4615          /* 4610 usb */
+
+#define        BCM4402_DEVICE_ID       0x4402          /* 4402 primary function 0 */
+#define        BCM4402_ENET_ID         0x4402          /* 4402 enet */
+#define        BCM4402_V90_ID          0x4403          /* 4402 v90 codec */
+
+#define        BCM4301_DEVICE_ID       0x4301          /* 4301 primary function 0 */
+#define        BCM4301_D11B_ID         0x4301          /* 4301 802.11b */
+
+#define        BCM4307_DEVICE_ID       0x4307          /* 4307 primary function 0 */
+#define        BCM4307_V90_ID          0x4305          /* 4307 v90 codec */
+#define        BCM4307_ENET_ID         0x4306          /* 4307 enet */
+#define        BCM4307_D11B_ID         0x4307          /* 4307 802.11b */
+
+#define        BCM4306_DEVICE_ID       0x4306          /* 4306 chipcommon chipid */
+#define        BCM4306_D11G_ID         0x4320          /* 4306 802.11g */
+#define        BCM4306_D11G_ID2        0x4325          
+#define        BCM4306_D11A_ID         0x4321          /* 4306 802.11a */
+#define        BCM4306_UART_ID         0x4322          /* 4306 uart */
+#define        BCM4306_V90_ID          0x4323          /* 4306 v90 codec */
+#define        BCM4306_D11DUAL_ID      0x4324          /* 4306 dual A+B */
+
+#define        BCM4309_PKG_ID          1               /* 4309 package id */
+
+#define        BCM4303_D11B_ID         0x4303          /* 4303 802.11b */
+#define        BCM4303_PKG_ID          2               /* 4303 package id */
+
+#define        BCM4310_DEVICE_ID       0x4310          /* 4310 chipcommon chipid */
+#define        BCM4310_D11B_ID         0x4311          /* 4310 802.11b */
+#define        BCM4310_UART_ID         0x4312          /* 4310 uart */
+#define        BCM4310_ENET_ID         0x4313          /* 4310 enet */
+#define        BCM4310_USB_ID          0x4315          /* 4310 usb */
+
+#define        BCM4704_DEVICE_ID       0x4704          /* 4704 chipcommon chipid */
+#define        BCM4704_ENET_ID         0x4706          /* 4704 enet (Use 47XX_ENET_ID instead!) */
+
+#define        BCM4317_DEVICE_ID       0x4317          /* 4317 chip common chipid */
+
+#define        BCM4712_DEVICE_ID       0x4712          /* 4712 chipcommon chipid */
+#define        BCM4712_MIPS_ID         0x4720          /* 4712 base devid */
+#define        BCM4712SMALL_PKG_ID     1               /* 200pin 4712 package id */
+
+#define        SDIOH_FPGA_ID           0x4380          /* sdio host fpga */
+
+#define BCM5365_DEVICE_ID       0x5365          /* 5365 chipcommon chipid */
+
+
+/* PCMCIA vendor Id's */
+
+#define        VENDOR_BROADCOM_PCMCIA  0x02d0
+
+/* SDIO vendor Id's */
+#define        VENDOR_BROADCOM_SDIO    0x00BF
+
+
+/* boardflags */
+#define        BFL_BTCOEXIST           0x0001  /* This board implements Bluetooth coexistance */
+#define        BFL_PACTRL              0x0002  /* This board has gpio 9 controlling the PA */
+#define        BFL_AIRLINEMODE         0x0004  /* This board implements gpio13 radio disable indication */
+#define        BFL_ENETSPI             0x0010  /* This board has ephy roboswitch spi */
+#define        BFL_CCKHIPWR            0x0040  /* Can do high-power CCK transmission */
+#define        BFL_ENETADM             0x0080  /* This board has ADMtek switch */
+#define        BFL_ENETVLAN            0x0100  /* This board can do vlan */
+
+/* board specific GPIO assignment, gpio 0-3 are also customer-configurable led */
+#define BOARD_GPIO_HWRAD_B     0x010   /* bit 4 is HWRAD input on 4301 */
+#define        BOARD_GPIO_BTC_IN       0x080   /* bit 7 is BT Coexistance Input */
+#define        BOARD_GPIO_BTC_OUT      0x100   /* bit 8 is BT Coexistance Out */
+#define        BOARD_GPIO_PACTRL       0x200   /* bit 9 controls the PA on new 4306 boards */
+#define        PCI_CFG_GPIO_SCS        0x10    /* PCI config space bit 4 for 4306c0 slow clock source */
+#define PCI_CFG_GPIO_HWRAD     0x20    /* PCI config space GPIO 13 for hw radio disable */
+#define PCI_CFG_GPIO_XTAL      0x40    /* PCI config space GPIO 14 for Xtal powerup */
+#define PCI_CFG_GPIO_PLL       0x80    /* PCI config space GPIO 15 for PLL powerdown */
+
+/* Bus types */
+#define        SB_BUS                  0       /* Silicon Backplane */
+#define        PCI_BUS                 1       /* PCI target */
+#define        PCMCIA_BUS              2       /* PCMCIA target */
+#define SDIO_BUS               3       /* SDIO target */
+
+/* Reference Board Types */
+
+#define        BU4710_BOARD            0x0400
+#define        VSIM4710_BOARD          0x0401
+#define        QT4710_BOARD            0x0402
+
+#define        BU4610_BOARD            0x0403
+#define        VSIM4610_BOARD          0x0404
+
+#define        BU4307_BOARD            0x0405
+#define        BCM94301CB_BOARD        0x0406
+#define        BCM94301PC_BOARD        0x0406          /* Pcmcia 5v card */
+#define        BCM94301MP_BOARD        0x0407
+#define        BCM94307MP_BOARD        0x0408
+#define        BCMAP4307_BOARD         0x0409
+
+#define        BU4309_BOARD            0x040a
+#define        BCM94309CB_BOARD        0x040b
+#define        BCM94309MP_BOARD        0x040c
+#define        BCM4309AP_BOARD         0x040d
+
+#define        BCM94302MP_BOARD        0x040e
+
+#define        VSIM4310_BOARD          0x040f
+#define        BU4711_BOARD            0x0410
+#define        BCM94310U_BOARD         0x0411
+#define        BCM94310AP_BOARD        0x0412
+#define        BCM94310MP_BOARD        0x0414
+
+#define        BU4306_BOARD            0x0416
+#define        BCM94306CB_BOARD        0x0417
+#define        BCM94306MP_BOARD        0x0418
+
+#define        BCM94710D_BOARD         0x041a
+#define        BCM94710R1_BOARD        0x041b
+#define        BCM94710R4_BOARD        0x041c
+#define        BCM94710AP_BOARD        0x041d
+
+
+#define        BU2050_BOARD            0x041f
+
+
+#define        BCM94309G_BOARD         0x0421
+
+#define        BCM94301PC3_BOARD       0x0422          /* Pcmcia 3.3v card */
+
+#define        BU4704_BOARD            0x0423
+#define        BU4702_BOARD            0x0424
+
+#define        BCM94306PC_BOARD        0x0425          /* pcmcia 3.3v 4306 card */
+
+#define        BU4317_BOARD            0x0426
+
+
+#define        BCM94702MN_BOARD        0x0428
+
+/* BCM4702 1U CompactPCI Board */
+#define        BCM94702CPCI_BOARD      0x0429
+
+/* BCM4702 with BCM95380 VLAN Router */
+#define        BCM95380RR_BOARD        0x042a
+
+/* cb4306 with SiGe PA */
+#define        BCM94306CBSG_BOARD      0x042b
+
+/* mp4301 with 2050 radio */
+#define        BCM94301MPL_BOARD       0x042c
+
+/* cb4306 with SiGe PA */
+#define        PCSG94306_BOARD         0x042d
+
+/* bu4704 with sdram */
+#define        BU4704SD_BOARD          0x042e
+
+/* Dual 11a/11g Router */
+#define        BCM94704AGR_BOARD       0x042f
+
+/* 11a-only minipci */
+#define        BCM94308MP_BOARD        0x0430
+
+
+
+/* BCM94317 boards */
+#define BCM94317CB_BOARD       0x0440
+#define BCM94317MP_BOARD       0x0441
+#define BCM94317PCMCIA_BOARD   0x0442
+#define BCM94317SDIO_BOARD     0x0443
+
+#define BU4712_BOARD           0x0444
+
+/* BCM4712 boards */
+#define BCM94712AGR_BOARD      0x0445
+#define BCM94712AP_BOARD       0x0446
+
+/* BCM4702 boards */
+#define CT4702AP_BOARD         0x0447
+
+#endif /* _BCMDEVS_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmendian.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmendian.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmendian.h       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmendian.h  2005-08-28 11:12:20.431859000 +0200
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * local version of endian.h - byte order defines
+ ******************************************************************************/
+
+#ifndef _BCMENDIAN_H_
+#define _BCMENDIAN_H_
+
+#include <typedefs.h>
+
+/* Byte swap a 16 bit value */
+#define BCMSWAP16(val) \
+       ((uint16)( \
+               (((uint16)(val) & (uint16)0x00ffU) << 8) | \
+               (((uint16)(val) & (uint16)0xff00U) >> 8) ))
+       
+/* Byte swap a 32 bit value */
+#define BCMSWAP32(val) \
+       ((uint32)( \
+               (((uint32)(val) & (uint32)0x000000ffUL) << 24) | \
+               (((uint32)(val) & (uint32)0x0000ff00UL) <<  8) | \
+               (((uint32)(val) & (uint32)0x00ff0000UL) >>  8) | \
+               (((uint32)(val) & (uint32)0xff000000UL) >> 24) ))
+
+static INLINE uint16
+bcmswap16(uint16 val)
+{
+       return BCMSWAP16(val);
+}
+
+static INLINE uint32
+bcmswap32(uint32 val)
+{
+       return BCMSWAP32(val);
+}
+
+/* buf - start of buffer of shorts to swap */
+/* len  - byte length of buffer */
+static INLINE void
+bcmswap16_buf(uint16 *buf, uint len)
+{
+       len = len/2;
+
+       while(len--){
+               *buf = bcmswap16(*buf);
+               buf++;
+       }
+}
+
+#ifndef hton16
+#ifndef IL_BIGENDIAN
+#define HTON16(i) BCMSWAP16(i)
+#define        hton16(i) bcmswap16(i)
+#define        hton32(i) bcmswap32(i)
+#define        ntoh16(i) bcmswap16(i)
+#define        ntoh32(i) bcmswap32(i)
+#define ltoh16(i) (i)
+#define ltoh32(i) (i)
+#define htol16(i) (i)
+#define htol32(i) (i)
+#else
+#define HTON16(i) (i)
+#define        hton16(i) (i)
+#define        hton32(i) (i)
+#define        ntoh16(i) (i)
+#define        ntoh32(i) (i)
+#define        ltoh16(i) bcmswap16(i)
+#define        ltoh32(i) bcmswap32(i)
+#define htol16(i) bcmswap16(i)
+#define htol32(i) bcmswap32(i)
+#endif
+#endif
+
+#ifndef IL_BIGENDIAN
+#define ltoh16_buf(buf, i)
+#define htol16_buf(buf, i)
+#else
+#define ltoh16_buf(buf, i) bcmswap16_buf((uint16*)buf, i)
+#define htol16_buf(buf, i) bcmswap16_buf((uint16*)buf, i)
+#endif
+
+/*
+* load 16-bit value from unaligned little endian byte array.
+*/
+static INLINE uint16
+ltoh16_ua(uint8 *bytes)
+{
+       return (bytes[1]<<8)+bytes[0];
+}
+
+/*
+* load 32-bit value from unaligned little endian byte array.
+*/
+static INLINE uint32
+ltoh32_ua(uint8 *bytes)
+{
+       return (bytes[3]<<24)+(bytes[2]<<16)+(bytes[1]<<8)+bytes[0];
+}
+
+/*
+* load 16-bit value from unaligned big(network) endian byte array.
+*/
+static INLINE uint16
+ntoh16_ua(uint8 *bytes)
+{
+       return (bytes[0]<<8)+bytes[1];
+}
+
+/*
+* load 32-bit value from unaligned big(network) endian byte array.
+*/
+static INLINE uint32
+ntoh32_ua(uint8 *bytes)
+{
+       return (bytes[0]<<24)+(bytes[1]<<16)+(bytes[2]<<8)+bytes[3];
+}
+
+#endif /* _BCMENDIAN_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenet47xx.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenet47xx.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenet47xx.h     1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenet47xx.h        2005-08-28 11:12:20.432858848 +0200
@@ -0,0 +1,229 @@
+/*
+ * Hardware-specific definitions for
+ * Broadcom BCM47XX 10/100 Mbps Ethernet cores.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _bcmenet_47xx_h_
+#define        _bcmenet_47xx_h_
+
+#include <bcmdevs.h>
+#include <hnddma.h>
+
+#define        BCMENET_NFILTERS        64              /* # ethernet address filter entries */
+#define        BCMENET_MCHASHBASE      0x200           /* multicast hash filter base address */
+#define        BCMENET_MCHASHSIZE      256             /* multicast hash filter size in bytes */
+#define        BCMENET_MAX_DMA         4096            /* chip has 12 bits of DMA addressing */
+
+/* power management event wakeup pattern constants */
+#define        BCMENET_NPMP            4               /* chip supports 4 wakeup patterns */
+#define        BCMENET_PMPBASE         0x400           /* wakeup pattern base address */
+#define        BCMENET_PMPSIZE         0x80            /* 128bytes each pattern */
+#define        BCMENET_PMMBASE         0x600           /* wakeup mask base address */
+#define        BCMENET_PMMSIZE         0x10            /* 128bits each mask */
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif /* PAD */
+
+/* sometimes you just need the enet mib definitions */
+#include <bcmenetmib.h>
+
+/*
+ * Host Interface Registers
+ */
+typedef volatile struct _bcmenettregs {
+       /* Device and Power Control */
+       uint32  devcontrol;
+       uint32  PAD[2];
+       uint32  biststatus;
+       uint32  wakeuplength;
+       uint32  PAD[3];
+       
+       /* Interrupt Control */
+       uint32  intstatus;
+       uint32  intmask;
+       uint32  gptimer;
+       uint32  PAD[23];
+
+       /* Ethernet MAC Address Filtering Control */
+       uint32  PAD[2];
+       uint32  enetftaddr;
+       uint32  enetftdata;
+       uint32  PAD[2];
+
+       /* Ethernet MAC Control */
+       uint32  emactxmaxburstlen;
+       uint32  emacrxmaxburstlen;
+       uint32  emaccontrol;
+       uint32  emacflowcontrol;
+
+       uint32  PAD[20];
+
+       /* DMA Lazy Interrupt Control */
+       uint32  intrecvlazy;
+       uint32  PAD[63];
+
+       /* DMA engine */
+       dmaregs_t       dmaregs;
+       dmafifo_t       dmafifo;
+       uint32  PAD[116];
+
+       /* EMAC Registers */
+       uint32 rxconfig;
+       uint32 rxmaxlength;
+       uint32 txmaxlength;
+       uint32 PAD;
+       uint32 mdiocontrol;
+       uint32 mdiodata;
+       uint32 emacintmask;
+       uint32 emacintstatus;
+       uint32 camdatalo;
+       uint32 camdatahi;
+       uint32 camcontrol;
+       uint32 enetcontrol;
+       uint32 txcontrol;
+       uint32 txwatermark;
+       uint32 mibcontrol;
+       uint32 PAD[49];
+
+       /* EMAC MIB counters */
+       bcmenetmib_t    mib;
+
+       uint32  PAD[585];
+
+       /* Sonics SiliconBackplane config registers */
+       sbconfig_t      sbconfig;
+} bcmenetregs_t;
+
+/* device control */
+#define        DC_PM           ((uint32)1 << 7)        /* pattern filtering enable */
+#define        DC_IP           ((uint32)1 << 10)       /* internal ephy present (rev >= 1) */
+#define        DC_ER           ((uint32)1 << 15)       /* ephy reset */
+#define        DC_MP           ((uint32)1 << 16)       /* mii phy mode enable */
+#define        DC_CO           ((uint32)1 << 17)       /* mii phy mode: enable clocks */
+#define        DC_PA_MASK      0x7c0000                /* mii phy mode: mdc/mdio phy address */
+#define        DC_PA_SHIFT     18
+
+/* wakeup length */
+#define        WL_P0_MASK      0x7f                    /* pattern 0 */
+#define        WL_D0           ((uint32)1 << 7)
+#define        WL_P1_MASK      0x7f00                  /* pattern 1 */
+#define        WL_P1_SHIFT     8
+#define        WL_D1           ((uint32)1 << 15)
+#define        WL_P2_MASK      0x7f0000                /* pattern 2 */
+#define        WL_P2_SHIFT     16
+#define        WL_D2           ((uint32)1 << 23)
+#define        WL_P3_MASK      0x7f000000              /* pattern 3 */
+#define        WL_P3_SHIFT     24
+#define        WL_D3           ((uint32)1 << 31)
+
+/* intstatus and intmask */
+#define        I_PME           ((uint32)1 << 6)        /* power management event */
+#define        I_TO            ((uint32)1 << 7)        /* general purpose timeout */
+#define        I_PC            ((uint32)1 << 10)       /* descriptor error */
+#define        I_PD            ((uint32)1 << 11)       /* data error */
+#define        I_DE            ((uint32)1 << 12)       /* descriptor protocol error */
+#define        I_RU            ((uint32)1 << 13)       /* receive descriptor underflow */
+#define        I_RO            ((uint32)1 << 14)       /* receive fifo overflow */
+#define        I_XU            ((uint32)1 << 15)       /* transmit fifo underflow */
+#define        I_RI            ((uint32)1 << 16)       /* receive interrupt */
+#define        I_XI            ((uint32)1 << 24)       /* transmit interrupt */
+#define        I_EM            ((uint32)1 << 26)       /* emac interrupt */
+#define        I_MW            ((uint32)1 << 27)       /* mii write */
+#define        I_MR            ((uint32)1 << 28)       /* mii read */
+
+/* emaccontrol */
+#define        EMC_CG          ((uint32)1 << 0)        /* crc32 generation enable */
+#define        EMC_EP          ((uint32)1 << 2)        /* onchip ephy: powerdown (rev >= 1) */
+#define        EMC_ED          ((uint32)1 << 3)        /* onchip ephy: energy detected (rev >= 1) */
+#define        EMC_LC_MASK     0xe0                    /* onchip ephy: led control (rev >= 1) */
+#define        EMC_LC_SHIFT    5
+
+/* emacflowcontrol */
+#define        EMF_RFH_MASK    0xff                    /* rx fifo hi water mark */
+#define        EMF_PG          ((uint32)1 << 15)       /* enable pause frame generation */
+
+/* interrupt receive lazy */
+#define        IRL_TO_MASK     0x00ffffff              /* timeout */
+#define        IRL_FC_MASK     0xff000000              /* frame count */
+#define        IRL_FC_SHIFT    24                      /* frame count */
+
+/* emac receive config */
+#define        ERC_DB          ((uint32)1 << 0)        /* disable broadcast */
+#define        ERC_AM          ((uint32)1 << 1)        /* accept all multicast */
+#define        ERC_RDT         ((uint32)1 << 2)        /* receive disable while transmitting */
+#define        ERC_PE          ((uint32)1 << 3)        /* promiscuous enable */
+#define        ERC_LE          ((uint32)1 << 4)        /* loopback enable */
+#define        ERC_FE          ((uint32)1 << 5)        /* enable flow control */
+#define        ERC_UF          ((uint32)1 << 6)        /* accept unicast flow control frame */
+#define        ERC_RF          ((uint32)1 << 7)        /* reject filter */
+
+/* emac mdio control */
+#define        MC_MF_MASK      0x7f                    /* mdc frequency */
+#define        MC_PE           ((uint32)1 << 7)        /* mii preamble enable */
+
+/* emac mdio data */
+#define        MD_DATA_MASK    0xffff                  /* r/w data */
+#define        MD_TA_MASK      0x30000                 /* turnaround value */
+#define        MD_TA_SHIFT     16
+#define        MD_TA_VALID     (2 << MD_TA_SHIFT)      /* valid ta */
+#define        MD_RA_MASK      0x7c0000                /* register address */
+#define        MD_RA_SHIFT     18
+#define        MD_PMD_MASK     0xf800000               /* physical media device */
+#define        MD_PMD_SHIFT    23
+#define        MD_OP_MASK      0x30000000              /* opcode */
+#define        MD_OP_SHIFT     28
+#define        MD_OP_WRITE     (1 << MD_OP_SHIFT)      /* write op */
+#define        MD_OP_READ      (2 << MD_OP_SHIFT)      /* read op */
+#define        MD_SB_MASK      0xc0000000              /* start bits */
+#define        MD_SB_SHIFT     30
+#define        MD_SB_START     (0x1 << MD_SB_SHIFT)    /* start of frame */
+
+/* emac intstatus and intmask */
+#define        EI_MII          ((uint32)1 << 0)        /* mii mdio interrupt */
+#define        EI_MIB          ((uint32)1 << 1)        /* mib interrupt */
+#define        EI_FLOW         ((uint32)1 << 2)        /* flow control interrupt */
+
+/* emac cam data high */
+#define        CD_V            ((uint32)1 << 16)       /* valid bit */
+
+/* emac cam control */
+#define        CC_CE           ((uint32)1 << 0)        /* cam enable */
+#define        CC_MS           ((uint32)1 << 1)        /* mask select */
+#define        CC_RD           ((uint32)1 << 2)        /* read */
+#define        CC_WR           ((uint32)1 << 3)        /* write */
+#define        CC_INDEX_MASK   0x3f0000                /* index */
+#define        CC_INDEX_SHIFT  16
+#define        CC_CB           ((uint32)1 << 31)       /* cam busy */
+
+/* emac ethernet control */
+#define        EC_EE           ((uint32)1 << 0)        /* emac enable */
+#define        EC_ED           ((uint32)1 << 1)        /* emac disable */
+#define        EC_ES           ((uint32)1 << 2)        /* emac soft reset */
+#define        EC_EP           ((uint32)1 << 3)        /* external phy select */
+
+/* emac transmit control */
+#define        EXC_FD          ((uint32)1 << 0)        /* full duplex */
+#define        EXC_FM          ((uint32)1 << 1)        /* flowmode */
+#define        EXC_SB          ((uint32)1 << 2)        /* single backoff enable */
+#define        EXC_SS          ((uint32)1 << 3)        /* small slottime */
+
+/* emac mib control */
+#define        EMC_RZ          ((uint32)1 << 0)        /* autoclear on read */
+
+/* sometimes you just need the enet rxheader definitions */
+#include <bcmenetrxh.h>
+
+#endif /* _bcmenet_47xx_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetmib.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetmib.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetmib.h      1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetmib.h 2005-08-28 11:12:20.432858848 +0200
@@ -0,0 +1,81 @@
+/*
+ * Hardware-specific MIB definition for
+ * Broadcom Home Networking Division
+ * BCM44XX and BCM47XX 10/100 Mbps Ethernet cores.
+ * 
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _bcmenetmib_h_
+#define _bcmenetmib_h_
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif /* PAD */
+
+/*
+ * EMAC MIB Registers
+ */
+typedef volatile struct {
+       uint32 tx_good_octets;
+       uint32 tx_good_pkts;
+       uint32 tx_octets;
+       uint32 tx_pkts;
+       uint32 tx_broadcast_pkts;
+       uint32 tx_multicast_pkts;
+       uint32 tx_len_64;
+       uint32 tx_len_65_to_127;
+       uint32 tx_len_128_to_255;
+       uint32 tx_len_256_to_511;
+       uint32 tx_len_512_to_1023;
+       uint32 tx_len_1024_to_max;
+       uint32 tx_jabber_pkts;
+       uint32 tx_oversize_pkts;
+       uint32 tx_fragment_pkts;
+       uint32 tx_underruns;
+       uint32 tx_total_cols;
+       uint32 tx_single_cols;
+       uint32 tx_multiple_cols;
+       uint32 tx_excessive_cols;
+       uint32 tx_late_cols;
+       uint32 tx_defered;
+       uint32 tx_carrier_lost;
+       uint32 tx_pause_pkts;
+       uint32 PAD[8];
+
+       uint32 rx_good_octets;
+       uint32 rx_good_pkts;
+       uint32 rx_octets;
+       uint32 rx_pkts;
+       uint32 rx_broadcast_pkts;
+       uint32 rx_multicast_pkts;
+       uint32 rx_len_64;
+       uint32 rx_len_65_to_127;
+       uint32 rx_len_128_to_255;
+       uint32 rx_len_256_to_511;
+       uint32 rx_len_512_to_1023;
+       uint32 rx_len_1024_to_max;
+       uint32 rx_jabber_pkts;
+       uint32 rx_oversize_pkts;
+       uint32 rx_fragment_pkts;
+       uint32 rx_missed_pkts;
+       uint32 rx_crc_align_errs;
+       uint32 rx_undersize;
+       uint32 rx_crc_errs;
+       uint32 rx_align_errs;
+       uint32 rx_symbol_errs;
+       uint32 rx_pause_pkts;
+       uint32 rx_nonpause_pkts;
+} bcmenetmib_t;
+
+#endif /* _bcmenetmib_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetrxh.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetrxh.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmenetrxh.h      1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmenetrxh.h 2005-08-28 11:12:20.433858696 +0200
@@ -0,0 +1,43 @@
+/*
+ * Hardware-specific Receive Data Header for the
+ * Broadcom Home Networking Division
+ * BCM44XX and BCM47XX 10/100 Mbps Ethernet cores.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _bcmenetrxh_h_
+#define        _bcmenetrxh_h_
+
+/*
+ * The Ethernet MAC core returns an 8-byte Receive Frame Data Header
+ * with every frame consisting of
+ * 16bits of frame length, followed by
+ * 16bits of EMAC rx descriptor info, followed by 32bits of undefined.
+ */
+typedef volatile struct {
+       uint16  len;
+       uint16  flags;
+       uint16  pad[12];
+} bcmenetrxh_t;
+
+#define        RXHDR_LEN       28
+
+#define        RXF_L           ((uint16)1 << 11)       /* last buffer in a frame */
+#define        RXF_MISS        ((uint16)1 << 7)        /* received due to promisc mode */
+#define        RXF_BRDCAST     ((uint16)1 << 6)        /* dest is broadcast address */
+#define        RXF_MULT        ((uint16)1 << 5)        /* dest is multicast address */
+#define        RXF_LG          ((uint16)1 << 4)        /* frame length > rxmaxlength */
+#define        RXF_NO          ((uint16)1 << 3)        /* odd number of nibbles */
+#define        RXF_RXER        ((uint16)1 << 2)        /* receive symbol error */
+#define        RXF_CRC         ((uint16)1 << 1)        /* crc error */
+#define        RXF_OV          ((uint16)1 << 0)        /* fifo overflow */
+
+#endif /* _bcmenetrxh_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmnvram.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmnvram.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmnvram.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmnvram.h   2005-08-28 11:12:20.433858696 +0200
@@ -0,0 +1,131 @@
+/*
+ * NVRAM variable manipulation
+ *
+ * $Copyright Open Broadcom Corporation$
+ *
+ * $Id: bcmnvram.h,v 1.1.1.1 2004/01/21 03:50:44 gigis Exp $
+ */
+
+#ifndef _bcmnvram_h_
+#define _bcmnvram_h_
+
+#ifndef _LANGUAGE_ASSEMBLY
+
+#include <typedefs.h>
+
+struct nvram_header {
+       uint32 magic;
+       uint32 len;
+       uint32 crc_ver_init;    /* 0:7 crc, 8:15 ver, 16:27 init, mem. test 28, 29-31 reserved */
+       uint32 config_refresh;  /* 0:15 config, 16:31 refresh */
+       uint32 config_ncdl;     /* ncdl values for memc */
+};
+
+struct nvram_tuple {
+       char *name;
+       char *value;
+       struct nvram_tuple *next;
+};
+
+/*
+ * Initialize NVRAM access. May be unnecessary or undefined on certain
+ * platforms.
+ */
+extern int nvram_init(void *sbh);
+
+/*
+ * Disable NVRAM access. May be unnecessary or undefined on certain
+ * platforms.
+ */
+extern void nvram_exit(void);
+
+/*
+ * Get the value of an NVRAM variable. The pointer returned may be
+ * invalid after a set.
+ * @param      name    name of variable to get
+ * @return     value of variable or NULL if undefined
+ */
+extern char * nvram_get(const char *name);
+
+/* 
+ * Get the value of an NVRAM variable.
+ * @param      name    name of variable to get
+ * @return     value of variable or NUL if undefined
+ */
+#define nvram_safe_get(name) (nvram_get(name) ? : "")
+
+/*
+ * Match an NVRAM variable.
+ * @param      name    name of variable to match
+ * @param      match   value to compare against value of variable
+ * @return     TRUE if variable is defined and its value is string equal
+ *             to match or FALSE otherwise
+ */
+static INLINE int
+nvram_match(char *name, char *match) {
+       const char *value = nvram_get(name);
+       return (value && !strcmp(value, match));
+}
+
+/*
+ * Inversely match an NVRAM variable.
+ * @param      name    name of variable to match
+ * @param      match   value to compare against value of variable
+ * @return     TRUE if variable is defined and its value is not string
+ *             equal to invmatch or FALSE otherwise
+ */
+static INLINE int
+nvram_invmatch(char *name, char *invmatch) {
+       const char *value = nvram_get(name);
+       return (value && strcmp(value, invmatch));
+}
+
+/*
+ * Set the value of an NVRAM variable. The name and value strings are
+ * copied into private storage. Pointers to previously set values
+ * may become invalid. The new value may be immediately
+ * retrieved but will not be permanently stored until a commit.
+ * @param      name    name of variable to set
+ * @param      value   value of variable
+ * @return     0 on success and errno on failure
+ */
+extern int nvram_set(const char *name, const char *value);
+
+/*
+ * Unset an NVRAM variable. Pointers to previously set values
+ * remain valid until a set.
+ * @param      name    name of variable to unset
+ * @return     0 on success and errno on failure
+ * NOTE: use nvram_commit to commit this change to flash.
+ */
+extern int nvram_unset(const char *name);
+
+/*
+ * Commit NVRAM variables to permanent storage. All pointers to values
+ * may be invalid after a commit.
+ * NVRAM values are undefined after a commit.
+ * @return     0 on success and errno on failure
+ */
+extern int nvram_commit(void);
+
+/*
+ * Get all NVRAM variables (format name=value\0 ... \0\0).
+ * @param      buf     buffer to store variables
+ * @param      count   size of buffer in bytes
+ * @return     0 on success and errno on failure
+ */
+extern int nvram_getall(char *buf, int count);
+
+extern int kernel_write(unsigned char *buffer, int offset, int length);
+
+#endif /* _LANGUAGE_ASSEMBLY */
+
+#define NVRAM_MAGIC            0x48534C46      /* 'FLSH' */
+#define NVRAM_VERSION          1
+#define NVRAM_HEADER_SIZE      20
+#define NVRAM_LOC_GAP          0x100000
+#define NVRAM_SPACE            0x2000
+#define NVRAM_FIRST_LOC                (0xbfd00000 - NVRAM_SPACE)
+#define NVRAM_LAST_LOC         (0xc0000000 - NVRAM_SPACE)
+
+#endif /* _bcmnvram_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmsrom.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmsrom.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmsrom.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmsrom.h    2005-08-28 11:12:20.433858696 +0200
@@ -0,0 +1,24 @@
+/*
+ * Misc useful routines to access NIC srom
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef        _bcmsrom_h_
+#define        _bcmsrom_h_
+
+extern int srom_var_init(uint bus, void *curmap, void *osh, char **vars, int *count);
+
+extern int srom_read(uint bus, void *curmap, void *osh, uint byteoff, uint nbytes, uint16 *buf);
+extern int srom_write(uint bus, void *curmap, void *osh, uint byteoff, uint nbytes, uint16 *buf);
+extern int srom_parsecis(uint8 *cis, char **vars, int *count);
+          
+#endif /* _bcmsrom_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bcmutils.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmutils.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bcmutils.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bcmutils.h   2005-08-28 11:12:20.435858392 +0200
@@ -0,0 +1,136 @@
+/*
+ * Misc useful os-independent macros and functions.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _bcmutils_h_
+#define        _bcmutils_h_
+
+#ifndef MIN
+#define        MIN(a, b)               (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define        MAX(a, b)               (((a)>(b))?(a):(b))
+#endif
+
+#define CEIL(x, y)             (((x) + ((y)-1)) / (y))
+#define        ROUNDUP(x, y)           ((((ulong)(x)+((y)-1))/(y))*(y))
+#define        ISALIGNED(a, x)         (((uint)(a) & ((x)-1)) == 0)
+#define        ISPOWEROF2(x)           ((((x)-1)&(x))==0)
+#define        OFFSETOF(type, member)  ((uint) &((type *)0)->member)
+#define ARRAYSIZE(a)           (sizeof(a)/sizeof(a[0]))
+
+/* bit map related macros */
+#ifndef setbit
+#define        NBBY    8       /* 8 bits per byte */
+#define        setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
+#define        clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
+#define        isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
+#define        isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+#endif
+
+#define        NBITS(type)     (sizeof (type) * 8)
+
+#define _BCM_U 0x01    /* upper */
+#define _BCM_L 0x02    /* lower */
+#define _BCM_D 0x04    /* digit */
+#define _BCM_C 0x08    /* cntrl */
+#define _BCM_P 0x10    /* punct */
+#define _BCM_S 0x20    /* white space (space/lf/tab) */
+#define _BCM_X 0x40    /* hex digit */
+#define _BCM_SP        0x80    /* hard space (0x20) */
+
+extern unsigned char bcm_ctype[];
+#define bcm_ismask(x) (bcm_ctype[(int)(unsigned char)(x)])
+
+#define bcm_isalnum(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L|_BCM_D)) != 0)
+#define bcm_isalpha(c) ((bcm_ismask(c)&(_BCM_U|_BCM_L)) != 0)
+#define bcm_iscntrl(c) ((bcm_ismask(c)&(_BCM_C)) != 0)
+#define bcm_isdigit(c) ((bcm_ismask(c)&(_BCM_D)) != 0)
+#define bcm_isgraph(c) ((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D)) != 0)
+#define bcm_islower(c) ((bcm_ismask(c)&(_BCM_L)) != 0)
+#define bcm_isprint(c) ((bcm_ismask(c)&(_BCM_P|_BCM_U|_BCM_L|_BCM_D|_BCM_SP)) != 0)
+#define bcm_ispunct(c) ((bcm_ismask(c)&(_BCM_P)) != 0)
+#define bcm_isspace(c) ((bcm_ismask(c)&(_BCM_S)) != 0)
+#define bcm_isupper(c) ((bcm_ismask(c)&(_BCM_U)) != 0)
+#define bcm_isxdigit(c)        ((bcm_ismask(c)&(_BCM_D|_BCM_X)) != 0)
+
+/*
+ * Spin at most 'us' microseconds while 'exp' is true.
+ * Caller should explicitly test 'exp' when this completes
+ * and take appropriate error action if 'exp' is still true.
+ */
+#define SPINWAIT(exp, us) { \
+       uint countdown = (us) + 9; \
+       while ((exp) && (countdown >= 10)) {\
+               OSL_DELAY(10); \
+               countdown -= 10; \
+       } \
+}
+
+/* generic osl packet queue */
+struct pktq {
+       void *head;
+       void *tail;
+       uint  len;
+       uint  maxlen; 
+};
+#define DEFAULT_QLEN   128
+
+#define        pktq_len(q)             ((q)->len)
+#define        pktq_avail(q)   ((q)->maxlen - (q)->len)
+#define        pktq_head(q)    ((q)->head)
+#define        pktq_full(q)    ((q)->len >= (q)->maxlen)
+
+/* crc defines */
+#define CRC8_INIT_VALUE  0xff          /* Initial CRC8 checksum value */
+#define CRC8_GOOD_VALUE  0x9f          /* Good final CRC8 checksum value */
+#define CRC16_INIT_VALUE 0xffff                /* Initial CRC16 checksum value */
+#define CRC16_GOOD_VALUE 0xf0b8                /* Good final CRC16 checksum value */
+#define CRC32_INIT_VALUE 0xffffffff /* Initial CRC32 checksum value */
+#define CRC32_GOOD_VALUE 0xdebb20e3 /* Good final CRC32 checksum value */
+
+/* tag_ID/length/value_buffer tuple */
+typedef struct bcm_tlv {
+       uint8   id;
+       uint8   len;
+       uint8   data[1];
+} bcm_tlv_t;
+
+/* externs */
+extern uint bcm_atoi(char *s);
+extern uchar bcm_toupper(uchar c);
+extern ulong bcm_strtoul(char *cp, char **endp, uint base);
+extern void deadbeef(char *p, uint len);
+extern void prhex(char *msg, uchar *buf, uint len);
+extern void prpkt(char *msg, void *drv, void *p0);
+extern uint pktcopy(void *drv, void *p, uint offset, int len, uchar *buf);
+extern uint pkttotlen(void *drv, void *);
+extern uchar *bcm_ether_ntoa(char *ea, char *buf);
+extern int bcm_ether_atoe(char *p, char *ea);
+extern void bcm_mdelay(uint ms);
+extern char *getvar(char *vars, char *name);
+extern int getintvar(char *vars, char *name);
+
+extern uint8 crc8(uint8 *p, uint nbytes, uint8 crc);
+extern uint16 crc16(uint8 *p, uint nbytes, uint16 crc);
+extern uint32 crc32(uint8 *p, uint nbytes, uint32 crc);
+extern bcm_tlv_t *bcm_parse_tlvs(void *buf, int buflen, uint key);
+extern bcm_tlv_t *bcm_parse_ordered_tlvs(void *buf, int buflen, uint key);
+extern void pktqinit(struct pktq *q, int maxlen);
+extern void pktenq(struct pktq *q, void *p, bool lifo);
+extern void *pktdeq(struct pktq *q);
+
+#define        bcmlog(fmt, a1, a2)
+#define        bcmdumplog(buf, size)   *buf = '\0'
+
+#endif /* _bcmutils_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/bitfuncs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bitfuncs.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/bitfuncs.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/bitfuncs.h   2005-08-28 11:12:20.435858392 +0200
@@ -0,0 +1,85 @@
+/*
+ * bit manipulation utility functions
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _BITFUNCS_H
+#define _BITFUNCS_H
+
+#include <typedefs.h>
+
+/* local prototypes */
+static INLINE uint32 find_msbit(uint32 x);
+
+
+/*
+ * find_msbit: returns index of most significant set bit in x, with index
+ *   range defined as 0-31.  NOTE: returns zero if input is zero.
+ */
+
+#if defined(USE_PENTIUM_BSR) && defined(__GNUC__)
+
+/*
+ * Implementation for Pentium processors and gcc.  Note that this
+ * instruction is actually very slow on some processors (e.g., family 5,
+ * model 2, stepping 12, "Pentium 75 - 200"), so we use the generic
+ * implementation instead.
+ */
+static INLINE uint32 find_msbit(uint32 x)
+{
+       uint msbit;
+        __asm__("bsrl %1,%0"
+                :"=r" (msbit)
+                :"r" (x));
+        return msbit;
+}
+
+#else
+
+/*
+ * Generic Implementation
+ */
+
+#define DB_POW_MASK16  0xffff0000
+#define DB_POW_MASK8   0x0000ff00
+#define DB_POW_MASK4   0x000000f0
+#define DB_POW_MASK2   0x0000000c
+#define DB_POW_MASK1   0x00000002
+
+static INLINE uint32 find_msbit(uint32 x)
+{
+       uint32 temp_x = x;
+       uint msbit = 0;
+       if (temp_x & DB_POW_MASK16) {
+               temp_x >>= 16;
+               msbit = 16;
+       }
+       if (temp_x & DB_POW_MASK8) {
+               temp_x >>= 8;
+               msbit += 8;
+       }
+       if (temp_x & DB_POW_MASK4) {
+               temp_x >>= 4;
+               msbit += 4;
+       }
+       if (temp_x & DB_POW_MASK2) {
+               temp_x >>= 2;
+               msbit += 2;
+       }
+       if (temp_x & DB_POW_MASK1) {
+               msbit += 1;
+       }
+       return(msbit);
+}
+
+#endif
+
+#endif /* _BITFUNCS_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h    2005-08-28 11:12:20.435858392 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ *
+*/
+
+#ifndef _epivers_h_
+#define _epivers_h_
+
+#ifdef linux
+#include <linux/config.h>
+#endif
+
+/* Vendor Name, ASCII, 32 chars max */
+#ifdef COMPANYNAME
+#define        HPNA_VENDOR             COMPANYNAME
+#else
+#define        HPNA_VENDOR             "Broadcom Corporation"
+#endif
+
+/* Driver Date, ASCII, 32 chars max */
+#define HPNA_DRV_BUILD_DATE    __DATE__
+
+/* Hardware Manufacture Date, ASCII, 32 chars max */
+#define HPNA_HW_MFG_DATE       "Not Specified"
+
+/* See documentation for Device Type values, 32 values max */
+#ifndef        HPNA_DEV_TYPE
+
+#if    defined(CONFIG_BRCM_VJ)
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_DISPLAY }
+
+#elif  defined(CONFIG_BCRM_93725)
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_CM_BRIDGE, CDCF_V0_DEVICE_DISPLAY }
+
+#else
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_PCINIC }
+
+#endif
+
+#endif /* !HPNA_DEV_TYPE */
+
+
+#define        EPI_MAJOR_VERSION       1
+
+#define        EPI_MINOR_VERSION       1
+
+#define        EPI_RC_NUMBER           2
+
+#define        EPI_INCREMENTAL_NUMBER  0
+
+#define        EPI_BUILD_NUMBER        0
+
+#define        EPI_VERSION             1,1,2,0
+
+#define        EPI_VERSION_NUM         0x01010200
+
+/* Driver Version String, ASCII, 32 chars max */
+#define        EPI_VERSION_STR         "1.1.2.0"
+#define        EPI_ROUTER_VERSION_STR  "1.1.2.0"
+
+#endif /* _epivers_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h.in linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h.in
--- linux-2.6.12.5/arch/mips/bcm947xx/include/epivers.h.in      1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/epivers.h.in 2005-08-28 11:12:20.436858240 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ *
+*/
+
+#ifndef _epivers_h_
+#define _epivers_h_
+
+#ifdef linux
+#include <linux/config.h>
+#endif
+
+/* Vendor Name, ASCII, 32 chars max */
+#ifdef COMPANYNAME
+#define        HPNA_VENDOR             COMPANYNAME
+#else
+#define        HPNA_VENDOR             "Broadcom Corporation"
+#endif
+
+/* Driver Date, ASCII, 32 chars max */
+#define HPNA_DRV_BUILD_DATE    __DATE__
+
+/* Hardware Manufacture Date, ASCII, 32 chars max */
+#define HPNA_HW_MFG_DATE       "Not Specified"
+
+/* See documentation for Device Type values, 32 values max */
+#ifndef        HPNA_DEV_TYPE
+
+#if    defined(CONFIG_BRCM_VJ)
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_DISPLAY }
+
+#elif  defined(CONFIG_BCRM_93725)
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_CM_BRIDGE, CDCF_V0_DEVICE_DISPLAY }
+
+#else
+#define HPNA_DEV_TYPE          { CDCF_V0_DEVICE_PCINIC }
+
+#endif
+
+#endif /* !HPNA_DEV_TYPE */
+
+
+#define        EPI_MAJOR_VERSION       @EPI_MAJOR_VERSION@
+
+#define        EPI_MINOR_VERSION       @EPI_MINOR_VERSION@
+
+#define        EPI_RC_NUMBER           @EPI_RC_NUMBER@
+
+#define        EPI_INCREMENTAL_NUMBER  @EPI_INCREMENTAL_NUMBER@
+
+#define        EPI_BUILD_NUMBER        @EPI_BUILD_NUMBER@
+
+#define        EPI_VERSION             @EPI_VERSION@
+
+#define        EPI_VERSION_NUM         @EPI_VERSION_NUM@
+
+/* Driver Version String, ASCII, 32 chars max */
+#define        EPI_VERSION_STR         "@EPI_VERSION_STR@"
+#define        EPI_ROUTER_VERSION_STR  "@EPI_ROUTER_VERSION_STR@"
+
+#endif /* _epivers_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/etsockio.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/etsockio.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/etsockio.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/etsockio.h   2005-08-28 11:12:20.436858240 +0200
@@ -0,0 +1,60 @@
+/*
+ * Driver-specific socket ioctls
+ * used by BSD, Linux, and PSOS
+ * Broadcom BCM44XX 10/100Mbps Ethernet Device Driver
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ *
+ * $Id$
+ */
+
+#ifndef _etsockio_h_
+#define _etsockio_h_
+
+/* THESE MUST BE CONTIGUOUS AND CONSISTENT WITH VALUES IN ETC.H */
+
+
+#if defined(linux)
+#define SIOCSETCUP             (SIOCDEVPRIVATE + 0)
+#define SIOCSETCDOWN           (SIOCDEVPRIVATE + 1)
+#define SIOCSETCLOOP           (SIOCDEVPRIVATE + 2)
+#define SIOCGETCDUMP           (SIOCDEVPRIVATE + 3)
+#define SIOCSETCSETMSGLEVEL    (SIOCDEVPRIVATE + 4)
+#define SIOCSETCPROMISC                (SIOCDEVPRIVATE + 5)
+#define SIOCSETCTXDOWN         (SIOCDEVPRIVATE + 6)    /* obsolete */
+#define SIOCSETCSPEED          (SIOCDEVPRIVATE + 7)
+#define SIOCTXGEN              (SIOCDEVPRIVATE + 8)
+#define SIOCGETCPHYRD          (SIOCDEVPRIVATE + 9)
+#define SIOCSETCPHYWR          (SIOCDEVPRIVATE + 10)
+#define SIOCPERF                   (SIOCDEVPRIVATE + 11)
+#define SIOCPERFDMA                (SIOCDEVPRIVATE + 12)
+
+#else  /* !linux */
+
+#define SIOCSETCUP             _IOWR('e', 130 + 0, struct ifreq)
+#define SIOCSETCDOWN           _IOWR('e', 130 + 1, struct ifreq)
+#define SIOCSETCLOOP           _IOWR('e', 130 + 2, struct ifreq)
+#define SIOCGETCDUMP           _IOWR('e', 130 + 3, struct ifreq)
+#define SIOCSETCSETMSGLEVEL    _IOWR('e', 130 + 4, struct ifreq)
+#define SIOCSETCPROMISC                _IOWR('e', 130 + 5, struct ifreq)
+#define SIOCSETCTXDOWN         _IOWR('e', 130 + 6, struct ifreq)       /* obsolete */
+#define SIOCSETCSPEED          _IOWR('e', 130 + 7, struct ifreq)
+#define SIOCTXGEN              _IOWR('e', 130 + 8, struct ifreq)
+
+#endif
+
+/* arg to SIOCTXGEN */
+struct txg {
+       uint32 num;             /* number of frames to send */
+       uint32 delay;           /* delay in microseconds between sending each */
+       uint32 size;            /* size of ether frame to send */
+       uchar buf[1514];        /* starting ether frame data */
+};
+
+#endif
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flash.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flash.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/flash.h   1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flash.h      2005-08-28 11:12:20.437858088 +0200
@@ -0,0 +1,184 @@
+/*
+ * flash.h: Common definitions for flash access.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ *
+ * $Id$
+ */
+
+/* Types of flashes we know about */
+typedef enum _flash_type {OLD, BSC, SCS, AMD, SST} flash_type_t;
+
+/* Commands to write/erase the flases */
+typedef struct _flash_cmds{
+       flash_type_t    type;
+       bool            need_unlock;
+       uint16          pre_erase;
+       uint16          erase_block;
+       uint16          erase_chip;
+       uint16          write_word;
+       uint16          write_buf;
+       uint16          clear_csr;
+       uint16          read_csr;
+       uint16          read_id;
+       uint16          confirm;
+       uint16          read_array;
+} flash_cmds_t;
+
+#define        UNLOCK_CMD_WORDS        2
+
+typedef struct _unlock_cmd {
+  uint         addr[UNLOCK_CMD_WORDS];
+  uint16       cmd[UNLOCK_CMD_WORDS];
+} unlock_cmd_t;
+
+/* Flash descriptors */
+typedef struct _flash_desc {
+       uint16          mfgid;          /* Manufacturer Id */
+       uint16          devid;          /* Device Id */
+       uint            size;           /* Total size in bytes */
+       uint            width;          /* Device width in bytes */
+       flash_type_t    type;           /* Device type old, S, J */
+       uint            bsize;          /* Block size */
+       uint            nb;             /* Number of blocks */
+       uint            ff;             /* First full block */
+       uint            lf;             /* Last full block */
+       uint            nsub;           /* Number of subblocks */
+       uint            *subblocks;     /* Offsets for subblocks */
+       char            *desc;          /* Description */
+} flash_desc_t;
+
+
+#ifdef DECLARE_FLASHES
+
+flash_cmds_t flash_cmds[] = {
+/*       type  needu   preera  eraseb  erasech write   wbuf    clcsr   rdcsr   rdid    confrm  read */
+       { BSC,  0,      0x00,   0x20,   0x00,   0x40,   0x00,   0x50,   0x70,   0x90,   0xd0,   0xff },
+       { SCS,  0,      0x00,   0x20,   0x00,   0x40,   0xe8,   0x50,   0x70,   0x90,   0xd0,   0xff },
+       { AMD,  1,      0x80,   0x30,   0x10,   0xa0,   0x00,   0x00,   0x00,   0x90,   0x00,   0xf0 },
+       { SST,  1,      0x80,   0x50,   0x10,   0xa0,   0x00,   0x00,   0x00,   0x90,   0x00,   0xf0 },
+       { 0 }
+};
+
+unlock_cmd_t unlock_cmd_amd = {
+#ifdef MIPSEB
+/* addr: */    { 0x0aa8,       0x0556},
+#else
+/* addr: */    { 0x0aaa,       0x0554},
+#endif
+/* data: */    { 0xaa,         0x55}
+};
+
+unlock_cmd_t unlock_cmd_sst = {
+#ifdef MIPSEB
+/* addr: */    { 0xaaa8,       0x5556},
+#else
+/* addr: */    { 0xaaaa,       0x5554},
+#endif
+/* data: */    { 0xaa,         0x55}
+};
+
+#define AMD_CMD 0xaaa
+#define SST_CMD 0xaaaa
+
+/* intel unlock block cmds */
+#define INTEL_UNLOCK1  0x60
+#define INTEL_UNLOCK2  0xD0
+
+/* Just eight blocks of 8KB byte each */
+
+uint blk8x8k[] = { 0x00000000,
+                  0x00002000,
+                  0x00004000,
+                  0x00006000,
+                  0x00008000,
+                  0x0000a000,
+                  0x0000c000,
+                  0x0000e000,
+                  0x00010000
+};
+
+/* Funky AMD arrangement for 29xx800's */
+uint amd800[] = { 0x00000000,          /* 16KB */
+                 0x00004000,           /* 32KB */
+                 0x0000c000,           /* 8KB */
+                 0x0000e000,           /* 8KB */
+                 0x00010000,           /* 8KB */
+                 0x00012000,           /* 8KB */
+                 0x00014000,           /* 32KB */
+                 0x0001c000,           /* 16KB */
+                 0x00020000
+};
+
+/* AMD arrangement for 29xx160's */
+uint amd4112[] = { 0x00000000,         /* 32KB */
+                  0x00008000,          /* 8KB */
+                  0x0000a000,          /* 8KB */
+                  0x0000c000,          /* 16KB */
+                  0x00010000
+};
+uint amd2114[] = { 0x00000000,         /* 16KB */
+                  0x00004000,          /* 8KB */
+                  0x00006000,          /* 8KB */
+                  0x00008000,          /* 32KB */
+                  0x00010000
+};
+
+
+
+flash_desc_t flashes[] = {
+       { 0x00b0, 0x00d0, 0x0200000, 2, SCS, 0x10000, 32,  0, 31,  0, NULL,    "Intel 28F160S3/5 1Mx16" },
+       { 0x00b0, 0x00d4, 0x0400000, 2, SCS, 0x10000, 64,  0, 63,  0, NULL,    "Intel 28F320S3/5 2Mx16" },
+       { 0x0089, 0x8890, 0x0200000, 2, BSC, 0x10000, 32,  0, 30,  8, blk8x8k, "Intel 28F160B3 1Mx16 TopB" },
+       { 0x0089, 0x8891, 0x0200000, 2, BSC, 0x10000, 32,  1, 31,  8, blk8x8k, "Intel 28F160B3 1Mx16 BotB" },
+       { 0x0089, 0x8896, 0x0400000, 2, BSC, 0x10000, 64,  0, 62,  8, blk8x8k, "Intel 28F320B3 2Mx16 TopB" },
+       { 0x0089, 0x8897, 0x0400000, 2, BSC, 0x10000, 64,  1, 63,  8, blk8x8k, "Intel 28F320B3 2Mx16 BotB" },
+       { 0x0089, 0x8898, 0x0800000, 2, BSC, 0x10000, 128, 0, 126, 8, blk8x8k, "Intel 28F640B3 4Mx16 TopB" },
+       { 0x0089, 0x8899, 0x0800000, 2, BSC, 0x10000, 128, 1, 127, 8, blk8x8k, "Intel 28F640B3 4Mx16 BotB" },
+       { 0x0089, 0x88C2, 0x0200000, 2, BSC, 0x10000, 32,  0, 30,  8, blk8x8k, "Intel 28F160C3 1Mx16 TopB" },
+       { 0x0089, 0x88C3, 0x0200000, 2, BSC, 0x10000, 32,  1, 31,  8, blk8x8k, "Intel 28F160C3 1Mx16 BotB" },
+       { 0x0089, 0x88C4, 0x0400000, 2, BSC, 0x10000, 64,  0, 62,  8, blk8x8k, "Intel 28F320C3 2Mx16 TopB" },
+       { 0x0089, 0x88C5, 0x0400000, 2, BSC, 0x10000, 64,  1, 63,  8, blk8x8k, "Intel 28F320C3 2Mx16 BotB" },
+       { 0x0089, 0x88CC, 0x0800000, 2, BSC, 0x10000, 128, 0, 126, 8, blk8x8k, "Intel 28F640C3 4Mx16 TopB" },
+       { 0x0089, 0x88CD, 0x0800000, 2, BSC, 0x10000, 128, 1, 127, 8, blk8x8k, "Intel 28F640C3 4Mx16 BotB" },
+       { 0x0089, 0x0014, 0x0400000, 2, SCS, 0x20000, 32,  0, 31,  0, NULL,    "Intel 28F320J5 2Mx16" },
+       { 0x0089, 0x0015, 0x0800000, 2, SCS, 0x20000, 64,  0, 63,  0, NULL,    "Intel 28F640J5 4Mx16" },
+       { 0x0089, 0x0016, 0x0400000, 2, SCS, 0x20000, 32,  0, 31,  0, NULL,    "Intel 28F320J3 2Mx16" },
+       { 0x0089, 0x0017, 0x0800000, 2, SCS, 0x20000, 64,  0, 63,  0, NULL,    "Intel 28F640J3 4Mx16" },
+       { 0x0089, 0x0018, 0x1000000, 2, SCS, 0x20000, 128, 0, 127, 0, NULL,    "Intel 28F128J3 8Mx16" },
+       { 0x00b0, 0x00e3, 0x0400000, 2, BSC, 0x10000, 64,  1, 63,  8, blk8x8k, "Sharp 28F320BJE 2Mx16 BotB" },
+       { 0x0001, 0x224a, 0x0100000, 2, AMD, 0x10000, 16,  0, 13,  8, amd800,  "AMD 29DL800BT 512Kx16 TopB" },
+       { 0x0001, 0x22cb, 0x0100000, 2, AMD, 0x10000, 16,  2, 15,  8, amd800,  "AMD 29DL800BB 512Kx16 BotB" },
+       { 0x0001, 0x22c4, 0x0200000, 2, AMD, 0x10000, 32,  0, 30,  4, amd2114, "AMD 29lv160DT 1Mx16 TopB" },
+       { 0x0001, 0x2249, 0x0200000, 2, AMD, 0x10000, 32,  1, 31,  4, amd4112, "AMD 29lv160DB 1Mx16 BotB" },
+       { 0x0001, 0x22f6, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  8, blk8x8k, "AMD 29lv320DT 2Mx16 TopB" },
+       { 0x0001, 0x22f9, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  8, blk8x8k, "AMD 29lv320DB 2Mx16 BotB" },
+       { 0x0001, 0x2201, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  8, blk8x8k, "AMD 29lv320MT 2Mx16 TopB" },
+       { 0x0001, 0x2200, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  8, blk8x8k, "AMD 29lv320MB 2Mx16 BotB" },
+       { 0x0020, 0x22CA, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  4, amd4112, "ST 29w320DT 2Mx16 TopB" },
+       { 0x0020, 0x22CB, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  4, amd2114, "ST 29w320DB 2Mx16 BotB" },
+       { 0x00C2, 0x00A7, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  4, amd4112, "MX29LV320T 2Mx16 TopB" },
+       { 0x00C2, 0x00A8, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  4, amd2114, "MX29LV320B 2Mx16 BotB" },
+       { 0x0004, 0x22F6, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  4, amd4112, "MBM29LV320TE 2Mx16 TopB" },
+       { 0x0004, 0x22F9, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  4, amd2114, "MBM29LV320BE 2Mx16 BotB" },
+       { 0x0098, 0x009A, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  4, amd4112, "TC58FVT321 2Mx16 TopB" },
+       { 0x0098, 0x009C, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  4, amd2114, "TC58FVB321 2Mx16 BotB" }, 
+       { 0x00C2, 0x22A7, 0x0400000, 2, AMD, 0x10000, 64,  0, 62,  4, amd4112, "MX29LV320T 2Mx16 TopB" },
+       { 0x00C2, 0x22A8, 0x0400000, 2, AMD, 0x10000, 64,  1, 63,  4, amd2114, "MX29LV320B 2Mx16 BotB" },
+       { 0x00BF, 0x2783, 0x0400000, 2, SST, 0x10000, 64,  0, 63,  0, NULL,    "SST39VF320 2Mx16" },
+       { 0,      0,      0,         0, OLD, 0,       0,   0, 0,   0, NULL,    NULL },
+};
+
+#else
+
+extern flash_cmds_t flash_cmds[];
+extern unlock_cmd_t unlock_cmd;
+extern flash_desc_t flashes[];
+
+#endif
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/flashutl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flashutl.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/flashutl.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/flashutl.h   2005-08-28 11:12:20.437858088 +0200
@@ -0,0 +1,34 @@
+/*
+ * BCM47XX FLASH driver interface
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _flashutl_h_
+#define _flashutl_h_
+
+#define FLASH_BASE      0xbfc00000             /* BCM4710 */
+
+int    flash_init(void* base_addr, char *flash_str);
+int    flash_erase(void);
+int    flash_eraseblk(unsigned long off);
+int    flash_write(unsigned long off, uint16 *src, uint nbytes);
+unsigned long  flash_block_base(unsigned long off);
+unsigned long  flash_block_lim(unsigned long off);
+int FlashWriteRange(unsigned short* dst, unsigned short* src, unsigned int numbytes);
+
+void nvWrite(unsigned short *data, unsigned int len);
+
+/* Global vars */
+extern char*           flashutl_base;
+extern flash_desc_t*   flashutl_desc;
+extern flash_cmds_t*   flashutl_cmd;
+
+#endif /* _flashutl_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hnddma.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hnddma.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/hnddma.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hnddma.h     2005-08-28 11:12:20.438857936 +0200
@@ -0,0 +1,181 @@
+/*
+ * Generic Broadcom Home Networking Division (HND) DMA engine definitions.
+ * This supports the following chips: BCM42xx, 44xx, 47xx .
+ *
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ */
+
+#ifndef        _hnddma_h_
+#define        _hnddma_h_
+
+/*
+ * Each DMA processor consists of a transmit channel and a receive channel.
+ */
+typedef volatile struct {
+       /* transmit channel */
+       uint32  xmtcontrol;                     /* enable, et al */
+       uint32  xmtaddr;                        /* descriptor ring base address (4K aligned) */
+       uint32  xmtptr;                         /* last descriptor posted to chip */
+       uint32  xmtstatus;                      /* current active descriptor, et al */
+
+       /* receive channel */
+       uint32  rcvcontrol;                     /* enable, et al */
+       uint32  rcvaddr;                        /* descriptor ring base address (4K aligned) */
+       uint32  rcvptr;                         /* last descriptor posted to chip */
+       uint32  rcvstatus;                      /* current active descriptor, et al */
+} dmaregs_t;
+
+typedef volatile struct {
+       /* diag access */
+       uint32  fifoaddr;                       /* diag address */
+       uint32  fifodatalow;                    /* low 32bits of data */
+       uint32  fifodatahigh;                   /* high 32bits of data */
+       uint32  pad;                            /* reserved */
+} dmafifo_t;
+
+/* transmit channel control */
+#define        XC_XE           ((uint32)1 << 0)        /* transmit enable */
+#define        XC_SE           ((uint32)1 << 1)        /* transmit suspend request */
+#define        XC_LE           ((uint32)1 << 2)        /* loopback enable */
+#define        XC_FL           ((uint32)1 << 4)        /* flush request */
+
+/* transmit descriptor table pointer */
+#define        XP_LD_MASK      0xfff                   /* last valid descriptor */
+
+/* transmit channel status */
+#define        XS_CD_MASK      0x0fff                  /* current descriptor pointer */
+#define        XS_XS_MASK      0xf000                  /* transmit state */
+#define        XS_XS_SHIFT     12
+#define        XS_XS_DISABLED  0x0000                  /* disabled */
+#define        XS_XS_ACTIVE    0x1000                  /* active */
+#define        XS_XS_IDLE      0x2000                  /* idle wait */
+#define        XS_XS_STOPPED   0x3000                  /* stopped */
+#define        XS_XS_SUSP      0x4000                  /* suspend pending */
+#define        XS_XE_MASK      0xf0000                 /* transmit errors */
+#define        XS_XE_SHIFT     16
+#define        XS_XE_NOERR     0x00000                 /* no error */
+#define        XS_XE_DPE       0x10000                 /* descriptor protocol error */
+#define        XS_XE_DFU       0x20000                 /* data fifo underrun */
+#define        XS_XE_BEBR      0x30000                 /* bus error on buffer read */
+#define        XS_XE_BEDA      0x40000                 /* bus error on descriptor access */
+#define        XS_FL           ((uint32)1 << 20)       /* flushed */
+
+/* receive channel control */
+#define        RC_RE           ((uint32)1 << 0)        /* receive enable */
+#define        RC_RO_MASK      0xfe                    /* receive frame offset */
+#define        RC_RO_SHIFT     1
+#define        RC_FM           ((uint32)1 << 8)        /* direct fifo receive (pio) mode */
+
+/* receive descriptor table pointer */
+#define        RP_LD_MASK      0xfff                   /* last valid descriptor */
+
+/* receive channel status */
+#define        RS_CD_MASK      0x0fff                  /* current descriptor pointer */
+#define        RS_RS_MASK      0xf000                  /* receive state */
+#define        RS_RS_SHIFT     12
+#define        RS_RS_DISABLED  0x0000                  /* disabled */
+#define        RS_RS_ACTIVE    0x1000                  /* active */
+#define        RS_RS_IDLE      0x2000                  /* idle wait */
+#define        RS_RS_STOPPED   0x3000                  /* reserved */
+#define        RS_RE_MASK      0xf0000                 /* receive errors */
+#define        RS_RE_SHIFT     16
+#define        RS_RE_NOERR     0x00000                 /* no error */
+#define        RS_RE_DPE       0x10000                 /* descriptor protocol error */
+#define        RS_RE_DFO       0x20000                 /* data fifo overflow */
+#define        RS_RE_BEBW      0x30000                 /* bus error on buffer write */
+#define        RS_RE_BEDA      0x40000                 /* bus error on descriptor access */
+
+/* fifoaddr */
+#define        FA_OFF_MASK     0xffff                  /* offset */
+#define        FA_SEL_MASK     0xf0000                 /* select */
+#define        FA_SEL_SHIFT    16
+#define        FA_SEL_XDD      0x00000                 /* transmit dma data */
+#define        FA_SEL_XDP      0x10000                 /* transmit dma pointers */
+#define        FA_SEL_RDD      0x40000                 /* receive dma data */
+#define        FA_SEL_RDP      0x50000                 /* receive dma pointers */
+#define        FA_SEL_XFD      0x80000                 /* transmit fifo data */
+#define        FA_SEL_XFP      0x90000                 /* transmit fifo pointers */
+#define        FA_SEL_RFD      0xc0000                 /* receive fifo data */
+#define        FA_SEL_RFP      0xd0000                 /* receive fifo pointers */
+
+/*
+ * DMA Descriptor
+ * Descriptors are only read by the hardware, never written back.
+ */
+typedef volatile struct {
+       uint32  ctrl;           /* misc control bits & bufcount */
+       uint32  addr;           /* data buffer address */
+} dmadd_t;
+
+/*
+ * Each descriptor ring must be 4096byte aligned
+ * and fit within a single 4096byte page.
+ */
+#define        DMAMAXRINGSZ    4096
+#define        DMARINGALIGN    4096
+
+/* control flags */
+#define        CTRL_BC_MASK    0x1fff                  /* buffer byte count */
+#define        CTRL_EOT        ((uint32)1 << 28)       /* end of descriptor table */
+#define        CTRL_IOC        ((uint32)1 << 29)       /* interrupt on completion */
+#define        CTRL_EOF        ((uint32)1 << 30)       /* end of frame */
+#define        CTRL_SOF        ((uint32)1 << 31)       /* start of frame */
+
+/* control flags in the range [27:20] are core-specific and not defined here */
+#define        CTRL_CORE_MASK  0x0ff00000
+
+/* export structure */
+typedef volatile struct {
+       /* rx error counters */
+       uint            rxgiants;       /* rx giant frames */
+       uint            rxnobuf;        /* rx out of dma descriptors */
+       /* tx error counters */
+       uint            txnobuf;        /* tx out of dma descriptors */
+} hnddma_t;
+
+#ifndef di_t
+#define        di_t    void
+#endif
+
+/* externs */
+extern void *dma_attach(void *drv, void *dev, char *name, dmaregs_t *dmaregs,
+       uint ntxd, uint nrxd, uint rxbufsize, uint nrxpost, uint rxoffset,
+       uint ddoffset, uint dataoffset, uint *msg_level);
+extern void dma_detach(di_t *di);
+extern void dma_txreset(di_t *di);
+extern void dma_rxreset(di_t *di);
+extern void dma_txinit(di_t *di);
+extern bool dma_txenabled(di_t *di);
+extern void dma_rxinit(di_t *di);
+extern void dma_rxenable(di_t *di);
+extern bool dma_rxenabled(di_t *di);
+extern void dma_txsuspend(di_t *di);
+extern void dma_txresume(di_t *di);
+extern bool dma_txsuspended(di_t *di);
+extern bool dma_txstopped(di_t *di);
+extern bool dma_rxstopped(di_t *di);
+extern int dma_txfast(di_t *di, void *p, uint32 coreflags);
+extern int dma_tx(di_t *di, void *p, uint32 coreflags);
+extern void dma_fifoloopbackenable(di_t *di);
+extern void *dma_rx(di_t *di);
+extern void dma_rxfill(di_t *di);
+extern void dma_txreclaim(di_t *di, bool forceall);
+extern void dma_rxreclaim(di_t *di);
+extern char *dma_dump(di_t *di, char *buf);
+extern char *dma_dumptx(di_t *di, char *buf);
+extern char *dma_dumprx(di_t *di, char *buf);
+extern uint dma_getvar(di_t *di, char *name);
+extern void *dma_getnexttxp(di_t *di, bool forceall);
+extern void *dma_getnextrxp(di_t *di, bool forceall);
+extern void dma_txblock(di_t *di);
+extern void dma_txunblock(di_t *di);
+extern uint dma_txactive(di_t *di);
+
+#endif /* _hnddma_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/hndmips.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hndmips.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/hndmips.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/hndmips.h    2005-08-28 11:12:20.439857784 +0200
@@ -0,0 +1,16 @@
+/*
+ * Alternate include file for HND sbmips.h since CFE also ships with
+ * a sbmips.h.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#include "sbmips.h"
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linux_osl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linux_osl.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/linux_osl.h       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linux_osl.h  2005-08-28 11:12:20.440857632 +0200
@@ -0,0 +1,313 @@
+/*
+ * Linux OS Independent Layer
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef _linux_osl_h_
+#define _linux_osl_h_
+
+#include <typedefs.h>
+
+/* use current 2.4.x calling conventions */
+#include <linuxver.h>
+
+/* assert and panic */
+#define        ASSERT(exp)             do {} while (0)
+
+/* PCMCIA attribute space access macros */
+#define        OSL_PCMCIA_READ_ATTR(osh, offset, buf, size) \
+       osl_pcmcia_read_attr((osh), (offset), (buf), (size))
+#define        OSL_PCMCIA_WRITE_ATTR(osh, offset, buf, size) \
+       osl_pcmcia_write_attr((osh), (offset), (buf), (size))
+extern void osl_pcmcia_read_attr(void *osh, uint offset, void *buf, int size);
+extern void osl_pcmcia_write_attr(void *osh, uint offset, void *buf, int size);
+
+/* PCI configuration space access macros */
+#define        OSL_PCI_READ_CONFIG(loc, offset, size) \
+       osl_pci_read_config((loc), (offset), (size))
+#define        OSL_PCI_WRITE_CONFIG(loc, offset, size, val) \
+       osl_pci_write_config((loc), (offset), (size), (val))
+extern uint32 osl_pci_read_config(void *loc, uint size, uint offset);
+extern void osl_pci_write_config(void *loc, uint offset, uint size, uint val);
+
+/* OSL initialization */
+#define osl_init()             do {} while (0)
+
+/* host/bus architecture-specific byte swap */
+#define BUS_SWAP32(v)          (v)
+
+/*
+ * BINOSL selects the slightly slower function-call-based binary compatible osl.
+ * Macros expand to calls to functions defined in linux_osl.c .
+ */
+#ifndef BINOSL
+
+/* string library, kernel mode */
+#define        printf(fmt, args...)    printk(fmt, ## args)
+#include <linux/kernel.h>
+#include <linux/string.h>
+
+/* register access macros */
+#define R_REG(r) ({ \
+       __typeof(*(r)) __osl_v; \
+       switch (sizeof(*(r))) { \
+       case sizeof(uint8):     __osl_v = readb((volatile uint8*)(r)); break; \
+       case sizeof(uint16):    __osl_v = readw((volatile uint16*)(r)); break; \
+       case sizeof(uint32):    __osl_v = readl((volatile uint32*)(r)); break; \
+       } \
+       __osl_v; \
+})
+#define W_REG(r, v) do { \
+       switch (sizeof(*(r))) { \
+       case sizeof(uint8):     writeb((uint8)(v), (volatile uint8*)(r)); break; \
+       case sizeof(uint16):    writew((uint16)(v), (volatile uint16*)(r)); break; \
+       case sizeof(uint32):    writel((uint32)(v), (volatile uint32*)(r)); break; \
+       } \
+} while (0)
+
+#define        AND_REG(r, v)           W_REG((r), R_REG(r) & (v))
+#define        OR_REG(r, v)            W_REG((r), R_REG(r) | (v))
+
+/* bcopy, bcmp, and bzero */
+#define        bcopy(src, dst, len)    memcpy((dst), (src), (len))
+#define        bcmp(b1, b2, len)       memcmp((b1), (b2), (len))
+#define        bzero(b, len)           memset((b), '\0', (len))
+
+/* general purpose memory allocation */
+#define        MALLOC(size)            kmalloc((size), GFP_ATOMIC)
+#define        MFREE(addr, size)       kfree((addr))
+
+/* uncached virtual address */
+#ifdef mips
+#define OSL_UNCACHED(va)       KSEG1ADDR((va))
+#include <asm/addrspace.h>
+#else
+#define OSL_UNCACHED(va)       (va)
+#endif
+
+/* get processor cycle count */
+#if defined(mips)
+#define        OSL_GETCYCLES(x)        ((x) = read_c0_count() * 2)
+#elif defined(__i386__)
+#define        OSL_GETCYCLES(x)        rdtscl((x))
+#else
+#define OSL_GETCYCLES(x)       ((x) = 0)
+#endif
+
+/* dereference an address that may cause a bus exception */
+#ifdef mips
+#if defined(MODULE) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,17))
+#define BUSPROBE(val, addr)    panic("get_dbe() will not fixup a bus exception when compiled into a module")
+#else
+#define        BUSPROBE(val, addr)     get_dbe((val), (addr))
+#include <asm/paccess.h>
+#endif
+#else
+#define        BUSPROBE(val, addr)     ({ (val) = R_REG((addr)); 0; })
+#endif
+
+/* map/unmap physical to virtual I/O */
+#define        REG_MAP(pa, size)       ioremap_nocache((unsigned long)(pa), (unsigned long)(size))
+#define        REG_UNMAP(va)           iounmap((void *)(va))
+
+/* allocate/free shared (dma-able) consistent (uncached) memory */
+#define        DMA_ALLOC_CONSISTENT(dev, size, pap) \
+       pci_alloc_consistent((dev), (size), (dma_addr_t*)(pap))
+#define        DMA_FREE_CONSISTENT(dev, va, size, pa) \
+       pci_free_consistent((dev), (size), (va), (dma_addr_t)(pa))
+
+/* map/unmap direction */
+#define        DMA_TX                  PCI_DMA_TODEVICE
+#define        DMA_RX                  PCI_DMA_FROMDEVICE
+
+/* map/unmap shared (dma-able) memory */
+#define        DMA_MAP(dev, va, size, direction, p) \
+       pci_map_single((dev), (va), (size), (direction))
+#define        DMA_UNMAP(dev, pa, size, direction, p) \
+       pci_unmap_single((dev), (dma_addr_t)(pa), (size), (direction))
+
+/* microsecond delay */
+#define        OSL_DELAY(usec)         udelay(usec)
+#include <linux/delay.h>
+#define OSL_SLEEP(usec) set_current_state(TASK_INTERRUPTIBLE); \
+                        schedule_timeout((usec*HZ)/1000000);
+#define OSL_IN_INTERRUPT() in_interrupt()
+
+/* shared (dma-able) memory access macros */
+#define        R_SM(r)                 *(r)
+#define        W_SM(r, v)              (*(r) = (v))
+#define        BZERO_SM(r, len)        memset((r), '\0', (len))
+
+/* packet primitives */
+#define        PKTGET(drv, len, send)          osl_pktget((drv), (len), (send))
+#define        PKTFREE(drv, skb, send)         osl_pktfree((skb))
+#define        PKTDATA(drv, skb)               (((struct sk_buff*)(skb))->data)
+#define        PKTLEN(drv, skb)                (((struct sk_buff*)(skb))->len)
+#define PKTHEADROOM(drv, skb)          (PKTDATA(drv,skb)-(((struct sk_buff*)(skb))->head))
+#define PKTTAILROOM(drv, skb)          ((((struct sk_buff*)(skb))->end)-(((struct sk_buff*)(skb))->tail))
+#define        PKTNEXT(drv, skb)               (((struct sk_buff*)(skb))->next)
+#define        PKTSETNEXT(skb, x)              (((struct sk_buff*)(skb))->next = (struct sk_buff*)(x))
+#define        PKTSETLEN(drv, skb, len)        __skb_trim((struct sk_buff*)(skb), (len))
+#define        PKTPUSH(drv, skb, bytes)        skb_push((struct sk_buff*)(skb), (bytes))
+#define        PKTPULL(drv, skb, bytes)        skb_pull((struct sk_buff*)(skb), (bytes))
+#define        PKTDUP(drv, skb)                skb_clone((struct sk_buff*)(skb), GFP_ATOMIC)
+#define        PKTCOOKIE(skb)                  ((void*)((struct sk_buff*)(skb))->csum)
+#define        PKTSETCOOKIE(skb, x)            (((struct sk_buff*)(skb))->csum = (uint)(x))
+#define        PKTLINK(skb)                    (((struct sk_buff*)(skb))->prev)
+#define        PKTSETLINK(skb, x)              (((struct sk_buff*)(skb))->prev = (struct sk_buff*)(x))
+extern void *osl_pktget(void *drv, uint len, bool send);
+extern void osl_pktfree(void *skb);
+
+#else  /* BINOSL */                                    
+
+/* string library */
+#ifndef LINUX_OSL
+#undef printf
+#define        printf(fmt, args...)            osl_printf((fmt), ## args)
+#undef sprintf
+#define sprintf(buf, fmt, args...)     osl_sprintf((buf), (fmt), ## args)
+#undef strcmp
+#define        strcmp(s1, s2)                  osl_strcmp((s1), (s2))
+#undef strncmp
+#define        strncmp(s1, s2, n)              osl_strncmp((s1), (s2), (n))
+#undef strlen
+#define strlen(s)                      osl_strlen((s))
+#undef strcpy
+#define        strcpy(d, s)                    osl_strcpy((d), (s))
+#undef strncpy
+#define        strncpy(d, s, n)                osl_strncpy((d), (s), (n))
+#endif
+extern int osl_printf(const char *format, ...);
+extern int osl_sprintf(char *buf, const char *format, ...);
+extern int osl_strcmp(const char *s1, const char *s2);
+extern int osl_strncmp(const char *s1, const char *s2, uint n);
+extern int osl_strlen(char *s);
+extern char* osl_strcpy(char *d, const char *s);
+extern char* osl_strncpy(char *d, const char *s, uint n);
+
+/* register access macros */
+#define R_REG(r) ({ \
+       __typeof(*(r)) __osl_v; \
+       switch (sizeof(*(r))) { \
+       case sizeof(uint8):     __osl_v = osl_readb((volatile uint8*)(r)); break; \
+       case sizeof(uint16):    __osl_v = osl_readw((volatile uint16*)(r)); break; \
+       case sizeof(uint32):    __osl_v = osl_readl((volatile uint32*)(r)); break; \
+       } \
+       __osl_v; \
+})
+#define W_REG(r, v) do { \
+       switch (sizeof(*(r))) { \
+       case sizeof(uint8):     osl_writeb((uint8)(v), (volatile uint8*)(r)); break; \
+       case sizeof(uint16):    osl_writew((uint16)(v), (volatile uint16*)(r)); break; \
+       case sizeof(uint32):    osl_writel((uint32)(v), (volatile uint32*)(r)); break; \
+       } \
+} while (0)
+#define        AND_REG(r, v)           W_REG((r), R_REG(r) & (v))
+#define        OR_REG(r, v)            W_REG((r), R_REG(r) | (v))
+extern uint8 osl_readb(volatile uint8 *r);
+extern uint16 osl_readw(volatile uint16 *r);
+extern uint32 osl_readl(volatile uint32 *r);
+extern void osl_writeb(uint8 v, volatile uint8 *r);
+extern void osl_writew(uint16 v, volatile uint16 *r);
+extern void osl_writel(uint32 v, volatile uint32 *r);
+
+/* bcopy, bcmp, and bzero */
+extern void bcopy(const void *src, void *dst, int len);
+extern int bcmp(const void *b1, const void *b2, int len);
+extern void bzero(void *b, int len);
+
+/* general purpose memory allocation */
+#define        MALLOC(size)            osl_malloc((size))
+#define        MFREE(addr, size)       osl_mfree((char*)(addr), (size))
+extern void *osl_malloc(uint size);
+extern void osl_mfree(void *addr, uint size);
+
+/* uncached virtual address */
+#define OSL_UNCACHED(va)       osl_uncached((va))
+extern void *osl_uncached(void *va);
+
+/* get processor cycle count */
+#define OSL_GETCYCLES(x)       ((x) = osl_getcycles())
+extern uint osl_getcycles(void);
+
+/* dereference an address that may target abort */
+#define        BUSPROBE(val, addr)     osl_busprobe(&(val), (addr))
+extern int osl_busprobe(uint32 *val, uint32 addr);
+
+/* map/unmap physical to virtual */
+#define        REG_MAP(pa, size)       osl_reg_map((pa), (size))
+#define        REG_UNMAP(va)           osl_reg_unmap((va))
+extern void *osl_reg_map(uint32 pa, uint size);
+extern void osl_reg_unmap(void *va);
+
+/* allocate/free shared (dma-able) consistent (uncached) memory */
+#define        DMA_ALLOC_CONSISTENT(dev, size, pap) \
+       osl_dma_alloc_consistent((dev), (size), (pap))
+#define        DMA_FREE_CONSISTENT(dev, va, size, pa) \
+       osl_dma_free_consistent((dev), (void*)(va), (size), (pa))
+extern void *osl_dma_alloc_consistent(void *dev, uint size, ulong *pap);
+extern void osl_dma_free_consistent(void *dev, void *va, uint size, ulong pa);
+
+/* map/unmap direction */
+#define        DMA_TX  1
+#define        DMA_RX  2
+
+/* map/unmap shared (dma-able) memory */
+#define        DMA_MAP(dev, va, size, direction, p) \
+       osl_dma_map((dev), (va), (size), (direction))
+#define        DMA_UNMAP(dev, pa, size, direction, p) \
+       osl_dma_unmap((dev), (pa), (size), (direction))
+extern uint osl_dma_map(void *dev, void *va, uint size, int direction);
+extern void osl_dma_unmap(void *dev, uint pa, uint size, int direction);
+
+/* microsecond delay */
+#define        OSL_DELAY(usec)         osl_delay((usec))
+extern void osl_delay(uint usec);
+
+/* shared (dma-able) memory access macros */
+#define        R_SM(r)                 *(r)
+#define        W_SM(r, v)              (*(r) = (v))
+#define        BZERO_SM(r, len)        bzero((r), (len))
+
+/* packet primitives */
+#define        PKTGET(drv, len, send)          osl_pktget((drv), (len), (send))
+#define        PKTFREE(drv, skb, send)         osl_pktfree((skb))
+#define        PKTDATA(drv, skb)               osl_pktdata((drv), (skb))
+#define        PKTLEN(drv, skb)                osl_pktlen((drv), (skb))
+#define        PKTNEXT(drv, skb)               osl_pktnext((drv), (skb))
+#define        PKTSETNEXT(skb, x)              osl_pktsetnext((skb), (x))
+#define        PKTSETLEN(drv, skb, len)        osl_pktsetlen((drv), (skb), (len))
+#define        PKTPUSH(drv, skb, bytes)        osl_pktpush((drv), (skb), (bytes))
+#define        PKTPULL(drv, skb, bytes)        osl_pktpull((drv), (skb), (bytes))
+#define        PKTDUP(drv, skb)                osl_pktdup((drv), (skb))
+#define        PKTCOOKIE(skb)                  osl_pktcookie((skb))
+#define        PKTSETCOOKIE(skb, x)            osl_pktsetcookie((skb), (x))
+#define        PKTLINK(skb)                    osl_pktlink((skb))
+#define        PKTSETLINK(skb, x)              osl_pktsetlink((skb), (x))
+extern void *osl_pktget(void *drv, uint len, bool send);
+extern void osl_pktfree(void *skb);
+extern uchar *osl_pktdata(void *drv, void *skb);
+extern uint osl_pktlen(void *drv, void *skb);
+extern void *osl_pktnext(void *drv, void *skb);
+extern void osl_pktsetnext(void *skb, void *x);
+extern void osl_pktsetlen(void *drv, void *skb, uint len);
+extern uchar *osl_pktpush(void *drv, void *skb, int bytes);
+extern uchar *osl_pktpull(void *drv, void *skb, int bytes);
+extern void *osl_pktdup(void *drv, void *skb);
+extern void *osl_pktcookie(void *skb);
+extern void osl_pktsetcookie(void *skb, void *x);
+extern void *osl_pktlink(void *skb);
+extern void osl_pktsetlink(void *skb, void *x);
+
+#endif /* BINOSL */
+
+#endif /* _linux_osl_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/linuxver.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linuxver.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/linuxver.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/linuxver.h   2005-08-28 11:12:20.441857480 +0200
@@ -0,0 +1,326 @@
+/*
+ * Linux-specific abstractions to gain some independence from linux kernel versions.
+ * Pave over some 2.2 versus 2.4 kernel differences.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _linuxver_h_
+#define _linuxver_h_
+
+#include <linux/config.h>
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
+/* __NO_VERSION__ must be defined for all linkables except one in 2.2 */
+#ifdef __UNDEF_NO_VERSION__
+#undef __NO_VERSION__
+#else
+#define __NO_VERSION__
+#endif
+#endif
+
+#if defined(MODULE) && defined(MODVERSIONS)
+#include <linux/modversions.h>
+#endif
+
+/* linux/malloc.h is deprecated, use linux/slab.h instead. */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9))
+#include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <asm/io.h>
+
+#ifndef __exit
+#define __exit
+#endif
+#ifndef __devexit
+#define __devexit
+#endif
+#ifndef __devinit
+#define __devinit      __init
+#endif
+#ifndef __devinitdata
+#define __devinitdata
+#endif
+#ifndef __devexit_p
+#define __devexit_p(x) x
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
+
+#define pci_get_drvdata(dev)           (dev)->sysdata
+#define pci_set_drvdata(dev, value)    (dev)->sysdata=(value)
+
+/*
+ * New-style (2.4.x) PCI/hot-pluggable PCI/CardBus registration
+ */
+
+struct pci_device_id {
+       unsigned int vendor, device;            /* Vendor and device ID or PCI_ANY_ID */
+       unsigned int subvendor, subdevice;      /* Subsystem ID's or PCI_ANY_ID */
+       unsigned int class, class_mask;         /* (class,subclass,prog-if) triplet */
+       unsigned long driver_data;              /* Data private to the driver */
+};
+
+struct pci_driver {
+       struct list_head node;
+       char *name;
+       const struct pci_device_id *id_table;   /* NULL if wants all devices */
+       int (*probe)(struct pci_dev *dev, const struct pci_device_id *id);      /* New device inserted */
+       void (*remove)(struct pci_dev *dev);    /* Device removed (NULL if not a hot-plug capable driver) */
+       void (*suspend)(struct pci_dev *dev);   /* Device suspended */
+       void (*resume)(struct pci_dev *dev);    /* Device woken up */
+};
+
+#define MODULE_DEVICE_TABLE(type, name)
+#define PCI_ANY_ID (~0)
+
+/* compatpci.c */
+#define pci_module_init pci_register_driver
+extern int pci_register_driver(struct pci_driver *drv);
+extern void pci_unregister_driver(struct pci_driver *drv);
+
+#endif /* PCI registration */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18))
+#ifdef MODULE
+#define module_init(x) int init_module(void) { return x(); }
+#define module_exit(x) void cleanup_module(void) { x(); }
+#else
+#define module_init(x) __initcall(x);
+#define module_exit(x) __exitcall(x);
+#endif
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,48))
+#define list_for_each(pos, head) \
+       for (pos = (head)->next; pos != (head); pos = pos->next)
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13))
+#define pci_resource_start(dev, bar)   ((dev)->base_address[(bar)])
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,44))
+#define pci_resource_start(dev, bar)   ((dev)->resource[(bar)].start)
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,23))
+#define pci_enable_device(dev) do { } while (0)
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,14))
+#define net_device device
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,42))
+
+/*
+ * DMA mapping
+ *
+ * See linux/Documentation/DMA-mapping.txt
+ */
+
+#ifndef PCI_DMA_TODEVICE
+#define        PCI_DMA_TODEVICE        1
+#define        PCI_DMA_FROMDEVICE      2
+#endif
+
+typedef u32 dma_addr_t;
+
+/* Pure 2^n version of get_order */
+static inline int get_order(unsigned long size)
+{
+       int order;
+
+       size = (size-1) >> (PAGE_SHIFT-1);
+       order = -1;
+       do {
+               size >>= 1;
+               order++;
+       } while (size);
+       return order;
+}
+
+static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
+                                        dma_addr_t *dma_handle)
+{
+       void *ret;
+       int gfp = GFP_ATOMIC | GFP_DMA;
+
+       ret = (void *)__get_free_pages(gfp, get_order(size));
+
+       if (ret != NULL) {
+               memset(ret, 0, size);
+               *dma_handle = virt_to_bus(ret);
+       }
+       return ret;
+}
+static inline void pci_free_consistent(struct pci_dev *hwdev, size_t size,
+                                      void *vaddr, dma_addr_t dma_handle)
+{
+       free_pages((unsigned long)vaddr, get_order(size));
+}
+#ifdef ILSIM
+extern uint pci_map_single(void *dev, void *va, uint size, int direction);
+extern void pci_unmap_single(void *dev, uint pa, uint size, int direction);
+#else
+#define pci_map_single(cookie, address, size, dir)     virt_to_bus(address)
+#define pci_unmap_single(cookie, address, size, dir)
+#endif
+
+#endif /* DMA mapping */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,43))
+
+#define dev_kfree_skb_any(a)           dev_kfree_skb(a)
+#define netif_down(dev)                        do { (dev)->start = 0; } while(0)
+
+/* pcmcia-cs provides its own netdevice compatibility layer */
+#ifndef _COMPAT_NETDEVICE_H
+
+/*
+ * SoftNet
+ *
+ * For pre-softnet kernels we need to tell the upper layer not to
+ * re-enter start_xmit() while we are in there. However softnet
+ * guarantees not to enter while we are in there so there is no need
+ * to do the netif_stop_queue() dance unless the transmit queue really
+ * gets stuck. This should also improve performance according to tests
+ * done by Aman Singla.
+ */
+
+#define dev_kfree_skb_irq(a)           dev_kfree_skb(a)
+#define netif_wake_queue(dev)          do { clear_bit(0, &(dev)->tbusy); mark_bh(NET_BH); } while(0)
+#define netif_stop_queue(dev)          set_bit(0, &(dev)->tbusy)
+
+static inline void netif_start_queue(struct net_device *dev)
+{
+       dev->tbusy = 0;
+       dev->interrupt = 0;
+       dev->start = 1;
+}
+
+#define netif_queue_stopped(dev)       (dev)->tbusy
+#define netif_running(dev)             (dev)->start
+
+#endif /* _COMPAT_NETDEVICE_H */
+
+#define netif_device_attach(dev)       netif_start_queue(dev)
+#define netif_device_detach(dev)       netif_stop_queue(dev)
+
+/* 2.4.x renamed bottom halves to tasklets */
+#define tasklet_struct                         tq_struct
+static inline void tasklet_schedule(struct tasklet_struct *tasklet)
+{
+       queue_task(tasklet, &tq_immediate);
+       mark_bh(IMMEDIATE_BH);
+}
+
+static inline void tasklet_init(struct tasklet_struct *tasklet,
+                               void (*func)(unsigned long),
+                               unsigned long data)
+{
+       tasklet->next = NULL;
+       tasklet->sync = 0;
+       tasklet->routine = (void (*)(void *))func;
+       tasklet->data = (void *)data;
+}
+#define tasklet_kill(tasklet)                  {do{} while(0);}
+
+/* 2.4.x introduced del_timer_sync() */
+#define del_timer_sync(timer) del_timer(timer)
+
+#else
+
+#define netif_down(dev)
+
+#endif /* SoftNet */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3))
+
+/*
+ * Emit code to initialise a tq_struct's routine and data pointers
+ */
+#define PREPARE_TQUEUE(_tq, _routine, _data)                   \
+       do {                                                    \
+               (_tq)->routine = _routine;                      \
+               (_tq)->data = _data;                            \
+       } while (0)
+
+/*
+ * Emit code to initialise all of a tq_struct
+ */
+#define INIT_TQUEUE(_tq, _routine, _data)                      \
+       do {                                                    \
+               INIT_LIST_HEAD(&(_tq)->list);                   \
+               (_tq)->sync = 0;                                \
+               PREPARE_TQUEUE((_tq), (_routine), (_data));     \
+       } while (0)
+
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6))
+
+/* Power management related routines */
+
+static inline int
+pci_save_state(struct pci_dev *dev, u32 *buffer)
+{
+       int i;
+       if (buffer) {
+               for (i = 0; i < 16; i++)
+                       pci_read_config_dword(dev, i * 4,&buffer[i]);
+       }
+       return 0;
+}
+
+static inline int 
+pci_restore_state(struct pci_dev *dev, u32 *buffer)
+{
+       int i;
+
+       if (buffer) {
+               for (i = 0; i < 16; i++)
+                       pci_write_config_dword(dev,i * 4, buffer[i]);
+       }
+       /*
+        * otherwise, write the context information we know from bootup.
+        * This works around a problem where warm-booting from Windows
+        * combined with a D3(hot)->D0 transition causes PCI config
+        * header data to be forgotten.
+        */     
+       else {
+               for (i = 0; i < 6; i ++)
+                       pci_write_config_dword(dev,
+                                              PCI_BASE_ADDRESS_0 + (i * 4),
+                                              pci_resource_start(dev, i));
+               pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+       }
+       return 0;
+}
+
+#endif /* PCI power management */
+
+/* Old cp0 access macros deprecated in 2.4.19 */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19))
+#define read_c0_count() read_32bit_cp0_register(CP0_COUNT)
+#endif
+
+#endif /* _linuxver_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/nvports.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/nvports.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/nvports.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/nvports.h    2005-08-28 11:12:20.441857480 +0200
@@ -0,0 +1,62 @@
+/*
+ * Broadcom Home Gateway Reference Design
+ * Ports Web Page Configuration Support Routines
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ * $Id$
+ */
+
+#ifndef _nvports_h_
+#define _nvports_h_
+
+#define uint32 unsigned long
+#define uint16 unsigned short
+#define uint unsigned int
+#define uint8 unsigned char
+#define uint64 unsigned long long
+
+enum FORCE_PORT {
+       FORCE_OFF,
+       FORCE_10H,
+       FORCE_10F,
+       FORCE_100H,
+       FORCE_100F,
+       FORCE_DOWN,
+       POWER_OFF
+};
+
+typedef struct _PORT_ATTRIBS
+{
+       uint    autoneg;
+       uint    force;
+       uint    native; 
+} PORT_ATTRIBS;
+
+extern uint
+nvExistsPortAttrib(char *attrib, uint portno);
+
+extern int
+nvExistsAnyForcePortAttrib(uint portno);
+
+extern void
+nvSetPortAttrib(char *attrib, uint portno);
+
+extern void
+nvUnsetPortAttrib(char *attrib, uint portno);
+
+extern void
+nvUnsetAllForcePortAttrib(uint portno);
+
+extern PORT_ATTRIBS
+nvGetSwitchPortAttribs(uint portno);
+
+#endif /* _nvports_h_ */
+
+
+
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/osl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/osl.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/osl.h     1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/osl.h        2005-08-28 11:12:20.441857480 +0200
@@ -0,0 +1,38 @@
+/*
+ * OS Independent Layer
+ * 
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _osl_h_
+#define _osl_h_
+
+#ifdef V2_HAL
+#include <v2hal_osl.h>
+#elif defined(linux)
+#include <linux_osl.h>
+#elif PMON
+#include <pmon_osl.h>
+#elif defined(NDIS)
+#include <ndis_osl.h>
+#elif defined(_CFE_)
+#include <cfe_osl.h>
+#elif defined(MACOS9)
+#include <macos9_osl.h>
+#elif defined(MACOSX)
+#include <macosx_osl.h>
+#else
+#error "Unsupported OSL requested"
+#endif
+
+/* handy */
+#define        SET_REG(r, mask, val)   W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
+
+#endif /* _osl_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/pcicfg.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/pcicfg.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/pcicfg.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/pcicfg.h     2005-08-28 11:12:20.442857328 +0200
@@ -0,0 +1,362 @@
+/*
+ * pcicfg.h: PCI configuration  constants and structures.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef        _h_pci_
+#define        _h_pci_
+
+/* The following inside ifndef's so we don't collide with NTDDK.H */
+#ifndef PCI_MAX_BUS
+#define PCI_MAX_BUS            0x100
+#endif
+#ifndef PCI_MAX_DEVICES
+#define PCI_MAX_DEVICES                0x20
+#endif
+#ifndef PCI_MAX_FUNCTION
+#define PCI_MAX_FUNCTION       0x8
+#endif
+
+#ifndef PCI_INVALID_VENDORID
+#define PCI_INVALID_VENDORID   0xffff
+#endif
+#ifndef PCI_INVALID_DEVICEID
+#define PCI_INVALID_DEVICEID   0xffff
+#endif
+
+
+/* Convert between bus-slot-function-register and config addresses */
+
+#define        PCICFG_BUS_SHIFT        16      /* Bus shift */
+#define        PCICFG_SLOT_SHIFT       11      /* Slot shift */
+#define        PCICFG_FUN_SHIFT        8       /* Function shift */
+#define        PCICFG_OFF_SHIFT        0       /* Bus shift */
+
+#define        PCICFG_BUS_MASK         0xff    /* Bus mask */
+#define        PCICFG_SLOT_MASK        0x1f    /* Slot mask */
+#define        PCICFG_FUN_MASK         7       /* Function mask */
+#define        PCICFG_OFF_MASK         0xff    /* Bus mask */
+
+#define        PCI_CONFIG_ADDR(b, s, f, o)                                     \
+               ((((b) & PCICFG_BUS_MASK) << PCICFG_BUS_SHIFT)          \
+                | (((s) & PCICFG_SLOT_MASK) << PCICFG_SLOT_SHIFT)      \
+                | (((f) & PCICFG_FUN_MASK) << PCICFG_FUN_SHIFT)        \
+                | (((o) & PCICFG_OFF_MASK) << PCICFG_OFF_SHIFT))
+
+#define        PCI_CONFIG_BUS(a)       (((a) >> PCICFG_BUS_SHIFT) & PCICFG_BUS_MASK)
+#define        PCI_CONFIG_SLOT(a)      (((a) >> PCICFG_SLOT_SHIFT) & PCICFG_SLOT_MASK)
+#define        PCI_CONFIG_FUN(a)       (((a) >> PCICFG_FUN_SHIFT) & PCICFG_FUN_MASK)
+#define        PCI_CONFIG_OFF(a)       (((a) >> PCICFG_OFF_SHIFT) & PCICFG_OFF_MASK)
+
+
+/* The actual config space */
+
+#define        PCI_BAR_MAX             6
+
+#define        PCI_ROM_BAR             8
+
+#define        PCR_RSVDA_MAX           2
+
+typedef struct _pci_config_regs {
+    unsigned short     vendor;
+    unsigned short     device;
+    unsigned short     command;
+    unsigned short     status;
+    unsigned char      rev_id;
+    unsigned char      prog_if;
+    unsigned char      sub_class;
+    unsigned char      base_class;
+    unsigned char      cache_line_size;
+    unsigned char      latency_timer;
+    unsigned char      header_type;
+    unsigned char      bist;
+    unsigned long      base[PCI_BAR_MAX];
+    unsigned long      cardbus_cis;
+    unsigned short     subsys_vendor;
+    unsigned short     subsys_id;
+    unsigned long      baserom;
+    unsigned long      rsvd_a[PCR_RSVDA_MAX];
+    unsigned char      int_line;
+    unsigned char      int_pin;
+    unsigned char      min_gnt;
+    unsigned char      max_lat;
+    unsigned char      dev_dep[192];
+} pci_config_regs;
+
+#define        SZPCR           (sizeof (pci_config_regs))
+#define        MINSZPCR        64              /* offsetof (dev_dep[0] */
+
+/* A structure for the config registers is nice, but in most
+ * systems the config space is not memory mapped, so we need
+ * filed offsetts. :-(
+ */
+#define        PCI_CFG_VID             0
+#define        PCI_CFG_DID             2
+#define        PCI_CFG_CMD             4
+#define        PCI_CFG_STAT            6
+#define        PCI_CFG_REV             8
+#define        PCI_CFG_PROGIF          9
+#define        PCI_CFG_SUBCL           0xa
+#define        PCI_CFG_BASECL          0xb
+#define        PCI_CFG_CLSZ            0xc
+#define        PCI_CFG_LATTIM          0xd
+#define        PCI_CFG_HDR             0xe
+#define        PCI_CFG_BIST            0xf
+#define        PCI_CFG_BAR0            0x10
+#define        PCI_CFG_BAR1            0x14
+#define        PCI_CFG_BAR2            0x18
+#define        PCI_CFG_BAR3            0x1c
+#define        PCI_CFG_BAR4            0x20
+#define        PCI_CFG_BAR5            0x24
+#define        PCI_CFG_CIS             0x28
+#define        PCI_CFG_SVID            0x2c
+#define        PCI_CFG_SSID            0x2e
+#define        PCI_CFG_ROMBAR          0x30
+#define        PCI_CFG_INT             0x3c
+#define        PCI_CFG_PIN             0x3d
+#define        PCI_CFG_MINGNT          0x3e
+#define        PCI_CFG_MAXLAT          0x3f
+
+/* Classes and subclasses */
+
+typedef enum {
+    PCI_CLASS_OLD = 0,
+    PCI_CLASS_DASDI,
+    PCI_CLASS_NET,
+    PCI_CLASS_DISPLAY,
+    PCI_CLASS_MMEDIA,
+    PCI_CLASS_MEMORY,
+    PCI_CLASS_BRIDGE,
+    PCI_CLASS_COMM,
+    PCI_CLASS_BASE,
+    PCI_CLASS_INPUT,
+    PCI_CLASS_DOCK,
+    PCI_CLASS_CPU,
+    PCI_CLASS_SERIAL,
+    PCI_CLASS_INTELLIGENT = 0xe,
+    PCI_CLASS_SATELLITE,
+    PCI_CLASS_CRYPT,
+    PCI_CLASS_DSP,
+    PCI_CLASS_MAX
+} pci_classes;
+
+typedef enum {
+    PCI_DASDI_SCSI,
+    PCI_DASDI_IDE,
+    PCI_DASDI_FLOPPY,
+    PCI_DASDI_IPI,
+    PCI_DASDI_RAID,
+    PCI_DASDI_OTHER = 0x80
+} pci_dasdi_subclasses;
+
+typedef enum {
+    PCI_NET_ETHER,
+    PCI_NET_TOKEN,
+    PCI_NET_FDDI,
+    PCI_NET_ATM,
+    PCI_NET_OTHER = 0x80
+} pci_net_subclasses;
+
+typedef enum {
+    PCI_DISPLAY_VGA,
+    PCI_DISPLAY_XGA,
+    PCI_DISPLAY_3D,
+    PCI_DISPLAY_OTHER = 0x80
+} pci_display_subclasses;
+
+typedef enum {
+    PCI_MMEDIA_VIDEO,
+    PCI_MMEDIA_AUDIO,
+    PCI_MMEDIA_PHONE,
+    PCI_MEDIA_OTHER = 0x80
+} pci_mmedia_subclasses;
+
+typedef enum {
+    PCI_MEMORY_RAM,
+    PCI_MEMORY_FLASH,
+    PCI_MEMORY_OTHER = 0x80
+} pci_memory_subclasses;
+
+typedef enum {
+    PCI_BRIDGE_HOST,
+    PCI_BRIDGE_ISA,
+    PCI_BRIDGE_EISA,
+    PCI_BRIDGE_MC,
+    PCI_BRIDGE_PCI,
+    PCI_BRIDGE_PCMCIA,
+    PCI_BRIDGE_NUBUS,
+    PCI_BRIDGE_CARDBUS,
+    PCI_BRIDGE_RACEWAY,
+    PCI_BRIDGE_OTHER = 0x80
+} pci_bridge_subclasses;
+
+typedef enum {
+    PCI_COMM_UART,
+    PCI_COMM_PARALLEL,
+    PCI_COMM_MULTIUART,
+    PCI_COMM_MODEM,
+    PCI_COMM_OTHER = 0x80
+} pci_comm_subclasses;
+
+typedef enum {
+    PCI_BASE_PIC,
+    PCI_BASE_DMA,
+    PCI_BASE_TIMER,
+    PCI_BASE_RTC,
+    PCI_BASE_PCI_HOTPLUG,
+    PCI_BASE_OTHER = 0x80
+} pci_base_subclasses;
+
+typedef enum {
+    PCI_INPUT_KBD,
+    PCI_INPUT_PEN,
+    PCI_INPUT_MOUSE,
+    PCI_INPUT_SCANNER,
+    PCI_INPUT_GAMEPORT,
+    PCI_INPUT_OTHER = 0x80
+} pci_input_subclasses;
+
+typedef enum {
+    PCI_DOCK_GENERIC,
+    PCI_DOCK_OTHER = 0x80
+} pci_dock_subclasses;
+
+typedef enum {
+    PCI_CPU_386,
+    PCI_CPU_486,
+    PCI_CPU_PENTIUM,
+    PCI_CPU_ALPHA = 0x10,
+    PCI_CPU_POWERPC = 0x20,
+    PCI_CPU_MIPS = 0x30,
+    PCI_CPU_COPROC = 0x40,
+    PCI_CPU_OTHER = 0x80
+} pci_cpu_subclasses;
+
+typedef enum {
+    PCI_SERIAL_IEEE1394,
+    PCI_SERIAL_ACCESS,
+    PCI_SERIAL_SSA,
+    PCI_SERIAL_USB,
+    PCI_SERIAL_FIBER,
+    PCI_SERIAL_SMBUS,
+    PCI_SERIAL_OTHER = 0x80
+} pci_serial_subclasses;
+
+typedef enum {
+    PCI_INTELLIGENT_I2O,
+} pci_intelligent_subclasses;
+
+typedef enum {
+    PCI_SATELLITE_TV,
+    PCI_SATELLITE_AUDIO,
+    PCI_SATELLITE_VOICE,
+    PCI_SATELLITE_DATA,
+    PCI_SATELLITE_OTHER = 0x80
+} pci_satellite_subclasses;
+
+typedef enum {
+    PCI_CRYPT_NETWORK,
+    PCI_CRYPT_ENTERTAINMENT,
+    PCI_CRYPT_OTHER = 0x80
+} pci_crypt_subclasses;
+
+typedef enum {
+    PCI_DSP_DPIO,
+    PCI_DSP_OTHER = 0x80
+} pci_dsp_subclasses;
+
+/* Header types */
+typedef enum {
+       PCI_HEADER_NORMAL,
+       PCI_HEADER_BRIDGE,
+       PCI_HEADER_CARDBUS
+} pci_header_types;
+
+
+/* Overlay for a PCI-to-PCI bridge */
+
+#define        PPB_RSVDA_MAX           2
+#define        PPB_RSVDD_MAX           8
+
+typedef struct _ppb_config_regs {
+    unsigned short     vendor;
+    unsigned short     device;
+    unsigned short     command;
+    unsigned short     status;
+    unsigned char      rev_id;
+    unsigned char      prog_if;
+    unsigned char      sub_class;
+    unsigned char      base_class;
+    unsigned char      cache_line_size;
+    unsigned char      latency_timer;
+    unsigned char      header_type;
+    unsigned char      bist;
+    unsigned long      rsvd_a[PPB_RSVDA_MAX];
+    unsigned char      prim_bus;
+    unsigned char      sec_bus;
+    unsigned char      sub_bus;
+    unsigned char      sec_lat;
+    unsigned char      io_base;
+    unsigned char      io_lim;
+    unsigned short     sec_status;
+    unsigned short     mem_base;
+    unsigned short     mem_lim;
+    unsigned short     pf_mem_base;
+    unsigned short     pf_mem_lim;
+    unsigned long      pf_mem_base_hi;
+    unsigned long      pf_mem_lim_hi;
+    unsigned short     io_base_hi;
+    unsigned short     io_lim_hi;
+    unsigned short     subsys_vendor;
+    unsigned short     subsys_id;
+    unsigned long      rsvd_b;
+    unsigned char      rsvd_c;
+    unsigned char      int_pin;
+    unsigned short     bridge_ctrl;
+    unsigned char      chip_ctrl;
+    unsigned char      diag_ctrl;
+    unsigned short     arb_ctrl;
+    unsigned long      rsvd_d[PPB_RSVDD_MAX];
+    unsigned char      dev_dep[192];
+} ppb_config_regs;
+
+/* Eveything below is BRCM HND proprietary */
+
+#define        PCI_BAR0_WIN            0x80    /* backplane addres space accessed by BAR0 */
+#define        PCI_BAR1_WIN            0x84    /* backplane addres space accessed by BAR1 */
+#define        PCI_SPROM_CONTROL       0x88    /* sprom property control */
+#define        PCI_BAR1_CONTROL        0x8c    /* BAR1 region burst control */
+#define        PCI_INT_STATUS          0x90    /* PCI and other cores interrupts */
+#define        PCI_INT_MASK            0x94    /* mask of PCI and other cores interrupts */
+#define PCI_TO_SB_MB           0x98    /* signal backplane interrupts */
+#define PCI_BACKPLANE_ADDR     0xA0    /* address an arbitrary location on the system backplane */
+#define PCI_BACKPLANE_DATA     0xA4    /* data at the location specified by above address register */
+#define        PCI_GPIO_IN             0xb0    /* pci config space gpio input (>=rev3) */
+#define        PCI_GPIO_OUT            0xb4    /* pci config space gpio output (>=rev3) */
+#define        PCI_GPIO_OUTEN          0xb8    /* pci config space gpio output enable (>=rev3) */
+
+#define        PCI_BAR0_SPROM_OFFSET   (4 * 1024)      /* bar0 + 4K accesses external sprom */
+#define        PCI_BAR0_PCIREGS_OFFSET (6 * 1024)      /* bar0 + 6K accesses pci core registers */
+
+/* PCI_INT_MASK */
+#define        PCI_SBIM_SHIFT          8       /* backplane core interrupt mask bits offset */
+#define        PCI_SBIM_MASK           0xff00  /* backplane core interrupt mask */
+
+/* PCI_SPROM_CONTROL */
+#define        SPROM_BLANK             0x04    /* indicating a blank sprom */
+#define SPROM_WRITEEN          0x10    /* sprom write enable */
+#define SPROM_BOOTROM_WE       0x20    /* external bootrom write enable */
+
+#define        SPROM_SIZE              256     /* sprom size in 16-bit */
+#define SPROM_CRC_RANGE                64      /* crc cover range in 16-bit */
+
+#endif
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/802.11.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/802.11.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/proto/802.11.h    1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/802.11.h       2005-08-28 11:12:20.450856112 +0200
@@ -0,0 +1,679 @@
+/*
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ *
+ * Fundamental types and constants relating to 802.11 
+ *
+ * $Id$
+ */
+
+#ifndef _802_11_H_
+#define _802_11_H_
+
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+
+#ifndef _NET_ETHERNET_H_
+#include <proto/ethernet.h>
+#endif
+
+/* enable structure packing */
+#if !defined(__GNUC__)
+#pragma pack(1)
+#endif
+
+/* some platforms require stronger medicine */
+#if defined(__GNUC__)
+#define        PACKED  __attribute__((packed))
+#else
+#define        PACKED
+#endif
+
+
+#define DOT11_TU_TO_US                 1024    /* 802.11 Time Unit is 1024 microseconds */
+
+/* Generic 802.11 frame constants */
+#define DOT11_A3_HDR_LEN               24
+#define DOT11_A4_HDR_LEN               30
+#define DOT11_MAC_HDR_LEN              DOT11_A3_HDR_LEN
+#define DOT11_FCS_LEN                  4
+#define DOT11_ICV_LEN                  4
+#define DOT11_ICV_AES_LEN              8
+
+
+#define DOT11_KEY_INDEX_SHIFT          6
+#define DOT11_IV_LEN                   4
+#define DOT11_IV_TKIP_LEN              8
+#define DOT11_IV_AES_OCB_LEN           4
+#define DOT11_IV_AES_CCM_LEN           8
+
+#define DOT11_MAX_MPDU_BODY_LEN                2312
+#define DOT11_MAX_MPDU_LEN             2346    /* body len + A4 hdr + FCS */
+#define DOT11_MAX_SSID_LEN             32
+
+/* dot11RTSThreshold */
+#define DOT11_DEFAULT_RTS_LEN          2347
+#define DOT11_MAX_RTS_LEN              2347
+
+/* dot11FragmentationThreshold */
+#define DOT11_MIN_FRAG_LEN             256
+#define DOT11_MAX_FRAG_LEN             2346    /* Max frag is also limited by aMPDUMaxLength of the attached PHY */
+#define DOT11_DEFAULT_FRAG_LEN         2346
+
+/* dot11BeaconPeriod */
+#define DOT11_MIN_BEACON_PERIOD                1
+#define DOT11_MAX_BEACON_PERIOD                0xFFFF
+
+/* dot11DTIMPeriod */
+#define DOT11_MIN_DTIM_PERIOD          1
+#define DOT11_MAX_DTIM_PERIOD          0xFF
+
+/* 802.2 LLC/SNAP header used by 802.11 per 802.1H */
+#define DOT11_LLC_SNAP_HDR_LEN 8
+#define DOT11_OUI_LEN                  3
+struct dot11_llc_snap_header {
+       uint8   dsap;                           /* always 0xAA */
+       uint8   ssap;                           /* always 0xAA */
+       uint8   ctl;                            /* always 0x03 */
+       uint8   oui[DOT11_OUI_LEN];             /* RFC1042: 0x00 0x00 0x00
+                                                  Bridge-Tunnel: 0x00 0x00 0xF8 */
+       uint16  type;                           /* ethertype */
+} PACKED;
+
+/* RFC1042 header used by 802.11 per 802.1H */
+#define RFC1042_HDR_LEN                        (ETHER_HDR_LEN + DOT11_LLC_SNAP_HDR_LEN)
+
+/* Generic 802.11 MAC header */
+/*
+ * N.B.: This struct reflects the full 4 address 802.11 MAC header.
+ *              The fields are defined such that the shorter 1, 2, and 3
+ *              address headers just use the first k fields.
+ */
+struct dot11_header {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       a1;             /* address 1 */
+       struct ether_addr       a2;             /* address 2 */
+       struct ether_addr       a3;             /* address 3 */
+       uint16                  seq;            /* sequence control */
+       struct ether_addr       a4;             /* address 4 */
+} PACKED;
+
+/* Control frames */
+
+struct dot11_rts_frame {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       ra;             /* receiver address */
+       struct ether_addr       ta;             /* transmitter address */
+} PACKED;
+#define        DOT11_RTS_LEN           16
+
+struct dot11_cts_frame {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       ra;             /* receiver address */
+} PACKED;
+#define        DOT11_CTS_LEN           10
+
+struct dot11_ack_frame {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       ra;             /* receiver address */
+} PACKED;
+#define        DOT11_ACK_LEN           10
+
+struct dot11_ps_poll_frame {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* AID */
+       struct ether_addr       bssid;          /* receiver address, STA in AP */
+       struct ether_addr       ta;             /* transmitter address */
+} PACKED;
+#define        DOT11_PS_POLL_LEN       16
+
+struct dot11_cf_end_frame {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       ra;             /* receiver address */
+       struct ether_addr       bssid;          /* transmitter address, STA in AP */
+} PACKED;
+#define        DOT11_CS_END_LEN        16
+
+/* Management frame header */
+struct dot11_management_header {
+       uint16                  fc;             /* frame control */
+       uint16                  durid;          /* duration/ID */
+       struct ether_addr       da;             /* receiver address */
+       struct ether_addr       sa;             /* transmitter address */
+       struct ether_addr       bssid;          /* BSS ID */
+       uint16                  seq;            /* sequence control */
+} PACKED;
+#define        DOT11_MGMT_HDR_LEN      24
+
+/* Management frame payloads */
+
+struct dot11_bcn_prb {
+       uint32                  timestamp[2];
+       uint16                  beacon_interval;
+       uint16                  capability;
+} PACKED;
+#define        DOT11_BCN_PRB_LEN       12
+
+struct dot11_auth {
+       uint16                  alg;            /* algorithm */
+       uint16                  seq;            /* sequence control */
+       uint16                  status;         /* status code */
+} PACKED;
+#define DOT11_AUTH_FIXED_LEN   6               /* length of auth frame without challenge info elt */
+
+struct dot11_assoc_req {
+       uint16                  capability;     /* capability information */
+       uint16                  listen;         /* listen interval */
+} PACKED;
+
+struct dot11_assoc_resp {
+       uint16                  capability;     /* capability information */
+       uint16                  status;         /* status code */
+       uint16                  aid;            /* association ID */
+} PACKED;
+
+struct dot11_action_measure {
+       uint8   category;
+       uint8   action;
+       uint8   token;
+       uint8   data[1];
+} PACKED;
+#define DOT11_ACTION_MEASURE_LEN       3
+
+/**************
+  802.11h related definitions.
+**************/
+typedef struct {
+       uint8 id;
+       uint8 len;
+       uint8 power;
+} dot11_power_cnst_t;
+
+typedef struct {
+       uint8 min;
+       uint8 max;
+} dot11_power_cap_t;
+
+typedef struct {
+       uint8 id;
+       uint8 len;
+       uint8 tx_pwr;
+       uint8 margin;
+} dot11_tpc_rep_t;
+#define DOT11_MNG_IE_TPC_REPORT_LEN    2       /* length of IE data, not including 2 byte header */
+
+typedef struct {
+       uint8 id;
+       uint8 len;
+       uint8 first_channel;
+       uint8 num_channels;
+} dot11_supp_channels_t;
+
+struct dot11_channel_switch {
+       uint8 id;
+       uint8 len;
+       uint8 mode;
+       uint8 channel;
+       uint8 count;
+}  PACKED;
+typedef struct dot11_channel_switch dot11_channel_switch_t;
+
+/* 802.11h Measurement Request/Report IEs */
+/* Measurement Type field */
+#define DOT11_MEASURE_TYPE_BASIC       0
+#define DOT11_MEASURE_TYPE_CCA                 1
+#define DOT11_MEASURE_TYPE_RPI         2
+
+/* Measurement Mode field */
+
+/* Measurement Request Modes */
+#define DOT11_MEASURE_MODE_ENABLE      (1<<1)
+#define DOT11_MEASURE_MODE_REQUEST     (1<<2)
+#define DOT11_MEASURE_MODE_REPORT      (1<<3)
+/* Measurement Report Modes */
+#define DOT11_MEASURE_MODE_LATE        (1<<0)
+#define DOT11_MEASURE_MODE_INCAPABLE   (1<<1)
+#define DOT11_MEASURE_MODE_REFUSED     (1<<2)
+/* Basic Measurement Map bits */
+#define DOT11_MEASURE_BASIC_MAP_BSS    ((uint8)(1<<0))
+#define DOT11_MEASURE_BASIC_MAP_OFDM   ((uint8)(1<<1))
+#define DOT11_MEASURE_BASIC_MAP_UKNOWN ((uint8)(1<<2))
+#define DOT11_MEASURE_BASIC_MAP_RADAR  ((uint8)(1<<3))
+#define DOT11_MEASURE_BASIC_MAP_UNMEAS ((uint8)(1<<4))
+
+typedef struct {
+       uint8 id;
+       uint8 len;
+       uint8 token;
+       uint8 mode;
+       uint8 type;
+       uint8 channel;
+       uint8 start_time[8];
+       uint16 duration;
+} dot11_meas_req_t;
+#define DOT11_MNG_IE_MREQ_LEN 14
+/* length of Measure Request IE data not including variable len */
+#define DOT11_MNG_IE_MREQ_FIXED_LEN 3
+
+struct dot11_meas_rep {
+       uint8 id;
+       uint8 len;
+       uint8 token;
+       uint8 mode;
+       uint8 type;
+       union 
+       {
+               struct {
+                       uint8 channel;
+                       uint8 start_time[8];
+                       uint16 duration;
+                       uint8 map;
+               } PACKED basic;
+               uint8 data[1];
+       } PACKED rep;
+} PACKED;
+typedef struct dot11_meas_rep dot11_meas_rep_t;
+
+/* length of Measure Report IE data not including variable len */
+#define DOT11_MNG_IE_MREP_FIXED_LEN    3
+
+struct dot11_meas_rep_basic {
+       uint8 channel;
+       uint8 start_time[8];
+       uint16 duration;
+       uint8 map;
+} PACKED;
+typedef struct dot11_meas_rep_basic dot11_meas_rep_basic_t;
+#define DOT11_MEASURE_BASIC_REP_LEN    12
+
+struct dot11_quiet {
+       uint8 id;
+       uint8 len;
+       uint8 count;    /* TBTTs until beacon interval in quiet starts */
+       uint8 period;   /* Beacon intervals between periodic quiet periods ? */
+       uint16 duration;/* Length of quiet period, in TU's */
+       uint16 offset;  /* TU's offset from TBTT in Count field */
+} PACKED;
+typedef struct dot11_quiet dot11_quiet_t;
+
+typedef struct {
+       uint8 channel;
+       uint8 map;
+} chan_map_tuple_t;
+
+typedef struct {
+       uint8 id;
+       uint8 len;
+       uint8 eaddr[ETHER_ADDR_LEN];
+       uint8 interval;
+       chan_map_tuple_t map[1];
+} dot11_ibss_dfs_t;
+
+
+/* Macro to take a pointer to a beacon or probe response
+ * header and return the char* pointer to the SSID info element
+ */
+#define BCN_PRB_SSID(hdr) ((char*)(hdr) + DOT11_MGMT_HDR_LEN + DOT11_BCN_PRB_LEN)
+
+/* Authentication frame payload constants */
+#define DOT11_OPEN_SYSTEM      0
+#define DOT11_SHARED_KEY       1
+#define DOT11_CHALLENGE_LEN    128
+
+/* Frame control macros */
+#define FC_PVER_MASK           0x3
+#define FC_PVER_SHIFT          0
+#define FC_TYPE_MASK           0xC
+#define FC_TYPE_SHIFT          2
+#define FC_SUBTYPE_MASK                0xF0
+#define FC_SUBTYPE_SHIFT       4
+#define FC_TODS                        0x100
+#define FC_TODS_SHIFT          8
+#define FC_FROMDS              0x200
+#define FC_FROMDS_SHIFT                9
+#define FC_MOREFRAG            0x400
+#define FC_MOREFRAG_SHIFT      10
+#define FC_RETRY               0x800
+#define FC_RETRY_SHIFT         11
+#define FC_PM                  0x1000
+#define FC_PM_SHIFT            12
+#define FC_MOREDATA            0x2000
+#define FC_MOREDATA_SHIFT      13
+#define FC_WEP                 0x4000
+#define FC_WEP_SHIFT           14
+#define FC_ORDER               0x8000
+#define FC_ORDER_SHIFT         15
+
+/* sequence control macros */
+#define SEQNUM_SHIFT           4
+#define FRAGNUM_MASK           0xF
+
+/* Frame Control type/subtype defs */
+
+/* FC Types */
+#define FC_TYPE_MNG            0
+#define FC_TYPE_CTL            1
+#define FC_TYPE_DATA           2
+
+/* Management Subtypes */
+#define FC_SUBTYPE_ASSOC_REQ           0
+#define FC_SUBTYPE_ASSOC_RESP          1
+#define FC_SUBTYPE_REASSOC_REQ         2
+#define FC_SUBTYPE_REASSOC_RESP                3
+#define FC_SUBTYPE_PROBE_REQ           4
+#define FC_SUBTYPE_PROBE_RESP          5
+#define FC_SUBTYPE_BEACON              8
+#define FC_SUBTYPE_ATIM                        9
+#define FC_SUBTYPE_DISASSOC            10
+#define FC_SUBTYPE_AUTH                        11
+#define FC_SUBTYPE_DEAUTH              12
+#define FC_SUBTYPE_ACTION              13
+
+/* Control Subtypes */
+#define FC_SUBTYPE_PS_POLL             10
+#define FC_SUBTYPE_RTS                 11
+#define FC_SUBTYPE_CTS                 12
+#define FC_SUBTYPE_ACK                 13
+#define FC_SUBTYPE_CF_END              14
+#define FC_SUBTYPE_CF_END_ACK          15
+
+/* Data Subtypes */
+#define FC_SUBTYPE_DATA                        0
+#define FC_SUBTYPE_DATA_CF_ACK         1
+#define FC_SUBTYPE_DATA_CF_POLL                2
+#define FC_SUBTYPE_DATA_CF_ACK_POLL    3
+#define FC_SUBTYPE_NULL                        4
+#define FC_SUBTYPE_CF_ACK              5
+#define FC_SUBTYPE_CF_POLL             6
+#define FC_SUBTYPE_CF_ACK_POLL         7
+
+/* type-subtype combos */
+#define FC_KIND_MASK           (FC_TYPE_MASK | FC_SUBTYPE_MASK)
+
+#define FC_KIND(t, s) (((t) << FC_TYPE_SHIFT) | ((s) << FC_SUBTYPE_SHIFT))
+
+#define FC_ASSOC_REQ   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_REQ)
+#define FC_ASSOC_RESP  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_RESP)
+#define FC_REASSOC_REQ FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_REQ)
+#define FC_REASSOC_RESP        FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_RESP)
+#define FC_PROBE_REQ   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_REQ)
+#define FC_PROBE_RESP  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_RESP)
+#define FC_BEACON      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_BEACON)
+#define FC_DISASSOC    FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DISASSOC)
+#define FC_AUTH                FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_AUTH)
+#define FC_DEAUTH      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DEAUTH)
+#define FC_ACTION      FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ACTION)
+
+#define FC_PS_POLL     FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_PS_POLL)
+#define FC_RTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_RTS)
+#define FC_CTS         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTS)
+#define FC_ACK         FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_ACK)
+#define FC_CF_END      FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END)
+#define FC_CF_END_ACK  FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END_ACK)
+
+#define FC_DATA                FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA)
+#define FC_NULL_DATA   FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_NULL)
+#define FC_DATA_CF_ACK FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA_CF_ACK)
+
+/* Management Frames */
+
+/* Management Frame Constants */
+
+/* Fixed fields */
+#define DOT11_MNG_AUTH_ALGO_LEN                2
+#define DOT11_MNG_AUTH_SEQ_LEN         2
+#define DOT11_MNG_BEACON_INT_LEN       2
+#define DOT11_MNG_CAP_LEN              2
+#define DOT11_MNG_AP_ADDR_LEN          6
+#define DOT11_MNG_LISTEN_INT_LEN       2
+#define DOT11_MNG_REASON_LEN           2
+#define DOT11_MNG_AID_LEN              2
+#define DOT11_MNG_STATUS_LEN           2
+#define DOT11_MNG_TIMESTAMP_LEN                8
+
+/* DUR/ID field in assoc resp is 0xc000 | AID */
+#define DOT11_AID_MASK                 0x3fff
+
+/* Reason Codes */
+#define DOT11_RC_RESERVED                      0
+#define DOT11_RC_UNSPECIFIED                   1       /* Unspecified reason */
+#define DOT11_RC_AUTH_INVAL                    2       /* Previous authentication no longer valid */
+#define DOT11_RC_DEAUTH_LEAVING                        3       /* Deauthenticated because sending station is
+                                                          leaving (or has left) IBSS or ESS */
+#define DOT11_RC_INACTIVITY                    4       /* Disassociated due to inactivity */
+#define DOT11_RC_BUSY                          5       /* Disassociated because AP is unable to handle
+                                                          all currently associated stations */
+#define DOT11_RC_INVAL_CLASS_2                 6       /* Class 2 frame received from
+                                                          nonauthenticated station */
+#define DOT11_RC_INVAL_CLASS_3                 7       /* Class 3 frame received from
+                                                          nonassociated station */
+#define DOT11_RC_DISASSOC_LEAVING              8       /* Disassociated because sending station is
+                                                          leaving (or has left) BSS */
+#define DOT11_RC_NOT_AUTH                      9       /* Station requesting (re)association is
+                                                          not authenticated with responding station */
+#define DOT11_RC_MAX                           23      /* Reason codes > 23 are reserved */
+
+/* Status Codes */
+#define DOT11_STATUS_SUCCESS                   0       /* Successful */
+#define DOT11_STATUS_FAILURE                   1       /* Unspecified failure */
+#define DOT11_STATUS_CAP_MISMATCH              10      /* Cannot support all requested capabilities
+                                                          in the Capability Information field */
+#define DOT11_STATUS_REASSOC_FAIL              11      /* Reassociation denied due to inability to
+                                                          confirm that association exists */
+#define DOT11_STATUS_ASSOC_FAIL                        12      /* Association denied due to reason outside
+                                                          the scope of this standard */
+#define DOT11_STATUS_AUTH_MISMATCH             13      /* Responding station does not support the
+                                                          specified authentication algorithm */
+#define DOT11_STATUS_AUTH_SEQ                  14      /* Received an Authentication frame with
+                                                          authentication transaction sequence number
+                                                          out of expected sequence */
+#define DOT11_STATUS_AUTH_CHALLENGE_FAIL       15      /* Authentication rejected because of challenge failure */
+#define DOT11_STATUS_AUTH_TIMEOUT              16      /* Authentication rejected due to timeout waiting
+                                                          for next frame in sequence */
+#define DOT11_STATUS_ASSOC_BUSY_FAIL           17      /* Association denied because AP is unable to
+                                                          handle additional associated stations */
+#define DOT11_STATUS_ASSOC_RATE_MISMATCH       18      /* Association denied due to requesting station
+                                                          not supporting all of the data rates in the
+                                                          BSSBasicRateSet parameter */
+#define DOT11_STATUS_ASSOC_SHORT_REQUIRED      19      /* Association denied due to requesting station
+                                                          not supporting the Short Preamble option */
+#define DOT11_STATUS_ASSOC_PBCC_REQUIRED       20      /* Association denied due to requesting station
+                                                          not supporting the PBCC Modulation option */
+#define DOT11_STATUS_ASSOC_AGILITY_REQUIRED    21      /* Association denied due to requesting station
+                                                          not supporting the Channel Agility option */
+#define DOT11_STATUS_ASSOC_SPECTRUM_REQUIRED   22      /* Association denied because Spectrum Management 
+                                                          capability is required. */
+#define DOT11_STATUS_ASSOC_BAD_POWER_CAP       23      /* Association denied because the info in the 
+                                                          Power Cap element is unacceptable. */
+#define DOT11_STATUS_ASSOC_BAD_SUP_CHANNELS    24      /* Association denied because the info in the 
+                                                          Supported Channel element is unacceptable */
+#define DOT11_STATUS_ASSOC_SHORTSLOT_REQUIRED  25      /* Association denied due to requesting station
+                                                          not supporting the Short Slot Time option */
+#define DOT11_STATUS_ASSOC_ERPBCC_REQUIRED     26      /* Association denied due to requesting station
+                                                          not supporting the ER-PBCC Modulation option */
+#define DOT11_STATUS_ASSOC_DSSOFDM_REQUIRED    27      /* Association denied due to requesting station
+                                                          not supporting the DSS-OFDM option */
+
+/* Info Elts, length of INFORMATION portion of Info Elts */
+#define DOT11_MNG_DS_PARAM_LEN                 1
+#define DOT11_MNG_IBSS_PARAM_LEN               2
+
+/* TIM Info element has 3 bytes fixed info in INFORMATION field,
+ * followed by 1 to 251 bytes of Partial Virtual Bitmap */
+#define DOT11_MNG_TIM_FIXED_LEN                        3
+#define DOT11_MNG_TIM_DTIM_COUNT               0
+#define DOT11_MNG_TIM_DTIM_PERIOD              1
+#define DOT11_MNG_TIM_BITMAP_CTL               2
+#define DOT11_MNG_TIM_PVB                      3
+
+/* TLV defines */
+#define TLV_TAG_OFF            0
+#define TLV_LEN_OFF            1
+#define TLV_HDR_LEN            2
+#define TLV_BODY_OFF           2
+
+/* Management Frame Information Element IDs */
+#define DOT11_MNG_SSID_ID                      0
+#define DOT11_MNG_RATES_ID                     1
+#define DOT11_MNG_FH_PARMS_ID                  2
+#define DOT11_MNG_DS_PARMS_ID                  3
+#define DOT11_MNG_CF_PARMS_ID                  4
+#define DOT11_MNG_TIM_ID                       5
+#define DOT11_MNG_IBSS_PARMS_ID                        6
+#define DOT11_MNG_COUNTRY_ID                   7
+#define DOT11_MNG_HOPPING_PARMS_ID             8
+#define DOT11_MNG_HOPPING_TABLE_ID             9
+#define DOT11_MNG_REQUEST_ID                   10
+#define DOT11_MNG_CHALLENGE_ID                 16
+#define DOT11_MNG_PWR_CONSTRAINT_ID            32    /* 11H PowerConstraint    */
+#define DOT11_MNG_PWR_CAP_ID                   33    /* 11H PowerCapability    */
+#define DOT11_MNG_TPC_REQUEST_ID               34    /* 11H TPC Request        */
+#define DOT11_MNG_TPC_REPORT_ID                        35    /* 11H TPC Report         */
+#define DOT11_MNG_SUPP_CHANNELS_ID             36    /* 11H Supported Channels */
+#define DOT11_MNG_CHANNEL_SWITCH_ID            37    /* 11H ChannelSwitch Announcement*/
+#define DOT11_MNG_MEASURE_REQUEST_ID           38    /* 11H MeasurementRequest */
+#define DOT11_MNG_MEASURE_REPORT_ID            39    /* 11H MeasurementReport  */
+#define DOT11_MNG_QUIET_ID                     40    /* 11H Quiet              */
+#define DOT11_MNG_IBSS_DFS_ID                  41    /* 11H IBSS_DFS           */
+#define DOT11_MNG_ERP_ID                       42
+#define DOT11_MNG_NONERP_ID                    47
+#define DOT11_MNG_EXT_RATES_ID                 50
+#define DOT11_MNG_WPA_ID                       221
+#define DOT11_MNG_PROPR_ID                     221
+
+/* ERP info element bit values */
+#define DOT11_MNG_ERP_LEN                      1       /* ERP is currently 1 byte long */
+#define DOT11_MNG_NONERP_PRESENT               0x01    /* NonERP (802.11b) STAs are present in the BSS */
+#define DOT11_MNG_USE_PROTECTION               0x02    /* Use protection mechanisms for ERP-OFDM frames */
+#define DOT11_MNG_BARKER_PREAMBLE              0x04    /* Short Preambles: 0 == allowed, 1 == not allowed */
+
+/* Capability Information Field */
+#define DOT11_CAP_ESS                          0x0001
+#define DOT11_CAP_IBSS                         0x0002
+#define DOT11_CAP_POLLABLE                     0x0004
+#define DOT11_CAP_POLL_RQ                      0x0008
+#define DOT11_CAP_PRIVACY                      0x0010
+#define DOT11_CAP_SHORT                                0x0020
+#define DOT11_CAP_PBCC                         0x0040
+#define DOT11_CAP_AGILITY                      0x0080
+#define DOT11_CAP_SPECTRUM                     0x0100
+#define DOT11_CAP_SHORTSLOT                    0x0400
+#define DOT11_CAP_CCK_OFDM                     0x2000
+
+/* Action Frame Constants */
+#define DOT11_ACTION_CAT_ERR_MASK      0x10
+#define DOT11_ACTION_CAT_SPECT_MNG     0x00
+
+#define DOT11_ACTION_ID_M_REQ          0
+#define DOT11_ACTION_ID_M_REP          1
+#define DOT11_ACTION_ID_TPC_REQ                2
+#define DOT11_ACTION_ID_TPC_REP                3
+#define DOT11_ACTION_ID_CHANNEL_SWITCH 4
+
+/* MLME Enumerations */
+#define DOT11_BSSTYPE_INFRASTRUCTURE           0
+#define DOT11_BSSTYPE_INDEPENDENT              1
+#define DOT11_BSSTYPE_ANY                      2
+#define DOT11_SCANTYPE_ACTIVE                  0
+#define DOT11_SCANTYPE_PASSIVE                 1
+
+/* 802.11 A PHY constants */
+#define APHY_SLOT_TIME         9
+#define APHY_SIFS_TIME         16
+#define APHY_DIFS_TIME         (APHY_SIFS_TIME + (2 * APHY_SLOT_TIME))
+#define APHY_PREAMBLE_TIME     16
+#define APHY_SIGNAL_TIME       4
+#define APHY_SYMBOL_TIME       4
+#define APHY_SERVICE_NBITS     16
+#define APHY_TAIL_NBITS                6
+#define        APHY_CWMIN              15
+
+/* 802.11 B PHY constants */
+#define BPHY_SLOT_TIME         20
+#define BPHY_SIFS_TIME         10
+#define BPHY_DIFS_TIME         50
+#define BPHY_PLCP_TIME         192
+#define BPHY_PLCP_SHORT_TIME   96
+#define        BPHY_CWMIN              31
+
+/* 802.11 G constants */
+#define DOT11_OFDM_SIGNAL_EXTENSION    6
+
+#define PHY_CWMAX              1023
+
+#define        DOT11_MAXNUMFRAGS       16      /* max # fragments per MSDU */
+
+/* dot11Counters Table - 802.11 spec., Annex D */
+typedef struct d11cnt {
+       uint32          txfrag;         /* dot11TransmittedFragmentCount */
+       uint32          txmulti;        /* dot11MulticastTransmittedFrameCount */
+       uint32          txfail;         /* dot11FailedCount */
+       uint32          txretry;        /* dot11RetryCount */
+       uint32          txretrie;       /* dot11MultipleRetryCount */
+       uint32          rxdup;          /* dot11FrameduplicateCount */
+       uint32          txrts;          /* dot11RTSSuccessCount */
+       uint32          txnocts;        /* dot11RTSFailureCount */
+       uint32          txnoack;        /* dot11ACKFailureCount */
+       uint32          rxfrag;         /* dot11ReceivedFragmentCount */
+       uint32          rxmulti;        /* dot11MulticastReceivedFrameCount */
+       uint32          rxcrc;          /* dot11FCSErrorCount */
+       uint32          txfrmsnt;       /* dot11TransmittedFrameCount */
+       uint32          rxundec;        /* dot11WEPUndecryptableCount */
+} d11cnt_t;
+
+/* BRCM OUI */
+#define BRCM_OUI               "\x00\x10\x18"
+
+/* WPA definitions */
+#define WPA_VERSION            1
+#define WPA_OUI                        "\x00\x50\xF2"
+
+#define WPA_OUI_LEN    3
+
+/* WPA authentication modes */
+#define WPA_AUTH_NONE          0       /* None */
+#define WPA_AUTH_UNSPECIFIED   1       /* Unspecified authentication over 802.1X: default for WPA */
+#define WPA_AUTH_PSK           2       /* Pre-shared Key over 802.1X */
+#define WPA_AUTH_DISABLED      255     /* Legacy (i.e., non-WPA) */
+                                
+#define IS_WPA_AUTH(auth)      ((auth) == WPA_AUTH_NONE || \
+                                (auth) == WPA_AUTH_UNSPECIFIED || \
+                                (auth) == WPA_AUTH_PSK)
+
+
+/* Key related defines */
+#define DOT11_MAX_KEY_SIZE     32      /* max size of any key */
+#define DOT11_MAX_IV_SIZE      16      /* max size of any IV */
+#define DOT11_EXT_IV_FLAG      (1<<5)  /* flag to indicate IV is > 4 bytes */
+
+#define WEP1_KEY_SIZE          5       /* max size of any WEP key */
+#define WEP1_KEY_HEX_SIZE      10      /* size of WEP key in hex. */
+#define WEP128_KEY_SIZE                13      /* max size of any WEP key */
+#define WEP128_KEY_HEX_SIZE    26      /* size of WEP key in hex. */
+#define TKIP_MIC_SIZE          8       /* size of TKIP MIC */
+#define TKIP_EOM_SIZE          7       /* max size of TKIP EOM */
+#define TKIP_EOM_FLAG          0x5a    /* TKIP EOM flag byte */
+#define TKIP_KEY_SIZE          32      /* size of any TKIP key */
+#define TKIP_MIC_AUTH_TX       16      /* offset to Authenticator MIC TX key */
+#define TKIP_MIC_AUTH_RX       24      /* offset to Authenticator MIC RX key */
+#define TKIP_MIC_SUP_RX                16      /* offset to Supplicant MIC RX key */
+#define TKIP_MIC_SUP_TX                24      /* offset to Supplicant MIC TX key */
+#define AES_KEY_SIZE           16      /* size of AES key */
+
+#undef PACKED
+#if !defined(__GNUC__)
+#pragma pack()
+#endif
+
+#endif /* _802_11_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/proto/ethernet.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/ethernet.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/proto/ethernet.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/proto/ethernet.h     2005-08-28 11:12:20.450856112 +0200
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * From FreeBSD 2.2.7: Fundamental constants relating to ethernet.
+ ******************************************************************************/
+
+#ifndef _NET_ETHERNET_H_           /* use native BSD ethernet.h when available */
+#define _NET_ETHERNET_H_
+
+#ifndef _TYPEDEFS_H_
+#include "typedefs.h"
+#endif
+
+#if defined(__GNUC__)
+#define        PACKED  __attribute__((packed))
+#else
+#define        PACKED
+#endif
+
+/*
+ * The number of bytes in an ethernet (MAC) address.
+ */
+#define        ETHER_ADDR_LEN          6
+
+/*
+ * The number of bytes in the type field.
+ */
+#define        ETHER_TYPE_LEN          2
+
+/*
+ * The number of bytes in the trailing CRC field.
+ */
+#define        ETHER_CRC_LEN           4
+
+/*
+ * The length of the combined header.
+ */
+#define        ETHER_HDR_LEN           (ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
+
+/*
+ * The minimum packet length.
+ */
+#define        ETHER_MIN_LEN           64
+
+/*
+ * The minimum packet user data length.
+ */
+#define        ETHER_MIN_DATA          46
+
+/*
+ * The maximum packet length.
+ */
+#define        ETHER_MAX_LEN           1518
+
+/*
+ * The maximum packet user data length.
+ */
+#define        ETHER_MAX_DATA          1500
+
+/*
+ * Used to uniquely identify a 802.1q VLAN-tagged header.
+ */
+#define        VLAN_TAG                        0x8100
+
+/*
+ * Located after dest & src address in ether header.
+ */
+#define VLAN_FIELDS_OFFSET             (ETHER_ADDR_LEN * 2)
+
+/*
+ * 4 bytes of vlan field info.
+ */
+#define VLAN_FIELDS_SIZE               4
+
+/* location of pri bits in 16-bit vlan fields */
+#define VLAN_PRI_SHIFT                 13
+
+/* 3 bits of priority */
+#define VLAN_PRI_MASK                  7
+
+/* 802.1X ethertype */
+#define ETHER_TYPE_802_1X      0x888e
+
+/*
+ * A macro to validate a length with
+ */
+#define        ETHER_IS_VALID_LEN(foo) \
+       ((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
+
+
+#ifndef __INCif_etherh     /* Quick and ugly hack for VxWorks */
+/*
+ * Structure of a 10Mb/s Ethernet header.
+ */
+struct ether_header {
+       uint8   ether_dhost[ETHER_ADDR_LEN];
+       uint8   ether_shost[ETHER_ADDR_LEN];
+       uint16  ether_type;
+} PACKED ;
+
+/*
+ * Structure of a 48-bit Ethernet address.
+ */
+struct ether_addr {
+       uint8 octet[ETHER_ADDR_LEN];
+} PACKED ;
+#endif
+
+/*
+ * Takes a pointer, returns true if a 48-bit multicast address
+ * (including broadcast, since it is all ones)
+ */
+#define ETHER_ISMULTI(ea) (((uint8 *)(ea))[0] & 1)
+
+/*
+ * Takes a pointer, returns true if a 48-bit broadcast (all ones)
+ */
+#define ETHER_ISBCAST(ea) ((((uint8 *)(ea))[0] &               \
+                           ((uint8 *)(ea))[1] &                \
+                           ((uint8 *)(ea))[2] &                \
+                           ((uint8 *)(ea))[3] &                \
+                           ((uint8 *)(ea))[4] &                \
+                           ((uint8 *)(ea))[5]) == 0xff)
+
+static const struct ether_addr ether_bcast = {{255, 255, 255, 255, 255, 255}};
+
+/*
+ * Takes a pointer, returns true if a 48-bit null address (all zeros)
+ */
+#define ETHER_ISNULLADDR(ea) ((((uint8 *)(ea))[0] |            \
+                           ((uint8 *)(ea))[1] |                \
+                           ((uint8 *)(ea))[2] |                \
+                           ((uint8 *)(ea))[3] |                \
+                           ((uint8 *)(ea))[4] |                \
+                           ((uint8 *)(ea))[5]) == 0)
+
+#undef PACKED
+
+#endif /* _NET_ETHERNET_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/rts/crc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/rts/crc.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/rts/crc.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/rts/crc.h    2005-08-28 11:12:20.451855960 +0200
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * crc.h - a function to compute crc for iLine10 headers
+ ******************************************************************************/
+
+#ifndef _RTS_CRC_H_
+#define _RTS_CRC_H_ 1
+
+#include "typedefs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define CRC8_INIT_VALUE  0xff       /* Initial CRC8 checksum value */
+#define CRC8_GOOD_VALUE  0x9f       /* Good final CRC8 checksum value */
+#define HCS_GOOD_VALUE   0x39       /* Good final header checksum value */
+
+#define CRC16_INIT_VALUE 0xffff     /* Initial CRC16 checksum value */
+#define CRC16_GOOD_VALUE 0xf0b8     /* Good final CRC16 checksum value */
+
+#define CRC32_INIT_VALUE 0xffffffff /* Initial CRC32 checksum value */
+#define CRC32_GOOD_VALUE 0xdebb20e3 /* Good final CRC32 checksum value */
+
+void   hcs(uint8 *, uint);
+uint8  crc8(uint8 *, uint, uint8);
+uint16 crc16(uint8 *, uint, uint16);
+uint32 crc32(uint8 *, uint, uint32);
+
+/* macros for common usage */
+
+#define APPEND_CRC8(pbytes, nbytes)                           \
+do {                                                          \
+    uint8 tmp = crc8(pbytes, nbytes, CRC8_INIT_VALUE) ^ 0xff; \
+    (pbytes)[(nbytes)] = tmp;                                 \
+    (nbytes) += 1;                                            \
+} while (0)
+
+#define APPEND_CRC16(pbytes, nbytes)                               \
+do {                                                               \
+    uint16 tmp = crc16(pbytes, nbytes, CRC16_INIT_VALUE) ^ 0xffff; \
+    (pbytes)[(nbytes) + 0] = (tmp >> 0) & 0xff;                    \
+    (pbytes)[(nbytes) + 1] = (tmp >> 8) & 0xff;                    \
+    (nbytes) += 2;                                                 \
+} while (0)
+
+#define APPEND_CRC32(pbytes, nbytes)                                   \
+do {                                                                   \
+    uint32 tmp = crc32(pbytes, nbytes, CRC32_INIT_VALUE) ^ 0xffffffff; \
+    (pbytes)[(nbytes) + 0] = (tmp >>  0) & 0xff;                       \
+    (pbytes)[(nbytes) + 1] = (tmp >>  8) & 0xff;                       \
+    (pbytes)[(nbytes) + 2] = (tmp >> 16) & 0xff;                       \
+    (pbytes)[(nbytes) + 3] = (tmp >> 24) & 0xff;                       \
+    (nbytes) += 4;                                                     \
+} while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTS_CRC_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/s5.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/s5.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/s5.h      1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/s5.h 2005-08-28 11:12:20.451855960 +0200
@@ -0,0 +1,103 @@
+#ifndef _S5_H_
+#define _S5_H_
+/*
+ *   Copyright 2003, Broadcom Corporation
+ *   All Rights Reserved.
+ * 
+ *   Broadcom Sentry5 (S5) BCM5365, 53xx, BCM58xx SOC Internal Core
+ *   and MIPS3301 (R4K) System Address Space
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License as
+ *   published by the Free Software Foundation, located in the file
+ *   LICENSE.
+ *
+ *   $Id: s5.h,v 1.3 2003/06/10 18:54:51 jfd Exp $
+ * 
+ */
+
+/* BCM5365 Address map */
+#define KSEG1ADDR(x)    ( (x) | 0xa0000000)
+#define BCM5365_SDRAM          0x00000000 /* 0-128MB Physical SDRAM */
+#define BCM5365_PCI_MEM                0x08000000 /* Host Mode PCI mem space (64MB) */
+#define BCM5365_PCI_CFG                0x0c000000 /* Host Mode PCI cfg space (64MB) */
+#define BCM5365_PCI_DMA                0x40000000 /* Client Mode PCI mem space (1GB)*/
+#define        BCM5365_SDRAM_SWAPPED   0x10000000 /* Byteswapped Physical SDRAM */
+#define BCM5365_ENUM           0x18000000 /* Beginning of core enum space */
+
+/* BCM5365 Core register space */
+#define BCM5365_REG_CHIPC      0x18000000 /* Chipcommon  registers */
+#define BCM5365_REG_EMAC0      0x18001000 /* Ethernet MAC0 core registers */
+#define BCM5365_REG_IPSEC      0x18002000 /* BCM582x CryptoCore registers */
+#define BCM5365_REG_USB                0x18003000 /* USB core registers */
+#define BCM5365_REG_PCI                0x18004000 /* PCI core registers */
+#define BCM5365_REG_MIPS33     0x18005000 /* MIPS core registers */
+#define BCM5365_REG_MEMC       0x18006000 /* MEMC core registers */
+#define BCM5365_REG_UARTS       (BCM5365_REG_CHIPC + 0x300) /* UART regs */
+#define        BCM5365_EJTAG           0xff200000 /* MIPS EJTAG space (2M) */
+
+/* COM Ports 1/2 */
+#define        BCM5365_UART            (BCM5365_REG_UARTS)
+#define BCM5365_UART_COM2      (BCM5365_REG_UARTS + 0x00000100)
+
+/* Registers common to MIPS33 Core used in 5365 */
+#define MIPS33_FLASH_REGION           0x1fc00000 /* Boot FLASH Region  */
+#define MIPS33_EXTIF_REGION           0x1a000000 /* Chipcommon EXTIF region*/
+#define BCM5365_EXTIF                 0x1b000000 /* MISC_CS */
+#define MIPS33_FLASH_REGION_AUX       0x1c000000 /* FLASH Region 2*/
+
+/* Internal Core Sonics Backplane Devices */
+#define INTERNAL_UART_COM1            BCM5365_UART
+#define INTERNAL_UART_COM2            BCM5365_UART_COM2
+#define SB_REG_CHIPC                  BCM5365_REG_CHIPC
+#define SB_REG_ENET0                  BCM5365_REG_EMAC0
+#define SB_REG_IPSEC                  BCM5365_REG_IPSEC
+#define SB_REG_USB                    BCM5365_REG_USB
+#define SB_REG_PCI                    BCM5365_REG_PCI
+#define SB_REG_MIPS                   BCM5365_REG_MIPS33
+#define SB_REG_MEMC                   BCM5365_REG_MEMC
+#define SB_REG_MEMC_OFF               0x6000
+#define SB_EXTIF_SPACE                MIPS33_EXTIF_REGION
+#define SB_FLASH_SPACE                MIPS33_FLASH_REGION
+
+/*
+ * XXX
+ * 5365-specific backplane interrupt flag numbers.  This should be done
+ * dynamically instead.
+ */
+#define        SBFLAG_PCI      0
+#define        SBFLAG_ENET0    1
+#define        SBFLAG_ILINE20  2
+#define        SBFLAG_CODEC    3
+#define        SBFLAG_USB      4
+#define        SBFLAG_EXTIF    5
+#define        SBFLAG_ENET1    6
+
+/* BCM95365 Local Bus devices */
+#define BCM95365K_RESET_ADDR            BCM5365_EXTIF
+#define BCM95365K_BOARDID_ADDR         (BCM5365_EXTIF | 0x4000)
+#define BCM95365K_DOC_ADDR             (BCM5365_EXTIF | 0x6000)
+#define BCM95365K_LED_ADDR             (BCM5365_EXTIF | 0xc000)
+#define BCM95365K_TOD_REG_BASE          (BCM95365K_NVRAM_ADDR | 0x1ff0)
+#define BCM95365K_NVRAM_ADDR           (BCM5365_EXTIF | 0xe000)
+#define BCM95365K_NVRAM_SIZE             0x1ff0 /* 8K NVRAM : DS1743/STM48txx*/
+
+/* Write to DLR2416 VFD Display character RAM */
+#define LED_REG(x)      \
+ (*(volatile unsigned char *) (KSEG1ADDR(BCM95365K_LED_ADDR) + (x)))
+
+#ifdef CONFIG_VSIM
+#define        BCM5365_TRACE(trval)        do { *((int *)0xa0002ff8) = (trval); \
+                                       } while (0)
+#else
+#define        BCM5365_TRACE(trval)        do { *((unsigned char *)\
+                                         KSEG1ADDR(BCM5365K_LED_ADDR)) = (trval); \
+                                   *((int *)0xa0002ff8) = (trval); } while (0)
+#endif
+
+/* BCM9536R Local Bus devices */
+#define BCM95365R_DOC_ADDR             BCM5365_EXTIF
+
+
+
+#endif /*!_S5_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbchipc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbchipc.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbchipc.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbchipc.h    2005-08-28 11:12:20.468853376 +0200
@@ -0,0 +1,281 @@
+/*
+ * SiliconBackplane Chipcommon core hardware definitions.
+ *
+ * The chipcommon core provides chip identification, SB control,
+ * jtag, 0/1/2 uarts, clock frequency control, a watchdog interrupt timer,
+ * gpio interface, extbus, and support for serial and parallel flashes.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef        _SBCHIPC_H
+#define        _SBCHIPC_H
+
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif /* PAD */
+
+typedef volatile struct {
+       uint32  chipid;                 /* 0x0 */
+       uint32  capabilities;
+       uint32  corecontrol;            /* corerev >= 1 */
+       uint32  PAD[5];
+
+       /* Interrupt control */
+       uint32  intstatus;              /* 0x20 */
+       uint32  intmask;
+       uint32  PAD[6];
+
+       /* serial flash interface registers */
+       uint32  flashcontrol;           /* 0x40 */
+       uint32  flashaddress;
+       uint32  flashdata;
+       uint32  PAD[1];
+
+       /* Silicon backplane configuration broadcast control */
+       uint32  broadcastaddress;
+       uint32  broadcastdata;
+       uint32  PAD[2];
+
+       /* gpio - cleared only by power-on-reset */
+       uint32  gpioin;                 /* 0x60 */
+       uint32  gpioout;
+       uint32  gpioouten;
+       uint32  gpiocontrol;
+       uint32  gpiointpolarity;
+       uint32  gpiointmask;
+       uint32  PAD[2];
+
+       /* Watchdog timer */
+       uint32  watchdog;               /* 0x80 */
+       uint32  PAD[3];
+
+       /* clock control */
+       uint32  clockcontrol_n;         /* 0x90 */
+       uint32  clockcontrol_sb;        /* aka m0 */
+       uint32  clockcontrol_pci;       /* aka m1 */
+       uint32  clockcontrol_m2;        /* mii/uart/mipsref */
+       uint32  clockcontrol_mips;      /* aka m3 */
+       uint32  uart_clkdiv;            /* corerev >= 3 */
+       uint32  PAD[2];
+
+       /* pll delay registers (corerev >= 4) */
+       uint32  pll_on_delay;           /* 0xb0 */
+       uint32  fref_sel_delay;
+       uint32  slow_clk_ctl;
+       uint32  PAD[17];
+
+       /* ExtBus control registers (corerev >= 3) */
+       uint32  cs01config;             /* 0x100 */
+       uint32  cs01memwaitcnt;
+       uint32  cs01attrwaitcnt;
+       uint32  cs01iowaitcnt;
+       uint32  cs23config;
+       uint32  cs23memwaitcnt;
+       uint32  cs23attrwaitcnt;
+       uint32  cs23iowaitcnt;
+       uint32  cs4config;
+       uint32  cs4waitcnt;
+       uint32  parallelflashconfig;
+       uint32  parallelflashwaitcnt;
+       uint32  PAD[116];
+
+       /* uarts */
+       uint8   uart0data;              /* 0x300 */
+       uint8   uart0imr;
+       uint8   uart0fcr;
+       uint8   uart0lcr;
+       uint8   uart0mcr;
+       uint8   uart0lsr;
+       uint8   uart0msr;
+       uint8   uart0scratch;
+       uint8   PAD[248];               /* corerev >= 1 */
+
+       uint8   uart1data;              /* 0x400 */
+       uint8   uart1imr;
+       uint8   uart1fcr;
+       uint8   uart1lcr;
+       uint8   uart1mcr;
+       uint8   uart1lsr;
+       uint8   uart1msr;
+       uint8   uart1scratch;
+} chipcregs_t;
+
+/* chipid */
+#define        CID_ID_MASK             0x0000ffff              /* Chip Id mask */
+#define        CID_REV_MASK            0x000f0000              /* Chip Revision mask */
+#define        CID_REV_SHIFT           16                      /* Chip Revision shift */
+#define        CID_PKG_MASK            0x00f00000              /* Package Option mask */
+#define        CID_PKG_SHIFT           20                      /* Package Option shift */
+#define        CID_CC_MASK             0x0f000000              /* CoreCount (corerev >= 4) */
+#define CID_CC_SHIFT           24
+
+/* capabilities */
+#define        CAP_UARTS_MASK          0x00000003              /* Number of uarts */
+#define CAP_MIPSEB             0x00000004              /* MIPS is in big-endian mode */
+#define CAP_UCLKSEL            0x00000018              /* UARTs clock select */
+#define CAP_UINTCLK            0x00000008              /* UARTs are driven by internal divided clock */
+#define CAP_UARTGPIO           0x00000020              /* UARTs own Gpio's 15:12 */
+#define CAP_EXTBUS             0x00000040              /* External bus present */
+#define        CAP_FLASH_MASK          0x00000700              /* Type of flash */
+#define        CAP_PLL_MASK            0x00038000              /* Type of PLL */
+#define CAP_PWR_CTL            0x00040000              /* Power control */
+
+/* PLL type */
+#define PLL_NONE               0x00000000
+#define PLL_TYPE1              0x00010000              /* 48Mhz base, 3 dividers */
+#define PLL_TYPE2              0x00020000              /* 48Mhz, 4 dividers */
+#define PLL_TYPE3              0x00030000              /* 25Mhz, 2 dividers */
+#define PLL_TYPE4              0x00008000              /* 48Mhz, 4 dividers */
+
+/* corecontrol */
+#define CC_UARTCLKO            0x00000001              /* Drive UART with internal clock */
+#define        CC_SE                   0x00000002              /* sync clk out enable (corerev >= 3) */
+
+/* intstatus/intmask */
+#define        CI_EI                   0x00000002              /* ro: ext intr pin (corerev >= 3) */
+
+/* slow_clk_ctl */
+#define SCC_SS_MASK            0x00000007              /* slow clock source mask */
+#define        SCC_SS_LPO              0x00000000              /* source of slow clock is LPO */
+#define        SCC_SS_XTAL             0x00000001              /* source of slow clock is crystal */
+#define        SCC_SS_PCI              0x00000002              /* source of slow clock is PCI */
+#define SCC_LF                 0x00000200              /* LPOFreqSel, 1: 160Khz, 0: 32KHz */
+#define SCC_LP                 0x00000400              /* LPOPowerDown, 1: LPO is disabled, 0: LPO is enabled */
+#define SCC_FS                 0x00000800              /* ForceSlowClk, 1: sb/cores running on slow clock, 0: power logic control */
+#define SCC_IP                 0x00001000              /* IgnorePllOffReq, 1/0: power logic ignores/honors PLL clock disable requests from core */
+#define SCC_XC                 0x00002000              /* XtalControlEn, 1/0: power logic does/doesn't disable crystal when appropriate */
+#define SCC_XP                 0x00004000              /* XtalPU (RO), 1/0: crystal running/disabled */
+#define SCC_CD_MASK            0xffff0000              /* ClockDivider mask, SlowClk = 1/(4+divisor) * crystal/PCI clock */
+#define SCC_CD_SHF             16                      /* CLockDivider shift */
+
+/* clockcontrol_n */
+#define        CN_N1_MASK              0x3f                    /* n1 control */
+#define        CN_N2_MASK              0x3f00                  /* n2 control */
+#define        CN_N2_SHIFT             8
+
+/* clockcontrol_sb/pci/uart */
+#define        CC_M1_MASK              0x3f                    /* m1 control */
+#define        CC_M2_MASK              0x3f00                  /* m2 control */
+#define        CC_M2_SHIFT             8
+#define        CC_M3_MASK              0x3f0000                /* m3 control */
+#define        CC_M3_SHIFT             16
+#define        CC_MC_MASK              0x1f000000              /* mux control */
+#define        CC_MC_SHIFT             24
+
+/* N3M Clock control values for 125Mhz */
+#define        CC_125_N                0x0802                  /* Default values for bcm4310 */
+#define        CC_125_M                0x04020009
+#define        CC_125_M25              0x11090009
+#define        CC_125_M33              0x11090005
+
+/* N3M Clock control magic field values */
+#define        CC_F6_2                 0x02                    /* A factor of 2 in */
+#define        CC_F6_3                 0x03                    /* 6-bit fields like */
+#define        CC_F6_4                 0x05                    /* N1, M1 or M3 */
+#define        CC_F6_5                 0x09
+#define        CC_F6_6                 0x11
+#define        CC_F6_7                 0x21
+
+#define        CC_F5_BIAS              5                       /* 5-bit fields get this added */
+
+#define        CC_MC_BYPASS            0x08
+#define        CC_MC_M1                0x04
+#define        CC_MC_M1M2              0x02
+#define        CC_MC_M1M2M3            0x01
+#define        CC_MC_M1M3              0x11
+
+/* Type 2 Clock control magic field values */
+#define        CC_T2_BIAS              2                       /* n1, n2, m1 & m3 bias */
+#define        CC_T2M2_BIAS            3                       /* m2 bias */
+
+#define        CC_T2MC_M1BYP           1
+#define        CC_T2MC_M2BYP           2
+#define        CC_T2MC_M3BYP           4
+
+/* Common clock base */
+#define        CC_CLOCK_BASE           24000000                /* Half the clock freq */
+
+/* Flash types in the chipcommon capabilities register */
+#define FLASH_NONE             0x000           /* No flash */
+#define SFLASH_ST              0x100           /* ST serial flash */
+#define SFLASH_AT              0x200           /* Atmel serial flash */
+#define        PFLASH                  0x700           /* Parallel flash */
+
+/* Bits in the config registers */
+#define        CC_CFG_EN               0x0001          /* Enable */
+#define        CC_CFG_EM_MASK          0x000e          /* Extif Mode */
+#define        CC_CFG_EM_ASYNC         0x0002          /*   Async/Parallel flash */
+#define        CC_CFG_EM_SYNC          0x0004          /*   Synchronous */
+#define        CC_CFG_EM_PCMCIA        0x0008          /*   PCMCIA */
+#define        CC_CFG_EM_IDE           0x000a          /*   IDE */
+#define        CC_CFG_DS               0x0010          /* Data size, 0=8bit, 1=16bit */
+#define        CC_CFG_CD_MASK          0x0060          /* Sync: Clock divisor */
+#define        CC_CFG_CE               0x0080          /* Sync: Clock enable */
+#define        CC_CFG_SB               0x0100          /* Sync: Size/Bytestrobe */
+
+/* Start/busy bit in flashcontrol */
+#define SFLASH_START           0x80000000
+#define SFLASH_BUSY            SFLASH_START
+
+/* flashcontrol opcodes for ST flashes */
+#define SFLASH_ST_WREN         0x0006          /* Write Enable */
+#define SFLASH_ST_WRDIS                0x0004          /* Write Disable */
+#define SFLASH_ST_RDSR         0x0105          /* Read Status Register */
+#define SFLASH_ST_WRSR         0x0101          /* Write Status Register */
+#define SFLASH_ST_READ         0x0303          /* Read Data Bytes */
+#define SFLASH_ST_PP           0x0302          /* Page Program */
+#define SFLASH_ST_SE           0x02d8          /* Sector Erase */
+#define SFLASH_ST_BE           0x00c7          /* Bulk Erase */
+#define SFLASH_ST_DP           0x00b9          /* Deep Power-down */
+#define SFLASH_ST_RES          0x03ab          /* Read Electronic Signature */
+
+/* Status register bits for ST flashes */
+#define SFLASH_ST_WIP          0x01            /* Write In Progress */
+#define SFLASH_ST_WEL          0x02            /* Write Enable Latch */
+#define SFLASH_ST_BP_MASK      0x1c            /* Block Protect */
+#define SFLASH_ST_BP_SHIFT     2
+#define SFLASH_ST_SRWD         0x80            /* Status Register Write Disable */
+
+/* flashcontrol opcodes for Atmel flashes */
+#define SFLASH_AT_READ                         0x07e8
+#define SFLASH_AT_PAGE_READ                    0x07d2
+#define SFLASH_AT_BUF1_READ
+#define SFLASH_AT_BUF2_READ
+#define SFLASH_AT_STATUS                       0x01d7
+#define SFLASH_AT_BUF1_WRITE                   0x0384
+#define SFLASH_AT_BUF2_WRITE                   0x0387
+#define SFLASH_AT_BUF1_ERASE_PROGRAM           0x0283
+#define SFLASH_AT_BUF2_ERASE_PROGRAM           0x0286
+#define SFLASH_AT_BUF1_PROGRAM                 0x0288
+#define SFLASH_AT_BUF2_PROGRAM                 0x0289
+#define SFLASH_AT_PAGE_ERASE                   0x0281
+#define SFLASH_AT_BLOCK_ERASE                  0x0250
+#define SFLASH_AT_BUF1_WRITE_ERASE_PROGRAM     0x0382
+#define SFLASH_AT_BUF2_WRITE_ERASE_PROGRAM     0x0385
+#define SFLASH_AT_BUF1_LOAD                    0x0253
+#define SFLASH_AT_BUF2_LOAD                    0x0255
+#define SFLASH_AT_BUF1_COMPARE                 0x0260
+#define SFLASH_AT_BUF2_COMPARE                 0x0261
+#define SFLASH_AT_BUF1_REPROGRAM               0x0258
+#define SFLASH_AT_BUF2_REPROGRAM               0x0259
+
+/* Status register bits for Atmel flashes */
+#define SFLASH_AT_READY                                0x80
+#define SFLASH_AT_MISMATCH                     0x40
+#define SFLASH_AT_ID_MASK                      0x38
+#define SFLASH_AT_ID_SHIFT                     3
+
+#endif /* _SBCHIPC_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbconfig.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbconfig.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbconfig.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbconfig.h   2005-08-28 11:12:20.469853224 +0200
@@ -0,0 +1,296 @@
+/*
+ * Broadcom SiliconBackplane hardware register definitions.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _SBCONFIG_H
+#define        _SBCONFIG_H
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif
+
+/*
+ * SiliconBackplane Address Map.
+ * All regions may not exist on all chips.
+ */
+#define SB_SDRAM_BASE          0x00000000      /* Physical SDRAM */
+#define SB_PCI_MEM             0x08000000      /* Host Mode PCI memory access space (64 MB) */
+#define SB_PCI_CFG             0x0c000000      /* Host Mode PCI configuration space (64 MB) */
+#define        SB_SDRAM_SWAPPED        0x10000000      /* Byteswapped Physical SDRAM */
+#define SB_ENUM_BASE           0x18000000      /* Enumeration space base */
+#define        SB_ENUM_LIM             0x18010000      /* Enumeration space limit */
+#define        SB_EXTIF_BASE           0x1f000000      /* External Interface region base address */
+#define SB_PCI_DMA             0x40000000      /* Client Mode PCI memory access space (1 GB) */
+#define        SB_EUART                (SB_EXTIF_BASE + 0x00800000)
+#define        SB_LED                  (SB_EXTIF_BASE + 0x00900000)
+
+/* enumeration space related defs */
+#define SB_CORE_SIZE           0x1000          /* each core gets 4Kbytes for registers */
+#define        SB_MAXCORES             ((SB_ENUM_LIM - SB_ENUM_BASE)/SB_CORE_SIZE)
+#define        SBCONFIGOFF             0xf00           /* core sbconfig regs are top 256bytes of regs */
+#define        SBCONFIGSIZE            256             /* sizeof (sbconfig_t) */
+
+/* mips address */
+#define        SB_EJTAG                0xff200000      /* MIPS EJTAG space (2M) */
+
+/*
+ * Sonics Configuration Space Registers.
+ */
+#ifdef _LANGUAGE_ASSEMBLY
+
+#define SBIPSFLAG              0x08
+#define SBTPSFLAG              0x18
+#define        SBTMERRLOGA             0x48            /* sonics >= 2.3 */
+#define        SBTMERRLOG              0x50            /* sonics >= 2.3 */
+#define SBADMATCH3             0x60
+#define SBADMATCH2             0x68
+#define SBADMATCH1             0x70
+#define SBIMSTATE              0x90
+#define SBINTVEC               0x94
+#define SBTMSTATELOW           0x98
+#define SBTMSTATEHIGH          0x9c
+#define SBBWA0                 0xa0
+#define SBIMCONFIGLOW          0xa8
+#define SBIMCONFIGHIGH         0xac
+#define SBADMATCH0             0xb0
+#define SBTMCONFIGLOW          0xb8
+#define SBTMCONFIGHIGH         0xbc
+#define SBBCONFIG              0xc0
+#define SBBSTATE               0xc8
+#define SBACTCNFG              0xd8
+#define        SBFLAGST                0xe8
+#define SBIDLOW                        0xf8
+#define SBIDHIGH               0xfc
+
+
+#else
+
+typedef volatile struct _sbconfig {
+       uint32  PAD[2];
+       uint32  sbipsflag;              /* initiator port ocp slave flag */
+       uint32  PAD[3];
+       uint32  sbtpsflag;              /* target port ocp slave flag */
+       uint32  PAD[11];
+       uint32  sbtmerrloga;            /* (sonics >= 2.3) */
+       uint32  PAD;
+       uint32  sbtmerrlog;             /* (sonics >= 2.3) */
+       uint32  PAD[3];
+       uint32  sbadmatch3;             /* address match3 */
+       uint32  PAD;
+       uint32  sbadmatch2;             /* address match2 */
+       uint32  PAD;
+       uint32  sbadmatch1;             /* address match1 */
+       uint32  PAD[7];
+       uint32  sbimstate;              /* initiator agent state */
+       uint32  sbintvec;               /* interrupt mask */
+       uint32  sbtmstatelow;           /* target state */
+       uint32  sbtmstatehigh;          /* target state */
+       uint32  sbbwa0;                 /* bandwidth allocation table0 */
+       uint32  PAD;
+       uint32  sbimconfiglow;          /* initiator configuration */
+       uint32  sbimconfighigh;         /* initiator configuration */
+       uint32  sbadmatch0;             /* address match0 */
+       uint32  PAD;
+       uint32  sbtmconfiglow;          /* target configuration */
+       uint32  sbtmconfighigh;         /* target configuration */
+       uint32  sbbconfig;              /* broadcast configuration */
+       uint32  PAD;
+       uint32  sbbstate;               /* broadcast state */
+       uint32  PAD[3];
+       uint32  sbactcnfg;              /* activate configuration */
+       uint32  PAD[3];
+       uint32  sbflagst;               /* current sbflags */
+       uint32  PAD[3];
+       uint32  sbidlow;                /* identification */
+       uint32  sbidhigh;               /* identification */
+} sbconfig_t;
+
+#endif /* _LANGUAGE_ASSEMBLY */
+
+/* sbipsflag */
+#define        SBIPS_INT1_MASK         0x3f            /* which sbflags get routed to mips interrupt 1 */
+#define        SBIPS_INT1_SHIFT        0
+#define        SBIPS_INT2_MASK         0x3f00          /* which sbflags get routed to mips interrupt 2 */
+#define        SBIPS_INT2_SHIFT        8
+#define        SBIPS_INT3_MASK         0x3f0000        /* which sbflags get routed to mips interrupt 3 */
+#define        SBIPS_INT3_SHIFT        16
+#define        SBIPS_INT4_MASK         0x3f000000      /* which sbflags get routed to mips interrupt 4 */
+#define        SBIPS_INT4_SHIFT        24
+
+/* sbtpsflag */
+#define        SBTPS_NUM0_MASK         0x3f            /* interrupt sbFlag # generated by this core */
+#define        SBTPS_F0EN0             0x40            /* interrupt is always sent on the backplane */
+
+/* sbtmerrlog */
+#define        SBTMEL_CM               0x00000007      /* command */
+#define        SBTMEL_CI               0x0000ff00      /* connection id */
+#define        SBTMEL_EC               0x0f000000      /* error code */
+#define        SBTMEL_ME               0x80000000      /* multiple error */
+
+/* sbimstate */
+#define        SBIM_PC                 0xf             /* pipecount */
+#define        SBIM_AP_MASK            0x30            /* arbitration policy */
+#define        SBIM_AP_BOTH            0x00            /* use both timeslaces and token */
+#define        SBIM_AP_TS              0x10            /* use timesliaces only */
+#define        SBIM_AP_TK              0x20            /* use token only */
+#define        SBIM_AP_RSV             0x30            /* reserved */
+#define        SBIM_IBE                0x20000         /* inbanderror */
+#define        SBIM_TO                 0x40000         /* timeout */
+#define        SBIM_BY                 0x01800000      /* busy (sonics >= 2.3) */
+#define        SBIM_RJ                 0x02000000      /* reject (sonics >= 2.3) */
+
+/* sbtmstatelow */
+#define        SBTML_RESET             0x1             /* reset */
+#define        SBTML_REJ               0x2             /* reject */
+#define        SBTML_CLK               0x10000         /* clock enable */
+#define        SBTML_FGC               0x20000         /* force gated clocks on */
+#define        SBTML_FL_MASK           0x3ffc0000      /* core-specific flags */
+#define        SBTML_PE                0x40000000      /* pme enable */
+#define        SBTML_BE                0x80000000      /* bist enable */
+
+/* sbtmstatehigh */
+#define        SBTMH_SERR              0x1             /* serror */
+#define        SBTMH_INT               0x2             /* interrupt */
+#define        SBTMH_BUSY              0x4             /* busy */
+#define        SBTMH_TO                0x00000020      /* timeout (sonics >= 2.3) */
+#define        SBTMH_FL_MASK           0x1fff0000      /* core-specific flags */
+#define        SBTMH_GCR               0x20000000      /* gated clock request */
+#define        SBTMH_BISTF             0x40000000      /* bist failed */
+#define        SBTMH_BISTD             0x80000000      /* bist done */
+
+/* sbbwa0 */
+#define        SBBWA_TAB0_MASK         0xffff          /* lookup table 0 */
+#define        SBBWA_TAB1_MASK         0xffff          /* lookup table 1 */
+#define        SBBWA_TAB1_SHIFT        16
+
+/* sbimconfiglow */
+#define        SBIMCL_STO_MASK         0x7             /* service timeout */
+#define        SBIMCL_RTO_MASK         0x70            /* request timeout */
+#define        SBIMCL_RTO_SHIFT        4
+#define        SBIMCL_CID_MASK         0xff0000        /* connection id */
+#define        SBIMCL_CID_SHIFT        16
+
+/* sbimconfighigh */
+#define        SBIMCH_IEM_MASK         0xc             /* inband error mode */
+#define        SBIMCH_TEM_MASK         0x30            /* timeout error mode */
+#define        SBIMCH_TEM_SHIFT        4
+#define        SBIMCH_BEM_MASK         0xc0            /* bus error mode */
+#define        SBIMCH_BEM_SHIFT        6
+
+/* sbadmatch0 */
+#define        SBAM_TYPE_MASK          0x3             /* address type */
+#define        SBAM_AD64               0x4             /* reserved */
+#define        SBAM_ADINT0_MASK        0xf8            /* type0 size */
+#define        SBAM_ADINT0_SHIFT       3
+#define        SBAM_ADINT1_MASK        0x1f8           /* type1 size */
+#define        SBAM_ADINT1_SHIFT       3
+#define        SBAM_ADINT2_MASK        0x1f8           /* type2 size */
+#define        SBAM_ADINT2_SHIFT       3
+#define        SBAM_ADEN               0x400           /* enable */
+#define        SBAM_ADNEG              0x800           /* negative decode */
+#define        SBAM_BASE0_MASK         0xffffff00      /* type0 base address */
+#define        SBAM_BASE0_SHIFT        8
+#define        SBAM_BASE1_MASK         0xfffff000      /* type1 base address for the core */
+#define        SBAM_BASE1_SHIFT        12
+#define        SBAM_BASE2_MASK         0xffff0000      /* type2 base address for the core */
+#define        SBAM_BASE2_SHIFT        16
+
+/* sbtmconfiglow */
+#define        SBTMCL_CD_MASK          0xff            /* clock divide */
+#define        SBTMCL_CO_MASK          0xf800          /* clock offset */
+#define        SBTMCL_CO_SHIFT         11
+#define        SBTMCL_IF_MASK          0xfc0000        /* interrupt flags */
+#define        SBTMCL_IF_SHIFT         18
+#define        SBTMCL_IM_MASK          0x3000000       /* interrupt mode */
+#define        SBTMCL_IM_SHIFT         24
+
+/* sbtmconfighigh */
+#define        SBTMCH_BM_MASK          0x3             /* busy mode */
+#define        SBTMCH_RM_MASK          0x3             /* retry mode */
+#define        SBTMCH_RM_SHIFT         2
+#define        SBTMCH_SM_MASK          0x30            /* stop mode */
+#define        SBTMCH_SM_SHIFT         4
+#define        SBTMCH_EM_MASK          0x300           /* sb error mode */
+#define        SBTMCH_EM_SHIFT         8
+#define        SBTMCH_IM_MASK          0xc00           /* int mode */
+#define        SBTMCH_IM_SHIFT         10
+
+/* sbbconfig */
+#define        SBBC_LAT_MASK           0x3             /* sb latency */
+#define        SBBC_MAX0_MASK          0xf0000         /* maxccntr0 */
+#define        SBBC_MAX0_SHIFT         16
+#define        SBBC_MAX1_MASK          0xf00000        /* maxccntr1 */
+#define        SBBC_MAX1_SHIFT         20
+
+/* sbbstate */
+#define        SBBS_SRD                0x1             /* st reg disable */
+#define        SBBS_HRD                0x2             /* hold reg disable */
+
+/* sbidlow */
+#define        SBIDL_CS_MASK           0x3             /* config space */
+#define        SBIDL_AR_MASK           0x38            /* # address ranges supported */
+#define        SBIDL_AR_SHIFT          3
+#define        SBIDL_SYNCH             0x40            /* sync */
+#define        SBIDL_INIT              0x80            /* initiator */
+#define        SBIDL_MINLAT_MASK       0xf00           /* minimum backplane latency */
+#define        SBIDL_MINLAT_SHIFT      8
+#define        SBIDL_MAXLAT            0xf000          /* maximum backplane latency */
+#define        SBIDL_MAXLAT_SHIFT      12
+#define        SBIDL_FIRST             0x10000         /* this initiator is first */
+#define        SBIDL_CW_MASK           0xc0000         /* cycle counter width */
+#define        SBIDL_CW_SHIFT          18
+#define        SBIDL_TP_MASK           0xf00000        /* target ports */
+#define        SBIDL_TP_SHIFT          20
+#define        SBIDL_IP_MASK           0xf000000       /* initiator ports */
+#define        SBIDL_IP_SHIFT          24
+#define        SBIDL_RV_MASK           0xf0000000      /* sonics backplane revision code */
+#define        SBIDL_RV_SHIFT          28
+
+/* sbidhigh */
+#define        SBIDH_RC_MASK           0xf             /* revision code*/
+#define        SBIDH_CC_MASK           0xfff0          /* core code */
+#define        SBIDH_CC_SHIFT          4
+#define        SBIDH_VC_MASK           0xffff0000      /* vendor code */
+#define        SBIDH_VC_SHIFT          16
+
+#define        SB_COMMIT               0xfd8           /* update buffered registers value */
+
+/* vendor codes */
+#define        SB_VEND_BCM             0x4243          /* Broadcom's SB vendor code */
+
+/* core codes */
+#define        SB_CC                   0x800           /* chipcommon core */
+#define        SB_ILINE20              0x801           /* iline20 core */
+#define        SB_SDRAM                0x803           /* sdram core */
+#define        SB_PCI                  0x804           /* pci core */
+#define        SB_MIPS                 0x805           /* mips core */
+#define        SB_ENET                 0x806           /* enet mac core */
+#define        SB_CODEC                0x807           /* v90 codec core */
+#define        SB_USB                  0x808           /* usb 1.1 host/device core */
+#define        SB_ILINE100             0x80a           /* iline100 core */
+#define        SB_IPSEC                0x80b           /* ipsec core */
+#define        SB_PCMCIA               0x80d           /* pcmcia core */
+#define        SB_MEMC                 0x80f           /* memc sdram core */
+#define        SB_EXTIF                0x811           /* external interface core */
+#define        SB_D11                  0x812           /* 802.11 MAC core */
+#define        SB_MIPS33               0x816           /* mips3302 core */
+#define        SB_USB11H               0x817           /* usb 1.1 host core */
+#define        SB_USB11D               0x818           /* usb 1.1 device core */
+#define        SB_USB20H               0x819           /* usb 2.0 host core */
+#define        SB_USB20D               0x81A           /* usb 2.0 device core */
+#define        SB_SDIOH                0x81B           /* sdio host core */
+#define SB_ROBO                 0x81C           /* robo switch core */
+
+#endif /* _SBCONFIG_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbextif.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbextif.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbextif.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbextif.h    2005-08-28 11:12:20.470853072 +0200
@@ -0,0 +1,242 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
+ * for the BCM47xx family of SiliconBackplane-based chips.
+ *
+ * The External Interface core supports a total of three external chip selects
+ * supporting external interfaces. One of the external chip selects is
+ * used for Flash, one is used for PCMCIA, and the other may be
+ * programmed to support either a synchronous interface or an
+ * asynchronous interface. The asynchronous interface can be used to
+ * support external devices such as UARTs and the BCM2019 Bluetooth
+ * baseband processor.
+ * The external interface core also contains 2 on-chip 16550 UARTs, clock
+ * frequency control, a watchdog interrupt timer, and a GPIO interface.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _SBEXTIF_H
+#define        _SBEXTIF_H
+
+/* external interface address space */
+#define        EXTIF_PCMCIA_MEMBASE(x) (x)
+#define        EXTIF_PCMCIA_IOBASE(x)  ((x) + 0x100000)
+#define        EXTIF_PCMCIA_CFGBASE(x) ((x) + 0x200000)
+#define        EXTIF_CFGIF_BASE(x)     ((x) + 0x800000)
+#define        EXTIF_FLASH_BASE(x)     ((x) + 0xc00000)
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif /* PAD */
+
+/*
+ * The multiple instances of output and output enable registers
+ * are present to allow driver software for multiple cores to control
+ * gpio outputs without needing to share a single register pair.
+ */
+struct gpiouser {
+       uint32  out;
+       uint32  outen;
+};
+#define        NGPIOUSER       5
+
+typedef volatile struct {
+       uint32  corecontrol;
+       uint32  extstatus;
+       uint32  PAD[2];
+
+       /* pcmcia control registers */
+       uint32  pcmcia_config;
+       uint32  pcmcia_memwait;
+       uint32  pcmcia_attrwait;
+       uint32  pcmcia_iowait;
+
+       /* programmable interface control registers */
+       uint32  prog_config;
+       uint32  prog_waitcount;
+
+       /* flash control registers */
+       uint32  flash_config;
+       uint32  flash_waitcount;
+       uint32  PAD[4];
+
+       uint32  watchdog;
+
+       /* clock control */
+       uint32  clockcontrol_n;
+       uint32  clockcontrol_sb;
+       uint32  clockcontrol_pci;
+       uint32  clockcontrol_mii;
+       uint32  PAD[3];
+
+       /* gpio */
+       uint32  gpioin;
+       struct gpiouser gpio[NGPIOUSER];
+       uint32  PAD;
+       uint32  ejtagouten;
+       uint32  gpiointpolarity;
+       uint32  gpiointmask;
+       uint32  PAD[153];
+
+       uint8   uartdata;
+       uint8   PAD[3];
+       uint8   uartimer;
+       uint8   PAD[3];
+       uint8   uartfcr;
+       uint8   PAD[3];
+       uint8   uartlcr;
+       uint8   PAD[3];
+       uint8   uartmcr;
+       uint8   PAD[3];
+       uint8   uartlsr;
+       uint8   PAD[3];
+       uint8   uartmsr;
+       uint8   PAD[3];
+       uint8   uartscratch;
+       uint8   PAD[3];
+} extifregs_t;
+
+/* corecontrol */
+#define        CC_UE           (1 << 0)                /* uart enable */
+
+/* extstatus */
+#define        ES_EM           (1 << 0)                /* endian mode (ro) */
+#define        ES_EI           (1 << 1)                /* external interrupt pin (ro) */
+#define        ES_GI           (1 << 2)                /* gpio interrupt pin (ro) */
+
+/* gpio bit mask */
+#define GPIO_BIT0      (1 << 0)
+#define GPIO_BIT1      (1 << 1)
+#define GPIO_BIT2      (1 << 2)
+#define GPIO_BIT3      (1 << 3)
+#define GPIO_BIT4      (1 << 4)
+#define GPIO_BIT5      (1 << 5)
+#define GPIO_BIT6      (1 << 6)
+#define GPIO_BIT7      (1 << 7)
+
+
+/* pcmcia/prog/flash_config */
+#define        CF_EN           (1 << 0)                /* enable */
+#define        CF_EM_MASK      0xe                     /* mode */
+#define        CF_EM_SHIFT     1
+#define        CF_EM_FLASH     0x0                     /* flash/asynchronous mode */
+#define        CF_EM_SYNC      0x2                     /* synchronous mode */
+#define        CF_EM_PCMCIA    0x4                     /* pcmcia mode */
+#define        CF_DS           (1 << 4)                /* destsize:  0=8bit, 1=16bit */
+#define        CF_BS           (1 << 5)                /* byteswap */
+#define        CF_CD_MASK      0xc0                    /* clock divider */
+#define        CF_CD_SHIFT     6
+#define        CF_CD_DIV2      0x0                     /* backplane/2 */
+#define        CF_CD_DIV3      0x40                    /* backplane/3 */
+#define        CF_CD_DIV4      0x80                    /* backplane/4 */
+#define        CF_CE           (1 << 8)                /* clock enable */
+#define        CF_SB           (1 << 9)                /* size/bytestrobe (synch only) */
+
+/* pcmcia_memwait */
+#define        PM_W0_MASK      0x3f                    /* waitcount0 */
+#define        PM_W1_MASK      0x1f00                  /* waitcount1 */
+#define        PM_W1_SHIFT     8
+#define        PM_W2_MASK      0x1f0000                /* waitcount2 */
+#define        PM_W2_SHIFT     16
+#define        PM_W3_MASK      0x1f000000              /* waitcount3 */
+#define        PM_W3_SHIFT     24
+
+/* pcmcia_attrwait */
+#define        PA_W0_MASK      0x3f                    /* waitcount0 */
+#define        PA_W1_MASK      0x1f00                  /* waitcount1 */
+#define        PA_W1_SHIFT     8
+#define        PA_W2_MASK      0x1f0000                /* waitcount2 */
+#define        PA_W2_SHIFT     16
+#define        PA_W3_MASK      0x1f000000              /* waitcount3 */
+#define        PA_W3_SHIFT     24
+
+/* pcmcia_iowait */
+#define        PI_W0_MASK      0x3f                    /* waitcount0 */
+#define        PI_W1_MASK      0x1f00                  /* waitcount1 */
+#define        PI_W1_SHIFT     8
+#define        PI_W2_MASK      0x1f0000                /* waitcount2 */
+#define        PI_W2_SHIFT     16
+#define        PI_W3_MASK      0x1f000000              /* waitcount3 */
+#define        PI_W3_SHIFT     24
+
+/* prog_waitcount */
+#define        PW_W0_MASK      0x0000001f                      /* waitcount0 */
+#define        PW_W1_MASK      0x00001f00                      /* waitcount1 */
+#define        PW_W1_SHIFT     8
+#define        PW_W2_MASK      0x001f0000              /* waitcount2 */
+#define        PW_W2_SHIFT     16
+#define        PW_W3_MASK      0x1f000000              /* waitcount3 */
+#define        PW_W3_SHIFT     24
+
+#define PW_W0       0x0000000c
+#define PW_W1       0x00000a00
+#define PW_W2       0x00020000
+#define PW_W3       0x01000000
+
+/* flash_waitcount */
+#define        FW_W0_MASK      0x1f                    /* waitcount0 */
+#define        FW_W1_MASK      0x1f00                  /* waitcount1 */
+#define        FW_W1_SHIFT     8
+#define        FW_W2_MASK      0x1f0000                /* waitcount2 */
+#define        FW_W2_SHIFT     16
+#define        FW_W3_MASK      0x1f000000              /* waitcount3 */
+#define        FW_W3_SHIFT     24
+
+/* watchdog */
+#define WATCHDOG_CLOCK 48000000                /* Hz */
+
+/* clockcontrol_n */
+#define        CN_N1_MASK      0x3f                    /* n1 control */
+#define        CN_N2_MASK      0x3f00                  /* n2 control */
+#define        CN_N2_SHIFT     8
+
+/* clockcontrol_sb/pci/mii */
+#define        CC_M1_MASK      0x3f                    /* m1 control */
+#define        CC_M2_MASK      0x3f00                  /* m2 control */
+#define        CC_M2_SHIFT     8
+#define        CC_M3_MASK      0x3f0000                /* m3 control */
+#define        CC_M3_SHIFT     16
+#define        CC_MC_MASK      0x1f000000              /* mux control */
+#define        CC_MC_SHIFT     24
+
+/* Clock control default values */
+#define CC_DEF_N       0x0009                  /* Default values for bcm4710 */
+#define CC_DEF_100     0x04020011
+#define CC_DEF_33      0x11030011
+#define CC_DEF_25      0x11050011
+
+/* Clock control values for 125Mhz */
+#define        CC_125_N        0x0802
+#define        CC_125_M        0x04020009
+#define        CC_125_M25      0x11090009
+#define        CC_125_M33      0x11090005
+
+/* Clock control magic field values */
+#define        CC_F6_2         0x02                    /* A factor of 2 in */
+#define        CC_F6_3         0x03                    /*  6-bit fields like */
+#define        CC_F6_4         0x05                    /*  N1, M1 or M3 */
+#define        CC_F6_5         0x09
+#define        CC_F6_6         0x11
+#define        CC_F6_7         0x21
+
+#define        CC_F5_BIAS      5                       /* 5-bit fields get this added */
+
+#define        CC_MC_BYPASS    0x08
+#define        CC_MC_M1        0x04
+#define        CC_MC_M1M2      0x02
+#define        CC_MC_M1M2M3    0x01
+#define        CC_MC_M1M3      0x11
+
+#define        CC_CLOCK_BASE   24000000        /* Half the clock freq. in the 4710 */
+
+#endif /* _SBEXTIF_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmemc.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmemc.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbmemc.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmemc.h     2005-08-28 11:12:20.471852920 +0200
@@ -0,0 +1,144 @@
+/*
+ * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _SBMEMC_H
+#define        _SBMEMC_H
+
+#ifdef _LANGUAGE_ASSEMBLY
+
+#define        MEMC_CONTROL            0x00
+#define        MEMC_CONFIG             0x04
+#define        MEMC_REFRESH            0x08
+#define        MEMC_BISTSTAT           0x0c
+#define        MEMC_MODEBUF            0x10
+#define        MEMC_BKCLS              0x14
+#define        MEMC_PRIORINV           0x18
+#define        MEMC_DRAMTIM            0x1c
+#define        MEMC_INTSTAT            0x20
+#define        MEMC_INTMASK            0x24
+#define        MEMC_INTINFO            0x28
+#define        MEMC_NCDLCTL            0x30
+#define        MEMC_RDNCDLCOR          0x34
+#define        MEMC_WRNCDLCOR          0x38
+#define        MEMC_MISCDLYCTL         0x3c
+#define        MEMC_DQSGATENCDL        0x40
+#define        MEMC_SPARE              0x44
+#define        MEMC_TPADDR             0x48
+#define        MEMC_TPDATA             0x4c
+#define        MEMC_BARRIER            0x50
+#define        MEMC_CORE               0x54
+
+
+#else
+
+/* Sonics side: MEMC core registers */
+typedef volatile struct sbmemcregs {
+       uint32  control;
+       uint32  config;
+       uint32  refresh;
+       uint32  biststat;
+       uint32  modebuf;
+       uint32  bkcls;
+       uint32  priorinv;
+       uint32  dramtim;
+       uint32  intstat;
+       uint32  intmask;
+       uint32  intinfo;
+       uint32  reserved1;
+       uint32  ncdlctl;
+       uint32  rdncdlcor;
+       uint32  wrncdlcor;
+       uint32  miscdlyctl;
+       uint32  dqsgatencdl;
+       uint32  spare;
+       uint32  tpaddr;
+       uint32  tpdata;
+       uint32  barrier;
+       uint32  core;
+} sbmemcregs_t;
+
+#endif
+
+/* MEMC Core Init values (OCP ID 0x80f) */
+
+/* For sdr: */
+#define MEMC_SD_CONFIG_INIT    0x00048000
+#define MEMC_SD_DRAMTIM_INIT   0x000754da
+#define MEMC_SD_RDNCDLCOR_INIT 0x00000000
+#define MEMC_SD_WRNCDLCOR_INIT 0x49351200
+#define MEMC_SD1_WRNCDLCOR_INIT        0x14500200      /* For corerev 1 (4712) */
+#define MEMC_SD_MISCDLYCTL_INIT        0x00061c1b
+#define MEMC_SD1_MISCDLYCTL_INIT 0x00021416    /* For corerev 1 (4712) */
+#define MEMC_SD_CONTROL_INIT0  0x00000002
+#define MEMC_SD_CONTROL_INIT1  0x00000008
+#define MEMC_SD_CONTROL_INIT2  0x00000004
+#define MEMC_SD_CONTROL_INIT3  0x00000010
+#define MEMC_SD_CONTROL_INIT4  0x00000001
+#define MEMC_SD_MODEBUF_INIT   0x00000000
+#define MEMC_SD_REFRESH_INIT   0x0000840f
+
+
+/* This is for SDRM8X8X4 */
+#define        MEMC_SDR_INIT           0x0008
+#define        MEMC_SDR_MODE           0x32
+#define        MEMC_SDR_NCDL           0x00020032
+#define        MEMC_SDR1_NCDL          0x0002020f      /* For corerev 1 (4712) */
+
+/* For ddr: */
+#define MEMC_CONFIG_INIT       0x00048000
+#define MEMC_DRAMTIM_INIT      0x000754d9
+#define MEMC_RDNCDLCOR_INIT    0x00000000
+#define MEMC_WRNCDLCOR_INIT    0x49351200
+#define MEMC_1_WRNCDLCOR_INIT  0x14500200
+#define MEMC_DQSGATENCDL_INIT  0x00030000
+#define MEMC_MISCDLYCTL_INIT   0x21061c1b
+#define MEMC_1_MISCDLYCTL_INIT 0x21021400
+#define MEMC_NCDLCTL_INIT      0x00002001
+#define MEMC_CONTROL_INIT0     0x00000002
+#define MEMC_CONTROL_INIT1     0x00000008
+#define MEMC_MODEBUF_INIT0     0x00004000
+#define MEMC_CONTROL_INIT2     0x00000010
+#define MEMC_MODEBUF_INIT1     0x00000100
+#define MEMC_CONTROL_INIT3     0x00000010
+#define MEMC_CONTROL_INIT4     0x00000008
+#define MEMC_REFRESH_INIT      0x0000840f
+#define MEMC_CONTROL_INIT5     0x00000004
+#define MEMC_MODEBUF_INIT2     0x00000000
+#define MEMC_CONTROL_INIT6     0x00000010
+#define MEMC_CONTROL_INIT7     0x00000001
+
+
+/* This is for DDRM16X16X2 */
+#define        MEMC_DDR_INIT           0x0009
+#define        MEMC_DDR_MODE           0x62
+#define        MEMC_DDR_NCDL           0x0005050a
+#define        MEMC_DDR1_NCDL          0x00000a0a      /* For corerev 1 (4712) */
+
+/* mask for sdr/ddr calibration registers */
+#define MEMC_RDNCDLCOR_RD_MASK 0x000000ff
+#define MEMC_WRNCDLCOR_WR_MASK 0x000000ff
+#define MEMC_DQSGATENCDL_G_MASK        0x000000ff
+
+/* masks for miscdlyctl registers */
+#define MEMC_MISC_SM_MASK      0x30000000
+#define MEMC_MISC_SM_SHIFT     28
+#define MEMC_MISC_SD_MASK      0x0f000000
+#define MEMC_MISC_SD_SHIFT     24
+
+/* hw threshhold for calculating wr/rd for sdr memc */
+#define MEMC_CD_THRESHOLD      128
+
+/* Low bit of init register says if memc is ddr or sdr */
+#define MEMC_CONFIG_DDR                0x00000001
+
+#endif /* _SBMEMC_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbmips.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmips.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbmips.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbmips.h     2005-08-28 11:12:20.471852920 +0200
@@ -0,0 +1,56 @@
+/*
+ * Broadcom SiliconBackplane MIPS definitions
+ *
+ * SB MIPS cores are custom MIPS32 processors with SiliconBackplane
+ * OCP interfaces. The CP0 processor ID is 0x00024000, where bits
+ * 23:16 mean Broadcom and bits 15:8 mean a MIPS core with an OCP
+ * interface. The core revision is stored in the SB ID register in SB
+ * configuration space.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef        _SBMIPS_H
+#define        _SBMIPS_H
+
+#ifndef _LANGUAGE_ASSEMBLY
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif /* PAD */
+
+typedef volatile struct {
+       uint32  corecontrol;
+       uint32  PAD[2];
+       uint32  biststatus;
+       uint32  PAD[4];
+       uint32  intstatus;
+       uint32  intmask;
+       uint32  timer;
+} mipsregs_t;
+
+extern uint32 sb_flag(void *sbh);
+extern uint sb_irq(void *sbh);
+
+extern void sb_serial_init(void *sbh, void (*add)(void *regs, uint irq, uint baud_base, uint reg_shift));
+
+extern void sb_mips_init(void *sbh);
+extern uint32 sb_mips_clock(void *sbh);
+extern bool sb_mips_setclock(void *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock);
+
+extern uint32 sb_memc_get_ncdl(void *sbh);
+
+#endif /* _LANGUAGE_ASSEMBLY */
+
+#endif /* _SBMIPS_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpci.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpci.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbpci.h   1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpci.h      2005-08-28 11:12:20.471852920 +0200
@@ -0,0 +1,113 @@
+/*
+ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
+ *
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ */
+
+#ifndef        _SBPCI_H
+#define        _SBPCI_H
+
+/* cpp contortions to concatenate w/arg prescan */
+#ifndef PAD
+#define        _PADLINE(line)  pad ## line
+#define        _XSTR(line)     _PADLINE(line)
+#define        PAD             _XSTR(__LINE__)
+#endif
+
+/* Sonics side: PCI core and host control registers */
+typedef struct sbpciregs {
+       uint32 control;         /* PCI control */
+       uint32 PAD[3];
+       uint32 arbcontrol;      /* PCI arbiter control */
+       uint32 PAD[3];
+       uint32 intstatus;       /* Interrupt status */
+       uint32 intmask;         /* Interrupt mask */
+       uint32 sbtopcimailbox;  /* Sonics to PCI mailbox */
+       uint32 PAD[9];
+       uint32 bcastaddr;       /* Sonics broadcast address */
+       uint32 bcastdata;       /* Sonics broadcast data */
+       uint32 PAD[2];
+       uint32 gpioin;          /* ro: gpio input (>=rev2) */
+       uint32 gpioout;         /* rw: gpio output (>=rev2) */
+       uint32 gpioouten;       /* rw: gpio output enable (>= rev2) */
+       uint32 gpiocontrol;     /* rw: gpio control (>= rev2) */
+       uint32 PAD[36];
+       uint32 sbtopci0;        /* Sonics to PCI translation 0 */
+       uint32 sbtopci1;        /* Sonics to PCI translation 1 */
+       uint32 sbtopci2;        /* Sonics to PCI translation 2 */
+       uint32 PAD[445];
+       uint16 sprom[36];       /* SPROM shadow Area */
+       uint32 PAD[46];
+} sbpciregs_t;
+
+/* PCI control */
+#define PCI_RST_OE     0x01    /* When set, drives PCI_RESET out to pin */
+#define PCI_RST                0x02    /* Value driven out to pin */
+#define PCI_CLK_OE     0x04    /* When set, drives clock as gated by PCI_CLK out to pin */
+#define PCI_CLK                0x08    /* Gate for clock driven out to pin */  
+
+/* PCI arbiter control */
+#define PCI_INT_ARB    0x01    /* When set, use an internal arbiter */
+#define PCI_EXT_ARB    0x02    /* When set, use an external arbiter */
+#define PCI_PARKID_MASK        0x06    /* Selects which agent is parked on an idle bus */
+#define PCI_PARKID_SHIFT   1
+#define PCI_PARKID_LAST           0    /* Last requestor */
+#define PCI_PARKID_4710           1    /* 4710 */
+#define PCI_PARKID_EXTREQ0 2   /* External requestor 0 */
+#define PCI_PARKID_EXTREQ1 3   /* External requestor 1 */
+
+/* Interrupt status/mask */
+#define PCI_INTA       0x01    /* PCI INTA# is asserted */
+#define PCI_INTB       0x02    /* PCI INTB# is asserted */
+#define PCI_SERR       0x04    /* PCI SERR# has been asserted (write one to clear) */
+#define PCI_PERR       0x08    /* PCI PERR# has been asserted (write one to clear) */
+#define PCI_PME                0x10    /* PCI PME# is asserted */
+
+/* (General) PCI/SB mailbox interrupts, two bits per pci function */
+#define        MAILBOX_F0_0    0x100   /* function 0, int 0 */
+#define        MAILBOX_F0_1    0x200   /* function 0, int 1 */
+#define        MAILBOX_F1_0    0x400   /* function 1, int 0 */
+#define        MAILBOX_F1_1    0x800   /* function 1, int 1 */
+#define        MAILBOX_F2_0    0x1000  /* function 2, int 0 */
+#define        MAILBOX_F2_1    0x2000  /* function 2, int 1 */
+#define        MAILBOX_F3_0    0x4000  /* function 3, int 0 */
+#define        MAILBOX_F3_1    0x8000  /* function 3, int 1 */
+
+/* Sonics broadcast address */
+#define BCAST_ADDR_MASK        0xff    /* Broadcast register address */
+
+/* Sonics to PCI translation types */
+#define SBTOPCI0_MASK  0xfc000000
+#define SBTOPCI1_MASK  0xfc000000
+#define SBTOPCI2_MASK  0xc0000000
+#define SBTOPCI_MEM    0
+#define SBTOPCI_IO     1
+#define SBTOPCI_CFG0   2
+#define SBTOPCI_CFG1   3
+#define        SBTOPCI_PREF    0x4     /* prefetch enable */
+#define        SBTOPCI_BURST   0x8     /* burst enable */
+
+/* PCI side: Reserved PCI configuration registers (see pcicfg.h) */
+#define cap_list       rsvd_a[0]
+#define bar0_window    dev_dep[0x80 - 0x40]
+#define bar1_window    dev_dep[0x84 - 0x40]
+#define sprom_control  dev_dep[0x88 - 0x40]
+
+#ifndef _LANGUAGE_ASSEMBLY
+
+extern int sbpci_read_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len);
+extern int sbpci_write_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len);
+extern void sbpci_ban(uint16 core);
+extern int sbpci_init(void *sbh);
+extern void sbpci_check(void *sbh);
+
+#endif /* !_LANGUAGE_ASSEMBLY */
+
+#endif /* _SBPCI_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbpcmcia.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpcmcia.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbpcmcia.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbpcmcia.h   2005-08-28 11:12:20.472852768 +0200
@@ -0,0 +1,131 @@
+/*
+ * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions.
+ *
+ * $Id$
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ */
+
+#ifndef        _SBPCMCIA_H
+#define        _SBPCMCIA_H
+
+
+/* All the addresses that are offsets in attribute space are divided
+ * by two to account for the fact that odd bytes are invalid in
+ * attribute space and our read/write routines make the space appear
+ * as if they didn't exist. Still we want to show the original numbers
+ * as documented in the hnd_pcmcia core manual.
+ */
+
+/* PCMCIA Function Configuration Registers */
+#define        PCMCIA_FCR              (0x700 / 2)
+
+#define        FCR0_OFF                0
+#define        FCR1_OFF                (0x40 / 2)
+#define        FCR2_OFF                (0x80 / 2)
+#define        FCR3_OFF                (0xc0 / 2)
+
+#define        PCMCIA_FCR0             (0x700 / 2)
+#define        PCMCIA_FCR1             (0x740 / 2)
+#define        PCMCIA_FCR2             (0x780 / 2)
+#define        PCMCIA_FCR3             (0x7c0 / 2)
+
+/* Standard PCMCIA FCR registers */
+
+#define        PCMCIA_COR              0
+
+#define        COR_RST                 0x80
+#define        COR_LEV                 0x40
+#define        COR_IRQEN               0x04
+#define        COR_BLREN               0x01
+#define        COR_FUNEN               0x01
+
+
+#define        PCICIA_FCSR             (2 / 2)
+#define        PCICIA_PRR              (4 / 2)
+#define        PCICIA_SCR              (6 / 2)
+#define        PCICIA_ESR              (8 / 2)
+
+
+#define PCM_MEMOFF             0x0000
+#define F0_MEMOFF              0x1000
+#define F1_MEMOFF              0x2000
+#define F2_MEMOFF              0x3000
+#define F3_MEMOFF              0x4000
+
+/* Memory base in the function fcr's */
+#define MEM_ADDR0              (0x728 / 2)
+#define MEM_ADDR1              (0x72a / 2)
+#define MEM_ADDR2              (0x72c / 2)
+
+/* PCMCIA base plus Srom access in fcr0: */
+#define PCMCIA_ADDR0           (0x072e / 2)
+#define PCMCIA_ADDR1           (0x0730 / 2)
+#define PCMCIA_ADDR2           (0x0732 / 2)
+
+#define MEM_SEG                        (0x0734 / 2)
+#define SROM_CS                        (0x0736 / 2)
+#define SROM_DATAL             (0x0738 / 2)
+#define SROM_DATAH             (0x073a / 2)
+#define SROM_ADDRL             (0x073c / 2)
+#define SROM_ADDRH             (0x073e / 2)
+
+/*  Values for srom_cs: */
+#define SROM_IDLE              0
+#define SROM_WRITE             1
+#define SROM_READ              2
+#define SROM_WEN               4
+#define SROM_WDS               7
+#define SROM_DONE              8
+
+/* CIS stuff */
+
+/* The CIS stops where the FCRs start */
+#define        CIS_SIZE                PCMCIA_FCR
+
+/* Standard tuples we know about */
+
+#define        CISTPL_MANFID           0x20            /* Manufacturer and device id */
+#define        CISTPL_FUNCE            0x22            /* Function extensions */
+#define        CISTPL_CFTABLE          0x1b            /* Config table entry */
+
+/* Function extensions for LANs */
+
+#define        LAN_TECH                1               /* Technology type */
+#define        LAN_SPEED               2               /* Raw bit rate */
+#define        LAN_MEDIA               3               /* Transmission media */
+#define        LAN_NID                 4               /* Node identification (aka MAC addr) */
+#define        LAN_CONN                5               /* Connector standard */
+
+
+/* CFTable */
+#define CFTABLE_REGWIN_2K      0x08            /* 2k reg windows size */
+#define CFTABLE_REGWIN_4K      0x10            /* 4k reg windows size */
+#define CFTABLE_REGWIN_8K      0x20            /* 8k reg windows size */
+
+/* Vendor unique tuples are 0x80-0x8f. Within Broadcom we'll
+ * take one for HNBU, and use "extensions" (a la FUNCE) within it.
+ */
+
+#define        CISTPL_BRCM_HNBU        0x80
+
+/* Subtypes of BRCM_HNBU: */
+
+#define        HNBU_CHIPID             0x01            /* Six bytes with PCI vendor &
+                                                * device id and chiprev
+                                                */
+#define        HNBU_BOARDREV           0x02            /* Two bytes board revision */
+#define        HNBU_PAPARMS            0x03            /* Eleven bytes PA parameters */
+#define        HNBU_OEM                0x04            /* Eight bytes OEM data */
+#define        HNBU_CC                 0x05            /* Default country code */
+#define        HNBU_AA                 0x06            /* Antennas available */
+#define        HNBU_AG                 0x07            /* Antenna gain */
+#define HNBU_BOARDFLAGS                0x08            /* board flags */
+#define HNBU_LED               0x09            /* LED set */
+
+#endif /* _SBPCMCIA_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbsdram.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbsdram.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbsdram.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbsdram.h    2005-08-28 11:12:20.472852768 +0200
@@ -0,0 +1,75 @@
+/*
+ * BCM47XX Sonics SiliconBackplane SDRAM controller core hardware definitions.
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef        _SBSDRAM_H
+#define        _SBSDRAM_H
+
+#ifndef _LANGUAGE_ASSEMBLY
+
+/* Sonics side: SDRAM core registers */
+typedef volatile struct sbsdramregs {
+       uint32  initcontrol;    /* Generates external SDRAM initialization sequence */
+       uint32  config;         /* Initializes external SDRAM mode register */
+       uint32  refresh;        /* Controls external SDRAM refresh rate */
+       uint32  pad1;
+       uint32  pad2;
+} sbsdramregs_t;
+
+#endif
+
+/* SDRAM initialization control (initcontrol) register bits */
+#define SDRAM_CBR      0x0001  /* Writing 1 generates refresh cycle and toggles bit */
+#define SDRAM_PRE      0x0002  /* Writing 1 generates precharge cycle and toggles bit */
+#define SDRAM_MRS      0x0004  /* Writing 1 generates mode register select cycle and toggles bit */
+#define SDRAM_EN       0x0008  /* When set, enables access to SDRAM */
+#define SDRAM_16Mb     0x0000  /* Use 16 Megabit SDRAM */
+#define SDRAM_64Mb     0x0010  /* Use 64 Megabit SDRAM */
+#define SDRAM_128Mb    0x0020  /* Use 128 Megabit SDRAM */
+#define SDRAM_RSVMb    0x0030  /* Use special SDRAM */
+#define SDRAM_RST      0x0080  /* Writing 1 causes soft reset of controller */
+#define SDRAM_SELFREF  0x0100  /* Writing 1 enables self refresh mode */
+#define SDRAM_PWRDOWN  0x0200  /* Writing 1 causes controller to power down */
+#define SDRAM_32BIT    0x0400  /* When set, indicates 32 bit SDRAM interface */
+#define SDRAM_9BITCOL  0x0800  /* When set, indicates 9 bit column */
+
+/* SDRAM configuration (config) register bits */
+#define SDRAM_BURSTFULL        0x0000  /* Use full page bursts */
+#define SDRAM_BURST8   0x0001  /* Use burst of 8 */
+#define SDRAM_BURST4   0x0002  /* Use burst of 4 */
+#define SDRAM_BURST2   0x0003  /* Use burst of 2 */
+#define SDRAM_CAS3     0x0000  /* Use CAS latency of 3 */
+#define SDRAM_CAS2     0x0004  /* Use CAS latency of 2 */
+
+/* SDRAM refresh control (refresh) register bits */
+#define SDRAM_REF(p)   (((p)&0xff) | SDRAM_REF_EN)     /* Refresh period */
+#define SDRAM_REF_EN   0x8000          /* Writing 1 enables periodic refresh */
+
+/* SDRAM Core default Init values (OCP ID 0x803) */
+#define SDRAM_INIT     MEM4MX16X2
+#define SDRAM_CONFIG    SDRAM_BURSTFULL
+#define SDRAM_REFRESH   SDRAM_REF(0x40)
+
+#define MEM1MX16       0x009   /* 2 MB */
+#define MEM1MX16X2     0x409   /* 4 MB */
+#define MEM2MX8X2      0x809   /* 4 MB */
+#define MEM2MX8X4      0xc09   /* 8 MB */
+#define MEM2MX32       0x439   /* 8 MB */
+#define MEM4MX16       0x019   /* 8 MB */
+#define MEM4MX16X2     0x419   /* 16 MB */
+#define MEM8MX8X2      0x819   /* 16 MB */
+#define MEM8MX16       0x829   /* 16 MB */
+#define MEM4MX32       0x429   /* 16 MB */
+#define MEM8MX8X4      0xc19   /* 32 MB */
+#define MEM8MX16X2     0xc29   /* 32 MB */
+
+#endif /* _SBSDRAM_H */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sbutils.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbutils.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sbutils.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sbutils.h    2005-08-28 11:12:20.473852616 +0200
@@ -0,0 +1,90 @@
+/*
+ * Misc utility routines for accessing chip-specific features
+ * of Broadcom HNBU SiliconBackplane-based chips.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef        _sbutils_h_
+#define        _sbutils_h_
+
+/* Board styles (bustype) */
+#define        BOARDSTYLE_SOC          0               /* Silicon Backplane */
+#define        BOARDSTYLE_PCI          1               /* PCI/MiniPCI board */
+#define        BOARDSTYLE_PCMCIA       2               /* PCMCIA board */
+#define        BOARDSTYLE_CARDBUS      3               /* Cardbus board */
+
+/*
+ * Many of the routines below take an 'sbh' handle as their first arg.
+ * Allocate this by calling sb_attach().  Free it by calling sb_detach().
+ * At any one time, the sbh is logically focused on one particular sb core
+ * (the "current core").
+ * Use sb_setcore() or sb_setcoreidx() to change the association to another core.
+ */
+
+/* exported externs */
+extern void *sb_attach(uint pcidev, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz);
+extern void *sb_kattach(void);
+extern void sb_detach(void *sbh);
+extern uint sb_chip(void *sbh);
+extern uint sb_chiprev(void *sbh);
+extern uint sb_chippkg(void *sbh);
+extern uint sb_boardvendor(void *sbh);
+extern uint sb_boardtype(void *sbh);
+extern uint sb_boardstyle(void *sbh);
+extern uint sb_bus(void *sbh);
+extern uint sb_corelist(void *sbh, uint coreid[]);
+extern uint sb_coreid(void *sbh);
+extern uint sb_coreidx(void *sbh);
+extern uint sb_coreunit(void *sbh);
+extern uint sb_corevendor(void *sbh);
+extern uint sb_corerev(void *sbh);
+extern void *sb_coreregs(void *sbh);
+extern uint32 sb_coreflags(void *sbh, uint32 mask, uint32 val);
+extern uint32 sb_coreflagshi(void *sbh, uint32 mask, uint32 val);
+extern bool sb_iscoreup(void *sbh);
+extern void *sb_setcoreidx(void *sbh, uint coreidx);
+extern void *sb_setcore(void *sbh, uint coreid, uint coreunit);
+extern void sb_commit(void *sbh);
+extern uint32 sb_base(uint32 admatch);
+extern uint32 sb_size(uint32 admatch);
+extern void sb_core_reset(void *sbh, uint32 bits);
+extern void sb_core_tofixup(void *sbh);
+extern void sb_core_disable(void *sbh, uint32 bits);
+extern uint32 sb_clock_rate(uint32 pll_type, uint32 n, uint32 m);
+extern uint32 sb_clock(void *sbh);
+extern void sb_pci_setup(void *sbh, uint32 *dmaoffset, uint coremask);
+extern void sb_pcmcia_init(void *sbh);
+extern void sb_watchdog(void *sbh, uint ticks);
+extern void *sb_gpiosetcore(void *sbh);
+extern uint32 sb_gpiocontrol(void *sbh, uint32 mask, uint32 val);
+extern uint32 sb_gpioouten(void *sbh, uint32 mask, uint32 val);
+extern uint32 sb_gpioout(void *sbh, uint32 mask, uint32 val);
+extern uint32 sb_gpioin(void *sbh);
+extern uint32 sb_gpiointpolarity(void *sbh, uint32 mask, uint32 val);
+extern uint32 sb_gpiointmask(void *sbh, uint32 mask, uint32 val);
+extern bool sb_taclear(void *sbh);
+extern void sb_pwrctl_init(void *sbh);
+extern uint16 sb_pwrctl_fast_pwrup_delay(void *sbh);
+extern bool sb_pwrctl_clk(void *sbh, uint mode);
+extern int sb_pwrctl_xtal(void *sbh, uint what, bool on);
+extern void sb_register_intr_callback(void *sbh, void *intrsoff_fn, void *intrsrestore_fn, void *intr_arg);
+
+/* pwrctl xtal what flags */
+#define        XTAL            0x1                     /* primary crystal oscillator (2050) */
+#define        PLL             0x2                     /* main chip pll */
+
+/* pwrctl clk mode */
+#define        CLK_FAST        0                       /* force fast (pll) clock */
+#define        CLK_SLOW        1                       /* force slow clock */
+#define        CLK_DYNAMIC     2                       /* enable dynamic power control */
+
+#endif /* _sbutils_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/sflash.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sflash.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/sflash.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/sflash.h     2005-08-28 11:12:20.473852616 +0200
@@ -0,0 +1,46 @@
+/*
+ * Broadcom SiliconBackplane chipcommon serial flash interface
+ *
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ *
+ * $Id$
+ */
+
+#ifndef _sflash_h_
+#define _sflash_h_
+
+#include <typedefs.h>
+#include <sbchipc.h>
+
+/* GPIO based bank selection (1 GPIO bit) */
+#define SFLASH_MAX_BANKS       1
+#define SFLASH_GPIO_SHIFT      2
+#define SFLASH_GPIO_MASK       ((SFLASH_MAX_BANKS - 1) << SFLASH_GPIO_SHIFT)
+
+struct sflash_bank {
+       uint offset;                                    /* Byte offset */
+       uint erasesize;                                 /* Block size */
+       uint numblocks;                                 /* Number of blocks */
+       uint size;                                      /* Total bank size in bytes */
+};
+
+struct sflash {
+       struct sflash_bank banks[SFLASH_MAX_BANKS];     /* GPIO selectable banks */
+       uint32 type;                                    /* Type */
+       uint size;                                      /* Total array size in bytes */
+};
+
+/* Utility functions */
+extern int sflash_poll(chipcregs_t *cc, uint offset);
+extern int sflash_read(chipcregs_t *cc, uint offset, uint len, uchar *buf);
+extern int sflash_write(chipcregs_t *cc, uint offset, uint len, const uchar *buf);
+extern int sflash_erase(chipcregs_t *cc, uint offset);
+extern struct sflash * sflash_init(chipcregs_t *cc);
+
+#endif /* _sflash_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/trxhdr.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/trxhdr.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/trxhdr.h  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/trxhdr.h     2005-08-28 11:12:20.474852464 +0200
@@ -0,0 +1,31 @@
+/*
+ * TRX image file header format.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */ 
+
+#include <typedefs.h>
+
+#define TRX_MAGIC      0x30524448      /* "HDR0" */
+#define TRX_VERSION    1
+#define TRX_MAX_LEN    0x3A0000
+#define TRX_NO_HEADER  1               /* Do not write TRX header */   
+
+struct trx_header {
+       uint32 magic;           /* "HDR0" */
+       uint32 len;             /* Length of file including header */
+       uint32 crc32;           /* 32-bit CRC from flag_version to end of file */
+       uint32 flag_version;    /* 0:15 flags, 16:31 version */
+       uint32 offsets[3];      /* Offsets of partitions from start of header */
+};
+
+/* Compatibility */
+typedef struct trx_header TRXHDR, *PTRXHDR;
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/typedefs.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/typedefs.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/typedefs.h        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/typedefs.h   2005-08-28 11:12:20.474852464 +0200
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2001-2003, Broadcom Corporation   
+ * All Rights Reserved.   
+ *    
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY   
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM   
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
+ * $Id$
+ */
+
+#ifndef _TYPEDEFS_H_
+#define _TYPEDEFS_H_
+
+/*----------------------- define TRUE, FALSE, NULL, bool ----------------*/
+#ifdef __cplusplus
+
+#ifndef FALSE
+#define FALSE  false
+#endif
+#ifndef TRUE
+#define TRUE   true
+#endif
+
+#else /* !__cplusplus */
+
+#if defined(_WIN32)
+
+typedef        unsigned char   bool;
+
+#else
+
+#if defined(MACOSX) && defined(KERNEL)
+#include <IOKit/IOTypes.h>
+#else
+typedef        int     bool;
+#endif
+
+#endif
+
+#ifndef FALSE
+#define FALSE  0
+#endif
+#ifndef TRUE
+#define TRUE   1
+
+#ifndef NULL
+#define        NULL 0
+#endif
+
+#endif
+
+#endif /* __cplusplus */
+
+#ifndef OFF
+#define        OFF     0
+#endif
+
+#ifndef ON
+#define        ON      1
+#endif
+
+/*----------------------- define uchar, ushort, uint, ulong ----------------*/
+
+typedef unsigned char uchar;
+
+#if defined(_WIN32) || defined(PMON) || defined(__MRC__) || defined(V2_HAL) || defined(_CFE_)
+
+#ifndef V2_HAL
+typedef unsigned short ushort;
+#endif
+
+typedef unsigned int   uint;
+typedef unsigned long  ulong;
+
+#else
+
+/* pick up ushort & uint from standard types.h */
+#if defined(linux) && defined(__KERNEL__)
+#include <linux/types.h>       /* sys/types.h and linux/types.h are oil and water */
+#else
+#include <sys/types.h> 
+#if !defined(TARGETENV_sun4) && !defined(linux)
+typedef unsigned long  ulong;
+#endif /* TARGETENV_sun4 */
+#endif
+#if defined(PMON)
+typedef unsigned int   uint;
+typedef unsigned long long       uint64;
+#endif
+
+#endif /* WIN32 || PMON || .. */
+
+/*----------------------- define [u]int8/16/32/64 --------------------------*/
+
+
+#ifdef V2_HAL
+#include <bcmos.h>
+#else
+typedef signed char    int8;
+typedef signed short   int16;
+typedef signed int     int32;
+
+typedef unsigned char  uint8;
+typedef unsigned short uint16;
+typedef unsigned int   uint32;
+#endif /* V2_HAL */
+
+typedef float          float32;
+typedef double         float64;
+
+/*
+ * abstracted floating point type allows for compile time selection of
+ * single or double precision arithmetic.  Compiling with -DFLOAT32
+ * selects single precision; the default is double precision.
+ */
+
+#if defined(FLOAT32)
+typedef float32 float_t;
+#else /* default to double precision floating point */
+typedef float64 float_t;
+#endif /* FLOAT32 */
+
+#ifdef _MSC_VER            /* Microsoft C */
+typedef signed __int64 int64;
+typedef unsigned __int64 uint64;
+
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
+/* gcc understands signed/unsigned 64 bit types, but complains in ANSI mode */
+typedef signed long long int64;
+typedef unsigned long long uint64;
+
+#elif defined(__ICL) && !defined(__STDC__)
+/* ICL accepts unsigned 64 bit type only, and complains in ANSI mode */
+typedef unsigned long long uint64;
+
+#endif /* _MSC_VER */
+
+
+/*----------------------- define PTRSZ, INLINE --------------------------*/
+
+#define        PTRSZ   sizeof (char*)
+
+#ifndef INLINE
+
+#ifdef _MSC_VER
+
+#define INLINE __inline
+
+#elif __GNUC__
+
+#define INLINE __inline__
+
+#else
+
+#define INLINE
+
+#endif /* _MSC_VER */
+
+#endif /* INLINE */
+
+#endif /* _TYPEDEFS_H_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/include/wlioctl.h linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/wlioctl.h
--- linux-2.6.12.5/arch/mips/bcm947xx/include/wlioctl.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/include/wlioctl.h    2005-08-28 11:12:20.475852312 +0200
@@ -0,0 +1,690 @@
+/*
+ * Custom OID/ioctl definitions for
+ * Broadcom 802.11abg Networking Device Driver
+ *
+ * Definitions subject to change without notice.
+ *
+ * Copyright 2001-2003, Broadcom Corporation
+ * All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
+ *
+ * $Id$
+ */
+
+#ifndef _wlioctl_h_
+#define        _wlioctl_h_
+
+#include <typedefs.h>
+#include <proto/ethernet.h>
+#include <proto/802.11.h>
+
+#if defined(__GNUC__)
+#define        PACKED  __attribute__((packed))
+#else
+#define        PACKED
+#endif
+
+/*
+ * Per-bss information structure.
+ */
+
+#define WL_NUMRATES            255     /* max # of rates in a rateset */
+
+typedef struct wl_rateset {
+       uint32  count;                  /* # rates in this set */
+       uint8   rates[WL_NUMRATES];     /* rates in 500kbps units w/hi bit set if basic */
+} wl_rateset_t;
+
+#define        WL_LEGACY_BSS_INFO_VERSION      106     /* an older supported version of wl_bss_info struct */
+#define        WL_BSS_INFO_VERSION             107     /* current version of wl_bss_info struct */
+
+typedef struct wl_bss_info106 {
+       uint            version;        /* version field */
+       struct ether_addr BSSID;
+       uint8           SSID_len;
+       uint8           SSID[32];
+       uint8           Privacy;        /* 0=No WEP, 1=Use WEP */
+       int16           RSSI;           /* receive signal strength (in dBm) */
+       uint16          beacon_period;  /* units are Kusec */
+       uint16          atim_window;    /* units are Kusec */
+       uint8           channel;        /* Channel no. */
+       int8            infra;          /* 0=IBSS, 1=infrastructure, 2=unknown */
+       struct {
+               uint    count;          /* # rates in this set */
+               uint8   rates[12];      /* rates in 500kbps units w/hi bit set if basic */
+       } rateset;                      /* supported rates */
+        uint8           dtim_period;    /* DTIM period */
+       int8            phy_noise;      /* noise right after tx (in dBm) */
+       uint16          capability;     /* Capability information */
+       struct dot11_bcn_prb *prb;      /* probe response frame (ioctl na) */
+       uint16          prb_len;        /* probe response frame length (ioctl na) */
+       struct {
+               uint8 supported;        /* wpa supported */
+               uint8 multicast;        /* multicast cipher */
+               uint8 ucount;           /* count of unicast ciphers */
+               uint8 unicast[4];       /* unicast ciphers */
+               uint8 acount;           /* count of auth modes */
+               uint8 auth[4];          /* Authentication modes */
+       } wpa;
+} wl_bss_info106_t;
+
+typedef struct wl_bss_info {
+       uint32          version;        /* version field */
+       uint32          length;         /* byte length of data in this record, starting at version and including IEs */
+       struct ether_addr BSSID;
+       uint16          beacon_period;  /* units are Kusec */
+       uint16          capability;     /* Capability information */
+       uint8           SSID_len;
+       uint8           SSID[32];
+       struct {
+               uint    count;          /* # rates in this set */
+               uint8   rates[16];      /* rates in 500kbps units w/hi bit set if basic */
+       } rateset;                      /* supported rates */
+       uint8           channel;        /* Channel no. */
+       uint16          atim_window;    /* units are Kusec */
+        uint8           dtim_period;    /* DTIM period */
+       int16           RSSI;           /* receive signal strength (in dBm) */
+       int8            phy_noise;      /* noise (in dBm) */
+       uint32          ie_length;      /* byte length of Information Elements */
+       /* variable length Information Elements */
+} wl_bss_info_t;
+
+typedef struct wl_scan_results {
+       uint32 buflen;
+       uint32 version;
+       uint32 count;
+       wl_bss_info_t bss_info[1];
+} wl_scan_results_t;
+/* size of wl_scan_results not including variable length array */
+#define WL_SCAN_RESULTS_FIXED_SIZE 12
+
+/* uint32 list */
+typedef struct wl_uint32_list {
+       /* in - # of elements, out - # of entries */
+       uint32 count;
+       /* variable length uint32 list */
+       uint32 element[1];
+} wl_uint32_list_t;
+
+typedef struct wlc_ssid {
+       uint32          SSID_len;
+       uchar           SSID[32];
+} wlc_ssid_t;
+
+#define WLC_CNTRY_BUF_SZ        4       /* Country string is 3 bytes + NULL */
+
+typedef struct wl_channels_in_country {
+       uint32 buflen;
+       uint32 band;
+       char country_abbrev[WLC_CNTRY_BUF_SZ];
+       uint32 count;
+       uint32 channel[1];
+} wl_channels_in_country_t;
+
+typedef struct wl_country_list {
+       uint32 buflen;
+       uint32 band_set;
+       uint32 band;
+       uint32 count;
+       char country_abbrev[1];
+} wl_country_list_t;
+
+
+/*
+* Maximum # of keys that wl driver supports in S/W. Keys supported 
+* in H/W is less than or equal to WSEC_MAX_KEYS.
+*/
+#define WSEC_MAX_KEYS          54      /* Max # of keys (50 + 4 default keys) */
+#define WSEC_MAX_DEFAULT_KEYS  4       /* # of default keys */
+
+/*
+* Remove these two defines if access to crypto/tkhash.h 
+* is unconditionally permitted.
+*/
+#define TKHASH_P1_KEY_SIZE     10      /* size of TKHash Phase1 output, in bytes */
+#define TKHASH_P2_KEY_SIZE     16      /* size of TKHash Phase2 output */
+
+/* Enumerate crypto algorithms */
+#define        CRYPTO_ALGO_OFF                 0
+#define        CRYPTO_ALGO_WEP1                1
+#define        CRYPTO_ALGO_TKIP                2
+#define        CRYPTO_ALGO_WEP128              3
+#define CRYPTO_ALGO_AES_CCM            4
+#define CRYPTO_ALGO_AES_OCB_MSDU       5
+#define CRYPTO_ALGO_AES_OCB_MPDU       6
+#define CRYPTO_ALGO_NALG               7
+
+/* For use with wlc_wep_key.flags */
+#define WSEC_PRIMARY_KEY       (1 << 1)        /* Indicates this key is the primary (ie tx) key */
+#define WSEC_TKIP_ERROR                (1 << 2)        /* Provoke deliberate MIC error */
+#define WSEC_REPLAY_ERROR      (1 << 3)        /* Provoke deliberate replay */
+
+#define WSEC_GEN_MIC_ERROR     0x0001
+#define WSEC_GEN_REPLAY                0x0002
+
+typedef struct tkip_info {
+       uint16          phase1[TKHASH_P1_KEY_SIZE/sizeof(uint16)];      /* tkhash phase1 result */
+       uint8           phase2[TKHASH_P2_KEY_SIZE];     /* tkhash phase2 result */
+       uint32          micl;
+       uint32          micr;
+} tkip_info_t;
+
+typedef struct wsec_iv {
+       uint32          hi;     /* upper 32 bits of IV */
+       uint16          lo;     /* lower 16 bits of IV */
+} wsec_iv_t;
+
+typedef struct wsec_key {
+       uint32          index;          /* key index */
+       uint32          len;            /* key length */
+       uint8           data[DOT11_MAX_KEY_SIZE];       /* key data */
+       tkip_info_t     tkip_tx;        /* tkip transmit state */
+       tkip_info_t     tkip_rx;        /* tkip receive state */
+       uint32          algo;           /* CRYPTO_ALGO_AES_CCM, CRYPTO_ALGO_WEP128, etc */
+       uint32          flags;          /* misc flags */
+       uint32          algo_hw;        /* cache for hw register*/
+       uint32          aes_mode;       /* cache for hw register*/
+       int             iv_len;         /* IV length */         
+       int             iv_initialized; /* has IV been initialized already? */          
+       int             icv_len;        /* ICV length */
+       wsec_iv_t       rxiv;           /* Rx IV */
+       wsec_iv_t       txiv;           /* Tx IV */
+       struct ether_addr ea;           /* per station */
+} wsec_key_t;
+
+/* wireless security bitvec */
+#define WEP_ENABLED            1
+#define TKIP_ENABLED           2
+#define AES_ENABLED            4
+#define WSEC_SWFLAG            8
+
+#define WSEC_SW(wsec)          ((wsec) & WSEC_SWFLAG)
+#define WSEC_HW(wsec)          (!WSEC_SW(wsec))
+#define WSEC_WEP_ENABLED(wsec) ((wsec) & WEP_ENABLED)
+#define WSEC_TKIP_ENABLED(wsec)        ((wsec) & TKIP_ENABLED)
+#define WSEC_AES_ENABLED(wsec) ((wsec) & AES_ENABLED)
+#define WSEC_ENABLED(wsec)     ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED))
+
+/* wireless authentication bit vector */
+#define WPA_ENABLED    1
+#define PSK_ENABLED    2
+
+#define WAUTH_WPA_ENABLED(wauth)       ((wauth) & WPA_ENABLED)
+#define WAUTH_PSK_ENABLED(wauth)       ((wauth) & PSK_ENABLED)
+#define WAUTH_ENABLED(wauth)           ((wauth) & (WPA_ENABLED | PSK_ENABLED))
+
+/* group/mcast cipher */
+#define WPA_MCAST_CIPHER(wsec) (((wsec) & TKIP_ENABLED) ? WPA_CIPHER_TKIP : \
+                               ((wsec) & AES_ENABLED) ? WPA_CIPHER_AES_CCM : \
+                               WPA_CIPHER_NONE)
+
+typedef struct wl_led_info {
+       uint32          index;          /* led index */
+       uint32          behavior;
+       bool            activehi;
+} wl_led_info_t;
+
+/*
+ * definitions for driver messages passed from WL to NAS.
+ */
+/* Use this to recognize wpa and 802.1x driver messages. */
+static const uint8 wl_wpa_snap_template[] =
+       { 0xaa, 0xaa, 0x03, 0x00, 0x90, 0x4c };
+
+#define WL_WPA_MSG_IFNAME_MAX  16
+
+/* WPA driver message */
+typedef struct wl_wpa_header {
+       struct ether_header eth;
+       struct dot11_llc_snap_header snap;
+       uint8 version;
+       uint8 type;
+       /* version 2 additions */
+       char ifname[WL_WPA_MSG_IFNAME_MAX];
+       /* version specific data */
+       /* uint8 data[1]; */
+} wl_wpa_header_t PACKED;
+
+#define WL_WPA_HEADER_LEN      (ETHER_HDR_LEN + DOT11_LLC_SNAP_HDR_LEN + 2 + WL_WPA_MSG_IFNAME_MAX)
+
+/* WPA driver message ethertype - private between wlc and nas */
+#define WL_WPA_ETHER_TYPE      0x9999
+
+/* WPA driver message current version */
+#define WL_WPA_MSG_VERSION     2
+
+/* Type field values for the 802.2 driver messages for WPA. */
+#define WLC_ASSOC_MSG          1
+#define WLC_DISASSOC_MSG       2
+#define WLC_PTK_MIC_MSG                3
+#define WLC_GTK_MIC_MSG                4
+
+/* 802.1x driver message */
+typedef struct wl_eapol_header {
+       struct ether_header eth;
+       struct dot11_llc_snap_header snap;
+       uint8 version;
+       uint8 reserved;
+       char ifname[WL_WPA_MSG_IFNAME_MAX];
+       /* version specific data */
+       /* uint8 802_1x_msg[1]; */
+} wl_eapol_header_t PACKED;
+
+#define WL_EAPOL_HEADER_LEN    (ETHER_HDR_LEN + DOT11_LLC_SNAP_HDR_LEN + 2 + WL_WPA_MSG_IFNAME_MAX)
+
+/* 802.1x driver message ethertype - private between wlc and nas */
+#define WL_EAPOL_ETHER_TYPE    0x999A
+
+/* 802.1x driver message current version */
+#define WL_EAPOL_MSG_VERSION   1
+
+/* srom read/write struct passed through ioctl */
+typedef struct {
+       uint   byteoff;         /* byte offset */
+       uint   nbytes;          /* number of bytes */
+       uint16 buf[1];
+} srom_rw_t;
+
+/* R_REG and W_REG struct passed through ioctl */
+typedef struct {
+       uint32  byteoff;        /* byte offset of the field in d11regs_t */
+       uint32  val;            /* read/write value of the field */
+       uint32  size;           /* sizeof the field */
+} rw_reg_t;
+
+/* Structure used by GET/SET_ATTEN ioctls */
+typedef struct {
+       uint16  auto_ctrl;      /* 1: Automatic control, 0: overriden */
+       uint16  bb;             /* Baseband attenuation */
+       uint16  radio;          /* Radio attenuation */
+       uint16  txctl1;         /* Radio TX_CTL1 value */
+} atten_t;
+
+/* Used to get specific STA parameters */ 
+typedef struct {
+       uint32  val;
+       struct ether_addr ea;
+} scb_val_t;
+
+/* callback registration data types */
+
+typedef struct _mac_event_params {
+       uint msg;
+       struct ether_addr *addr;
+       uint result;
+       uint status; 
+       uint auth_type;
+} mac_event_params_t;
+
+typedef struct _mic_error_params {
+       struct ether_addr *ea;
+       bool group;
+       bool flush_txq;
+} mic_error_params_t;
+
+typedef enum _wl_callback {
+       WL_MAC_EVENT_CALLBACK = 0,
+       WL_LINK_UP_CALLBACK,
+       WL_LINK_DOWN_CALLBACK,
+       WL_MIC_ERROR_CALLBACK,
+       WL_LAST_CALLBACK
+} wl_callback_t;
+
+typedef struct _callback {
+       void (*fn)(void *, void *);
+       void *context;
+} callback_t;
+
+typedef struct _scan_callback {
+       void (*fn)(void *);
+       void *context;
+} scan_callback_t;
+
+/* used to register an arbitrary callback via the IOCTL interface */
+typedef struct _set_callback {
+       int index;
+       callback_t callback;
+} set_callback_t;
+
+/*
+ * Country locale determines which channels are available to us.
+ */
+typedef enum _wlc_locale {
+       WLC_WW = 0,     /* Worldwide */
+       WLC_THA,        /* Thailand */
+       WLC_ISR,        /* Israel */
+       WLC_JDN,        /* Jordan */
+       WLC_PRC,        /* China */
+       WLC_JPN,        /* Japan */
+       WLC_FCC,        /* USA */
+       WLC_EUR,        /* Europe */
+       WLC_USL,        /* US Low Band only */
+       WLC_JPH,        /* Japan High Band only */
+       WLC_ALL,        /* All the channels in this band */
+       WLC_11D,        /* Represents locale recieved by 11d beacons */
+       WLC_LAST_LOCALE,
+       WLC_UNDEFINED_LOCALE = 0xf
+} wlc_locale_t;
+
+/* channel encoding */
+typedef struct channel_info {
+       int hw_channel;
+       int target_channel;
+       int scan_channel;
+} channel_info_t;
+
+/* For ioctls that take a list of MAC addresses */
+struct maclist {
+       uint count;                     /* number of MAC addresses */
+       struct ether_addr ea[1];        /* variable length array of MAC addresses */
+};
+
+/* get pkt count struct passed through ioctl */
+typedef struct get_pktcnt {
+       uint rx_good_pkt;
+       uint rx_bad_pkt;
+       uint tx_good_pkt;
+       uint tx_bad_pkt;
+} get_pktcnt_t;
+
+/* Linux network driver ioctl encoding */
+typedef struct wl_ioctl {
+       int cmd;        /* common ioctl definition */
+       void *buf;      /* pointer to user buffer */
+       int len;        /* length of user buffer */
+} wl_ioctl_t;
+
+/* 
+ * Structure for passing hardware and software 
+ * revision info up from the driver. 
+ */
+typedef struct wlc_rev_info {
+       uint            vendorid;       /* PCI vendor id */
+       uint            deviceid;       /* device id of chip */
+       uint            radiorev;       /* radio revision */
+       uint            chiprev;        /* chip revision */
+       uint            corerev;        /* core revision */
+       uint            boardid;        /* board identifier (usu. PCI sub-device id) */
+       uint            boardvendor;    /* board vendor (usu. PCI sub-vendor id) */
+       uint            boardrev;       /* board revision */
+       uint            driverrev;      /* driver version */
+       uint            ucoderev;       /* microcode version */
+       uint            bus;            /* bus type */
+       uint        chipnum;    /* chip number */
+} wlc_rev_info_t;
+
+/* check this magic number */
+#define WLC_IOCTL_MAGIC                0x14e46c77
+
+/* bump this number if you change the ioctl interface */
+#define WLC_IOCTL_VERSION      1
+
+/* maximum length buffer required */
+#define WLC_IOCTL_MAXLEN       8192
+
+/* common ioctl definitions */
+#define WLC_GET_MAGIC                          0
+#define WLC_GET_VERSION                                1
+#define WLC_UP                                 2
+#define WLC_DOWN                               3
+#define WLC_DUMP                               6
+#define WLC_GET_MSGLEVEL                       7
+#define WLC_SET_MSGLEVEL                       8
+#define WLC_GET_PROMISC                                9
+#define WLC_SET_PROMISC                                10
+#define WLC_GET_RATE                           12
+#define WLC_SET_RATE                           13
+#define WLC_GET_INSTANCE                       14
+#define WLC_GET_FRAG                           15
+#define WLC_SET_FRAG                           16
+#define WLC_GET_RTS                            17
+#define WLC_SET_RTS                            18
+#define WLC_GET_INFRA                          19
+#define WLC_SET_INFRA                          20
+#define WLC_GET_AUTH                           21
+#define WLC_SET_AUTH                           22
+#define WLC_GET_BSSID                          23
+#define WLC_SET_BSSID                          24
+#define WLC_GET_SSID                           25
+#define WLC_SET_SSID                           26
+#define WLC_RESTART                            27
+#define WLC_GET_CHANNEL                                29
+#define WLC_SET_CHANNEL                                30
+#define WLC_GET_SRL                            31
+#define WLC_SET_SRL                            32
+#define WLC_GET_LRL                            33
+#define WLC_SET_LRL                            34
+#define WLC_GET_PLCPHDR                                35
+#define WLC_SET_PLCPHDR                                36
+#define WLC_GET_RADIO                          37
+#define WLC_SET_RADIO                          38
+#define WLC_GET_PHYTYPE                                39
+#define WLC_GET_WEP                            42
+#define WLC_SET_WEP                            43
+#define WLC_GET_KEY                            44
+#define WLC_SET_KEY                            45
+#define WLC_SCAN                               50
+#define WLC_SCAN_RESULTS                       51
+#define WLC_DISASSOC                           52
+#define WLC_REASSOC                            53
+#define WLC_GET_ROAM_TRIGGER                   54
+#define WLC_SET_ROAM_TRIGGER                   55
+#define WLC_GET_TXANT                          61
+#define WLC_SET_TXANT                          62
+#define WLC_GET_ANTDIV                         63
+#define WLC_SET_ANTDIV                         64
+#define WLC_GET_TXPWR                          65
+#define WLC_SET_TXPWR                          66
+#define WLC_GET_CLOSED                         67
+#define WLC_SET_CLOSED                         68
+#define WLC_GET_MACLIST                                69
+#define WLC_SET_MACLIST                                70
+#define WLC_GET_RATESET                                71
+#define WLC_SET_RATESET                                72
+#define WLC_GET_LOCALE                         73
+#define WLC_SET_LOCALE                         74
+#define WLC_GET_BCNPRD                         75
+#define WLC_SET_BCNPRD                         76
+#define WLC_GET_DTIMPRD                                77
+#define WLC_SET_DTIMPRD                                78
+#define WLC_GET_SROM                           79
+#define WLC_SET_SROM                           80
+#define WLC_GET_WEP_RESTRICT                   81
+#define WLC_SET_WEP_RESTRICT                   82
+#define WLC_GET_COUNTRY                                83
+#define WLC_SET_COUNTRY                                84
+#define WLC_GET_REVINFO                                98
+#define WLC_GET_MACMODE                                105
+#define WLC_SET_MACMODE                                106
+#define WLC_GET_GMODE                          109
+#define WLC_SET_GMODE                          110
+#define WLC_GET_CURR_RATESET                   114     /* current rateset */
+#define WLC_GET_SCANSUPPRESS                   115
+#define WLC_SET_SCANSUPPRESS                   116
+#define WLC_GET_AP                             117
+#define WLC_SET_AP                             118
+#define WLC_GET_EAP_RESTRICT                   119
+#define WLC_SET_EAP_RESTRICT                   120
+#define WLC_GET_WDSLIST                                123
+#define WLC_SET_WDSLIST                                124
+#define WLC_GET_RSSI                           127
+#define WLC_GET_WSEC                           133
+#define WLC_SET_WSEC                           134
+#define WLC_GET_BSS_INFO                       136
+#define WLC_GET_LAZYWDS                                138
+#define WLC_SET_LAZYWDS                                139
+#define WLC_GET_BANDLIST                       140
+#define WLC_GET_BAND                           141
+#define WLC_SET_BAND                           142
+#define WLC_GET_SHORTSLOT                      144
+#define WLC_GET_SHORTSLOT_OVERRIDE             145
+#define WLC_SET_SHORTSLOT_OVERRIDE             146
+#define WLC_GET_SHORTSLOT_RESTRICT             147
+#define WLC_SET_SHORTSLOT_RESTRICT             148
+#define WLC_GET_GMODE_PROTECTION               149
+#define WLC_GET_GMODE_PROTECTION_OVERRIDE      150
+#define WLC_SET_GMODE_PROTECTION_OVERRIDE      151
+#define WLC_UPGRADE                            152
+#define WLC_GET_ASSOCLIST                      159
+#define WLC_GET_CLK                            160
+#define WLC_SET_CLK                            161
+#define WLC_GET_UP                             162
+#define WLC_OUT                                        163
+#define WLC_GET_WPA_AUTH                       164
+#define WLC_SET_WPA_AUTH                       165
+#define WLC_GET_GMODE_PROTECTION_CONTROL       178
+#define WLC_SET_GMODE_PROTECTION_CONTROL       179
+#define WLC_GET_PHYLIST                                180
+#define WLC_GET_GMODE_PROTECTION_CTS           198
+#define WLC_SET_GMODE_PROTECTION_CTS           199
+#define WLC_GET_PIOMODE                                203
+#define WLC_SET_PIOMODE                                204
+#define WLC_SET_LED                            209
+#define WLC_GET_LED                            210
+#define WLC_GET_CHANNEL_SEL                    215
+#define WLC_START_CHANNEL_SEL                  216
+#define WLC_GET_VALID_CHANNELS                 217
+#define WLC_GET_FAKEFRAG                       218
+#define WLC_SET_FAKEFRAG                       219
+#define WLC_GET_WET                            230
+#define WLC_SET_WET                            231
+#define WLC_GET_KEY_PRIMARY                    235
+#define WLC_SET_KEY_PRIMARY                    236
+#define WLC_SCAN_WITH_CALLBACK                 240
+#define WLC_SET_CS_SCAN_TIMER                  248
+#define WLC_GET_CS_SCAN_TIMER                  249
+#define WLC_CURRENT_PWR                                256
+#define WLC_GET_CHANNELS_IN_COUNTRY            260
+#define WLC_GET_COUNTRY_LIST                   261
+#define WLC_NVRAM_GET                          264
+#define WLC_NVRAM_SET                          265
+#define WLC_LAST                               271     /* bump after adding */
+
+/*
+ * Minor kludge alert:
+ * Duplicate a few definitions that irelay requires from epiioctl.h here
+ * so caller doesn't have to include this file and epiioctl.h .
+ * If this grows any more, it would be time to move these irelay-specific
+ * definitions out of the epiioctl.h and into a separate driver common file.
+ */
+#ifndef EPICTRL_COOKIE
+#define EPICTRL_COOKIE         0xABADCEDE
+#endif
+
+/* vx wlc ioctl's offset */
+#define CMN_IOCTL_OFF 0x180
+
+/*
+ * custom OID support
+ *
+ * 0xFF - implementation specific OID
+ * 0xE4 - first byte of Broadcom PCI vendor ID
+ * 0x14 - second byte of Broadcom PCI vendor ID
+ * 0xXX - the custom OID number
+ */
+
+/* begin 0x1f values beyond the start of the ET driver range. */
+#define WL_OID_BASE            0xFFE41420
+
+/* NDIS overrides */
+#define OID_WL_GETINSTANCE     (WL_OID_BASE + WLC_GET_INSTANCE)
+
+#define WL_DECRYPT_STATUS_SUCCESS      1
+#define WL_DECRYPT_STATUS_FAILURE      2
+#define WL_DECRYPT_STATUS_UNKNOWN      3
+
+/* allows user-mode app to poll the status of USB image upgrade */
+#define WLC_UPGRADE_SUCCESS                    0
+#define WLC_UPGRADE_PENDING                    1
+
+/* Bit masks for radio disabled status - returned by WL_GET_RADIO */
+#define WL_RADIO_SW_DISABLE    (1<<0)
+#define WL_RADIO_HW_DISABLE    (1<<1)
+
+/* Override bit for WLC_SET_TXPWR.  if set, ignore other level limits */
+#define WL_TXPWR_OVERRIDE      (1<<31)
+
+
+/* Bus types */
+#define WL_SB_BUS      0       /* Silicon Backplane */
+#define WL_PCI_BUS     1       /* PCI target */
+#define WL_PCMCIA_BUS  2       /* PCMCIA target */
+
+/* band types */
+#define        WLC_BAND_AUTO           0       /* auto-select */
+#define        WLC_BAND_A              1       /* "a" band (5   Ghz) */
+#define        WLC_BAND_B              2       /* "b" band (2.4 Ghz) */
+
+/* MAC list modes */
+#define WLC_MACMODE_DISABLED   0       /* MAC list disabled */
+#define WLC_MACMODE_DENY       1       /* Deny specified (i.e. allow unspecified) */
+#define WLC_MACMODE_ALLOW      2       /* Allow specified (i.e. deny unspecified) */   
+
+/* 
+ *
+ */
+#define GMODE_LEGACY_B         0
+#define GMODE_AUTO             1
+#define GMODE_ONLY             2
+#define GMODE_B_DEFERRED       3
+#define GMODE_PERFORMANCE      4
+#define GMODE_LRS              5
+#define GMODE_MAX              6
+
+/* values for PLCPHdr_override */
+#define WLC_PLCP_AUTO  -1
+#define WLC_PLCP_SHORT 0
+#define WLC_PLCP_LONG  1
+
+/* values for g_protection_override */
+#define WLC_G_PROTECTION_AUTO  -1
+#define WLC_G_PROTECTION_OFF   0
+#define WLC_G_PROTECTION_ON    1
+
+/* values for g_protection_control */
+#define WLC_G_PROTECTION_CTL_OFF       0
+#define WLC_G_PROTECTION_CTL_LOCAL     1
+#define WLC_G_PROTECTION_CTL_OVERLAP   2
+
+
+
+
+
+
+/* max # of leds supported by GPIO (gpio pin# == led index#) */
+#define        WL_LED_NUMGPIO          16      /* gpio 0-15 */
+
+/* led per-pin behaviors */
+#define        WL_LED_OFF              0               /* always off */
+#define        WL_LED_ON               1               /* always on */
+#define        WL_LED_ACTIVITY         2               /* activity */
+#define        WL_LED_RADIO            3               /* radio enabled */
+#define        WL_LED_ARADIO           4               /* 5  Ghz radio enabled */
+#define        WL_LED_BRADIO           5               /* 2.4Ghz radio enabled */
+#define        WL_LED_BGMODE           6               /* on if gmode, off if bmode */
+#define        WL_LED_WI1              7               
+#define        WL_LED_WI2              8               
+#define        WL_LED_WI3              9               
+#define        WL_LED_ASSOC            10              /* associated state indicator */
+#define        WL_LED_INACTIVE         11              /* null behavior (clears default behavior) */
+#define        WL_LED_NUMBEHAVIOR      12
+
+/* led behavior numeric value format */
+#define        WL_LED_BEH_MASK         0x7f            /* behavior mask */
+#define        WL_LED_AL_MASK          0x80            /* activelow (polarity) bit */
+
+
+/* rate check */
+#define WL_RATE_OFDM(r)                (((r) & 0x7f) == 12 || ((r) & 0x7f) == 18 || \
+                                ((r) & 0x7f) == 24 || ((r) & 0x7f) == 36 || \
+                                ((r) & 0x7f) == 48 || ((r) & 0x7f) == 72 || \
+                                ((r) & 0x7f) == 96 || ((r) & 0x7f) == 108)
+
+
+#undef PACKED
+
+#endif /* _wlioctl_h_ */
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/int-handler.S linux-2.6.12.5-brcm/arch/mips/bcm947xx/int-handler.S
--- linux-2.6.12.5/arch/mips/bcm947xx/int-handler.S     1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/int-handler.S        2005-08-28 16:58:08.027788792 +0200
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <asm/asm.h>
+#include <asm/mipsregs.h>
+#include <asm/regdef.h>
+#include <asm/stackframe.h>
+
+       .text
+       .set    noreorder
+       .set    noat
+       .align  5
+
+       NESTED(bcm47xx_irq_handler, PT_SIZE, sp)
+       SAVE_ALL
+       CLI
+
+       .set    at
+       .set    noreorder
+
+       jal     bcm47xx_irq_dispatch
+       move    a0, sp
+
+       j       ret_from_irq
+       nop
+               
+       END(bcm47xx_irq_handler)
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/irq.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/irq.c
--- linux-2.6.12.5/arch/mips/bcm947xx/irq.c     1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/irq.c        2005-08-28 16:58:26.178029536 +0200
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <linux/smp.h>
+#include <linux/types.h>
+
+#include <asm/cpu.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/irq_cpu.h>
+#include <asm/gdb-stub.h>
+
+extern asmlinkage void bcm47xx_irq_handler(void);
+
+void bcm47xx_irq_dispatch(struct pt_regs *regs)
+{
+       u32 cause;
+
+       cause = read_c0_cause() & read_c0_status() & CAUSEF_IP;
+
+       clear_c0_status(cause);
+
+       if (cause & CAUSEF_IP7)
+               do_IRQ(7, regs);
+       if (cause & CAUSEF_IP2)
+               do_IRQ(2, regs);
+       if (cause & CAUSEF_IP3)
+               do_IRQ(3, regs);
+       if (cause & CAUSEF_IP4)
+               do_IRQ(4, regs);
+       if (cause & CAUSEF_IP5)
+               do_IRQ(5, regs);
+       if (cause & CAUSEF_IP6)
+               do_IRQ(6, regs);
+}
+
+void __init arch_init_irq(void)
+{
+       set_except_vector(0, bcm47xx_irq_handler);
+       mips_cpu_irq_init(0);
+}
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/prom.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/prom.c
--- linux-2.6.12.5/arch/mips/bcm947xx/prom.c    1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/prom.c       2005-08-28 16:58:41.789656208 +0200
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/bootmem.h>
+
+#include <asm/addrspace.h>
+#include <asm/bootinfo.h>
+#include <asm/pmon.h>
+
+const char *get_system_type(void)
+{
+       return "Broadcom BCM47xx";
+}
+
+void __init prom_init(void)
+{
+       unsigned long mem;
+
+        mips_machgroup = MACH_GROUP_BRCM;
+        mips_machtype = MACH_BCM47XX;
+
+       /* Figure out memory size by finding aliases */
+       for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
+               if (*(unsigned long *)((unsigned long)(prom_init) + mem) == 
+                   *(unsigned long *)(prom_init))
+                       break;
+       }
+
+       add_memory_region(0, mem, BOOT_MEM_RAM);
+}
+
+unsigned long __init prom_free_prom_memory(void)
+{
+       return 0;
+}
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c
--- linux-2.6.12.5/arch/mips/bcm947xx/setup.c   1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c      2005-08-28 16:57:28.317825624 +0200
@@ -0,0 +1,127 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/tty.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <linux/serial_reg.h>
+#include <asm/time.h>
+#include <asm/reboot.h>
+
+#include <typedefs.h>
+#include <sbutils.h>
+#include <sbmips.h>
+#include <sbpci.h>
+#include <sbconfig.h>
+#include <bcmdevs.h>
+
+#if 1
+
+#define SER_PORT1(reg) (*((volatile unsigned char *)(0xb8000400+reg)))
+
+int putDebugChar(char c)
+{
+       while (!(SER_PORT1(UART_LSR) & UART_LSR_THRE));
+       SER_PORT1(UART_TX) = c;
+       
+       return 1;
+}
+
+char getDebugChar(void)
+{
+       while (!(SER_PORT1(UART_LSR) & 1));
+       return SER_PORT1(UART_RX);
+}
+
+
+static int ser_line = 0;
+
+static void
+serial_add(void *regs, uint irq, uint baud_base, uint reg_shift)
+{
+       struct uart_port s;
+
+       memset(&s, 0, sizeof(s));
+
+       s.line = ser_line++;
+       s.membase = regs;
+       s.irq = irq + 2;
+       s.uartclk = baud_base;
+       s.flags = ASYNC_BOOT_AUTOCONF;
+       s.iotype = SERIAL_IO_MEM;
+       s.regshift = reg_shift;
+
+       if (early_serial_setup(&s) != 0) {
+               printk(KERN_ERR "Serial setup failed!\n");
+       }
+}
+#endif
+
+extern void bcm47xx_time_init(void);
+extern void bcm47xx_timer_setup(struct irqaction *irq);
+
+void *nvram_get(char *foo)
+{
+       return NULL;
+}
+
+void *sbh;
+
+static void bcm47xx_machine_restart(char *command)
+{
+       /* Set the watchdog timer to reset immediately */
+       cli();
+       sb_watchdog(sbh, 1);
+       while (1);
+}
+
+static void bcm47xx_machine_halt(void)
+{
+       /* Disable interrupts and watchdog and spin forever */
+       cli();
+       sb_watchdog(sbh, 0);
+       while (1);
+}
+
+static int __init bcm47xx_init(void)
+{
+
+       sbh = sb_kattach();
+       sb_mips_init(sbh);
+       sbpci_init(sbh);
+       sb_serial_init(sbh, serial_add);
+
+       _machine_restart = bcm47xx_machine_restart;
+       _machine_halt = bcm47xx_machine_halt;
+       _machine_power_off = bcm47xx_machine_halt;
+       
+       board_time_init = bcm47xx_time_init;
+       board_timer_setup = bcm47xx_timer_setup;
+       
+       return 0;
+}
+
+early_initcall(bcm47xx_init);
diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/time.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/time.c
--- linux-2.6.12.5/arch/mips/bcm947xx/time.c    1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/time.c       2005-08-28 16:57:55.440702320 +0200
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/serial_reg.h>
+#include <linux/interrupt.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+#include <asm/time.h>
+
+void __init
+bcm47xx_time_init(void)
+{
+       unsigned int hz;
+
+       /*
+        * Use deterministic values for initial counter interrupt
+        * so that calibrate delay avoids encountering a counter wrap.
+        */
+       write_c0_count(0);
+       write_c0_compare(0xffff);
+
+       hz = 200 * 1000 * 1000;
+
+       /* Set MIPS counter frequency for fixed_rate_gettimeoffset() */
+       mips_hpt_frequency = hz / 2;
+
+}
+
+void __init
+bcm47xx_timer_setup(struct irqaction *irq)
+{
+       /* Enable the timer interrupt */
+       setup_irq(7, irq);
+}
diff -Nur linux-2.6.12.5/arch/mips/kernel/cpu-probe.c linux-2.6.12.5-brcm/arch/mips/kernel/cpu-probe.c
--- linux-2.6.12.5/arch/mips/kernel/cpu-probe.c 2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/kernel/cpu-probe.c    2005-08-28 11:12:20.538842736 +0200
@@ -555,6 +555,28 @@
        }
 }
 
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
+{
+       decode_config1(c);
+       switch (c->processor_id & 0xff00) {
+               case PRID_IMP_BCM3302:
+                       c->cputype = CPU_BCM3302;
+                       c->isa_level = MIPS_CPU_ISA_M32;
+                       c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
+                                       MIPS_CPU_4KTLB | MIPS_CPU_COUNTER;
+               break;
+               case PRID_IMP_BCM4710:
+                       c->cputype = CPU_BCM4710;
+                       c->isa_level = MIPS_CPU_ISA_M32;
+                       c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
+                                       MIPS_CPU_4KTLB | MIPS_CPU_COUNTER;
+               break;
+       default:
+               c->cputype = CPU_UNKNOWN;
+               break;
+       }
+}
+
 __init void cpu_probe(void)
 {
        struct cpuinfo_mips *c = &current_cpu_data;
@@ -577,7 +599,9 @@
        case PRID_COMP_SIBYTE:
                cpu_probe_sibyte(c);
                break;
-
+       case PRID_COMP_BROADCOM:
+               cpu_probe_broadcom(c);
+               break;
        case PRID_COMP_SANDCRAFT:
                cpu_probe_sandcraft(c);
                break;
diff -Nur linux-2.6.12.5/arch/mips/kernel/head.S linux-2.6.12.5-brcm/arch/mips/kernel/head.S
--- linux-2.6.12.5/arch/mips/kernel/head.S      2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/kernel/head.S 2005-08-28 11:12:20.539842584 +0200
@@ -122,6 +122,14 @@
 #endif
        .endm
 
+#ifdef CONFIG_BCM4710
+#undef eret
+#define eret nop; nop; eret
+#endif
+
+       j       kernel_entry
+       nop
+
        /*
         * Reserved space for exception handlers.
         * Necessary for machines which link their kernels at KSEG0.
diff -Nur linux-2.6.12.5/arch/mips/kernel/proc.c linux-2.6.12.5-brcm/arch/mips/kernel/proc.c
--- linux-2.6.12.5/arch/mips/kernel/proc.c      2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/kernel/proc.c 2005-08-28 11:12:20.553840456 +0200
@@ -75,7 +75,9 @@
        [CPU_VR4133]    "NEC VR4133",
        [CPU_VR4181]    "NEC VR4181",
        [CPU_VR4181A]   "NEC VR4181A",
-       [CPU_SR71000]   "Sandcraft SR71000"
+       [CPU_SR71000]   "Sandcraft SR71000",
+       [CPU_BCM3302]   "Broadcom BCM3302",
+       [CPU_BCM4710]   "Broadcom BCM4710"
 };
 
 
diff -Nur linux-2.6.12.5/arch/mips/mm/tlbex.c linux-2.6.12.5-brcm/arch/mips/mm/tlbex.c
--- linux-2.6.12.5/arch/mips/mm/tlbex.c 2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/mm/tlbex.c    2005-08-28 11:12:20.587835288 +0200
@@ -851,6 +851,8 @@
        case CPU_4KSC:
        case CPU_20KC:
        case CPU_25KF:
+       case CPU_BCM3302:
+       case CPU_BCM4710:
                tlbw(p);
                break;
 
diff -Nur linux-2.6.12.5/arch/mips/pci/Makefile linux-2.6.12.5-brcm/arch/mips/pci/Makefile
--- linux-2.6.12.5/arch/mips/pci/Makefile       2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/pci/Makefile  2005-08-28 16:41:44.565297816 +0200
@@ -18,6 +18,7 @@
 obj-$(CONFIG_MIPS_TX3927)      += ops-jmr3927.o
 obj-$(CONFIG_PCI_VR41XX)       += ops-vr41xx.o pci-vr41xx.o
 obj-$(CONFIG_NEC_CMBVR4133)    += fixup-vr4133.o
+obj-$(CONFIG_BCM947XX)         += ops-sb.o fixup-bcm47xx.o pci-bcm47xx.o
 
 #
 # These are still pretty much in the old state, watch, go blind.
diff -Nur linux-2.6.12.5/arch/mips/pci/fixup-bcm47xx.c linux-2.6.12.5-brcm/arch/mips/pci/fixup-bcm47xx.c
--- linux-2.6.12.5/arch/mips/pci/fixup-bcm47xx.c        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/pci/fixup-bcm47xx.c   2005-08-28 11:12:20.611831640 +0200
@@ -0,0 +1,23 @@
+#include <linux/init.h>
+#include <linux/pci.h>
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+       return 0;
+}
+
+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       u8 irq;
+       
+       if (dev->bus->number == 1)
+               return 2;
+
+       pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
+       return irq + 2;
+}
+
+struct pci_fixup pcibios_fixups[] __initdata = {
+       { 0 }
+};
diff -Nur linux-2.6.12.5/arch/mips/pci/ops-sb.c linux-2.6.12.5-brcm/arch/mips/pci/ops-sb.c
--- linux-2.6.12.5/arch/mips/pci/ops-sb.c       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/pci/ops-sb.c  2005-08-28 11:12:20.612831488 +0200
@@ -0,0 +1,44 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+#include <asm/pci.h>
+
+#include <typedefs.h>
+#include <sbpci.h>
+
+extern void *sbh;
+//extern spinlock_t bcm47xx_sbh_lock;
+
+static int
+sb_pci_read_config(struct pci_bus *bus, unsigned int devfn,
+                    int reg, int size, u32 *val)
+{
+       //unsigned long flags;
+       int ret;
+
+
+       //spin_lock_irqsave(&sbh_lock, flags);
+       ret = sbpci_read_config(sbh, bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), reg, val, size);
+       //spin_unlock_irqrestore(&sbh_lock, flags);
+
+       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+static int
+sb_pci_write_config(struct pci_bus *bus, unsigned int devfn,
+                     int reg, int size, u32 val)
+{
+//     unsigned long flags;
+       int ret;
+
+//     spin_lock_irqsave(&sbh_lock, flags);
+       ret = sbpci_write_config(sbh, bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), reg, &val, size);
+//     spin_unlock_irqrestore(&sbh_lock, flags);
+       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops sb_pci_ops = {
+       .read = sb_pci_read_config,
+       .write = sb_pci_write_config,
+};
diff -Nur linux-2.6.12.5/arch/mips/pci/pci-bcm47xx.c linux-2.6.12.5-brcm/arch/mips/pci/pci-bcm47xx.c
--- linux-2.6.12.5/arch/mips/pci/pci-bcm47xx.c  1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/arch/mips/pci/pci-bcm47xx.c     2005-08-28 11:12:20.612831488 +0200
@@ -0,0 +1,61 @@
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+
+#include <asm/cpu.h>
+#include <asm/io.h>
+
+#include <typedefs.h>
+#include <sbconfig.h>
+
+extern struct pci_ops sb_pci_ops;
+
+static struct resource sb_pci_mem_resource = {
+       .name   = "SB PCI Memory resources",
+       .start  = SB_ENUM_BASE,
+       .end    = SB_ENUM_LIM - 1,
+       .flags  = IORESOURCE_MEM,
+};
+
+static struct resource sb_pci_io_resource = {
+       .name   = "SB PCI I/O resources",
+       .start  = 0x100,
+       .end    = 0x1FF,
+       .flags  = IORESOURCE_IO,
+};
+
+static struct pci_controller bcm47xx_sb_pci_controller = {
+       .pci_ops        = &sb_pci_ops,
+       .mem_resource   = &sb_pci_mem_resource,
+       .io_resource    = &sb_pci_io_resource,
+};
+
+static struct resource ext_pci_mem_resource = {
+       .name   = "Ext PCI Memory resources",
+       .start  = SB_PCI_DMA,
+//     .end    = 0x7FFFFFFF,
+       .end    = 0x40FFFFFF,
+       .flags  = IORESOURCE_MEM,
+};
+
+static struct resource ext_pci_io_resource = {
+       .name   = "Ext PCI I/O resources",
+       .start  = 0x200,
+       .end    = 0x2FF,
+       .flags  = IORESOURCE_IO,
+};
+
+static struct pci_controller bcm47xx_ext_pci_controller = {
+       .pci_ops        = &sb_pci_ops,
+       .mem_resource   = &ext_pci_mem_resource,
+       .io_resource    = &ext_pci_io_resource,
+};
+
+static int __init bcm47xx_pci_init(void)
+{
+       register_pci_controller(&bcm47xx_sb_pci_controller);
+       register_pci_controller(&bcm47xx_ext_pci_controller);
+       return 0;
+}
+
+early_initcall(bcm47xx_pci_init);
diff -Nur linux-2.6.12.5/arch/mips/pci/pci.c linux-2.6.12.5-brcm/arch/mips/pci/pci.c
--- linux-2.6.12.5/arch/mips/pci/pci.c  2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/arch/mips/pci/pci.c     2005-08-28 11:12:20.629828904 +0200
@@ -238,7 +238,8 @@
                if (dev->resource[i].flags & IORESOURCE_IO)
                        offset = hose->io_offset;
                else if (dev->resource[i].flags & IORESOURCE_MEM)
-                       offset = hose->mem_offset;
+                       offset = 0x26000000;
+               //      offset = hose->mem_offset;
 
                dev->resource[i].start += offset;
                dev->resource[i].end += offset;
diff -Nur linux-2.6.12.5/drivers/mtd/maps/Kconfig linux-2.6.12.5-brcm/drivers/mtd/maps/Kconfig
--- linux-2.6.12.5/drivers/mtd/maps/Kconfig     2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/drivers/mtd/maps/Kconfig        2005-08-28 16:21:23.595930936 +0200
@@ -357,6 +357,12 @@
          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
 
+config MTD_BCM47XX
+       tristate "BCM47xx flash device"
+       depends on MIPS && MTD_CFI && BCM947XX
+       help
+         Support for the flash chips on the BCM947xx board.
+         
 config MTD_BEECH
        tristate "CFI Flash device mapped on IBM 405LP Beech"
        depends on MTD_CFI && PPC32 && 40x && BEECH
diff -Nur linux-2.6.12.5/drivers/mtd/maps/Makefile linux-2.6.12.5-brcm/drivers/mtd/maps/Makefile
--- linux-2.6.12.5/drivers/mtd/maps/Makefile    2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/drivers/mtd/maps/Makefile       2005-08-28 11:12:20.666823280 +0200
@@ -31,6 +31,7 @@
 obj-$(CONFIG_MTD_PCMCIA)       += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)      += rpxlite.o
 obj-$(CONFIG_MTD_TQM8XXL)      += tqm8xxl.o
+obj-$(CONFIG_MTD_BCM47XX)      += bcm47xx-flash.o
 obj-$(CONFIG_MTD_SA1100)       += sa1100-flash.o
 obj-$(CONFIG_MTD_IPAQ)         += ipaq-flash.o
 obj-$(CONFIG_MTD_SBC_GXX)      += sbc_gxx.o
diff -Nur linux-2.6.12.5/drivers/mtd/maps/bcm47xx-flash.c linux-2.6.12.5-brcm/drivers/mtd/maps/bcm47xx-flash.c
--- linux-2.6.12.5/drivers/mtd/maps/bcm47xx-flash.c     1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/drivers/mtd/maps/bcm47xx-flash.c        2005-08-28 17:01:50.948899632 +0200
@@ -0,0 +1,131 @@
+/*
+ * Flash mapping for BCM947XX boards
+ *
+ * Copyright (C) 2001 Broadcom Corporation
+ *
+ * $Id: bcm47xx-flash.c,v 1.1 2004/10/21 07:18:31 jolt Exp $
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <asm/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <linux/config.h>
+
+#define WINDOW_ADDR 0x1c000000
+#define WINDOW_SIZE (0x400000*2)
+#define BUSWIDTH 2
+
+static struct mtd_info *bcm947xx_mtd;
+
+static void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
+{
+#define MIPS_MEMCPY_ALIGN 4
+       map_word ret;
+       ssize_t transfer;
+       ssize_t done = 0;
+       if ((len >= MIPS_MEMCPY_ALIGN) && (!(from & (MIPS_MEMCPY_ALIGN - 1))) && (!(((unsigned int)to & (MIPS_MEMCPY_ALIGN - 1))))) {
+               done = len & ~(MIPS_MEMCPY_ALIGN - 1);
+               memcpy_fromio(to, map->virt + from, done);
+       }
+       while (done < len) {
+               ret = map->read(map, from + done);
+               transfer = len - done;
+               if (transfer > map->bankwidth)
+                       transfer = map->bankwidth;
+               memcpy((void *)((unsigned long)to + done), &ret.x[0], transfer);
+               done += transfer;
+       }
+}
+
+static struct map_info bcm947xx_map = {
+       name: "Physically mapped flash",
+       size: WINDOW_SIZE,
+       bankwidth: BUSWIDTH,
+       phys: WINDOW_ADDR,
+};
+
+#define SECTORS *64*1024
+
+#ifdef CONFIG_MTD_PARTITIONS
+#if 0
+static struct mtd_partition bcm947xx_parts[] = {
+// 64 - 4 - 14 - 1 = 45 = 8 + 37
+       { name: "pmon", offset: 0, size: 4 SECTORS, mask_flags: MTD_WRITEABLE },
+       { name: "linux", offset: MTDPART_OFS_APPEND, size: 14 SECTORS },
+       { name: "rescue", offset: MTDPART_OFS_APPEND, size: 8 SECTORS },
+       { name: "rootfs", offset: MTDPART_OFS_APPEND, size: 37 SECTORS },
+       { name: "nvram", offset: MTDPART_OFS_APPEND, size: 1 SECTORS, mask_flags: MTD_WRITEABLE },
+};
+#else
+static struct mtd_partition bcm947xx_parts[] = {
+       { name: "cfe",
+           offset:  0,
+           size:  384*1024,
+           mask_flags: MTD_WRITEABLE
+         },
+       { name: "config",
+           offset:  MTDPART_OFS_APPEND,
+           size:  128*1024
+         },
+       { name: "linux",
+           offset:  MTDPART_OFS_APPEND,
+           size:  10*128*1024
+         },
+       { name: "jffs",
+           offset: MTDPART_OFS_APPEND,
+           size: (8*1024*1024)-((384*1024)+(128*1024)+(10*128*1024)+(128*1024)),
+         },
+       { name: "nvram",
+           offset: MTDPART_OFS_APPEND,
+           size: 128*1024,
+           mask_flags: MTD_WRITEABLE
+         },
+};
+#endif
+#endif
+
+int __init init_bcm947xx_map(void)
+{
+       bcm947xx_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+
+       if (!bcm947xx_map.virt) {
+               printk("Failed to ioremap\n");
+               return -EIO;
+       }
+       simple_map_init(&bcm947xx_map);
+       
+       bcm947xx_map.copy_from = bcm947xx_map_copy_from;
+       
+       if (!(bcm947xx_mtd = do_map_probe("cfi_probe", &bcm947xx_map))) {
+               printk("Failed to do_map_probe\n");
+               iounmap((void *)bcm947xx_map.virt);
+               return -ENXIO;
+       }
+
+       bcm947xx_mtd->owner = THIS_MODULE;
+
+       printk(KERN_NOTICE "flash device: %x at %x\n", bcm947xx_mtd->size, WINDOW_ADDR);
+
+#ifdef CONFIG_MTD_PARTITIONS
+       return add_mtd_partitions(bcm947xx_mtd, bcm947xx_parts, sizeof(bcm947xx_parts)/sizeof(bcm947xx_parts[0]));
+#else
+       return 0;
+#endif
+}
+
+void __exit cleanup_bcm947xx_map(void)
+{
+#ifdef CONFIG_MTD_PARTITIONS
+       del_mtd_partitions(bcm947xx_mtd);
+#endif
+       map_destroy(bcm947xx_mtd);
+       iounmap((void *)bcm947xx_map.virt);
+}
+
+module_init(init_bcm947xx_map);
+module_exit(cleanup_bcm947xx_map);
diff -Nur linux-2.6.12.5/drivers/net/b44.c linux-2.6.12.5-brcm/drivers/net/b44.c
--- linux-2.6.12.5/drivers/net/b44.c    2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/drivers/net/b44.c       2005-08-28 11:12:20.691819480 +0200
@@ -1,7 +1,8 @@
-/* b44.c: Broadcom 4400 device driver.
+/* b44.c: Broadcom 4400/47xx device driver.
  *
  * Copyright (C) 2002 David S. Miller (davem@redhat.com)
- * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
+ * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
+ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  *
  * Distribute under GPL.
  */
@@ -78,7 +79,7 @@
        DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Florian Schirmer, Pekka Pietikainen, David S. Miller");
-MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
+MODULE_DESCRIPTION("Broadcom 4400/47xx 10/100 PCI ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
 
@@ -93,6 +94,8 @@
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4713,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
        { }     /* terminate list with empty entry */
 };
 
@@ -106,24 +109,13 @@
 static void b44_poll_controller(struct net_device *dev);
 #endif
 
-static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
-{
-       return readl(bp->regs + reg);
-}
-
-static inline void bw32(const struct b44 *bp, 
-                       unsigned long reg, unsigned long val)
-{
-       writel(val, bp->regs + reg);
-}
-
 static int b44_wait_bit(struct b44 *bp, unsigned long reg,
                        u32 bit, unsigned long timeout, const int clear)
 {
        unsigned long i;
 
        for (i = 0; i < timeout; i++) {
-               u32 val = br32(bp, reg);
+               u32 val = br32(reg);
 
                if (clear && !(val & bit))
                        break;
@@ -154,7 +146,7 @@
 
 static u32 ssb_get_core_rev(struct b44 *bp)
 {
-       return (br32(bp, B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
+       return (br32(B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
 }
 
 static u32 ssb_pci_setup(struct b44 *bp, u32 cores)
@@ -165,13 +157,13 @@
        pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, BCM4400_PCI_CORE_ADDR);
        pci_rev = ssb_get_core_rev(bp);
 
-       val = br32(bp, B44_SBINTVEC);
+       val = br32(B44_SBINTVEC);
        val |= cores;
-       bw32(bp, B44_SBINTVEC, val);
+       bw32(B44_SBINTVEC, val);
 
-       val = br32(bp, SSB_PCI_TRANS_2);
+       val = br32(SSB_PCI_TRANS_2);
        val |= SSB_PCI_PREF | SSB_PCI_BURST;
-       bw32(bp, SSB_PCI_TRANS_2, val);
+       bw32(SSB_PCI_TRANS_2, val);
 
        pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, bar_orig);
 
@@ -180,18 +172,18 @@
 
 static void ssb_core_disable(struct b44 *bp)
 {
-       if (br32(bp, B44_SBTMSLOW) & SBTMSLOW_RESET)
+       if (br32(B44_SBTMSLOW) & SBTMSLOW_RESET)
                return;
 
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
+       bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
        b44_wait_bit(bp, B44_SBTMSLOW, SBTMSLOW_REJECT, 100000, 0);
        b44_wait_bit(bp, B44_SBTMSHIGH, SBTMSHIGH_BUSY, 100000, 1);
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
+       bw32(B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
                            SBTMSLOW_REJECT | SBTMSLOW_RESET));
-       br32(bp, B44_SBTMSLOW);
+       br32(B44_SBTMSLOW);
        udelay(1);
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
-       br32(bp, B44_SBTMSLOW);
+       bw32(B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
+       br32(B44_SBTMSLOW);
        udelay(1);
 }
 
@@ -200,58 +192,65 @@
        u32 val;
 
        ssb_core_disable(bp);
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
-       br32(bp, B44_SBTMSLOW);
+       bw32(B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+       br32(B44_SBTMSLOW);
        udelay(1);
 
        /* Clear SERR if set, this is a hw bug workaround.  */
-       if (br32(bp, B44_SBTMSHIGH) & SBTMSHIGH_SERR)
-               bw32(bp, B44_SBTMSHIGH, 0);
+       if (br32(B44_SBTMSHIGH) & SBTMSHIGH_SERR)
+               bw32(B44_SBTMSHIGH, 0);
 
-       val = br32(bp, B44_SBIMSTATE);
+       val = br32(B44_SBIMSTATE);
        if (val & (SBIMSTATE_IBE | SBIMSTATE_TO))
-               bw32(bp, B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
+               bw32(B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
 
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
-       br32(bp, B44_SBTMSLOW);
+       bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+       br32(B44_SBTMSLOW);
        udelay(1);
 
-       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK));
-       br32(bp, B44_SBTMSLOW);
+       bw32(B44_SBTMSLOW, (SBTMSLOW_CLOCK));
+       br32(B44_SBTMSLOW);
        udelay(1);
 }
 
+static int b44_4713_instance;
+
 static int ssb_core_unit(struct b44 *bp)
 {
-#if 0
-       u32 val = br32(bp, B44_SBADMATCH0);
-       u32 base;
-
-       type = val & SBADMATCH0_TYPE_MASK;
-       switch (type) {
-       case 0:
-               base = val & SBADMATCH0_BS0_MASK;
-               break;
-
-       case 1:
-               base = val & SBADMATCH0_BS1_MASK;
-               break;
-
-       case 2:
-       default:
-               base = val & SBADMATCH0_BS2_MASK;
-               break;
-       };
-#endif
-       return 0;
+       if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
+               return b44_4713_instance++;
+       else
+               return 0;
 }
 
 static int ssb_is_core_up(struct b44 *bp)
 {
-       return ((br32(bp, B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
+       return ((br32(B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
                == SBTMSLOW_CLOCK);
 }
 
+static void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)
+{
+       u32 val;
+
+       bw32(B44_CAM_CTRL, (CAM_CTRL_READ |
+                           (index << CAM_CTRL_INDEX_SHIFT)));
+
+       b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);  
+
+       val = br32(B44_CAM_DATA_LO);
+
+       data[2] = (val >> 24) & 0xFF;
+       data[3] = (val >> 16) & 0xFF;
+       data[4] = (val >> 8) & 0xFF;
+       data[5] = (val >> 0) & 0xFF;
+
+       val = br32(B44_CAM_DATA_HI);
+       
+       data[0] = (val >> 8) & 0xFF;
+       data[1] = (val >> 0) & 0xFF;
+}
+
 static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
 {
        u32 val;
@@ -260,19 +259,19 @@
        val |= ((u32) data[3]) << 16;
        val |= ((u32) data[4]) <<  8;
        val |= ((u32) data[5]) <<  0;
-       bw32(bp, B44_CAM_DATA_LO, val);
+       bw32(B44_CAM_DATA_LO, val);
        val = (CAM_DATA_HI_VALID | 
               (((u32) data[0]) << 8) |
               (((u32) data[1]) << 0));
-       bw32(bp, B44_CAM_DATA_HI, val);
-       bw32(bp, B44_CAM_CTRL, (CAM_CTRL_WRITE |
+       bw32(B44_CAM_DATA_HI, val);
+       bw32(B44_CAM_CTRL, (CAM_CTRL_WRITE |
                            (index << CAM_CTRL_INDEX_SHIFT)));
        b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);  
 }
 
 static inline void __b44_disable_ints(struct b44 *bp)
 {
-       bw32(bp, B44_IMASK, 0);
+       bw32(B44_IMASK, 0);
 }
 
 static void b44_disable_ints(struct b44 *bp)
@@ -280,34 +279,40 @@
        __b44_disable_ints(bp);
 
        /* Flush posted writes. */
-       br32(bp, B44_IMASK);
+       br32(B44_IMASK);
 }
 
 static void b44_enable_ints(struct b44 *bp)
 {
-       bw32(bp, B44_IMASK, bp->imask);
+       bw32(B44_IMASK, bp->imask);
 }
 
 static int b44_readphy(struct b44 *bp, int reg, u32 *val)
 {
        int err;
 
-       bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
-       bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
+       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
+               return 0;
+
+       bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
+       bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
                             (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
                             (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
                             (reg << MDIO_DATA_RA_SHIFT) |
                             (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
        err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
-       *val = br32(bp, B44_MDIO_DATA) & MDIO_DATA_DATA;
+       *val = br32(B44_MDIO_DATA) & MDIO_DATA_DATA;
 
        return err;
 }
 
 static int b44_writephy(struct b44 *bp, int reg, u32 val)
 {
-       bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
-       bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
+       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
+               return 0;
+
+       bw32(B44_EMAC_ISTAT, EMAC_INT_MII);
+       bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START |
                             (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
                             (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
                             (reg << MDIO_DATA_RA_SHIFT) |
@@ -344,6 +349,9 @@
        u32 val;
        int err;
 
+       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
+               return 0;
+
        err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
        if (err)
                return err;
@@ -367,20 +375,20 @@
        bp->flags &= ~(B44_FLAG_TX_PAUSE | B44_FLAG_RX_PAUSE);
        bp->flags |= pause_flags;
 
-       val = br32(bp, B44_RXCONFIG);
+       val = br32(B44_RXCONFIG);
        if (pause_flags & B44_FLAG_RX_PAUSE)
                val |= RXCONFIG_FLOW;
        else
                val &= ~RXCONFIG_FLOW;
-       bw32(bp, B44_RXCONFIG, val);
+       bw32(B44_RXCONFIG, val);
 
-       val = br32(bp, B44_MAC_FLOW);
+       val = br32(B44_MAC_FLOW);
        if (pause_flags & B44_FLAG_TX_PAUSE)
                val |= (MAC_FLOW_PAUSE_ENAB |
                        (0xc0 & MAC_FLOW_RX_HI_WATER));
        else
                val &= ~MAC_FLOW_PAUSE_ENAB;
-       bw32(bp, B44_MAC_FLOW, val);
+       bw32(B44_MAC_FLOW, val);
 }
 
 static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
@@ -414,6 +422,9 @@
        u32 val;
        int err;
 
+       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
+               return 0;
+
        if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
                goto out;
        if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
@@ -476,11 +487,11 @@
 
        val = &bp->hw_stats.tx_good_octets;
        for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL) {
-               *val++ += br32(bp, reg);
+               *val++ += br32(reg);
        }
        val = &bp->hw_stats.rx_good_octets;
        for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL) {
-               *val++ += br32(bp, reg);
+               *val++ += br32(reg);
        }
 }
 
@@ -506,6 +517,19 @@
 {
        u32 bmsr, aux;
 
+       if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
+               bp->flags |= B44_FLAG_100_BASE_T;
+               bp->flags |= B44_FLAG_FULL_DUPLEX;
+               if (!netif_carrier_ok(bp->dev)) {
+                       u32 val = br32(B44_TX_CTRL);
+                       val |= TX_CTRL_DUPLEX;
+                       bw32(B44_TX_CTRL, val);
+                       netif_carrier_on(bp->dev);
+                       b44_link_report(bp);
+               }
+               return;
+       }
+
        if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
            !b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
            (bmsr != 0xffff)) {
@@ -520,14 +544,14 @@
 
                if (!netif_carrier_ok(bp->dev) &&
                    (bmsr & BMSR_LSTATUS)) {
-                       u32 val = br32(bp, B44_TX_CTRL);
+                       u32 val = br32(B44_TX_CTRL);
                        u32 local_adv, remote_adv;
 
                        if (bp->flags & B44_FLAG_FULL_DUPLEX)
                                val |= TX_CTRL_DUPLEX;
                        else
                                val &= ~TX_CTRL_DUPLEX;
-                       bw32(bp, B44_TX_CTRL, val);
+                       bw32(B44_TX_CTRL, val);
 
                        if (!(bp->flags & B44_FLAG_FORCE_LINK) &&
                            !b44_readphy(bp, MII_ADVERTISE, &local_adv) &&
@@ -572,7 +596,7 @@
 {
        u32 cur, cons;
 
-       cur  = br32(bp, B44_DMATX_STAT) & DMATX_STAT_CDMASK;
+       cur  = br32(B44_DMATX_STAT) & DMATX_STAT_CDMASK;
        cur /= sizeof(struct dma_desc);
 
        /* XXX needs updating when NETIF_F_SG is supported */
@@ -596,7 +620,7 @@
            TX_BUFFS_AVAIL(bp) > B44_TX_WAKEUP_THRESH)
                netif_wake_queue(bp->dev);
 
-       bw32(bp, B44_GPTIMER, 0);
+       bw32(B44_GPTIMER, 0);
 }
 
 /* Works like this.  This chip writes a 'struct rx_header" 30 bytes
@@ -713,7 +737,7 @@
        u32 cons, prod;
 
        received = 0;
-       prod  = br32(bp, B44_DMARX_STAT) & DMARX_STAT_CDMASK;
+       prod  = br32(B44_DMARX_STAT) & DMARX_STAT_CDMASK;
        prod /= sizeof(struct dma_desc);
        cons = bp->rx_cons;
 
@@ -792,7 +816,7 @@
        }
 
        bp->rx_cons = cons;
-       bw32(bp, B44_DMARX_PTR, cons * sizeof(struct dma_desc));
+       bw32(B44_DMARX_PTR, cons * sizeof(struct dma_desc));
 
        return received;
 }
@@ -856,8 +880,8 @@
 
        spin_lock_irqsave(&bp->lock, flags);
 
-       istat = br32(bp, B44_ISTAT);
-       imask = br32(bp, B44_IMASK);
+       istat = br32(B44_ISTAT);
+       imask = br32(B44_IMASK);
 
        /* ??? What the fuck is the purpose of the interrupt mask
         * ??? register if we have to mask it out by hand anyways?
@@ -877,8 +901,8 @@
                               dev->name);
                }
 
-               bw32(bp, B44_ISTAT, istat);
-               br32(bp, B44_ISTAT);
+               bw32(B44_ISTAT, istat);
+               br32(B44_ISTAT);
        }
        spin_unlock_irqrestore(&bp->lock, flags);
        return IRQ_RETVAL(handled);
@@ -965,11 +989,11 @@
 
        wmb();
 
-       bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+       bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
        if (bp->flags & B44_FLAG_BUGGY_TXPTR)
-               bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+               bw32(B44_DMATX_PTR, entry * sizeof(struct dma_desc));
        if (bp->flags & B44_FLAG_REORDER_BUG)
-               br32(bp, B44_DMATX_PTR);
+               br32(B44_DMATX_PTR);
 
        if (TX_BUFFS_AVAIL(bp) < 1)
                netif_stop_queue(dev);
@@ -1137,32 +1161,35 @@
 {
        unsigned long reg;
 
-       bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+       bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
        for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL)
-               br32(bp, reg);
+               br32(reg);
        for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL)
-               br32(bp, reg);
+               br32(reg);
 }
 
 /* bp->lock is held. */
 static void b44_chip_reset(struct b44 *bp)
 {
+       unsigned int sb_clock;
+
        if (ssb_is_core_up(bp)) {
-               bw32(bp, B44_RCV_LAZY, 0);
-               bw32(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE);
+               bw32(B44_RCV_LAZY, 0);
+               bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE);
                b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 100, 1);
-               bw32(bp, B44_DMATX_CTRL, 0);
+               bw32(B44_DMATX_CTRL, 0);
                bp->tx_prod = bp->tx_cons = 0;
-               if (br32(bp, B44_DMARX_STAT) & DMARX_STAT_EMASK) {
+               if (br32(B44_DMARX_STAT) & DMARX_STAT_EMASK) {
                        b44_wait_bit(bp, B44_DMARX_STAT, DMARX_STAT_SIDLE,
                                     100, 0);
                }
-               bw32(bp, B44_DMARX_CTRL, 0);
+               bw32(B44_DMARX_CTRL, 0);
                bp->rx_prod = bp->rx_cons = 0;
        } else {
-               ssb_pci_setup(bp, (bp->core_unit == 0 ?
-                                  SBINTVEC_ENET0 :
-                                  SBINTVEC_ENET1));
+               if (bp->pdev->device != PCI_DEVICE_ID_BCM4713)
+                       ssb_pci_setup(bp, (bp->core_unit == 0 ?
+                                          SBINTVEC_ENET0 :
+                                          SBINTVEC_ENET1));
        }
 
        ssb_core_reset(bp);
@@ -1170,20 +1197,26 @@
        b44_clear_stats(bp);
 
        /* Make PHY accessible. */
-       bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
-                            (0x0d & MDIO_CTRL_MAXF_MASK)));
-       br32(bp, B44_MDIO_CTRL);
-
-       if (!(br32(bp, B44_DEVCTRL) & DEVCTRL_IPP)) {
-               bw32(bp, B44_ENET_CTRL, ENET_CTRL_EPSEL);
-               br32(bp, B44_ENET_CTRL);
+       if (bp->pdev->device == PCI_DEVICE_ID_BCM4713)
+               sb_clock = 100000000; /* 100 MHz */
+       else
+               sb_clock = 62500000; /* 62.5 MHz */
+
+       bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
+                            (((sb_clock + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO)
+                            & MDIO_CTRL_MAXF_MASK)));
+       br32(B44_MDIO_CTRL);
+
+       if (!(br32(B44_DEVCTRL) & DEVCTRL_IPP)) {
+               bw32(B44_ENET_CTRL, ENET_CTRL_EPSEL);
+               br32(B44_ENET_CTRL);
                bp->flags &= ~B44_FLAG_INTERNAL_PHY;
        } else {
-               u32 val = br32(bp, B44_DEVCTRL);
+               u32 val = br32(B44_DEVCTRL);
 
                if (val & DEVCTRL_EPR) {
-                       bw32(bp, B44_DEVCTRL, (val & ~DEVCTRL_EPR));
-                       br32(bp, B44_DEVCTRL);
+                       bw32(B44_DEVCTRL, (val & ~DEVCTRL_EPR));
+                       br32(B44_DEVCTRL);
                        udelay(100);
                }
                bp->flags |= B44_FLAG_INTERNAL_PHY;
@@ -1200,13 +1233,13 @@
 /* bp->lock is held. */
 static void __b44_set_mac_addr(struct b44 *bp)
 {
-       bw32(bp, B44_CAM_CTRL, 0);
+       bw32(B44_CAM_CTRL, 0);
        if (!(bp->dev->flags & IFF_PROMISC)) {
                u32 val;
 
                __b44_cam_write(bp, bp->dev->dev_addr, 0);
-               val = br32(bp, B44_CAM_CTRL);
-               bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+               val = br32(B44_CAM_CTRL);
+               bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
        }
 }
 
@@ -1240,30 +1273,30 @@
        b44_setup_phy(bp);
 
        /* Enable CRC32, set proper LED modes and power on PHY */
-       bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
-       bw32(bp, B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
+       bw32(B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
+       bw32(B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
 
        /* This sets the MAC address too.  */
        __b44_set_rx_mode(bp->dev);
 
        /* MTU + eth header + possible VLAN tag + struct rx_header */
-       bw32(bp, B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
-       bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+       bw32(B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+       bw32(B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
 
-       bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
-       bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
-       bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
-       bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+       bw32(B44_TX_WMARK, 56); /* XXX magic */
+       bw32(B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+       bw32(B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+       bw32(B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
                              (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
-       bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+       bw32(B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
 
-       bw32(bp, B44_DMARX_PTR, bp->rx_pending);
+       bw32(B44_DMARX_PTR, bp->rx_pending);
        bp->rx_prod = bp->rx_pending;   
 
-       bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+       bw32(B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
 
-       val = br32(bp, B44_ENET_CTRL);
-       bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
+       val = br32(B44_ENET_CTRL);
+       bw32(B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
 }
 
 static int b44_open(struct net_device *dev)
@@ -1416,11 +1449,11 @@
        int i=0;
        unsigned char zero[6] = {0,0,0,0,0,0};
 
-       val = br32(bp, B44_RXCONFIG);
+       val = br32(B44_RXCONFIG);
        val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
        if (dev->flags & IFF_PROMISC) {
                val |= RXCONFIG_PROMISC;
-               bw32(bp, B44_RXCONFIG, val);
+               bw32(B44_RXCONFIG, val);
        } else {
                __b44_set_mac_addr(bp);
 
@@ -1432,9 +1465,9 @@
                for(;i<64;i++) {
                        __b44_cam_write(bp, zero, i);                   
                }
-               bw32(bp, B44_RXCONFIG, val);
-               val = br32(bp, B44_CAM_CTRL);
-               bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+               bw32(B44_RXCONFIG, val);
+               val = br32(B44_CAM_CTRL);
+               bw32(B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
        }
 }
 
@@ -1704,19 +1737,41 @@
 {
        u8 eeprom[128];
        int err;
+       unsigned long flags;
 
-       err = b44_read_eeprom(bp, &eeprom[0]);
-       if (err)
-               goto out;
-
-       bp->dev->dev_addr[0] = eeprom[79];
-       bp->dev->dev_addr[1] = eeprom[78];
-       bp->dev->dev_addr[2] = eeprom[81];
-       bp->dev->dev_addr[3] = eeprom[80];
-       bp->dev->dev_addr[4] = eeprom[83];
-       bp->dev->dev_addr[5] = eeprom[82];
-
-       bp->phy_addr = eeprom[90] & 0x1f;
+       if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) {
+               /* 
+                * BCM47xx boards don't have a EEPROM. The MAC is stored in
+                * a NVRAM area somewhere in the flash memory. As we don't
+                * know the location and/or the format of the NVRAM area
+                * here, we simply rely on the bootloader to write the
+                * MAC into the CAM.
+                */
+               spin_lock_irqsave(&bp->lock, flags);
+               __b44_cam_read(bp, bp->dev->dev_addr, 0);
+               spin_unlock_irqrestore(&bp->lock, flags);
+
+               /* 
+                * BCM47xx boards don't have a PHY. Usually there is a switch
+                * chip with multiple PHYs connected to the PHY port.
+                */
+               bp->phy_addr = B44_PHY_ADDR_NO_PHY;
+               bp->dma_offset = 0;
+       } else {
+               err = b44_read_eeprom(bp, &eeprom[0]);
+               if (err)
+                       return err;
+
+               bp->dev->dev_addr[0] = eeprom[79];
+               bp->dev->dev_addr[1] = eeprom[78];
+               bp->dev->dev_addr[2] = eeprom[81];
+               bp->dev->dev_addr[3] = eeprom[80];
+               bp->dev->dev_addr[4] = eeprom[83];
+               bp->dev->dev_addr[5] = eeprom[82];
+
+               bp->phy_addr = eeprom[90] & 0x1f;
+               bp->dma_offset = SB_PCI_DMA;
+       } 
 
        /* With this, plus the rx_header prepended to the data by the
         * hardware, we'll land the ethernet header on a 2-byte boundary.
@@ -1726,13 +1781,12 @@
        bp->imask = IMASK_DEF;
 
        bp->core_unit = ssb_core_unit(bp);
-       bp->dma_offset = SB_PCI_DMA;
 
        /* XXX - really required? 
           bp->flags |= B44_FLAG_BUGGY_TXPTR;
          */
-out:
-       return err;
+
+       return 0;
 }
 
 static int __devinit b44_init_one(struct pci_dev *pdev,
@@ -1810,7 +1864,7 @@
 
        spin_lock_init(&bp->lock);
 
-       bp->regs = ioremap(b44reg_base, b44reg_len);
+       bp->regs = (unsigned long) ioremap(b44reg_base, b44reg_len);
        if (bp->regs == 0UL) {
                printk(KERN_ERR PFX "Cannot map device registers, "
                       "aborting.\n");
@@ -1871,7 +1925,8 @@
 
        pci_save_state(bp->pdev);
 
-       printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
+       printk(KERN_INFO "%s: Broadcom %s 10/100BaseT Ethernet ", dev->name,
+               (pdev->device == PCI_DEVICE_ID_BCM4713) ? "47xx" : "4400");
        for (i = 0; i < 6; i++)
                printk("%2.2x%c", dev->dev_addr[i],
                       i == 5 ? '\n' : ':');
@@ -1879,7 +1934,7 @@
        return 0;
 
 err_out_iounmap:
-       iounmap(bp->regs);
+       iounmap((void *) bp->regs);
 
 err_out_free_dev:
        free_netdev(dev);
@@ -1901,7 +1956,7 @@
                struct b44 *bp = netdev_priv(dev);
 
                unregister_netdev(dev);
-               iounmap(bp->regs);
+               iounmap((void *) bp->regs);
                free_netdev(dev);
                pci_release_regions(pdev);
                pci_disable_device(pdev);
diff -Nur linux-2.6.12.5/drivers/net/b44.c.orig linux-2.6.12.5-brcm/drivers/net/b44.c.orig
--- linux-2.6.12.5/drivers/net/b44.c.orig       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/drivers/net/b44.c.orig  2005-08-15 02:20:18.000000000 +0200
@@ -0,0 +1,1978 @@
+/* b44.c: Broadcom 4400 device driver.
+ *
+ * Copyright (C) 2002 David S. Miller (davem@redhat.com)
+ * Fixed by Pekka Pietikainen (pp@ee.oulu.fi)
+ *
+ * Distribute under GPL.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/version.h>
+
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include "b44.h"
+
+#define DRV_MODULE_NAME                "b44"
+#define PFX DRV_MODULE_NAME    ": "
+#define DRV_MODULE_VERSION     "0.95"
+#define DRV_MODULE_RELDATE     "Aug 3, 2004"
+
+#define B44_DEF_MSG_ENABLE       \
+       (NETIF_MSG_DRV          | \
+        NETIF_MSG_PROBE        | \
+        NETIF_MSG_LINK         | \
+        NETIF_MSG_TIMER        | \
+        NETIF_MSG_IFDOWN       | \
+        NETIF_MSG_IFUP         | \
+        NETIF_MSG_RX_ERR       | \
+        NETIF_MSG_TX_ERR)
+
+/* length of time before we decide the hardware is borked,
+ * and dev->tx_timeout() should be called to fix the problem
+ */
+#define B44_TX_TIMEOUT                 (5 * HZ)
+
+/* hardware minimum and maximum for a single frame's data payload */
+#define B44_MIN_MTU                    60
+#define B44_MAX_MTU                    1500
+
+#define B44_RX_RING_SIZE               512
+#define B44_DEF_RX_RING_PENDING                200
+#define B44_RX_RING_BYTES      (sizeof(struct dma_desc) * \
+                                B44_RX_RING_SIZE)
+#define B44_TX_RING_SIZE               512
+#define B44_DEF_TX_RING_PENDING                (B44_TX_RING_SIZE - 1)
+#define B44_TX_RING_BYTES      (sizeof(struct dma_desc) * \
+                                B44_TX_RING_SIZE)
+#define B44_DMA_MASK 0x3fffffff
+
+#define TX_RING_GAP(BP)        \
+       (B44_TX_RING_SIZE - (BP)->tx_pending)
+#define TX_BUFFS_AVAIL(BP)                                             \
+       (((BP)->tx_cons <= (BP)->tx_prod) ?                             \
+         (BP)->tx_cons + (BP)->tx_pending - (BP)->tx_prod :            \
+         (BP)->tx_cons - (BP)->tx_prod - TX_RING_GAP(BP))
+#define NEXT_TX(N)             (((N) + 1) & (B44_TX_RING_SIZE - 1))
+
+#define RX_PKT_BUF_SZ          (1536 + bp->rx_offset + 64)
+#define TX_PKT_BUF_SZ          (B44_MAX_MTU + ETH_HLEN + 8)
+
+/* minimum number of free TX descriptors required to wake up TX process */
+#define B44_TX_WAKEUP_THRESH           (B44_TX_RING_SIZE / 4)
+
+static char version[] __devinitdata =
+       DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+
+MODULE_AUTHOR("Florian Schirmer, Pekka Pietikainen, David S. Miller");
+MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
+
+static int b44_debug = -1;     /* -1 == use B44_DEF_MSG_ENABLE as value */
+module_param(b44_debug, int, 0);
+MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
+
+static struct pci_device_id b44_pci_tbl[] = {
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B0,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { }     /* terminate list with empty entry */
+};
+
+MODULE_DEVICE_TABLE(pci, b44_pci_tbl);
+
+static void b44_halt(struct b44 *);
+static void b44_init_rings(struct b44 *);
+static void b44_init_hw(struct b44 *);
+static int b44_poll(struct net_device *dev, int *budget);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void b44_poll_controller(struct net_device *dev);
+#endif
+
+static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
+{
+       return readl(bp->regs + reg);
+}
+
+static inline void bw32(const struct b44 *bp, 
+                       unsigned long reg, unsigned long val)
+{
+       writel(val, bp->regs + reg);
+}
+
+static int b44_wait_bit(struct b44 *bp, unsigned long reg,
+                       u32 bit, unsigned long timeout, const int clear)
+{
+       unsigned long i;
+
+       for (i = 0; i < timeout; i++) {
+               u32 val = br32(bp, reg);
+
+               if (clear && !(val & bit))
+                       break;
+               if (!clear && (val & bit))
+                       break;
+               udelay(10);
+       }
+       if (i == timeout) {
+               printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit %08x of register "
+                      "%lx to %s.\n",
+                      bp->dev->name,
+                      bit, reg,
+                      (clear ? "clear" : "set"));
+               return -ENODEV;
+       }
+       return 0;
+}
+
+/* Sonics SiliconBackplane support routines.  ROFL, you should see all the
+ * buzz words used on this company's website :-)
+ *
+ * All of these routines must be invoked with bp->lock held and
+ * interrupts disabled.
+ */
+
+#define SB_PCI_DMA             0x40000000      /* Client Mode PCI memory access space (1 GB) */
+#define BCM4400_PCI_CORE_ADDR  0x18002000      /* Address of PCI core on BCM4400 cards */
+
+static u32 ssb_get_core_rev(struct b44 *bp)
+{
+       return (br32(bp, B44_SBIDHIGH) & SBIDHIGH_RC_MASK);
+}
+
+static u32 ssb_pci_setup(struct b44 *bp, u32 cores)
+{
+       u32 bar_orig, pci_rev, val;
+
+       pci_read_config_dword(bp->pdev, SSB_BAR0_WIN, &bar_orig);
+       pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, BCM4400_PCI_CORE_ADDR);
+       pci_rev = ssb_get_core_rev(bp);
+
+       val = br32(bp, B44_SBINTVEC);
+       val |= cores;
+       bw32(bp, B44_SBINTVEC, val);
+
+       val = br32(bp, SSB_PCI_TRANS_2);
+       val |= SSB_PCI_PREF | SSB_PCI_BURST;
+       bw32(bp, SSB_PCI_TRANS_2, val);
+
+       pci_write_config_dword(bp->pdev, SSB_BAR0_WIN, bar_orig);
+
+       return pci_rev;
+}
+
+static void ssb_core_disable(struct b44 *bp)
+{
+       if (br32(bp, B44_SBTMSLOW) & SBTMSLOW_RESET)
+               return;
+
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_CLOCK));
+       b44_wait_bit(bp, B44_SBTMSLOW, SBTMSLOW_REJECT, 100000, 0);
+       b44_wait_bit(bp, B44_SBTMSHIGH, SBTMSHIGH_BUSY, 100000, 1);
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_FGC | SBTMSLOW_CLOCK |
+                           SBTMSLOW_REJECT | SBTMSLOW_RESET));
+       br32(bp, B44_SBTMSLOW);
+       udelay(1);
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_REJECT | SBTMSLOW_RESET));
+       br32(bp, B44_SBTMSLOW);
+       udelay(1);
+}
+
+static void ssb_core_reset(struct b44 *bp)
+{
+       u32 val;
+
+       ssb_core_disable(bp);
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_RESET | SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+       br32(bp, B44_SBTMSLOW);
+       udelay(1);
+
+       /* Clear SERR if set, this is a hw bug workaround.  */
+       if (br32(bp, B44_SBTMSHIGH) & SBTMSHIGH_SERR)
+               bw32(bp, B44_SBTMSHIGH, 0);
+
+       val = br32(bp, B44_SBIMSTATE);
+       if (val & (SBIMSTATE_IBE | SBIMSTATE_TO))
+               bw32(bp, B44_SBIMSTATE, val & ~(SBIMSTATE_IBE | SBIMSTATE_TO));
+
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK | SBTMSLOW_FGC));
+       br32(bp, B44_SBTMSLOW);
+       udelay(1);
+
+       bw32(bp, B44_SBTMSLOW, (SBTMSLOW_CLOCK));
+       br32(bp, B44_SBTMSLOW);
+       udelay(1);
+}
+
+static int ssb_core_unit(struct b44 *bp)
+{
+#if 0
+       u32 val = br32(bp, B44_SBADMATCH0);
+       u32 base;
+
+       type = val & SBADMATCH0_TYPE_MASK;
+       switch (type) {
+       case 0:
+               base = val & SBADMATCH0_BS0_MASK;
+               break;
+
+       case 1:
+               base = val & SBADMATCH0_BS1_MASK;
+               break;
+
+       case 2:
+       default:
+               base = val & SBADMATCH0_BS2_MASK;
+               break;
+       };
+#endif
+       return 0;
+}
+
+static int ssb_is_core_up(struct b44 *bp)
+{
+       return ((br32(bp, B44_SBTMSLOW) & (SBTMSLOW_RESET | SBTMSLOW_REJECT | SBTMSLOW_CLOCK))
+               == SBTMSLOW_CLOCK);
+}
+
+static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
+{
+       u32 val;
+
+       val  = ((u32) data[2]) << 24;
+       val |= ((u32) data[3]) << 16;
+       val |= ((u32) data[4]) <<  8;
+       val |= ((u32) data[5]) <<  0;
+       bw32(bp, B44_CAM_DATA_LO, val);
+       val = (CAM_DATA_HI_VALID | 
+              (((u32) data[0]) << 8) |
+              (((u32) data[1]) << 0));
+       bw32(bp, B44_CAM_DATA_HI, val);
+       bw32(bp, B44_CAM_CTRL, (CAM_CTRL_WRITE |
+                           (index << CAM_CTRL_INDEX_SHIFT)));
+       b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);  
+}
+
+static inline void __b44_disable_ints(struct b44 *bp)
+{
+       bw32(bp, B44_IMASK, 0);
+}
+
+static void b44_disable_ints(struct b44 *bp)
+{
+       __b44_disable_ints(bp);
+
+       /* Flush posted writes. */
+       br32(bp, B44_IMASK);
+}
+
+static void b44_enable_ints(struct b44 *bp)
+{
+       bw32(bp, B44_IMASK, bp->imask);
+}
+
+static int b44_readphy(struct b44 *bp, int reg, u32 *val)
+{
+       int err;
+
+       bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
+       bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
+                            (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) |
+                            (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+                            (reg << MDIO_DATA_RA_SHIFT) |
+                            (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT)));
+       err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
+       *val = br32(bp, B44_MDIO_DATA) & MDIO_DATA_DATA;
+
+       return err;
+}
+
+static int b44_writephy(struct b44 *bp, int reg, u32 val)
+{
+       bw32(bp, B44_EMAC_ISTAT, EMAC_INT_MII);
+       bw32(bp, B44_MDIO_DATA, (MDIO_DATA_SB_START |
+                            (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) |
+                            (bp->phy_addr << MDIO_DATA_PMD_SHIFT) |
+                            (reg << MDIO_DATA_RA_SHIFT) |
+                            (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) |
+                            (val & MDIO_DATA_DATA)));
+       return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0);
+}
+
+/* miilib interface */
+/* FIXME FIXME: phy_id is ignored, bp->phy_addr use is unconditional
+ * due to code existing before miilib use was added to this driver.
+ * Someone should remove this artificial driver limitation in
+ * b44_{read,write}phy.  bp->phy_addr itself is fine (and needed).
+ */
+static int b44_mii_read(struct net_device *dev, int phy_id, int location)
+{
+       u32 val;
+       struct b44 *bp = netdev_priv(dev);
+       int rc = b44_readphy(bp, location, &val);
+       if (rc)
+               return 0xffffffff;
+       return val;
+}
+
+static void b44_mii_write(struct net_device *dev, int phy_id, int location,
+                        int val)
+{
+       struct b44 *bp = netdev_priv(dev);
+       b44_writephy(bp, location, val);
+}
+
+static int b44_phy_reset(struct b44 *bp)
+{
+       u32 val;
+       int err;
+
+       err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
+       if (err)
+               return err;
+       udelay(100);
+       err = b44_readphy(bp, MII_BMCR, &val);
+       if (!err) {
+               if (val & BMCR_RESET) {
+                       printk(KERN_ERR PFX "%s: PHY Reset would not complete.\n",
+                              bp->dev->name);
+                       err = -ENODEV;
+               }
+       }
+
+       return 0;
+}
+
+static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
+{
+       u32 val;
+
+       bp->flags &= ~(B44_FLAG_TX_PAUSE | B44_FLAG_RX_PAUSE);
+       bp->flags |= pause_flags;
+
+       val = br32(bp, B44_RXCONFIG);
+       if (pause_flags & B44_FLAG_RX_PAUSE)
+               val |= RXCONFIG_FLOW;
+       else
+               val &= ~RXCONFIG_FLOW;
+       bw32(bp, B44_RXCONFIG, val);
+
+       val = br32(bp, B44_MAC_FLOW);
+       if (pause_flags & B44_FLAG_TX_PAUSE)
+               val |= (MAC_FLOW_PAUSE_ENAB |
+                       (0xc0 & MAC_FLOW_RX_HI_WATER));
+       else
+               val &= ~MAC_FLOW_PAUSE_ENAB;
+       bw32(bp, B44_MAC_FLOW, val);
+}
+
+static void b44_set_flow_ctrl(struct b44 *bp, u32 local, u32 remote)
+{
+       u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE |
+                                     B44_FLAG_RX_PAUSE);
+
+       if (local & ADVERTISE_PAUSE_CAP) {
+               if (local & ADVERTISE_PAUSE_ASYM) {
+                       if (remote & LPA_PAUSE_CAP)
+                               pause_enab |= (B44_FLAG_TX_PAUSE |
+                                              B44_FLAG_RX_PAUSE);
+                       else if (remote & LPA_PAUSE_ASYM)
+                               pause_enab |= B44_FLAG_RX_PAUSE;
+               } else {
+                       if (remote & LPA_PAUSE_CAP)
+                               pause_enab |= (B44_FLAG_TX_PAUSE |
+                                              B44_FLAG_RX_PAUSE);
+               }
+       } else if (local & ADVERTISE_PAUSE_ASYM) {
+               if ((remote & LPA_PAUSE_CAP) &&
+                   (remote & LPA_PAUSE_ASYM))
+                       pause_enab |= B44_FLAG_TX_PAUSE;
+       }
+
+       __b44_set_flow_ctrl(bp, pause_enab);
+}
+
+static int b44_setup_phy(struct b44 *bp)
+{
+       u32 val;
+       int err;
+
+       if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
+               goto out;
+       if ((err = b44_writephy(bp, B44_MII_ALEDCTRL,
+                               val & MII_ALEDCTRL_ALLMSK)) != 0)
+               goto out;
+       if ((err = b44_readphy(bp, B44_MII_TLEDCTRL, &val)) != 0)
+               goto out;
+       if ((err = b44_writephy(bp, B44_MII_TLEDCTRL,
+                               val | MII_TLEDCTRL_ENABLE)) != 0)
+               goto out;
+
+       if (!(bp->flags & B44_FLAG_FORCE_LINK)) {
+               u32 adv = ADVERTISE_CSMA;
+
+               if (bp->flags & B44_FLAG_ADV_10HALF)
+                       adv |= ADVERTISE_10HALF;
+               if (bp->flags & B44_FLAG_ADV_10FULL)
+                       adv |= ADVERTISE_10FULL;
+               if (bp->flags & B44_FLAG_ADV_100HALF)
+                       adv |= ADVERTISE_100HALF;
+               if (bp->flags & B44_FLAG_ADV_100FULL)
+                       adv |= ADVERTISE_100FULL;
+
+               if (bp->flags & B44_FLAG_PAUSE_AUTO)
+                       adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+
+               if ((err = b44_writephy(bp, MII_ADVERTISE, adv)) != 0)
+                       goto out;
+               if ((err = b44_writephy(bp, MII_BMCR, (BMCR_ANENABLE |
+                                                      BMCR_ANRESTART))) != 0)
+                       goto out;
+       } else {
+               u32 bmcr;
+
+               if ((err = b44_readphy(bp, MII_BMCR, &bmcr)) != 0)
+                       goto out;
+               bmcr &= ~(BMCR_FULLDPLX | BMCR_ANENABLE | BMCR_SPEED100);
+               if (bp->flags & B44_FLAG_100_BASE_T)
+                       bmcr |= BMCR_SPEED100;
+               if (bp->flags & B44_FLAG_FULL_DUPLEX)
+                       bmcr |= BMCR_FULLDPLX;
+               if ((err = b44_writephy(bp, MII_BMCR, bmcr)) != 0)
+                       goto out;
+
+               /* Since we will not be negotiating there is no safe way
+                * to determine if the link partner supports flow control
+                * or not.  So just disable it completely in this case.
+                */
+               b44_set_flow_ctrl(bp, 0, 0);
+       }
+
+out:
+       return err;
+}
+
+static void b44_stats_update(struct b44 *bp)
+{
+       unsigned long reg;
+       u32 *val;
+
+       val = &bp->hw_stats.tx_good_octets;
+       for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL) {
+               *val++ += br32(bp, reg);
+       }
+       val = &bp->hw_stats.rx_good_octets;
+       for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL) {
+               *val++ += br32(bp, reg);
+       }
+}
+
+static void b44_link_report(struct b44 *bp)
+{
+       if (!netif_carrier_ok(bp->dev)) {
+               printk(KERN_INFO PFX "%s: Link is down.\n", bp->dev->name);
+       } else {
+               printk(KERN_INFO PFX "%s: Link is up at %d Mbps, %s duplex.\n",
+                      bp->dev->name,
+                      (bp->flags & B44_FLAG_100_BASE_T) ? 100 : 10,
+                      (bp->flags & B44_FLAG_FULL_DUPLEX) ? "full" : "half");
+
+               printk(KERN_INFO PFX "%s: Flow control is %s for TX and "
+                      "%s for RX.\n",
+                      bp->dev->name,
+                      (bp->flags & B44_FLAG_TX_PAUSE) ? "on" : "off",
+                      (bp->flags & B44_FLAG_RX_PAUSE) ? "on" : "off");
+       }
+}
+
+static void b44_check_phy(struct b44 *bp)
+{
+       u32 bmsr, aux;
+
+       if (!b44_readphy(bp, MII_BMSR, &bmsr) &&
+           !b44_readphy(bp, B44_MII_AUXCTRL, &aux) &&
+           (bmsr != 0xffff)) {
+               if (aux & MII_AUXCTRL_SPEED)
+                       bp->flags |= B44_FLAG_100_BASE_T;
+               else
+                       bp->flags &= ~B44_FLAG_100_BASE_T;
+               if (aux & MII_AUXCTRL_DUPLEX)
+                       bp->flags |= B44_FLAG_FULL_DUPLEX;
+               else
+                       bp->flags &= ~B44_FLAG_FULL_DUPLEX;
+
+               if (!netif_carrier_ok(bp->dev) &&
+                   (bmsr & BMSR_LSTATUS)) {
+                       u32 val = br32(bp, B44_TX_CTRL);
+                       u32 local_adv, remote_adv;
+
+                       if (bp->flags & B44_FLAG_FULL_DUPLEX)
+                               val |= TX_CTRL_DUPLEX;
+                       else
+                               val &= ~TX_CTRL_DUPLEX;
+                       bw32(bp, B44_TX_CTRL, val);
+
+                       if (!(bp->flags & B44_FLAG_FORCE_LINK) &&
+                           !b44_readphy(bp, MII_ADVERTISE, &local_adv) &&
+                           !b44_readphy(bp, MII_LPA, &remote_adv))
+                               b44_set_flow_ctrl(bp, local_adv, remote_adv);
+
+                       /* Link now up */
+                       netif_carrier_on(bp->dev);
+                       b44_link_report(bp);
+               } else if (netif_carrier_ok(bp->dev) && !(bmsr & BMSR_LSTATUS)) {
+                       /* Link now down */
+                       netif_carrier_off(bp->dev);
+                       b44_link_report(bp);
+               }
+
+               if (bmsr & BMSR_RFAULT)
+                       printk(KERN_WARNING PFX "%s: Remote fault detected in PHY\n",
+                              bp->dev->name);
+               if (bmsr & BMSR_JCD)
+                       printk(KERN_WARNING PFX "%s: Jabber detected in PHY\n",
+                              bp->dev->name);
+       }
+}
+
+static void b44_timer(unsigned long __opaque)
+{
+       struct b44 *bp = (struct b44 *) __opaque;
+
+       spin_lock_irq(&bp->lock);
+
+       b44_check_phy(bp);
+
+       b44_stats_update(bp);
+
+       spin_unlock_irq(&bp->lock);
+
+       bp->timer.expires = jiffies + HZ;
+       add_timer(&bp->timer);
+}
+
+static void b44_tx(struct b44 *bp)
+{
+       u32 cur, cons;
+
+       cur  = br32(bp, B44_DMATX_STAT) & DMATX_STAT_CDMASK;
+       cur /= sizeof(struct dma_desc);
+
+       /* XXX needs updating when NETIF_F_SG is supported */
+       for (cons = bp->tx_cons; cons != cur; cons = NEXT_TX(cons)) {
+               struct ring_info *rp = &bp->tx_buffers[cons];
+               struct sk_buff *skb = rp->skb;
+
+               if (unlikely(skb == NULL))
+                       BUG();
+
+               pci_unmap_single(bp->pdev,
+                                pci_unmap_addr(rp, mapping),
+                                skb->len,
+                                PCI_DMA_TODEVICE);
+               rp->skb = NULL;
+               dev_kfree_skb_irq(skb);
+       }
+
+       bp->tx_cons = cons;
+       if (netif_queue_stopped(bp->dev) &&
+           TX_BUFFS_AVAIL(bp) > B44_TX_WAKEUP_THRESH)
+               netif_wake_queue(bp->dev);
+
+       bw32(bp, B44_GPTIMER, 0);
+}
+
+/* Works like this.  This chip writes a 'struct rx_header" 30 bytes
+ * before the DMA address you give it.  So we allocate 30 more bytes
+ * for the RX buffer, DMA map all of it, skb_reserve the 30 bytes, then
+ * point the chip at 30 bytes past where the rx_header will go.
+ */
+static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
+{
+       struct dma_desc *dp;
+       struct ring_info *src_map, *map;
+       struct rx_header *rh;
+       struct sk_buff *skb;
+       dma_addr_t mapping;
+       int dest_idx;
+       u32 ctrl;
+
+       src_map = NULL;
+       if (src_idx >= 0)
+               src_map = &bp->rx_buffers[src_idx];
+       dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);
+       map = &bp->rx_buffers[dest_idx];
+       skb = dev_alloc_skb(RX_PKT_BUF_SZ);
+       if (skb == NULL)
+               return -ENOMEM;
+
+       mapping = pci_map_single(bp->pdev, skb->data,
+                                RX_PKT_BUF_SZ,
+                                PCI_DMA_FROMDEVICE);
+
+       /* Hardware bug work-around, the chip is unable to do PCI DMA
+          to/from anything above 1GB :-( */
+       if(mapping+RX_PKT_BUF_SZ > B44_DMA_MASK) {
+               /* Sigh... */
+               pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
+               dev_kfree_skb_any(skb);
+               skb = __dev_alloc_skb(RX_PKT_BUF_SZ,GFP_DMA);
+               if (skb == NULL)
+                       return -ENOMEM;
+               mapping = pci_map_single(bp->pdev, skb->data,
+                                        RX_PKT_BUF_SZ,
+                                        PCI_DMA_FROMDEVICE);
+               if(mapping+RX_PKT_BUF_SZ > B44_DMA_MASK) {
+                       pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE);
+                       dev_kfree_skb_any(skb);
+                       return -ENOMEM;
+               }
+       }
+
+       skb->dev = bp->dev;
+       skb_reserve(skb, bp->rx_offset);
+
+       rh = (struct rx_header *)
+               (skb->data - bp->rx_offset);
+       rh->len = 0;
+       rh->flags = 0;
+
+       map->skb = skb;
+       pci_unmap_addr_set(map, mapping, mapping);
+
+       if (src_map != NULL)
+               src_map->skb = NULL;
+
+       ctrl  = (DESC_CTRL_LEN & (RX_PKT_BUF_SZ - bp->rx_offset));
+       if (dest_idx == (B44_RX_RING_SIZE - 1))
+               ctrl |= DESC_CTRL_EOT;
+
+       dp = &bp->rx_ring[dest_idx];
+       dp->ctrl = cpu_to_le32(ctrl);
+       dp->addr = cpu_to_le32((u32) mapping + bp->rx_offset + bp->dma_offset);
+
+       return RX_PKT_BUF_SZ;
+}
+
+static void b44_recycle_rx(struct b44 *bp, int src_idx, u32 dest_idx_unmasked)
+{
+       struct dma_desc *src_desc, *dest_desc;
+       struct ring_info *src_map, *dest_map;
+       struct rx_header *rh;
+       int dest_idx;
+       u32 ctrl;
+
+       dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);
+       dest_desc = &bp->rx_ring[dest_idx];
+       dest_map = &bp->rx_buffers[dest_idx];
+       src_desc = &bp->rx_ring[src_idx];
+       src_map = &bp->rx_buffers[src_idx];
+
+       dest_map->skb = src_map->skb;
+       rh = (struct rx_header *) src_map->skb->data;
+       rh->len = 0;
+       rh->flags = 0;
+       pci_unmap_addr_set(dest_map, mapping,
+                          pci_unmap_addr(src_map, mapping));
+
+       ctrl = src_desc->ctrl;
+       if (dest_idx == (B44_RX_RING_SIZE - 1))
+               ctrl |= cpu_to_le32(DESC_CTRL_EOT);
+       else
+               ctrl &= cpu_to_le32(~DESC_CTRL_EOT);
+
+       dest_desc->ctrl = ctrl;
+       dest_desc->addr = src_desc->addr;
+       src_map->skb = NULL;
+
+       pci_dma_sync_single_for_device(bp->pdev, src_desc->addr,
+                                      RX_PKT_BUF_SZ,
+                                      PCI_DMA_FROMDEVICE);
+}
+
+static int b44_rx(struct b44 *bp, int budget)
+{
+       int received;
+       u32 cons, prod;
+
+       received = 0;
+       prod  = br32(bp, B44_DMARX_STAT) & DMARX_STAT_CDMASK;
+       prod /= sizeof(struct dma_desc);
+       cons = bp->rx_cons;
+
+       while (cons != prod && budget > 0) {
+               struct ring_info *rp = &bp->rx_buffers[cons];
+               struct sk_buff *skb = rp->skb;
+               dma_addr_t map = pci_unmap_addr(rp, mapping);
+               struct rx_header *rh;
+               u16 len;
+
+               pci_dma_sync_single_for_cpu(bp->pdev, map,
+                                           RX_PKT_BUF_SZ,
+                                           PCI_DMA_FROMDEVICE);
+               rh = (struct rx_header *) skb->data;
+               len = cpu_to_le16(rh->len);
+               if ((len > (RX_PKT_BUF_SZ - bp->rx_offset)) ||
+                   (rh->flags & cpu_to_le16(RX_FLAG_ERRORS))) {
+               drop_it:
+                       b44_recycle_rx(bp, cons, bp->rx_prod);
+               drop_it_no_recycle:
+                       bp->stats.rx_dropped++;
+                       goto next_pkt;
+               }
+
+               if (len == 0) {
+                       int i = 0;
+
+                       do {
+                               udelay(2);
+                               barrier();
+                               len = cpu_to_le16(rh->len);
+                       } while (len == 0 && i++ < 5);
+                       if (len == 0)
+                               goto drop_it;
+               }
+
+               /* Omit CRC. */
+               len -= 4;
+
+               if (len > RX_COPY_THRESHOLD) {
+                       int skb_size;
+                       skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
+                       if (skb_size < 0)
+                               goto drop_it;
+                       pci_unmap_single(bp->pdev, map,
+                                        skb_size, PCI_DMA_FROMDEVICE);
+                       /* Leave out rx_header */
+                       skb_put(skb, len+bp->rx_offset);
+                       skb_pull(skb,bp->rx_offset);
+               } else {
+                       struct sk_buff *copy_skb;
+
+                       b44_recycle_rx(bp, cons, bp->rx_prod);
+                       copy_skb = dev_alloc_skb(len + 2);
+                       if (copy_skb == NULL)
+                               goto drop_it_no_recycle;
+
+                       copy_skb->dev = bp->dev;
+                       skb_reserve(copy_skb, 2);
+                       skb_put(copy_skb, len);
+                       /* DMA sync done above, copy just the actual packet */
+                       memcpy(copy_skb->data, skb->data+bp->rx_offset, len);
+
+                       skb = copy_skb;
+               }
+               skb->ip_summed = CHECKSUM_NONE;
+               skb->protocol = eth_type_trans(skb, bp->dev);
+               netif_receive_skb(skb);
+               bp->dev->last_rx = jiffies;
+               received++;
+               budget--;
+       next_pkt:
+               bp->rx_prod = (bp->rx_prod + 1) &
+                       (B44_RX_RING_SIZE - 1);
+               cons = (cons + 1) & (B44_RX_RING_SIZE - 1);
+       }
+
+       bp->rx_cons = cons;
+       bw32(bp, B44_DMARX_PTR, cons * sizeof(struct dma_desc));
+
+       return received;
+}
+
+static int b44_poll(struct net_device *netdev, int *budget)
+{
+       struct b44 *bp = netdev_priv(netdev);
+       int done;
+
+       spin_lock_irq(&bp->lock);
+
+       if (bp->istat & (ISTAT_TX | ISTAT_TO)) {
+               /* spin_lock(&bp->tx_lock); */
+               b44_tx(bp);
+               /* spin_unlock(&bp->tx_lock); */
+       }
+       spin_unlock_irq(&bp->lock);
+
+       done = 1;
+       if (bp->istat & ISTAT_RX) {
+               int orig_budget = *budget;
+               int work_done;
+
+               if (orig_budget > netdev->quota)
+                       orig_budget = netdev->quota;
+
+               work_done = b44_rx(bp, orig_budget);
+
+               *budget -= work_done;
+               netdev->quota -= work_done;
+
+               if (work_done >= orig_budget)
+                       done = 0;
+       }
+
+       if (bp->istat & ISTAT_ERRORS) {
+               spin_lock_irq(&bp->lock);
+               b44_halt(bp);
+               b44_init_rings(bp);
+               b44_init_hw(bp);
+               netif_wake_queue(bp->dev);
+               spin_unlock_irq(&bp->lock);
+               done = 1;
+       }
+
+       if (done) {
+               netif_rx_complete(netdev);
+               b44_enable_ints(bp);
+       }
+
+       return (done ? 0 : 1);
+}
+
+static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+       struct net_device *dev = dev_id;
+       struct b44 *bp = netdev_priv(dev);
+       unsigned long flags;
+       u32 istat, imask;
+       int handled = 0;
+
+       spin_lock_irqsave(&bp->lock, flags);
+
+       istat = br32(bp, B44_ISTAT);
+       imask = br32(bp, B44_IMASK);
+
+       /* ??? What the fuck is the purpose of the interrupt mask
+        * ??? register if we have to mask it out by hand anyways?
+        */
+       istat &= imask;
+       if (istat) {
+               handled = 1;
+               if (netif_rx_schedule_prep(dev)) {
+                       /* NOTE: These writes are posted by the readback of
+                        *       the ISTAT register below.
+                        */
+                       bp->istat = istat;
+                       __b44_disable_ints(bp);
+                       __netif_rx_schedule(dev);
+               } else {
+                       printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
+                              dev->name);
+               }
+
+               bw32(bp, B44_ISTAT, istat);
+               br32(bp, B44_ISTAT);
+       }
+       spin_unlock_irqrestore(&bp->lock, flags);
+       return IRQ_RETVAL(handled);
+}
+
+static void b44_tx_timeout(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       printk(KERN_ERR PFX "%s: transmit timed out, resetting\n",
+              dev->name);
+
+       spin_lock_irq(&bp->lock);
+
+       b44_halt(bp);
+       b44_init_rings(bp);
+       b44_init_hw(bp);
+
+       spin_unlock_irq(&bp->lock);
+
+       b44_enable_ints(bp);
+
+       netif_wake_queue(dev);
+}
+
+static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       struct sk_buff *bounce_skb;
+       dma_addr_t mapping;
+       u32 len, entry, ctrl;
+
+       len = skb->len;
+       spin_lock_irq(&bp->lock);
+
+       /* This is a hard error, log it. */
+       if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
+               netif_stop_queue(dev);
+               spin_unlock_irq(&bp->lock);
+               printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
+                      dev->name);
+               return 1;
+       }
+
+       mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
+       if(mapping+len > B44_DMA_MASK) {
+               /* Chip can't handle DMA to/from >1GB, use bounce buffer */
+               pci_unmap_single(bp->pdev, mapping, len, PCI_DMA_TODEVICE);
+
+               bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ,
+                                            GFP_ATOMIC|GFP_DMA);
+               if (!bounce_skb)
+                       return NETDEV_TX_BUSY;
+
+               mapping = pci_map_single(bp->pdev, bounce_skb->data,
+                                        len, PCI_DMA_TODEVICE);
+               if(mapping+len > B44_DMA_MASK) {
+                       pci_unmap_single(bp->pdev, mapping,
+                                        len, PCI_DMA_TODEVICE);
+                       dev_kfree_skb_any(bounce_skb);
+                       return NETDEV_TX_BUSY;
+               }
+
+               memcpy(skb_put(bounce_skb, len), skb->data, skb->len);
+               dev_kfree_skb_any(skb);
+               skb = bounce_skb;
+       }
+
+       entry = bp->tx_prod;
+       bp->tx_buffers[entry].skb = skb;
+       pci_unmap_addr_set(&bp->tx_buffers[entry], mapping, mapping);
+
+       ctrl  = (len & DESC_CTRL_LEN);
+       ctrl |= DESC_CTRL_IOC | DESC_CTRL_SOF | DESC_CTRL_EOF;
+       if (entry == (B44_TX_RING_SIZE - 1))
+               ctrl |= DESC_CTRL_EOT;
+
+       bp->tx_ring[entry].ctrl = cpu_to_le32(ctrl);
+       bp->tx_ring[entry].addr = cpu_to_le32((u32) mapping+bp->dma_offset);
+
+       entry = NEXT_TX(entry);
+
+       bp->tx_prod = entry;
+
+       wmb();
+
+       bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+       if (bp->flags & B44_FLAG_BUGGY_TXPTR)
+               bw32(bp, B44_DMATX_PTR, entry * sizeof(struct dma_desc));
+       if (bp->flags & B44_FLAG_REORDER_BUG)
+               br32(bp, B44_DMATX_PTR);
+
+       if (TX_BUFFS_AVAIL(bp) < 1)
+               netif_stop_queue(dev);
+
+       spin_unlock_irq(&bp->lock);
+
+       dev->trans_start = jiffies;
+
+       return 0;
+}
+
+static int b44_change_mtu(struct net_device *dev, int new_mtu)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       if (new_mtu < B44_MIN_MTU || new_mtu > B44_MAX_MTU)
+               return -EINVAL;
+
+       if (!netif_running(dev)) {
+               /* We'll just catch it later when the
+                * device is up'd.
+                */
+               dev->mtu = new_mtu;
+               return 0;
+       }
+
+       spin_lock_irq(&bp->lock);
+       b44_halt(bp);
+       dev->mtu = new_mtu;
+       b44_init_rings(bp);
+       b44_init_hw(bp);
+       spin_unlock_irq(&bp->lock);
+
+       b44_enable_ints(bp);
+       
+       return 0;
+}
+
+/* Free up pending packets in all rx/tx rings.
+ *
+ * The chip has been shut down and the driver detached from
+ * the networking, so no interrupts or new tx packets will
+ * end up in the driver.  bp->lock is not held and we are not
+ * in an interrupt context and thus may sleep.
+ */
+static void b44_free_rings(struct b44 *bp)
+{
+       struct ring_info *rp;
+       int i;
+
+       for (i = 0; i < B44_RX_RING_SIZE; i++) {
+               rp = &bp->rx_buffers[i];
+
+               if (rp->skb == NULL)
+                       continue;
+               pci_unmap_single(bp->pdev,
+                                pci_unmap_addr(rp, mapping),
+                                RX_PKT_BUF_SZ,
+                                PCI_DMA_FROMDEVICE);
+               dev_kfree_skb_any(rp->skb);
+               rp->skb = NULL;
+       }
+
+       /* XXX needs changes once NETIF_F_SG is set... */
+       for (i = 0; i < B44_TX_RING_SIZE; i++) {
+               rp = &bp->tx_buffers[i];
+
+               if (rp->skb == NULL)
+                       continue;
+               pci_unmap_single(bp->pdev,
+                                pci_unmap_addr(rp, mapping),
+                                rp->skb->len,
+                                PCI_DMA_TODEVICE);
+               dev_kfree_skb_any(rp->skb);
+               rp->skb = NULL;
+       }
+}
+
+/* Initialize tx/rx rings for packet processing.
+ *
+ * The chip has been shut down and the driver detached from
+ * the networking, so no interrupts or new tx packets will
+ * end up in the driver.  bp->lock is not held and we are not
+ * in an interrupt context and thus may sleep.
+ */
+static void b44_init_rings(struct b44 *bp)
+{
+       int i;
+
+       b44_free_rings(bp);
+
+       memset(bp->rx_ring, 0, B44_RX_RING_BYTES);
+       memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
+
+       for (i = 0; i < bp->rx_pending; i++) {
+               if (b44_alloc_rx_skb(bp, -1, i) < 0)
+                       break;
+       }
+}
+
+/*
+ * Must not be invoked with interrupt sources disabled and
+ * the hardware shutdown down.
+ */
+static void b44_free_consistent(struct b44 *bp)
+{
+       if (bp->rx_buffers) {
+               kfree(bp->rx_buffers);
+               bp->rx_buffers = NULL;
+       }
+       if (bp->tx_buffers) {
+               kfree(bp->tx_buffers);
+               bp->tx_buffers = NULL;
+       }
+       if (bp->rx_ring) {
+               pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
+                                   bp->rx_ring, bp->rx_ring_dma);
+               bp->rx_ring = NULL;
+       }
+       if (bp->tx_ring) {
+               pci_free_consistent(bp->pdev, DMA_TABLE_BYTES,
+                                   bp->tx_ring, bp->tx_ring_dma);
+               bp->tx_ring = NULL;
+       }
+}
+
+/*
+ * Must not be invoked with interrupt sources disabled and
+ * the hardware shutdown down.  Can sleep.
+ */
+static int b44_alloc_consistent(struct b44 *bp)
+{
+       int size;
+
+       size  = B44_RX_RING_SIZE * sizeof(struct ring_info);
+       bp->rx_buffers = kmalloc(size, GFP_KERNEL);
+       if (!bp->rx_buffers)
+               goto out_err;
+       memset(bp->rx_buffers, 0, size);
+
+       size = B44_TX_RING_SIZE * sizeof(struct ring_info);
+       bp->tx_buffers = kmalloc(size, GFP_KERNEL);
+       if (!bp->tx_buffers)
+               goto out_err;
+       memset(bp->tx_buffers, 0, size);
+
+       size = DMA_TABLE_BYTES;
+       bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma);
+       if (!bp->rx_ring)
+               goto out_err;
+
+       bp->tx_ring = pci_alloc_consistent(bp->pdev, size, &bp->tx_ring_dma);
+       if (!bp->tx_ring)
+               goto out_err;
+
+       return 0;
+
+out_err:
+       b44_free_consistent(bp);
+       return -ENOMEM;
+}
+
+/* bp->lock is held. */
+static void b44_clear_stats(struct b44 *bp)
+{
+       unsigned long reg;
+
+       bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+       for (reg = B44_TX_GOOD_O; reg <= B44_TX_PAUSE; reg += 4UL)
+               br32(bp, reg);
+       for (reg = B44_RX_GOOD_O; reg <= B44_RX_NPAUSE; reg += 4UL)
+               br32(bp, reg);
+}
+
+/* bp->lock is held. */
+static void b44_chip_reset(struct b44 *bp)
+{
+       if (ssb_is_core_up(bp)) {
+               bw32(bp, B44_RCV_LAZY, 0);
+               bw32(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE);
+               b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 100, 1);
+               bw32(bp, B44_DMATX_CTRL, 0);
+               bp->tx_prod = bp->tx_cons = 0;
+               if (br32(bp, B44_DMARX_STAT) & DMARX_STAT_EMASK) {
+                       b44_wait_bit(bp, B44_DMARX_STAT, DMARX_STAT_SIDLE,
+                                    100, 0);
+               }
+               bw32(bp, B44_DMARX_CTRL, 0);
+               bp->rx_prod = bp->rx_cons = 0;
+       } else {
+               ssb_pci_setup(bp, (bp->core_unit == 0 ?
+                                  SBINTVEC_ENET0 :
+                                  SBINTVEC_ENET1));
+       }
+
+       ssb_core_reset(bp);
+
+       b44_clear_stats(bp);
+
+       /* Make PHY accessible. */
+       bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
+                            (0x0d & MDIO_CTRL_MAXF_MASK)));
+       br32(bp, B44_MDIO_CTRL);
+
+       if (!(br32(bp, B44_DEVCTRL) & DEVCTRL_IPP)) {
+               bw32(bp, B44_ENET_CTRL, ENET_CTRL_EPSEL);
+               br32(bp, B44_ENET_CTRL);
+               bp->flags &= ~B44_FLAG_INTERNAL_PHY;
+       } else {
+               u32 val = br32(bp, B44_DEVCTRL);
+
+               if (val & DEVCTRL_EPR) {
+                       bw32(bp, B44_DEVCTRL, (val & ~DEVCTRL_EPR));
+                       br32(bp, B44_DEVCTRL);
+                       udelay(100);
+               }
+               bp->flags |= B44_FLAG_INTERNAL_PHY;
+       }
+}
+
+/* bp->lock is held. */
+static void b44_halt(struct b44 *bp)
+{
+       b44_disable_ints(bp);
+       b44_chip_reset(bp);
+}
+
+/* bp->lock is held. */
+static void __b44_set_mac_addr(struct b44 *bp)
+{
+       bw32(bp, B44_CAM_CTRL, 0);
+       if (!(bp->dev->flags & IFF_PROMISC)) {
+               u32 val;
+
+               __b44_cam_write(bp, bp->dev->dev_addr, 0);
+               val = br32(bp, B44_CAM_CTRL);
+               bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+       }
+}
+
+static int b44_set_mac_addr(struct net_device *dev, void *p)
+{
+       struct b44 *bp = netdev_priv(dev);
+       struct sockaddr *addr = p;
+
+       if (netif_running(dev))
+               return -EBUSY;
+
+       memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
+       spin_lock_irq(&bp->lock);
+       __b44_set_mac_addr(bp);
+       spin_unlock_irq(&bp->lock);
+
+       return 0;
+}
+
+/* Called at device open time to get the chip ready for
+ * packet processing.  Invoked with bp->lock held.
+ */
+static void __b44_set_rx_mode(struct net_device *);
+static void b44_init_hw(struct b44 *bp)
+{
+       u32 val;
+
+       b44_chip_reset(bp);
+       b44_phy_reset(bp);
+       b44_setup_phy(bp);
+
+       /* Enable CRC32, set proper LED modes and power on PHY */
+       bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
+       bw32(bp, B44_RCV_LAZY, (1 << RCV_LAZY_FC_SHIFT));
+
+       /* This sets the MAC address too.  */
+       __b44_set_rx_mode(bp->dev);
+
+       /* MTU + eth header + possible VLAN tag + struct rx_header */
+       bw32(bp, B44_RXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+       bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
+
+       bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
+       bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+       bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+       bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+                             (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+       bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+
+       bw32(bp, B44_DMARX_PTR, bp->rx_pending);
+       bp->rx_prod = bp->rx_pending;   
+
+       bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+
+       val = br32(bp, B44_ENET_CTRL);
+       bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
+}
+
+static int b44_open(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       int err;
+
+       err = b44_alloc_consistent(bp);
+       if (err)
+               return err;
+
+       err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
+       if (err)
+               goto err_out_free;
+
+       spin_lock_irq(&bp->lock);
+
+       b44_init_rings(bp);
+       b44_init_hw(bp);
+       bp->flags |= B44_FLAG_INIT_COMPLETE;
+
+       spin_unlock_irq(&bp->lock);
+
+       init_timer(&bp->timer);
+       bp->timer.expires = jiffies + HZ;
+       bp->timer.data = (unsigned long) bp;
+       bp->timer.function = b44_timer;
+       add_timer(&bp->timer);
+
+       b44_enable_ints(bp);
+
+       return 0;
+
+err_out_free:
+       b44_free_consistent(bp);
+       return err;
+}
+
+#if 0
+/*static*/ void b44_dump_state(struct b44 *bp)
+{
+       u32 val32, val32_2, val32_3, val32_4, val32_5;
+       u16 val16;
+
+       pci_read_config_word(bp->pdev, PCI_STATUS, &val16);
+       printk("DEBUG: PCI status [%04x] \n", val16);
+
+}
+#endif
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling receive - used by netconsole and other diagnostic tools
+ * to allow network i/o with interrupts disabled.
+ */
+static void b44_poll_controller(struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       b44_interrupt(dev->irq, dev, NULL);
+       enable_irq(dev->irq);
+}
+#endif
+
+static int b44_close(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       netif_stop_queue(dev);
+
+       del_timer_sync(&bp->timer);
+
+       spin_lock_irq(&bp->lock);
+
+#if 0
+       b44_dump_state(bp);
+#endif
+       b44_halt(bp);
+       b44_free_rings(bp);
+       bp->flags &= ~B44_FLAG_INIT_COMPLETE;
+       netif_carrier_off(bp->dev);
+
+       spin_unlock_irq(&bp->lock);
+
+       free_irq(dev->irq, dev);
+
+       b44_free_consistent(bp);
+
+       return 0;
+}
+
+static struct net_device_stats *b44_get_stats(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       struct net_device_stats *nstat = &bp->stats;
+       struct b44_hw_stats *hwstat = &bp->hw_stats;
+
+       /* Convert HW stats into netdevice stats. */
+       nstat->rx_packets = hwstat->rx_pkts;
+       nstat->tx_packets = hwstat->tx_pkts;
+       nstat->rx_bytes   = hwstat->rx_octets;
+       nstat->tx_bytes   = hwstat->tx_octets;
+       nstat->tx_errors  = (hwstat->tx_jabber_pkts +
+                            hwstat->tx_oversize_pkts +
+                            hwstat->tx_underruns +
+                            hwstat->tx_excessive_cols +
+                            hwstat->tx_late_cols);
+       nstat->multicast  = hwstat->tx_multicast_pkts;
+       nstat->collisions = hwstat->tx_total_cols;
+
+       nstat->rx_length_errors = (hwstat->rx_oversize_pkts +
+                                  hwstat->rx_undersize);
+       nstat->rx_over_errors   = hwstat->rx_missed_pkts;
+       nstat->rx_frame_errors  = hwstat->rx_align_errs;
+       nstat->rx_crc_errors    = hwstat->rx_crc_errs;
+       nstat->rx_errors        = (hwstat->rx_jabber_pkts +
+                                  hwstat->rx_oversize_pkts +
+                                  hwstat->rx_missed_pkts +
+                                  hwstat->rx_crc_align_errs +
+                                  hwstat->rx_undersize +
+                                  hwstat->rx_crc_errs +
+                                  hwstat->rx_align_errs +
+                                  hwstat->rx_symbol_errs);
+
+       nstat->tx_aborted_errors = hwstat->tx_underruns;
+#if 0
+       /* Carrier lost counter seems to be broken for some devices */
+       nstat->tx_carrier_errors = hwstat->tx_carrier_lost;
+#endif
+
+       return nstat;
+}
+
+static int __b44_load_mcast(struct b44 *bp, struct net_device *dev)
+{
+       struct dev_mc_list *mclist;
+       int i, num_ents;
+
+       num_ents = min_t(int, dev->mc_count, B44_MCAST_TABLE_SIZE);
+       mclist = dev->mc_list;
+       for (i = 0; mclist && i < num_ents; i++, mclist = mclist->next) {
+               __b44_cam_write(bp, mclist->dmi_addr, i + 1);
+       }
+       return i+1;
+}
+
+static void __b44_set_rx_mode(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       u32 val;
+       int i=0;
+       unsigned char zero[6] = {0,0,0,0,0,0};
+
+       val = br32(bp, B44_RXCONFIG);
+       val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
+       if (dev->flags & IFF_PROMISC) {
+               val |= RXCONFIG_PROMISC;
+               bw32(bp, B44_RXCONFIG, val);
+       } else {
+               __b44_set_mac_addr(bp);
+
+               if (dev->flags & IFF_ALLMULTI)
+                       val |= RXCONFIG_ALLMULTI;
+               else
+                       i=__b44_load_mcast(bp, dev);
+               
+               for(;i<64;i++) {
+                       __b44_cam_write(bp, zero, i);                   
+               }
+               bw32(bp, B44_RXCONFIG, val);
+               val = br32(bp, B44_CAM_CTRL);
+               bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);
+       }
+}
+
+static void b44_set_rx_mode(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       spin_lock_irq(&bp->lock);
+       __b44_set_rx_mode(dev);
+       spin_unlock_irq(&bp->lock);
+}
+
+static u32 b44_get_msglevel(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       return bp->msg_enable;
+}
+
+static void b44_set_msglevel(struct net_device *dev, u32 value)
+{
+       struct b44 *bp = netdev_priv(dev);
+       bp->msg_enable = value;
+}
+
+static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
+{
+       struct b44 *bp = netdev_priv(dev);
+       struct pci_dev *pci_dev = bp->pdev;
+
+       strcpy (info->driver, DRV_MODULE_NAME);
+       strcpy (info->version, DRV_MODULE_VERSION);
+       strcpy (info->bus_info, pci_name(pci_dev));
+}
+
+static int b44_nway_reset(struct net_device *dev)
+{
+       struct b44 *bp = netdev_priv(dev);
+       u32 bmcr;
+       int r;
+
+       spin_lock_irq(&bp->lock);
+       b44_readphy(bp, MII_BMCR, &bmcr);
+       b44_readphy(bp, MII_BMCR, &bmcr);
+       r = -EINVAL;
+       if (bmcr & BMCR_ANENABLE) {
+               b44_writephy(bp, MII_BMCR,
+                            bmcr | BMCR_ANRESTART);
+               r = 0;
+       }
+       spin_unlock_irq(&bp->lock);
+
+       return r;
+}
+
+static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+               return -EAGAIN;
+       cmd->supported = (SUPPORTED_Autoneg);
+       cmd->supported |= (SUPPORTED_100baseT_Half |
+                         SUPPORTED_100baseT_Full |
+                         SUPPORTED_10baseT_Half |
+                         SUPPORTED_10baseT_Full |
+                         SUPPORTED_MII);
+
+       cmd->advertising = 0;
+       if (bp->flags & B44_FLAG_ADV_10HALF)
+               cmd->advertising |= ADVERTISE_10HALF;
+       if (bp->flags & B44_FLAG_ADV_10FULL)
+               cmd->advertising |= ADVERTISE_10FULL;
+       if (bp->flags & B44_FLAG_ADV_100HALF)
+               cmd->advertising |= ADVERTISE_100HALF;
+       if (bp->flags & B44_FLAG_ADV_100FULL)
+               cmd->advertising |= ADVERTISE_100FULL;
+       cmd->advertising |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+       cmd->speed = (bp->flags & B44_FLAG_100_BASE_T) ?
+               SPEED_100 : SPEED_10;
+       cmd->duplex = (bp->flags & B44_FLAG_FULL_DUPLEX) ?
+               DUPLEX_FULL : DUPLEX_HALF;
+       cmd->port = 0;
+       cmd->phy_address = bp->phy_addr;
+       cmd->transceiver = (bp->flags & B44_FLAG_INTERNAL_PHY) ?
+               XCVR_INTERNAL : XCVR_EXTERNAL;
+       cmd->autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?
+               AUTONEG_DISABLE : AUTONEG_ENABLE;
+       cmd->maxtxpkt = 0;
+       cmd->maxrxpkt = 0;
+       return 0;
+}
+
+static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+               return -EAGAIN;
+
+       /* We do not support gigabit. */
+       if (cmd->autoneg == AUTONEG_ENABLE) {
+               if (cmd->advertising &
+                   (ADVERTISED_1000baseT_Half |
+                    ADVERTISED_1000baseT_Full))
+                       return -EINVAL;
+       } else if ((cmd->speed != SPEED_100 &&
+                   cmd->speed != SPEED_10) ||
+                  (cmd->duplex != DUPLEX_HALF &&
+                   cmd->duplex != DUPLEX_FULL)) {
+                       return -EINVAL;
+       }
+
+       spin_lock_irq(&bp->lock);
+
+       if (cmd->autoneg == AUTONEG_ENABLE) {
+               bp->flags &= ~B44_FLAG_FORCE_LINK;
+               bp->flags &= ~(B44_FLAG_ADV_10HALF |
+                              B44_FLAG_ADV_10FULL |
+                              B44_FLAG_ADV_100HALF |
+                              B44_FLAG_ADV_100FULL);
+               if (cmd->advertising & ADVERTISE_10HALF)
+                       bp->flags |= B44_FLAG_ADV_10HALF;
+               if (cmd->advertising & ADVERTISE_10FULL)
+                       bp->flags |= B44_FLAG_ADV_10FULL;
+               if (cmd->advertising & ADVERTISE_100HALF)
+                       bp->flags |= B44_FLAG_ADV_100HALF;
+               if (cmd->advertising & ADVERTISE_100FULL)
+                       bp->flags |= B44_FLAG_ADV_100FULL;
+       } else {
+               bp->flags |= B44_FLAG_FORCE_LINK;
+               if (cmd->speed == SPEED_100)
+                       bp->flags |= B44_FLAG_100_BASE_T;
+               if (cmd->duplex == DUPLEX_FULL)
+                       bp->flags |= B44_FLAG_FULL_DUPLEX;
+       }
+
+       b44_setup_phy(bp);
+
+       spin_unlock_irq(&bp->lock);
+
+       return 0;
+}
+
+static void b44_get_ringparam(struct net_device *dev,
+                             struct ethtool_ringparam *ering)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       ering->rx_max_pending = B44_RX_RING_SIZE - 1;
+       ering->rx_pending = bp->rx_pending;
+
+       /* XXX ethtool lacks a tx_max_pending, oops... */
+}
+
+static int b44_set_ringparam(struct net_device *dev,
+                            struct ethtool_ringparam *ering)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       if ((ering->rx_pending > B44_RX_RING_SIZE - 1) ||
+           (ering->rx_mini_pending != 0) ||
+           (ering->rx_jumbo_pending != 0) ||
+           (ering->tx_pending > B44_TX_RING_SIZE - 1))
+               return -EINVAL;
+
+       spin_lock_irq(&bp->lock);
+
+       bp->rx_pending = ering->rx_pending;
+       bp->tx_pending = ering->tx_pending;
+
+       b44_halt(bp);
+       b44_init_rings(bp);
+       b44_init_hw(bp);
+       netif_wake_queue(bp->dev);
+       spin_unlock_irq(&bp->lock);
+
+       b44_enable_ints(bp);
+       
+       return 0;
+}
+
+static void b44_get_pauseparam(struct net_device *dev,
+                               struct ethtool_pauseparam *epause)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       epause->autoneg =
+               (bp->flags & B44_FLAG_PAUSE_AUTO) != 0;
+       epause->rx_pause =
+               (bp->flags & B44_FLAG_RX_PAUSE) != 0;
+       epause->tx_pause =
+               (bp->flags & B44_FLAG_TX_PAUSE) != 0;
+}
+
+static int b44_set_pauseparam(struct net_device *dev,
+                               struct ethtool_pauseparam *epause)
+{
+       struct b44 *bp = netdev_priv(dev);
+
+       spin_lock_irq(&bp->lock);
+       if (epause->autoneg)
+               bp->flags |= B44_FLAG_PAUSE_AUTO;
+       else
+               bp->flags &= ~B44_FLAG_PAUSE_AUTO;
+       if (epause->rx_pause)
+               bp->flags |= B44_FLAG_RX_PAUSE;
+       else
+               bp->flags &= ~B44_FLAG_RX_PAUSE;
+       if (epause->tx_pause)
+               bp->flags |= B44_FLAG_TX_PAUSE;
+       else
+               bp->flags &= ~B44_FLAG_TX_PAUSE;
+       if (bp->flags & B44_FLAG_PAUSE_AUTO) {
+               b44_halt(bp);
+               b44_init_rings(bp);
+               b44_init_hw(bp);
+       } else {
+               __b44_set_flow_ctrl(bp, bp->flags);
+       }
+       spin_unlock_irq(&bp->lock);
+
+       b44_enable_ints(bp);
+       
+       return 0;
+}
+
+static struct ethtool_ops b44_ethtool_ops = {
+       .get_drvinfo            = b44_get_drvinfo,
+       .get_settings           = b44_get_settings,
+       .set_settings           = b44_set_settings,
+       .nway_reset             = b44_nway_reset,
+       .get_link               = ethtool_op_get_link,
+       .get_ringparam          = b44_get_ringparam,
+       .set_ringparam          = b44_set_ringparam,
+       .get_pauseparam         = b44_get_pauseparam,
+       .set_pauseparam         = b44_set_pauseparam,
+       .get_msglevel           = b44_get_msglevel,
+       .set_msglevel           = b44_set_msglevel,
+};
+
+static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+       struct mii_ioctl_data *data = if_mii(ifr);
+       struct b44 *bp = netdev_priv(dev);
+       int err;
+
+       spin_lock_irq(&bp->lock);
+       err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL);
+       spin_unlock_irq(&bp->lock);
+
+       return err;
+}
+
+/* Read 128-bytes of EEPROM. */
+static int b44_read_eeprom(struct b44 *bp, u8 *data)
+{
+       long i;
+       u16 *ptr = (u16 *) data;
+
+       for (i = 0; i < 128; i += 2)
+               ptr[i / 2] = readw(bp->regs + 4096 + i);
+
+       return 0;
+}
+
+static int __devinit b44_get_invariants(struct b44 *bp)
+{
+       u8 eeprom[128];
+       int err;
+
+       err = b44_read_eeprom(bp, &eeprom[0]);
+       if (err)
+               goto out;
+
+       bp->dev->dev_addr[0] = eeprom[79];
+       bp->dev->dev_addr[1] = eeprom[78];
+       bp->dev->dev_addr[2] = eeprom[81];
+       bp->dev->dev_addr[3] = eeprom[80];
+       bp->dev->dev_addr[4] = eeprom[83];
+       bp->dev->dev_addr[5] = eeprom[82];
+
+       bp->phy_addr = eeprom[90] & 0x1f;
+
+       /* With this, plus the rx_header prepended to the data by the
+        * hardware, we'll land the ethernet header on a 2-byte boundary.
+        */
+       bp->rx_offset = 30;
+
+       bp->imask = IMASK_DEF;
+
+       bp->core_unit = ssb_core_unit(bp);
+       bp->dma_offset = SB_PCI_DMA;
+
+       /* XXX - really required? 
+          bp->flags |= B44_FLAG_BUGGY_TXPTR;
+         */
+out:
+       return err;
+}
+
+static int __devinit b44_init_one(struct pci_dev *pdev,
+                                 const struct pci_device_id *ent)
+{
+       static int b44_version_printed = 0;
+       unsigned long b44reg_base, b44reg_len;
+       struct net_device *dev;
+       struct b44 *bp;
+       int err, i;
+
+       if (b44_version_printed++ == 0)
+               printk(KERN_INFO "%s", version);
+
+       err = pci_enable_device(pdev);
+       if (err) {
+               printk(KERN_ERR PFX "Cannot enable PCI device, "
+                      "aborting.\n");
+               return err;
+       }
+
+       if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+               printk(KERN_ERR PFX "Cannot find proper PCI device "
+                      "base address, aborting.\n");
+               err = -ENODEV;
+               goto err_out_disable_pdev;
+       }
+
+       err = pci_request_regions(pdev, DRV_MODULE_NAME);
+       if (err) {
+               printk(KERN_ERR PFX "Cannot obtain PCI resources, "
+                      "aborting.\n");
+               goto err_out_disable_pdev;
+       }
+
+       pci_set_master(pdev);
+
+       err = pci_set_dma_mask(pdev, (u64) B44_DMA_MASK);
+       if (err) {
+               printk(KERN_ERR PFX "No usable DMA configuration, "
+                      "aborting.\n");
+               goto err_out_free_res;
+       }
+       
+       err = pci_set_consistent_dma_mask(pdev, (u64) B44_DMA_MASK);
+       if (err) {
+         printk(KERN_ERR PFX "No usable DMA configuration, "
+                "aborting.\n");
+         goto err_out_free_res;
+       }
+
+       b44reg_base = pci_resource_start(pdev, 0);
+       b44reg_len = pci_resource_len(pdev, 0);
+
+       dev = alloc_etherdev(sizeof(*bp));
+       if (!dev) {
+               printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
+               err = -ENOMEM;
+               goto err_out_free_res;
+       }
+
+       SET_MODULE_OWNER(dev);
+       SET_NETDEV_DEV(dev,&pdev->dev);
+
+       /* No interesting netdevice features in this card... */
+       dev->features |= 0;
+
+       bp = netdev_priv(dev);
+       bp->pdev = pdev;
+       bp->dev = dev;
+       if (b44_debug >= 0)
+               bp->msg_enable = (1 << b44_debug) - 1;
+       else
+               bp->msg_enable = B44_DEF_MSG_ENABLE;
+
+       spin_lock_init(&bp->lock);
+
+       bp->regs = ioremap(b44reg_base, b44reg_len);
+       if (bp->regs == 0UL) {
+               printk(KERN_ERR PFX "Cannot map device registers, "
+                      "aborting.\n");
+               err = -ENOMEM;
+               goto err_out_free_dev;
+       }
+
+       bp->rx_pending = B44_DEF_RX_RING_PENDING;
+       bp->tx_pending = B44_DEF_TX_RING_PENDING;
+
+       dev->open = b44_open;
+       dev->stop = b44_close;
+       dev->hard_start_xmit = b44_start_xmit;
+       dev->get_stats = b44_get_stats;
+       dev->set_multicast_list = b44_set_rx_mode;
+       dev->set_mac_address = b44_set_mac_addr;
+       dev->do_ioctl = b44_ioctl;
+       dev->tx_timeout = b44_tx_timeout;
+       dev->poll = b44_poll;
+       dev->weight = 64;
+       dev->watchdog_timeo = B44_TX_TIMEOUT;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       dev->poll_controller = b44_poll_controller;
+#endif
+       dev->change_mtu = b44_change_mtu;
+       dev->irq = pdev->irq;
+       SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
+
+       err = b44_get_invariants(bp);
+       if (err) {
+               printk(KERN_ERR PFX "Problem fetching invariants of chip, "
+                      "aborting.\n");
+               goto err_out_iounmap;
+       }
+
+       bp->mii_if.dev = dev;
+       bp->mii_if.mdio_read = b44_mii_read;
+       bp->mii_if.mdio_write = b44_mii_write;
+       bp->mii_if.phy_id = bp->phy_addr;
+       bp->mii_if.phy_id_mask = 0x1f;
+       bp->mii_if.reg_num_mask = 0x1f;
+
+       /* By default, advertise all speed/duplex settings. */
+       bp->flags |= (B44_FLAG_ADV_10HALF | B44_FLAG_ADV_10FULL |
+                     B44_FLAG_ADV_100HALF | B44_FLAG_ADV_100FULL);
+
+       /* By default, auto-negotiate PAUSE. */
+       bp->flags |= B44_FLAG_PAUSE_AUTO;
+
+       err = register_netdev(dev);
+       if (err) {
+               printk(KERN_ERR PFX "Cannot register net device, "
+                      "aborting.\n");
+               goto err_out_iounmap;
+       }
+
+       pci_set_drvdata(pdev, dev);
+
+       pci_save_state(bp->pdev);
+
+       printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name);
+       for (i = 0; i < 6; i++)
+               printk("%2.2x%c", dev->dev_addr[i],
+                      i == 5 ? '\n' : ':');
+
+       return 0;
+
+err_out_iounmap:
+       iounmap(bp->regs);
+
+err_out_free_dev:
+       free_netdev(dev);
+
+err_out_free_res:
+       pci_release_regions(pdev);
+
+err_out_disable_pdev:
+       pci_disable_device(pdev);
+       pci_set_drvdata(pdev, NULL);
+       return err;
+}
+
+static void __devexit b44_remove_one(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+
+       if (dev) {
+               struct b44 *bp = netdev_priv(dev);
+
+               unregister_netdev(dev);
+               iounmap(bp->regs);
+               free_netdev(dev);
+               pci_release_regions(pdev);
+               pci_disable_device(pdev);
+               pci_set_drvdata(pdev, NULL);
+       }
+}
+
+static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       struct b44 *bp = netdev_priv(dev);
+
+        if (!netif_running(dev))
+                 return 0;
+
+       del_timer_sync(&bp->timer);
+
+       spin_lock_irq(&bp->lock); 
+
+       b44_halt(bp);
+       netif_carrier_off(bp->dev); 
+       netif_device_detach(bp->dev);
+       b44_free_rings(bp);
+
+       spin_unlock_irq(&bp->lock);
+       return 0;
+}
+
+static int b44_resume(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+       struct b44 *bp = netdev_priv(dev);
+
+       pci_restore_state(pdev);
+
+       if (!netif_running(dev))
+               return 0;
+
+       spin_lock_irq(&bp->lock);
+
+       b44_init_rings(bp);
+       b44_init_hw(bp);
+       netif_device_attach(bp->dev);
+       spin_unlock_irq(&bp->lock);
+
+       bp->timer.expires = jiffies + HZ;
+       add_timer(&bp->timer);
+
+       b44_enable_ints(bp);
+       return 0;
+}
+
+static struct pci_driver b44_driver = {
+       .name           = DRV_MODULE_NAME,
+       .id_table       = b44_pci_tbl,
+       .probe          = b44_init_one,
+       .remove         = __devexit_p(b44_remove_one),
+        .suspend        = b44_suspend,
+        .resume         = b44_resume,
+};
+
+static int __init b44_init(void)
+{
+       return pci_module_init(&b44_driver);
+}
+
+static void __exit b44_cleanup(void)
+{
+       pci_unregister_driver(&b44_driver);
+}
+
+module_init(b44_init);
+module_exit(b44_cleanup);
+
diff -Nur linux-2.6.12.5/drivers/net/b44.h linux-2.6.12.5-brcm/drivers/net/b44.h
--- linux-2.6.12.5/drivers/net/b44.h    2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/drivers/net/b44.h       2005-08-28 11:12:20.694819024 +0200
@@ -292,6 +292,9 @@
 #define SSB_PCI_MASK1          0xfc000000
 #define SSB_PCI_MASK2          0xc0000000
 
+#define br32(REG)      readl(bp->regs + (REG))
+#define bw32(REG,VAL)  writel((VAL), bp->regs + (REG))
+
 /* 4400 PHY registers */
 #define B44_MII_AUXCTRL                24      /* Auxiliary Control */
 #define  MII_AUXCTRL_DUPLEX    0x0001  /* Full Duplex */
@@ -345,6 +348,8 @@
 };
 
 #define B44_MCAST_TABLE_SIZE   32
+#define B44_PHY_ADDR_NO_PHY    30
+#define B44_MDC_RATIO          5000000
 
 /* SW copy of device statistics, kept up to date by periodic timer
  * which probes HW values.  Must have same relative layout as HW
@@ -410,7 +415,7 @@
        struct net_device_stats stats;
        struct b44_hw_stats     hw_stats;
 
-       void __iomem            *regs;
+       unsigned long           regs;
        struct pci_dev          *pdev;
        struct net_device       *dev;
 
diff -Nur linux-2.6.12.5/drivers/net/b44.h.orig linux-2.6.12.5-brcm/drivers/net/b44.h.orig
--- linux-2.6.12.5/drivers/net/b44.h.orig       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/drivers/net/b44.h.orig  2005-08-15 02:20:18.000000000 +0200
@@ -0,0 +1,427 @@
+#ifndef _B44_H
+#define _B44_H
+
+/* Register layout. (These correspond to struct _bcmenettregs in bcm4400.) */
+#define        B44_DEVCTRL     0x0000UL /* Device Control */
+#define  DEVCTRL_MPM           0x00000040 /* Magic Packet PME Enable (B0 only) */
+#define  DEVCTRL_PFE           0x00000080 /* Pattern Filtering Enable */
+#define  DEVCTRL_IPP           0x00000400 /* Internal EPHY Present */
+#define  DEVCTRL_EPR           0x00008000 /* EPHY Reset */
+#define  DEVCTRL_PME           0x00001000 /* PHY Mode Enable */
+#define  DEVCTRL_PMCE          0x00002000 /* PHY Mode Clocks Enable */
+#define  DEVCTRL_PADDR         0x0007c000 /* PHY Address */
+#define  DEVCTRL_PADDR_SHIFT   18
+#define B44_BIST_STAT  0x000CUL /* Built-In Self-Test Status */
+#define B44_WKUP_LEN   0x0010UL /* Wakeup Length */
+#define  WKUP_LEN_P0_MASK      0x0000007f /* Pattern 0 */
+#define  WKUP_LEN_D0           0x00000080
+#define  WKUP_LEN_P1_MASK      0x00007f00 /* Pattern 1 */
+#define  WKUP_LEN_P1_SHIFT     8
+#define  WKUP_LEN_D1           0x00008000
+#define  WKUP_LEN_P2_MASK      0x007f0000 /* Pattern 2 */
+#define  WKUP_LEN_P2_SHIFT     16
+#define  WKUP_LEN_D2           0x00000000
+#define  WKUP_LEN_P3_MASK      0x7f000000 /* Pattern 3 */
+#define  WKUP_LEN_P3_SHIFT     24
+#define  WKUP_LEN_D3           0x80000000
+#define B44_ISTAT      0x0020UL /* Interrupt Status */
+#define  ISTAT_LS              0x00000020 /* Link Change (B0 only) */
+#define  ISTAT_PME             0x00000040 /* Power Management Event */
+#define  ISTAT_TO              0x00000080 /* General Purpose Timeout */
+#define  ISTAT_DSCE            0x00000400 /* Descriptor Error */
+#define  ISTAT_DATAE           0x00000800 /* Data Error */
+#define  ISTAT_DPE             0x00001000 /* Descr. Protocol Error */
+#define  ISTAT_RDU             0x00002000 /* Receive Descr. Underflow */
+#define  ISTAT_RFO             0x00004000 /* Receive FIFO Overflow */
+#define  ISTAT_TFU             0x00008000 /* Transmit FIFO Underflow */
+#define  ISTAT_RX              0x00010000 /* RX Interrupt */
+#define  ISTAT_TX              0x01000000 /* TX Interrupt */
+#define  ISTAT_EMAC            0x04000000 /* EMAC Interrupt */
+#define  ISTAT_MII_WRITE       0x08000000 /* MII Write Interrupt */
+#define  ISTAT_MII_READ                0x10000000 /* MII Read Interrupt */
+#define  ISTAT_ERRORS (ISTAT_DSCE|ISTAT_DATAE|ISTAT_DPE|ISTAT_RDU|ISTAT_RFO|ISTAT_TFU)
+#define B44_IMASK      0x0024UL /* Interrupt Mask */
+#define  IMASK_DEF             (ISTAT_ERRORS | ISTAT_TO | ISTAT_RX | ISTAT_TX)
+#define B44_GPTIMER    0x0028UL /* General Purpose Timer */
+#define B44_ADDR_LO    0x0088UL /* ENET Address Lo (B0 only) */
+#define B44_ADDR_HI    0x008CUL /* ENET Address Hi (B0 only) */
+#define B44_FILT_ADDR  0x0090UL /* ENET Filter Address */
+#define B44_FILT_DATA  0x0094UL /* ENET Filter Data */
+#define B44_TXBURST    0x00A0UL /* TX Max Burst Length */
+#define B44_RXBURST    0x00A4UL /* RX Max Burst Length */
+#define B44_MAC_CTRL   0x00A8UL /* MAC Control */
+#define  MAC_CTRL_CRC32_ENAB   0x00000001 /* CRC32 Generation Enable */
+#define  MAC_CTRL_PHY_PDOWN    0x00000004 /* Onchip EPHY Powerdown */
+#define  MAC_CTRL_PHY_EDET     0x00000008 /* Onchip EPHY Energy Detected */
+#define  MAC_CTRL_PHY_LEDCTRL  0x000000e0 /* Onchip EPHY LED Control */
+#define  MAC_CTRL_PHY_LEDCTRL_SHIFT 5
+#define B44_MAC_FLOW   0x00ACUL /* MAC Flow Control */
+#define  MAC_FLOW_RX_HI_WATER  0x000000ff /* Receive FIFO HI Water Mark */
+#define  MAC_FLOW_PAUSE_ENAB   0x00008000 /* Enable Pause Frame Generation */
+#define B44_RCV_LAZY   0x0100UL /* Lazy Interrupt Control */
+#define  RCV_LAZY_TO_MASK      0x00ffffff /* Timeout */
+#define  RCV_LAZY_FC_MASK      0xff000000 /* Frame Count */
+#define  RCV_LAZY_FC_SHIFT     24
+#define B44_DMATX_CTRL 0x0200UL /* DMA TX Control */
+#define  DMATX_CTRL_ENABLE     0x00000001 /* Enable */
+#define  DMATX_CTRL_SUSPEND    0x00000002 /* Suepend Request */
+#define  DMATX_CTRL_LPBACK     0x00000004 /* Loopback Enable */
+#define  DMATX_CTRL_FAIRPRIOR  0x00000008 /* Fair Priority */
+#define  DMATX_CTRL_FLUSH      0x00000010 /* Flush Request */
+#define B44_DMATX_ADDR 0x0204UL /* DMA TX Descriptor Ring Address */
+#define B44_DMATX_PTR  0x0208UL /* DMA TX Last Posted Descriptor */
+#define B44_DMATX_STAT 0x020CUL /* DMA TX Current Active Desc. + Status */
+#define  DMATX_STAT_CDMASK     0x00000fff /* Current Descriptor Mask */
+#define  DMATX_STAT_SMASK      0x0000f000 /* State Mask */
+#define  DMATX_STAT_SDISABLED  0x00000000 /* State Disabled */
+#define  DMATX_STAT_SACTIVE    0x00001000 /* State Active */
+#define  DMATX_STAT_SIDLE      0x00002000 /* State Idle Wait */
+#define  DMATX_STAT_SSTOPPED   0x00003000 /* State Stopped */
+#define  DMATX_STAT_SSUSP      0x00004000 /* State Suspend Pending */
+#define  DMATX_STAT_EMASK      0x000f0000 /* Error Mask */
+#define  DMATX_STAT_ENONE      0x00000000 /* Error None */
+#define  DMATX_STAT_EDPE       0x00010000 /* Error Desc. Protocol Error */
+#define  DMATX_STAT_EDFU       0x00020000 /* Error Data FIFO Underrun */
+#define  DMATX_STAT_EBEBR      0x00030000 /* Error Bus Error on Buffer Read */
+#define  DMATX_STAT_EBEDA      0x00040000 /* Error Bus Error on Desc. Access */
+#define  DMATX_STAT_FLUSHED    0x00100000 /* Flushed */
+#define B44_DMARX_CTRL 0x0210UL /* DMA RX Control */
+#define  DMARX_CTRL_ENABLE     0x00000001 /* Enable */
+#define  DMARX_CTRL_ROMASK     0x000000fe /* Receive Offset Mask */
+#define  DMARX_CTRL_ROSHIFT    1          /* Receive Offset Shift */
+#define B44_DMARX_ADDR 0x0214UL /* DMA RX Descriptor Ring Address */
+#define B44_DMARX_PTR  0x0218UL /* DMA RX Last Posted Descriptor */
+#define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */
+#define  DMARX_STAT_CDMASK     0x00000fff /* Current Descriptor Mask */
+#define  DMARX_STAT_SMASK      0x0000f000 /* State Mask */
+#define  DMARX_STAT_SDISABLED  0x00000000 /* State Disbaled */
+#define  DMARX_STAT_SACTIVE    0x00001000 /* State Active */
+#define  DMARX_STAT_SIDLE      0x00002000 /* State Idle Wait */
+#define  DMARX_STAT_SSTOPPED   0x00003000 /* State Stopped */
+#define  DMARX_STAT_EMASK      0x000f0000 /* Error Mask */
+#define  DMARX_STAT_ENONE      0x00000000 /* Error None */
+#define  DMARX_STAT_EDPE       0x00010000 /* Error Desc. Protocol Error */
+#define  DMARX_STAT_EDFO       0x00020000 /* Error Data FIFO Overflow */
+#define  DMARX_STAT_EBEBW      0x00030000 /* Error Bus Error on Buffer Write */
+#define  DMARX_STAT_EBEDA      0x00040000 /* Error Bus Error on Desc. Access */
+#define B44_DMAFIFO_AD 0x0220UL /* DMA FIFO Diag Address */
+#define  DMAFIFO_AD_OMASK      0x0000ffff /* Offset Mask */
+#define  DMAFIFO_AD_SMASK      0x000f0000 /* Select Mask */
+#define  DMAFIFO_AD_SXDD       0x00000000 /* Select Transmit DMA Data */
+#define  DMAFIFO_AD_SXDP       0x00010000 /* Select Transmit DMA Pointers */
+#define  DMAFIFO_AD_SRDD       0x00040000 /* Select Receive DMA Data */
+#define  DMAFIFO_AD_SRDP       0x00050000 /* Select Receive DMA Pointers */
+#define  DMAFIFO_AD_SXFD       0x00080000 /* Select Transmit FIFO Data */
+#define  DMAFIFO_AD_SXFP       0x00090000 /* Select Transmit FIFO Pointers */
+#define  DMAFIFO_AD_SRFD       0x000c0000 /* Select Receive FIFO Data */
+#define  DMAFIFO_AD_SRFP       0x000c0000 /* Select Receive FIFO Pointers */
+#define B44_DMAFIFO_LO 0x0224UL /* DMA FIFO Diag Low Data */
+#define B44_DMAFIFO_HI 0x0228UL /* DMA FIFO Diag High Data */
+#define B44_RXCONFIG   0x0400UL /* EMAC RX Config */
+#define  RXCONFIG_DBCAST       0x00000001 /* Disable Broadcast */
+#define  RXCONFIG_ALLMULTI     0x00000002 /* Accept All Multicast */
+#define  RXCONFIG_NORX_WHILE_TX        0x00000004 /* Receive Disable While Transmitting */
+#define  RXCONFIG_PROMISC      0x00000008 /* Promiscuous Enable */
+#define  RXCONFIG_LPBACK       0x00000010 /* Loopback Enable */
+#define  RXCONFIG_FLOW         0x00000020 /* Flow Control Enable */
+#define  RXCONFIG_FLOW_ACCEPT  0x00000040 /* Accept Unicast Flow Control Frame */
+#define  RXCONFIG_RFILT                0x00000080 /* Reject Filter */
+#define B44_RXMAXLEN   0x0404UL /* EMAC RX Max Packet Length */
+#define B44_TXMAXLEN   0x0408UL /* EMAC TX Max Packet Length */
+#define B44_MDIO_CTRL  0x0410UL /* EMAC MDIO Control */
+#define  MDIO_CTRL_MAXF_MASK   0x0000007f /* MDC Frequency */
+#define  MDIO_CTRL_PREAMBLE    0x00000080 /* MII Preamble Enable */
+#define B44_MDIO_DATA  0x0414UL /* EMAC MDIO Data */
+#define  MDIO_DATA_DATA                0x0000ffff /* R/W Data */
+#define  MDIO_DATA_TA_MASK     0x00030000 /* Turnaround Value */
+#define  MDIO_DATA_TA_SHIFT    16
+#define  MDIO_TA_VALID         2
+#define  MDIO_DATA_RA_MASK     0x007c0000 /* Register Address */
+#define  MDIO_DATA_RA_SHIFT    18
+#define  MDIO_DATA_PMD_MASK    0x0f800000 /* Physical Media Device */
+#define  MDIO_DATA_PMD_SHIFT   23
+#define  MDIO_DATA_OP_MASK     0x30000000 /* Opcode */
+#define  MDIO_DATA_OP_SHIFT    28
+#define  MDIO_OP_WRITE         1
+#define  MDIO_OP_READ          2
+#define  MDIO_DATA_SB_MASK     0xc0000000 /* Start Bits */
+#define  MDIO_DATA_SB_SHIFT    30
+#define  MDIO_DATA_SB_START    0x40000000 /* Start Of Frame */
+#define B44_EMAC_IMASK 0x0418UL /* EMAC Interrupt Mask */
+#define B44_EMAC_ISTAT 0x041CUL /* EMAC Interrupt Status */
+#define  EMAC_INT_MII          0x00000001 /* MII MDIO Interrupt */
+#define  EMAC_INT_MIB          0x00000002 /* MIB Interrupt */
+#define  EMAC_INT_FLOW         0x00000003 /* Flow Control Interrupt */
+#define B44_CAM_DATA_LO        0x0420UL /* EMAC CAM Data Low */
+#define B44_CAM_DATA_HI        0x0424UL /* EMAC CAM Data High */
+#define  CAM_DATA_HI_VALID     0x00010000 /* Valid Bit */
+#define B44_CAM_CTRL   0x0428UL /* EMAC CAM Control */
+#define  CAM_CTRL_ENABLE       0x00000001 /* CAM Enable */
+#define  CAM_CTRL_MSEL         0x00000002 /* Mask Select */
+#define  CAM_CTRL_READ         0x00000004 /* Read */
+#define  CAM_CTRL_WRITE                0x00000008 /* Read */
+#define  CAM_CTRL_INDEX_MASK   0x003f0000 /* Index Mask */
+#define  CAM_CTRL_INDEX_SHIFT  16
+#define  CAM_CTRL_BUSY         0x80000000 /* CAM Busy */
+#define B44_ENET_CTRL  0x042CUL /* EMAC ENET Control */
+#define  ENET_CTRL_ENABLE      0x00000001 /* EMAC Enable */
+#define  ENET_CTRL_DISABLE     0x00000002 /* EMAC Disable */
+#define  ENET_CTRL_SRST                0x00000004 /* EMAC Soft Reset */
+#define  ENET_CTRL_EPSEL       0x00000008 /* External PHY Select */
+#define B44_TX_CTRL    0x0430UL /* EMAC TX Control */
+#define  TX_CTRL_DUPLEX                0x00000001 /* Full Duplex */
+#define  TX_CTRL_FMODE         0x00000002 /* Flow Mode */
+#define  TX_CTRL_SBENAB                0x00000004 /* Single Backoff Enable */
+#define  TX_CTRL_SMALL_SLOT    0x00000008 /* Small Slottime */
+#define B44_TX_WMARK   0x0434UL /* EMAC TX Watermark */
+#define B44_MIB_CTRL   0x0438UL /* EMAC MIB Control */
+#define  MIB_CTRL_CLR_ON_READ  0x00000001 /* Autoclear on Read */
+#define B44_TX_GOOD_O  0x0500UL /* MIB TX Good Octets */
+#define B44_TX_GOOD_P  0x0504UL /* MIB TX Good Packets */
+#define B44_TX_O       0x0508UL /* MIB TX Octets */
+#define B44_TX_P       0x050CUL /* MIB TX Packets */
+#define B44_TX_BCAST   0x0510UL /* MIB TX Broadcast Packets */
+#define B44_TX_MCAST   0x0514UL /* MIB TX Multicast Packets */
+#define B44_TX_64      0x0518UL /* MIB TX <= 64 byte Packets */
+#define B44_TX_65_127  0x051CUL /* MIB TX 65 to 127 byte Packets */
+#define B44_TX_128_255 0x0520UL /* MIB TX 128 to 255 byte Packets */
+#define B44_TX_256_511 0x0524UL /* MIB TX 256 to 511 byte Packets */
+#define B44_TX_512_1023        0x0528UL /* MIB TX 512 to 1023 byte Packets */
+#define B44_TX_1024_MAX        0x052CUL /* MIB TX 1024 to max byte Packets */
+#define B44_TX_JABBER  0x0530UL /* MIB TX Jabber Packets */
+#define B44_TX_OSIZE   0x0534UL /* MIB TX Oversize Packets */
+#define B44_TX_FRAG    0x0538UL /* MIB TX Fragment Packets */
+#define B44_TX_URUNS   0x053CUL /* MIB TX Underruns */
+#define B44_TX_TCOLS   0x0540UL /* MIB TX Total Collisions */
+#define B44_TX_SCOLS   0x0544UL /* MIB TX Single Collisions */
+#define B44_TX_MCOLS   0x0548UL /* MIB TX Multiple Collisions */
+#define B44_TX_ECOLS   0x054CUL /* MIB TX Excessive Collisions */
+#define B44_TX_LCOLS   0x0550UL /* MIB TX Late Collisions */
+#define B44_TX_DEFERED 0x0554UL /* MIB TX Defered Packets */
+#define B44_TX_CLOST   0x0558UL /* MIB TX Carrier Lost */
+#define B44_TX_PAUSE   0x055CUL /* MIB TX Pause Packets */
+#define B44_RX_GOOD_O  0x0580UL /* MIB RX Good Octets */
+#define B44_RX_GOOD_P  0x0584UL /* MIB RX Good Packets */
+#define B44_RX_O       0x0588UL /* MIB RX Octets */
+#define B44_RX_P       0x058CUL /* MIB RX Packets */
+#define B44_RX_BCAST   0x0590UL /* MIB RX Broadcast Packets */
+#define B44_RX_MCAST   0x0594UL /* MIB RX Multicast Packets */
+#define B44_RX_64      0x0598UL /* MIB RX <= 64 byte Packets */
+#define B44_RX_65_127  0x059CUL /* MIB RX 65 to 127 byte Packets */
+#define B44_RX_128_255 0x05A0UL /* MIB RX 128 to 255 byte Packets */
+#define B44_RX_256_511 0x05A4UL /* MIB RX 256 to 511 byte Packets */
+#define B44_RX_512_1023        0x05A8UL /* MIB RX 512 to 1023 byte Packets */
+#define B44_RX_1024_MAX        0x05ACUL /* MIB RX 1024 to max byte Packets */
+#define B44_RX_JABBER  0x05B0UL /* MIB RX Jabber Packets */
+#define B44_RX_OSIZE   0x05B4UL /* MIB RX Oversize Packets */
+#define B44_RX_FRAG    0x05B8UL /* MIB RX Fragment Packets */
+#define B44_RX_MISS    0x05BCUL /* MIB RX Missed Packets */
+#define B44_RX_CRCA    0x05C0UL /* MIB RX CRC Align Errors */
+#define B44_RX_USIZE   0x05C4UL /* MIB RX Undersize Packets */
+#define B44_RX_CRC     0x05C8UL /* MIB RX CRC Errors */
+#define B44_RX_ALIGN   0x05CCUL /* MIB RX Align Errors */
+#define B44_RX_SYM     0x05D0UL /* MIB RX Symbol Errors */
+#define B44_RX_PAUSE   0x05D4UL /* MIB RX Pause Packets */
+#define B44_RX_NPAUSE  0x05D8UL /* MIB RX Non-Pause Packets */
+
+/* Silicon backplane register definitions */
+#define B44_SBIMSTATE  0x0F90UL /* SB Initiator Agent State */
+#define  SBIMSTATE_PC          0x0000000f /* Pipe Count */
+#define  SBIMSTATE_AP_MASK     0x00000030 /* Arbitration Priority */
+#define  SBIMSTATE_AP_BOTH     0x00000000 /* Use both timeslices and token */
+#define  SBIMSTATE_AP_TS       0x00000010 /* Use timeslices only */
+#define  SBIMSTATE_AP_TK       0x00000020 /* Use token only */
+#define  SBIMSTATE_AP_RSV      0x00000030 /* Reserved */
+#define  SBIMSTATE_IBE         0x00020000 /* In Band Error */
+#define  SBIMSTATE_TO          0x00040000 /* Timeout */
+#define B44_SBINTVEC   0x0F94UL /* SB Interrupt Mask */
+#define  SBINTVEC_PCI          0x00000001 /* Enable interrupts for PCI */
+#define  SBINTVEC_ENET0                0x00000002 /* Enable interrupts for enet 0 */
+#define  SBINTVEC_ILINE20      0x00000004 /* Enable interrupts for iline20 */
+#define  SBINTVEC_CODEC                0x00000008 /* Enable interrupts for v90 codec */
+#define  SBINTVEC_USB          0x00000010 /* Enable interrupts for usb */
+#define  SBINTVEC_EXTIF                0x00000020 /* Enable interrupts for external i/f */
+#define  SBINTVEC_ENET1                0x00000040 /* Enable interrupts for enet 1 */
+#define B44_SBTMSLOW   0x0F98UL /* SB Target State Low */
+#define  SBTMSLOW_RESET                0x00000001 /* Reset */
+#define  SBTMSLOW_REJECT       0x00000002 /* Reject */
+#define  SBTMSLOW_CLOCK                0x00010000 /* Clock Enable */
+#define  SBTMSLOW_FGC          0x00020000 /* Force Gated Clocks On */
+#define  SBTMSLOW_PE           0x40000000 /* Power Management Enable */
+#define  SBTMSLOW_BE           0x80000000 /* BIST Enable */
+#define B44_SBTMSHIGH  0x0F9CUL /* SB Target State High */
+#define  SBTMSHIGH_SERR                0x00000001 /* S-error */
+#define  SBTMSHIGH_INT         0x00000002 /* Interrupt */
+#define  SBTMSHIGH_BUSY                0x00000004 /* Busy */
+#define  SBTMSHIGH_GCR         0x20000000 /* Gated Clock Request */
+#define  SBTMSHIGH_BISTF       0x40000000 /* BIST Failed */
+#define  SBTMSHIGH_BISTD       0x80000000 /* BIST Done */
+#define B44_SBIDHIGH   0x0FFCUL /* SB Identification High */
+#define  SBIDHIGH_RC_MASK      0x0000000f /* Revision Code */
+#define  SBIDHIGH_CC_MASK      0x0000fff0 /* Core Code */
+#define  SBIDHIGH_CC_SHIFT     4
+#define  SBIDHIGH_VC_MASK      0xffff0000 /* Vendor Code */
+#define  SBIDHIGH_VC_SHIFT     16
+
+/* SSB PCI config space registers.  */
+#define        SSB_BAR0_WIN            0x80
+#define        SSB_BAR1_WIN            0x84
+#define        SSB_SPROM_CONTROL       0x88
+#define        SSB_BAR1_CONTROL        0x8c
+
+/* SSB core and host control registers.  */
+#define SSB_CONTROL            0x0000UL
+#define SSB_ARBCONTROL         0x0010UL
+#define SSB_ISTAT              0x0020UL
+#define SSB_IMASK              0x0024UL
+#define SSB_MBOX               0x0028UL
+#define SSB_BCAST_ADDR         0x0050UL
+#define SSB_BCAST_DATA         0x0054UL
+#define SSB_PCI_TRANS_0                0x0100UL
+#define SSB_PCI_TRANS_1                0x0104UL
+#define SSB_PCI_TRANS_2                0x0108UL
+#define SSB_SPROM              0x0800UL
+
+#define SSB_PCI_MEM            0x00000000
+#define SSB_PCI_IO             0x00000001
+#define SSB_PCI_CFG0           0x00000002
+#define SSB_PCI_CFG1           0x00000003
+#define SSB_PCI_PREF           0x00000004
+#define SSB_PCI_BURST          0x00000008
+#define SSB_PCI_MASK0          0xfc000000
+#define SSB_PCI_MASK1          0xfc000000
+#define SSB_PCI_MASK2          0xc0000000
+
+/* 4400 PHY registers */
+#define B44_MII_AUXCTRL                24      /* Auxiliary Control */
+#define  MII_AUXCTRL_DUPLEX    0x0001  /* Full Duplex */
+#define  MII_AUXCTRL_SPEED     0x0002  /* 1=100Mbps, 0=10Mbps */
+#define  MII_AUXCTRL_FORCED    0x0004  /* Forced 10/100 */
+#define B44_MII_ALEDCTRL       26      /* Activity LED */
+#define  MII_ALEDCTRL_ALLMSK   0x7fff
+#define B44_MII_TLEDCTRL       27      /* Traffic Meter LED */
+#define  MII_TLEDCTRL_ENABLE   0x0040
+
+struct dma_desc {
+       u32     ctrl;
+       u32     addr;
+};
+
+/* There are only 12 bits in the DMA engine for descriptor offsetting
+ * so the table must be aligned on a boundary of this.
+ */
+#define DMA_TABLE_BYTES                4096
+
+#define DESC_CTRL_LEN  0x00001fff
+#define DESC_CTRL_CMASK        0x0ff00000 /* Core specific bits */
+#define DESC_CTRL_EOT  0x10000000 /* End of Table */
+#define DESC_CTRL_IOC  0x20000000 /* Interrupt On Completion */
+#define DESC_CTRL_EOF  0x40000000 /* End of Frame */
+#define DESC_CTRL_SOF  0x80000000 /* Start of Frame */
+
+#define RX_COPY_THRESHOLD      256
+
+struct rx_header {
+       u16     len;
+       u16     flags;
+       u16     pad[12];
+};
+#define RX_HEADER_LEN  28
+
+#define RX_FLAG_OFIFO  0x00000001 /* FIFO Overflow */
+#define RX_FLAG_CRCERR 0x00000002 /* CRC Error */
+#define RX_FLAG_SERR   0x00000004 /* Receive Symbol Error */
+#define RX_FLAG_ODD    0x00000008 /* Frame has odd number of nibbles */
+#define RX_FLAG_LARGE  0x00000010 /* Frame is > RX MAX Length */
+#define RX_FLAG_MCAST  0x00000020 /* Dest is Multicast Address */
+#define RX_FLAG_BCAST  0x00000040 /* Dest is Broadcast Address */
+#define RX_FLAG_MISS   0x00000080 /* Received due to promisc mode */
+#define RX_FLAG_LAST   0x00000800 /* Last buffer in frame */
+#define RX_FLAG_ERRORS (RX_FLAG_ODD | RX_FLAG_SERR | RX_FLAG_CRCERR | RX_FLAG_OFIFO)
+
+struct ring_info {
+       struct sk_buff          *skb;
+       DECLARE_PCI_UNMAP_ADDR(mapping);
+};
+
+#define B44_MCAST_TABLE_SIZE   32
+
+/* SW copy of device statistics, kept up to date by periodic timer
+ * which probes HW values.  Must have same relative layout as HW
+ * register above, because b44_stats_update depends upon this.
+ */
+struct b44_hw_stats {
+       u32 tx_good_octets, tx_good_pkts, tx_octets;
+       u32 tx_pkts, tx_broadcast_pkts, tx_multicast_pkts;
+       u32 tx_len_64, tx_len_65_to_127, tx_len_128_to_255;
+       u32 tx_len_256_to_511, tx_len_512_to_1023, tx_len_1024_to_max;
+       u32 tx_jabber_pkts, tx_oversize_pkts, tx_fragment_pkts;
+       u32 tx_underruns, tx_total_cols, tx_single_cols;
+       u32 tx_multiple_cols, tx_excessive_cols, tx_late_cols;
+       u32 tx_defered, tx_carrier_lost, tx_pause_pkts;
+       u32 __pad1[8];
+
+       u32 rx_good_octets, rx_good_pkts, rx_octets;
+       u32 rx_pkts, rx_broadcast_pkts, rx_multicast_pkts;
+       u32 rx_len_64, rx_len_65_to_127, rx_len_128_to_255;
+       u32 rx_len_256_to_511, rx_len_512_to_1023, rx_len_1024_to_max;
+       u32 rx_jabber_pkts, rx_oversize_pkts, rx_fragment_pkts;
+       u32 rx_missed_pkts, rx_crc_align_errs, rx_undersize;
+       u32 rx_crc_errs, rx_align_errs, rx_symbol_errs;
+       u32 rx_pause_pkts, rx_nonpause_pkts;
+};
+
+struct b44 {
+       spinlock_t              lock;
+
+       u32                     imask, istat;
+
+       struct dma_desc         *rx_ring, *tx_ring;
+
+       u32                     tx_prod, tx_cons;
+       u32                     rx_prod, rx_cons;
+
+       struct ring_info        *rx_buffers;
+       struct ring_info        *tx_buffers;
+
+       u32                     dma_offset;
+       u32                     flags;
+#define B44_FLAG_INIT_COMPLETE 0x00000001
+#define B44_FLAG_BUGGY_TXPTR   0x00000002
+#define B44_FLAG_REORDER_BUG   0x00000004
+#define B44_FLAG_PAUSE_AUTO    0x00008000
+#define B44_FLAG_FULL_DUPLEX   0x00010000
+#define B44_FLAG_100_BASE_T    0x00020000
+#define B44_FLAG_TX_PAUSE      0x00040000
+#define B44_FLAG_RX_PAUSE      0x00080000
+#define B44_FLAG_FORCE_LINK    0x00100000
+#define B44_FLAG_ADV_10HALF    0x01000000
+#define B44_FLAG_ADV_10FULL    0x02000000
+#define B44_FLAG_ADV_100HALF   0x04000000
+#define B44_FLAG_ADV_100FULL   0x08000000
+#define B44_FLAG_INTERNAL_PHY  0x10000000
+
+       u32                     rx_offset;
+
+       u32                     msg_enable;
+
+       struct timer_list       timer;
+
+       struct net_device_stats stats;
+       struct b44_hw_stats     hw_stats;
+
+       void __iomem            *regs;
+       struct pci_dev          *pdev;
+       struct net_device       *dev;
+
+       dma_addr_t              rx_ring_dma, tx_ring_dma;
+
+       u32                     rx_pending;
+       u32                     tx_pending;
+       u8                      phy_addr;
+       u8                      core_unit;
+
+       struct mii_if_info      mii_if;
+};
+
+#endif /* _B44_H */
diff -Nur linux-2.6.12.5/include/asm-mips/bootinfo.h linux-2.6.12.5-brcm/include/asm-mips/bootinfo.h
--- linux-2.6.12.5/include/asm-mips/bootinfo.h  2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/include/asm-mips/bootinfo.h     2005-08-28 11:12:20.695818872 +0200
@@ -213,6 +213,12 @@
 #define MACH_GROUP_TITAN       22      /* PMC-Sierra Titan             */
 #define  MACH_TITAN_YOSEMITE   1       /* PMC-Sierra Yosemite          */
 
+/*
+ * Valid machtype for group Broadcom
+ */
+#define MACH_GROUP_BRCM                23      /* Broadcom                     */
+#define MACH_BCM47XX           1       /* Broadcom BCM47xx             */
+
 #define CL_SIZE                        COMMAND_LINE_SIZE
 
 const char *get_system_type(void);
diff -Nur linux-2.6.12.5/include/asm-mips/cpu.h linux-2.6.12.5-brcm/include/asm-mips/cpu.h
--- linux-2.6.12.5/include/asm-mips/cpu.h       2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/include/asm-mips/cpu.h  2005-08-28 11:12:20.695818872 +0200
@@ -87,6 +87,13 @@
 #define PRID_IMP_SR71000        0x0400
 
 /*
+ * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
+ */
+
+#define PRID_IMP_BCM4710       0x4000
+#define PRID_IMP_BCM3302       0x9000
+
+/*
  * Definitions for 7:0 on legacy processors
  */
 
@@ -177,7 +184,9 @@
 #define CPU_VR4133             56
 #define CPU_AU1550             57
 #define CPU_24K                        58
-#define CPU_LAST               58
+#define CPU_BCM3302            59
+#define CPU_BCM4710            60
+#define CPU_LAST               60
 
 /*
  * ISA Level encodings
diff -Nur linux-2.6.12.5/include/asm-mips/mipsregs.h linux-2.6.12.5-brcm/include/asm-mips/mipsregs.h
--- linux-2.6.12.5/include/asm-mips/mipsregs.h  2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/include/asm-mips/mipsregs.h     2005-08-28 11:12:20.722814768 +0200
@@ -790,10 +790,18 @@
 #define read_c0_config1()      __read_32bit_c0_register($16, 1)
 #define read_c0_config2()      __read_32bit_c0_register($16, 2)
 #define read_c0_config3()      __read_32bit_c0_register($16, 3)
+#define read_c0_config4()      __read_32bit_c0_register($16, 4)
+#define read_c0_config5()      __read_32bit_c0_register($16, 5)
+#define read_c0_config6()      __read_32bit_c0_register($16, 6)
+#define read_c0_config7()      __read_32bit_c0_register($16, 7)
 #define write_c0_config(val)   __write_32bit_c0_register($16, 0, val)
 #define write_c0_config1(val)  __write_32bit_c0_register($16, 1, val)
 #define write_c0_config2(val)  __write_32bit_c0_register($16, 2, val)
 #define write_c0_config3(val)  __write_32bit_c0_register($16, 3, val)
+#define write_c0_config4(val)  __write_32bit_c0_register($16, 4, val)
+#define write_c0_config5(val)  __write_32bit_c0_register($16, 5, val)
+#define write_c0_config6(val)  __write_32bit_c0_register($16, 6, val)
+#define write_c0_config7(val)  __write_32bit_c0_register($16, 7, val)
 
 /*
  * The WatchLo register.  There may be upto 8 of them.
diff -Nur linux-2.6.12.5/include/linux/init.h linux-2.6.12.5-brcm/include/linux/init.h
--- linux-2.6.12.5/include/linux/init.h 2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/include/linux/init.h    2005-08-28 11:12:20.723814616 +0200
@@ -86,6 +86,8 @@
        static initcall_t __initcall_##fn __attribute_used__ \
        __attribute__((__section__(".initcall" level ".init"))) = fn
 
+#define early_initcall(fn)             __define_initcall(".early1",fn)
+
 #define core_initcall(fn)              __define_initcall("1",fn)
 #define postcore_initcall(fn)          __define_initcall("2",fn)
 #define arch_initcall(fn)              __define_initcall("3",fn)
diff -Nur linux-2.6.12.5/include/linux/pci_ids.h linux-2.6.12.5-brcm/include/linux/pci_ids.h
--- linux-2.6.12.5/include/linux/pci_ids.h      2005-08-15 02:20:18.000000000 +0200
+++ linux-2.6.12.5-brcm/include/linux/pci_ids.h 2005-08-28 11:12:20.726814160 +0200
@@ -2110,6 +2110,7 @@
 #define PCI_DEVICE_ID_TIGON3_5901_2    0x170e
 #define PCI_DEVICE_ID_BCM4401          0x4401
 #define PCI_DEVICE_ID_BCM4401B0                0x4402
+#define PCI_DEVICE_ID_BCM4713          0x4713
 
 #define PCI_VENDOR_ID_TOPIC            0x151f
 #define PCI_DEVICE_ID_TOPIC_TP560      0x0000
diff -Nur linux-2.6.12.5/include/linux/pci_ids.h.orig linux-2.6.12.5-brcm/include/linux/pci_ids.h.orig
--- linux-2.6.12.5/include/linux/pci_ids.h.orig 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.12.5-brcm/include/linux/pci_ids.h.orig    2005-08-15 02:20:18.000000000 +0200
@@ -0,0 +1,2609 @@
+/*
+ *     PCI Class, Vendor and Device IDs
+ *
+ *     Please keep sorted.
+ */
+
+/* Device classes and subclasses */
+
+#define PCI_CLASS_NOT_DEFINED          0x0000
+#define PCI_CLASS_NOT_DEFINED_VGA      0x0001
+
+#define PCI_BASE_CLASS_STORAGE         0x01
+#define PCI_CLASS_STORAGE_SCSI         0x0100
+#define PCI_CLASS_STORAGE_IDE          0x0101
+#define PCI_CLASS_STORAGE_FLOPPY       0x0102
+#define PCI_CLASS_STORAGE_IPI          0x0103
+#define PCI_CLASS_STORAGE_RAID         0x0104
+#define PCI_CLASS_STORAGE_OTHER                0x0180
+
+#define PCI_BASE_CLASS_NETWORK         0x02
+#define PCI_CLASS_NETWORK_ETHERNET     0x0200
+#define PCI_CLASS_NETWORK_TOKEN_RING   0x0201
+#define PCI_CLASS_NETWORK_FDDI         0x0202
+#define PCI_CLASS_NETWORK_ATM          0x0203
+#define PCI_CLASS_NETWORK_OTHER                0x0280
+
+#define PCI_BASE_CLASS_DISPLAY         0x03
+#define PCI_CLASS_DISPLAY_VGA          0x0300
+#define PCI_CLASS_DISPLAY_XGA          0x0301
+#define PCI_CLASS_DISPLAY_3D           0x0302
+#define PCI_CLASS_DISPLAY_OTHER                0x0380
+
+#define PCI_BASE_CLASS_MULTIMEDIA      0x04
+#define PCI_CLASS_MULTIMEDIA_VIDEO     0x0400
+#define PCI_CLASS_MULTIMEDIA_AUDIO     0x0401
+#define PCI_CLASS_MULTIMEDIA_PHONE     0x0402
+#define PCI_CLASS_MULTIMEDIA_OTHER     0x0480
+
+#define PCI_BASE_CLASS_MEMORY          0x05
+#define PCI_CLASS_MEMORY_RAM           0x0500
+#define PCI_CLASS_MEMORY_FLASH         0x0501
+#define PCI_CLASS_MEMORY_OTHER         0x0580
+
+#define PCI_BASE_CLASS_BRIDGE          0x06
+#define PCI_CLASS_BRIDGE_HOST          0x0600
+#define PCI_CLASS_BRIDGE_ISA           0x0601
+#define PCI_CLASS_BRIDGE_EISA          0x0602
+#define PCI_CLASS_BRIDGE_MC            0x0603
+#define PCI_CLASS_BRIDGE_PCI           0x0604
+#define PCI_CLASS_BRIDGE_PCMCIA                0x0605
+#define PCI_CLASS_BRIDGE_NUBUS         0x0606
+#define PCI_CLASS_BRIDGE_CARDBUS       0x0607
+#define PCI_CLASS_BRIDGE_RACEWAY       0x0608
+#define PCI_CLASS_BRIDGE_OTHER         0x0680
+
+#define PCI_BASE_CLASS_COMMUNICATION   0x07
+#define PCI_CLASS_COMMUNICATION_SERIAL 0x0700
+#define PCI_CLASS_COMMUNICATION_PARALLEL 0x0701
+#define PCI_CLASS_COMMUNICATION_MULTISERIAL 0x0702
+#define PCI_CLASS_COMMUNICATION_MODEM  0x0703
+#define PCI_CLASS_COMMUNICATION_OTHER  0x0780
+
+#define PCI_BASE_CLASS_SYSTEM          0x08
+#define PCI_CLASS_SYSTEM_PIC           0x0800
+#define PCI_CLASS_SYSTEM_DMA           0x0801
+#define PCI_CLASS_SYSTEM_TIMER         0x0802
+#define PCI_CLASS_SYSTEM_RTC           0x0803
+#define PCI_CLASS_SYSTEM_PCI_HOTPLUG   0x0804
+#define PCI_CLASS_SYSTEM_OTHER         0x0880
+
+#define PCI_BASE_CLASS_INPUT           0x09
+#define PCI_CLASS_INPUT_KEYBOARD       0x0900
+#define PCI_CLASS_INPUT_PEN            0x0901
+#define PCI_CLASS_INPUT_MOUSE          0x0902
+#define PCI_CLASS_INPUT_SCANNER                0x0903
+#define PCI_CLASS_INPUT_GAMEPORT       0x0904
+#define PCI_CLASS_INPUT_OTHER          0x0980
+
+#define PCI_BASE_CLASS_DOCKING         0x0a
+#define PCI_CLASS_DOCKING_GENERIC      0x0a00
+#define PCI_CLASS_DOCKING_OTHER                0x0a80
+
+#define PCI_BASE_CLASS_PROCESSOR       0x0b
+#define PCI_CLASS_PROCESSOR_386                0x0b00
+#define PCI_CLASS_PROCESSOR_486                0x0b01
+#define PCI_CLASS_PROCESSOR_PENTIUM    0x0b02
+#define PCI_CLASS_PROCESSOR_ALPHA      0x0b10
+#define PCI_CLASS_PROCESSOR_POWERPC    0x0b20
+#define PCI_CLASS_PROCESSOR_MIPS       0x0b30
+#define PCI_CLASS_PROCESSOR_CO         0x0b40
+
+#define PCI_BASE_CLASS_SERIAL          0x0c
+#define PCI_CLASS_SERIAL_FIREWIRE      0x0c00
+#define PCI_CLASS_SERIAL_ACCESS                0x0c01
+#define PCI_CLASS_SERIAL_SSA           0x0c02
+#define PCI_CLASS_SERIAL_USB           0x0c03
+#define PCI_CLASS_SERIAL_FIBER         0x0c04
+#define PCI_CLASS_SERIAL_SMBUS         0x0c05
+
+#define PCI_BASE_CLASS_INTELLIGENT     0x0e
+#define PCI_CLASS_INTELLIGENT_I2O      0x0e00
+
+#define PCI_BASE_CLASS_SATELLITE       0x0f
+#define PCI_CLASS_SATELLITE_TV         0x0f00
+#define PCI_CLASS_SATELLITE_AUDIO      0x0f01
+#define PCI_CLASS_SATELLITE_VOICE      0x0f03
+#define PCI_CLASS_SATELLITE_DATA       0x0f04
+
+#define PCI_BASE_CLASS_CRYPT           0x10
+#define PCI_CLASS_CRYPT_NETWORK                0x1000
+#define PCI_CLASS_CRYPT_ENTERTAINMENT  0x1001
+#define PCI_CLASS_CRYPT_OTHER          0x1080
+
+#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11
+#define PCI_CLASS_SP_DPIO              0x1100
+#define PCI_CLASS_SP_OTHER             0x1180
+
+#define PCI_CLASS_OTHERS               0xff
+
+/* Vendors and devices.  Sort key: vendor first, device next. */
+
+#define PCI_VENDOR_ID_DYNALINK         0x0675
+#define PCI_DEVICE_ID_DYNALINK_IS64PH  0x1702
+
+#define PCI_VENDOR_ID_BERKOM                   0x0871
+#define PCI_DEVICE_ID_BERKOM_A1T               0xffa1
+#define PCI_DEVICE_ID_BERKOM_T_CONCEPT         0xffa2
+#define PCI_DEVICE_ID_BERKOM_A4T               0xffa4
+#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO     0xffa8
+
+#define PCI_VENDOR_ID_COMPAQ           0x0e11
+#define PCI_DEVICE_ID_COMPAQ_TOKENRING 0x0508
+#define PCI_DEVICE_ID_COMPAQ_1280      0x3033
+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX   0x4000
+#define PCI_DEVICE_ID_COMPAQ_6010      0x6010
+#define PCI_DEVICE_ID_COMPAQ_TACHYON   0xa0fc
+#define PCI_DEVICE_ID_COMPAQ_SMART2P   0xae10
+#define PCI_DEVICE_ID_COMPAQ_NETEL100  0xae32
+#define PCI_DEVICE_ID_COMPAQ_NETEL10   0xae34
+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE 0xae33
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I 0xae35
+#define PCI_DEVICE_ID_COMPAQ_NETEL100D 0xae40
+#define PCI_DEVICE_ID_COMPAQ_NETEL100PI        0xae43
+#define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011
+#define PCI_DEVICE_ID_COMPAQ_CISS      0xb060
+#define PCI_DEVICE_ID_COMPAQ_CISSB     0xb178
+#define PCI_DEVICE_ID_COMPAQ_CISSC     0x46
+#define PCI_DEVICE_ID_COMPAQ_THUNDER   0xf130
+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150
+
+#define PCI_VENDOR_ID_NCR              0x1000
+#define PCI_VENDOR_ID_LSI_LOGIC                0x1000
+#define PCI_DEVICE_ID_NCR_53C810       0x0001
+#define PCI_DEVICE_ID_NCR_53C820       0x0002
+#define PCI_DEVICE_ID_NCR_53C825       0x0003
+#define PCI_DEVICE_ID_NCR_53C815       0x0004
+#define PCI_DEVICE_ID_LSI_53C810AP     0x0005
+#define PCI_DEVICE_ID_NCR_53C860       0x0006
+#define PCI_DEVICE_ID_LSI_53C1510      0x000a
+#define PCI_DEVICE_ID_NCR_53C896       0x000b
+#define PCI_DEVICE_ID_NCR_53C895       0x000c
+#define PCI_DEVICE_ID_NCR_53C885       0x000d
+#define PCI_DEVICE_ID_NCR_53C875       0x000f
+#define PCI_DEVICE_ID_NCR_53C1510      0x0010
+#define PCI_DEVICE_ID_LSI_53C895A      0x0012
+#define PCI_DEVICE_ID_LSI_53C875A      0x0013
+#define PCI_DEVICE_ID_LSI_53C1010_33   0x0020
+#define PCI_DEVICE_ID_LSI_53C1010_66   0x0021
+#define PCI_DEVICE_ID_LSI_53C1030      0x0030
+#define PCI_DEVICE_ID_LSI_1030_53C1035 0x0032
+#define PCI_DEVICE_ID_LSI_53C1035      0x0040
+#define PCI_DEVICE_ID_NCR_53C875J      0x008f
+#define PCI_DEVICE_ID_LSI_FC909                0x0621
+#define PCI_DEVICE_ID_LSI_FC929                0x0622
+#define PCI_DEVICE_ID_LSI_FC929_LAN    0x0623
+#define PCI_DEVICE_ID_LSI_FC919                0x0624
+#define PCI_DEVICE_ID_LSI_FC919_LAN    0x0625
+#define PCI_DEVICE_ID_LSI_FC929X       0x0626
+#define PCI_DEVICE_ID_LSI_FC939X       0x0642
+#define PCI_DEVICE_ID_LSI_FC949X       0x0640
+#define PCI_DEVICE_ID_LSI_FC919X       0x0628
+#define PCI_DEVICE_ID_NCR_YELLOWFIN    0x0701
+#define PCI_DEVICE_ID_LSI_61C102       0x0901
+#define PCI_DEVICE_ID_LSI_63C815       0x1000
+#define PCI_DEVICE_ID_LSI_SAS1064      0x0050
+#define PCI_DEVICE_ID_LSI_SAS1066      0x005E
+#define PCI_DEVICE_ID_LSI_SAS1068      0x0054
+#define PCI_DEVICE_ID_LSI_SAS1064A     0x005C
+#define PCI_DEVICE_ID_LSI_SAS1064E     0x0056
+#define PCI_DEVICE_ID_LSI_SAS1066E     0x005A
+#define PCI_DEVICE_ID_LSI_SAS1068E     0x0058
+#define PCI_DEVICE_ID_LSI_SAS1078      0x0060
+
+#define PCI_VENDOR_ID_ATI              0x1002
+/* Mach64 */
+#define PCI_DEVICE_ID_ATI_68800                0x4158
+#define PCI_DEVICE_ID_ATI_215CT222     0x4354
+#define PCI_DEVICE_ID_ATI_210888CX     0x4358
+#define PCI_DEVICE_ID_ATI_215ET222     0x4554
+/* Mach64 / Rage */
+#define PCI_DEVICE_ID_ATI_215GB                0x4742
+#define PCI_DEVICE_ID_ATI_215GD                0x4744
+#define PCI_DEVICE_ID_ATI_215GI                0x4749
+#define PCI_DEVICE_ID_ATI_215GP                0x4750
+#define PCI_DEVICE_ID_ATI_215GQ                0x4751
+#define PCI_DEVICE_ID_ATI_215XL                0x4752
+#define PCI_DEVICE_ID_ATI_215GT                0x4754
+#define PCI_DEVICE_ID_ATI_215GTB       0x4755
+#define PCI_DEVICE_ID_ATI_215_IV       0x4756
+#define PCI_DEVICE_ID_ATI_215_IW       0x4757
+#define PCI_DEVICE_ID_ATI_215_IZ       0x475A
+#define PCI_DEVICE_ID_ATI_210888GX     0x4758
+#define PCI_DEVICE_ID_ATI_215_LB       0x4c42
+#define PCI_DEVICE_ID_ATI_215_LD       0x4c44
+#define PCI_DEVICE_ID_ATI_215_LG       0x4c47
+#define PCI_DEVICE_ID_ATI_215_LI       0x4c49
+#define PCI_DEVICE_ID_ATI_215_LM       0x4c4D
+#define PCI_DEVICE_ID_ATI_215_LN       0x4c4E
+#define PCI_DEVICE_ID_ATI_215_LR       0x4c52
+#define PCI_DEVICE_ID_ATI_215_LS       0x4c53
+#define PCI_DEVICE_ID_ATI_264_LT       0x4c54
+/* Mach64 VT */
+#define PCI_DEVICE_ID_ATI_264VT                0x5654
+#define PCI_DEVICE_ID_ATI_264VU                0x5655
+#define PCI_DEVICE_ID_ATI_264VV                0x5656
+/* Rage128 GL */
+#define PCI_DEVICE_ID_ATI_RAGE128_RE   0x5245
+#define PCI_DEVICE_ID_ATI_RAGE128_RF   0x5246
+#define PCI_DEVICE_ID_ATI_RAGE128_RG   0x5247
+/* Rage128 VR */
+#define PCI_DEVICE_ID_ATI_RAGE128_RK   0x524b
+#define PCI_DEVICE_ID_ATI_RAGE128_RL   0x524c
+#define PCI_DEVICE_ID_ATI_RAGE128_SE   0x5345
+#define PCI_DEVICE_ID_ATI_RAGE128_SF   0x5346
+#define PCI_DEVICE_ID_ATI_RAGE128_SG   0x5347
+#define PCI_DEVICE_ID_ATI_RAGE128_SH   0x5348
+#define PCI_DEVICE_ID_ATI_RAGE128_SK   0x534b
+#define PCI_DEVICE_ID_ATI_RAGE128_SL   0x534c
+#define PCI_DEVICE_ID_ATI_RAGE128_SM   0x534d
+#define PCI_DEVICE_ID_ATI_RAGE128_SN   0x534e
+/* Rage128 Ultra */
+#define PCI_DEVICE_ID_ATI_RAGE128_TF   0x5446
+#define PCI_DEVICE_ID_ATI_RAGE128_TL   0x544c
+#define PCI_DEVICE_ID_ATI_RAGE128_TR   0x5452
+#define PCI_DEVICE_ID_ATI_RAGE128_TS   0x5453
+#define PCI_DEVICE_ID_ATI_RAGE128_TT   0x5454
+#define PCI_DEVICE_ID_ATI_RAGE128_TU   0x5455
+/* Rage128 M3 */
+#define PCI_DEVICE_ID_ATI_RAGE128_LE   0x4c45
+#define PCI_DEVICE_ID_ATI_RAGE128_LF   0x4c46
+/* Rage128 M4 */
+#define PCI_DEVICE_ID_ATI_RAGE128_MF    0x4d46
+#define PCI_DEVICE_ID_ATI_RAGE128_ML    0x4d4c
+/* Rage128 Pro GL */
+#define PCI_DEVICE_ID_ATI_RAGE128_PA   0x5041
+#define PCI_DEVICE_ID_ATI_RAGE128_PB   0x5042
+#define PCI_DEVICE_ID_ATI_RAGE128_PC   0x5043
+#define PCI_DEVICE_ID_ATI_RAGE128_PD   0x5044
+#define PCI_DEVICE_ID_ATI_RAGE128_PE   0x5045
+#define PCI_DEVICE_ID_ATI_RAGE128_PF   0x5046
+/* Rage128 Pro VR */
+#define PCI_DEVICE_ID_ATI_RAGE128_PG   0x5047
+#define PCI_DEVICE_ID_ATI_RAGE128_PH   0x5048
+#define PCI_DEVICE_ID_ATI_RAGE128_PI   0x5049
+#define PCI_DEVICE_ID_ATI_RAGE128_PJ   0x504A
+#define PCI_DEVICE_ID_ATI_RAGE128_PK   0x504B
+#define PCI_DEVICE_ID_ATI_RAGE128_PL   0x504C
+#define PCI_DEVICE_ID_ATI_RAGE128_PM   0x504D
+#define PCI_DEVICE_ID_ATI_RAGE128_PN   0x504E
+#define PCI_DEVICE_ID_ATI_RAGE128_PO   0x504F
+#define PCI_DEVICE_ID_ATI_RAGE128_PP   0x5050
+#define PCI_DEVICE_ID_ATI_RAGE128_PQ   0x5051
+#define PCI_DEVICE_ID_ATI_RAGE128_PR   0x5052
+#define PCI_DEVICE_ID_ATI_RAGE128_TR   0x5452
+#define PCI_DEVICE_ID_ATI_RAGE128_PS   0x5053
+#define PCI_DEVICE_ID_ATI_RAGE128_PT   0x5054
+#define PCI_DEVICE_ID_ATI_RAGE128_PU   0x5055
+#define PCI_DEVICE_ID_ATI_RAGE128_PV   0x5056
+#define PCI_DEVICE_ID_ATI_RAGE128_PW   0x5057
+#define PCI_DEVICE_ID_ATI_RAGE128_PX   0x5058
+/* Rage128 M4 */
+#define PCI_DEVICE_ID_ATI_RADEON_LE    0x4d45
+#define PCI_DEVICE_ID_ATI_RADEON_LF    0x4d46
+/* Radeon R100 */
+#define PCI_DEVICE_ID_ATI_RADEON_QD    0x5144
+#define PCI_DEVICE_ID_ATI_RADEON_QE    0x5145
+#define PCI_DEVICE_ID_ATI_RADEON_QF    0x5146
+#define PCI_DEVICE_ID_ATI_RADEON_QG    0x5147
+/* Radeon RV100 (VE) */
+#define PCI_DEVICE_ID_ATI_RADEON_QY    0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_QZ    0x515a
+/* Radeon R200 (8500) */
+#define PCI_DEVICE_ID_ATI_RADEON_QL    0x514c
+#define PCI_DEVICE_ID_ATI_RADEON_QN    0x514e
+#define PCI_DEVICE_ID_ATI_RADEON_QO    0x514f
+#define PCI_DEVICE_ID_ATI_RADEON_Ql    0x516c
+#define PCI_DEVICE_ID_ATI_RADEON_BB    0x4242
+/* Radeon R200 (9100) */
+#define PCI_DEVICE_ID_ATI_RADEON_QM    0x514d
+/* Radeon RV200 (7500) */
+#define PCI_DEVICE_ID_ATI_RADEON_QW    0x5157
+#define PCI_DEVICE_ID_ATI_RADEON_QX    0x5158
+/* Radeon NV-100 */
+#define PCI_DEVICE_ID_ATI_RADEON_N1    0x5159
+#define PCI_DEVICE_ID_ATI_RADEON_N2    0x515a
+/* Radeon RV250 (9000) */
+#define PCI_DEVICE_ID_ATI_RADEON_Id    0x4964
+#define PCI_DEVICE_ID_ATI_RADEON_Ie    0x4965
+#define PCI_DEVICE_ID_ATI_RADEON_If    0x4966
+#define PCI_DEVICE_ID_ATI_RADEON_Ig    0x4967
+/* Radeon RV280 (9200) */
+#define PCI_DEVICE_ID_ATI_RADEON_Y_    0x5960
+#define PCI_DEVICE_ID_ATI_RADEON_Ya    0x5961
+#define PCI_DEVICE_ID_ATI_RADEON_Yd    0x5964
+/* Radeon R300 (9500) */
+#define PCI_DEVICE_ID_ATI_RADEON_AD    0x4144
+/* Radeon R300 (9700) */
+#define PCI_DEVICE_ID_ATI_RADEON_ND    0x4e44
+#define PCI_DEVICE_ID_ATI_RADEON_NE    0x4e45
+#define PCI_DEVICE_ID_ATI_RADEON_NF    0x4e46
+#define PCI_DEVICE_ID_ATI_RADEON_NG    0x4e47
+#define PCI_DEVICE_ID_ATI_RADEON_AE    0x4145
+#define PCI_DEVICE_ID_ATI_RADEON_AF    0x4146
+/* Radeon R350 (9800) */
+#define PCI_DEVICE_ID_ATI_RADEON_NH    0x4e48
+#define PCI_DEVICE_ID_ATI_RADEON_NI    0x4e49
+/* Radeon RV350 (9600) */
+#define PCI_DEVICE_ID_ATI_RADEON_AP    0x4150
+#define PCI_DEVICE_ID_ATI_RADEON_AR    0x4152
+/* Radeon M6 */
+#define PCI_DEVICE_ID_ATI_RADEON_LY    0x4c59
+#define PCI_DEVICE_ID_ATI_RADEON_LZ    0x4c5a
+/* Radeon M7 */
+#define PCI_DEVICE_ID_ATI_RADEON_LW    0x4c57
+#define PCI_DEVICE_ID_ATI_RADEON_LX    0x4c58
+/* Radeon M9 */
+#define PCI_DEVICE_ID_ATI_RADEON_Ld    0x4c64
+#define PCI_DEVICE_ID_ATI_RADEON_Le    0x4c65
+#define PCI_DEVICE_ID_ATI_RADEON_Lf    0x4c66
+#define PCI_DEVICE_ID_ATI_RADEON_Lg    0x4c67
+/* Radeon */
+#define PCI_DEVICE_ID_ATI_RADEON_RA    0x5144
+#define PCI_DEVICE_ID_ATI_RADEON_RB    0x5145
+#define PCI_DEVICE_ID_ATI_RADEON_RC    0x5146
+#define PCI_DEVICE_ID_ATI_RADEON_RD    0x5147
+/* RadeonIGP */
+#define PCI_DEVICE_ID_ATI_RS100                0xcab0
+#define PCI_DEVICE_ID_ATI_RS200                0xcab2
+#define PCI_DEVICE_ID_ATI_RS200_B      0xcbb2
+#define PCI_DEVICE_ID_ATI_RS250                0xcab3
+#define PCI_DEVICE_ID_ATI_RS300_100    0x5830
+#define PCI_DEVICE_ID_ATI_RS300_133    0x5831
+#define PCI_DEVICE_ID_ATI_RS300_166    0x5832
+#define PCI_DEVICE_ID_ATI_RS300_200    0x5833
+#define PCI_DEVICE_ID_ATI_RS350_100     0x7830
+#define PCI_DEVICE_ID_ATI_RS350_133     0x7831
+#define PCI_DEVICE_ID_ATI_RS350_166     0x7832
+#define PCI_DEVICE_ID_ATI_RS350_200     0x7833
+#define PCI_DEVICE_ID_ATI_RS400_100     0x5a30
+#define PCI_DEVICE_ID_ATI_RS400_133     0x5a31
+#define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
+#define PCI_DEVICE_ID_ATI_RS400_200     0x5a33
+#define PCI_DEVICE_ID_ATI_RS480         0x5950
+/* ATI IXP Chipset */
+#define PCI_DEVICE_ID_ATI_IXP200_IDE   0x4349
+#define PCI_DEVICE_ID_ATI_IXP300_IDE   0x4369
+#define PCI_DEVICE_ID_ATI_IXP300_SATA   0x436e
+#define PCI_DEVICE_ID_ATI_IXP400_IDE   0x4376
+#define PCI_DEVICE_ID_ATI_IXP400_SATA   0x4379
+
+#define PCI_VENDOR_ID_VLSI             0x1004
+#define PCI_DEVICE_ID_VLSI_82C592      0x0005
+#define PCI_DEVICE_ID_VLSI_82C593      0x0006
+#define PCI_DEVICE_ID_VLSI_82C594      0x0007
+#define PCI_DEVICE_ID_VLSI_82C597      0x0009
+#define PCI_DEVICE_ID_VLSI_82C541      0x000c
+#define PCI_DEVICE_ID_VLSI_82C543      0x000d
+#define PCI_DEVICE_ID_VLSI_82C532      0x0101
+#define PCI_DEVICE_ID_VLSI_82C534      0x0102
+#define PCI_DEVICE_ID_VLSI_82C535      0x0104
+#define PCI_DEVICE_ID_VLSI_82C147      0x0105
+#define PCI_DEVICE_ID_VLSI_VAS96011    0x0702
+
+#define PCI_VENDOR_ID_ADL              0x1005
+#define PCI_DEVICE_ID_ADL_2301         0x2301
+
+#define PCI_VENDOR_ID_NS               0x100b
+#define PCI_DEVICE_ID_NS_87415         0x0002
+#define PCI_DEVICE_ID_NS_87560_LIO     0x000e
+#define PCI_DEVICE_ID_NS_87560_USB     0x0012
+#define PCI_DEVICE_ID_NS_83815         0x0020
+#define PCI_DEVICE_ID_NS_83820         0x0022
+#define PCI_DEVICE_ID_NS_SCx200_BRIDGE 0x0500
+#define PCI_DEVICE_ID_NS_SCx200_SMI    0x0501
+#define PCI_DEVICE_ID_NS_SCx200_IDE    0x0502
+#define PCI_DEVICE_ID_NS_SCx200_AUDIO  0x0503
+#define PCI_DEVICE_ID_NS_SCx200_VIDEO  0x0504
+#define PCI_DEVICE_ID_NS_SCx200_XBUS   0x0505
+#define PCI_DEVICE_ID_NS_SC1100_BRIDGE 0x0510
+#define PCI_DEVICE_ID_NS_SC1100_SMI    0x0511
+#define PCI_DEVICE_ID_NS_SC1100_XBUS   0x0515
+#define PCI_DEVICE_ID_NS_87410         0xd001
+
+#define PCI_VENDOR_ID_TSENG            0x100c
+#define PCI_DEVICE_ID_TSENG_W32P_2     0x3202
+#define PCI_DEVICE_ID_TSENG_W32P_b     0x3205
+#define PCI_DEVICE_ID_TSENG_W32P_c     0x3206
+#define PCI_DEVICE_ID_TSENG_W32P_d     0x3207
+#define PCI_DEVICE_ID_TSENG_ET6000     0x3208
+
+#define PCI_VENDOR_ID_WEITEK           0x100e
+#define PCI_DEVICE_ID_WEITEK_P9000     0x9001
+#define PCI_DEVICE_ID_WEITEK_P9100     0x9100
+
+#define PCI_VENDOR_ID_DEC              0x1011
+#define PCI_DEVICE_ID_DEC_BRD          0x0001
+#define PCI_DEVICE_ID_DEC_TULIP                0x0002
+#define PCI_DEVICE_ID_DEC_TGA          0x0004
+#define PCI_DEVICE_ID_DEC_TULIP_FAST   0x0009
+#define PCI_DEVICE_ID_DEC_TGA2         0x000D
+#define PCI_DEVICE_ID_DEC_FDDI         0x000F
+#define PCI_DEVICE_ID_DEC_TULIP_PLUS   0x0014
+#define PCI_DEVICE_ID_DEC_21142                0x0019
+#define PCI_DEVICE_ID_DEC_21052                0x0021
+#define PCI_DEVICE_ID_DEC_21150                0x0022
+#define PCI_DEVICE_ID_DEC_21152                0x0024
+#define PCI_DEVICE_ID_DEC_21153                0x0025
+#define PCI_DEVICE_ID_DEC_21154                0x0026
+#define PCI_DEVICE_ID_DEC_21285                0x1065
+#define PCI_DEVICE_ID_COMPAQ_42XX      0x0046
+
+#define PCI_VENDOR_ID_CIRRUS           0x1013
+#define PCI_DEVICE_ID_CIRRUS_7548      0x0038
+#define PCI_DEVICE_ID_CIRRUS_5430      0x00a0
+#define PCI_DEVICE_ID_CIRRUS_5434_4    0x00a4
+#define PCI_DEVICE_ID_CIRRUS_5434_8    0x00a8
+#define PCI_DEVICE_ID_CIRRUS_5436      0x00ac
+#define PCI_DEVICE_ID_CIRRUS_5446      0x00b8
+#define PCI_DEVICE_ID_CIRRUS_5480      0x00bc
+#define PCI_DEVICE_ID_CIRRUS_5462      0x00d0
+#define PCI_DEVICE_ID_CIRRUS_5464      0x00d4
+#define PCI_DEVICE_ID_CIRRUS_5465      0x00d6
+#define PCI_DEVICE_ID_CIRRUS_6729      0x1100
+#define PCI_DEVICE_ID_CIRRUS_6832      0x1110
+#define PCI_DEVICE_ID_CIRRUS_7542      0x1200
+#define PCI_DEVICE_ID_CIRRUS_7543      0x1202
+#define PCI_DEVICE_ID_CIRRUS_7541      0x1204
+
+#define PCI_VENDOR_ID_IBM              0x1014
+#define PCI_DEVICE_ID_IBM_FIRE_CORAL   0x000a
+#define PCI_DEVICE_ID_IBM_TR           0x0018
+#define PCI_DEVICE_ID_IBM_82G2675      0x001d
+#define PCI_DEVICE_ID_IBM_MCA          0x0020
+#define PCI_DEVICE_ID_IBM_82351                0x0022
+#define PCI_DEVICE_ID_IBM_PYTHON       0x002d
+#define PCI_DEVICE_ID_IBM_SERVERAID    0x002e
+#define PCI_DEVICE_ID_IBM_TR_WAKE      0x003e
+#define PCI_DEVICE_ID_IBM_MPIC         0x0046
+#define PCI_DEVICE_ID_IBM_3780IDSP     0x007d
+#define PCI_DEVICE_ID_IBM_CHUKAR       0x0096
+#define PCI_DEVICE_ID_IBM_CPC710_PCI64 0x00fc
+#define PCI_DEVICE_ID_IBM_CPC710_PCI32 0x0105
+#define        PCI_DEVICE_ID_IBM_405GP         0x0156
+#define PCI_DEVICE_ID_IBM_SNIPE                0x0180
+#define PCI_DEVICE_ID_IBM_SERVERAIDI960        0x01bd
+#define PCI_DEVICE_ID_IBM_CITRINE              0x028C
+#define PCI_DEVICE_ID_IBM_GEMSTONE             0xB166
+#define PCI_DEVICE_ID_IBM_MPIC_2       0xffff
+#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1        0x0031
+#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2        0x0219
+#define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX                0x021A
+#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM    0x0251
+#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252
+
+#define PCI_VENDOR_ID_COMPEX2          0x101a // pci.ids says "AT&T GIS (NCR)"
+#define PCI_DEVICE_ID_COMPEX2_100VG    0x0005
+
+#define PCI_VENDOR_ID_WD               0x101c
+#define PCI_DEVICE_ID_WD_7197          0x3296
+#define PCI_DEVICE_ID_WD_90C           0xc24a
+
+#define PCI_VENDOR_ID_AMI              0x101e
+#define PCI_DEVICE_ID_AMI_MEGARAID3    0x1960
+#define PCI_DEVICE_ID_AMI_MEGARAID     0x9010
+#define PCI_DEVICE_ID_AMI_MEGARAID2    0x9060
+
+#define PCI_VENDOR_ID_AMD              0x1022
+#define PCI_DEVICE_ID_AMD_LANCE                0x2000
+#define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001
+#define PCI_DEVICE_ID_AMD_SCSI         0x2020
+#define PCI_DEVICE_ID_AMD_SERENADE     0x36c0
+#define PCI_DEVICE_ID_AMD_FE_GATE_7006 0x7006
+#define PCI_DEVICE_ID_AMD_FE_GATE_7007 0x7007
+#define PCI_DEVICE_ID_AMD_FE_GATE_700C 0x700C
+#define PCI_DEVICE_ID_AMD_FE_GATE_700D 0x700D
+#define PCI_DEVICE_ID_AMD_FE_GATE_700E 0x700E
+#define PCI_DEVICE_ID_AMD_FE_GATE_700F 0x700F
+#define PCI_DEVICE_ID_AMD_COBRA_7400   0x7400
+#define PCI_DEVICE_ID_AMD_COBRA_7401   0x7401
+#define PCI_DEVICE_ID_AMD_COBRA_7403   0x7403
+#define PCI_DEVICE_ID_AMD_COBRA_7404   0x7404
+#define PCI_DEVICE_ID_AMD_VIPER_7408   0x7408
+#define PCI_DEVICE_ID_AMD_VIPER_7409   0x7409
+#define PCI_DEVICE_ID_AMD_VIPER_740B   0x740B
+#define PCI_DEVICE_ID_AMD_VIPER_740C   0x740C
+#define PCI_DEVICE_ID_AMD_VIPER_7410   0x7410
+#define PCI_DEVICE_ID_AMD_VIPER_7411   0x7411
+#define PCI_DEVICE_ID_AMD_VIPER_7413   0x7413
+#define PCI_DEVICE_ID_AMD_VIPER_7414   0x7414
+#define PCI_DEVICE_ID_AMD_OPUS_7440    0x7440
+#      define PCI_DEVICE_ID_AMD_VIPER_7440     PCI_DEVICE_ID_AMD_OPUS_7440
+#define PCI_DEVICE_ID_AMD_OPUS_7441    0x7441
+#      define PCI_DEVICE_ID_AMD_VIPER_7441     PCI_DEVICE_ID_AMD_OPUS_7441
+#define PCI_DEVICE_ID_AMD_OPUS_7443    0x7443
+#      define PCI_DEVICE_ID_AMD_VIPER_7443     PCI_DEVICE_ID_AMD_OPUS_7443
+#define PCI_DEVICE_ID_AMD_OPUS_7445    0x7445
+#define PCI_DEVICE_ID_AMD_OPUS_7448    0x7448
+# define       PCI_DEVICE_ID_AMD_VIPER_7448    PCI_DEVICE_ID_AMD_OPUS_7448
+#define PCI_DEVICE_ID_AMD_OPUS_7449    0x7449
+#      define PCI_DEVICE_ID_AMD_VIPER_7449     PCI_DEVICE_ID_AMD_OPUS_7449
+#define PCI_DEVICE_ID_AMD_8111_LAN     0x7462
+#define PCI_DEVICE_ID_AMD_8111_LPC     0x7468
+#define PCI_DEVICE_ID_AMD_8111_IDE     0x7469
+#define PCI_DEVICE_ID_AMD_8111_SMBUS2  0x746a
+#define PCI_DEVICE_ID_AMD_8111_SMBUS   0x746b
+#define PCI_DEVICE_ID_AMD_8111_AUDIO   0x746d
+#define PCI_DEVICE_ID_AMD_8151_0       0x7454
+#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
+
+#define PCI_VENDOR_ID_TRIDENT          0x1023
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX        0x2000
+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX        0x2001
+#define PCI_DEVICE_ID_TRIDENT_9320     0x9320
+#define PCI_DEVICE_ID_TRIDENT_9388     0x9388
+#define PCI_DEVICE_ID_TRIDENT_9397     0x9397
+#define PCI_DEVICE_ID_TRIDENT_939A     0x939A
+#define PCI_DEVICE_ID_TRIDENT_9520     0x9520
+#define PCI_DEVICE_ID_TRIDENT_9525     0x9525
+#define PCI_DEVICE_ID_TRIDENT_9420     0x9420
+#define PCI_DEVICE_ID_TRIDENT_9440     0x9440
+#define PCI_DEVICE_ID_TRIDENT_9660     0x9660
+#define PCI_DEVICE_ID_TRIDENT_9750     0x9750
+#define PCI_DEVICE_ID_TRIDENT_9850     0x9850
+#define PCI_DEVICE_ID_TRIDENT_9880     0x9880
+#define PCI_DEVICE_ID_TRIDENT_8400     0x8400
+#define PCI_DEVICE_ID_TRIDENT_8420     0x8420
+#define PCI_DEVICE_ID_TRIDENT_8500     0x8500
+
+#define PCI_VENDOR_ID_AI               0x1025
+#define PCI_DEVICE_ID_AI_M1435         0x1435
+
+#define PCI_VENDOR_ID_DELL             0x1028
+#define PCI_DEVICE_ID_DELL_RACIII      0x0008
+#define PCI_DEVICE_ID_DELL_RAC4                0x0012
+
+#define PCI_VENDOR_ID_MATROX           0x102B
+#define PCI_DEVICE_ID_MATROX_MGA_2     0x0518
+#define PCI_DEVICE_ID_MATROX_MIL       0x0519
+#define PCI_DEVICE_ID_MATROX_MYS       0x051A
+#define PCI_DEVICE_ID_MATROX_MIL_2     0x051b
+#define PCI_DEVICE_ID_MATROX_MIL_2_AGP 0x051f
+#define PCI_DEVICE_ID_MATROX_MGA_IMP   0x0d10
+#define PCI_DEVICE_ID_MATROX_G100_MM   0x1000
+#define PCI_DEVICE_ID_MATROX_G100_AGP  0x1001
+#define PCI_DEVICE_ID_MATROX_G200_PCI  0x0520
+#define PCI_DEVICE_ID_MATROX_G200_AGP  0x0521
+#define        PCI_DEVICE_ID_MATROX_G400       0x0525
+#define PCI_DEVICE_ID_MATROX_G550      0x2527
+#define PCI_DEVICE_ID_MATROX_VIA       0x4536
+
+#define PCI_VENDOR_ID_CT               0x102c
+#define PCI_DEVICE_ID_CT_69000         0x00c0
+#define PCI_DEVICE_ID_CT_65545         0x00d8
+#define PCI_DEVICE_ID_CT_65548         0x00dc
+#define PCI_DEVICE_ID_CT_65550         0x00e0
+#define PCI_DEVICE_ID_CT_65554         0x00e4
+#define PCI_DEVICE_ID_CT_65555         0x00e5
+
+#define PCI_VENDOR_ID_MIRO             0x1031
+#define PCI_DEVICE_ID_MIRO_36050       0x5601
+#define PCI_DEVICE_ID_MIRO_DC10PLUS    0x7efe
+#define PCI_DEVICE_ID_MIRO_DC30PLUS    0xd801
+
+#define PCI_VENDOR_ID_NEC              0x1033
+#define PCI_DEVICE_ID_NEC_CBUS_1       0x0001 /* PCI-Cbus Bridge */
+#define PCI_DEVICE_ID_NEC_LOCAL                0x0002 /* Local Bridge */
+#define PCI_DEVICE_ID_NEC_ATM          0x0003 /* ATM LAN Controller */
+#define PCI_DEVICE_ID_NEC_R4000                0x0004 /* R4000 Bridge */
+#define PCI_DEVICE_ID_NEC_486          0x0005 /* 486 Like Peripheral Bus Bridge */
+#define PCI_DEVICE_ID_NEC_ACCEL_1      0x0006 /* Graphic Accelerator */
+#define PCI_DEVICE_ID_NEC_UXBUS                0x0007 /* UX-Bus Bridge */
+#define PCI_DEVICE_ID_NEC_ACCEL_2      0x0008 /* Graphic Accelerator */
+#define PCI_DEVICE_ID_NEC_GRAPH                0x0009 /* PCI-CoreGraph Bridge */
+#define PCI_DEVICE_ID_NEC_VL           0x0016 /* PCI-VL Bridge */
+#define PCI_DEVICE_ID_NEC_STARALPHA2   0x002c /* STAR ALPHA2 */
+#define PCI_DEVICE_ID_NEC_CBUS_2       0x002d /* PCI-Cbus Bridge */
+#define PCI_DEVICE_ID_NEC_USB          0x0035 /* PCI-USB Host */
+#define PCI_DEVICE_ID_NEC_CBUS_3       0x003b
+#define PCI_DEVICE_ID_NEC_NAPCCARD     0x003e
+#define PCI_DEVICE_ID_NEC_PCX2         0x0046 /* PowerVR */
+#define PCI_DEVICE_ID_NEC_NILE4                0x005a
+#define PCI_DEVICE_ID_NEC_VRC5476       0x009b
+#define PCI_DEVICE_ID_NEC_VRC4173      0x00a5
+#define PCI_DEVICE_ID_NEC_VRC5477_AC97  0x00a6
+#define PCI_DEVICE_ID_NEC_PC9821CS01    0x800c /* PC-9821-CS01 */
+#define PCI_DEVICE_ID_NEC_PC9821NRB06   0x800d /* PC-9821NR-B06 */
+
+#define PCI_VENDOR_ID_FD               0x1036
+#define PCI_DEVICE_ID_FD_36C70         0x0000
+
+#define PCI_VENDOR_ID_SI               0x1039
+#define PCI_DEVICE_ID_SI_5591_AGP      0x0001
+#define PCI_DEVICE_ID_SI_6202          0x0002
+#define PCI_DEVICE_ID_SI_503           0x0008
+#define PCI_DEVICE_ID_SI_ACPI          0x0009
+#define PCI_DEVICE_ID_SI_SMBUS         0x0016
+#define PCI_DEVICE_ID_SI_LPC           0x0018
+#define PCI_DEVICE_ID_SI_5597_VGA      0x0200
+#define PCI_DEVICE_ID_SI_6205          0x0205
+#define PCI_DEVICE_ID_SI_501           0x0406
+#define PCI_DEVICE_ID_SI_496           0x0496
+#define PCI_DEVICE_ID_SI_300           0x0300
+#define PCI_DEVICE_ID_SI_315H          0x0310
+#define PCI_DEVICE_ID_SI_315           0x0315
+#define PCI_DEVICE_ID_SI_315PRO                0x0325
+#define PCI_DEVICE_ID_SI_530           0x0530
+#define PCI_DEVICE_ID_SI_540           0x0540
+#define PCI_DEVICE_ID_SI_550           0x0550
+#define PCI_DEVICE_ID_SI_540_VGA       0x5300
+#define PCI_DEVICE_ID_SI_550_VGA       0x5315
+#define PCI_DEVICE_ID_SI_601           0x0601
+#define PCI_DEVICE_ID_SI_620           0x0620
+#define PCI_DEVICE_ID_SI_630           0x0630
+#define PCI_DEVICE_ID_SI_633           0x0633
+#define PCI_DEVICE_ID_SI_635           0x0635
+#define PCI_DEVICE_ID_SI_640           0x0640
+#define PCI_DEVICE_ID_SI_645           0x0645
+#define PCI_DEVICE_ID_SI_646           0x0646
+#define PCI_DEVICE_ID_SI_648           0x0648
+#define PCI_DEVICE_ID_SI_650           0x0650
+#define PCI_DEVICE_ID_SI_651           0x0651
+#define PCI_DEVICE_ID_SI_652           0x0652
+#define PCI_DEVICE_ID_SI_655           0x0655
+#define PCI_DEVICE_ID_SI_661           0x0661
+#define PCI_DEVICE_ID_SI_730           0x0730
+#define PCI_DEVICE_ID_SI_733           0x0733
+#define PCI_DEVICE_ID_SI_630_VGA       0x6300
+#define PCI_DEVICE_ID_SI_730_VGA       0x7300
+#define PCI_DEVICE_ID_SI_735           0x0735
+#define PCI_DEVICE_ID_SI_740           0x0740
+#define PCI_DEVICE_ID_SI_741           0x0741
+#define PCI_DEVICE_ID_SI_745           0x0745
+#define PCI_DEVICE_ID_SI_746           0x0746
+#define PCI_DEVICE_ID_SI_748           0x0748
+#define PCI_DEVICE_ID_SI_750           0x0750
+#define PCI_DEVICE_ID_SI_751           0x0751
+#define PCI_DEVICE_ID_SI_752           0x0752
+#define PCI_DEVICE_ID_SI_755           0x0755
+#define PCI_DEVICE_ID_SI_760           0x0760
+#define PCI_DEVICE_ID_SI_900           0x0900
+#define PCI_DEVICE_ID_SI_961           0x0961
+#define PCI_DEVICE_ID_SI_962           0x0962
+#define PCI_DEVICE_ID_SI_963           0x0963
+#define PCI_DEVICE_ID_SI_5107          0x5107
+#define PCI_DEVICE_ID_SI_5300          0x5300
+#define PCI_DEVICE_ID_SI_5511          0x5511
+#define PCI_DEVICE_ID_SI_5513          0x5513
+#define PCI_DEVICE_ID_SI_5518          0x5518
+#define PCI_DEVICE_ID_SI_5571          0x5571
+#define PCI_DEVICE_ID_SI_5581          0x5581
+#define PCI_DEVICE_ID_SI_5582          0x5582
+#define PCI_DEVICE_ID_SI_5591          0x5591
+#define PCI_DEVICE_ID_SI_5596          0x5596
+#define PCI_DEVICE_ID_SI_5597          0x5597
+#define PCI_DEVICE_ID_SI_5598          0x5598
+#define PCI_DEVICE_ID_SI_5600          0x5600
+#define PCI_DEVICE_ID_SI_6300          0x6300
+#define PCI_DEVICE_ID_SI_6306          0x6306
+#define PCI_DEVICE_ID_SI_6326          0x6326
+#define PCI_DEVICE_ID_SI_7001          0x7001
+#define PCI_DEVICE_ID_SI_7012          0x7012
+#define PCI_DEVICE_ID_SI_7016          0x7016
+
+#define PCI_VENDOR_ID_HP               0x103c
+#define PCI_DEVICE_ID_HP_VISUALIZE_EG  0x1005
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX6 0x1006
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX4 0x1008
+#define PCI_DEVICE_ID_HP_VISUALIZE_FX2 0x100a
+#define PCI_DEVICE_ID_HP_TACHYON       0x1028
+#define PCI_DEVICE_ID_HP_TACHLITE      0x1029
+#define PCI_DEVICE_ID_HP_J2585A                0x1030
+#define PCI_DEVICE_ID_HP_J2585B                0x1031
+#define PCI_DEVICE_ID_HP_J2973A                0x1040
+#define PCI_DEVICE_ID_HP_J2970A                0x1042
+#define PCI_DEVICE_ID_HP_DIVA          0x1048
+#define PCI_DEVICE_ID_HP_DIVA_TOSCA1   0x1049
+#define PCI_DEVICE_ID_HP_DIVA_TOSCA2   0x104A
+#define PCI_DEVICE_ID_HP_DIVA_MAESTRO  0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA       0x1054
+#define PCI_DEVICE_ID_HP_REO_SBA       0x10f0
+#define PCI_DEVICE_ID_HP_REO_IOC       0x10f1
+#define PCI_DEVICE_ID_HP_VISUALIZE_FXE 0x108b
+#define PCI_DEVICE_ID_HP_DIVA_HALFDOME 0x1223
+#define PCI_DEVICE_ID_HP_DIVA_KEYSTONE 0x1226
+#define PCI_DEVICE_ID_HP_DIVA_POWERBAR 0x1227
+#define PCI_DEVICE_ID_HP_ZX1_SBA       0x1229
+#define PCI_DEVICE_ID_HP_ZX1_IOC       0x122a
+#define PCI_DEVICE_ID_HP_PCIX_LBA      0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC    0x127c
+#define PCI_DEVICE_ID_HP_DIVA_EVEREST  0x1282
+#define PCI_DEVICE_ID_HP_DIVA_AUX      0x1290
+#define PCI_DEVICE_ID_HP_DIVA_RMP3     0x1301
+#define PCI_DEVICE_ID_HP_CISSA         0x3220
+#define PCI_DEVICE_ID_HP_CISSB         0x3230
+#define PCI_DEVICE_ID_HP_ZX2_IOC       0x4031
+
+#define PCI_VENDOR_ID_PCTECH           0x1042
+#define PCI_DEVICE_ID_PCTECH_RZ1000    0x1000
+#define PCI_DEVICE_ID_PCTECH_RZ1001    0x1001
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_0 0x3000
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_1 0x3010
+#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
+
+#define PCI_VENDOR_ID_ASUSTEK          0x1043
+#define PCI_DEVICE_ID_ASUSTEK_0675     0x0675
+
+#define PCI_VENDOR_ID_DPT              0x1044
+#define PCI_DEVICE_ID_DPT              0xa400
+
+#define PCI_VENDOR_ID_OPTI             0x1045
+#define PCI_DEVICE_ID_OPTI_92C178      0xc178
+#define PCI_DEVICE_ID_OPTI_82C557      0xc557
+#define PCI_DEVICE_ID_OPTI_82C558      0xc558
+#define PCI_DEVICE_ID_OPTI_82C621      0xc621
+#define PCI_DEVICE_ID_OPTI_82C700      0xc700
+#define PCI_DEVICE_ID_OPTI_82C701      0xc701
+#define PCI_DEVICE_ID_OPTI_82C814      0xc814
+#define PCI_DEVICE_ID_OPTI_82C822      0xc822
+#define PCI_DEVICE_ID_OPTI_82C861      0xc861
+#define PCI_DEVICE_ID_OPTI_82C825      0xd568
+
+#define PCI_VENDOR_ID_ELSA             0x1048
+#define PCI_DEVICE_ID_ELSA_MICROLINK   0x1000
+#define PCI_DEVICE_ID_ELSA_QS3000      0x3000
+
+#define PCI_VENDOR_ID_SGS              0x104a
+#define PCI_DEVICE_ID_SGS_2000         0x0008
+#define PCI_DEVICE_ID_SGS_1764         0x0009
+
+#define PCI_VENDOR_ID_BUSLOGIC               0x104B
+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
+#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT     0x8130
+
+#define PCI_VENDOR_ID_TI               0x104c
+#define PCI_DEVICE_ID_TI_TVP4010       0x3d04
+#define PCI_DEVICE_ID_TI_TVP4020       0x3d07
+#define PCI_DEVICE_ID_TI_4450          0x8011
+#define PCI_DEVICE_ID_TI_1130          0xac12
+#define PCI_DEVICE_ID_TI_1031          0xac13
+#define PCI_DEVICE_ID_TI_1131          0xac15
+#define PCI_DEVICE_ID_TI_1250          0xac16
+#define PCI_DEVICE_ID_TI_1220          0xac17
+#define PCI_DEVICE_ID_TI_1221          0xac19
+#define PCI_DEVICE_ID_TI_1210          0xac1a
+#define PCI_DEVICE_ID_TI_1450          0xac1b
+#define PCI_DEVICE_ID_TI_1225          0xac1c
+#define PCI_DEVICE_ID_TI_1251A         0xac1d
+#define PCI_DEVICE_ID_TI_1211          0xac1e
+#define PCI_DEVICE_ID_TI_1251B         0xac1f
+#define PCI_DEVICE_ID_TI_4410          0xac41
+#define PCI_DEVICE_ID_TI_4451          0xac42
+#define PCI_DEVICE_ID_TI_4510          0xac44
+#define PCI_DEVICE_ID_TI_4520          0xac46
+#define PCI_DEVICE_ID_TI_1410          0xac50
+#define PCI_DEVICE_ID_TI_1420          0xac51
+#define PCI_DEVICE_ID_TI_1451A         0xac52
+#define PCI_DEVICE_ID_TI_1620          0xac54
+#define PCI_DEVICE_ID_TI_1520          0xac55
+#define PCI_DEVICE_ID_TI_1510          0xac56
+
+#define PCI_VENDOR_ID_SONY             0x104d
+#define PCI_DEVICE_ID_SONY_CXD3222     0x8039
+
+#define PCI_VENDOR_ID_OAK              0x104e
+#define PCI_DEVICE_ID_OAK_OTI107       0x0107
+
+/* Winbond have two vendor IDs! See 0x10ad as well */
+#define PCI_VENDOR_ID_WINBOND2         0x1050
+#define PCI_DEVICE_ID_WINBOND2_89C940  0x0940
+#define PCI_DEVICE_ID_WINBOND2_89C940F 0x5a5a
+#define PCI_DEVICE_ID_WINBOND2_6692    0x6692
+
+#define PCI_VENDOR_ID_ANIGMA           0x1051
+#define PCI_DEVICE_ID_ANIGMA_MC145575  0x0100
+  
+#define PCI_VENDOR_ID_EFAR             0x1055
+#define PCI_DEVICE_ID_EFAR_SLC90E66_1  0x9130
+#define PCI_DEVICE_ID_EFAR_SLC90E66_0  0x9460
+#define PCI_DEVICE_ID_EFAR_SLC90E66_2  0x9462
+#define PCI_DEVICE_ID_EFAR_SLC90E66_3  0x9463
+
+#define PCI_VENDOR_ID_MOTOROLA         0x1057
+#define PCI_VENDOR_ID_MOTOROLA_OOPS    0x1507
+#define PCI_DEVICE_ID_MOTOROLA_MPC105  0x0001
+#define PCI_DEVICE_ID_MOTOROLA_MPC106  0x0002
+#define PCI_DEVICE_ID_MOTOROLA_MPC107  0x0004
+#define PCI_DEVICE_ID_MOTOROLA_RAVEN   0x4801
+#define PCI_DEVICE_ID_MOTOROLA_FALCON  0x4802
+#define PCI_DEVICE_ID_MOTOROLA_HAWK    0x4803
+#define PCI_DEVICE_ID_MOTOROLA_CPX8216 0x4806
+#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b
+#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803
+
+#define PCI_VENDOR_ID_PROMISE          0x105a
+#define PCI_DEVICE_ID_PROMISE_20265    0x0d30
+#define PCI_DEVICE_ID_PROMISE_20267    0x4d30
+#define PCI_DEVICE_ID_PROMISE_20246    0x4d33
+#define PCI_DEVICE_ID_PROMISE_20262    0x4d38
+#define PCI_DEVICE_ID_PROMISE_20263    0x0D38
+#define PCI_DEVICE_ID_PROMISE_20268    0x4d68
+#define PCI_DEVICE_ID_PROMISE_20268R   0x6268
+#define PCI_DEVICE_ID_PROMISE_20269    0x4d69
+#define PCI_DEVICE_ID_PROMISE_20270    0x6268
+#define PCI_DEVICE_ID_PROMISE_20271    0x6269
+#define PCI_DEVICE_ID_PROMISE_20275    0x1275
+#define PCI_DEVICE_ID_PROMISE_20276    0x5275
+#define PCI_DEVICE_ID_PROMISE_20277    0x7275
+#define PCI_DEVICE_ID_PROMISE_5300     0x5300
+
+#define PCI_VENDOR_ID_N9               0x105d
+#define PCI_DEVICE_ID_N9_I128          0x2309
+#define PCI_DEVICE_ID_N9_I128_2                0x2339
+#define PCI_DEVICE_ID_N9_I128_T2R      0x493d
+
+#define PCI_VENDOR_ID_UMC              0x1060
+#define PCI_DEVICE_ID_UMC_UM8673F      0x0101
+#define PCI_DEVICE_ID_UMC_UM8891A      0x0891
+#define PCI_DEVICE_ID_UMC_UM8886BF     0x673a
+#define PCI_DEVICE_ID_UMC_UM8886A      0x886a
+#define PCI_DEVICE_ID_UMC_UM8881F      0x8881
+#define PCI_DEVICE_ID_UMC_UM8886F      0x8886
+#define PCI_DEVICE_ID_UMC_UM9017F      0x9017
+#define PCI_DEVICE_ID_UMC_UM8886N      0xe886
+#define PCI_DEVICE_ID_UMC_UM8891N      0xe891
+
+#define PCI_VENDOR_ID_X                        0x1061
+#define PCI_DEVICE_ID_X_AGX016         0x0001
+
+#define PCI_VENDOR_ID_MYLEX            0x1069
+#define PCI_DEVICE_ID_MYLEX_DAC960_P   0x0001
+#define PCI_DEVICE_ID_MYLEX_DAC960_PD  0x0002
+#define PCI_DEVICE_ID_MYLEX_DAC960_PG  0x0010
+#define PCI_DEVICE_ID_MYLEX_DAC960_LA  0x0020
+#define PCI_DEVICE_ID_MYLEX_DAC960_LP  0x0050
+#define PCI_DEVICE_ID_MYLEX_DAC960_BA  0xBA56
+#define PCI_DEVICE_ID_MYLEX_DAC960_GEM 0xB166
+
+#define PCI_VENDOR_ID_PICOP            0x1066
+#define PCI_DEVICE_ID_PICOP_PT86C52X   0x0001
+#define PCI_DEVICE_ID_PICOP_PT80C524   0x8002
+
+#define PCI_VENDOR_ID_APPLE            0x106b
+#define PCI_DEVICE_ID_APPLE_BANDIT     0x0001
+#define PCI_DEVICE_ID_APPLE_GC         0x0002
+#define PCI_DEVICE_ID_APPLE_HYDRA      0x000e
+#define PCI_DEVICE_ID_APPLE_UNI_N_FW   0x0018
+#define PCI_DEVICE_ID_APPLE_KL_USB     0x0019
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP  0x0020
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021
+#define PCI_DEVICE_ID_APPLE_KEYLARGO   0x0022
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMACP        0x0024
+#define PCI_DEVICE_ID_APPLE_KEYLARGO_P 0x0025
+#define PCI_DEVICE_ID_APPLE_KL_USB_P   0x0026
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P        0x0027
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15        0x002d
+#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15        0x002e
+#define PCI_DEVICE_ID_APPLE_UNI_N_FW2  0x0030
+#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2        0x0032
+#define PCI_DEVIEC_ID_APPLE_UNI_N_ATA  0x0033
+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP2 0x0034
+#define PCI_DEVICE_ID_APPLE_IPID_ATA100        0x003b
+#define PCI_DEVICE_ID_APPLE_KEYLARGO_I 0x003e
+#define PCI_DEVICE_ID_APPLE_K2_ATA100  0x0043
+#define PCI_DEVICE_ID_APPLE_U3_AGP     0x004b
+#define PCI_DEVICE_ID_APPLE_K2_GMAC    0x004c
+#define PCI_DEVICE_ID_APPLE_SH_ATA      0x0050
+#define PCI_DEVICE_ID_APPLE_SH_SUNGEM   0x0051
+#define PCI_DEVICE_ID_APPLE_SH_FW       0x0052
+#define PCI_DEVICE_ID_APPLE_U3L_AGP    0x0058
+#define PCI_DEVICE_ID_APPLE_U3H_AGP    0x0059
+#define PCI_DEVICE_ID_APPLE_TIGON3     0x1645
+
+#define PCI_VENDOR_ID_YAMAHA           0x1073
+#define PCI_DEVICE_ID_YAMAHA_724       0x0004
+#define PCI_DEVICE_ID_YAMAHA_724F      0x000d
+#define PCI_DEVICE_ID_YAMAHA_740       0x000a
+#define PCI_DEVICE_ID_YAMAHA_740C      0x000c
+#define PCI_DEVICE_ID_YAMAHA_744       0x0010
+#define PCI_DEVICE_ID_YAMAHA_754       0x0012
+
+#define PCI_VENDOR_ID_NEXGEN           0x1074
+#define PCI_DEVICE_ID_NEXGEN_82C501    0x4e78
+
+#define PCI_VENDOR_ID_QLOGIC           0x1077
+#define PCI_DEVICE_ID_QLOGIC_ISP1020   0x1020
+#define PCI_DEVICE_ID_QLOGIC_ISP1022   0x1022
+#define PCI_DEVICE_ID_QLOGIC_ISP2100   0x2100
+#define PCI_DEVICE_ID_QLOGIC_ISP2200   0x2200
+
+#define PCI_VENDOR_ID_CYRIX            0x1078
+#define PCI_DEVICE_ID_CYRIX_5510       0x0000
+#define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001
+#define PCI_DEVICE_ID_CYRIX_5520       0x0002
+#define PCI_DEVICE_ID_CYRIX_5530_LEGACY        0x0100
+#define PCI_DEVICE_ID_CYRIX_5530_SMI   0x0101
+#define PCI_DEVICE_ID_CYRIX_5530_IDE   0x0102
+#define PCI_DEVICE_ID_CYRIX_5530_AUDIO 0x0103
+#define PCI_DEVICE_ID_CYRIX_5530_VIDEO 0x0104
+
+#define PCI_VENDOR_ID_LEADTEK          0x107d
+#define PCI_DEVICE_ID_LEADTEK_805      0x0000
+
+#define PCI_VENDOR_ID_INTERPHASE       0x107e
+#define PCI_DEVICE_ID_INTERPHASE_5526  0x0004
+#define PCI_DEVICE_ID_INTERPHASE_55x6  0x0005
+#define PCI_DEVICE_ID_INTERPHASE_5575  0x0008
+
+#define PCI_VENDOR_ID_CONTAQ           0x1080
+#define PCI_DEVICE_ID_CONTAQ_82C599    0x0600
+#define PCI_DEVICE_ID_CONTAQ_82C693    0xc693
+
+#define PCI_VENDOR_ID_FOREX            0x1083
+
+#define PCI_VENDOR_ID_OLICOM           0x108d
+#define PCI_DEVICE_ID_OLICOM_OC3136    0x0001
+#define PCI_DEVICE_ID_OLICOM_OC2315    0x0011
+#define PCI_DEVICE_ID_OLICOM_OC2325    0x0012
+#define PCI_DEVICE_ID_OLICOM_OC2183    0x0013
+#define PCI_DEVICE_ID_OLICOM_OC2326    0x0014
+#define PCI_DEVICE_ID_OLICOM_OC6151    0x0021
+
+#define PCI_VENDOR_ID_SUN              0x108e
+#define PCI_DEVICE_ID_SUN_EBUS         0x1000
+#define PCI_DEVICE_ID_SUN_HAPPYMEAL    0x1001
+#define PCI_DEVICE_ID_SUN_RIO_EBUS     0x1100
+#define PCI_DEVICE_ID_SUN_RIO_GEM      0x1101
+#define PCI_DEVICE_ID_SUN_RIO_1394     0x1102
+#define PCI_DEVICE_ID_SUN_RIO_USB      0x1103
+#define PCI_DEVICE_ID_SUN_GEM          0x2bad
+#define PCI_DEVICE_ID_SUN_SIMBA                0x5000
+#define PCI_DEVICE_ID_SUN_PBM          0x8000
+#define PCI_DEVICE_ID_SUN_SCHIZO       0x8001
+#define PCI_DEVICE_ID_SUN_SABRE                0xa000
+#define PCI_DEVICE_ID_SUN_HUMMINGBIRD  0xa001
+#define PCI_DEVICE_ID_SUN_TOMATILLO    0xa801
+
+#define PCI_VENDOR_ID_CMD              0x1095
+#define PCI_DEVICE_ID_CMD_640          0x0640
+#define PCI_DEVICE_ID_CMD_643          0x0643
+#define PCI_DEVICE_ID_CMD_646          0x0646
+#define PCI_DEVICE_ID_CMD_647          0x0647
+#define PCI_DEVICE_ID_CMD_648          0x0648
+#define PCI_DEVICE_ID_CMD_649          0x0649
+#define PCI_DEVICE_ID_CMD_670          0x0670
+#define PCI_DEVICE_ID_CMD_680          0x0680
+
+#define PCI_DEVICE_ID_SII_680          0x0680
+#define PCI_DEVICE_ID_SII_3112         0x3112
+#define PCI_DEVICE_ID_SII_1210SA       0x0240
+
+#define PCI_VENDOR_ID_VISION           0x1098
+#define PCI_DEVICE_ID_VISION_QD8500    0x0001
+#define PCI_DEVICE_ID_VISION_QD8580    0x0002
+
+#define PCI_VENDOR_ID_BROOKTREE                0x109e
+#define PCI_DEVICE_ID_BROOKTREE_848    0x0350
+#define PCI_DEVICE_ID_BROOKTREE_849A   0x0351
+#define PCI_DEVICE_ID_BROOKTREE_878_1  0x036e
+#define PCI_DEVICE_ID_BROOKTREE_878    0x0878
+#define PCI_DEVICE_ID_BROOKTREE_8474   0x8474
+
+#define PCI_VENDOR_ID_SIERRA           0x10a8
+#define PCI_DEVICE_ID_SIERRA_STB       0x0000
+
+#define PCI_VENDOR_ID_SGI              0x10a9
+#define PCI_DEVICE_ID_SGI_IOC3         0x0003
+#define PCI_DEVICE_ID_SGI_IOC4         0x100a
+#define PCI_VENDOR_ID_SGI_LITHIUM      0x1002
+
+#define PCI_VENDOR_ID_ACC              0x10aa
+#define PCI_DEVICE_ID_ACC_2056         0x0000
+
+#define PCI_VENDOR_ID_WINBOND          0x10ad
+#define PCI_DEVICE_ID_WINBOND_83769    0x0001
+#define PCI_DEVICE_ID_WINBOND_82C105   0x0105
+#define PCI_DEVICE_ID_WINBOND_83C553   0x0565
+
+#define PCI_VENDOR_ID_DATABOOK         0x10b3
+#define PCI_DEVICE_ID_DATABOOK_87144   0xb106
+
+#define PCI_VENDOR_ID_PLX              0x10b5
+#define PCI_DEVICE_ID_PLX_R685         0x1030
+#define PCI_DEVICE_ID_PLX_ROMULUS      0x106a
+#define PCI_DEVICE_ID_PLX_SPCOM800     0x1076
+#define PCI_DEVICE_ID_PLX_1077         0x1077
+#define PCI_DEVICE_ID_PLX_SPCOM200     0x1103
+#define PCI_DEVICE_ID_PLX_DJINN_ITOO   0x1151
+#define PCI_DEVICE_ID_PLX_R753         0x1152
+#define PCI_DEVICE_ID_PLX_9030         0x9030
+#define PCI_DEVICE_ID_PLX_9050         0x9050
+#define PCI_DEVICE_ID_PLX_9060         0x9060
+#define PCI_DEVICE_ID_PLX_9060ES       0x906E
+#define PCI_DEVICE_ID_PLX_9060SD       0x906D
+#define PCI_DEVICE_ID_PLX_9080         0x9080
+#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001
+
+#define PCI_VENDOR_ID_MADGE            0x10b6
+#define PCI_DEVICE_ID_MADGE_MK2                0x0002
+#define PCI_DEVICE_ID_MADGE_C155S      0x1001
+
+#define PCI_VENDOR_ID_3COM             0x10b7
+#define PCI_DEVICE_ID_3COM_3C985       0x0001
+#define PCI_DEVICE_ID_3COM_3C940       0x1700
+#define PCI_DEVICE_ID_3COM_3C339       0x3390
+#define PCI_DEVICE_ID_3COM_3C359       0x3590
+#define PCI_DEVICE_ID_3COM_3C590       0x5900
+#define PCI_DEVICE_ID_3COM_3C595TX     0x5950
+#define PCI_DEVICE_ID_3COM_3C595T4     0x5951
+#define PCI_DEVICE_ID_3COM_3C595MII    0x5952
+#define PCI_DEVICE_ID_3COM_3C940B      0x80eb
+#define PCI_DEVICE_ID_3COM_3C900TPO    0x9000
+#define PCI_DEVICE_ID_3COM_3C900COMBO  0x9001
+#define PCI_DEVICE_ID_3COM_3C905TX     0x9050
+#define PCI_DEVICE_ID_3COM_3C905T4     0x9051
+#define PCI_DEVICE_ID_3COM_3C905B_TX   0x9055
+#define PCI_DEVICE_ID_3COM_3CR990      0x9900
+#define PCI_DEVICE_ID_3COM_3CR990_TX_95        0x9902
+#define PCI_DEVICE_ID_3COM_3CR990_TX_97        0x9903
+#define PCI_DEVICE_ID_3COM_3CR990B     0x9904
+#define PCI_DEVICE_ID_3COM_3CR990_FX   0x9905
+#define PCI_DEVICE_ID_3COM_3CR990SVR95 0x9908
+#define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909
+#define PCI_DEVICE_ID_3COM_3CR990SVR   0x990a
+
+#define PCI_VENDOR_ID_SMC              0x10b8
+#define PCI_DEVICE_ID_SMC_EPIC100      0x0005
+
+#define PCI_VENDOR_ID_AL               0x10b9
+#define PCI_DEVICE_ID_AL_M1445         0x1445
+#define PCI_DEVICE_ID_AL_M1449         0x1449
+#define PCI_DEVICE_ID_AL_M1451         0x1451
+#define PCI_DEVICE_ID_AL_M1461         0x1461
+#define PCI_DEVICE_ID_AL_M1489         0x1489
+#define PCI_DEVICE_ID_AL_M1511         0x1511
+#define PCI_DEVICE_ID_AL_M1513         0x1513
+#define PCI_DEVICE_ID_AL_M1521         0x1521
+#define PCI_DEVICE_ID_AL_M1523         0x1523
+#define PCI_DEVICE_ID_AL_M1531         0x1531
+#define PCI_DEVICE_ID_AL_M1533         0x1533
+#define PCI_DEVICE_ID_AL_M1535                 0x1535
+#define PCI_DEVICE_ID_AL_M1541         0x1541
+#define PCI_DEVICE_ID_AL_M1543         0x1543
+#define PCI_DEVICE_ID_AL_M1563         0x1563
+#define PCI_DEVICE_ID_AL_M1621         0x1621
+#define PCI_DEVICE_ID_AL_M1631         0x1631
+#define PCI_DEVICE_ID_AL_M1632         0x1632
+#define PCI_DEVICE_ID_AL_M1641         0x1641
+#define PCI_DEVICE_ID_AL_M1644         0x1644
+#define PCI_DEVICE_ID_AL_M1647         0x1647
+#define PCI_DEVICE_ID_AL_M1651         0x1651
+#define PCI_DEVICE_ID_AL_M1671         0x1671
+#define PCI_DEVICE_ID_AL_M1681         0x1681
+#define PCI_DEVICE_ID_AL_M1683         0x1683
+#define PCI_DEVICE_ID_AL_M1689         0x1689
+#define PCI_DEVICE_ID_AL_M3307         0x3307
+#define PCI_DEVICE_ID_AL_M4803         0x5215
+#define PCI_DEVICE_ID_AL_M5219         0x5219
+#define PCI_DEVICE_ID_AL_M5228         0x5228
+#define PCI_DEVICE_ID_AL_M5229         0x5229
+#define PCI_DEVICE_ID_AL_M5237         0x5237
+#define PCI_DEVICE_ID_AL_M5243         0x5243
+#define PCI_DEVICE_ID_AL_M5451         0x5451
+#define PCI_DEVICE_ID_AL_M7101         0x7101
+
+#define PCI_VENDOR_ID_MITSUBISHI       0x10ba
+
+#define PCI_VENDOR_ID_SURECOM          0x10bd
+#define PCI_DEVICE_ID_SURECOM_NE34     0x0e34
+
+#define PCI_VENDOR_ID_NEOMAGIC         0x10c8
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128V 0x0002
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICMEDIA_256AV       0x0005
+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS   0x0083
+
+#define PCI_VENDOR_ID_ASP              0x10cd
+#define PCI_DEVICE_ID_ASP_ABP940       0x1200
+#define PCI_DEVICE_ID_ASP_ABP940U      0x1300
+#define PCI_DEVICE_ID_ASP_ABP940UW     0x2300
+
+#define PCI_VENDOR_ID_MACRONIX         0x10d9
+#define PCI_DEVICE_ID_MACRONIX_MX98713 0x0512
+#define PCI_DEVICE_ID_MACRONIX_MX987x5 0x0531
+
+#define PCI_VENDOR_ID_TCONRAD          0x10da
+#define PCI_DEVICE_ID_TCONRAD_TOKENRING        0x0508
+
+#define PCI_VENDOR_ID_CERN             0x10dc
+#define PCI_DEVICE_ID_CERN_SPSB_PMC    0x0001
+#define PCI_DEVICE_ID_CERN_SPSB_PCI    0x0002
+#define PCI_DEVICE_ID_CERN_HIPPI_DST   0x0021
+#define PCI_DEVICE_ID_CERN_HIPPI_SRC   0x0022
+
+#define PCI_VENDOR_ID_NVIDIA                   0x10de
+#define PCI_DEVICE_ID_NVIDIA_TNT               0x0020
+#define PCI_DEVICE_ID_NVIDIA_TNT2              0x0028
+#define PCI_DEVICE_ID_NVIDIA_UTNT2             0x0029
+#define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN        0x002a
+#define PCI_DEVICE_ID_NVIDIA_VTNT2             0x002C
+#define PCI_DEVICE_ID_NVIDIA_UVTNT2            0x002D
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE  0x0035
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA 0x0036
+#define PCI_DEVICE_ID_NVIDIA_NVENET_10         0x0037
+#define PCI_DEVICE_ID_NVIDIA_NVENET_11         0x0038
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2        0x003e
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA 0x0040
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800       0x0041
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE    0x0042
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT    0x0045
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000     0x004E
+#define PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS     0x0052
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE  0x0053
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA 0x0054
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2        0x0055
+#define PCI_DEVICE_ID_NVIDIA_NVENET_8          0x0056
+#define PCI_DEVICE_ID_NVIDIA_NVENET_9          0x0057
+#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO       0x0059
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS     0x0064
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE       0x0065
+#define PCI_DEVICE_ID_NVIDIA_NVENET_2          0x0066
+#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO                0x006a
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS    0x0084
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE      0x0085
+#define PCI_DEVICE_ID_NVIDIA_NVENET_4          0x0086
+#define PCI_DEVICE_ID_NVIDIA_NVENET_5          0x008c
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA     0x008e
+#define PCI_DEVICE_ID_NVIDIA_ITNT2             0x00A0
+#define PCI_DEVICE_ID_GEFORCE_6800A             0x00c1
+#define PCI_DEVICE_ID_GEFORCE_6800A_LE          0x00c2
+#define PCI_DEVICE_ID_GEFORCE_GO_6800           0x00c8
+#define PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA     0x00c9
+#define PCI_DEVICE_ID_QUADRO_FX_GO1400          0x00cc
+#define PCI_DEVICE_ID_QUADRO_FX_1400            0x00ce
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3           0x00d1
+#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO                0x00da
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS     0x00d4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE       0x00d5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_3          0x00d6
+#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO                0x00da
+#define PCI_DEVICE_ID_NVIDIA_NVENET_7          0x00df
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S          0x00e1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA     0x00e3
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS    0x00e4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE      0x00e5
+#define PCI_DEVICE_ID_NVIDIA_NVENET_6          0x00e6
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2    0x00ee
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR       0x0100
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR       0x0101
+#define PCI_DEVICE_ID_NVIDIA_QUADRO            0x0103
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX       0x0110
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2      0x0111
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO       0x0112
+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR       0x0113
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT   0x0140
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6600      0x0141
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL   0x0145
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540     0x014E
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200      0x014F
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS      0x0150
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2     0x0151
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA    0x0152
+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO       0x0153
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE 0x0161
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200    0x0164
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250    0x0166
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1  0x0167
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1  0x0168
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460   0x0170
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440   0x0171
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420   0x0172
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE        0x0173
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO   0x0174
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO   0x0175
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32 0x0176
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO    0x0177
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL    0x0178
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64 0x0179
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_200       0x017A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL    0x017B
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL  0x017C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16 0x017D
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X 0x0182
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO    0x0186
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO    0x0187
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL    0x0188
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC    0x0189
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS    0x018A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL    0x018B
+#define PCI_DEVICE_ID_NVIDIA_IGEFORCE2         0x01a0
+#define PCI_DEVICE_ID_NVIDIA_NFORCE            0x01a4
+#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO                0x01b1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_SMBUS      0x01b4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE                0x01bc
+#define PCI_DEVICE_ID_NVIDIA_NVENET_1          0x01c3
+#define PCI_DEVICE_ID_NVIDIA_NFORCE2           0x01e0
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3          0x0200
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1                0x0201
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2                0x0202
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC                0x0203
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B      0x0211
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE   0x0212
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT   0x0215
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600  0x0250
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400  0x0251
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200  0x0253
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL    0x0258
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL    0x0259
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL    0x025B
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE  0x0265
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA 0x0266
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2        0x0267
+#define PCI_DEVICE_ID_NVIDIA_NVENET_12         0x0268
+#define PCI_DEVICE_ID_NVIDIA_NVENET_13         0x0269
+#define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO       0x026B
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800  0x0280
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X    0x0281
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE     0x0282
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO       0x0286
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL        0x0288
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL        0x0289
+#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL       0x028C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA  0x0301
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800        0x0302
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000         0x0308
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000         0x0309
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA  0x0311
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600        0x0312
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE      0x0314
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600      0x031A
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650      0x031B
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700        0x031C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200        0x0320
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA  0x0321
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1      0x0322
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE      0x0323
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200      0x0324
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250      0x0325
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500        0x0326
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100        0x0327
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32   0x0328
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200            0x0329
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI     0x032A
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500          0x032B
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300      0x032C
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100      0x032D
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA  0x0330
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900        0x0331
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT      0x0332
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA  0x0333
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT      0x0334
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000         0x0338
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700          0x033F
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA  0x0341
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700        0x0342
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE      0x0343
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE      0x0344
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1    0x0347
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2    0x0348
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000       0x034C
+#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100         0x034E
+
+#define PCI_VENDOR_ID_IMS              0x10e0
+#define PCI_DEVICE_ID_IMS_8849         0x8849
+#define PCI_DEVICE_ID_IMS_TT128                0x9128
+#define PCI_DEVICE_ID_IMS_TT3D         0x9135
+
+#define PCI_VENDOR_ID_TEKRAM2          0x10e1
+#define PCI_DEVICE_ID_TEKRAM2_690c     0x690c
+
+#define PCI_VENDOR_ID_TUNDRA           0x10e3
+#define PCI_DEVICE_ID_TUNDRA_CA91C042  0x0000
+
+#define PCI_VENDOR_ID_AMCC             0x10e8
+#define PCI_DEVICE_ID_AMCC_MYRINET     0x8043
+#define PCI_DEVICE_ID_AMCC_PARASTATION 0x8062
+#define PCI_DEVICE_ID_AMCC_S5933       0x807d
+#define PCI_DEVICE_ID_AMCC_S5933_HEPC3 0x809c
+
+#define PCI_VENDOR_ID_INTERG           0x10ea
+#define PCI_DEVICE_ID_INTERG_1680      0x1680
+#define PCI_DEVICE_ID_INTERG_1682      0x1682
+#define PCI_DEVICE_ID_INTERG_2000      0x2000
+#define PCI_DEVICE_ID_INTERG_2010      0x2010
+#define PCI_DEVICE_ID_INTERG_5000      0x5000
+#define PCI_DEVICE_ID_INTERG_5050      0x5050
+
+#define PCI_VENDOR_ID_REALTEK          0x10ec
+#define PCI_DEVICE_ID_REALTEK_8029     0x8029
+#define PCI_DEVICE_ID_REALTEK_8129     0x8129
+#define PCI_DEVICE_ID_REALTEK_8139     0x8139
+#define PCI_DEVICE_ID_REALTEK_8169     0x8169
+
+#define PCI_VENDOR_ID_XILINX           0x10ee
+#define PCI_DEVICE_ID_TURBOPAM         0x4020
+
+#define PCI_VENDOR_ID_TRUEVISION       0x10fa
+#define PCI_DEVICE_ID_TRUEVISION_T1000 0x000c
+
+#define PCI_VENDOR_ID_INIT             0x1101
+#define PCI_DEVICE_ID_INIT_320P                0x9100
+#define PCI_DEVICE_ID_INIT_360P                0x9500
+
+#define PCI_VENDOR_ID_CREATIVE         0x1102 // duplicate: ECTIVA
+#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
+
+#define PCI_VENDOR_ID_ECTIVA           0x1102 // duplicate: CREATIVE
+#define PCI_DEVICE_ID_ECTIVA_EV1938    0x8938
+
+#define PCI_VENDOR_ID_TTI              0x1103
+#define PCI_DEVICE_ID_TTI_HPT343       0x0003
+#define PCI_DEVICE_ID_TTI_HPT366       0x0004
+#define PCI_DEVICE_ID_TTI_HPT372       0x0005
+#define PCI_DEVICE_ID_TTI_HPT302       0x0006
+#define PCI_DEVICE_ID_TTI_HPT371       0x0007
+#define PCI_DEVICE_ID_TTI_HPT374       0x0008
+#define PCI_DEVICE_ID_TTI_HPT372N      0x0009  // apparently a 372N variant?
+
+#define PCI_VENDOR_ID_VIA              0x1106
+#define PCI_DEVICE_ID_VIA_8763_0       0x0198
+#define PCI_DEVICE_ID_VIA_8380_0       0x0204
+#define PCI_DEVICE_ID_VIA_3238_0       0x0238
+#define PCI_DEVICE_ID_VIA_PT880                0x0258
+#define PCI_DEVICE_ID_VIA_PX8X0_0      0x0259
+#define PCI_DEVICE_ID_VIA_3269_0       0x0269
+#define PCI_DEVICE_ID_VIA_K8T800PRO_0  0x0282
+#define PCI_DEVICE_ID_VIA_8363_0       0x0305
+#define PCI_DEVICE_ID_VIA_8371_0       0x0391
+#define PCI_DEVICE_ID_VIA_8501_0       0x0501
+#define PCI_DEVICE_ID_VIA_82C505       0x0505
+#define PCI_DEVICE_ID_VIA_82C561       0x0561
+#define PCI_DEVICE_ID_VIA_82C586_1     0x0571
+#define PCI_DEVICE_ID_VIA_82C576       0x0576
+#define PCI_DEVICE_ID_VIA_82C585       0x0585
+#define PCI_DEVICE_ID_VIA_82C586_0     0x0586
+#define PCI_DEVICE_ID_VIA_82C595       0x0595
+#define PCI_DEVICE_ID_VIA_82C596       0x0596
+#define PCI_DEVICE_ID_VIA_82C597_0     0x0597
+#define PCI_DEVICE_ID_VIA_82C598_0     0x0598
+#define PCI_DEVICE_ID_VIA_8601_0       0x0601
+#define PCI_DEVICE_ID_VIA_8605_0       0x0605
+#define PCI_DEVICE_ID_VIA_82C680       0x0680
+#define PCI_DEVICE_ID_VIA_82C686       0x0686
+#define PCI_DEVICE_ID_VIA_82C691_0     0x0691
+#define PCI_DEVICE_ID_VIA_82C693       0x0693
+#define PCI_DEVICE_ID_VIA_82C693_1     0x0698
+#define PCI_DEVICE_ID_VIA_82C926       0x0926
+#define PCI_DEVICE_ID_VIA_82C576_1     0x1571
+#define PCI_DEVICE_ID_VIA_82C595_97    0x1595
+#define PCI_DEVICE_ID_VIA_82C586_2     0x3038
+#define PCI_DEVICE_ID_VIA_82C586_3     0x3040
+#define PCI_DEVICE_ID_VIA_6305         0x3044
+#define PCI_DEVICE_ID_VIA_82C596_3     0x3050
+#define PCI_DEVICE_ID_VIA_82C596B_3    0x3051
+#define PCI_DEVICE_ID_VIA_82C686_4     0x3057
+#define PCI_DEVICE_ID_VIA_82C686_5     0x3058
+#define PCI_DEVICE_ID_VIA_8233_5       0x3059
+#define PCI_DEVICE_ID_VIA_8233_7       0x3065
+#define PCI_DEVICE_ID_VIA_82C686_6     0x3068
+#define PCI_DEVICE_ID_VIA_8233_0       0x3074
+#define PCI_DEVICE_ID_VIA_8633_0       0x3091
+#define PCI_DEVICE_ID_VIA_8367_0       0x3099
+#define PCI_DEVICE_ID_VIA_8653_0       0x3101
+#define PCI_DEVICE_ID_VIA_8622         0x3102
+#define PCI_DEVICE_ID_VIA_8233C_0      0x3109
+#define PCI_DEVICE_ID_VIA_8361         0x3112
+#define PCI_DEVICE_ID_VIA_XM266                0x3116
+#define PCI_DEVICE_ID_VIA_612X         0x3119
+#define PCI_DEVICE_ID_VIA_862X_0       0x3123
+#define PCI_DEVICE_ID_VIA_8753_0       0x3128
+#define PCI_DEVICE_ID_VIA_8233A                0x3147
+#define PCI_DEVICE_ID_VIA_8703_51_0    0x3148
+#define PCI_DEVICE_ID_VIA_8237_SATA    0x3149
+#define PCI_DEVICE_ID_VIA_XN266                0x3156
+#define PCI_DEVICE_ID_VIA_8754C_0      0x3168
+#define PCI_DEVICE_ID_VIA_8235         0x3177
+#define PCI_DEVICE_ID_VIA_P4N333       0x3178
+#define PCI_DEVICE_ID_VIA_8385_0       0x3188
+#define PCI_DEVICE_ID_VIA_8377_0       0x3189
+#define PCI_DEVICE_ID_VIA_8378_0       0x3205
+#define PCI_DEVICE_ID_VIA_8783_0       0x3208
+#define PCI_DEVICE_ID_VIA_P4M400       0x3209
+#define PCI_DEVICE_ID_VIA_8237         0x3227
+#define PCI_DEVICE_ID_VIA_3296_0       0x0296
+#define PCI_DEVICE_ID_VIA_86C100A      0x6100
+#define PCI_DEVICE_ID_VIA_8231         0x8231
+#define PCI_DEVICE_ID_VIA_8231_4       0x8235
+#define PCI_DEVICE_ID_VIA_8365_1       0x8305
+#define PCI_DEVICE_ID_VIA_8371_1       0x8391
+#define PCI_DEVICE_ID_VIA_8501_1       0x8501
+#define PCI_DEVICE_ID_VIA_82C597_1     0x8597
+#define PCI_DEVICE_ID_VIA_82C598_1     0x8598
+#define PCI_DEVICE_ID_VIA_8601_1       0x8601
+#define PCI_DEVICE_ID_VIA_8505_1       0x8605
+#define PCI_DEVICE_ID_VIA_8633_1       0xB091
+#define PCI_DEVICE_ID_VIA_8367_1       0xB099
+#define PCI_DEVICE_ID_VIA_P4X266_1     0xB101
+#define PCI_DEVICE_ID_VIA_8615_1       0xB103
+#define PCI_DEVICE_ID_VIA_8361_1       0xB112
+#define PCI_DEVICE_ID_VIA_8235_1       0xB168
+#define PCI_DEVICE_ID_VIA_838X_1       0xB188
+#define PCI_DEVICE_ID_VIA_83_87XX_1    0xB198
+
+#define PCI_VENDOR_ID_SIEMENS           0x110A
+#define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
+
+#define PCI_VENDOR_ID_SMC2             0x1113
+#define PCI_DEVICE_ID_SMC2_1211TX      0x1211
+
+#define PCI_VENDOR_ID_VORTEX           0x1119
+#define PCI_DEVICE_ID_VORTEX_GDT60x0   0x0000
+#define PCI_DEVICE_ID_VORTEX_GDT6000B  0x0001
+#define PCI_DEVICE_ID_VORTEX_GDT6x10   0x0002
+#define PCI_DEVICE_ID_VORTEX_GDT6x20   0x0003
+#define PCI_DEVICE_ID_VORTEX_GDT6530   0x0004
+#define PCI_DEVICE_ID_VORTEX_GDT6550   0x0005
+#define PCI_DEVICE_ID_VORTEX_GDT6x17   0x0006
+#define PCI_DEVICE_ID_VORTEX_GDT6x27   0x0007
+#define PCI_DEVICE_ID_VORTEX_GDT6537   0x0008
+#define PCI_DEVICE_ID_VORTEX_GDT6557   0x0009
+#define PCI_DEVICE_ID_VORTEX_GDT6x15   0x000a
+#define PCI_DEVICE_ID_VORTEX_GDT6x25   0x000b
+#define PCI_DEVICE_ID_VORTEX_GDT6535   0x000c
+#define PCI_DEVICE_ID_VORTEX_GDT6555   0x000d
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP 0x0100
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP 0x0101
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP 0x0102
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP1        0x0110
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP1        0x0111
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP1        0x0112
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP1        0x0113
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP1        0x0114
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP1        0x0115
+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP2        0x0120
+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP2        0x0121
+#define PCI_DEVICE_ID_VORTEX_GDT6537RP2        0x0122
+#define PCI_DEVICE_ID_VORTEX_GDT6557RP2        0x0123
+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP2        0x0124
+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP2        0x0125
+
+#define PCI_VENDOR_ID_EF               0x111a
+#define PCI_DEVICE_ID_EF_ATM_FPGA      0x0000
+#define PCI_DEVICE_ID_EF_ATM_ASIC      0x0002
+#define PCI_VENDOR_ID_EF_ATM_LANAI2    0x0003
+#define PCI_VENDOR_ID_EF_ATM_LANAIHB   0x0005
+
+#define PCI_VENDOR_ID_IDT              0x111d
+#define PCI_DEVICE_ID_IDT_IDT77201     0x0001
+
+#define PCI_VENDOR_ID_FORE             0x1127
+#define PCI_DEVICE_ID_FORE_PCA200PC    0x0210
+#define PCI_DEVICE_ID_FORE_PCA200E     0x0300
+
+#define PCI_VENDOR_ID_IMAGINGTECH      0x112f
+#define PCI_DEVICE_ID_IMAGINGTECH_ICPCI        0x0000
+
+#define PCI_VENDOR_ID_PHILIPS          0x1131
+#define PCI_DEVICE_ID_PHILIPS_SAA7145  0x7145
+#define PCI_DEVICE_ID_PHILIPS_SAA7146  0x7146
+#define PCI_DEVICE_ID_PHILIPS_SAA9730  0x9730
+
+#define PCI_VENDOR_ID_EICON            0x1133
+#define PCI_DEVICE_ID_EICON_DIVA20PRO  0xe001
+#define PCI_DEVICE_ID_EICON_DIVA20     0xe002
+#define PCI_DEVICE_ID_EICON_DIVA20PRO_U        0xe003
+#define PCI_DEVICE_ID_EICON_DIVA20_U   0xe004
+#define PCI_DEVICE_ID_EICON_DIVA201    0xe005
+#define PCI_DEVICE_ID_EICON_DIVA202    0xe00b
+#define PCI_DEVICE_ID_EICON_MAESTRA    0xe010
+#define PCI_DEVICE_ID_EICON_MAESTRAQ   0xe012
+#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013
+#define PCI_DEVICE_ID_EICON_MAESTRAP   0xe014
+
+#define PCI_VENDOR_ID_ZIATECH          0x1138
+#define PCI_DEVICE_ID_ZIATECH_5550_HC  0x5550
+ 
+#define PCI_VENDOR_ID_CYCLONE          0x113c
+#define PCI_DEVICE_ID_CYCLONE_SDK      0x0001
+
+#define PCI_VENDOR_ID_ALLIANCE         0x1142
+#define PCI_DEVICE_ID_ALLIANCE_PROMOTIO        0x3210
+#define PCI_DEVICE_ID_ALLIANCE_PROVIDEO        0x6422
+#define PCI_DEVICE_ID_ALLIANCE_AT24    0x6424
+#define PCI_DEVICE_ID_ALLIANCE_AT3D    0x643d
+
+#define PCI_VENDOR_ID_SYSKONNECT       0x1148
+#define PCI_DEVICE_ID_SYSKONNECT_FP    0x4000
+#define PCI_DEVICE_ID_SYSKONNECT_TR    0x4200
+#define PCI_DEVICE_ID_SYSKONNECT_GE    0x4300
+#define PCI_DEVICE_ID_SYSKONNECT_YU    0x4320
+#define PCI_DEVICE_ID_SYSKONNECT_9DXX  0x4400
+#define PCI_DEVICE_ID_SYSKONNECT_9MXX  0x4500
+
+#define PCI_VENDOR_ID_VMIC             0x114a
+#define PCI_DEVICE_ID_VMIC_VME         0x7587
+
+#define PCI_VENDOR_ID_DIGI             0x114f
+#define PCI_DEVICE_ID_DIGI_EPC         0x0002
+#define PCI_DEVICE_ID_DIGI_RIGHTSWITCH 0x0003
+#define PCI_DEVICE_ID_DIGI_XEM         0x0004
+#define PCI_DEVICE_ID_DIGI_XR          0x0005
+#define PCI_DEVICE_ID_DIGI_CX          0x0006
+#define PCI_DEVICE_ID_DIGI_XRJ         0x0009
+#define PCI_DEVICE_ID_DIGI_EPCJ                0x000a
+#define PCI_DEVICE_ID_DIGI_XR_920      0x0027
+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070
+#define PCI_DEVICE_ID_DIGI_DF_M_E      0x0071
+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072
+#define PCI_DEVICE_ID_DIGI_DF_M_A      0x0073
+#define PCI_DEVICE_ID_NEO_2DB9          0x00C8
+#define PCI_DEVICE_ID_NEO_2DB9PRI       0x00C9
+#define PCI_DEVICE_ID_NEO_2RJ45         0x00CA
+#define PCI_DEVICE_ID_NEO_2RJ45PRI      0x00CB
+
+#define PCI_VENDOR_ID_MUTECH           0x1159
+#define PCI_DEVICE_ID_MUTECH_MV1000    0x0001
+
+#define PCI_VENDOR_ID_XIRCOM           0x115d
+#define PCI_DEVICE_ID_XIRCOM_X3201_ETH 0x0003
+#define PCI_DEVICE_ID_XIRCOM_RBM56G    0x0101
+#define PCI_DEVICE_ID_XIRCOM_X3201_MDM 0x0103
+
+#define PCI_VENDOR_ID_RENDITION                0x1163
+#define PCI_DEVICE_ID_RENDITION_VERITE 0x0001
+#define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000
+
+#define PCI_VENDOR_ID_SERVERWORKS        0x1166
+#define PCI_DEVICE_ID_SERVERWORKS_HE     0x0008
+#define PCI_DEVICE_ID_SERVERWORKS_LE     0x0009
+#define PCI_DEVICE_ID_SERVERWORKS_CIOB30  0x0010
+#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011
+#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017
+#define PCI_DEVICE_ID_SERVERWORKS_OSB4   0x0200
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5   0x0201
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6    0x0203
+#define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
+#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
+#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221
+#define PCI_DEVICE_ID_SERVERWORKS_GCLE    0x0225
+#define PCI_DEVICE_ID_SERVERWORKS_GCLE2   0x0227
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230
+
+#define PCI_VENDOR_ID_SBE              0x1176
+#define PCI_DEVICE_ID_SBE_WANXL100     0x0301
+#define PCI_DEVICE_ID_SBE_WANXL200     0x0302
+#define PCI_DEVICE_ID_SBE_WANXL400     0x0104
+
+#define PCI_VENDOR_ID_TOSHIBA          0x1179
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO  0x0102
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1        0x0103
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2        0x0105
+#define PCI_DEVICE_ID_TOSHIBA_601      0x0601
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC95  0x060a
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_A 0x0603
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_B 0x060a
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC97  0x060f
+#define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617
+
+#define PCI_VENDOR_ID_TOSHIBA_2                0x102f
+#define PCI_DEVICE_ID_TOSHIBA_TX3927   0x000a
+#define PCI_DEVICE_ID_TOSHIBA_TC35815CF        0x0030
+#define PCI_DEVICE_ID_TOSHIBA_TX4927   0x0180
+#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC    0x0108
+
+#define PCI_VENDOR_ID_RICOH            0x1180
+#define PCI_DEVICE_ID_RICOH_RL5C465    0x0465
+#define PCI_DEVICE_ID_RICOH_RL5C466    0x0466
+#define PCI_DEVICE_ID_RICOH_RL5C475    0x0475
+#define PCI_DEVICE_ID_RICOH_RL5C476    0x0476
+#define PCI_DEVICE_ID_RICOH_RL5C478    0x0478
+
+#define PCI_VENDOR_ID_DLINK            0x1186
+#define PCI_DEVICE_ID_DLINK_DGE510T    0x4c00
+
+#define PCI_VENDOR_ID_ARTOP            0x1191
+#define PCI_DEVICE_ID_ARTOP_ATP8400    0x0004
+#define PCI_DEVICE_ID_ARTOP_ATP850UF   0x0005
+#define PCI_DEVICE_ID_ARTOP_ATP860     0x0006
+#define PCI_DEVICE_ID_ARTOP_ATP860R    0x0007
+#define PCI_DEVICE_ID_ARTOP_ATP865     0x0008
+#define PCI_DEVICE_ID_ARTOP_ATP865R    0x0009
+#define PCI_DEVICE_ID_ARTOP_AEC7610    0x8002
+#define PCI_DEVICE_ID_ARTOP_AEC7612UW  0x8010
+#define PCI_DEVICE_ID_ARTOP_AEC7612U   0x8020
+#define PCI_DEVICE_ID_ARTOP_AEC7612S   0x8030
+#define PCI_DEVICE_ID_ARTOP_AEC7612D   0x8040
+#define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050
+#define PCI_DEVICE_ID_ARTOP_8060       0x8060
+#define PCI_DEVICE_ID_ARTOP_AEC67160   0x8080
+#define PCI_DEVICE_ID_ARTOP_AEC67160_2 0x8081
+#define PCI_DEVICE_ID_ARTOP_AEC67162   0x808a
+
+#define PCI_VENDOR_ID_ZEITNET          0x1193
+#define PCI_DEVICE_ID_ZEITNET_1221     0x0001
+#define PCI_DEVICE_ID_ZEITNET_1225     0x0002
+
+#define PCI_VENDOR_ID_OMEGA            0x119b
+#define PCI_DEVICE_ID_OMEGA_82C092G    0x1221
+
+#define PCI_VENDOR_ID_FUJITSU_ME       0x119e
+#define PCI_DEVICE_ID_FUJITSU_FS155    0x0001
+#define PCI_DEVICE_ID_FUJITSU_FS50     0x0003
+
+#define PCI_SUBVENDOR_ID_KEYSPAN       0x11a9
+#define PCI_SUBDEVICE_ID_KEYSPAN_SX2   0x5334
+
+#define PCI_VENDOR_ID_MARVELL          0x11ab
+#define PCI_DEVICE_ID_MARVELL_GT64011  0x4146
+#define PCI_DEVICE_ID_MARVELL_GT64111  0x4146
+#define PCI_DEVICE_ID_MARVELL_GT64260  0x6430
+#define PCI_DEVICE_ID_MARVELL_MV64360  0x6460
+#define PCI_DEVICE_ID_MARVELL_MV64460  0x6480
+#define PCI_DEVICE_ID_MARVELL_GT96100  0x9652
+#define PCI_DEVICE_ID_MARVELL_GT96100A 0x9653
+
+#define PCI_VENDOR_ID_LITEON           0x11ad
+#define PCI_DEVICE_ID_LITEON_LNE100TX  0x0002
+
+#define PCI_VENDOR_ID_V3               0x11b0
+#define PCI_DEVICE_ID_V3_V960          0x0001
+#define PCI_DEVICE_ID_V3_V350          0x0001
+#define PCI_DEVICE_ID_V3_V961          0x0002
+#define PCI_DEVICE_ID_V3_V351          0x0002
+
+#define PCI_VENDOR_ID_NP               0x11bc
+#define PCI_DEVICE_ID_NP_PCI_FDDI      0x0001
+
+#define PCI_VENDOR_ID_ATT              0x11c1
+#define PCI_DEVICE_ID_ATT_L56XMF       0x0440
+#define PCI_DEVICE_ID_ATT_VENUS_MODEM  0x480
+
+#define PCI_VENDOR_ID_NEC2             0x11c3 /* NEC (2nd) */
+
+#define PCI_VENDOR_ID_SPECIALIX                0x11cb
+#define PCI_DEVICE_ID_SPECIALIX_IO8    0x2000
+#define PCI_DEVICE_ID_SPECIALIX_XIO    0x4000
+#define PCI_DEVICE_ID_SPECIALIX_RIO    0x8000
+#define PCI_SUBDEVICE_ID_SPECIALIX_SPEED4 0xa004
+
+#define PCI_VENDOR_ID_AURAVISION       0x11d1
+#define PCI_DEVICE_ID_AURAVISION_VXP524        0x01f7
+
+#define PCI_VENDOR_ID_ANALOG_DEVICES   0x11d4
+#define PCI_DEVICE_ID_AD1889JS         0x1889
+
+#define PCI_VENDOR_ID_IKON             0x11d5
+#define PCI_DEVICE_ID_IKON_10115       0x0115
+#define PCI_DEVICE_ID_IKON_10117       0x0117
+
+#define PCI_VENDOR_ID_SEGA             0x11db
+#define PCI_DEVICE_ID_SEGA_BBA         0x1234
+
+#define PCI_VENDOR_ID_ZORAN            0x11de
+#define PCI_DEVICE_ID_ZORAN_36057      0x6057
+#define PCI_DEVICE_ID_ZORAN_36120      0x6120
+
+#define PCI_VENDOR_ID_KINETIC          0x11f4
+#define PCI_DEVICE_ID_KINETIC_2915     0x2915
+
+#define PCI_VENDOR_ID_COMPEX           0x11f6
+#define PCI_DEVICE_ID_COMPEX_ENET100VG4        0x0112
+#define PCI_DEVICE_ID_COMPEX_RL2000    0x1401
+
+#define PCI_VENDOR_ID_RP               0x11fe
+#define PCI_DEVICE_ID_RP32INTF         0x0001
+#define PCI_DEVICE_ID_RP8INTF          0x0002
+#define PCI_DEVICE_ID_RP16INTF         0x0003
+#define PCI_DEVICE_ID_RP4QUAD          0x0004
+#define PCI_DEVICE_ID_RP8OCTA          0x0005
+#define PCI_DEVICE_ID_RP8J             0x0006
+#define PCI_DEVICE_ID_RP4J             0x0007
+#define PCI_DEVICE_ID_RP8SNI           0x0008  
+#define PCI_DEVICE_ID_RP16SNI          0x0009  
+#define PCI_DEVICE_ID_RPP4             0x000A
+#define PCI_DEVICE_ID_RPP8             0x000B
+#define PCI_DEVICE_ID_RP8M             0x000C
+#define PCI_DEVICE_ID_RP4M             0x000D
+#define PCI_DEVICE_ID_RP2_232          0x000E
+#define PCI_DEVICE_ID_RP2_422          0x000F
+#define PCI_DEVICE_ID_URP32INTF                0x0801
+#define PCI_DEVICE_ID_URP8INTF         0x0802
+#define PCI_DEVICE_ID_URP16INTF                0x0803
+#define PCI_DEVICE_ID_URP8OCTA         0x0805
+#define PCI_DEVICE_ID_UPCI_RM3_8PORT   0x080C       
+#define PCI_DEVICE_ID_UPCI_RM3_4PORT   0x080D
+#define PCI_DEVICE_ID_CRP16INTF                0x0903       
+
+#define PCI_VENDOR_ID_CYCLADES         0x120e
+#define PCI_DEVICE_ID_CYCLOM_Y_Lo      0x0100
+#define PCI_DEVICE_ID_CYCLOM_Y_Hi      0x0101
+#define PCI_DEVICE_ID_CYCLOM_4Y_Lo     0x0102
+#define PCI_DEVICE_ID_CYCLOM_4Y_Hi     0x0103
+#define PCI_DEVICE_ID_CYCLOM_8Y_Lo     0x0104
+#define PCI_DEVICE_ID_CYCLOM_8Y_Hi     0x0105
+#define PCI_DEVICE_ID_CYCLOM_Z_Lo      0x0200
+#define PCI_DEVICE_ID_CYCLOM_Z_Hi      0x0201
+#define PCI_DEVICE_ID_PC300_RX_2       0x0300
+#define PCI_DEVICE_ID_PC300_RX_1       0x0301
+#define PCI_DEVICE_ID_PC300_TE_2       0x0310
+#define PCI_DEVICE_ID_PC300_TE_1       0x0311
+#define PCI_DEVICE_ID_PC300_TE_M_2     0x0320
+#define PCI_DEVICE_ID_PC300_TE_M_1     0x0321
+
+/* Allied Telesyn */
+#define PCI_VENDOR_ID_AT               0x1259
+#define PCI_SUBDEVICE_ID_AT_2701FX     0x2703
+
+#define PCI_VENDOR_ID_ESSENTIAL                0x120f
+#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER     0x0001
+
+#define PCI_VENDOR_ID_O2               0x1217
+#define PCI_DEVICE_ID_O2_6729          0x6729
+#define PCI_DEVICE_ID_O2_6730          0x673a
+#define PCI_DEVICE_ID_O2_6832          0x6832
+#define PCI_DEVICE_ID_O2_6836          0x6836
+
+#define PCI_VENDOR_ID_3DFX             0x121a
+#define PCI_DEVICE_ID_3DFX_VOODOO      0x0001
+#define PCI_DEVICE_ID_3DFX_VOODOO2     0x0002
+#define PCI_DEVICE_ID_3DFX_BANSHEE     0x0003
+#define PCI_DEVICE_ID_3DFX_VOODOO3     0x0005
+#define PCI_DEVICE_ID_3DFX_VOODOO5     0x0009
+
+#define PCI_VENDOR_ID_SIGMADES         0x1236
+#define PCI_DEVICE_ID_SIGMADES_6425    0x6401
+
+#define PCI_VENDOR_ID_CCUBE            0x123f
+
+#define PCI_VENDOR_ID_AVM              0x1244
+#define PCI_DEVICE_ID_AVM_B1           0x0700
+#define PCI_DEVICE_ID_AVM_C4           0x0800
+#define PCI_DEVICE_ID_AVM_A1           0x0a00
+#define PCI_DEVICE_ID_AVM_A1_V2                0x0e00
+#define PCI_DEVICE_ID_AVM_C2           0x1100
+#define PCI_DEVICE_ID_AVM_T1           0x1200
+
+#define PCI_VENDOR_ID_DIPIX            0x1246
+
+#define PCI_VENDOR_ID_STALLION         0x124d
+#define PCI_DEVICE_ID_STALLION_ECHPCI832 0x0000
+#define PCI_DEVICE_ID_STALLION_ECHPCI864 0x0002
+#define PCI_DEVICE_ID_STALLION_EIOPCI  0x0003
+
+#define PCI_VENDOR_ID_OPTIBASE         0x1255
+#define PCI_DEVICE_ID_OPTIBASE_FORGE   0x1110
+#define PCI_DEVICE_ID_OPTIBASE_FUSION  0x1210
+#define PCI_DEVICE_ID_OPTIBASE_VPLEX   0x2110
+#define PCI_DEVICE_ID_OPTIBASE_VPLEXCC 0x2120
+#define PCI_DEVICE_ID_OPTIBASE_VQUEST  0x2130
+
+/* Allied Telesyn */
+#define PCI_VENDOR_ID_AT               0x1259
+#define PCI_SUBDEVICE_ID_AT_2700FX     0x2701
+#define PCI_SUBDEVICE_ID_AT_2701FX     0x2703
+
+#define PCI_VENDOR_ID_ESS              0x125d
+#define PCI_DEVICE_ID_ESS_ESS1968      0x1968
+#define PCI_DEVICE_ID_ESS_AUDIOPCI     0x1969
+#define PCI_DEVICE_ID_ESS_ESS1978      0x1978
+
+#define PCI_VENDOR_ID_SATSAGEM         0x1267
+#define PCI_DEVICE_ID_SATSAGEM_NICCY   0x1016
+#define PCI_DEVICE_ID_SATSAGEM_PCR2101 0x5352
+#define PCI_DEVICE_ID_SATSAGEM_TELSATTURBO 0x5a4b
+
+#define PCI_VENDOR_ID_HUGHES           0x1273
+#define PCI_DEVICE_ID_HUGHES_DIRECPC   0x0002
+
+#define PCI_VENDOR_ID_ENSONIQ          0x1274
+#define PCI_DEVICE_ID_ENSONIQ_CT5880   0x5880
+#define PCI_DEVICE_ID_ENSONIQ_ES1370   0x5000
+#define PCI_DEVICE_ID_ENSONIQ_ES1371   0x1371
+
+#define PCI_VENDOR_ID_TRANSMETA                0x1279
+#define PCI_DEVICE_ID_EFFICEON         0x0060
+
+#define PCI_VENDOR_ID_ROCKWELL         0x127A
+
+#define PCI_VENDOR_ID_ITE              0x1283
+#define PCI_DEVICE_ID_ITE_IT8172G      0x8172
+#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
+#define PCI_DEVICE_ID_ITE_8872         0x8872
+#define PCI_DEVICE_ID_ITE_IT8330G_0    0xe886
+
+/* formerly Platform Tech */
+#define PCI_VENDOR_ID_ESS_OLD          0x1285
+#define PCI_DEVICE_ID_ESS_ESS0100      0x0100
+
+#define PCI_VENDOR_ID_ALTEON           0x12ae
+#define PCI_DEVICE_ID_ALTEON_ACENIC    0x0001
+
+#define PCI_VENDOR_ID_USR              0x12B9
+
+#define PCI_SUBVENDOR_ID_CONNECT_TECH                  0x12c4
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232          0x0001
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232          0x0002
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232          0x0003
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485          0x0004
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_4_4      0x0005
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485          0x0006
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485_2_2      0x0007
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_485          0x0008
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6      0x0009
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1       0x000A
+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1       0x000B
+
+#define PCI_VENDOR_ID_PICTUREL         0x12c5
+#define PCI_DEVICE_ID_PICTUREL_PCIVST  0x0081
+
+#define PCI_VENDOR_ID_NVIDIA_SGS       0x12d2
+#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
+
+#define PCI_SUBVENDOR_ID_CHASE_PCIFAST         0x12E0
+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4                0x0031
+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8                0x0021
+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16       0x0011
+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC    0x0041
+#define PCI_SUBVENDOR_ID_CHASE_PCIRAS          0x124D
+#define PCI_SUBDEVICE_ID_CHASE_PCIRAS4         0xF001
+#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8         0xF010
+
+#define PCI_VENDOR_ID_AUREAL           0x12eb
+#define PCI_DEVICE_ID_AUREAL_VORTEX_1  0x0001
+#define PCI_DEVICE_ID_AUREAL_VORTEX_2  0x0002
+#define PCI_DEVICE_ID_AUREAL_ADVANTAGE 0x0003
+
+#define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8
+#define PCI_DEVICE_ID_LML_33R10                0x8a02
+
+#define PCI_VENDOR_ID_CBOARDS          0x1307
+#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
+
+#define PCI_VENDOR_ID_SIIG             0x131f
+#define PCI_DEVICE_ID_SIIG_1S_10x_550  0x1000
+#define PCI_DEVICE_ID_SIIG_1S_10x_650  0x1001
+#define PCI_DEVICE_ID_SIIG_1S_10x_850  0x1002
+#define PCI_DEVICE_ID_SIIG_1S1P_10x_550        0x1010
+#define PCI_DEVICE_ID_SIIG_1S1P_10x_650        0x1011
+#define PCI_DEVICE_ID_SIIG_1S1P_10x_850        0x1012
+#define PCI_DEVICE_ID_SIIG_1P_10x      0x1020
+#define PCI_DEVICE_ID_SIIG_2P_10x      0x1021
+#define PCI_DEVICE_ID_SIIG_2S_10x_550  0x1030
+#define PCI_DEVICE_ID_SIIG_2S_10x_650  0x1031
+#define PCI_DEVICE_ID_SIIG_2S_10x_850  0x1032
+#define PCI_DEVICE_ID_SIIG_2S1P_10x_550        0x1034
+#define PCI_DEVICE_ID_SIIG_2S1P_10x_650        0x1035
+#define PCI_DEVICE_ID_SIIG_2S1P_10x_850        0x1036
+#define PCI_DEVICE_ID_SIIG_4S_10x_550  0x1050
+#define PCI_DEVICE_ID_SIIG_4S_10x_650  0x1051
+#define PCI_DEVICE_ID_SIIG_4S_10x_850  0x1052
+#define PCI_DEVICE_ID_SIIG_1S_20x_550  0x2000
+#define PCI_DEVICE_ID_SIIG_1S_20x_650  0x2001
+#define PCI_DEVICE_ID_SIIG_1S_20x_850  0x2002
+#define PCI_DEVICE_ID_SIIG_1P_20x      0x2020
+#define PCI_DEVICE_ID_SIIG_2P_20x      0x2021
+#define PCI_DEVICE_ID_SIIG_2S_20x_550  0x2030
+#define PCI_DEVICE_ID_SIIG_2S_20x_650  0x2031
+#define PCI_DEVICE_ID_SIIG_2S_20x_850  0x2032
+#define PCI_DEVICE_ID_SIIG_2P1S_20x_550        0x2040
+#define PCI_DEVICE_ID_SIIG_2P1S_20x_650        0x2041
+#define PCI_DEVICE_ID_SIIG_2P1S_20x_850        0x2042
+#define PCI_DEVICE_ID_SIIG_1S1P_20x_550        0x2010
+#define PCI_DEVICE_ID_SIIG_1S1P_20x_650        0x2011
+#define PCI_DEVICE_ID_SIIG_1S1P_20x_850        0x2012
+#define PCI_DEVICE_ID_SIIG_4S_20x_550  0x2050
+#define PCI_DEVICE_ID_SIIG_4S_20x_650  0x2051
+#define PCI_DEVICE_ID_SIIG_4S_20x_850  0x2052
+#define PCI_DEVICE_ID_SIIG_2S1P_20x_550        0x2060
+#define PCI_DEVICE_ID_SIIG_2S1P_20x_650        0x2061
+#define PCI_DEVICE_ID_SIIG_2S1P_20x_850        0x2062
+
+#define PCI_VENDOR_ID_RADISYS          0x1331
+#define PCI_DEVICE_ID_RADISYS_ENP2611  0x0030
+
+#define PCI_VENDOR_ID_DOMEX            0x134a
+#define PCI_DEVICE_ID_DOMEX_DMX3191D   0x0001
+
+#define PCI_VENDOR_ID_QUATECH          0x135C
+#define PCI_DEVICE_ID_QUATECH_QSC100   0x0010
+#define PCI_DEVICE_ID_QUATECH_DSC100   0x0020
+#define PCI_DEVICE_ID_QUATECH_DSC200   0x0030
+#define PCI_DEVICE_ID_QUATECH_QSC200   0x0040
+#define PCI_DEVICE_ID_QUATECH_ESC100D  0x0050
+#define PCI_DEVICE_ID_QUATECH_ESC100M  0x0060
+
+#define PCI_VENDOR_ID_SEALEVEL         0x135e
+#define PCI_DEVICE_ID_SEALEVEL_U530    0x7101
+#define PCI_DEVICE_ID_SEALEVEL_UCOMM2  0x7201
+#define PCI_DEVICE_ID_SEALEVEL_UCOMM422        0x7402
+#define PCI_DEVICE_ID_SEALEVEL_UCOMM232        0x7202
+#define PCI_DEVICE_ID_SEALEVEL_COMM4   0x7401
+#define PCI_DEVICE_ID_SEALEVEL_COMM8   0x7801
+#define PCI_DEVICE_ID_SEALEVEL_UCOMM8  0x7804
+
+#define PCI_VENDOR_ID_HYPERCOPE                0x1365
+#define PCI_DEVICE_ID_HYPERCOPE_PLX    0x9050
+#define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO    0x0104
+#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO                0x0106
+#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO       0x0107
+#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2      0x0108
+#define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS      0x0109
+
+#define PCI_VENDOR_ID_KAWASAKI         0x136b
+#define PCI_DEVICE_ID_MCHIP_KL5A72002  0xff01
+
+#define PCI_VENDOR_ID_CNET             0x1371
+#define PCI_DEVICE_ID_CNET_GIGACARD    0x434e
+
+#define PCI_VENDOR_ID_LMC              0x1376
+#define PCI_DEVICE_ID_LMC_HSSI         0x0003
+#define PCI_DEVICE_ID_LMC_DS3          0x0004
+#define PCI_DEVICE_ID_LMC_SSI          0x0005
+#define PCI_DEVICE_ID_LMC_T1           0x0006
+
+#define PCI_VENDOR_ID_NETGEAR          0x1385
+#define PCI_DEVICE_ID_NETGEAR_GA620    0x620a
+#define PCI_DEVICE_ID_NETGEAR_GA622    0x622a
+
+#define PCI_VENDOR_ID_APPLICOM         0x1389
+#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
+#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
+#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
+
+#define PCI_VENDOR_ID_MOXA             0x1393
+#define PCI_DEVICE_ID_MOXA_RC7000      0x0001
+#define PCI_DEVICE_ID_MOXA_CP102       0x1020
+#define PCI_DEVICE_ID_MOXA_CP102UL     0x1021
+#define PCI_DEVICE_ID_MOXA_CP102U      0x1022
+#define PCI_DEVICE_ID_MOXA_C104                0x1040
+#define PCI_DEVICE_ID_MOXA_CP104U      0x1041
+#define PCI_DEVICE_ID_MOXA_CP104JU     0x1042
+#define PCI_DEVICE_ID_MOXA_CT114       0x1140
+#define PCI_DEVICE_ID_MOXA_CP114       0x1141
+#define PCI_DEVICE_ID_MOXA_CP118U      0x1180
+#define PCI_DEVICE_ID_MOXA_CP132       0x1320
+#define PCI_DEVICE_ID_MOXA_CP132U      0x1321
+#define PCI_DEVICE_ID_MOXA_CP134U      0x1340
+#define PCI_DEVICE_ID_MOXA_C168                0x1680
+#define PCI_DEVICE_ID_MOXA_CP168U      0x1681
+#define PCI_DEVICE_ID_MOXA_CP204J      0x2040
+#define PCI_DEVICE_ID_MOXA_C218                0x2180
+#define PCI_DEVICE_ID_MOXA_C320                0x3200
+
+#define PCI_VENDOR_ID_CCD              0x1397
+#define PCI_DEVICE_ID_CCD_2BD0         0x2bd0
+#define PCI_DEVICE_ID_CCD_B000         0xb000
+#define PCI_DEVICE_ID_CCD_B006         0xb006
+#define PCI_DEVICE_ID_CCD_B007         0xb007
+#define PCI_DEVICE_ID_CCD_B008         0xb008
+#define PCI_DEVICE_ID_CCD_B009         0xb009
+#define PCI_DEVICE_ID_CCD_B00A         0xb00a
+#define PCI_DEVICE_ID_CCD_B00B         0xb00b
+#define PCI_DEVICE_ID_CCD_B00C         0xb00c
+#define PCI_DEVICE_ID_CCD_B100         0xb100
+
+#define PCI_VENDOR_ID_EXAR             0x13a8
+#define PCI_DEVICE_ID_EXAR_XR17C152    0x0152
+#define PCI_DEVICE_ID_EXAR_XR17C154    0x0154
+#define PCI_DEVICE_ID_EXAR_XR17C158    0x0158
+
+#define PCI_VENDOR_ID_MICROGATE                0x13c0
+#define PCI_DEVICE_ID_MICROGATE_USC    0x0010
+#define PCI_DEVICE_ID_MICROGATE_SCC    0x0020
+#define PCI_DEVICE_ID_MICROGATE_SCA    0x0030
+#define PCI_DEVICE_ID_MICROGATE_USC2   0x0210
+
+#define PCI_VENDOR_ID_3WARE            0x13C1
+#define PCI_DEVICE_ID_3WARE_1000       0x1000
+#define PCI_DEVICE_ID_3WARE_7000       0x1001
+#define PCI_DEVICE_ID_3WARE_9000       0x1002
+
+#define PCI_VENDOR_ID_IOMEGA           0x13ca
+#define PCI_DEVICE_ID_IOMEGA_BUZ       0x4231
+
+#define PCI_VENDOR_ID_ABOCOM           0x13D1
+#define PCI_DEVICE_ID_ABOCOM_2BD1       0x2BD1
+
+#define PCI_VENDOR_ID_CMEDIA           0x13f6
+#define PCI_DEVICE_ID_CMEDIA_CM8338A   0x0100
+#define PCI_DEVICE_ID_CMEDIA_CM8338B   0x0101
+#define PCI_DEVICE_ID_CMEDIA_CM8738    0x0111
+#define PCI_DEVICE_ID_CMEDIA_CM8738B   0x0112
+
+#define PCI_VENDOR_ID_LAVA             0x1407
+#define PCI_DEVICE_ID_LAVA_DSERIAL     0x0100 /* 2x 16550 */
+#define PCI_DEVICE_ID_LAVA_QUATRO_A    0x0101 /* 2x 16550, half of 4 port */
+#define PCI_DEVICE_ID_LAVA_QUATRO_B    0x0102 /* 2x 16550, half of 4 port */
+#define PCI_DEVICE_ID_LAVA_OCTO_A      0x0180 /* 4x 16550A, half of 8 port */
+#define PCI_DEVICE_ID_LAVA_OCTO_B      0x0181 /* 4x 16550A, half of 8 port */
+#define PCI_DEVICE_ID_LAVA_PORT_PLUS   0x0200 /* 2x 16650 */
+#define PCI_DEVICE_ID_LAVA_QUAD_A      0x0201 /* 2x 16650, half of 4 port */
+#define PCI_DEVICE_ID_LAVA_QUAD_B      0x0202 /* 2x 16650, half of 4 port */
+#define PCI_DEVICE_ID_LAVA_SSERIAL     0x0500 /* 1x 16550 */
+#define PCI_DEVICE_ID_LAVA_PORT_650    0x0600 /* 1x 16650 */
+#define PCI_DEVICE_ID_LAVA_PARALLEL    0x8000
+#define PCI_DEVICE_ID_LAVA_DUAL_PAR_A  0x8002 /* The Lava Dual Parallel is */
+#define PCI_DEVICE_ID_LAVA_DUAL_PAR_B  0x8003 /* two PCI devices on a card */
+#define PCI_DEVICE_ID_LAVA_BOCA_IOPPAR 0x8800
+
+#define PCI_VENDOR_ID_TIMEDIA          0x1409
+#define PCI_DEVICE_ID_TIMEDIA_1889     0x7168
+
+#define PCI_VENDOR_ID_OXSEMI           0x1415
+#define PCI_DEVICE_ID_OXSEMI_12PCI840  0x8403
+#define PCI_DEVICE_ID_OXSEMI_16PCI954  0x9501
+#define PCI_DEVICE_ID_OXSEMI_16PCI95N  0x9511
+#define PCI_DEVICE_ID_OXSEMI_16PCI954PP        0x9513
+#define PCI_DEVICE_ID_OXSEMI_16PCI952  0x9521
+
+#define PCI_VENDOR_ID_SAMSUNG          0x144d
+
+#define PCI_VENDOR_ID_AIRONET          0x14b9
+#define PCI_DEVICE_ID_AIRONET_4800_1   0x0001
+#define PCI_DEVICE_ID_AIRONET_4800     0x4500 // values switched?  see
+#define PCI_DEVICE_ID_AIRONET_4500     0x4800 // drivers/net/aironet4500_card.c
+
+#define PCI_VENDOR_ID_TITAN            0x14D2
+#define PCI_DEVICE_ID_TITAN_010L       0x8001
+#define PCI_DEVICE_ID_TITAN_100L       0x8010
+#define PCI_DEVICE_ID_TITAN_110L       0x8011
+#define PCI_DEVICE_ID_TITAN_200L       0x8020
+#define PCI_DEVICE_ID_TITAN_210L       0x8021
+#define PCI_DEVICE_ID_TITAN_400L       0x8040
+#define PCI_DEVICE_ID_TITAN_800L       0x8080
+#define PCI_DEVICE_ID_TITAN_100                0xA001
+#define PCI_DEVICE_ID_TITAN_200                0xA005
+#define PCI_DEVICE_ID_TITAN_400                0xA003
+#define PCI_DEVICE_ID_TITAN_800B       0xA004
+
+#define PCI_VENDOR_ID_PANACOM          0x14d4
+#define PCI_DEVICE_ID_PANACOM_QUADMODEM        0x0400
+#define PCI_DEVICE_ID_PANACOM_DUALMODEM        0x0402
+
+#define PCI_VENDOR_ID_SIPACKETS                0x14d9
+#define PCI_DEVICE_ID_SP_HT            0x0010
+
+#define PCI_VENDOR_ID_AFAVLAB          0x14db
+#define PCI_DEVICE_ID_AFAVLAB_P028     0x2180
+#define PCI_DEVICE_ID_AFAVLAB_P030     0x2182
+
+#define PCI_VENDOR_ID_BROADCOM         0x14e4
+#define PCI_DEVICE_ID_TIGON3_5752      0x1600
+#define PCI_DEVICE_ID_TIGON3_5752M     0x1601
+#define PCI_DEVICE_ID_TIGON3_5700      0x1644
+#define PCI_DEVICE_ID_TIGON3_5701      0x1645
+#define PCI_DEVICE_ID_TIGON3_5702      0x1646
+#define PCI_DEVICE_ID_TIGON3_5703      0x1647
+#define PCI_DEVICE_ID_TIGON3_5704      0x1648
+#define PCI_DEVICE_ID_TIGON3_5704S_2   0x1649
+#define PCI_DEVICE_ID_NX2_5706         0x164a
+#define PCI_DEVICE_ID_TIGON3_5702FE    0x164d
+#define PCI_DEVICE_ID_TIGON3_5705      0x1653
+#define PCI_DEVICE_ID_TIGON3_5705_2    0x1654
+#define PCI_DEVICE_ID_TIGON3_5720      0x1658
+#define PCI_DEVICE_ID_TIGON3_5721      0x1659
+#define PCI_DEVICE_ID_TIGON3_5705M     0x165d
+#define PCI_DEVICE_ID_TIGON3_5705M_2   0x165e
+#define PCI_DEVICE_ID_TIGON3_5705F     0x166e
+#define PCI_DEVICE_ID_TIGON3_5750      0x1676
+#define PCI_DEVICE_ID_TIGON3_5751      0x1677
+#define PCI_DEVICE_ID_TIGON3_5750M     0x167c
+#define PCI_DEVICE_ID_TIGON3_5751M     0x167d
+#define PCI_DEVICE_ID_TIGON3_5751F     0x167e
+#define PCI_DEVICE_ID_TIGON3_5782      0x1696
+#define PCI_DEVICE_ID_TIGON3_5788      0x169c
+#define PCI_DEVICE_ID_TIGON3_5789      0x169d
+#define PCI_DEVICE_ID_TIGON3_5702X     0x16a6
+#define PCI_DEVICE_ID_TIGON3_5703X     0x16a7
+#define PCI_DEVICE_ID_TIGON3_5704S     0x16a8
+#define PCI_DEVICE_ID_NX2_5706S                0x16aa
+#define PCI_DEVICE_ID_TIGON3_5702A3    0x16c6
+#define PCI_DEVICE_ID_TIGON3_5703A3    0x16c7
+#define PCI_DEVICE_ID_TIGON3_5781      0x16dd
+#define PCI_DEVICE_ID_TIGON3_5753      0x16f7
+#define PCI_DEVICE_ID_TIGON3_5753M     0x16fd
+#define PCI_DEVICE_ID_TIGON3_5753F     0x16fe
+#define PCI_DEVICE_ID_TIGON3_5901      0x170d
+#define PCI_DEVICE_ID_BCM4401B1                0x170c
+#define PCI_DEVICE_ID_TIGON3_5901_2    0x170e
+#define PCI_DEVICE_ID_BCM4401          0x4401
+#define PCI_DEVICE_ID_BCM4401B0                0x4402
+
+#define PCI_VENDOR_ID_TOPIC            0x151f
+#define PCI_DEVICE_ID_TOPIC_TP560      0x0000
+
+#define PCI_VENDOR_ID_ENE              0x1524
+#define PCI_DEVICE_ID_ENE_1211         0x1211
+#define PCI_DEVICE_ID_ENE_1225         0x1225
+#define PCI_DEVICE_ID_ENE_1410         0x1410
+#define PCI_DEVICE_ID_ENE_1420         0x1420
+
+#define PCI_VENDOR_ID_SYBA             0x1592
+#define PCI_DEVICE_ID_SYBA_2P_EPP      0x0782
+#define PCI_DEVICE_ID_SYBA_1P_ECP      0x0783
+
+#define PCI_VENDOR_ID_MORETON          0x15aa
+#define PCI_DEVICE_ID_RASTEL_2PORT     0x2000
+
+#define PCI_VENDOR_ID_ZOLTRIX          0x15b0
+#define PCI_DEVICE_ID_ZOLTRIX_2BD0     0x2bd0 
+
+#define PCI_VENDOR_ID_MELLANOX         0x15b3
+#define PCI_DEVICE_ID_MELLANOX_TAVOR   0x5a44
+#define PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT 0x6278
+#define PCI_DEVICE_ID_MELLANOX_ARBEL   0x6282
+#define PCI_DEVICE_ID_MELLANOX_SINAI_OLD 0x5e8c
+#define PCI_DEVICE_ID_MELLANOX_SINAI   0x6274
+
+#define PCI_VENDOR_ID_PDC              0x15e9
+#define PCI_DEVICE_ID_PDC_1841         0x1841
+
+#define PCI_VENDOR_ID_MACROLINK                0x15ed
+#define PCI_DEVICE_ID_MACROLINK_MCCS8  0x1000
+#define PCI_DEVICE_ID_MACROLINK_MCCS   0x1001
+#define PCI_DEVICE_ID_MACROLINK_MCCS8H 0x1002
+#define PCI_DEVICE_ID_MACROLINK_MCCSH  0x1003
+#define PCI_DEVICE_ID_MACROLINK_MCCR8  0x2000
+#define PCI_DEVICE_ID_MACROLINK_MCCR   0x2001
+
+#define PCI_VENDOR_ID_FARSITE           0x1619
+#define PCI_DEVICE_ID_FARSITE_T2P       0x0400
+#define PCI_DEVICE_ID_FARSITE_T4P       0x0440
+#define PCI_DEVICE_ID_FARSITE_T1U       0x0610
+#define PCI_DEVICE_ID_FARSITE_T2U       0x0620
+#define PCI_DEVICE_ID_FARSITE_T4U       0x0640
+#define PCI_DEVICE_ID_FARSITE_TE1       0x1610
+#define PCI_DEVICE_ID_FARSITE_TE1C      0x1612
+
+#define PCI_VENDOR_ID_SIBYTE           0x166d
+#define PCI_DEVICE_ID_BCM1250_HT       0x0002
+
+#define PCI_VENDOR_ID_LINKSYS          0x1737
+#define PCI_DEVICE_ID_LINKSYS_EG1032   0x1032
+#define PCI_DEVICE_ID_LINKSYS_EG1064   0x1064
+
+#define PCI_VENDOR_ID_ALTIMA           0x173b
+#define PCI_DEVICE_ID_ALTIMA_AC1000    0x03e8
+#define PCI_DEVICE_ID_ALTIMA_AC1001    0x03e9
+#define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
+#define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
+
+#define PCI_VENDOR_ID_S2IO             0x17d5
+#define        PCI_DEVICE_ID_S2IO_WIN          0x5731
+#define        PCI_DEVICE_ID_S2IO_UNI          0x5831
+#define PCI_DEVICE_ID_HERC_WIN         0x5732
+#define PCI_DEVICE_ID_HERC_UNI         0x5832
+
+#define PCI_VENDOR_ID_INFINICON                0x1820
+
+#define PCI_VENDOR_ID_TOPSPIN          0x1867
+
+#define PCI_VENDOR_ID_TDI               0x192E
+#define PCI_DEVICE_ID_TDI_EHCI          0x0101
+
+#define PCI_VENDOR_ID_SYMPHONY         0x1c1c
+#define PCI_DEVICE_ID_SYMPHONY_101     0x0001
+
+#define PCI_VENDOR_ID_TEKRAM           0x1de1
+#define PCI_DEVICE_ID_TEKRAM_DC290     0xdc29
+
+#define PCI_VENDOR_ID_HINT             0x3388
+#define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013
+
+#define PCI_VENDOR_ID_3DLABS           0x3d3d
+#define PCI_DEVICE_ID_3DLABS_300SX     0x0001
+#define PCI_DEVICE_ID_3DLABS_500TX     0x0002
+#define PCI_DEVICE_ID_3DLABS_DELTA     0x0003
+#define PCI_DEVICE_ID_3DLABS_PERMEDIA  0x0004
+#define PCI_DEVICE_ID_3DLABS_MX                0x0006
+#define PCI_DEVICE_ID_3DLABS_PERMEDIA2 0x0007
+#define PCI_DEVICE_ID_3DLABS_GAMMA     0x0008
+#define PCI_DEVICE_ID_3DLABS_PERMEDIA2V        0x0009
+
+#define PCI_VENDOR_ID_AVANCE           0x4005
+#define PCI_DEVICE_ID_AVANCE_ALG2064   0x2064
+#define PCI_DEVICE_ID_AVANCE_2302      0x2302
+
+#define PCI_VENDOR_ID_AKS              0x416c
+#define PCI_DEVICE_ID_AKS_ALADDINCARD  0x0100
+#define PCI_DEVICE_ID_AKS_CPC          0x0200
+
+#define PCI_VENDOR_ID_REDCREEK         0x4916
+#define PCI_DEVICE_ID_RC45             0x1960
+
+#define PCI_VENDOR_ID_NETVIN           0x4a14
+#define PCI_DEVICE_ID_NETVIN_NV5000SC  0x5000
+
+#define PCI_VENDOR_ID_S3               0x5333
+#define PCI_DEVICE_ID_S3_PLATO_PXS     0x0551
+#define PCI_DEVICE_ID_S3_ViRGE         0x5631
+#define PCI_DEVICE_ID_S3_TRIO          0x8811
+#define PCI_DEVICE_ID_S3_AURORA64VP    0x8812
+#define PCI_DEVICE_ID_S3_TRIO64UVP     0x8814
+#define PCI_DEVICE_ID_S3_ViRGE_VX      0x883d
+#define PCI_DEVICE_ID_S3_868           0x8880
+#define PCI_DEVICE_ID_S3_928           0x88b0
+#define PCI_DEVICE_ID_S3_864_1         0x88c0
+#define PCI_DEVICE_ID_S3_864_2         0x88c1
+#define PCI_DEVICE_ID_S3_964_1         0x88d0
+#define PCI_DEVICE_ID_S3_964_2         0x88d1
+#define PCI_DEVICE_ID_S3_968           0x88f0
+#define PCI_DEVICE_ID_S3_TRIO64V2      0x8901
+#define PCI_DEVICE_ID_S3_PLATO_PXG     0x8902
+#define PCI_DEVICE_ID_S3_ViRGE_DXGX    0x8a01
+#define PCI_DEVICE_ID_S3_ViRGE_GX2     0x8a10
+#define PCI_DEVICE_ID_S3_SAVAGE4       0x8a25
+#define PCI_DEVICE_ID_S3_ViRGE_MX      0x8c01
+#define PCI_DEVICE_ID_S3_ViRGE_MXP     0x8c02
+#define PCI_DEVICE_ID_S3_ViRGE_MXPMV   0x8c03
+#define PCI_DEVICE_ID_S3_PROSAVAGE8    0x8d04
+#define PCI_DEVICE_ID_S3_SONICVIBES    0xca00
+
+#define PCI_VENDOR_ID_DUNORD           0x5544
+#define PCI_DEVICE_ID_DUNORD_I3000     0x0001
+
+#define PCI_VENDOR_ID_DCI              0x6666
+#define PCI_DEVICE_ID_DCI_PCCOM4       0x0001
+#define PCI_DEVICE_ID_DCI_PCCOM8       0x0002
+
+#define PCI_VENDOR_ID_DUNORD           0x5544
+#define PCI_DEVICE_ID_DUNORD_I3000     0x0001
+
+#define PCI_VENDOR_ID_GENROCO          0x5555
+#define PCI_DEVICE_ID_GENROCO_HFP832   0x0003
+
+#define PCI_VENDOR_ID_INTEL            0x8086
+#define PCI_DEVICE_ID_INTEL_EESSC      0x0008
+#define PCI_DEVICE_ID_INTEL_21145      0x0039
+#define PCI_DEVICE_ID_INTEL_82375      0x0482
+#define PCI_DEVICE_ID_INTEL_82424      0x0483
+#define PCI_DEVICE_ID_INTEL_82378      0x0484
+#define PCI_DEVICE_ID_INTEL_82430      0x0486
+#define PCI_DEVICE_ID_INTEL_82434      0x04a3
+#define PCI_DEVICE_ID_INTEL_I960       0x0960
+#define PCI_DEVICE_ID_INTEL_I960RM     0x0962
+#define PCI_DEVICE_ID_INTEL_82562ET    0x1031
+#define PCI_DEVICE_ID_INTEL_82801CAM   0x1038
+#define PCI_DEVICE_ID_INTEL_82815_MC   0x1130
+#define PCI_DEVICE_ID_INTEL_82815_AB   0x1131
+#define PCI_DEVICE_ID_INTEL_82815_CGC  0x1132
+#define PCI_DEVICE_ID_INTEL_82559ER    0x1209
+#define PCI_DEVICE_ID_INTEL_82092AA_0  0x1221
+#define PCI_DEVICE_ID_INTEL_82092AA_1  0x1222
+#define PCI_DEVICE_ID_INTEL_7116       0x1223
+#define PCI_DEVICE_ID_INTEL_7505_0     0x2550  
+#define PCI_DEVICE_ID_INTEL_7505_1     0x2552  
+#define PCI_DEVICE_ID_INTEL_7205_0     0x255d
+#define PCI_DEVICE_ID_INTEL_82596      0x1226
+#define PCI_DEVICE_ID_INTEL_82865      0x1227
+#define PCI_DEVICE_ID_INTEL_82557      0x1229
+#define PCI_DEVICE_ID_INTEL_82437      0x122d
+#define PCI_DEVICE_ID_INTEL_82371FB_0  0x122e
+#define PCI_DEVICE_ID_INTEL_82371FB_1  0x1230
+#define PCI_DEVICE_ID_INTEL_82371MX    0x1234
+#define PCI_DEVICE_ID_INTEL_82437MX    0x1235
+#define PCI_DEVICE_ID_INTEL_82441      0x1237
+#define PCI_DEVICE_ID_INTEL_82380FB    0x124b
+#define PCI_DEVICE_ID_INTEL_82439      0x1250
+#define PCI_DEVICE_ID_INTEL_80960_RP   0x1960
+#define PCI_DEVICE_ID_INTEL_82840_HB   0x1a21
+#define PCI_DEVICE_ID_INTEL_82845_HB   0x1a30
+#define PCI_DEVICE_ID_INTEL_82801AA_0  0x2410
+#define PCI_DEVICE_ID_INTEL_82801AA_1  0x2411
+#define PCI_DEVICE_ID_INTEL_82801AA_2  0x2412
+#define PCI_DEVICE_ID_INTEL_82801AA_3  0x2413
+#define PCI_DEVICE_ID_INTEL_82801AA_5  0x2415
+#define PCI_DEVICE_ID_INTEL_82801AA_6  0x2416
+#define PCI_DEVICE_ID_INTEL_82801AA_8  0x2418
+#define PCI_DEVICE_ID_INTEL_82801AB_0  0x2420
+#define PCI_DEVICE_ID_INTEL_82801AB_1  0x2421
+#define PCI_DEVICE_ID_INTEL_82801AB_2  0x2422
+#define PCI_DEVICE_ID_INTEL_82801AB_3  0x2423
+#define PCI_DEVICE_ID_INTEL_82801AB_5  0x2425
+#define PCI_DEVICE_ID_INTEL_82801AB_6  0x2426
+#define PCI_DEVICE_ID_INTEL_82801AB_8  0x2428
+#define PCI_DEVICE_ID_INTEL_82801BA_0  0x2440
+#define PCI_DEVICE_ID_INTEL_82801BA_1  0x2442
+#define PCI_DEVICE_ID_INTEL_82801BA_2  0x2443
+#define PCI_DEVICE_ID_INTEL_82801BA_3  0x2444
+#define PCI_DEVICE_ID_INTEL_82801BA_4  0x2445
+#define PCI_DEVICE_ID_INTEL_82801BA_5  0x2446
+#define PCI_DEVICE_ID_INTEL_82801BA_6  0x2448
+#define PCI_DEVICE_ID_INTEL_82801BA_7  0x2449
+#define PCI_DEVICE_ID_INTEL_82801BA_8  0x244a
+#define PCI_DEVICE_ID_INTEL_82801BA_9  0x244b
+#define PCI_DEVICE_ID_INTEL_82801BA_10 0x244c
+#define PCI_DEVICE_ID_INTEL_82801BA_11 0x244e
+#define PCI_DEVICE_ID_INTEL_82801E_0   0x2450
+#define PCI_DEVICE_ID_INTEL_82801E_2   0x2452
+#define PCI_DEVICE_ID_INTEL_82801E_3   0x2453
+#define PCI_DEVICE_ID_INTEL_82801E_9   0x2459
+#define PCI_DEVICE_ID_INTEL_82801E_11  0x245b
+#define PCI_DEVICE_ID_INTEL_82801E_13  0x245d
+#define PCI_DEVICE_ID_INTEL_82801E_14  0x245e
+#define PCI_DEVICE_ID_INTEL_82801CA_0  0x2480
+#define PCI_DEVICE_ID_INTEL_82801CA_2  0x2482
+#define PCI_DEVICE_ID_INTEL_82801CA_3  0x2483
+#define PCI_DEVICE_ID_INTEL_82801CA_4  0x2484
+#define PCI_DEVICE_ID_INTEL_82801CA_5  0x2485
+#define PCI_DEVICE_ID_INTEL_82801CA_6  0x2486
+#define PCI_DEVICE_ID_INTEL_82801CA_7  0x2487
+#define PCI_DEVICE_ID_INTEL_82801CA_10 0x248a
+#define PCI_DEVICE_ID_INTEL_82801CA_11 0x248b
+#define PCI_DEVICE_ID_INTEL_82801CA_12 0x248c
+#define PCI_DEVICE_ID_INTEL_82801DB_0  0x24c0
+#define PCI_DEVICE_ID_INTEL_82801DB_1  0x24c1
+#define PCI_DEVICE_ID_INTEL_82801DB_2  0x24c2
+#define PCI_DEVICE_ID_INTEL_82801DB_3  0x24c3
+#define PCI_DEVICE_ID_INTEL_82801DB_4  0x24c4
+#define PCI_DEVICE_ID_INTEL_82801DB_5  0x24c5
+#define PCI_DEVICE_ID_INTEL_82801DB_6  0x24c6
+#define PCI_DEVICE_ID_INTEL_82801DB_7  0x24c7
+#define PCI_DEVICE_ID_INTEL_82801DB_9  0x24c9
+#define PCI_DEVICE_ID_INTEL_82801DB_10 0x24ca
+#define PCI_DEVICE_ID_INTEL_82801DB_11 0x24cb
+#define PCI_DEVICE_ID_INTEL_82801DB_12  0x24cc
+#define PCI_DEVICE_ID_INTEL_82801DB_13 0x24cd
+#define PCI_DEVICE_ID_INTEL_82801EB_0  0x24d0
+#define PCI_DEVICE_ID_INTEL_82801EB_1  0x24d1
+#define PCI_DEVICE_ID_INTEL_82801EB_2  0x24d2
+#define PCI_DEVICE_ID_INTEL_82801EB_3  0x24d3
+#define PCI_DEVICE_ID_INTEL_82801EB_4  0x24d4
+#define PCI_DEVICE_ID_INTEL_82801EB_5  0x24d5
+#define PCI_DEVICE_ID_INTEL_82801EB_6  0x24d6
+#define PCI_DEVICE_ID_INTEL_82801EB_7  0x24d7
+#define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
+#define PCI_DEVICE_ID_INTEL_82801EB_13 0x24dd
+#define PCI_DEVICE_ID_INTEL_ESB_1      0x25a1
+#define PCI_DEVICE_ID_INTEL_ESB_2      0x25a2
+#define PCI_DEVICE_ID_INTEL_ESB_3      0x25a3
+#define PCI_DEVICE_ID_INTEL_ESB_31     0x25b0
+#define PCI_DEVICE_ID_INTEL_ESB_4      0x25a4
+#define PCI_DEVICE_ID_INTEL_ESB_5      0x25a6
+#define PCI_DEVICE_ID_INTEL_ESB_6      0x25a7
+#define PCI_DEVICE_ID_INTEL_ESB_7      0x25a9
+#define PCI_DEVICE_ID_INTEL_ESB_8      0x25aa
+#define PCI_DEVICE_ID_INTEL_ESB_9      0x25ab
+#define PCI_DEVICE_ID_INTEL_ESB_11     0x25ac
+#define PCI_DEVICE_ID_INTEL_ESB_12     0x25ad
+#define PCI_DEVICE_ID_INTEL_ESB_13     0x25ae
+#define PCI_DEVICE_ID_INTEL_82820_HB   0x2500
+#define PCI_DEVICE_ID_INTEL_82820_UP_HB        0x2501
+#define PCI_DEVICE_ID_INTEL_82850_HB   0x2530
+#define PCI_DEVICE_ID_INTEL_82860_HB   0x2531
+#define PCI_DEVICE_ID_INTEL_82845G_HB  0x2560
+#define PCI_DEVICE_ID_INTEL_82845G_IG  0x2562
+#define PCI_DEVICE_ID_INTEL_82865_HB   0x2570
+#define PCI_DEVICE_ID_INTEL_82865_IG   0x2572
+#define PCI_DEVICE_ID_INTEL_82875_HB   0x2578
+#define PCI_DEVICE_ID_INTEL_82875_IG   0x257b
+#define PCI_DEVICE_ID_INTEL_82915G_HB  0x2580
+#define PCI_DEVICE_ID_INTEL_82915G_IG  0x2582
+#define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590
+#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592
+#define PCI_DEVICE_ID_INTEL_82945G_HB  0x2770
+#define PCI_DEVICE_ID_INTEL_82945G_IG  0x2772
+#define PCI_DEVICE_ID_INTEL_ICH6_0     0x2640
+#define PCI_DEVICE_ID_INTEL_ICH6_1     0x2641
+#define PCI_DEVICE_ID_INTEL_ICH6_2     0x2642
+#define PCI_DEVICE_ID_INTEL_ICH6_3     0x2651
+#define PCI_DEVICE_ID_INTEL_ICH6_4     0x2652
+#define PCI_DEVICE_ID_INTEL_ICH6_5     0x2653
+#define PCI_DEVICE_ID_INTEL_ICH6_6     0x2658
+#define PCI_DEVICE_ID_INTEL_ICH6_7     0x2659
+#define PCI_DEVICE_ID_INTEL_ICH6_8     0x265a
+#define PCI_DEVICE_ID_INTEL_ICH6_9     0x265b
+#define PCI_DEVICE_ID_INTEL_ICH6_10    0x265c
+#define PCI_DEVICE_ID_INTEL_ICH6_11    0x2660
+#define PCI_DEVICE_ID_INTEL_ICH6_12    0x2662
+#define PCI_DEVICE_ID_INTEL_ICH6_13    0x2664
+#define PCI_DEVICE_ID_INTEL_ICH6_14    0x2666
+#define PCI_DEVICE_ID_INTEL_ICH6_15    0x2668
+#define PCI_DEVICE_ID_INTEL_ICH6_16    0x266a
+#define PCI_DEVICE_ID_INTEL_ICH6_17    0x266d
+#define PCI_DEVICE_ID_INTEL_ICH6_18    0x266e
+#define PCI_DEVICE_ID_INTEL_ICH6_19    0x266f
+#define PCI_DEVICE_ID_INTEL_ESB2_0     0x2670
+#define PCI_DEVICE_ID_INTEL_ESB2_1     0x2680
+#define PCI_DEVICE_ID_INTEL_ESB2_2     0x2681
+#define PCI_DEVICE_ID_INTEL_ESB2_3     0x2682
+#define PCI_DEVICE_ID_INTEL_ESB2_4     0x2683
+#define PCI_DEVICE_ID_INTEL_ESB2_5     0x2688
+#define PCI_DEVICE_ID_INTEL_ESB2_6     0x2689
+#define PCI_DEVICE_ID_INTEL_ESB2_7     0x268a
+#define PCI_DEVICE_ID_INTEL_ESB2_8     0x268b
+#define PCI_DEVICE_ID_INTEL_ESB2_9     0x268c
+#define PCI_DEVICE_ID_INTEL_ESB2_10    0x2690
+#define PCI_DEVICE_ID_INTEL_ESB2_11    0x2692
+#define PCI_DEVICE_ID_INTEL_ESB2_12    0x2694
+#define PCI_DEVICE_ID_INTEL_ESB2_13    0x2696
+#define PCI_DEVICE_ID_INTEL_ESB2_14    0x2698
+#define PCI_DEVICE_ID_INTEL_ESB2_15    0x2699
+#define PCI_DEVICE_ID_INTEL_ESB2_16    0x269a
+#define PCI_DEVICE_ID_INTEL_ESB2_17    0x269b
+#define PCI_DEVICE_ID_INTEL_ESB2_18    0x269e
+#define PCI_DEVICE_ID_INTEL_ICH7_0     0x27b8
+#define PCI_DEVICE_ID_INTEL_ICH7_1     0x27b9
+#define PCI_DEVICE_ID_INTEL_ICH7_2     0x27c0
+#define PCI_DEVICE_ID_INTEL_ICH7_3     0x27c1
+#define PCI_DEVICE_ID_INTEL_ICH7_30    0x27b0
+#define PCI_DEVICE_ID_INTEL_ICH7_31    0x27bd
+#define PCI_DEVICE_ID_INTEL_ICH7_5     0x27c4
+#define PCI_DEVICE_ID_INTEL_ICH7_6     0x27c5
+#define PCI_DEVICE_ID_INTEL_ICH7_7     0x27c8
+#define PCI_DEVICE_ID_INTEL_ICH7_8     0x27c9
+#define PCI_DEVICE_ID_INTEL_ICH7_9     0x27ca
+#define PCI_DEVICE_ID_INTEL_ICH7_10    0x27cb
+#define PCI_DEVICE_ID_INTEL_ICH7_11    0x27cc
+#define PCI_DEVICE_ID_INTEL_ICH7_12    0x27d0
+#define PCI_DEVICE_ID_INTEL_ICH7_13    0x27d2
+#define PCI_DEVICE_ID_INTEL_ICH7_14    0x27d4
+#define PCI_DEVICE_ID_INTEL_ICH7_15    0x27d6
+#define PCI_DEVICE_ID_INTEL_ICH7_16    0x27d8
+#define PCI_DEVICE_ID_INTEL_ICH7_17    0x27da
+#define PCI_DEVICE_ID_INTEL_ICH7_18    0x27dc
+#define PCI_DEVICE_ID_INTEL_ICH7_19    0x27dd
+#define PCI_DEVICE_ID_INTEL_ICH7_20    0x27de
+#define PCI_DEVICE_ID_INTEL_ICH7_21    0x27df
+#define PCI_DEVICE_ID_INTEL_ICH7_22    0x27e0
+#define PCI_DEVICE_ID_INTEL_ICH7_23    0x27e2
+#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340
+#define PCI_DEVICE_ID_INTEL_ESB2_19    0x3500
+#define PCI_DEVICE_ID_INTEL_ESB2_20    0x3501
+#define PCI_DEVICE_ID_INTEL_ESB2_21    0x3504
+#define PCI_DEVICE_ID_INTEL_ESB2_22    0x3505
+#define PCI_DEVICE_ID_INTEL_ESB2_23    0x350c
+#define PCI_DEVICE_ID_INTEL_ESB2_24    0x350d
+#define PCI_DEVICE_ID_INTEL_ESB2_25    0x3510
+#define PCI_DEVICE_ID_INTEL_ESB2_26    0x3511
+#define PCI_DEVICE_ID_INTEL_ESB2_27    0x3514
+#define PCI_DEVICE_ID_INTEL_ESB2_28    0x3515
+#define PCI_DEVICE_ID_INTEL_ESB2_29    0x3518
+#define PCI_DEVICE_ID_INTEL_ESB2_30    0x3519
+#define PCI_DEVICE_ID_INTEL_82830_HB   0x3575
+#define PCI_DEVICE_ID_INTEL_82830_CGC  0x3577
+#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
+#define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
+#define PCI_DEVICE_ID_INTEL_E7520_MCH  0x3590
+#define PCI_DEVICE_ID_INTEL_E7320_MCH  0x3592
+#define PCI_DEVICE_ID_INTEL_MCH_PA     0x3595
+#define PCI_DEVICE_ID_INTEL_MCH_PA1    0x3596
+#define PCI_DEVICE_ID_INTEL_MCH_PB     0x3597
+#define PCI_DEVICE_ID_INTEL_MCH_PB1    0x3598
+#define PCI_DEVICE_ID_INTEL_MCH_PC     0x3599
+#define PCI_DEVICE_ID_INTEL_MCH_PC1    0x359a
+#define PCI_DEVICE_ID_INTEL_E7525_MCH  0x359e
+#define PCI_DEVICE_ID_INTEL_80310      0x530d
+#define PCI_DEVICE_ID_INTEL_82371SB_0  0x7000
+#define PCI_DEVICE_ID_INTEL_82371SB_1  0x7010
+#define PCI_DEVICE_ID_INTEL_82371SB_2  0x7020
+#define PCI_DEVICE_ID_INTEL_82437VX    0x7030
+#define PCI_DEVICE_ID_INTEL_82439TX    0x7100
+#define PCI_DEVICE_ID_INTEL_82371AB_0  0x7110
+#define PCI_DEVICE_ID_INTEL_82371AB    0x7111
+#define PCI_DEVICE_ID_INTEL_82371AB_2  0x7112
+#define PCI_DEVICE_ID_INTEL_82371AB_3  0x7113
+#define PCI_DEVICE_ID_INTEL_82810_MC1  0x7120
+#define PCI_DEVICE_ID_INTEL_82810_IG1  0x7121
+#define PCI_DEVICE_ID_INTEL_82810_MC3  0x7122
+#define PCI_DEVICE_ID_INTEL_82810_IG3  0x7123
+#define PCI_DEVICE_ID_INTEL_82810E_MC  0x7124
+#define PCI_DEVICE_ID_INTEL_82810E_IG  0x7125
+#define PCI_DEVICE_ID_INTEL_82443LX_0  0x7180
+#define PCI_DEVICE_ID_INTEL_82443LX_1  0x7181
+#define PCI_DEVICE_ID_INTEL_82443BX_0  0x7190
+#define PCI_DEVICE_ID_INTEL_82443BX_1  0x7191
+#define PCI_DEVICE_ID_INTEL_82443BX_2  0x7192
+#define PCI_DEVICE_ID_INTEL_440MX      0x7195
+#define PCI_DEVICE_ID_INTEL_82443MX_0  0x7198
+#define PCI_DEVICE_ID_INTEL_82443MX_1  0x7199
+#define PCI_DEVICE_ID_INTEL_82443MX_2  0x719a
+#define PCI_DEVICE_ID_INTEL_82443MX_3  0x719b
+#define PCI_DEVICE_ID_INTEL_82443GX_0  0x71a0
+#define PCI_DEVICE_ID_INTEL_82443GX_1  0x71a1
+#define PCI_DEVICE_ID_INTEL_82443GX_2  0x71a2
+#define PCI_DEVICE_ID_INTEL_82372FB_0  0x7600
+#define PCI_DEVICE_ID_INTEL_82372FB_1  0x7601
+#define PCI_DEVICE_ID_INTEL_82372FB_2  0x7602
+#define PCI_DEVICE_ID_INTEL_82372FB_3  0x7603
+#define PCI_DEVICE_ID_INTEL_82454GX    0x84c4
+#define PCI_DEVICE_ID_INTEL_82450GX    0x84c5
+#define PCI_DEVICE_ID_INTEL_82451NX    0x84ca
+#define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
+#define PCI_DEVICE_ID_INTEL_84460GX    0x84ea
+#define PCI_DEVICE_ID_INTEL_IXP4XX     0x8500
+#define PCI_DEVICE_ID_INTEL_IXP2400    0x9001
+#define PCI_DEVICE_ID_INTEL_IXP2800    0x9004
+#define PCI_DEVICE_ID_INTEL_S21152BB   0xb152
+
+#define PCI_VENDOR_ID_COMPUTONE                0x8e0e
+#define PCI_DEVICE_ID_COMPUTONE_IP2EX  0x0291
+#define PCI_DEVICE_ID_COMPUTONE_PG     0x0302
+#define PCI_SUBVENDOR_ID_COMPUTONE     0x8e0e
+#define PCI_SUBDEVICE_ID_COMPUTONE_PG4 0x0001
+#define PCI_SUBDEVICE_ID_COMPUTONE_PG8 0x0002
+#define PCI_SUBDEVICE_ID_COMPUTONE_PG6 0x0003
+
+#define PCI_VENDOR_ID_KTI              0x8e2e
+#define PCI_DEVICE_ID_KTI_ET32P2       0x3000
+
+#define PCI_VENDOR_ID_ADAPTEC          0x9004
+#define PCI_DEVICE_ID_ADAPTEC_7810     0x1078
+#define PCI_DEVICE_ID_ADAPTEC_7821     0x2178
+#define PCI_DEVICE_ID_ADAPTEC_38602    0x3860
+#define PCI_DEVICE_ID_ADAPTEC_7850     0x5078
+#define PCI_DEVICE_ID_ADAPTEC_7855     0x5578
+#define PCI_DEVICE_ID_ADAPTEC_5800     0x5800
+#define PCI_DEVICE_ID_ADAPTEC_3860     0x6038
+#define PCI_DEVICE_ID_ADAPTEC_1480A    0x6075
+#define PCI_DEVICE_ID_ADAPTEC_7860     0x6078
+#define PCI_DEVICE_ID_ADAPTEC_7861     0x6178
+#define PCI_DEVICE_ID_ADAPTEC_7870     0x7078
+#define PCI_DEVICE_ID_ADAPTEC_7871     0x7178
+#define PCI_DEVICE_ID_ADAPTEC_7872     0x7278
+#define PCI_DEVICE_ID_ADAPTEC_7873     0x7378
+#define PCI_DEVICE_ID_ADAPTEC_7874     0x7478
+#define PCI_DEVICE_ID_ADAPTEC_7895     0x7895
+#define PCI_DEVICE_ID_ADAPTEC_7880     0x8078
+#define PCI_DEVICE_ID_ADAPTEC_7881     0x8178
+#define PCI_DEVICE_ID_ADAPTEC_7882     0x8278
+#define PCI_DEVICE_ID_ADAPTEC_7883     0x8378
+#define PCI_DEVICE_ID_ADAPTEC_7884     0x8478
+#define PCI_DEVICE_ID_ADAPTEC_7885     0x8578
+#define PCI_DEVICE_ID_ADAPTEC_7886     0x8678
+#define PCI_DEVICE_ID_ADAPTEC_7887     0x8778
+#define PCI_DEVICE_ID_ADAPTEC_7888     0x8878
+#define PCI_DEVICE_ID_ADAPTEC_1030     0x8b78
+
+#define PCI_VENDOR_ID_ADAPTEC2         0x9005
+#define PCI_DEVICE_ID_ADAPTEC2_2940U2  0x0010
+#define PCI_DEVICE_ID_ADAPTEC2_2930U2  0x0011
+#define PCI_DEVICE_ID_ADAPTEC2_7890B   0x0013
+#define PCI_DEVICE_ID_ADAPTEC2_7890    0x001f
+#define PCI_DEVICE_ID_ADAPTEC2_3940U2  0x0050
+#define PCI_DEVICE_ID_ADAPTEC2_3950U2D 0x0051
+#define PCI_DEVICE_ID_ADAPTEC2_7896    0x005f
+#define PCI_DEVICE_ID_ADAPTEC2_7892A   0x0080
+#define PCI_DEVICE_ID_ADAPTEC2_7892B   0x0081
+#define PCI_DEVICE_ID_ADAPTEC2_7892D   0x0083
+#define PCI_DEVICE_ID_ADAPTEC2_7892P   0x008f
+#define PCI_DEVICE_ID_ADAPTEC2_7899A   0x00c0
+#define PCI_DEVICE_ID_ADAPTEC2_7899B   0x00c1
+#define PCI_DEVICE_ID_ADAPTEC2_7899D   0x00c3
+#define PCI_DEVICE_ID_ADAPTEC2_7899P   0x00cf
+#define PCI_DEVICE_ID_ADAPTEC2_SCAMP   0x0503
+
+#define PCI_VENDOR_ID_ATRONICS         0x907f
+#define PCI_DEVICE_ID_ATRONICS_2015    0x2015
+
+#define PCI_VENDOR_ID_HOLTEK           0x9412
+#define PCI_DEVICE_ID_HOLTEK_6565      0x6565
+
+#define PCI_VENDOR_ID_NETMOS           0x9710
+#define PCI_DEVICE_ID_NETMOS_9705      0x9705
+#define PCI_DEVICE_ID_NETMOS_9715      0x9715
+#define PCI_DEVICE_ID_NETMOS_9735      0x9735
+#define PCI_DEVICE_ID_NETMOS_9745      0x9745
+#define PCI_DEVICE_ID_NETMOS_9755      0x9755
+#define PCI_DEVICE_ID_NETMOS_9805      0x9805
+#define PCI_DEVICE_ID_NETMOS_9815      0x9815
+#define PCI_DEVICE_ID_NETMOS_9835      0x9835
+#define PCI_DEVICE_ID_NETMOS_9845      0x9845
+#define PCI_DEVICE_ID_NETMOS_9855      0x9855
+
+#define PCI_SUBVENDOR_ID_EXSYS         0xd84d
+#define PCI_SUBDEVICE_ID_EXSYS_4014    0x4014
+
+#define PCI_VENDOR_ID_TIGERJET         0xe159
+#define PCI_DEVICE_ID_TIGERJET_300     0x0001
+#define PCI_DEVICE_ID_TIGERJET_100     0x0002
+
+#define PCI_VENDOR_ID_TTTECH           0x0357
+#define PCI_DEVICE_ID_TTTECH_MC322     0x000A
+
+#define PCI_VENDOR_ID_ARK              0xedd8
+#define PCI_DEVICE_ID_ARK_STING                0xa091
+#define PCI_DEVICE_ID_ARK_STINGARK     0xa099
+#define PCI_DEVICE_ID_ARK_2000MT       0xa0a1