Changeset 2268d20 in freewrt

Timestamp:

Jul 7, 2006, 12:14:16 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

dfb8263

Parents:

b232ea4

Message:

use OpenWrt whiterussian system code and wireless driver

• make it build with 2.4.32
• add netgear wgt634u patches (untested)
• keep newest flash map stuff
• add wlcompat and wl.o from whiterussian
• add diag_led.c from whiterussian

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@177 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

target/linux

Files:

• brcm-2.4/Makefile (modified) (2 diffs)
• brcm-2.4/config (modified) (1 diff)
• brcm-2.4/patches/001-bcm47xx.patch (modified) (367 diffs)
• kernel.mk (modified) (2 diffs)
• package/diag/diag_led.c (modified) (14 diffs)
• package/wlcompat/wlcompat.c (modified) (3 diffs)

target/linux/brcm-2.4/Makefile

@@ +1 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
@@ -36 +38 @@
 
 LINUX_BINARY_DRIVER_SITE=http://www.freewrt.org/distfiles
-# proprietary driver, extracted from Linksys GPL sourcetree WRT54GS 4.70.6
-LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.7.tar.gz
-LINUX_BINARY_WL_MD5SUM=ff50130914790cbae9b73a13513da5ee
+LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.4.tar.gz
+LINUX_BINARY_WL_MD5SUM=35a3e22aa8a56555b4ba01d09454d7ec
 
 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):

target/linux/brcm-2.4/config

@@ -247 +247 @@
 # Self-contained MTD device drivers
 #
-CONFIG_MTD_SFLASH=y
+# CONFIG_MTD_SFLASH is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_SLRAM is not set

target/linux/brcm-2.4/patches/001-bcm47xx.patch

@@ -1 @@
-diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
---- linux.old/arch/mips/Makefile        2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/Makefile        2006-04-27 19:24:19.000000000 +0200
-@@ -726,6 +726,19 @@
+diff -Nur linux-2.4.32/arch/mips/Makefile linux-2.4.32-freewrt/arch/mips/Makefile
+--- linux-2.4.32/arch/mips/Makefile     2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/Makefile     2006-07-06 00:32:54.000000000 +0200
+@@ -715,6 +715,19 @@
  endif
  
@@ -9 +9 @@
 +#
 +ifdef CONFIG_BCM947XX
-+LIBS           += arch/mips/bcm947xx/generic/brcm.o arch/mips/bcm947xx/bcm947xx.o 
-+SUBDIRS                += arch/mips/bcm947xx/generic arch/mips/bcm947xx 
-+LOADADDR       := 0x80001000
++LIBS           += arch/mips/bcm947xx/generic/brcm.o arch/mips/bcm947xx/bcm947xx.o 
++SUBDIRS                += arch/mips/bcm947xx/generic arch/mips/bcm947xx 
++LOADADDR       := 0x80001000
 +
 +zImage: vmlinux
@@ -22 +22 @@
  # error messages during linking.  Select a default linkscript if
  # none has been choosen above.
-@@ -778,6 +791,7 @@
+@@ -767,6 +780,7 @@
         $(MAKE) -C arch/$(ARCH)/tools clean
         $(MAKE) -C arch/mips/baget clean
@@ -30 +30 @@
  archmrproper:
         @$(MAKEBOOT) mrproper
-diff -urN linux.old/arch/mips/bcm947xx/Makefile linux.dev/arch/mips/bcm947xx/Makefile
---- linux.old/arch/mips/bcm947xx/Makefile       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/Makefile       2006-05-02 17:46:22.000000000 +0200
-@@ -0,0 +1,17 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/Makefile linux-2.4.32-freewrt/arch/mips/bcm947xx/Makefile
+--- linux-2.4.32/arch/mips/bcm947xx/Makefile    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/Makefile    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,15 @@
 +#
 +# Makefile for the BCM947xx specific kernel interface routines
@@ -43 +43 @@
 +O_TARGET        := bcm947xx.o
 +
-+export-objs     := export.o
++export-objs     := nvram_linux.o setup.o
 +obj-y          := prom.o setup.o time.o sbmips.o gpio.o
-+obj-y          += nvram.o nvram_linux.o sflash.o cfe_env.o
-+obj-y          += sbutils.o bcmutils.o bcmsrom.o hndchipc.o
++obj-y          += nvram.o nvram_linux.o
 +obj-$(CONFIG_PCI) += sbpci.o pcibios.o
-+obj-y          += export.o
 +
 +include $(TOPDIR)/Rules.make
-diff -urN linux.old/arch/mips/bcm947xx/bcmsrom.c linux.dev/arch/mips/bcm947xx/bcmsrom.c
---- linux.old/arch/mips/bcm947xx/bcmsrom.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/bcmsrom.c      2006-04-27 20:32:48.000000000 +0200
-@@ -0,0 +1,1212 @@
-+/*
-+ *  Misc useful routines to access NIC SROM/OTP .
-+ *
-+ * Copyright 2006, 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.1.14 2006/04/15 01:28:25 michael Exp $
-+ */
-+
-+#include <typedefs.h>
-+#include <bcmdefs.h>
-+#include <osl.h>
-+#include <bcmutils.h>
-+#include <bcmsrom.h>
-+#include <bcmdevs.h>
-+#include <bcmendian.h>
-+#include <sbpcmcia.h>
-+#include <pcicfg.h>
-+#include <sbutils.h>
-+#include <bcmnvram.h>
-+
-+/* debug/trace */
-+#if defined(WLTEST)
-+#define        BS_ERROR(args)  printf args
-+#else
-+#define        BS_ERROR(args)
-+#endif /* BCMDBG_ERR || WLTEST */
-+
-+#define        VARS_MAX        4096    /* should be reduced */
-+
-+#define WRITE_ENABLE_DELAY     500     /* 500 ms after write enable/disable toggle */
-+#define WRITE_WORD_DELAY       20      /* 20 ms between each word write */
-+
-+static int initvars_srom_pci(void *sbh, void *curmap, char **vars, uint *count);
-+static int initvars_cis_pcmcia(void *sbh, osl_t *osh, char **vars, uint *count);
-+static int initvars_flash_sb(void *sbh, char **vars, uint *count);
-+static int srom_parsecis(osl_t *osh, uint8 **pcis, uint ciscnt, char **vars, uint *count);
-+static int sprom_cmd_pcmcia(osl_t *osh, uint8 cmd);
-+static int sprom_read_pcmcia(osl_t *osh, uint16 addr, uint16 *data);
-+static int sprom_write_pcmcia(osl_t *osh, uint16 addr, uint16 data);
-+static int sprom_read_pci(osl_t *osh, uint16 *sprom, uint wordoff, uint16 *buf, uint nwords,
-+                          bool check_crc);
-+
-+static int initvars_table(osl_t *osh, char *start, char *end, char **vars, uint *count);
-+static int initvars_flash(osl_t *osh, char **vp, uint len, char *devpath);
-+
-+/*
-+ * Initialize local vars from the right source for this platform.
-+ * Return 0 on success, nonzero on error.
-+ */
-+int
-+srom_var_init(void *sbh, uint bustype, void *curmap, osl_t *osh, char **vars, uint *count)
-+{
-+       ASSERT(bustype == BUSTYPE(bustype));
-+       if (vars == NULL || count == NULL)
-+               return (0);
-+
-+       switch (BUSTYPE(bustype)) {
-+       case SB_BUS:
-+       case JTAG_BUS:
-+               return initvars_flash_sb(sbh, vars, count);
-+
-+       case PCI_BUS:
-+               ASSERT(curmap); /* can not be NULL */
-+               return initvars_srom_pci(sbh, curmap, vars, count);
-+
-+       case PCMCIA_BUS:
-+               return initvars_cis_pcmcia(sbh, osh, vars, count);
-+
-+
-+       default:
-+               ASSERT(0);
-+       }
-+       return (-1);
-+}
-+
-+/* support only 16-bit word read from srom */
-+int
-+srom_read(uint bustype, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf)
-+{
-+       void *srom;
-+       uint i, off, nw;
-+
-+       ASSERT(bustype == BUSTYPE(bustype));
-+
-+       /* check input - 16-bit access only */
-+       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
-+               return 1;
-+
-+       off = byteoff / 2;
-+       nw = nbytes / 2;
-+
-+       if (BUSTYPE(bustype) == PCI_BUS) {
-+               if (!curmap)
-+                       return 1;
-+               srom = (uchar*)curmap + PCI_BAR0_SPROM_OFFSET;
-+               if (sprom_read_pci(osh, srom, off, buf, nw, FALSE))
-+                       return 1;
-+       } else if (BUSTYPE(bustype) == PCMCIA_BUS) {
-+               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 bustype, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf)
-+{
-+       uint16 *srom;
-+       uint i, nw, crc_range;
-+       uint16 image[SPROM_SIZE];
-+       uint8 crc;
-+       volatile uint32 val32;
-+
-+       ASSERT(bustype == BUSTYPE(bustype));
-+
-+       /* check input - 16-bit access only */
-+       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
-+               return 1;
-+
-+       /* Are we writing the whole thing at once? */
-+       if ((byteoff == 0) &&
-+           ((nbytes == SPROM_SIZE) ||
-+            (nbytes == (SPROM_CRC_RANGE * 2)) ||
-+            (nbytes == (SROM4_WORDS * 2)))) {
-+               crc_range = nbytes;
-+               bcopy((void*)buf, (void*)image, nbytes);
-+               nw = nbytes / 2;
-+       } else {
-+               if ((BUSTYPE(bustype) == PCMCIA_BUS) || (BUSTYPE(bustype) == SDIO_BUS))
-+                       crc_range = SPROM_SIZE;
-+               else
-+                       crc_range = SPROM_CRC_RANGE * 2;        /* Tentative */
-+
-+               nw = crc_range / 2;
-+               /* read first 64 words from srom */
-+               if (srom_read(bustype, curmap, osh, 0, nw * 2, image))
-+                       return 1;
-+               if (image[SROM4_SIGN] == SROM4_SIGNATURE) {
-+                       crc_range = SROM4_WORDS;
-+                       nw = crc_range / 2;
-+                       if (srom_read(bustype, 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 = ~hndcrc8((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);
-+
-+       if (BUSTYPE(bustype) == PCI_BUS) {
-+               srom = (uint16*)((uchar*)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(WRITE_ENABLE_DELAY);
-+               /* write srom */
-+               for (i = 0; i < nw; i++) {
-+                       W_REG(osh, &srom[i], image[i]);
-+                       bcm_mdelay(WRITE_WORD_DELAY);
-+               }
-+               /* disable writes to the SPROM */
-+               OSL_PCI_WRITE_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32), val32 &
-+                                    ~SPROM_WRITEEN);
-+       } else if (BUSTYPE(bustype) == PCMCIA_BUS) {
-+               /* enable writes to the SPROM */
-+               if (sprom_cmd_pcmcia(osh, SROM_WEN))
-+                       return 1;
-+               bcm_mdelay(WRITE_ENABLE_DELAY);
-+               /* write srom */
-+               for (i = 0; i < nw; i++) {
-+                       sprom_write_pcmcia(osh, (uint16)(i), image[i]);
-+                       bcm_mdelay(WRITE_WORD_DELAY);
-+               }
-+               /* disable writes to the SPROM */
-+               if (sprom_cmd_pcmcia(osh, SROM_WDS))
-+                       return 1;
-+       } else {
-+               return 1;
-+       }
-+
-+       bcm_mdelay(WRITE_ENABLE_DELAY);
-+       return 0;
-+}
-+
-+
-+static int
-+srom_parsecis(osl_t *osh, uint8 **pcis, uint ciscnt, char **vars, uint *count)
-+{
-+       char eabuf[32];
-+       char *vp, *base;
-+       uint8 *cis, tup, tlen, sromrev = 1;
-+       int i, j;
-+       uint varsize;
-+       bool ag_init = FALSE;
-+       uint32 w32;
-+
-+       ASSERT(vars);
-+       ASSERT(count);
-+
-+       base = vp = MALLOC(osh, VARS_MAX);
-+       ASSERT(vp);
-+       if (!vp)
-+               return -2;
-+
-+       while (ciscnt--) {
-+               cis = *pcis++;
-+               i = 0;
-+               do {
-+                       tup = cis[i++];
-+                       tlen = cis[i++];
-+                       if ((i + tlen) >= CIS_SIZE)
-+                               break;
-+
-+                       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:
-+                               switch (cis[i]) {
-+                               case LAN_NID:
-+                                       ASSERT(cis[i + 1] == 6);
-+                                       bcm_ether_ntoa((struct ether_addr *)&cis[i + 2], eabuf);
-+                                       vp += sprintf(vp, "il0macaddr=%s", eabuf);
-+                                       vp++;
-+                                       break;
-+                               case 1:         /* SDIO Extended Data */
-+                                       vp += sprintf(vp, "sdmaxblk=%d",
-+                                                     (cis[i + 13] << 8) | cis[i + 12]);
-+                                       vp++;
-+                                       break;
-+                               }
-+                               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_SROMREV:
-+                                       sromrev = cis[i + 1];
-+                                       break;
-+
-+                               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, "aa2g=%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:
-+                                       ASSERT(sromrev == 1);
-+                                       vp += sprintf(vp, "cc=%d", cis[i + 1]);
-+                                       vp++;
-+                                       break;
-+
-+                               case HNBU_PAPARMS:
-+                                       if (tlen == 2) {
-+                                               ASSERT(sromrev == 1);
-+                                               vp += sprintf(vp, "pa0maxpwr=%d", cis[i + 1]);
-+                                               vp++;
-+                                       } else if (tlen >= 9) {
-+                                               if (tlen == 10) {
-+                                                       ASSERT(sromrev == 2);
-+                                                       vp += sprintf(vp, "opo=%d", cis[i + 9]);
-+                                                       vp++;
-+                                               } else
-+                                                       ASSERT(tlen == 9);
-+
-+                                               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++;
-+                                               vp += sprintf(vp, "pa0maxpwr=%d", cis[i + 8]);
-+                                               vp++;
-+                                       } else
-+                                               ASSERT(tlen >= 9);
-+                                       break;
-+
-+                               case HNBU_OEM:
-+                                       ASSERT(sromrev == 1);
-+                                       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:
-+                                       w32 = (cis[i + 2] << 8) + cis[i + 1];
-+                                       if (tlen == 5)
-+                                               w32 |= (cis[i + 4] << 24) + (cis[i + 3] << 16);
-+                                       vp += sprintf(vp, "boardflags=0x%x", w32);
-+                                       vp++;
-+                                       break;
-+
-+                               case HNBU_LEDS:
-+                                       if (cis[i + 1] != 0xff) {
-+                                               vp += sprintf(vp, "ledbh0=%d", cis[i + 1]);
-+                                               vp++;
-+                                       }
-+                                       if (cis[i + 2] != 0xff) {
-+                                               vp += sprintf(vp, "ledbh1=%d", cis[i + 2]);
-+                                               vp++;
-+                                       }
-+                                       if (cis[i + 3] != 0xff) {
-+                                               vp += sprintf(vp, "ledbh2=%d", cis[i + 3]);
-+                                               vp++;
-+                                       }
-+                                       if (cis[i + 4] != 0xff) {
-+                                               vp += sprintf(vp, "ledbh3=%d", cis[i + 4]);
-+                                               vp++;
-+                                       }
-+                                       break;
-+
-+                               case HNBU_CCODE:
-+                               {
-+                                       char str[3];
-+                                       ASSERT(sromrev > 1);
-+                                       str[0] = cis[i + 1];
-+                                       str[1] = cis[i + 2];
-+                                       str[2] = 0;
-+                                       vp += sprintf(vp, "ccode=%s", str);
-+                                       vp++;
-+                                       vp += sprintf(vp, "cctl=0x%x", cis[i + 3]);
-+                                       vp++;
-+                                       break;
-+                               }
-+
-+                               case HNBU_CCKPO:
-+                                       ASSERT(sromrev > 2);
-+                                       vp += sprintf(vp, "cckpo=0x%x",
-+                                                     (cis[i + 2] << 8) | cis[i + 1]);
-+                                       vp++;
-+                                       break;
-+
-+                               case HNBU_OFDMPO:
-+                                       ASSERT(sromrev > 2);
-+                                       vp += sprintf(vp, "ofdmpo=0x%x",
-+                                                     (cis[i + 4] << 24) |
-+                                                     (cis[i + 3] << 16) |
-+                                                     (cis[i + 2] << 8) |
-+                                                     cis[i + 1]);
-+                                       vp++;
-+                                       break;
-+                               }
-+                               break;
-+
-+                       }
-+                       i += tlen;
-+               } while (tup != 0xff);
-+       }
-+
-+       /* Set the srom version */
-+       vp += sprintf(vp, "sromrev=%d", sromrev);
-+       vp++;
-+
-+       /* if there is no antenna gain field, set default */
-+       if (ag_init == FALSE) {
-+               ASSERT(sromrev == 1);
-+               vp += sprintf(vp, "ag0=%d", 0xff);
-+               vp++;
-+       }
-+
-+       /* final nullbyte terminator */
-+       *vp++ = '\0';
-+       varsize = (uint)(vp - base);
-+
-+       ASSERT((vp - base) < VARS_MAX);
-+
-+       if (varsize == VARS_MAX) {
-+               *vars = base;
-+       } else {
-+               vp = MALLOC(osh, varsize);
-+               ASSERT(vp);
-+               if (vp)
-+                       bcopy(base, vp, varsize);
-+               MFREE(osh, base, VARS_MAX);
-+               *vars = vp;
-+               if (!vp) {
-+                       *count = 0;
-+                       return -2;
-+               }
-+       }
-+       *count = varsize;
-+
-+       return (0);
-+}
-+
-+
-+/* set PCMCIA sprom command register */
-+static int
-+sprom_cmd_pcmcia(osl_t *osh, uint8 cmd)
-+{
-+       uint8 status = 0;
-+       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(osl_t *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 */
-+       data_h = data_l = 0;
-+       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(osl_t *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(osl_t *osh, uint16 *sprom, uint wordoff, uint16 *buf, uint nwords, bool check_crc)
-+{
-+       int err = 0;
-+       uint i;
-+
-+       /* read the sprom */
-+       for (i = 0; i < nwords; i++)
-+               buf[i] = R_REG(osh, &sprom[wordoff + i]);
-+
-+       if (check_crc) {
-+               /* fixup the endianness so crc8 will pass */
-+               htol16_buf(buf, nwords * 2);
-+               if (hndcrc8((uint8*)buf, nwords * 2, CRC8_INIT_VALUE) != CRC8_GOOD_VALUE)
-+                       err = 1;
-+               /* now correct the endianness of the byte array */
-+               ltoh16_buf(buf, nwords * 2);
-+       }
-+
-+       return err;
-+}
-+
-+/*
-+* Create variable table from memory.
-+* Return 0 on success, nonzero on error.
-+*/
-+static int
-+initvars_table(osl_t *osh, char *start, char *end, char **vars, uint *count)
-+{
-+       int c = (int)(end - start);
-+
-+       /* do it only when there is more than just the null string */
-+       if (c > 1) {
-+               char *vp = MALLOC(osh, c);
-+               ASSERT(vp);
-+               if (!vp)
-+                       return BCME_NOMEM;
-+               bcopy(start, vp, c);
-+               *vars = vp;
-+               *count = c;
-+       }
-+       else {
-+               *vars = NULL;
-+               *count = 0;
-+       }
-+
-+       return 0;
-+}
-+
-+/*
-+ * Find variables with <devpath> from flash. 'base' points to the beginning
-+ * of the table upon enter and to the end of the table upon exit when success.
-+ * Return 0 on success, nonzero on error.
-+ */
-+static int
-+initvars_flash(osl_t *osh, char **base, uint len, char *devpath)
-+{
-+       char *vp = *base;
-+       char *flash;
-+       int err;
-+       char *s;
-+       uint l, dl, copy_len;
-+
-+       /* allocate memory and read in flash */
-+       if (!(flash = MALLOC(osh, NVRAM_SPACE)))
-+               return BCME_NOMEM;
-+       if ((err = nvram_getall(flash, NVRAM_SPACE)))
-+               goto exit;
-+
-+       /* grab vars with the <devpath> prefix in name */
-+       dl = strlen(devpath);
-+       for (s = flash; s && *s; s += l + 1) {
-+               l = strlen(s);
-+
-+               /* skip non-matching variable */
-+               if (strncmp(s, devpath, dl))
-+                       continue;
-+
-+               /* is there enough room to copy? */
-+               copy_len = l - dl + 1;
-+               if (len < copy_len) {
-+                       err = BCME_BUFTOOSHORT;
-+                       goto exit;
-+               }
-+
-+               /* no prefix, just the name=value */
-+               strcpy(vp, &s[dl]);
-+               vp += copy_len;
-+               len -= copy_len;
-+       }
-+
-+       /* add null string as terminator */
-+       if (len < 1) {
-+               err = BCME_BUFTOOSHORT;
-+               goto exit;
-+       }
-+       *vp++ = '\0';
-+
-+       *base = vp;
-+
-+exit:  MFREE(osh, flash, NVRAM_SPACE);
-+       return err;
-+}
-+
-+/*
-+ * Initialize nonvolatile variable table from flash.
-+ * Return 0 on success, nonzero on error.
-+ */
-+static int
-+initvars_flash_sb(void *sbh, char **vars, uint *count)
-+{
-+       osl_t *osh = sb_osh(sbh);
-+       char devpath[SB_DEVPATH_BUFSZ];
-+       char *vp, *base;
-+       int err;
-+
-+       ASSERT(vars);
-+       ASSERT(count);
-+
-+       if ((err = sb_devpath(sbh, devpath, sizeof(devpath))))
-+               return err;
-+
-+       base = vp = MALLOC(osh, VARS_MAX);
-+       ASSERT(vp);
-+       if (!vp)
-+               return BCME_NOMEM;
-+
-+       if ((err = initvars_flash(osh, &vp, VARS_MAX, devpath)))
-+               goto err;
-+
-+       err = initvars_table(osh, base, vp, vars, count);
-+
-+err:   MFREE(osh, base, VARS_MAX);
-+       return err;
-+}
-+
-+#ifdef WLTEST
-+char mfgsromvars[256];
-+char *defaultsromvars = "il0macaddr=00:11:22:33:44:51\0"
-+               "et0macaddr=00:11:22:33:44:52\0"
-+               "et1macaddr=00:11:22:33:44:53\0"
-+               "boardtype=0xffff\0"
-+               "boardrev=0x10\0"
-+               "boardflags=8\0"
-+               "sromrev=2\0"
-+               "aa2g=3";
-+#define        MFGSROM_DEFVARSLEN      147 /* default srom len */
-+#endif /* WL_TEST */
-+
-+/*
-+ * Initialize nonvolatile variable table from sprom.
-+ * Return 0 on success, nonzero on error.
-+ */
-+static int
-+initvars_srom_pci(void *sbh, void *curmap, char **vars, uint *count)
-+{
-+       uint16 w, *b;
-+       uint8 sromrev = 0;
-+       struct ether_addr ea;
-+       char eabuf[32];
-+       uint32 w32;
-+       int woff, i;
-+       char *vp, *base;
-+       osl_t *osh = sb_osh(sbh);
-+       bool flash = FALSE;
-+       char name[SB_DEVPATH_BUFSZ+16], *value;
-+       char devpath[SB_DEVPATH_BUFSZ];
-+       int err;
-+
-+       /*
-+        * Apply CRC over SROM content regardless SROM is present or not,
-+        * and use variable <devpath>sromrev's existance in flash to decide
-+        * if we should return an error when CRC fails or read SROM variables
-+        * from flash.
-+        */
-+       b = MALLOC(osh, SROM_MAX);
-+       ASSERT(b);
-+       if (!b)
-+               return -2;
-+
-+       err = sprom_read_pci(osh, (void*)((int8*)curmap + PCI_BAR0_SPROM_OFFSET), 0, b,
-+                            64, TRUE);
-+       if (err == 0) {
-+               /* srom is good and is rev < 4 */
-+               /* top word of sprom contains version and crc8 */
-+               sromrev = b[63] & 0xff;
-+               /* bcm4401 sroms misprogrammed */
-+               if (sromrev == 0x10)
-+                       sromrev = 1;
-+       } else if (b[SROM4_SIGN] == SROM4_SIGNATURE) {
-+               /* If sromrev >= 4, read more */
-+               err = sprom_read_pci(osh, (void*)((int8*)curmap + PCI_BAR0_SPROM_OFFSET), 0, b,
-+                                    SROM4_WORDS, TRUE);
-+               sromrev = b[SROM4_WORDS - 1] & 0xff;
-+       }
-+
-+       if (err) {
-+#ifdef WLTEST
-+               BS_ERROR(("SROM Crc Error, so see if we could use a default\n"));
-+               w32 = OSL_PCI_READ_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32));
-+               if (w32 & SPROM_OTPIN_USE) {
-+                       BS_ERROR(("srom crc failed with OTP, use default vars....\n"));
-+                       vp = base =  mfgsromvars;
-+                       if (sb_chip(sbh) == BCM4311_CHIP_ID) {
-+                               BS_ERROR(("setting the devid to be 4311\n"));
-+                               vp += sprintf(vp, "devid=0x4311");
-+                               vp++;
-+                       }
-+                       bcopy(defaultsromvars,  vp, MFGSROM_DEFVARSLEN);
-+                       vp += MFGSROM_DEFVARSLEN;
-+                       goto varsdone;
-+               } else {
-+                       BS_ERROR(("srom crc failed with SPROM....\n"));
-+#endif /* WLTEST */
-+                       if ((err = sb_devpath(sbh, devpath, sizeof(devpath))))
-+                               return err;
-+                       sprintf(name, "%ssromrev", devpath);
-+                       if (!(value = getvar(NULL, name)))
-+                               return (-1);
-+                       sromrev = (uint8)bcm_strtoul(value, NULL, 0);
-+                       flash = TRUE;
-+#ifdef WLTEST
-+               }
-+#endif /* WLTEST */
-+       }
-+
-+       /* srom version check */
-+       if (sromrev > 4)
-+               return (-2);
-+
-+       ASSERT(vars);
-+       ASSERT(count);
-+
-+       base = vp = MALLOC(osh, VARS_MAX);
-+       ASSERT(vp);
-+       if (!vp)
-+               return -2;
-+
-+       /* read variables from flash */
-+       if (flash) {
-+               if ((err = initvars_flash(osh, &vp, VARS_MAX, devpath)))
-+                       goto err;
-+               goto varsdone;
-+       }
-+
-+       vp += sprintf(vp, "sromrev=%d", sromrev);
-+       vp++;
-+
-+       if (sromrev >= 4) {
-+               uint path, pathbase;
-+               const uint pathbases[MAX_PATH] = {SROM4_PATH0, SROM4_PATH1,
-+                                                 SROM4_PATH2, SROM4_PATH3};
-+
-+               vp += sprintf(vp, "boardrev=%d", b[SROM4_BREV]);
-+               vp++;
-+
-+               vp += sprintf(vp, "boardflags=%d", (b[SROM4_BFL1] << 16) | b[SROM4_BFL0]);
-+               vp++;
-+
-+               vp += sprintf(vp, "boardflags2=%d", (b[SROM4_BFL3] << 16) | b[SROM4_BFL2]);
-+               vp++;
-+
-+               /* The macaddr */
-+               ea.octet[0] = (b[SROM4_MACHI] >> 8) & 0xff;
-+               ea.octet[1] = b[SROM4_MACHI] & 0xff;
-+               ea.octet[2] = (b[SROM4_MACMID] >> 8) & 0xff;
-+               ea.octet[3] = b[SROM4_MACMID] & 0xff;
-+               ea.octet[4] = (b[SROM4_MACLO] >> 8) & 0xff;
-+               ea.octet[5] = b[SROM4_MACLO] & 0xff;
-+               bcm_ether_ntoa(&ea, eabuf);
-+               vp += sprintf(vp, "macaddr=%s", eabuf);
-+               vp++;
-+
-+               w = b[SROM4_CCODE];
-+               if (w == 0)
-+                       vp += sprintf(vp, "ccode=");
-+               else
-+                       vp += sprintf(vp, "ccode=%c%c", (w >> 8), (w & 0xff));
-+               vp++;
-+               vp += sprintf(vp, "regrev=%d", b[SROM4_REGREV]);
-+               vp++;
-+
-+               w = b[SROM4_LEDBH10];
-+               if ((w != 0) && (w != 0xffff)) {
-+                       /* ledbh0 */
-+                       vp += sprintf(vp, "ledbh0=%d", (w & 0xff));
-+                       vp++;
-+
-+                       /* ledbh1 */
-+                       vp += sprintf(vp, "ledbh1=%d", (w >> 8) & 0xff);
-+                       vp++;
-+               }
-+               w = b[SROM4_LEDBH32];
-+               if ((w != 0) && (w != 0xffff)) {
-+                       /* ledbh2 */
-+                       vp += sprintf(vp, "ledbh2=%d", w & 0xff);
-+                       vp++;
-+
-+                       /* ledbh3 */
-+                       vp += sprintf(vp, "ledbh3=%d", (w >> 8) & 0xff);
-+                       vp++;
-+               }
-+               /* LED Powersave duty cycle (oncount >> 24) (offcount >> 8) */
-+               w = b[SROM4_LEDDC];
-+               w32 = ((uint32)((unsigned char)(w >> 8) & 0xff) << 24) |  /* oncount */
-+                       ((uint32)((unsigned char)(w & 0xff)) << 8); /* offcount */
-+               vp += sprintf(vp, "leddc=%d", w32);
-+               vp++;
-+
-+               w = b[SROM4_AA];
-+               vp += sprintf(vp, "aa2g=%d", w & SROM4_AA2G_MASK);
-+               vp++;
-+               vp += sprintf(vp, "aa5g=%d", w >> SROM4_AA5G_SHIFT);
-+               vp++;
-+
-+               w = b[SROM4_AG10];
-+               vp += sprintf(vp, "ag0=%d", w & 0xff);
-+               vp++;
-+               vp += sprintf(vp, "ag1=%d", (w >> 8) & 0xff);
-+               vp++;
-+               w = b[SROM4_AG32];
-+               vp += sprintf(vp, "ag2=%d", w & 0xff);
-+               vp++;
-+               vp += sprintf(vp, "ag3=%d", (w >> 8) & 0xff);
-+               vp++;
-+
-+               /* Fixed power indices when power control is disabled */
-+               for (i = 0; i < 2; i++) {
-+                       w = b[SROM4_TXPID2G + i];
-+                       vp += sprintf(vp, "txpid2ga%d=%d", 2 * i, w & 0xff);
-+                       vp++;
-+                       vp += sprintf(vp, "txpid2ga%d=%d", (2 * i) + 1, (w >> 8) & 0xff);
-+                       vp++;
-+                       w = b[SROM4_TXPID5G + i];
-+                       vp += sprintf(vp, "txpid5ga%d=%d", 2 * i, w & 0xff);
-+                       vp++;
-+                       vp += sprintf(vp, "txpid5ga%d=%d", (2 * i) + 1, (w >> 8) & 0xff);
-+                       vp++;
-+                       w = b[SROM4_TXPID5GL + i];
-+                       vp += sprintf(vp, "txpid5gla%d=%d", 2 * i, w & 0xff);
-+                       vp++;
-+                       vp += sprintf(vp, "txpid5gla%d=%d", (2 * i) + 1, (w >> 8) & 0xff);
-+                       vp++;
-+                       w = b[SROM4_TXPID5GH + i];
-+                       vp += sprintf(vp, "txpid5gha%d=%d", 2 * i, w & 0xff);
-+                       vp++;
-+                       vp += sprintf(vp, "txpid5gha%d=%d", (2 * i) + 1, (w >> 8) & 0xff);
-+                       vp++;
-+               }
-+
-+               /* Per path variables */
-+               for (path = 0; path < MAX_PATH; path++) {
-+                       pathbase = pathbases[path];
-+                       w = b[pathbase + SROM4_2G_ITT_MAXP];
-+                       vp += sprintf(vp, "itt2ga%d=%d", path, w >> B2G_ITT_SHIFT);
-+                       vp++;
-+                       vp += sprintf(vp, "maxp2ga%d=%d", path, w & B2G_MAXP_MASK);
-+                       vp++;
-+
-+                       for (i = 0; i < 4; i++) {
-+                               vp += sprintf(vp, "pa2gw%da%d=%d", i, path,
-+                                             b[pathbase + SROM4_2G_PA + i]);
-+                               vp++;
-+                       }
-+
-+                       w = b[pathbase + SROM4_5G_ITT_MAXP];
-+                       vp += sprintf(vp, "itt5ga%d=%d", path, w >> B5G_ITT_SHIFT);
-+                       vp++;
-+                       vp += sprintf(vp, "maxp5ga%d=%d", path, w & B5G_MAXP_MASK);
-+                       vp++;
-+
-+                       w = b[pathbase + SROM4_5GLH_MAXP];
-+                       vp += sprintf(vp, "maxp5lga%d=%d", path, w >> B5GL_MAXP_SHIFT);
-+                       vp++;
-+                       vp += sprintf(vp, "maxp5gha%d=%d", path, w & B5GH_MAXP_MASK);
-+                       vp++;
-+
-+                       for (i = 0; i < 4; i++) {
-+                               vp += sprintf(vp, "pa5gw%da%d=%d", i, path,
-+                                             b[pathbase + SROM4_5G_PA + i]);
-+                               vp++;
-+                               vp += sprintf(vp, "pa5glw%da%d=%d", i, path,
-+                                             b[pathbase + SROM4_5GL_PA + i]);
-+                               vp++;
-+                               vp += sprintf(vp, "pa5hgw%da%d=%d", i, path,
-+                                             b[pathbase + SROM4_5GH_PA + i]);
-+                               vp++;
-+                       }
-+               }
-+
-+               vp += sprintf(vp, "cck2gpo=%d", b[SROM4_2G_CCKPO]);
-+               vp++;
-+
-+               w32 = ((uint32)b[SROM4_2G_OFDMPO + 1] << 16) | b[SROM4_2G_OFDMPO];
-+               vp += sprintf(vp, "ofdm2gpo=%d", w32);
-+               vp++;
-+
-+               w32 = ((uint32)b[SROM4_5G_OFDMPO + 1] << 16) | b[SROM4_5G_OFDMPO];
-+               vp += sprintf(vp, "ofdm5gpo=%d", w32);
-+               vp++;
-+
-+               w32 = ((uint32)b[SROM4_5GL_OFDMPO + 1] << 16) | b[SROM4_5GL_OFDMPO];
-+               vp += sprintf(vp, "ofdm5glpo=%d", w32);
-+               vp++;
-+
-+               w32 = ((uint32)b[SROM4_5GH_OFDMPO + 1] << 16) | b[SROM4_5GH_OFDMPO];
-+               vp += sprintf(vp, "ofdm5ghpo=%d", w32);
-+               vp++;
-+
-+               for (i = 0; i < 8; i++) {
-+                       vp += sprintf(vp, "mcs2gpo%d=%d", i, b[SROM4_2G_MCSPO]);
-+                       vp++;
-+                       vp += sprintf(vp, "mcs5gpo%d=%d", i, b[SROM4_5G_MCSPO]);
-+                       vp++;
-+                       vp += sprintf(vp, "mcs5glpo%d=%d", i, b[SROM4_5GL_MCSPO]);
-+                       vp++;
-+                       vp += sprintf(vp, "mcs5ghpo%d=%d", i, b[SROM4_5GH_MCSPO]);
-+                       vp++;
-+               }
-+
-+               vp += sprintf(vp, "ccdpo%d=%d", i, b[SROM4_CCDPO]);
-+               vp++;
-+               vp += sprintf(vp, "stbcpo%d=%d", i, b[SROM4_STBCPO]);
-+               vp++;
-+               vp += sprintf(vp, "bw40po%d=%d", i, b[SROM4_BW40PO]);
-+               vp++;
-+               vp += sprintf(vp, "bwduppo%d=%d", i, b[SROM4_BWDUPPO]);
-+               vp++;
-+
-+               goto done;
-+       }
-+       if (sromrev >= 3) {
-+               /* New section takes over the 3th hardware function space */
-+
-+               /* Words 22+23 are 11a (mid) ofdm power offsets */
-+               w32 = ((uint32)b[23] << 16) | b[22];
-+               vp += sprintf(vp, "ofdmapo=%d", w32);
-+               vp++;
-+
-+               /* Words 24+25 are 11a (low) ofdm power offsets */
-+               w32 = ((uint32)b[25] << 16) | b[24];
-+               vp += sprintf(vp, "ofdmalpo=%d", w32);
-+               vp++;
-+
-+               /* Words 26+27 are 11a (high) ofdm power offsets */
-+               w32 = ((uint32)b[27] << 16) | b[26];
-+               vp += sprintf(vp, "ofdmahpo=%d", w32);
-+               vp++;
-+
-+               /* LED Powersave duty cycle (oncount >> 24) (offcount >> 8) */
-+               w32 = ((uint32)((unsigned char)(b[21] >> 8) & 0xff) << 24) |  /* oncount */
-+                       ((uint32)((unsigned char)(b[21] & 0xff)) << 8); /* offcount */
-+               vp += sprintf(vp, "leddc=%d", w32);
-+
-+               vp++;
-+       }
-+
-+       if (sromrev >= 2) {
-+               /* New section takes over the 4th hardware function space */
-+
-+               /* 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 += 3;
-+       bcm_ether_ntoa(&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 += 3;
-+       bcm_ether_ntoa(&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 += 3;
-+       bcm_ether_ntoa(&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, "aa2g=%d", (w >> 12) & 0x3);
-+       vp++;
-+
-+       vp += sprintf(vp, "aa5g=%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)) {
-+               /* ledbh0 */
-+               vp += sprintf(vp, "ledbh0=%d", (w & 0xff));
-+               vp++;
-+
-+               /* ledbh1 */
-+               vp += sprintf(vp, "ledbh1=%d", (w >> 8) & 0xff);
-+               vp++;
-+       }
-+       w = b[51];
-+       if ((w != 0) && (w != 0xffff)) {
-+               /* ledbh2 */
-+               vp += sprintf(vp, "ledbh2=%d", w & 0xff);
-+               vp++;
-+
-+               /* ledbh */
-+               vp += sprintf(vp, "ledbh3=%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 */
-+       w32 = (uint32)b[57];
-+       if (w32 == 0xffff) w32 = 0;
-+       if (sromrev > 1) {
-+               /* Word 28 is the high bits of boardflags */
-+               w32 |= (uint32)b[28] << 16;
-+       }
-+       vp += sprintf(vp, "boardflags=%d", w32);
-+       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++;
-+       } else if (sromrev == 2) {
-+               /* Word 60 OFDM tx power offset from CCK level */
-+               /* OFDM Power Offset - opo */
-+               vp += sprintf(vp, "opo=%d", b[60] & 0xff);
-+               vp++;
-+       } else {
-+               /* Word 60: cck power offsets */
-+               vp += sprintf(vp, "cckpo=%d", b[60]);
-+               vp++;
-+
-+               /* Words 61+62: 11g ofdm power offsets */
-+               w32 = ((uint32)b[62] << 16) | b[61];
-+               vp += sprintf(vp, "ofdmgpo=%d", w32);
-+               vp++;
-+       }
-+
-+       /* final nullbyte terminator */
-+done:  *vp++ = '\0';
-+
-+       ASSERT((vp - base) <= VARS_MAX);
-+
-+varsdone:
-+       err = initvars_table(osh, base, vp, vars, count);
-+
-+err:
-+#ifdef WLTEST
-+       if (base != mfgsromvars)
-+#endif
-+               MFREE(osh, base, VARS_MAX);
-+       MFREE(osh, b, SROM_MAX);
-+       return err;
-+}
-+
-+/*
-+ * Read the cis and call parsecis to initialize the vars.
-+ * Return 0 on success, nonzero on error.
-+ */
-+static int
-+initvars_cis_pcmcia(void *sbh, osl_t *osh, char **vars, uint *count)
-+{
-+       uint8 *cis = NULL;
-+       int rc;
-+       uint data_sz;
-+
-+       data_sz = (sb_pcmciarev(sbh) == 1) ? (SPROM_SIZE * 2) : CIS_SIZE;
-+
-+       if ((cis = MALLOC(osh, data_sz)) == NULL)
-+               return (-2);
-+
-+       if (sb_pcmciarev(sbh) == 1) {
-+               if (srom_read(PCMCIA_BUS, (void *)NULL, osh, 0, data_sz, (uint16 *)cis)) {
-+                       MFREE(osh, cis, data_sz);
-+                       return (-1);
-+               }
-+               /* fix up endianess for 16-bit data vs 8-bit parsing */
-+               ltoh16_buf((uint16 *)cis, data_sz);
-+       } else
-+               OSL_PCMCIA_READ_ATTR(osh, 0, cis, data_sz);
-+
-+       rc = srom_parsecis(osh, &cis, 1, vars, count);
-+
-+       MFREE(osh, cis, data_sz);
-+
-+       return (rc);
-+}
-+
-diff -urN linux.old/arch/mips/bcm947xx/bcmutils.c linux.dev/arch/mips/bcm947xx/bcmutils.c
---- linux.old/arch/mips/bcm947xx/bcmutils.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/bcmutils.c     2006-04-28 00:34:02.000000000 +0200
-@@ -0,0 +1,247 @@
-+/*
-+ * Misc useful OS-independent routines.
-+ *
-+ * Copyright 2006, 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.1.12 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#include <typedefs.h>
-+#include <bcmdefs.h>
-+#include <stdarg.h>
-+#include <bcmutils.h>
-+#include <osl.h>
-+#include <sbutils.h>
-+#include <bcmnvram.h>
-+#include <bcmendian.h>
-+#include <bcmdevs.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 */
-+};
-+
-+
-+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);
-+}
-+
-+uchar
-+bcm_toupper(uchar c)
-+{
-+       if (bcm_islower(c))
-+               c -= 'a'-'A';
-+       return (c);
-+}
-+
-+char*
-+bcm_ether_ntoa(struct ether_addr *ea, char *buf)
-+{
-+       sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-+               ea->octet[0]&0xff, ea->octet[1]&0xff, ea->octet[2]&0xff,
-+               ea->octet[3]&0xff, ea->octet[4]&0xff, ea->octet[5]&0xff);
-+       return (buf);
-+}
-+
-+
-+/*
-+ * 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;) {
-+               /* CSTYLED */
-+               if ((memcmp(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));
-+}
-+
-+
-+/*******************************************************************************
-+ * 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
-+};
-+
-+#define CRC_INNER_LOOP(n, c, x) \
-+       (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
-+
-+uint8
-+hndcrc8(
-+       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;
-+}
-+
-+
-diff -urN linux.old/arch/mips/bcm947xx/cfe_env.c linux.dev/arch/mips/bcm947xx/cfe_env.c
---- linux.old/arch/mips/bcm947xx/cfe_env.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/cfe_env.c      2006-04-27 19:24:19.000000000 +0200
-@@ -0,0 +1,234 @@
-+/*
-+ * NVRAM variable manipulation (Linux kernel half)
-+ *
-+ * 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 <linux/config.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+
-+#include <typedefs.h>
-+#include <osl.h>
-+#include <bcmendian.h>
-+#include <bcmutils.h>
-+
-+#define NVRAM_SIZE       (0x1ff0)
-+static char _nvdata[NVRAM_SIZE] __initdata;
-+static char _valuestr[256] __initdata;
-+
-+/*
-+ * TLV types.  These codes are used in the "type-length-value"
-+ * encoding of the items stored in the NVRAM device (flash or EEPROM)
-+ *
-+ * The layout of the flash/nvram is as follows:
-+ *
-+ * <type> <length> <data ...> <type> <length> <data ...> <type_end>
-+ *
-+ * The type code of "ENV_TLV_TYPE_END" marks the end of the list.
-+ * The "length" field marks the length of the data section, not
-+ * including the type and length fields.
-+ *
-+ * Environment variables are stored as follows:
-+ *
-+ * <type_env> <length> <flags> <name> = <value>
-+ *
-+ * If bit 0 (low bit) is set, the length is an 8-bit value.
-+ * If bit 0 (low bit) is clear, the length is a 16-bit value
-+ * 
-+ * Bit 7 set indicates "user" TLVs.  In this case, bit 0 still
-+ * indicates the size of the length field.  
-+ *
-+ * Flags are from the constants below:
-+ *
-+ */
-+#define ENV_LENGTH_16BITS      0x00    /* for low bit */
-+#define ENV_LENGTH_8BITS       0x01
-+
-+#define ENV_TYPE_USER          0x80
-+
-+#define ENV_CODE_SYS(n,l) (((n)<<1)|(l))
-+#define ENV_CODE_USER(n,l) ((((n)<<1)|(l)) | ENV_TYPE_USER)
-+
-+/*
-+ * The actual TLV types we support
-+ */
-+
-+#define ENV_TLV_TYPE_END       0x00    
-+#define ENV_TLV_TYPE_ENV       ENV_CODE_SYS(0,ENV_LENGTH_8BITS)
-+
-+/*
-+ * Environment variable flags 
-+ */
-+
-+#define ENV_FLG_NORMAL         0x00    /* normal read/write */
-+#define ENV_FLG_BUILTIN                0x01    /* builtin - not stored in flash */
-+#define ENV_FLG_READONLY       0x02    /* read-only - cannot be changed */
-+
-+#define ENV_FLG_MASK           0xFF    /* mask of attributes we keep */
-+#define ENV_FLG_ADMIN          0x100   /* lets us internally override permissions */
-+
-+
-+/*  *********************************************************************
-+    *  _nvram_read(buffer,offset,length)
-+    *  
-+    *  Read data from the NVRAM device
-+    *  
-+    *  Input parameters: 
-+    *             buffer - destination buffer
-+    *             offset - offset of data to read
-+    *             length - number of bytes to read
-+    *             
-+    *  Return value:
-+    *             number of bytes read, or <0 if error occured
-+    ********************************************************************* */
-+static int
-+_nvram_read(unsigned char *nv_buf, unsigned char *buffer, int offset, int length)
-+{
-+    int i;
-+    if (offset > NVRAM_SIZE)
-+       return -1; 
-+
-+    for ( i = 0; i < length; i++) {
-+       buffer[i] = ((volatile unsigned char*)nv_buf)[offset + i];
-+    }
-+    return length;
-+}
-+
-+
-+static char*
-+_strnchr(const char *dest,int c,size_t cnt)
-+{
-+       while (*dest && (cnt > 0)) {
-+       if (*dest == c) return (char *) dest;
-+       dest++;
-+       cnt--;
-+       }
-+       return NULL;
-+}
-+
-+
-+
-+/*
-+ * Core support API: Externally visible.
-+ */
-+
-+/*
-+ * Get the value of an NVRAM variable
-+ * @param      name    name of variable to get
-+ * @return     value of variable or NULL if undefined
-+ */
-+
-+char* 
-+cfe_env_get(unsigned char *nv_buf, char* name)
-+{
-+    int size;
-+    unsigned char *buffer;
-+    unsigned char *ptr;
-+    unsigned char *envval;
-+    unsigned int reclen;
-+    unsigned int rectype;
-+    int offset;
-+    int flg;
-+    
-+    size = NVRAM_SIZE;
-+    buffer = &_nvdata[0];
-+
-+    ptr = buffer;
-+    offset = 0;
-+
-+    /* Read the record type and length */
-+    if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
-+       goto error;
-+    }
-+    
-+    while ((*ptr != ENV_TLV_TYPE_END)  && (size > 1)) {
-+
-+       /* Adjust pointer for TLV type */
-+       rectype = *(ptr);
-+       offset++;
-+       size--;
-+
-+       /* 
-+        * Read the length.  It can be either 1 or 2 bytes
-+        * depending on the code 
-+        */
-+       if (rectype & ENV_LENGTH_8BITS) {
-+           /* Read the record type and length - 8 bits */
-+           if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
-+               goto error;
-+           }
-+           reclen = *(ptr);
-+           size--;
-+           offset++;
-+       }
-+       else {
-+           /* Read the record type and length - 16 bits, MSB first */
-+           if (_nvram_read(nv_buf, ptr,offset,2) != 2) {
-+               goto error;
-+           }
-+           reclen = (((unsigned int) *(ptr)) << 8) + (unsigned int) *(ptr+1);
-+           size -= 2;
-+           offset += 2;
-+       }
-+
-+       if (reclen > size)
-+           break;      /* should not happen, bad NVRAM */
-+
-+       switch (rectype) {
-+           case ENV_TLV_TYPE_ENV:
-+               /* Read the TLV data */
-+               if (_nvram_read(nv_buf, ptr,offset,reclen) != reclen)
-+                   goto error;
-+               flg = *ptr++;
-+               envval = (unsigned char *) _strnchr(ptr,'=',(reclen-1));
-+               if (envval) {
-+                   *envval++ = '\0';
-+                   memcpy(_valuestr,envval,(reclen-1)-(envval-ptr));
-+                   _valuestr[(reclen-1)-(envval-ptr)] = '\0';
-+#if 0                  
-+                   printk(KERN_INFO "NVRAM:%s=%s\n", ptr, _valuestr);
-+#endif
-+                   if(!strcmp(ptr, name)){
-+                       return _valuestr;
-+                   }
-+                   if((strlen(ptr) > 1) && !strcmp(&ptr[1], name))
-+                       return _valuestr;
-+               }
-+               break;
-+               
-+           default: 
-+               /* Unknown TLV type, skip it. */
-+               break;
-+           }
-+
-+       /*
-+        * Advance to next TLV 
-+        */
-+               
-+       size -= (int)reclen;
-+       offset += reclen;
-+
-+       /* Read the next record type */
-+       ptr = buffer;
-+       if (_nvram_read(nv_buf, ptr,offset,1) != 1)
-+           goto error;
-+       }
-+
-+error:
-+    return NULL;
-+
-+}
-+
-diff -urN linux.old/arch/mips/bcm947xx/compressed/Makefile linux.dev/arch/mips/bcm947xx/compressed/Makefile
---- linux.old/arch/mips/bcm947xx/compressed/Makefile    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/compressed/Makefile    2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/compressed/Makefile linux-2.4.32-freewrt/arch/mips/bcm947xx/compressed/Makefile
+--- linux-2.4.32/arch/mips/bcm947xx/compressed/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/compressed/Makefile 2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,33 @@
 +#
@@ -1793 +86 @@
 +clean:
 +       rm -f vmlinuz piggy
-diff -urN linux.old/arch/mips/bcm947xx/export.c linux.dev/arch/mips/bcm947xx/export.c
---- linux.old/arch/mips/bcm947xx/export.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/export.c       2006-04-28 02:57:34.000000000 +0200
-@@ -0,0 +1,62 @@
-+#include <linux/module.h>
-+
-+#define _export(n) \
-+               void n(void); \
-+               EXPORT_SYMBOL(n);
-+
-+_export(bcm947xx_sbh)
-+
-+_export(sb_attach)
-+_export(sb_boardtype)
-+_export(sb_boardvendor)
-+_export(sb_btcgpiowar)
-+_export(sb_bus)
-+_export(sb_chip)
-+_export(sb_chiprev)
-+_export(sb_chipcrev)
-+_export(sb_chippkg)
-+_export(sb_clkctl_clk)
-+_export(sb_clkctl_fast_pwrup_delay)
-+_export(sb_clkctl_init)
-+_export(sb_clkctl_xtal)
-+_export(sb_core_disable)
-+_export(sb_core_reset)
-+_export(sb_core_tofixup)
-+_export(sb_coreflags)
-+_export(sb_coreflagshi)
-+_export(sb_coreidx)
-+_export(sb_corerev)
-+_export(sb_coreunit)
-+_export(sb_detach)
-+_export(sb_deviceremoved)
-+_export(sb_gpiocontrol)
-+_export(sb_gpioled)
-+_export(sb_gpioin)
-+_export(sb_gpioout)
-+_export(sb_gpioouten)
-+_export(sb_gpiotimerval)
-+_export(sb_iscoreup)
-+_export(sb_pci_setup)
-+_export(sb_pcirev)
-+_export(sb_pcmcia_init)
-+_export(sb_pcmciarev)
-+_export(sb_register_intr_callback)
-+_export(sb_setcore)
-+_export(sb_war16165)
-+_export(sb_osh)
-+               
-+_export(getvar)
-+_export(getintvar)
-+_export(bcm_strtoul)
-+_export(bcm_ctype)
-+_export(bcm_toupper)
-+_export(bcm_ether_ntoa)
-+
-+_export(nvram_get)
-+_export(nvram_getall)
-+_export(nvram_set)
-+_export(nvram_unset)
-+_export(nvram_commit)
-+
-+_export(srom_read)
-+_export(srom_write)
-diff -urN linux.old/arch/mips/bcm947xx/generic/Makefile linux.dev/arch/mips/bcm947xx/generic/Makefile
---- linux.old/arch/mips/bcm947xx/generic/Makefile       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/generic/Makefile       2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/generic/Makefile linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/Makefile
+--- linux-2.4.32/arch/mips/bcm947xx/generic/Makefile    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/Makefile    2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,15 @@
 +#
@@ -1878 +105 @@
 +
 +include $(TOPDIR)/Rules.make
-diff -urN linux.old/arch/mips/bcm947xx/generic/int-handler.S linux.dev/arch/mips/bcm947xx/generic/int-handler.S
---- linux.old/arch/mips/bcm947xx/generic/int-handler.S  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/generic/int-handler.S  2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/generic/int-handler.S linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/int-handler.S
+--- linux-2.4.32/arch/mips/bcm947xx/generic/int-handler.S       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/int-handler.S       2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,51 @@
 +/*
@@ -1933 +160 @@
 +               
 +       END(brcmIRQ)
-diff -urN linux.old/arch/mips/bcm947xx/generic/irq.c linux.dev/arch/mips/bcm947xx/generic/irq.c
---- linux.old/arch/mips/bcm947xx/generic/irq.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/generic/irq.c  2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/generic/irq.c linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/irq.c
+--- linux-2.4.32/arch/mips/bcm947xx/generic/irq.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/generic/irq.c       2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,130 @@
 +/*
@@ -2067 +294 @@
 +#endif
 +}
-diff -urN linux.old/arch/mips/bcm947xx/gpio.c linux.dev/arch/mips/bcm947xx/gpio.c
---- linux.old/arch/mips/bcm947xx/gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/gpio.c 2006-04-27 23:09:33.000000000 +0200
-@@ -0,0 +1,159 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/gpio.c linux-2.4.32-freewrt/arch/mips/bcm947xx/gpio.c
+--- linux-2.4.32/arch/mips/bcm947xx/gpio.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/gpio.c      2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,158 @@
 +/*
 + * GPIO char driver
 + *
-+ * Copyright 2005, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -2082 +309 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id$
++ * $Id: gpio.c,v 1.1 2005/03/16 13:49:59 wbx Exp $
 + */
 +
@@ -2092 +319 @@
 +
 +#include <typedefs.h>
-+#include <osl.h>
 +#include <bcmutils.h>
 +#include <sbutils.h>
 +#include <bcmdevs.h>
 +
-+static sb_t *gpio_sbh;
++static void *gpio_sbh;
 +static int gpio_major;
 +static devfs_handle_t gpio_dir;
@@ -2137 +363 @@
 +               break;
 +       case 1:
-+               val = sb_gpioout(gpio_sbh, 0, 0, GPIO_DRV_PRIORITY);
++               val = sb_gpioout(gpio_sbh, 0, 0);
 +               break;
 +       case 2:
-+               val = sb_gpioouten(gpio_sbh, 0, 0, GPIO_DRV_PRIORITY);
++               val = sb_gpioouten(gpio_sbh, 0, 0);
 +               break;
 +       case 3:
-+               val = sb_gpiocontrol(gpio_sbh, 0, 0, GPIO_DRV_PRIORITY);
++               val = sb_gpiocontrol(gpio_sbh, 0, 0);
 +               break;
 +       default:
@@ -2167 +393 @@
 +               return -EACCES;
 +       case 1:
-+               sb_gpioout(gpio_sbh, ~0, val, GPIO_DRV_PRIORITY);
++               sb_gpioout(gpio_sbh, ~0, val);
 +               break;
 +       case 2:
-+               sb_gpioouten(gpio_sbh, ~0, val, GPIO_DRV_PRIORITY);
++               sb_gpioouten(gpio_sbh, ~0, val);
 +               break;
 +       case 3:
-+               sb_gpiocontrol(gpio_sbh, ~0, val, GPIO_DRV_PRIORITY);
++               sb_gpiocontrol(gpio_sbh, ~0, val);
 +               break;
 +       default:
@@ -2209 +435 @@
 +                                                    gpio_file[i].name,
 +                                                    DEVFS_FL_DEFAULT, gpio_major, i,
-+                                                    S_IFCHR | S_IRUGO | S_IWUGO,
++                                                    S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP,
 +                                                    &gpio_fops, NULL);
 +       }
@@ -2230 +456 @@
 +module_init(gpio_init);
 +module_exit(gpio_exit);
-diff -urN linux.old/arch/mips/bcm947xx/hndchipc.c linux.dev/arch/mips/bcm947xx/hndchipc.c
---- linux.old/arch/mips/bcm947xx/hndchipc.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/hndchipc.c     2006-04-28 00:33:05.000000000 +0200
-@@ -0,0 +1,158 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/bcmdevs.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmdevs.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/bcmdevs.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmdevs.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,369 @@
 +/*
-+ * BCM47XX support code for some chipcommon (old extif) facilities (uart)
++ * Broadcom device-specific manifest constants.
 + *
-+ * Copyright 2006, 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: hndchipc.c,v 1.1.1.1 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#include <typedefs.h>
-+#include <bcmdefs.h>
-+#include <osl.h>
-+#include <bcmutils.h>
-+#include <sbutils.h>
-+#include <bcmdevs.h>
-+#include <bcmnvram.h>
-+#include <sbconfig.h>
-+#include <sbextif.h>
-+#include <sbchipc.h>
-+#include <hndcpu.h>
-+
-+/*
-+ * Returns TRUE if an external UART exists at the given base
-+ * register.
-+ */
-+static bool
-+BCMINITFN(serial_exists)(osl_t *osh, uint8 *regs)
-+{
-+       uint8 save_mcr, status1;
-+
-+       save_mcr = R_REG(osh, &regs[UART_MCR]);
-+       W_REG(osh, &regs[UART_MCR], UART_MCR_LOOP | 0x0a);
-+       status1 = R_REG(osh, &regs[UART_MSR]) & 0xf0;
-+       W_REG(osh, &regs[UART_MCR], save_mcr);
-+
-+       return (status1 == 0x90);
-+}
-+
-+/*
-+ * Initializes UART access. The callback function will be called once
-+ * per found UART.
-+ */
-+void
-+BCMINITFN(sb_serial_init)(sb_t *sbh, void (*add)(void *regs, uint irq, uint baud_base,
-+                                                 uint reg_shift))
-+{
-+       osl_t *osh;
-+       void *regs;
-+       ulong base;
-+       uint irq;
-+       int i, n;
-+
-+       osh = sb_osh(sbh);
-+
-+       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(osh, &sb->sbadmatch1)));
-+
-+               /* Determine IRQ */
-+               irq = sb_irq(sbh);
-+
-+               /* Disable GPIO interrupt initially */
-+               W_REG(osh, &eir->gpiointpolarity, 0);
-+               W_REG(osh, &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(osh, regs)) {
-+                               /* Set GPIO 1 to be the external UART IRQ */
-+                               W_REG(osh, &eir->gpiointmask, 2);
-+                               /* XXXDetermine external UART clock */
-+                               if (add)
-+                                       add(regs, irq, 13500000, 0);
-+                       }
-+               }
-+
-+               /* Add internal UART if enabled */
-+               if (R_REG(osh, &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(osh, &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(osh, &cc->clockcontrol_n),
-+                                                 R_REG(osh, &cc->clockcontrol_m2));
-+                       div = 1;
-+               } else {
-+                       /* Fixed ALP clock */
-+                       if (rev >= 11 && rev != 15) {
-+                               baud_base = 20000000;
-+                               div = 1;
-+                               /* Set the override bit so we don't divide it */
-+                               W_REG(osh, &cc->corecontrol, CC_UARTCLKO);
-+                       }
-+                       /* Internal backplane clock */
-+                       else if (rev >= 3) {
-+                               baud_base = sb_clock(sbh);
-+                               div = 2;        /* Minimum divisor */
-+                               W_REG(osh, &cc->clkdiv,
-+                                     ((R_REG(osh, &cc->clkdiv) & ~CLKD_UART) | div));
-+                       }
-+                       /* Fixed internal backplane clock */
-+                       else {
-+                               baud_base = 88000000;
-+                               div = 48;
-+                       }
-+
-+                       /* Clock source depends on strapping if UartClkOverride is unset */
-+                       if ((rev > 0) &&
-+                           ((R_REG(osh, &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);
-+               }
-+       }
-+}
-+
-diff -urN linux.old/arch/mips/bcm947xx/include/bcm4710.h linux.dev/arch/mips/bcm947xx/include/bcm4710.h
---- linux.old/arch/mips/bcm947xx/include/bcm4710.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcm4710.h      2006-04-27 22:30:01.000000000 +0200
-@@ -0,0 +1,91 @@
-+/*
-+ * 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 2004, Broadcom Corporation   
++ * Copyright 2005, Broadcom Corporation   
 + * All Rights Reserved.   
 + *    
@@ -2408 +470 @@
 + * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS   
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.   
-+ *
-+ * $Id: bcm4710.h,v 1.3 2004/09/27 07:23:30 tallest Exp $
-+ */
-+
-+#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 -urN linux.old/arch/mips/bcm947xx/include/bcmdefs.h linux.dev/arch/mips/bcm947xx/include/bcmdefs.h
---- linux.old/arch/mips/bcm947xx/include/bcmdefs.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmdefs.h      2006-04-27 20:12:21.000000000 +0200
-@@ -0,0 +1,106 @@
-+/*
-+ * Misc system wide definitions
-+ *
-+ * Copyright 2006, 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: bcmdefs.h,v 1.1.1.3 2006/04/08 06:13:39 honor Exp $
-+ */
-+
-+#ifndef        _bcmdefs_h_
-+#define        _bcmdefs_h_
-+
-+/*
-+ * One doesn't need to include this file explicitly, gets included automatically if
-+ * typedefs.h is included.
-+ */
-+
-+/* Reclaiming text and data :
-+ * The following macros specify special linker sections that can be reclaimed
-+ * after a system is considered 'up'.
-+ */
-+#if defined(__GNUC__) && defined(BCMRECLAIM)
-+extern bool    bcmreclaimed;
-+#define BCMINITDATA(_data)     __attribute__ ((__section__ (".dataini." #_data))) _data
-+#define BCMINITFN(_fn)         __attribute__ ((__section__ (".textini." #_fn))) _fn
-+#else /* #if defined(__GNUC__) && defined(BCMRECLAIM) */
-+#define BCMINITDATA(_data)     _data
-+#define BCMINITFN(_fn)         _fn
-+#define bcmreclaimed           0
-+#endif /* #if defined(__GNUC__) && defined(BCMRECLAIM) */
-+
-+/* Reclaim uninit functions if BCMNODOWN is defined            */
-+/* and if they are not already removed by -gc-sections */
-+#ifdef BCMNODOWN
-+#define BCMUNINITFN(_fn)               BCMINITFN(_fn)
-+#else
-+#define BCMUNINITFN(_fn)               _fn
-+#endif
-+
-+#ifdef BCMRECLAIM
-+#define CONST
-+#else
-+#define CONST  const
-+#endif /* BCMRECLAIM */
-+
-+/* Compatibility with old-style BCMRECLAIM */
-+#define BCMINIT(_id)           _id
-+
-+
-+/* Put some library data/code into ROM to reduce RAM requirements */
-+#if defined(__GNUC__) && defined(BCMROMOFFLOAD)
-+#define BCMROMDATA(_data)      __attribute__ ((__section__ (".datarom." #_data))) _data
-+#define BCMROMFN(_fn)          __attribute__ ((__section__ (".textrom." #_fn))) _fn
-+#else
-+#define BCMROMDATA(_data)      _data
-+#define BCMROMFN(_fn)          _fn
-+#endif
-+
-+/* 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 */
-+#define JTAG_BUS               4       /* JTAG */
-+#define NO_BUS                 0xFF    /* Bus that does not support R/W REG */
-+
-+/* Allows optimization for single-bus support */
-+#ifdef BCMBUSTYPE
-+#define BUSTYPE(bus) (BCMBUSTYPE)
-+#else
-+#define BUSTYPE(bus) (bus)
-+#endif
-+
-+/* Defines for DMA Address Width - Shared between OSL and HNDDMA */
-+#define DMADDR_MASK_32 0x0             /* Address mask for 32-bits */
-+#define DMADDR_MASK_30 0xc0000000      /* Address mask for 30-bits */
-+#define DMADDR_MASK_0  0xffffffff      /* Address mask for 0-bits (hi-part) */
-+
-+#define        DMADDRWIDTH_30  30 /* 30-bit addressing capability */
-+#define        DMADDRWIDTH_32  32 /* 32-bit addressing capability */
-+#define        DMADDRWIDTH_63  63 /* 64-bit addressing capability */
-+#define        DMADDRWIDTH_64  64 /* 64-bit addressing capability */
-+
-+/* packet headroom necessary to accomodate the largest header in the system, (i.e TXOFF).
-+ * By doing, we avoid the need  to allocate an extra buffer for the header when bridging to WL.
-+ * There is a compile time check in wlc.c which ensure that this value is at least as big
-+ * as TXOFF. This value is used in dma_rxfill (hnddma.c).
-+ */
-+#define BCMEXTRAHDROOM 160
-+
-+/* Headroom required for dongle-to-host communication.  Packets allocated
-+ * locally in the dongle (e.g. for CDC ioctls or RNDIS messages) should
-+ * leave this much room in front for low-level message headers which may
-+ * be needed to get across the dongle bus to the host.  (These messages
-+ * don't go over the network, so room for the full WL header above would
-+ * be a waste.)
-+ */
-+#define BCMDONGLEHDRSZ 8
-+
-+
-+
-+#endif /* _bcmdefs_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm947xx/include/bcmdevs.h
---- linux.old/arch/mips/bcm947xx/include/bcmdevs.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h      2006-04-27 22:30:25.000000000 +0200
-@@ -0,0 +1,369 @@
-+/*
-+ * Broadcom device-specific manifest constants.
-+ *
-+ * Copyright 2006, 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: bcmdevs.h,v 1.1.1.17 2006/04/15 01:29:08 michael Exp $
++ * $Id$
 + */
 +
@@ -2617 +476 @@
 +#define        _BCMDEVS_H
 +
-+#include "bcm4710.h"
 +
 +/* Known PCI vendor Id's */
@@ -2657 +515 @@
 +#define        BCM47XX_USB20H_ID       0x471a          /* 47xx usb 2.0 host */
 +#define        BCM47XX_USB20D_ID       0x471b          /* 47xx usb 2.0 device */
-+#define        BCM47XX_ATA100_ID       0x471d          /* 47xx parallel ATA */
-+#define        BCM47XX_SATAXOR_ID      0x471e          /* 47xx serial ATA & XOR DMA */
-+#define        BCM47XX_GIGETH_ID       0x471f          /* 47xx GbE (5700) */
-+
-+#define BCM47XX_SMBUS_EMU_ID   0x47fe          /* 47xx emulated SMBus device */
-+#define        BCM47XX_XOR_EMU_ID      0x47ff          /* 47xx emulated XOR engine */
-+
-+#define        BCM4710_CHIP_ID         0x4710          /* 4710 chipid returned by sb_chip() */
++
 +#define        BCM4710_DEVICE_ID       0x4710          /* 4710 primary function 0 */
 +
-+#define        BCM4402_CHIP_ID         0x4402          /* 4402 chipid */
++#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        BCM4401_ENET_ID         0x170c          /* 4401b0 production enet cards */
 +
-+#define        BCM4306_CHIP_ID         0x4306          /* 4306 chipcommon chipid */
++#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          
@@ -2682 +548 @@
 +#define        BCM4309_PKG_ID          1               /* 4309 package id */
 +
-+#define        BCM4311_CHIP_ID         0x4311          /* 4311 PCIe 802.11a/b/g */
-+#define        BCM4311_D11G_ID         0x4311          /* 4311 802.11b/g id */
-+#define        BCM4311_D11DUAL_ID      0x4312          /* 4311 802.11a/b/g id */
-+#define        BCM4311_D11A_ID         0x4313          /* 4311 802.11a 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        BCMGPRS_UART_ID         0x4333          /* Uart id used by 4306/gprs card */
-+#define        BCMGPRS2_UART_ID        0x4344          /* Uart id used by 4306/gprs card */
-+
-+#define        BCM4704_CHIP_ID         0x4704          /* 4704 chipcommon chipid */
++
++#define        BCM4704_DEVICE_ID       0x4704          /* 4704 chipcommon chipid */
 +#define        BCM4704_ENET_ID         0x4706          /* 4704 enet (Use 47XX_ENET_ID instead!) */
 +
-+#define        BCM4318_CHIP_ID         0x4318          /* 4318 chip common chipid */
-+#define        BCM4318_D11G_ID         0x4318          /* 4318 802.11b/g id */
-+#define        BCM4318_D11DUAL_ID      0x4319          /* 4318 802.11a/b/g id */
-+#define        BCM4318_D11A_ID         0x431a          /* 4318 802.11a id */
-+
-+#define        BCM4321_CHIP_ID         0x4321          /* 4321 chip common chipid */
-+#define        BCM4321_D11N_ID         0x4328          /* 4321 802.11n dualband id */
-+#define        BCM4321_D11N2G_ID       0x4329          /* 4321 802.11n 2.4Hgz band id */
-+#define        BCM4321_D11N5G_ID       0x432a          /* 4321 802.11n 5Ghz band id */
-+
-+#define BCM4331_CHIP_ID                0x4331          /* 4331 chip common chipid */
-+#define BCM4331_D11N2G_ID      0x4330          /* 4331 802.11n 2.4Ghz band id */
-+#define BCM4331_D11N_ID                0x4331          /* 4331 802.11n dualband id */
-+#define BCM4331_D11N5G_ID      0x4332          /* 4331 802.11n 5Ghz band id */
-+
-+#define HDLSIM5350_PKG_ID      1               /* HDL simulator package id for a 5350 */
-+#define HDLSIM_PKG_ID          14              /* HDL simulator package id */
-+#define HWSIM_PKG_ID           15              /* Hardware simulator package id */
-+
-+#define        BCM4712_CHIP_ID         0x4712          /* 4712 chipcommon chipid */
++#define        BCM4317_DEVICE_ID       0x4317          /* 4317 chip common chipid */
++
++#define        BCM4318_DEVICE_ID       0x4318          /* 4318 chip common chipid */
++#define        BCM4318_D11G_ID         0x4318          /* 4318 801.11b/g id */
++#define        BCM4318_D11DUAL_ID      0x4319          /* 4318 801.11a/b/g id */
++#define BCM4318_JTAGM_ID       0x4331          /* 4318 jtagm device id */
++
++#define FPGA_JTAGM_ID          0x4330          /* ??? */
++
++/* 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        BCM4712_DEVICE_ID       0x4712          /* 4712 chipcommon chipid */
 +#define        BCM4712_MIPS_ID         0x4720          /* 4712 base devid */
 +#define        BCM4712LARGE_PKG_ID     0               /* 340pin 4712 package id */
@@ -2721 +610 @@
 +#define        BCM4712MID_PKG_ID       2               /* 225pin 4712 package id */
 +
-+#define BCM5365_CHIP_ID                0x5365          /* 5365 chipcommon chipid */
-+#define        BCM5350_CHIP_ID         0x5350          /* bcm5350 chipcommon chipid */
-+#define        BCM5352_CHIP_ID         0x5352          /* bcm5352 chipcommon chipid */
-+
-+#define        BCM4320_CHIP_ID         0x4320          /* bcm4320 chipcommon chipid */
-+
-+#define BCM4328_CHIP_ID                0x4328          /* bcm4328 chipcommon chipid */
-+
-+#define FPGA_JTAGM_ID          0x43f0          /* FPGA jtagm device id */
-+#define BCM43XX_JTAGM_ID       0x43f1          /* 43xx jtagm device id */
-+#define BCM43XXOLD_JTAGM_ID    0x4331          /* 43xx old jtagm device id */
-+
-+#define SDIOH_FPGA_ID          0x43f2          /* sdio host fpga */
-+#define SDIOD_FPGA_ID          0x43f4          /* sdio device fpga */
-+
-+#define MIMO_FPGA_ID           0x43f8          /* FPGA mimo minimacphy device id */
-+
-+#define BCM4785_CHIP_ID                0x4785          /* 4785 chipcommon chipid */
++#define        SDIOH_FPGA_ID           0x4380          /* sdio host fpga */
++
++#define BCM5365_DEVICE_ID       0x5365          /* 5365 chipcommon chipid */
++#define        BCM5350_DEVICE_ID       0x5350          /* bcm5350 chipcommon chipid */
++#define        BCM5352_DEVICE_ID       0x5352          /* bcm5352 chipcommon chipid */
++
++#define        BCM4320_DEVICE_ID       0x4320          /* bcm4320 chipcommon chipid */
 +
 +/* PCMCIA vendor Id's */
@@ -2762 +640 @@
 +#define BFL_HGPA               0x2000  /* This board has a high gain PA */
 +#define        BFL_BTCMOD              0x4000  /* This board' BTCOEXIST is in the alternate gpios */
-+#define        BFL_ALTIQ               0x8000  /* Alternate I/Q settings */
-+
-+/* boardflags2 */
-+#define BFL2_RXBB_INT_REG_DIS  0x00000001      /* This board has an external rxbb regulator */
-+#define BFL2_SSWITCH_AVAIL     0x00000002      /* This board has a superswitch for > 2 antennas */
-+#define BFL2_TXPWRCTRL_EN      0x00000004      /* This board permits TX Power Control to be enabled */
-+
-+/* board specific GPIO assignment, gpio 0-3 are also customer-configurable led */
-+#define        BOARD_GPIO_BTCMOD_IN    0x010   /* bit 4 is the alternate BT Coexistance Input */
-+#define        BOARD_GPIO_BTCMOD_OUT   0x020   /* bit 5 is the alternate BT Coexistance Out */
-+#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 */
-+
-+/* power control defines */
-+#define PLL_DELAY              150             /* us pll on delay */
-+#define FREF_DELAY             200             /* us fref change delay */
-+#define MIN_SLOW_CLK           32              /* us Slow clock period */
-+#define        XTAL_ON_DELAY           1000            /* us crystal power-on delay */
-+
-+/* Reference Board Types */
-+
-+#define        BU4710_BOARD            0x0400
-+#define        VSIM4710_BOARD          0x0401
-+#define        QT4710_BOARD            0x0402
-+
-+#define        BU4309_BOARD            0x040a
-+#define        BCM94309CB_BOARD        0x040b
-+#define        BCM94309MP_BOARD        0x040c
-+#define        BCM4309AP_BOARD         0x040d
-+
-+#define        BCM94302MP_BOARD        0x040e
-+
-+#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        BU4704_BOARD            0x0423
-+#define        BU4702_BOARD            0x0424
-+
-+#define        BCM94306PC_BOARD        0x0425          /* pcmcia 3.3v 4306 card */
-+
-+
-+#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
-+
-+/* 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
-+
-+
-+
-+#define BU4712_BOARD           0x0444
-+#define        BU4712SD_BOARD          0x045d
-+#define        BU4712L_BOARD           0x045f
-+
-+/* BCM4712 boards */
-+#define BCM94712AP_BOARD       0x0445
-+#define BCM94712P_BOARD                0x0446
-+
-+/* BCM4318 boards */
-+#define BU4318_BOARD           0x0447
-+#define CB4318_BOARD           0x0448
-+#define MPG4318_BOARD          0x0449
-+#define MP4318_BOARD           0x044a
-+#define SD4318_BOARD           0x044b
-+
-+/* BCM63XX boards */
-+#define BCM96338_BOARD         0x6338
-+#define BCM96348_BOARD         0x6348
-+
-+/* Another mp4306 with SiGe */
-+#define        BCM94306P_BOARD         0x044c
-+
-+/* mp4303 */
-+#define        BCM94303MP_BOARD        0x044e
-+
-+/* mpsgh4306 */
-+#define        BCM94306MPSGH_BOARD     0x044f
-+
-+/* BRCM 4306 w/ Front End Modules */
-+#define BCM94306MPM            0x0450
-+#define BCM94306MPL            0x0453
-+
-+/* 4712agr */
-+#define        BCM94712AGR_BOARD       0x0451
-+
-+/* pcmcia 4303 */
-+#define        PC4303_BOARD            0x0454
-+
-+/* 5350K */
-+#define        BCM95350K_BOARD         0x0455
-+
-+/* 5350R */
-+#define        BCM95350R_BOARD         0x0456
-+
-+/* 4306mplna */
-+#define        BCM94306MPLNA_BOARD     0x0457
-+
-+/* 4320 boards */
-+#define        BU4320_BOARD            0x0458
-+#define        BU4320S_BOARD           0x0459
-+#define        BCM94320PH_BOARD        0x045a
-+
-+/* 4306mph */
-+#define        BCM94306MPH_BOARD       0x045b
-+
-+/* 4306pciv */
-+#define        BCM94306PCIV_BOARD      0x045c
-+
-+#define        BU4712SD_BOARD          0x045d
-+
-+#define        BCM94320PFLSH_BOARD     0x045e
-+
-+#define        BU4712L_BOARD           0x045f
-+#define        BCM94712LGR_BOARD       0x0460
-+#define        BCM94320R_BOARD         0x0461
-+
-+#define        BU5352_BOARD            0x0462
-+
-+#define        BCM94318MPGH_BOARD      0x0463
-+
-+#define        BU4311_BOARD            0x0464
-+#define        BCM94311MC_BOARD        0x0465
-+#define        BCM94311MCAG_BOARD      0x0466
-+
-+#define        BCM95352GR_BOARD        0x0467
-+
-+/* bcm95351agr */
-+#define        BCM95351AGR_BOARD       0x0470
-+
-+/* bcm94704mpcb */
-+#define        BCM94704MPCB_BOARD      0x0472
-+
-+/* 4785 boards */
-+#define BU4785_BOARD           0x0478
-+
-+/* 4321 boards */
-+#define BU4321_BOARD           0x046b
-+#define BU4321E_BOARD          0x047c
-+#define MP4321_BOARD           0x046c
-+#define CB2_4321_BOARD         0x046d
-+#define MC4321_BOARD           0x046e
-+
-+/* # of GPIO pins */
-+#define GPIO_NUMPINS           16
-+
-+/* radio ID codes */
-+#define        NORADIO_ID              0xe4f5
-+#define        NORADIO_IDCODE          0x4e4f5246
-+
-+#define        BCM2050_ID              0x2050
-+#define        BCM2050_IDCODE          0x02050000
-+#define        BCM2050A0_IDCODE        0x1205017f
-+#define        BCM2050A1_IDCODE        0x2205017f
-+#define        BCM2050R8_IDCODE        0x8205017f
-+
-+#define BCM2055_ID             0x2055
-+#define BCM2055_IDCODE         0x02055000
-+#define BCM2055A0_IDCODE       0x1205517f
-+
-+#define        BCM2060_ID              0x2060
-+#define        BCM2060_IDCODE          0x02060000
-+#define        BCM2060WW_IDCODE        0x1206017f
-+
-+#define BCM2062_ID             0x2062
-+#define BCM2062_IDCODE         0x02062000
-+#define BCM2062A0_IDCODE       0x0206217f
-+
-+/* parts of an idcode: */
-+#define        IDCODE_MFG_MASK         0x00000fff
-+#define        IDCODE_MFG_SHIFT        0
-+#define        IDCODE_ID_MASK          0x0ffff000
-+#define        IDCODE_ID_SHIFT         12
-+#define        IDCODE_REV_MASK         0xf0000000
-+#define        IDCODE_REV_SHIFT        28
-+
-+#endif /* _BCMDEVS_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs1.h linux.dev/arch/mips/bcm947xx/include/bcmdevs1.h
---- linux.old/arch/mips/bcm947xx/include/bcmdevs1.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmdevs1.h     2006-05-02 04:32:03.000000000 +0200
-@@ -0,0 +1,391 @@
-+/*
-+ * Broadcom device-specific manifest constants.
-+ *
-+ * Copyright 2005, 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        _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        BCM47XX_ROBO_ID         0x4719          /* 47xx/53xx roboswitch core */
-+#define        BCM47XX_USB20H_ID       0x471a          /* 47xx usb 2.0 host */
-+#define        BCM47XX_USB20D_ID       0x471b          /* 47xx usb 2.0 device */
-+
-+#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        BCM4401_ENET_ID         0x170c          /* 4401b0 production enet cards */
-+
-+#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        BCMGPRS_UART_ID         0x4333          /* Uart id used by 4306/gprs card */
-+#define        BCMGPRS2_UART_ID        0x4344          /* Uart id used by 4306/gprs card */
-+
-+
-+#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        BCM4318_DEVICE_ID       0x4318          /* 4318 chip common chipid */
-+#define        BCM4318_D11G_ID         0x4318          /* 4318 801.11b/g id */
-+#define        BCM4318_D11DUAL_ID      0x4319          /* 4318 801.11a/b/g id */
-+#define BCM4318_JTAGM_ID       0x4331          /* 4318 jtagm device id */
-+
-+#define FPGA_JTAGM_ID          0x4330          /* ??? */
-+
-+/* 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        BCM4712_DEVICE_ID       0x4712          /* 4712 chipcommon chipid */
-+#define        BCM4712_MIPS_ID         0x4720          /* 4712 base devid */
-+#define        BCM4712LARGE_PKG_ID     0               /* 340pin 4712 package id */
-+#define        BCM4712SMALL_PKG_ID     1               /* 200pin 4712 package id */
-+#define        BCM4712MID_PKG_ID       2               /* 225pin 4712 package id */
-+
-+#define        SDIOH_FPGA_ID           0x4380          /* sdio host fpga */
-+
-+#define BCM5365_DEVICE_ID       0x5365          /* 5365 chipcommon chipid */
-+#define        BCM5350_DEVICE_ID       0x5350          /* bcm5350 chipcommon chipid */
-+#define        BCM5352_DEVICE_ID       0x5352          /* bcm5352 chipcommon chipid */
-+
-+#define        BCM4320_DEVICE_ID       0x4320          /* bcm4320 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_ENETROBO            0x0010  /* This board has robo switch or core */
-+#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 has vlan capability */
-+#define        BFL_AFTERBURNER         0x0200  /* This board supports Afterburner mode */
-+#define BFL_NOPCI              0x0400  /* This board leaves PCI floating */
-+#define BFL_FEM                        0x0800  /* This board supports the Front End Module */
-+#define BFL_EXTLNA             0x1000  /* This board has an external LNA */
-+#define BFL_HGPA               0x2000  /* This board has a high gain PA */
-+#define        BFL_BTCMOD              0x4000  /* This board' BTCOEXIST is in the alternate gpios */
-+#define        BFL_ALTIQ               0x8000  /* Alternate I/Q settings */
 +
 +/* board specific GPIO assignment, gpio 0-3 are also customer-configurable led */
@@ -3185 +668 @@
 +
 +/* power control defines */
-+#define PLL_DELAY              150             /* us pll on delay */
-+#define FREF_DELAY             200             /* us fref change delay */
-+#define MIN_SLOW_CLK           32              /* us Slow clock period */
-+#define        XTAL_ON_DELAY           1000            /* us crystal power-on delay */
++#define PLL_DELAY              150             /* 150us pll on delay */
++#define FREF_DELAY             200             /* 200us fref change delay */
++#define MIN_SLOW_CLK           32              /* 32us Slow clock period */
 +
 +/* Reference Board Types */
@@ -3293 +775 @@
 +#define SD4318_BOARD           0x044b
 +
-+/* BCM63XX boards */
-+#define BCM96338_BOARD         0x6338
-+#define BCM96345_BOARD         0x6345
-+#define BCM96348_BOARD         0x6348
-+
 +/* Another mp4306 with SiGe */
 +#define        BCM94306P_BOARD         0x044c
@@ -3332 +809 @@
 +#define        BCM94306MPLNA_BOARD     0x0457
 +
-+/* 4320 boards */
-+#define        BU4320_BOARD            0x0458
-+#define        BU4320S_BOARD           0x0459
-+#define        BCM94320PH_BOARD        0x045a
 +
 +/* 4306mph */
@@ -3345 +818 @@
 +#define        BU4712SD_BOARD          0x045d
 +
-+#define        BCM94320PFLSH_BOARD     0x045e
 +
 +#define        BU4712L_BOARD           0x045f
 +#define        BCM94712LGR_BOARD       0x0460
-+#define        BCM94320R_BOARD         0x0461
 +
 +#define        BU5352_BOARD            0x0462
-+
-+#define        BCM94318MPGH_BOARD      0x0463
-+
-+
 +#define        BCM95352GR_BOARD        0x0467
-+
-+/* bcm95351agr */
-+#define        BCM95351AGR_BOARD       0x0470
 +
 +/* # of GPIO pins */
@@ -3365 +829 @@
 +
 +#endif /* _BCMDEVS_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/bcm947xx/include/bcmendian.h
---- linux.old/arch/mips/bcm947xx/include/bcmendian.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h    2006-04-27 20:08:35.000000000 +0200
-@@ -0,0 +1,198 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/bcmendian.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmendian.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/bcmendian.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmendian.h 2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,168 @@
 +/*
 + * local version of endian.h - byte order defines
 + *
-+ * Copyright 2006, 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.
++ * Copyright 2005, 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: bcmendian.h,v 1.1.1.10 2006/02/27 03:43:16 honor Exp $
++ *  $Id$
 +*/
 +
@@ -3390 +854 @@
 +/* Byte swap a 16 bit value */
 +#define BCMSWAP16(val) \
-+       ((uint16)(\
++       ((uint16)( \
 +               (((uint16)(val) & (uint16)0x00ffU) << 8) | \
-+               (((uint16)(val) & (uint16)0xff00U) >> 8)))
-+
++               (((uint16)(val) & (uint16)0xff00U) >> 8) ))
++       
 +/* Byte swap a 32 bit value */
 +#define BCMSWAP32(val) \
-+       ((uint32)(\
++       ((uint32)( \
 +               (((uint32)(val) & (uint32)0x000000ffUL) << 24) | \
 +               (((uint32)(val) & (uint32)0x0000ff00UL) <<  8) | \
 +               (((uint32)(val) & (uint32)0x00ff0000UL) >>  8) | \
-+               (((uint32)(val) & (uint32)0xff000000UL) >> 24)))
-+
-+/* 2 Byte swap a 32 bit value */
-+#define BCMSWAP32BY16(val) \
-+       ((uint32)(\
-+               (((uint32)(val) & (uint32)0x0000ffffUL) << 16) | \
-+               (((uint32)(val) & (uint32)0xffff0000UL) >> 16)))
-+
++               (((uint32)(val) & (uint32)0xff000000UL) >> 24) ))
 +
 +static INLINE uint16
@@ -3419 +876 @@
 +{
 +       return BCMSWAP32(val);
-+}
-+
-+static INLINE uint32
-+bcmswap32by16(uint32 val)
-+{
-+       return BCMSWAP32BY16(val);
 +}
 +
@@ -3434 +885 @@
 +       len = len/2;
 +
-+       while (len--) {
++       while(len--){
 +               *buf = bcmswap16(*buf);
 +               buf++;
@@ -3461 +912 @@
 +#define htol16(i) bcmswap16(i)
 +#define htol32(i) bcmswap32(i)
-+#endif /* IL_BIGENDIAN */
-+#endif /* hton16 */
++#endif
++#endif
 +
 +#ifndef IL_BIGENDIAN
@@ -3470 +921 @@
 +#define ltoh16_buf(buf, i) bcmswap16_buf((uint16*)buf, i)
 +#define htol16_buf(buf, i) bcmswap16_buf((uint16*)buf, i)
-+#endif /* IL_BIGENDIAN */
-+
-+/*
-+* store 16-bit value to unaligned little endian byte array.
-+*/
-+static INLINE void
-+htol16_ua_store(uint16 val, uint8 *bytes)
-+{
-+       bytes[0] = val&0xff;
-+       bytes[1] = val>>8;
-+}
-+
-+/*
-+* store 32-bit value to unaligned little endian byte array.
-+*/
-+static INLINE void
-+htol32_ua_store(uint32 val, uint8 *bytes)
-+{
-+       bytes[0] = val&0xff;
-+       bytes[1] = (val>>8)&0xff;
-+       bytes[2] = (val>>16)&0xff;
-+       bytes[3] = val>>24;
-+}
-+
-+/*
-+* store 16-bit value to unaligned network(big) endian byte array.
-+*/
-+static INLINE void
-+hton16_ua_store(uint16 val, uint8 *bytes)
-+{
-+       bytes[1] = val&0xff;
-+       bytes[0] = val>>8;
-+}
-+
-+/*
-+* store 32-bit value to unaligned network(big) endian byte array.
-+*/
-+static INLINE void
-+hton32_ua_store(uint32 val, uint8 *bytes)
-+{
-+       bytes[3] = val&0xff;
-+       bytes[2] = (val>>8)&0xff;
-+       bytes[1] = (val>>16)&0xff;
-+       bytes[0] = val>>24;
-+}
++#endif
 +
 +/*
@@ -3520 +927 @@
 +*/
 +static INLINE uint16
-+ltoh16_ua(void *bytes)
-+{
-+       return (((uint8*)bytes)[1]<<8)+((uint8 *)bytes)[0];
++ltoh16_ua(uint8 *bytes)
++{
++       return (bytes[1]<<8)+bytes[0];
 +}
 +
@@ -3529 +936 @@
 +*/
 +static INLINE uint32
-+ltoh32_ua(void *bytes)
-+{
-+       return (((uint8*)bytes)[3]<<24)+(((uint8*)bytes)[2]<<16)+
-+              (((uint8*)bytes)[1]<<8)+((uint8*)bytes)[0];
++ltoh32_ua(uint8 *bytes)
++{
++       return (bytes[3]<<24)+(bytes[2]<<16)+(bytes[1]<<8)+bytes[0];
 +}
 +
@@ -3539 +945 @@
 +*/
 +static INLINE uint16
-+ntoh16_ua(void *bytes)
-+{
-+       return (((uint8*)bytes)[0]<<8)+((uint8*)bytes)[1];
++ntoh16_ua(uint8 *bytes)
++{
++       return (bytes[0]<<8)+bytes[1];
 +}
 +
@@ -3548 +954 @@
 +*/
 +static INLINE uint32
-+ntoh32_ua(void *bytes)
-+{
-+       return (((uint8*)bytes)[0]<<24)+(((uint8*)bytes)[1]<<16)+
-+              (((uint8*)bytes)[2]<<8)+((uint8*)bytes)[3];
-+}
-+
-+#define ltoh_ua(ptr) (\
-+       sizeof(*(ptr)) == sizeof(uint8) ?  *(uint8 *)ptr : \
-+       sizeof(*(ptr)) == sizeof(uint16) ? (((uint8 *)ptr)[1]<<8)+((uint8 *)ptr)[0] : \
-+       (((uint8 *)ptr)[3]<<24)+(((uint8 *)ptr)[2]<<16)+(((uint8 *)ptr)[1]<<8)+((uint8 *)ptr)[0] \
-+)
-+
-+#define ntoh_ua(ptr) (\
-+       sizeof(*(ptr)) == sizeof(uint8) ?  *(uint8 *)ptr : \
-+       sizeof(*(ptr)) == sizeof(uint16) ? (((uint8 *)ptr)[0]<<8)+((uint8 *)ptr)[1] : \
-+       (((uint8 *)ptr)[0]<<24)+(((uint8 *)ptr)[1]<<16)+(((uint8 *)ptr)[2]<<8)+((uint8 *)ptr)[3] \
-+)
++ntoh32_ua(uint8 *bytes)
++{
++       return (bytes[0]<<24)+(bytes[1]<<16)+(bytes[2]<<8)+bytes[3];
++}
++
++/* get_ua adapted from Linux asm-mips/unaligned.h */
++#ifdef IL_BIGENDIAN
++#define get_ua(ptr)                                            \
++({                                                                     \
++       __typeof__(*(ptr)) __val;                                       \
++                                                                       \
++       switch (sizeof(*(ptr))) {                                       \
++       case 1:                                                         \
++               __val = *(uint8 *)ptr;                  \
++               break;                                                  \
++       case 2:                                                         \
++               __val = ntoh16_ua((uint8 *)ptr);                \
++               break;                                                  \
++       case 4:                                                         \
++               __val = ntoh32_ua((uint8 *)ptr);                \
++               break;                                                  \
++       }                                                               \
++                                                                       \
++       __val;                                                          \
++})
++#else
++#define get_ua(ptr)                                            \
++({                                                                     \
++       __typeof__(*(ptr)) __val;                                       \
++                                                                       \
++       switch (sizeof(*(ptr))) {                                       \
++       case 1:                                                         \
++               __val = *(uint8 *)ptr;                  \
++               break;                                                  \
++       case 2:                                                         \
++               __val = ltoh16_ua((uint8 *)ptr);                \
++               break;                                                  \
++       case 4:                                                         \
++               __val = ltoh32_ua((uint8 *)ptr);                \
++               break;                                                  \
++       }                                                               \
++                                                                       \
++       __val;                                                          \
++})
++#endif
 +
 +#endif /* _BCMENDIAN_H_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bcm947xx/include/bcmnvram.h
---- linux.old/arch/mips/bcm947xx/include/bcmnvram.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h     2006-04-27 23:29:18.000000000 +0200
-@@ -0,0 +1,159 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/bcmnvram.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmnvram.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/bcmnvram.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmnvram.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,132 @@
 +/*
 + * NVRAM variable manipulation
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -3582 +1016 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: bcmnvram.h,v 1.17 2006/03/02 12:33:44 honor Exp $
++ * $Id$
 + */
 +
@@ -3591 +1025 @@
 +
 +#include <typedefs.h>
-+#include <bcmdefs.h>
 +
 +struct nvram_header {
 +       uint32 magic;
 +       uint32 len;
-+       uint32 crc_ver_init;    /* 0:7 crc, 8:15 ver, 16:31 sdram_init */
-+       uint32 config_refresh;  /* 0:15 sdram_config, 16:31 sdram_refresh */
++       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 */
 +};
@@ -3611 +1044 @@
 + * platforms.
 + */
-+extern int nvram_init(void *sbh);
++extern int BCMINIT(nvram_init)(void *sbh);
 +
 +/*
@@ -3617 +1050 @@
 + * platforms.
 + */
-+extern void nvram_exit(void *sbh);
++extern void BCMINIT(nvram_exit)(void);
 +
 +/*
@@ -3625 +1058 @@
 + * @return     value of variable or NULL if undefined
 + */
-+extern char * nvram_get(const char *name);
-+
-+/* 
-+ * Read the reset GPIO value from the nvram and set the GPIO
-+ * as input
-+ */
-+extern int BCMINITFN(nvram_resetgpio_init)(void *sbh);
-+extern int BCMINITFN(nvram_gpio_init)(const char *name, void *sbh);
-+extern int BCMINITFN(nvram_gpio_set)(const char *name, void *sbh, int type);
++extern char * BCMINIT(nvram_get)(const char *name);
 +
 +/* 
@@ -3640 +1065 @@
 + * @return     value of variable or NUL if undefined
 + */
-+#define nvram_safe_get(name) (nvram_get(name) ? : "")
-+
-+#define nvram_safe_unset(name) ({ \
-+       if(nvram_get(name)) \
-+               nvram_unset(name); \
-+})
-+
-+#define nvram_safe_set(name, value) ({ \
-+       if(!nvram_get(name) || strcmp(nvram_get(name), value)) \
-+               nvram_set(name, value); \
-+})
++#define nvram_safe_get(name) (BCMINIT(nvram_get)(name) ? : "")
 +
 +/*
@@ -3661 +1076 @@
 +static INLINE int
 +nvram_match(char *name, char *match) {
-+       const char *value = nvram_get(name);
++       const char *value = BCMINIT(nvram_get)(name);
 +       return (value && !strcmp(value, match));
 +}
@@ -3674 +1089 @@
 +static INLINE int
 +nvram_invmatch(char *name, char *invmatch) {
-+       const char *value = nvram_get(name);
++       const char *value = BCMINIT(nvram_get)(name);
 +       return (value && strcmp(value, invmatch));
 +}
@@ -3687 +1102 @@
 + * @return     0 on success and errno on failure
 + */
-+extern int nvram_set(const char *name, const char *value);
++extern int BCMINIT(nvram_set)(const char *name, const char *value);
 +
 +/*
@@ -3696 +1111 @@
 + * NOTE: use nvram_commit to commit this change to flash.
 + */
-+extern int nvram_unset(const char *name);
++extern int BCMINIT(nvram_unset)(const char *name);
 +
 +/*
@@ -3704 +1119 @@
 + * @return     0 on success and errno on failure
 + */
-+extern int nvram_commit(void);
++extern int BCMINIT(nvram_commit)(void);
 +
 +/*
@@ -3712 +1127 @@
 + * @return     0 on success and errno on failure
 + */
-+extern int nvram_getall(char *buf, int count);
-+
-+extern int file2nvram(char *filename, char *varname);
-+extern int nvram2file(char *varname, char *filename);
++extern int BCMINIT(nvram_getall)(char *buf, int count);
 +
 +#endif /* _LANGUAGE_ASSEMBLY */
 +
 +#define NVRAM_MAGIC            0x48534C46      /* 'FLSH' */
-+#define NVRAM_CLEAR_MAGIC              0x0
-+#define NVRAM_INVALID_MAGIC    0xFFFFFFFF
 +#define NVRAM_VERSION          1
 +#define NVRAM_HEADER_SIZE      20
 +#define NVRAM_SPACE            0x8000
 +
-+#define NVRAM_MAX_VALUE_LEN 255
-+#define NVRAM_MAX_PARAM_LEN 64
-+
 +#endif /* _bcmnvram_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm947xx/include/bcmsrom.h
---- linux.old/arch/mips/bcm947xx/include/bcmsrom.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h      2006-04-27 20:27:33.000000000 +0200
-@@ -0,0 +1,108 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/bcmsrom.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmsrom.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/bcmsrom.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmsrom.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,22 @@
 +/*
 + * Misc useful routines to access NIC local SROM/OTP .
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -3745 +1152 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: bcmsrom.h,v 1.1.1.13 2006/04/15 01:29:08 michael Exp $
++ * $Id$
 + */
 +
@@ -3751 +1158 @@
 +#define        _bcmsrom_h_
 +
-+/* Maximum srom: 4 Kilobits == 512 bytes */
-+#define        SROM_MAX        512
-+
-+/* SROM Rev 4: Reallocate the software part of the srom to accomodate
-+ * MIMO features. It assumes up to two PCIE functions and 440 bytes
-+ * of useable srom i.e. the useable storage in chips with OTP that
-+ * implements hardware redundancy.
-+ */
-+
-+#define        SROM4_WORDS             220
-+
-+#define        SROM4_SIGN              32
-+#define        SROM4_SIGNATURE         0x5372
-+
-+#define        SROM4_BREV              33
-+
-+#define        SROM4_BFL0              34
-+#define        SROM4_BFL1              35
-+#define        SROM4_BFL2              36
-+#define        SROM4_BFL3              37
-+
-+#define        SROM4_MACHI             38
-+#define        SROM4_MACMID            39
-+#define        SROM4_MACLO             40
-+
-+#define        SROM4_CCODE             41
-+#define        SROM4_REGREV            42
-+
-+#define        SROM4_LEDBH10           43
-+#define        SROM4_LEDBH32           44
-+
-+#define        SROM4_LEDDC             45
-+
-+#define        SROM4_AA                46
-+#define        SROM4_AA2G_MASK         0x00ff
-+#define        SROM4_AA2G_SHIFT        0
-+#define        SROM4_AA5G_MASK         0xff00
-+#define        SROM4_AA5G_SHIFT        8
-+
-+#define        SROM4_AG10              47
-+#define        SROM4_AG32              48
-+
-+#define        SROM4_TXPID2G           49
-+#define        SROM4_TXPID5G           51
-+#define        SROM4_TXPID5GL          53
-+#define        SROM4_TXPID5GH          55
-+
-+/* Per-path fields */
-+#define        MAX_PATH                4
-+#define        SROM4_PATH0             64
-+#define        SROM4_PATH1             87
-+#define        SROM4_PATH2             110
-+#define        SROM4_PATH3             133
-+
-+#define        SROM4_2G_ITT_MAXP       0
-+#define        SROM4_2G_PA             1
-+#define        SROM4_5G_ITT_MAXP       5
-+#define        SROM4_5GLH_MAXP         6
-+#define        SROM4_5G_PA             7
-+#define        SROM4_5GL_PA            11
-+#define        SROM4_5GH_PA            15
-+
-+/* Fields in the ITT_MAXP and 5GLH_MAXP words */
-+#define        B2G_MAXP_MASK           0xff
-+#define        B2G_ITT_SHIFT           8
-+#define        B5G_MAXP_MASK           0xff
-+#define        B5G_ITT_SHIFT           8
-+#define        B5GH_MAXP_MASK          0xff
-+#define        B5GL_MAXP_SHIFT         8
-+
-+/* All the miriad power offsets */
-+#define        SROM4_2G_CCKPO          156
-+#define        SROM4_2G_OFDMPO         157
-+#define        SROM4_5G_OFDMPO         159
-+#define        SROM4_5GL_OFDMPO        161
-+#define        SROM4_5GH_OFDMPO        163
-+#define        SROM4_2G_MCSPO          165
-+#define        SROM4_5G_MCSPO          173
-+#define        SROM4_5GL_MCSPO         181
-+#define        SROM4_5GH_MCSPO         189
-+#define        SROM4_CCDPO             197
-+#define        SROM4_STBCPO            198
-+#define        SROM4_BW40PO            199
-+#define        SROM4_BWDUPPO           200
-+
-+extern int srom_var_init(void *sbh, uint bus, void *curmap, osl_t *osh, char **vars, uint *count);
-+
-+extern int srom_read(uint bus, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf);
-+extern int srom_write(uint bus, void *curmap, osl_t *osh, uint byteoff, uint nbytes, uint16 *buf);
-+
++extern int srom_var_init(void *sbh, 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);
++          
 +#endif /* _bcmsrom_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bcm947xx/include/bcmutils.h
---- linux.old/arch/mips/bcm947xx/include/bcmutils.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h     2006-05-02 01:52:12.000000000 +0200
-@@ -0,0 +1,433 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/bcmutils.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmutils.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/bcmutils.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/bcmutils.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,239 @@
 +/*
 + * Misc useful os-independent macros and functions.
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -3856 +1177 @@
 + * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
-+ * $Id: bcmutils.h,v 1.1.1.16 2006/04/08 06:13:39 honor Exp $
++ * $Id$
 + */
 +
@@ -3862 +1183 @@
 +#define        _bcmutils_h_
 +
-+/* ** driver-only section ** */
++/*** driver-only section ***/
 +#ifdef BCMDRIVER
++#include <osl.h>
 +
 +#define _BCM_U 0x01    /* upper */
@@ -3873 +1195 @@
 +#define _BCM_X 0x40    /* hex digit */
 +#define _BCM_SP        0x80    /* hard space (0x20) */
-+
-+#define GPIO_PIN_NOTDEFINED    0x20    /* Pin not defined */
 +
 +extern unsigned char bcm_ctype[];
@@ -3904 +1224 @@
 +}
 +
-+struct  ether_addr {
-+       uint8 octet[6];
-+} __attribute__((packed));
-+
++/* generic osl packet queue */
++struct pktq {
++       void *head;     /* first packet to dequeue */
++       void *tail;     /* last packet to dequeue */
++       uint len;       /* number of queued packets */
++       uint maxlen;    /* maximum number of queued packets */
++       bool priority;  /* enqueue by packet priority */
++       uint8 prio_map[MAXPRIO+1]; /* user priority to packet enqueue policy map */
++};
++#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)
++#define        _pktq_pri(q, pri)       ((q)->prio_map[pri])
++#define        pktq_tailpri(q) ((q)->tail ? _pktq_pri(q, PKTPRIO((q)->tail)) : _pktq_pri(q, 0))
++
++/* externs */
++/* packet */
++extern uint pktcopy(void *drv, void *p, uint offset, int len, uchar *buf);
++extern uint pkttotlen(void *drv, void *);
++extern void pktq_init(struct pktq *q, uint maxlen, const uint8 prio_map[]);
++extern void pktenq(struct pktq *q, void *p, bool lifo);
++extern void *pktdeq(struct pktq *q);
++extern void *pktdeqtail(struct pktq *q);
 +/* string */
++extern uint bcm_atoi(char *s);
 +extern uchar bcm_toupper(uchar c);
 +extern ulong bcm_strtoul(char *cp, char **endp, uint base);
@@ -3915 +1258 @@
 +extern ulong wchar2ascii(char *abuf, ushort *wbuf, ushort wbuflen, ulong abuflen);
 +/* ethernet address */
-+extern char *bcm_ether_ntoa(struct ether_addr *ea, char *buf);
++extern char *bcm_ether_ntoa(char *ea, char *buf);
++extern int bcm_ether_atoe(char *p, char *ea);
++/* delay */
++extern void bcm_mdelay(uint ms);
 +/* variable access */
 +extern char *getvar(char *vars, char *name);
 +extern int getintvar(char *vars, char *name);
 +extern uint getgpiopin(char *vars, char *pin_name, uint def_pin);
-+#ifdef BCMPERFSTATS
-+extern void bcm_perf_enable(void);
-+extern void bcmstats(char *fmt);
-+extern void bcmlog(char *fmt, uint a1, uint a2);
-+extern void bcmdumplog(char *buf, int size);
-+extern int bcmdumplogent(char *buf, uint idx);
-+#else
-+#define bcm_perf_enable()
-+#define bcmstats(fmt)
 +#define        bcmlog(fmt, a1, a2)
 +#define        bcmdumplog(buf, size)   *buf = '\0'
 +#define        bcmdumplogent(buf, idx) -1
-+#endif /* BCMPERFSTATS */
-+extern char *bcm_nvram_vars(uint *length);
-+extern int bcm_nvram_cache(void *sbh);
-+
-+/* Support for sharing code across in-driver iovar implementations.
-+ * The intent is that a driver use this structure to map iovar names
-+ * to its (private) iovar identifiers, and the lookup function to
-+ * find the entry.  Macros are provided to map ids and get/set actions
-+ * into a single number space for a switch statement.
-+ */
-+
-+/* iovar structure */
-+typedef struct bcm_iovar {
-+       const char *name;       /* name for lookup and display */
-+       uint16 varid;           /* id for switch */
-+       uint16 flags;           /* driver-specific flag bits */
-+       uint16 type;            /* base type of argument */
-+       uint16 minlen;          /* min length for buffer vars */
-+} bcm_iovar_t;
-+
-+/* varid definitions are per-driver, may use these get/set bits */
-+
-+/* IOVar action bits for id mapping */
-+#define IOV_GET 0 /* Get an iovar */
-+#define IOV_SET 1 /* Set an iovar */
-+
-+/* Varid to actionid mapping */
-+#define IOV_GVAL(id)           ((id)*2)
-+#define IOV_SVAL(id)           (((id)*2)+IOV_SET)
-+#define IOV_ISSET(actionid)    ((actionid & IOV_SET) == IOV_SET)
-+
-+/* flags are per-driver based on driver attributes */
-+
-+/* Base type definitions */
-+#define IOVT_VOID      0       /* no value (implictly set only) */
-+#define IOVT_BOOL      1       /* any value ok (zero/nonzero) */
-+#define IOVT_INT8      2       /* integer values are range-checked */
-+#define IOVT_UINT8     3       /* unsigned int 8 bits */
-+#define IOVT_INT16     4       /* int 16 bits */
-+#define IOVT_UINT16    5       /* unsigned int 16 bits */
-+#define IOVT_INT32     6       /* int 32 bits */
-+#define IOVT_UINT32    7       /* unsigned int 32 bits */
-+#define IOVT_BUFFER    8       /* buffer is size-checked as per minlen */
-+
-+extern const bcm_iovar_t *bcm_iovar_lookup(const bcm_iovar_t *table, const char *name);
-+extern int bcm_iovar_lencheck(const bcm_iovar_t *table, void *arg, int len, bool set);
-+
 +#endif /* #ifdef BCMDRIVER */
 +
-+/* ** driver/apps-shared section ** */
-+
-+#define BCME_STRLEN            64      /* Max string length for BCM errors */
-+#define VALID_BCMERROR(e)  ((e <= 0) && (e >= BCME_LAST))
-+
-+
-+/*
-+ * error codes could be added but the defined ones shouldn't be changed/deleted
-+ * these error codes are exposed to the user code
-+ * when ever a new error code is added to this list
-+ * please update errorstring table with the related error string and
-+ * update osl files with os specific errorcode map
-+*/
-+
-+#define BCME_OK                                0       /* Success */
-+#define BCME_ERROR                     -1      /* Error generic */
-+#define BCME_BADARG                    -2      /* Bad Argument */
-+#define BCME_BADOPTION                 -3      /* Bad option */
-+#define BCME_NOTUP                     -4      /* Not up */
-+#define BCME_NOTDOWN                   -5      /* Not down */
-+#define BCME_NOTAP                     -6      /* Not AP */
-+#define BCME_NOTSTA                    -7      /* Not STA  */
-+#define BCME_BADKEYIDX                 -8      /* BAD Key Index */
-+#define BCME_RADIOOFF                  -9      /* Radio Off */
-+#define BCME_NOTBANDLOCKED             -10     /* Not  band locked */
-+#define BCME_NOCLK                     -11     /* No Clock */
-+#define BCME_BADRATESET                        -12     /* BAD Rate valueset */
-+#define BCME_BADBAND                   -13     /* BAD Band */
-+#define BCME_BUFTOOSHORT               -14     /* Buffer too short */
-+#define BCME_BUFTOOLONG                        -15     /* Buffer too long */
-+#define BCME_BUSY                      -16     /* Busy */
-+#define BCME_NOTASSOCIATED             -17     /* Not Associated */
-+#define BCME_BADSSIDLEN                        -18     /* Bad SSID len */
-+#define BCME_OUTOFRANGECHAN            -19     /* Out of Range Channel */
-+#define BCME_BADCHAN                   -20     /* Bad Channel */
-+#define BCME_BADADDR                   -21     /* Bad Address */
-+#define BCME_NORESOURCE                        -22     /* Not Enough Resources */
-+#define BCME_UNSUPPORTED               -23     /* Unsupported */
-+#define BCME_BADLEN                    -24     /* Bad length */
-+#define BCME_NOTREADY                  -25     /* Not Ready */
-+#define BCME_EPERM                     -26     /* Not Permitted */
-+#define BCME_NOMEM                     -27     /* No Memory */
-+#define BCME_ASSOCIATED                        -28     /* Associated */
-+#define BCME_RANGE                     -29     /* Not In Range */
-+#define BCME_NOTFOUND                  -30     /* Not Found */
-+#define BCME_WME_NOT_ENABLED           -31     /* WME Not Enabled */
-+#define BCME_TSPEC_NOTFOUND            -32     /* TSPEC Not Found */
-+#define BCME_ACM_NOTSUPPORTED          -33     /* ACM Not Supported */
-+#define BCME_NOT_WME_ASSOCIATION       -34     /* Not WME Association */
-+#define BCME_SDIO_ERROR                        -35     /* SDIO Bus Error */
-+#define BCME_DONGLE_DOWN               -36     /* Dongle Not Accessible */
-+#define BCME_LAST                      BCME_DONGLE_DOWN
-+
-+/* These are collection of BCME Error strings */
-+#define BCMERRSTRINGTABLE {            \
-+       "OK",                           \
-+       "Undefined error",              \
-+       "Bad Argument",                 \
-+       "Bad Option",                   \
-+       "Not up",                       \
-+       "Not down",                     \
-+       "Not AP",                       \
-+       "Not STA",                      \
-+       "Bad Key Index",                \
-+       "Radio Off",                    \
-+       "Not band locked",              \
-+       "No clock",                     \
-+       "Bad Rate valueset",            \
-+       "Bad Band",                     \
-+       "Buffer too short",             \
-+       "Buffer too long",              \
-+       "Busy",                         \
-+       "Not Associated",               \
-+       "Bad SSID len",                 \
-+       "Out of Range Channel",         \
-+       "Bad Channel",                  \
-+       "Bad Address",                  \
-+       "Not Enough Resources",         \
-+       "Unsupported",                  \
-+       "Bad length",                   \
-+       "Not Ready",                    \
-+       "Not Permitted",                \
-+       "No Memory",                    \
-+       "Associated",                   \
-+       "Not In Range",                 \
-+       "Not Found",                    \
-+       "WME Not Enabled",              \
-+       "TSPEC Not Found",              \
-+       "ACM Not Supported",            \
-+       "Not WME Association",          \
-+       "SDIO Bus Error",               \
-+       "Dongle Not Accessible"         \
-+}
-+
-+#ifndef ABS
-+#define        ABS(a)                  (((a) < 0)?-(a):(a))
-+#endif /* ABS */
-+
++/*** driver/apps-shared section ***/
 +#ifndef MIN
-+#define        MIN(a, b)               (((a) < (b))?(a):(b))
-+#endif /* MIN */
++#define        MIN(a, b)               (((a)<(b))?(a):(b))
++#endif
 +
 +#ifndef MAX
-+#define        MAX(a, b)               (((a) > (b))?(a):(b))
-+#endif /* MAX */
++#define        MAX(a, b)               (((a)>(b))?(a):(b))
++#endif
 +
 +#define CEIL(x, y)             (((x) + ((y)-1)) / (y))
 +#define        ROUNDUP(x, y)           ((((x)+((y)-1))/(y))*(y))
 +#define        ISALIGNED(a, x)         (((a) & ((x)-1)) == 0)
-+#define        ISPOWEROF2(x)           ((((x)-1)&(x)) == 0)
-+#define VALID_MASK(mask)       !((mask) & ((mask) + 1))
++#define        ISPOWEROF2(x)           ((((x)-1)&(x))==0)
 +#define        OFFSETOF(type, member)  ((uint)(uintptr)&((type *)0)->member)
 +#define ARRAYSIZE(a)           (sizeof(a)/sizeof(a[0]))
@@ -4097 +1289 @@
 +/* bit map related macros */
 +#ifndef setbit
-+#ifndef NBBY               /* the BSD family defines NBBY */
 +#define        NBBY    8       /* 8 bits per byte */
-+#endif /* #ifndef NBBY */
-+#define        setbit(a, i)    (((uint8 *)a)[(i)/NBBY] |= 1<<((i)%NBBY))
-+#define        clrbit(a, i)    (((uint8 *)a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-+#define        isset(a, i)     (((uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY)))
-+#define        isclr(a, i)     ((((uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-+#endif /* setbit */
-+
-+#define        NBITS(type)     (sizeof(type) * 8)
-+#define NBITVAL(nbits) (1 << (nbits))
-+#define MAXBITVAL(nbits)       ((1 << (nbits)) - 1)
-+#define        NBITMASK(nbits) MAXBITVAL(nbits)
-+#define MAXNBVAL(nbyte)        MAXBITVAL((nbyte) * 8)
-+
-+/* basic mux operation - can be optimized on several architectures */
-+#define MUX(pred, true, false) ((pred) ? (true) : (false))
-+
-+/* modulo inc/dec - assumes x E [0, bound - 1] */
-+#define MODDEC(x, bound) MUX((x) == 0, (bound) - 1, (x) - 1)
-+#define MODINC(x, bound) MUX((x) == (bound) - 1, 0, (x) + 1)
-+
-+/* modulo inc/dec, bound = 2^k */
-+#define MODDEC_POW2(x, bound) (((x) - 1) & ((bound) - 1))
-+#define MODINC_POW2(x, bound) (((x) + 1) & ((bound) - 1))
-+
-+/* modulo add/sub - assumes x, y E [0, bound - 1] */
-+#define MODADD(x, y, bound) \
-+    MUX((x) + (y) >= (bound), (x) + (y) - (bound), (x) + (y))
-+#define MODSUB(x, y, bound) \
-+    MUX(((int)(x)) - ((int)(y)) < 0, (x) - (y) + (bound), (x) - (y))
-+
-+/* module add/sub, bound = 2^k */
-+#define MODADD_POW2(x, y, bound) (((x) + (y)) & ((bound) - 1))
-+#define MODSUB_POW2(x, y, bound) (((x) - (y)) & ((bound) - 1))
++#define        setbit(a,i)     (((uint8 *)a)[(i)/NBBY] |= 1<<((i)%NBBY))
++#define        clrbit(a,i)     (((uint8 *)a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
++#define        isset(a,i)      (((uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY)))
++#define        isclr(a,i)      ((((uint8 *)a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
++#endif
++
++#define        NBITS(type)     (sizeof (type) * 8)
 +
 +/* crc defines */
@@ -4155 +1320 @@
 +
 +/* Check that bcm_tlv_t fits into the given buflen */
-+#define bcm_valid_tlv(elt, buflen) ((buflen) >= 2 && (int)(buflen) >= (int)(2 + (elt)->len))
++#define bcm_valid_tlv(elt, buflen) ((buflen) >= 2 && (buflen) >= 2 + (elt)->len)
 +
 +/* buffer length for ethernet address from bcm_ether_ntoa() */
-+#define ETHER_ADDR_STR_LEN     18      /* 18-bytes of Ethernet address buffer length */
++#define ETHER_ADDR_STR_LEN     18
 +
 +/* unaligned load and store macros */
@@ -4220 +1385 @@
 +}
 +
-+#endif /* IL_BIGENDIAN */
++#endif
 +
 +/* externs */
@@ -4228 +1393 @@
 +extern uint32 hndcrc32(uint8 *p, uint nbytes, uint32 crc);
 +/* format/print */
-+extern void printfbig(char *buf);
-+
 +/* IE parsing */
 +extern bcm_tlv_t *bcm_next_tlv(bcm_tlv_t *elt, int *buflen);
 +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);
-+
-+/* bcmerror */
-+extern const char *bcmerrorstr(int bcmerror);
 +
 +/* multi-bool data type: set of bools, mbool is true if any is set */
@@ -4245 +1405 @@
 +#define        mboolmaskset(mb, mask, val)     ((mb) = (((mb) & ~(mask)) | (val)))
 +
-+/* power conversion */
-+extern uint16 bcm_qdbm_to_mw(uint8 qdbm);
-+extern uint8 bcm_mw_to_qdbm(uint16 mw);
-+
-+/* generic datastruct to help dump routines */
-+struct fielddesc {
-+       char    *nameandfmt;
-+       uint32  offset;
-+       uint32  len;
-+};
-+
-+/* Buffer structure for collecting string-formatted data 
-+* using bcm_bprintf() API.
-+* Use bcm_binit() to initialize before use
-+*/
-+struct bcmstrbuf
-+{
-+       char *buf;      /* pointer to current position in origbuf */
-+       uint size;      /* current (residual) size in bytes */
-+       char *origbuf;  /* unmodified pointer to orignal buffer */
-+       uint origsize;  /* unmodified orignal buffer size in bytes */
-+};
-+
-+extern void bcm_binit(struct bcmstrbuf *b, char *buf, uint size);
-+extern int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...);
-+
-+typedef  uint32 (*readreg_rtn)(void *arg0, void *arg1, uint32 offset);
-+extern uint bcmdumpfields(readreg_rtn func_ptr, void *arg0, void *arg1, struct fielddesc *str,
-+                          char *buf, uint32 bufsize);
-+
-+extern uint bcm_mkiovar(char *name, char *data, uint datalen, char *buf, uint len);
-+extern uint bcm_bitcount(uint8 *bitmap, uint bytelength);
-+
 +#endif /* _bcmutils_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/hndcpu.h linux.dev/arch/mips/bcm947xx/include/hndcpu.h
---- linux.old/arch/mips/bcm947xx/include/hndcpu.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/hndcpu.h       2006-04-27 22:14:38.000000000 +0200
-@@ -0,0 +1,28 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/hnddma.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/hnddma.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/hnddma.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/hnddma.h    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,184 @@
 +/*
-+ * HND SiliconBackplane MIPS/ARM cores software interface.
++ * Generic Broadcom Home Networking Division (HND) DMA engine definitions.
++ * This supports the following chips: BCM42xx, 44xx, 47xx .
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, 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        _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_AD_MASK      0xfff00000              /* active descriptor */
++#define        XS_AD_SHIFT     20
++
++/* 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 */
++#define        RS_AD_MASK      0xfff00000              /* active descriptor */
++#define        RS_AD_SHIFT     20
++
++/* 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 uintptr dma_getvar(di_t *di, char *name);
++extern void *dma_getnexttxp(di_t *di, bool forceall);
++extern void *dma_peeknexttxp(di_t *di);
++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);
++extern void dma_txrotate(di_t *di);
++
++
++#endif /* _hnddma_h_ */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/hndmips.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/hndmips.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/hndmips.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/hndmips.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,16 @@
++/*
++ * Alternate include file for HND sbmips.h since CFE also ships with
++ * a sbmips.h.
++ *
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -4294 +1610 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: hndcpu.h,v 1.1.1.1 2006/02/27 03:43:16 honor Exp $
++ * $Id$
 + */
 +
-+#ifndef _hndcpu_h_
-+#define _hndcpu_h_
-+
-+#if defined(mips)
-+#include <hndmips.h>
-+#elif defined(__ARM_ARCH_4T__)
-+#include <hndarm.h>
-+#endif
-+
-+extern uint sb_irq(sb_t *sbh);
-+extern uint32 sb_cpu_clock(sb_t *sbh);
-+extern void sb_cpu_wait(void);
-+
-+#endif /* _hndcpu_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm947xx/include/hndmips.h
---- linux.old/arch/mips/bcm947xx/include/hndmips.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/hndmips.h      2006-04-27 20:43:42.000000000 +0200
-@@ -0,0 +1,45 @@
++#include "sbmips.h"
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/linux_osl.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/linux_osl.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/linux_osl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/linux_osl.h 2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,341 @@
 +/*
-+ * HND SiliconBackplane MIPS core software interface.
++ * Linux OS Independent Layer
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -4326 +1629 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: hndmips.h,v 1.1.1.8 2006/02/27 03:43:16 honor Exp $
++ * $Id$
 + */
 +
-+#ifndef _hndmips_h_
-+#define _hndmips_h_
-+
-+extern void sb_mips_init(sb_t *sbh, uint shirq_map_base);
-+extern bool sb_mips_setclock(sb_t *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock);
-+extern void enable_pfc(uint32 mode);
-+extern uint32 sb_memc_get_ncdl(sb_t *sbh);
-+
-+#if defined(BCMPERFSTATS)
-+/* enable counting - exclusive version. Only one set of counters allowed at a time */
-+extern void hndmips_perf_instrcount_enable(void);
-+extern void hndmips_perf_icachecount_enable(void);
-+extern void hndmips_perf_dcachecount_enable(void);
-+/* start and stop counting */
-+#define hndmips_perf_start01() \
-+       MTC0(C0_PERFORMANCE, 4, MFC0(C0_PERFORMANCE, 4) | 0x80008000)
-+#define hndmips_perf_stop01() \
-+       MTC0(C0_PERFORMANCE, 4, MFC0(C0_PERFORMANCE, 4) & ~0x80008000)
-+/* retrieve coutners - counters *decrement* */
-+#define hndmips_perf_read0() -(long)(MFC0(C0_PERFORMANCE, 0))
-+#define hndmips_perf_read1() -(long)(MFC0(C0_PERFORMANCE, 1))
-+#define hndmips_perf_read2() -(long)(MFC0(C0_PERFORMANCE, 2))
-+/* enable counting - modular version. Each counters can be enabled separately. */
-+extern void hndmips_perf_icache_hit_enable(void);
-+extern void hndmips_perf_icache_miss_enable(void);
-+extern uint32 hndmips_perf_read_instrcount(void);
-+extern uint32 hndmips_perf_read_cache_miss(void);
-+extern uint32 hndmips_perf_read_cache_hit(void);
-+#endif /*  defined(BCMINTERNAL) || defined (BCMPERFSTATS) */
-+
-+#endif /* _hndmips_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/hndpci.h linux.dev/arch/mips/bcm947xx/include/hndpci.h
---- linux.old/arch/mips/bcm947xx/include/hndpci.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/hndpci.h       2006-04-27 20:36:48.000000000 +0200
-@@ -0,0 +1,30 @@
++#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 */
++#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
++struct pcmcia_dev {
++       dev_link_t link;        /* PCMCIA device pointer */
++       dev_node_t node;        /* PCMCIA node structure */
++       void *base;             /* Mapped attribute memory window */
++       size_t size;            /* Size of window */
++       void *drv;              /* Driver data */
++};
++#endif
++#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(osh, offset, size) \
++       osl_pci_read_config((osh), (offset), (size))
++#define        OSL_PCI_WRITE_CONFIG(osh, offset, size, val) \
++       osl_pci_write_config((osh), (offset), (size), (val))
++extern uint32 osl_pci_read_config(void *osh, uint size, uint offset);
++extern void osl_pci_write_config(void *osh, uint offset, uint size, uint val);
++
++/* OSL initialization */
++extern void *osl_attach(void *pdev);
++extern void osl_detach(void *osh);
++
++/* host/bus architecture-specific byte swap */
++#define BUS_SWAP32(v)          (v)
++
++/* general purpose memory allocation */
++
++#if defined(BCMDBG_MEM)
++
++#define        MALLOC(osh, size)       osl_debug_malloc((osh), (size), __LINE__, __FILE__)
++#define        MFREE(osh, addr, size)  osl_debug_mfree((osh), (addr), (size), __LINE__, __FILE__)
++#define MALLOCED(osh)          osl_malloced((osh))
++#define        MALLOC_DUMP(osh, buf, sz) osl_debug_memdump((osh), (buf), (sz))
++extern void *osl_debug_malloc(void *osh, uint size, int line, char* file);
++extern void osl_debug_mfree(void *osh, void *addr, uint size, int line, char* file);
++extern char *osl_debug_memdump(void *osh, char *buf, uint sz);
++
++#else
++
++#define        MALLOC(osh, size)       osl_malloc((osh), (size))
++#define        MFREE(osh, addr, size)  osl_mfree((osh), (addr), (size))
++#define MALLOCED(osh)          osl_malloced((osh))
++
++#endif /* BCMDBG_MEM */
++
++#define        MALLOC_FAILED(osh)      osl_malloc_failed((osh))
++
++extern void *osl_malloc(void *osh, uint size);
++extern void osl_mfree(void *osh, void *addr, uint size);
++extern uint osl_malloced(void *osh);
++extern uint osl_malloc_failed(void *osh);
++
++/* allocate/free shared (dma-able) consistent memory */
++#define        DMA_CONSISTENT_ALIGN    PAGE_SIZE
++#define        DMA_ALLOC_CONSISTENT(osh, size, pap) \
++       osl_dma_alloc_consistent((osh), (size), (pap))
++#define        DMA_FREE_CONSISTENT(osh, va, size, pa) \
++       osl_dma_free_consistent((osh), (void*)(va), (size), (pa))
++extern void *osl_dma_alloc_consistent(void *osh, uint size, ulong *pap);
++extern void osl_dma_free_consistent(void *osh, 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(osh, va, size, direction, p) \
++       osl_dma_map((osh), (va), (size), (direction))
++#define        DMA_UNMAP(osh, pa, size, direction, p) \
++       osl_dma_unmap((osh), (pa), (size), (direction))
++extern uint osl_dma_map(void *osh, void *va, uint size, int direction);
++extern void osl_dma_unmap(void *osh, uint pa, uint size, int direction);
++
++/* register access macros */
++#if defined(BCMJTAG)
++struct bcmjtag_info;
++extern uint32 bcmjtag_read(struct bcmjtag_info *ejh, uint32 addr, uint size);
++extern void bcmjtag_write(struct bcmjtag_info *ejh, uint32 addr, uint32 val, uint size);
++#define        R_REG(r)        bcmjtag_read(NULL, (uint32)(r), sizeof (*(r)))
++#define        W_REG(r, v)     bcmjtag_write(NULL, (uint32)(r), (uint32)(v), sizeof (*(r)))
++#endif
++
 +/*
-+ * HND SiliconBackplane PCI core software interface.
++ * 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 */
++#if !defined(BCMJTAG)
++#define R_REG(r) ( \
++       sizeof(*(r)) == sizeof(uint8) ? readb((volatile uint8*)(r)) : \
++       sizeof(*(r)) == sizeof(uint16) ? readw((volatile uint16*)(r)) : \
++       readl((volatile uint32*)(r)) \
++)
++#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)
++#endif
++
++#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))
++
++/* 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))
++
++/* microsecond delay */
++#define        OSL_DELAY(usec)         udelay(usec)
++#include <linux/delay.h>
++
++/* 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))
++#define        PKTPRIO(skb)                    (((struct sk_buff*)(skb))->priority)
++#define        PKTSETPRIO(skb, x)              (((struct sk_buff*)(skb))->priority = (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 */
++#if !defined(BCMJTAG)
++#define R_REG(r) ( \
++       sizeof(*(r)) == sizeof(uint8) ? osl_readb((volatile uint8*)(r)) : \
++       sizeof(*(r)) == sizeof(uint16) ? osl_readw((volatile uint16*)(r)) : \
++       osl_readl((volatile uint32*)(r)) \
++)
++#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)
++#endif
++
++#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);
++
++/* 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);
++
++/* 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 PKTHEADROOM(drv, skb)          osl_pktheadroom((drv), (skb))
++#define PKTTAILROOM(drv, skb)          osl_pkttailroom((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))
++#define        PKTPRIO(skb)                    osl_pktprio((skb))
++#define        PKTSETPRIO(skb, x)              osl_pktsetprio((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 uint osl_pktheadroom(void *drv, void *skb);
++extern uint osl_pkttailroom(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);
++extern uint osl_pktprio(void *skb);
++extern void osl_pktsetprio(void *skb, uint x);
++
++#endif /* BINOSL */
++
++/* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */
++#define        PKTBUFSZ        2048
++
++#endif /* _linux_osl_h_ */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/linuxver.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/linuxver.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/linuxver.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/linuxver.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,399 @@
++/*
++ * Linux-specific abstractions to gain some independence from linux kernel versions.
++ * Pave over some 2.2 versus 2.4 versus 2.6 kernel differences.
 + *
-+ * $Id: hndpci.h,v 1.1.1.1 2006/02/27 03:43:16 honor Exp $
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -4375 +1974 @@
 + * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
-+ */
-+
-+#ifndef _hndpci_h_
-+#define _hndpci_h_
-+
-+extern int sbpci_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf,
-+                             int len);
-+extern int extpci_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf,
-+                              int len);
-+extern int sbpci_write_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf,
-+                              int len);
-+extern int extpci_write_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf,
-+                               int len);
-+extern void sbpci_ban(uint16 core);
-+extern int sbpci_init(sb_t *sbh);
-+extern int sbpci_init_pci(sb_t *sbh);
-+extern void sbpci_check(sb_t *sbh);
-+
-+#endif /* _hndpci_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bcm947xx/include/linuxver.h
---- linux.old/arch/mips/bcm947xx/include/linuxver.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/linuxver.h     2006-04-27 20:10:08.000000000 +0200
-@@ -0,0 +1,417 @@
-+/*
-+ * Linux-specific abstractions to gain some independence from linux kernel versions.
-+ * Pave over some 2.2 versus 2.4 versus 2.6 kernel differences.
-+ *
-+ * Copyright 2006, 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: linuxver.h,v 1.1.1.10 2006/02/27 03:43:16 honor Exp $
++ *   
++ * $Id$
 + */
 +
@@ -4419 +1984 @@
 +#include <linux/version.h>
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0))
++#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__
@@ -4426 +1991 @@
 +#define __NO_VERSION__
 +#endif
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0) */
++#endif
 +
 +#if defined(MODULE) && defined(MODVERSIONS)
@@ -4432 +1997 @@
 +#endif
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
-+#include <linux/moduleparam.h>
-+#endif
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
-+#define module_param(_name_, _type_, _perm_)   MODULE_PARM(_name_, "i")
-+#define module_param_string(_name_, _string_, _size_, _perm_) \
-+               MODULE_PARM(_string_, "c" __MODULE_STRING(_size_))
-+#endif
-+
 +/* linux/malloc.h is deprecated, use linux/slab.h instead. */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 9))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9))
 +#include <linux/malloc.h>
 +#else
@@ -4459 +2013 @@
 +#include <asm/io.h>
 +
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 41))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,41))
 +#include <linux/workqueue.h>
 +#else
@@ -4475 +2029 @@
 +#define flush_scheduled_work() flush_scheduled_tasks()
 +#endif
-+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 41) */
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 +/* Some distributions have their own 2.6.x compatibility layers */
 +#ifndef IRQ_NONE
@@ -4485 +2039 @@
 +#define IRQ_RETVAL(x)
 +#endif
-+#else
-+typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs);
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
++#endif
 +
 +#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
@@ -4498 +2050 @@
 +#include <pcmcia/ds.h>
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 69))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69))
 +/* In 2.5 (as of 2.5.69 at least) there is a cs_error exported which
-+ * does this, but it's not in 2.4 so we do our own for now.
-+ */
++ * does this, but it's not in 2.4 so we do our own for now. */
 +static inline void
 +cs_error(client_handle_t handle, int func, int ret)
@@ -4528 +2079 @@
 +#endif
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0))
++#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)
++#define pci_set_drvdata(dev, value)    (dev)->sysdata=(value)
 +
 +/*
@@ -4548 +2099 @@
 +       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)
-+                                                */
++       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 */
@@ -4567 +2115 @@
 +#endif /* PCI registration */
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18))
 +#ifdef MODULE
 +#define module_init(x) int init_module(void) { return x(); }
@@ -4575 +2123 @@
 +#define module_exit(x) __exitcall(x);
 +#endif
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18) */
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 48))
++#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))
++#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))
++#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))
++#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))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,14))
 +#define net_device device
 +#endif
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 42))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,42))
 +
 +/*
@@ -4626 +2174 @@
 +
 +static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-+                                         dma_addr_t *dma_handle)
++                                        dma_addr_t *dma_handle)
 +{
 +       void *ret;
@@ -4640 +2188 @@
 +}
 +static inline void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-+                                       void *vaddr, dma_addr_t dma_handle)
++                                      void *vaddr, dma_addr_t dma_handle)
 +{
 +       free_pages((unsigned long)vaddr, get_order(size));
@@ -4654 +2202 @@
 +#endif /* DMA mapping */
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 43))
++#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)
++#define netif_down(dev)                        do { (dev)->start = 0; } while(0)
 +
 +/* pcmcia-cs provides its own netdevice compatibility layer */
@@ -4673 +2221 @@
 + */
 +
-+#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)
++#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)
@@ -4702 +2249 @@
 +
 +static inline void tasklet_init(struct tasklet_struct *tasklet,
-+                                void (*func)(unsigned long),
-+                                unsigned long data)
++                               void (*func)(unsigned long),
++                               unsigned long data)
 +{
 +       tasklet->next = NULL;
@@ -4710 +2257 @@
 +       tasklet->data = (void *)data;
 +}
-+#define tasklet_kill(tasklet)  { do{} while (0); }
++#define tasklet_kill(tasklet)                  {do{} while(0);}
 +
 +/* 2.4.x introduced del_timer_sync() */
@@ -4721 +2268 @@
 +#endif /* SoftNet */
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3))
 +
 +/*
@@ -4742 +2289 @@
 +       } while (0)
 +
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 3) */
-+
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 6))
++#endif
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,6))
 +
 +/* Power management related routines */
@@ -4754 +2301 @@
 +       if (buffer) {
 +               for (i = 0; i < 16; i++)
-+                       pci_read_config_dword(dev, i * 4, &buffer[i]);
++                       pci_read_config_dword(dev, i * 4,&buffer[i]);
 +       }
 +       return 0;
 +}
 +
-+static inline int
++static inline int 
 +pci_restore_state(struct pci_dev *dev, u32 *buffer)
 +{
@@ -4766 +2313 @@
 +       if (buffer) {
 +               for (i = 0; i < 16; i++)
-+                       pci_write_config_dword(dev, i * 4, buffer[i]);
++                       pci_write_config_dword(dev,i * 4, buffer[i]);
 +       }
 +       /*
@@ -4773 +2320 @@
 +        * 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_BASE_ADDRESS_0 + (i * 4),
++                                              pci_resource_start(dev, i));
 +               pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
 +       }
@@ -4787 +2334 @@
 +
 +/* Old cp0 access macros deprecated in 2.4.19 */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 19))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19))
 +#define read_c0_count() read_32bit_cp0_register(CP0_COUNT)
 +#endif
@@ -4809 +2356 @@
 +#endif
 +
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 +/* struct packet_type redefined in 2.6.x */
 +#define af_packet_priv                 data
@@ -4815 +2362 @@
 +
 +#endif /* _linuxver_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm947xx/include/mipsinc.h
---- linux.old/arch/mips/bcm947xx/include/mipsinc.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h      2006-04-27 22:12:20.000000000 +0200
-@@ -0,0 +1,541 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/mipsinc.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/mipsinc.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/mipsinc.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/mipsinc.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,524 @@
 +/*
 + * HND Run Time Environment for standalone MIPS programs.
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -4830 +2377 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: mipsinc.h,v 1.1.1.5 2006/02/27 03:43:16 honor Exp $
++ * $Id$
 + */
 +
 +#ifndef        _MISPINC_H
-+#define _MISPINC_H
++#define        _MISPINC_H
 +
 +
@@ -4880 +2427 @@
 +
 +
-+/* CP0 Registers */
++/*  *********************************************************************
++    *  CP0 Registers 
++    ********************************************************************* */
 +
 +#define C0_INX         $0
@@ -4906 +2455 @@
 +#define C0_DIAGNOSTIC  $22
 +#define C0_BROADCOM    C0_DIAGNOSTIC
-+#define        C0_PERFORMANCE  $25
 +#define C0_ECC         $26
 +#define C0_CACHEERR    $27
@@ -4917 +2465 @@
 + * LEAF - declare leaf routine
 + */
-+#define LEAF(symbol)                           \
++#define        LEAF(symbol)                            \
 +               .globl  symbol;                 \
 +               .align  2;                      \
-+               .type   symbol, @function;      \
-+               .ent    symbol, 0;              \
-+symbol:                .frame  sp, 0, ra
++               .type   symbol,@function;       \
++               .ent    symbol,0;               \
++symbol:                .frame  sp,0,ra
 +
 +/*
 + * END - mark end of function
 + */
-+#define END(function)                          \
++#define        END(function)                           \
 +               .end    function;               \
-+               .size   function, . - function
-+
-+#define _ULCAST_
-+
-+#define MFC0_SEL(dst, src, sel) \
-+               .word\t(0x40000000 | ((dst) << 16) | ((src) << 11) | (sel))
-+
-+
-+#define MTC0_SEL(dst, src, sel) \
-+               .word\t(0x40800000 | ((dst) << 16) | ((src) << 11) | (sel))
++               .size   function,.-function
++
++#define        _ULCAST_
 +
 +#else
@@ -4953 +2494 @@
 +#endif
 +
-+#define _ULCAST_ (unsigned long)
-+
-+
-+/* CP0 Registers */
++#define        _ULCAST_ (unsigned long)
++
++
++/*  *********************************************************************
++    *  CP0 Registers 
++    ********************************************************************* */
 +
 +#define C0_INX         0               /* CP0: TLB Index */
@@ -4982 +2525 @@
 +#define C0_DIAGNOSTIC  22              /* CP0: Diagnostic */
 +#define C0_BROADCOM    C0_DIAGNOSTIC   /* CP0: Broadcom Register */
-+#define        C0_PERFORMANCE  25              /* CP0: Performance Counter/Control Registers */
 +#define C0_ECC         26              /* CP0: ECC */
 +#define C0_CACHEERR    27              /* CP0: CacheErr */
@@ -5027 +2569 @@
 + * Cache Operations
 + */
-+#define Index_Invalidate_I     0x00
-+#define Index_Writeback_Inv_D  0x01
-+#define Index_Invalidate_SI    0x02
-+#define Index_Writeback_Inv_SD 0x03
++#define Index_Invalidate_I      0x00
++#define Index_Writeback_Inv_D   0x01
++#define Index_Invalidate_SI     0x02
++#define Index_Writeback_Inv_SD  0x03
 +#define Index_Load_Tag_I       0x04
 +#define Index_Load_Tag_D       0x05
@@ -5058 +2600 @@
 +#define Hit_Set_Virtual_SI     0x1e
 +#define Hit_Set_Virtual_SD     0x1f
-+#endif /* !Index_Invalidate_I */
++#endif
++
++#ifndef        _LANGUAGE_ASSEMBLY
++
++/*
++ * 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)
++
++#define get_c0_count()                                         \
++({                                                             \
++       int __res;                                              \
++       __asm__ __volatile__(                                   \
++       ".set\tnoreorder\n\t"                                   \
++       ".set\tnoat\n\t"                                        \
++       "mfc0\t%0,$9\n\t"                                       \
++       ".set\tat\n\t"                                          \
++       ".set\treorder"                                         \
++       :"=r" (__res));                                         \
++       __res;                                                  \
++})
++
++static INLINE void icache_probe(uint32 config1, uint *size, uint *lsize)
++{
++       uint lsz, sets, ways;
++
++       /* Instruction Cache Size = Associativity * Line Size * Sets Per Way */
++       if ((lsz = ((config1 >> 19) & 7)))
++               lsz = 2 << lsz;
++       sets = 64 << ((config1 >> 22) & 7);
++       ways = 1 + ((config1 >> 16) & 7);
++       *size = lsz * sets * ways;
++       *lsize = lsz;
++}
++
++static INLINE void dcache_probe(uint32 config1, uint *size, uint *lsize)
++{
++       uint lsz, sets, ways;
++
++       /* Data Cache Size = Associativity * Line Size * Sets Per Way */
++       if ((lsz = ((config1 >> 10) & 7)))
++               lsz = 2 << lsz;
++       sets = 64 << ((config1 >> 13) & 7);
++       ways = 1 + ((config1 >> 7) & 7);
++       *size = lsz * sets * ways;
++       *lsize = lsz;
++}
++
++#define cache_unroll(base,op)                  \
++       __asm__ __volatile__("                  \
++               .set noreorder;                 \
++               .set mips3;                     \
++                cache %1, (%0);                        \
++               .set mips0;                     \
++               .set reorder"                   \
++               :                               \
++               : "r" (base),                   \
++                 "i" (op));
++
++#endif /* !_LANGUAGE_ASSEMBLY */
 +
 +
@@ -5064 +2694 @@
 + * R4x00 interrupt enable / cause bits
 + */
-+#define IE_SW0                 (_ULCAST_(1) <<  8)
-+#define IE_SW1                 (_ULCAST_(1) <<  9)
-+#define IE_IRQ0                        (_ULCAST_(1) << 10)
-+#define IE_IRQ1                        (_ULCAST_(1) << 11)
-+#define IE_IRQ2                        (_ULCAST_(1) << 12)
-+#define IE_IRQ3                        (_ULCAST_(1) << 13)
-+#define IE_IRQ4                        (_ULCAST_(1) << 14)
-+#define IE_IRQ5                        (_ULCAST_(1) << 15)
-+
-+#ifndef        ST0_UM
++#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 mips32 cp0 status register
@@ -5080 +2717 @@
 +#define ST0_EXL                        0x00000002
 +#define ST0_ERL                        0x00000004
++/* already defined
 +#define ST0_UM                 0x00000010
 +#define ST0_SWINT0             0x00000100
 +#define ST0_SWINT1             0x00000200
++*/
 +#define ST0_HWINT0             0x00000400
 +#define ST0_HWINT1             0x00000800
@@ -5101 +2740 @@
 +#define ST0_CU2                        0x40000000
 +#define ST0_CU3                        0x80000000
-+#endif /* !ST0_UM */
 +
 +
@@ -5111 +2749 @@
 +#define C_INT                  0x0000ff00
 +#define C_INT_SHIFT            8
-+#define C_SW0                  (_ULCAST_(1) <<  8)
-+#define C_SW1                  (_ULCAST_(1) <<  9)
-+#define C_IRQ0                 (_ULCAST_(1) << 10)
-+#define C_IRQ1                 (_ULCAST_(1) << 11)
-+#define C_IRQ2                 (_ULCAST_(1) << 12)
-+#define C_IRQ3                 (_ULCAST_(1) << 13)
-+#define C_IRQ4                 (_ULCAST_(1) << 14)
-+#define C_IRQ5                 (_ULCAST_(1) << 15)
++/* already defined
++#define C_SW0                  0x00000100
++#define C_SW1                  0x00000200
++#define C_IRQ0                 0x00000400
++#define C_IRQ1                 0x00000800
++#define C_IRQ2                 0x00001000
++#define C_IRQ3                 0x00002000
++#define C_IRQ4                 0x00004000
++#define C_IRQ5                 0x00008000
++*/
 +#define C_WP                   0x00400000
 +#define C_IV                   0x00800000
@@ -5160 +2800 @@
 +#define CONF_IB                                (_ULCAST_(1) <<  5)
 +#define CONF_SE                                (_ULCAST_(1) << 12)
-+#ifndef CONF_BE                                    /* duplicate in mipsregs.h */
-+#define CONF_BE                                (_ULCAST_(1) << 15)
-+#endif
 +#define CONF_SC                                (_ULCAST_(1) << 17)
 +#define CONF_AC                                (_ULCAST_(1) << 23)
 +#define CONF_HALT                      (_ULCAST_(1) << 25)
-+#ifndef CONF_M                             /* duplicate in mipsregs.h */
-+#define CONF_M                         (_ULCAST_(1) << 31)
-+#endif
 +
 +
@@ -5174 +2808 @@
 + * Bits in the cp0 config register select 1.
 + */
-+#define CONF1_FP               0x00000001      /* FPU present */
-+#define CONF1_EP               0x00000002      /* EJTAG present */
-+#define CONF1_CA               0x00000004      /* mips16 implemented */
-+#define CONF1_WR               0x00000008      /* Watch registers present */
-+#define CONF1_PC               0x00000010      /* Performance counters present */
-+#define CONF1_DA_SHIFT         7               /* D$ associativity */
-+#define CONF1_DA_MASK          0x00000380
-+#define CONF1_DA_BASE          1
-+#define CONF1_DL_SHIFT         10              /* D$ line size */
-+#define CONF1_DL_MASK          0x00001c00
-+#define CONF1_DL_BASE          2
-+#define CONF1_DS_SHIFT         13              /* D$ sets/way */
-+#define CONF1_DS_MASK          0x0000e000
-+#define CONF1_DS_BASE          64
-+#define CONF1_IA_SHIFT         16              /* I$ associativity */
-+#define CONF1_IA_MASK          0x00070000
-+#define CONF1_IA_BASE          1
-+#define CONF1_IL_SHIFT         19              /* I$ line size */
-+#define CONF1_IL_MASK          0x00380000
-+#define CONF1_IL_BASE          2
-+#define CONF1_IS_SHIFT         22              /* Instruction cache sets/way */
-+#define CONF1_IS_MASK          0x01c00000
-+#define CONF1_IS_BASE          64
-+#define CONF1_MS_MASK          0x7e000000      /* Number of tlb entries */
-+#define CONF1_MS_SHIFT         25
++#define CONF1_FP                       0x00000001              /* FPU present */
++#define CONF1_EP                       0x00000002              /* EJTAG present */
++#define CONF1_CA                       0x00000004              /* mips16 implemented */
++#define CONF1_WR                       0x00000008              /* Watch registers present */
++#define CONF1_PC                       0x00000010              /* Performance counters present */
++#define        CONF1_DA_SHIFT                  7                       /* D$ associativity */
++#define CONF1_DA_MASK                  0x00000380
++#define CONF1_DA_BASE                  1
++#define CONF1_DL_SHIFT                 10                      /* D$ line size */
++#define CONF1_DL_MASK                  0x00001c00
++#define CONF1_DL_BASE                  2
++#define CONF1_DS_SHIFT                 13                      /* D$ sets/way */
++#define CONF1_DS_MASK                  0x0000e000
++#define CONF1_DS_BASE                  64
++#define CONF1_IA_SHIFT                 16                      /* I$ associativity */
++#define CONF1_IA_MASK                  0x00070000
++#define CONF1_IA_BASE                  1
++#define CONF1_IL_SHIFT                 19                      /* I$ line size */
++#define CONF1_IL_MASK                  0x00380000
++#define CONF1_IL_BASE                  2
++#define CONF1_IS_SHIFT                 22                      /* Instruction cache sets/way */
++#define CONF1_IS_MASK                  0x01c00000
++#define CONF1_IS_BASE                  64
++#define CONF1_MS_MASK                  0x7e000000              /* Number of tlb entries */
++#define CONF1_MS_SHIFT                 25
 +
 +/* PRID register */
@@ -5214 +2848 @@
 +#define PRID_IMP_BCM3302       0x9000
 +#define PRID_IMP_BCM3303       0x9100
++#define        PRID_IMP_BCM3303        0x9100
 +
 +#define PRID_IMP_UNKNOWN       0xff00
 +
-+#define BCM330X(id) \
-+               (((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == \
-+                (PRID_COMP_BROADCOM | PRID_IMP_BCM3302)) || \
-+               ((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == \
-+                (PRID_COMP_BROADCOM | PRID_IMP_BCM3303)))
++#define       BCM330X(id) \
++       (((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == (PRID_COMP_BROADCOM | PRID_IMP_BCM3302)) \
++       || ((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == (PRID_COMP_BROADCOM | PRID_IMP_BCM3303)))
 +
 +/* Bits in C0_BROADCOM */
-+#define BRCM_PFC_AVAIL         0x20000000      /* PFC is available */
-+#define BRCM_DC_ENABLE         0x40000000      /* Enable Data $ */
-+#define BRCM_IC_ENABLE         0x80000000      /* Enable Instruction $ */
-+#define BRCM_PFC_ENABLE                0x00400000      /* Obsolete? Enable PFC (at least on 4310) */
-+#define BRCM_CLF_ENABLE                0x00100000      /* Enable cache line first feature */
++#define        BRCM_PFC_AVAIL          0x20000000      /* PFC is available */
++#define        BRCM_DC_ENABLE          0x40000000      /* Enable Data $ */
++#define        BRCM_IC_ENABLE          0x80000000      /* Enable Instruction $ */
++#define        BRCM_PFC_ENABLE         0x00400000      /* Obsolete? Enable PFC (at least on 4310) */
 +
 +/* PreFetch Cache aka Read Ahead Cache */
 +
-+#define PFC_CR0                        0xff400000      /* control reg 0 */
-+#define PFC_CR1                        0xff400004      /* control reg 1 */
-+
-+/* PFC operations */
-+#define PFC_I                  0x00000001      /* Enable PFC use for instructions */
-+#define PFC_D                  0x00000002      /* Enable PFC use for data */
-+#define PFC_PFI                        0x00000004      /* Enable seq. prefetch for instructions */
-+#define PFC_PFD                        0x00000008      /* Enable seq. prefetch for data */
-+#define PFC_CINV               0x00000010      /* Enable selective (i/d) cacheop flushing */
-+#define PFC_NCH                        0x00000020      /* Disable flushing based on cacheops */
-+#define PFC_DPF                        0x00000040      /* Enable directional prefetching */
-+#define PFC_FLUSH              0x00000100      /* Flush the PFC */
-+#define PFC_BRR                        0x40000000      /* Bus error indication */
-+#define PFC_PWR                        0x80000000      /* Disable power saving (clock gating) */
-+
-+/* Handy defaults */
-+#define PFC_DISABLED           0
-+#define PFC_AUTO                       0xffffffff      /* auto select the default mode */
-+#define PFC_INST               (PFC_I | PFC_PFI | PFC_CINV)
-+#define PFC_INST_NOPF          (PFC_I | PFC_CINV)
-+#define PFC_DATA               (PFC_D | PFC_PFD | PFC_CINV)
-+#define PFC_DATA_NOPF          (PFC_D | PFC_CINV)
-+#define PFC_I_AND_D            (PFC_INST | PFC_DATA)
-+#define PFC_I_AND_D_NOPF       (PFC_INST_NOPF | PFC_DATA_NOPF)
-+
-+#ifndef        _LANGUAGE_ASSEMBLY
-+
++#define        PFC_CR0         0xff400000      /* control reg 0 */
++#define        PFC_CR1         0xff400004      /* control reg 1 */
++
++/* 
++ * 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_RX                0       /* In:  Receive buffer (DLAB=0) */
++#define UART_TX                0       /* Out: Transmit buffer (DLAB=0) */
++#define UART_DLL       0       /* Out: Divisor Latch Low (DLAB=1) */
++#define UART_DLM       1       /* Out: Divisor Latch High (DLAB=1) */
++#define UART_LCR       3       /* Out: Line Control Register */
++#define UART_MCR       4       /* Out: Modem Control Register */
++#define UART_LSR       5       /* In:  Line Status Register */
++#define UART_MSR       6       /* In:  Modem Status Register */
++#define UART_SCR       7       /* I/O: Scratch Register */
++#define UART_LCR_DLAB  0x80    /* Divisor latch access bit */
++#define UART_LCR_WLEN8  0x03   /* Wordlength: 8 bits */
++#define UART_MCR_LOOP  0x10    /* Enable loopback test mode */
++#define UART_LSR_THRE  0x20    /* Transmit-hold-register empty */
++#define UART_LSR_RXRDY 0x01    /* Receiver ready */
++
++
++#endif /* _MISPINC_H */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/osl.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/osl.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/osl.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/osl.h       2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,39 @@
 +/*
-+ * Macros to access the system control coprocessor
++ * OS Independent Layer
++ * 
++ * Copyright 2005, 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$
 + */
 +
-+#define MFC0(source, sel)                                      \
-+({                                                             \
-+       int __res;                                              \
-+       __asm__ __volatile__("                                  \
-+       .set\tnoreorder;                                        \
-+       .set\tnoat;                                             \
-+       .word\t"STR(0x40010000 | ((source) << 11) | (sel))";    \
-+       move\t%0, $1;                                           \
-+       .set\tat;                                               \
-+       .set\treorder"                                          \
-+       :"=r" (__res)                                           \
-+       :                                                       \
-+       :"$1");                                                 \
-+       __res;                                                  \
-+})
-+
-+#define MTC0(source, sel, value)                               \
-+do {                                                           \
-+       __asm__ __volatile__("                                  \
-+       .set\tnoreorder;                                        \
-+       .set\tnoat;                                             \
-+       move\t$1, %z0;                                          \
-+       .word\t"STR(0x40810000 | ((source) << 11) | (sel))";    \
-+       .set\tat;                                               \
-+       .set\treorder"                                          \
-+       :                                                       \
-+       :"jr" (value)                                           \
-+       :"$1");                                                 \
-+} while (0)
-+
-+#define get_c0_count()                                         \
-+({                                                             \
-+       int __res;                                              \
-+       __asm__ __volatile__("                                  \
-+       .set\tnoreorder;                                        \
-+       .set\tnoat;                                             \
-+       mfc0\t%0, $9;                                           \
-+       .set\tat;                                               \
-+       .set\treorder"                                          \
-+       :"=r" (__res));                                         \
-+       __res;                                                  \
-+})
-+
-+static INLINE void icache_probe(uint32 config1, uint *size, uint *lsize)
-+{
-+       uint lsz, sets, ways;
-+
-+       /* Instruction Cache Size = Associativity * Line Size * Sets Per Way */
-+       if ((lsz = ((config1 & CONF1_IL_MASK) >> CONF1_IL_SHIFT)))
-+               lsz = CONF1_IL_BASE << lsz;
-+       sets = CONF1_IS_BASE << ((config1 & CONF1_IS_MASK) >> CONF1_IS_SHIFT);
-+       ways = CONF1_IA_BASE + ((config1 & CONF1_IA_MASK) >> CONF1_IA_SHIFT);
-+       *size = lsz * sets * ways;
-+       *lsize = lsz;
-+}
-+
-+static INLINE void dcache_probe(uint32 config1, uint *size, uint *lsize)
-+{
-+       uint lsz, sets, ways;
-+
-+       /* Data Cache Size = Associativity * Line Size * Sets Per Way */
-+       if ((lsz = ((config1 & CONF1_DL_MASK) >> CONF1_DL_SHIFT)))
-+               lsz = CONF1_DL_BASE << lsz;
-+       sets = CONF1_DS_BASE << ((config1 & CONF1_DS_MASK) >> CONF1_DS_SHIFT);
-+       ways = CONF1_DA_BASE + ((config1 & CONF1_DA_MASK) >> CONF1_DA_SHIFT);
-+       *size = lsz * sets * ways;
-+       *lsize = lsz;
-+}
-+
-+#define cache_op(base, op)                     \
-+       __asm__ __volatile__("                  \
-+               .set noreorder;                 \
-+               .set mips3;                     \
-+               cache %1, (%0);                 \
-+               .set mips0;                     \
-+               .set reorder"                   \
-+               :                               \
-+               : "r" (base),                   \
-+                 "i" (op));
-+
-+#define cache_unroll4(base, delta, op)         \
-+       __asm__ __volatile__("                  \
-+               .set noreorder;                 \
-+               .set mips3;                     \
-+               cache %1, 0(%0);                \
-+               cache %1, delta(%0);            \
-+               cache %1, (2 * delta)(%0);      \
-+               cache %1, (3 * delta)(%0);      \
-+               .set mips0;                     \
-+               .set reorder"                   \
-+               :                               \
-+               : "r" (base),                   \
-+                 "i" (op));
-+
-+#endif /* !_LANGUAGE_ASSEMBLY */
-+
-+#endif /* _MISPINC_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947xx/include/osl.h
---- linux.old/arch/mips/bcm947xx/include/osl.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/osl.h  2006-05-02 17:40:43.000000000 +0200
-@@ -0,0 +1,179 @@
-+#ifndef __osl_h
-+#define __osl_h
-+
-+#include <linux/delay.h>
-+#include <typedefs.h>
-+#include <linuxver.h>
-+#include <bcmutils.h>
-+#include <pcicfg.h>
-+
-+#define ASSERT(n)
-+
-+/* Pkttag flag should be part of public information */
-+struct osl_pubinfo {
-+       bool pkttag;
-+       uint pktalloced; /* Number of allocated packet buffers */
-+};
-+
-+struct osl_info {
-+       struct osl_pubinfo pub;
-+       uint magic;
-+       void *pdev;
-+       uint malloced;
-+       uint failed;
-+       void *dbgmem_list;
-+};
-+
-+typedef struct osl_info osl_t;
-+
-+#define PCI_CFG_RETRY                10
-+
-+/* map/unmap direction */
-+#define DMA_TX  1   /* TX direction for DMA */
-+#define DMA_RX  2   /* RX direction for DMA */
-+
-+#define        AND_REG(osh, r, v)              W_REG(osh, (r), R_REG(osh, r) & (v))
-+#define        OR_REG(osh, r, v)               W_REG(osh, (r), R_REG(osh, r) | (v))
-+#define SET_REG(osh, r, mask, val)     W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
-+
-+/* 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))
-+
-+/* uncached virtual address */
-+#ifdef mips
-+#define OSL_UNCACHED(va)       KSEG1ADDR((va))
-+#include <asm/addrspace.h>
++#ifndef _osl_h_
++#define _osl_h_
++
++#if defined(linux)
++#include <linux_osl.h>
++#elif defined(NDIS)
++#include <ndis_osl.h>
++#elif defined(_CFE_)
++#include <cfe_osl.h>
++#elif defined(_HNDRTE_)
++#include <hndrte_osl.h>
++#elif defined(_MINOSL_)
++#include <min_osl.h>
++#elif PMON
++#include <pmon_osl.h>
++#elif defined(MACOSX)
++#include <macosx_osl.h>
 +#else
-+#define OSL_UNCACHED(va)       (va)
-+#endif /* mips */
-+
-+
-+#ifndef IL_BIGENDIAN
-+#define R_REG(osh, r) (\
-+       sizeof(*(r)) == sizeof(uint8) ? readb((volatile uint8*)(r)) : \
-+       sizeof(*(r)) == sizeof(uint16) ? readw((volatile uint16*)(r)) : \
-+       readl((volatile uint32*)(r)) \
-+)
-+#define W_REG(osh, 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)
-+#else  /* IL_BIGENDIAN */
-+#define R_REG(osh, r) ({ \
-+       __typeof(*(r)) __osl_v; \
-+       switch (sizeof(*(r))) { \
-+       case sizeof(uint8):     __osl_v = readb((volatile uint8*)((uint32)r^3)); break; \
-+       case sizeof(uint16):    __osl_v = readw((volatile uint16*)((uint32)r^2)); break; \
-+       case sizeof(uint32):    __osl_v = readl((volatile uint32*)(r)); break; \
-+       } \
-+       __osl_v; \
-+})
-+#define W_REG(osh, r, v) do { \
-+       switch (sizeof(*(r))) { \
-+       case sizeof(uint8):     writeb((uint8)(v), (volatile uint8*)((uint32)r^3)); break; \
-+       case sizeof(uint16):    writew((uint16)(v), (volatile uint16*)((uint32)r^2)); break; \
-+       case sizeof(uint32):    writel((uint32)(v), (volatile uint32*)(r)); break; \
-+       } \
-+} while (0)
-+#endif /* IL_BIGENDIAN */
-+
-+/* dereference an address that may cause a bus exception */
-+#define        BUSPROBE(val, addr)     get_dbe((val), (addr))
-+#include <asm/paccess.h>
-+
-+/* 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))
-+
-+/* 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))
-+
-+#define        MALLOC(osh, size)       kmalloc((size), GFP_ATOMIC)
-+#define        MFREE(osh, addr, size)  kfree((addr))
-+#define MALLOCED(osh)  (0)     
-+
-+#define        osl_delay               OSL_DELAY
-+static inline void OSL_DELAY(uint usec)
-+{
-+       uint d;
-+
-+       while (usec > 0) {
-+               d = MIN(usec, 1000);
-+               udelay(d);
-+               usec -= d;
-+       }
-+}
-+
-+static inline void
-+bcm_mdelay(uint ms)
-+{
-+       uint i;
-+
-+       for (i = 0; i < ms; i++) {
-+               OSL_DELAY(1000);
-+       }
-+}
-+
-+
-+#define        OSL_PCMCIA_READ_ATTR(osh, offset, buf, size)
-+#define        OSL_PCMCIA_WRITE_ATTR(osh, offset, buf, size)
-+
-+#define        OSL_PCI_READ_CONFIG(osh, offset, size) \
-+       osl_pci_read_config((osh), (offset), (size))
-+
-+static inline uint32
-+osl_pci_read_config(osl_t *osh, uint offset, uint size)
-+{
-+       uint val;
-+       uint retry = PCI_CFG_RETRY;      
-+
-+       do {
-+               pci_read_config_dword(osh->pdev, offset, &val);
-+               if (val != 0xffffffff)
-+                       break;
-+       } while (retry--);
-+
-+       return (val);
-+}
-+
-+#define        OSL_PCI_WRITE_CONFIG(osh, offset, size, val) \
-+       osl_pci_write_config((osh), (offset), (size), (val))
-+static inline void
-+osl_pci_write_config(osl_t *osh, uint offset, uint size, uint val)
-+{
-+       uint retry = PCI_CFG_RETRY;      
-+
-+       do {
-+               pci_write_config_dword(osh->pdev, offset, val);
-+               if (offset != PCI_BAR0_WIN)
-+                       break;
-+               if (osl_pci_read_config(osh, offset, size) == val)
-+                       break;
-+       } while (retry--);
-+}
-+
-+
-+/* return bus # for the pci device pointed by osh->pdev */
-+#define OSL_PCI_BUS(osh)       osl_pci_bus(osh)
-+static inline uint
-+osl_pci_bus(osl_t *osh)
-+{
-+       return ((struct pci_dev *)osh->pdev)->bus->number;
-+}
-+
-+/* return slot # for the pci device pointed by osh->pdev */
-+#define OSL_PCI_SLOT(osh)      osl_pci_slot(osh)
-+static inline uint
-+osl_pci_slot(osl_t *osh)
-+{
-+       return PCI_SLOT(((struct pci_dev *)osh->pdev)->devfn);
-+}
-+
++#error "Unsupported OSL requested"
 +#endif
-diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm947xx/include/pcicfg.h
---- linux.old/arch/mips/bcm947xx/include/pcicfg.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h       2006-04-27 20:31:41.000000000 +0200
-@@ -0,0 +1,495 @@
++
++/* handy */
++#define        SET_REG(r, mask, val)   W_REG((r), ((R_REG(r) & ~(mask)) | (val)))
++#define        MAXPRIO         7       /* 0-7 */
++
++#endif /* _osl_h_ */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/pcicfg.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/pcicfg.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/pcicfg.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/pcicfg.h    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,369 @@
 +/*
-+ * pcicfg.h: PCI configuration constants and structures.
++ * pcicfg.h: PCI configuration  constants and structures.
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -5558 +2948 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: pcicfg.h,v 1.1.1.11 2006/04/08 06:13:40 honor Exp $
++ * $Id$
 + */
 +
-+#ifndef        _h_pcicfg_
-+#define        _h_pcicfg_
++#ifndef        _h_pci_
++#define        _h_pci_
 +
 +/* The following inside ifndef's so we don't collide with NTDDK.H */
@@ -5588 +2978 @@
 +#define        PCICFG_SLOT_SHIFT       11      /* Slot shift */
 +#define        PCICFG_FUN_SHIFT        8       /* Function shift */
-+#define        PCICFG_OFF_SHIFT        0       /* Register shift */
++#define        PCICFG_OFF_SHIFT        0       /* Bus shift */
 +
 +#define        PCICFG_BUS_MASK         0xff    /* Bus mask */
@@ -5606 +2996 @@
 +#define        PCI_CONFIG_OFF(a)       (((a) >> PCICFG_OFF_SHIFT) & PCICFG_OFF_MASK)
 +
-+/* PCIE Config space accessing MACROS */
-+
-+#define        PCIECFG_BUS_SHIFT       24      /* Bus shift */
-+#define        PCIECFG_SLOT_SHIFT      19      /* Slot/Device shift */
-+#define        PCIECFG_FUN_SHIFT       16      /* Function shift */
-+#define        PCIECFG_OFF_SHIFT       0       /* Register shift */
-+
-+#define        PCIECFG_BUS_MASK        0xff    /* Bus mask */
-+#define        PCIECFG_SLOT_MASK       0x1f    /* Slot/Device mask */
-+#define        PCIECFG_FUN_MASK        7       /* Function mask */
-+#define        PCIECFG_OFF_MASK        0x3ff   /* Register mask */
-+
-+#define        PCIE_CONFIG_ADDR(b, s, f, o)                                    \
-+               ((((b) & PCIECFG_BUS_MASK) << PCIECFG_BUS_SHIFT)                \
-+                | (((s) & PCIECFG_SLOT_MASK) << PCIECFG_SLOT_SHIFT)    \
-+                | (((f) & PCIECFG_FUN_MASK) << PCIECFG_FUN_SHIFT)      \
-+                | (((o) & PCIECFG_OFF_MASK) << PCIECFG_OFF_SHIFT))
-+
-+#define        PCIE_CONFIG_BUS(a)      (((a) >> PCIECFG_BUS_SHIFT) & PCIECFG_BUS_MASK)
-+#define        PCIE_CONFIG_SLOT(a)     (((a) >> PCIECFG_SLOT_SHIFT) & PCIECFG_SLOT_MASK)
-+#define        PCIE_CONFIG_FUN(a)      (((a) >> PCIECFG_FUN_SHIFT) & PCIECFG_FUN_MASK)
-+#define        PCIE_CONFIG_OFF(a)      (((a) >> PCIECFG_OFF_SHIFT) & PCIECFG_OFF_MASK)
 +
 +/* The actual config space */
@@ -5637 +3005 @@
 +#define        PCR_RSVDA_MAX           2
 +
-+/* Bits in PCI bars' flags */
-+
-+#define        PCIBAR_FLAGS            0xf
-+#define        PCIBAR_IO               0x1
-+#define        PCIBAR_MEM1M            0x2
-+#define        PCIBAR_MEM64            0x4
-+#define        PCIBAR_PREFETCH         0x8
-+#define        PCIBAR_MEM32_MASK       0xFFFFFF80
-+
-+/* pci config status reg has a bit to indicate that capability ptr is present */
-+
-+#define PCI_CAPPTR_PRESENT     0x0010
-+
 +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];
++    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;
 +
@@ -5705 +3060 @@
 +#define        PCI_CFG_SSID            0x2e
 +#define        PCI_CFG_ROMBAR          0x30
-+#define PCI_CFG_CAPPTR         0x34
 +#define        PCI_CFG_INT             0x3c
 +#define        PCI_CFG_PIN             0x3d
@@ -5711 +3065 @@
 +#define        PCI_CFG_MAXLAT          0x3f
 +
-+#ifdef __NetBSD__
-+#undef PCI_CLASS_DISPLAY
-+#undef PCI_CLASS_MEMORY
-+#undef PCI_CLASS_BRIDGE
-+#undef PCI_CLASS_INPUT
-+#undef PCI_CLASS_DOCK
-+#endif /* __NetBSD__ */
-+
 +/* 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_XOR = 0xfe
++    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_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_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_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_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_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_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_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_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_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_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_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_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_I2O,
 +} pci_intelligent_subclasses;
 +
 +typedef enum {
-+       PCI_SATELLITE_TV,
-+       PCI_SATELLITE_AUDIO,
-+       PCI_SATELLITE_VOICE,
-+       PCI_SATELLITE_DATA,
-+       PCI_SATELLITE_OTHER = 0x80
++    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_NETWORK,
++    PCI_CRYPT_ENTERTAINMENT,
++    PCI_CRYPT_OTHER = 0x80
 +} pci_crypt_subclasses;
 +
 +typedef enum {
-+       PCI_DSP_DPIO,
-+       PCI_DSP_OTHER = 0x80
++    PCI_DSP_DPIO,
++    PCI_DSP_OTHER = 0x80
 +} pci_dsp_subclasses;
-+
-+typedef enum {
-+       PCI_XOR_QDMA,
-+       PCI_XOR_OTHER = 0x80
-+} pci_xor_subclasses;
 +
 +/* Header types */
@@ -5886 +3227 @@
 +
 +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];
++    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;
 +
-+
-+/* PCI CAPABILITY DEFINES */
-+#define PCI_CAP_POWERMGMTCAP_ID                0x01
-+#define PCI_CAP_MSICAP_ID              0x05
-+#define PCI_CAP_PCIECAP_ID             0x10
-+
-+/* Data structure to define the Message Signalled Interrupt facility 
-+ * Valid for PCI and PCIE configurations
-+ */
-+typedef struct _pciconfig_cap_msi {
-+       unsigned char capID;
-+       unsigned char nextptr;
-+       unsigned short msgctrl;
-+       unsigned int msgaddr;
-+} pciconfig_cap_msi;
-+
-+/* Data structure to define the Power managment facility
-+ * Valid for PCI and PCIE configurations
-+ */
-+typedef struct _pciconfig_cap_pwrmgmt {
-+       unsigned char capID;
-+       unsigned char nextptr;
-+       unsigned short pme_cap;
-+       unsigned short pme_sts_ctrl;
-+       unsigned char pme_bridge_ext;
-+       unsigned char data;
-+} pciconfig_cap_pwrmgmt;
-+
-+/* Data structure to define the PCIE capability */
-+typedef struct _pciconfig_cap_pcie {
-+       unsigned char capID;
-+       unsigned char nextptr;
-+       unsigned short pcie_cap;
-+       unsigned int dev_cap;
-+       unsigned short dev_ctrl;
-+       unsigned short dev_status;
-+       unsigned int link_cap;
-+       unsigned short link_ctrl;
-+       unsigned short link_status;
-+} pciconfig_cap_pcie;
-+
-+/* PCIE Enhanced CAPABILITY DEFINES */
-+#define PCIE_EXTCFG_OFFSET     0x100
-+#define PCIE_ADVERRREP_CAPID   0x0001
-+#define PCIE_VC_CAPID          0x0002
-+#define PCIE_DEVSNUM_CAPID     0x0003
-+#define PCIE_PWRBUDGET_CAPID   0x0004
-+
-+/* Header to define the PCIE specific capabilities in the extended config space */
-+typedef struct _pcie_enhanced_caphdr {
-+       unsigned short capID;
-+       unsigned short cap_ver : 4;
-+       unsigned short next_ptr : 12;
-+} pcie_enhanced_caphdr;
-+
-+
-+/* Everything below is BRCM HND proprietary */
-+
-+
-+/* Brcm PCI configuration registers */
-+#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]
++/* Eveything below is BRCM HND proprietary */
 +
 +#define        PCI_BAR0_WIN            0x80    /* backplane addres space accessed by BAR0 */
@@ -6000 +3278 @@
 +#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 */
++#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_SHADOW_OFFSET  (2 * 1024)      /* bar0 + 2K accesses sprom shadow (in pci core) */
 +#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 */
-+#define        PCI_BAR0_PCISBR_OFFSET  (4 * 1024)      /* pci core SB registers are at the end of the
-+                                                * 8KB window, so their address is the "regular"
-+                                                * address plus 4K
-+                                                */
-+#define PCI_BAR0_WINSZ         8192            /* bar0 window size */
-+
-+/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
-+#define        PCI_16KB0_PCIREGS_OFFSET (8 * 1024)     /* bar0 + 8K accesses pci/pcie core registers */
-+#define        PCI_16KB0_CCREGS_OFFSET (12 * 1024)     /* bar0 + 12K accesses chipc core registers */
-+#define PCI_16KBB0_WINSZ       (16 * 1024)     /* bar0 window size */
 +
 +/* PCI_INT_STATUS */
@@ -6028 +3295 @@
 +
 +/* PCI_SPROM_CONTROL */
-+#define SPROM_SZ_MSK           0x02    /* SPROM Size Mask */
-+#define SPROM_LOCKED           0x08    /* SPROM Locked */
-+#define        SPROM_BLANK             0x04    /* indicating a blank SPROM */
-+#define SPROM_WRITEEN          0x10    /* SPROM write enable */
++#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_OTPIN_USE                0x80    /* device OTP In use */
 +
 +#define        SPROM_SIZE              256     /* sprom size in 16-bit */
@@ -6041 +3305 @@
 +#define PCI_CFG_CMD_STAT_TA    0x08000000      /* target abort status */
 +
-+#endif /* _h_pcicfg_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm947xx/include/sbchipc.h
---- linux.old/arch/mips/bcm947xx/include/sbchipc.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h      2006-04-27 22:11:01.000000000 +0200
-@@ -0,0 +1,516 @@
++#endif
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbchipc.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbchipc.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbchipc.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbchipc.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,394 @@
 +/*
 + * SiliconBackplane Chipcommon core hardware definitions.
@@ -6053 +3317 @@
 + * gpio interface, extbus, and support for serial and parallel flashes.
 + *
-+ * $Id: sbchipc.h,v 1.1.1.14 2006/04/15 01:29:08 michael Exp $
-+ * Copyright 2006, Broadcom Corporation
++ * $Id$
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -6123 +3387 @@
 +       /* Watchdog timer */
 +       uint32  watchdog;               /* 0x80 */
-+       uint32  PAD[1];
-+
-+       /* GPIO based LED powersave registers corerev >= 16 */
-+       uint32  gpiotimerval;           /* 0x88 */
-+       uint32  gpiotimeroutmask;
++       uint32  PAD[3];
 +
 +       /* clock control */
@@ -6134 +3394 @@
 +       uint32  clockcontrol_pci;       /* aka m1 */
 +       uint32  clockcontrol_m2;        /* mii/uart/mipsref */
-+       uint32  clockcontrol_m3;        /* cpu */
++       uint32  clockcontrol_mips;      /* aka m3 */
 +       uint32  clkdiv;                 /* corerev >= 3 */
 +       uint32  PAD[2];
@@ -6162 +3422 @@
 +       uint32  flash_config;
 +       uint32  flash_waitcount;
-+       uint32  PAD[44];
-+
-+       /* Clock control and hardware workarounds */
-+       uint32  clk_ctl_st;
-+       uint32  hw_war;
-+       uint32  PAD[70];
++       uint32  PAD[116];
 +
 +       /* uarts */
@@ -6198 +3453 @@
 +#define        CC_JTAGDR               0x38
 +#define        CC_JTAGCTRL             0x3c
-+#define        CC_WATCHDOG             0x80
-+#define        CC_CLKC_N               0x90
-+#define        CC_CLKC_M0              0x94
-+#define        CC_CLKC_M1              0x98
-+#define        CC_CLKC_M2              0x9c
-+#define        CC_CLKC_M3              0xa0
 +#define        CC_CLKDIV               0xa4
-+#define        CC_SYS_CLK_CTL          0xc0
 +#define        CC_OTP                  0x800
 +
 +/* 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_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_MASK                0x000000c0      /* External bus mask */
-+#define CAP_EXTBUS_NONE                0x00000000      /* No ExtBus present */
-+#define CAP_EXTBUS_FULL                0x00000040      /* ExtBus: PCMCIA, IDE & Prog */
-+#define CAP_EXTBUS_PROG                0x00000080      /* ExtBus: ProgIf only */
-+#define        CAP_FLASH_MASK          0x00000700      /* Type of flash */
-+#define        CAP_PLL_MASK            0x00038000      /* Type of PLL */
-+#define CAP_PWR_CTL            0x00040000      /* Power control */
-+#define CAP_OTPSIZE            0x00380000      /* OTP Size (0 = none) */
-+#define CAP_OTPSIZE_SHIFT      19              /* OTP Size shift */
-+#define CAP_OTPSIZE_BASE       5               /* OTP Size base */
-+#define CAP_JTAGP              0x00400000      /* JTAG Master Present */
-+#define CAP_ROM                        0x00800000      /* Internal boot rom active */
-+#define CAP_BKPLN64            0x08000000      /* 64-bit backplane */
++#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 */
++#define CAP_OTPSIZE            0x00380000              /* OTP Size (0 = none) */
++#define CAP_OTPSIZE_SHIFT      19                      /* OTP Size shift */
++#define CAP_JTAGP              0x00400000              /* JTAG Master Present */
++#define CAP_ROM                        0x00800000              /* Internal boot rom active */
 +
 +/* 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 */
-+#define PLL_TYPE5              0x00018000      /* 25Mhz, 4 dividers */
-+#define PLL_TYPE6              0x00028000      /* 100/200 or 120/240 only */
-+#define PLL_TYPE7              0x00038000      /* 25Mhz, 4 dividers */
++#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 */
++#define PLL_TYPE5              0x00018000              /* 25Mhz, 4 dividers */
++#define PLL_TYPE6              0x00028000              /* 100/200 or 120/240 only */
++#define PLL_TYPE7              0x00038000              /* 25Mhz, 4 dividers */
 +
 +/* corecontrol */
-+#define CC_UARTCLKO            0x00000001      /* Drive UART with internal clock */
-+#define        CC_SE                   0x00000002      /* sync clk out enable (corerev >= 3) */
-+
-+/* chipcontrol */
-+#define CHIPCTRL_4321A0_DEFAULT        0x3a4           
-+#define CHIPCTRL_4321A1_DEFAULT        0x0a4           
-+
-+/* Fields in the otpstatus register */
-+#define        OTPS_PROGFAIL           0x80000000
-+#define        OTPS_PROTECT            0x00000007
-+#define        OTPS_HW_PROTECT         0x00000001
-+#define        OTPS_SW_PROTECT         0x00000002
-+#define        OTPS_CID_PROTECT        0x00000004
-+
-+/* Fields in the otpcontrol register */
-+#define        OTPC_RECWAIT            0xff000000
-+#define        OTPC_PROGWAIT           0x00ffff00
-+#define        OTPC_PRW_SHIFT          8
-+#define        OTPC_MAXFAIL            0x00000038
-+#define        OTPC_VSEL               0x00000006
-+#define        OTPC_SELVL              0x00000001
-+
-+/* Fields in otpprog */
-+#define        OTPP_COL_MASK           0x000000ff
-+#define        OTPP_ROW_MASK           0x0000ff00
-+#define        OTPP_ROW_SHIFT          8
-+#define        OTPP_READERR            0x10000000
-+#define        OTPP_VALUE              0x20000000
-+#define        OTPP_VALUE_SHIFT                29
-+#define        OTPP_READ               0x40000000
-+#define        OTPP_START              0x80000000
-+#define        OTPP_BUSY               0x80000000
++#define CC_UARTCLKO            0x00000001              /* Drive UART with internal clock */
++#define        CC_SE                   0x00000002              /* sync clk out enable (corerev >= 3) */
 +
 +/* jtagcmd */
@@ -6293 +3506 @@
 +#define JCMD0_ACC_PDR          0x00005000
 +#define JCMD0_IRW_MASK         0x00000f00
-+#define JCMD_ACC_MASK          0x000f0000      /* Changes for corerev 11 */
++#define JCMD_ACC_MASK          0x000f0000              /* Changes for corerev 11 */
 +#define JCMD_ACC_IRDR          0x00000000
 +#define JCMD_ACC_DR            0x00010000
@@ -6305 +3518 @@
 +
 +/* jtagctrl */
-+#define JCTRL_FORCE_CLK                4               /* Force clock */
-+#define JCTRL_EXT_EN           2               /* Enable external targets */
-+#define JCTRL_EN               1               /* Enable Jtag master */
++#define JCTRL_FORCE_CLK                4                       /* Force clock */
++#define JCTRL_EXT_EN           2                       /* Enable external targets */
++#define JCTRL_EN               1                       /* Enable Jtag master */
 +
 +/* Fields in clkdiv */
 +#define        CLKD_SFLASH             0x0f000000
-+#define        CLKD_SFLASH_SHIFT       24
++#define        CLKD_SFLASH_SHIFT               24
 +#define        CLKD_OTP                0x000f0000
 +#define        CLKD_OTP_SHIFT          16
 +#define        CLKD_JTAG               0x00000f00
-+#define        CLKD_JTAG_SHIFT         8
++#define        CLKD_JTAG_SHIFT         8               
 +#define        CLKD_UART               0x000000ff
 +
 +/* intstatus/intmask */
-+#define        CI_GPIO                 0x00000001      /* gpio intr */
-+#define        CI_EI                   0x00000002      /* ro: ext intr pin (corerev >= 3) */
-+#define        CI_WDRESET              0x80000000      /* watchdog reset occurred */
++#define        CI_GPIO                 0x00000001              /* gpio intr */
++#define        CI_EI                   0x00000002              /* ro: ext intr pin (corerev >= 3) */
++#define        CI_WDRESET              0x80000000              /* watchdog reset occurred */
 +
 +/* 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 (SlowClk = 1/(4+divisor)) */
-+#define SCC_CD_SHIFT           16
-+
-+/* system_clk_ctl */
-+#define        SYCC_IE                 0x00000001      /* ILPen: Enable Idle Low Power */
-+#define        SYCC_AE                 0x00000002      /* ALPen: Enable Active Low Power */
-+#define        SYCC_FP                 0x00000004      /* ForcePLLOn */
-+#define        SYCC_AR                 0x00000008      /* Force ALP (or HT if ALPen is not set */
-+#define        SYCC_HR                 0x00000010      /* Force HT */
-+#define SYCC_CD_MASK           0xffff0000      /* ClkDiv  (ILP = 1/(4 * (divisor + 1)) */
-+#define SYCC_CD_SHIFT          16
-+
-+/* gpiotimerval */
-+#define GPIO_ONTIME_SHIFT      16
++#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 */
++
++/* sys_clk_ctl */
++#define        SYCC_IE                 0x00000001              /* ILPen: Enable Idle Low Power */
++#define        SYCC_AE                 0x00000002              /* ALPen: Enable Active Low Power */
++#define        SYCC_FP                 0x00000004              /* ForcePLLOn */
++#define        SYCC_AR                 0x00000008              /* Force ALP (or HT if ALPen is not set */
++#define        SYCC_HR                 0x00000010              /* Force HT */
++#define SYCC_CD_MASK           0xffff0000              /* ClockDivider mask, SlowClk = 1/(4+divisor) * crystal/PCI clock */
++#define SYCC_CD_SHF            16                      /* CLockDivider shift */
 +
 +/* clockcontrol_n */
-+#define        CN_N1_MASK              0x3f            /* n1 control */
-+#define        CN_N2_MASK              0x3f00          /* n2 control */
++#define        CN_N1_MASK              0x3f                    /* n1 control */
++#define        CN_N2_MASK              0x3f00                  /* n2 control */
 +#define        CN_N2_SHIFT             8
-+#define        CN_PLLC_MASK            0xf0000         /* pll control */
++#define        CN_PLLC_MASK            0xf0000                 /* pll control */
 +#define        CN_PLLC_SHIFT           16
 +
 +/* clockcontrol_sb/pci/uart */
-+#define        CC_M1_MASK              0x3f            /* m1 control */
-+#define        CC_M2_MASK              0x3f00          /* m2 control */
++#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_MASK              0x3f0000                /* m3 control */
 +#define        CC_M3_SHIFT             16
-+#define        CC_MC_MASK              0x1f000000      /* mux control */
++#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_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_F5_BIAS              5                       /* 5-bit fields get this added */
 +
 +#define        CC_MC_BYPASS            0x08
@@ -6390 +3598 @@
 +
 +/* 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_T2_BIAS              2                       /* n1, n2, m1 & m3 bias */
++#define        CC_T2M2_BIAS            3                       /* m2 bias */
 +
 +#define        CC_T2MC_M1BYP           1
@@ -6398 +3606 @@
 +
 +/* Type 6 Clock control magic field values */
-+#define        CC_T6_MMASK             1               /* bits of interest in m */
-+#define        CC_T6_M0                120000000       /* sb clock for m = 0 */
-+#define        CC_T6_M1                100000000       /* sb clock for m = 1 */
++#define        CC_T6_MMASK             1                       /* bits of interest in m */
++#define        CC_T6_M0                120000000               /* sb clock for m = 0 */
++#define        CC_T6_M1                100000000               /* sb clock for m = 1 */
 +#define        SB2MIPS_T6(sb)          (2 * (sb))
 +
 +/* Common clock base */
-+#define        CC_CLOCK_BASE1          24000000        /* Half the clock freq */
-+#define CC_CLOCK_BASE2         12500000        /* Alternate crystal on some PLL's */
-+
-+/* Clock control values for 200Mhz in 5350 */
-+#define        CLKC_5350_N             0x0311
-+#define        CLKC_5350_M             0x04020009
++#define        CC_CLOCK_BASE1          24000000                /* Half the clock freq */
++#define CC_CLOCK_BASE2         12500000                /* Alternate crystal on some PLL's */
 +
 +/* Flash types in the chipcommon capabilities register */
@@ -6417 +3621 @@
 +#define        PFLASH                  0x700           /* Parallel flash */
 +
-+/* Bits in the ExtBus config registers */
++/* Bits in the config registers */
 +#define        CC_CFG_EN               0x0001          /* Enable */
 +#define        CC_CFG_EM_MASK          0x000e          /* Extif Mode */
-+#define        CC_CFG_EM_ASYNC         0x0000          /*   Async/Parallel flash */
-+#define        CC_CFG_EM_SYNC          0x0002          /*   Synchronous */
-+#define        CC_CFG_EM_PCMCIA        0x0004          /*   PCMCIA */
-+#define        CC_CFG_EM_IDE           0x0006          /*   IDE */
++#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 */
@@ -6429 +3633 @@
 +#define        CC_CFG_SB               0x0100          /* Sync: Size/Bytestrobe */
 +
-+/* ExtBus address space */
-+#define        CC_EB_BASE              0x1a000000      /* Chipc ExtBus base address */
-+#define        CC_EB_PCMCIA_MEM        0x1a000000      /* PCMCIA 0 memory base address */
-+#define        CC_EB_PCMCIA_IO         0x1a200000      /* PCMCIA 0 I/O base address */
-+#define        CC_EB_PCMCIA_CFG        0x1a400000      /* PCMCIA 0 config base address */
-+#define        CC_EB_IDE               0x1a800000      /* IDE memory base */
-+#define        CC_EB_PCMCIA1_MEM       0x1a800000      /* PCMCIA 1 memory base address */
-+#define        CC_EB_PCMCIA1_IO        0x1aa00000      /* PCMCIA 1 I/O base address */
-+#define        CC_EB_PCMCIA1_CFG       0x1ac00000      /* PCMCIA 1 config base address */
-+#define        CC_EB_PROGIF            0x1b000000      /* ProgIF Async/Sync base address */
-+
-+
 +/* Start/busy bit in flashcontrol */
-+#define SFLASH_OPCODE          0x000000ff
-+#define SFLASH_ACTION          0x00000700
 +#define SFLASH_START           0x80000000
 +#define SFLASH_BUSY            SFLASH_START
 +
-+/* flashcontrol action codes */
-+#define        SFLASH_ACT_OPONLY       0x0000          /* Issue opcode only */
-+#define        SFLASH_ACT_OP1D         0x0100          /* opcode + 1 data byte */
-+#define        SFLASH_ACT_OP3A         0x0200          /* opcode + 3 address bytes */
-+#define        SFLASH_ACT_OP3A1D       0x0300          /* opcode + 3 addres & 1 data bytes */
-+#define        SFLASH_ACT_OP3A4D       0x0400          /* opcode + 3 addres & 4 data bytes */
-+#define        SFLASH_ACT_OP3A4X4D     0x0500          /* opcode + 3 addres, 4 don't care & 4 data bytes */
-+#define        SFLASH_ACT_OP3A1X4D     0x0700          /* opcode + 3 addres, 1 don't care & 4 data bytes */
-+
-+/* flashcontrol action+opcodes for ST flashes */
++/* flashcontrol opcodes for ST flashes */
 +#define SFLASH_ST_WREN         0x0006          /* Write Enable */
 +#define SFLASH_ST_WRDIS                0x0004          /* Write Disable */
@@ -6475 +3656 @@
 +#define SFLASH_ST_SRWD         0x80            /* Status Register Write Disable */
 +
-+/* flashcontrol action+opcodes for Atmel flashes */
++/* flashcontrol opcodes for Atmel flashes */
 +#define SFLASH_AT_READ                         0x07e8
 +#define SFLASH_AT_PAGE_READ                    0x07d2
@@ -6504 +3685 @@
 +#define SFLASH_AT_ID_SHIFT                     3
 +
-+/* OTP regions */
-+#define        OTP_HW_REGION   OTPS_HW_PROTECT
-+#define        OTP_SW_REGION   OTPS_SW_PROTECT
-+#define        OTP_CID_REGION  OTPS_CID_PROTECT
-+
-+/* OTP regions (Byte offsets from otp size) */
-+#define        OTP_SWLIM_OFF   (-8)
-+#define        OTP_CIDBASE_OFF 0
-+#define        OTP_CIDLIM_OFF  8
-+
-+/* Predefined OTP words (Word offset from otp size) */
-+#define        OTP_BOUNDARY_OFF (-4)
-+#define        OTP_HWSIGN_OFF  (-3)
-+#define        OTP_SWSIGN_OFF  (-2)
-+#define        OTP_CIDSIGN_OFF (-1)
-+
-+#define        OTP_CID_OFF     0
-+#define        OTP_PKG_OFF     1
-+#define        OTP_FID_OFF     2
-+#define        OTP_RSV_OFF     3
-+#define        OTP_LIM_OFF     4
++/* OTP conventions */
++#define        OTP_HWBASE      0
++#define        OTP_SWLIM       256
++#define        OTP_CIDBASE     256
++#define        OTP_CIDLIM      260
++
++#define        OTP_BOUNDARY    252
++#define        OTP_HWSIGN      253
++#define        OTP_SWSIGN      254
++#define        OTP_CIDSIGN     255
++
++#define        OTP_CID         256
++#define        OTP_PKG         257
++#define        OTP_FID         258
 +
 +#define        OTP_SIGNATURE   0x578a
 +#define        OTP_MAGIC       0x4e56
 +
-+/* 
-+ * 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_RX                0       /* In:  Receive buffer (DLAB=0) */
-+#define UART_TX                0       /* Out: Transmit buffer (DLAB=0) */
-+#define UART_DLL       0       /* Out: Divisor Latch Low (DLAB=1) */
-+#define UART_IER       1       /* In/Out: Interrupt Enable Register (DLAB=0) */
-+#define UART_DLM       1       /* Out: Divisor Latch High (DLAB=1) */
-+#define UART_IIR       2       /* In: Interrupt Identity Register  */
-+#define UART_FCR       2       /* Out: FIFO Control Register */
-+#define UART_LCR       3       /* Out: Line Control Register */
-+#define UART_MCR       4       /* Out: Modem Control Register */
-+#define UART_LSR       5       /* In:  Line Status Register */
-+#define UART_MSR       6       /* In:  Modem Status Register */
-+#define UART_SCR       7       /* I/O: Scratch Register */
-+#define UART_LCR_DLAB  0x80    /* Divisor latch access bit */
-+#define UART_LCR_WLEN8 0x03    /* Wordlength: 8 bits */
-+#define UART_MCR_OUT2  0x08    /* MCR GPIO out 2 */
-+#define UART_MCR_LOOP  0x10    /* Enable loopback test mode */
-+#define UART_LSR_THRE  0x20    /* Transmit-hold-register empty */
-+#define UART_LSR_RXRDY 0x01    /* Receiver ready */
-+#define UART_FCR_FIFO_ENABLE 1 /* FIFO control register bit controlling FIFO enable/disable */
-+
-+/* Interrupt Enable Register (IER) bits */
-+#define UART_IER_EDSSI 8       /* enable modem status interrupt */
-+#define UART_IER_ELSI  4       /* enable receiver line status interrupt */
-+#define UART_IER_ETBEI  2      /* enable transmitter holding register empty interrupt */
-+#define UART_IER_ERBFI 1       /* enable data available interrupt */
-+
 +#endif /* _SBCHIPC_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bcm947xx/include/sbconfig.h
---- linux.old/arch/mips/bcm947xx/include/sbconfig.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h     2006-04-27 22:14:11.000000000 +0200
-@@ -0,0 +1,369 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbconfig.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbconfig.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbconfig.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbconfig.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,324 @@
 +/*
 + * Broadcom SiliconBackplane hardware register definitions.
 + *
-+ * Copyright 2006, 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: sbconfig.h,v 1.1.1.11 2006/02/27 03:43:16 honor Exp $
++ * Copyright 2005, 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$
 + */
 +
@@ -6596 +3737 @@
 +#define SB_SDRAM_BASE          0x00000000      /* Physical SDRAM */
 +#define SB_PCI_MEM             0x08000000      /* Host Mode sb2pcitranslation0 (64 MB) */
-+#define SB_PCI_MEM_SZ          (64 * 1024 * 1024)
 +#define SB_PCI_CFG             0x0c000000      /* Host Mode sb2pcitranslation1 (64 MB) */
 +#define        SB_SDRAM_SWAPPED        0x10000000      /* Byteswapped Physical SDRAM */
@@ -6606 +3746 @@
 +
 +#define        SB_EXTIF_BASE           0x1f000000      /* External Interface region base address */
-+#define        SB_FLASH1               0x1fc00000      /* MIPS Flash Region 1 */
-+#define        SB_FLASH1_SZ            0x00400000      /* MIPS Size of Flash Region 1 */
-+
-+#define        SB_ROM                  0x20000000      /* ARM ROM */
-+#define        SB_SRAM2                0x80000000      /* ARM SRAM Region 2 */
-+#define        SB_ARM_FLASH1           0xffff0000      /* ARM Flash Region 1 */
-+#define        SB_ARM_FLASH1_SZ        0x00010000      /* ARM Size of Flash Region 1 */
++#define        SB_FLASH1               0x1fc00000      /* Flash Region 1 */
++#define        SB_FLASH1_SZ            0x00400000      /* Size of Flash Region 1 */
 +
 +#define SB_PCI_DMA             0x40000000      /* Client Mode sb2pcitranslation2 (1 GB) */
 +#define SB_PCI_DMA_SZ          0x40000000      /* Client Mode sb2pcitranslation2 size in bytes */
-+#define SB_PCIE_DMA_L32                0x00000000      /* PCIE Client Mode sb2pcitranslation2
-+                                                * (2 ZettaBytes), low 32 bits
-+                                                */
-+#define SB_PCIE_DMA_H32                0x80000000      /* PCIE Client Mode sb2pcitranslation2
-+                                                * (2 ZettaBytes), high 32 bits
-+                                                */
 +#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 SB_MAXFUNCS            4               /* max. # functions per core */
 +#define        SBCONFIGOFF             0xf00           /* core sbconfig regs are top 256bytes of regs */
 +#define        SBCONFIGSIZE            256             /* sizeof (sbconfig_t) */
@@ -6662 +3789 @@
 +#define SBIDLOW                        0xf8
 +#define SBIDHIGH               0xfc
-+
-+/* All the previous registers are above SBCONFIGOFF, but with Sonics 2.3, we have
-+ * a few registers *below* that line. I think it would be very confusing to try
-+ * and change the value of SBCONFIGOFF, so I'm definig them as absolute offsets here,
-+ */
-+
-+#define SBIMERRLOGA            0xea8
-+#define SBIMERRLOG             0xeb0
-+#define SBTMPORTCONNID0                0xed8
-+#define SBTMPORTLOCK0          0xef8
 +
 +#ifndef _LANGUAGE_ASSEMBLY
@@ -6751 +3868 @@
 +/* sbtmstatelow */
 +#define        SBTML_RESET             0x1             /* reset */
-+#define        SBTML_REJ_MASK          0x6             /* reject */
-+#define        SBTML_REJ_SHIFT         1
++#define        SBTML_REJ               0x2             /* reject */
 +#define        SBTML_CLK               0x10000         /* clock enable */
 +#define        SBTML_FGC               0x20000         /* force gated clocks on */
@@ -6765 +3881 @@
 +#define        SBTMH_TO                0x00000020      /* timeout (sonics >= 2.3) */
 +#define        SBTMH_FL_MASK           0x1fff0000      /* core-specific flags */
-+#define SBTMH_DMA64            0x10000000      /* supports DMA with 64-bit addresses */
 +#define        SBTMH_GCR               0x20000000      /* gated clock request */
 +#define        SBTMH_BISTF             0x40000000      /* bist failed */
 +#define        SBTMH_BISTD             0x80000000      /* bist done */
-+
 +
 +/* sbbwa0 */
@@ -6858 +3972 @@
 +#define        SBIDL_RV_MASK           0xf0000000      /* sonics backplane revision code */
 +#define        SBIDL_RV_SHIFT          28
-+#define        SBIDL_RV_2_2            0x00000000      /* version 2.2 or earlier */
-+#define        SBIDL_RV_2_3            0x10000000      /* version 2.3 */
 +
 +/* sbidhigh */
-+#define        SBIDH_RC_MASK           0x000f          /* revision code */
-+#define        SBIDH_RCE_MASK          0x7000          /* revision code extension field */
-+#define        SBIDH_RCE_SHIFT         8
-+#define        SBCOREREV(sbidh) \
-+       ((((sbidh) & SBIDH_RCE_MASK) >> SBIDH_RCE_SHIFT) | ((sbidh) & SBIDH_RC_MASK))
-+#define        SBIDH_CC_MASK           0x8ff0          /* core code */
++#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 */
@@ -6878 +3986 @@
 +
 +/* core codes */
-+#define        SB_NODEV                0x700           /* Invalid coreid */
 +#define        SB_CC                   0x800           /* chipcommon core */
 +#define        SB_ILINE20              0x801           /* iline20 core */
@@ -6891 +3998 @@
 +#define        SB_IPSEC                0x80b           /* ipsec core */
 +#define        SB_PCMCIA               0x80d           /* pcmcia core */
-+#define SB_SDIOD               SB_PCMCIA       /* pcmcia core has sdio device */
 +#define        SB_SOCRAM               0x80e           /* internal memory core */
 +#define        SB_MEMC                 0x80f           /* memc sdram core */
@@ -6906 +4012 @@
 +#define        SB_SATAXOR              0x81e           /* serial ATA & XOR DMA core */
 +#define        SB_GIGETH               0x81f           /* gigabit ethernet core */
-+#define        SB_PCIE                 0x820           /* pci express core */
-+#define        SB_MIMO                 0x821           /* MIMO phy core */
-+#define        SB_SRAMC                0x822           /* SRAM controller core */
-+#define        SB_MINIMAC              0x823           /* MINI MAC/phy core */
-+#define        SB_ARM11                0x824           /* ARM 1176 core */
-+#define        SB_ARM7                 0x825           /* ARM 7tdmi core */
-+
-+#define        SB_CC_IDX               0               /* chipc, when present, is always core 0 */
 +
 +/* Not really related to Silicon Backplane, but a couple of software
@@ -6932 +4030 @@
 +#define        BISZ_BSSST_IDX          5               /*      5: text start */
 +#define        BISZ_BSSEND_IDX         6               /*      6: text start */
-+#define BISZ_SIZE              7               /* descriptor size in 32-bit intergers */
 +
 +#endif /* _SBCONFIG_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm947xx/include/sbextif.h
---- linux.old/arch/mips/bcm947xx/include/sbextif.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbextif.h      2006-04-27 22:13:03.000000000 +0200
-@@ -0,0 +1,243 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbextif.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbextif.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbextif.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbextif.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,242 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -6953 +4050 @@
 + * frequency control, a watchdog interrupt timer, and a GPIO interface.
 + *
-+ * Copyright 2006, 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: sbextif.h,v 1.1.1.8 2006/02/27 03:43:16 honor Exp $
++ * Copyright 2005, 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$
 + */
 +
@@ -7182 +4278 @@
 +
 +#endif /* _SBEXTIF_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbhndmips.h linux.dev/arch/mips/bcm947xx/include/sbhndmips.h
---- linux.old/arch/mips/bcm947xx/include/sbhndmips.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbhndmips.h    2006-04-27 20:43:56.000000000 +0200
-@@ -0,0 +1,47 @@
-+/*
-+ * 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 2006, 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: sbhndmips.h,v 1.1.1.1 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#ifndef        _sbhndmips_h_
-+#define        _sbhndmips_h_
-+
-+#include <mipsinc.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;
-+
-+#endif /* _LANGUAGE_ASSEMBLY */
-+
-+#endif /* _sbhndmips_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm947xx/include/sbmemc.h
---- linux.old/arch/mips/bcm947xx/include/sbmemc.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h       2006-04-27 22:12:41.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbmemc.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbmemc.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbmemc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbmemc.h    2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
 + *
-+ * Copyright 2006, 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.
++ * Copyright 2005, 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: sbmemc.h,v 1.6 2006/03/02 12:33:44 honor Exp $
++ * $Id$
 + */
 +
@@ -7278 +4323 @@
 +#define        MEMC_CORE               0x54
 +
-+#else  /* !_LANGUAGE_ASSEMBLY */
++
++#else
 +
 +/* Sonics side: MEMC core registers */
@@ -7306 +4352 @@
 +} sbmemcregs_t;
 +
-+#endif /* _LANGUAGE_ASSEMBLY */
++#endif
 +
 +/* MEMC Core Init values (OCP ID 0x80f) */
@@ -7339 +4385 @@
 +#define MEMC_DRAMTIM25_INIT    0x000754d9
 +#define MEMC_RDNCDLCOR_INIT    0x00000000
-+#define MEMC_RDNCDLCOR_SIMINIT 0xf6f6f6f6      /* For hdl sim */
 +#define MEMC_WRNCDLCOR_INIT    0x49351200
 +#define MEMC_1_WRNCDLCOR_INIT  0x14500200
@@ -7384 +4429 @@
 +
 +#endif /* _SBMEMC_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm947xx/include/sbpci.h
---- linux.old/arch/mips/bcm947xx/include/sbpci.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbpci.h        2006-05-02 17:20:14.000000000 +0200
-@@ -0,0 +1,114 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbmips.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbmips.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbmips.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbmips.h    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,60 @@
 +/*
-+ * HND SiliconBackplane PCI core hardware definitions.
++ * Broadcom SiliconBackplane MIPS definitions
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * 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 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -7399 +4450 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: sbpci.h,v 1.1.1.11 2006/02/27 03:43:16 honor Exp $
++ * $Id$
 + */
 +
-+#ifndef        _sbpci_h_
-+#define        _sbpci_h_
++#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 BCMINIT(sb_serial_init)(void *sbh, void (*add)(void *regs, uint irq, uint baud_base, uint reg_shift));
++
++extern void *sb_jtagm_init(void *sbh, uint clkd, bool exttap);
++extern void sb_jtagm_disable(void *h);
++extern uint32 jtag_rwreg(void *h, uint32 ir, uint32 dr);
++extern void BCMINIT(sb_mips_init)(void *sbh);
++extern uint32 BCMINIT(sb_mips_clock)(void *sbh);
++extern bool BCMINIT(sb_mips_setclock)(void *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock);
++
++extern uint32 BCMINIT(sb_memc_get_ncdl)(void *sbh);
++extern uint32 BCMINIT(sb_mips_get_pfc)(void *sbh);
++
++#endif /* _LANGUAGE_ASSEMBLY */
++
++#endif /* _SBMIPS_H */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbpci.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbpci.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbpci.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbpci.h     2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,117 @@
++/*
++ * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
++ *
++ * $Id$
++ * Copyright 2005, 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 */
@@ -7435 +4541 @@
 +       uint32 sbtopci1;        /* Sonics to PCI translation 1 */
 +       uint32 sbtopci2;        /* Sonics to PCI translation 2 */
-+       uint32 PAD[189];
-+       uint32 pcicfg[4][64];   /* 0x400 - 0x7FF, PCI Cfg Space (>=rev8) */
++       uint32 PAD[445];
 +       uint16 sprom[36];       /* SPROM shadow Area */
 +       uint32 PAD[46];
 +} sbpciregs_t;
-+
-+#endif /* _LANGUAGE_ASSEMBLY */
 +
 +/* PCI control */
@@ -7447 +4550 @@
 +#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 */
++#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 */
-+/* ParkID - for PCI corerev >= 8 */
-+#define PCI_PARKID_MASK                0x1c    /* Selects which agent is parked on an idle bus */
-+#define PCI_PARKID_SHIFT       2
-+#define PCI_PARKID_EXT0                0       /* External master 0 */
-+#define PCI_PARKID_EXT1                1       /* External master 1 */
-+#define PCI_PARKID_EXT2                2       /* External master 2 */
-+#define PCI_PARKID_INT         3       /* Internal master */
-+#define PCI_PARKID_LAST                4       /* Last active master */
++#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 */
@@ -7496 +4597 @@
 +#define        SBTOPCI_RC_READMULTI    0x20    /* memory read multiple */
 +
-+/* PCI core index in SROM shadow area */
-+#define SRSH_PI_OFFSET 0       /* first word */
-+#define SRSH_PI_MASK   0xf000  /* bit 15:12 */
-+#define SRSH_PI_SHIFT  12      /* bit 15:12 */
-+
-+#endif /* _sbpci_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbpcie.h linux.dev/arch/mips/bcm947xx/include/sbpcie.h
---- linux.old/arch/mips/bcm947xx/include/sbpcie.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbpcie.h       2006-04-27 20:42:22.000000000 +0200
-@@ -0,0 +1,200 @@
-+/*
-+ * BCM43XX SiliconBackplane PCIE core hardware definitions.
-+ *
-+ * Copyright 2006, 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: sbpcie.h,v 1.1.1.2 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#ifndef        _SBPCIE_H
-+#define        _SBPCIE_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
-+
-+/* PCIE Enumeration space offsets */
-+#define  PCIE_CORE_CONFIG_OFFSET       0x0
-+#define  PCIE_FUNC0_CONFIG_OFFSET      0x400
-+#define  PCIE_FUNC1_CONFIG_OFFSET      0x500
-+#define  PCIE_FUNC2_CONFIG_OFFSET      0x600
-+#define  PCIE_FUNC3_CONFIG_OFFSET      0x700
-+#define  PCIE_SPROM_SHADOW_OFFSET      0x800
-+#define  PCIE_SBCONFIG_OFFSET          0xE00
-+
-+/* PCIE Bar0 Address Mapping. Each function maps 16KB config space */
-+#define PCIE_DEV_BAR0_SIZE             0x4000
-+#define PCIE_BAR0_WINMAPCORE_OFFSET    0x0
-+#define PCIE_BAR0_EXTSPROM_OFFSET      0x1000
-+#define PCIE_BAR0_PCIECORE_OFFSET      0x2000
-+#define PCIE_BAR0_CCCOREREG_OFFSET     0x3000
-+
-+/* SB side: PCIE core and host control registers */
-+typedef struct sbpcieregs {
-+       uint32 PAD[3];
-+       uint32 biststatus;      /* bist Status: 0x00C */
-+       uint32 PAD[6];
-+       uint32 sbtopcimailbox;  /* sb to pcie mailbox: 0x028 */
-+       uint32 PAD[54];
-+       uint32 sbtopcie0;       /* sb to pcie translation 0: 0x100 */
-+       uint32 sbtopcie1;       /* sb to pcie translation 1: 0x104 */
-+       uint32 sbtopcie2;       /* sb to pcie translation 2: 0x108 */
-+       uint32 PAD[4];
-+
-+       /* pcie core supports in direct access to config space */
-+       uint32 configaddr;      /* pcie config space access: Address field: 0x120 */
-+       uint32 configdata;      /* pcie config space access: Data field: 0x124 */
-+
-+       /* mdio access to serdes */
-+       uint32 mdiocontrol;     /* controls the mdio access: 0x128 */
-+       uint32 mdiodata;        /* Data to the mdio access: 0x12c */
-+
-+       /* pcie protocol phy/dllp/tlp register access mechanism */
-+       uint32 pcieaddr;        /* address of the internal registeru: 0x130 */
-+       uint32 pciedata;        /* Data to/from the internal regsiter: 0x134 */
-+
-+       uint32 PAD[434];
-+       uint16 sprom[36];       /* SPROM shadow Area */
-+} sbpcieregs_t;
-+
-+/* SB to PCIE translation masks */
-+#define SBTOPCIE0_MASK 0xfc000000
-+#define SBTOPCIE1_MASK 0xfc000000
-+#define SBTOPCIE2_MASK 0xc0000000
-+
-+/* Access type bits (0:1) */
-+#define SBTOPCIE_MEM   0
-+#define SBTOPCIE_IO    1
-+#define SBTOPCIE_CFG0  2
-+#define SBTOPCIE_CFG1  3
-+
-+/* Prefetch enable bit 2 */
-+#define SBTOPCIE_PF            4
-+
-+/* Write Burst enable for memory write bit 3 */
-+#define SBTOPCIE_WR_BURST      8
-+
-+/* config access */
-+#define CONFIGADDR_FUNC_MASK   0x7000
-+#define CONFIGADDR_FUNC_SHF    12
-+#define CONFIGADDR_REG_MASK    0x0FFF
-+#define CONFIGADDR_REG_SHF     0
-+
-+/* PCIE protocol regs Indirect Address */
-+#define PCIEADDR_PROT_MASK     0x300
-+#define PCIEADDR_PROT_SHF      8
-+#define PCIEADDR_PL_TLP                0
-+#define PCIEADDR_PL_DLLP       1
-+#define PCIEADDR_PL_PLP                2
-+
-+/* PCIE protocol PHY diagnostic registers */
-+#define        PCIE_PLP_MODEREG                0x200 /* Mode */
-+#define        PCIE_PLP_STATUSREG              0x204 /* Status */
-+#define PCIE_PLP_LTSSMCTRLREG          0x208 /* LTSSM control */
-+#define PCIE_PLP_LTLINKNUMREG          0x20c /* Link Training Link number */
-+#define PCIE_PLP_LTLANENUMREG          0x210 /* Link Training Lane number */
-+#define PCIE_PLP_LTNFTSREG             0x214 /* Link Training N_FTS */
-+#define PCIE_PLP_ATTNREG               0x218 /* Attention */
-+#define PCIE_PLP_ATTNMASKREG           0x21C /* Attention Mask */
-+#define PCIE_PLP_RXERRCTR              0x220 /* Rx Error */
-+#define PCIE_PLP_RXFRMERRCTR           0x224 /* Rx Framing Error */
-+#define PCIE_PLP_RXERRTHRESHREG                0x228 /* Rx Error threshold */
-+#define PCIE_PLP_TESTCTRLREG           0x22C /* Test Control reg */
-+#define PCIE_PLP_SERDESCTRLOVRDREG     0x230 /* SERDES Control Override */
-+#define PCIE_PLP_TIMINGOVRDREG         0x234 /* Timing param override */
-+#define PCIE_PLP_RXTXSMDIAGREG         0x238 /* RXTX State Machine Diag */
-+#define PCIE_PLP_LTSSMDIAGREG          0x23C /* LTSSM State Machine Diag */
-+
-+/* PCIE protocol DLLP diagnostic registers */
-+#define PCIE_DLLP_LCREG                        0x100 /* Link Control */
-+#define PCIE_DLLP_LSREG                        0x104 /* Link Status */
-+#define PCIE_DLLP_LAREG                        0x108 /* Link Attention */
-+#define PCIE_DLLP_LAMASKREG            0x10C /* Link Attention Mask */
-+#define PCIE_DLLP_NEXTTXSEQNUMREG      0x110 /* Next Tx Seq Num */
-+#define PCIE_DLLP_ACKEDTXSEQNUMREG     0x114 /* Acked Tx Seq Num */
-+#define PCIE_DLLP_PURGEDTXSEQNUMREG    0x118 /* Purged Tx Seq Num */
-+#define PCIE_DLLP_RXSEQNUMREG          0x11C /* Rx Sequence Number */
-+#define PCIE_DLLP_LRREG                        0x120 /* Link Replay */
-+#define PCIE_DLLP_LACKTOREG            0x124 /* Link Ack Timeout */
-+#define PCIE_DLLP_PMTHRESHREG          0x128 /* Power Management Threshold */
-+#define PCIE_DLLP_RTRYWPREG            0x12C /* Retry buffer write ptr */
-+#define PCIE_DLLP_RTRYRPREG            0x130 /* Retry buffer Read ptr */
-+#define PCIE_DLLP_RTRYPPREG            0x134 /* Retry buffer Purged ptr */
-+#define PCIE_DLLP_RTRRWREG             0x138 /* Retry buffer Read/Write */
-+#define PCIE_DLLP_ECTHRESHREG          0x13C /* Error Count Threshold */
-+#define PCIE_DLLP_TLPERRCTRREG         0x140 /* TLP Error Counter */
-+#define PCIE_DLLP_ERRCTRREG            0x144 /* Error Counter */
-+#define PCIE_DLLP_NAKRXCTRREG          0x148 /* NAK Received Counter */
-+#define PCIE_DLLP_TESTREG              0x14C /* Test */
-+#define PCIE_DLLP_PKTBIST              0x150 /* Packet BIST */
-+
-+/* PCIE protocol TLP diagnostic registers */
-+#define PCIE_TLP_CONFIGREG             0x000 /* Configuration */
-+#define PCIE_TLP_WORKAROUNDSREG                0x004 /* TLP Workarounds */
-+#define PCIE_TLP_WRDMAUPPER            0x010 /* Write DMA Upper Address */
-+#define PCIE_TLP_WRDMALOWER            0x014 /* Write DMA Lower Address */
-+#define PCIE_TLP_WRDMAREQ_LBEREG       0x018 /* Write DMA Len/ByteEn Req */
-+#define PCIE_TLP_RDDMAUPPER            0x01C /* Read DMA Upper Address */
-+#define PCIE_TLP_RDDMALOWER            0x020 /* Read DMA Lower Address */
-+#define PCIE_TLP_RDDMALENREG           0x024 /* Read DMA Len Req */
-+#define PCIE_TLP_MSIDMAUPPER           0x028 /* MSI DMA Upper Address */
-+#define PCIE_TLP_MSIDMALOWER           0x02C /* MSI DMA Lower Address */
-+#define PCIE_TLP_MSIDMALENREG          0x030 /* MSI DMA Len Req */
-+#define PCIE_TLP_SLVREQLENREG          0x034 /* Slave Request Len */
-+#define PCIE_TLP_FCINPUTSREQ           0x038 /* Flow Control Inputs */
-+#define PCIE_TLP_TXSMGRSREQ            0x03C /* Tx StateMachine and Gated Req */
-+#define PCIE_TLP_ADRACKCNTARBLEN       0x040 /* Address Ack XferCnt and ARB Len */
-+#define PCIE_TLP_DMACPLHDR0            0x044 /* DMA Completion Hdr 0 */
-+#define PCIE_TLP_DMACPLHDR1            0x048 /* DMA Completion Hdr 1 */
-+#define PCIE_TLP_DMACPLHDR2            0x04C /* DMA Completion Hdr 2 */
-+#define PCIE_TLP_DMACPLMISC0           0x050 /* DMA Completion Misc0 */
-+#define PCIE_TLP_DMACPLMISC1           0x054 /* DMA Completion Misc1 */
-+#define PCIE_TLP_DMACPLMISC2           0x058 /* DMA Completion Misc2 */
-+#define PCIE_TLP_SPTCTRLLEN            0x05C /* Split Controller Req len */
-+#define PCIE_TLP_SPTCTRLMSIC0          0x060 /* Split Controller Misc 0 */
-+#define PCIE_TLP_SPTCTRLMSIC1          0x064 /* Split Controller Misc 1 */
-+#define PCIE_TLP_BUSDEVFUNC            0x068 /* Bus/Device/Func */
-+#define PCIE_TLP_RESETCTR              0x06C /* Reset Counter */
-+#define PCIE_TLP_RTRYBUF               0x070 /* Retry Buffer value */
-+#define PCIE_TLP_TGTDEBUG1             0x074 /* Target Debug Reg1 */
-+#define PCIE_TLP_TGTDEBUG2             0x078 /* Target Debug Reg2 */
-+#define PCIE_TLP_TGTDEBUG3             0x07C /* Target Debug Reg3 */
-+#define PCIE_TLP_TGTDEBUG4             0x080 /* Target Debug Reg4 */
-+
-+/* MDIO control */
-+#define MDIOCTL_DIVISOR_MASK           0x7f    /* clock to be used on MDIO */
-+#define MDIOCTL_DIVISOR_VAL            0x2
-+#define MDIOCTL_PREAM_EN               0x80    /* Enable preamble sequnce */
-+#define MDIOCTL_ACCESS_DONE            0x100   /* Tranaction complete */
-+
-+/* MDIO Data */
-+#define MDIODATA_MASK                  0x0000ffff      /* data 2 bytes */
-+#define MDIODATA_TA                    0x00020000      /* Turnaround */
-+#define MDIODATA_REGADDR_SHF           18              /* Regaddr shift */
-+#define MDIODATA_REGADDR_MASK          0x003c0000      /* Regaddr Mask */
-+#define MDIODATA_DEVADDR_SHF           22              /* Physmedia devaddr shift */
-+#define MDIODATA_DEVADDR_MASK          0x0fc00000      /* Physmedia devaddr Mask */
-+#define MDIODATA_WRITE                 0x10000000      /* write Transaction */
-+#define MDIODATA_READ                  0x20000000      /* Read Transaction */
-+#define MDIODATA_START                 0x40000000      /* start of Transaction */
-+
-+/* MDIO devices (SERDES modules) */
-+#define MDIODATA_DEV_PLL                       0x1d    /* SERDES PLL Dev */
-+#define MDIODATA_DEV_TX                        0x1e    /* SERDES TX Dev */
-+#define MDIODATA_DEV_RX                        0x1f    /* SERDES RX Dev */
-+
-+/* SERDES registers */
-+#define SERDES_RX_TIMER1               2       /* Rx Timer1 */
-+#define SERDES_RX_CDR                  6       /* CDR */
-+#define SERDES_RX_CDRBW                        7       /* CDR BW */
-+
-+#endif /* _SBPCIE_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbpcmcia.h linux.dev/arch/mips/bcm947xx/include/sbpcmcia.h
---- linux.old/arch/mips/bcm947xx/include/sbpcmcia.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbpcmcia.h     2006-04-27 20:29:47.000000000 +0200
-@@ -0,0 +1,147 @@
++/* 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.4.32/arch/mips/bcm947xx/include/sbpcmcia.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbpcmcia.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbpcmcia.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbpcmcia.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,139 @@
 +/*
 + * BCM43XX Sonics SiliconBackplane PCMCIA core hardware definitions.
 + *
-+ * Copyright 2006, 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: sbpcmcia.h,v 1.1.1.9 2006/02/27 03:43:16 honor Exp $
++ * $Id$
++ * Copyright 2005, 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.      
 + */
 +
@@ -7829 +4736 @@
 +/* Subtypes of BRCM_HNBU: */
 +
-+#define HNBU_SROMREV           0x00            /* A byte with sromrev, 1 if not present */
-+#define HNBU_CHIPID            0x01            /* Two 16bit values: PCI vendor & device id */
-+#define HNBU_BOARDREV          0x02            /* One byte board revision */
-+#define HNBU_PAPARMS           0x03            /* PA parameters: 8 (sromrev == 1)
-+                                                * or 9 (sromrev > 1) bytes
++#define        HNBU_CHIPID             0x01            /* Six bytes with PCI vendor &
++                                                * device id and chiprev
 +                                                */
-+#define HNBU_OEM               0x04            /* Eight bytes OEM data (sromrev == 1) */
-+#define HNBU_CC                        0x05            /* Default country code (sromrev == 1) */
++#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 (2 or 4 bytes) */
-+#define HNBU_LEDS              0x09            /* LED set */
-+#define HNBU_CCODE             0x0a            /* Country code (2 bytes ascii + 1 byte cctl)
-+                                                * in rev 2
-+                                                */
-+#define HNBU_CCKPO             0x0b            /* 2 byte cck power offsets in rev 3 */
-+#define HNBU_OFDMPO            0x0c            /* 4 byte 11g ofdm power offsets in rev 3 */
-+#define HNBU_GPIOTIMER         0x0d            /* 2 bytes with on/off values in rev 3 */
++#define HNBU_BOARDFLAGS                0x08            /* board flags */
++#define HNBU_LED               0x09            /* LED set */
 +
 +
@@ -7857 +4757 @@
 +
 +#endif /* _SBPCMCIA_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm947xx/include/sbsdram.h
---- linux.old/arch/mips/bcm947xx/include/sbsdram.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h      2006-04-27 20:36:08.000000000 +0200
-@@ -0,0 +1,85 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbsdram.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbsdram.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbsdram.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbsdram.h   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,75 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane SDRAM controller core hardware definitions.
 + *
-+ * Copyright 2006, 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: sbsdram.h,v 1.1.1.9 2006/03/02 13:03:52 honor Exp $
++ * Copyright 2005, 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$
 + */
 +
@@ -7889 +4788 @@
 +} sbsdramregs_t;
 +
-+/* SDRAM simulation */
-+#ifdef RAMSZ
-+#define        SDRAMSZ         RAMSZ
-+#else
-+#define SDRAMSZ                (4 * 1024 * 1024)
 +#endif
-+
-+extern uchar sdrambuf[SDRAMSZ];
-+
-+#endif /* _LANGUAGE_ASSEMBLY */
 +
 +/* SDRAM initialization control (initcontrol) register bits */
@@ -7946 +4836 @@
 +
 +#endif /* _SBSDRAM_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbsocram.h linux.dev/arch/mips/bcm947xx/include/sbsocram.h
---- linux.old/arch/mips/bcm947xx/include/sbsocram.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbsocram.h     2006-04-27 22:13:19.000000000 +0200
-@@ -0,0 +1,64 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbsocram.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbsocram.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbsocram.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbsocram.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,37 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane embedded ram core
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, 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        _SBSOCRAM_H
++#define        _SBSOCRAM_H
++
++#define        SOCRAM_MEMSIZE          0x00
++#define        SOCRAM_BISTSTAT         0x0c
++
++
++#ifndef _LANGUAGE_ASSEMBLY
++
++/* Memcsocram core registers */
++typedef volatile struct sbsocramregs {
++       uint32  memsize;
++       uint32  biststat;
++} sbsocramregs_t;
++
++#endif
++
++/* Them memory size is 2 to the power of the following
++ * base added to the contents of the memsize register.
++ */
++#define SOCRAM_MEMSIZE_BASESHIFT 16
++
++#endif /* _SBSOCRAM_H */
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sbutils.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbutils.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sbutils.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sbutils.h   2006-07-04 09:37:18.000000000 +0200
+@@ -0,0 +1,91 @@
++/*
++ * Misc utility routines for accessing chip-specific features
++ * of Broadcom HNBU SiliconBackplane-based chips.
++ *
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -7961 +4893 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: sbsocram.h,v 1.1.1.3 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#ifndef        _SBSOCRAM_H
-+#define        _SBSOCRAM_H
-+
-+#define        SR_COREINFO             0x00
-+#define        SR_BWALLOC              0x04
-+#define        SR_BISTSTAT             0x0c
-+#define        SR_BANKINDEX            0x10
-+#define        SR_BANKSTBYCTL          0x14
-+
-+
-+#ifndef _LANGUAGE_ASSEMBLY
-+
-+/* Memcsocram core registers */
-+typedef volatile struct sbsocramregs {
-+       uint32  coreinfo;
-+       uint32  bwalloc;
-+       uint32  PAD;
-+       uint32  biststat;
-+       uint32  bankidx;
-+       uint32  standbyctrl;
-+} sbsocramregs_t;
-+
-+#endif
-+
-+/* Coreinfo register */
-+#define        SRCI_PT_MASK            0x30000
-+#define        SRCI_PT_SHIFT           16
-+
-+/* In corerev 0, the memory size is 2 to the power of the
-+ * base plus 16 plus to the contents of the memsize field plus 1.
-+ */
-+#define        SRCI_MS0_MASK           0xf
-+#define SR_MS0_BASE            16
-+
-+/*
-+ * In corerev 1 the bank size is 2 ^ the bank size field plus 14,
-+ * the memory size is number of banks times bank size.
-+ * The same applies to rom size.
-+ */
-+#define        SRCI_ROMNB_MASK         0xf000
-+#define        SRCI_ROMNB_SHIFT        12
-+#define        SRCI_ROMBSZ_MASK        0xf00
-+#define        SRCI_ROMBSZ_SHIFT       8
-+#define        SRCI_SRNB_MASK          0xf0
-+#define        SRCI_SRNB_SHIFT         4
-+#define        SRCI_SRBSZ_MASK         0xf
-+#define        SRCI_SRBSZ_SHIFT        0
-+
-+#define SR_BSZ_BASE            14
-+#endif /* _SBSOCRAM_H */
-diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm947xx/include/sbutils.h
---- linux.old/arch/mips/bcm947xx/include/sbutils.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbutils.h      2006-04-27 23:09:25.000000000 +0200
-@@ -0,0 +1,150 @@
-+/*
-+ * Misc utility routines for accessing chip-specific features
-+ * of Broadcom HNBU SiliconBackplane-based chips.
-+ *
-+ * Copyright 2006, 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.h,v 1.4 2006/04/08 07:12:42 honor Exp $
++ * $Id$
 + */
 +
 +#ifndef        _sbutils_h_
 +#define        _sbutils_h_
-+
-+/* 
-+ * Datastructure to export all chip specific common variables
-+ * public (read-only) portion of sbutils handle returned by
-+ * sb_attach()/sb_kattach()
-+*/
-+
-+struct sb_pub {
-+
-+       uint    bustype;                /* SB_BUS, PCI_BUS  */
-+       uint    buscoretype;            /* SB_PCI, SB_PCMCIA, SB_PCIE */
-+       uint    buscorerev;             /* buscore rev */
-+       uint    buscoreidx;             /* buscore index */
-+       int     ccrev;                  /* chip common core rev */
-+       uint    boardtype;              /* board type */
-+       uint    boardvendor;            /* board vendor */
-+       uint    chip;                   /* chip number */
-+       uint    chiprev;                /* chip revision */
-+       uint    chippkg;                /* chip package option */
-+       uint    sonicsrev;              /* sonics backplane rev */
-+};
-+
-+typedef const struct sb_pub  sb_t;
 +
 +/*
@@ -8067 +4907 @@
 + */
 +
-+#define        SB_OSH          NULL    /* Use for sb_kattach when no osh is available */
 +/* exported externs */
-+extern sb_t *sb_attach(uint pcidev, osl_t *osh, void *regs, uint bustype,
-+                       void *sdh, char **vars, uint *varsz);
-+extern sb_t *sb_kattach(void);
-+extern void sb_detach(sb_t *sbh);
-+extern uint sb_chip(sb_t *sbh);
-+extern uint sb_chiprev(sb_t *sbh);
-+extern uint sb_chipcrev(sb_t *sbh);
-+extern uint sb_chippkg(sb_t *sbh);
-+extern uint sb_pcirev(sb_t *sbh);
-+extern bool sb_war16165(sb_t *sbh);
-+extern uint sb_pcmciarev(sb_t *sbh);
-+extern uint sb_boardvendor(sb_t *sbh);
-+extern uint sb_boardtype(sb_t *sbh);
-+extern uint sb_bus(sb_t *sbh);
-+extern uint sb_buscoretype(sb_t *sbh);
-+extern uint sb_buscorerev(sb_t *sbh);
-+extern uint sb_corelist(sb_t *sbh, uint coreid[]);
-+extern uint sb_coreid(sb_t *sbh);
-+extern uint sb_coreidx(sb_t *sbh);
-+extern uint sb_coreunit(sb_t *sbh);
-+extern uint sb_corevendor(sb_t *sbh);
-+extern uint sb_corerev(sb_t *sbh);
-+extern void *sb_osh(sb_t *sbh);
-+extern void sb_setosh(sb_t *sbh, osl_t *osh);
-+extern void *sb_coreregs(sb_t *sbh);
-+extern uint32 sb_coreflags(sb_t *sbh, uint32 mask, uint32 val);
-+extern uint32 sb_coreflagshi(sb_t *sbh, uint32 mask, uint32 val);
-+extern bool sb_iscoreup(sb_t *sbh);
-+extern void *sb_setcoreidx(sb_t *sbh, uint coreidx);
-+extern void *sb_setcore(sb_t *sbh, uint coreid, uint coreunit);
-+extern int sb_corebist(sb_t *sbh);
-+extern void sb_commit(sb_t *sbh);
++extern void * BCMINIT(sb_attach)(uint pcidev, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz);
++extern void * BCMINIT(sb_kattach)(void);
++extern void sb_detach(void *sbh);
++extern uint BCMINIT(sb_chip)(void *sbh);
++extern uint BCMINIT(sb_chiprev)(void *sbh);
++extern uint BCMINIT(sb_chipcrev)(void *sbh);
++extern uint BCMINIT(sb_chippkg)(void *sbh);
++extern uint BCMINIT(sb_pcirev)(void *sbh);
++extern uint BCMINIT(sb_pcmciarev)(void *sbh);
++extern uint BCMINIT(sb_boardvendor)(void *sbh);
++extern uint BCMINIT(sb_boardtype)(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_osh(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(sb_t *sbh, uint32 bits, uint32 resetbits);
-+extern void sb_core_tofixup(sb_t *sbh);
-+extern void sb_core_disable(sb_t *sbh, uint32 bits);
++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(sb_t *sbh);
-+extern void sb_pci_setup(sb_t *sbh, uint coremask);
-+extern void sb_pcmcia_init(sb_t *sbh);
-+extern void sb_watchdog(sb_t *sbh, uint ticks);
-+extern void *sb_gpiosetcore(sb_t *sbh);
-+extern uint32 sb_gpiocontrol(sb_t *sbh, uint32 mask, uint32 val, uint8 priority);
-+extern uint32 sb_gpioouten(sb_t *sbh, uint32 mask, uint32 val, uint8 priority);
-+extern uint32 sb_gpioout(sb_t *sbh, uint32 mask, uint32 val, uint8 priority);
-+extern uint32 sb_gpioin(sb_t *sbh);
-+extern uint32 sb_gpiointpolarity(sb_t *sbh, uint32 mask, uint32 val, uint8 priority);
-+extern uint32 sb_gpiointmask(sb_t *sbh, uint32 mask, uint32 val, uint8 priority);
-+extern uint32 sb_gpioled(sb_t *sbh, uint32 mask, uint32 val);
-+extern uint32 sb_gpioreserve(sb_t *sbh, uint32 gpio_num, uint8 priority);
-+extern uint32 sb_gpiorelease(sb_t *sbh, uint32 gpio_num, uint8 priority);
-+
-+extern void sb_clkctl_init(sb_t *sbh);
-+extern uint16 sb_clkctl_fast_pwrup_delay(sb_t *sbh);
-+extern bool sb_clkctl_clk(sb_t *sbh, uint mode);
-+extern int sb_clkctl_xtal(sb_t *sbh, uint what, bool on);
-+extern void sb_register_intr_callback(sb_t *sbh, void *intrsoff_fn, void *intrsrestore_fn,
-+                                      void *intrsenabled_fn, void *intr_arg);
-+extern uint32 sb_set_initiator_to(sb_t *sbh, uint32 to);
-+extern int sb_corepciid(sb_t *sbh, uint func, uint16 *pcivendor, uint16 *pcidevice,
-+                        uint8 *pciclass, uint8 *pcisubclass, uint8 *pciprogif,
-+                        uint8 *pciheader);
-+extern uint sb_pcie_readreg(void *sbh, void* arg1, uint offset);
-+extern uint sb_pcie_writereg(sb_t *sbh, void *arg1,  uint offset, uint val);
-+extern uint32 sb_gpiotimerval(sb_t *sbh, uint32 mask, uint32 val);
-+extern bool sb_backplane64(sb_t *sbh);
-+extern void sb_btcgpiowar(sb_t *sbh);
-+
-+
-+
-+
-+extern bool sb_deviceremoved(sb_t *sbh);
-+extern uint32 sb_socram_size(sb_t *sbh);
-+
-+/*
-+* Build device path. Path size must be >= SB_DEVPATH_BUFSZ.
-+* The returned path is NULL terminated and has trailing '/'.
-+* Return 0 on success, nonzero otherwise.
-+*/
-+extern int sb_devpath(sb_t *sbh, char *path, int size);
-+
-+/* clkctl xtal what flags */
-+#define        XTAL                    0x1             /* primary crystal oscillator (2050) */
-+#define        PLL                     0x2             /* main chip pll */
-+
-+/* clkctl clk mode */
-+#define        CLK_FAST                0               /* force fast (pll) clock */
-+#define        CLK_DYNAMIC             2               /* enable dynamic clock control */
-+
++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 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 int sb_pwrctl_slowclk(void *sbh, bool set, uint *div);
++extern void sb_register_intr_callback(void *sbh, void *intrsoff_fn, void *intrsrestore_fn, void *intrsenabled_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 */
 +
 +/* GPIO usage priorities */
-+#define GPIO_DRV_PRIORITY      0               /* Driver */
-+#define GPIO_APP_PRIORITY      1               /* Application */
-+
-+/* device path */
-+#define SB_DEVPATH_BUFSZ       16              /* min buffer size in bytes */
++#define GPIO_DRV_PRIORITY      0               /* Driver */
++#define GPIO_APP_PRIORITY      1               /* Application */
 +
 +#endif /* _sbutils_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm947xx/include/sflash.h
---- linux.old/arch/mips/bcm947xx/include/sflash.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sflash.h       2006-04-27 22:13:51.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/sflash.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sflash.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/sflash.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/sflash.h    2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Broadcom SiliconBackplane chipcommon serial flash interface
 + *
-+ * Copyright 2006, 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.
++ * Copyright 2005, 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: sflash.h,v 1.1.1.8 2006/02/27 03:43:16 honor Exp $
++ * $Id$
 + */
 +
@@ -8208 +5012 @@
 +
 +#endif /* _sflash_h_ */
-diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm947xx/include/trxhdr.h
---- linux.old/arch/mips/bcm947xx/include/trxhdr.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h       2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/trxhdr.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/trxhdr.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/trxhdr.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/trxhdr.h    2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,33 @@
 +/*
@@ -8245 +5049 @@
 +/* Compatibility */
 +typedef struct trx_header TRXHDR, *PTRXHDR;
-diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bcm947xx/include/typedefs.h
---- linux.old/arch/mips/bcm947xx/include/typedefs.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/typedefs.h     2006-04-27 23:47:30.000000000 +0200
-@@ -0,0 +1,361 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/include/typedefs.h linux-2.4.32-freewrt/arch/mips/bcm947xx/include/typedefs.h
+--- linux-2.4.32/arch/mips/bcm947xx/include/typedefs.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/include/typedefs.h  2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,322 @@
 +/*
-+ * Copyright 2006, 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: typedefs.h,v 1.1.1.12 2006/04/08 06:13:40 honor Exp $
++ * Copyright 2005, 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$
 + */
 +
@@ -8279 +5083 @@
 +#ifdef SITE_TYPEDEFS
 +
-+/*
++/*******************************************************************************
 + * Site Specific Typedefs
-+ *
-+ */
++ *******************************************************************************/
 +
 +#include "site_typedefs.h"
@@ -8288 +5091 @@
 +#else
 +
-+/*
++/*******************************************************************************
 + * Inferred Typedefs
-+ *
-+ */
++ *******************************************************************************/
 +
 +/* Infer the compile environment based on preprocessor symbols and pramas.
@@ -8326 +5128 @@
 +#endif
 +
-+
-+#if defined(_MINOSL_)
-+#define _NEED_SIZE_T_
-+#endif
-+
-+#if defined(_NEED_SIZE_T_)
-+typedef long unsigned int size_t;
-+#endif
-+
-+#ifdef __DJGPP__
-+typedef long unsigned int size_t;
-+#endif /* __DJGPP__ */
-+
 +#ifdef _MSC_VER            /* Microsoft C */
 +#define TYPEDEF_INT64
@@ -8346 +5135 @@
 +#endif
 +
-+#if defined(MACOSX)
++#if defined(MACOSX) && defined(KERNEL)
 +#define TYPEDEF_BOOL
-+#endif
-+
-+#if defined(__NetBSD__)
-+#define TYPEDEF_ULONG
 +#endif
 +
@@ -8361 +5146 @@
 +#endif
 +
-+#if !defined(linux) && !defined(_WIN32) && !defined(_CFE_) && \
-+       !defined(_HNDRTE_) && !defined(_MINOSL_) && !defined(__DJGPP__)
++#if !defined(linux) && !defined(_WIN32) && !defined(PMON) && !defined(_CFE_) && !defined(_HNDRTE_) && !defined(_MINOSL_)
 +#define TYPEDEF_UINT
 +#define TYPEDEF_USHORT
@@ -8375 +5159 @@
 +
 +/* ICL accepts unsigned 64 bit type only, and complains in ANSI mode
-+ * for singned or unsigned
-+ */
++ * for singned or unsigned */
 +#if defined(__ICL)
 +
@@ -8387 +5170 @@
 +#endif /* __ICL */
 +
-+#if !defined(_WIN32) && !defined(_CFE_) && !defined(_MINOSL_) && \
-+       !defined(__DJGPP__)
++
++#if !defined(_WIN32) && !defined(PMON) && !defined(_CFE_) && !defined(_HNDRTE_) && !defined(_MINOSL_)
 +
 +/* pick up ushort & uint from standard types.h */
@@ -8397 +5180 @@
 +#else
 +
-+#include <sys/types.h>
++#include <sys/types.h> 
 +
 +#endif
 +
-+#endif /* !_WIN32 && !PMON && !_CFE_ && !_HNDRTE_  && !_MINOSL_ && !__DJGPP__ */
-+
-+#if defined(MACOSX)
-+
-+#ifdef __BIG_ENDIAN__
-+#define IL_BIGENDIAN
-+#else
-+#ifdef IL_BIGENDIAN
-+#error "IL_BIGENDIAN was defined for a little-endian compile"
++#endif /* !_WIN32 && !PMON && !_CFE_ && !_HNDRTE_  && !_MINOSL_ */
++
++#if defined(MACOSX) && defined(KERNEL)
++#include <IOKit/IOTypes.h>
 +#endif
-+#endif /* __BIG_ENDIAN__ */
-+
-+#if !defined(__cplusplus)
-+
-+#if defined(__i386__)
-+typedef unsigned char bool;
-+#else
-+typedef unsigned int bool;
-+#endif
-+#define TYPE_BOOL 1
-+enum {
-+    false      = 0,
-+    true       = 1
-+};
-+
-+#if defined(KERNEL)
-+#include <IOKit/IOTypes.h>
-+#endif /* KERNEL */
-+
-+#endif /* __cplusplus */
-+
-+#endif /* MACOSX */
 +
 +
@@ -8441 +5197 @@
 +
 +
-+/*
++/*******************************************************************************
 + * Default Typedefs
-+ *
-+ */
++ *******************************************************************************/
 +
 +#ifdef USE_TYPEDEF_DEFAULTS
@@ -8450 +5205 @@
 +
 +#ifndef TYPEDEF_BOOL
-+typedef        /* @abstract@ */ unsigned char  bool;
++typedef        /*@abstract@*/ unsigned char    bool;
 +#endif
 +
-+/* define uchar, ushort, uint, ulong */
++/*----------------------- define uchar, ushort, uint, ulong ------------------*/
 +
 +#ifndef TYPEDEF_UCHAR
@@ -8471 +5226 @@
 +#endif
 +
-+/* define [u]int8/16/32/64, uintptr */
++/*----------------------- define [u]int8/16/32/64, uintptr --------------------*/
 +
 +#ifndef TYPEDEF_UINT8
@@ -8509 +5264 @@
 +#endif
 +
-+/* define float32/64, float_t */
++/*----------------------- define float32/64, float_t -----------------------*/
 +
 +#ifndef TYPEDEF_FLOAT32
@@ -8535 +5290 @@
 +#endif /* TYPEDEF_FLOAT_T */
 +
-+/* define macro values */
++/*----------------------- define macro values -----------------------------*/
 +
 +#ifndef FALSE
@@ -8542 +5297 @@
 +
 +#ifndef TRUE
-+#define TRUE   1  /* TRUE */
++#define TRUE   1
 +#endif
 +
@@ -8554 +5309 @@
 +
 +#ifndef ON
-+#define        ON      1  /* ON = 1 */
++#define        ON      1
 +#endif
 +
-+#define        AUTO    (-1) /* Auto = -1 */
-+
-+/* define PTRSZ, INLINE */
++#define        AUTO    (-1)
++
++/* Reclaiming text and data :
++   The following macros specify special linker sections that can be reclaimed
++   after a system is considered 'up'.
++ */ 
++#if defined(__GNUC__) && defined(BCMRECLAIM)
++extern bool    bcmreclaimed;
++#define BCMINITDATA(_data)     __attribute__ ((__section__ (".dataini." #_data))) _data##_ini          
++#define BCMINITFN(_fn)         __attribute__ ((__section__ (".textini." #_fn))) _fn##_ini
++#define BCMINIT(_id)           _id##_ini
++#else 
++#define BCMINITDATA(_data)     _data           
++#define BCMINITFN(_fn)         _fn
++#define BCMINIT(_id)           _id
++#define bcmreclaimed           0
++#endif
++
++/*----------------------- define PTRSZ, INLINE ----------------------------*/
 +
 +#ifndef PTRSZ
-+#define        PTRSZ   sizeof(char*)
++#define        PTRSZ   sizeof (char*)
 +#endif
 +
@@ -8603 +5374 @@
 +#endif /* USE_TYPEDEF_DEFAULTS */
 +
-+/* 
-+ * Including the bcmdefs.h here, to make sure everyone including typedefs.h 
-+ * gets this automatically 
-+*/
-+#include "bcmdefs.h"
-+
 +#endif /* _TYPEDEFS_H_ */
-diff -urN linux.old/arch/mips/bcm947xx/nvram.c linux.dev/arch/mips/bcm947xx/nvram.c
---- linux.old/arch/mips/bcm947xx/nvram.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/nvram.c        2006-04-27 23:11:58.000000000 +0200
-@@ -0,0 +1,315 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/nvram.c linux-2.4.32-freewrt/arch/mips/bcm947xx/nvram.c
+--- linux-2.4.32/arch/mips/bcm947xx/nvram.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/nvram.c     2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,321 @@
 +/*
 + * NVRAM variable manipulation (common)
@@ -8625 +5390 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
++ * $Id$
 + */
 +
@@ -8910 +5676 @@
 +       struct nvram_header *header;
 +       int ret;
-+
-+       if (!(header = (struct nvram_header *) kmalloc(NVRAM_SPACE, GFP_ATOMIC))) {
++       void *osh;
++
++       /* get kernel osl handler */
++       osh = osl_attach(NULL);
++
++       if (!(header = (struct nvram_header *) MALLOC(osh, NVRAM_SPACE))) {
++               printf("nvram_init: out of memory, malloced %d bytes\n", MALLOCED(osh));
 +               return -12; /* -ENOMEM */
 +       }
@@ -8919 +5690 @@
 +               BCMINIT(nvram_rehash)(header);
 +
-+       kfree(header);
++       MFREE(osh, header, NVRAM_SPACE);
 +       return ret;
 +}
@@ -8929 +5700 @@
 +       BCMINIT(nvram_free)();
 +}
-diff -urN linux.old/arch/mips/bcm947xx/nvram_linux.c linux.dev/arch/mips/bcm947xx/nvram_linux.c
---- linux.old/arch/mips/bcm947xx/nvram_linux.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/nvram_linux.c  2006-04-27 23:30:07.000000000 +0200
-@@ -0,0 +1,723 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/nvram_linux.c linux-2.4.32-freewrt/arch/mips/bcm947xx/nvram_linux.c
+--- linux-2.4.32/arch/mips/bcm947xx/nvram_linux.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/nvram_linux.c       2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,617 @@
 +/*
 + * NVRAM variable manipulation (Linux kernel half)
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -8944 +5715 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: nvram_linux.c,v 1.19 2006/04/08 07:12:42 honor Exp $
++ * $Id$
 + */
 +
@@ -8965 +5736 @@
 +
 +#include <typedefs.h>
-+#include <osl.h>
 +#include <bcmendian.h>
 +#include <bcmnvram.h>
@@ -8972 +5742 @@
 +#include <sbchipc.h>
 +#include <sbutils.h>
-+#include <hndmips.h>
-+#include <sflash.h>
++#include <sbmips.h>
 +
 +/* In BSS to minimize text size and page aligned so it can be mmap()-ed */
@@ -8987 +5756 @@
 +extern void *bcm947xx_sbh;
 +extern spinlock_t bcm947xx_sbh_lock;
-+
-+static int cfe_env;
-+extern char *cfe_env_get(char *nv_buf, const char *name);
 +
 +/* Convenience */
@@ -9003 +5769 @@
 +       struct nvram_header *header;
 +       chipcregs_t *cc;
-+       struct sflash *info = NULL;
 +       int i;
 +       uint32 base, off, lim;
-+       u32 *src, *dst;
 +
 +       if ((cc = sb_setcore(sbh, SB_CC, 0)) != NULL) {
@@ -9017 +5781 @@
 +               case SFLASH_ST:
 +               case SFLASH_AT:
-+                       if ((info = sflash_init(cc)) == NULL)
-+                               return;
-+                       lim = info->size;
-+                       break;
-+
 +               case FLASH_NONE:
 +               default:
@@ -9032 +5791 @@
 +       }
 +
-+       /* XXX: hack for supporting the CFE environment stuff on WGT634U */
-+       src = (u32 *) KSEG1ADDR(base + 8 * 1024 * 1024 - 0x2000);
-+       dst = (u32 *) nvram_buf;
-+       if ((lim == 0x02000000) && ((*src & 0xff00ff) == 0x000001)) {
-+               printk("early_nvram_init: WGT634U NVRAM found.\n");
-+
-+               for (i = 0; i < 0x1ff0; i++) {
-+                       if (*src == 0xFFFFFFFF)
-+                               break;
-+                       *dst++ = *src++;
-+               }
-+               cfe_env = 1;
-+               return;
-+       }
-+
 +       off = FLASH_MIN;
 +       while (off <= lim) {
 +               /* Windowed flash access */
 +               header = (struct nvram_header *) KSEG1ADDR(base + off - NVRAM_SPACE);
-+               if (header->magic == NVRAM_MAGIC)
-+                       goto found;
-+               off <<= 1;
-+       }
-+
-+       /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
-+       header = (struct nvram_header *) KSEG1ADDR(base + 4 KB);
-+       if (header->magic == NVRAM_MAGIC)
-+               goto found;
-+       
-+       header = (struct nvram_header *) KSEG1ADDR(base + 1 KB);
-+       if (header->magic == NVRAM_MAGIC)
-+               goto found;
-+       
-+       printk("early_nvram_init: NVRAM not found\n");
-+       return;
-+
-+found:
-+       src = (u32 *) header;
-+       dst = (u32 *) nvram_buf;
-+       for (i = 0; i < sizeof(struct nvram_header); i += 4)
-+               *dst++ = *src++;
-+       for (; i < header->len && i < NVRAM_SPACE; i += 4)
-+               *dst++ = ltoh32(*src++);
++               if (header->magic == NVRAM_MAGIC) {
++                       u32 *src = (u32 *) header;
++                       u32 *dst = (u32 *) nvram_buf;
++                       for (i = 0; i < sizeof(struct nvram_header); i += 4)
++                               *dst++ = *src++;
++                       for (; i < header->len && i < NVRAM_SPACE; i += 4)
++                               *dst++ = ltoh32(*src++);
++                       return;
++               }
++
++               /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
++               if (off == 1 KB)
++                       break;
++               else if (off == 4 KB)
++                       off = 1 KB;
++               else if (off == lim)
++                       off = 4 KB;
++               else
++                       off <<= 1;
++       }
 +}
 +
@@ -9086 +5826 @@
 +               return NULL;
 +
-+       /* Too early? */
-+       if (sbh == NULL)
-+               return NULL;
-+
 +       if (!nvram_buf[0])
 +               early_nvram_init();
-+
-+       if (cfe_env)
-+               return cfe_env_get(nvram_buf, name);
 +
 +       /* Look for name=value and return value */
@@ -9111 +5844 @@
 +}
 +
-+static int __init
-+early_nvram_getall(char *buf, int count)
-+{
-+       char *var, *end;
-+       int len = 0;
-+       
-+       /* Too early? */
-+       if (sbh == NULL)
-+               return -1;
-+
-+       if (!nvram_buf[0])
-+               early_nvram_init();
-+
-+       bzero(buf, count);
-+
-+       /* Write name=value\0 ... \0\0 */
-+       var = &nvram_buf[sizeof(struct nvram_header)];
-+       end = nvram_buf + sizeof(nvram_buf) - 2;
-+       end[0] = end[1] = '\0';
-+       for (; *var; var += strlen(var) + 1) {
-+               if ((count - len) <= (strlen(var) + 1))
-+                       break;
-+               len += sprintf(buf + len, "%s", var) + 1;
-+       }
-+
-+       return 0;
-+}
 +#endif /* !MODULE */
 +
@@ -9145 +5851 @@
 +extern int _nvram_getall(char *buf, int count);
 +extern int _nvram_commit(struct nvram_header *header);
-+extern int _nvram_init(void *sbh);
++extern int _nvram_init(void);
 +extern void _nvram_exit(void);
 +
@@ -9276 +5982 @@
 +{
 +       char *buf;
-+       size_t erasesize, len, magic_len;
++       size_t erasesize, len;
 +       unsigned int i;
 +       int ret;
@@ -9285 +5991 @@
 +       wait_queue_head_t wait_q;
 +       struct erase_info erase;
-+       u_int32_t magic_offset = 0; /* Offset for writing MAGIC # */
 +
 +       if (!nvram_mtd) {
@@ -9316 +6021 @@
 +               }
 +               header = (struct nvram_header *)(buf + i);
-+               magic_offset = i + ((void *)&header->magic - (void *)header);
 +       } else {
 +               offset = nvram_mtd->size - NVRAM_SPACE;
-+               magic_offset = ((void *)&header->magic - (void *)header);
 +               header = (struct nvram_header *)buf;
 +       }
 +
-+       /* clear the existing magic # to mark the NVRAM as unusable 
-+                we can pull MAGIC bits low without erase       */
-+       header->magic = NVRAM_CLEAR_MAGIC; /* All zeros magic */
-+
-+       /* Unlock sector blocks (for Intel 28F320C3B flash) , 20060309 */
-+       if(nvram_mtd->unlock)
-+               nvram_mtd->unlock(nvram_mtd, offset, nvram_mtd->erasesize);
-+
-+       ret = MTD_WRITE(nvram_mtd, offset + magic_offset, sizeof(header->magic), 
-+                                                                       &magic_len, (char *)&header->magic);
-+       if (ret || magic_len != sizeof(header->magic)) {
-+               printk("nvram_commit: clear MAGIC error\n");
-+               ret = -EIO;
-+               goto done;
-+       }
-+
-+       header->magic = NVRAM_MAGIC; /* reset MAGIC before we regenerate the NVRAM,
-+                                                                                                                               otherwise we'll have an incorrect CRC */
 +       /* Regenerate NVRAM */
 +       spin_lock_irqsave(&nvram_lock, flags);
@@ -9377 +6062 @@
 +
 +       /* Write partition up to end of data area */
-+       header->magic = NVRAM_INVALID_MAGIC; /* All ones magic */
 +       offset = nvram_mtd->size - erasesize;
 +       i = erasesize - NVRAM_SPACE + header->len;
@@ -9387 +6071 @@
 +       }
 +
-+       /* Now mark the NVRAM in flash as "valid" by setting the correct
-+                MAGIC # */
-+       header->magic = NVRAM_MAGIC;
-+       ret = MTD_WRITE(nvram_mtd, offset + magic_offset, sizeof(header->magic), 
-+                                                                       &magic_len, (char *)&header->magic);
-+       if (ret || magic_len != sizeof(header->magic)) {
-+               printk("nvram_commit: write MAGIC error\n");
-+               ret = -EIO;
-+               goto done;
-+       }
-+
-+       /*
-+        * Reading a few bytes back here will put the device
-+        * back to the correct mode on certain flashes */
 +       offset = nvram_mtd->size - erasesize;
 +       ret = MTD_READ(nvram_mtd, offset, 4, &len, buf);
@@ -9407 +6077 @@
 +       up(&nvram_sem);
 +       kfree(buf);
-+
 +       return ret;
 +}
@@ -9418 +6087 @@
 +
 +       spin_lock_irqsave(&nvram_lock, flags);
-+       if (nvram_major >= 0)
-+               ret = _nvram_getall(buf, count);
-+       else
-+               ret = early_nvram_getall(buf, count);
++       ret = _nvram_getall(buf, count);
 +       spin_unlock_irqrestore(&nvram_lock, flags);
 +
@@ -9427 +6093 @@
 +}
 +
-+
-+
-+
-+
-+
++EXPORT_SYMBOL(nvram_get);
++EXPORT_SYMBOL(nvram_getall);
++EXPORT_SYMBOL(nvram_set);
++EXPORT_SYMBOL(nvram_unset);
++EXPORT_SYMBOL(nvram_commit);
 +
 +/* User mode interface below */
@@ -9523 +6189 @@
 +       if (cmd != NVRAM_MAGIC)
 +               return -EINVAL;
-+
 +       return nvram_commit();
 +}
@@ -9629 +6294 @@
 +
 +       /* Initialize hash table */
-+       _nvram_init(sbh);
++       _nvram_init();
 +
 +       /* Create /dev/nvram handle */
@@ -9656 +6321 @@
 +module_init(dev_nvram_init);
 +module_exit(dev_nvram_exit);
-diff -urN linux.old/arch/mips/bcm947xx/pcibios.c linux.dev/arch/mips/bcm947xx/pcibios.c
---- linux.old/arch/mips/bcm947xx/pcibios.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/pcibios.c      2006-04-27 23:42:50.000000000 +0200
-@@ -0,0 +1,380 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/pcibios.c linux-2.4.32-freewrt/arch/mips/bcm947xx/pcibios.c
+--- linux-2.4.32/arch/mips/bcm947xx/pcibios.c   1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/pcibios.c   2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,355 @@
 +/*
 + * Low-Level PCI and SB support for BCM47xx (Linux support code)
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -9671 +6336 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: pcibios.c,v 1.1.1.9 2006/02/27 03:42:55 honor Exp $
++ * $Id$ 
 + */
 +
@@ -9686 +6351 @@
 +
 +#include <typedefs.h>
-+#include <osl.h>
 +#include <bcmutils.h>
 +#include <sbconfig.h>
++#include <sbpci.h>
++#include <pcicfg.h>
 +#include <sbutils.h>
-+#include <hndpci.h>
-+#include <pcicfg.h>
 +#include <bcmdevs.h>
 +#include <bcmnvram.h>
 +
 +/* Global SB handle */
-+extern sb_t *bcm947xx_sbh;
++extern void *bcm947xx_sbh;
 +extern spinlock_t bcm947xx_sbh_lock;
 +
@@ -9710 +6374 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, value, sizeof(*value));
++       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, value, sizeof(*value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9723 +6386 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, value, sizeof(*value));
++       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, value, sizeof(*value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9736 +6398 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, value, sizeof(*value));
++       ret = sbpci_read_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, value, sizeof(*value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9749 +6410 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, &value, sizeof(value));
++       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, &value, sizeof(value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9762 +6422 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, &value, sizeof(value));
++       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, &value, sizeof(value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9775 +6434 @@
 +
 +       spin_lock_irqsave(&sbh_lock, flags);
-+       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn),
-+               PCI_FUNC(dev->devfn), where, &value, sizeof(value));
++       ret = sbpci_write_config(sbh, dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), where, &value, sizeof(value));
 +       spin_unlock_irqrestore(&sbh_lock, flags);
 +       return ret ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
@@ -9806 +6464 @@
 +       set_io_port_base((unsigned long) ioremap_nocache(SB_PCI_MEM, 0x04000000));
 +
++       mdelay(300); //By Joey for Atheros Card
++
 +       /* Scan the SB bus */
 +       pci_scan_bus(0, &pcibios_ops, NULL);
@@ -9835 +6495 @@
 +       u8 irq;
 +
-+       printk("PCI: Fixing up bus %d\n", b->number);
++               printk("PCI: Fixing up bus %d\n", b->number);
 +
 +       /* Fix up SB */
 +       if (b->number == 0) {
-+               for (ln = b->devices.next; ln != &b->devices; ln = ln->next) {
++               for (ln=b->devices.next; ln != &b->devices; ln=ln->next) {
 +                       d = pci_dev_b(ln);
 +                       /* Fix up interrupt lines */
@@ -9850 +6510 @@
 +       /* Fix up external PCI */
 +       else {
-+               for (ln = b->devices.next; ln != &b->devices; ln = ln->next) {
++               for (ln=b->devices.next; ln != &b->devices; ln=ln->next) {
 +                       d = pci_dev_b(ln);
 +                       /* Fix up resource bases */
@@ -9858 +6518 @@
 +                               if (res->end) {
 +                                       size = res->end - res->start + 1;
-+                                       if (*base & (size - 1))
-+                                               *base = (*base + size) & ~(size - 1);
-+                                       res->start = *base;
-+                                       res->end = res->start + size - 1;
-+                                       *base += size;
-+                                       pci_write_config_dword(d,
-+                                               PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
++                                       if (*base & (size - 1))
++                                               *base = (*base + size) & ~(size - 1);
++                                       res->start = *base;
++                                       res->end = res->start + size - 1;
++                                       *base += size;
++                                       pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
 +                               }
 +                               /* Fix up PCI bridge BAR0 only */
@@ -9886 +6545 @@
 +void
 +pcibios_align_resource(void *data, struct resource *res,
-+       unsigned long size, unsigned long align)
++                      unsigned long size, unsigned long align)
 +{
 +}
@@ -9903 +6562 @@
 +       pci_read_config_word(dev, PCI_COMMAND, &cmd);
 +       old_cmd = cmd;
-+       for (idx = 0; idx < 6; idx++) {
++       for(idx=0; idx<6; idx++) {
 +               r = &dev->resource[idx];
 +               if (r->flags & IORESOURCE_IO)
@@ -9924 +6583 @@
 +       ulong flags;
 +       uint coreidx;
-+       void *regs;
 +
 +       /* External PCI device enable */
@@ -9939 +6597 @@
 +       spin_lock_irqsave(&sbh_lock, flags);
 +       coreidx = sb_coreidx(sbh);
-+       regs = sb_setcoreidx(sbh, PCI_SLOT(dev->devfn));
-+       if (!regs)
++       if (!sb_setcoreidx(sbh, PCI_SLOT(dev->devfn)))
 +               return PCIBIOS_DEVICE_NOT_FOUND;
 +
@@ -9954 +6611 @@
 +       if (sb_coreid(sbh) == SB_USB) {
 +               sb_core_disable(sbh, sb_coreflags(sbh, 0, 0));
-+               sb_core_reset(sbh, 1 << 29, 0);
-+       }
-+       /*
-+        * USB 2.0 special considerations:
-+        *
-+        * 1. Since the core supports both OHCI and EHCI functions, it must
-+        *    only be reset once.
-+        *
-+        * 2. In addition to the standard SB reset sequence, the Host Control
-+        *    Register must be programmed to bring the USB core and various
-+        *    phy components out of reset.
-+        */
-+       else if (sb_coreid(sbh) == SB_USB20H) {
-+               if (!sb_iscoreup(sbh)) {
-+                       sb_core_reset(sbh, 0, 0);
-+                       writel(0x7FF, (ulong)regs + 0x200);
-+                       udelay(1);
-+               }
++               sb_core_reset(sbh, 1 << 29);
 +       } else
-+               sb_core_reset(sbh, 0, 0);
++               sb_core_reset(sbh, 0);
 +
 +       sb_setcoreidx(sbh, coreidx);
 +       spin_unlock_irqrestore(&sbh_lock, flags);
-+
++       
 +       return 0;
 +}
@@ -9983 +6623 @@
 +void
 +pcibios_update_resource(struct pci_dev *dev, struct resource *root,
-+       struct resource *res, int resource)
++                       struct resource *res, int resource)
 +{
 +       unsigned long where, size;
@@ -10040 +6680 @@
 +}
 +
-diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.c
---- linux.old/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/prom.c 2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/prom.c linux-2.4.32-freewrt/arch/mips/bcm947xx/prom.c
+--- linux-2.4.32/arch/mips/bcm947xx/prom.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/prom.c      2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,41 @@
 +/*
@@ -10085 +6725 @@
 +{
 +}
-diff -urN linux.old/arch/mips/bcm947xx/sbmips.c linux.dev/arch/mips/bcm947xx/sbmips.c
---- linux.old/arch/mips/bcm947xx/sbmips.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/sbmips.c       2006-05-02 04:43:13.000000000 +0200
-@@ -0,0 +1,1132 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/sbmips.c linux-2.4.32-freewrt/arch/mips/bcm947xx/sbmips.c
+--- linux-2.4.32/arch/mips/bcm947xx/sbmips.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/sbmips.c    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,1033 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane MIPS core routines
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -10100 +6740 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: hndmips.c,v 1.1.1.1 2006/02/27 03:43:16 honor Exp $
++ * $Id: sbmips.c,v 1.3 2005/03/07 08:35:32 kanki Exp $
 + */
 +
 +#include <typedefs.h>
-+#include <bcmdefs.h>
 +#include <osl.h>
-+#include <bcmutils.h>
 +#include <sbutils.h>
 +#include <bcmdevs.h>
 +#include <bcmnvram.h>
++#include <bcmutils.h>
++#include <hndmips.h>
 +#include <sbconfig.h>
 +#include <sbextif.h>
@@ -10115 +6755 @@
 +#include <sbmemc.h>
 +#include <mipsinc.h>
-+#include <sbhndmips.h>
-+#include <hndcpu.h>
-+
-+/* sbipsflag register format, indexed by irq. */
++
++/* 
++ * Returns TRUE if an external UART exists at the given base
++ * register.
++ */
++static bool    
++BCMINITFN(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 
++BCMINITFN(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 (BCMINIT(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 >= 11) {
++                               /* Fixed ALP clock */
++                               baud_base = 20000000;
++                               div = 1;
++                               /* Set the override bit so we don't divide it */
++                               W_REG(&cc->corecontrol, CC_UARTCLKO);
++                       } else if (rev >= 3) {
++                               /* Internal backplane clock */
++                               baud_base = sb_clock(sbh);
++                               div = 2;        /* Minimum divisor */
++                               W_REG(&cc->clkdiv, ((R_REG(&cc->clkdiv) & ~CLKD_UART) | 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);
++               }
++       }
++}
++
++/*
++ * Initialize jtag master and return handle for
++ * jtag_rwreg. Returns NULL on failure.
++ */
++void *
++sb_jtagm_init(void *sbh, uint clkd, bool exttap)
++{
++       void *regs;
++
++       if ((regs = sb_setcore(sbh, SB_CC, 0)) != NULL) {
++               chipcregs_t *cc = (chipcregs_t *) regs;
++               uint32 tmp;
++
++               /*
++                * Determine jtagm availability from
++                * core revision and capabilities.
++                */
++               tmp = sb_corerev(sbh);
++               /*
++                * Corerev 10 has jtagm, but the only chip
++                * with it does not have a mips, and
++                * the layout of the jtagcmd register is
++                * different. We'll only accept >= 11.
++                */
++               if (tmp < 11)
++                       return (NULL);
++
++               tmp = R_REG(&cc->capabilities);
++               if ((tmp & CAP_JTAGP) == 0)
++                       return (NULL);
++
++               /* Set clock divider if requested */
++               if (clkd != 0) {
++                       tmp = R_REG(&cc->clkdiv);
++                       tmp = (tmp & ~CLKD_JTAG) |
++                               ((clkd << CLKD_JTAG_SHIFT) & CLKD_JTAG);
++                       W_REG(&cc->clkdiv, tmp);
++               }
++
++               /* Enable jtagm */
++               tmp = JCTRL_EN | (exttap ? JCTRL_EXT_EN : 0);
++               W_REG(&cc->jtagctrl, tmp);
++       }
++
++       return (regs);
++}
++
++void
++sb_jtagm_disable(void *h)
++{
++       chipcregs_t *cc = (chipcregs_t *)h;
++
++       W_REG(&cc->jtagctrl, R_REG(&cc->jtagctrl) & ~JCTRL_EN);
++}
++
++/*
++ * Read/write a jtag register. Assumes a target with
++ * 8 bit IR and 32 bit DR.
++ */
++#define        IRWIDTH         8
++#define        DRWIDTH         32
++uint32
++jtag_rwreg(void *h, uint32 ir, uint32 dr)
++{
++       chipcregs_t *cc = (chipcregs_t *) h;
++       uint32 tmp;
++
++       W_REG(&cc->jtagir, ir);
++       W_REG(&cc->jtagdr, dr);
++       tmp = JCMD_START | JCMD_ACC_IRDR |
++               ((IRWIDTH - 1) << JCMD_IRW_SHIFT) |
++               (DRWIDTH - 1);
++       W_REG(&cc->jtagcmd, tmp);
++       while (((tmp = R_REG(&cc->jtagcmd)) & JCMD_BUSY) == JCMD_BUSY) {
++               /* OSL_DELAY(1); */
++       }
++
++       tmp = R_REG(&cc->jtagdr);
++       return (tmp);
++}
++
++/* 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,      /* placeholder */
++       0,
 +       SBIPS_INT1_MASK,
 +       SBIPS_INT2_MASK,
@@ -10128 +6983 @@
 +
 +static const uint32 sbips_int_shift[] = {
-+       0,      /* placeholder */
-+       SBIPS_INT1_SHIFT,
++       0,
++       0,
 +       SBIPS_INT2_SHIFT,
 +       SBIPS_INT3_SHIFT,
@@ -10135 +6990 @@
 +};
 +
-+/*
-+ * Map SB cores sharing the MIPS hardware IRQ0 to virtual dedicated OS IRQs.
-+ * Per-port BSP code is required to provide necessary translations between
-+ * the shared MIPS IRQ and the virtual OS IRQs based on SB core flag.
-+ *
-+ * See sb_irq() for the mapping.
-+ */
-+static uint shirq_map_base = 0;
-+
-+/* Returns the SB interrupt flag of the current core. */
-+static uint32
-+sb_getflag(sb_t *sbh)
-+{
-+       osl_t *osh;
-+       void *regs;
-+       sbconfig_t *sb;
-+
-+       osh = sb_osh(sbh);
-+       regs = sb_coreregs(sbh);
-+       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
-+
-+       return (R_REG(osh, &sb->sbtpsflag) & SBTPS_NUM0_MASK);
-+}
-+
-+/*
++/* 
 + * Returns the MIPS IRQ assignment of the current core. If unassigned,
 + * 0 is returned.
 + */
 +uint
-+sb_irq(sb_t *sbh)
-+{
-+       osl_t *osh;
++sb_irq(void *sbh)
++{
 +       uint idx;
 +       void *regs;
@@ -10173 +7003 @@
 +       uint irq = 0;
 +
-+       osh = sb_osh(sbh);
-+       flag = sb_getflag(sbh);
++       flag = sb_flag(sbh);
 +
 +       idx = sb_coreidx(sbh);
@@ -10183 +7012 @@
 +
 +               /* sbipsflag specifies which core is routed to interrupts 1 to 4 */
-+               sbipsflag = R_REG(osh, &sb->sbipsflag);
++               sbipsflag = R_REG(&sb->sbipsflag);
 +               for (irq = 1; irq <= 4; irq++) {
 +                       if (((sbipsflag & sbips_int_mask[irq]) >> sbips_int_shift[irq]) == flag)
@@ -10198 +7027 @@
 +
 +/* Clears the specified MIPS IRQ. */
-+static void
-+BCMINITFN(sb_clearirq)(sb_t *sbh, uint irq)
-+{
-+       osl_t *osh;
++static void 
++BCMINITFN(sb_clearirq)(void *sbh, uint irq)
++{
 +       void *regs;
 +       sbconfig_t *sb;
-+
-+       osh = sb_osh(sbh);
 +
 +       if (!(regs = sb_setcore(sbh, SB_MIPS, 0)) &&
@@ -10213 +7039 @@
 +
 +       if (irq == 0)
-+               W_REG(osh, &sb->sbintvec, 0);
++               W_REG(&sb->sbintvec, 0);
 +       else
-+               OR_REG(osh, &sb->sbipsflag, sbips_int_mask[irq]);
-+}
-+
-+/*
++               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.
-+ *
-+ * The old assignment to the specified core is removed first.
 + */
-+static void
-+BCMINITFN(sb_setirq)(sb_t *sbh, uint irq, uint coreid, uint coreunit)
-+{
-+       osl_t *osh;
++static void 
++BCMINITFN(sb_setirq)(void *sbh, uint irq, uint coreid, uint coreunit)
++{
 +       void *regs;
 +       sbconfig_t *sb;
 +       uint32 flag;
-+       uint oldirq;
-+
-+       osh = sb_osh(sbh);
 +
 +       regs = sb_setcore(sbh, coreid, coreunit);
 +       ASSERT(regs);
-+       flag = sb_getflag(sbh);
-+       oldirq = sb_irq(sbh);
-+       if (oldirq)
-+               sb_clearirq(sbh, oldirq);
++       flag = sb_flag(sbh);
 +
 +       if (!(regs = sb_setcore(sbh, SB_MIPS, 0)) &&
@@ -10247 +7064 @@
 +       sb = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
 +
-+       if (!oldirq)
-+               AND_REG(osh, &sb->sbintvec, ~(1 << flag));
-+
 +       if (irq == 0)
-+               OR_REG(osh, &sb->sbintvec, 1 << flag);
++               OR_REG(&sb->sbintvec, 1 << flag);
 +       else {
 +               flag <<= sbips_int_shift[irq];
 +               ASSERT(!(flag & ~sbips_int_mask[irq]));
-+               flag |= R_REG(osh, &sb->sbipsflag) & ~sbips_int_mask[irq];
-+               W_REG(osh, &sb->sbipsflag, flag);
-+       }
-+}
-+
-+/*
++               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.
-+ *
-+ * 'shirqmap' enables virtual dedicated OS IRQ mapping if non-zero.
 + */
-+void
-+BCMINITFN(sb_mips_init)(sb_t *sbh, uint shirqmap)
-+{
-+       osl_t *osh;
++void 
++BCMINITFN(sb_mips_init)(void *sbh)
++{
 +       ulong hz, ns, tmp;
 +       extifregs_t *eir;
@@ -10276 +7087 @@
 +       uint irq;
 +
-+       osh = sb_osh(sbh);
-+
 +       /* Figure out current SB clock speed */
 +       if ((hz = sb_clock(sbh)) == 0)
@@ -10286 +7095 @@
 +       if ((eir = sb_setcore(sbh, SB_EXTIF, 0))) {
 +               /* Initialize extif so we can get to the LEDs and external UART */
-+               W_REG(osh, &eir->prog_config, CF_EN);
++               W_REG(&eir->prog_config, CF_EN);
 +
 +               /* Set timing for the flash */
@@ -10292 +7101 @@
 +               tmp = tmp | (CEIL(40, ns) << FW_W1_SHIFT); /* W1 = 40nS */
 +               tmp = tmp | CEIL(120, ns);              /* W0 = 120nS */
-+               W_REG(osh, &eir->prog_waitcount, tmp);  /* 0x01020a0c for a 100Mhz clock */
++               W_REG(&eir->prog_waitcount, tmp);       /* 0x01020a0c for a 100Mhz clock */
 +
 +               /* Set programmable interface timing for external uart */
@@ -10299 +7108 @@
 +               tmp = tmp | (CEIL(100, ns) << FW_W1_SHIFT); /* W1 = 100nS */
 +               tmp = tmp | CEIL(120, ns);              /* W0 = 120nS */
-+               W_REG(osh, &eir->prog_waitcount, tmp);  /* 0x01020a0c for a 100Mhz clock */
++               W_REG(&eir->prog_waitcount, tmp);       /* 0x01020a0c for a 100Mhz clock */
 +       } else if ((cc = sb_setcore(sbh, SB_CC, 0))) {
++//==================================tallest===============================================
++               /* set register for external IO to control LED. */
++                W_REG(&cc->prog_config, 0x11);
++                tmp = CEIL(10, ns) << FW_W3_SHIFT;      /* W3 = 10nS */
++                tmp = tmp | (CEIL(40, ns) << FW_W1_SHIFT); /* W1 = 40nS */
++                tmp = tmp | CEIL(240, ns);              /* W0 = 120nS */
++                W_REG(&cc->prog_waitcount, tmp);        /* 0x01020a0c for a 100Mhz clock */
++//========================================================================================
 +               /* 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 */
-+               if ((sb_corerev(sbh) < 9) ||
-+                       (BCMINIT(sb_chip)(sbh) == 0x5365))
-+                       W_REG(osh, &cc->flash_waitcount, tmp);
-+
-+               if ((sb_corerev(sbh) < 9) ||
-+                   ((sb_chip(sbh) == BCM5350_CHIP_ID) && sb_chiprev(sbh) == 0) ||
-+                       (BCMINIT(sb_chip)(sbh) == 0x5365)) {
-+                       W_REG(osh, &cc->pcmcia_memwait, tmp);
++
++               // Added by Chen-I for 5365
++               if (BCMINIT(sb_chip)(sbh) == BCM5365_DEVICE_ID)
++               {
++                       W_REG(&cc->flash_waitcount, tmp);
++                       W_REG(&cc->pcmcia_memwait, tmp);
 +               }
-+
-+               /* Save shared IRQ mapping base */
-+               shirq_map_base = shirqmap;
++               else
++               {
++                       if (sb_corerev(sbh) < 9)  
++                               W_REG(&cc->flash_waitcount, tmp);
++       
++                       if ( (sb_corerev(sbh) < 9) || 
++                            ((BCMINIT(sb_chip)(sbh) == BCM5350_DEVICE_ID) && BCMINIT(sb_chiprev)(sbh) == 0) ) {
++                               W_REG(&cc->pcmcia_memwait, tmp);
++                       }
++               }
++
++               // Added by Chen-I & Yen for enabling 5350 EXTIF
++               if (BCMINIT(sb_chip)(sbh) == BCM5350_DEVICE_ID) 
++               {
++                       /* 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(&cc->prog_waitcount, tmp);       /* 0x01020a0c for a 100Mhz clock */
++                       //printf("===========config_REG=%d\n", R_REG(&cc->prog_config));
++                       //printf("-----------config_REG_addr=%x\n", &cc->prog_config);
++                       //printf("===========waitcount_REG=%d\n", R_REG(&cc->prog_waitcount));
++                       //printf("-----------waitcount_REG=%x\n", &cc->prog_waitcount);
++               }
 +       }
 +
 +       /* Chip specific initialization */
-+       switch (sb_chip(sbh)) {
-+       case BCM4710_CHIP_ID:
++       switch (BCMINIT(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);
++                       BCMINIT(sb_clearirq)(sbh, irq);
++               BCMINIT(sb_setirq)(sbh, 0, SB_CODEC, 0);
++               BCMINIT(sb_setirq)(sbh, 0, SB_EXTIF, 0);
++               BCMINIT(sb_setirq)(sbh, 2, SB_ENET, 1);
++               BCMINIT(sb_setirq)(sbh, 3, SB_ILINE20, 0);
++               BCMINIT(sb_setirq)(sbh, 4, SB_PCI, 0);
 +               ASSERT(eir);
-+               value = nvram_get("et0phyaddr");
++               value = BCMINIT(nvram_get)("et0phyaddr");
 +               if (value && !strcmp(value, "31")) {
 +                       /* Enable internal UART */
-+                       W_REG(osh, &eir->corecontrol, CC_UE);
++                       W_REG(&eir->corecontrol, CC_UE);
 +                       /* Give USB its own interrupt */
-+                       sb_setirq(sbh, 1, SB_USB, 0);
++                       BCMINIT(sb_setirq)(sbh, 1, SB_USB, 0);
 +               } else {
 +                       /* Disable internal UART */
-+                       W_REG(osh, &eir->corecontrol, 0);
++                       W_REG(&eir->corecontrol, 0);
 +                       /* Give Ethernet its own interrupt */
-+                       sb_setirq(sbh, 1, SB_ENET, 0);
-+                       sb_setirq(sbh, 0, SB_USB, 0);
++                       BCMINIT(sb_setirq)(sbh, 1, SB_ENET, 0);
++                       BCMINIT(sb_setirq)(sbh, 0, SB_USB, 0);
 +               }
 +               break;
-+       case BCM5350_CHIP_ID:
-+               /* Clear interrupt map */
-+               for (irq = 0; irq <= 4; irq++)
-+                       sb_clearirq(sbh, irq);
-+               sb_setirq(sbh, 0, SB_CC, 0);
-+               sb_setirq(sbh, 0, SB_MIPS33, 0);
-+               sb_setirq(sbh, 1, SB_D11, 0);
-+               sb_setirq(sbh, 2, SB_ENET, 0);
-+               sb_setirq(sbh, 3, SB_PCI, 0);
-+               sb_setirq(sbh, 4, SB_USB, 0);
++       case BCM4310_DEVICE_ID:
++               MTC0(C0_BROADCOM, 0, MFC0(C0_BROADCOM, 0) & ~(1 << 22));
 +               break;
-+       case BCM4785_CHIP_ID:
-+               /* Reassign PCI to irq 4 */
-+               sb_setirq(sbh, 4, SB_PCI, 0);
++        case BCM5350_DEVICE_ID:
++                /* Clear interrupt map */
++                for (irq = 0; irq <= 4; irq++)
++                        BCMINIT(sb_clearirq)(sbh, irq);
++                BCMINIT(sb_setirq)(sbh, 0, SB_CC, 0);
++                BCMINIT(sb_setirq)(sbh, 1, SB_D11, 0);
++                BCMINIT(sb_setirq)(sbh, 2, SB_ENET, 0);
++               BCMINIT(sb_setirq)(sbh, 3, SB_IPSEC, 0);
++                BCMINIT(sb_setirq)(sbh, 4, SB_USB, 0);
 +               break;
 +       }
@@ -10364 +7199 @@
 +
 +uint32
-+BCMINITFN(sb_cpu_clock)(sb_t *sbh)
++BCMINITFN(sb_mips_clock)(void *sbh)
 +{
 +       extifregs_t *eir;
@@ -10378 +7213 @@
 +       /* switch to extif or chipc core */
 +       if ((eir = (extifregs_t *) sb_setcore(sbh, SB_EXTIF, 0))) {
-+               n = R_REG(osh, &eir->clockcontrol_n);
-+               m = R_REG(osh, &eir->clockcontrol_sb);
++               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(osh, &cc->capabilities) & CAP_PLL_MASK;
-+               n = R_REG(osh, &cc->clockcontrol_n);
++               pll_type = R_REG(&cc->capabilities) & CAP_PLL_MASK;
++               n = R_REG(&cc->clockcontrol_n);
 +               if ((pll_type == PLL_TYPE2) ||
 +                   (pll_type == PLL_TYPE4) ||
 +                   (pll_type == PLL_TYPE6) ||
 +                   (pll_type == PLL_TYPE7))
-+                       m = R_REG(osh, &cc->clockcontrol_m3);
++                       m = R_REG(&cc->clockcontrol_mips);
 +               else if (pll_type == PLL_TYPE5) {
 +                       rate = 200000000;
@@ -10393 +7228 @@
 +               }
 +               else if (pll_type == PLL_TYPE3) {
-+                       if (sb_chip(sbh) == BCM5365_CHIP_ID) {
++                       if (BCMINIT(sb_chip)(sbh) == BCM5365_DEVICE_ID) { /* 5365 is also type3 */
 +                               rate = 200000000;
 +                               goto out;
-+                       }
-+                       /* 5350 uses m2 to control mips */
-+                       else
-+                               m = R_REG(osh, &cc->clockcontrol_m2);
++                       } else
++                               m = R_REG(&cc->clockcontrol_m2); /* 5350 uses m2 to control mips */
 +               } else
-+                       m = R_REG(osh, &cc->clockcontrol_sb);
++                       m = R_REG(&cc->clockcontrol_sb);
 +       } else
 +               goto out;
 +
-+
-+       /* calculate rate */
-+       if (BCMINIT(sb_chip)(sbh) == 0x5365)
++       // Added by Chen-I for 5365 
++       if (BCMINIT(sb_chip)(sbh) == BCM5365_DEVICE_ID)
 +               rate = 100000000;
 +       else
++               /* calculate rate */
 +               rate = sb_clock_rate(pll_type, n, m);
 +
@@ -10424 +7257 @@
 +#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4)
 +
-+static void
++static void 
 +BCMINITFN(handler)(void)
 +{
-+       __asm__(
++       /* Step 11 */
++       __asm__ (
 +               ".set\tmips32\n\t"
 +               "ssnop\n\t"
@@ -10441 +7275 @@
 +               "nop\n\t"
 +               "nop\n\t"
-+               ".set\tmips0");
++               ".set\tmips0"
++       );
 +}
 +
 +/* The following MUST come right after handler() */
-+static void
++static void 
 +BCMINITFN(afterhandler)(void)
 +{
@@ -10452 +7287 @@
 +/*
 + * Set the MIPS, backplane and PCI clocks as closely as possible.
-+ *
-+ * MIPS clocks synchronization function has been moved from PLL in chipcommon
-+ * core rev. 15 to a DLL inside the MIPS core in 4785.
 + */
-+bool
-+BCMINITFN(sb_mips_setclock)(sb_t *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock)
++bool 
++BCMINITFN(sb_mips_setclock)(void *sbh, uint32 mipsclock, uint32 sbclock, uint32 pciclock)
 +{
 +       extifregs_t *eir = NULL;
@@ -10467 +7299 @@
 +       uint ic_size, ic_lsize;
 +       uint idx, i;
-+
-+       /* PLL configuration: type 1 */
 +       typedef struct {
 +               uint32 mipsclock;
@@ -10477 +7307 @@
 +       } n3m_table_t;
 +       static n3m_table_t BCMINITDATA(type1_table)[] = {
-+               /* 96.000 32.000 24.000 */
-+               { 96000000, 0x0303, 0x04020011, 0x11030011, 0x11050011 },
-+               /* 100.000 33.333 25.000 */
-+               { 100000000, 0x0009, 0x04020011, 0x11030011, 0x11050011 },
-+               /* 104.000 31.200 24.960 */
-+               { 104000000, 0x0802, 0x04020011, 0x11050009, 0x11090009 },
-+               /* 108.000 32.400 24.923 */
-+               { 108000000, 0x0403, 0x04020011, 0x11050009, 0x02000802 },
-+               /* 112.000 32.000 24.889 */
-+               { 112000000, 0x0205, 0x04020011, 0x11030021, 0x02000403 },
-+               /* 115.200 32.000 24.000 */
-+               { 115200000, 0x0303, 0x04020009, 0x11030011, 0x11050011 },
-+               /* 120.000 30.000 24.000 */
-+               { 120000000, 0x0011, 0x04020011, 0x11050011, 0x11090011 },
-+               /* 124.800 31.200 24.960 */
-+               { 124800000, 0x0802, 0x04020009, 0x11050009, 0x11090009 },
-+               /* 128.000 32.000 24.000 */
-+               { 128000000, 0x0305, 0x04020011, 0x11050011, 0x02000305 },
-+               /* 132.000 33.000 24.750 */
-+               { 132000000, 0x0603, 0x04020011, 0x11050011, 0x02000305 },
-+               /* 136.000 32.640 24.727 */
-+               { 136000000, 0x0c02, 0x04020011, 0x11090009, 0x02000603 },
-+               /* 140.000 30.000 24.706 */
-+               { 140000000, 0x0021, 0x04020011, 0x11050021, 0x02000c02 },
-+               /* 144.000 30.857 24.686 */
-+               { 144000000, 0x0405, 0x04020011, 0x01020202, 0x11090021 },
-+               /* 150.857 33.000 24.000 */
-+               { 150857142, 0x0605, 0x04020021, 0x02000305, 0x02000605 },
-+               /* 152.000 32.571 24.000 */
-+               { 152000000, 0x0e02, 0x04020011, 0x11050021, 0x02000e02 },
-+               /* 156.000 31.200 24.960 */
-+               { 156000000, 0x0802, 0x04020005, 0x11050009, 0x11090009 },
-+               /* 160.000 32.000 24.000 */
-+               { 160000000, 0x0309, 0x04020011, 0x11090011, 0x02000309 },
-+               /* 163.200 32.640 24.727 */
-+               { 163200000, 0x0c02, 0x04020009, 0x11090009, 0x02000603 },
-+               /* 168.000 32.000 24.889 */
-+               { 168000000, 0x0205, 0x04020005, 0x11030021, 0x02000403 },
-+               /* 176.000 33.000 24.000 */
-+               { 176000000, 0x0602, 0x04020003, 0x11050005, 0x02000602 },
-+               };
-+
-+       /* PLL configuration: type 3 */
++               {  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;
@@ -10525 +7333 @@
 +               uint32 m2; /* that is the clockcontrol_m2 */
 +       } type3_table_t;
-+       static type3_table_t type3_table[] = {
-+               /* for 5350, mips clock is always double sb clock */
-+               { 150000000, 0x311, 0x4020005 },
-+               { 200000000, 0x311, 0x4020003 },
-+               };
-+
-+       /* PLL configuration: type 2, 4, 7 */
++       static type3_table_t type3_table[] = { /* for 5350, mips clock is always double sb clock */
++               { 150000000, 0x311, 0x4020005 }, 
++               { 200000000, 0x311, 0x4020003 }, 
++       };
 +       typedef struct {
 +               uint32 mipsclock;
@@ -10542 +7347 @@
 +               uint32 ratio_cfg;
 +               uint32 ratio_parm;
-+               uint32 d11_r1;
-+               uint32 d11_r2;
 +       } n4m_table_t;
++
 +       static n4m_table_t BCMINITDATA(type2_table)[] = {
-+               { 120000000, 60000000, 0x0303, 0x01000200, 0x01000600, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 150000000, 75000000, 0x0303, 0x01000100, 0x01000600, 0x01000100, 0x05000100, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 180000000, 80000000, 0x0403, 0x01010000, 0x01020300, 0x01020600, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 180000000, 90000000, 0x0403, 0x01000100, 0x01020300, 0x01000100, 0x05000100, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 200000000, 100000000, 0x0303, 0x02010000, 0x02040001, 0x02010000, 0x06000001, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 211200000, 105600000, 0x0902, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 220800000, 110400000, 0x1500, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 230400000, 115200000, 0x0604, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 234000000, 104000000, 0x0b01, 0x01010000, 0x01010700, 0x01020600, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 240000000, 120000000, 0x0803, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 252000000, 126000000, 0x0504, 0x01000100, 0x01020500, 0x01000100, 0x05000100, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 264000000, 132000000, 0x0903, 0x01000200, 0x01020700, 0x01000200, 0x05000200, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 270000000, 120000000, 0x0703, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 276000000, 122666666, 0x1500, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 280000000, 140000000, 0x0503, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 288000000, 128000000, 0x0604, 0x01010000, 0x01030400, 0x01020600, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 288000000, 144000000, 0x0404, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 300000000, 133333333, 0x0803, 0x01010000, 0x01020600, 0x01010100, 0x05000100, 8,
-+               0x012a00a9, 9 /* ratio  4/9 */, 0x012a00a9 },
-+               { 300000000, 150000000, 0x0803, 0x01000100, 0x01020600, 0x01010100, 0x05000100, 11,
-+               0x0aaa0555, 8 /* ratio  4/8 */, 0x00aa0055 },
-+               { 330000000, 132000000, 0x0903, 0x01000200, 0x00020200, 0x01010100, 0x05000100, 0,
-+               0, 10 /* ratio 4/10 */, 0x02520129 },
-+               { 330000000, 146666666, 0x0903, 0x01010000, 0x00020200, 0x01010100, 0x05000100, 0,
-+               0, 9 /* ratio 4/9 */, 0x012a00a9 },
-+               { 330000000, 165000000, 0x0903, 0x01000100, 0x00020200, 0x01010100, 0x05000100, 0,
-+               0, 8 /* ratio 4/8 */, 0x00aa0055 },
-+               { 360000000, 120000000, 0x0a03, 0x01000300, 0x00010201, 0x01010200, 0x05000100, 0,
-+               0, 12 /* ratio 4/12 */, 0x04920492 },
-+               { 360000000, 144000000, 0x0a03, 0x01000200, 0x00010201, 0x01010200, 0x05000100, 0,
-+               0, 10 /* ratio 4/10 */, 0x02520129 },
-+               { 360000000, 160000000, 0x0a03, 0x01010000, 0x00010201, 0x01010200, 0x05000100, 0,
-+               0, 9 /* ratio 4/9 */, 0x012a00a9 },
-+               { 360000000, 180000000, 0x0a03, 0x01000100, 0x00010201, 0x01010200, 0x05000100, 0,
-+               0, 8 /* ratio 4/8 */, 0x00aa0055 },
-+               { 390000000, 130000000, 0x0b03, 0x01010100, 0x00020101, 0x01020100, 0x05000100, 0,
-+               0, 12 /* ratio 4/12 */, 0x04920492 },
-+               { 390000000, 156000000, 0x0b03, 0x01000200, 0x00020101, 0x01020100, 0x05000100, 0,
-+               0, 10 /* ratio 4/10 */, 0x02520129 },
-+               { 390000000, 173000000, 0x0b03, 0x01010000, 0x00020101, 0x01020100, 0x05000100, 0,
-+               0, 9 /* ratio 4/9 */, 0x012a00a9 },
-+               { 390000000, 195000000, 0x0b03, 0x01000100, 0x00020101, 0x01020100, 0x05000100, 0,
-+               0, 8 /* ratio 4/8 */, 0x00aa0055 },
++               { 180000000,  80000000, 0x0403, 0x01010000, 0x01020300, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 180000000,  90000000, 0x0403, 0x01000100, 0x01020300, 0x01000100, 0x05000100, 11, 0x0aaa0555 },
++               { 200000000, 100000000, 0x0303, 0x02010000, 0x02040001, 0x02010000, 0x06000001, 11, 0x0aaa0555 },
++               { 211200000, 105600000, 0x0902, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 11, 0x0aaa0555 },
++               { 220800000, 110400000, 0x1500, 0x01000200, 0x01030400, 0x01000200, 0x05000200, 11, 0x0aaa0555 },
++               { 230400000, 115200000, 0x0604, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 11, 0x0aaa0555 },
++               { 234000000, 104000000, 0x0b01, 0x01010000, 0x01010700, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 240000000, 120000000, 0x0803, 0x01000200, 0x01020600, 0x01000200, 0x05000200, 11, 0x0aaa0555 },
++               { 252000000, 126000000, 0x0504, 0x01000100, 0x01020500, 0x01000100, 0x05000100, 11, 0x0aaa0555 },
++               { 264000000, 132000000, 0x0903, 0x01000200, 0x01020700, 0x01000200, 0x05000200, 11, 0x0aaa0555 },
++               { 270000000, 120000000, 0x0703, 0x01010000, 0x01030400, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 276000000, 122666666, 0x1500, 0x01010000, 0x01030400, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 280000000, 140000000, 0x0503, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 11, 0x0aaa0555 },
++               { 288000000, 128000000, 0x0604, 0x01010000, 0x01030400, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 288000000, 144000000, 0x0404, 0x01000000, 0x01010600, 0x01000000, 0x05000000, 11, 0x0aaa0555 },
++               { 300000000, 133333333, 0x0803, 0x01010000, 0x01020600, 0x01020600, 0x05000100,  8, 0x012a00a9 },
++               { 300000000, 150000000, 0x0803, 0x01000100, 0x01020600, 0x01000100, 0x05000100, 11, 0x0aaa0555 }
 +       };
++
 +       static n4m_table_t BCMINITDATA(type4_table)[] = {
-+               { 120000000, 60000000, 0x0009, 0x11020009, 0x01030203, 0x11020009, 0x04000009, 11,
-+               0x0aaa0555 },
-+               { 150000000, 75000000, 0x0009, 0x11050002, 0x01030203, 0x11050002, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 192000000, 96000000, 0x0702, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 198000000, 99000000, 0x0603, 0x11020005, 0x11030011, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 200000000, 100000000, 0x0009, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 11,
-+               0x0aaa0555 },
-+               { 204000000, 102000000, 0x0c02, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 208000000, 104000000, 0x0802, 0x11030002, 0x11090005, 0x11030002, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 210000000, 105000000, 0x0209, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 216000000, 108000000, 0x0111, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 224000000, 112000000, 0x0205, 0x11030002, 0x02002103, 0x11030002, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 228000000, 101333333, 0x0e02, 0x11030003, 0x11210005, 0x01030305, 0x04000005, 8,
-+               0x012a00a9 },
-+               { 228000000, 114000000, 0x0e02, 0x11020005, 0x11210005, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 240000000, 102857143, 0x0109, 0x04000021, 0x01050203, 0x11030021, 0x04000003, 13,
-+               0x254a14a9 },
-+               { 240000000, 120000000, 0x0109, 0x11030002, 0x01050203, 0x11030002, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 252000000, 100800000, 0x0203, 0x04000009, 0x11050005, 0x02000209, 0x04000002, 9,
-+               0x02520129 },
-+               { 252000000, 126000000, 0x0203, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 11,
-+               0x0aaa0555 },
-+               { 264000000, 132000000, 0x0602, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 11,
-+               0x0aaa0555 },
-+               { 272000000, 116571428, 0x0c02, 0x04000021, 0x02000909, 0x02000221, 0x04000003, 13,
-+               0x254a14a9 },
-+               { 280000000, 120000000, 0x0209, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 13,
-+               0x254a14a9 },
-+               { 288000000, 123428571, 0x0111, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 13,
-+               0x254a14a9 },
-+               { 300000000, 120000000, 0x0009, 0x04000009, 0x01030203, 0x02000902, 0x04000002, 9,
-+               0x02520129 },
-+               { 300000000, 150000000, 0x0009, 0x04000005, 0x01030203, 0x04000005, 0x04000002, 11,
-+               0x0aaa0555 }
++               { 192000000,  96000000, 0x0702, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11, 0x0aaa0555 },
++               { 198000000,  99000000, 0x0603, 0x11020005, 0x11030011, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 200000000, 100000000, 0x0009, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 11, 0x0aaa0555 },
++               { 204000000, 102000000, 0x0c02, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 208000000, 104000000, 0x0802, 0x11030002, 0x11090005, 0x11030002, 0x04000003, 11, 0x0aaa0555 },
++               { 210000000, 105000000, 0x0209, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 216000000, 108000000, 0x0111, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 224000000, 112000000, 0x0205, 0x11030002, 0x02002103, 0x11030002, 0x04000003, 11, 0x0aaa0555 },
++               { 228000000, 101333333, 0x0e02, 0x11030003, 0x11210005, 0x01030305, 0x04000005,  8, 0x012a00a9 },
++               { 228000000, 114000000, 0x0e02, 0x11020005, 0x11210005, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 240000000, 102857143, 0x0109, 0x04000021, 0x01050203, 0x11030021, 0x04000003, 13, 0x254a14a9 },
++               { 240000000, 120000000, 0x0109, 0x11030002, 0x01050203, 0x11030002, 0x04000003, 11, 0x0aaa0555 },
++               { 252000000, 100800000, 0x0203, 0x04000009, 0x11050005, 0x02000209, 0x04000002,  9, 0x02520129 },
++               { 252000000, 126000000, 0x0203, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 11, 0x0aaa0555 },
++               { 264000000, 132000000, 0x0602, 0x04000005, 0x11050005, 0x04000005, 0x04000002, 11, 0x0aaa0555 },
++               { 272000000, 116571428, 0x0c02, 0x04000021, 0x02000909, 0x02000221, 0x04000003, 13, 0x254a14a9 },
++               { 280000000, 120000000, 0x0209, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 13, 0x254a14a9 },
++               { 288000000, 123428571, 0x0111, 0x04000021, 0x01030303, 0x02000221, 0x04000003, 13, 0x254a14a9 },
++               { 300000000, 120000000, 0x0009, 0x04000009, 0x01030203, 0x02000902, 0x04000002,  9, 0x02520129 },
++               { 300000000, 150000000, 0x0009, 0x04000005, 0x01030203, 0x04000005, 0x04000002, 11, 0x0aaa0555 }
 +       };
++
 +       static n4m_table_t BCMINITDATA(type7_table)[] = {
-+               { 183333333, 91666666, 0x0605, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 187500000, 93750000, 0x0a03, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 196875000, 98437500, 0x1003, 0x11020005, 0x11050011, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 200000000, 100000000, 0x0311, 0x04000011, 0x11030011, 0x04000009, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 200000000, 100000000, 0x0311, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 11,
-+               0x0aaa0555 },
-+               { 206250000, 103125000, 0x1103, 0x11020005, 0x11050011, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 212500000, 106250000, 0x0c05, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 215625000, 107812500, 0x1203, 0x11090009, 0x11050005, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 216666666, 108333333, 0x0805, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 225000000, 112500000, 0x0d03, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 233333333, 116666666, 0x0905, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11,
-+               0x0aaa0555 },
-+               { 237500000, 118750000, 0x0e05, 0x11020005, 0x11210005, 0x11020005, 0x04000005, 11,
-+               0x0aaa0555 },
-+               { 240000000, 120000000, 0x0b11, 0x11020009, 0x11210009, 0x11020009, 0x04000009, 11,
-+               0x0aaa0555 },
-+               { 250000000, 125000000, 0x0f03, 0x11020003, 0x11210003, 0x11020003, 0x04000003, 11,
-+               0x0aaa0555 }
++               { 183333333,  91666666, 0x0605, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11, 0x0aaa0555 },
++               { 187500000,  93750000, 0x0a03, 0x04000011, 0x11030011, 0x04000011, 0x04000003, 11, 0x0aaa0555 },
++               { 196875000,  98437500, 0x1003, 0x11020005, 0x11050011, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 200000000, 100000000, 0x0311, 0x04000011, 0x11030011, 0x04000009, 0x04000003, 11, 0x0aaa0555 },
++               { 200000000, 100000000, 0x0311, 0x04020011, 0x11030011, 0x04020011, 0x04020003, 11, 0x0aaa0555 },
++               { 206250000, 103125000, 0x1103, 0x11020005, 0x11050011, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 212500000, 106250000, 0x0c05, 0x11020005, 0x01030303, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 215625000, 107812500, 0x1203, 0x11090009, 0x11050005, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 216666666, 108333333, 0x0805, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11, 0x0aaa0555 },
++               { 225000000, 112500000, 0x0d03, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11, 0x0aaa0555 },
++               { 233333333, 116666666, 0x0905, 0x11020003, 0x11030011, 0x11020003, 0x04000003, 11, 0x0aaa0555 },
++               { 237500000, 118750000, 0x0e05, 0x11020005, 0x11210005, 0x11020005, 0x04000005, 11, 0x0aaa0555 },
++               { 240000000, 120000000, 0x0b11, 0x11020009, 0x11210009, 0x11020009, 0x04000009, 11, 0x0aaa0555 },
++               { 250000000, 125000000, 0x0f03, 0x11020003, 0x11210003, 0x11020003, 0x04000003, 11, 0x0aaa0555 }
 +       };
 +
 +       ulong start, end, dst;
 +       bool ret = FALSE;
-+
-+       volatile uint32 *dll_ctrl = (volatile uint32 *)0xff400008;
-+       volatile uint32 *dll_r1 = (volatile uint32 *)0xff400010;
-+       volatile uint32 *dll_r2 = (volatile uint32 *)0xff400018;
-+
++       
 +       /* get index of the current core */
 +       idx = sb_coreidx(sbh);
@@ -10703 +7424 @@
 +               clockcontrol_m2 = &cc->clockcontrol_m2;
 +       } else if ((cc = (chipcregs_t *) sb_setcore(sbh, SB_CC, 0))) {
-+               pll_type = R_REG(osh, &cc->capabilities) & CAP_PLL_MASK;
++               pll_type = R_REG(&cc->capabilities) & CAP_PLL_MASK;
 +               if (pll_type == PLL_TYPE6) {
 +                       clockcontrol_n = NULL;
@@ -10712 +7433 @@
 +                       clockcontrol_sb = &cc->clockcontrol_sb;
 +                       clockcontrol_pci = &cc->clockcontrol_pci;
-+                       clockcontrol_m2 = &cc->clockcontrol_m2;
++               clockcontrol_m2 = &cc->clockcontrol_m2;
 +               }
 +       } else
@@ -10722 +7443 @@
 +       } else {
 +               /* Store the current clock register values */
-+               orig_n = R_REG(osh, clockcontrol_n);
-+               orig_sb = R_REG(osh, clockcontrol_sb);
-+               orig_pci = R_REG(osh, clockcontrol_pci);
++               orig_n = R_REG(clockcontrol_n);
++               orig_sb = R_REG(clockcontrol_sb);
++               orig_pci = R_REG(clockcontrol_pci);
 +       }
 +
@@ -10730 +7451 @@
 +               /* Keep the current PCI clock if not specified */
 +               if (pciclock == 0) {
-+                       pciclock = sb_clock_rate(pll_type, R_REG(osh, clockcontrol_n),
-+                                                R_REG(osh, clockcontrol_pci));
++                       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)
++               for (i = 0; i < ARRAYSIZE(BCMINIT(type1_table)); i++) {
++                       ASSERT(BCMINIT(type1_table)[i].mipsclock ==
++                              sb_clock_rate(pll_type, BCMINIT(type1_table)[i].n, BCMINIT(type1_table)[i].sb));
++                       if (BCMINIT(type1_table)[i].mipsclock > mipsclock)
 +                               break;
 +               }
@@ -10750 +7469 @@
 +                       i--;
 +               }
-+               ASSERT(type1_table[i].mipsclock <= mipsclock);
++               ASSERT(BCMINIT(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))
++               if ((orig_n == BCMINIT(type1_table)[i].n) &&
++                   (orig_sb == BCMINIT(type1_table)[i].sb) &&
++                   (orig_pci == BCMINIT(type1_table)[i].pci33))
 +                       goto done;
 +
 +               /* Set the PLL controls */
-+               W_REG(osh, clockcontrol_n, type1_table[i].n);
-+               W_REG(osh, clockcontrol_sb, type1_table[i].sb);
++               W_REG(clockcontrol_n, BCMINIT(type1_table)[i].n);
++               W_REG(clockcontrol_sb, BCMINIT(type1_table)[i].sb);
 +               if (pciclock == 25000000)
-+                       W_REG(osh, clockcontrol_pci, type1_table[i].pci25);
++                       W_REG(clockcontrol_pci, BCMINIT(type1_table)[i].pci25);
 +               else
-+                       W_REG(osh, clockcontrol_pci, type1_table[i].pci33);
++                       W_REG(clockcontrol_pci, BCMINIT(type1_table)[i].pci33);
++
++               /* Reset */
++               sb_watchdog(sbh, 1);
++
++               while (1);
++       } else if ((pll_type == PLL_TYPE3) &&
++                  (BCMINIT(sb_chip)(sbh) != BCM5365_DEVICE_ID)) {
++               /* 5350 */
++               /* Search for the closest MIPS clock less than or equal to a preferred value */
++
++               for (i = 0; i < ARRAYSIZE(type3_table); i++) {
++                       if (type3_table[i].mipsclock > mipsclock)
++                               break;
++               }
++               if (i == 0) {
++                       ret = FALSE;
++                       goto done;
++               } else {
++                       ret = TRUE;
++                       i--;
++               }
++               ASSERT(type3_table[i].mipsclock <= mipsclock);
++
++               /* No PLL change */
++               orig_m2 = R_REG(&cc->clockcontrol_m2);
++               if ((orig_n == type3_table[i].n) &&
++                   (orig_m2 == type3_table[i].m2))  {
++                       goto done;
++               }
++               
++               /* Set the PLL controls */
++               W_REG(clockcontrol_n, type3_table[i].n);
++               W_REG(clockcontrol_m2, type3_table[i].m2);
 +
 +               /* Reset */
 +               sb_watchdog(sbh, 1);
 +               while (1);
-+       } else if (pll_type == PLL_TYPE3) {
-+               /* 5350 */
-+               if (sb_chip(sbh) != BCM5365_CHIP_ID) {
-+                       /*
-+                        * Search for the closest MIPS clock less than or equal to
-+                        * a preferred value.
-+                        */
-+                       for (i = 0; i < ARRAYSIZE(type3_table); i++) {
-+                               if (type3_table[i].mipsclock > mipsclock)
-+                                       break;
-+                       }
-+                       if (i == 0) {
-+                               ret = FALSE;
-+                               goto done;
-+                       } else {
-+                               ret = TRUE;
-+                               i--;
-+                       }
-+                       ASSERT(type3_table[i].mipsclock <= mipsclock);
-+
-+                       /* No PLL change */
-+                       orig_m2 = R_REG(osh, &cc->clockcontrol_m2);
-+                       if ((orig_n == type3_table[i].n) &&
-+                           (orig_m2 == type3_table[i].m2)) {
-+                               goto done;
-+                       }
-+
-+                       /* Set the PLL controls */
-+                       W_REG(osh, clockcontrol_n, type3_table[i].n);
-+                       W_REG(osh, clockcontrol_m2, type3_table[i].m2);
-+
-+                       /* Reset */
-+                       sb_watchdog(sbh, 1);
-+                       while (1);
-+               }
 +       } else if ((pll_type == PLL_TYPE2) ||
-+                  (pll_type == PLL_TYPE4) ||
-+                  (pll_type == PLL_TYPE6) ||
-+                  (pll_type == PLL_TYPE7)) {
++                  (pll_type == PLL_TYPE4) ||
++                  (pll_type == PLL_TYPE6) ||
++                  (pll_type == PLL_TYPE7)) {
 +               n4m_table_t *table = NULL, *te;
 +               uint tabsz = 0;
@@ -10813 +7530 @@
 +               ASSERT(cc);
 +
-+               orig_mips = R_REG(osh, &cc->clockcontrol_m3);
-+
-+               switch (pll_type) {
-+               case PLL_TYPE6: {
++               orig_mips = R_REG(&cc->clockcontrol_mips);
++
++               if (pll_type == PLL_TYPE6) {
 +                       uint32 new_mips = 0;
 +
@@ -10826 +7542 @@
 +                               goto done;
 +
-+                       W_REG(osh, &cc->clockcontrol_m3, new_mips);
++                       W_REG(&cc->clockcontrol_mips, new_mips);
 +                       goto end_fill;
 +               }
-+               case PLL_TYPE2:
-+                       table = type2_table;
-+                       tabsz = ARRAYSIZE(type2_table);
-+                       break;
-+               case PLL_TYPE4:
-+                       table = type4_table;
-+                       tabsz = ARRAYSIZE(type4_table);
-+                       break;
-+               case PLL_TYPE7:
-+                       table = type7_table;
-+                       tabsz = ARRAYSIZE(type7_table);
-+                       break;
-+               default:
-+                       ASSERT("No table for plltype" == NULL);
-+                       break;
-+               }
++
++               if (pll_type == PLL_TYPE2) {
++                       table = BCMINIT(type2_table);
++                       tabsz = ARRAYSIZE(BCMINIT(type2_table));
++               } else if (pll_type == PLL_TYPE4) {
++                       table = BCMINIT(type4_table);
++                       tabsz = ARRAYSIZE(BCMINIT(type4_table));
++               } else if (pll_type == PLL_TYPE7) {
++                       table = BCMINIT(type7_table);
++                       tabsz = ARRAYSIZE(BCMINIT(type7_table));
++               } else
++                       ASSERT((char *)"No table for plltype" == NULL);
 +
 +               /* Store the current clock register values */
-+               orig_m2 = R_REG(osh, &cc->clockcontrol_m2);
++               orig_m2 = R_REG(&cc->clockcontrol_m2);
 +               orig_ratio_parm = 0;
 +               orig_ratio_cfg = 0;
@@ -10889 +7601 @@
 +
 +               /* Set the PLL controls */
-+               W_REG(osh, clockcontrol_n, te->n);
-+               W_REG(osh, clockcontrol_sb, te->sb);
-+               W_REG(osh, clockcontrol_pci, te->pci33);
-+               W_REG(osh, &cc->clockcontrol_m2, te->m2);
-+               W_REG(osh, &cc->clockcontrol_m3, te->m3);
++               W_REG(clockcontrol_n, te->n);
++               W_REG(clockcontrol_sb, te->sb);
++               W_REG(clockcontrol_pci, te->pci33);
++               W_REG(&cc->clockcontrol_m2, te->m2);
++               W_REG(&cc->clockcontrol_mips, te->m3);
 +
 +               /* Set the chipcontrol bit to change mipsref to the backplane divider if needed */
-+               if ((pll_type == PLL_TYPE7) && (te->sb != te->m2) &&
++               if ((pll_type == PLL_TYPE7) &&
++                   (te->sb != te->m2) &&
 +                   (sb_clock_rate(pll_type, te->n, te->m2) == 120000000))
-+                       W_REG(osh, &cc->chipcontrol,
-+                             R_REG(osh, &cc->chipcontrol) | 0x100);
++                       W_REG(&cc->chipcontrol, R_REG(&cc->chipcontrol) | 0x100);
 +
 +               /* No ratio change */
-+               if (sb_chip(sbh) != BCM4785_CHIP_ID) {
-+                       if (orig_ratio_parm == te->ratio_parm)
-+                               goto end_fill;
-+               }
++               if (orig_ratio_parm == te->ratio_parm)
++                       goto end_fill;
++
++               icache_probe(MFC0(C0_CONFIG, 1), &ic_size, &ic_lsize);
 +
 +               /* Preload the code into the cache */
-+               icache_probe(MFC0(C0_CONFIG, 1), &ic_size, &ic_lsize);
-+               if (sb_chip(sbh) == BCM4785_CHIP_ID) {
-+                       start = ((ulong) &&start_fill_4785) & ~(ic_lsize - 1);
-+                       end = ((ulong) &&end_fill_4785 + (ic_lsize - 1)) & ~(ic_lsize - 1);
-+               }
-+               else {
-+                       start = ((ulong) &&start_fill) & ~(ic_lsize - 1);
-+                       end = ((ulong) &&end_fill + (ic_lsize - 1)) & ~(ic_lsize - 1);
-+               }
++               start = ((ulong) &&start_fill) & ~(ic_lsize - 1);
++               end = ((ulong) &&end_fill + (ic_lsize - 1)) & ~(ic_lsize - 1);
 +               while (start < end) {
-+                       cache_op(start, Fill_I);
++                       cache_unroll(start, Fill_I);
 +                       start += ic_lsize;
 +               }
 +
 +               /* Copy the handler */
-+               start = (ulong) &handler;
-+               end = (ulong) &afterhandler;
++               start = (ulong) &BCMINIT(handler);
++               end = (ulong) &BCMINIT(afterhandler);
 +               dst = KSEG1ADDR(0x180);
 +               for (i = 0; i < (end - start); i += 4)
 +                       *((ulong *)(dst + i)) = *((ulong *)(start + i));
-+
-+               /* Preload the handler into the cache one line at a time */
-+               for (i = 0; i < (end - start); i += ic_lsize)
-+                       cache_op(dst + i, Fill_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 */
@@ -10939 +7644 @@
 +               MTC0(C0_STATUS, 0, MFC0(C0_STATUS, 0) | (ALLINTS | ST0_IE));
 +
-+               /* 4785 clock freq change procedures */
-+               if (sb_chip(sbh) == BCM4785_CHIP_ID) {
-+       start_fill_4785:
-+                       /* Switch to async */
-+                       MTC0(C0_BROADCOM, 4, (1 << 22));
-+
-+                       /* Set clock ratio in MIPS */
-+                       *dll_r1 = (*dll_r1 & 0xfffffff0) | (te->d11_r1 - 1);
-+                       *dll_r2 = te->d11_r2;
-+
-+                       /* Enable new settings in MIPS */
-+                       *dll_r1 = *dll_r1 | 0xc0000000;
-+
-+                       /* Set active cfg */
-+                       MTC0(C0_BROADCOM, 2, MFC0(C0_BROADCOM, 2) | (1 << 3) | 1);
-+
-+                       /* Fake soft reset (clock cfg registers not reset) */
-+                       MTC0(C0_BROADCOM, 5, MFC0(C0_BROADCOM, 5) | (1 << 2));
-+
-+                       /* Clear active cfg */
-+                       MTC0(C0_BROADCOM, 2, MFC0(C0_BROADCOM, 2) & ~(1 << 3));
-+
-+                       /* set watchdog timer */
-+                       W_REG(osh, &cc->watchdog, 20);
-+                       (void) R_REG(osh, &cc->chipid);
-+
-+                       /* wait for timer interrupt */
-+                       __asm__ __volatile__(
-+                               ".set\tmips3\n\t"
-+                               "sync\n\t"
-+                               "wait\n\t"
-+                               ".set\tmips0");
-+       end_fill_4785:
-+                       while (1);
-+               }
-+               /* Generic clock freq change procedures */
-+               else {
-+                       /* Enable MIPS timer interrupt */
-+                       if (!(mipsr = sb_setcore(sbh, SB_MIPS, 0)) &&
-+                           !(mipsr = sb_setcore(sbh, SB_MIPS33, 0)))
-+                               ASSERT(mipsr);
-+                       W_REG(osh, &mipsr->intmask, 1);
++               /* 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, te->ratio_parm);
-+                       MTC0(C0_BROADCOM, 1, te->ratio_cfg);
-+
-+                       /* step 2: program timer intr */
-+                       W_REG(osh, &mipsr->timer, 100);
-+                       (void) R_REG(osh, &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, (1 << 3) | 1);
-+
-+                       /* 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) | (1 << 2));
++               /* step 1, set clock ratios */
++               MTC0(C0_BROADCOM, 3, te->ratio_parm);
++               MTC0(C0_BROADCOM, 1, te->ratio_cfg);
++
++               /* 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:
-+                       /* set watchdog timer */
-+                       W_REG(osh, &cc->watchdog, 20);
-+                       (void) R_REG(osh, &cc->chipid);
-+
-+                       /* wait for timer interrupt */
-+                       __asm__ __volatile__(
-+                               ".set\tmips3\n\t"
-+                               "sync\n\t"
-+                               "wait\n\t"
-+                               ".set\tmips0");
-+                       while (1);
-+               }
++               /* 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:
-+       /* Enable 4785 DLL */
-+       if (sb_chip(sbh) == BCM4785_CHIP_ID) {
-+               uint32 tmp;
-+
-+               /* set mask to 1e, enable DLL (bit 0) */
-+               *dll_ctrl |= 0x0041e021;
-+
-+               /* enable aggressive hardware mode */
-+               *dll_ctrl |= 0x00000080;
-+
-+               /* wait for lock flag to clear */
-+               while ((*dll_ctrl & 0x2) == 0);
-+
-+               /* clear sticky flags (clear on write 1) */
-+               tmp = *dll_ctrl;
-+               *dll_ctrl = tmp;
-+
-+               /* set mask to 5b'10001 */
-+               *dll_ctrl = (*dll_ctrl & 0xfffc1fff) | 0x00022000;
-+
-+               /* enable sync mode */
-+               MTC0(C0_BROADCOM, 4, MFC0(C0_BROADCOM, 4) & 0xfe3fffff);
-+               (void)MFC0(C0_BROADCOM, 4);
-+       }
-+
 +       /* switch back to previous core */
 +       sb_setcoreidx(sbh, idx);
@@ -11060 +7705 @@
 +}
 +
-+void
-+BCMINITFN(enable_pfc)(uint32 mode)
-+{
-+       ulong start, end;
-+       uint ic_size, ic_lsize;
-+
-+       /* If auto then choose the correct mode for this
-+        * platform, currently we only ever select one mode
-+        */
-+       if (mode == PFC_AUTO)
-+               mode = PFC_INST;
-+
-+       icache_probe(MFC0(C0_CONFIG, 1), &ic_size, &ic_lsize);
-+
-+       /* enable prefetch cache if available */
-+       if (MFC0(C0_BROADCOM, 0) & BRCM_PFC_AVAIL) {
-+               start = ((ulong) &&setpfc_start) & ~(ic_lsize - 1);
-+               end = ((ulong) &&setpfc_end + (ic_lsize - 1)) & ~(ic_lsize - 1);
-+
-+               /* Preload setpfc code into the cache one line at a time */
-+               while (start < end) {
-+                       cache_op(start, Fill_I);
-+                       start += ic_lsize;
-+               }
-+
-+               /* Now set the pfc */
-+       setpfc_start:
-+               /* write range */
-+               *(volatile uint32 *)PFC_CR1 = 0xffff0000;
-+
-+               /* enable */
-+               *(volatile uint32 *)PFC_CR0 = mode;
-+       setpfc_end:
-+               /* Compiler foder */
-+               ic_size = 0;
-+       }
-+}
 +
 +/* returns the ncdl value to be programmed into sdram_ncdl for calibration */
 +uint32
-+BCMINITFN(sb_memc_get_ncdl)(sb_t *sbh)
-+{
-+       osl_t *osh;
++BCMINITFN(sb_memc_get_ncdl)(void *sbh)
++{
 +       sbmemcregs_t *memc;
 +       uint32 ret = 0;
@@ -11108 +7715 @@
 +       uint idx, rev;
 +
-+       osh = sb_osh(sbh);
-+
 +       idx = sb_coreidx(sbh);
 +
@@ -11118 +7723 @@
 +       rev = sb_corerev(sbh);
 +
-+       config = R_REG(osh, &memc->config);
-+       wr = R_REG(osh, &memc->wrncdlcor);
-+       rd = R_REG(osh, &memc->rdncdlcor);
-+       misc = R_REG(osh, &memc->miscdlyctl);
-+       dqsg = R_REG(osh, &memc->dqsgatencdl);
++       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;
++       wr &= MEMC_WRNCDLCOR_WR_MASK; 
 +       dqsg &= MEMC_DQSGATENCDL_G_MASK;
 +
@@ -11131 +7736 @@
 +               ret = (wr << 16) | (rd << 8) | dqsg;
 +       } else {
-+               if (rev > 0)
++               if ((rev > 0) || (sb_chip(sbh) == BCM5365_DEVICE_ID))
 +                       cd = rd;
 +               else
@@ -11147 +7752 @@
 +}
 +
-+#if defined(BCMPERFSTATS)
-+/*
-+ * CP0 Register 25 supports 4 semi-independent 32bit performance counters.
-+ * $25 select 0, 1, 2, and 3 are the counters.  The counters *decrement* (who thought this one up?)
-+ * $25 select 4 and 5 each contain 2-16bit control fields, one for each of the 4 counters
-+ * $25 select 6 is the global perf control register.
-+ */
-+/* enable and start instruction counting */
-+
-+void
-+hndmips_perf_instrcount_enable()
-+{
-+       MTC0(C0_PERFORMANCE, 6, 0x80000200);    /* global enable perf counters */
-+       MTC0(C0_PERFORMANCE, 4,
-+            0x8044 | MFC0(C0_PERFORMANCE, 4)); /* enable instruction counting for counter 0 */
-+       MTC0(C0_PERFORMANCE, 0, 0);             /* zero counter zero */
-+}
-+
-+/* enable and start I$ hit and I$ miss counting */
-+void
-+hndmips_perf_icachecount_enable(void)
-+{
-+       MTC0(C0_PERFORMANCE, 6, 0x80000218);    /* enable I$ counting */
-+       MTC0(C0_PERFORMANCE, 4, 0x80148018);    /* count I$ hits in cntr 0 and misses in cntr 1 */
-+       MTC0(C0_PERFORMANCE, 0, 0);             /* zero counter 0 - # I$ hits */
-+       MTC0(C0_PERFORMANCE, 1, 0);             /* zero counter 1 - # I$ misses */
-+}
-+
-+/* enable and start D$ hit and I$ miss counting */
-+void
-+hndmips_perf_dcachecount_enable(void)
-+{
-+       MTC0(C0_PERFORMANCE, 6, 0x80000211);    /* enable D$ counting */
-+       MTC0(C0_PERFORMANCE, 4, 0x80248028);    /* count D$ hits in cntr 0 and misses in cntr 1 */
-+       MTC0(C0_PERFORMANCE, 0, 0);             /* zero counter 0 - # D$ hits */
-+       MTC0(C0_PERFORMANCE, 1, 0);             /* zero counter 1 - # D$ misses */
-+}
-+
-+void
-+hndmips_perf_icache_miss_enable()
-+{
-+       MTC0(C0_PERFORMANCE, 4,
-+            0x80140000 | MFC0(C0_PERFORMANCE, 4)); /* enable cache misses counting for counter 1 */
-+       MTC0(C0_PERFORMANCE, 1, 0); /* zero counter one */
-+}
-+
-+
-+void
-+hndmips_perf_icache_hit_enable()
-+{
-+       MTC0(C0_PERFORMANCE, 5, 0x8018 | MFC0(C0_PERFORMANCE, 5));
-+       /* enable cache hits counting for counter 2 */
-+       MTC0(C0_PERFORMANCE, 2, 0);             /* zero counter 2 */
-+}
++/* returns the PFC values to be used based on the chip ID*/
 +
 +uint32
-+hndmips_perf_read_instrcount()
-+{
-+       return -(long)(MFC0(C0_PERFORMANCE, 0));
-+}
-+
-+uint32
-+hndmips_perf_read_cache_miss()
-+{
-+       return -(long)(MFC0(C0_PERFORMANCE, 1));
-+}
-+
-+uint32
-+hndmips_perf_read_cache_hit()
-+{
-+       return -(long)(MFC0(C0_PERFORMANCE, 2));
-+}
-+
-+#endif /* BCMINTERNAL | BCMPERFSTATS */
-diff -urN linux.old/arch/mips/bcm947xx/sbpci.c linux.dev/arch/mips/bcm947xx/sbpci.c
---- linux.old/arch/mips/bcm947xx/sbpci.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/sbpci.c        2006-05-02 17:37:13.000000000 +0200
-@@ -0,0 +1,768 @@
++BCMINITFN(sb_mips_get_pfc)(void *sbh)
++{
++       if (BCMINIT(sb_chip)(sbh) == BCM5350_DEVICE_ID) 
++               return 0x11;
++       else 
++               return 0x15;
++}
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/sbpci.c linux-2.4.32-freewrt/arch/mips/bcm947xx/sbpci.c
+--- linux-2.4.32/arch/mips/bcm947xx/sbpci.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/sbpci.c     2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,588 @@
 +/*
 + * Low-Level PCI and SB support for BCM47xx
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -11236 +7777 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: hndpci.c,v 1.1.1.3 2006/04/08 06:13:39 honor Exp $
++ * $Id: sbpci.c,v 1.7 2005/03/07 08:35:32 kanki Exp $
 + */
 +
 +#include <typedefs.h>
-+#include <osl.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 <sbpci.h>
-+#include <bcmendian.h>
 +#include <bcmnvram.h>
-+#include <hndcpu.h>
 +#include <hndmips.h>
-+#include <hndpci.h>
-+
-+/* debug/trace */
-+#ifdef BCMDBG_PCI
-+#define        PCI_MSG(args)   printf args
-+#else
-+#define        PCI_MSG(args)
-+#endif /* BCMDBG_PCI */
 +
 +/* Can free sbpci_init() memory after boot */
 +#ifndef linux
 +#define __init
-+#endif /* linux */
++#endif
 +
 +/* Emulated configuration space */
-+typedef struct {
-+       int     n;
-+       uint    size0;
-+       uint    size1;
-+       uint    size2;
-+       uint    size3;
-+} sb_bar_cfg_t;
 +static pci_config_regs sb_config_regs[SB_MAXCORES];
-+static sb_bar_cfg_t sb_bar_cfg[SB_MAXCORES];
-+
-+/* Links to emulated and real PCI configuration spaces */
-+#define MAXFUNCS  2
-+typedef struct {
-+       pci_config_regs *emu;   /* emulated PCI config */
-+       pci_config_regs *pci;   /* real PCI config */
-+       sb_bar_cfg_t *bar;      /* region sizes */
-+} sb_pci_cfg_t;
-+static sb_pci_cfg_t sb_pci_cfg[SB_MAXCORES][MAXFUNCS];
-+
-+/* Special emulated config space for non-existing device */
-+static pci_config_regs sb_pci_null = { 0xffff, 0xffff };
 +
 +/* Banned cores */
-+static uint16 pci_ban[SB_MAXCORES] = { 0 };
++static uint16 pci_ban[32] = { 0 };
 +static uint pci_banned = 0;
 +
@@ -11297 +7809 @@
 +/* Disable PCI host core */
 +static bool pci_disabled = FALSE;
-+
-+/* Host bridge slot #, default to 0 */
-+static uint8 pci_hbslot = 0;
-+
-+/* Internal macros */
-+#define PCI_SLOTAD_MAP 16      /* SLOT<n> mapps to AD<n+16> */
-+#define PCI_HBSBCFG_REV        8       /* MIN. core rev. required to
-+                                * access host bridge PCI cfg space
-+                                * from SB
-+                                */
 +
 +/*
@@ -11313 +7815 @@
 +
 +/* Assume one-hot slot wiring */
-+#define PCI_SLOT_MAX 16        /* Max. PCI Slots */
++#define PCI_SLOT_MAX 16
 +
 +static uint32
-+config_cmd(sb_t *sbh, uint bus, uint dev, uint func, uint off)
++config_cmd(void *sbh, uint bus, uint dev, uint func, uint off)
 +{
 +       uint coreidx;
 +       sbpciregs_t *regs;
 +       uint32 addr = 0;
-+       osl_t *osh;
 +
 +       /* CardBusMode supports only one device */
 +       if (cardbus && dev > 1)
 +               return 0;
-+
-+       osh = sb_osh(sbh);
 +
 +       coreidx = sb_coreidx(sbh);
@@ -11336 +7835 @@
 +               /* Skip unwired slots */
 +               if (dev < PCI_SLOT_MAX) {
-+                       uint32 win;
-+
 +                       /* Slide the PCI window to the appropriate slot */
-+                       win = (SBTOPCI_CFG0 | ((1 << (dev + PCI_SLOTAD_MAP)) & SBTOPCI1_MASK));
-+                       W_REG(osh, &regs->sbtopci1, win);
-+                       addr = SB_PCI_CFG |
-+                               ((1 << (dev + PCI_SLOTAD_MAP)) & ~SBTOPCI1_MASK) |
-+                               (func << PCICFG_FUN_SHIFT) |
-+                               (off & ~3);
++                       W_REG(&regs->sbtopci1, SBTOPCI_CFG0 | ((1 << (dev + 16)) & SBTOPCI1_MASK));
++                       addr = SB_PCI_CFG | ((1 << (dev + 16)) & ~SBTOPCI1_MASK) |
++                               (func << 8) | (off & ~3);
 +               }
-+       } else {
-+               /* Type 1 transaction */
-+               W_REG(osh, &regs->sbtopci1, SBTOPCI_CFG1);
-+               addr = SB_PCI_CFG |
-+                       (bus << PCICFG_BUS_SHIFT) |
-+                       (dev << PCICFG_SLOT_SHIFT) |
-+                       (func << PCICFG_FUN_SHIFT) |
-+                       (off & ~3);
++       }
++
++       /* Type 1 transaction */
++       else {
++               W_REG(&regs->sbtopci1, SBTOPCI_CFG1);
++               addr = SB_PCI_CFG | (bus << 16) | (dev << 11) | (func << 8) | (off & ~3);
 +       }
 +
@@ -11361 +7853 @@
 +}
 +
-+/*
-+ * Read host bridge PCI config registers from Silicon Backplane (>=rev8).
-+ *
-+ * It returns TRUE to indicate that access to the host bridge's pci config
-+ * from SB is ok, and values in 'addr' and 'val' are valid.
-+ *
-+ * It can only read registers at multiple of 4-bytes. Callers must pick up
-+ * needed bytes from 'val' based on 'off' value. Value in 'addr' reflects
-+ * the register address where value in 'val' is read.
-+ */
-+static bool
-+sb_pcihb_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off,
-+                  uint32 **addr, uint32 *val)
-+{
-+       sbpciregs_t *regs;
-+       osl_t *osh;
-+       uint coreidx;
-+       bool ret = FALSE;
-+
-+       /* sanity check */
-+       ASSERT(bus == 1);
-+       ASSERT(dev == pci_hbslot);
-+       ASSERT(func == 0);
-+
-+       osh = sb_osh(sbh);
-+
-+       /* read pci config when core rev >= 8 */
-+       coreidx = sb_coreidx(sbh);
-+       regs = (sbpciregs_t *)sb_setcore(sbh, SB_PCI, 0);
-+       if (regs && sb_corerev(sbh) >= PCI_HBSBCFG_REV) {
-+               *addr = (uint32 *)&regs->pcicfg[func][off >> 2];
-+               *val = R_REG(osh, *addr);
-+               ret = TRUE;
-+       }
-+       sb_setcoreidx(sbh, coreidx);
-+
-+       return ret;
-+}
-+
-+int
-+extpci_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
-+{
-+       uint32 addr = 0, *reg = NULL, val;
++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;
 +
-+       /*
-+        * Set value to -1 when:
-+        *      flag 'pci_disabled' is true;
-+        *      value of 'addr' is zero;
-+        *      REG_MAP() fails;
-+        *      BUSPROBE() fails;
-+        */
-+       if (pci_disabled)
++       if (pci_disabled ||
++           !(addr = config_cmd(sbh, bus, dev, func, off)) ||
++           !(reg = (uint32 *) REG_MAP(addr, len)) ||
++           BUSPROBE(val, reg))
 +               val = 0xffffffff;
-+       else if (bus == 1 && dev == pci_hbslot && func == 0 &&
-+                sb_pcihb_read_config(sbh, bus, dev, func, off, &reg, &val))
-+               ;
-+       else if (((addr = config_cmd(sbh, bus, dev, func, off)) == 0) ||
-+                ((reg = (uint32 *)REG_MAP(addr, len)) == 0) ||
-+                (BUSPROBE(val, reg) != 0))
-+               val = 0xffffffff;
-+
-+       PCI_MSG(("%s: 0x%x <= 0x%p(0x%x), len %d, off 0x%x, buf 0x%p\n",
-+              __FUNCTION__, val, reg, addr, len, off, buf));
 +
 +       val >>= 8 * (off & 3);
@@ -11436 +7875 @@
 +               ret = -1;
 +
-+       if (reg && addr)
++       if (reg)
 +               REG_UNMAP(reg);
 +
@@ -11442 +7881 @@
 +}
 +
-+int
-+extpci_write_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
-+{
-+       osl_t *osh;
-+       uint32 addr = 0, *reg = NULL, val;
++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;
 +
-+       osh = sb_osh(sbh);
-+
-+       /*
-+        * Ignore write attempt when:
-+        *      flag 'pci_disabled' is true;
-+        *      value of 'addr' is zero;
-+        *      REG_MAP() fails;
-+        *      BUSPROBE() fails;
-+        */
-+       if (pci_disabled)
-+               return 0;
-+       else if (bus == 1 && dev == pci_hbslot && func == 0 &&
-+                sb_pcihb_read_config(sbh, bus, dev, func, off, &reg, &val))
-+               ;
-+       else if (((addr = config_cmd(sbh, bus, dev, func, off)) == 0) ||
-+                ((reg = (uint32 *) REG_MAP(addr, len)) == 0) ||
-+                (BUSPROBE(val, reg) != 0))
++       if (pci_disabled ||
++           !(addr = config_cmd(sbh, bus, dev, func, off)) ||
++           !(reg = (uint32 *) REG_MAP(addr, len)) ||
++           BUSPROBE(val, reg))
 +               goto done;
 +
@@ -11476 +7901 @@
 +               val &= ~(0xff << (8 * (off & 3)));
 +               val |= *((uint8 *) buf) << (8 * (off & 3));
-+       } else {
++       } else
 +               ret = -1;
-+               goto done;
-+       }
-+
-+       PCI_MSG(("%s: 0x%x => 0x%p\n", __FUNCTION__, val, reg));
-+
-+       W_REG(osh, reg, val);
-+
-+done:
-+       if (reg && addr)
++
++       W_REG(reg, val);
++
++ done:
++       if (reg)
 +               REG_UNMAP(reg);
 +
 +       return ret;
-+}
-+
-+/*
-+ * Must access emulated PCI configuration at these locations even when
-+ * the real PCI config space exists and is accessible.
-+ *
-+ * PCI_CFG_VID (0x00)
-+ * PCI_CFG_DID (0x02)
-+ * PCI_CFG_PROGIF (0x09)
-+ * PCI_CFG_SUBCL  (0x0a)
-+ * PCI_CFG_BASECL (0x0b)
-+ * PCI_CFG_HDR (0x0e)
-+ * PCI_CFG_INT (0x3c)
-+ * PCI_CFG_PIN (0x3d)
-+ */
-+#define FORCE_EMUCFG(off, len) \
-+       ((off == PCI_CFG_VID) || (off == PCI_CFG_DID) || \
-+        (off == PCI_CFG_PROGIF) || \
-+        (off == PCI_CFG_SUBCL) || (off == PCI_CFG_BASECL) || \
-+        (off == PCI_CFG_HDR) || \
-+        (off == PCI_CFG_INT) || (off == PCI_CFG_PIN))
-+
-+/* Sync the emulation registers and the real PCI config registers. */
-+static void
-+sb_pcid_read_config(sb_t *sbh, uint coreidx, sb_pci_cfg_t *cfg,
-+                    uint off, uint len)
-+{
-+       osl_t *osh;
-+       uint oldidx;
-+
-+       ASSERT(cfg);
-+       ASSERT(cfg->emu);
-+       ASSERT(cfg->pci);
-+
-+       /* decide if real PCI config register access is necessary */
-+       if (FORCE_EMUCFG(off, len))
-+               return;
-+
-+       osh = sb_osh(sbh);
-+
-+       /* access to the real pci config space only when the core is up */
-+       oldidx = sb_coreidx(sbh);
-+       sb_setcoreidx(sbh, coreidx);
-+       if (sb_iscoreup(sbh)) {
-+               if (len == 4)
-+                       *(uint32 *)((ulong)cfg->emu + off) =
-+                               htol32(R_REG(osh, (uint32 *)((ulong)cfg->pci + off)));
-+               else if (len == 2)
-+                       *(uint16 *)((ulong)cfg->emu + off) =
-+                               htol16(R_REG(osh, (uint16 *)((ulong)cfg->pci + off)));
-+               else if (len == 1)
-+                       *(uint8 *)((ulong)cfg->emu + off) =
-+                               R_REG(osh, (uint8 *)((ulong)cfg->pci + off));
-+       }
-+       sb_setcoreidx(sbh, oldidx);
-+}
-+
-+static void
-+sb_pcid_write_config(sb_t *sbh, uint coreidx, sb_pci_cfg_t *cfg,
-+                     uint off, uint len)
-+{
-+       osl_t *osh;
-+       uint oldidx;
-+
-+       ASSERT(cfg);
-+       ASSERT(cfg->emu);
-+       ASSERT(cfg->pci);
-+
-+       osh = sb_osh(sbh);
-+
-+       /* decide if real PCI config register access is necessary */
-+       if (FORCE_EMUCFG(off, len))
-+               return;
-+
-+       /* access to the real pci config space only when the core is up */
-+       oldidx = sb_coreidx(sbh);
-+       sb_setcoreidx(sbh, coreidx);
-+       if (sb_iscoreup(sbh)) {
-+               if (len == 4)
-+                       W_REG(osh, (uint32 *)((ulong)cfg->pci + off),
-+                             ltoh32(*(uint32 *)((ulong)cfg->emu + off)));
-+               else if (len == 2)
-+                       W_REG(osh, (uint16 *)((ulong)cfg->pci + off),
-+                             ltoh16(*(uint16 *)((ulong)cfg->emu + off)));
-+               else if (len == 1)
-+                       W_REG(osh, (uint8 *)((ulong)cfg->pci + off),
-+                             *(uint8 *)((ulong)cfg->emu + off));
-+       }
-+       sb_setcoreidx(sbh, oldidx);
 +}
 +
@@ -11584 +7916 @@
 + * Functions for accessing translated SB configuration space
 + */
++
 +static int
-+sb_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
++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 || func >= MAXFUNCS || (off + len) > sizeof(pci_config_regs))
++       if (dev >= SB_MAXCORES || (off + len) > sizeof(pci_config_regs))
 +               return -1;
-+       cfg = sb_pci_cfg[dev][func].emu;
++       cfg = &sb_config_regs[dev];
 +
 +       ASSERT(ISALIGNED(off, len));
 +       ASSERT(ISALIGNED((uintptr)buf, len));
-+
-+       /* use special config space if the device does not exist */
-+       if (!cfg)
-+               cfg = &sb_pci_null;
-+       /* sync emulation with real PCI config if necessary */
-+       else if (sb_pci_cfg[dev][func].pci)
-+               sb_pcid_read_config(sbh, dev, &sb_pci_cfg[dev][func], off, len);
 +
 +       if (len == 4)
@@ -11616 +7942 @@
 +
 +static int
-+sb_write_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
-+{
-+       uint coreidx;
++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;
-+       osl_t *osh;
-+       sb_bar_cfg_t *bar;
-+
-+       if (dev >= SB_MAXCORES || func >= MAXFUNCS || (off + len) > sizeof(pci_config_regs))
++
++       if (dev >= SB_MAXCORES || (off + len) > sizeof(pci_config_regs))
 +               return -1;
-+       cfg = sb_pci_cfg[dev][func].emu;
-+       if (!cfg)
-+               return -1;
++       cfg = &sb_config_regs[dev];
 +
 +       ASSERT(ISALIGNED(off, len));
 +       ASSERT(ISALIGNED((uintptr)buf, len));
 +
-+       osh = sb_osh(sbh);
-+
 +       /* Emulate BAR sizing */
-+       if (off >= OFFSETOF(pci_config_regs, base[0]) &&
-+           off <= OFFSETOF(pci_config_regs, base[3]) &&
++       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))) {
-+                       bar = sb_pci_cfg[dev][func].bar;
++                       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] = ~(bar->size0 - 1);
-+                       else if (off == OFFSETOF(pci_config_regs, base[1]) && bar->n >= 1)
-+                               cfg->base[1] = ~(bar->size1 - 1);
-+                       else if (off == OFFSETOF(pci_config_regs, base[2]) && bar->n >= 2)
-+                               cfg->base[2] = ~(bar->size2 - 1);
-+                       else if (off == OFFSETOF(pci_config_regs, base[3]) && bar->n >= 3)
-+                               cfg->base[3] = ~(bar->size3 - 1);
++                               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);
-+       }
-+       else if (len == 4)
++               return 0;
++       }
++
++       if (len == 4)
 +               *((uint32 *)((ulong) cfg + off)) = htol32(*((uint32 *) buf));
 +       else if (len == 2)
@@ -11663 +7986 @@
 +               return -1;
 +
-+       /* sync emulation with real PCI config if necessary */
-+       if (sb_pci_cfg[dev][func].pci)
-+               sb_pcid_write_config(sbh, dev, &sb_pci_cfg[dev][func], off, len);
-+
 +       return 0;
 +}
 +
 +int
-+sbpci_read_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
++sbpci_read_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
 +{
 +       if (bus == 0)
@@ -11680 +7999 @@
 +
 +int
-+sbpci_write_config(sb_t *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
++sbpci_write_config(void *sbh, uint bus, uint dev, uint func, uint off, void *buf, int len)
 +{
 +       if (bus == 0)
@@ -11695 +8014 @@
 +}
 +
-+/*
-+ * Initiliaze PCI core. Return 0 after a successful initialization.
-+ * Otherwise return -1 to indicate there is no PCI core and return 1
-+ * to indicate PCI core is disabled.
-+ */
-+int __init
-+sbpci_init_pci(sb_t *sbh)
++static int
++sbpci_init_pci(void *sbh)
 +{
 +       uint chip, chiprev, chippkg, host;
@@ -11707 +8021 @@
 +       sbpciregs_t *pci;
 +       sbconfig_t *sb;
++       int CT4712_WR;
 +       uint32 val;
-+       int ret = 0;
-+       char *hbslot;
-+       osl_t *osh;
 +
 +       chip = sb_chip(sbh);
@@ -11716 +8028 @@
 +       chippkg = sb_chippkg(sbh);
 +
-+       osh = sb_osh(sbh);
-+
 +       if (!(pci = (sbpciregs_t *) sb_setcore(sbh, SB_PCI, 0))) {
-+               printk("PCI: no core\n");
++               printf("PCI: no core\n");
 +               pci_disabled = TRUE;
 +               return -1;
 +       }
-+
-+       if ((chip == 0x4310) && (chiprev == 0))
++       sb_core_reset(sbh, 0);
++
++       boardflags = (uint32) getintvar(NULL, "boardflags");
++
++       if ((chip == BCM4310_DEVICE_ID) && (chiprev == 0))
 +               pci_disabled = TRUE;
-+       
-+       sb = (sbconfig_t *)((ulong) pci + SBCONFIGOFF);
-+
-+       boardflags = (uint32) getintvar(NULL, "boardflags");
 +
 +       /*
@@ -11736 +8045 @@
 +        * floating.
 +        */
-+       if (((chip == BCM4712_CHIP_ID) &&
++       if (((chip == BCM4712_DEVICE_ID) &&
 +            ((chippkg == BCM4712SMALL_PKG_ID) ||
 +             (chippkg == BCM4712MID_PKG_ID))) ||
 +           (boardflags & BFL_NOPCI))
 +               pci_disabled = TRUE;
-+
-+       /* Enable the core */
-+       sb_core_reset(sbh, 0, 0);
 +
 +       /*
@@ -11757 +8063 @@
 +
 +       if (!host) {
-+               ret = 1;
-+
 +               /* Disable PCI interrupts in client mode */
-+               W_REG(osh, &sb->sbintvec, 0);
++               sb = (sbconfig_t *)((ulong) pci + SBCONFIGOFF);
++               W_REG(&sb->sbintvec, 0);
 +
 +               /* Disable the PCI bridge in client mode */
 +               sbpci_ban(SB_PCI);
-+               sb_core_disable(sbh, 0);
-+
-+               printk("PCI: Disabled\n");
++               printf("PCI: Disabled\n");
 +       } else {
-+               printk("PCI: Initializing host\n");
-+
-+               /* Disable PCI SBReqeustTimeout for BCM4785 */
-+               if (chip == BCM4785_CHIP_ID) {
-+                       AND_REG(osh, &sb->sbimconfiglow, ~0x00000070);
-+                       sb_commit(sbh);
++               /* 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(150);                         /* 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);
 +               }
 +
-+               /* Reset the external PCI bus and enable the clock */
-+               W_REG(osh, &pci->control, 0x5);         /* enable the tristate drivers */
-+               W_REG(osh, &pci->control, 0xd);         /* enable the PCI clock */
-+               OSL_DELAY(150);                         /* delay > 100 us */
-+               W_REG(osh, &pci->control, 0xf);         /* deassert PCI reset */
-+               /* Use internal arbiter and park REQ/GRNT at external master 0 */
-+               W_REG(osh, &pci->arbcontrol, PCI_INT_ARB);
-+               OSL_DELAY(1);                           /* delay 1 us */
-+               if (sb_corerev(sbh) >= 8) {
-+                       val = getintvar(NULL, "parkid");
-+                       ASSERT(val <= PCI_PARKID_LAST);
-+                       OR_REG(osh, &pci->arbcontrol, val << PCI_PARKID_SHIFT);
-+                       OSL_DELAY(1);
-+               }
-+
-+               /* Enable CardBusMode */
-+               cardbus = getintvar(NULL, "cardbus") == 1;
-+               if (cardbus) {
-+                       printk("PCI: Enabling CardBus\n");
-+                       /* GPIO 1 resets the CardBus device on bcm94710ap */
-+                       sb_gpioout(sbh, 1, 1, GPIO_DRV_PRIORITY);
-+                       sb_gpioouten(sbh, 1, 1, GPIO_DRV_PRIORITY);
-+                       W_REG(osh, &pci->sprom[0], R_REG(osh, &pci->sprom[0]) | 0x400);
-+               }
-+
 +               /* 64 MB I/O access window */
-+               W_REG(osh, &pci->sbtopci0, SBTOPCI_IO);
++               W_REG(&pci->sbtopci0, SBTOPCI_IO);
 +               /* 64 MB configuration access window */
-+               W_REG(osh, &pci->sbtopci1, SBTOPCI_CFG0);
++               W_REG(&pci->sbtopci1, SBTOPCI_CFG0);
 +               /* 1 GB memory access window */
-+               W_REG(osh, &pci->sbtopci2, SBTOPCI_MEM | SB_PCI_DMA);
-+
-+               /* Host bridge slot # nvram overwrite */
-+               if ((hbslot = nvram_get("pcihbslot"))) {
-+                       pci_hbslot = bcm_strtoul(hbslot, NULL, 0);
-+                       ASSERT(pci_hbslot < PCI_MAX_DEVICES);
-+               }
++               W_REG(&pci->sbtopci2, SBTOPCI_MEM | SB_PCI_DMA);
 +
 +               /* Enable PCI bridge BAR0 prefetch and burst */
 +               val = 6;
-+               sbpci_write_config(sbh, 1, pci_hbslot, 0, PCI_CFG_CMD, &val, sizeof(val));
++               sbpci_write_config(sbh, 1, 0, 0, PCI_CFG_CMD, &val, sizeof(val));
 +
 +               /* Enable PCI interrupts */
-+               W_REG(osh, &pci->intmask, PCI_INTA);
-+       }
-+
-+       return ret;
-+}
-+
-+/*
-+ * Get the PCI region address and size information.
-+ */
-+static void __init
-+sbpci_init_regions(sb_t *sbh, uint func, pci_config_regs *cfg, sb_bar_cfg_t *bar)
-+{
-+       osl_t *osh;
-+       uint16 coreid;
++               W_REG(&pci->intmask, PCI_INTA);
++       }
++       
++       return 0;
++}
++
++static int
++sbpci_init_cores(void *sbh)
++{
++       uint chip, chiprev, chippkg, coreidx, i;
++       sbconfig_t *sb;
++       pci_config_regs *cfg;
 +       void *regs;
-+       sbconfig_t *sb;
-+       uint32 base;
-+
-+       osh     = sb_osh(sbh);
-+       coreid  = sb_coreid(sbh);
-+       regs    = sb_coreregs(sbh);
-+       sb      = (sbconfig_t *)((ulong) regs + SBCONFIGOFF);
-+
-+       switch (coreid) {
-+       case SB_USB20H:
-+               base = htol32(sb_base(R_REG(osh, &sb->sbadmatch0)));
-+
-+               cfg->base[0] = func == 0 ? base : base + 0x800;  /* OHCI/EHCI */
-+               cfg->base[1] = 0;
-+               cfg->base[2] = 0;
-+               cfg->base[3] = 0;
-+               cfg->base[4] = 0;
-+               cfg->base[5] = 0;
-+               bar->n       = 1;
-+               bar->size0   = func == 0 ? 0x200 : 0x100;  /* OHCI/EHCI */
-+               bar->size1   = 0;
-+               bar->size2   = 0;
-+               bar->size3   = 0;
-+               break;
-+       default:
-+               cfg->base[0] = htol32(sb_base(R_REG(osh, &sb->sbadmatch0)));
-+               cfg->base[1] = htol32(sb_base(R_REG(osh, &sb->sbadmatch1)));
-+               cfg->base[2] = htol32(sb_base(R_REG(osh, &sb->sbadmatch2)));
-+               cfg->base[3] = htol32(sb_base(R_REG(osh, &sb->sbadmatch3)));
-+               cfg->base[4] = 0;
-+               cfg->base[5] = 0;
-+               bar->n       = (R_REG(osh, &sb->sbidlow) & SBIDL_AR_MASK) >> SBIDL_AR_SHIFT;
-+               bar->size0   = sb_size(R_REG(osh, &sb->sbadmatch0));
-+               bar->size1   = sb_size(R_REG(osh, &sb->sbadmatch1));
-+               bar->size2   = sb_size(R_REG(osh, &sb->sbadmatch2));
-+               bar->size3   = sb_size(R_REG(osh, &sb->sbadmatch3));
-+               break;
-+       }
-+}
-+
-+/*
-+ * Construct PCI config spaces for SB cores so that they
-+ * can be accessed as if they were PCI devices.
-+ */
-+static void __init
-+sbpci_init_cores(sb_t *sbh)
-+{
-+       uint chiprev, coreidx, i;
-+       sbconfig_t *sb;
-+       pci_config_regs *cfg, *pci;
-+       sb_bar_cfg_t *bar;
-+       void *regs;
-+       osl_t *osh;
-+       uint16 vendor, device;
-+       uint16 coreid;
++       char varname[8];
++       uint wlidx = 0;
++       uint16 vendor, core;
 +       uint8 class, subclass, progif;
-+       uint dev;
-+       uint8 header;
-+       uint func;
-+
++       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);
-+
-+       osh = sb_osh(sbh);
 +
 +       /* Scan the SB bus */
 +       bzero(sb_config_regs, sizeof(sb_config_regs));
-+       bzero(sb_bar_cfg, sizeof(sb_bar_cfg));
-+       bzero(sb_pci_cfg, sizeof(sb_pci_cfg));
-+       memset(&sb_pci_null, -1, sizeof(sb_pci_null));
-+       cfg = sb_config_regs;
-+       bar = sb_bar_cfg;
-+       for (dev = 0; dev < SB_MAXCORES; dev ++) {
-+               /* Check if the core exists */
-+               if (!(regs = sb_setcoreidx(sbh, dev)))
++       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 */
-+               coreid = sb_coreid(sbh);
 +               for (i = 0; i < pci_banned; i++)
-+                       if (coreid == pci_ban[i])
++                       if (core == pci_ban[i])
 +                               break;
 +               if (i < pci_banned)
 +                       continue;
 +
-+               for (func = 0; func < MAXFUNCS; ++func) {
-+                       /* Make sure we won't go beyond the limit */
-+                       if (cfg >= &sb_config_regs[SB_MAXCORES]) {
-+                               printk("PCI: too many emulated devices\n");
-+                               goto done;
-+                       }
-+
-+                       /* Convert core id to pci id */
-+                       if (sb_corepciid(sbh, func, &vendor, &device, &class, &subclass,
-+                                        &progif, &header))
-+                               continue;
-+
-+                       /*
-+                        * Differentiate real PCI config from emulated.
-+                        * non zero 'pci' indicate there is a real PCI config space
-+                        * for this device.
-+                        */
-+                       switch (device) {
-+                       case BCM47XX_GIGETH_ID:
-+                               pci = (pci_config_regs *)((uint32)regs + 0x800);
-+                               break;
-+                       case BCM47XX_SATAXOR_ID:
-+                               pci = (pci_config_regs *)((uint32)regs + 0x400);
-+                               break;
-+                       case BCM47XX_ATA100_ID:
-+                               pci = (pci_config_regs *)((uint32)regs + 0x800);
-+                               break;
-+                       default:
-+                               pci = NULL;
-+                               break;
-+                       }
-+                       /* Supported translations */
-+                       cfg->vendor = htol16(vendor);
-+                       cfg->device = htol16(device);
-+                       cfg->rev_id = chiprev;
-+                       cfg->prog_if = progif;
-+                       cfg->sub_class = subclass;
-+                       cfg->base_class = class;
-+                       cfg->header_type = header;
-+                       sbpci_init_regions(sbh, func, cfg, bar);
-+                       /* Save core interrupt flag */
-+                       cfg->int_pin = R_REG(osh, &sb->sbtpsflag) & SBTPS_NUM0_MASK;
-+                       /* Save core interrupt assignment */
-+                       cfg->int_line = sb_irq(sbh);
-+                       /* Indicate there is no SROM */
-+                       *((uint32 *) &cfg->sprom_control) = 0xffffffff;
-+
-+                       /* Point to the PCI config spaces */
-+                       sb_pci_cfg[dev][func].emu = cfg;
-+                       sb_pci_cfg[dev][func].pci = pci;
-+                       sb_pci_cfg[dev][func].bar = bar;
-+                       cfg ++;
-+                       bar ++;
-+               }
-+       }
-+
-+done:
-+       sb_setcoreidx(sbh, coreidx);
-+}
-+
-+/*
-+ * Initialize PCI core and construct PCI config spaces for SB cores.
-+ * Must propagate sbpci_init_pci() return value to the caller to let
-+ * them know the PCI core initialization status.
-+ */
-+int __init
-+sbpci_init(sb_t *sbh)
-+{
-+       int status = sbpci_init_pci(sbh);
-+       sbpci_init_cores(sbh);
-+       return status;
-+}
-+
-diff -urN linux.old/arch/mips/bcm947xx/sbutils.c linux.dev/arch/mips/bcm947xx/sbutils.c
---- linux.old/arch/mips/bcm947xx/sbutils.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/sbutils.c      2006-05-02 04:33:16.000000000 +0200
-@@ -0,0 +1,3081 @@
-+/*
-+ * Misc utility routines for accessing chip-specific features
-+ * of the SiliconBackplane-based Broadcom chips.
-+ *
-+ * Copyright 2006, 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.10 2006/04/08 07:12:42 honor Exp $
-+ */
-+
-+#include <typedefs.h>
-+#include <bcmdefs.h>
-+#include <osl.h>
-+#include <bcmutils.h>
-+#include <sbutils.h>
-+#include <bcmdevs.h>
-+#include <sbconfig.h>
-+#include <sbchipc.h>
-+#include <sbpci.h>
-+#include <sbpcie.h>
-+#include <pcicfg.h>
-+#include <sbpcmcia.h>
-+#include <sbextif.h>
-+#include <sbsocram.h>
-+#include <bcmsrom.h>
-+#ifdef __mips__
-+#include <mipsinc.h>
-+#endif /* __mips__ */
-+
-+/* debug/trace */
-+#define        SB_ERROR(args)
-+
-+typedef uint32 (*sb_intrsoff_t)(void *intr_arg);
-+typedef void (*sb_intrsrestore_t)(void *intr_arg, uint32 arg);
-+typedef bool (*sb_intrsenabled_t)(void *intr_arg);
-+
-+/* misc sb info needed by some of the routines */
-+typedef struct sb_info {
-+
-+       struct sb_pub   sb;             /* back plane public state (must be first field) */
-+
-+       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 */
-+
-+       bool    memseg;                 /* flag to toggle MEM_SEG register */
-+
-+       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;            /* turns chip interrupts off */
-+       sb_intrsrestore_t       intrsrestore_fn;        /* restore chip interrupts */
-+       sb_intrsenabled_t       intrsenabled_fn;        /* check if interrupts are enabled */
-+
-+} sb_info_t;
-+
-+/* local prototypes */
-+static sb_info_t * sb_doattach(sb_info_t *si, uint devid, osl_t *osh, void *regs,
-+       uint bustype, void *sdh, char **vars, uint *varsz);
-+static void sb_scan(sb_info_t *si);
-+static uint sb_corereg(sb_info_t *si, uint coreidx, uint regoff, uint mask, uint val);
-+static uint _sb_coreidx(sb_info_t *si);
-+static uint sb_findcoreidx(sb_info_t *si, uint coreid, uint coreunit);
-+static uint sb_pcidev2chip(uint pcidev);
-+static uint sb_chip2numcores(uint chip);
-+static bool sb_ispcie(sb_info_t *si);
-+static bool sb_find_pci_capability(sb_info_t *si, uint8 req_cap_id, uchar *buf, uint32 *buflen);
-+static int sb_pci_fixcfg(sb_info_t *si);
-+
-+/* routines to access mdio slave device registers */
-+static int sb_pcie_mdiowrite(sb_info_t *si,  uint physmedia, uint readdr, uint val);
-+static void sb_war30841(sb_info_t *si);
-+
-+/* delay needed between the mdio control/ mdiodata register data access */
-+#define PR28829_DELAY() OSL_DELAY(10)
-+
-+/* size that can take bitfielddump */
-+#define BITFIELD_DUMP_SIZE  32
-+
-+/* global variable to indicate reservation/release of gpio's */
-+static uint32 sb_gpioreservation = 0;
-+
-+#define        SB_INFO(sbh)    (sb_info_t*)sbh
-+#define        SET_SBREG(si, r, mask, val)     \
-+               W_SBREG((si), (r), ((R_SBREG((si), (r)) & ~(mask)) | (val)))
-+#define        GOODCOREADDR(x) (((x) >= SB_ENUM_BASE) && ((x) <= SB_ENUM_LIM) && \
-+               ISALIGNED((x), SB_CORE_SIZE))
-+#define        GOODREGS(regs)  ((regs) && ISALIGNED((uintptr)(regs), SB_CORE_SIZE))
-+#define        REGS2SB(va)     (sbconfig_t*) ((int8*)(va) + SBCONFIGOFF)
-+#define        GOODIDX(idx)    (((uint)idx) < SB_MAXCORES)
-+#define        BADIDX          (SB_MAXCORES+1)
-+#define        NOREV           -1              /* Invalid rev */
-+
-+#define PCI(si)                ((BUSTYPE(si->sb.bustype) == PCI_BUS) && (si->sb.buscoretype == SB_PCI))
-+#define PCIE(si)       ((BUSTYPE(si->sb.bustype) == PCI_BUS) && (si->sb.buscoretype == SB_PCIE))
-+
-+/* sonicsrev */
-+#define        SONICS_2_2      (SBIDL_RV_2_2 >> SBIDL_RV_SHIFT)
-+#define        SONICS_2_3      (SBIDL_RV_2_3 >> SBIDL_RV_SHIFT)
-+
-+#define        R_SBREG(si, sbr)        sb_read_sbreg((si), (sbr))
-+#define        W_SBREG(si, sbr, v)     sb_write_sbreg((si), (sbr), (v))
-+#define        AND_SBREG(si, sbr, v)   W_SBREG((si), (sbr), (R_SBREG((si), (sbr)) & (v)))
-+#define        OR_SBREG(si, sbr, v)    W_SBREG((si), (sbr), (R_SBREG((si), (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); }
-+
-+/* dynamic clock control defines */
-+#define        LPOMINFREQ              25000           /* low power oscillator min */
-+#define        LPOMAXFREQ              43000           /* low power oscillator max */
-+#define        XTALMINFREQ             19800000        /* 20 MHz - 1% */
-+#define        XTALMAXFREQ             20200000        /* 20 MHz + 1% */
-+#define        PCIMINFREQ              25000000        /* 25 MHz */
-+#define        PCIMAXFREQ              34000000        /* 33 MHz + fudge */
-+
-+#define        ILP_DIV_5MHZ            0               /* ILP = 5 MHz */
-+#define        ILP_DIV_1MHZ            4               /* ILP = 1 MHz */
-+
-+/* different register spaces to access thr'u pcie indirect access */
-+#define PCIE_CONFIGREGS        1               /* Access to config space */
-+#define PCIE_PCIEREGS          2               /* Access to pcie registers */
-+
-+/* GPIO Based LED powersave defines */
-+#define DEFAULT_GPIO_ONTIME    10              /* Default: 10% on */
-+#define DEFAULT_GPIO_OFFTIME   90              /* Default: 10% on */
-+
-+#define DEFAULT_GPIOTIMERVAL  ((DEFAULT_GPIO_ONTIME << GPIO_ONTIME_SHIFT) | DEFAULT_GPIO_OFFTIME)
-+
-+static uint32
-+sb_read_sbreg(sb_info_t *si, volatile uint32 *sbr)
-+{
-+       uint8 tmp;
-+       uint32 val, intr_val = 0;
-+
-+
-+       /*
-+        * 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);
-+               sbr = (volatile uint32 *)((uintptr)sbr & ~(1 << 11)); /* mask out bit 11 */
-+       }
-+
-+       val = R_REG(si->osh, 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(sb_info_t *si, volatile uint32 *sbr, uint32 v)
-+{
-+       uint8 tmp;
-+       volatile uint32 dummy;
-+       uint32 intr_val = 0;
-+
-+
-+       /*
-+        * 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);
-+               sbr = (volatile uint32 *)((uintptr)sbr & ~(1 << 11)); /* mask out bit 11 */
-+       }
-+
-+       if (BUSTYPE(si->sb.bustype) == PCMCIA_BUS) {
-+#ifdef IL_BIGENDIAN
-+               dummy = R_REG(si->osh, sbr);
-+               W_REG(si->osh, ((volatile uint16 *)sbr + 1), (uint16)((v >> 16) & 0xffff));
-+               dummy = R_REG(si->osh, sbr);
-+               W_REG(si->osh, (volatile uint16 *)sbr, (uint16)(v & 0xffff));
-+#else
-+               dummy = R_REG(si->osh, sbr);
-+               W_REG(si->osh, (volatile uint16 *)sbr, (uint16)(v & 0xffff));
-+               dummy = R_REG(si->osh, sbr);
-+               W_REG(si->osh, ((volatile uint16 *)sbr + 1), (uint16)((v >> 16) & 0xffff));
-+#endif /* IL_BIGENDIAN */
-+       } else
-+               W_REG(si->osh, 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
-+ */
-+sb_t *
-+BCMINITFN(sb_attach)(uint devid, osl_t *osh, void *regs,
-+                     uint bustype, void *sdh, char **vars, uint *varsz)
-+{
-+       sb_info_t *si;
-+
-+       /* alloc sb_info_t */
-+       if ((si = MALLOC(osh, sizeof (sb_info_t))) == NULL) {
-+               SB_ERROR(("sb_attach: malloc failed! malloced %d bytes\n", MALLOCED(osh)));
-+               return (NULL);
-+       }
-+
-+       if (sb_doattach(si, devid, osh, regs, bustype, sdh, vars, (uint*)varsz) == NULL) {
-+               MFREE(osh, si, sizeof(sb_info_t));
-+               return (NULL);
-+       }
-+
-+       return (sb_t *)si;
-+}
-+
-+/* Using sb_kattach depends on SB_BUS support, either implicit  */
-+/* no limiting BCMBUSTYPE value) or explicit (value is SB_BUS). */
-+#if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SB_BUS)
-+
-+/* global kernel resource */
-+static sb_info_t ksi;
-+static bool ksi_attached = FALSE;
-+
-+/* generic kernel variant of sb_attach() */
-+sb_t *
-+BCMINITFN(sb_kattach)(void)
-+{
-+       osl_t *osh = NULL;
-+       uint32 *regs;
-+
-+       if (!ksi_attached) {
-+               uint32 cid;
-+
-+               regs = (uint32 *)REG_MAP(SB_ENUM_BASE, SB_CORE_SIZE);
-+               cid = R_REG(osh, (uint32 *)regs);
-+               if (((cid & CID_ID_MASK) == BCM4712_CHIP_ID) &&
-+                   ((cid & CID_PKG_MASK) != BCM4712LARGE_PKG_ID) &&
-+                   ((cid & CID_REV_MASK) <= (3 << CID_REV_SHIFT))) {
-+                       uint32 *scc, val;
-+
-+                       scc = (uint32 *)((uchar*)regs + OFFSETOF(chipcregs_t, slow_clk_ctl));
-+                       val = R_REG(osh, scc);
-+                       SB_ERROR(("    initial scc = 0x%x\n", val));
-+                       val |= SCC_SS_XTAL;
-+                       W_REG(osh, scc, val);
-+               }
-+
-+               if (sb_doattach(&ksi, BCM4710_DEVICE_ID, osh, (void*)regs,
-+                       SB_BUS, NULL, NULL, NULL) == NULL) {
-+                       return NULL;
-+               }
-+               else
-+                       ksi_attached = TRUE;
-+       }
-+
-+       return (sb_t *)&ksi;
-+}
-+#endif /* !BCMBUSTYPE || (BCMBUSTYPE == SB_BUS) */
-+
-+static sb_info_t  *
-+BCMINITFN(sb_doattach)(sb_info_t *si, uint devid, osl_t *osh, void *regs,
-+                       uint bustype, void *sdh, char **vars, uint *varsz)
-+{
-+       uint origidx;
-+       chipcregs_t *cc;
-+       sbconfig_t *sb;
-+       uint32 w;
-+
-+       ASSERT(GOODREGS(regs));
-+
-+       bzero((uchar*)si, sizeof(sb_info_t));
-+
-+       si->sb.buscoreidx = si->gpioidx = BADIDX;
-+
-+       si->curmap = regs;
-+       si->sdh = sdh;
-+       si->osh = osh;
-+
-+       /* check to see if we are a sb core mimic'ing a pci core */
-+       if (bustype == PCI_BUS) {
-+               if (OSL_PCI_READ_CONFIG(si->osh, PCI_SPROM_CONTROL, sizeof(uint32)) == 0xffffffff) {
-+                       SB_ERROR(("%s: incoming bus is PCI but it's a lie, switching to SB "
-+                                 "devid:0x%x\n", __FUNCTION__, devid));
-+                       bustype = SB_BUS;
-+               }
-+       }
-+
-+       si->sb.bustype = bustype;
-+       if (si->sb.bustype != BUSTYPE(si->sb.bustype)) {
-+               SB_ERROR(("sb_doattach: bus type %d does not match configured bus type %d\n",
-+                         si->sb.bustype, BUSTYPE(si->sb.bustype)));
-+               return NULL;
-+       }
-+
-+       /* need to set memseg flag for CF card first before any sb registers access */
-+       if (BUSTYPE(si->sb.bustype) == PCMCIA_BUS)
-+               si->memseg = TRUE;
-+
-+       /* kludge to enable the clock on the 4306 which lacks a slowclock */
-+       if (BUSTYPE(si->sb.bustype) == PCI_BUS)
-+               sb_clkctl_xtal(&si->sb, XTAL|PLL, ON);
-+
-+       if (BUSTYPE(si->sb.bustype) == PCI_BUS) {
-+               w = OSL_PCI_READ_CONFIG(si->osh, PCI_BAR0_WIN, sizeof(uint32));
-+               if (!GOODCOREADDR(w))
-+                       OSL_PCI_WRITE_CONFIG(si->osh, PCI_BAR0_WIN, sizeof(uint32), SB_ENUM_BASE);
-+       }
-+
-+       /* initialize current core index value */
-+       si->curidx = _sb_coreidx(si);
-+
-+       if (si->curidx == BADIDX) {
-+               SB_ERROR(("sb_doattach: bad core index\n"));
-+               return NULL;
-+       }
-+
-+       /* get sonics backplane revision */
-+       sb = REGS2SB(si->curmap);
-+       si->sb.sonicsrev = (R_SBREG(si, &sb->sbidlow) & SBIDL_RV_MASK) >> SBIDL_RV_SHIFT;
-+
-+       /* keep and reuse the initial register mapping */
-+       origidx = si->curidx;
-+       if (BUSTYPE(si->sb.bustype) == SB_BUS)
-+               si->regs[origidx] = regs;
-+
-+       /* is core-0 a chipcommon core? */
-+       si->numcores = 1;
-+       cc = (chipcregs_t*) sb_setcoreidx(&si->sb, 0);
-+       if (sb_coreid(&si->sb) != SB_CC)
-+               cc = NULL;
-+
-+       /* determine chip id and rev */
-+       if (cc) {
-+               /* chip common core found! */
-+               si->sb.chip = R_REG(si->osh, &cc->chipid) & CID_ID_MASK;
-+               si->sb.chiprev = (R_REG(si->osh, &cc->chipid) & CID_REV_MASK) >> CID_REV_SHIFT;
-+               si->sb.chippkg = (R_REG(si->osh, &cc->chipid) & CID_PKG_MASK) >> CID_PKG_SHIFT;
-+       } else {
-+               /* no chip common core -- must convert device id to chip id */
-+               if ((si->sb.chip = sb_pcidev2chip(devid)) == 0) {
-+                       SB_ERROR(("sb_doattach: unrecognized device id 0x%04x\n", devid));
-+                       sb_setcoreidx(&si->sb, origidx);
-+                       return NULL;
-+               }
-+       }
-+
-+       /* get chipcommon rev */
-+       si->sb.ccrev = cc ? (int)sb_corerev(&si->sb) : NOREV;
-+
-+       /* determine numcores */
-+       if (cc && ((si->sb.ccrev == 4) || (si->sb.ccrev >= 6)))
-+               si->numcores = (R_REG(si->osh, &cc->chipid) & CID_CC_MASK) >> CID_CC_SHIFT;
-+       else
-+               si->numcores = sb_chip2numcores(si->sb.chip);
-+
-+       /* return to original core */
-+       sb_setcoreidx(&si->sb, origidx);
-+
-+       /* sanity checks */
-+       ASSERT(si->sb.chip);
-+
-+       /* scan for cores */
-+       sb_scan(si);
-+
-+       /* fixup necessary chip/core configurations */
-+       if (BUSTYPE(si->sb.bustype) == PCI_BUS) {
-+               if (sb_pci_fixcfg(si)) {
-+                       SB_ERROR(("sb_doattach: sb_pci_fixcfg failed\n"));
-+                       return NULL;
-+               }
-+       }
-+
-+       /* srom_var_init() depends on sb_scan() info */
-+       if (srom_var_init(si, si->sb.bustype, si->curmap, si->osh, vars, varsz)) {
-+               SB_ERROR(("sb_doattach: srom_var_init failed: bad srom\n"));
-+               return (NULL);
-+       }
-+
-+       if (cc == NULL) {
-+               /*
-+                * 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 (BUSTYPE(si->sb.bustype) == PCMCIA_BUS) {
-+                       ASSERT(vars);
-+                       si->sb.chiprev = getintvar(*vars, "chiprev");
-+               } else if (BUSTYPE(si->sb.bustype) == PCI_BUS) {
-+                       w = OSL_PCI_READ_CONFIG(si->osh, PCI_CFG_REV, sizeof(uint32));
-+                       si->sb.chiprev = w & 0xff;
-+               } else
-+                       si->sb.chiprev = 0;
-+       }
-+
-+       if (BUSTYPE(si->sb.bustype) == PCMCIA_BUS) {
-+               w = getintvar(*vars, "regwindowsz");
-+               si->memseg = (w <= CFTABLE_REGWIN_2K) ? TRUE : FALSE;
-+       }
-+
-+       /* gpio control core is required */
-+       if (!GOODIDX(si->gpioidx)) {
-+               SB_ERROR(("sb_doattach: gpio control core not found\n"));
-+               return NULL;
-+       }
-+
-+       /* get boardtype and boardrev */
-+       switch (BUSTYPE(si->sb.bustype)) {
-+       case PCI_BUS:
-+               /* do a pci config read to get subsystem id and subvendor id */
-+               w = OSL_PCI_READ_CONFIG(si->osh, PCI_CFG_SVID, sizeof(uint32));
-+               si->sb.boardvendor = w & 0xffff;
-+               si->sb.boardtype = (w >> 16) & 0xffff;
-+               break;
-+
-+       case PCMCIA_BUS:
-+       case SDIO_BUS:
-+               si->sb.boardvendor = getintvar(*vars, "manfid");
-+               si->sb.boardtype = getintvar(*vars, "prodid");
-+               break;
-+
-+       case SB_BUS:
-+       case JTAG_BUS:
-+               si->sb.boardvendor = VENDOR_BROADCOM;
-+               if ((si->sb.boardtype = getintvar(NULL, "boardtype")) == 0)
-+                       si->sb.boardtype = 0xffff;
-+               break;
-+       }
-+
-+       if (si->sb.boardtype == 0) {
-+               SB_ERROR(("sb_doattach: unknown board type\n"));
-+               ASSERT(si->sb.boardtype);
-+       }
-+
-+       /* setup the GPIO based LED powersave register */
-+       if (si->sb.ccrev >= 16) {
-+               if ((vars == NULL) || ((w = getintvar(*vars, "leddc")) == 0))
-+                       w = DEFAULT_GPIOTIMERVAL;
-+               sb_corereg(si, 0, OFFSETOF(chipcregs_t, gpiotimerval), ~0, w);
-+       }
-+       if ((si->sb.chip == BCM4311_CHIP_ID) && (si->sb.chiprev <= 1)) {
-+               /* set proper clk setup delays before forcing HT */
-+               sb_clkctl_init((void *)si);
-+               sb_corereg((void*)si, SB_CC_IDX, OFFSETOF(chipcregs_t, system_clk_ctl),
-+                          SYCC_HR, SYCC_HR);
-+       }
-+
-+
-+       return (si);
-+}
-+
-+uint
-+sb_coreid(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+       sb = REGS2SB(si->curmap);
-+
-+       return ((R_SBREG(si, &sb->sbidhigh) & SBIDH_CC_MASK) >> SBIDH_CC_SHIFT);
-+}
-+
-+uint
-+sb_coreidx(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->curidx);
-+}
-+
-+/* return current index of core */
-+static uint
-+_sb_coreidx(sb_info_t *si)
-+{
-+       sbconfig_t *sb;
-+       uint32 sbaddr = 0;
-+
-+       ASSERT(si);
-+
-+       switch (BUSTYPE(si->sb.bustype)) {
-+       case SB_BUS:
-+               sb = REGS2SB(si->curmap);
-+               sbaddr = sb_base(R_SBREG(si, &sb->sbadmatch0));
-+               break;
-+
-+       case PCI_BUS:
-+               sbaddr = OSL_PCI_READ_CONFIG(si->osh, PCI_BAR0_WIN, sizeof(uint32));
-+               break;
-+
-+       case PCMCIA_BUS: {
-+               uint8 tmp = 0;
-+
-+               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;
-+       }
-+
-+#ifdef BCMJTAG
-+       case JTAG_BUS:
-+               sbaddr = (uint32)si->curmap;
-+               break;
-+#endif /* BCMJTAG */
-+
-+       default:
-+               ASSERT(0);
-+       }
-+
-+       if (!GOODCOREADDR(sbaddr))
-+               return BADIDX;
-+
-+       return ((sbaddr - SB_ENUM_BASE) / SB_CORE_SIZE);
-+}
-+
-+uint
-+sb_corevendor(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+       sb = REGS2SB(si->curmap);
-+
-+       return ((R_SBREG(si, &sb->sbidhigh) & SBIDH_VC_MASK) >> SBIDH_VC_SHIFT);
-+}
-+
-+uint
-+sb_corerev(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+       uint sbidh;
-+
-+       si = SB_INFO(sbh);
-+       sb = REGS2SB(si->curmap);
-+       sbidh = R_SBREG(si, &sb->sbidhigh);
-+
-+       return (SBCOREREV(sbidh));
-+}
-+
-+void *
-+sb_osh(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return si->osh;
-+}
-+
-+void
-+sb_setosh(sb_t *sbh, osl_t *osh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       if (si->osh != NULL) {
-+               SB_ERROR(("osh is already set....\n"));
-+               ASSERT(!si->osh);
-+       }
-+       si->osh = osh;
-+}
-+
-+/* set/clear sbtmstatelow core-specific flags */
-+uint32
-+sb_coreflags(sb_t *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);
-+
-+       /* mask and set */
-+       if (mask || val) {
-+               w = (R_SBREG(si, &sb->sbtmstatelow) & ~mask) | val;
-+               W_SBREG(si, &sb->sbtmstatelow, w);
-+       }
-+
-+       /* return the new value */
-+       return (R_SBREG(si, &sb->sbtmstatelow));
-+}
-+
-+/* set/clear sbtmstatehigh core-specific flags */
-+uint32
-+sb_coreflagshi(sb_t *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(si, &sb->sbtmstatehigh) & ~mask) | val;
-+               W_SBREG(si, &sb->sbtmstatehigh, w);
-+       }
-+
-+       /* return the new value */
-+       return (R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_FL_MASK);
-+}
-+
-+/* Run bist on current core. Caller needs to take care of core-specific bist hazards */
-+int
-+sb_corebist(sb_t *sbh)
-+{
-+       uint32 sblo;
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+       int result = 0;
-+
-+       si = SB_INFO(sbh);
-+       sb = REGS2SB(si->curmap);
-+
-+       sblo = R_SBREG(si, &sb->sbtmstatelow);
-+       W_SBREG(si, &sb->sbtmstatelow, (sblo | SBTML_FGC | SBTML_BE));
-+
-+       SPINWAIT(((R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_BISTD) == 0), 100000);
-+
-+       if (R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_BISTF)
-+               result = BCME_ERROR;
-+
-+       W_SBREG(si, &sb->sbtmstatelow, sblo);
-+
-+       return result;
-+}
-+
-+bool
-+sb_iscoreup(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+       sb = REGS2SB(si->curmap);
-+
-+       return ((R_SBREG(si, &sb->sbtmstatelow) &
-+                (SBTML_RESET | SBTML_REJ_MASK | 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.
-+ *
-+ * When using the silicon backplane, no fidleing with interrupts or core switches are needed.
-+ *
-+ * Also, when using pci/pcie, we can optimize away the core switching for pci registers
-+ * and (on newer pci cores) chipcommon registers.
-+ */
-+static uint
-+sb_corereg(sb_info_t *si, uint coreidx, uint regoff, uint mask, uint val)
-+{
-+       uint origidx = 0;
-+       uint32 *r = NULL;
-+       uint w;
-+       uint intr_val = 0;
-+       bool fast = FALSE;
-+
-+       ASSERT(GOODIDX(coreidx));
-+       ASSERT(regoff < SB_CORE_SIZE);
-+       ASSERT((val & ~mask) == 0);
-+
-+#ifdef notyet
-+       if (si->sb.bustype == SB_BUS) {
-+               /* If internal bus, we can always get at everything */
-+               fast = TRUE;
-+               r = (uint32 *)((uchar *)si->regs[coreidx] + regoff);
-+       } else if (si->sb.bustype == PCI_BUS) {
-+               /* If pci/pcie, we can get at pci/pcie regs and on newer cores to chipc */
-+
-+               if ((si->coreid[coreidx] == SB_CC) &&
-+                   ((si->sb.buscoretype == SB_PCIE) ||
-+                    (si->sb.buscorerev >= 13))) {
-+                       /* Chipc registers are mapped at 12KB */
-+
-+                       fast = TRUE;
-+                       r = (uint32 *)((char *)si->curmap + PCI_16KB0_CCREGS_OFFSET + regoff);
-+               } else if (si->sb.buscoreidx == coreidx) {
-+                       /* pci registers are at either in the last 2KB of an 8KB window
-+                        * or, in pcie and pci rev 13 at 8KB
-+                        */
-+                       fast = TRUE;
-+                       if ((si->sb.buscoretype == SB_PCIE) ||
-+                           (si->sb.buscorerev >= 13))
-+                               r = (uint32 *)((char *)si->curmap +
-+                                              PCI_16KB0_PCIREGS_OFFSET + regoff);
-+                       else
-+                               r = (uint32 *)((char *)si->curmap +
-+                                              ((regoff >= SBCONFIGOFF) ?
-+                                               PCI_BAR0_PCISBR_OFFSET : PCI_BAR0_PCIREGS_OFFSET) +
-+                                              regoff);
-+               }
-+       }
-+#endif /* notyet */
-+
-+       if (!fast) {
-+               INTR_OFF(si, intr_val);
-+
-+               /* save current core index */
-+               origidx = sb_coreidx(&si->sb);
-+
-+               /* switch core */
-+               r = (uint32*) ((uchar*) sb_setcoreidx(&si->sb, coreidx) + regoff);
-+       }
-+       ASSERT(r);
-+
-+       /* mask and set */
-+       if (mask || val) {
-+               if (regoff >= SBCONFIGOFF) {
-+                       w = (R_SBREG(si, r) & ~mask) | val;
-+                       W_SBREG(si, r, w);
-+               } else {
-+                       w = (R_REG(si->osh, r) & ~mask) | val;
-+                       W_REG(si->osh, r, w);
-+               }
-+       }
-+
-+       /* readback */
-+       if (regoff >= SBCONFIGOFF)
-+               w = R_SBREG(si, r);
-+       else
-+               w = R_REG(si->osh, r);
-+
-+       if (!fast) {
-+               /* restore core index */
-+               if (origidx != coreidx)
-+                       sb_setcoreidx(&si->sb, origidx);
-+
-+               INTR_RESTORE(si, intr_val);
-+       }
-+
-+       return (w);
-+}
-+
-+#define DWORD_ALIGN(x)  (x & ~(0x03))
-+#define BYTE_POS(x) (x & 0x3)
-+#define WORD_POS(x) (x & 0x1)
-+
-+#define BYTE_SHIFT(x)  (8 * BYTE_POS(x))
-+#define WORD_SHIFT(x)  (16 * WORD_POS(x))
-+
-+#define BYTE_VAL(a, x) ((a >> BYTE_SHIFT(x)) & 0xFF)
-+#define WORD_VAL(a, x) ((a >> WORD_SHIFT(x)) & 0xFFFF)
-+
-+#define read_pci_cfg_byte(a) \
-+       (BYTE_VAL(OSL_PCI_READ_CONFIG(si->osh, DWORD_ALIGN(a), 4), a) & 0xff)
-+
-+#define read_pci_cfg_write(a) \
-+       (WORD_VAL(OSL_PCI_READ_CONFIG(si->osh, DWORD_ALIGN(a), 4), a) & 0xffff)
-+
-+
-+/* return TRUE if requested capability exists in the PCI config space */
-+static bool
-+sb_find_pci_capability(sb_info_t *si, uint8 req_cap_id, uchar *buf, uint32 *buflen)
-+{
-+       uint8 cap_id;
-+       uint8 cap_ptr;
-+       uint32  bufsize;
-+       uint8 byte_val;
-+
-+       if (BUSTYPE(si->sb.bustype) != PCI_BUS)
-+               return FALSE;
-+
-+       /* check for Header type 0 */
-+       byte_val = read_pci_cfg_byte(PCI_CFG_HDR);
-+       if ((byte_val & 0x7f) != PCI_HEADER_NORMAL)
-+               return FALSE;
-+
-+       /* check if the capability pointer field exists */
-+       byte_val = read_pci_cfg_byte(PCI_CFG_STAT);
-+       if (!(byte_val & PCI_CAPPTR_PRESENT))
-+               return FALSE;
-+
-+       cap_ptr = read_pci_cfg_byte(PCI_CFG_CAPPTR);
-+       /* check if the capability pointer is 0x00 */
-+       if (cap_ptr == 0x00)
-+               return FALSE;
-+
-+
-+       /* loop thr'u the capability list and see if the pcie capabilty exists */
-+
-+       cap_id = read_pci_cfg_byte(cap_ptr);
-+
-+       while (cap_id != req_cap_id) {
-+               cap_ptr = read_pci_cfg_byte((cap_ptr+1));
-+               if (cap_ptr == 0x00) break;
-+               cap_id = read_pci_cfg_byte(cap_ptr);
-+       }
-+       if (cap_id != req_cap_id) {
-+               return FALSE;
-+       }
-+       /* found the caller requested capability */
-+       if ((buf != NULL) && (buflen != NULL)) {
-+               bufsize = *buflen;
-+               if (!bufsize) goto end;
-+               *buflen = 0;
-+               /* copy the cpability data excluding cap ID and next ptr */
-+               cap_ptr += 2;
-+               if ((bufsize + cap_ptr)  > SZPCR)
-+                       bufsize = SZPCR - cap_ptr;
-+               *buflen = bufsize;
-+               while (bufsize--) {
-+                       *buf = read_pci_cfg_byte(cap_ptr);
-+                       cap_ptr++;
-+                       buf++;
-+               }
-+       }
-+end:
-+       return TRUE;
-+}
-+
-+/* return TRUE if PCIE capability exists the pci config space */
-+static inline bool
-+sb_ispcie(sb_info_t *si)
-+{
-+       return (sb_find_pci_capability(si, PCI_CAP_PCIECAP_ID, NULL, NULL));
-+}
-+
-+/* scan the sb enumerated space to identify all cores */
-+static void
-+BCMINITFN(sb_scan)(sb_info_t *si)
-+{
-+       uint origidx;
-+       uint i;
-+       bool pci;
-+       bool pcie;
-+       uint pciidx;
-+       uint pcieidx;
-+       uint pcirev;
-+       uint pcierev;
-+
-+
-+       /* numcores should already be set */
-+       ASSERT((si->numcores > 0) && (si->numcores <= SB_MAXCORES));
-+
-+       /* save current core index */
-+       origidx = sb_coreidx(&si->sb);
-+
-+       si->sb.buscorerev = NOREV;
-+       si->sb.buscoreidx = BADIDX;
-+
-+       si->gpioidx = BADIDX;
-+
-+       pci = pcie = FALSE;
-+       pcirev = pcierev = NOREV;
-+       pciidx = pcieidx = BADIDX;
-+
-+       for (i = 0; i < si->numcores; i++) {
-+               sb_setcoreidx(&si->sb, i);
-+               si->coreid[i] = sb_coreid(&si->sb);
-+
-+               if (si->coreid[i] == SB_PCI) {
-+                       pciidx = i;
-+                       pcirev = sb_corerev(&si->sb);
-+                       pci = TRUE;
-+               } else if (si->coreid[i] == SB_PCIE) {
-+                       pcieidx = i;
-+                       pcierev = sb_corerev(&si->sb);
-+                       pcie = TRUE;
-+               } else if (si->coreid[i] == SB_PCMCIA) {
-+                       si->sb.buscorerev = sb_corerev(&si->sb);
-+                       si->sb.buscoretype = si->coreid[i];
-+                       si->sb.buscoreidx = i;
-+               }
-+       }
-+       if (pci && pcie) {
-+               if (sb_ispcie(si))
-+                       pci = FALSE;
-+               else
-+                       pcie = FALSE;
-+       }
-+       if (pci) {
-+               si->sb.buscoretype = SB_PCI;
-+               si->sb.buscorerev = pcirev;
-+               si->sb.buscoreidx = pciidx;
-+       } else if (pcie) {
-+               si->sb.buscoretype = SB_PCIE;
-+               si->sb.buscorerev = pcierev;
-+               si->sb.buscoreidx = pcieidx;
-+       }
-+
-+       /*
-+        * 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(si, SB_CC, 0))) {
-+               si->gpioidx = sb_findcoreidx(si, SB_CC, 0);
-+               si->gpioid = SB_CC;
-+       } else if (PCI(si) && (si->sb.buscorerev >= 2)) {
-+               si->gpioidx = si->sb.buscoreidx;
-+               si->gpioid = SB_PCI;
-+       } else if (sb_findcoreidx(si, SB_EXTIF, 0)) {
-+               si->gpioidx = sb_findcoreidx(si, SB_EXTIF, 0);
-+               si->gpioid = SB_EXTIF;
-+       } else
-+               ASSERT(si->gpioidx != BADIDX);
-+
-+       /* return to original core index */
-+       sb_setcoreidx(&si->sb, origidx);
-+}
-+
-+/* may be called with core in reset */
-+void
-+sb_detach(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint idx;
-+
-+       si = SB_INFO(sbh);
-+
-+       if (si == NULL)
-+               return;
-+
-+       if (BUSTYPE(si->sb.bustype) == SB_BUS)
-+               for (idx = 0; idx < SB_MAXCORES; idx++)
-+                       if (si->regs[idx]) {
-+                               REG_UNMAP(si->regs[idx]);
-+                               si->regs[idx] = NULL;
-+                       }
-+#if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SB_BUS)
-+       if (si != &ksi)
-+#endif /* !BCMBUSTYPE || (BCMBUSTYPE == SB_BUS) */
-+               MFREE(si->osh, si, sizeof(sb_info_t));
-+
-+}
-+
-+/* use pci dev id to determine chip id for chips not having a chipcommon core */
-+static uint
-+BCMINITFN(sb_pcidev2chip)(uint pcidev)
-+{
-+       if ((pcidev >= BCM4710_DEVICE_ID) && (pcidev <= BCM47XX_USB_ID))
-+               return (BCM4710_CHIP_ID);
-+       if ((pcidev >= BCM4402_ENET_ID) && (pcidev <= BCM4402_V90_ID))
-+               return (BCM4402_CHIP_ID);
-+       if (pcidev == BCM4401_ENET_ID)
-+               return (BCM4402_CHIP_ID);
-+
-+       return (0);
-+}
-+
-+/* convert chip number to number of i/o cores */
-+static uint
-+BCMINITFN(sb_chip2numcores)(uint chip)
-+{
-+       if (chip == BCM4710_CHIP_ID)
-+               return (9);
-+       if (chip == BCM4402_CHIP_ID)
-+               return (3);
-+       if (chip == BCM4306_CHIP_ID)    /* < 4306c0 */
-+               return (6);
-+       if (chip == BCM4704_CHIP_ID)
-+               return (9);
-+       if (chip == BCM5365_CHIP_ID)
-+               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(sb_info_t *si, uint coreid, uint coreunit)
-+{
-+       uint found;
-+       uint i;
-+
-+       found = 0;
-+
-+       for (i = 0; i < si->numcores; i++)
-+               if (si->coreid[i] == coreid) {
-+                       if (found == coreunit)
-+                               return (i);
-+                       found++;
-+               }
-+
-+       return (BADIDX);
-+}
-+
-+/* 
-+ * this function changes logical "focus" to the indiciated core,
-+ * must be called with interrupt off.
-+ * Moreover, callers should keep interrupts off during switching out of and back to d11 core
-+ */
-+void*
-+sb_setcoreidx(sb_t *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->intrsenabled_fn == NULL) || !(*(si)->intrsenabled_fn)((si)->intr_arg));
-+
-+       sbaddr = SB_ENUM_BASE + (coreidx * SB_CORE_SIZE);
-+
-+       switch (BUSTYPE(si->sb.bustype)) {
-+       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;
-+#ifdef BCMJTAG
-+       case JTAG_BUS:
-+               /* map new one */
-+               if (!si->regs[coreidx]) {
-+                       si->regs[coreidx] = (void *)sbaddr;
-+                       ASSERT(GOODREGS(si->regs[coreidx]));
-+               }
-+               si->curmap = si->regs[coreidx];
-+               break;
-+#endif /* BCMJTAG */
-+       }
-+
-+       si->curidx = coreidx;
-+
-+       return (si->curmap);
-+}
-+
-+/* 
-+ * this function changes logical "focus" to the indiciated core,
-+ * must be called with interrupt off.
-+ * Moreover, callers should keep interrupts off during switching out of and back to d11 core
-+ */
-+void*
-+sb_setcore(sb_t *sbh, uint coreid, uint coreunit)
-+{
-+       sb_info_t *si;
-+       uint idx;
-+
-+       si = SB_INFO(sbh);
-+       idx = sb_findcoreidx(si, coreid, coreunit);
-+       if (!GOODIDX(idx))
-+               return (NULL);
-+
-+       return (sb_setcoreidx(sbh, idx));
-+}
-+
-+/* return chip number */
-+uint
-+sb_chip(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.chip);
-+}
-+
-+/* return chip revision number */
-+uint
-+sb_chiprev(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.chiprev);
-+}
-+
-+/* return chip common revision number */
-+uint
-+sb_chipcrev(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.ccrev);
-+}
-+
-+/* return chip package option */
-+uint
-+sb_chippkg(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.chippkg);
-+}
-+
-+/* return PCI core rev. */
-+uint
-+sb_pcirev(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.buscorerev);
-+}
-+
-+bool
-+BCMINITFN(sb_war16165)(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       return (PCI(si) && (si->sb.buscorerev <= 10));
-+}
-+
-+static void
-+BCMINITFN(sb_war30841)(sb_info_t *si)
-+{
-+       sb_pcie_mdiowrite(si, MDIODATA_DEV_RX, SERDES_RX_TIMER1, 0x8128);
-+       sb_pcie_mdiowrite(si, MDIODATA_DEV_RX, SERDES_RX_CDR, 0x0100);
-+       sb_pcie_mdiowrite(si, MDIODATA_DEV_RX, SERDES_RX_CDRBW, 0x1466);
-+}
-+
-+/* return PCMCIA core rev. */
-+uint
-+BCMINITFN(sb_pcmciarev)(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.buscorerev);
-+}
-+
-+/* return board vendor id */
-+uint
-+sb_boardvendor(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.boardvendor);
-+}
-+
-+/* return boardtype */
-+uint
-+sb_boardtype(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       char *var;
-+
-+       si = SB_INFO(sbh);
-+
-+       if (BUSTYPE(si->sb.bustype) == SB_BUS && si->sb.boardtype == 0xffff) {
-+               /* boardtype format is a hex string */
-+               si->sb.boardtype = getintvar(NULL, "boardtype");
-+
-+               /* backward compatibility for older boardtype string format */
-+               if ((si->sb.boardtype == 0) && (var = getvar(NULL, "boardtype"))) {
-+                       if (!strcmp(var, "bcm94710dev"))
-+                               si->sb.boardtype = BCM94710D_BOARD;
-+                       else if (!strcmp(var, "bcm94710ap"))
-+                               si->sb.boardtype = BCM94710AP_BOARD;
-+                       else if (!strcmp(var, "bu4710"))
-+                               si->sb.boardtype = BU4710_BOARD;
-+                       else if (!strcmp(var, "bcm94702mn"))
-+                               si->sb.boardtype = BCM94702MN_BOARD;
-+                       else if (!strcmp(var, "bcm94710r1"))
-+                               si->sb.boardtype = BCM94710R1_BOARD;
-+                       else if (!strcmp(var, "bcm94710r4"))
-+                               si->sb.boardtype = BCM94710R4_BOARD;
-+                       else if (!strcmp(var, "bcm94702cpci"))
-+                               si->sb.boardtype = BCM94702CPCI_BOARD;
-+                       else if (!strcmp(var, "bcm95380_rr"))
-+                               si->sb.boardtype = BCM95380RR_BOARD;
-+               }
-+       }
-+
-+       return (si->sb.boardtype);
-+}
-+
-+/* return bus type of sbh device */
-+uint
-+sb_bus(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       return (si->sb.bustype);
-+}
-+
-+/* return bus core type */
-+uint
-+sb_buscoretype(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       return (si->sb.buscoretype);
-+}
-+
-+/* return bus core revision */
-+uint
-+sb_buscorerev(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       si = SB_INFO(sbh);
-+
-+       return (si->sb.buscorerev);
-+}
-+
-+/* return list of found cores */
-+uint
-+sb_corelist(sb_t *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(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       ASSERT(GOODREGS(si->curmap));
-+
-+       return (si->curmap);
-+}
-+
-+
-+/* do buffered registers update */
-+void
-+sb_commit(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint origidx;
-+       uint intr_val = 0;
-+
-+       si = SB_INFO(sbh);
-+
-+       origidx = si->curidx;
-+       ASSERT(GOODIDX(origidx));
-+
-+       INTR_OFF(si, intr_val);
-+
-+       /* switch over to chipcommon core if there is one, else use pci */
-+       if (si->sb.ccrev != NOREV) {
-+               chipcregs_t *ccregs = (chipcregs_t *)sb_setcore(sbh, SB_CC, 0);
-+
-+               /* do the buffer registers update */
-+               W_REG(si->osh, &ccregs->broadcastaddress, SB_COMMIT);
-+               W_REG(si->osh, &ccregs->broadcastdata, 0x0);
-+       } else if (PCI(si)) {
-+               sbpciregs_t *pciregs = (sbpciregs_t *)sb_setcore(sbh, SB_PCI, 0);
-+
-+               /* do the buffer registers update */
-+               W_REG(si->osh, &pciregs->bcastaddr, SB_COMMIT);
-+               W_REG(si->osh, &pciregs->bcastdata, 0x0);
-+       } else
-+               ASSERT(0);
-+
-+       /* restore core index */
-+       sb_setcoreidx(sbh, origidx);
-+       INTR_RESTORE(si, intr_val);
-+}
-+
-+/* reset and re-enable a core
-+ * inputs:
-+ * bits - core specific bits that are set during and after reset sequence
-+ * resetbits - core specific bits that are set only during reset sequence
-+ */
-+void
-+sb_core_reset(sb_t *sbh, uint32 bits, uint32 resetbits)
-+{
-+       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 | resetbits));
-+
-+       /*
-+        * Now do the initialization sequence.
-+        */
-+
-+       /* set reset while enabling the clock and forcing them on throughout the core */
-+       W_SBREG(si, &sb->sbtmstatelow, (SBTML_FGC | SBTML_CLK | SBTML_RESET | bits | resetbits));
-+       dummy = R_SBREG(si, &sb->sbtmstatelow);
-+       OSL_DELAY(1);
-+
-+       if (R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_SERR) {
-+               W_SBREG(si, &sb->sbtmstatehigh, 0);
-+       }
-+       if ((dummy = R_SBREG(si, &sb->sbimstate)) & (SBIM_IBE | SBIM_TO)) {
-+               AND_SBREG(si, &sb->sbimstate, ~(SBIM_IBE | SBIM_TO));
-+       }
-+
-+       /* clear reset and allow it to propagate throughout the core */
-+       W_SBREG(si, &sb->sbtmstatelow, (SBTML_FGC | SBTML_CLK | bits));
-+       dummy = R_SBREG(si, &sb->sbtmstatelow);
-+       OSL_DELAY(1);
-+
-+       /* leave clock enabled */
-+       W_SBREG(si, &sb->sbtmstatelow, (SBTML_CLK | bits));
-+       dummy = R_SBREG(si, &sb->sbtmstatelow);
-+       OSL_DELAY(1);
-+}
-+
-+void
-+sb_core_tofixup(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+
-+       if ((BUSTYPE(si->sb.bustype) != PCI_BUS) || PCIE(si) ||
-+           (PCI(si) && (si->sb.buscorerev >= 5)))
-+               return;
-+
-+       ASSERT(GOODREGS(si->curmap));
-+       sb = REGS2SB(si->curmap);
-+
-+       if (BUSTYPE(si->sb.bustype) == SB_BUS) {
-+               SET_SBREG(si, &sb->sbimconfiglow,
-+                         SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
-+                         (0x5 << SBIMCL_RTO_SHIFT) | 0x3);
-+       } else {
-+               if (sb_coreid(sbh) == SB_PCI) {
-+                       SET_SBREG(si, &sb->sbimconfiglow,
-+                                 SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
-+                                 (0x3 << SBIMCL_RTO_SHIFT) | 0x2);
-+               } else {
-+                       SET_SBREG(si, &sb->sbimconfiglow, (SBIMCL_RTO_MASK | SBIMCL_STO_MASK), 0);
-+               }
-+       }
-+
-+       sb_commit(sbh);
-+}
-+
-+/*
-+ * Set the initiator timeout for the "master core".
-+ * The master core is defined to be the core in control
-+ * of the chip and so it issues accesses to non-memory
-+ * locations (Because of dma *any* core can access memeory).
-+ *
-+ * The routine uses the bus to decide who is the master:
-+ *     SB_BUS => mips
-+ *     JTAG_BUS => chipc
-+ *     PCI_BUS => pci or pcie
-+ *     PCMCIA_BUS => pcmcia
-+ *     SDIO_BUS => pcmcia
-+ *
-+ * This routine exists so callers can disable initiator
-+ * timeouts so accesses to very slow devices like otp
-+ * won't cause an abort. The routine allows arbitrary
-+ * settings of the service and request timeouts, though.
-+ *
-+ * Returns the timeout state before changing it or -1
-+ * on error.
-+ */
-+
-+#define        TO_MASK (SBIMCL_RTO_MASK | SBIMCL_STO_MASK)
-+
-+uint32
-+sb_set_initiator_to(sb_t *sbh, uint32 to)
-+{
-+       sb_info_t *si;
-+       uint origidx, idx;
-+       uint intr_val = 0;
-+       uint32 tmp, ret = 0xffffffff;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+
-+       if ((to & ~TO_MASK) != 0)
-+               return ret;
-+
-+       /* Figure out the master core */
-+       idx = BADIDX;
-+       switch (BUSTYPE(si->sb.bustype)) {
-+       case PCI_BUS:
-+               idx = si->sb.buscoreidx;
-+               break;
-+       case JTAG_BUS:
-+               idx = SB_CC_IDX;
-+               break;
-+       case PCMCIA_BUS:
-+       case SDIO_BUS:
-+               idx = sb_findcoreidx(si, SB_PCMCIA, 0);
-+               break;
-+       case SB_BUS:
-+               if ((idx = sb_findcoreidx(si, SB_MIPS33, 0)) == BADIDX)
-+                       idx = sb_findcoreidx(si, SB_MIPS, 0);
-+               break;
-+       default:
-+               ASSERT(0);
-+       }
-+       if (idx == BADIDX)
-+               return ret;
-+
-+       INTR_OFF(si, intr_val);
-+       origidx = sb_coreidx(sbh);
-+
-+       sb = REGS2SB(sb_setcoreidx(sbh, idx));
-+
-+       tmp = R_SBREG(si, &sb->sbimconfiglow);
-+       ret = tmp & TO_MASK;
-+       W_SBREG(si, &sb->sbimconfiglow, (tmp & ~TO_MASK) | to);
-+
-+       sb_commit(sbh);
-+       sb_setcoreidx(sbh, origidx);
-+       INTR_RESTORE(si, intr_val);
-+       return ret;
-+}
-+
-+void
-+sb_core_disable(sb_t *sbh, uint32 bits)
-+{
-+       sb_info_t *si;
-+       volatile uint32 dummy;
-+       uint32 rej;
-+       sbconfig_t *sb;
-+
-+       si = SB_INFO(sbh);
-+
-+       ASSERT(GOODREGS(si->curmap));
-+       sb = REGS2SB(si->curmap);
-+
-+       /* if core is already in reset, just return */
-+       if (R_SBREG(si, &sb->sbtmstatelow) & SBTML_RESET)
-+               return;
-+
-+       /* reject value changed between sonics 2.2 and 2.3 */
-+       if (si->sb.sonicsrev == SONICS_2_2)
-+               rej = (1 << SBTML_REJ_SHIFT);
-+       else
-+               rej = (2 << SBTML_REJ_SHIFT);
-+
-+       /* if clocks are not enabled, put into reset and return */
-+       if ((R_SBREG(si, &sb->sbtmstatelow) & SBTML_CLK) == 0)
-+               goto disable;
-+
-+       /* set target reject and spin until busy is clear (preserve core-specific bits) */
-+       OR_SBREG(si, &sb->sbtmstatelow, rej);
-+       dummy = R_SBREG(si, &sb->sbtmstatelow);
-+       OSL_DELAY(1);
-+       SPINWAIT((R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_BUSY), 100000);
-+       if (R_SBREG(si, &sb->sbtmstatehigh) & SBTMH_BUSY)
-+               SB_ERROR(("%s: target state still busy\n", __FUNCTION__));
-+
-+       if (R_SBREG(si, &sb->sbidlow) & SBIDL_INIT) {
-+               OR_SBREG(si, &sb->sbimstate, SBIM_RJ);
-+               dummy = R_SBREG(si, &sb->sbimstate);
-+               OSL_DELAY(1);
-+               SPINWAIT((R_SBREG(si, &sb->sbimstate) & SBIM_BY), 100000);
-+       }
-+
-+       /* set reset and reject while enabling the clocks */
-+       W_SBREG(si, &sb->sbtmstatelow, (bits | SBTML_FGC | SBTML_CLK | rej | SBTML_RESET));
-+       dummy = R_SBREG(si, &sb->sbtmstatelow);
-+       OSL_DELAY(10);
-+
-+       /* don't forget to clear the initiator reject bit */
-+       if (R_SBREG(si, &sb->sbidlow) & SBIDL_INIT)
-+               AND_SBREG(si, &sb->sbimstate, ~SBIM_RJ);
-+
-+disable:
-+       /* leave reset and reject asserted */
-+       W_SBREG(si, &sb->sbtmstatelow, (bits | rej | SBTML_RESET));
-+       OSL_DELAY(1);
-+}
-+
-+/* set chip watchdog reset timer to fire in 'ticks' backplane cycles */
-+void
-+sb_watchdog(sb_t *sbh, uint ticks)
-+{
-+       sb_info_t *si = SB_INFO(sbh);
-+
-+       /* make sure we come up in fast clock mode */
-+       sb_clkctl_clk(sbh, CLK_FAST);
-+
-+       /* instant NMI */
-+       switch (si->gpioid) {
-+       case SB_CC:
-+#ifdef __mips__
-+               if (sb_chip(sbh) == BCM4785_CHIP_ID && ticks <= 1)
-+                       MTC0(C0_BROADCOM, 4, (1 << 22));
-+#endif /* __mips__ */
-+               sb_corereg(si, 0, OFFSETOF(chipcregs_t, watchdog), ~0, ticks);
-+#ifdef __mips__
-+               if (sb_chip(sbh) == BCM4785_CHIP_ID && ticks <= 1) {
-+                       __asm__ __volatile__ (
-+                               ".set\tmips3\n\t"
-+                               "sync\n\t"
-+                               "wait\n\t"
-+                               ".set\tmips0"
-+                       );
-+                       while (1);
-+               }
-+#endif /* __mips__ */
-+               break;
-+       case SB_EXTIF:
-+               sb_corereg(si, si->gpioidx, OFFSETOF(extifregs_t, watchdog), ~0, ticks);
-+               break;
-+       }
-+}
-+
-+/* initialize the pcmcia core */
-+void
-+sb_pcmcia_init(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint8 cor = 0;
-+
-+       si = SB_INFO(sbh);
-+
-+       /* enable d11 mac interrupts */
-+       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
-+ * coremask is the bitvec of cores by index to be enabled.
-+ */
-+void
-+BCMINITFN(sb_pci_setup)(sb_t *sbh, uint coremask)
-+{
-+       sb_info_t *si;
-+       sbconfig_t *sb;
-+       sbpciregs_t *pciregs;
-+       uint32 sbflag;
-+       uint32 w;
-+       uint idx;
-+       int reg_val;
-+
-+       si = SB_INFO(sbh);
-+
-+       /* if not pci bus, we're done */
-+       if (BUSTYPE(si->sb.bustype) != PCI_BUS)
-+               return;
-+
-+       ASSERT(PCI(si) || PCIE(si));
-+       ASSERT(si->sb.buscoreidx != BADIDX);
-+
-+       /* 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(si, &sb->sbtpsflag) & SBTPS_NUM0_MASK;
-+
-+       /* switch over to pci core */
-+       pciregs = (sbpciregs_t*) sb_setcoreidx(sbh, si->sb.buscoreidx);
-+       sb = REGS2SB(pciregs);
-+
-+       /*
-+        * Enable sb->pci interrupts.  Assume
-+        * PCI rev 2.3 support was added in pci core rev 6 and things changed..
-+        */
-+       if (PCIE(si) || (PCI(si) && ((si->sb.buscorerev) >= 6))) {
-+               /* 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);
-+       } else {
-+               /* set sbintvec bit for our flag number */
-+               OR_SBREG(si, &sb->sbintvec, (1 << sbflag));
-+       }
-+
-+       if (PCI(si)) {
-+               OR_REG(si->osh, &pciregs->sbtopci2, (SBTOPCI_PREF|SBTOPCI_BURST));
-+               if (si->sb.buscorerev >= 11)
-+                       OR_REG(si->osh, &pciregs->sbtopci2, SBTOPCI_RC_READMULTI);
-+               if (si->sb.buscorerev < 5) {
-+                       SET_SBREG(si, &sb->sbimconfiglow, SBIMCL_RTO_MASK | SBIMCL_STO_MASK,
-+                               (0x3 << SBIMCL_RTO_SHIFT) | 0x2);
-+                       sb_commit(sbh);
-+               }
-+       }
-+
-+#ifdef PCIE_SUPPOER
-+       /* PCIE workarounds */
-+       if (PCIE(si)) {
-+               if ((si->sb.buscorerev == 0) || (si->sb.buscorerev == 1)) {
-+                       reg_val = sb_pcie_readreg((void *)sbh, (void *)PCIE_PCIEREGS,
-+                               PCIE_TLP_WORKAROUNDSREG);
-+                       reg_val |= 0x8;
-+                       sb_pcie_writereg((void *)sbh, (void *)PCIE_PCIEREGS,
-+                               PCIE_TLP_WORKAROUNDSREG, reg_val);
-+               }
-+
-+               if (si->sb.buscorerev == 1) {
-+                       reg_val = sb_pcie_readreg((void *)sbh, (void *)PCIE_PCIEREGS,
-+                               PCIE_DLLP_LCREG);
-+                       reg_val |= (0x40);
-+                       sb_pcie_writereg(sbh, (void *)PCIE_PCIEREGS, PCIE_DLLP_LCREG, reg_val);
-+               }
-+
-+               if (si->sb.buscorerev == 0)
-+                       sb_war30841(si);
-+       }
-+#endif
-+
-+       /* switch back to previous core */
-+       sb_setcoreidx(sbh, idx);
-+}
-+
-+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(sb_t *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_TYPE6) {
-+               if (m & CC_T6_MMASK)
-+                       return CC_T6_M1;
-+               else
-+                       return CC_T6_M0;
-+       } else if ((pll_type == PLL_TYPE1) ||
-+                  (pll_type == PLL_TYPE3) ||
-+                  (pll_type == PLL_TYPE4) ||
-+                  (pll_type == PLL_TYPE7)) {
-+               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_TYPE5) {
-+               return (100000000);
-+       } else
-+               ASSERT(0);
-+       /* PLL types 3 and 7 use BASE2 (25Mhz) */
-+       if ((pll_type == PLL_TYPE3) ||
-+           (pll_type == PLL_TYPE7)) {
-+               clock =  CC_CLOCK_BASE2 * n1 * n2;
-+       } else
-+               clock = CC_CLOCK_BASE1 * 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_TYPE3) ||
-+           (pll_type == PLL_TYPE4) ||
-+           (pll_type == PLL_TYPE7)) {
-+               m1 = factor6(m1);
-+               if ((pll_type == PLL_TYPE1) || (pll_type == PLL_TYPE3))
-+                       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(sb_t *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(si->osh, &eir->clockcontrol_n);
-+               m = R_REG(si->osh, &eir->clockcontrol_sb);
-+       } else if ((cc = (chipcregs_t *) sb_setcore(sbh, SB_CC, 0))) {
-+               pll_type = R_REG(si->osh, &cc->capabilities) & CAP_PLL_MASK;
-+               if (pll_type == PLL_NONE) {
-+                       INTR_RESTORE(si, intr_val);
-+                       return 80000000;
-+               }
-+               n = R_REG(si->osh, &cc->clockcontrol_n);
-+               if (pll_type == PLL_TYPE6)
-+                       m = R_REG(si->osh, &cc->clockcontrol_m3);
-+               else if ((pll_type == PLL_TYPE3) && !(BCMINIT(sb_chip)(sbh) == 0x5365))
-+                       m = R_REG(si->osh, &cc->clockcontrol_m2);
-+               else
-+                       m = R_REG(si->osh, &cc->clockcontrol_sb);
-+       } else {
-+               INTR_RESTORE(si, intr_val);
-+               return 0;
-+       }
-+
-+       /* calculate rate */
-+       if (BCMINIT(sb_chip)(sbh) == 0x5365)
-+               rate = 100000000;
-+       else {
-+               rate = sb_clock_rate(pll_type, n, m);
-+
-+               if (pll_type == PLL_TYPE3)
-+                       rate = rate / 2;
-+       }
-+
-+       /* 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(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       return (sb_setcoreidx(sbh, si->gpioidx));
-+}
-+
-+/* mask&set gpiocontrol bits */
-+uint32
-+sb_gpiocontrol(sb_t *sbh, uint32 mask, uint32 val, uint8 priority)
-+{
-+       sb_info_t *si;
-+       uint regoff;
-+
-+       si = SB_INFO(sbh);
-+       regoff = 0;
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* gpios could be shared on router platforms */
-+       if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
-+               mask = priority ? (sb_gpioreservation & mask) :
-+                       ((sb_gpioreservation | mask) & ~(sb_gpioreservation));
-+               val &= mask;
-+       }
-+
-+       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(si, si->gpioidx, regoff, mask, val));
-+}
-+
-+/* mask&set gpio output enable bits */
-+uint32
-+sb_gpioouten(sb_t *sbh, uint32 mask, uint32 val, uint8 priority)
-+{
-+       sb_info_t *si;
-+       uint regoff;
-+
-+       si = SB_INFO(sbh);
-+       regoff = 0;
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* gpios could be shared on router platforms */
-+       if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
-+               mask = priority ? (sb_gpioreservation & mask) :
-+                       ((sb_gpioreservation | mask) & ~(sb_gpioreservation));
-+               val &= mask;
-+       }
-+
-+       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(si, si->gpioidx, regoff, mask, val));
-+}
-+
-+/* mask&set gpio output bits */
-+uint32
-+sb_gpioout(sb_t *sbh, uint32 mask, uint32 val, uint8 priority)
-+{
-+       sb_info_t *si;
-+       uint regoff;
-+
-+       si = SB_INFO(sbh);
-+       regoff = 0;
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* gpios could be shared on router platforms */
-+       if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
-+               mask = priority ? (sb_gpioreservation & mask) :
-+                       ((sb_gpioreservation | mask) & ~(sb_gpioreservation));
-+               val &= mask;
-+       }
-+
-+       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(si, si->gpioidx, regoff, mask, val));
-+}
-+
-+/* reserve one gpio */
-+uint32
-+sb_gpioreserve(sb_t *sbh, uint32 gpio_bitmask, uint8 priority)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* only cores on SB_BUS share GPIO's and only applcation users need to
-+        * reserve/release GPIO
-+        */
-+       if ((BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority))  {
-+               ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
-+               return -1;
-+       }
-+       /* make sure only one bit is set */
-+       if ((!gpio_bitmask) || ((gpio_bitmask) & (gpio_bitmask - 1))) {
-+               ASSERT((gpio_bitmask) && !((gpio_bitmask) & (gpio_bitmask - 1)));
-+               return -1;
-+       }
-+
-+       /* already reserved */
-+       if (sb_gpioreservation & gpio_bitmask)
-+               return -1;
-+       /* set reservation */
-+       sb_gpioreservation |= gpio_bitmask;
-+
-+       return sb_gpioreservation;
-+}
-+
-+/* release one gpio */
-+/* 
-+ * releasing the gpio doesn't change the current value on the GPIO last write value
-+ * persists till some one overwrites it
-+*/
-+
-+uint32
-+sb_gpiorelease(sb_t *sbh, uint32 gpio_bitmask, uint8 priority)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* only cores on SB_BUS share GPIO's and only applcation users need to
-+        * reserve/release GPIO
-+        */
-+       if ((BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority))  {
-+               ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
-+               return -1;
-+       }
-+       /* make sure only one bit is set */
-+       if ((!gpio_bitmask) || ((gpio_bitmask) & (gpio_bitmask - 1))) {
-+               ASSERT((gpio_bitmask) && !((gpio_bitmask) & (gpio_bitmask - 1)));
-+               return -1;
-+       }
-+
-+       /* already released */
-+       if (!(sb_gpioreservation & gpio_bitmask))
-+               return -1;
-+
-+       /* clear reservation */
-+       sb_gpioreservation &= ~gpio_bitmask;
-+
-+       return sb_gpioreservation;
-+}
-+
-+/* return the current gpioin register value */
-+uint32
-+sb_gpioin(sb_t *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(si, si->gpioidx, regoff, 0, 0));
-+}
-+
-+/* mask&set gpio interrupt polarity bits */
-+uint32
-+sb_gpiointpolarity(sb_t *sbh, uint32 mask, uint32 val, uint8 priority)
-+{
-+       sb_info_t *si;
-+       uint regoff;
-+
-+       si = SB_INFO(sbh);
-+       regoff = 0;
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* gpios could be shared on router platforms */
-+       if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
-+               mask = priority ? (sb_gpioreservation & mask) :
-+                       ((sb_gpioreservation | mask) & ~(sb_gpioreservation));
-+               val &= mask;
-+       }
-+
-+       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(si, si->gpioidx, regoff, mask, val));
-+}
-+
-+/* mask&set gpio interrupt mask bits */
-+uint32
-+sb_gpiointmask(sb_t *sbh, uint32 mask, uint32 val, uint8 priority)
-+{
-+       sb_info_t *si;
-+       uint regoff;
-+
-+       si = SB_INFO(sbh);
-+       regoff = 0;
-+
-+       priority = GPIO_DRV_PRIORITY; /* compatibility hack */
-+
-+       /* gpios could be shared on router platforms */
-+       if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
-+               mask = priority ? (sb_gpioreservation & mask) :
-+                       ((sb_gpioreservation | mask) & ~(sb_gpioreservation));
-+               val &= mask;
-+       }
-+
-+       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(si, si->gpioidx, regoff, mask, val));
-+}
-+
-+/* assign the gpio to an led */
-+uint32
-+sb_gpioled(sb_t *sbh, uint32 mask, uint32 val)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+       if (si->sb.ccrev < 16)
-+               return -1;
-+
-+       /* gpio led powersave reg */
-+       return (sb_corereg(si, 0, OFFSETOF(chipcregs_t, gpiotimeroutmask), mask, val));
-+}
-+
-+/* mask & set gpio timer val */
-+uint32
-+sb_gpiotimerval(sb_t *sbh, uint32 mask, uint32 gpiotimerval)
-+{
-+       sb_info_t *si;
-+       si = SB_INFO(sbh);
-+
-+       if (si->sb.ccrev < 16)
-+               return -1;
-+
-+       return (sb_corereg(si, 0, OFFSETOF(chipcregs_t, gpiotimerval), mask, gpiotimerval));
-+}
-+
-+
-+/* return the slow clock source - LPO, XTAL, or PCI */
-+static uint
-+sb_slowclk_src(sb_info_t *si)
-+{
-+       chipcregs_t *cc;
-+
-+
-+       ASSERT(sb_coreid(&si->sb) == SB_CC);
-+
-+       if (si->sb.ccrev < 6) {
-+               if ((BUSTYPE(si->sb.bustype) == PCI_BUS) &&
-+                   (OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_OUT, sizeof(uint32)) &
-+                    PCI_CFG_GPIO_SCS))
-+                       return (SCC_SS_PCI);
-+               else
-+                       return (SCC_SS_XTAL);
-+       } else if (si->sb.ccrev < 10) {
-+               cc = (chipcregs_t*) sb_setcoreidx(&si->sb, si->curidx);
-+               return (R_REG(si->osh, &cc->slow_clk_ctl) & SCC_SS_MASK);
-+       } else  /* Insta-clock */
-+               return (SCC_SS_XTAL);
-+}
-+
-+/* return the ILP (slowclock) min or max frequency */
-+static uint
-+sb_slowclk_freq(sb_info_t *si, bool max)
-+{
-+       chipcregs_t *cc;
-+       uint32 slowclk;
-+       uint div;
-+
-+
-+       ASSERT(sb_coreid(&si->sb) == SB_CC);
-+
-+       cc = (chipcregs_t*) sb_setcoreidx(&si->sb, si->curidx);
-+
-+       /* shouldn't be here unless we've established the chip has dynamic clk control */
-+       ASSERT(R_REG(si->osh, &cc->capabilities) & CAP_PWR_CTL);
-+
-+       slowclk = sb_slowclk_src(si);
-+       if (si->sb.ccrev < 6) {
-+               if (slowclk == SCC_SS_PCI)
-+                       return (max? (PCIMAXFREQ/64) : (PCIMINFREQ/64));
-+               else
-+                       return (max? (XTALMAXFREQ/32) : (XTALMINFREQ/32));
-+       } else if (si->sb.ccrev < 10) {
-+               div = 4 * (((R_REG(si->osh, &cc->slow_clk_ctl) & SCC_CD_MASK) >> SCC_CD_SHIFT) + 1);
-+               if (slowclk == SCC_SS_LPO)
-+                       return (max? LPOMAXFREQ : LPOMINFREQ);
-+               else if (slowclk == SCC_SS_XTAL)
-+                       return (max? (XTALMAXFREQ/div) : (XTALMINFREQ/div));
-+               else if (slowclk == SCC_SS_PCI)
-+                       return (max? (PCIMAXFREQ/div) : (PCIMINFREQ/div));
-+               else
-+                       ASSERT(0);
-+       } else {
-+               /* Chipc rev 10 is InstaClock */
-+               div = R_REG(si->osh, &cc->system_clk_ctl) >> SYCC_CD_SHIFT;
-+               div = 4 * (div + 1);
-+               return (max ? XTALMAXFREQ : (XTALMINFREQ/div));
-+       }
-+       return (0);
-+}
-+
-+static void
-+BCMINITFN(sb_clkctl_setdelay)(sb_info_t *si, void *chipcregs)
-+{
-+       chipcregs_t * cc;
-+       uint slowmaxfreq, pll_delay, slowclk;
-+       uint pll_on_delay, fref_sel_delay;
-+
-+       pll_delay = PLL_DELAY;
-+
-+       /* If the slow clock is not sourced by the xtal then add the xtal_on_delay
-+        * since the xtal will also be powered down by dynamic clk control logic.
-+        */
-+
-+       slowclk = sb_slowclk_src(si);
-+       if (slowclk != SCC_SS_XTAL)
-+               pll_delay += XTAL_ON_DELAY;
-+
-+       /* Starting with 4318 it is ILP that is used for the delays */
-+       slowmaxfreq = sb_slowclk_freq(si, (si->sb.ccrev >= 10) ? FALSE : TRUE);
-+
-+       pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;
-+       fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
-+
-+       cc = (chipcregs_t *)chipcregs;
-+       W_REG(si->osh, &cc->pll_on_delay, pll_on_delay);
-+       W_REG(si->osh, &cc->fref_sel_delay, fref_sel_delay);
-+}
-+
-+/* initialize power control delay registers */
-+void
-+BCMINITFN(sb_clkctl_init)(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint origidx;
-+       chipcregs_t *cc;
-+
-+       si = SB_INFO(sbh);
-+
-+       origidx = si->curidx;
-+
-+       if ((cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0)) == NULL)
-+               return;
-+
-+       if ((si->sb.chip == BCM4321_CHIP_ID) && (si->sb.chiprev < 2))
-+               W_REG(si->osh, &cc->chipcontrol,
-+                     (si->sb.chiprev == 0) ? CHIPCTRL_4321A0_DEFAULT : CHIPCTRL_4321A1_DEFAULT);
-+
-+       if (!(R_REG(si->osh, &cc->capabilities) & CAP_PWR_CTL))
-+               goto done;
-+
-+       /* set all Instaclk chip ILP to 1 MHz */
-+       else if (si->sb.ccrev >= 10)
-+               SET_REG(si->osh, &cc->system_clk_ctl, SYCC_CD_MASK,
-+                       (ILP_DIV_1MHZ << SYCC_CD_SHIFT));
-+
-+       sb_clkctl_setdelay(si, (void *)cc);
-+
-+done:
-+       sb_setcoreidx(sbh, origidx);
-+}
-+
-+/* return the value suitable for writing to the dot11 core FAST_PWRUP_DELAY register */
-+uint16
-+sb_clkctl_fast_pwrup_delay(sb_t *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;
-+
-+       INTR_OFF(si, intr_val);
-+
-+       if ((cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0)) == NULL)
-+               goto done;
-+
-+       if (!(R_REG(si->osh, &cc->capabilities) & CAP_PWR_CTL))
-+               goto done;
-+
-+       slowminfreq = sb_slowclk_freq(si, FALSE);
-+       fpdelay = (((R_REG(si->osh, &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_clkctl_xtal(sb_t *sbh, uint what, bool on)
-+{
-+       sb_info_t *si;
-+       uint32 in, out, outen;
-+
-+       si = SB_INFO(sbh);
-+
-+       switch (BUSTYPE(si->sb.bustype)) {
-+
-+
-+               case PCMCIA_BUS:
-+                       return (0);
-+
-+
-+               case PCI_BUS:
-+
-+                       /* pcie core doesn't have any mapping to control the xtal pu */
-+                       if (PCIE(si))
-+                               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));
-+
-+                       /*
-+                        * Avoid glitching the clock if GPRS is already using it.
-+                        * 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(XTAL_ON_DELAY);
-+                               }
-+
-+                               /* 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);
-+                       }
-+
-+               default:
-+                       return (-1);
-+       }
-+
-+       return (0);
-+}
-+
-+/* set dynamic clk control mode (forceslow, forcefast, dynamic) */
-+/*   returns true if we are forcing fast clock */
-+bool
-+sb_clkctl_clk(sb_t *sbh, uint mode)
-+{
-+       sb_info_t *si;
-+       uint origidx;
-+       chipcregs_t *cc;
-+       uint32 scc;
-+       uint intr_val = 0;
-+
-+       si = SB_INFO(sbh);
-+
-+       /* chipcommon cores prior to rev6 don't support dynamic clock control */
-+       if (si->sb.ccrev < 6)
-+               return (FALSE);
-+
-+
-+       /* Chips with ccrev 10 are EOL and they don't have SYCC_HR which we use below */
-+       ASSERT(si->sb.ccrev != 10);
-+
-+       INTR_OFF(si, intr_val);
-+
-+       origidx = si->curidx;
-+
-+       if (sb_setcore(sbh, SB_MIPS33, 0) && (sb_corerev(&si->sb) <= 7) &&
-+           (BUSTYPE(si->sb.bustype) == SB_BUS) && (si->sb.ccrev >= 10))
-+               goto done;
-+
-+       /* PR32414WAR  "Force HT clock on" all the time, no dynamic clk ctl */
-+       if ((si->sb.chip == BCM4311_CHIP_ID) && (si->sb.chiprev <= 1))
-+               goto done;
-+
-+       cc = (chipcregs_t*) sb_setcore(sbh, SB_CC, 0);
-+       ASSERT(cc != NULL);
-+
-+       if (!(R_REG(si->osh, &cc->capabilities) & CAP_PWR_CTL))
-+               goto done;
-+
-+       switch (mode) {
-+       case CLK_FAST:  /* force fast (pll) clock */
-+               if (si->sb.ccrev < 10) {
-+                       /* don't forget to force xtal back on before we clear SCC_DYN_XTAL.. */
-+                       sb_clkctl_xtal(&si->sb, XTAL, ON);
-+
-+                       SET_REG(si->osh, &cc->slow_clk_ctl, (SCC_XC | SCC_FS | SCC_IP), SCC_IP);
-+               } else
-+                       OR_REG(si->osh, &cc->system_clk_ctl, SYCC_HR);
-+               /* wait for the PLL */
-+               OSL_DELAY(PLL_DELAY);
-+               break;
-+
-+       case CLK_DYNAMIC:       /* enable dynamic clock control */
-+
-+               if (si->sb.ccrev < 10) {
-+                       scc = R_REG(si->osh, &cc->slow_clk_ctl);
-+                       scc &= ~(SCC_FS | SCC_IP | SCC_XC);
-+                       if ((scc & SCC_SS_MASK) != SCC_SS_XTAL)
-+                               scc |= SCC_XC;
-+                       W_REG(si->osh, &cc->slow_clk_ctl, scc);
-+
-+                       /* for dynamic control, we have to release our xtal_pu "force on" */
-+                       if (scc & SCC_XC)
-+                               sb_clkctl_xtal(&si->sb, XTAL, OFF);
-+               } else {
-+                       /* Instaclock */
-+                       AND_REG(si->osh, &cc->system_clk_ctl, ~SYCC_HR);
-+               }
-+               break;
-+
-+       default:
-+               ASSERT(0);
-+       }
-+
-+done:
-+       sb_setcoreidx(sbh, origidx);
-+       INTR_RESTORE(si, intr_val);
-+       return (mode == CLK_FAST);
-+}
-+
-+/* register driver interrupt disabling and restoring callback functions */
-+void
-+sb_register_intr_callback(sb_t *sbh, void *intrsoff_fn, void *intrsrestore_fn,
-+                          void *intrsenabled_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;
-+       si->intrsenabled_fn = (sb_intrsenabled_t)intrsenabled_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];
-+}
-+
-+
-+int
-+sb_corepciid(sb_t *sbh, uint func, uint16 *pcivendor, uint16 *pcidevice,
-+             uint8 *pciclass, uint8 *pcisubclass, uint8 *pciprogif,
-+             uint8 *pciheader)
-+{
-+       uint16 vendor = 0xffff, device = 0xffff;
-+       uint core, unit;
-+       uint chip, chippkg;
-+       uint nfunc;
-+       char varname[SB_DEVPATH_BUFSZ + 8];
-+       uint8 class, subclass, progif;
-+       char devpath[SB_DEVPATH_BUFSZ];
-+       uint8 header;
-+
-+       core = sb_coreid(sbh);
-+       unit = sb_coreunit(sbh);
-+
-+       chip = sb_chip(sbh);
-+       chippkg = sb_chippkg(sbh);
-+
-+       progif = 0;
-+       header = PCI_HEADER_NORMAL;
-+
-+       /* Verify whether the function exists for the core */
-+       nfunc = (core == SB_USB20H) ? 2 : 1;
-+       if (func >= nfunc)
-+               return BCME_ERROR;
-+
-+       /* Known vendor translations */
-+       switch (sb_corevendor(sbh)) {
-+       case SB_VEND_BCM:
-+               vendor = VENDOR_BROADCOM;
-+               break;
-+       default:
-+               return BCME_ERROR;
-+       }
-+
-+       /* Determine class based on known core codes */
-+       switch (core) {
-+       case SB_ILINE20:
-+               class = PCI_CLASS_NET;
-+               subclass = PCI_NET_ETHER;
-+               device = BCM47XX_ILINE_ID;
-+               break;
-+       case SB_ENET:
-+               class = PCI_CLASS_NET;
-+               subclass = PCI_NET_ETHER;
-+               device = BCM47XX_ENET_ID;
-+               break;
-+       case SB_GIGETH:
-+               class = PCI_CLASS_NET;
-+               subclass = PCI_NET_ETHER;
-+               device = BCM47XX_GIGETH_ID;
-+               break;
-+       case SB_SDRAM:
-+       case SB_MEMC:
-+               class = PCI_CLASS_MEMORY;
-+               subclass = PCI_MEMORY_RAM;
-+               device = (uint16)core;
-+               break;
-+       case SB_PCI:
-+       case SB_PCIE:
-+               class = PCI_CLASS_BRIDGE;
-+               subclass = PCI_BRIDGE_PCI;
-+               device = (uint16)core;
-+               header = PCI_HEADER_BRIDGE;
-+               break;
-+       case SB_MIPS:
-+       case SB_MIPS33:
-+               class = PCI_CLASS_CPU;
-+               subclass = PCI_CPU_MIPS;
-+               device = (uint16)core;
-+               break;
-+       case SB_CODEC:
-+               class = PCI_CLASS_COMM;
-+               subclass = PCI_COMM_MODEM;
-+               device = BCM47XX_V90_ID;
-+               break;
-+       case SB_USB:
-+               class = PCI_CLASS_SERIAL;
-+               subclass = PCI_SERIAL_USB;
-+               progif = 0x10; /* OHCI */
-+               device = BCM47XX_USB_ID;
-+               break;
-+       case SB_USB11H:
-+               class = PCI_CLASS_SERIAL;
-+               subclass = PCI_SERIAL_USB;
-+               progif = 0x10; /* OHCI */
-+               device = BCM47XX_USBH_ID;
-+               break;
-+       case SB_USB20H:
-+               class = PCI_CLASS_SERIAL;
-+               subclass = PCI_SERIAL_USB;
-+               progif = func == 0 ? 0x10 : 0x20; /* OHCI/EHCI */
-+               device = BCM47XX_USB20H_ID;
-+               header = 0x80; /* multifunction */
-+               break;
-+       case SB_USB11D:
-+               class = PCI_CLASS_SERIAL;
-+               subclass = PCI_SERIAL_USB;
-+               device = BCM47XX_USBD_ID;
-+               break;
-+       case SB_USB20D:
-+               class = PCI_CLASS_SERIAL;
-+               subclass = PCI_SERIAL_USB;
-+               device = BCM47XX_USB20D_ID;
-+               break;
-+       case SB_IPSEC:
-+               class = PCI_CLASS_CRYPT;
-+               subclass = PCI_CRYPT_NETWORK;
-+               device = BCM47XX_IPSEC_ID;
-+               break;
-+       case SB_ROBO:
-+               class = PCI_CLASS_NET;
-+               subclass = PCI_NET_OTHER;
-+               device = BCM47XX_ROBO_ID;
-+               break;
-+       case SB_EXTIF:
-+       case SB_CC:
-+               class = PCI_CLASS_MEMORY;
-+               subclass = PCI_MEMORY_FLASH;
-+               device = (uint16)core;
-+               break;
-+       case SB_D11:
-+               class = PCI_CLASS_NET;
-+               subclass = PCI_NET_OTHER;
-+               /* Let nvram variable override core ID */
-+               sb_devpath(sbh, devpath, sizeof(devpath));
-+               sprintf(varname, "%sdevid", devpath);
-+               if ((device = (uint16)getintvar(NULL, varname)))
-+                       break;
-+               /*
-+               * no longer support wl%did, but keep the code
-+               * here for backward compatibility.
-+               */
-+               sprintf(varname, "wl%did", unit);
-+               if ((device = (uint16)getintvar(NULL, varname)))
-+                       break;
-+               /* Chip specific conversion */
-+               if (chip == BCM4712_CHIP_ID) {
-+                       if (chippkg == BCM4712SMALL_PKG_ID)
-+                               device = BCM4306_D11G_ID;
-+                       else
-+                               device = BCM4306_D11DUAL_ID;
++               /* Known vendor translations */
++               switch (vendor) {
++               case SB_VEND_BCM:
++                       vendor = VENDOR_BROADCOM;
 +                       break;
 +               }
-+               /* ignore it */
-+               device = 0xffff;
-+               break;
-+       case SB_SATAXOR:
-+               class = PCI_CLASS_XOR;
-+               subclass = PCI_XOR_QDMA;
-+               device = BCM47XX_SATAXOR_ID;
-+               break;
-+       case SB_ATA100:
-+               class = PCI_CLASS_DASDI;
-+               subclass = PCI_DASDI_IDE;
-+               device = BCM47XX_ATA100_ID;
-+               break;
-+
-+       default:
-+               class = subclass = progif = 0xff;
-+               device = (uint16)core;
-+               break;
-+       }
-+
-+       *pcivendor = vendor;
-+       *pcidevice = device;
-+       *pciclass = class;
-+       *pcisubclass = subclass;
-+       *pciprogif = progif;
-+       *pciheader = header;
-+
++
++               /* 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_ROBO:
++                       class = PCI_CLASS_NET;
++                       subclass = PCI_NET_OTHER;
++                       core = BCM47XX_ROBO_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] = htol32(sb_base(R_REG(&sb->sbadmatch1)));
++               cfg->base[2] = htol32(sb_base(R_REG(&sb->sbadmatch2)));
++               cfg->base[3] = 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;
 +}
 +
-+
-+
-+/* use the mdio interface to write to mdio slaves */
-+static int
-+sb_pcie_mdiowrite(sb_info_t *si,  uint physmedia, uint regaddr, uint val)
-+{
-+       uint mdiodata;
-+       uint i = 0;
-+       sbpcieregs_t *pcieregs;
-+
-+       pcieregs = (sbpcieregs_t*) sb_setcoreidx(&si->sb, si->sb.buscoreidx);
-+       ASSERT(pcieregs);
-+
-+       /* enable mdio access to SERDES */
-+       W_REG(si->osh, (&pcieregs->mdiocontrol), MDIOCTL_PREAM_EN | MDIOCTL_DIVISOR_VAL);
-+
-+       mdiodata = MDIODATA_START | MDIODATA_WRITE |
-+               (physmedia << MDIODATA_DEVADDR_SHF) |
-+               (regaddr << MDIODATA_REGADDR_SHF) | MDIODATA_TA | val;
-+
-+       W_REG(si->osh, (&pcieregs->mdiodata), mdiodata);
-+
-+       PR28829_DELAY();
-+
-+       /* retry till the transaction is complete */
-+       while (i < 10) {
-+               if (R_REG(si->osh, &(pcieregs->mdiocontrol)) & MDIOCTL_ACCESS_DONE) {
-+                       /* Disable mdio access to SERDES */
-+                       W_REG(si->osh, (&pcieregs->mdiocontrol), 0);
-+                       return 0;
++int __init
++sbpci_init(void *sbh)
++{
++       sbpci_init_pci(sbh);
++       sbpci_init_cores(sbh);
++       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);
 +               }
-+               OSL_DELAY(1000);
-+               i++;
-+       }
-+
-+       SB_ERROR(("sb_pcie_mdiowrite: timed out\n"));
-+       /* Disable mdio access to SERDES */
-+       W_REG(si->osh, (&pcieregs->mdiocontrol), 0);
-+       ASSERT(0);
-+       return 1;
-+
-+}
-+
-+/* indirect way to read pcie config regs */
-+uint
-+sb_pcie_readreg(void *sb, void* arg1, uint offset)
-+{
-+       sb_info_t *si;
-+       sb_t   *sbh;
-+       uint retval = 0xFFFFFFFF;
-+       sbpcieregs_t *pcieregs;
-+       uint addrtype;
-+
-+       sbh = (sb_t *)sb;
-+       si = SB_INFO(sbh);
-+       ASSERT(PCIE(si));
-+
-+       pcieregs = (sbpcieregs_t *)sb_setcore(sbh, SB_PCIE, 0);
-+       ASSERT(pcieregs);
-+
-+       addrtype = (uint)((uintptr)arg1);
-+       switch (addrtype) {
-+               case PCIE_CONFIGREGS:
-+                       W_REG(si->osh, (&pcieregs->configaddr), offset);
-+                       retval = R_REG(si->osh, &(pcieregs->configdata));
-+                       break;
-+               case PCIE_PCIEREGS:
-+                       W_REG(si->osh, &(pcieregs->pcieaddr), offset);
-+                       retval = R_REG(si->osh, &(pcieregs->pciedata));
-+                       break;
-+               default:
-+                       ASSERT(0);
-+                       break;
-+       }
-+       return retval;
-+}
-+
-+/* indirect way to write pcie config/mdio/pciecore regs */
-+uint
-+sb_pcie_writereg(sb_t *sbh, void *arg1,  uint offset, uint val)
-+{
-+       sb_info_t *si;
-+       sbpcieregs_t *pcieregs;
-+       uint addrtype;
-+
-+       si = SB_INFO(sbh);
-+       ASSERT(PCIE(si));
-+
-+       pcieregs = (sbpcieregs_t *)sb_setcore(sbh, SB_PCIE, 0);
-+       ASSERT(pcieregs);
-+
-+       addrtype = (uint)((uintptr)arg1);
-+
-+       switch (addrtype) {
-+               case PCIE_CONFIGREGS:
-+                       W_REG(si->osh, (&pcieregs->configaddr), offset);
-+                       W_REG(si->osh, (&pcieregs->configdata), val);
-+                       break;
-+               case PCIE_PCIEREGS:
-+                       W_REG(si->osh, (&pcieregs->pcieaddr), offset);
-+                       W_REG(si->osh, (&pcieregs->pciedata), val);
-+                       break;
-+               default:
-+                       ASSERT(0);
-+                       break;
-+       }
-+       return 0;
-+}
-+
-+/* Build device path. Support SB, PCI, and JTAG for now. */
-+int
-+sb_devpath(sb_t *sbh, char *path, int size)
-+{
-+       ASSERT(path);
-+       ASSERT(size >= SB_DEVPATH_BUFSZ);
-+
-+       switch (BUSTYPE((SB_INFO(sbh))->sb.bustype)) {
-+       case SB_BUS:
-+       case JTAG_BUS:
-+               sprintf(path, "sb/%u/", sb_coreidx(sbh));
-+               break;
-+       case PCI_BUS:
-+               ASSERT((SB_INFO(sbh))->osh);
-+               sprintf(path, "pci/%u/%u/", OSL_PCI_BUS((SB_INFO(sbh))->osh),
-+                       OSL_PCI_SLOT((SB_INFO(sbh))->osh));
-+               break;
-+       case PCMCIA_BUS:
-+               SB_ERROR(("sb_devpath: OSL_PCMCIA_BUS() not implemented, bus 1 assumed\n"));
-+               SB_ERROR(("sb_devpath: OSL_PCMCIA_SLOT() not implemented, slot 1 assumed\n"));
-+               sprintf(path, "pc/%u/%u/", 1, 1);
-+               break;
-+       case SDIO_BUS:
-+               SB_ERROR(("sb_devpath: device 0 assumed\n"));
-+               sprintf(path, "sd/%u/", sb_coreidx(sbh));
-+               break;
-+       default:
++               /* Should not reach here */
 +               ASSERT(0);
-+               break;
-+       }
-+
-+       return 0;
-+}
-+
++       }
++
++       sb_setcoreidx(sbh, coreidx);
++}
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/setup.c linux-2.4.32-freewrt/arch/mips/bcm947xx/setup.c
+--- linux-2.4.32/arch/mips/bcm947xx/setup.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/setup.c     2006-07-06 08:36:07.000000000 +0200
+@@ -0,0 +1,199 @@
 +/*
-+ * Fixup SROMless PCI device's configuration.
-+ * The current core may be changed upon return.
-+ */
-+static int
-+sb_pci_fixcfg(sb_info_t *si)
-+{
-+       uint origidx, pciidx;
-+       sbpciregs_t *pciregs;
-+       sbpcieregs_t *pcieregs;
-+       uint16 val16, *reg16;
-+       char name[SB_DEVPATH_BUFSZ+16], *value;
-+       char devpath[SB_DEVPATH_BUFSZ];
-+
-+       ASSERT(BUSTYPE(si->sb.bustype) == PCI_BUS);
-+
-+       /* Fixup PI in SROM shadow area to enable the correct PCI core access */
-+       /* save the current index */
-+       origidx = sb_coreidx(&si->sb);
-+
-+       /* check 'pi' is correct and fix it if not */
-+       if (si->sb.buscoretype == SB_PCIE) {
-+               pcieregs = (sbpcieregs_t *)sb_setcore(&si->sb, SB_PCIE, 0);
-+               ASSERT(pcieregs);
-+               reg16 = &pcieregs->sprom[SRSH_PI_OFFSET];
-+       } else if (si->sb.buscoretype == SB_PCI) {
-+               pciregs = (sbpciregs_t *)sb_setcore(&si->sb, SB_PCI, 0);
-+               ASSERT(pciregs);
-+               reg16 = &pciregs->sprom[SRSH_PI_OFFSET];
-+       } else {
-+               ASSERT(0);
-+               return -1;
-+       }
-+       pciidx = sb_coreidx(&si->sb);
-+       val16 = R_REG(si->osh, reg16);
-+       if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) != (uint16)pciidx) {
-+               val16 = (uint16)(pciidx << SRSH_PI_SHIFT) | (val16 & ~SRSH_PI_MASK);
-+               W_REG(si->osh, reg16, val16);
-+       }
-+
-+       /* restore the original index */
-+       sb_setcoreidx(&si->sb, origidx);
-+
-+       /*
-+        * Fixup bar0window in PCI config space to make the core indicated
-+        * by the nvram variable the current core.
-+        * !Do it last, it may change the current core!
-+        */
-+       if (sb_devpath(&si->sb, devpath, sizeof(devpath)))
-+               return -1;
-+       sprintf(name, "%sb0w", devpath);
-+       if ((value = getvar(NULL, name))) {
-+               OSL_PCI_WRITE_CONFIG(si->osh, PCI_BAR0_WIN, sizeof(uint32),
-+                       bcm_strtoul(value, NULL, 16));
-+               /* update curidx since the current core is changed */
-+               si->curidx = _sb_coreidx(si);
-+               if (si->curidx == BADIDX) {
-+                       SB_ERROR(("sb_pci_fixcfg: bad core index\n"));
-+                       return -1;
-+               }
-+       }
-+
-+       return 0;
-+}
-+
-+static uint
-+sb_chipc_capability(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       /* Make sure that there is ChipCommon core present */
-+       if (si->coreid[SB_CC_IDX] == SB_CC)
-+               return (sb_corereg(si, SB_CC_IDX, OFFSETOF(chipcregs_t, capabilities),
-+                                  0, 0));
-+       return 0;
-+}
-+
-+/* Return ADDR64 capability of the backplane */
-+bool
-+sb_backplane64(sb_t *sbh)
-+{
-+       return ((sb_chipc_capability(sbh) & CAP_BKPLN64) != 0);
-+}
-+
-+void
-+sb_btcgpiowar(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint origidx;
-+       uint intr_val = 0;
-+       chipcregs_t *cc;
-+       si = SB_INFO(sbh);
-+
-+       /* Make sure that there is ChipCommon core present &&
-+        * UART_TX is strapped to 1
-+        */
-+       if (!(sb_chipc_capability(sbh) & CAP_UARTGPIO))
-+               return;
-+
-+       /* sb_corereg cannot be used as we have to guarantee 8-bit read/writes */
-+       INTR_OFF(si, intr_val);
-+
-+       origidx = sb_coreidx(sbh);
-+
-+       cc = (chipcregs_t *)sb_setcore(sbh, SB_CC, 0);
-+       if (cc == NULL)
-+               goto end;
-+
-+       W_REG(si->osh, &cc->uart0mcr, R_REG(si->osh, &cc->uart0mcr) | 0x04);
-+
-+end:
-+       /* restore the original index */
-+       sb_setcoreidx(sbh, origidx);
-+
-+       INTR_RESTORE(si, intr_val);
-+}
-+
-+/* check if the device is removed */
-+bool
-+sb_deviceremoved(sb_t *sbh)
-+{
-+       uint32 w;
-+       sb_info_t *si;
-+
-+       si = SB_INFO(sbh);
-+
-+       switch (BUSTYPE(si->sb.bustype)) {
-+       case PCI_BUS:
-+               ASSERT(si->osh);
-+               w = OSL_PCI_READ_CONFIG(si->osh, PCI_CFG_VID, sizeof(uint32));
-+               if ((w & 0xFFFF) != VENDOR_BROADCOM)
-+                       return TRUE;
-+               else
-+                       return FALSE;
-+       default:
-+               return FALSE;
-+       }
-+       return FALSE;
-+}
-+
-+/* Return the RAM size of the SOCRAM core */
-+uint32
-+sb_socram_size(sb_t *sbh)
-+{
-+       sb_info_t *si;
-+       uint origidx;
-+       uint intr_val = 0;
-+
-+       sbsocramregs_t *regs;
-+       bool wasup;
-+       uint corerev;
-+       uint32 coreinfo;
-+       uint memsize = 0;
-+
-+       si = SB_INFO(sbh);
-+       ASSERT(si);
-+
-+       /* Block ints and save current core */
-+       INTR_OFF(si, intr_val);
-+       origidx = sb_coreidx(sbh);
-+
-+       /* Switch to SOCRAM core */
-+       if (!(regs = sb_setcore(sbh, SB_SOCRAM, 0)))
-+               goto done;
-+
-+       /* Get info for determining size */
-+       if (!(wasup = sb_iscoreup(sbh)))
-+               sb_core_reset(sbh, 0, 0);
-+       corerev = sb_corerev(sbh);
-+       coreinfo = R_REG(si->osh, &regs->coreinfo);
-+
-+       /* Calculate size from coreinfo based on rev */
-+       switch (corerev) {
-+       case 0:
-+               memsize = 1 << (16 + (coreinfo & SRCI_MS0_MASK));
-+               break;
-+       default: /* rev >= 1 */
-+               memsize = 1 << (SR_BSZ_BASE + (coreinfo & SRCI_SRBSZ_MASK));
-+               memsize *= (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
-+               break;
-+       }
-+
-+       /* Return to previous state and core */
-+       if (!wasup)
-+               sb_core_disable(sbh, 0);
-+       sb_setcoreidx(sbh, origidx);
-+
-+done:
-+       INTR_RESTORE(si, intr_val);
-+       return memsize;
-+}
-+
-+
-diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setup.c
---- linux.old/arch/mips/bcm947xx/setup.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/setup.c        2006-04-27 23:22:53.000000000 +0200
-@@ -0,0 +1,241 @@
-+/*
-+ *  Generic setup routines for Broadcom MIPS boards
++ * Generic setup routines for Broadcom MIPS boards
 + *
-+ *  Copyright (C) 2005 Felix Fietkau <nbd@openwrt.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.
-+ *
-+ *
-+ * Copyright 2005, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -15116 +8369 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
++ * $Id: setup.c,v 1.2 2005/04/02 12:12:57 wbx Exp $
 + */
 +
@@ -15121 +8375 @@
 +#include <linux/init.h>
 +#include <linux/kernel.h>
-+#include <linux/module.h>
 +#include <linux/serialP.h>
 +#include <linux/ide.h>
 +#include <asm/bootinfo.h>
-+#include <asm/cpu.h>
 +#include <asm/time.h>
 +#include <asm/reboot.h>
 +
 +#include <typedefs.h>
-+#include <osl.h>
-+#include <sbutils.h>
 +#include <bcmutils.h>
 +#include <bcmnvram.h>
-+#include <sbhndmips.h>
-+#include <hndmips.h>
++#include <sbmips.h>
++#include <sbutils.h>
 +#include <trxhdr.h>
-+
-+/* Virtual IRQ base, after last hw IRQ */
-+#define SBMIPS_VIRTIRQ_BASE 6
-+
-+/* # IRQs, hw and sw IRQs */
-+#define SBMIPS_NUMIRQS  8
-+
-+/* Global SB handle */
-+sb_t *bcm947xx_sbh = NULL;
-+spinlock_t bcm947xx_sbh_lock = SPIN_LOCK_UNLOCKED;
-+
-+/* Convenience */
-+#define sbh bcm947xx_sbh
-+#define sbh_lock bcm947xx_sbh_lock
 +
 +extern void bcm947xx_time_init(void);
 +extern void bcm947xx_timer_setup(struct irqaction *irq);
++extern void check_enable_mips_pfc(int val);
 +
 +#ifdef CONFIG_REMOTE_DEBUG
@@ -15165 +8402 @@
 +#endif
 +
++/* Global SB handle */
++void *bcm947xx_sbh = NULL;
++spinlock_t bcm947xx_sbh_lock = SPIN_LOCK_UNLOCKED;
++EXPORT_SYMBOL(bcm947xx_sbh);
++EXPORT_SYMBOL(bcm947xx_sbh_lock);
++
++/* Convenience */
++#define sbh bcm947xx_sbh
++#define sbh_lock bcm947xx_sbh_lock
++
 +/* Kernel command line */
 +char arcs_cmdline[CL_SIZE] __initdata = CONFIG_CMDLINE;
-+extern void sb_serial_init(sb_t *sbh, void (*add)(void *regs, uint irq, uint baud_base, uint reg_shift));
 +
 +void
@@ -15238 +8484 @@
 +        s.io_type = SERIAL_IO_MEM;
 +        s.iomem_reg_shift = reg_shift;
-+
 +        if (early_serial_setup(&s) != 0) {
 +                printk(KERN_ERR "Serial setup failed!\n");
@@ -15252 +8497 @@
 +       int i;
 +       char *value;
++       uint  pfc_val;
 +
 +       /* Get global SB handle */
@@ -15257 +8503 @@
 +
 +       /* Initialize clocks and interrupts */
-+       sb_mips_init(sbh, SBMIPS_VIRTIRQ_BASE);
-+
-+       if (BCM330X(current_cpu_data.processor_id) &&
-+               (read_c0_diag() & BRCM_PFC_AVAIL)) {
-+               /* 
-+                * Now that the sbh is inited set the  proper PFC value 
-+                */     
-+               printk("Setting the PFC to its default value\n");
-+               enable_pfc(PFC_AUTO);
-+       }
-+
++       sb_mips_init(sbh);
++
++       /* 
++        * Now that the sbh is inited set the  proper PFC value 
++        */     
++       pfc_val = sb_mips_get_pfc(sbh);
++       printk("Setting the PFC value as 0x%x\n", pfc_val);
++       check_enable_mips_pfc(pfc_val);
 +
 +#ifdef CONFIG_SERIAL
 +       sb_serial_init(sbh, serial_add);
-+
 +       /* reverse serial ports if nvram variable starts with console=ttyS1 */
 +       /* Initialize UARTs */
@@ -15307 +8549 @@
 +get_system_type(void)
 +{
-+       static char s[32];
-+
-+       if (bcm947xx_sbh) {
-+               sprintf(s, "Broadcom BCM%X chip rev %d", sb_chip(bcm947xx_sbh),
-+                       sb_chiprev(bcm947xx_sbh));
-+               return s;
-+       }
-+       else
-+               return "Broadcom BCM947XX";
++       return "Broadcom BCM947XX";
 +}
 +
@@ -15323 +8557 @@
 +}
 +
-diff -urN linux.old/arch/mips/bcm947xx/sflash.c linux.dev/arch/mips/bcm947xx/sflash.c
---- linux.old/arch/mips/bcm947xx/sflash.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/sflash.c       2006-04-27 22:11:27.000000000 +0200
-@@ -0,0 +1,422 @@
+diff -Nur linux-2.4.32/arch/mips/bcm947xx/time.c linux-2.4.32-freewrt/arch/mips/bcm947xx/time.c
+--- linux-2.4.32/arch/mips/bcm947xx/time.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/bcm947xx/time.c      2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,102 @@
 +/*
-+ * Broadcom SiliconBackplane chipcommon serial flash interface
-+ *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -15338 +8570 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: sflash.c,v 1.1.1.13 2006/02/27 03:43:16 honor Exp $
-+ */
-+
-+#include <osl.h>
-+#include <typedefs.h>
-+#include <sbconfig.h>
-+#include <sbchipc.h>
-+#include <mipsinc.h>
-+#include <bcmutils.h>
-+#include <bcmdevs.h>
-+#include <sflash.h>
-+
-+/* Private global state */
-+static struct sflash sflash;
-+
-+/* Issue a serial flash command */
-+static INLINE void
-+sflash_cmd(chipcregs_t *cc, uint opcode)
-+{
-+       W_REG(NULL, &cc->flashcontrol, SFLASH_START | opcode);
-+       while (R_REG(NULL, &cc->flashcontrol) & SFLASH_BUSY);
-+}
-+
-+/* Initialize serial flash access */
-+struct sflash *
-+sflash_init(chipcregs_t *cc)
-+{
-+       uint32 id, id2;
-+
-+       bzero(&sflash, sizeof(sflash));
-+
-+       sflash.type = R_REG(NULL, &cc->capabilities) & CAP_FLASH_MASK;
-+
-+       switch (sflash.type) {
-+       case SFLASH_ST:
-+               /* Probe for ST chips */
-+               sflash_cmd(cc, SFLASH_ST_DP);
-+               sflash_cmd(cc, SFLASH_ST_RES);
-+               id = R_REG(NULL, &cc->flashdata);
-+               switch (id) {
-+               case 0x11:
-+                       /* ST M25P20 2 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 4;
-+                       break;
-+               case 0x12:
-+                       /* ST M25P40 4 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 8;
-+                       break;
-+               case 0x13:
-+                       /* ST M25P80 8 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 16;
-+                       break;
-+               case 0x14:
-+                       /* ST M25P16 16 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 32;
-+                       break;
-+               case 0x15:
-+                       /* ST M25P32 32 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 64;
-+                       break;
-+               case 0x16:
-+                       /* ST M25P64 64 Mbit Serial Flash */
-+                       sflash.blocksize = 64 * 1024;
-+                       sflash.numblocks = 128;
-+                       break;
-+               case 0xbf:
-+                       W_REG(NULL, &cc->flashaddress, 1);
-+                       sflash_cmd(cc, SFLASH_ST_RES);
-+                       id2 = R_REG(NULL, &cc->flashdata);
-+                       if (id2 == 0x44) {
-+                               /* SST M25VF80 4 Mbit Serial Flash */
-+                               sflash.blocksize = 64 * 1024;
-+                               sflash.numblocks = 8;
-+                       }
-+                       break;
-+               }
-+               break;
-+
-+       case SFLASH_AT:
-+               /* Probe for Atmel chips */
-+               sflash_cmd(cc, SFLASH_AT_STATUS);
-+               id = R_REG(NULL, &cc->flashdata) & 0x3c;
-+               switch (id) {
-+               case 0xc:
-+                       /* Atmel AT45DB011 1Mbit Serial Flash */
-+                       sflash.blocksize = 256;
-+                       sflash.numblocks = 512;
-+                       break;
-+               case 0x14:
-+                       /* Atmel AT45DB021 2Mbit Serial Flash */
-+                       sflash.blocksize = 256;
-+                       sflash.numblocks = 1024;
-+                       break;
-+               case 0x1c:
-+                       /* Atmel AT45DB041 4Mbit Serial Flash */
-+                       sflash.blocksize = 256;
-+                       sflash.numblocks = 2048;
-+                       break;
-+               case 0x24:
-+                       /* Atmel AT45DB081 8Mbit Serial Flash */
-+                       sflash.blocksize = 256;
-+                       sflash.numblocks = 4096;
-+                       break;
-+               case 0x2c:
-+                       /* Atmel AT45DB161 16Mbit Serial Flash */
-+                       sflash.blocksize = 512;
-+                       sflash.numblocks = 4096;
-+                       break;
-+               case 0x34:
-+                       /* Atmel AT45DB321 32Mbit Serial Flash */
-+                       sflash.blocksize = 512;
-+                       sflash.numblocks = 8192;
-+                       break;
-+               case 0x3c:
-+                       /* Atmel AT45DB642 64Mbit Serial Flash */
-+                       sflash.blocksize = 1024;
-+                       sflash.numblocks = 8192;
-+                       break;
-+               }
-+               break;
-+       }
-+
-+       sflash.size = sflash.blocksize * sflash.numblocks;
-+       return sflash.size ? &sflash : NULL;
-+}
-+
-+/* Read len bytes starting at offset into buf. Returns number of bytes read. */
-+int
-+sflash_read(chipcregs_t *cc, uint offset, uint len, uchar *buf)
-+{
-+       int cnt;
-+       uint32 *from, *to;
-+
-+       if (!len)
-+               return 0;
-+
-+       if ((offset + len) > sflash.size)
-+               return -22;
-+
-+       if ((len >= 4) && (offset & 3))
-+               cnt = 4 - (offset & 3);
-+       else if ((len >= 4) && ((uint32)buf & 3))
-+               cnt = 4 - ((uint32)buf & 3);
-+       else
-+               cnt = len;
-+
-+       from = (uint32 *)KSEG1ADDR(SB_FLASH2 + offset);
-+       to = (uint32 *)buf;
-+
-+       if (cnt < 4) {
-+               bcopy(from, to, cnt);
-+               return cnt;
-+       }
-+
-+       while (cnt >= 4) {
-+               *to++ = *from++;
-+               cnt -= 4;
-+       }
-+
-+       return (len - cnt);
-+}
-+
-+/* Poll for command completion. Returns zero when complete. */
-+int
-+sflash_poll(chipcregs_t *cc, uint offset)
-+{
-+       if (offset >= sflash.size)
-+               return -22;
-+
-+       switch (sflash.type) {
-+       case SFLASH_ST:
-+               /* Check for ST Write In Progress bit */
-+               sflash_cmd(cc, SFLASH_ST_RDSR);
-+               return R_REG(NULL, &cc->flashdata) & SFLASH_ST_WIP;
-+       case SFLASH_AT:
-+               /* Check for Atmel Ready bit */
-+               sflash_cmd(cc, SFLASH_AT_STATUS);
-+               return !(R_REG(NULL, &cc->flashdata) & SFLASH_AT_READY);
-+       }
-+
-+       return 0;
-+}
-+
-+/* Write len bytes starting at offset into buf. Returns number of bytes
-+ * written. Caller should poll for completion.
-+ */
-+int
-+sflash_write(chipcregs_t *cc, uint offset, uint len, const uchar *buf)
-+{
-+       struct sflash *sfl;
-+       int ret = 0;
-+       bool is4712b0;
-+       uint32 page, byte, mask;
-+
-+       if (!len)
-+               return 0;
-+
-+       if ((offset + len) > sflash.size)
-+               return -22;
-+
-+       sfl = &sflash;
-+       switch (sfl->type) {
-+       case SFLASH_ST:
-+               mask = R_REG(NULL, &cc->chipid);
-+               is4712b0 = (((mask & CID_ID_MASK) == BCM4712_CHIP_ID) &&
-+                           ((mask & CID_REV_MASK) == (3 << CID_REV_SHIFT)));
-+               /* Enable writes */
-+               sflash_cmd(cc, SFLASH_ST_WREN);
-+               if (is4712b0) {
-+                       mask = 1 << 14;
-+                       W_REG(NULL, &cc->flashaddress, offset);
-+                       W_REG(NULL, &cc->flashdata, *buf++);
-+                       /* Set chip select */
-+                       OR_REG(NULL, &cc->gpioout, mask);
-+                       /* Issue a page program with the first byte */
-+                       sflash_cmd(cc, SFLASH_ST_PP);
-+                       ret = 1;
-+                       offset++;
-+                       len--;
-+                       while (len > 0) {
-+                               if ((offset & 255) == 0) {
-+                                       /* Page boundary, drop cs and return */
-+                                       AND_REG(NULL, &cc->gpioout, ~mask);
-+                                       if (!sflash_poll(cc, offset)) {
-+                                               /* Flash rejected command */
-+                                               return -11;
-+                                       }
-+                                       return ret;
-+                               } else {
-+                                       /* Write single byte */
-+                                       sflash_cmd(cc, *buf++);
-+                               }
-+                               ret++;
-+                               offset++;
-+                               len--;
-+                       }
-+                       /* All done, drop cs if needed */
-+                       if ((offset & 255) != 1) {
-+                               /* Drop cs */
-+                               AND_REG(NULL, &cc->gpioout, ~mask);
-+                               if (!sflash_poll(cc, offset)) {
-+                                       /* Flash rejected command */
-+                                       return -12;
-+                               }
-+                       }
-+               } else {
-+                       ret = 1;
-+                       W_REG(NULL, &cc->flashaddress, offset);
-+                       W_REG(NULL, &cc->flashdata, *buf);
-+                       /* Page program */
-+                       sflash_cmd(cc, SFLASH_ST_PP);
-+               }
-+               break;
-+       case SFLASH_AT:
-+               mask = sfl->blocksize - 1;
-+               page = (offset & ~mask) << 1;
-+               byte = offset & mask;
-+               /* Read main memory page into buffer 1 */
-+               if (byte || (len < sfl->blocksize)) {
-+                       W_REG(NULL, &cc->flashaddress, page);
-+                       sflash_cmd(cc, SFLASH_AT_BUF1_LOAD);
-+                       /* 250 us for AT45DB321B */
-+                       SPINWAIT(sflash_poll(cc, offset), 1000);
-+                       ASSERT(!sflash_poll(cc, offset));
-+               }
-+               /* Write into buffer 1 */
-+               for (ret = 0; (ret < (int)len) && (byte < sfl->blocksize); ret++) {
-+                       W_REG(NULL, &cc->flashaddress, byte++);
-+                       W_REG(NULL, &cc->flashdata, *buf++);
-+                       sflash_cmd(cc, SFLASH_AT_BUF1_WRITE);
-+               }
-+               /* Write buffer 1 into main memory page */
-+               W_REG(NULL, &cc->flashaddress, page);
-+               sflash_cmd(cc, SFLASH_AT_BUF1_PROGRAM);
-+               break;
-+       }
-+
-+       return ret;
-+}
-+
-+/* Erase a region. Returns number of bytes scheduled for erasure.
-+ * Caller should poll for completion.
-+ */
-+int
-+sflash_erase(chipcregs_t *cc, uint offset)
-+{
-+       struct sflash *sfl;
-+
-+       if (offset >= sflash.size)
-+               return -22;
-+
-+       sfl = &sflash;
-+       switch (sfl->type) {
-+       case SFLASH_ST:
-+               sflash_cmd(cc, SFLASH_ST_WREN);
-+               W_REG(NULL, &cc->flashaddress, offset);
-+               sflash_cmd(cc, SFLASH_ST_SE);
-+               return sfl->blocksize;
-+       case SFLASH_AT:
-+               W_REG(NULL, &cc->flashaddress, offset << 1);
-+               sflash_cmd(cc, SFLASH_AT_PAGE_ERASE);
-+               return sfl->blocksize;
-+       }
-+
-+       return 0;
-+}
-+
-+/*
-+ * writes the appropriate range of flash, a NULL buf simply erases
-+ * the region of flash
-+ */
-+int
-+sflash_commit(chipcregs_t *cc, uint offset, uint len, const uchar *buf)
-+{
-+       struct sflash *sfl;
-+       uchar *block = NULL, *cur_ptr, *blk_ptr;
-+       uint blocksize = 0, mask, cur_offset, cur_length, cur_retlen, remainder;
-+       uint blk_offset, blk_len, copied;
-+       int bytes, ret = 0;
-+
-+       /* Check address range */
-+       if (len <= 0)
-+               return 0;
-+
-+       sfl = &sflash;
-+       if ((offset + len) > sfl->size)
-+               return -1;
-+
-+       blocksize = sfl->blocksize;
-+       mask = blocksize - 1;
-+
-+       /* Allocate a block of mem */
-+       if (!(block = MALLOC(NULL, blocksize)))
-+               return -1;
-+
-+       while (len) {
-+               /* Align offset */
-+               cur_offset = offset & ~mask;
-+               cur_length = blocksize;
-+               cur_ptr = block;
-+
-+               remainder = blocksize - (offset & mask);
-+               if (len < remainder)
-+                       cur_retlen = len;
-+               else
-+                       cur_retlen = remainder;
-+
-+               /* buf == NULL means erase only */
-+               if (buf) {
-+                       /* Copy existing data into holding block if necessary */
-+                       if ((offset & mask) || (len < blocksize)) {
-+                               blk_offset = cur_offset;
-+                               blk_len = cur_length;
-+                               blk_ptr = cur_ptr;
-+
-+                               /* Copy entire block */
-+                               while (blk_len) {
-+                                       copied = sflash_read(cc, blk_offset, blk_len, blk_ptr);
-+                                       blk_offset += copied;
-+                                       blk_len -= copied;
-+                                       blk_ptr += copied;
-+                               }
-+                       }
-+
-+                       /* Copy input data into holding block */
-+                       memcpy(cur_ptr + (offset & mask), buf, cur_retlen);
-+               }
-+
-+               /* Erase block */
-+               if ((ret = sflash_erase(cc, (uint) cur_offset)) < 0)
-+                       goto done;
-+               while (sflash_poll(cc, (uint) cur_offset));
-+
-+               /* buf == NULL means erase only */
-+               if (!buf) {
-+                       offset += cur_retlen;
-+                       len -= cur_retlen;
-+                       continue;
-+               }
-+
-+               /* Write holding block */
-+               while (cur_length > 0) {
-+                       if ((bytes = sflash_write(cc,
-+                                                 (uint) cur_offset,
-+                                                 (uint) cur_length,
-+                                                 (uchar *) cur_ptr)) < 0) {
-+                               ret = bytes;
-+                               goto done;
-+                       }
-+                       while (sflash_poll(cc, (uint) cur_offset));
-+                       cur_offset += bytes;
-+                       cur_length -= bytes;
-+                       cur_ptr += bytes;
-+               }
-+
-+               offset += cur_retlen;
-+               len -= cur_retlen;
-+               buf += cur_retlen;
-+       }
-+
-+       ret = len;
-+done:
-+       if (block)
-+               MFREE(NULL, block, blocksize);
-+       return ret;
-+}
-diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.c
---- linux.old/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/time.c 2006-04-28 00:45:40.000000000 +0200
-@@ -0,0 +1,104 @@
-+/*
-+ * Copyright 2006, 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: time.c,v 1.1.1.10 2006/02/27 03:42:55 honor Exp $
++ * $Id: time.c,v 1.1 2005/03/16 13:49:59 wbx Exp $
 + */
 +#include <linux/config.h>
@@ -15775 +8583 @@
 +
 +#include <typedefs.h>
-+#include <osl.h>
 +#include <bcmnvram.h>
 +#include <sbconfig.h>
 +#include <sbextif.h>
 +#include <sbutils.h>
-+#include <hndmips.h>
-+#include <mipsinc.h>
-+#include <hndcpu.h>
++#include <sbmips.h>
 +
 +/* Global SB handle */
@@ -15809 +8614 @@
 +       write_c0_compare(0xffff);
 +
-+       if (!(hz = sb_cpu_clock(sbh)))
++       if (!(hz = sb_mips_clock(sbh)))
 +               hz = 100000000;
 +
@@ -15820 +8625 @@
 +       /* Set watchdog interval in ms */
 +       watchdog = simple_strtoul(nvram_safe_get("watchdog"), NULL, 0);
-+
-+       /* Please set the watchdog to 3 sec if it is less than 3 but not equal to 0 */
++       
++       /* Please set the watchdog to 3 sec if it is less than 3 but not equal to 0 */
 +       if (watchdog > 0) {
 +               if (watchdog < 3000)
 +                       watchdog = 3000;
 +       }
++
 +
 +       /* Set panic timeout in seconds */
@@ -15857 +8663 @@
 +       setup_irq(7, &bcm947xx_timer_irqaction);
 +}
-diff -urN linux.old/arch/mips/config-shared.in linux.dev/arch/mips/config-shared.in
---- linux.old/arch/mips/config-shared.in        2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/config-shared.in        2006-04-27 19:24:19.000000000 +0200
-@@ -208,6 +208,14 @@
+diff -Nur linux-2.4.32/arch/mips/config-shared.in linux-2.4.32-freewrt/arch/mips/config-shared.in
+--- linux-2.4.32/arch/mips/config-shared.in     2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/config-shared.in     2006-07-02 21:58:25.000000000 +0200
+@@ -205,6 +205,14 @@
     fi
     define_bool CONFIG_MIPS_RTC y
@@ -15875 +8681 @@
  bool 'Support for TANBAC TB0226 (Mbase)' CONFIG_TANBAC_TB0226
  bool 'Support for TANBAC TB0229 (VR4131DIMM)' CONFIG_TANBAC_TB0229
-@@ -229,6 +237,11 @@
+@@ -226,6 +234,11 @@
  define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
  
@@ -15887 +8693 @@
  #
  if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
-@@ -554,6 +567,13 @@
+@@ -533,6 +546,13 @@
     define_bool CONFIG_SWAP_IO_SPACE_L y
     define_bool CONFIG_BOOT_ELF32 y
@@ -15901 +8707 @@
     define_bool CONFIG_ARC32 y
     define_bool CONFIG_ARC_MEMORY y
-@@ -1042,7 +1062,11 @@
+@@ -1011,7 +1031,11 @@
  
  bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE
@@ -15914 +8720 @@
  if [ "$CONFIG_KGDB" = "y" ]; then
     define_bool CONFIG_DEBUG_INFO y
-diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
---- linux.old/arch/mips/kernel/cpu-probe.c      2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/kernel/cpu-probe.c      2006-04-27 19:24:19.000000000 +0200
-@@ -162,7 +162,7 @@
+diff -Nur linux-2.4.32/arch/mips/kernel/cpu-probe.c linux-2.4.32-freewrt/arch/mips/kernel/cpu-probe.c
+--- linux-2.4.32/arch/mips/kernel/cpu-probe.c   2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/kernel/cpu-probe.c   2006-07-02 21:58:25.000000000 +0200
+@@ -174,7 +174,7 @@
  
  static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
@@ -15926 +8732 @@
                 c->cputype = CPU_R2000;
                 c->isa_level = MIPS_CPU_ISA_I;
-@@ -172,7 +172,7 @@
+@@ -184,7 +184,7 @@
                 c->tlbsize = 64;
                 break;
@@ -15935 +8741 @@
                                 c->cputype = CPU_R3081E;
                         else
-@@ -187,12 +187,12 @@
+@@ -199,12 +199,12 @@
                 break;
         case PRID_IMP_R4000:
@@ -15950 +8756 @@
                         else
                                 c->cputype = CPU_R4000SC;
-@@ -438,7 +438,7 @@
+@@ -450,7 +450,7 @@
  static inline void cpu_probe_mips(struct cpuinfo_mips *c)
  {
@@ -15959 +8765 @@
                 c->cputype = CPU_4KC;
                 c->isa_level = MIPS_CPU_ISA_M32;
-@@ -479,10 +479,10 @@
+@@ -491,10 +491,10 @@
  {
         decode_config1(c);
@@ -15972 +8778 @@
                         c->cputype = CPU_AU1000;
                         break;
-@@ -510,10 +510,34 @@
+@@ -522,10 +522,34 @@
         }
  }
@@ -16008 +8814 @@
                 c->cputype = CPU_SB1;
                 c->isa_level = MIPS_CPU_ISA_M64;
-@@ -535,7 +559,7 @@
+@@ -547,7 +571,7 @@
  static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
  {
@@ -16017 +8823 @@
                 c->cputype = CPU_SR71000;
                 c->isa_level = MIPS_CPU_ISA_M64;
-@@ -560,7 +584,7 @@
+@@ -572,7 +596,7 @@
         c->cputype      = CPU_UNKNOWN;
  
@@ -16026 +8832 @@
         case PRID_COMP_LEGACY:
                 cpu_probe_legacy(c);
-@@ -571,6 +595,9 @@
+@@ -583,6 +607,9 @@
         case PRID_COMP_ALCHEMY:
                 cpu_probe_alchemy(c);
@@ -16036 +8842 @@
                 cpu_probe_sibyte(c);
                 break;
-diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
---- linux.old/arch/mips/kernel/head.S   2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/kernel/head.S   2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/kernel/head.S linux-2.4.32-freewrt/arch/mips/kernel/head.S
+--- linux-2.4.32/arch/mips/kernel/head.S        2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/kernel/head.S        2006-07-02 21:58:25.000000000 +0200
 @@ -28,12 +28,20 @@
  #include <asm/mipsregs.h>
@@ -16061 +8867 @@
                 /* The following two symbols are used for kernel profiling. */
                 EXPORT(stext)
-diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
---- linux.old/arch/mips/kernel/proc.c   2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/kernel/proc.c   2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/kernel/proc.c linux-2.4.32-freewrt/arch/mips/kernel/proc.c
+--- linux-2.4.32/arch/mips/kernel/proc.c        2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/kernel/proc.c        2006-07-02 21:58:25.000000000 +0200
 @@ -78,9 +78,10 @@
         [CPU_AU1550]    "Au1550",
@@ -16076 +8882 @@
  {
         unsigned int version = current_cpu_data.processor_id;
-diff -urN linux.old/arch/mips/kernel/setup.c linux.dev/arch/mips/kernel/setup.c
---- linux.old/arch/mips/kernel/setup.c  2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/kernel/setup.c  2006-04-27 19:24:19.000000000 +0200
-@@ -493,6 +493,7 @@
+diff -Nur linux-2.4.32/arch/mips/kernel/setup.c linux-2.4.32-freewrt/arch/mips/kernel/setup.c
+--- linux-2.4.32/arch/mips/kernel/setup.c       2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/kernel/setup.c       2006-07-02 21:58:25.000000000 +0200
+@@ -495,6 +495,7 @@
         void swarm_setup(void);
         void hp_setup(void);
@@ -16087 +8893 @@
  
         frame_info_init();
-@@ -691,6 +692,11 @@
+@@ -693,6 +694,11 @@
                  pmc_yosemite_setup();
                  break;
@@ -16099 +8905 @@
                 panic("Unsupported architecture");
         }
-diff -urN linux.old/arch/mips/kernel/traps.c linux.dev/arch/mips/kernel/traps.c
---- linux.old/arch/mips/kernel/traps.c  2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/kernel/traps.c  2006-04-27 19:24:19.000000000 +0200
-@@ -920,6 +920,7 @@
+diff -Nur linux-2.4.32/arch/mips/kernel/traps.c linux-2.4.32-freewrt/arch/mips/kernel/traps.c
+--- linux-2.4.32/arch/mips/kernel/traps.c       2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/kernel/traps.c       2006-07-02 21:58:25.000000000 +0200
+@@ -913,6 +913,7 @@
  void __init trap_init(void)
  {
@@ -16110 +8916 @@
         extern char except_vec_ejtag_debug;
         extern char except_vec4;
-@@ -927,6 +928,7 @@
+@@ -922,6 +923,7 @@
  
         /* Copy the generic exception handler code to it's final destination. */
@@ -16118 +8924 @@
         /*
          * Setup default vectors
-@@ -985,6 +987,12 @@
+@@ -980,6 +982,12 @@
         set_except_vector(13, handle_tr);
         set_except_vector(22, handle_mdmx);
@@ -16131 +8937 @@
                 set_except_vector(15, handle_fpe);
  
-diff -urN linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
---- linux.old/arch/mips/mm/c-r4k.c      2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/mm/c-r4k.c      2006-04-27 19:24:19.000000000 +0200
-@@ -1166,3 +1166,47 @@
+diff -Nur linux-2.4.32/arch/mips/mm/c-r4k.c linux-2.4.32-freewrt/arch/mips/mm/c-r4k.c
+--- linux-2.4.32/arch/mips/mm/c-r4k.c   2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/mm/c-r4k.c   2006-07-02 21:58:25.000000000 +0200
+@@ -1114,3 +1114,47 @@
         build_clear_page();
         build_copy_page();
@@ -16182 +8988 @@
 +
 +
-diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
---- linux.old/arch/mips/pci/Makefile    2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/arch/mips/pci/Makefile    2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/arch/mips/pci/Makefile linux-2.4.32-freewrt/arch/mips/pci/Makefile
+--- linux-2.4.32/arch/mips/pci/Makefile 2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.32-freewrt/arch/mips/pci/Makefile 2006-07-02 21:58:25.000000000 +0200
 @@ -13,7 +13,9 @@
  obj-$(CONFIG_MIPS_MSC)         += ops-msc.o
@@ -16195 +9001 @@
  
  include $(TOPDIR)/Rules.make
-diff -urN linux.old/drivers/char/serial.c linux.dev/drivers/char/serial.c
---- linux.old/drivers/char/serial.c     2006-04-27 18:04:37.000000000 +0200
-+++ linux.dev/drivers/char/serial.c     2006-04-27 19:24:19.000000000 +0200
-@@ -444,6 +444,10 @@
+diff -Nur linux-2.4.32/drivers/char/serial.c linux-2.4.32-freewrt/drivers/char/serial.c
+--- linux-2.4.32/drivers/char/serial.c  2005-11-16 20:12:54.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/char/serial.c  2006-07-02 21:58:25.000000000 +0200
+@@ -422,6 +422,10 @@
                 return inb(info->port+1);
  #endif
@@ -16209 +9015 @@
                              (offset<<info->iomem_reg_shift));
         default:
-@@ -464,6 +468,9 @@
+@@ -442,6 +446,9 @@
         case SERIAL_IO_MEM:
                 writeb(value, (unsigned long) info->iomem_base +
@@ -16219 +9025 @@
         default:
                 outb(value, info->port+offset);
-@@ -1728,7 +1735,7 @@
+@@ -1704,7 +1711,7 @@
                         /* Special case since 134 is really 134.5 */
                         quot = (2*baud_base / 269);
@@ -16228 +9034 @@
         /* If the quotient is zero refuse the change */
         if (!quot && old_termios) {
-@@ -1745,12 +1752,12 @@
+@@ -1721,12 +1728,12 @@
                                 /* Special case since 134 is really 134.5 */
                                 quot = (2*baud_base / 269);
@@ -16243 +9049 @@
          * Work around a bug in the Oxford Semiconductor 952 rev B
          * chip which causes it to seriously miscalculate baud rates
-@@ -5994,6 +6001,13 @@
+@@ -5982,6 +5989,13 @@
          *      Divisor, bytesize and parity
          */
@@ -16257 +9063 @@
                 state->flags |= ASYNC_CONS_FLOW;
         info = &async_sercons;
-@@ -6007,7 +6021,7 @@
+@@ -5995,7 +6009,7 @@
         info->io_type = state->io_type;
         info->iomem_base = state->iomem_base;
@@ -16266 +9072 @@
  #if defined(__powerpc__) || defined(__alpha__)
         cval >>= 8;
-diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in
---- linux.old/drivers/net/Config.in     2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/drivers/net/Config.in     2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/drivers/net/Config.in linux-2.4.32-freewrt/drivers/net/Config.in
+--- linux-2.4.32/drivers/net/Config.in  2005-01-19 15:09:56.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/Config.in  2006-07-02 21:58:25.000000000 +0200
 @@ -2,6 +2,8 @@
  # Network device configuration
@@ -16278 +9084 @@
  
  tristate 'Dummy net driver support' CONFIG_DUMMY
-diff -urN linux.old/drivers/net/Makefile linux.dev/drivers/net/Makefile
---- linux.old/drivers/net/Makefile      2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/drivers/net/Makefile      2006-05-04 01:41:03.000000000 +0200
+diff -Nur linux-2.4.32/drivers/net/Makefile linux-2.4.32-freewrt/drivers/net/Makefile
+--- linux-2.4.32/drivers/net/Makefile   2005-01-19 15:09:56.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/Makefile   2006-07-02 21:58:25.000000000 +0200
 @@ -3,6 +3,8 @@
  # Makefile for the Linux network (ethercard) device drivers.
@@ -16290 +9096 @@
  obj-m           :=
  obj-n           :=
-@@ -39,6 +41,7 @@
+@@ -39,6 +41,8 @@
    obj-$(CONFIG_ISDN) += slhc.o
  endif
  
++subdir-$(CONFIG_HND) += hnd
 +subdir-$(CONFIG_WL) += wl
  subdir-$(CONFIG_NET_PCMCIA) += pcmcia
  subdir-$(CONFIG_NET_WIRELESS) += wireless
  subdir-$(CONFIG_TULIP) += tulip
-diff -urN linux.old/drivers/net/wireless/Config.in linux.dev/drivers/net/wireless/Config.in
---- linux.old/drivers/net/wireless/Config.in    2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/drivers/net/wireless/Config.in    2006-05-04 01:42:48.000000000 +0200
-@@ -13,6 +13,7 @@
- fi
+@@ -69,6 +73,13 @@
+ obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o
+ obj-$(CONFIG_SUNGEM) += sungem.o
  
- if [ "$CONFIG_PCI" = "y" ]; then
-+   dep_tristate '    Proprietary Broadcom BCM43xx 802.11 Wireless support' CONFIG_WL
-    dep_tristate '    Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)' CONFIG_PLX_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
-    dep_tristate '    Hermes in TMD7160/NCP130 based PCI adaptor support (Pheecom WL-PCI etc.) (EXPERIMENTAL)' CONFIG_TMD_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
-    dep_tristate '    Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)' CONFIG_PCI_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
-diff -urN linux.old/drivers/net/wl/patchtable.pl linux.dev/drivers/net/wl/patchtable.pl
---- linux.old/drivers/net/wl/patchtable.pl      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/patchtable.pl      2006-04-28 01:33:52.000000000 +0200
-@@ -0,0 +1,54 @@
-+#!/usr/bin/perl
-+use strict;
-+
-+my $TABLE = pack("V", 0xbadc0ded);
-+my $TABLE_SIZE = 512;
-+my $SLT1 = "\x01\x00\x00\x00";
-+my $SLT2 = "\x02\x00\x00\x00";
-+my $ACKW = "\x03\x00\x00\x00";
-+my $PTABLE_END = "\xff\xff\xff\xff";
-+
-+my $addr = "";
-+my $opcode = "";
-+my $function = "";
-+
-+sub add_entry {
-+       my $key = shift;
-+       my $value = shift;
-+       my $default = shift;
-+
-+       $TABLE .= $key;
-+       $TABLE .= pack("V", $value);
-+       $TABLE .= pack("V", $default);
-+}
-+
-+while (<>) {
-+       $addr = $opcode = "";
-+       /^\w{8}\s*<(.*)>:$/ and $function = $1;
-+       /^\s*(\w+):\s*(\w{8})\s*/ and do {
-+               $addr = $1;
-+               $opcode = $2;
-+       };
-+
-+       ($function eq 'wlc_update_slot_timing') and do {
-+               # li    a2,9    -- short slot time
-+               ($opcode eq '24060009') and add_entry($SLT1, hex($addr), hex($opcode));
-+               # li    v0,519  -- 510 + short slot time
-+               ($opcode eq '24020207') and add_entry($SLT2, hex($addr), hex($opcode));
-+               
-+               # li    a2,20   -- long slot time
-+               ($opcode eq '24060014') and add_entry($SLT1, hex($addr), hex($opcode));
-+               # li    v0,530  -- 510 + long slot time
-+               ($opcode eq '24020212') and add_entry($SLT2, hex($addr), hex($opcode));
-+       };
-+       ($function eq 'wlc_d11hdrs') and do {
-+               # ori   s6,s6,0x1 -- ack flag (new)
-+               ($opcode eq '36d60001') and add_entry($ACKW, hex($addr), hex($opcode));
-+               # ori   s3,s3,0x1 -- ack flag (old)
-+               ($opcode eq '36730001') and add_entry($ACKW, hex($addr), hex($opcode));
-+       }
-+}
-+
-+$TABLE .= $PTABLE_END;
-+$TABLE .= ("\x00" x ($TABLE_SIZE - length($TABLE)));
-+print $TABLE;
-diff -urN linux.old/drivers/net/wl/Makefile linux.dev/drivers/net/wl/Makefile
---- linux.old/drivers/net/wl/Makefile   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/Makefile   2006-04-28 01:33:52.000000000 +0200
-@@ -0,0 +1,32 @@
++ifeq ($(CONFIG_HND),y)
++  obj-y += hnd/hnd.o
++endif
++ifeq ($(CONFIG_WL),y)
++  obj-y += wl/wl.o
++endif
++
+ obj-$(CONFIG_MACE) += mace.o
+ obj-$(CONFIG_BMAC) += bmac.o
+ obj-$(CONFIG_GMAC) += gmac.o
+diff -Nur linux-2.4.32/drivers/net/hnd/Makefile linux-2.4.32-freewrt/drivers/net/hnd/Makefile
+--- linux-2.4.32/drivers/net/hnd/Makefile       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/Makefile       2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,19 @@
 +#
-+# Makefile for the Broadcom wl driver
++# Makefile for the BCM47xx specific kernel interface routines
++# under Linux.
 +#
-+# Copyright 2004, 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: Makefile,v 1.2 2005/03/29 03:32:18 mbm Exp $
-+
-+EXTRA_CFLAGS += -I$(TOPDIR)/arch/mips/bcm947xx/include -DBCMDRIVER
-+
-+O_TARGET       := wl_link.o
-+
-+obj-y          := wl_mod.o
-+obj-y          += bcmutils.o hnddma.o linux_osl.o
-+
-+obj-m          := $(O_TARGET)
-+
-+wl_mod.o: wl_apsta.o
-+       cp $< $@ && perl -pi -e 's,eth%d,wl%d\x00,g' $@
-+
-+wl.o: wl_link.o
-+       $(OBJDUMP) -d $< | perl patchtable.pl > patchtable.bin
-+       cat wl_link.o patchtable.bin > $@
-+
-+modules: wl.o
++
++EXTRA_CFLAGS   += -I$(TOPDIR)/arch/mips/bcm947xx/include -DBCMDRIVER
++
++O_TARGET       := hnd.o
++
++HND_OBJS       := bcmutils.o hnddma.o linux_osl.o sbutils.o bcmsrom.o
++
++export-objs    := shared_ksyms.o
++obj-y          := shared_ksyms.o $(HND_OBJS)
++obj-m           := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-diff -urN linux.old/drivers/net/wl/bcmip.h linux.dev/drivers/net/wl/bcmip.h
---- linux.old/drivers/net/wl/bcmip.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/bcmip.h    2006-04-28 02:11:28.000000000 +0200
-@@ -0,0 +1,101 @@
++
++shared_ksyms.c: shared_ksyms.sh $(HND_OBJS)
++       sh -e $< $(HND_OBJS) > $@
+diff -Nur linux-2.4.32/drivers/net/hnd/bcmsrom.c linux-2.4.32-freewrt/drivers/net/hnd/bcmsrom.c
+--- linux-2.4.32/drivers/net/hnd/bcmsrom.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/bcmsrom.c      2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,716 @@
 +/*
-+ * Copyright 2006, 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.
++ *  Misc useful routines to access NIC SROM/OTP .
 + *
-+ * Fundamental constants relating to IP Protocol
-+ *
-+ * $Id: bcmip.h,v 1.1.1.3 2006/02/27 03:43:16 honor Exp $
++ * Copyright 2004, 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 _bcmip_h_
-+#define _bcmip_h_
-+
-+/* IPV4 and IPV6 common */
-+#define IP_VER_OFFSET          0x0     /* offset to version field */
-+#define IP_VER_MASK            0xf0    /* version mask */
-+#define IP_VER_SHIFT           4       /* version shift */
-+#define IP_VER_4               4       /* version number for IPV4 */
-+#define IP_VER_6               6       /* version number for IPV6 */
-+
-+#define IP_VER(ip_body) \
-+       ((((uint8 *)(ip_body))[IP_VER_OFFSET] & IP_VER_MASK) >> IP_VER_SHIFT)
-+
-+#define IP_PROT_ICMP           0x1     /* ICMP protocol */
-+#define IP_PROT_TCP            0x6     /* TCP protocol */
-+#define IP_PROT_UDP            0x11    /* UDP protocol type */
-+
-+/* IPV4 field offsets */
-+#define IPV4_VER_HL_OFFSET     0       /* version and ihl byte offset */
-+#define IPV4_TOS_OFFSET                1       /* type of service offset */
-+#define IPV4_PROT_OFFSET       9       /* protocol type offset */
-+#define IPV4_CHKSUM_OFFSET     10      /* IP header checksum offset */
-+#define IPV4_SRC_IP_OFFSET     12      /* src IP addr offset */
-+#define IPV4_DEST_IP_OFFSET    16      /* dest IP addr offset */
-+
-+/* IPV4 field decodes */
-+#define IPV4_VER_MASK          0xf0    /* IPV4 version mask */
-+#define IPV4_VER_SHIFT         4       /* IPV4 version shift */
-+
-+#define IPV4_HLEN_MASK         0x0f    /* IPV4 header length mask */
-+#define IPV4_HLEN(ipv4_body)   (4 * (((uint8 *)(ipv4_body))[IPV4_VER_HL_OFFSET] & IPV4_HLEN_MASK))
-+
-+#define IPV4_ADDR_LEN          4       /* IPV4 address length */
-+
-+#define IPV4_ADDR_NULL(a)      ((((uint8 *)(a))[0] | ((uint8 *)(a))[1] | \
-+                                 ((uint8 *)(a))[2] | ((uint8 *)(a))[3]) == 0)
-+
-+#define        IPV4_TOS_DSCP_MASK      0xfc    /* DiffServ codepoint mask */
-+#define        IPV4_TOS_DSCP_SHIFT     2       /* DiffServ codepoint shift */
-+
-+#define        IPV4_TOS(ipv4_body)     (((uint8 *)(ipv4_body))[IPV4_TOS_OFFSET])
-+
-+#define        IPV4_TOS_PREC_MASK      0xe0    /* Historical precedence mask */
-+#define        IPV4_TOS_PREC_SHIFT     5       /* Historical precedence shift */
-+
-+#define IPV4_TOS_LOWDELAY      0x10    /* Lowest delay requested */
-+#define IPV4_TOS_THROUGHPUT    0x8     /* Best throughput requested */
-+#define IPV4_TOS_RELIABILITY   0x4     /* Most reliable delivery requested */
-+
-+#define IPV4_PROT(ipv4_body)   (((uint8 *)(ipv4_body))[IPV4_PROT_OFFSET])
-+
-+#define IPV4_ADDR_STR_LEN      16      /* Max IP address length in string format */
-+
-+/* IPV6 field offsets */
-+#define IPV6_PAYLOAD_LEN_OFFSET        4       /* payload length offset */
-+#define IPV6_NEXT_HDR_OFFSET   6       /* next header/protocol offset */
-+#define IPV6_HOP_LIMIT_OFFSET  7       /* hop limit offset */
-+#define IPV6_SRC_IP_OFFSET     8       /* src IP addr offset */
-+#define IPV6_DEST_IP_OFFSET    24      /* dst IP addr offset */
-+
-+/* IPV6 field decodes */
-+#define IPV6_TRAFFIC_CLASS(ipv6_body) \
-+       (((((uint8 *)(ipv6_body))[0] & 0x0f) << 4) | \
-+        ((((uint8 *)(ipv6_body))[1] & 0xf0) >> 4))
-+
-+#define IPV6_FLOW_LABEL(ipv6_body) \
-+       (((((uint8 *)(ipv6_body))[1] & 0x0f) << 16) | \
-+        (((uint8 *)(ipv6_body))[2] << 8) | \
-+        (((uint8 *)(ipv6_body))[3]))
-+
-+#define IPV6_PAYLOAD_LEN(ipv6_body) \
-+       ((((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 0] << 8) | \
-+        ((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 1])
-+
-+#define IPV6_NEXT_HDR(ipv6_body) \
-+       (((uint8 *)(ipv6_body))[IPV6_NEXT_HDR_OFFSET])
-+
-+#define IPV6_PROT(ipv6_body)   IPV6_NEXT_HDR(ipv6_body)
-+
-+#define IPV6_ADDR_LEN          16      /* IPV6 address length */
-+
-+/* IPV4 TOS or IPV6 Traffic Classifier or 0 */
-+#define IP_TOS(ip_body) \
-+       (IP_VER(ip_body) == IP_VER_4 ? IPV4_TOS(ip_body) : \
-+        IP_VER(ip_body) == IP_VER_6 ? IPV6_TRAFFIC_CLASS(ip_body) : 0)
-+
-+#endif /* _bcmip_h_ */
-diff -urN linux.old/drivers/net/wl/bcmutils.c linux.dev/drivers/net/wl/bcmutils.c
---- linux.old/drivers/net/wl/bcmutils.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/bcmutils.c 2006-04-28 02:27:20.000000000 +0200
-@@ -0,0 +1,857 @@
++#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 <sbutils.h>
++
++struct  ether_addr {
++       uint8 octet[6];
++} PACKED;
++
++#define        VARS_MAX        4096    /* should be reduced */
++
++#define WRITE_ENABLE_DELAY     500     /* 500 ms after write enable/disable toggle */
++#define WRITE_WORD_DELAY       20      /* 20 ms between each word write */
++
++static int initvars_srom_pci(void *osh, void *curmap, char **vars, int *count);
++static int initvars_cis_pcmcia(void *sbh, void *curmap, void *osh, char **vars, int *count);
++static int srom_parsecis(void *osh, uint8 *cis, 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 wordoff, uint16 *buf, uint nwords, bool check_crc);
++
++/*
++ * Initialize local vars from the right source for this platform.
++ * Return 0 on success, nonzero on error.
++ */
++int
++srom_var_init(void *sbh, uint bustype, void *curmap, void *osh, char **vars, int *count)
++{
++       ASSERT(bustype == BUSTYPE(bustype));
++       if (vars == NULL)
++               return (0);
++
++       switch (BUSTYPE(bustype)) {
++       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(osh, curmap, vars, count));
++
++       case PCMCIA_BUS:
++               return(initvars_cis_pcmcia(sbh, curmap, osh, vars, count));
++
++
++       default:
++               ASSERT(0);
++       }
++       return (-1);
++}
++
++/* support only 16-bit word read from srom */
++int
++srom_read(uint bustype, void *curmap, void *osh, uint byteoff, uint nbytes, uint16 *buf)
++{
++       void *srom;
++       uint i, off, nw;
++
++       ASSERT(bustype == BUSTYPE(bustype));
++
++       /* check input - 16-bit access only */
++       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
++               return 1;
++
++       off = byteoff / 2;
++       nw = nbytes / 2;
++
++       if (BUSTYPE(bustype) == PCI_BUS) {
++               if (!curmap)
++                       return 1;
++               srom = (uchar*)curmap + PCI_BAR0_SPROM_OFFSET;
++               if (sprom_read_pci(srom, off, buf, nw, FALSE))
++                       return 1;
++       } else if (BUSTYPE(bustype) == PCMCIA_BUS) {
++               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 bustype, 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;
++
++       ASSERT(bustype == BUSTYPE(bustype));
++
++       /* check input - 16-bit access only */
++       if (byteoff & 1 || nbytes & 1 || (byteoff + nbytes) > (SPROM_SIZE * 2))
++               return 1;
++
++       crc_range = (((BUSTYPE(bustype) == PCMCIA_BUS) || (BUSTYPE(bustype) == SDIO_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(bustype, 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 = ~hndcrc8((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 (BUSTYPE(bustype) == PCI_BUS) {
++               srom = (uint16*)((uchar*)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(WRITE_ENABLE_DELAY);
++               /* write srom */
++               for (i = 0; i < nw; i++) {
++                       W_REG(&srom[off + i], p[i]);
++                       bcm_mdelay(WRITE_WORD_DELAY);
++               }
++               /* disable writes to the SPROM */
++               OSL_PCI_WRITE_CONFIG(osh, PCI_SPROM_CONTROL, sizeof(uint32), val32 & ~SPROM_WRITEEN);
++       } else if (BUSTYPE(bustype) == PCMCIA_BUS) {
++               /* enable writes to the SPROM */
++               if (sprom_cmd_pcmcia(osh, SROM_WEN))
++                       return 1;
++               bcm_mdelay(WRITE_ENABLE_DELAY);
++               /* write srom */
++               for (i = 0; i < nw; i++) {
++                       sprom_write_pcmcia(osh, (uint16)(off + i), p[i]);
++                       bcm_mdelay(WRITE_WORD_DELAY);
++               }
++               /* disable writes to the SPROM */
++               if (sprom_cmd_pcmcia(osh, SROM_WDS))
++                       return 1;
++       } else {
++               return 1;
++       }
++
++       bcm_mdelay(WRITE_ENABLE_DELAY);
++       return 0;
++}
++
++
++static int
++srom_parsecis(void *osh, 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(osh, VARS_MAX);
++       ASSERT(vp);
++
++       i = 0;
++       do {
++               tup = cis[i++];
++               tlen = cis[i++];
++               if ((i + tlen) >= CIS_SIZE)
++                       break;
++
++               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] == 6);
++                               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 - base);
++
++       ASSERT((vp - base) < VARS_MAX);
++
++       if (varsize == VARS_MAX) {
++               *vars = base;
++       } else {
++               vp = MALLOC(osh, varsize);
++               ASSERT(vp);
++               bcopy(base, vp, varsize);
++               MFREE(osh, 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 = 0;
++       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 */
++       data_h = data_l = 0;
++       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 wordoff, uint16 *buf, uint nwords, bool check_crc)
++{
++       uint8 chk8;
++       uint i;
++
++       /* read the sprom */
++       for (i = 0; i < nwords; i++)
++               buf[i] = R_REG(&sprom[wordoff + i]);
++
++       if (check_crc) {
++               /* fixup the endianness so crc8 will pass */
++               htol16_buf(buf, nwords * 2);
++               if ((chk8 = hndcrc8((uchar*)buf, nwords * 2, CRC8_INIT_VALUE)) != CRC8_GOOD_VALUE)
++                       return (1);
++               /* now correct the endianness of the byte array */
++               ltoh16_buf(buf, nwords * 2);
++       }
++
++       return (0);
++}
++
++/*
++ * Initialize nonvolatile variable table from sprom.
++ * Return 0 on success, nonzero on error.
++ */
++
++static int
++initvars_srom_pci(void *osh, void *curmap, char **vars, int *count)
++{
++       uint16 w, b[64];
++       uint8 sromrev;
++       struct ether_addr ea;
++       char eabuf[32];              
++       uint32 bfl;
++       int c, woff, i;
++       char *vp, *base;
++
++       if (sprom_read_pci((void*)((int8*)curmap + PCI_BAR0_SPROM_OFFSET), 0, b, sizeof(b)/sizeof(b[0]), TRUE))
++               return (-1);
++
++       /* top word of sprom contains version and crc8 */
++       sromrev = b[63] & 0xff;
++       /* bcm4401 sroms misprogrammed */
++       if (sromrev == 0x10)
++               sromrev = 1;
++       if ((sromrev != 1) && (sromrev != 2))
++               return (-2);
++
++       ASSERT(vars);
++       ASSERT(count);
++
++       base = vp = MALLOC(osh, VARS_MAX);
++       ASSERT(vp);
++
++       vp += sprintf(vp, "sromrev=%d", sromrev);
++       vp++;
++
++       if (sromrev >= 2) {
++               /* New section takes over the 4th hardware function space */
++
++               /* 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 += 3;
++       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 += 3;
++       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 += 3;
++       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 */
++       bfl = (uint32)b[57];
++       if (bfl == 0xffff) bfl = 0;
++       if (sromrev > 1) {
++               /* Word 28 is boardflags2 */
++               bfl |= (uint32)b[28] << 16;
++       }
++       vp += sprintf(vp, "boardflags=%d", bfl);
++       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++;
++       } else {
++               /* Word 60 OFDM tx power offset from CCK level */
++               /* OFDM Power Offset - opo */
++               vp += sprintf(vp, "opo=%d", b[60] & 0xff);
++               vp++;
++       }
++
++       /* final nullbyte terminator */
++       *vp++ = '\0';
++
++       c = (int)(vp - base);
++       ASSERT((vp - base) <= VARS_MAX);
++
++       if (c == VARS_MAX) {
++               *vars = base;
++       } else {
++               vp = MALLOC(osh, c);
++               ASSERT(vp);
++               bcopy(base, vp, c);
++               MFREE(osh, 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 *sbh, void *curmap, void *osh, char **vars, int *count)
++{
++       uint8 *cis = NULL;
++       int rc;
++       uint data_sz;
++
++       data_sz = (sb_pcmciarev(sbh) == 1) ? (SPROM_SIZE * 2) : CIS_SIZE;
++
++       if ((cis = MALLOC(osh, data_sz)) == NULL)
++               return (-2);
++
++       if (sb_pcmciarev(sbh) == 1) {
++               if (srom_read(PCMCIA_BUS, (void *)NULL, osh, 0, data_sz, (uint16 *)cis)) {
++                       MFREE(osh, cis, data_sz);
++                       return (-1);
++               }
++               /* fix up endianess for 16-bit data vs 8-bit parsing */
++               ltoh16_buf((uint16 *)cis, data_sz);
++       } else
++               OSL_PCMCIA_READ_ATTR(osh, 0, cis, data_sz);
++
++       rc = srom_parsecis(osh, cis, vars, count);
++
++       MFREE(osh, cis, data_sz);
++
++       return (rc);
++}
++
+diff -Nur linux-2.4.32/drivers/net/hnd/bcmutils.c linux-2.4.32-freewrt/drivers/net/hnd/bcmutils.c
+--- linux-2.4.32/drivers/net/hnd/bcmutils.c     1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/bcmutils.c     2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,862 @@
 +/*
 + * Misc useful OS-independent routines.
 + *
-+ * Copyright 2006, 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.1.12 2006/02/27 03:43:16 honor Exp $
++ * Copyright 2004, 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>
-+#include <bcmdefs.h>
-+#include <stdarg.h>
 +#include <osl.h>
-+#include "linux_osl.h"
-+#include "pktq.h"
++#include <bcmnvram.h>
 +#include <bcmutils.h>
-+#include <sbutils.h>
-+#include <bcmnvram.h>
 +#include <bcmendian.h>
 +#include <bcmdevs.h>
-+#include "bcmip.h"
-+
-+#define ETHER_TYPE_8021Q       0x8100
-+#define ETHER_TYPE_IP          0x0800
-+#define VLAN_PRI_SHIFT             13
-+#define VLAN_PRI_MASK               7
-+
-+
-+struct  ether_header {
-+       uint8   ether_dhost[6];
-+       uint8   ether_shost[6];
-+       uint16  ether_type;
-+} __attribute__((packed));
-+
-+
-+struct ethervlan_header {
-+       uint8   ether_dhost[6];
-+       uint8   ether_shost[6];
-+       uint16  vlan_type;              /* 0x8100 */
-+       uint16  vlan_tag;               /* priority, cfi and vid */
-+       uint16  ether_type;
-+};
-+
++
++#ifdef BCMDRIVER
 +/* copy a pkt buffer chain into a buffer */
 +uint
-+pktcopy(osl_t *osh, void *p, uint offset, int len, uchar *buf)
++pktcopy(void *drv, void *p, uint offset, int len, uchar *buf)
 +{
 +       uint n, ret = 0;
@@ -16569 +9897 @@
 +
 +       /* skip 'offset' bytes */
-+       for (; p && offset; p = PKTNEXT(osh, p)) {
-+               if (offset < (uint)PKTLEN(osh, p))
++       for (; p && offset; p = PKTNEXT(drv, p)) {
++               if (offset < (uint)PKTLEN(drv, p))
 +                       break;
-+               offset -= PKTLEN(osh, p);
++               offset -= PKTLEN(drv, p);
 +       }
 +
@@ -16579 +9907 @@
 +
 +       /* copy the data */
-+       for (; p && len; p = PKTNEXT(osh, p)) {
-+               n = MIN((uint)PKTLEN(osh, p) - offset, (uint)len);
-+               bcopy(PKTDATA(osh, p) + offset, buf, n);
++       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;
@@ -16593 +9921 @@
 +/* return total length of buffer chain */
 +uint
-+pkttotlen(osl_t *osh, void *p)
++pkttotlen(void *drv, void *p)
 +{
 +       uint total;
 +
 +       total = 0;
-+       for (; p; p = PKTNEXT(osh, p))
-+               total += PKTLEN(osh, p);
++       for (; p; p = PKTNEXT(drv, p))
++               total += PKTLEN(drv, p);
 +       return (total);
 +}
 +
-+/* return the last buffer of chained pkt */
-+void *
-+pktlast(osl_t *osh, void *p)
-+{
-+       for (; PKTNEXT(osh, p); p = PKTNEXT(osh, p))
-+               ;
++void
++pktq_init(struct pktq *q, uint maxlen, const bool prio_map[])
++{
++       q->head = q->tail = NULL;
++       q->maxlen = maxlen;
++       q->len = 0;
++       if (prio_map) {
++               q->priority = TRUE;
++               bcopy(prio_map, q->prio_map, sizeof(q->prio_map));
++       }
++       else
++               q->priority = FALSE;
++}
++
++/* should always check pktq_full before calling pktenq */
++void
++pktenq(struct pktq *q, void *p, bool lifo)
++{
++       void *next, *prev;
++
++       /* allow 10 pkts slack */
++       ASSERT(q->len < (q->maxlen + 10));
++
++       /* Queueing chains not allowed */
++       ASSERT(PKTLINK(p) == NULL);
++
++       /* Queue is empty */
++       if (q->tail == NULL) {
++               ASSERT(q->head == NULL);
++               q->head = q->tail = p;
++       }
++
++       /* Insert at head or tail */
++       else if (q->priority == FALSE) {
++               /* Insert at head (LIFO) */
++               if (lifo) {
++                       PKTSETLINK(p, q->head);
++                       q->head = p;
++               }
++               /* Insert at tail (FIFO) */
++               else {
++                       ASSERT(PKTLINK(q->tail) == NULL);
++                       PKTSETLINK(q->tail, p);
++                       PKTSETLINK(p, NULL);
++                       q->tail = p;
++               }
++       }
++
++       /* Insert by priority */
++       else {
++               /* legal priorities 0-7 */
++               ASSERT(PKTPRIO(p) <= MAXPRIO);
++
++               ASSERT(q->head);
++               ASSERT(q->tail);
++               /* Shortcut to insertion at tail */
++               if (_pktq_pri(q, PKTPRIO(p)) < _pktq_pri(q, PKTPRIO(q->tail)) ||
++                   (!lifo && _pktq_pri(q, PKTPRIO(p)) <= _pktq_pri(q, PKTPRIO(q->tail)))) {
++                       prev = q->tail;
++                       next = NULL;
++               }
++               /* Insert at head or in the middle */
++               else {
++                       prev = NULL;
++                       next = q->head;
++               }
++               /* Walk the queue */
++               for (; next; prev = next, next = PKTLINK(next)) {
++                       /* Priority queue invariant */
++                       ASSERT(!prev || _pktq_pri(q, PKTPRIO(prev)) >= _pktq_pri(q, PKTPRIO(next)));
++                       /* Insert at head of string of packets of same priority (LIFO) */
++                       if (lifo) {
++                               if (_pktq_pri(q, PKTPRIO(p)) >= _pktq_pri(q, PKTPRIO(next)))
++                                       break;
++                       }
++                       /* Insert at tail of string of packets of same priority (FIFO) */
++                       else {
++                               if (_pktq_pri(q, PKTPRIO(p)) > _pktq_pri(q, PKTPRIO(next)))
++                                       break;
++                       }
++               }
++               /* Insert at tail */
++               if (next == NULL) {
++                       ASSERT(PKTLINK(q->tail) == NULL);
++                       PKTSETLINK(q->tail, p);
++                       PKTSETLINK(p, NULL);
++                       q->tail = p;
++               }
++               /* Insert in the middle */
++               else if (prev) {
++                       PKTSETLINK(prev, p);
++                       PKTSETLINK(p, next);
++               }
++               /* Insert at head */
++               else {
++                       PKTSETLINK(p, q->head);
++                       q->head = p;
++               }
++       }
++
++       /* List invariants after insertion */
++       ASSERT(q->head);
++       ASSERT(PKTLINK(q->tail) == NULL);
++
++       q->len++;
++}
++
++/* dequeue packet at head */
++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);
 +}
 +
-+
-+/*
-+ * osl multiple-precedence packet queue
-+ * hi_prec is always >= the number of the highest non-empty queue
-+ */
-+void *
-+pktq_penq(struct pktq *pq, int prec, void *p)
-+{
-+       struct pktq_prec *q;
-+
-+       ASSERT(prec >= 0 && prec < pq->num_prec);
-+       ASSERT(PKTLINK(p) == NULL);         /* queueing chains not allowed */
-+
-+       ASSERT(!pktq_full(pq));
-+       ASSERT(!pktq_pfull(pq, prec));
-+
-+       q = &pq->q[prec];
-+
-+       if (q->head)
-+               PKTSETLINK(q->tail, p);
-+       else
-+               q->head = p;
-+
-+       q->tail = p;
-+       q->len++;
-+
-+       pq->len++;
-+
-+       if (pq->hi_prec < prec)
-+               pq->hi_prec = (uint8)prec;
-+
-+       return p;
-+}
-+
-+void *
-+pktq_penq_head(struct pktq *pq, int prec, void *p)
-+{
-+       struct pktq_prec *q;
-+
-+       ASSERT(prec >= 0 && prec < pq->num_prec);
-+       ASSERT(PKTLINK(p) == NULL);         /* queueing chains not allowed */
-+
-+       ASSERT(!pktq_full(pq));
-+       ASSERT(!pktq_pfull(pq, prec));
-+
-+       q = &pq->q[prec];
-+
-+       if (q->head == NULL)
-+               q->tail = p;
-+
-+       PKTSETLINK(p, q->head);
-+       q->head = p;
-+       q->len++;
-+
-+       pq->len++;
-+
-+       if (pq->hi_prec < prec)
-+               pq->hi_prec = (uint8)prec;
-+
-+       return p;
-+}
-+
-+void *
-+pktq_pdeq(struct pktq *pq, int prec)
-+{
-+       struct pktq_prec *q;
++/* dequeue packet at tail */
++void*
++pktdeqtail(struct pktq *q)
++{
 +       void *p;
-+
-+       ASSERT(prec >= 0 && prec < pq->num_prec);
-+
-+       q = &pq->q[prec];
-+
-+       if ((p = q->head) == NULL)
-+               return NULL;
-+
-+       if ((q->head = PKTLINK(p)) == NULL)
-+               q->tail = NULL;
-+
-+       q->len--;
-+
-+       pq->len--;
-+
-+       PKTSETLINK(p, NULL);
-+
-+       return p;
-+}
-+
-+void *
-+pktq_pdeq_tail(struct pktq *pq, int prec)
-+{
-+       struct pktq_prec *q;
-+       void *p, *prev;
-+
-+       ASSERT(prec >= 0 && prec < pq->num_prec);
-+
-+       q = &pq->q[prec];
-+
-+       if ((p = q->head) == NULL)
-+               return NULL;
-+
-+       for (prev = NULL; p != q->tail; p = PKTLINK(p))
-+               prev = p;
-+
-+       if (prev)
-+               PKTSETLINK(prev, NULL);
-+       else
-+               q->head = NULL;
-+
++       void *next, *prev;
++
++       if (q->head == q->tail) {  /* last packet on queue or queue empty */
++               p = q->head;
++               q->head = q->tail = NULL;
++               q->len = 0;
++               return(p);
++       }
++
++       /* start walk at head */
++       prev = NULL;
++       next = q->head;
++
++       /* Walk the queue to find prev of q->tail */
++       for (; next; prev = next, next = PKTLINK(next)) {
++               if (next == q->tail)
++                       break;
++       }
++
++       ASSERT(prev);
++
++       PKTSETLINK(prev, NULL);
 +       q->tail = prev;
 +       q->len--;
-+
-+       pq->len--;
-+
-+       return p;
-+}
-+
-+void
-+pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir)
-+{
-+       struct pktq_prec *q;
-+       void *p;
-+
-+       q = &pq->q[prec];
-+       p = q->head;
-+       while (p) {
-+               q->head = PKTLINK(p);
-+               PKTSETLINK(p, NULL);
-+               PKTFREE(osh, p, dir);
-+               q->len--;
-+               pq->len--;
-+               p = q->head;
-+       }
-+       ASSERT(q->len == 0);
-+       q->tail = NULL;
-+}
-+
-+bool
-+pktq_pdel(struct pktq *pq, void *pktbuf, int prec)
-+{
-+       struct pktq_prec *q;
-+       void *p;
-+
-+       ASSERT(prec >= 0 && prec < pq->num_prec);
-+
-+       if (!pktbuf)
-+               return FALSE;
-+
-+       q = &pq->q[prec];
-+
-+       if (q->head == pktbuf) {
-+               if ((q->head = PKTLINK(pktbuf)) == NULL)
-+                       q->tail = NULL;
-+       } else {
-+               for (p = q->head; p && PKTLINK(p) != pktbuf; p = PKTLINK(p))
-+                       ;
-+               if (p == NULL)
-+                       return FALSE;
-+
-+               PKTSETLINK(p, PKTLINK(pktbuf));
-+               if (q->tail == pktbuf)
-+                       q->tail = p;
-+       }
-+
-+       q->len--;
-+       pq->len--;
-+       PKTSETLINK(pktbuf, NULL);
-+       return TRUE;
-+}
-+
-+void
-+pktq_init(struct pktq *pq, int num_prec, int max_len)
-+{
-+       int prec;
-+
-+       ASSERT(num_prec > 0 && num_prec <= PKTQ_MAX_PREC);
-+
-+       bzero(pq, sizeof(*pq));
-+
-+       pq->num_prec = (uint16)num_prec;
-+
-+       pq->max = (uint16)max_len;
-+
-+       for (prec = 0; prec < num_prec; prec++)
-+               pq->q[prec].max = pq->max;
-+}
-+
-+void *
-+pktq_deq(struct pktq *pq, int *prec_out)
-+{
-+       struct pktq_prec *q;
-+       void *p;
-+       int prec;
-+
-+       if (pq->len == 0)
-+               return NULL;
-+
-+       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-+               pq->hi_prec--;
-+
-+       q = &pq->q[prec];
-+
-+       if ((p = q->head) == NULL)
-+               return NULL;
-+
-+       if ((q->head = PKTLINK(p)) == NULL)
-+               q->tail = NULL;
-+
-+       q->len--;
-+
-+       pq->len--;
-+
-+       if (prec_out)
-+               *prec_out = prec;
-+
-+       PKTSETLINK(p, NULL);
-+
-+       return p;
-+}
-+
-+void *
-+pktq_deq_tail(struct pktq *pq, int *prec_out)
-+{
-+       struct pktq_prec *q;
-+       void *p, *prev;
-+       int prec;
-+
-+       if (pq->len == 0)
-+               return NULL;
-+
-+       for (prec = 0; prec < pq->hi_prec; prec++)
-+               if (pq->q[prec].head)
-+                       break;
-+
-+       q = &pq->q[prec];
-+
-+       if ((p = q->head) == NULL)
-+               return NULL;
-+
-+       for (prev = NULL; p != q->tail; p = PKTLINK(p))
-+               prev = p;
-+
-+       if (prev)
-+               PKTSETLINK(prev, NULL);
-+       else
-+               q->head = NULL;
-+
-+       q->tail = prev;
-+       q->len--;
-+
-+       pq->len--;
-+
-+       if (prec_out)
-+               *prec_out = prec;
-+
-+       PKTSETLINK(p, NULL);
-+
-+       return p;
-+}
-+
-+void *
-+pktq_peek(struct pktq *pq, int *prec_out)
-+{
-+       int prec;
-+
-+       if (pq->len == 0)
-+               return NULL;
-+
-+       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-+               pq->hi_prec--;
-+
-+       if (prec_out)
-+               *prec_out = prec;
-+
-+       return (pq->q[prec].head);
-+}
-+
-+void *
-+pktq_peek_tail(struct pktq *pq, int *prec_out)
-+{
-+       int prec;
-+
-+       if (pq->len == 0)
-+               return NULL;
-+
-+       for (prec = 0; prec < pq->hi_prec; prec++)
-+               if (pq->q[prec].head)
-+                       break;
-+
-+       if (prec_out)
-+               *prec_out = prec;
-+
-+       return (pq->q[prec].tail);
-+}
-+
-+void
-+pktq_flush(osl_t *osh, struct pktq *pq, bool dir)
-+{
-+       int prec;
-+       for (prec = 0; prec < pq->num_prec; prec++)
-+               pktq_pflush(osh, pq, prec, dir);
-+       ASSERT(pq->len == 0);
-+}
-+
-+/* Return sum of lengths of a specific set of precedences */
-+int
-+pktq_mlen(struct pktq *pq, uint prec_bmp)
-+{
-+       int prec, len;
-+
-+       len = 0;
-+
-+       for (prec = 0; prec <= pq->hi_prec; prec++)
-+               if (prec_bmp & (1 << prec))
-+                       len += pq->q[prec].len;
-+
-+       return len;
-+}
-+
-+/* Priority dequeue from a specific set of precedences */
-+void *
-+pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out)
-+{
-+       struct pktq_prec *q;
-+       void *p;
-+       int prec;
-+
-+       if (pq->len == 0)
-+               return NULL;
-+
-+       while ((prec = pq->hi_prec) > 0 && pq->q[prec].head == NULL)
-+               pq->hi_prec--;
-+
-+       while ((prec_bmp & (1 << prec)) == 0 || pq->q[prec].head == NULL)
-+               if (prec-- == 0)
-+                       return NULL;
-+
-+       q = &pq->q[prec];
-+
-+       if ((p = q->head) == NULL)
-+               return NULL;
-+
-+       if ((q->head = PKTLINK(p)) == NULL)
-+               q->tail = NULL;
-+
-+       q->len--;
-+
-+       if (prec_out)
-+               *prec_out = prec;
-+
-+       pq->len--;
-+
-+       PKTSETLINK(p, NULL);
-+
-+       return p;
++       p = next;
++
++       return (p);
++}
++
++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);
++}
++
++/* return pointer to location of substring 'needle' in 'haystack' */
++char*
++bcmstrstr(char *haystack, char *needle)
++{
++       int len, nlen;
++       int i;
++
++       if ((haystack == NULL) || (needle == NULL))
++               return (haystack);
++
++       nlen = strlen(needle);
++       len = strlen(haystack) - nlen + 1;
++
++       for (i = 0; i < len; i++)
++               if (bcmp(needle, &haystack[i], nlen) == 0)
++                       return (&haystack[i]);
++       return (NULL);
 +}
 +
@@ -16976 +10216 @@
 +}
 +
++#if defined(CONFIG_USBRNDIS_RETAIL) || defined(NDIS_MINIPORT_DRIVER)
++/* registry routine buffer preparation utility functions:
++ * parameter order is like strncpy, but returns count
++ * of bytes copied. Minimum bytes copied is null char(1)/wchar(2)
++ */
++ulong
++wchar2ascii(
++       char *abuf,
++       ushort *wbuf,
++       ushort wbuflen,
++       ulong abuflen
++)
++{
++       ulong copyct = 1;
++       ushort i;
++
++       if (abuflen == 0)
++               return 0;
++
++       /* wbuflen is in bytes */
++       wbuflen /= sizeof(ushort);
++
++       for (i = 0; i < wbuflen; ++i) {
++               if (--abuflen == 0)
++                       break;
++               *abuf++ = (char) *wbuf++;
++               ++copyct;
++       }
++       *abuf = '\0';
++
++       return copyct;
++}
++#endif
++
 +char*
-+bcm_ether_ntoa(struct ether_addr *ea, char *buf)
-+{
-+       sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
-+               ea->octet[0]&0xff, ea->octet[1]&0xff, ea->octet[2]&0xff,
-+               ea->octet[3]&0xff, ea->octet[4]&0xff, ea->octet[5]&0xff);
++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);
 +}
@@ -16987 +10261 @@
 +/* parse a xx:xx:xx:xx:xx:xx format ethernet address */
 +int
-+bcm_ether_atoe(char *p, struct ether_addr *ea)
++bcm_ether_atoe(char *p, char *ea)
 +{
 +       int i = 0;
 +
 +       for (;;) {
-+               ea->octet[i++] = (char) bcm_strtoul(p, &p, 16);
++               ea[i++] = (char) bcm_strtoul(p, &p, 16);
 +               if (!*p++ || i == 6)
 +                       break;
@@ -17000 +10274 @@
 +}
 +
-+/* Takes an Ethernet frame and sets out-of-bound PKTPRIO
-+ * Also updates the inplace vlan tag if requested
++void
++bcm_mdelay(uint ms)
++{
++       uint i;
++
++       for (i = 0; i < ms; i++) {
++               OSL_DELAY(1000);
++       }
++}
++
++/*
++ * Search the name=value vars for a specific one and return its value.
++ * Returns NULL if not found.
 + */
-+void
-+pktsetprio(void *pkt, bool update_vtag)
-+{
-+       struct ether_header *eh;
-+       struct ethervlan_header *evh;
-+       uint8 *pktdata;
-+       int priority = 0;
-+
-+       pktdata = (uint8 *) PKTDATA(NULL, pkt);
-+       ASSERT(ISALIGNED((uintptr)pktdata, sizeof(uint16)));
-+
-+       eh = (struct ether_header *) pktdata;
-+
-+       if (ntoh16(eh->ether_type) == ETHER_TYPE_8021Q) {
-+               uint16 vlan_tag;
-+               int vlan_prio, dscp_prio = 0;
-+
-+               evh = (struct ethervlan_header *)eh;
-+
-+               vlan_tag = ntoh16(evh->vlan_tag);
-+               vlan_prio = (int) (vlan_tag >> VLAN_PRI_SHIFT) & VLAN_PRI_MASK;
-+
-+               if (ntoh16(evh->ether_type) == ETHER_TYPE_IP) {
-+                       uint8 *ip_body = pktdata + sizeof(struct ethervlan_header);
-+                       uint8 tos_tc = IP_TOS(ip_body);
-+                       dscp_prio = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
-+               }
-+
-+               /* DSCP priority gets precedence over 802.1P (vlan tag) */
-+               priority = (dscp_prio != 0) ? dscp_prio : vlan_prio;
-+
-+               /* 
-+                * If the DSCP priority is not the same as the VLAN priority,
-+                * then overwrite the priority field in the vlan tag, with the
-+                * DSCP priority value. This is required for Linux APs because
-+                * the VLAN driver on Linux, overwrites the skb->priority field
-+                * with the priority value in the vlan tag
-+                */
-+               if (update_vtag && (priority != vlan_prio)) {
-+                       vlan_tag &= ~(VLAN_PRI_MASK << VLAN_PRI_SHIFT);
-+                       vlan_tag |= (uint16)priority << VLAN_PRI_SHIFT;
-+                       evh->vlan_tag = hton16(vlan_tag);
-+               }
-+       } else if (ntoh16(eh->ether_type) == ETHER_TYPE_IP) {
-+               uint8 *ip_body = pktdata + sizeof(struct ether_header);
-+               uint8 tos_tc = IP_TOS(ip_body);
-+               priority = (int)(tos_tc >> IPV4_TOS_PREC_SHIFT);
-+       }
-+
-+       ASSERT(priority >= 0 && priority <= MAXPRIO);
-+       PKTSETPRIO(pkt, priority);
-+}
-+
-+static char bcm_undeferrstr[BCME_STRLEN];
-+
-+static const char *bcmerrorstrtable[] = BCMERRSTRINGTABLE;
-+
-+/* Convert the Error codes into related Error strings  */
-+const char *
-+bcmerrorstr(int bcmerror)
-+{
-+       int abs_bcmerror;
-+
-+       abs_bcmerror = ABS(bcmerror);
-+
-+       /* check if someone added a bcmerror code but forgot to add errorstring */
-+       ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(bcmerrorstrtable) - 1));
-+       if ((bcmerror > 0) || (abs_bcmerror > ABS(BCME_LAST))) {
-+               sprintf(bcm_undeferrstr, "undefined Error %d", bcmerror);
-+               return bcm_undeferrstr;
-+       }
-+
-+       ASSERT((strlen((char*)bcmerrorstrtable[abs_bcmerror])) < BCME_STRLEN);
-+
-+       return bcmerrorstrtable[abs_bcmerror];
-+}
-+
-+
++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 (BCMINIT(nvram_get)(name));
++}
++
++/*
++ * Search the vars for a specific one and return its value as
++ * an integer. Returns 0 if not found.
++ */
 +int
-+bcm_iovar_lencheck(const bcm_iovar_t *vi, void *arg, int len, bool set)
-+{
-+       int bcmerror = 0;
-+
-+       /* length check on io buf */
-+       switch (vi->type) {
-+       case IOVT_BOOL:
-+       case IOVT_INT8:
-+       case IOVT_INT16:
-+       case IOVT_INT32:
-+       case IOVT_UINT8:
-+       case IOVT_UINT16:
-+       case IOVT_UINT32:
-+               /* all integers are int32 sized args at the ioctl interface */
-+               if (len < (int)sizeof(int)) {
-+                       bcmerror = BCME_BUFTOOSHORT;
-+               }
-+               break;
-+
-+       case IOVT_BUFFER:
-+               /* buffer must meet minimum length requirement */
-+               if (len < vi->minlen) {
-+                       bcmerror = BCME_BUFTOOSHORT;
-+               }
-+               break;
-+
-+       case IOVT_VOID:
-+               if (!set) {
-+                       /* Cannot return nil... */
-+                       bcmerror = BCME_UNSUPPORTED;
-+               } else if (len) {
-+                       /* Set is an action w/o parameters */
-+                       bcmerror = BCME_BUFTOOLONG;
-+               }
-+               break;
-+
-+       default:
-+               /* unknown type for length check in iovar info */
-+               ASSERT(0);
-+               bcmerror = BCME_UNSUPPORTED;
-+       }
-+
-+       return bcmerror;
-+}
++getintvar(char *vars, char *name)
++{
++       char *val;
++
++       if ((val = getvar(vars, name)) == NULL)
++               return (0);
++
++       return (bcm_strtoul(val, NULL, 0));
++}
++
++/* Return gpio pin number assigned to the named pin */
++/*
++* Variable should be in format:
++*
++*      gpio<N>=pin_name
++*
++* 'def_pin' is returned if there is no such variable found.
++*/
++uint
++getgpiopin(char *vars, char *pin_name, uint def_pin)
++{
++       char name[] = "gpioXXXX";
++       char *val;
++       uint pin;
++
++       /* Go thru all possibilities till a match in pin name */
++       for (pin = 0; pin < GPIO_NUMPINS; pin ++) {
++               sprintf(name, "gpio%d", pin);
++               val = getvar(vars, name);
++               if (val && !strcmp(val, pin_name))
++                       return pin;
++       }
++       return def_pin;
++}
++
++#endif /* #ifdef BCMDRIVER */
++
++/*******************************************************************************
++ * 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
++};
 +
 +#define CRC_INNER_LOOP(n, c, x) \
-+                   (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
++    (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
++
++uint8
++hndcrc8(
++       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
++hndcrc16(
++    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] = {
@@ -17204 +10567 @@
 +)
 +{
-+       uint8 *pend;
++    uint8 *pend;
 +#ifdef __mips__
-+       uint8 tmp[4];
-+       ulong *tptr = (ulong *)tmp;
++    uint8 tmp[4];
++    ulong *tptr = (ulong *)tmp;
 +
 +       /* in case the beginning of the buffer isn't aligned */
@@ -17215 +10578 @@
 +               CRC_INNER_LOOP(32, crc, *pdata++);
 +
-+       /* handle bulk of data as 32-bit words */
-+       pend = pdata + (nbytes & 0xfffffffc);
-+       while (pdata < pend) {
-+               *tptr = *(ulong *)pdata;
-+               pdata += sizeof(ulong *);
-+               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++);
++    /* 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 /* __mips__ */
-+
-+       return crc;
-+}
-+
-+
-+/*
-+ * Advance from the current 1-byte tag/1-byte length/variable-length value
++    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
++
++
++/* 
++ * Advance from the current 1-byte tag/1-byte length/variable-length value 
 + * triple, to the next, returning a pointer to the next.
-+ * If the current or next TLV is invalid (does not fit in given buffer length),
-+ * NULL is returned.
-+ * *buflen is not modified if the TLV elt parameter is invalid, or is decremented
-+ * by the TLV paramter's length if it is valid.
 + */
 +bcm_tlv_t *
@@ -17254 +10647 @@
 +
 +       /* validate current elt */
-+       if (!bcm_valid_tlv(elt, *buflen))
++       if (*buflen < 2) {
 +               return NULL;
-+
-+       /* advance to next elt */
++       }
++       
 +       len = elt->len;
-+       elt = (bcm_tlv_t*)(elt->data + len);
-+       *buflen -= (2 + len);
-+
-+       /* validate next elt */
-+       if (!bcm_valid_tlv(elt, *buflen))
-+               return NULL;
-+
++
++       /* validate remaining buflen */
++       if (*buflen >= (2 + len + 2)) {
++               elt = (bcm_tlv_t*)(elt->data + len);
++               *buflen -= (2 + len);
++       } else {
++               elt = NULL;
++       }
++       
 +       return elt;
 +}
 +
-+/*
-+ * Traverse a string of 1-byte tag/1-byte length/variable-length value
-+ * triples, returning a pointer to the substring whose first element
++/* 
++ * 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
 + */
@@ -17294 +10689 @@
 +               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
++/* 
++ * 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.
++ * than the target key. 
 + */
 +bcm_tlv_t *
@@ -17317 +10712 @@
 +               uint id = elt->id;
 +               int len = elt->len;
-+
++               
 +               /* Punt if we start seeing IDs > than target key */
 +               if (id > key)
-+                       return (NULL);
++                       return(NULL);
 +
 +               /* validate remaining totlen */
@@ -17333 +10728 @@
 +
 +
-+/* Initialization of bcmstrbuf structure */
-+void
-+bcm_binit(struct bcmstrbuf *b, char *buf, uint size)
-+{
-+       b->origsize = b->size = size;
-+       b->origbuf = b->buf = buf;
-+}
-+
-+/* Buffer sprintf wrapper to guard against buffer overflow */
-+int
-+bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...)
-+{
-+       va_list ap;
-+       int r;
-+
-+       va_start(ap, fmt);
-+       r = vsnprintf(b->buf, b->size, fmt, ap);
-+
-+       /* Non Ansi C99 compliant returns -1,
-+        * Ansi compliant return r >= b->size,
-+        * bcmstdlib returns 0, handle all
-+        */
-+       if ((r == -1) || (r >= (int)b->size) || (r == 0))
-+       {
-+               b->size = 0;
-+       }
-+       else
-+       {
-+               b->size -= r;
-+               b->buf += r;
-+       }
-+
-+       va_end(ap);
-+
-+       return r;
-+}
-diff -urN linux.old/drivers/net/wl/hnddma.c linux.dev/drivers/net/wl/hnddma.c
---- linux.old/drivers/net/wl/hnddma.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/hnddma.c   2006-05-02 17:42:13.000000000 +0200
-@@ -0,0 +1,1157 @@
+diff -Nur linux-2.4.32/drivers/net/hnd/hnddma.c linux-2.4.32-freewrt/drivers/net/hnd/hnddma.c
+--- linux-2.4.32/drivers/net/hnd/hnddma.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/hnddma.c       2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,865 @@
 +/*
 + * Generic Broadcom Home Networking Division (HND) DMA module.
 + * This supports the following chips: BCM42xx, 44xx, 47xx .
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -17385 +10744 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: hnddma.c,v 1.11 2006/04/08 07:12:42 honor Exp $
++ * $Id$
 + */
 +
 +#include <typedefs.h>
-+#include <bcmdefs.h>
 +#include <osl.h>
-+#include "linux_osl.h"
 +#include <bcmendian.h>
 +#include <sbconfig.h>
 +#include <bcmutils.h>
-+#include <bcmdevs.h>
-+#include <sbutils.h>
-+
-+#include "sbhnddma.h"
-+#include "hnddma.h"
++
++struct dma_info;       /* forward declaration */
++#define di_t struct dma_info
++#include <hnddma.h>
 +
 +/* debug/trace */
-+#define        DMA_ERROR(args)
++#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               /* 8 char names */
-+
-+#define        DI_INFO(dmah)   (dma_info_t *)dmah
++/* 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 {
-+       struct hnddma_pub hnddma;       /* exported structure, don't use hnddma_t,
-+                                        * which could be const
-+                                        */
++       hnddma_t        hnddma;         /* exported structure */
 +       uint            *msg_level;     /* message level pointer */
++
 +       char            name[MAXNAMEL]; /* callers name for diag msgs */
-+
++       void            *drv;           /* driver handle */
 +       void            *osh;           /* os handle */
-+       sb_t            *sbh;           /* sb handle */
-+
-+       bool            dma64;          /* dma64 enabled */
-+       bool            addrext;        /* this dma engine supports DmaExtendedAddrChanges */
-+
-+       dma32regs_t     *d32txregs;     /* 32 bits dma tx engine registers */
-+       dma32regs_t     *d32rxregs;     /* 32 bits dma rx engine registers */
-+       dma64regs_t     *d64txregs;     /* 64 bits dma tx engine registers */
-+       dma64regs_t     *d64rxregs;     /* 64 bits dma rx engine registers */
-+
-+       uint32          dma64align;     /* either 8k or 4k depends on number of dd */
-+       dma32dd_t       *txd32;         /* pointer to dma32 tx descriptor ring */
-+       dma64dd_t       *txd64;         /* pointer to dma64 tx descriptor ring */
-+       uint            ntxd;           /* # tx descriptors tunable */
++       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;          /* pointer to parallel array of pointers to packets */
-+       osldma_t        *tx_dmah;       /* DMA TX descriptor ring handle */
-+       osldma_t        **txp_dmah;     /* DMA TX packet data handle */
 +       ulong           txdpa;          /* physical address of descriptor ring */
 +       uint            txdalign;       /* #bytes added to alloc'd mem to align txd */
 +       uint            txdalloc;       /* #bytes allocated for the ring */
 +
-+       dma32dd_t       *rxd32;         /* pointer to dma32 rx descriptor ring */
-+       dma64dd_t       *rxd64;         /* pointer to dma64 rx descriptor ring */
-+       uint            nrxd;           /* # rx descriptors tunable */
++       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;          /* pointer to parallel array of pointers to packets */
-+       osldma_t        *rx_dmah;       /* DMA RX descriptor ring handle */
-+       osldma_t        **rxp_dmah;     /* DMA RX packet data handle */
 +       ulong           rxdpa;          /* physical address of descriptor ring */
 +       uint            rxdalign;       /* #bytes added to alloc'd mem to align rxd */
@@ -17458 +10795 @@
 +
 +       /* tunables */
-+       uint            rxbufsize;      /* rx buffer size in bytes,
-+                                          not including the extra headroom
-+                                       */
++       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            ddoffsetlow;    /* add to get dma address of descriptor ring, low 32 bits */
-+       uint            ddoffsethigh;   /*   high 32 bits */
-+       uint            dataoffsetlow;  /* add to get dma address of data buffer, low 32 bits */
-+       uint            dataoffsethigh; /*   high 32 bits */
++       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        XXD(x, n)       ((x) & ((n) - 1))       /* faster than %, but n must be power of 2 */
++#define        XXD(x, n)       ((x) & ((n) - 1))
 +#define        TXD(x)          XXD((x), di->ntxd)
 +#define        RXD(x)          XXD((x), di->nrxd)
@@ -17480 +10815 @@
 +
 +/* macros to convert between byte offsets and indexes */
-+#define        B2I(bytes, type)        ((bytes) / sizeof(type))
-+#define        I2B(index, type)        ((index) * sizeof(type))
-+
-+#define        PCI32ADDR_HIGH          0xc0000000      /* address[31:30] */
-+#define        PCI32ADDR_HIGH_SHIFT    30              /* address[31:30] */
-+
-+
-+/* common prototypes */
-+static bool _dma_isaddrext(dma_info_t *di);
-+static bool dma32_alloc(dma_info_t *di, uint direction);
-+static void _dma_detach(dma_info_t *di);
-+static void _dma_ddtable_init(dma_info_t *di, uint direction, ulong pa);
-+static void _dma_rxinit(dma_info_t *di);
-+static void *_dma_rx(dma_info_t *di);
-+static void _dma_rxfill(dma_info_t *di);
-+static void _dma_rxreclaim(dma_info_t *di);
-+static void _dma_rxenable(dma_info_t *di);
-+static void * _dma_getnextrxp(dma_info_t *di, bool forceall);
-+
-+static void _dma_txblock(dma_info_t *di);
-+static void _dma_txunblock(dma_info_t *di);
-+static uint _dma_txactive(dma_info_t *di);
-+
-+static void* _dma_peeknexttxp(dma_info_t *di);
-+static uintptr _dma_getvar(dma_info_t *di, char *name);
-+static void _dma_counterreset(dma_info_t *di);
-+static void _dma_fifoloopbackenable(dma_info_t *di);
-+
-+/* ** 32 bit DMA prototypes */
-+static bool dma32_alloc(dma_info_t *di, uint direction);
-+static bool dma32_txreset(dma_info_t *di);
-+static bool dma32_rxreset(dma_info_t *di);
-+static bool dma32_txsuspendedidle(dma_info_t *di);
-+static int  dma32_txfast(dma_info_t *di, void *p0, bool commit);
-+static void *dma32_getnexttxp(dma_info_t *di, bool forceall);
-+static void *dma32_getnextrxp(dma_info_t *di, bool forceall);
-+static void dma32_txrotate(dma_info_t *di);
-+static bool dma32_rxidle(dma_info_t *di);
-+static void dma32_txinit(dma_info_t *di);
-+static bool dma32_txenabled(dma_info_t *di);
-+static void dma32_txsuspend(dma_info_t *di);
-+static void dma32_txresume(dma_info_t *di);
-+static bool dma32_txsuspended(dma_info_t *di);
-+static void dma32_txreclaim(dma_info_t *di, bool forceall);
-+static bool dma32_txstopped(dma_info_t *di);
-+static bool dma32_rxstopped(dma_info_t *di);
-+static bool dma32_rxenabled(dma_info_t *di);
-+static bool _dma32_addrext(osl_t *osh, dma32regs_t *dma32regs);
-+
-+
-+static di_fcn_t dma32proc = {
-+       (di_detach_t)_dma_detach,
-+       (di_txinit_t)dma32_txinit,
-+       (di_txreset_t)dma32_txreset,
-+       (di_txenabled_t)dma32_txenabled,
-+       (di_txsuspend_t)dma32_txsuspend,
-+       (di_txresume_t)dma32_txresume,
-+       (di_txsuspended_t)dma32_txsuspended,
-+       (di_txsuspendedidle_t)dma32_txsuspendedidle,
-+       (di_txfast_t)dma32_txfast,
-+       (di_txstopped_t)dma32_txstopped,
-+       (di_txreclaim_t)dma32_txreclaim,
-+       (di_getnexttxp_t)dma32_getnexttxp,
-+       (di_peeknexttxp_t)_dma_peeknexttxp,
-+       (di_txblock_t)_dma_txblock,
-+       (di_txunblock_t)_dma_txunblock,
-+       (di_txactive_t)_dma_txactive,
-+       (di_txrotate_t)dma32_txrotate,
-+
-+       (di_rxinit_t)_dma_rxinit,
-+       (di_rxreset_t)dma32_rxreset,
-+       (di_rxidle_t)dma32_rxidle,
-+       (di_rxstopped_t)dma32_rxstopped,
-+       (di_rxenable_t)_dma_rxenable,
-+       (di_rxenabled_t)dma32_rxenabled,
-+       (di_rx_t)_dma_rx,
-+       (di_rxfill_t)_dma_rxfill,
-+       (di_rxreclaim_t)_dma_rxreclaim,
-+       (di_getnextrxp_t)_dma_getnextrxp,
-+
-+       (di_fifoloopbackenable_t)_dma_fifoloopbackenable,
-+       (di_getvar_t)_dma_getvar,
-+       (di_counterreset_t)_dma_counterreset,
-+
-+       NULL,
-+       NULL,
-+       NULL,
-+       34
-+};
-+
-+hnddma_t *
-+dma_attach(osl_t *osh, char *name, sb_t *sbh, void *dmaregstx, void *dmaregsrx,
-+           uint ntxd, uint nrxd, uint rxbufsize, uint nrxpost, uint rxoffset, uint *msg_level)
++#define        B2I(bytes)      ((bytes) / sizeof (dmadd_t))
++#define        I2B(index)      ((index) * sizeof (dmadd_t))
++
++/*
++ * This assume the largest i/o address is, in fact, the pci big window
++ * and that the pci core sb2pcitranslation2 register has been left with
++ * the default 0x0 pci base address.
++ */
++#define        MAXDMAADDR              SB_PCI_DMA_SZ
++#define        DMA_ADDRESSABLE(x)      !((x) & ~(MAXDMAADDR - 1))
++
++/* prototypes */
++
++void* 
++dma_attach(void *drv, void *osh, 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;
 +       uint size;
++       void *va;
++
++       ASSERT(ntxd <= MAXDD);
++       ASSERT(ISPOWEROF2(ntxd));
++       ASSERT(nrxd <= MAXDD);
++       ASSERT(ISPOWEROF2(nrxd));
 +
 +       /* allocate private info structure */
@@ -17581 +10845 @@
 +               return (NULL);
 +       }
-+       bzero((char *)di, sizeof(dma_info_t));
-+
++       bzero((char*)di, sizeof (dma_info_t));
++
++       /* allocate tx packet pointer vector */
++       if (ntxd) {
++               size = ntxd * sizeof (void*);
++               if ((di->txp = MALLOC(osh, size)) == NULL)
++                       goto fail;
++               bzero((char*)di->txp, size);
++       }
++
++       /* allocate rx packet pointer vector */
++       if (nrxd) {
++               size = nrxd * sizeof (void*);
++               if ((di->rxp = MALLOC(osh, size)) == NULL)
++                       goto fail;
++               bzero((char*)di->rxp, size);
++       }
++
++       /* set message level */
 +       di->msg_level = msg_level ? msg_level : &dma_msg_level;
 +
-+       /* old chips w/o sb is no longer supported */
-+       ASSERT(sbh != NULL);
-+
-+       /* check arguments */
-+       ASSERT(ISPOWEROF2(ntxd));
-+       ASSERT(ISPOWEROF2(nrxd));
-+       if (nrxd == 0)
-+               ASSERT(dmaregsrx == NULL);
-+       if (ntxd == 0)
-+               ASSERT(dmaregstx == NULL);
-+
-+
-+       /* init dma reg pointer */
-+       ASSERT(ntxd <= D32MAXDD);
-+       ASSERT(nrxd <= D32MAXDD);
-+       di->d32txregs = (dma32regs_t *)dmaregstx;
-+       di->d32rxregs = (dma32regs_t *)dmaregsrx;
-+
-+       DMA_TRACE(("%s: dma_attach: %s osh %p ntxd %d nrxd %d rxbufsize %d nrxpost %d "
-+                  "rxoffset %d dmaregstx %p dmaregsrx %p\n",
-+                  name, "DMA32", osh, ntxd, nrxd, rxbufsize,
-+                  nrxpost, rxoffset, dmaregstx, dmaregsrx));
++       DMA_TRACE(("%s: dma_attach: drv %p osh %p regs %p ntxd %d nrxd %d rxbufsize %d nrxpost %d rxoffset %d ddoffset 0x%x dataoffset 0x%x\n", name, drv, osh, regs, ntxd, nrxd, rxbufsize, nrxpost, rxoffset, ddoffset, dataoffset));
 +
 +       /* make a private copy of our callers name */
@@ -17612 +10872 @@
 +       di->name[MAXNAMEL-1] = '\0';
 +
++       di->drv = drv;
 +       di->osh = osh;
-+       di->sbh = sbh;
++       di->regs = regs;
++
++       /* allocate transmit descriptor ring */
++       if (ntxd) {
++               /* only need ntxd descriptors but it must be DMARINGALIGNed */
++               size = ntxd * sizeof (dmadd_t);
++               if (!ISALIGNED(DMA_CONSISTENT_ALIGN, DMARINGALIGN))
++                       size += DMARINGALIGN;
++               if ((va = DMA_ALLOC_CONSISTENT(osh, size, &di->txdpa)) == NULL)
++                       goto fail;
++               di->txd = (dmadd_t*) ROUNDUP((uintptr)va, DMARINGALIGN);
++               di->txdalign = (uint)((int8*)di->txd - (int8*)va);
++               di->txdpa += di->txdalign;
++               di->txdalloc = size;
++               ASSERT(ISALIGNED((uintptr)di->txd, DMARINGALIGN));
++               ASSERT(DMA_ADDRESSABLE(di->txdpa));
++       }
++
++       /* allocate receive descriptor ring */
++       if (nrxd) {
++               /* only need nrxd descriptors but it must be DMARINGALIGNed */
++               size = nrxd * sizeof (dmadd_t);
++               if (!ISALIGNED(DMA_CONSISTENT_ALIGN, DMARINGALIGN))
++                       size += DMARINGALIGN;
++               if ((va = DMA_ALLOC_CONSISTENT(osh, size, &di->rxdpa)) == NULL)
++                       goto fail;
++               di->rxd = (dmadd_t*) ROUNDUP((uintptr)va, DMARINGALIGN);
++               di->rxdalign = (uint)((int8*)di->rxd - (int8*)va);
++               di->rxdpa += di->rxdalign;
++               di->rxdalloc = size;
++               ASSERT(ISALIGNED((uintptr)di->rxd, DMARINGALIGN));
++               ASSERT(DMA_ADDRESSABLE(di->rxdpa));
++       }
 +
 +       /* save tunables */
 +       di->ntxd = ntxd;
 +       di->nrxd = nrxd;
-+
-+       /* the actual dma size doesn't include the extra headroom */
-+       if (rxbufsize > BCMEXTRAHDROOM)
-+               di->rxbufsize = rxbufsize - BCMEXTRAHDROOM;
-+       else
-+               di->rxbufsize = rxbufsize;
-+
++       di->rxbufsize = rxbufsize;
 +       di->nrxpost = nrxpost;
 +       di->rxoffset = rxoffset;
-+
-+       /*
-+        * figure out the DMA physical address offset for dd and data
-+        *   for old chips w/o sb, use zero
-+        *   for new chips w sb,
-+        *     PCI/PCIE: they map silicon backplace address to zero based memory, need offset
-+        *     Other bus: use zero
-+        *     SB_BUS BIGENDIAN kludge: use sdram swapped region for data buffer, not descriptor
-+        */
-+       di->ddoffsetlow = 0;
-+       di->dataoffsetlow = 0;
-+       /* for pci bus, add offset */
-+       if (sbh->bustype == PCI_BUS) {
-+               di->ddoffsetlow = SB_PCI_DMA;
-+               di->ddoffsethigh = 0;
-+               di->dataoffsetlow =  di->ddoffsetlow;
-+               di->dataoffsethigh =  di->ddoffsethigh;
-+       }
-+
-+#if defined(__mips__) && defined(IL_BIGENDIAN)
-+       di->dataoffsetlow = di->dataoffsetlow + SB_SDRAM_SWAPPED;
-+#endif
-+
-+       di->addrext = _dma_isaddrext(di);
-+
-+       /* allocate tx packet pointer vector */
-+       if (ntxd) {
-+               size = ntxd * sizeof(void *);
-+               if ((di->txp = MALLOC(osh, size)) == NULL) {
-+                       DMA_ERROR(("%s: dma_attach: out of tx memory, malloced %d bytes\n",
-+                                  di->name, MALLOCED(osh)));
-+                       goto fail;
-+               }
-+               bzero((char *)di->txp, size);
-+       }
-+
-+       /* allocate rx packet pointer vector */
-+       if (nrxd) {
-+               size = nrxd * sizeof(void *);
-+               if ((di->rxp = MALLOC(osh, size)) == NULL) {
-+                       DMA_ERROR(("%s: dma_attach: out of rx memory, malloced %d bytes\n",
-+                                  di->name, MALLOCED(osh)));
-+                       goto fail;
-+               }
-+               bzero((char *)di->rxp, size);
-+       }
-+
-+       /* allocate transmit descriptor ring, only need ntxd descriptors but it must be aligned */
-+       if (ntxd) {
-+               if (!dma32_alloc(di, DMA_TX))
-+                       goto fail;
-+       }
-+
-+       /* allocate receive descriptor ring, only need nrxd descriptors but it must be aligned */
-+       if (nrxd) {
-+               if (!dma32_alloc(di, DMA_RX))
-+                       goto fail;
-+       }
-+
-+       if ((di->ddoffsetlow == SB_PCI_DMA) && (di->txdpa > SB_PCI_DMA_SZ) && !di->addrext) {
-+               DMA_ERROR(("%s: dma_attach: txdpa 0x%lx: addrext not supported\n",
-+                          di->name, di->txdpa));
-+               goto fail;
-+       }
-+       if ((di->ddoffsetlow == SB_PCI_DMA) && (di->rxdpa > SB_PCI_DMA_SZ) && !di->addrext) {
-+               DMA_ERROR(("%s: dma_attach: rxdpa 0x%lx: addrext not supported\n",
-+                          di->name, di->rxdpa));
-+               goto fail;
-+       }
-+
-+       DMA_TRACE(("ddoffsetlow 0x%x ddoffsethigh 0x%x dataoffsetlow 0x%x dataoffsethigh "
-+                  "0x%x addrext %d\n", di->ddoffsetlow, di->ddoffsethigh, di->dataoffsetlow,
-+                  di->dataoffsethigh, di->addrext));
-+
-+       /* allocate tx packet pointer vector and DMA mapping vectors */
-+       if (ntxd) {
-+
-+               size = ntxd * sizeof(osldma_t **);
-+               if ((di->txp_dmah = (osldma_t **)MALLOC(osh, size)) == NULL)
-+                       goto fail;
-+               bzero((char*)di->txp_dmah, size);
-+       }else
-+               di->txp_dmah = NULL;
-+
-+       /* allocate rx packet pointer vector and DMA mapping vectors */
-+       if (nrxd) {
-+
-+               size = nrxd * sizeof(osldma_t **);
-+               if ((di->rxp_dmah = (osldma_t **)MALLOC(osh, size)) == NULL)
-+                       goto fail;
-+               bzero((char*)di->rxp_dmah, size);
-+
-+       } else
-+               di->rxp_dmah = NULL;
-+
-+       /* initialize opsvec of function pointers */
-+       di->hnddma.di_fn = dma32proc;
-+
-+       return ((hnddma_t *)di);
++       di->ddoffset = ddoffset;
++       di->dataoffset = dataoffset;
++
++       return ((void*)di);
 +
 +fail:
-+       _dma_detach(di);
++       dma_detach((void*)di);
 +       return (NULL);
 +}
 +
-+/* init the tx or rx descriptor */
-+static INLINE void
-+dma32_dd_upd(dma_info_t *di, dma32dd_t *ddring, ulong pa, uint outidx, uint32 *flags,
-+             uint32 bufcount)
-+{
-+       /* dma32 uses 32 bits control to fit both flags and bufcounter */
-+       *flags = *flags | (bufcount & CTRL_BC_MASK);
-+
-+       if ((di->dataoffsetlow != SB_PCI_DMA) || !(pa & PCI32ADDR_HIGH)) {
-+               W_SM(&ddring[outidx].addr, BUS_SWAP32(pa + di->dataoffsetlow));
-+               W_SM(&ddring[outidx].ctrl, BUS_SWAP32(*flags));
-+       } else {
-+               /* address extension */
-+               uint32 ae;
-+               ASSERT(di->addrext);
-+               ae = (pa & PCI32ADDR_HIGH) >> PCI32ADDR_HIGH_SHIFT;
-+               pa &= ~PCI32ADDR_HIGH;
-+
-+               *flags |= (ae << CTRL_AE_SHIFT);
-+               W_SM(&ddring[outidx].addr, BUS_SWAP32(pa + di->dataoffsetlow));
-+               W_SM(&ddring[outidx].ctrl, BUS_SWAP32(*flags));
-+       }
-+}
-+
-+static bool
-+_dma32_addrext(osl_t *osh, dma32regs_t *dma32regs)
-+{
-+       uint32 w;
-+
-+       OR_REG(osh, &dma32regs->control, XC_AE);
-+       w = R_REG(osh, &dma32regs->control);
-+       AND_REG(osh, &dma32regs->control, ~XC_AE);
-+       return ((w & XC_AE) == XC_AE);
-+}
-+
-+/* !! may be called with core in reset */
-+static void
-+_dma_detach(dma_info_t *di)
++/* may be called with core in reset */
++void
++dma_detach(dma_info_t *di)
 +{
 +       if (di == NULL)
@@ -17781 +10938 @@
 +
 +       /* free dma descriptor rings */
-+       if (di->txd32)
-+               DMA_FREE_CONSISTENT(di->osh, ((int8*)di->txd32 - di->txdalign),
-+                                   di->txdalloc, (di->txdpa - di->txdalign), &di->tx_dmah);
-+       if (di->rxd32)
-+               DMA_FREE_CONSISTENT(di->osh, ((int8*)di->rxd32 - di->rxdalign),
-+                                   di->rxdalloc, (di->rxdpa - di->rxdalign), &di->rx_dmah);
++       if (di->txd)
++               DMA_FREE_CONSISTENT(di->osh, ((int8*)di->txd - di->txdalign),
++                       di->txdalloc, (di->txdpa - di->txdalign));
++       if (di->rxd)
++               DMA_FREE_CONSISTENT(di->osh, ((int8*)di->rxd - di->rxdalign),
++                       di->rxdalloc, (di->rxdpa - di->rxdalign));
 +
 +       /* free packet pointer vectors */
 +       if (di->txp)
-+               MFREE(di->osh, (void *)di->txp, (di->ntxd * sizeof(void *)));
++               MFREE(di->osh, (void*)di->txp, (di->ntxd * sizeof (void*)));
 +       if (di->rxp)
-+               MFREE(di->osh, (void *)di->rxp, (di->nrxd * sizeof(void *)));
-+
-+       /* free tx packet DMA handles */
-+       if (di->txp_dmah)
-+               MFREE(di->osh, (void *)di->txp_dmah, di->ntxd * sizeof(osldma_t **));
-+
-+       /* free rx packet DMA handles */
-+       if (di->rxp_dmah)
-+               MFREE(di->osh, (void *)di->rxp_dmah, di->nrxd * sizeof(osldma_t **));
++               MFREE(di->osh, (void*)di->rxp, (di->nrxd * sizeof (void*)));
 +
 +       /* free our private info structure */
-+       MFREE(di->osh, (void *)di, sizeof(dma_info_t));
-+
-+}
-+
-+/* return TRUE if this dma engine supports DmaExtendedAddrChanges, otherwise FALSE */
-+static bool
-+_dma_isaddrext(dma_info_t *di)
-+{
-+       if (di->d32txregs)
-+               return (_dma32_addrext(di->osh, di->d32txregs));
-+       else if (di->d32rxregs)
-+               return (_dma32_addrext(di->osh, di->d32rxregs));
-+       return FALSE;
-+}
-+
-+/* initialize descriptor table base address */
-+static void
-+_dma_ddtable_init(dma_info_t *di, uint direction, ulong pa)
-+{
-+       if ((di->ddoffsetlow != SB_PCI_DMA) || !(pa & PCI32ADDR_HIGH)) {
-+               if (direction == DMA_TX)
-+                       W_REG(di->osh, &di->d32txregs->addr, (pa + di->ddoffsetlow));
-+               else
-+                       W_REG(di->osh, &di->d32rxregs->addr, (pa + di->ddoffsetlow));
-+       } else {
-+               /* dma32 address extension */
-+               uint32 ae;
-+               ASSERT(di->addrext);
-+
-+               /* shift the high bit(s) from pa to ae */
-+               ae = (pa & PCI32ADDR_HIGH) >> PCI32ADDR_HIGH_SHIFT;
-+               pa &= ~PCI32ADDR_HIGH;
-+
-+               if (direction == DMA_TX) {
-+                       W_REG(di->osh, &di->d32txregs->addr, (pa + di->ddoffsetlow));
-+                       SET_REG(di->osh, &di->d32txregs->control, XC_AE, ae <<XC_AE_SHIFT);
-+               } else {
-+                       W_REG(di->osh, &di->d32rxregs->addr, (pa + di->ddoffsetlow));
-+                       SET_REG(di->osh, &di->d32rxregs->control, RC_AE, ae <<RC_AE_SHIFT);
++       MFREE(di->osh, (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)
++{
++       if (!(R_REG(&di->regs->xmtcontrol) & XC_SE))
++               return 0;
++       
++       if ((R_REG(&di->regs->xmtstatus) & XS_XS_MASK) != XS_XS_IDLE)
++               return 0;
++
++       OSL_DELAY(2);
++       return ((R_REG(&di->regs->xmtstatus) & XS_XS_MASK) == XS_XS_IDLE);
++}
++
++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->osh, data, len, DMA_TX, p);
++               ASSERT(DMA_ADDRESSABLE(pa));
++
++               /* 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)     ((uintptr)(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 = (uint)(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->osh, start, len, DMA_TX, p);
++                       ASSERT(DMA_ADDRESSABLE(pa));
++
++                       /* 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);
 +               }
 +       }
-+}
-+
-+static void
-+_dma_fifoloopbackenable(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_fifoloopbackenable\n", di->name));
-+       OR_REG(di->osh, &di->d32txregs->control, XC_LE);
-+}
-+
-+static void
-+_dma_rxinit(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_rxinit\n", di->name));
-+
-+       if (di->nrxd == 0)
-+               return;
-+
-+       di->rxin = di->rxout = 0;
-+
-+       /* clear rx descriptor ring */
-+       BZERO_SM((void *)di->rxd32, (di->nrxd * sizeof(dma32dd_t)));
-+       _dma_rxenable(di);
-+       _dma_ddtable_init(di, DMA_RX, di->rxdpa);
-+}
-+
-+static void
-+_dma_rxenable(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_rxenable\n", di->name));
-+
-+       W_REG(di->osh, &di->d32rxregs->control, ((di->rxoffset << RC_RO_SHIFT) | RC_RE));
-+}
-+
-+/* !! rx entry routine, returns a pointer to the next frame received,
-+ * or NULL if there are no more
-+ */
-+static void *
-+_dma_rx(dma_info_t *di)
++
++       /* 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;
@@ -17887 +11294 @@
 +       int skiplen = 0;
 +
-+       while ((p = _dma_getnextrxp(di, FALSE))) {
++       while ((p = dma_getnextrxp(di, FALSE))) {
 +               /* skip giant packets which span multiple rx descriptors */
 +               if (skiplen > 0) {
@@ -17893 +11300 @@
 +                       if (skiplen < 0)
 +                               skiplen = 0;
-+                       PKTFREE(di->osh, p, FALSE);
++                       PKTFREE(di->drv, p, FALSE);
 +                       continue;
 +               }
 +
-+               len = ltoh16(*(uint16*)(PKTDATA(di->osh, p)));
++               len = ltoh16(*(uint16*)(PKTDATA(di->drv, p)));
 +               DMA_TRACE(("%s: dma_rx len %d\n", di->name, len));
 +
@@ -17905 +11312 @@
 +                       if (len > 0)
 +                               skiplen = len - (di->rxbufsize - di->rxoffset);
-+                       PKTFREE(di->osh, p, FALSE);
++                       PKTFREE(di->drv, p, FALSE);
 +                       di->hnddma.rxgiants++;
 +                       continue;
@@ -17911 +11318 @@
 +
 +               /* set actual length */
-+               PKTSETLEN(di->osh, p, (di->rxoffset + len));
++               PKTSETLEN(di->drv, p, (di->rxoffset + len));
 +
 +               break;
@@ -17920 +11327 @@
 +
 +/* post receive buffers */
-+static void
-+_dma_rxfill(dma_info_t *di)
++void
++dma_rxfill(dma_info_t *di)
 +{
 +       void *p;
 +       uint rxin, rxout;
-+       uint32 flags = 0;
++       uint ctrl;
 +       uint n;
 +       uint i;
 +       uint32 pa;
-+       uint extra_offset = 0;
++       uint rxbufsize;
 +
 +       /*
@@ -17939 +11346 @@
 +       rxin = di->rxin;
 +       rxout = di->rxout;
++       rxbufsize = di->rxbufsize;
 +
 +       n = di->nrxpost - NRXDACTIVE(rxin, rxout);
@@ -17944 +11352 @@
 +       DMA_TRACE(("%s: dma_rxfill: post %d\n", di->name, n));
 +
-+       if (di->rxbufsize > BCMEXTRAHDROOM)
-+               extra_offset = BCMEXTRAHDROOM;
-+
 +       for (i = 0; i < n; i++) {
-+               /* the di->rxbufsize doesn't include the extra headroom, we need to add it to the
-+                  size to be allocated
-+               */
-+               if ((p = PKTGET(di->osh, di->rxbufsize + extra_offset,
-+                               FALSE)) == NULL) {
++               if ((p = PKTGET(di->drv, rxbufsize, FALSE)) == NULL) {
 +                       DMA_ERROR(("%s: dma_rxfill: out of rxbufs\n", di->name));
 +                       di->hnddma.rxnobuf++;
 +                       break;
 +               }
-+               /* reserve an extra headroom, if applicable */
-+               if (extra_offset)
-+                       PKTPULL(di->osh, p, extra_offset);
-+
-+               /* Do a cached write instead of uncached write since DMA_MAP
-+                * will flush the cache.
-+                */
-+               *(uint32*)(PKTDATA(di->osh, p)) = 0;
-+
-+               pa = (uint32) DMA_MAP(di->osh, PKTDATA(di->osh, p),
-+                                     di->rxbufsize, DMA_RX, p);
-+
++
++               *(uint32*)(OSL_UNCACHED(PKTDATA(di->drv, p))) = 0;
++
++               pa = (uint32) DMA_MAP(di->osh, PKTDATA(di->drv, p), rxbufsize, DMA_RX, p);
 +               ASSERT(ISALIGNED(pa, 4));
++               ASSERT(DMA_ADDRESSABLE(pa));
 +
 +               /* save the free packet pointer */
@@ -17975 +11369 @@
 +               di->rxp[rxout] = p;
 +
-+               /* reset flags for each descriptor */
-+               flags = 0;
++               /* prep the descriptor control value */
++               ctrl = rxbufsize;
 +               if (rxout == (di->nrxd - 1))
-+                       flags = CTRL_EOT;
-+               dma32_dd_upd(di, di->rxd32, pa, rxout, &flags, di->rxbufsize);
++                       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);
 +       }
@@ -17986 +11384 @@
 +
 +       /* update the chip lastdscr pointer */
-+       W_REG(di->osh, &di->d32rxregs->ptr, I2B(rxout, dma32dd_t));
-+}
-+
-+/* like getnexttxp but no reclaim */
-+static void *
-+_dma_peeknexttxp(dma_info_t *di)
-+{
-+       uint end, i;
-+
-+       if (di->ntxd == 0)
-+               return (NULL);
-+
-+       end = B2I(R_REG(di->osh, &di->d32txregs->status) & XS_CD_MASK, dma32dd_t);
-+
-+       for (i = di->txin; i != end; i = NEXTTXD(i))
-+               if (di->txp[i])
-+                       return (di->txp[i]);
-+
-+       return (NULL);
-+}
-+
-+static void
-+_dma_rxreclaim(dma_info_t *di)
++       W_REG(&di->regs->rcvptr, I2B(rxout));
++}
++
++void
++dma_txreclaim(dma_info_t *di, bool forceall)
 +{
 +       void *p;
 +
-+       /* "unused local" warning suppression for OSLs that
-+        * define PKTFREE() without using the di->osh arg
-+        */
-+       di = di;
-+
-+       DMA_TRACE(("%s: dma_rxreclaim\n", di->name));
-+
-+       while ((p = _dma_getnextrxp(di, TRUE)))
-+               PKTFREE(di->osh, p, FALSE);
-+}
-+
-+static void *
-+_dma_getnextrxp(dma_info_t *di, bool forceall)
-+{
-+       if (di->nrxd == 0)
-+               return (NULL);
-+
-+       return dma32_getnextrxp(di, forceall);
-+}
-+
-+static void
-+_dma_txblock(dma_info_t *di)
-+{
-+       di->hnddma.txavail = 0;
-+}
-+
-+static void
-+_dma_txunblock(dma_info_t *di)
-+{
-+       di->hnddma.txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
-+}
-+
-+static uint
-+_dma_txactive(dma_info_t *di)
-+{
-+       return (NTXDACTIVE(di->txin, di->txout));
-+}
-+
-+static void
-+_dma_counterreset(dma_info_t *di)
-+{
-+       /* reset all software counter */
-+       di->hnddma.rxgiants = 0;
-+       di->hnddma.rxnobuf = 0;
-+       di->hnddma.txnobuf = 0;
-+}
-+
-+/* get the address of the var in order to change later */
-+static uintptr
-+_dma_getvar(dma_info_t *di, char *name)
-+{
-+       if (!strcmp(name, "&txavail"))
-+               return ((uintptr) &(di->hnddma.txavail));
-+       else {
-+               ASSERT(0);
-+       }
-+       return (0);
-+}
-+
-+void
-+dma_txpioloopback(osl_t *osh, dma32regs_t *regs)
-+{
-+       OR_REG(osh, &regs->control, XC_LE);
-+}
-+
-+
-+
-+/* 32 bits DMA functions */
-+static void
-+dma32_txinit(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_txinit\n", di->name));
-+
-+       if (di->ntxd == 0)
-+               return;
-+
-+       di->txin = di->txout = 0;
-+       di->hnddma.txavail = di->ntxd - 1;
-+
-+       /* clear tx descriptor ring */
-+       BZERO_SM((void *)di->txd32, (di->ntxd * sizeof(dma32dd_t)));
-+       W_REG(di->osh, &di->d32txregs->control, XC_XE);
-+       _dma_ddtable_init(di, DMA_TX, di->txdpa);
-+}
-+
-+static bool
-+dma32_txenabled(dma_info_t *di)
-+{
-+       uint32 xc;
-+
-+       /* If the chip is dead, it is not enabled :-) */
-+       xc = R_REG(di->osh, &di->d32txregs->control);
-+       return ((xc != 0xffffffff) && (xc & XC_XE));
-+}
-+
-+static void
-+dma32_txsuspend(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_txsuspend\n", di->name));
-+
-+       if (di->ntxd == 0)
-+               return;
-+
-+       OR_REG(di->osh, &di->d32txregs->control, XC_SE);
-+}
-+
-+static void
-+dma32_txresume(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_txresume\n", di->name));
-+
-+       if (di->ntxd == 0)
-+               return;
-+
-+       AND_REG(di->osh, &di->d32txregs->control, ~XC_SE);
-+}
-+
-+static bool
-+dma32_txsuspended(dma_info_t *di)
-+{
-+       return (di->ntxd == 0) || ((R_REG(di->osh, &di->d32txregs->control) & XC_SE) == XC_SE);
-+}
-+
-+static void
-+dma32_txreclaim(dma_info_t *di, bool forceall)
-+{
-+       void *p;
-+
 +       DMA_TRACE(("%s: dma_txreclaim %s\n", di->name, forceall ? "all" : ""));
 +
-+       while ((p = dma32_getnexttxp(di, forceall)))
-+               PKTFREE(di->osh, p, TRUE);
-+}
-+
-+static bool
-+dma32_txstopped(dma_info_t *di)
-+{
-+       return ((R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK) == XS_XS_STOPPED);
-+}
-+
-+static bool
-+dma32_rxstopped(dma_info_t *di)
-+{
-+       return ((R_REG(di->osh, &di->d32rxregs->status) & RS_RS_MASK) == RS_RS_STOPPED);
-+}
-+
-+static bool
-+dma32_alloc(dma_info_t *di, uint direction)
-+{
-+       uint size;
-+       uint ddlen;
-+       void *va;
-+
-+       ddlen = sizeof(dma32dd_t);
-+
-+       size = (direction == DMA_TX) ? (di->ntxd * ddlen) : (di->nrxd * ddlen);
-+
-+       if (!ISALIGNED(DMA_CONSISTENT_ALIGN, D32RINGALIGN))
-+               size += D32RINGALIGN;
-+
-+
-+       if (direction == DMA_TX) {
-+               if ((va = DMA_ALLOC_CONSISTENT(di->osh, size, &di->txdpa, &di->tx_dmah)) == NULL) {
-+                       DMA_ERROR(("%s: dma_attach: DMA_ALLOC_CONSISTENT(ntxd) failed\n",
-+                                  di->name));
-+                       return FALSE;
-+               }
-+
-+               di->txd32 = (dma32dd_t *) ROUNDUP((uintptr)va, D32RINGALIGN);
-+               di->txdalign = (uint)((int8*)di->txd32 - (int8*)va);
-+               di->txdpa += di->txdalign;
-+               di->txdalloc = size;
-+               ASSERT(ISALIGNED((uintptr)di->txd32, D32RINGALIGN));
-+       } else {
-+               if ((va = DMA_ALLOC_CONSISTENT(di->osh, size, &di->rxdpa, &di->rx_dmah)) == NULL) {
-+                       DMA_ERROR(("%s: dma_attach: DMA_ALLOC_CONSISTENT(nrxd) failed\n",
-+                                  di->name));
-+                       return FALSE;
-+               }
-+               di->rxd32 = (dma32dd_t *) ROUNDUP((uintptr)va, D32RINGALIGN);
-+               di->rxdalign = (uint)((int8*)di->rxd32 - (int8*)va);
-+               di->rxdpa += di->rxdalign;
-+               di->rxdalloc = size;
-+               ASSERT(ISALIGNED((uintptr)di->rxd32, D32RINGALIGN));
-+       }
-+
-+       return TRUE;
-+}
-+
-+static bool
-+dma32_txreset(dma_info_t *di)
-+{
-+       uint32 status;
-+
-+       if (di->ntxd == 0)
-+               return TRUE;
-+
-+       /* suspend tx DMA first */
-+       W_REG(di->osh, &di->d32txregs->control, XC_SE);
-+       SPINWAIT(((status = (R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK))
-+                != XS_XS_DISABLED) &&
-+                (status != XS_XS_IDLE) &&
-+                (status != XS_XS_STOPPED),
-+                (10000));
-+
-+       W_REG(di->osh, &di->d32txregs->control, 0);
-+       SPINWAIT(((status = (R_REG(di->osh,
-+                &di->d32txregs->status) & XS_XS_MASK)) != XS_XS_DISABLED),
-+                10000);
-+
-+       /* wait for the last transaction to complete */
-+       OSL_DELAY(300);
-+
-+       return (status == XS_XS_DISABLED);
-+}
-+
-+static bool
-+dma32_rxidle(dma_info_t *di)
-+{
-+       DMA_TRACE(("%s: dma_rxidle\n", di->name));
-+
-+       if (di->nrxd == 0)
-+               return TRUE;
-+
-+       return ((R_REG(di->osh, &di->d32rxregs->status) & RS_CD_MASK) ==
-+               R_REG(di->osh, &di->d32rxregs->ptr));
-+}
-+
-+static bool
-+dma32_rxreset(dma_info_t *di)
-+{
-+       uint32 status;
-+
-+       if (di->nrxd == 0)
-+               return TRUE;
-+
-+       W_REG(di->osh, &di->d32rxregs->control, 0);
-+       SPINWAIT(((status = (R_REG(di->osh,
-+                &di->d32rxregs->status) & RS_RS_MASK)) != RS_RS_DISABLED),
-+                10000);
-+
-+       return (status == RS_RS_DISABLED);
-+}
-+
-+static bool
-+dma32_rxenabled(dma_info_t *di)
-+{
-+       uint32 rc;
-+
-+       rc = R_REG(di->osh, &di->d32rxregs->control);
-+       return ((rc != 0xffffffff) && (rc & RC_RE));
-+}
-+
-+static bool
-+dma32_txsuspendedidle(dma_info_t *di)
-+{
-+       if (di->ntxd == 0)
-+               return TRUE;
-+
-+       if (!(R_REG(di->osh, &di->d32txregs->control) & XC_SE))
-+               return 0;
-+
-+       if ((R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK) != XS_XS_IDLE)
-+               return 0;
-+
-+       OSL_DELAY(2);
-+       return ((R_REG(di->osh, &di->d32txregs->status) & XS_XS_MASK) == XS_XS_IDLE);
-+}
-+
-+/* !! tx entry routine
-+ * supports full 32bit dma engine buffer addressing so
-+ * dma buffers can cross 4 Kbyte page boundaries.
-+ */
-+static int
-+dma32_txfast(dma_info_t *di, void *p0, bool commit)
-+{
-+       void *p, *next;
-+       uchar *data;
-+       uint len;
-+       uint txout;
-+       uint32 flags = 0;
-+       uint32 pa;
-+
-+       DMA_TRACE(("%s: dma_txfast\n", di->name));
-+
-+       txout = di->txout;
-+
-+       /*
-+        * Walk the chain of packet buffers
-+        * allocating and initializing transmit descriptor entries.
-+        */
-+       for (p = p0; p; p = next) {
-+               data = PKTDATA(di->osh, p);
-+               len = PKTLEN(di->osh, p);
-+               next = PKTNEXT(di->osh, 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->osh, data, len, DMA_TX, p);
-+
-+               flags = 0;
-+               if (p == p0)
-+                       flags |= CTRL_SOF;
-+               if (next == NULL)
-+                       flags |= (CTRL_IOC | CTRL_EOF);
-+               if (txout == (di->ntxd - 1))
-+                       flags |= CTRL_EOT;
-+
-+               dma32_dd_upd(di, di->txd32, pa, txout, &flags, len);
-+               ASSERT(di->txp[txout] == NULL);
-+
-+               txout = NEXTTXD(txout);
-+       }
-+
-+       /* if last txd eof not set, fix it */
-+       if (!(flags & CTRL_EOF))
-+               W_SM(&di->txd32[PREVTXD(txout)].ctrl, BUS_SWAP32(flags | CTRL_IOC | CTRL_EOF));
-+
-+       /* save the packet */
-+       di->txp[PREVTXD(txout)] = p0;
-+
-+       /* bump the tx descriptor index */
-+       di->txout = txout;
-+
-+       /* kick the chip */
-+       if (commit)
-+               W_REG(di->osh, &di->d32txregs->ptr, I2B(txout, dma32dd_t));
-+
-+       /* tx flow control */
-+       di->hnddma.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->osh, p0, TRUE);
-+       di->hnddma.txavail = 0;
-+       di->hnddma.txnobuf++;
-+       return (-1);
++       while ((p = dma_getnexttxp(di, forceall)))
++               PKTFREE(di->drv, p, TRUE);
 +}
 +
@@ -18365 +11404 @@
 + * regardless of the value of the hardware "curr" pointer.
 + */
-+static void *
-+dma32_getnexttxp(dma_info_t *di, bool forceall)
++void*
++dma_getnexttxp(dma_info_t *di, bool forceall)
 +{
 +       uint start, end, i;
@@ -18372 +11411 @@
 +
 +       DMA_TRACE(("%s: dma_getnexttxp %s\n", di->name, forceall ? "all" : ""));
-+
-+       if (di->ntxd == 0)
-+               return (NULL);
 +
 +       txp = NULL;
@@ -18382 +11418 @@
 +               end = di->txout;
 +       else
-+               end = B2I(R_REG(di->osh, &di->d32txregs->status) & XS_CD_MASK, dma32dd_t);
++               end = B2I(R_REG(&di->regs->xmtstatus) & XS_CD_MASK);
 +
 +       if ((start == 0) && (end > di->txout))
@@ -18388 +11424 @@
 +
 +       for (i = start; i != end && !txp; i = NEXTTXD(i)) {
-+               DMA_UNMAP(di->osh, (BUS_SWAP32(R_SM(&di->txd32[i].addr)) - di->dataoffsetlow),
-+                         (BUS_SWAP32(R_SM(&di->txd32[i].ctrl)) & CTRL_BC_MASK),
-+                         DMA_TX, di->txp[i]);
-+
-+               W_SM(&di->txd32[i].addr, 0xdeadbeef);
++               DMA_UNMAP(di->osh, (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;
@@ -18400 +11434 @@
 +
 +       /* tx flow control */
-+       di->hnddma.txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
++       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
 +
 +       return (txp);
@@ -18412 +11446 @@
 +}
 +
-+static void *
-+dma32_getnextrxp(dma_info_t *di, bool forceall)
++/* like getnexttxp but no reclaim */
++void*
++dma_peeknexttxp(dma_info_t *di)
++{
++       uint end, i;
++
++       end = B2I(R_REG(&di->regs->xmtstatus) & XS_CD_MASK);
++
++       for (i = di->txin; i != end; i = NEXTTXD(i))
++               if (di->txp[i])
++                       return (di->txp[i]);
++
++       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;
@@ -18419 +11479 @@
 +
 +       /* if forcing, dma engine must be disabled */
-+       ASSERT(!forceall || !dma32_rxenabled(di));
++       ASSERT(!forceall || !dma_rxenabled(di));
 +
 +       i = di->rxin;
@@ -18428 +11488 @@
 +
 +       /* ignore curr if forceall */
-+       if (!forceall && (i == B2I(R_REG(di->osh, &di->d32rxregs->status) & RS_CD_MASK, dma32dd_t)))
++       if (!forceall && (i == B2I(R_REG(&di->regs->rcvstatus) & RS_CD_MASK)))
 +               return (NULL);
 +
@@ -18437 +11497 @@
 +
 +       /* clear this packet from the descriptor ring */
-+       DMA_UNMAP(di->osh, (BUS_SWAP32(R_SM(&di->rxd32[i].addr)) - di->dataoffsetlow),
-+                 di->rxbufsize, DMA_RX, rxp);
-+
-+       W_SM(&di->rxd32[i].addr, 0xdeadbeef);
++       DMA_UNMAP(di->osh, (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);
++}
++
++
++uintptr
++dma_getvar(dma_info_t *di, char *name)
++{
++       if (!strcmp(name, "&txavail"))
++               return ((uintptr) &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));
 +}
 +
@@ -18450 +11539 @@
 + * Rotate all active tx dma ring entries "forward" by (ActiveDescriptor - txin).
 + */
-+static void
-+dma32_txrotate(dma_info_t *di)
++void
++dma_txrotate(di_t *di)
 +{
 +       uint ad;
@@ -18460 +11549 @@
 +       uint first, last;
 +
-+       ASSERT(dma32_txsuspendedidle(di));
-+
-+       nactive = _dma_txactive(di);
-+       ad = B2I(((R_REG(di->osh, &di->d32txregs->status) & XS_AD_MASK) >> XS_AD_SHIFT), dma32dd_t);
++       ASSERT(dma_txsuspended(di));
++
++       nactive = dma_txactive(di);
++       ad = B2I((R_REG(&di->regs->xmtstatus) & XS_AD_MASK) >> XS_AD_SHIFT);
 +       rot = TXD(ad - di->txin);
 +
@@ -18485 +11574 @@
 +                * EOT is set only in the last entry in the ring.
 +                */
-+               w = BUS_SWAP32(R_SM(&di->txd32[old].ctrl)) & ~CTRL_EOT;
++               w = R_SM(&di->txd[old].ctrl) & ~CTRL_EOT;
 +               if (new == (di->ntxd - 1))
 +                       w |= CTRL_EOT;
-+               W_SM(&di->txd32[new].ctrl, BUS_SWAP32(w));
-+               W_SM(&di->txd32[new].addr, R_SM(&di->txd32[old].addr));
++               W_SM(&di->txd[new].ctrl, w);
++               W_SM(&di->txd[new].addr, R_SM(&di->txd[old].addr));
 +
 +               /* zap the old tx dma descriptor address field */
-+               W_SM(&di->txd32[old].addr, BUS_SWAP32(0xdeadbeef));
++               W_SM(&di->txd[old].addr, 0xdeadbeef);
 +
 +               /* move the corresponding txp[] entry */
@@ -18503 +11592 @@
 +       di->txin = ad;
 +       di->txout = TXD(di->txout + rot);
-+       di->hnddma.txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
++       di->txavail = di->ntxd - NTXDACTIVE(di->txin, di->txout) - 1;
 +
 +       /* kick the chip */
-+       W_REG(di->osh, &di->d32txregs->ptr, I2B(di->txout, dma32dd_t));
-+}
-+
-+
-+uint
-+dma_addrwidth(sb_t *sbh, void *dmaregs)
-+{
-+       dma32regs_t *dma32regs;
-+       osl_t *osh;
-+
-+       osh = sb_osh(sbh);
-+
-+       /* Start checking for 32-bit / 30-bit addressing */
-+       dma32regs = (dma32regs_t *)dmaregs;
-+
-+       /* For System Backplane, PCIE bus or addrext feature, 32-bits ok */
-+       if ((BUSTYPE(sbh->bustype) == SB_BUS) ||
-+           ((BUSTYPE(sbh->bustype) == PCI_BUS) && sbh->buscoretype == SB_PCIE) ||
-+           (_dma32_addrext(osh, dma32regs)))
-+               return (DMADDRWIDTH_32);
-+
-+       /* Fallthru */
-+       return (DMADDRWIDTH_30);
-+}
-diff -urN linux.old/drivers/net/wl/hnddma.h linux.dev/drivers/net/wl/hnddma.h
---- linux.old/drivers/net/wl/hnddma.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/hnddma.h   2006-04-28 02:20:44.000000000 +0200
-@@ -0,0 +1,156 @@
-+/*
-+ * Generic Broadcom Home Networking Division (HND) DMA engine SW interface
-+ * This supports the following chips: BCM42xx, 44xx, 47xx .
-+ *
-+ * Copyright 2006, 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.h,v 1.1.1.13 2006/04/08 06:13:39 honor Exp $
-+ */
-+
-+#ifndef        _hnddma_h_
-+#define        _hnddma_h_
-+
-+typedef const struct hnddma_pub hnddma_t;
-+
-+/* dma function type */
-+typedef void (*di_detach_t)(hnddma_t *dmah);
-+typedef bool (*di_txreset_t)(hnddma_t *dmah);
-+typedef bool (*di_rxreset_t)(hnddma_t *dmah);
-+typedef bool (*di_rxidle_t)(hnddma_t *dmah);
-+typedef void (*di_txinit_t)(hnddma_t *dmah);
-+typedef bool (*di_txenabled_t)(hnddma_t *dmah);
-+typedef void (*di_rxinit_t)(hnddma_t *dmah);
-+typedef void (*di_txsuspend_t)(hnddma_t *dmah);
-+typedef void (*di_txresume_t)(hnddma_t *dmah);
-+typedef bool (*di_txsuspended_t)(hnddma_t *dmah);
-+typedef bool (*di_txsuspendedidle_t)(hnddma_t *dmah);
-+typedef int (*di_txfast_t)(hnddma_t *dmah, void *p, bool commit);
-+typedef void (*di_fifoloopbackenable_t)(hnddma_t *dmah);
-+typedef bool  (*di_txstopped_t)(hnddma_t *dmah);
-+typedef bool  (*di_rxstopped_t)(hnddma_t *dmah);
-+typedef bool  (*di_rxenable_t)(hnddma_t *dmah);
-+typedef bool  (*di_rxenabled_t)(hnddma_t *dmah);
-+typedef void* (*di_rx_t)(hnddma_t *dmah);
-+typedef void (*di_rxfill_t)(hnddma_t *dmah);
-+typedef void (*di_txreclaim_t)(hnddma_t *dmah, bool forceall);
-+typedef void (*di_rxreclaim_t)(hnddma_t *dmah);
-+typedef        uintptr (*di_getvar_t)(hnddma_t *dmah, char *name);
-+typedef void* (*di_getnexttxp_t)(hnddma_t *dmah, bool forceall);
-+typedef void* (*di_getnextrxp_t)(hnddma_t *dmah, bool forceall);
-+typedef void* (*di_peeknexttxp_t)(hnddma_t *dmah);
-+typedef void (*di_txblock_t)(hnddma_t *dmah);
-+typedef void (*di_txunblock_t)(hnddma_t *dmah);
-+typedef uint (*di_txactive_t)(hnddma_t *dmah);
-+typedef void (*di_txrotate_t)(hnddma_t *dmah);
-+typedef void (*di_counterreset_t)(hnddma_t *dmah);
-+typedef char* (*di_dump_t)(hnddma_t *dmah, struct bcmstrbuf *b, bool dumpring);
-+typedef char* (*di_dumptx_t)(hnddma_t *dmah, struct bcmstrbuf *b, bool dumpring);
-+typedef char* (*di_dumprx_t)(hnddma_t *dmah, struct bcmstrbuf *b, bool dumpring);
-+
-+/* dma opsvec */
-+typedef struct di_fcn_s {
-+       di_detach_t             detach;
-+       di_txinit_t             txinit;
-+       di_txreset_t            txreset;
-+       di_txenabled_t          txenabled;
-+       di_txsuspend_t          txsuspend;
-+       di_txresume_t           txresume;
-+       di_txsuspended_t        txsuspended;
-+       di_txsuspendedidle_t    txsuspendedidle;
-+       di_txfast_t             txfast;
-+       di_txstopped_t          txstopped;
-+       di_txreclaim_t          txreclaim;
-+       di_getnexttxp_t         getnexttxp;
-+       di_peeknexttxp_t        peeknexttxp;
-+       di_txblock_t            txblock;
-+       di_txunblock_t          txunblock;
-+       di_txactive_t           txactive;
-+       di_txrotate_t           txrotate;
-+
-+       di_rxinit_t             rxinit;
-+       di_rxreset_t            rxreset;
-+       di_rxidle_t             rxidle;
-+       di_rxstopped_t          rxstopped;
-+       di_rxenable_t           rxenable;
-+       di_rxenabled_t          rxenabled;
-+       di_rx_t                 rx;
-+       di_rxfill_t             rxfill;
-+       di_rxreclaim_t          rxreclaim;
-+       di_getnextrxp_t         getnextrxp;
-+
-+       di_fifoloopbackenable_t fifoloopbackenable;
-+       di_getvar_t             d_getvar;
-+       di_counterreset_t       counterreset;
-+       di_dump_t               dump;
-+       di_dumptx_t             dumptx;
-+       di_dumprx_t             dumprx;
-+       uint                    endnum;
-+} di_fcn_t;
-+
-+/*
-+ * Exported data structure (read-only)
-+ */
-+/* export structure */
-+struct hnddma_pub {
-+       di_fcn_t        di_fn;          /* DMA function pointers */
-+       uint            txavail;        /* # free tx descriptors */
-+
-+       /* 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 */
-+};
-+
-+
-+extern hnddma_t * dma_attach(osl_t *osh, char *name, sb_t *sbh, void *dmaregstx, void *dmaregsrx,
-+                             uint ntxd, uint nrxd, uint rxbufsize, uint nrxpost, uint rxoffset,
-+                             uint *msg_level);
-+#define dma_detach(di)                 ((di)->di_fn.detach(di))
-+#define dma_txreset(di)                        ((di)->di_fn.txreset(di))
-+#define dma_rxreset(di)                        ((di)->di_fn.rxreset(di))
-+#define dma_rxidle(di)                 ((di)->di_fn.rxidle(di))
-+#define dma_txinit(di)                  ((di)->di_fn.txinit(di))
-+#define dma_txenabled(di)               ((di)->di_fn.txenabled(di))
-+#define dma_rxinit(di)                  ((di)->di_fn.rxinit(di))
-+#define dma_txsuspend(di)               ((di)->di_fn.txsuspend(di))
-+#define dma_txresume(di)                ((di)->di_fn.txresume(di))
-+#define dma_txsuspended(di)             ((di)->di_fn.txsuspended(di))
-+#define dma_txsuspendedidle(di)         ((di)->di_fn.txsuspendedidle(di))
-+#define dma_txfast(di, p, commit)      ((di)->di_fn.txfast(di, p, commit))
-+#define dma_fifoloopbackenable(di)      ((di)->di_fn.fifoloopbackenable(di))
-+#define dma_txstopped(di)               ((di)->di_fn.txstopped(di))
-+#define dma_rxstopped(di)               ((di)->di_fn.rxstopped(di))
-+#define dma_rxenable(di)                ((di)->di_fn.rxenable(di))
-+#define dma_rxenabled(di)               ((di)->di_fn.rxenabled(di))
-+#define dma_rx(di)                      ((di)->di_fn.rx(di))
-+#define dma_rxfill(di)                  ((di)->di_fn.rxfill(di))
-+#define dma_txreclaim(di, forceall)    ((di)->di_fn.txreclaim(di, forceall))
-+#define dma_rxreclaim(di)               ((di)->di_fn.rxreclaim(di))
-+#define dma_getvar(di, name)           ((di)->di_fn.d_getvar(di, name))
-+#define dma_getnexttxp(di, forceall)    ((di)->di_fn.getnexttxp(di, forceall))
-+#define dma_getnextrxp(di, forceall)    ((di)->di_fn.getnextrxp(di, forceall))
-+#define dma_peeknexttxp(di)             ((di)->di_fn.peeknexttxp(di))
-+#define dma_txblock(di)                 ((di)->di_fn.txblock(di))
-+#define dma_txunblock(di)               ((di)->di_fn.txunblock(di))
-+#define dma_txactive(di)                ((di)->di_fn.txactive(di))
-+#define dma_txrotate(di)                ((di)->di_fn.txrotate(di))
-+#define dma_counterreset(di)            ((di)->di_fn.counterreset(di))
-+
-+#define DMA_DUMP_SIZE 2048
-+/* return addresswidth allowed
-+ * This needs to be done after SB attach but before dma attach.
-+ * SB attach provides ability to probe backplane and dma core capabilities
-+ * This info is needed by DMA_ALLOC_CONSISTENT in dma attach
-+ */
-+extern uint dma_addrwidth(sb_t *sbh, void *dmaregs);
-+
-+/* pio helpers */
-+void dma_txpioloopback(osl_t *osh, dma32regs_t *);
-+
-+#endif /* _hnddma_h_ */
-diff -urN linux.old/drivers/net/wl/linux_osl.c linux.dev/drivers/net/wl/linux_osl.c
---- linux.old/drivers/net/wl/linux_osl.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/linux_osl.c        2006-04-28 02:29:46.000000000 +0200
-@@ -0,0 +1,269 @@
++       W_REG(&di->regs->xmtptr, I2B(di->txout));
++}
+diff -Nur linux-2.4.32/drivers/net/hnd/linux_osl.c linux-2.4.32-freewrt/drivers/net/hnd/linux_osl.c
+--- linux-2.4.32/drivers/net/hnd/linux_osl.c    1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/linux_osl.c    2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,640 @@
 +/*
 + * Linux OS Independent Layer
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2004, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -18705 +11612 @@
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
 + *
-+ * $Id: linux_osl.c,v 1.1.1.14 2006/04/08 06:13:39 honor Exp $
++ * $Id$
 + */
 +
@@ -18714 +11621 @@
 +#include <linux/module.h>
 +#include <linuxver.h>
-+#include <bcmdefs.h>
-+#include <osl.h>
-+#include "linux_osl.h"
++#include <linux_osl.h>
 +#include <bcmutils.h>
 +#include <linux/delay.h>
 +#ifdef mips
 +#include <asm/paccess.h>
-+#endif /* mips */
++#endif
 +#include <pcicfg.h>
 +
 +#define PCI_CFG_RETRY          10      
 +
-+#define OS_HANDLE_MAGIC                0x1234abcd      /* Magic # to recognise osh */
-+#define BCM_MEM_FILENAME_LEN   24              /* Mem. filename length */
++#define OS_HANDLE_MAGIC                0x1234abcd
++#define BCM_MEM_FILENAME_LEN   24
 +
 +typedef struct bcm_mem_link {
@@ -18737 +11642 @@
 +} bcm_mem_link_t;
 +
-+static int16 linuxbcmerrormap[] =  \
-+{      0,                      /* 0 */
-+       -EINVAL,                /* BCME_ERROR */
-+       -EINVAL,                /* BCME_BADARG */
-+       -EINVAL,                /* BCME_BADOPTION */
-+       -EINVAL,                /* BCME_NOTUP */
-+       -EINVAL,                /* BCME_NOTDOWN */
-+       -EINVAL,                /* BCME_NOTAP */
-+       -EINVAL,                /* BCME_NOTSTA */
-+       -EINVAL,                /* BCME_BADKEYIDX */
-+       -EINVAL,                /* BCME_RADIOOFF */
-+       -EINVAL,                /* BCME_NOTBANDLOCKED */
-+       -EINVAL,                /* BCME_NOCLK */
-+       -EINVAL,                /* BCME_BADRATESET */
-+       -EINVAL,                /* BCME_BADBAND */
-+       -E2BIG,                 /* BCME_BUFTOOSHORT */
-+       -E2BIG,                 /* BCME_BUFTOOLONG */
-+       -EBUSY,                 /* BCME_BUSY */
-+       -EINVAL,                /* BCME_NOTASSOCIATED */
-+       -EINVAL,                /* BCME_BADSSIDLEN */
-+       -EINVAL,                /* BCME_OUTOFRANGECHAN */
-+       -EINVAL,                /* BCME_BADCHAN */
-+       -EFAULT,                /* BCME_BADADDR */
-+       -ENOMEM,                /* BCME_NORESOURCE */
-+       -EOPNOTSUPP,            /* BCME_UNSUPPORTED */
-+       -EMSGSIZE,              /* BCME_BADLENGTH */
-+       -EINVAL,                /* BCME_NOTREADY */
-+       -EPERM,                 /* BCME_NOTPERMITTED */
-+       -ENOMEM,                /* BCME_NOMEM */
-+       -EINVAL,                /* BCME_ASSOCIATED */
-+       -ERANGE,                /* BCME_RANGE */
-+       -EINVAL,                /* BCME_NOTFOUND */
-+       -EINVAL,                /* BCME_WME_NOT_ENABLED */
-+       -EINVAL,                /* BCME_TSPEC_NOTFOUND */
-+       -EINVAL,                /* BCME_ACM_NOTSUPPORTED */
-+       -EINVAL,                /* BCME_NOT_WME_ASSOCIATION */
-+       -EIO,                   /* BCME_SDIO_ERROR */
-+       -ENODEV                 /* BCME_DONGLE_DOWN */
-+};
-+
-+/* translate bcmerrors into linux errors */
-+int
-+osl_error(int bcmerror)
-+{
-+       int abs_bcmerror;
-+       int array_size = ARRAYSIZE(linuxbcmerrormap);
-+
-+       abs_bcmerror = ABS(bcmerror);
-+
-+       if (bcmerror > 0)
-+               abs_bcmerror = 0;
-+
-+       else if (abs_bcmerror >= array_size)
-+               abs_bcmerror = BCME_ERROR;
-+
-+       return linuxbcmerrormap[abs_bcmerror];
-+}
-+
-+osl_t *
-+osl_attach(void *pdev, bool pkttag)
-+{
-+       osl_t *osh;
-+
-+       osh = kmalloc(sizeof(osl_t), GFP_ATOMIC);
++typedef struct os_handle {
++       uint magic;
++       void *pdev;
++       uint malloced;
++       uint failed;
++       bcm_mem_link_t *dbgmem_list;
++} os_handle_t;
++
++void *
++osl_attach(void *pdev)
++{
++       os_handle_t *osh;
++
++       osh = kmalloc(sizeof(os_handle_t), GFP_ATOMIC);
 +       ASSERT(osh);
-+
-+       bzero(osh, sizeof(osl_t));
-+
-+       /*
-+        * check the cases where
-+        * 1.Error code Added to bcmerror table, but forgot to add it to the OS
-+        * dependent error code
-+        * 2. Error code is added to the bcmerror table, but forgot to add the
-+        * corresponding errorstring(dummy call to bcmerrorstr)
-+        */
-+       bcmerrorstr(0);
-+       ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(linuxbcmerrormap) - 1));
 +
 +       osh->magic = OS_HANDLE_MAGIC;
@@ -18820 +11663 @@
 +       osh->dbgmem_list = NULL;
 +       osh->pdev = pdev;
-+       osh->pub.pkttag = pkttag;
 +
 +       return osh;
@@ -18826 +11668 @@
 +
 +void
-+osl_detach(osl_t *osh)
-+{
-+       if (osh == NULL)
-+               return;
-+
-+       ASSERT(osh->magic == OS_HANDLE_MAGIC);
++osl_detach(void *osh)
++{
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
 +       kfree(osh);
 +}
 +
-+/* Return a new packet. zero out pkttag */
 +void*
-+osl_pktget(osl_t *osh, uint len, bool send)
++osl_pktget(void *drv, uint len, bool send)
 +{
 +       struct sk_buff *skb;
 +
-+       if ((skb = dev_alloc_skb(len))) {
-+               skb_put(skb, len);
-+               skb->priority = 0;
-+
-+#ifdef BCMDBG_PKT
-+       pktlist_add(&(osh->pktlist), (void *) skb);
-+#endif  /* BCMDBG_PKT */
-+
-+               osh->pub.pktalloced++;
-+       }
++       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);
 +}
 +
-+/* Free the driver packet. Free the tag if present */
 +void
-+osl_pktfree(osl_t *osh, void *p)
++osl_pktfree(void *p)
 +{
 +       struct sk_buff *skb, *nskb;
@@ -18867 +11701 @@
 +               nskb = skb->next;
 +               skb->next = NULL;
-+
-+#ifdef BCMDBG_PKT
-+               pktlist_remove(&(osh->pktlist), (void *) skb);
-+#endif  /* BCMDBG_PKT */
-+
 +               if (skb->destructor) {
-+                       /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if destructor exists
-+                        */
++                       /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if destructor exists */
 +                       dev_kfree_skb_any(skb);
 +               } else {
@@ -18880 +11708 @@
 +                       dev_kfree_skb(skb);
 +               }
-+
-+               osh->pub.pktalloced--;
-+
 +               skb = nskb;
 +       }
 +}
 +
++uint32
++osl_pci_read_config(void *osh, uint offset, uint size)
++{
++       struct pci_dev *pdev;
++       uint val;
++       uint retry=PCI_CFG_RETRY;        
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       /* only 4byte access supported */
++       ASSERT(size == 4);
++
++       pdev = ((os_handle_t *)osh)->pdev;
++       do {
++               pci_read_config_dword(pdev, offset, &val);
++               if (val != 0xffffffff)
++                       break;
++       } while (retry--);
++
++
++       return (val);
++}
++
++void
++osl_pci_write_config(void *osh, uint offset, uint size, uint val)
++{
++       struct pci_dev *pdev;
++       uint retry=PCI_CFG_RETRY;        
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       /* only 4byte access supported */
++       ASSERT(size == 4);
++
++       pdev = ((os_handle_t *)osh)->pdev;
++
++       do {
++               pci_write_config_dword(pdev, offset, val);
++               if (offset!=PCI_BAR0_WIN)
++                       break;
++               if (osl_pci_read_config(osh,offset,size) == val) 
++                       break;
++       } while (retry--);
++
++}
++
++static void
++osl_pcmcia_attr(void *osh, uint offset, char *buf, int size, bool write)
++{
++}
++
++void
++osl_pcmcia_read_attr(void *osh, uint offset, void *buf, int size)
++{
++       osl_pcmcia_attr(osh, offset, (char *) buf, size, FALSE);
++}
++
++void
++osl_pcmcia_write_attr(void *osh, uint offset, void *buf, int size)
++{
++       osl_pcmcia_attr(osh, offset, (char *) buf, size, TRUE);
++}
++
++
++#ifdef BCMDBG_MEM
++
 +void*
-+osl_malloc(osl_t *osh, uint size)
-+{
++osl_debug_malloc(void *osh, uint size, int line, char* file)
++{
++       bcm_mem_link_t *p;
++       char* basename;
++       os_handle_t *h = (os_handle_t *)osh;
++       
++       if (size == 0) {
++               return NULL;
++       }
++       
++       p = (bcm_mem_link_t*)osl_malloc(osh, sizeof(bcm_mem_link_t) + size);
++       if (p == NULL)
++               return p;
++       
++       p->size = size;
++       p->line = line;
++       
++       basename = strrchr(file, '/');
++       /* skip the '/' */
++       if (basename)
++               basename++;
++
++       if (!basename)
++               basename = file;
++       
++       strncpy(p->file, basename, BCM_MEM_FILENAME_LEN);
++       p->file[BCM_MEM_FILENAME_LEN - 1] = '\0';
++
++       /* link this block */
++       p->prev = NULL;
++       p->next = h->dbgmem_list;
++       if (p->next)
++               p->next->prev = p;
++       h->dbgmem_list = p;
++
++       return p + 1;
++}
++
++void
++osl_debug_mfree(void *osh, void *addr, uint size, int line, char* file)
++{
++       bcm_mem_link_t *p = (bcm_mem_link_t *)((int8*)addr - sizeof(bcm_mem_link_t));
++       os_handle_t *h = (os_handle_t *)osh;
++       
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++
++       if (p->size == 0) {
++               printk("osl_debug_mfree: double free on addr 0x%x size %d at line %d file %s\n", 
++                       (uint)addr, size, line, file);
++               return;
++       }
++
++       if (p->size != size) {
++               printk("osl_debug_mfree: dealloc size %d does not match alloc size %d on addr 0x%x at line %d file %s\n",
++                      size, p->size, (uint)addr, line, file);
++               return;
++       }
++
++       /* unlink this block */
++       if (p->prev)
++               p->prev->next = p->next;
++       if (p->next)
++               p->next->prev = p->prev;
++       if (h->dbgmem_list == p)
++               h->dbgmem_list = p->next;
++       p->next = p->prev = NULL;
++
++       osl_mfree(osh, p, size + sizeof(bcm_mem_link_t));
++}
++
++char*
++osl_debug_memdump(void *osh, char *buf, uint sz)
++{
++       bcm_mem_link_t *p;
++       char *obuf;
++       os_handle_t *h = (os_handle_t *)osh;
++
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++       obuf = buf;
++
++       buf += sprintf(buf, "   Address\tSize\tFile:line\n");
++       for (p = h->dbgmem_list; p && ((buf - obuf) < (sz - 128)); p = p->next)
++               buf += sprintf(buf, "0x%08x\t%5d\t%s:%d\n",
++                       (int)p + sizeof(bcm_mem_link_t), p->size, p->file, p->line);
++
++       return (obuf);
++}
++
++#endif /* BCMDBG_MEM */
++
++void*
++osl_malloc(void *osh, uint size)
++{
++       os_handle_t *h = (os_handle_t *)osh;
 +       void *addr;
 +
-+       /* only ASSERT if osh is defined */
-+       if (osh)
-+               ASSERT(osh->magic == OS_HANDLE_MAGIC);
-+
-+       if ((addr = kmalloc(size, GFP_ATOMIC)) == NULL) {
-+               if (osh)
-+                       osh->failed++;
-+               return (NULL);
-+       }
-+       if (osh)
-+               osh->malloced += size;
-+
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++       h->malloced += size;
++       addr = kmalloc(size, GFP_ATOMIC);
++       if (!addr)
++               h->failed++;
 +       return (addr);
 +}
 +
 +void
-+osl_mfree(osl_t *osh, void *addr, uint size)
-+{
-+       if (osh) {
-+               ASSERT(osh->magic == OS_HANDLE_MAGIC);
-+               osh->malloced -= size;
-+       }
++osl_mfree(void *osh, void *addr, uint size)
++{
++       os_handle_t *h = (os_handle_t *)osh;
++
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++       h->malloced -= size;
 +       kfree(addr);
 +}
 +
 +uint
-+osl_malloced(osl_t *osh)
-+{
-+       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-+       return (osh->malloced);
-+}
-+
-+uint osl_malloc_failed(osl_t *osh)
-+{
-+       ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
-+       return (osh->failed);
-+}
-+
-+#undef osl_delay
++osl_malloced(void *osh)
++{
++       os_handle_t *h = (os_handle_t *)osh;
++
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++       return (h->malloced);
++}
++
++uint osl_malloc_failed(void *osh)
++{
++       os_handle_t *h = (os_handle_t *)osh;
++
++       ASSERT((h && (h->magic == OS_HANDLE_MAGIC)));
++       return (h->failed);
++}
++
++void*
++osl_dma_alloc_consistent(void *osh, uint size, ulong *pap)
++{
++       struct pci_dev *dev;
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       dev = ((os_handle_t *)osh)->pdev;
++       return (pci_alloc_consistent(dev, size, (dma_addr_t*)pap));
++}
++
++void
++osl_dma_free_consistent(void *osh, void *va, uint size, ulong pa)
++{
++       struct pci_dev *dev;
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       dev = ((os_handle_t *)osh)->pdev;
++       pci_free_consistent(dev, size, va, (dma_addr_t)pa);
++}
++
++uint
++osl_dma_map(void *osh, void *va, uint size, int direction)
++{
++       int dir;
++       struct pci_dev *dev;
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       dev = ((os_handle_t *)osh)->pdev;
++       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
++       return (pci_map_single(dev, va, size, dir));
++}
++
++void
++osl_dma_unmap(void *osh, uint pa, uint size, int direction)
++{
++       int dir;
++       struct pci_dev *dev;
++
++       ASSERT((osh && (((os_handle_t *)osh)->magic == OS_HANDLE_MAGIC)));
++
++       dev = ((os_handle_t *)osh)->pdev;
++       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
++       pci_unmap_single(dev, (uint32)pa, size, dir);
++}
++
++#if defined(BINOSL)
++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);
++}
++#endif /* BCMDBG || BINOSL */
++
++/*
++ * 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);
++}
++
++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_delay(uint usec)
 +{
-+       OSL_DELAY(usec);
-+}
-+
-+/* Clone a packet.
-+ * The pkttag contents are NOT cloned.
-+ */
-+void *
-+osl_pktdup(osl_t *osh, void *skb)
-+{
-+       void * p;
-+
-+       if ((p = skb_clone((struct sk_buff*)skb, GFP_ATOMIC)) == NULL)
-+               return NULL;
-+
-+       /* skb_clone copies skb->cb.. we don't want that */
-+       if (osh->pub.pkttag)
-+               bzero((void*)((struct sk_buff *)p)->cb, OSL_PKTTAG_SZ);
-+
-+       /* Increment the packet counter */
-+       osh->pub.pktalloced++;
-+       return (p);
++       udelay(usec);
++}
++
++uchar*
++osl_pktdata(void *drv, void *skb)
++{
++       return (((struct sk_buff*)skb)->data);
 +}
 +
 +uint
-+osl_pktalloced(osl_t *osh)
-+{
-+       return (osh->pub.pktalloced);
-+}
-+
-diff -urN linux.old/drivers/net/wl/linux_osl.h linux.dev/drivers/net/wl/linux_osl.h
---- linux.old/drivers/net/wl/linux_osl.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/linux_osl.h        2006-05-02 17:44:29.000000000 +0200
-@@ -0,0 +1,171 @@
++osl_pktlen(void *drv, void *skb)
++{
++       return (((struct sk_buff*)skb)->len);
++}
++
++uint
++osl_pktheadroom(void *drv, void *skb)
++{
++       return (uint) skb_headroom((struct sk_buff *) skb);
++}
++
++uint
++osl_pkttailroom(void *drv, void *skb)
++{
++       return (uint) skb_tailroom((struct sk_buff *) skb);
++}
++
++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;
++}
++
++uint
++osl_pktprio(void *skb)
++{
++       return (((struct sk_buff*)skb)->priority);
++}
++
++void
++osl_pktsetprio(void *skb, uint x)
++{
++       ((struct sk_buff*)skb)->priority = x;
++}
++
++#endif /* BINOSL */
+diff -Nur linux-2.4.32/drivers/net/hnd/sbutils.c linux-2.4.32-freewrt/drivers/net/hnd/sbutils.c
+--- linux-2.4.32/drivers/net/hnd/sbutils.c      1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/sbutils.c      2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,2061 @@
 +/*
-+ * Linux OS Independent Layer
++ * Misc utility routines for accessing chip-specific features
++ * of the SiliconBackplane-based Broadcom chips.
 + *
-+ * Copyright 2006, Broadcom Corporation
++ * Copyright 2005, Broadcom Corporation
 + * All Rights Reserved.
 + * 
@@ -18977 +12256 @@
 + * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
 + * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
-+ *
-+ * $Id: linux_osl.h,v 1.1.1.13 2006/04/08 06:13:39 honor Exp $
++ * $Id: sbutils.c,v 1.6 2005/03/07 08:35:32 kanki Exp $
 + */
 +
-+#ifndef _linux_osl_h_
-+#define _linux_osl_h_
-+
 +#include <typedefs.h>
-+#include <linuxver.h>
 +#include <osl.h>
-+
-+#define OSL_PKTTAG_SZ     32 /* Size of PktTag */
-+
-+/* osl handle type forward declaration */
-+typedef struct osl_dmainfo osldma_t;
-+
-+/* OSL initialization */
-+extern osl_t *osl_attach(void *pdev, bool pkttag);
-+extern void osl_detach(osl_t *osh);
-+
-+/* host/bus architecture-specific byte swap */
-+#define BUS_SWAP32(v)          (v)
-+#define        MALLOC_FAILED(osh)      osl_malloc_failed((osh))
-+
-+extern void *osl_malloc(osl_t *osh, uint size);
-+extern void osl_mfree(osl_t *osh, void *addr, uint size);
-+extern uint osl_malloced(osl_t *osh);
-+extern uint osl_malloc_failed(osl_t *osh);
-+
-+/* API for DMA addressing capability */
-+#define        DMA_MAP(osh, va, size, direction, p) \
-+       osl_dma_map((osh), (va), (size), (direction))
-+#define        DMA_UNMAP(osh, pa, size, direction, p) \
-+       osl_dma_unmap((osh), (pa), (size), (direction))
-+static inline uint
-+osl_dma_map(void *osh, void *va, uint size, int direction)
-+{
-+       int dir;
-+       struct pci_dev *dev;
-+
-+       dev = (osh == NULL ? NULL : ((osl_t *)osh)->pdev);
-+       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
-+       return (pci_map_single(dev, va, size, dir));
-+}
-+
-+static inline void
-+osl_dma_unmap(void *osh, uint pa, uint size, int direction)
-+{
-+       int dir;
-+       struct pci_dev *dev;
-+
-+       dev = (osh == NULL ? NULL : ((osl_t *)osh)->pdev);
-+       dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;
-+       pci_unmap_single(dev, (uint32)pa, size, dir);
-+}
-+
-+#define OSL_DMADDRWIDTH(osh, addrwidth) do {} while (0)
-+#define        DMA_CONSISTENT_ALIGN    PAGE_SIZE
-+#define        DMA_ALLOC_CONSISTENT(osh, size, pap, dmah) \
-+       osl_dma_alloc_consistent((osh), (size), (pap))
-+#define        DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
-+       osl_dma_free_consistent((osh), (void*)(va), (size), (pa))
-+static inline void*
-+osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap)
-+{
-+       return (pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap));
-+}
-+
-+static inline void
-+osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa)
-+{
-+       pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa);
-+}
-+
-+
-+/* register access macros */
-+#if defined(BCMJTAG)
-+#include <bcmjtag.h>
-+#define        R_REG(osh, r)   bcmjtag_read(NULL, (uint32)(r), sizeof(*(r)))
-+#define        W_REG(osh, r, v)        bcmjtag_write(NULL, (uint32)(r), (uint32)(v), sizeof(*(r)))
-+#endif /* defined(BCMSDIO) */
-+
-+/* packet primitives */
-+#define        PKTGET(osh, len, send)          osl_pktget((osh), (len), (send))
-+#define        PKTFREE(osh, skb, send)         osl_pktfree((osh), (skb))
-+#define        PKTDATA(osh, skb)               (((struct sk_buff*)(skb))->data)
-+#define        PKTLEN(osh, skb)                (((struct sk_buff*)(skb))->len)
-+#define PKTHEADROOM(osh, skb)          (PKTDATA(osh, skb)-(((struct sk_buff*)(skb))->head))
-+#define PKTTAILROOM(osh, skb) ((((struct sk_buff*)(skb))->end)-(((struct sk_buff*)(skb))->tail))
-+#define        PKTNEXT(osh, skb)               (((struct sk_buff*)(skb))->next)
-+#define        PKTSETNEXT(osh, skb, x)         (((struct sk_buff*)(skb))->next = (struct sk_buff*)(x))
-+#define        PKTSETLEN(osh, skb, len)        __skb_trim((struct sk_buff*)(skb), (len))
-+#define        PKTPUSH(osh, skb, bytes)        skb_push((struct sk_buff*)(skb), (bytes))
-+#define        PKTPULL(osh, skb, bytes)        skb_pull((struct sk_buff*)(skb), (bytes))
-+#define        PKTDUP(osh, skb)                osl_pktdup((osh), (skb))
-+#define        PKTTAG(skb)                     ((void*)(((struct sk_buff*)(skb))->cb))
-+#define PKTALLOCED(osh)                        osl_pktalloced((osh))
-+#define PKTLIST_DUMP(osh, buf)
-+
-+/* Convert a native(OS) packet to driver packet.
-+ * In the process, native packet is destroyed, there is no copying
-+ * Also, a packettag is zeroed out
++#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);
++typedef bool (*sb_intrsenabled_t)(void *intr_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    bustype;                /* 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_intrsenabled_t       intrsenabled_fn;        /* function to check if chip interrupts are enabled */
++} sb_info_t;
++
++/* local prototypes */
++static void* BCMINIT(sb_doattach)(sb_info_t *si, uint devid, void *osh, void *regs, uint bustype, void *sdh, char **vars, int *varsz);
++static void BCMINIT(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 BCMINIT(sb_pcidev2chip)(uint pcidev);
++static uint BCMINIT(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((uintptr)(regs), SB_CORE_SIZE))
++#define        REGS2SB(va)     (sbconfig_t*) ((int8*)(va) + SBCONFIGOFF)
++#define        GOODIDX(idx)    (((uint)idx) < SB_MAXCORES)
++#define        BADIDX          (SB_MAXCORES+1)
++#define        NOREV           (SBIDH_RC_MASK + 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.
 + */
-+static INLINE void *
-+osl_pkt_frmnative(struct osl_pubinfo *osh, struct sk_buff *skb)
-+{
-+       struct sk_buff *nskb;
-+
-+       if (osh->pkttag)
-+               bzero((void*)skb->cb, OSL_PKTTAG_SZ);
-+
-+       /* Increment the packet counter */
-+       for (nskb = skb; nskb; nskb = nskb->next) {
-+               osh->pktalloced++;
-+       }
-+
-+       return (void *)skb;
-+}
-+#define PKTFRMNATIVE(osh, skb) osl_pkt_frmnative(((struct osl_pubinfo *)osh), \
-+                                                       (struct sk_buff*)(skb))
-+
-+/* Convert a driver packet to native(OS) packet
-+ * In the process, packettag is zeroed out before sending up
-+ * IP code depends on skb->cb to be setup correctly with various options
-+ * In our case, that means it should be 0
++#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        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_DEF_DIV    0                       /* default slow clock divider */
++
++#define XTAL_ON_DELAY          1000    /* Xtal power on delay in us */
++
++#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);
++               (uintptr)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);
++               (uintptr)sbr &= ~(1 << 11);     /* mask out bit 11 */
++       }
++
++       if (BUSTYPE(si->bustype) == PCMCIA_BUS) {
++#ifdef IL_BIGENDIAN
++               dummy = R_REG(sbr);
++               W_REG(((volatile uint16 *)sbr + 1), (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 *)sbr + 1), (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
 + */
-+static INLINE struct sk_buff *
-+osl_pkt_tonative(struct osl_pubinfo *osh, void *pkt)
-+{
-+       struct sk_buff *nskb;
-+
-+       if (osh->pkttag)
-+               bzero(((struct sk_buff*)pkt)->cb, OSL_PKTTAG_SZ);
-+
-+       /* Decrement the packet counter */
-+       for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next) {
-+               osh->pktalloced--;
-+       }
-+
-+       return (struct sk_buff *)pkt;
-+}
-+#define PKTTONATIVE(osh, pkt)          osl_pkt_tonative((struct osl_pubinfo *)(osh), (pkt))
-+
-+#define        PKTLINK(skb)                    (((struct sk_buff*)(skb))->prev)
-+#define        PKTSETLINK(skb, x)              (((struct sk_buff*)(skb))->prev = (struct sk_buff*)(x))
-+#define        PKTPRIO(skb)                    (((struct sk_buff*)(skb))->priority)
-+#define        PKTSETPRIO(skb, x)              (((struct sk_buff*)(skb))->priority = (x))
-+#define PKTSHARED(skb)                  (((struct sk_buff*)(skb))->cloned)
-+
-+extern void *osl_pktget(osl_t *osh, uint len, bool send);
-+extern void osl_pktfree(osl_t *osh, void *skb);
-+extern void *osl_pktdup(osl_t *osh, void *skb);
-+extern uint osl_pktalloced(osl_t *osh);
-+
-+#define OSL_ERROR(bcmerror)    osl_error(bcmerror)
-+extern int osl_error(int bcmerror);
-+
-+/* the largest reasonable packet buffer driver uses for ethernet MTU in bytes */
-+#define        PKTBUFSZ        2048   /* largest reasonable packet buffer, driver uses for ethernet MTU */
-+
-+#endif /* _linux_osl_h_ */
-diff -urN linux.old/drivers/net/wl/pktq.h linux.dev/drivers/net/wl/pktq.h
---- linux.old/drivers/net/wl/pktq.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/pktq.h     2006-04-28 02:11:49.000000000 +0200
-@@ -0,0 +1,97 @@
++void* 
++BCMINITFN(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(osh, sizeof (sb_info_t))) == NULL) {
++               SB_ERROR(("sb_attach: malloc failed! malloced %d bytes\n", MALLOCED(osh)));
++               return (NULL);
++       }
++
++       if (BCMINIT(sb_doattach)(si, devid, osh, regs, bustype, sdh, vars, varsz) == NULL) {
++               MFREE(osh, si, sizeof (sb_info_t));
++               return (NULL);
++       }
++       return si;
++}
++
++/* Using sb_kattach depends on SB_BUS support, either implicit  */
++/* no limiting BCMBUSTYPE value) or explicit (value is SB_BUS). */
++#if !defined(BCMBUSTYPE) || (BCMBUSTYPE == SB_BUS)
++
++/* global kernel resource */
++static sb_info_t ksi;
++
++/* generic kernel variant of sb_attach() */
++void* 
++BCMINITFN(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 & CID_ID_MASK) == BCM4712_DEVICE_ID) &&
++                   ((cid & CID_PKG_MASK) != BCM4712LARGE_PKG_ID) &&
++                   ((cid & CID_REV_MASK) <= (3 << CID_REV_SHIFT))) {
++                       uint32 *scc, val;
++
++                       scc = (uint32 *)((uchar*)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);
++               }
++
++               if (BCMINIT(sb_doattach)(&ksi, BCM4710_DEVICE_ID, NULL, (void*)regs,
++                       SB_BUS, NULL, &unused, &varsz) == NULL) {
++                       return NULL;
++               }
++       }
++
++       return &ksi;
++}
++#endif
++
++static void* 
++BCMINITFN(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;
++       int res;
++
++       ASSERT(GOODREGS(regs));
++
++       bzero((uchar*)si, sizeof (sb_info_t));
++
++       si->pciidx = si->gpioidx = BADIDX;
++
++       si->osh = osh;
++       si->curmap = regs;
++       si->sdh = sdh;
++
++       /* 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->bustype = bustype;
++       if (si->bustype != BUSTYPE(si->bustype)) {
++               SB_ERROR(("sb_doattach: bus type %d does not match configured bus type %d\n",
++                         si->bustype, BUSTYPE(si->bustype)));
++               return NULL;
++       }
++
++       /* need to set memseg flag for CF card first before any sb registers access */
++       if (BUSTYPE(si->bustype) == PCMCIA_BUS)
++               si->memseg = TRUE;
++
++       /* kludge to enable the clock on the 4306 which lacks a slowclock */
++       if (BUSTYPE(si->bustype) == PCI_BUS)
++               sb_pwrctl_xtal((void*)si, XTAL|PLL, ON);
++
++       /* initialize current core index value */
++       si->curidx = _sb_coreidx((void*)si);
++       if (si->curidx == BADIDX) {
++               return NULL;
++       }
++
++       /* keep and reuse the initial register mapping */
++       origidx = si->curidx;
++       if (BUSTYPE(si->bustype) == SB_BUS)
++               si->regs[origidx] = regs;
++
++       /* 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 {
++               /* The only pcmcia chip without a chipcommon core is a 4301 */
++               if (BUSTYPE(si->bustype) == PCMCIA_BUS)
++                       devid = BCM4301_DEVICE_ID;
++
++               /* no chip common core -- must convert device id to chip id */
++               if ((si->chip = BCMINIT(sb_pcidev2chip)(devid)) == 0) {
++                       SB_ERROR(("sb_attach: unrecognized device id 0x%04x\n", devid));
++                       return NULL;
++               }
++       }
++
++       /* get chipcommon rev */
++       si->ccrev = cc ? sb_corerev((void*)si) : NOREV;
++
++       /* determine numcores */
++       if (cc && ((si->ccrev == 4) || (si->ccrev >= 6)))
++               si->numcores = (R_REG(&cc->chipid) & CID_CC_MASK) >> CID_CC_SHIFT;
++       else
++               si->numcores = BCMINIT(sb_chip2numcores)(si->chip);
++
++       /* return to original core */
++       sb_setcoreidx((void*)si, origidx);
++
++       /* sanity checks */
++       ASSERT(si->chip);
++
++       /* scan for cores */
++       BCMINIT(sb_scan)(si);
++
++       /* srom_var_init() depends on sb_scan() info */
++       if ((res = srom_var_init(si, si->bustype, si->curmap, osh, vars, varsz))) {
++               SB_ERROR(("sb_attach: srom_var_init failed: bad srom\n"));
++               return (NULL);
++       }
++       
++       if (cc == NULL) {
++               /*
++                * 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 (BUSTYPE(si->bustype) == PCMCIA_BUS) {
++                       ASSERT(vars);
++                       si->chiprev = getintvar(*vars, "chiprev");
++               } else if (BUSTYPE(si->bustype) == PCI_BUS) {
++                       w = OSL_PCI_READ_CONFIG(osh, PCI_CFG_REV, sizeof (uint32));
++                       si->chiprev = w & 0xff;
++               } else
++                       si->chiprev = 0;
++       }
++
++       if (BUSTYPE(si->bustype) == PCMCIA_BUS) {
++               w = getintvar(*vars, "regwindowsz");
++               si->memseg = (w <= CFTABLE_REGWIN_2K) ? TRUE : FALSE;
++       }
++
++       /* gpio control core is required */
++       if (!GOODIDX(si->gpioidx)) {
++               SB_ERROR(("sb_attach: gpio control core not found\n"));
++               return NULL;
++       }
++
++       /* get boardtype and boardrev */
++       switch (BUSTYPE(si->bustype)) {
++       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);
++}
++
++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 (BUSTYPE(si->bustype)) {
++       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 = 0;
++
++               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);
++       }
++
++       if (!GOODCOREADDR(sbaddr))
++               return BADIDX;
++
++       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);
++}
++
++void *
++sb_osh(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return si->osh;
++}
++
++#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);
++}
++
 +/*
-+ * Misc useful os-independent macros and functions.
-+ *
-+ * Copyright 2006, 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.h,v 1.1.1.16 2006/04/08 06:13:39 honor Exp $
++ * Switch to 'coreidx', issue a single arbitrary 32bit register mask&set operation,
++ * switch back to the original core, and return the new value.
 + */
-+
-+#ifndef        _pktq_h_
-+#define        _pktq_h_
-+#include <osl.h>
-+
-+/* osl multi-precedence packet queue */
-+
-+#define PKTQ_LEN_DEFAULT        128    /* Max 128 packets */
-+#define PKTQ_MAX_PREC           16     /* Maximum precedence levels */
-+
-+struct pktq {
-+       struct pktq_prec {
-+               void *head;     /* first packet to dequeue */
-+               void *tail;     /* last packet to dequeue */
-+               uint16 len;     /* number of queued packets */
-+               uint16 max;     /* maximum number of queued packets */
-+       } q[PKTQ_MAX_PREC];
-+       uint16 num_prec;        /* number of precedences in use */
-+       uint16 hi_prec;         /* rapid dequeue hint (>= highest non-empty prec) */
-+       uint16 max;             /* total max packets */
-+       uint16 len;             /* total number of packets */
-+};
-+
-+#define PKTQ_PREC_ITER(pq, prec)        for (prec = (pq)->num_prec - 1; prec >= 0; prec--)
-+
-+/* forward definition of ether_addr structure used by some function prototypes */
-+
-+struct ether_addr;
-+
-+/* operations on a specific precedence in packet queue */
-+
-+#define pktq_psetmax(pq, prec, _max)    ((pq)->q[prec].max = (_max))
-+#define pktq_plen(pq, prec)             ((pq)->q[prec].len)
-+#define pktq_pavail(pq, prec)           ((pq)->q[prec].max - (pq)->q[prec].len)
-+#define pktq_pfull(pq, prec)            ((pq)->q[prec].len >= (pq)->q[prec].max)
-+#define pktq_pempty(pq, prec)           ((pq)->q[prec].len == 0)
-+
-+#define pktq_ppeek(pq, prec)            ((pq)->q[prec].head)
-+#define pktq_ppeek_tail(pq, prec)       ((pq)->q[prec].tail)
-+
-+extern void *pktq_penq(struct pktq *pq, int prec, void *p);
-+extern void *pktq_penq_head(struct pktq *pq, int prec, void *p);
-+extern void *pktq_pdeq(struct pktq *pq, int prec);
-+extern void *pktq_pdeq_tail(struct pktq *pq, int prec);
-+/* Empty the queue at particular precedence level */
-+extern void pktq_pflush(osl_t *osh, struct pktq *pq, int prec, bool dir);
-+/* Remove a specified packet from its queue */
-+extern bool pktq_pdel(struct pktq *pq, void *p, int prec);
-+
-+/* operations on a set of precedences in packet queue */
-+
-+extern int pktq_mlen(struct pktq *pq, uint prec_bmp);
-+extern void *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
-+
-+/* operations on packet queue as a whole */
-+
-+#define pktq_len(pq)                    ((int)(pq)->len)
-+#define pktq_max(pq)                    ((int)(pq)->max)
-+#define pktq_avail(pq)                  ((int)((pq)->max - (pq)->len))
-+#define pktq_full(pq)                   ((pq)->len >= (pq)->max)
-+#define pktq_empty(pq)                  ((pq)->len == 0)
-+
-+/* operations for single precedence queues */
-+#define pktenq(pq, p)          pktq_penq((pq), 0, (p))
-+#define pktenq_head(pq, p)     pktq_penq_head((pq), 0, (p))
-+#define pktdeq(pq)             pktq_pdeq((pq), 0)
-+#define pktdeq_tail(pq)                pktq_pdeq_tail((pq), 0)
-+
-+extern void pktq_init(struct pktq *pq, int num_prec, int max_len);
-+/* prec_out may be NULL if caller is not interested in return value */
-+extern void *pktq_deq(struct pktq *pq, int *prec_out);
-+extern void *pktq_deq_tail(struct pktq *pq, int *prec_out);
-+extern void *pktq_peek(struct pktq *pq, int *prec_out);
-+extern void *pktq_peek_tail(struct pktq *pq, int *prec_out);
-+extern void pktq_flush(osl_t *osh, struct pktq *pq, bool dir); /* Empty the entire queue */
-+
-+/* externs */
-+/* packet */
-+extern uint pktcopy(osl_t *osh, void *p, uint offset, int len, uchar *buf);
-+extern uint pkttotlen(osl_t *osh, void *p);
-+extern void *pktlast(osl_t *osh, void *p);
-+
-+extern void pktsetprio(void *pkt, bool update_vtag);
-+
-+#endif /* _pktq_h_ */
-diff -urN linux.old/drivers/net/wl/sbhnddma.h linux.dev/drivers/net/wl/sbhnddma.h
---- linux.old/drivers/net/wl/sbhnddma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/wl/sbhnddma.h 2006-04-28 02:20:47.000000000 +0200
-@@ -0,0 +1,284 @@
++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);
++
++       INTR_OFF(si, intr_val);
++
++       /* save current core index */
++       origidx = sb_coreidx(sbh);
++
++       /* switch core */
++       r = (uint32*) ((uchar*) 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 */
++       if (regoff >= SBCONFIGOFF)
++               w = R_SBREG(sbh, r);
++       else
++               w = R_REG(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
++BCMINITFN(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->pcmciaidx = si->gpioidx = BADIDX;
++       si->pcirev = si->pcmciarev = NOREV;
++
++       for (i = 0; i < si->numcores; i++) {
++               sb_setcoreidx(sbh, i);
++               si->coreid[i] = sb_coreid(sbh);
++
++               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;
++       } else
++               ASSERT(si->gpioidx != BADIDX);
++
++       /* 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 (BUSTYPE(si->bustype) == SB_BUS)
++               for (idx = 0; idx < SB_MAXCORES; idx++)
++                       if (si->regs[idx]) {
++                               REG_UNMAP(si->regs[idx]);
++                               si->regs[idx] = NULL;
++                       }
++
++       MFREE(si->osh, si, sizeof (sb_info_t));
++}
++
++/* use pci dev id to determine chip id for chips not having a chipcommon core */
++static uint
++BCMINITFN(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 == BCM4401_ENET_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
++BCMINITFN(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);
++}
++
++/* 
++ * this function changes logical "focus" to the indiciated core, 
++ * must be called with interrupt off.
++ * Moreover, callers should keep interrupts off during switching out of and back to d11 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->intrsenabled_fn == NULL) || !(*(si)->intrsenabled_fn)((si)->intr_arg));
++
++       sbaddr = SB_ENUM_BASE + (coreidx * SB_CORE_SIZE);
++
++       switch (BUSTYPE(si->bustype)) {
++       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);
++}
++
++/* 
++ * this function changes logical "focus" to the indiciated core, 
++ * must be called with interrupt off.
++ * Moreover, callers should keep interrupts off during switching out of and back to d11 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
++BCMINITFN(sb_chip)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->chip);
++}
++
++/* return chip revision number */
++uint
++BCMINITFN(sb_chiprev)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->chiprev);
++}
++
++/* return chip common revision number */
++uint
++BCMINITFN(sb_chipcrev)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->ccrev);
++}
++
++/* return chip package option */
++uint
++BCMINITFN(sb_chippkg)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->chippkg);
++}
++
++/* return PCI core rev. */
++uint
++BCMINITFN(sb_pcirev)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->pcirev);
++}
++
++/* return PCMCIA core rev. */
++uint
++BCMINITFN(sb_pcmciarev)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->pcmciarev);
++}
++
++/* return board vendor id */
++uint
++BCMINITFN(sb_boardvendor)(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->boardvendor);
++}
++
++/* return boardtype */
++uint
++BCMINITFN(sb_boardtype)(void *sbh)
++{
++       sb_info_t *si;
++       char *var;
++
++       si = SB_INFO(sbh);
++
++       if (BUSTYPE(si->bustype) == 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 bus type of sdh device */
++uint
++sb_bus(void *sbh)
++{
++       sb_info_t *si;
++
++       si = SB_INFO(sbh);
++       return (si->bustype);
++}
++
++/* 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);
++}
++
++
++/* do buffered registers update */
++void
++sb_commit(void *sbh)
++{
++       sb_info_t *si;
++       uint origidx;
++       uint intr_val = 0;
++
++       si = SB_INFO(sbh);
++
++       origidx = si->curidx;
++       ASSERT(GOODIDX(origidx));
++
++       INTR_OFF(si, intr_val);
++
++       /* switch over to chipcommon core if there is one, else use pci */
++       if (si->ccrev != NOREV) {
++               chipcregs_t *ccregs = (chipcregs_t *)sb_setcore(sbh, SB_CC, 0);
++
++               /* do the buffer registers update */
++               W_REG(&ccregs->broadcastaddress, SB_COMMIT);
++               W_REG(&ccregs->broadcastdata, 0x0);
++       } else if (si->pciidx != BADIDX) {
++               sbpciregs_t *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);
++       } else {
++               ASSERT((si->ccrev != NOREV) && (si->pciidx != BADIDX));
++       }
++
++       /* 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->pciidx == BADIDX) || (si->pcirev >= 5))
++               return;
++
++       ASSERT(GOODREGS(si->curmap));
++       sb = REGS2SB(si->curmap);
++
++       if (BUSTYPE(si->bustype) == 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);
++
++       /* if core is already in reset, just return */
++       if (R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_RESET)
++               return;
++
++       /* if clocks are not enabled, put into reset and return */
++       if ((R_SBREG(sbh, &sb->sbtmstatelow) & SBTML_CLK) == 0)
++               goto disable;
++
++       /* set the target reject bit and spin until busy is clear */
++       W_SBREG(sbh, &sb->sbtmstatelow, (SBTML_CLK | SBTML_REJ));
++       dummy = R_SBREG(sbh, &sb->sbtmstatelow);
++       OSL_DELAY(1);
++       SPINWAIT((R_SBREG(sbh, &sb->sbtmstatehigh) & SBTMH_BUSY), 100000);
++
++       if (R_SBREG(sbh, &sb->sbidlow) & SBIDL_INIT) {
++               OR_SBREG(sbh, &sb->sbimstate, SBIM_RJ);
++               dummy = R_SBREG(sbh, &sb->sbimstate);
++               OSL_DELAY(1);
++               SPINWAIT((R_SBREG(sbh, &sb->sbimstate) & SBIM_BY), 100000);
++       }
++
++       /* 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);
++
++       /* don't forget to clear the initiator reject bit */
++       if (R_SBREG(sbh, &sb->sbidlow) & SBIDL_INIT)
++               AND_SBREG(sbh, &sb->sbimstate, ~SBIM_RJ);
++
++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);
++       }
++
++}
++
++
 +/*
-+ * Generic Broadcom Home Networking Division (HND) DMA engine HW interface
-+ * This supports the following chips: BCM42xx, 44xx, 47xx .
-+ *
-+ * Copyright 2006, 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: sbhnddma.h,v 1.1.1.2 2006/02/27 03:43:16 honor Exp $
++ * 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.
 + */
-+
-+#ifndef        _sbhnddma_h_
-+#define        _sbhnddma_h_
-+
-+/* DMA structure:
-+ *  support two DMA engines: 32 bits address or 64 bit addressing
-+ *  basic DMA register set is per channel(transmit or receive)
-+ *  a pair of channels is defined for convenience
++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 (BUSTYPE(si->bustype) != PCI_BUS)
++               return;
++
++       ASSERT(si->pciidx != BADIDX);
++
++       /* 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 dma big window */
++       OR_REG(&pciregs->sbtopci2, (SBTOPCI_PREF|SBTOPCI_BURST));
++
++       /* enable read multiple for dma big window */
++       if (si->pcirev >= 11)
++               OR_REG(&pciregs->sbtopci2, SBTOPCI_RC_READMULTI);
++
++       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_TYPE6) {
++               if (m & CC_T6_MMASK)
++                       return CC_T6_M1;
++               else
++                       return CC_T6_M0;
++       } else if ((pll_type == PLL_TYPE1) ||
++                  (pll_type == PLL_TYPE3) ||
++                  (pll_type == PLL_TYPE4) ||
++                  (pll_type == PLL_TYPE7)) {
++               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_TYPE5) {
++               return (100000000);
++       } else
++               ASSERT((pll_type >= PLL_TYPE1) && (pll_type <= PLL_TYPE4));
++       /* PLL types 3 and 7 use BASE2 (25Mhz) */
++       if ((pll_type == PLL_TYPE3) ||
++           (pll_type == PLL_TYPE7)) { 
++               clock =  CC_CLOCK_BASE2 * n1 * n2;
++       }
++       else 
++               clock = CC_CLOCK_BASE1 * 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_TYPE3) ||
++           (pll_type == PLL_TYPE4) ||
++           (pll_type == PLL_TYPE7)) {
++               m1 = factor6(m1);
++               if ((pll_type == PLL_TYPE1) || (pll_type == PLL_TYPE3))
++                       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);
++               if (pll_type == PLL_TYPE6)
++                       m = R_REG(&cc->clockcontrol_mips);
++               else if ((pll_type == PLL_TYPE3) && (BCMINIT(sb_chip)(sbh) != BCM5365_DEVICE_ID))
++                       m = R_REG(&cc->clockcontrol_m2);
++               else
++                       m = R_REG(&cc->clockcontrol_sb);
++       } else {
++               INTR_RESTORE(si, intr_val);
++               return 0;
++       }
++
++       if (BCMINIT(sb_chip)(sbh) == BCM5365_DEVICE_ID) {
++               rate = 100000000;
++       } else {
++               /* calculate rate */
++               rate = sb_clock_rate(pll_type, n, m);
++               if (pll_type == PLL_TYPE3)
++                       rate = rate / 2;
++       }
++
++
++       /* 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 slow clock source.
++ * Three sources of SLOW CLOCK: LPO, Xtal, PCI
 + */
-+
-+
-+/* 32 bits addressing */
-+
-+/* dma registers per channel(xmt or rcv) */
-+typedef volatile struct {
-+       uint32  control;                /* enable, et al */
-+       uint32  addr;                   /* descriptor ring base address (4K aligned) */
-+       uint32  ptr;                    /* last descriptor posted to chip */
-+       uint32  status;                 /* current active descriptor, et al */
-+} dma32regs_t;
-+
-+typedef volatile struct {
-+       dma32regs_t     xmt;            /* dma tx channel */
-+       dma32regs_t     rcv;            /* dma rx channel */
-+} dma32regp_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 */
-+} dma32diag_t;
++static uint
++sb_slowclk_src(void *sbh)
++{
++       sb_info_t *si;
++       chipcregs_t *cc;
++       uint32 v;
++
++       si = SB_INFO(sbh);
++
++       ASSERT(sb_coreid(sbh) == SB_CC);
++
++       if (si->ccrev < 6) {
++               switch (BUSTYPE(si->bustype)) {
++                       case PCMCIA_BUS: return (SCC_SS_XTAL);
++                       case PCI_BUS:
++                               v = OSL_PCI_READ_CONFIG(si->osh, PCI_GPIO_OUT, sizeof (uint32));
++                               if (v & PCI_CFG_GPIO_SCS)
++                                       return (SCC_SS_PCI);
++                               else
++                                       return (SCC_SS_XTAL);
++                       default: return (SCC_SS_XTAL);
++               }
++       } else if (si->ccrev < 10) {
++               cc = (chipcregs_t*) sb_setcoreidx(sbh, si->curidx);
++               v = R_REG(&cc->slow_clk_ctl) & SCC_SS_MASK;
++               return (v);
++       } else {
++               return (SCC_SS_XTAL);
++       }
++}
 +
 +/*
-+ * DMA Descriptor
-+ * Descriptors are only read by the hardware, never written back.
++ * 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)
 + */
-+typedef volatile struct {
-+       uint32  ctrl;           /* misc control bits & bufcount */
-+       uint32  addr;           /* data buffer address */
-+} dma32dd_t;
-+
-+/*
-+ * Each descriptor ring must be 4096byte aligned, and fit within a single 4096byte page.
-+ */
-+#define        D32MAXRINGSZ    4096
-+#define        D32RINGALIGN    4096
-+#define        D32MAXDD        (D32MAXRINGSZ / sizeof (dma32dd_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 */
-+#define        XC_AE           ((uint32)3 << 16)       /* address extension bits */
-+#define        XC_AE_SHIFT     16
-+
-+/* 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_AD_MASK      0xfff00000              /* active descriptor */
-+#define        XS_AD_SHIFT     20
-+
-+/* 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 */
-+#define        RC_AE           ((uint32)3 << 16)       /* address extension bits */
-+#define        RC_AE_SHIFT     16
-+
-+/* 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 */
-+#define        RS_AD_MASK      0xfff00000              /* active descriptor */
-+#define        RS_AD_SHIFT     20
-+
-+/* 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 */
-+#define        FA_SEL_RSD      0xe0000                 /* receive frame status data */
-+#define        FA_SEL_RSP      0xf0000                 /* receive frame status pointers */
-+
-+/* descriptor control flags */
-+#define        CTRL_BC_MASK    0x1fff                  /* buffer byte count */
-+#define        CTRL_AE         ((uint32)3 << 16)       /* address extension bits */
-+#define        CTRL_AE_SHIFT   16
-+#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
-+
-+/* 64 bits addressing */
-+
-+/* dma registers per channel(xmt or rcv) */
-+typedef volatile struct {
-+       uint32  control;                /* enable, et al */
-+       uint32  ptr;                    /* last descriptor posted to chip */
-+       uint32  addrlow;                /* descriptor ring base address low 32-bits (8K aligned) */
-+       uint32  addrhigh;               /* descriptor ring base address bits 63:32 (8K aligned) */
-+       uint32  status0;                /* current descriptor, xmt state */
-+       uint32  status1;                /* active descriptor, xmt error */
-+} dma64regs_t;
-+
-+typedef volatile struct {
-+       dma64regs_t     tx;             /* dma64 tx channel */
-+       dma64regs_t     rx;             /* dma64 rx channel */
-+} dma64regp_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 */
-+} dma64diag_t;
-+
-+/*
-+ * DMA Descriptor
-+ * Descriptors are only read by the hardware, never written back.
-+ */
-+typedef volatile struct {
-+       uint32  ctrl1;          /* misc control bits & bufcount */
-+       uint32  ctrl2;          /* buffer count and address extension */
-+       uint32  addrlow;        /* memory address of the date buffer, bits 31:0 */
-+       uint32  addrhigh;       /* memory address of the date buffer, bits 63:32 */
-+} dma64dd_t;
-+
-+/*
-+ * Each descriptor ring must be 8kB aligned, and fit within a contiguous 8kB physical addresss.
-+ */
-+#define        D64MAXRINGSZ    8192
-+#define        D64RINGALIGN    8192
-+#define        D64MAXDD        (D64MAXRINGSZ / sizeof (dma64dd_t))
-+
-+/* transmit channel control */
-+#define        D64_XC_XE               0x00000001      /* transmit enable */
-+#define        D64_XC_SE               0x00000002      /* transmit suspend request */
-+#define        D64_XC_LE               0x00000004      /* loopback enable */
-+#define        D64_XC_FL               0x00000010      /* flush request */
-+#define        D64_XC_AE               0x00030000      /* address extension bits */
-+#define        D64_XC_AE_SHIFT         16
-+
-+/* transmit descriptor table pointer */
-+#define        D64_XP_LD_MASK          0x00000fff      /* last valid descriptor */
-+
-+/* transmit channel status */
-+#define        D64_XS0_CD_MASK         0x00001fff      /* current descriptor pointer */
-+#define        D64_XS0_XS_MASK         0xf0000000      /* transmit state */
-+#define        D64_XS0_XS_SHIFT                28
-+#define        D64_XS0_XS_DISABLED     0x00000000      /* disabled */
-+#define        D64_XS0_XS_ACTIVE       0x10000000      /* active */
-+#define        D64_XS0_XS_IDLE         0x20000000      /* idle wait */
-+#define        D64_XS0_XS_STOPPED      0x30000000      /* stopped */
-+#define        D64_XS0_XS_SUSP         0x40000000      /* suspend pending */
-+
-+#define        D64_XS1_AD_MASK         0x0001ffff      /* active descriptor */
-+#define        D64_XS1_XE_MASK         0xf0000000      /* transmit errors */
-+#define        D64_XS1_XE_SHIFT                28
-+#define        D64_XS1_XE_NOERR        0x00000000      /* no error */
-+#define        D64_XS1_XE_DPE          0x10000000      /* descriptor protocol error */
-+#define        D64_XS1_XE_DFU          0x20000000      /* data fifo underrun */
-+#define        D64_XS1_XE_DTE          0x30000000      /* data transfer error */
-+#define        D64_XS1_XE_DESRE        0x40000000      /* descriptor read error */
-+#define        D64_XS1_XE_COREE        0x50000000      /* core error */
-+
-+/* receive channel control */
-+#define        D64_RC_RE               0x00000001      /* receive enable */
-+#define        D64_RC_RO_MASK          0x000000fe      /* receive frame offset */
-+#define        D64_RC_RO_SHIFT         1
-+#define        D64_RC_FM               0x00000100      /* direct fifo receive (pio) mode */
-+#define        D64_RC_AE               0x00030000      /* address extension bits */
-+#define        D64_RC_AE_SHIFT         16
-+
-+/* receive descriptor table pointer */
-+#define        D64_RP_LD_MASK          0x00000fff      /* last valid descriptor */
-+
-+/* receive channel status */
-+#define        D64_RS0_CD_MASK         0x00001fff      /* current descriptor pointer */
-+#define        D64_RS0_RS_MASK         0xf0000000      /* receive state */
-+#define        D64_RS0_RS_SHIFT                28
-+#define        D64_RS0_RS_DISABLED     0x00000000      /* disabled */
-+#define        D64_RS0_RS_ACTIVE       0x10000000      /* active */
-+#define        D64_RS0_RS_IDLE         0x20000000      /* idle wait */
-+#define        D64_RS0_RS_STOPPED      0x30000000      /* stopped */
-+#define        D64_RS0_RS_SUSP         0x40000000      /* suspend pending */
-+
-+#define        D64_RS1_AD_MASK         0x0001ffff      /* active descriptor */
-+#define        D64_RS1_RE_MASK         0xf0000000      /* receive errors */
-+#define        D64_RS1_RE_SHIFT                28
-+#define        D64_RS1_RE_NOERR        0x00000000      /* no error */
-+#define        D64_RS1_RE_DPO          0x10000000      /* descriptor protocol error */
-+#define        D64_RS1_RE_DFU          0x20000000      /* data fifo overflow */
-+#define        D64_RS1_RE_DTE          0x30000000      /* data transfer error */
-+#define        D64_RS1_RE_DESRE        0x40000000      /* descriptor read error */
-+#define        D64_RS1_RE_COREE        0x50000000      /* core error */
-+
-+/* fifoaddr */
-+#define        D64_FA_OFF_MASK         0xffff          /* offset */
-+#define        D64_FA_SEL_MASK         0xf0000         /* select */
-+#define        D64_FA_SEL_SHIFT        16
-+#define        D64_FA_SEL_XDD          0x00000         /* transmit dma data */
-+#define        D64_FA_SEL_XDP          0x10000         /* transmit dma pointers */
-+#define        D64_FA_SEL_RDD          0x40000         /* receive dma data */
-+#define        D64_FA_SEL_RDP          0x50000         /* receive dma pointers */
-+#define        D64_FA_SEL_XFD          0x80000         /* transmit fifo data */
-+#define        D64_FA_SEL_XFP          0x90000         /* transmit fifo pointers */
-+#define        D64_FA_SEL_RFD          0xc0000         /* receive fifo data */
-+#define        D64_FA_SEL_RFP          0xd0000         /* receive fifo pointers */
-+#define        D64_FA_SEL_RSD          0xe0000         /* receive frame status data */
-+#define        D64_FA_SEL_RSP          0xf0000         /* receive frame status pointers */
-+
-+/* descriptor control flags 1 */
-+#define        D64_CTRL1_EOT           ((uint32)1 << 28)       /* end of descriptor table */
-+#define        D64_CTRL1_IOC           ((uint32)1 << 29)       /* interrupt on completion */
-+#define        D64_CTRL1_EOF           ((uint32)1 << 30)       /* end of frame */
-+#define        D64_CTRL1_SOF           ((uint32)1 << 31)       /* start of frame */
-+
-+/* descriptor control flags 2 */
-+#define        D64_CTRL2_BC_MASK       0x00007fff      /* buffer byte count mask */
-+#define        D64_CTRL2_AE            0x00030000      /* address extension bits */
-+#define        D64_CTRL2_AE_SHIFT      16
-+
-+/* control flags in the range [27:20] are core-specific and not defined here */
-+#define        D64_CTRL_CORE_MASK      0x0ff00000
-+
-+
-+#endif /* _sbhnddma_h_ */
-diff -urN linux.old/drivers/parport/Config.in linux.dev/drivers/parport/Config.in
---- linux.old/drivers/parport/Config.in 2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/drivers/parport/Config.in 2006-04-27 19:24:19.000000000 +0200
++static uint
++sb_slowclk_freq(void *sbh, bool max)
++{
++       sb_info_t *si;
++       chipcregs_t *cc;
++       uint32 slowclk;
++       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);
++
++       slowclk = sb_slowclk_src(sbh);
++       if (si->ccrev < 6) {
++               if (slowclk == SCC_SS_PCI)
++                       return (max? (PCIMAXFREQ/64) : (PCIMINFREQ/64));
++               else
++                       return (max? (XTALMAXFREQ/32) : (XTALMINFREQ/32));
++       } else if (si->ccrev < 10) {
++               div = 4 * (((R_REG(&cc->slow_clk_ctl) & SCC_CD_MASK) >> SCC_CD_SHF) + 1);
++               if (slowclk == SCC_SS_LPO)
++                       return (max? LPOMAXFREQ : LPOMINFREQ);
++               else if (slowclk == SCC_SS_XTAL)
++                       return (max? (XTALMAXFREQ/div) : (XTALMINFREQ/div));
++               else if (slowclk == SCC_SS_PCI)
++                       return (max? (PCIMAXFREQ/div) : (PCIMINFREQ/div));
++               else
++                       ASSERT(0);
++       } else {
++               /* Chipc rev 10 is InstaClock */
++               div = R_REG(&cc->system_clk_ctl) >> SYCC_CD_SHF;
++               div = 4 * (div + 1);
++               return (max ? XTALMAXFREQ : (XTALMINFREQ/div));
++       }
++       return (0);
++}
++
++static void
++sb_pwrctl_setdelay(void *sbh, void *chipcregs)
++{
++       sb_info_t *si;
++       chipcregs_t * cc;
++       uint slowmaxfreq, pll_delay, slowclk;
++       uint pll_on_delay, fref_sel_delay;
++
++       si = SB_INFO(sbh);
++       pll_delay = PLL_DELAY;
++
++       /* If the slow clock is not sourced by the xtal then add the xtal_on_delay
++        * since the xtal will also be powered down by dynamic power control logic.
++        */
++       slowclk = sb_slowclk_src(sbh);
++       if (slowclk != SCC_SS_XTAL)
++               pll_delay += XTAL_ON_DELAY;
++
++       /* Starting with 4318 it is ILP that is used for the delays */
++       slowmaxfreq = sb_slowclk_freq(sbh, (si->ccrev >= 10) ? FALSE : TRUE);
++
++       pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;
++       fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
++
++       cc = (chipcregs_t *)chipcregs;
++       W_REG(&cc->pll_on_delay, pll_on_delay);
++       W_REG(&cc->fref_sel_delay, fref_sel_delay);
++}
++
++/* set or get slow clock divider */
++int
++sb_pwrctl_slowclk(void *sbh, bool set, uint *div)
++{
++       sb_info_t *si;
++       uint origidx;
++       chipcregs_t *cc;
++       uint intr_val = 0;
++       uint err = 0;
++       
++       si = SB_INFO(sbh);
++
++       /* chipcommon cores prior to rev6 don't support slowclkcontrol */
++       if (si->ccrev < 6)
++               return 1;
++
++       /* chipcommon cores rev10 are a whole new ball game */
++       if (si->ccrev >= 10)
++               return 1;
++
++       if (set && ((*div % 4) || (*div < 4)))
++               return 2;
++       
++       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)) {
++               err = 3;
++               goto done;
++       }
++
++       if (set) {
++               SET_REG(&cc->slow_clk_ctl, SCC_CD_MASK, ((*div / 4 - 1) << SCC_CD_SHF));
++               sb_pwrctl_setdelay(sbh, (void *)cc);
++       } else
++               *div = 4 * (((R_REG(&cc->slow_clk_ctl) & SCC_CD_MASK) >> SCC_CD_SHF) + 1);
++
++done:
++       sb_setcoreidx(sbh, origidx);
++       INTR_RESTORE(si, intr_val);
++       return err;
++}
++
++/* initialize power control delay registers */
++void
++sb_pwrctl_init(void *sbh)
++{
++       sb_info_t *si;
++       uint origidx;
++       chipcregs_t *cc;
++
++       si = SB_INFO(sbh);
++
++       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;
++
++       /* 4317pc does not work with SlowClock less than 5Mhz */
++       if (BUSTYPE(si->bustype) == PCMCIA_BUS) {
++               if ((si->ccrev >= 6) && (si->ccrev < 10))
++                       SET_REG(&cc->slow_clk_ctl, SCC_CD_MASK, (SCC_DEF_DIV << SCC_CD_SHF));
++       }
++       
++       sb_pwrctl_setdelay(sbh, (void *)cc);
++
++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 (BUSTYPE(si->bustype) == 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 = sb_slowclk_freq(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);
++
++       switch (BUSTYPE(si->bustype)) {
++
++
++               case PCMCIA_BUS:
++                       return (0);
++
++
++               case PCI_BUS:
++
++                       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));
++
++                       /*
++                        * Avoid glitching the clock if GPRS is already using it.
++                        * 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(XTAL_ON_DELAY);
++                               }
++
++                               /* 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);
++                       }
++
++               default:
++                       return (-1);
++       }
++
++       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);
++
++       /* chipcommon cores rev10 are a whole new ball game */
++       if (si->ccrev >= 10)
++               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 ((BUSTYPE(si->bustype) == SDIO_BUS) || (BUSTYPE(si->bustype) == 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 *intrsenabled_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;
++       si->intrsenabled_fn = (sb_intrsenabled_t)intrsenabled_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.4.32/drivers/net/hnd/shared_ksyms.sh linux-2.4.32-freewrt/drivers/net/hnd/shared_ksyms.sh
+--- linux-2.4.32/drivers/net/hnd/shared_ksyms.sh        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/hnd/shared_ksyms.sh        2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,21 @@
++#!/bin/sh
++#
++# Copyright 2004, 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: shared_ksyms.sh,v 1.1 2005/03/16 13:50:00 wbx Exp $
++#
++
++cat <<EOF
++#include <linux/config.h>
++#include <linux/module.h>
++EOF
++
++for file in $* ; do
++    ${NM} $file | sed -ne 's/[0-9A-Fa-f]* [DT] \([^ ]*\)/extern void \1; EXPORT_SYMBOL(\1);/p'
++done
+diff -Nur linux-2.4.32/drivers/net/wireless/Config.in linux-2.4.32-freewrt/drivers/net/wireless/Config.in
+--- linux-2.4.32/drivers/net/wireless/Config.in 2004-11-17 12:54:21.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/wireless/Config.in 2006-07-02 21:58:25.000000000 +0200
+@@ -13,6 +13,7 @@
+ fi
+ 
+ if [ "$CONFIG_PCI" = "y" ]; then
++   dep_tristate '    Proprietary Broadcom BCM43xx 802.11 Wireless support' CONFIG_WL
+    dep_tristate '    Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)' CONFIG_PLX_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
+    dep_tristate '    Hermes in TMD7160/NCP130 based PCI adaptor support (Pheecom WL-PCI etc.) (EXPERIMENTAL)' CONFIG_TMD_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
+    dep_tristate '    Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)' CONFIG_PCI_HERMES $CONFIG_HERMES $CONFIG_EXPERIMENTAL
+diff -Nur linux-2.4.32/drivers/net/wl/Makefile linux-2.4.32-freewrt/drivers/net/wl/Makefile
+--- linux-2.4.32/drivers/net/wl/Makefile        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/net/wl/Makefile        2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,26 @@
++#
++# Makefile for the Broadcom wl driver
++#
++# Copyright 2004, 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: Makefile,v 1.2 2005/03/29 03:32:18 mbm Exp $
++
++EXTRA_CFLAGS += -I$(TOPDIR)/arch/mips/bcm947xx/include
++
++O_TARGET       := wl.o
++
++obj-y          := apsta_aeskeywrap.o apsta_aes.o apsta_bcmwpa.o apsta_d11ucode.o
++obj-y          += apsta_hmac.o apsta_md5.o apsta_passhash.o apsta_prf.o apsta_rc4.o
++obj-y          += apsta_rijndael-alg-fst.o apsta_sha1.o apsta_tkhash.o apsta_wlc_led.o
++obj-y          += apsta_wlc_phy.o apsta_wlc_rate.o apsta_wlc_security.o 
++obj-y          += apsta_wlc_sup.o apsta_wlc_wet.o apsta_wl_linux.o apsta_wlc.o
++
++obj-m          := $(O_TARGET)
++
++include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.32/drivers/parport/Config.in linux-2.4.32-freewrt/drivers/parport/Config.in
+--- linux-2.4.32/drivers/parport/Config.in      2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/parport/Config.in      2006-07-02 21:58:25.000000000 +0200
 @@ -11,6 +11,7 @@
  tristate 'Parallel port support' CONFIG_PARPORT
@@ -19538 +14383 @@
        if [ "$CONFIG_SERIAL" = "m" ]; then
           define_tristate CONFIG_PARPORT_PC_CML1 m
-diff -urN linux.old/drivers/parport/Makefile linux.dev/drivers/parport/Makefile
---- linux.old/drivers/parport/Makefile  2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/drivers/parport/Makefile  2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/drivers/parport/Makefile linux-2.4.32-freewrt/drivers/parport/Makefile
+--- linux-2.4.32/drivers/parport/Makefile       2004-08-08 01:26:05.000000000 +0200
++++ linux-2.4.32-freewrt/drivers/parport/Makefile       2006-07-02 21:58:25.000000000 +0200
 @@ -22,6 +22,7 @@
  
@@ -19549 +14394 @@
  obj-$(CONFIG_PARPORT_AMIGA)    += parport_amiga.o
  obj-$(CONFIG_PARPORT_MFC3)     += parport_mfc3.o
-diff -urN linux.old/drivers/parport/parport_splink.c linux.dev/drivers/parport/parport_splink.c
---- linux.old/drivers/parport/parport_splink.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/parport/parport_splink.c  2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/drivers/parport/parport_splink.c linux-2.4.32-freewrt/drivers/parport/parport_splink.c
+--- linux-2.4.32/drivers/parport/parport_splink.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/parport/parport_splink.c       2006-07-02 21:58:25.000000000 +0200
 @@ -0,0 +1,345 @@
 +/* Low-level parallel port routines for the ASUS WL-500g built-in port
@@ -19898 +14743 @@
 +module_exit(parport_splink_cleanup)
 +
-diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
---- linux.old/include/asm-mips/bootinfo.h       2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/include/asm-mips/bootinfo.h       2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/drivers/pcmcia/Makefile linux-2.4.32-freewrt/drivers/pcmcia/Makefile
+--- linux-2.4.32/drivers/pcmcia/Makefile        2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/pcmcia/Makefile        2006-07-02 21:58:25.000000000 +0200
+@@ -65,6 +65,10 @@
+ au1000_ss-objs-$(CONFIG_PCMCIA_DB1X00)         += au1000_db1x00.o
+ au1000_ss-objs-$(CONFIG_PCMCIA_XXS1500)        += au1000_xxs1500.o
+ 
++obj-$(CONFIG_PCMCIA_BCM4710)   += bcm4710_ss.o
++bcm4710_ss-objs                                        := bcm4710_generic.o
++bcm4710_ss-objs                                        += bcm4710_pcmcia.o
++
+ obj-$(CONFIG_PCMCIA_SA1100)    += sa1100_cs.o
+ obj-$(CONFIG_PCMCIA_M8XX)      += m8xx_pcmcia.o
+ obj-$(CONFIG_PCMCIA_SIBYTE)    += sibyte_generic.o
+@@ -102,5 +106,8 @@
+ au1x00_ss.o: $(au1000_ss-objs-y)
+        $(LD) -r -o $@ $(au1000_ss-objs-y)
+ 
++bcm4710_ss.o: $(bcm4710_ss-objs)
++       $(LD) -r -o $@ $(bcm4710_ss-objs)
++
+ yenta_socket.o: $(yenta_socket-objs)
+        $(LD) $(LD_RFLAG) -r -o $@ $(yenta_socket-objs)
+diff -Nur linux-2.4.32/drivers/pcmcia/bcm4710_generic.c linux-2.4.32-freewrt/drivers/pcmcia/bcm4710_generic.c
+--- linux-2.4.32/drivers/pcmcia/bcm4710_generic.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/pcmcia/bcm4710_generic.c       2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,912 @@
++/*
++ *
++ * bcm47xx pcmcia driver
++ *
++ * Copyright 2004, 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.
++ *
++ * Based on sa1100_generic.c from www.handhelds.org,
++ *     and au1000_generic.c from oss.sgi.com.
++ *
++ * $Id: bcm4710_generic.c,v 1.1 2005/03/16 13:50:00 wbx Exp $
++ */
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/config.h>
++#include <linux/delay.h>
++#include <linux/ioport.h>
++#include <linux/kernel.h>
++#include <linux/tqueue.h>
++#include <linux/timer.h>
++#include <linux/mm.h>
++#include <linux/proc_fs.h>
++#include <linux/version.h>
++#include <linux/types.h>
++#include <linux/vmalloc.h>
++
++#include <pcmcia/version.h>
++#include <pcmcia/cs_types.h>
++#include <pcmcia/cs.h>
++#include <pcmcia/ss.h>
++#include <pcmcia/bulkmem.h>
++#include <pcmcia/cistpl.h>
++#include <pcmcia/bus_ops.h>
++#include "cs_internal.h"
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/system.h>
++
++#include <typedefs.h>
++#include <bcm4710.h>
++#include <sbextif.h>
++
++#include "bcm4710pcmcia.h"
++
++#ifdef PCMCIA_DEBUG
++static int pc_debug = PCMCIA_DEBUG;
++#endif
++
++MODULE_DESCRIPTION("Linux PCMCIA Card Services: bcm47xx Socket Controller");
++
++/* This structure maintains housekeeping state for each socket, such
++ * as the last known values of the card detect pins, or the Card Services
++ * callback value associated with the socket:
++ */
++static struct bcm47xx_pcmcia_socket *pcmcia_socket;
++static int socket_count;
++
++
++/* Returned by the low-level PCMCIA interface: */
++static struct pcmcia_low_level *pcmcia_low_level;
++
++/* Event poll timer structure */
++static struct timer_list poll_timer;
++
++
++/* Prototypes for routines which are used internally: */
++
++static int  bcm47xx_pcmcia_driver_init(void);
++static void bcm47xx_pcmcia_driver_shutdown(void);
++static void bcm47xx_pcmcia_task_handler(void *data);
++static void bcm47xx_pcmcia_poll_event(unsigned long data);
++static void bcm47xx_pcmcia_interrupt(int irq, void *dev, struct pt_regs *regs);
++static struct tq_struct bcm47xx_pcmcia_task;
++
++#ifdef CONFIG_PROC_FS
++static int bcm47xx_pcmcia_proc_status(char *buf, char **start, 
++               off_t pos, int count, int *eof, void *data);
++#endif
++
++
++/* Prototypes for operations which are exported to the
++ * in-kernel PCMCIA core:
++ */
++
++static int bcm47xx_pcmcia_init(unsigned int sock);
++static int bcm47xx_pcmcia_suspend(unsigned int sock);
++static int bcm47xx_pcmcia_register_callback(unsigned int sock, 
++               void (*handler)(void *, unsigned int), void *info);
++static int bcm47xx_pcmcia_inquire_socket(unsigned int sock, socket_cap_t *cap);
++static int bcm47xx_pcmcia_get_status(unsigned int sock, u_int *value);
++static int bcm47xx_pcmcia_get_socket(unsigned int sock, socket_state_t *state);
++static int bcm47xx_pcmcia_set_socket(unsigned int sock, socket_state_t *state);
++static int bcm47xx_pcmcia_get_io_map(unsigned int sock, struct pccard_io_map *io);
++static int bcm47xx_pcmcia_set_io_map(unsigned int sock, struct pccard_io_map *io);
++static int bcm47xx_pcmcia_get_mem_map(unsigned int sock, struct pccard_mem_map *mem);
++static int bcm47xx_pcmcia_set_mem_map(unsigned int sock, struct pccard_mem_map *mem);
++#ifdef CONFIG_PROC_FS
++static void bcm47xx_pcmcia_proc_setup(unsigned int sock, struct proc_dir_entry *base);
++#endif
++
++static struct pccard_operations bcm47xx_pcmcia_operations = {
++       bcm47xx_pcmcia_init,
++       bcm47xx_pcmcia_suspend,
++       bcm47xx_pcmcia_register_callback,
++       bcm47xx_pcmcia_inquire_socket,
++       bcm47xx_pcmcia_get_status,
++       bcm47xx_pcmcia_get_socket,
++       bcm47xx_pcmcia_set_socket,
++       bcm47xx_pcmcia_get_io_map,
++       bcm47xx_pcmcia_set_io_map,
++       bcm47xx_pcmcia_get_mem_map,
++       bcm47xx_pcmcia_set_mem_map,
++#ifdef CONFIG_PROC_FS
++       bcm47xx_pcmcia_proc_setup
++#endif
++};
++
++
++/*
++ * bcm47xx_pcmcia_driver_init()
++ *
++ * This routine performs a basic sanity check to ensure that this
++ * kernel has been built with the appropriate board-specific low-level
++ * PCMCIA support, performs low-level PCMCIA initialization, registers
++ * this socket driver with Card Services, and then spawns the daemon
++ * thread which is the real workhorse of the socket driver.
++ *
++ * Please see linux/Documentation/arm/SA1100/PCMCIA for more information
++ * on the low-level kernel interface.
++ *
++ * Returns: 0 on success, -1 on error
++ */
++static int __init bcm47xx_pcmcia_driver_init(void)
++{
++       servinfo_t info;
++       struct pcmcia_init pcmcia_init;
++       struct pcmcia_state state;
++       unsigned int i;
++       unsigned long tmp;
++
++
++       printk("\nBCM47XX PCMCIA (CS release %s)\n", CS_RELEASE);
++
++       CardServices(GetCardServicesInfo, &info);
++
++       if (info.Revision != CS_RELEASE_CODE) {
++               printk(KERN_ERR "Card Services release codes do not match\n");
++               return -1;
++       }
++
++#ifdef CONFIG_BCM4710
++       pcmcia_low_level=&bcm4710_pcmcia_ops;
++#else
++#error Unsupported Broadcom BCM47XX board.
++#endif
++
++       pcmcia_init.handler=bcm47xx_pcmcia_interrupt;
++
++       if ((socket_count = pcmcia_low_level->init(&pcmcia_init)) < 0) {
++               printk(KERN_ERR "Unable to initialize PCMCIA service.\n");
++               return -EIO;
++       } else {
++               printk("\t%d PCMCIA sockets initialized.\n", socket_count);
++       }
++
++       pcmcia_socket = 
++               kmalloc(sizeof(struct bcm47xx_pcmcia_socket) * socket_count, 
++                               GFP_KERNEL);
++       memset(pcmcia_socket, 0, 
++                       sizeof(struct bcm47xx_pcmcia_socket) * socket_count);
++       if (!pcmcia_socket) {
++               printk(KERN_ERR "Card Services can't get memory \n");
++               return -1;
++       }
++                       
++       for (i = 0; i < socket_count; i++) {
++               if (pcmcia_low_level->socket_state(i, &state) < 0) {
++                       printk(KERN_ERR "Unable to get PCMCIA status\n");
++                       return -EIO;
++               }
++               pcmcia_socket[i].k_state = state;
++               pcmcia_socket[i].cs_state.csc_mask = SS_DETECT;
++               
++               if (i == 0) {
++                       pcmcia_socket[i].virt_io =
++                               (unsigned long)ioremap_nocache(EXTIF_PCMCIA_IOBASE(BCM4710_EXTIF), 0x1000);
++                       /* Substract ioport base which gets added by in/out */
++                       pcmcia_socket[i].virt_io -= mips_io_port_base;
++                       pcmcia_socket[i].phys_attr =
++                               (unsigned long)EXTIF_PCMCIA_CFGBASE(BCM4710_EXTIF);
++                       pcmcia_socket[i].phys_mem =
++                               (unsigned long)EXTIF_PCMCIA_MEMBASE(BCM4710_EXTIF);
++               } else  {
++                       printk(KERN_ERR "bcm4710: socket 1 not supported\n");
++                       return 1;
++               }
++       }
++
++       /* Only advertise as many sockets as we can detect: */
++       if (register_ss_entry(socket_count, &bcm47xx_pcmcia_operations) < 0) {
++               printk(KERN_ERR "Unable to register socket service routine\n");
++               return -ENXIO;
++       }
++
++       /* Start the event poll timer.  
++        * It will reschedule by itself afterwards. 
++        */
++       bcm47xx_pcmcia_poll_event(0);
++
++       DEBUG(1, "bcm4710: initialization complete\n");
++       return 0;
++
++}
++
++module_init(bcm47xx_pcmcia_driver_init);
++
++
++/*
++ * bcm47xx_pcmcia_driver_shutdown()
++ *
++ * Invokes the low-level kernel service to free IRQs associated with this
++ * socket controller and reset GPIO edge detection.
++ */
++static void __exit bcm47xx_pcmcia_driver_shutdown(void)
++{
++       int i;
++
++       del_timer_sync(&poll_timer);
++       unregister_ss_entry(&bcm47xx_pcmcia_operations);
++       pcmcia_low_level->shutdown();
++       flush_scheduled_tasks();
++       for (i = 0; i < socket_count; i++) {
++               if (pcmcia_socket[i].virt_io) 
++                       iounmap((void *)pcmcia_socket[i].virt_io);
++               if (pcmcia_socket[i].phys_attr) 
++                       iounmap((void *)pcmcia_socket[i].phys_attr);
++               if (pcmcia_socket[i].phys_mem) 
++                       iounmap((void *)pcmcia_socket[i].phys_mem);
++       }
++       DEBUG(1, "bcm4710: shutdown complete\n");
++}
++
++module_exit(bcm47xx_pcmcia_driver_shutdown);
++
++/*
++ * bcm47xx_pcmcia_init()
++ * We perform all of the interesting initialization tasks in 
++ * bcm47xx_pcmcia_driver_init().
++ *
++ * Returns: 0
++ */
++static int bcm47xx_pcmcia_init(unsigned int sock)
++{
++       DEBUG(1, "%s(): initializing socket %u\n", __FUNCTION__, sock);
++
++       return 0;
++}
++
++/*
++ * bcm47xx_pcmcia_suspend()
++ *
++ * We don't currently perform any actions on a suspend.
++ *
++ * Returns: 0
++ */
++static int bcm47xx_pcmcia_suspend(unsigned int sock)
++{
++       DEBUG(1, "%s(): suspending socket %u\n", __FUNCTION__, sock);
++
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_events()
++ *
++ * Helper routine to generate a Card Services event mask based on
++ * state information obtained from the kernel low-level PCMCIA layer
++ * in a recent (and previous) sampling. Updates `prev_state'.
++ *
++ * Returns: an event mask for the given socket state.
++ */
++static inline unsigned 
++bcm47xx_pcmcia_events(struct pcmcia_state *state, 
++               struct pcmcia_state *prev_state, 
++               unsigned int mask, unsigned int flags)
++{
++       unsigned int events=0;
++
++       if (state->bvd1 != prev_state->bvd1) {
++
++               DEBUG(3, "%s(): card BVD1 value %u\n", __FUNCTION__, state->bvd1);
++
++               events |= mask & (flags & SS_IOCARD) ? SS_STSCHG : SS_BATDEAD;
++       }
++
++       if (state->bvd2 != prev_state->bvd2) {
++
++               DEBUG(3, "%s(): card BVD2 value %u\n", __FUNCTION__, state->bvd2);
++
++               events |= mask & (flags & SS_IOCARD) ? 0 : SS_BATWARN;
++       }
++
++       if (state->detect != prev_state->detect) {
++
++               DEBUG(3, "%s(): card detect value %u\n", __FUNCTION__, state->detect);
++
++               events |= mask & SS_DETECT;
++       }
++
++
++       if (state->ready != prev_state->ready) {
++
++               DEBUG(3, "%s(): card ready value %u\n", __FUNCTION__, state->ready);
++
++               events |= mask & ((flags & SS_IOCARD) ? 0 : SS_READY);
++       }
++
++       if (events != 0) {
++               DEBUG(2, "events: %s%s%s%s%s\n",
++                     (events & SS_DETECT) ? "DETECT " : "",
++                     (events & SS_READY) ? "READY " : "",
++                     (events & SS_BATDEAD) ? "BATDEAD " : "",
++                     (events & SS_BATWARN) ? "BATWARN " : "",
++                     (events & SS_STSCHG) ? "STSCHG " : "");
++       }
++
++       *prev_state=*state;
++       return events;
++}
++
++
++/* 
++ * bcm47xx_pcmcia_task_handler()
++ *
++ * Processes serviceable socket events using the "eventd" thread context.
++ *
++ * Event processing (specifically, the invocation of the Card Services event
++ * callback) occurs in this thread rather than in the actual interrupt
++ * handler due to the use of scheduling operations in the PCMCIA core.
++ */
++static void bcm47xx_pcmcia_task_handler(void *data) 
++{
++       struct pcmcia_state state;
++       int i, events, irq_status;
++
++       DEBUG(4, "%s(): entering PCMCIA monitoring thread\n", __FUNCTION__);
++
++       for (i = 0; i < socket_count; i++)  {
++               if ((irq_status = pcmcia_low_level->socket_state(i, &state)) < 0)
++                       printk(KERN_ERR "Error in kernel low-level PCMCIA service.\n");
++
++               events = bcm47xx_pcmcia_events(&state, 
++                                              &pcmcia_socket[i].k_state, 
++                                              pcmcia_socket[i].cs_state.csc_mask, 
++                                              pcmcia_socket[i].cs_state.flags);
++
++               if (pcmcia_socket[i].handler != NULL) {
++                       pcmcia_socket[i].handler(pcmcia_socket[i].handler_info,
++                                                events);
++               }
++       }
++}
++
++static struct tq_struct bcm47xx_pcmcia_task = {
++       routine: bcm47xx_pcmcia_task_handler
++};
++
++
++/*
++ * bcm47xx_pcmcia_poll_event()
++ *
++ * Let's poll for events in addition to IRQs since IRQ only is unreliable...
++ */
++static void bcm47xx_pcmcia_poll_event(unsigned long dummy)
++{
++       DEBUG(4, "%s(): polling for events\n", __FUNCTION__);
++
++       poll_timer.function = bcm47xx_pcmcia_poll_event;
++       poll_timer.expires = jiffies + BCM47XX_PCMCIA_POLL_PERIOD;
++       add_timer(&poll_timer);
++       schedule_task(&bcm47xx_pcmcia_task);
++}
++
++
++/* 
++ * bcm47xx_pcmcia_interrupt()
++ *
++ * Service routine for socket driver interrupts (requested by the
++ * low-level PCMCIA init() operation via bcm47xx_pcmcia_thread()).
++ *
++ * The actual interrupt-servicing work is performed by
++ * bcm47xx_pcmcia_task(), largely because the Card Services event-
++ * handling code performs scheduling operations which cannot be
++ * executed from within an interrupt context.
++ */
++static void 
++bcm47xx_pcmcia_interrupt(int irq, void *dev, struct pt_regs *regs)
++{
++       DEBUG(3, "%s(): servicing IRQ %d\n", __FUNCTION__, irq);
++       schedule_task(&bcm47xx_pcmcia_task);
++}
++
++
++/*
++ * bcm47xx_pcmcia_register_callback()
++ *
++ * Implements the register_callback() operation for the in-kernel
++ * PCMCIA service (formerly SS_RegisterCallback in Card Services). If 
++ * the function pointer `handler' is not NULL, remember the callback 
++ * location in the state for `sock', and increment the usage counter 
++ * for the driver module. (The callback is invoked from the interrupt
++ * service routine, bcm47xx_pcmcia_interrupt(), to notify Card Services
++ * of interesting events.) Otherwise, clear the callback pointer in the
++ * socket state and decrement the module usage count.
++ *
++ * Returns: 0
++ */
++static int 
++bcm47xx_pcmcia_register_callback(unsigned int sock, 
++               void (*handler)(void *, unsigned int), void *info)
++{
++       if (handler == NULL) {
++               pcmcia_socket[sock].handler = NULL;
++               MOD_DEC_USE_COUNT;
++       } else {
++               MOD_INC_USE_COUNT;
++               pcmcia_socket[sock].handler = handler;
++               pcmcia_socket[sock].handler_info = info;
++       }
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_inquire_socket()
++ *
++ * Implements the inquire_socket() operation for the in-kernel PCMCIA
++ * service (formerly SS_InquireSocket in Card Services). Of note is
++ * the setting of the SS_CAP_PAGE_REGS bit in the `features' field of
++ * `cap' to "trick" Card Services into tolerating large "I/O memory" 
++ * addresses. Also set is SS_CAP_STATIC_MAP, which disables the memory
++ * resource database check. (Mapped memory is set up within the socket
++ * driver itself.)
++ *
++ * In conjunction with the STATIC_MAP capability is a new field,
++ * `io_offset', recommended by David Hinds. Rather than go through
++ * the SetIOMap interface (which is not quite suited for communicating
++ * window locations up from the socket driver), we just pass up
++ * an offset which is applied to client-requested base I/O addresses
++ * in alloc_io_space().
++ *
++ * Returns: 0 on success, -1 if no pin has been configured for `sock'
++ */
++static int
++bcm47xx_pcmcia_inquire_socket(unsigned int sock, socket_cap_t *cap)
++{
++       struct pcmcia_irq_info irq_info;
++
++       if (sock >= socket_count) {
++               printk(KERN_ERR "bcm47xx: socket %u not configured\n", sock);
++               return -1;
++       }
++
++       /* SS_CAP_PAGE_REGS: used by setup_cis_mem() in cistpl.c to set the
++        *   force_low argument to validate_mem() in rsrc_mgr.c -- since in
++        *   general, the mapped * addresses of the PCMCIA memory regions
++        *   will not be within 0xffff, setting force_low would be
++        *   undesirable.
++        *
++        * SS_CAP_STATIC_MAP: don't bother with the (user-configured) memory
++        *   resource database; we instead pass up physical address ranges
++        *   and allow other parts of Card Services to deal with remapping.
++        *
++        * SS_CAP_PCCARD: we can deal with 16-bit PCMCIA & CF cards, but
++        *   not 32-bit CardBus devices.
++        */
++       cap->features = (SS_CAP_PAGE_REGS  | SS_CAP_STATIC_MAP | SS_CAP_PCCARD);
++
++       irq_info.sock = sock;
++       irq_info.irq = -1;
++
++       if (pcmcia_low_level->get_irq_info(&irq_info) < 0) {
++               printk(KERN_ERR "Error obtaining IRQ info socket %u\n", sock);
++               return -1;
++       }
++
++       cap->irq_mask = 0;
++       cap->map_size = PAGE_SIZE;
++       cap->pci_irq = irq_info.irq;
++       cap->io_offset = pcmcia_socket[sock].virt_io;
++
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_get_status()
++ *
++ * Implements the get_status() operation for the in-kernel PCMCIA
++ * service (formerly SS_GetStatus in Card Services). Essentially just
++ * fills in bits in `status' according to internal driver state or
++ * the value of the voltage detect chipselect register.
++ *
++ * As a debugging note, during card startup, the PCMCIA core issues
++ * three set_socket() commands in a row the first with RESET deasserted,
++ * the second with RESET asserted, and the last with RESET deasserted
++ * again. Following the third set_socket(), a get_status() command will
++ * be issued. The kernel is looking for the SS_READY flag (see
++ * setup_socket(), reset_socket(), and unreset_socket() in cs.c).
++ *
++ * Returns: 0
++ */
++static int 
++bcm47xx_pcmcia_get_status(unsigned int sock, unsigned int *status)
++{
++       struct pcmcia_state state;
++
++
++       if ((pcmcia_low_level->socket_state(sock, &state)) < 0) {
++               printk(KERN_ERR "Unable to get PCMCIA status from kernel.\n");
++               return -1;
++       }
++
++       pcmcia_socket[sock].k_state = state;
++
++       *status = state.detect ? SS_DETECT : 0;
++
++       *status |= state.ready ? SS_READY : 0;
++
++       /* The power status of individual sockets is not available
++        * explicitly from the hardware, so we just remember the state
++        * and regurgitate it upon request:
++        */
++       *status |= pcmcia_socket[sock].cs_state.Vcc ? SS_POWERON : 0;
++
++       if (pcmcia_socket[sock].cs_state.flags & SS_IOCARD)
++               *status |= state.bvd1 ? SS_STSCHG : 0;
++       else {
++               if (state.bvd1 == 0)
++                       *status |= SS_BATDEAD;
++               else if (state.bvd2 == 0)
++                       *status |= SS_BATWARN;
++       }
++
++       *status |= state.vs_3v ? SS_3VCARD : 0;
++
++       *status |= state.vs_Xv ? SS_XVCARD : 0;
++
++       DEBUG(2, "\tstatus: %s%s%s%s%s%s%s%s\n",
++             (*status&SS_DETECT)?"DETECT ":"",
++             (*status&SS_READY)?"READY ":"", 
++             (*status&SS_BATDEAD)?"BATDEAD ":"",
++             (*status&SS_BATWARN)?"BATWARN ":"",
++             (*status&SS_POWERON)?"POWERON ":"",
++             (*status&SS_STSCHG)?"STSCHG ":"",
++             (*status&SS_3VCARD)?"3VCARD ":"",
++             (*status&SS_XVCARD)?"XVCARD ":"");
++
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_get_socket()
++ *
++ * Implements the get_socket() operation for the in-kernel PCMCIA
++ * service (formerly SS_GetSocket in Card Services). Not a very 
++ * exciting routine.
++ *
++ * Returns: 0
++ */
++static int 
++bcm47xx_pcmcia_get_socket(unsigned int sock, socket_state_t *state)
++{
++       DEBUG(2, "%s() for sock %u\n", __FUNCTION__, sock);
++
++       /* This information was given to us in an earlier call to set_socket(),
++        * so we're just regurgitating it here:
++        */
++       *state = pcmcia_socket[sock].cs_state;
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_set_socket()
++ *
++ * Implements the set_socket() operation for the in-kernel PCMCIA
++ * service (formerly SS_SetSocket in Card Services). We more or
++ * less punt all of this work and let the kernel handle the details
++ * of power configuration, reset, &c. We also record the value of
++ * `state' in order to regurgitate it to the PCMCIA core later.
++ *
++ * Returns: 0
++ */
++static int 
++bcm47xx_pcmcia_set_socket(unsigned int sock, socket_state_t *state)
++{
++       struct pcmcia_configure configure;
++
++       DEBUG(2, "\tmask:  %s%s%s%s%s%s\n\tflags: %s%s%s%s%s%s\n"
++             "\tVcc %d  Vpp %d  irq %d\n",
++             (state->csc_mask == 0) ? "<NONE>" : "",
++             (state->csc_mask & SS_DETECT) ? "DETECT " : "",
++             (state->csc_mask & SS_READY) ? "READY " : "",
++             (state->csc_mask & SS_BATDEAD) ? "BATDEAD " : "",
++             (state->csc_mask & SS_BATWARN) ? "BATWARN " : "",
++             (state->csc_mask & SS_STSCHG) ? "STSCHG " : "",
++             (state->flags == 0) ? "<NONE>" : "",
++             (state->flags & SS_PWR_AUTO) ? "PWR_AUTO " : "",
++             (state->flags & SS_IOCARD) ? "IOCARD " : "",
++             (state->flags & SS_RESET) ? "RESET " : "",
++             (state->flags & SS_SPKR_ENA) ? "SPKR_ENA " : "",
++             (state->flags & SS_OUTPUT_ENA) ? "OUTPUT_ENA " : "",
++             state->Vcc, state->Vpp, state->io_irq);
++
++       configure.sock = sock;
++       configure.vcc = state->Vcc;
++       configure.vpp = state->Vpp;
++       configure.output = (state->flags & SS_OUTPUT_ENA) ? 1 : 0;
++       configure.speaker = (state->flags & SS_SPKR_ENA) ? 1 : 0;
++       configure.reset = (state->flags & SS_RESET) ? 1 : 0;
++
++       if (pcmcia_low_level->configure_socket(&configure) < 0) {
++               printk(KERN_ERR "Unable to configure socket %u\n", sock);
++               return -1;
++       }
++
++       pcmcia_socket[sock].cs_state = *state;
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_get_io_map()
++ *
++ * Implements the get_io_map() operation for the in-kernel PCMCIA
++ * service (formerly SS_GetIOMap in Card Services). Just returns an
++ * I/O map descriptor which was assigned earlier by a set_io_map().
++ *
++ * Returns: 0 on success, -1 if the map index was out of range
++ */
++static int 
++bcm47xx_pcmcia_get_io_map(unsigned int sock, struct pccard_io_map *map)
++{
++       DEBUG(2, "bcm47xx_pcmcia_get_io_map: sock %d\n", sock);
++
++       if (map->map >= MAX_IO_WIN) {
++               printk(KERN_ERR "%s(): map (%d) out of range\n", 
++                      __FUNCTION__, map->map);
++               return -1;
++       }
++
++       *map = pcmcia_socket[sock].io_map[map->map];
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_set_io_map()
++ *
++ * Implements the set_io_map() operation for the in-kernel PCMCIA
++ * service (formerly SS_SetIOMap in Card Services). We configure
++ * the map speed as requested, but override the address ranges
++ * supplied by Card Services.
++ *
++ * Returns: 0 on success, -1 on error
++ */
++int 
++bcm47xx_pcmcia_set_io_map(unsigned int sock, struct pccard_io_map *map)
++{
++       unsigned int speed;
++       unsigned long start;
++
++       DEBUG(2, "\tmap %u  speed %u\n\tstart 0x%08lx  stop 0x%08lx\n"
++             "\tflags: %s%s%s%s%s%s%s%s\n",
++             map->map, map->speed, map->start, map->stop,
++             (map->flags == 0) ? "<NONE>" : "",
++             (map->flags & MAP_ACTIVE) ? "ACTIVE " : "",
++             (map->flags & MAP_16BIT) ? "16BIT " : "",
++             (map->flags & MAP_AUTOSZ) ? "AUTOSZ " : "",
++             (map->flags & MAP_0WS) ? "0WS " : "",
++             (map->flags & MAP_WRPROT) ? "WRPROT " : "",
++             (map->flags & MAP_USE_WAIT) ? "USE_WAIT " : "",
++             (map->flags & MAP_PREFETCH) ? "PREFETCH " : "");
++
++       if (map->map >= MAX_IO_WIN) {
++               printk(KERN_ERR "%s(): map (%d) out of range\n", 
++                               __FUNCTION__, map->map);
++               return -1;
++       }
++
++       if (map->flags & MAP_ACTIVE) {
++               speed = (map->speed > 0) ? map->speed : BCM47XX_PCMCIA_IO_SPEED;
++               pcmcia_socket[sock].speed_io = speed;
++       }
++
++       start = map->start;
++
++       if (map->stop == 1) {
++               map->stop = PAGE_SIZE - 1;
++       }
++
++       map->start = pcmcia_socket[sock].virt_io;
++       map->stop = map->start + (map->stop - start);
++       pcmcia_socket[sock].io_map[map->map] = *map;
++       DEBUG(2, "set_io_map %d start %x stop %x\n", 
++             map->map, map->start, map->stop);
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_get_mem_map()
++ *
++ * Implements the get_mem_map() operation for the in-kernel PCMCIA
++ * service (formerly SS_GetMemMap in Card Services). Just returns a
++ *  memory map descriptor which was assigned earlier by a
++ *  set_mem_map() request.
++ *
++ * Returns: 0 on success, -1 if the map index was out of range
++ */
++static int 
++bcm47xx_pcmcia_get_mem_map(unsigned int sock, struct pccard_mem_map *map)
++{
++       DEBUG(2, "%s() for sock %u\n", __FUNCTION__, sock);
++
++       if (map->map >= MAX_WIN) {
++               printk(KERN_ERR "%s(): map (%d) out of range\n", 
++                      __FUNCTION__, map->map);
++               return -1;
++       }
++
++       *map = pcmcia_socket[sock].mem_map[map->map];
++       return 0;
++}
++
++
++/*
++ * bcm47xx_pcmcia_set_mem_map()
++ *
++ * Implements the set_mem_map() operation for the in-kernel PCMCIA
++ * service (formerly SS_SetMemMap in Card Services). We configure
++ * the map speed as requested, but override the address ranges
++ * supplied by Card Services.
++ *
++ * Returns: 0 on success, -1 on error
++ */
++static int 
++bcm47xx_pcmcia_set_mem_map(unsigned int sock, struct pccard_mem_map *map)
++{
++       unsigned int speed;
++       unsigned long start;
++       u_long flags;
++
++       if (map->map >= MAX_WIN) {
++               printk(KERN_ERR "%s(): map (%d) out of range\n", 
++                      __FUNCTION__, map->map);
++               return -1;
++       }
++
++       DEBUG(2, "\tmap %u  speed %u\n\tsys_start  %#lx\n"
++             "\tsys_stop   %#lx\n\tcard_start %#x\n"
++             "\tflags: %s%s%s%s%s%s%s%s\n",
++             map->map, map->speed, map->sys_start, map->sys_stop,
++             map->card_start, (map->flags == 0) ? "<NONE>" : "",
++             (map->flags & MAP_ACTIVE) ? "ACTIVE " : "",
++             (map->flags & MAP_16BIT) ? "16BIT " : "",
++             (map->flags & MAP_AUTOSZ) ? "AUTOSZ " : "",
++             (map->flags & MAP_0WS) ? "0WS " : "",
++             (map->flags & MAP_WRPROT) ? "WRPROT " : "",
++             (map->flags & MAP_ATTRIB) ? "ATTRIB " : "",
++             (map->flags & MAP_USE_WAIT) ? "USE_WAIT " : "");
++
++       if (map->flags & MAP_ACTIVE) {
++               /* When clients issue RequestMap, the access speed is not always
++                * properly configured:
++                */
++               speed = (map->speed > 0) ? map->speed : BCM47XX_PCMCIA_MEM_SPEED;
++
++               /* TBD */
++               if (map->flags & MAP_ATTRIB) {
++                       pcmcia_socket[sock].speed_attr = speed;
++               } else {
++                       pcmcia_socket[sock].speed_mem = speed;
++               }
++       }
++
++       save_flags(flags);
++       cli();
++       start = map->sys_start;
++
++       if (map->sys_stop == 0)
++               map->sys_stop = PAGE_SIZE - 1;
++
++       if (map->flags & MAP_ATTRIB) {
++               map->sys_start = pcmcia_socket[sock].phys_attr + 
++                       map->card_start;
++       } else {
++               map->sys_start = pcmcia_socket[sock].phys_mem + 
++                       map->card_start;
++       }
++
++       map->sys_stop = map->sys_start + (map->sys_stop - start);
++       pcmcia_socket[sock].mem_map[map->map] = *map;
++       restore_flags(flags);
++       DEBUG(2, "set_mem_map %d start %x stop %x card_start %x\n", 
++                       map->map, map->sys_start, map->sys_stop, 
++                       map->card_start);
++       return 0;
++}
++
++
++#if defined(CONFIG_PROC_FS)
++
++/*
++ * bcm47xx_pcmcia_proc_setup()
++ *
++ * Implements the proc_setup() operation for the in-kernel PCMCIA
++ * service (formerly SS_ProcSetup in Card Services).
++ *
++ * Returns: 0 on success, -1 on error
++ */
++static void 
++bcm47xx_pcmcia_proc_setup(unsigned int sock, struct proc_dir_entry *base)
++{
++       struct proc_dir_entry *entry;
++
++       if ((entry = create_proc_entry("status", 0, base)) == NULL) {
++               printk(KERN_ERR "Unable to install \"status\" procfs entry\n");
++               return;
++       }
++
++       entry->read_proc = bcm47xx_pcmcia_proc_status;
++       entry->data = (void *)sock;
++}
++
++
++/*
++ * bcm47xx_pcmcia_proc_status()
++ *
++ * Implements the /proc/bus/pccard/??/status file.
++ *
++ * Returns: the number of characters added to the buffer
++ */
++static int 
++bcm47xx_pcmcia_proc_status(char *buf, char **start, off_t pos, 
++                          int count, int *eof, void *data)
++{
++       char *p = buf;
++       unsigned int sock = (unsigned int)data;
++
++       p += sprintf(p, "k_flags  : %s%s%s%s%s%s%s\n", 
++                    pcmcia_socket[sock].k_state.detect ? "detect " : "",
++                    pcmcia_socket[sock].k_state.ready ? "ready " : "",
++                    pcmcia_socket[sock].k_state.bvd1 ? "bvd1 " : "",
++                    pcmcia_socket[sock].k_state.bvd2 ? "bvd2 " : "",
++                    pcmcia_socket[sock].k_state.wrprot ? "wrprot " : "",
++                    pcmcia_socket[sock].k_state.vs_3v ? "vs_3v " : "",
++                    pcmcia_socket[sock].k_state.vs_Xv ? "vs_Xv " : "");
++
++       p += sprintf(p, "status   : %s%s%s%s%s%s%s%s%s\n",
++                    pcmcia_socket[sock].k_state.detect ? "SS_DETECT " : "",
++                    pcmcia_socket[sock].k_state.ready ? "SS_READY " : "",
++                    pcmcia_socket[sock].cs_state.Vcc ? "SS_POWERON " : "",
++                    pcmcia_socket[sock].cs_state.flags & SS_IOCARD ? "SS_IOCARD " : "",
++                    (pcmcia_socket[sock].cs_state.flags & SS_IOCARD &&
++                     pcmcia_socket[sock].k_state.bvd1) ? "SS_STSCHG " : "",
++                    ((pcmcia_socket[sock].cs_state.flags & SS_IOCARD) == 0 &&
++                     (pcmcia_socket[sock].k_state.bvd1 == 0)) ? "SS_BATDEAD " : "",
++                    ((pcmcia_socket[sock].cs_state.flags & SS_IOCARD) == 0 &&
++                     (pcmcia_socket[sock].k_state.bvd2 == 0)) ? "SS_BATWARN " : "",
++                    pcmcia_socket[sock].k_state.vs_3v ? "SS_3VCARD " : "",
++                    pcmcia_socket[sock].k_state.vs_Xv ? "SS_XVCARD " : "");
++
++       p += sprintf(p, "mask     : %s%s%s%s%s\n",
++                    pcmcia_socket[sock].cs_state.csc_mask & SS_DETECT ? "SS_DETECT " : "",
++                    pcmcia_socket[sock].cs_state.csc_mask & SS_READY ? "SS_READY " : "",
++                    pcmcia_socket[sock].cs_state.csc_mask & SS_BATDEAD ? "SS_BATDEAD " : "",
++                    pcmcia_socket[sock].cs_state.csc_mask & SS_BATWARN ? "SS_BATWARN " : "",
++                    pcmcia_socket[sock].cs_state.csc_mask & SS_STSCHG ? "SS_STSCHG " : "");
++
++       p += sprintf(p, "cs_flags : %s%s%s%s%s\n",
++                    pcmcia_socket[sock].cs_state.flags & SS_PWR_AUTO ?
++                       "SS_PWR_AUTO " : "",
++                    pcmcia_socket[sock].cs_state.flags & SS_IOCARD ?
++                       "SS_IOCARD " : "",
++                    pcmcia_socket[sock].cs_state.flags & SS_RESET ?
++                       "SS_RESET " : "",
++                    pcmcia_socket[sock].cs_state.flags & SS_SPKR_ENA ?
++                       "SS_SPKR_ENA " : "",
++                    pcmcia_socket[sock].cs_state.flags & SS_OUTPUT_ENA ?
++                       "SS_OUTPUT_ENA " : "");
++
++       p += sprintf(p, "Vcc      : %d\n", pcmcia_socket[sock].cs_state.Vcc);
++       p += sprintf(p, "Vpp      : %d\n", pcmcia_socket[sock].cs_state.Vpp);
++       p += sprintf(p, "irq      : %d\n", pcmcia_socket[sock].cs_state.io_irq);
++       p += sprintf(p, "I/O      : %u\n", pcmcia_socket[sock].speed_io);
++       p += sprintf(p, "attribute: %u\n", pcmcia_socket[sock].speed_attr);
++       p += sprintf(p, "common   : %u\n", pcmcia_socket[sock].speed_mem);
++       return p-buf;
++}
++
++
++#endif  /* defined(CONFIG_PROC_FS) */
+diff -Nur linux-2.4.32/drivers/pcmcia/bcm4710_pcmcia.c linux-2.4.32-freewrt/drivers/pcmcia/bcm4710_pcmcia.c
+--- linux-2.4.32/drivers/pcmcia/bcm4710_pcmcia.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/pcmcia/bcm4710_pcmcia.c        2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,266 @@
++/*
++ * BCM4710 specific pcmcia routines.
++ *
++ * Copyright 2004, 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: bcm4710_pcmcia.c,v 1.1 2005/03/16 13:50:00 wbx Exp $
++ */
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/config.h>
++#include <linux/delay.h>
++#include <linux/ioport.h>
++#include <linux/kernel.h>
++#include <linux/tqueue.h>
++#include <linux/timer.h>
++#include <linux/mm.h>
++#include <linux/proc_fs.h>
++#include <linux/version.h>
++#include <linux/types.h>
++#include <linux/pci.h>
++
++#include <pcmcia/version.h>
++#include <pcmcia/cs_types.h>
++#include <pcmcia/cs.h>
++#include <pcmcia/ss.h>
++#include <pcmcia/bulkmem.h>
++#include <pcmcia/cistpl.h>
++#include <pcmcia/bus_ops.h>
++#include "cs_internal.h"
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/system.h>
++
++
++#include <typedefs.h>
++#include <bcmdevs.h>
++#include <bcm4710.h>
++#include <sbconfig.h>
++#include <sbextif.h>
++
++#include "bcm4710pcmcia.h"
++
++/* Use a static var for irq dev_id */
++static int bcm47xx_pcmcia_dev_id;
++
++/* Do we think we have a card or not? */
++static int bcm47xx_pcmcia_present = 0;
++
++
++static void bcm4710_pcmcia_reset(void)
++{
++       extifregs_t *eir;
++       unsigned long s;
++       uint32 out0, out1, outen;
++
++
++       eir = (extifregs_t *) ioremap_nocache(BCM4710_REG_EXTIF, sizeof(extifregs_t));
++
++       save_and_cli(s);
++
++       /* Use gpio7 to reset the pcmcia slot */
++       outen = readl(&eir->gpio[0].outen);
++       outen |= BCM47XX_PCMCIA_RESET;
++       out0 = readl(&eir->gpio[0].out);
++       out0 &= ~(BCM47XX_PCMCIA_RESET);
++       out1 = out0 | BCM47XX_PCMCIA_RESET;
++
++       writel(out0, &eir->gpio[0].out);
++       writel(outen, &eir->gpio[0].outen);
++       mdelay(1);
++       writel(out1, &eir->gpio[0].out);
++       mdelay(1);
++       writel(out0, &eir->gpio[0].out);
++
++       restore_flags(s);
++}
++
++
++static int bcm4710_pcmcia_init(struct pcmcia_init *init)
++{
++       struct pci_dev *pdev;
++       extifregs_t *eir;
++       uint32 outen, intp, intm, tmp;
++       uint16 *attrsp;
++       int rc = 0, i;
++       extern unsigned long bcm4710_cpu_cycle;
++
++
++       if (!(pdev = pci_find_device(VENDOR_BROADCOM, SB_EXTIF, NULL))) {
++               printk(KERN_ERR "bcm4710_pcmcia: extif not found\n");
++               return -ENODEV;
++       }
++       eir = (extifregs_t *) ioremap_nocache(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
++
++       /* Initialize the pcmcia i/f: 16bit no swap */
++       writel(CF_EM_PCMCIA | CF_DS | CF_EN, &eir->pcmcia_config);
++
++#ifdef notYet
++
++       /* Set the timing for memory accesses */
++       tmp = (19 / bcm4710_cpu_cycle) << 24;           /* W3 = 10nS */
++       tmp = tmp | ((29 / bcm4710_cpu_cycle) << 16);   /* W2 = 20nS */
++       tmp = tmp | ((109 / bcm4710_cpu_cycle) << 8);   /* W1 = 100nS */
++       tmp = tmp | (129 / bcm4710_cpu_cycle);          /* W0 = 120nS */
++       writel(tmp, &eir->pcmcia_memwait);              /* 0x01020a0c for a 100Mhz clock */
++
++       /* Set the timing for I/O accesses */
++       tmp = (19 / bcm4710_cpu_cycle) << 24;           /* W3 = 10nS */
++       tmp = tmp | ((29 / bcm4710_cpu_cycle) << 16);   /* W2 = 20nS */
++       tmp = tmp | ((109 / bcm4710_cpu_cycle) << 8);   /* W1 = 100nS */
++       tmp = tmp | (129 / bcm4710_cpu_cycle);          /* W0 = 120nS */
++       writel(tmp, &eir->pcmcia_iowait);               /* 0x01020a0c for a 100Mhz clock */
++
++       /* Set the timing for attribute accesses */
++       tmp = (19 / bcm4710_cpu_cycle) << 24;           /* W3 = 10nS */
++       tmp = tmp | ((29 / bcm4710_cpu_cycle) << 16);   /* W2 = 20nS */
++       tmp = tmp | ((109 / bcm4710_cpu_cycle) << 8);   /* W1 = 100nS */
++       tmp = tmp | (129 / bcm4710_cpu_cycle);          /* W0 = 120nS */
++       writel(tmp, &eir->pcmcia_attrwait);             /* 0x01020a0c for a 100Mhz clock */
++
++#endif
++       /* Make sure gpio0 and gpio5 are inputs */
++       outen = readl(&eir->gpio[0].outen);
++       outen &= ~(BCM47XX_PCMCIA_WP | BCM47XX_PCMCIA_STSCHG | BCM47XX_PCMCIA_RESET);
++       writel(outen, &eir->gpio[0].outen);
++
++       /* Issue a reset to the pcmcia socket */
++       bcm4710_pcmcia_reset();
++
++#ifdef DO_BCM47XX_PCMCIA_INTERRUPTS
++       /* Setup gpio5 to be the STSCHG interrupt */
++       intp = readl(&eir->gpiointpolarity);
++       writel(intp | BCM47XX_PCMCIA_STSCHG, &eir->gpiointpolarity);    /* Active low */
++       intm = readl(&eir->gpiointmask);
++       writel(intm | BCM47XX_PCMCIA_STSCHG, &eir->gpiointmask);        /* Enable it */
++#endif
++
++       DEBUG(2, "bcm4710_pcmcia after reset:\n");
++       DEBUG(2, "\textstatus\t= 0x%08x:\n", readl(&eir->extstatus));
++       DEBUG(2, "\tpcmcia_config\t= 0x%08x:\n", readl(&eir->pcmcia_config));
++       DEBUG(2, "\tpcmcia_memwait\t= 0x%08x:\n", readl(&eir->pcmcia_memwait));
++       DEBUG(2, "\tpcmcia_attrwait\t= 0x%08x:\n", readl(&eir->pcmcia_attrwait));
++       DEBUG(2, "\tpcmcia_iowait\t= 0x%08x:\n", readl(&eir->pcmcia_iowait));
++       DEBUG(2, "\tgpioin\t\t= 0x%08x:\n", readl(&eir->gpioin));
++       DEBUG(2, "\tgpio_outen0\t= 0x%08x:\n", readl(&eir->gpio[0].outen));
++       DEBUG(2, "\tgpio_out0\t= 0x%08x:\n", readl(&eir->gpio[0].out));
++       DEBUG(2, "\tgpiointpolarity\t= 0x%08x:\n", readl(&eir->gpiointpolarity));
++       DEBUG(2, "\tgpiointmask\t= 0x%08x:\n", readl(&eir->gpiointmask));
++
++#ifdef DO_BCM47XX_PCMCIA_INTERRUPTS
++       /* Request pcmcia interrupt */
++       rc =  request_irq(BCM47XX_PCMCIA_IRQ, init->handler, SA_INTERRUPT,
++                         "PCMCIA Interrupt", &bcm47xx_pcmcia_dev_id);
++#endif
++
++       attrsp = (uint16 *)ioremap_nocache(EXTIF_PCMCIA_CFGBASE(BCM4710_EXTIF), 0x1000);
++       tmp = readw(&attrsp[0]);
++       DEBUG(2, "\tattr[0] = 0x%04x\n", tmp);
++       if ((tmp == 0x7fff) || (tmp == 0x7f00)) {
++               bcm47xx_pcmcia_present = 0;
++       } else {
++               bcm47xx_pcmcia_present = 1;
++       }
++
++       /* There's only one socket */
++       return 1;
++}
++
++static int bcm4710_pcmcia_shutdown(void)
++{
++       extifregs_t *eir;
++       uint32 intm;
++
++       eir = (extifregs_t *) ioremap_nocache(BCM4710_REG_EXTIF, sizeof(extifregs_t));
++
++       /* Disable the pcmcia i/f */
++       writel(0, &eir->pcmcia_config);
++
++       /* Reset gpio's */
++       intm = readl(&eir->gpiointmask);
++       writel(intm & ~BCM47XX_PCMCIA_STSCHG, &eir->gpiointmask);       /* Disable it */
++
++       free_irq(BCM47XX_PCMCIA_IRQ, &bcm47xx_pcmcia_dev_id);
++
++       return 0;
++}
++
++static int 
++bcm4710_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state)
++{
++       extifregs_t *eir;
++
++       eir = (extifregs_t *) ioremap_nocache(BCM4710_REG_EXTIF, sizeof(extifregs_t));
++
++
++       if (sock != 0) {
++               printk(KERN_ERR "bcm4710 socket_state bad sock %d\n", sock);
++               return -1;
++       }
++
++       if (bcm47xx_pcmcia_present) {
++               state->detect = 1;
++               state->ready = 1;
++               state->bvd1 = 1;
++               state->bvd2 = 1;
++               state->wrprot = (readl(&eir->gpioin) & BCM47XX_PCMCIA_WP) == BCM47XX_PCMCIA_WP; 
++               state->vs_3v = 0;
++               state->vs_Xv = 0;
++       } else {
++               state->detect = 0;
++               state->ready = 0;
++       }
++
++       return 1;
++}
++
++
++static int bcm4710_pcmcia_get_irq_info(struct pcmcia_irq_info *info)
++{
++       if (info->sock >= BCM47XX_PCMCIA_MAX_SOCK) return -1;
++
++       info->irq = BCM47XX_PCMCIA_IRQ;         
++
++       return 0;
++}
++
++
++static int 
++bcm4710_pcmcia_configure_socket(const struct pcmcia_configure *configure)
++{
++       if (configure->sock >= BCM47XX_PCMCIA_MAX_SOCK) return -1;
++
++
++       DEBUG(2, "Vcc %dV Vpp %dV output %d speaker %d reset %d\n", configure->vcc,
++             configure->vpp, configure->output, configure->speaker, configure->reset);
++
++       if ((configure->vcc != 50) || (configure->vpp != 50)) {
++               printk("%s: bad Vcc/Vpp (%d:%d)\n", __FUNCTION__, configure->vcc, 
++                      configure->vpp);
++       }
++
++       if (configure->reset) {
++               /* Issue a reset to the pcmcia socket */
++               DEBUG(1, "%s: Reseting socket\n", __FUNCTION__);
++               bcm4710_pcmcia_reset();
++       }
++
++
++       return 0;
++}
++
++struct pcmcia_low_level bcm4710_pcmcia_ops = { 
++       bcm4710_pcmcia_init,
++       bcm4710_pcmcia_shutdown,
++       bcm4710_pcmcia_socket_state,
++       bcm4710_pcmcia_get_irq_info,
++       bcm4710_pcmcia_configure_socket
++};
++
+diff -Nur linux-2.4.32/drivers/pcmcia/bcm4710pcmcia.h linux-2.4.32-freewrt/drivers/pcmcia/bcm4710pcmcia.h
+--- linux-2.4.32/drivers/pcmcia/bcm4710pcmcia.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.32-freewrt/drivers/pcmcia/bcm4710pcmcia.h 2006-07-02 21:58:25.000000000 +0200
+@@ -0,0 +1,118 @@
++/*
++ *
++ * bcm47xx pcmcia driver
++ *
++ * Copyright 2004, 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.
++ *
++ * Based on sa1100.h and include/asm-arm/arch-sa1100/pcmica.h
++ *     from www.handhelds.org,
++ * and au1000_generic.c from oss.sgi.com.
++ *
++ * $Id: bcm4710pcmcia.h,v 1.1 2005/03/16 13:50:00 wbx Exp $
++ */
++
++#if !defined(_BCM4710PCMCIA_H)
++#define _BCM4710PCMCIA_H
++
++#include <pcmcia/cs_types.h>
++#include <pcmcia/ss.h>
++#include <pcmcia/bulkmem.h>
++#include <pcmcia/cistpl.h>
++#include "cs_internal.h"
++
++
++/* The 47xx can only support one socket */
++#define BCM47XX_PCMCIA_MAX_SOCK                1
++
++/* In the bcm947xx gpio's are used for some pcmcia functions */
++#define        BCM47XX_PCMCIA_WP               0x01            /* Bit 0 is WP input */
++#define        BCM47XX_PCMCIA_STSCHG           0x20            /* Bit 5 is STSCHG input/interrupt */
++#define        BCM47XX_PCMCIA_RESET            0x80            /* Bit 7 is RESET */
++
++#define        BCM47XX_PCMCIA_IRQ              2
++
++/* The socket driver actually works nicely in interrupt-driven form,
++ * so the (relatively infrequent) polling is "just to be sure."
++ */
++#define BCM47XX_PCMCIA_POLL_PERIOD    (2 * HZ)
++
++#define BCM47XX_PCMCIA_IO_SPEED       (255)
++#define BCM47XX_PCMCIA_MEM_SPEED      (300)
++
++
++struct pcmcia_state {
++       unsigned detect: 1,
++               ready: 1,
++               bvd1: 1,
++               bvd2: 1,
++               wrprot: 1,
++               vs_3v: 1,
++               vs_Xv: 1;
++};
++
++
++struct pcmcia_configure {
++       unsigned sock: 8,
++               vcc: 8,
++               vpp: 8,
++               output: 1,
++               speaker: 1,
++               reset: 1;
++};
++
++struct pcmcia_irq_info {
++       unsigned int sock;
++       unsigned int irq;
++};
++
++/* This structure encapsulates per-socket state which we might need to
++ * use when responding to a Card Services query of some kind.
++ */
++struct bcm47xx_pcmcia_socket {
++  socket_state_t        cs_state;
++  struct pcmcia_state   k_state;
++  unsigned int          irq;
++  void                  (*handler)(void *, unsigned int);
++  void                  *handler_info;
++  pccard_io_map         io_map[MAX_IO_WIN];
++  pccard_mem_map        mem_map[MAX_WIN];
++  ioaddr_t              virt_io, phys_attr, phys_mem;
++  unsigned short        speed_io, speed_attr, speed_mem;
++};
++
++struct pcmcia_init {
++       void (*handler)(int irq, void *dev, struct pt_regs *regs);
++};
++
++struct pcmcia_low_level {
++       int (*init)(struct pcmcia_init *);
++       int (*shutdown)(void);
++       int (*socket_state)(unsigned sock, struct pcmcia_state *);
++       int (*get_irq_info)(struct pcmcia_irq_info *);
++       int (*configure_socket)(const struct pcmcia_configure *);
++};
++
++extern struct pcmcia_low_level bcm47xx_pcmcia_ops;
++
++/* I/O pins replacing memory pins
++ * (PCMCIA System Architecture, 2nd ed., by Don Anderson, p.75)
++ *
++ * These signals change meaning when going from memory-only to 
++ * memory-or-I/O interface:
++ */
++#define iostschg bvd1
++#define iospkr   bvd2
++
++
++/*
++ * Declaration for implementation specific low_level operations.
++ */
++extern struct pcmcia_low_level bcm4710_pcmcia_ops;
++
++#endif  /* !defined(_BCM4710PCMCIA_H) */
+diff -Nur linux-2.4.32/include/asm-mips/bootinfo.h linux-2.4.32-freewrt/include/asm-mips/bootinfo.h
+--- linux-2.4.32/include/asm-mips/bootinfo.h    2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.32-freewrt/include/asm-mips/bootinfo.h    2006-07-02 21:58:25.000000000 +0200
 @@ -37,6 +37,7 @@
  #define MACH_GROUP_HP_LJ       20 /* Hewlett Packard LaserJet               */
@@ -19909 +16085 @@
  /*
   * Valid machtype values for group unknown (low order halfword of mips_machtype)
-@@ -197,6 +198,15 @@
+@@ -194,6 +195,15 @@
  #define MACH_TANBAC_TB0229     7       /* TANBAC TB0229 (VR4131DIMM) */
  
@@ -19925 +16101 @@
   */
  #define        MACH_TITAN_YOSEMITE     1       /* PMC-Sierra Yosemite */
-diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
---- linux.old/include/asm-mips/cpu.h    2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/include/asm-mips/cpu.h    2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/include/asm-mips/cpu.h linux-2.4.32-freewrt/include/asm-mips/cpu.h
+--- linux-2.4.32/include/asm-mips/cpu.h 2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.32-freewrt/include/asm-mips/cpu.h 2006-07-02 21:58:25.000000000 +0200
 @@ -22,6 +22,11 @@
     spec.
@@ -19976 +16152 @@
  /*
   * ISA Level encodings
-diff -urN linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kcache.h
---- linux.old/include/asm-mips/r4kcache.h       2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/include/asm-mips/r4kcache.h       2006-04-27 19:24:19.000000000 +0200
-@@ -658,4 +658,17 @@
+diff -Nur linux-2.4.32/include/asm-mips/r4kcache.h linux-2.4.32-freewrt/include/asm-mips/r4kcache.h
+--- linux-2.4.32/include/asm-mips/r4kcache.h    2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.32-freewrt/include/asm-mips/r4kcache.h    2006-07-02 21:58:25.000000000 +0200
+@@ -567,4 +567,17 @@
                         cache128_unroll32(addr|ws,Index_Writeback_Inv_SD);
  }
@@ -19997 +16173 @@
 +
  #endif /* __ASM_R4KCACHE_H */
-diff -urN linux.old/include/asm-mips/serial.h linux.dev/include/asm-mips/serial.h
---- linux.old/include/asm-mips/serial.h 2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/include/asm-mips/serial.h 2006-04-27 19:24:19.000000000 +0200
+diff -Nur linux-2.4.32/include/asm-mips/serial.h linux-2.4.32-freewrt/include/asm-mips/serial.h
+--- linux-2.4.32/include/asm-mips/serial.h      2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.32-freewrt/include/asm-mips/serial.h      2006-07-02 21:58:25.000000000 +0200
 @@ -223,6 +223,13 @@
  #define TXX927_SERIAL_PORT_DEFNS
@@ -20022 +16198 @@
         DDB5477_SERIAL_PORT_DEFNS               \
         EV96100_SERIAL_PORT_DEFNS               \
-diff -urN linux.old/init/do_mounts.c linux.dev/init/do_mounts.c
---- linux.old/init/do_mounts.c  2006-04-27 18:04:38.000000000 +0200
-+++ linux.dev/init/do_mounts.c  2006-04-27 19:24:19.000000000 +0200
-@@ -254,7 +254,13 @@
+diff -Nur linux-2.4.32/init/do_mounts.c linux-2.4.32-freewrt/init/do_mounts.c
+--- linux-2.4.32/init/do_mounts.c       2003-11-28 19:26:21.000000000 +0100
++++ linux-2.4.32-freewrt/init/do_mounts.c       2006-07-02 21:58:25.000000000 +0200
+@@ -253,7 +253,13 @@
         { "ftlb", 0x2c08 },
         { "ftlc", 0x2c10 },

target/linux/kernel.mk

@@ -10 +10 @@
 
 $(PACKAGE_DIR):
-        mkdir -p $(PACKAGE_DIR)
+        @mkdir -p $(PACKAGE_DIR)
         
 $(DL_DIR)/$(LINUX_SOURCE):
@@ -28 +28 @@
           $(LINUX_DIR)/Makefile  \
           $(LINUX_DIR)/arch/*/Makefile
-        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
         $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h $(MAKE_TRACE)
         touch $@

target/linux/package/diag/diag_led.c

@@ -2 +2 @@
  * diag_led.c - replacement diag module
  *
- * Copyright (C) 2004 Mike Baker,
- *                    Imre Kaloz <kaloz@dune.hu>
+ * Copyright (C) 2004-2006 Mike Baker,
+ *                         Imre Kaloz <kaloz@dune.hu>,
+ *                         Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -19 +20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: diag_led.c 3510 2006-03-27 21:05:17Z wbx $
+ * $Id: 005-diag_led.patch 3355 2006-03-13 07:57:51Z nbd $
  */
 
@@ -29 +30 @@
  * 2005/04/13 added licensing informations
  * 2005/04/18 base reset polarity off initial readings
- * 2006/02/07 motorola wa840g/we800g support added
  */
 
@@ -38 +38 @@
 #include <asm/io.h>
 #include <typedefs.h>
-#include <osl.h>
 #include <bcmdevs.h>
 #include <sbutils.h>
@@ -46 +45 @@
 
 // v2.x - - - - -
+#define BITS(n)                 ((1 << n) - 1)
+#define ISSET(n,b)              ((n & (1 << b)) ? 1 : 0)
 #define DIAG_GPIO (1<<1)
+#define AOSS_GPIO (1<<6)
 #define DMZ_GPIO  (1<<7)
+#define SES_GPIO  ((1 << 2) | (1 << 3) | (1 << 5))
 
 static void set_gpio(uint32 mask, uint32 value) {
-        sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY);
-        sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY);
-        sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY);
+        sb_gpiocontrol(sbh,mask,0);
+        sb_gpioouten(sbh,mask,mask);
+        sb_gpioout(sbh,mask,value);
 }
 
@@ -60 +63 @@
 static void v2_set_dmz(u8 state) {
         set_gpio(DMZ_GPIO,state);
+}
+static void v2_set_aoss(u8 state) {
+        set_gpio(AOSS_GPIO,state);
+}
+static void v2_set_ses(u8 state) {
+        set_gpio(SES_GPIO, (ISSET(state, 0) << 2) | (ISSET(state, 1) << 3) | (ISSET(state, 2) << 5));
 }
 
@@ -81 +90 @@
 }
 
-static void wap1_set_diag(u8 state) {
-       set_gpio(1<<3,state);
-}
-static void wap1_set_dmz(u8 state) {
-       set_gpio(1<<4,state);
-}
-
 // - - - - -
 static void ignore(u8 ignored) {};
 
 // - - - - -
-#define BIT_DMZ         0x01
-#define BIT_DIAG        0x04
+#define BIT_DMZ         (1 << 0)
+#define BIT_DIAG        (1 << 2)
+#define BIT_SES         (BITS(3) << 3)
 
 void (*set_diag)(u8 state);
 void (*set_dmz)(u8 state);
-
+void (*set_ses)(u8 state);
+
+static unsigned int diag_reverse = 1;
+static unsigned int ses_reverse = 1;
 static unsigned int diag = 0;
 
 static void diag_change()
 {
-        set_diag(0xFF); // off
-        set_dmz(0xFF); // off
+        set_diag(diag_reverse ? 0xFF : 0x00); // off
+        set_dmz(diag_reverse ? 0xFF : 0x00); // off
+        set_ses(ses_reverse ? 0xFF : 0x00); // off
 
         if(diag & BIT_DIAG)
-                set_diag(0x00); // on
+                set_diag(diag_reverse ? 0x00 : 0xFF); // on
         if(diag & BIT_DMZ)
-                set_dmz(0x00); // on
+                set_dmz(diag_reverse ? 0x00 : 0xFF); // on
+        if(diag & BIT_SES)
+                set_ses(((ses_reverse ? ~diag : diag) >> 3) & BITS(3));
 }
 
@@ -126 +135 @@
 static unsigned char reset_polarity = 0;
 static unsigned int reset = 0;
+static unsigned char button_gpio = 0;
+static unsigned char button_polarity = 0;
+static unsigned int button = 0;
+
+
+static int read_gpio(int gpio, int polarity)
+{
+        int res;
+        
+        if (gpio) {
+                sb_gpiocontrol(sbh,gpio,gpio);
+                sb_gpioouten(sbh,gpio,0);
+                res=!(sb_gpioin(sbh)&gpio);
+
+                return (polarity ? !res : res);
+        }
+
+        return 0;
+}
 
 static int proc_reset(ctl_table *table, int write, struct file *filp,
                 void *buffer, size_t *lenp)
 {
-
-        if (reset_gpio) {
-                sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
-                sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
-                reset=!(sb_gpioin(sbh)&reset_gpio);
-
-                if (reset_polarity) reset=!reset;
-        } else {
-                reset=0;
-        }
+        reset = read_gpio(reset_gpio, reset_polarity);
+
+        return proc_dointvec(table, write, filp, buffer, lenp);
+}
+
+static int proc_button(ctl_table *table, int write, struct file *filp,
+                void *buffer, size_t *lenp)
+{
+        button = read_gpio(button_gpio, button_polarity);
 
         return proc_dointvec(table, write, filp, buffer, lenp);
@@ -164 +191 @@
            proc_handler: proc_reset 
          },
+         {
+           ctl_name: 2002,
+           procname: "button",
+           data: &button,
+           maxlen: sizeof(button),
+           mode: 0444,
+           proc_handler: proc_button
+         },
          { 0 }
 };
@@ -179 +214 @@
         set_diag=ignore;
         set_dmz=ignore;
+        set_ses=ignore;
         
         buf=nvram_get("pmon_ver") ?: "";
         if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) {
                 buf=nvram_get("boardtype")?:"";
-                if (!strncmp(buf,"bcm94710dev",11)) {
+                if (!strcmp(buf,"bcm94710dev")) {
                         buf=nvram_get("boardnum")?:"";
                         if (!strcmp(buf,"42")) {
@@ -191 +227 @@
                                 reset_gpio=(1<<6);
                         }
-                        if (simple_strtoul(buf, NULL, 0) == 2) {
-                                // wap54g v1.0
-                                // do not use strcmp as PMON v5.3.22 has some built-in nvram 
-                                // defaults with trailing \r
-                                set_diag=wap1_set_diag;
-                                // no dmz led on wap54g, used green led 
-                                // labeled "WLAN Link" instead
-                                set_dmz=wap1_set_dmz;
-                                reset_gpio=(1<<0);
-                        }
                         if (!strcmp(buf,"asusX")) {
                                 //asus wl-500g
                                 reset_gpio=(1<<6);
-                        }
-                        if (!strcmp(buf,"2")) {
-                                //wa840g v1 / we800g v1
-                                reset_gpio=(1<<0);
                         }
                 }
@@ -229 +251 @@
                         set_diag=v2_set_diag;
                         set_dmz=v2_set_dmz;
+                        set_ses=v2_set_ses;
+                        
                         reset_gpio=(1<<6);
+                        button_gpio=(1<<4);
+
+                        if (!strcmp((nvram_get("boardtype")?:""), "0x0101")) // WRT54G3G
+                                ses_reverse = 0;
+                        else
+                                ses_reverse = 1;
                 }
                 if (!strcmp(buf,"44")) {
@@ -237 +267 @@
                 if (!strcmp(buf,"00")) {
                         //buffalo
+                        diag_reverse = 0;
+                        set_dmz=v2_set_diag;
+                        set_diag=v2_set_aoss;
                         reset_gpio=(1<<7);
                 }
@@ -245 +278 @@
         }
 
-        
-        sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
-        sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
+        sb_gpiocontrol(sbh,reset_gpio,reset_gpio);
+        sb_gpioouten(sbh,reset_gpio,0);
         reset_polarity=!(sb_gpioin(sbh)&reset_gpio);
+
+        if (button_gpio) {
+                sb_gpiocontrol(sbh,button_gpio,button_gpio);
+                sb_gpioouten(sbh,button_gpio,0);
+                button_polarity=!(sb_gpioin(sbh)&button_gpio);
+        } else {
+                // don't create /proc/button
+                sys_diag[2].ctl_name = 0;
+        }
 
         diag_sysctl_header = register_sysctl_table(sys_diag, 0);

target/linux/package/wlcompat/wlcompat.c

@@ -19 +19 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: wlcompat.c 3732 2006-05-06 02:34:35Z nbd $
+ * $Id: wlcompat.c 2529 2005-11-19 01:07:28Z nbd $
  */
 
@@ -981 +981 @@
 {
         int found = 0, i;
-        char devname[4] = "wl0";
+        char *devname = "eth0";
         bss_force = 0;
         
@@ -987 +987 @@
                 if ((dev->wireless_handlers == NULL) && ((wl_ioctl(dev, WLC_GET_MAGIC, &i, sizeof(i)) == 0) && i == WLC_IOCTL_MAGIC))
                         found = 1;
-                devname[2]++;
+                devname[3]++;
         }