Merge /spare/repo/linux-2.6/

570 files changed, 57612 insertions, 32319 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index ed41d9036bfc..aed4a9b97c14 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -58,4 +58,6 @@ source "drivers/mmc/Kconfig"
 
 source "drivers/infiniband/Kconfig"
 
+source "drivers/sn/Kconfig"
+
 endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 15681de688f4..3167be54fedd 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -61,6 +61,6 @@ obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_MMC)               += mmc/
 obj-$(CONFIG_INFINIBAND)        += infiniband/
-obj-$(CONFIG_BLK_DEV_SGIIOC4)   += sn/
+obj-$(CONFIG_SGI_IOC4)          += sn/
 obj-y                           += firmware/
 obj-$(CONFIG_CRYPTO)            += crypto/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0400a52d5085..670fdb5142d1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -40,13 +40,12 @@ config ACPI
           available at:
           <http://www.acpi.info>
 
+if ACPI
+
 config ACPI_BOOT
         bool
-        depends on ACPI || X86_HT
         default y
 
-if ACPI
-
 config ACPI_INTERPRETER
         bool
         depends on !IA64_SGI_SN
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 12b0eea63407..8093f2e00321 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -391,7 +391,6 @@ acpi_pci_irq_enable (
         u8                      pin = 0;
         int                     edge_level = ACPI_LEVEL_SENSITIVE;
         int                     active_high_low = ACPI_ACTIVE_LOW;
-        extern int              via_interrupt_line_quirk;
         char                    *link = NULL;
 
         ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
@@ -444,9 +443,6 @@ acpi_pci_irq_enable (
                 }
         }
 
-        if (via_interrupt_line_quirk)
-                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq & 15);
-
         dev->irq = acpi_register_gsi(irq, edge_level, active_high_low);
 
         printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ff64d333e95f..c9d671cf7857 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -171,7 +171,7 @@ static void acpi_processor_idle (void)
         int                     sleep_ticks = 0;
         u32                     t1, t2 = 0;
 
-        pr = processors[_smp_processor_id()];
+        pr = processors[raw_smp_processor_id()];
         if (!pr)
                 return;
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 119c94093a13..e85885593280 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -65,14 +65,14 @@ static ssize_t acpi_device_attr_show(struct kobject *kobj,
 {
         struct acpi_device *device = to_acpi_device(kobj);
         struct acpi_device_attribute *attribute = to_handle_attr(attr);
-        return attribute->show ? attribute->show(device, buf) : 0;
+        return attribute->show ? attribute->show(device, buf) : -EIO;
 }
 static ssize_t acpi_device_attr_store(struct kobject *kobj,
                 struct attribute *attr, const char *buf, size_t len)
 {
         struct acpi_device *device = to_acpi_device(kobj);
         struct acpi_device_attribute *attribute = to_handle_attr(attr);
-        return attribute->store ? attribute->store(device, buf, len) : len;
+        return attribute->store ? attribute->store(device, buf, len) : -EIO;
 }
 
 static struct sysfs_ops acpi_device_sysfs_ops = {
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
index d1dcd8eae3c9..5b77188527a9 100644
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
@@ -39,7 +39,8 @@ ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
   fore_200e-objs                += fore200e_pca_fw.o
   # guess the target endianess to choose the right PCA-200E firmware image
   ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
-    CONFIG_ATM_FORE200E_PCA_FW = $(shell if test -n "`$(CC) -E -dM $(src)/../../include/asm/byteorder.h | grep ' __LITTLE_ENDIAN '`"; then echo $(obj)/pca200e.bin; else echo $(obj)/pca200e_ecd.bin2; fi)
+    byteorder.h                 := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h
+    CONFIG_ATM_FORE200E_PCA_FW  := $(obj)/pca200e$(if $(shell $(CC) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
   endif
 endif
 
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 9e65bfb85ba3..5f702199543a 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -383,8 +383,7 @@ fore200e_shutdown(struct fore200e* fore200e)
     switch(fore200e->state) {
 
     case FORE200E_STATE_COMPLETE:
-        if (fore200e->stats)
-            kfree(fore200e->stats);
+        kfree(fore200e->stats);
 
     case FORE200E_STATE_IRQ:
         free_irq(fore200e->irq, fore200e->atm_dev);
@@ -963,8 +962,7 @@ fore200e_tx_irq(struct fore200e* fore200e)
                 entry, txq->tail, entry->vc_map, entry->skb);
 
         /* free copy of misaligned data */
-        if (entry->data)
-            kfree(entry->data);
+        kfree(entry->data);
         
         /* remove DMA mapping */
         fore200e->bus->dma_unmap(fore200e, entry->tpd->tsd[ 0 ].buffer, entry->tpd->tsd[ 0 ].length,
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 3022c548a132..df2c83fd5496 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -412,8 +412,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
 init_one_failure:
         if (atm_dev)
                 atm_dev_deregister(atm_dev);
-        if (he_dev)
-                kfree(he_dev);
+        kfree(he_dev);
         pci_disable_device(pci_dev);
         return err;
 }
@@ -2534,8 +2533,7 @@ he_open(struct atm_vcc *vcc)
 open_failed:
 
         if (err) {
-                if (he_vcc)
-                        kfree(he_vcc);
+                kfree(he_vcc);
                 clear_bit(ATM_VF_ADDR, &vcc->flags);
         }
         else
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 85bf5c8442b0..b2a7b754fd14 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -676,10 +676,10 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
    PRINTK("nicstar%d: RSQ base at 0x%x.\n", i, (u32) card->rsq.base);
       
    /* Initialize SCQ0, the only VBR SCQ used */
-   card->scq1 = (scq_info *) NULL;
-   card->scq2 = (scq_info *) NULL;
+   card->scq1 = NULL;
+   card->scq2 = NULL;
    card->scq0 = get_scq(VBR_SCQSIZE, NS_VRSCD0);
-   if (card->scq0 == (scq_info *) NULL)
+   if (card->scq0 == NULL)
    {
       printk("nicstar%d: can't get SCQ0.\n", i);
       error = 12;
@@ -993,24 +993,24 @@ static scq_info *get_scq(int size, u32 scd)
    int i;
 
    if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
-      return (scq_info *) NULL;
+      return NULL;
 
    scq = (scq_info *) kmalloc(sizeof(scq_info), GFP_KERNEL);
-   if (scq == (scq_info *) NULL)
-      return (scq_info *) NULL;
+   if (scq == NULL)
+      return NULL;
    scq->org = kmalloc(2 * size, GFP_KERNEL);
    if (scq->org == NULL)
    {
       kfree(scq);
-      return (scq_info *) NULL;
+      return NULL;
    }
    scq->skb = (struct sk_buff **) kmalloc(sizeof(struct sk_buff *) *
                                           (size / NS_SCQE_SIZE), GFP_KERNEL);
-   if (scq->skb == (struct sk_buff **) NULL)
+   if (scq->skb == NULL)
    {
       kfree(scq->org);
       kfree(scq);
-      return (scq_info *) NULL;
+      return NULL;
    }
    scq->num_entries = size / NS_SCQE_SIZE;
    scq->base = (ns_scqe *) ALIGN_ADDRESS(scq->org, size);
@@ -1498,7 +1498,7 @@ static int ns_open(struct atm_vcc *vcc)
          vc->cbr_scd = NS_FRSCD + frscdi * NS_FRSCD_SIZE;
 
          scq = get_scq(CBR_SCQSIZE, vc->cbr_scd);
-         if (scq == (scq_info *) NULL)
+         if (scq == NULL)
          {
             PRINTK("nicstar%d: can't get fixed rate SCQ.\n", card->index);
             card->scd2vc[frscdi] = NULL;
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 47a800519ad0..8d5e65cb9755 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -902,7 +902,7 @@ static void close_tx(struct atm_vcc *vcc)
                 zatm_dev->tx_bw += vcc->qos.txtp.min_pcr;
                 dealloc_shaper(vcc->dev,zatm_vcc->shaper);
         }
-        if (zatm_vcc->ring) kfree(zatm_vcc->ring);
+        kfree(zatm_vcc->ring);
 }
 
 
@@ -1339,12 +1339,9 @@ static int __init zatm_start(struct atm_dev *dev)
         return 0;
     out:
         for (i = 0; i < NR_MBX; i++)
-                if (zatm_dev->mbx_start[i] != 0)
-                        kfree((void *) zatm_dev->mbx_start[i]);
-        if (zatm_dev->rx_map != NULL)
-                kfree(zatm_dev->rx_map);
-        if (zatm_dev->tx_map != NULL)
-                kfree(zatm_dev->tx_map);
+                kfree(zatm_dev->mbx_start[i]);
+        kfree(zatm_dev->rx_map);
+        kfree(zatm_dev->tx_map);
         free_irq(zatm_dev->irq, dev);
         return error;
 }
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index a47928a2e575..66d9c4643fc1 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -1,7 +1,7 @@
 # Makefile for the Linux device tree
 
-obj-y                   := core.o sys.o bus.o \
-                           driver.o class.o class_simple.o platform.o \
+obj-y                   := core.o sys.o bus.o dd.o \
+                           driver.o class.o platform.o \
                            cpu.o firmware.o init.o map.o dmapool.o \
                            attribute_container.o transport_class.o
 obj-y                   += power/
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 8d1e8bd48632..645f62692920 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -4,6 +4,8 @@ extern void bus_remove_device(struct device * dev);
 extern int bus_add_driver(struct device_driver *);
 extern void bus_remove_driver(struct device_driver *);
 
+extern void driver_detach(struct device_driver * drv);
+
 static inline struct class_device *to_class_dev(struct kobject *obj)
 {
         return container_of(obj, struct class_device, kobj);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 3cb04bb04c2b..43722af90bdd 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -17,9 +17,6 @@
 #include "base.h"
 #include "power/power.h"
 
-#define to_dev(node) container_of(node, struct device, bus_list)
-#define to_drv(node) container_of(node, struct device_driver, kobj.entry)
-
 #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
 #define to_bus(obj) container_of(obj, struct bus_type, subsys.kset.kobj)
 
@@ -36,7 +33,7 @@ drv_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
 {
         struct driver_attribute * drv_attr = to_drv_attr(attr);
         struct device_driver * drv = to_driver(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (drv_attr->show)
                 ret = drv_attr->show(drv, buf);
@@ -49,7 +46,7 @@ drv_attr_store(struct kobject * kobj, struct attribute * attr,
 {
         struct driver_attribute * drv_attr = to_drv_attr(attr);
         struct device_driver * drv = to_driver(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (drv_attr->store)
                 ret = drv_attr->store(drv, buf, count);
@@ -135,50 +132,11 @@ static struct kobj_type ktype_bus = {
 
 decl_subsys(bus, &ktype_bus, NULL);
 
-static int __bus_for_each_dev(struct bus_type *bus, struct device *start,
-                              void *data, int (*fn)(struct device *, void *))
-{
-        struct list_head *head;
-        struct device *dev;
-        int error = 0;
-
-        if (!(bus = get_bus(bus)))
-                return -EINVAL;
-
-        head = &bus->devices.list;
-        dev = list_prepare_entry(start, head, bus_list);
-        list_for_each_entry_continue(dev, head, bus_list) {
-                get_device(dev);
-                error = fn(dev, data);
-                put_device(dev);
-                if (error)
-                        break;
-        }
-        put_bus(bus);
-        return error;
-}
 
-static int __bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
-                              void * data, int (*fn)(struct device_driver *, void *))
+static struct device * next_device(struct klist_iter * i)
 {
-        struct list_head *head;
-        struct device_driver *drv;
-        int error = 0;
-
-        if (!(bus = get_bus(bus)))
-                return -EINVAL;
-
-        head = &bus->drivers.list;
-        drv = list_prepare_entry(start, head, kobj.entry);
-        list_for_each_entry_continue(drv, head, kobj.entry) {
-                get_driver(drv);
-                error = fn(drv, data);
-                put_driver(drv);
-                if (error)
-                        break;
-        }
-        put_bus(bus);
-        return error;
+        struct klist_node * n = klist_next(i);
+        return n ? container_of(n, struct device, knode_bus) : NULL;
 }
 
 /**
@@ -204,12 +162,27 @@ static int __bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
 int bus_for_each_dev(struct bus_type * bus, struct device * start,
                      void * data, int (*fn)(struct device *, void *))
 {
-        int ret;
+        struct klist_iter i;
+        struct device * dev;
+        int error = 0;
 
-        down_read(&bus->subsys.rwsem);
-        ret = __bus_for_each_dev(bus, start, data, fn);
-        up_read(&bus->subsys.rwsem);
-        return ret;
+        if (!bus)
+                return -EINVAL;
+
+        klist_iter_init_node(&bus->klist_devices, &i,
+                             (start ? &start->knode_bus : NULL));
+        while ((dev = next_device(&i)) && !error)
+                error = fn(dev, data);
+        klist_iter_exit(&i);
+        return error;
+}
+
+
+
+static struct device_driver * next_driver(struct klist_iter * i)
+{
+        struct klist_node * n = klist_next(i);
+        return n ? container_of(n, struct device_driver, knode_bus) : NULL;
 }
 
 /**
@@ -235,179 +208,19 @@ int bus_for_each_dev(struct bus_type * bus, struct device * start,
 int bus_for_each_drv(struct bus_type * bus, struct device_driver * start,
                      void * data, int (*fn)(struct device_driver *, void *))
 {
-        int ret;
-
-        down_read(&bus->subsys.rwsem);
-        ret = __bus_for_each_drv(bus, start, data, fn);
-        up_read(&bus->subsys.rwsem);
-        return ret;
-}
-
-/**
- *      device_bind_driver - bind a driver to one device.
- *      @dev:   device.
- *
- *      Allow manual attachment of a driver to a device.
- *      Caller must have already set @dev->driver.
- *
- *      Note that this does not modify the bus reference count
- *      nor take the bus's rwsem. Please verify those are accounted
- *      for before calling this. (It is ok to call with no other effort
- *      from a driver's probe() method.)
- */
-
-void device_bind_driver(struct device * dev)
-{
-        pr_debug("bound device '%s' to driver '%s'\n",
-                 dev->bus_id, dev->driver->name);
-        list_add_tail(&dev->driver_list, &dev->driver->devices);
-        sysfs_create_link(&dev->driver->kobj, &dev->kobj,
-                          kobject_name(&dev->kobj));
-        sysfs_create_link(&dev->kobj, &dev->driver->kobj, "driver");
-}
-
-
-/**
- *      driver_probe_device - attempt to bind device & driver.
- *      @drv:   driver.
- *      @dev:   device.
- *
- *      First, we call the bus's match function, if one present, which
- *      should compare the device IDs the driver supports with the
- *      device IDs of the device. Note we don't do this ourselves
- *      because we don't know the format of the ID structures, nor what
- *      is to be considered a match and what is not.
- *
- *      If we find a match, we call @drv->probe(@dev) if it exists, and
- *      call device_bind_driver() above.
- */
-int driver_probe_device(struct device_driver * drv, struct device * dev)
-{
-        if (drv->bus->match && !drv->bus->match(dev, drv))
-                return -ENODEV;
-
-        dev->driver = drv;
-        if (drv->probe) {
-                int error = drv->probe(dev);
-                if (error) {
-                        dev->driver = NULL;
-                        return error;
-                }
-        }
-
-        device_bind_driver(dev);
-        return 0;
-}
-
-
-/**
- *      device_attach - try to attach device to a driver.
- *      @dev:   device.
- *
- *      Walk the list of drivers that the bus has and call
- *      driver_probe_device() for each pair. If a compatible
- *      pair is found, break out and return.
- */
-int device_attach(struct device * dev)
-{
-        struct bus_type * bus = dev->bus;
-        struct list_head * entry;
-        int error;
-
-        if (dev->driver) {
-                device_bind_driver(dev);
-                return 1;
-        }
-
-        if (bus->match) {
-                list_for_each(entry, &bus->drivers.list) {
-                        struct device_driver * drv = to_drv(entry);
-                        error = driver_probe_device(drv, dev);
-                        if (!error)
-                                /* success, driver matched */
-                                return 1;
-                        if (error != -ENODEV && error != -ENXIO)
-                                /* driver matched but the probe failed */
-                                printk(KERN_WARNING
-                                    "%s: probe of %s failed with error %d\n",
-                                    drv->name, dev->bus_id, error);
-                }
-        }
-
-        return 0;
-}
-
-
-/**
- *      driver_attach - try to bind driver to devices.
- *      @drv:   driver.
- *
- *      Walk the list of devices that the bus has on it and try to
- *      match the driver with each one.  If driver_probe_device()
- *      returns 0 and the @dev->driver is set, we've found a
- *      compatible pair.
- *
- *      Note that we ignore the -ENODEV error from driver_probe_device(),
- *      since it's perfectly valid for a driver not to bind to any devices.
- */
-void driver_attach(struct device_driver * drv)
-{
-        struct bus_type * bus = drv->bus;
-        struct list_head * entry;
-        int error;
-
-        if (!bus->match)
-                return;
-
-        list_for_each(entry, &bus->devices.list) {
-                struct device * dev = container_of(entry, struct device, bus_list);
-                if (!dev->driver) {
-                        error = driver_probe_device(drv, dev);
-                        if (error && (error != -ENODEV))
-                                /* driver matched but the probe failed */
-                                printk(KERN_WARNING
-                                    "%s: probe of %s failed with error %d\n",
-                                    drv->name, dev->bus_id, error);
-                }
-        }
-}
-
-
-/**
- *      device_release_driver - manually detach device from driver.
- *      @dev:   device.
- *
- *      Manually detach device from driver.
- *      Note that this is called without incrementing the bus
- *      reference count nor taking the bus's rwsem. Be sure that
- *      those are accounted for before calling this function.
- */
-
-void device_release_driver(struct device * dev)
-{
-        struct device_driver * drv = dev->driver;
-        if (drv) {
-                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
-                sysfs_remove_link(&dev->kobj, "driver");
-                list_del_init(&dev->driver_list);
-                if (drv->remove)
-                        drv->remove(dev);
-                dev->driver = NULL;
-        }
-}
-
+        struct klist_iter i;
+        struct device_driver * drv;
+        int error = 0;
 
-/**
- *      driver_detach - detach driver from all devices it controls.
- *      @drv:   driver.
- */
+        if (!bus)
+                return -EINVAL;
 
-static void driver_detach(struct device_driver * drv)
-{
-        while (!list_empty(&drv->devices)) {
-                struct device * dev = container_of(drv->devices.next, struct device, driver_list);
-                device_release_driver(dev);
-        }
+        klist_iter_init_node(&bus->klist_drivers, &i,
+                             start ? &start->knode_bus : NULL);
+        while ((drv = next_driver(&i)) && !error)
+                error = fn(drv, data);
+        klist_iter_exit(&i);
+        return error;
 }
 
 static int device_add_attrs(struct bus_type * bus, struct device * dev)
@@ -456,14 +269,15 @@ int bus_add_device(struct device * dev)
         int error = 0;
 
         if (bus) {
-                down_write(&dev->bus->subsys.rwsem);
                 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
-                list_add_tail(&dev->bus_list, &dev->bus->devices.list);
-                device_attach(dev);
-                up_write(&dev->bus->subsys.rwsem);
-                device_add_attrs(bus, dev);
-                sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
-                sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
+                error = device_attach(dev);
+                klist_add_tail(&bus->klist_devices, &dev->knode_bus);
+                if (error >= 0)
+                        error = device_add_attrs(bus, dev);
+                if (!error) {
+                        sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
+                        sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
+                }
         }
         return error;
 }
@@ -483,11 +297,9 @@ void bus_remove_device(struct device * dev)
                 sysfs_remove_link(&dev->kobj, "bus");
                 sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
                 device_remove_attrs(dev->bus, dev);
-                down_write(&dev->bus->subsys.rwsem);
+                klist_remove(&dev->knode_bus);
                 pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
                 device_release_driver(dev);
-                list_del_init(&dev->bus_list);
-                up_write(&dev->bus->subsys.rwsem);
                 put_bus(dev->bus);
         }
 }
@@ -547,9 +359,8 @@ int bus_add_driver(struct device_driver * drv)
                         return error;
                 }
 
-                down_write(&bus->subsys.rwsem);
                 driver_attach(drv);
-                up_write(&bus->subsys.rwsem);
+                klist_add_tail(&bus->klist_drivers, &drv->knode_bus);
                 module_add_driver(drv->owner, drv);
 
                 driver_add_attrs(bus, drv);
@@ -571,10 +382,9 @@ void bus_remove_driver(struct device_driver * drv)
 {
         if (drv->bus) {
                 driver_remove_attrs(drv->bus, drv);
-                down_write(&drv->bus->subsys.rwsem);
+                klist_remove(&drv->knode_bus);
                 pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
                 driver_detach(drv);
-                up_write(&drv->bus->subsys.rwsem);
                 module_remove_driver(drv);
                 kobject_unregister(&drv->kobj);
                 put_bus(drv->bus);
@@ -587,7 +397,7 @@ static int bus_rescan_devices_helper(struct device *dev, void *data)
 {
         int *count = data;
 
-        if (!dev->driver && device_attach(dev))
+        if (!dev->driver && (device_attach(dev) > 0))
                 (*count)++;
 
         return 0;
@@ -607,9 +417,7 @@ int bus_rescan_devices(struct bus_type * bus)
 {
         int count = 0;
 
-        down_write(&bus->subsys.rwsem);
-        __bus_for_each_dev(bus, NULL, &count, bus_rescan_devices_helper);
-        up_write(&bus->subsys.rwsem);
+        bus_for_each_dev(bus, NULL, &count, bus_rescan_devices_helper);
 
         return count;
 }
@@ -710,6 +518,9 @@ int bus_register(struct bus_type * bus)
         retval = kset_register(&bus->drivers);
         if (retval)
                 goto bus_drivers_fail;
+
+        klist_init(&bus->klist_devices);
+        klist_init(&bus->klist_drivers);
         bus_add_attrs(bus);
 
         pr_debug("bus type '%s' registered\n", bus->name);
@@ -749,12 +560,6 @@ int __init buses_init(void)
 EXPORT_SYMBOL_GPL(bus_for_each_dev);
 EXPORT_SYMBOL_GPL(bus_for_each_drv);
 
-EXPORT_SYMBOL_GPL(driver_probe_device);
-EXPORT_SYMBOL_GPL(device_bind_driver);
-EXPORT_SYMBOL_GPL(device_release_driver);
-EXPORT_SYMBOL_GPL(device_attach);
-EXPORT_SYMBOL_GPL(driver_attach);
-
 EXPORT_SYMBOL_GPL(bus_add_device);
 EXPORT_SYMBOL_GPL(bus_remove_device);
 EXPORT_SYMBOL_GPL(bus_register);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index d2a2f8f2b4ed..479c12570881 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/kdev_t.h>
+#include <linux/err.h>
 #include "base.h"
 
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
@@ -26,7 +27,7 @@ class_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
 {
         struct class_attribute * class_attr = to_class_attr(attr);
         struct class * dc = to_class(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (class_attr->show)
                 ret = class_attr->show(dc, buf);
@@ -39,7 +40,7 @@ class_attr_store(struct kobject * kobj, struct attribute * attr,
 {
         struct class_attribute * class_attr = to_class_attr(attr);
         struct class * dc = to_class(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (class_attr->store)
                 ret = class_attr->store(dc, buf, count);
@@ -162,6 +163,69 @@ void class_unregister(struct class * cls)
         subsystem_unregister(&cls->subsys);
 }
 
+static void class_create_release(struct class *cls)
+{
+        kfree(cls);
+}
+
+static void class_device_create_release(struct class_device *class_dev)
+{
+        kfree(class_dev);
+}
+
+/**
+ * class_create - create a struct class structure
+ * @owner: pointer to the module that is to "own" this struct class
+ * @name: pointer to a string for the name of this class.
+ *
+ * This is used to create a struct class pointer that can then be used
+ * in calls to class_device_create().
+ *
+ * Note, the pointer created here is to be destroyed when finished by
+ * making a call to class_destroy().
+ */
+struct class *class_create(struct module *owner, char *name)
+{
+        struct class *cls;
+        int retval;
+
+        cls = kmalloc(sizeof(struct class), GFP_KERNEL);
+        if (!cls) {
+                retval = -ENOMEM;
+                goto error;
+        }
+        memset(cls, 0x00, sizeof(struct class));
+
+        cls->name = name;
+        cls->owner = owner;
+        cls->class_release = class_create_release;
+        cls->release = class_device_create_release;
+
+        retval = class_register(cls);
+        if (retval)
+                goto error;
+
+        return cls;
+
+error:
+        kfree(cls);
+        return ERR_PTR(retval);
+}
+
+/**
+ * class_destroy - destroys a struct class structure
+ * @cs: pointer to the struct class that is to be destroyed
+ *
+ * Note, the pointer to be destroyed must have been created with a call
+ * to class_create().
+ */
+void class_destroy(struct class *cls)
+{
+        if ((cls == NULL) || (IS_ERR(cls)))
+                return;
+
+        class_unregister(cls);
+}
 
 /* Class Device Stuff */
 
@@ -262,7 +326,7 @@ static int class_hotplug_filter(struct kset *kset, struct kobject *kobj)
         return 0;
 }
 
-static char *class_hotplug_name(struct kset *kset, struct kobject *kobj)
+static const char *class_hotplug_name(struct kset *kset, struct kobject *kobj)
 {
         struct class_device *class_dev = to_class_dev(kobj);
 
@@ -375,7 +439,6 @@ static ssize_t show_dev(struct class_device *class_dev, char *buf)
 {
         return print_dev_t(buf, class_dev->devt);
 }
-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
 
 void class_device_initialize(struct class_device *class_dev)
 {
@@ -412,7 +475,31 @@ int class_device_add(struct class_device *class_dev)
         if ((error = kobject_add(&class_dev->kobj)))
                 goto register_done;
 
-        /* now take care of our own registration */
+        /* add the needed attributes to this device */
+        if (MAJOR(class_dev->devt)) {
+                struct class_device_attribute *attr;
+                attr = kmalloc(sizeof(*attr), GFP_KERNEL);
+                if (!attr) {
+                        error = -ENOMEM;
+                        kobject_del(&class_dev->kobj);
+                        goto register_done;
+                }
+                memset(attr, sizeof(*attr), 0x00);
+                attr->attr.name = "dev";
+                attr->attr.mode = S_IRUGO;
+                attr->attr.owner = parent->owner;
+                attr->show = show_dev;
+                attr->store = NULL;
+                class_device_create_file(class_dev, attr);
+                class_dev->devt_attr = attr;
+        }
+
+        class_device_add_attrs(class_dev);
+        if (class_dev->dev)
+                sysfs_create_link(&class_dev->kobj,
+                                  &class_dev->dev->kobj, "device");
+
+        /* notify any interfaces this device is now here */
         if (parent) {
                 down(&parent->sem);
                 list_add_tail(&class_dev->node, &parent->children);
@@ -421,16 +508,8 @@ int class_device_add(struct class_device *class_dev)
                                 class_intf->add(class_dev);
                 up(&parent->sem);
         }
-
-        if (MAJOR(class_dev->devt))
-                class_device_create_file(class_dev, &class_device_attr_dev);
-
-        class_device_add_attrs(class_dev);
-        if (class_dev->dev)
-                sysfs_create_link(&class_dev->kobj,
-                                  &class_dev->dev->kobj, "device");
-
         kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
+
  register_done:
         if (error && parent)
                 class_put(parent);
@@ -444,6 +523,58 @@ int class_device_register(struct class_device *class_dev)
         return class_device_add(class_dev);
 }
 
+/**
+ * class_device_create - creates a class device and registers it with sysfs
+ * @cs: pointer to the struct class that this device should be registered to.
+ * @dev: the dev_t for the char device to be added.
+ * @device: a pointer to a struct device that is assiociated with this class device.
+ * @fmt: string for the class device's name
+ *
+ * This function can be used by char device classes.  A struct
+ * class_device will be created in sysfs, registered to the specified
+ * class.  A "dev" file will be created, showing the dev_t for the
+ * device.  The pointer to the struct class_device will be returned from
+ * the call.  Any further sysfs files that might be required can be
+ * created using this pointer.
+ *
+ * Note: the struct class passed to this function must have previously
+ * been created with a call to class_create().
+ */
+struct class_device *class_device_create(struct class *cls, dev_t devt,
+                                         struct device *device, char *fmt, ...)
+{
+        va_list args;
+        struct class_device *class_dev = NULL;
+        int retval = -ENODEV;
+
+        if (cls == NULL || IS_ERR(cls))
+                goto error;
+
+        class_dev = kmalloc(sizeof(struct class_device), GFP_KERNEL);
+        if (!class_dev) {
+                retval = -ENOMEM;
+                goto error;
+        }
+        memset(class_dev, 0x00, sizeof(struct class_device));
+
+        class_dev->devt = devt;
+        class_dev->dev = device;
+        class_dev->class = cls;
+
+        va_start(args, fmt);
+        vsnprintf(class_dev->class_id, BUS_ID_SIZE, fmt, args);
+        va_end(args);
+        retval = class_device_register(class_dev);
+        if (retval)
+                goto error;
+
+        return class_dev;
+
+error:
+        kfree(class_dev);
+        return ERR_PTR(retval);
+}
+
 void class_device_del(struct class_device *class_dev)
 {
         struct class * parent = class_dev->class;
@@ -460,6 +591,11 @@ void class_device_del(struct class_device *class_dev)
 
         if (class_dev->dev)
                 sysfs_remove_link(&class_dev->kobj, "device");
+        if (class_dev->devt_attr) {
+                class_device_remove_file(class_dev, class_dev->devt_attr);
+                kfree(class_dev->devt_attr);
+                class_dev->devt_attr = NULL;
+        }
         class_device_remove_attrs(class_dev);
 
         kobject_hotplug(&class_dev->kobj, KOBJ_REMOVE);
@@ -477,6 +613,32 @@ void class_device_unregister(struct class_device *class_dev)
         class_device_put(class_dev);
 }
 
+/**
+ * class_device_destroy - removes a class device that was created with class_device_create()
+ * @cls: the pointer to the struct class that this device was registered * with.
+ * @dev: the dev_t of the device that was previously registered.
+ *
+ * This call unregisters and cleans up a class device that was created with a
+ * call to class_device_create()
+ */
+void class_device_destroy(struct class *cls, dev_t devt)
+{
+        struct class_device *class_dev = NULL;
+        struct class_device *class_dev_tmp;
+
+        down(&cls->sem);
+        list_for_each_entry(class_dev_tmp, &cls->children, node) {
+                if (class_dev_tmp->devt == devt) {
+                        class_dev = class_dev_tmp;
+                        break;
+                }
+        }
+        up(&cls->sem);
+
+        if (class_dev)
+                class_device_unregister(class_dev);
+}
+
 int class_device_rename(struct class_device *class_dev, char *new_name)
 {
         int error = 0;
@@ -576,6 +738,8 @@ EXPORT_SYMBOL_GPL(class_register);
 EXPORT_SYMBOL_GPL(class_unregister);
 EXPORT_SYMBOL_GPL(class_get);
 EXPORT_SYMBOL_GPL(class_put);
+EXPORT_SYMBOL_GPL(class_create);
+EXPORT_SYMBOL_GPL(class_destroy);
 
 EXPORT_SYMBOL_GPL(class_device_register);
 EXPORT_SYMBOL_GPL(class_device_unregister);
@@ -584,6 +748,8 @@ EXPORT_SYMBOL_GPL(class_device_add);
 EXPORT_SYMBOL_GPL(class_device_del);
 EXPORT_SYMBOL_GPL(class_device_get);
 EXPORT_SYMBOL_GPL(class_device_put);
+EXPORT_SYMBOL_GPL(class_device_create);
+EXPORT_SYMBOL_GPL(class_device_destroy);
 EXPORT_SYMBOL_GPL(class_device_create_file);
 EXPORT_SYMBOL_GPL(class_device_remove_file);
 EXPORT_SYMBOL_GPL(class_device_create_bin_file);
diff --git a/drivers/base/class_simple.c b/drivers/base/class_simple.c
deleted file mode 100644
index 27699eb20a37..000000000000
--- a/drivers/base/class_simple.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * class_simple.c - a "simple" interface for classes for simple char devices.
- *
- * Copyright (c) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (c) 2003-2004 IBM Corp.
- *
- * This file is released under the GPLv2
- *
- */
-
-#include <linux/config.h>
-#include <linux/device.h>
-#include <linux/err.h>
-
-struct class_simple {
-        struct class class;
-};
-#define to_class_simple(d) container_of(d, struct class_simple, class)
-
-struct simple_dev {
-        struct list_head node;
-        struct class_device class_dev;
-};
-#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
-
-static LIST_HEAD(simple_dev_list);
-static DEFINE_SPINLOCK(simple_dev_list_lock);
-
-static void release_simple_dev(struct class_device *class_dev)
-{
-        struct simple_dev *s_dev = to_simple_dev(class_dev);
-        kfree(s_dev);
-}
-
-static void class_simple_release(struct class *class)
-{
-        struct class_simple *cs = to_class_simple(class);
-        kfree(cs);
-}
-
-/**
- * class_simple_create - create a struct class_simple structure
- * @owner: pointer to the module that is to "own" this struct class_simple
- * @name: pointer to a string for the name of this class.
- *
- * This is used to create a struct class_simple pointer that can then be used
- * in calls to class_simple_device_add().  This is used when you do not wish to
- * create a full blown class support for a type of char devices.
- *
- * Note, the pointer created here is to be destroyed when finished by making a
- * call to class_simple_destroy().
- */
-struct class_simple *class_simple_create(struct module *owner, char *name)
-{
-        struct class_simple *cs;
-        int retval;
-
-        cs = kmalloc(sizeof(*cs), GFP_KERNEL);
-        if (!cs) {
-                retval = -ENOMEM;
-                goto error;
-        }
-        memset(cs, 0x00, sizeof(*cs));
-
-        cs->class.name = name;
-        cs->class.class_release = class_simple_release;
-        cs->class.release = release_simple_dev;
-
-        retval = class_register(&cs->class);
-        if (retval)
-                goto error;
-
-        return cs;
-
-error:
-        kfree(cs);
-        return ERR_PTR(retval);
-}
-EXPORT_SYMBOL(class_simple_create);
-
-/**
- * class_simple_destroy - destroys a struct class_simple structure
- * @cs: pointer to the struct class_simple that is to be destroyed
- *
- * Note, the pointer to be destroyed must have been created with a call to
- * class_simple_create().
- */
-void class_simple_destroy(struct class_simple *cs)
-{
-        if ((cs == NULL) || (IS_ERR(cs)))
-                return;
-
-        class_unregister(&cs->class);
-}
-EXPORT_SYMBOL(class_simple_destroy);
-
-/**
- * class_simple_device_add - adds a class device to sysfs for a character driver
- * @cs: pointer to the struct class_simple that this device should be registered to.
- * @dev: the dev_t for the device to be added.
- * @device: a pointer to a struct device that is assiociated with this class device.
- * @fmt: string for the class device's name
- *
- * This function can be used by simple char device classes that do not
- * implement their own class device registration.  A struct class_device will
- * be created in sysfs, registered to the specified class.  A "dev" file will
- * be created, showing the dev_t for the device.  The pointer to the struct
- * class_device will be returned from the call.  Any further sysfs files that
- * might be required can be created using this pointer.
- * Note: the struct class_simple passed to this function must have previously been
- * created with a call to class_simple_create().
- */
-struct class_device *class_simple_device_add(struct class_simple *cs, dev_t dev, struct device *device, const char *fmt, ...)
-{
-        va_list args;
-        struct simple_dev *s_dev = NULL;
-        int retval;
-
-        if ((cs == NULL) || (IS_ERR(cs))) {
-                retval = -ENODEV;
-                goto error;
-        }
-
-        s_dev = kmalloc(sizeof(*s_dev), GFP_KERNEL);
-        if (!s_dev) {
-                retval = -ENOMEM;
-                goto error;
-        }
-        memset(s_dev, 0x00, sizeof(*s_dev));
-
-        s_dev->class_dev.devt = dev;
-        s_dev->class_dev.dev = device;
-        s_dev->class_dev.class = &cs->class;
-
-        va_start(args, fmt);
-        vsnprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, fmt, args);
-        va_end(args);
-        retval = class_device_register(&s_dev->class_dev);
-        if (retval)
-                goto error;
-
-        spin_lock(&simple_dev_list_lock);
-        list_add(&s_dev->node, &simple_dev_list);
-        spin_unlock(&simple_dev_list_lock);
-
-        return &s_dev->class_dev;
-
-error:
-        kfree(s_dev);
-        return ERR_PTR(retval);
-}
-EXPORT_SYMBOL(class_simple_device_add);
-
-/**
- * class_simple_set_hotplug - set the hotplug callback in the embedded struct class
- * @cs: pointer to the struct class_simple to hold the pointer
- * @hotplug: function pointer to the hotplug function
- *
- * Implement and set a hotplug function to add environment variables specific to this
- * class on the hotplug event.
- */
-int class_simple_set_hotplug(struct class_simple *cs,
-        int (*hotplug)(struct class_device *dev, char **envp, int num_envp, char *buffer, int buffer_size))
-{
-        if ((cs == NULL) || (IS_ERR(cs)))
-                return -ENODEV;
-        cs->class.hotplug = hotplug;
-        return 0;
-}
-EXPORT_SYMBOL(class_simple_set_hotplug);
-
-/**
- * class_simple_device_remove - removes a class device that was created with class_simple_device_add()
- * @dev: the dev_t of the device that was previously registered.
- *
- * This call unregisters and cleans up a class device that was created with a
- * call to class_device_simple_add()
- */
-void class_simple_device_remove(dev_t dev)
-{
-        struct simple_dev *s_dev = NULL;
-        int found = 0;
-
-        spin_lock(&simple_dev_list_lock);
-        list_for_each_entry(s_dev, &simple_dev_list, node) {
-                if (s_dev->class_dev.devt == dev) {
-                        found = 1;
-                        break;
-                }
-        }
-        if (found) {
-                list_del(&s_dev->node);
-                spin_unlock(&simple_dev_list_lock);
-                class_device_unregister(&s_dev->class_dev);
-        } else {
-                spin_unlock(&simple_dev_list_lock);
-        }
-}
-EXPORT_SYMBOL(class_simple_device_remove);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index fbc223486f81..86d79755fbfb 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -36,10 +36,10 @@ dev_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
 {
         struct device_attribute * dev_attr = to_dev_attr(attr);
         struct device * dev = to_dev(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (dev_attr->show)
-                ret = dev_attr->show(dev, buf);
+                ret = dev_attr->show(dev, dev_attr, buf);
         return ret;
 }
 
@@ -49,10 +49,10 @@ dev_attr_store(struct kobject * kobj, struct attribute * attr,
 {
         struct device_attribute * dev_attr = to_dev_attr(attr);
         struct device * dev = to_dev(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (dev_attr->store)
-                ret = dev_attr->store(dev, buf, count);
+                ret = dev_attr->store(dev, dev_attr, buf, count);
         return ret;
 }
 
@@ -102,7 +102,7 @@ static int dev_hotplug_filter(struct kset *kset, struct kobject *kobj)
         return 0;
 }
 
-static char *dev_hotplug_name(struct kset *kset, struct kobject *kobj)
+static const char *dev_hotplug_name(struct kset *kset, struct kobject *kobj)
 {
         struct device *dev = to_dev(kobj);
 
@@ -207,11 +207,9 @@ void device_initialize(struct device *dev)
 {
         kobj_set_kset_s(dev, devices_subsys);
         kobject_init(&dev->kobj);
-        INIT_LIST_HEAD(&dev->node);
-        INIT_LIST_HEAD(&dev->children);
-        INIT_LIST_HEAD(&dev->driver_list);
-        INIT_LIST_HEAD(&dev->bus_list);
+        klist_init(&dev->klist_children);
         INIT_LIST_HEAD(&dev->dma_pools);
+        init_MUTEX(&dev->sem);
 }
 
 /**
@@ -250,10 +248,8 @@ int device_add(struct device *dev)
                 goto PMError;
         if ((error = bus_add_device(dev)))
                 goto BusError;
-        down_write(&devices_subsys.rwsem);
         if (parent)
-                list_add_tail(&dev->node, &parent->children);
-        up_write(&devices_subsys.rwsem);
+                klist_add_tail(&parent->klist_children, &dev->knode_parent);
 
         /* notify platform of device entry */
         if (platform_notify)
@@ -336,10 +332,8 @@ void device_del(struct device * dev)
 {
         struct device * parent = dev->parent;
 
-        down_write(&devices_subsys.rwsem);
         if (parent)
-                list_del_init(&dev->node);
-        up_write(&devices_subsys.rwsem);
+                klist_remove(&dev->knode_parent);
 
         /* Notify the platform of the removal, in case they
          * need to do anything...
@@ -373,6 +367,12 @@ void device_unregister(struct device * dev)
 }
 
 
+static struct device * next_device(struct klist_iter * i)
+{
+        struct klist_node * n = klist_next(i);
+        return n ? container_of(n, struct device, knode_parent) : NULL;
+}
+
 /**
  *      device_for_each_child - device child iterator.
  *      @dev:   parent struct device.
@@ -385,39 +385,20 @@ void device_unregister(struct device * dev)
  *      We check the return of @fn each time. If it returns anything
  *      other than 0, we break out and return that value.
  */
-int device_for_each_child(struct device * dev, void * data,
+int device_for_each_child(struct device * parent, void * data,
                      int (*fn)(struct device *, void *))
 {
+        struct klist_iter i;
         struct device * child;
         int error = 0;
 
-        down_read(&devices_subsys.rwsem);
-        list_for_each_entry(child, &dev->children, node) {
-                if((error = fn(child, data)))
-                        break;
-        }
-        up_read(&devices_subsys.rwsem);
+        klist_iter_init(&parent->klist_children, &i);
+        while ((child = next_device(&i)) && !error)
+                error = fn(child, data);
+        klist_iter_exit(&i);
         return error;
 }
 
-/**
- *      device_find - locate device on a bus by name.
- *      @name:  name of the device.
- *      @bus:   bus to scan for the device.
- *
- *      Call kset_find_obj() to iterate over list of devices on
- *      a bus to find device by name. Return device if found.
- *
- *      Note that kset_find_obj increments device's reference count.
- */
-struct device *device_find(const char *name, struct bus_type *bus)
-{
-        struct kobject *k = kset_find_obj(&bus->devices, name);
-        if (k)
-                return to_dev(k);
-        return NULL;
-}
-
 int __init devices_init(void)
 {
         return subsystem_register(&devices_subsys);
@@ -433,7 +414,6 @@ EXPORT_SYMBOL_GPL(device_del);
 EXPORT_SYMBOL_GPL(device_unregister);
 EXPORT_SYMBOL_GPL(get_device);
 EXPORT_SYMBOL_GPL(put_device);
-EXPORT_SYMBOL_GPL(device_find);
 
 EXPORT_SYMBOL_GPL(device_create_file);
 EXPORT_SYMBOL_GPL(device_remove_file);
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
new file mode 100644
index 000000000000..6db3a789c54f
--- /dev/null
+++ b/drivers/base/dd.c
@@ -0,0 +1,248 @@
+/*
+ *      drivers/base/dd.c - The core device/driver interactions.
+ *
+ *      This file contains the (sometimes tricky) code that controls the
+ *      interactions between devices and drivers, which primarily includes
+ *      driver binding and unbinding.
+ *
+ *      All of this code used to exist in drivers/base/bus.c, but was
+ *      relocated to here in the name of compartmentalization (since it wasn't
+ *      strictly code just for the 'struct bus_type'.
+ *
+ *      Copyright (c) 2002-5 Patrick Mochel
+ *      Copyright (c) 2002-3 Open Source Development Labs
+ *
+ *      This file is released under the GPLv2
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+
+#include "base.h"
+#include "power/power.h"
+
+#define to_drv(node) container_of(node, struct device_driver, kobj.entry)
+
+
+/**
+ *      device_bind_driver - bind a driver to one device.
+ *      @dev:   device.
+ *
+ *      Allow manual attachment of a driver to a device.
+ *      Caller must have already set @dev->driver.
+ *
+ *      Note that this does not modify the bus reference count
+ *      nor take the bus's rwsem. Please verify those are accounted
+ *      for before calling this. (It is ok to call with no other effort
+ *      from a driver's probe() method.)
+ *
+ *      This function must be called with @dev->sem held.
+ */
+void device_bind_driver(struct device * dev)
+{
+        pr_debug("bound device '%s' to driver '%s'\n",
+                 dev->bus_id, dev->driver->name);
+        klist_add_tail(&dev->driver->klist_devices, &dev->knode_driver);
+        sysfs_create_link(&dev->driver->kobj, &dev->kobj,
+                          kobject_name(&dev->kobj));
+        sysfs_create_link(&dev->kobj, &dev->driver->kobj, "driver");
+}
+
+/**
+ *      driver_probe_device - attempt to bind device & driver.
+ *      @drv:   driver.
+ *      @dev:   device.
+ *
+ *      First, we call the bus's match function, if one present, which
+ *      should compare the device IDs the driver supports with the
+ *      device IDs of the device. Note we don't do this ourselves
+ *      because we don't know the format of the ID structures, nor what
+ *      is to be considered a match and what is not.
+ *
+ *
+ *      This function returns 1 if a match is found, an error if one
+ *      occurs (that is not -ENODEV or -ENXIO), and 0 otherwise.
+ *
+ *      This function must be called with @dev->sem held.
+ */
+static int driver_probe_device(struct device_driver * drv, struct device * dev)
+{
+        int ret = 0;
+
+        if (drv->bus->match && !drv->bus->match(dev, drv))
+                goto Done;
+
+        pr_debug("%s: Matched Device %s with Driver %s\n",
+                 drv->bus->name, dev->bus_id, drv->name);
+        dev->driver = drv;
+        if (drv->probe) {
+                ret = drv->probe(dev);
+                if (ret) {
+                        dev->driver = NULL;
+                        goto ProbeFailed;
+                }
+        }
+        device_bind_driver(dev);
+        ret = 1;
+        pr_debug("%s: Bound Device %s to Driver %s\n",
+                 drv->bus->name, dev->bus_id, drv->name);
+        goto Done;
+
+ ProbeFailed:
+        if (ret == -ENODEV || ret == -ENXIO) {
+                /* Driver matched, but didn't support device
+                 * or device not found.
+                 * Not an error; keep going.
+                 */
+                ret = 0;
+        } else {
+                /* driver matched but the probe failed */
+                printk(KERN_WARNING
+                       "%s: probe of %s failed with error %d\n",
+                       drv->name, dev->bus_id, ret);
+        }
+ Done:
+        return ret;
+}
+
+static int __device_attach(struct device_driver * drv, void * data)
+{
+        struct device * dev = data;
+        return driver_probe_device(drv, dev);
+}
+
+/**
+ *      device_attach - try to attach device to a driver.
+ *      @dev:   device.
+ *
+ *      Walk the list of drivers that the bus has and call
+ *      driver_probe_device() for each pair. If a compatible
+ *      pair is found, break out and return.
+ *
+ *      Returns 1 if the device was bound to a driver;
+ *      0 if no matching device was found; error code otherwise.
+ */
+int device_attach(struct device * dev)
+{
+        int ret = 0;
+
+        down(&dev->sem);
+        if (dev->driver) {
+                device_bind_driver(dev);
+                ret = 1;
+        } else
+                ret = bus_for_each_drv(dev->bus, NULL, dev, __device_attach);
+        up(&dev->sem);
+        return ret;
+}
+
+static int __driver_attach(struct device * dev, void * data)
+{
+        struct device_driver * drv = data;
+
+        /*
+         * Lock device and try to bind to it. We drop the error
+         * here and always return 0, because we need to keep trying
+         * to bind to devices and some drivers will return an error
+         * simply if it didn't support the device.
+         *
+         * driver_probe_device() will spit a warning if there
+         * is an error.
+         */
+
+        down(&dev->sem);
+        if (!dev->driver)
+                driver_probe_device(drv, dev);
+        up(&dev->sem);
+
+
+        return 0;
+}
+
+/**
+ *      driver_attach - try to bind driver to devices.
+ *      @drv:   driver.
+ *
+ *      Walk the list of devices that the bus has on it and try to
+ *      match the driver with each one.  If driver_probe_device()
+ *      returns 0 and the @dev->driver is set, we've found a
+ *      compatible pair.
+ */
+void driver_attach(struct device_driver * drv)
+{
+        bus_for_each_dev(drv->bus, NULL, drv, __driver_attach);
+}
+
+/**
+ *      device_release_driver - manually detach device from driver.
+ *      @dev:   device.
+ *
+ *      Manually detach device from driver.
+ *
+ *      __device_release_driver() must be called with @dev->sem held.
+ */
+
+static void __device_release_driver(struct device * dev)
+{
+        struct device_driver * drv;
+
+        drv = dev->driver;
+        if (drv) {
+                get_driver(drv);
+                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+                sysfs_remove_link(&dev->kobj, "driver");
+                klist_remove(&dev->knode_driver);
+
+                if (drv->remove)
+                        drv->remove(dev);
+                dev->driver = NULL;
+                put_driver(drv);
+        }
+}
+
+void device_release_driver(struct device * dev)
+{
+        /*
+         * If anyone calls device_release_driver() recursively from
+         * within their ->remove callback for the same device, they
+         * will deadlock right here.
+         */
+        down(&dev->sem);
+        __device_release_driver(dev);
+        up(&dev->sem);
+}
+
+
+/**
+ * driver_detach - detach driver from all devices it controls.
+ * @drv: driver.
+ */
+void driver_detach(struct device_driver * drv)
+{
+        struct device * dev;
+
+        for (;;) {
+                spin_lock_irq(&drv->klist_devices.k_lock);
+                if (list_empty(&drv->klist_devices.k_list)) {
+                        spin_unlock_irq(&drv->klist_devices.k_lock);
+                        break;
+                }
+                dev = list_entry(drv->klist_devices.k_list.prev,
+                                struct device, knode_driver.n_node);
+                get_device(dev);
+                spin_unlock_irq(&drv->klist_devices.k_lock);
+
+                down(&dev->sem);
+                if (dev->driver == drv)
+                        __device_release_driver(dev);
+                up(&dev->sem);
+                put_device(dev);
+        }
+}
+
+
+EXPORT_SYMBOL_GPL(device_bind_driver);
+EXPORT_SYMBOL_GPL(device_release_driver);
+EXPORT_SYMBOL_GPL(device_attach);
+EXPORT_SYMBOL_GPL(driver_attach);
+
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index f48833df61a2..c4aebf2f522d 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -41,7 +41,7 @@ struct dma_page {	/* cacheable header for 'allocation' bytes */
 static DECLARE_MUTEX (pools_lock);
 
 static ssize_t
-show_pools (struct device *dev, char *buf)
+show_pools (struct device *dev, struct device_attribute *attr, char *buf)
 {
         unsigned temp;
         unsigned size;
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 3b269f7e5213..1b645886e9eb 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -18,6 +18,43 @@
 #define to_dev(node) container_of(node, struct device, driver_list)
 #define to_drv(obj) container_of(obj, struct device_driver, kobj)
 
+
+static struct device * next_device(struct klist_iter * i)
+{
+        struct klist_node * n = klist_next(i);
+        return n ? container_of(n, struct device, knode_driver) : NULL;
+}
+
+/**
+ *      driver_for_each_device - Iterator for devices bound to a driver.
+ *      @drv:   Driver we're iterating.
+ *      @data:  Data to pass to the callback.
+ *      @fn:    Function to call for each device.
+ *
+ *      Iterate over the @drv's list of devices calling @fn for each one.
+ */
+
+int driver_for_each_device(struct device_driver * drv, struct device * start, 
+                           void * data, int (*fn)(struct device *, void *))
+{
+        struct klist_iter i;
+        struct device * dev;
+        int error = 0;
+
+        if (!drv)
+                return -EINVAL;
+
+        klist_iter_init_node(&drv->klist_devices, &i,
+                             start ? &start->knode_driver : NULL);
+        while ((dev = next_device(&i)) && !error)
+                error = fn(dev, data);
+        klist_iter_exit(&i);
+        return error;
+}
+
+EXPORT_SYMBOL_GPL(driver_for_each_device);
+
+
 /**
  *      driver_create_file - create sysfs file for driver.
  *      @drv:   driver.
@@ -85,7 +122,7 @@ void put_driver(struct device_driver * drv)
  */
 int driver_register(struct device_driver * drv)
 {
-        INIT_LIST_HEAD(&drv->devices);
+        klist_init(&drv->klist_devices);
         init_completion(&drv->unloaded);
         return bus_add_driver(drv);
 }
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 583d57ec49a8..904b27caf697 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -87,7 +87,7 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
         for (i = 0; i < MAX_NR_ZONES; i++) {
                 struct zone *z = &pg->node_zones[i];
                 for (cpu = 0; cpu < NR_CPUS; cpu++) {
-                        struct per_cpu_pageset *ps = &z->pageset[cpu];
+                        struct per_cpu_pageset *ps = zone_pcp(z,cpu);
                         numa_hit += ps->numa_hit;
                         numa_miss += ps->numa_miss;
                         numa_foreign += ps->numa_foreign;
@@ -136,7 +136,7 @@ static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);
  *
  * Initialize and register the node device.
  */
-int __init register_node(struct node *node, int num, struct node *parent)
+int register_node(struct node *node, int num, struct node *parent)
 {
         int error;
 
@@ -153,8 +153,24 @@ int __init register_node(struct node *node, int num, struct node *parent)
         return error;
 }
 
+/**
+ * unregister_node - unregister a node device
+ * @node: node going away
+ *
+ * Unregisters a node device @node.  All the devices on the node must be
+ * unregistered before calling this function.
+ */
+void unregister_node(struct node *node)
+{
+        sysdev_remove_file(&node->sysdev, &attr_cpumap);
+        sysdev_remove_file(&node->sysdev, &attr_meminfo);
+        sysdev_remove_file(&node->sysdev, &attr_numastat);
+        sysdev_remove_file(&node->sysdev, &attr_distance);
+
+        sysdev_unregister(&node->sysdev);
+}
 
-int __init register_node_type(void)
+static int __init register_node_type(void)
 {
         return sysdev_class_register(&node_class);
 }
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 26468971ef5a..bdd96b03b885 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -22,6 +22,9 @@ extern int sysdev_resume(void);
 
 int resume_device(struct device * dev)
 {
+        int error = 0;
+
+        down(&dev->sem);
         if (dev->power.pm_parent
                         && dev->power.pm_parent->power.power_state) {
                 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
@@ -31,9 +34,10 @@ int resume_device(struct device * dev)
         }
         if (dev->bus && dev->bus->resume) {
                 dev_dbg(dev,"resuming\n");
-                return dev->bus->resume(dev);
+                error = dev->bus->resume(dev);
         }
-        return 0;
+        up(&dev->sem);
+        return error;
 }
 
 
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 0ec44ef840be..2ccee3763acf 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -39,6 +39,7 @@ int suspend_device(struct device * dev, pm_message_t state)
 {
         int error = 0;
 
+        down(&dev->sem);
         if (dev->power.power_state) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
                         dev->power.power_state, state);
@@ -58,7 +59,7 @@ int suspend_device(struct device * dev, pm_message_t state)
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
-
+        up(&dev->sem);
         return error;
 }
 
@@ -113,8 +114,19 @@ int device_suspend(pm_message_t state)
                 put_device(dev);
         }
         up(&dpm_list_sem);
-        if (error)
+        if (error) {
+                /* we failed... before resuming, bring back devices from
+                 * dpm_off_irq list back to main dpm_off list, we do want
+                 * to call resume() on them, in case they partially suspended
+                 * despite returning -EAGAIN
+                 */
+                while (!list_empty(&dpm_off_irq)) {
+                        struct list_head * entry = dpm_off_irq.next;
+                        list_del(entry);
+                        list_add(entry, &dpm_off);
+                }
                 dpm_resume();
+        }
         up(&dpm_sem);
         return error;
 }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 6ac96349a8e8..f82b3df9545f 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -24,12 +24,12 @@
  *      low-power state.
  */
 
-static ssize_t state_show(struct device * dev, char * buf)
+static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
         return sprintf(buf, "%u\n", dev->power.power_state);
 }
 
-static ssize_t state_store(struct device * dev, const char * buf, size_t n)
+static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
         u32 state;
         char * rest;
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 9102e3756f95..f37a13de804a 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -37,7 +37,7 @@ sysdev_show(struct kobject * kobj, struct attribute * attr, char * buffer)
 
         if (sysdev_attr->show)
                 return sysdev_attr->show(sysdev, buffer);
-        return 0;
+        return -EIO;
 }
 
 
@@ -50,7 +50,7 @@ sysdev_store(struct kobject * kobj, struct attribute * attr,
 
         if (sysdev_attr->store)
                 return sysdev_attr->store(sysdev, buffer, count);
-        return 0;
+        return -EIO;
 }
 
 static struct sysfs_ops sysfs_ops = {
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 14aeca3e2e8c..45a243096187 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -36,7 +36,7 @@ static int emsgs_head_idx, emsgs_tail_idx;
 static struct semaphore emsgs_sema;
 static spinlock_t emsgs_lock;
 static int nblocked_emsgs_readers;
-static struct class_simple *aoe_class;
+static struct class *aoe_class;
 static struct aoe_chardev chardevs[] = {
         { MINOR_ERR, "err" },
         { MINOR_DISCOVER, "discover" },
@@ -218,13 +218,13 @@ aoechr_init(void)
         }
         sema_init(&emsgs_sema, 0);
         spin_lock_init(&emsgs_lock);
-        aoe_class = class_simple_create(THIS_MODULE, "aoe");
+        aoe_class = class_create(THIS_MODULE, "aoe");
         if (IS_ERR(aoe_class)) {
                 unregister_chrdev(AOE_MAJOR, "aoechr");
                 return PTR_ERR(aoe_class);
         }
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                class_simple_device_add(aoe_class,
+                class_device_create(aoe_class,
                                         MKDEV(AOE_MAJOR, chardevs[i].minor),
                                         NULL, chardevs[i].name);
 
@@ -237,8 +237,8 @@ aoechr_exit(void)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                class_simple_device_remove(MKDEV(AOE_MAJOR, chardevs[i].minor));
-        class_simple_destroy(aoe_class);
+                class_device_destroy(aoe_class, MKDEV(AOE_MAJOR, chardevs[i].minor));
+        class_destroy(aoe_class);
         unregister_chrdev(AOE_MAJOR, "aoechr");
 }
 
diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
index a9575bb58a5e..638db06de2be 100644
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
@@ -2044,7 +2044,7 @@ as_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
         struct as_fs_entry *entry = to_as(attr);
 
         if (!entry->show)
-                return 0;
+                return -EIO;
 
         return entry->show(e->elevator_data, page);
 }
@@ -2057,7 +2057,7 @@ as_attr_store(struct kobject *kobj, struct attribute *attr,
         struct as_fs_entry *entry = to_as(attr);
 
         if (!entry->store)
-                return -EINVAL;
+                return -EIO;
 
         return entry->store(e->elevator_data, page, length);
 }
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 8f7c1a1ed7f4..abde27027c06 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -41,6 +41,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
+#include <linux/dma-mapping.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/completion.h>
@@ -126,8 +127,6 @@ static struct board_type products[] = {
 #define MAX_CTLR_ORIG   8
 
 
-#define CCISS_DMA_MASK  0xFFFFFFFF      /* 32 bit DMA */
-
 static ctlr_info_t *hba[MAX_CTLR];
 
 static void do_cciss_request(request_queue_t *q);
@@ -2393,11 +2392,6 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
                 printk(KERN_ERR "cciss: Unable to Enable PCI device\n");
                 return( -1);
         }
-        if (pci_set_dma_mask(pdev, CCISS_DMA_MASK ) != 0)
-        {
-                printk(KERN_ERR "cciss:  Unable to set DMA mask\n");
-                return(-1);
-        }
 
         subsystem_vendor_id = pdev->subsystem_vendor;
         subsystem_device_id = pdev->subsystem_device;
@@ -2747,9 +2741,9 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         hba[i]->pdev = pdev;
 
         /* configure PCI DMA stuff */
-        if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL))
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))
                 printk("cciss: using DAC cycles\n");
-        else if (!pci_set_dma_mask(pdev, 0xffffffff))
+        else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
                 printk("cciss: not using DAC cycles\n");
         else {
                 printk("cciss: no suitable DMA available\n");
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index 0ef7a0065ece..3ac47dde64da 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -1202,13 +1202,16 @@ retry:
                 if (new_cfqq) {
                         cfqq = new_cfqq;
                         new_cfqq = NULL;
-                } else if (gfp_mask & __GFP_WAIT) {
+                } else {
                         spin_unlock_irq(cfqd->queue->queue_lock);
                         new_cfqq = kmem_cache_alloc(cfq_pool, gfp_mask);
                         spin_lock_irq(cfqd->queue->queue_lock);
+
+                        if (!new_cfqq && !(gfp_mask & __GFP_WAIT))
+                                goto out;
+
                         goto retry;
-                } else
-                        goto out;
+                }
 
                 memset(cfqq, 0, sizeof(*cfqq));
 
@@ -1772,7 +1775,7 @@ cfq_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
         struct cfq_fs_entry *entry = to_cfq(attr);
 
         if (!entry->show)
-                return 0;
+                return -EIO;
 
         return entry->show(e->elevator_data, page);
 }
@@ -1785,7 +1788,7 @@ cfq_attr_store(struct kobject *kobj, struct attribute *attr,
         struct cfq_fs_entry *entry = to_cfq(attr);
 
         if (!entry->store)
-                return -EINVAL;
+                return -EIO;
 
         return entry->store(e->elevator_data, page, length);
 }
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index d63d34c671f7..7f79f3dd0165 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -886,7 +886,7 @@ deadline_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
         struct deadline_fs_entry *entry = to_deadline(attr);
 
         if (!entry->show)
-                return 0;
+                return -EIO;
 
         return entry->show(e->elevator_data, page);
 }
@@ -899,7 +899,7 @@ deadline_attr_store(struct kobject *kobj, struct attribute *attr,
         struct deadline_fs_entry *entry = to_deadline(attr);
 
         if (!entry->store)
-                return -EINVAL;
+                return -EIO;
 
         return entry->store(e->elevator_data, page, length);
 }
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 6b79b4314622..f831f08f839c 100644
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -220,11 +220,6 @@ void elevator_exit(elevator_t *e)
         kfree(e);
 }
 
-static int elevator_global_init(void)
-{
-        return 0;
-}
-
 int elv_merge(request_queue_t *q, struct request **req, struct bio *bio)
 {
         elevator_t *e = q->elevator;
@@ -291,6 +286,13 @@ void elv_requeue_request(request_queue_t *q, struct request *rq)
         }
 
         /*
+         * the request is prepped and may have some resources allocated.
+         * allowing unprepped requests to pass this one may cause resource
+         * deadlock.  turn on softbarrier.
+         */
+        rq->flags |= REQ_SOFTBARRIER;
+
+        /*
          * if iosched has an explicit requeue hook, then use that. otherwise
          * just put the request at the front of the queue
          */
@@ -322,7 +324,7 @@ void __elv_add_request(request_queue_t *q, struct request *rq, int where,
                         int nrq = q->rq.count[READ] + q->rq.count[WRITE]
                                   - q->in_flight;
 
-                        if (nrq == q->unplug_thresh)
+                        if (nrq >= q->unplug_thresh)
                                 __generic_unplug_device(q);
                 }
         } else
@@ -386,6 +388,12 @@ struct request *elv_next_request(request_queue_t *q)
                 if (ret == BLKPREP_OK) {
                         break;
                 } else if (ret == BLKPREP_DEFER) {
+                        /*
+                         * the request may have been (partially) prepped.
+                         * we need to keep this request in the front to
+                         * avoid resource deadlock.  turn on softbarrier.
+                         */
+                        rq->flags |= REQ_SOFTBARRIER;
                         rq = NULL;
                         break;
                 } else if (ret == BLKPREP_KILL) {
@@ -692,8 +700,6 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name)
         return len;
 }
 
-module_init(elevator_global_init);
-
 EXPORT_SYMBOL(elv_add_request);
 EXPORT_SYMBOL(__elv_add_request);
 EXPORT_SYMBOL(elv_requeue_request);
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 8bbe01d4b487..53f7d846b747 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -322,7 +322,7 @@ static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr,
         struct gendisk *disk = to_disk(kobj);
         struct disk_attribute *disk_attr =
                 container_of(attr,struct disk_attribute,attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (disk_attr->show)
                 ret = disk_attr->show(disk,page);
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 11ef9d9ea139..81fe3a0c1fe7 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -2038,7 +2038,6 @@ EXPORT_SYMBOL(blk_requeue_request);
  * @rq:         request to be inserted
  * @at_head:    insert request at head or tail of queue
  * @data:       private data
- * @reinsert:   true if request it a reinsertion of previously processed one
  *
  * Description:
  *    Many block devices need to execute commands asynchronously, so they don't
@@ -2053,8 +2052,9 @@ EXPORT_SYMBOL(blk_requeue_request);
  *    host that is unable to accept a particular command.
  */
 void blk_insert_request(request_queue_t *q, struct request *rq,
-                        int at_head, void *data, int reinsert)
+                        int at_head, void *data)
 {
+        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
         unsigned long flags;
 
         /*
@@ -2071,20 +2071,12 @@ void blk_insert_request(request_queue_t *q, struct request *rq,
         /*
          * If command is tagged, release the tag
          */
-        if (reinsert)
-                blk_requeue_request(q, rq);
-        else {
-                int where = ELEVATOR_INSERT_BACK;
-
-                if (at_head)
-                        where = ELEVATOR_INSERT_FRONT;
+        if (blk_rq_tagged(rq))
+                blk_queue_end_tag(q, rq);
 
-                if (blk_rq_tagged(rq))
-                        blk_queue_end_tag(q, rq);
+        drive_stat_acct(rq, rq->nr_sectors, 1);
+        __elv_add_request(q, rq, where, 0);
 
-                drive_stat_acct(rq, rq->nr_sectors, 1);
-                __elv_add_request(q, rq, where, 0);
-        }
         if (blk_queue_plugged(q))
                 __generic_unplug_device(q);
         else
@@ -3582,7 +3574,7 @@ queue_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
 
         q = container_of(kobj, struct request_queue, kobj);
         if (!entry->show)
-                return 0;
+                return -EIO;
 
         return entry->show(q, page);
 }
@@ -3596,7 +3588,7 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,
 
         q = container_of(kobj, struct request_queue, kobj);
         if (!entry->store)
-                return -EINVAL;
+                return -EIO;
 
         return entry->store(q, page, length);
 }
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 202a5a74ad37..fa49d62626ba 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -723,7 +723,7 @@ static int pd_special_command(struct pd_unit *disk,
         rq.ref_count = 1;
         rq.waiting = &wait;
         rq.end_io = blk_end_sync_rq;
-        blk_insert_request(disk->gd->queue, &rq, 0, func, 0);
+        blk_insert_request(disk->gd->queue, &rq, 0, func);
         wait_for_completion(&wait);
         rq.waiting = NULL;
         if (rq.errors)
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index dbeb107bb971..84d8e291ed96 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -222,7 +222,7 @@ static int pg_identify(struct pg *dev, int log);
 
 static char pg_scratch[512];    /* scratch block buffer */
 
-static struct class_simple *pg_class;
+static struct class *pg_class;
 
 /* kernel glue structures */
 
@@ -666,7 +666,7 @@ static int __init pg_init(void)
                 err = -1;
                 goto out;
         }
-        pg_class = class_simple_create(THIS_MODULE, "pg");
+        pg_class = class_create(THIS_MODULE, "pg");
         if (IS_ERR(pg_class)) {
                 err = PTR_ERR(pg_class);
                 goto out_chrdev;
@@ -675,7 +675,7 @@ static int __init pg_init(void)
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
                 if (dev->present) {
-                        class_simple_device_add(pg_class, MKDEV(major, unit), 
+                        class_device_create(pg_class, MKDEV(major, unit),
                                         NULL, "pg%u", unit);
                         err = devfs_mk_cdev(MKDEV(major, unit),
                                       S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",
@@ -688,8 +688,8 @@ static int __init pg_init(void)
         goto out;
 
 out_class:
-        class_simple_device_remove(MKDEV(major, unit));
-        class_simple_destroy(pg_class);
+        class_device_destroy(pg_class, MKDEV(major, unit));
+        class_destroy(pg_class);
 out_chrdev:
         unregister_chrdev(major, "pg");
 out:
@@ -703,11 +703,11 @@ static void __exit pg_exit(void)
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
                 if (dev->present) {
-                        class_simple_device_remove(MKDEV(major, unit));
+                        class_device_destroy(pg_class, MKDEV(major, unit));
                         devfs_remove("pg/%u", unit);
                 }
         }
-        class_simple_destroy(pg_class);
+        class_destroy(pg_class);
         devfs_remove("pg");
         unregister_chrdev(major, name);
 
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 8fbd6922fe0d..5fe8ee86f095 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -242,7 +242,7 @@ static struct file_operations pt_fops = {
 };
 
 /* sysfs class support */
-static struct class_simple *pt_class;
+static struct class *pt_class;
 
 static inline int status_reg(struct pi_adapter *pi)
 {
@@ -963,7 +963,7 @@ static int __init pt_init(void)
                 err = -1;
                 goto out;
         }
-        pt_class = class_simple_create(THIS_MODULE, "pt");
+        pt_class = class_create(THIS_MODULE, "pt");
         if (IS_ERR(pt_class)) {
                 err = PTR_ERR(pt_class);
                 goto out_chrdev;
@@ -972,29 +972,29 @@ static int __init pt_init(void)
         devfs_mk_dir("pt");
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
-                        class_simple_device_add(pt_class, MKDEV(major, unit), 
+                        class_device_create(pt_class, MKDEV(major, unit),
                                         NULL, "pt%d", unit);
                         err = devfs_mk_cdev(MKDEV(major, unit),
                                       S_IFCHR | S_IRUSR | S_IWUSR,
                                       "pt/%d", unit);
                         if (err) {
-                                class_simple_device_remove(MKDEV(major, unit));
+                                class_device_destroy(pt_class, MKDEV(major, unit));
                                 goto out_class;
                         }
-                        class_simple_device_add(pt_class, MKDEV(major, unit + 128),
+                        class_device_create(pt_class, MKDEV(major, unit + 128),
                                         NULL, "pt%dn", unit);
                         err = devfs_mk_cdev(MKDEV(major, unit + 128),
                                       S_IFCHR | S_IRUSR | S_IWUSR,
                                       "pt/%dn", unit);
                         if (err) {
-                                class_simple_device_remove(MKDEV(major, unit + 128));
+                                class_device_destroy(pt_class, MKDEV(major, unit + 128));
                                 goto out_class;
                         }
                 }
         goto out;
 
 out_class:
-        class_simple_destroy(pt_class);
+        class_destroy(pt_class);
 out_chrdev:
         unregister_chrdev(major, "pt");
 out:
@@ -1006,12 +1006,12 @@ static void __exit pt_exit(void)
         int unit;
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
-                        class_simple_device_remove(MKDEV(major, unit));
+                        class_device_destroy(pt_class, MKDEV(major, unit));
                         devfs_remove("pt/%d", unit);
-                        class_simple_device_remove(MKDEV(major, unit + 128));
+                        class_device_destroy(pt_class, MKDEV(major, unit + 128));
                         devfs_remove("pt/%dn", unit);
                 }
-        class_simple_destroy(pt_class);
+        class_destroy(pt_class);
         devfs_remove("pt");
         unregister_chrdev(major, name);
         for (unit = 0; unit < PT_UNITS; unit++)
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 797f5988c2b5..5ed3a6379452 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -614,7 +614,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx)
         spin_unlock_irq(&host->lock);
 
         DPRINTK("blk_insert_request, tag == %u\n", idx);
-        blk_insert_request(host->oob_q, crq->rq, 1, crq, 0);
+        blk_insert_request(host->oob_q, crq->rq, 1, crq);
 
         return 0;
 
@@ -653,7 +653,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func)
         crq->msg_bucket = (u32) rc;
 
         DPRINTK("blk_insert_request, tag == %u\n", idx);
-        blk_insert_request(host->oob_q, crq->rq, 1, crq, 0);
+        blk_insert_request(host->oob_q, crq->rq, 1, crq);
 
         return 0;
 }
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index ce42889f98fb..685f061e69b2 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -8,13 +8,12 @@
  * and is not licensed separately. See file COPYING for details.
  *
  * TODO (sorted by decreasing priority)
+ *  -- Kill first_open (Al Viro fixed the block layer now)
  *  -- Do resets with usb_device_reset (needs a thread context, use khubd)
  *  -- set readonly flag for CDs, set removable flag for CF readers
  *  -- do inquiry and verify we got a disk and not a tape (for LUN mismatch)
- *  -- support pphaneuf's SDDR-75 with two LUNs (also broken capacity...)
  *  -- special case some senses, e.g. 3a/0 -> no media present, reduce retries
  *  -- verify the 13 conditions and do bulk resets
- *  -- normal pool of commands instead of cmdv[]?
  *  -- kill last_pipe and simply do two-state clearing on both pipes
  *  -- verify protocol (bulk) from USB descriptors (maybe...)
  *  -- highmem and sg
@@ -49,7 +48,14 @@
 #define US_SC_SCSI      0x06            /* Transparent */
 
 /*
+ * This many LUNs per USB device.
+ * Every one of them takes a host, see UB_MAX_HOSTS.
  */
+#define UB_MAX_LUNS   9
+
+/*
+ */
+
 #define UB_MINORS_PER_MAJOR     8
 
 #define UB_MAX_CDB_SIZE      16         /* Corresponds to Bulk */
@@ -65,7 +71,7 @@ struct bulk_cb_wrap {
         u32     Tag;                    /* unique per command id */
         __le32  DataTransferLength;     /* size of data */
         u8      Flags;                  /* direction in bit 0 */
-        u8      Lun;                    /* LUN normally 0 */
+        u8      Lun;                    /* LUN */
         u8      Length;                 /* of of the CDB */
         u8      CDB[UB_MAX_CDB_SIZE];   /* max command */
 };
@@ -168,6 +174,7 @@ struct ub_scsi_cmd {
         unsigned int len;               /* Requested length */
         // struct scatterlist sgv[UB_MAX_REQ_SG];
 
+        struct ub_lun *lun;
         void (*done)(struct ub_dev *, struct ub_scsi_cmd *);
         void *back;
 };
@@ -252,25 +259,47 @@ struct ub_scsi_cmd_queue {
 };
 
 /*
- * The UB device instance.
+ * The block device instance (one per LUN).
+ */
+struct ub_lun {
+        struct ub_dev *udev;
+        struct list_head link;
+        struct gendisk *disk;
+        int id;                         /* Host index */
+        int num;                        /* LUN number */
+        char name[16];
+
+        int changed;                    /* Media was changed */
+        int removable;
+        int readonly;
+        int first_open;                 /* Kludge. See ub_bd_open. */
+
+        /* Use Ingo's mempool if or when we have more than one command. */
+        /*
+         * Currently we never need more than one command for the whole device.
+         * However, giving every LUN a command is a cheap and automatic way
+         * to enforce fairness between them.
+         */
+        int cmda[1];
+        struct ub_scsi_cmd cmdv[1];
+
+        struct ub_capacity capacity; 
+};
+
+/*
+ * The USB device instance.
  */
 struct ub_dev {
         spinlock_t lock;
-        int id;                         /* Number among ub's */
         atomic_t poison;                /* The USB device is disconnected */
         int openc;                      /* protected by ub_lock! */
                                         /* kref is too implicit for our taste */
         unsigned int tagcnt;
-        int changed;                    /* Media was changed */
-        int removable;
-        int readonly;
-        int first_open;                 /* Kludge. See ub_bd_open. */
-        char name[8];
+        char name[12];
         struct usb_device *dev;
         struct usb_interface *intf;
 
-        struct ub_capacity capacity; 
-        struct gendisk *disk;
+        struct list_head luns;
 
         unsigned int send_bulk_pipe;    /* cached pipe values */
         unsigned int recv_bulk_pipe;
@@ -279,10 +308,6 @@ struct ub_dev {
 
         struct tasklet_struct tasklet;
 
-        /* XXX Use Ingo's mempool (once we have more than one) */
-        int cmda[1];
-        struct ub_scsi_cmd cmdv[1];
-
         struct ub_scsi_cmd_queue cmd_queue;
         struct ub_scsi_cmd top_rqs_cmd; /* REQUEST SENSE */
         unsigned char top_sense[UB_SENSE_SIZE];
@@ -301,9 +326,9 @@ struct ub_dev {
 /*
  */
 static void ub_cleanup(struct ub_dev *sc);
-static int ub_bd_rq_fn_1(struct ub_dev *sc, struct request *rq);
-static int ub_cmd_build_block(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
-    struct request *rq);
+static int ub_bd_rq_fn_1(struct ub_lun *lun, struct request *rq);
+static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,
+    struct ub_scsi_cmd *cmd, struct request *rq);
 static int ub_cmd_build_packet(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
     struct request *rq);
 static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd);
@@ -320,8 +345,10 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd);
 static int ub_submit_clear_stall(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
     int stalled_pipe);
 static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd);
-static int ub_sync_tur(struct ub_dev *sc);
-static int ub_sync_read_cap(struct ub_dev *sc, struct ub_capacity *ret);
+static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun);
+static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
+    struct ub_capacity *ret);
+static int ub_probe_lun(struct ub_dev *sc, int lnum);
 
 /*
  */
@@ -342,6 +369,7 @@ MODULE_DEVICE_TABLE(usb, ub_usb_ids);
  */
 #define UB_MAX_HOSTS  26
 static char ub_hostv[UB_MAX_HOSTS];
+
 static DEFINE_SPINLOCK(ub_lock);        /* Locks globals and ->openc */
 
 /*
@@ -402,10 +430,12 @@ static void ub_cmdtr_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
         }
 }
 
-static ssize_t ub_diag_show(struct device *dev, char *page)
+static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr, char *page)
 {
         struct usb_interface *intf;
         struct ub_dev *sc;
+        struct list_head *p;
+        struct ub_lun *lun;
         int cnt;
         unsigned long flags;
         int nc, nh;
@@ -421,9 +451,15 @@ static ssize_t ub_diag_show(struct device *dev, char *page)
         spin_lock_irqsave(&sc->lock, flags);
 
         cnt += sprintf(page + cnt,
-            "qlen %d qmax %d changed %d removable %d readonly %d\n",
-            sc->cmd_queue.qlen, sc->cmd_queue.qmax,
-            sc->changed, sc->removable, sc->readonly);
+            "qlen %d qmax %d\n",
+            sc->cmd_queue.qlen, sc->cmd_queue.qmax);
+
+        list_for_each (p, &sc->luns) {
+                lun = list_entry(p, struct ub_lun, link);
+                cnt += sprintf(page + cnt,
+                    "lun %u changed %d removable %d readonly %d\n",
+                    lun->num, lun->changed, lun->removable, lun->readonly);
+        }
 
         if ((nc = sc->tr.cur + 1) == SCMD_TRACE_SZ) nc = 0;
         for (j = 0; j < SCMD_TRACE_SZ; j++) {
@@ -523,53 +559,63 @@ static void ub_put(struct ub_dev *sc)
  */
 static void ub_cleanup(struct ub_dev *sc)
 {
+        struct list_head *p;
+        struct ub_lun *lun;
         request_queue_t *q;
 
-        /* I don't think queue can be NULL. But... Stolen from sx8.c */
-        if ((q = sc->disk->queue) != NULL)
-                blk_cleanup_queue(q);
+        while (!list_empty(&sc->luns)) {
+                p = sc->luns.next;
+                lun = list_entry(p, struct ub_lun, link);
+                list_del(p);
 
-        /*
-         * If we zero disk->private_data BEFORE put_disk, we have to check
-         * for NULL all over the place in open, release, check_media and
-         * revalidate, because the block level semaphore is well inside the
-         * put_disk. But we cannot zero after the call, because *disk is gone.
-         * The sd.c is blatantly racy in this area.
-         */
-        /* disk->private_data = NULL; */
-        put_disk(sc->disk);
-        sc->disk = NULL;
+                /* I don't think queue can be NULL. But... Stolen from sx8.c */
+                if ((q = lun->disk->queue) != NULL)
+                        blk_cleanup_queue(q);
+                /*
+                 * If we zero disk->private_data BEFORE put_disk, we have
+                 * to check for NULL all over the place in open, release,
+                 * check_media and revalidate, because the block level
+                 * semaphore is well inside the put_disk.
+                 * But we cannot zero after the call, because *disk is gone.
+                 * The sd.c is blatantly racy in this area.
+                 */
+                /* disk->private_data = NULL; */
+                put_disk(lun->disk);
+                lun->disk = NULL;
+
+                ub_id_put(lun->id);
+                kfree(lun);
+        }
 
-        ub_id_put(sc->id);
         kfree(sc);
 }
 
 /*
  * The "command allocator".
  */
-static struct ub_scsi_cmd *ub_get_cmd(struct ub_dev *sc)
+static struct ub_scsi_cmd *ub_get_cmd(struct ub_lun *lun)
 {
         struct ub_scsi_cmd *ret;
 
-        if (sc->cmda[0])
+        if (lun->cmda[0])
                 return NULL;
-        ret = &sc->cmdv[0];
-        sc->cmda[0] = 1;
+        ret = &lun->cmdv[0];
+        lun->cmda[0] = 1;
         return ret;
 }
 
-static void ub_put_cmd(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
+static void ub_put_cmd(struct ub_lun *lun, struct ub_scsi_cmd *cmd)
 {
-        if (cmd != &sc->cmdv[0]) {
+        if (cmd != &lun->cmdv[0]) {
                 printk(KERN_WARNING "%s: releasing a foreign cmd %p\n",
-                    sc->name, cmd);
+                    lun->name, cmd);
                 return;
         }
-        if (!sc->cmda[0]) {
-                printk(KERN_WARNING "%s: releasing a free cmd\n", sc->name);
+        if (!lun->cmda[0]) {
+                printk(KERN_WARNING "%s: releasing a free cmd\n", lun->name);
                 return;
         }
-        sc->cmda[0] = 0;
+        lun->cmda[0] = 0;
 }
 
 /*
@@ -630,29 +676,30 @@ static struct ub_scsi_cmd *ub_cmdq_pop(struct ub_dev *sc)
 
 static void ub_bd_rq_fn(request_queue_t *q)
 {
-        struct ub_dev *sc = q->queuedata;
+        struct ub_lun *lun = q->queuedata;
         struct request *rq;
 
         while ((rq = elv_next_request(q)) != NULL) {
-                if (ub_bd_rq_fn_1(sc, rq) != 0) {
+                if (ub_bd_rq_fn_1(lun, rq) != 0) {
                         blk_stop_queue(q);
                         break;
                 }
         }
 }
 
-static int ub_bd_rq_fn_1(struct ub_dev *sc, struct request *rq)
+static int ub_bd_rq_fn_1(struct ub_lun *lun, struct request *rq)
 {
+        struct ub_dev *sc = lun->udev;
         struct ub_scsi_cmd *cmd;
         int rc;
 
-        if (atomic_read(&sc->poison) || sc->changed) {
+        if (atomic_read(&sc->poison) || lun->changed) {
                 blkdev_dequeue_request(rq);
                 ub_end_rq(rq, 0);
                 return 0;
         }
 
-        if ((cmd = ub_get_cmd(sc)) == NULL)
+        if ((cmd = ub_get_cmd(lun)) == NULL)
                 return -1;
         memset(cmd, 0, sizeof(struct ub_scsi_cmd));
 
@@ -661,32 +708,30 @@ static int ub_bd_rq_fn_1(struct ub_dev *sc, struct request *rq)
         if (blk_pc_request(rq)) {
                 rc = ub_cmd_build_packet(sc, cmd, rq);
         } else {
-                rc = ub_cmd_build_block(sc, cmd, rq);
+                rc = ub_cmd_build_block(sc, lun, cmd, rq);
         }
         if (rc != 0) {
-                ub_put_cmd(sc, cmd);
+                ub_put_cmd(lun, cmd);
                 ub_end_rq(rq, 0);
-                blk_start_queue(sc->disk->queue);
                 return 0;
         }
-
         cmd->state = UB_CMDST_INIT;
+        cmd->lun = lun;
         cmd->done = ub_rw_cmd_done;
         cmd->back = rq;
 
         cmd->tag = sc->tagcnt++;
         if ((rc = ub_submit_scsi(sc, cmd)) != 0) {
-                ub_put_cmd(sc, cmd);
+                ub_put_cmd(lun, cmd);
                 ub_end_rq(rq, 0);
-                blk_start_queue(sc->disk->queue);
                 return 0;
         }
 
         return 0;
 }
 
-static int ub_cmd_build_block(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
-    struct request *rq)
+static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,
+    struct ub_scsi_cmd *cmd, struct request *rq)
 {
         int ub_dir;
 #if 0 /* We use rq->buffer for now */
@@ -707,7 +752,7 @@ static int ub_cmd_build_block(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
         sg = &cmd->sgv[0];
         n_elem = blk_rq_map_sg(q, rq, sg);
         if (n_elem <= 0) {
-                ub_put_cmd(sc, cmd);
+                ub_put_cmd(lun, cmd);
                 ub_end_rq(rq, 0);
                 blk_start_queue(q);
                 return 0;               /* request with no s/g entries? */
@@ -716,7 +761,7 @@ static int ub_cmd_build_block(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
         if (n_elem != 1) {              /* Paranoia */
                 printk(KERN_WARNING "%s: request with %d segments\n",
                     sc->name, n_elem);
-                ub_put_cmd(sc, cmd);
+                ub_put_cmd(lun, cmd);
                 ub_end_rq(rq, 0);
                 blk_start_queue(q);
                 return 0;
@@ -748,8 +793,8 @@ static int ub_cmd_build_block(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
          * The call to blk_queue_hardsect_size() guarantees that request
          * is aligned, but it is given in terms of 512 byte units, always.
          */
-        block = rq->sector >> sc->capacity.bshift;
-        nblks = rq->nr_sectors >> sc->capacity.bshift;
+        block = rq->sector >> lun->capacity.bshift;
+        nblks = rq->nr_sectors >> lun->capacity.bshift;
 
         cmd->cdb[0] = (ub_dir == UB_DIR_READ)? READ_10: WRITE_10;
         /* 10-byte uses 4 bytes of LBA: 2147483648KB, 2097152MB, 2048GB */
@@ -803,7 +848,8 @@ static int ub_cmd_build_packet(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
 static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 {
         struct request *rq = cmd->back;
-        struct gendisk *disk = sc->disk;
+        struct ub_lun *lun = cmd->lun;
+        struct gendisk *disk = lun->disk;
         request_queue_t *q = disk->queue;
         int uptodate;
 
@@ -818,7 +864,7 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
         else
                 uptodate = 0;
 
-        ub_put_cmd(sc, cmd);
+        ub_put_cmd(lun, cmd);
         ub_end_rq(rq, uptodate);
         blk_start_queue(q);
 }
@@ -887,7 +933,7 @@ static int ub_scsi_cmd_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
         bcb->Tag = cmd->tag;            /* Endianness is not important */
         bcb->DataTransferLength = cpu_to_le32(cmd->len);
         bcb->Flags = (cmd->dir == UB_DIR_READ) ? 0x80 : 0;
-        bcb->Lun = 0;                   /* No multi-LUN yet */
+        bcb->Lun = (cmd->lun != NULL) ? cmd->lun->num : 0;
         bcb->Length = cmd->cdb_len;
 
         /* copy the command payload */
@@ -1002,9 +1048,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                          * The control pipe clears itself - nothing to do.
                          * XXX Might try to reset the device here and retry.
                          */
-                        printk(KERN_NOTICE "%s: "
-                            "stall on control pipe for device %u\n",
-                            sc->name, sc->dev->devnum);
+                        printk(KERN_NOTICE "%s: stall on control pipe\n",
+                            sc->name);
                         goto Bad_End;
                 }
 
@@ -1025,9 +1070,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                          * The control pipe clears itself - nothing to do.
                          * XXX Might try to reset the device here and retry.
                          */
-                        printk(KERN_NOTICE "%s: "
-                            "stall on control pipe for device %u\n",
-                            sc->name, sc->dev->devnum);
+                        printk(KERN_NOTICE "%s: stall on control pipe\n",
+                            sc->name);
                         goto Bad_End;
                 }
 
@@ -1046,9 +1090,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                         rc = ub_submit_clear_stall(sc, cmd, sc->last_pipe);
                         if (rc != 0) {
                                 printk(KERN_NOTICE "%s: "
-                                    "unable to submit clear for device %u"
-                                    " (code %d)\n",
-                                    sc->name, sc->dev->devnum, rc);
+                                    "unable to submit clear (%d)\n",
+                                    sc->name, rc);
                                 /*
                                  * This is typically ENOMEM or some other such shit.
                                  * Retrying is pointless. Just do Bad End on it...
@@ -1107,9 +1150,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                         rc = ub_submit_clear_stall(sc, cmd, sc->last_pipe);
                         if (rc != 0) {
                                 printk(KERN_NOTICE "%s: "
-                                    "unable to submit clear for device %u"
-                                    " (code %d)\n",
-                                    sc->name, sc->dev->devnum, rc);
+                                    "unable to submit clear (%d)\n",
+                                    sc->name, rc);
                                 /*
                                  * This is typically ENOMEM or some other such shit.
                                  * Retrying is pointless. Just do Bad End on it...
@@ -1140,9 +1182,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                         rc = ub_submit_clear_stall(sc, cmd, sc->last_pipe);
                         if (rc != 0) {
                                 printk(KERN_NOTICE "%s: "
-                                    "unable to submit clear for device %u"
-                                    " (code %d)\n",
-                                    sc->name, sc->dev->devnum, rc);
+                                    "unable to submit clear (%d)\n",
+                                    sc->name, rc);
                                 /*
                                  * This is typically ENOMEM or some other such shit.
                                  * Retrying is pointless. Just do Bad End on it...
@@ -1164,9 +1205,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                          * encounter such a thing, try to read the CSW again.
                          */
                         if (++cmd->stat_count >= 4) {
-                                printk(KERN_NOTICE "%s: "
-                                    "unable to get CSW on device %u\n",
-                                    sc->name, sc->dev->devnum);
+                                printk(KERN_NOTICE "%s: unable to get CSW\n",
+                                    sc->name);
                                 goto Bad_End;
                         }
                         __ub_state_stat(sc, cmd);
@@ -1207,10 +1247,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                          */
                         if (++cmd->stat_count >= 4) {
                                 printk(KERN_NOTICE "%s: "
-                                    "tag mismatch orig 0x%x reply 0x%x "
-                                    "on device %u\n",
-                                    sc->name, cmd->tag, bcs->Tag,
-                                    sc->dev->devnum);
+                                    "tag mismatch orig 0x%x reply 0x%x\n",
+                                    sc->name, cmd->tag, bcs->Tag);
                                 goto Bad_End;
                         }
                         __ub_state_stat(sc, cmd);
@@ -1244,8 +1282,8 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 
         } else {
                 printk(KERN_WARNING "%s: "
-                    "wrong command state %d on device %u\n",
-                    sc->name, cmd->state, sc->dev->devnum);
+                    "wrong command state %d\n",
+                    sc->name, cmd->state);
                 goto Bad_End;
         }
         return;
@@ -1288,7 +1326,6 @@ static void __ub_state_stat(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 
         if ((rc = usb_submit_urb(&sc->work_urb, GFP_ATOMIC)) != 0) {
                 /* XXX Clear stalls */
-                printk("%s: CSW #%d submit failed (%d)\n", sc->name, cmd->tag, rc); /* P3 */
                 ub_complete(&sc->work_done);
                 ub_state_done(sc, cmd, rc);
                 return;
@@ -1333,6 +1370,7 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
         scmd->state = UB_CMDST_INIT;
         scmd->data = sc->top_sense;
         scmd->len = UB_SENSE_SIZE;
+        scmd->lun = cmd->lun;
         scmd->done = ub_top_sense_done;
         scmd->back = cmd;
 
@@ -1411,14 +1449,14 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd)
         }
         if (cmd != scmd->back) {
                 printk(KERN_WARNING "%s: "
-                    "sense done for wrong command 0x%x on device %u\n",
-                    sc->name, cmd->tag, sc->dev->devnum);
+                    "sense done for wrong command 0x%x\n",
+                    sc->name, cmd->tag);
                 return;
         }
         if (cmd->state != UB_CMDST_SENSE) {
                 printk(KERN_WARNING "%s: "
-                    "sense done with bad cmd state %d on device %u\n",
-                    sc->name, cmd->state, sc->dev->devnum);
+                    "sense done with bad cmd state %d\n",
+                    sc->name, cmd->state);
                 return;
         }
 
@@ -1429,68 +1467,32 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd)
         ub_scsi_urb_compl(sc, cmd);
 }
 
-#if 0
-/* Determine what the maximum LUN supported is */
-int usb_stor_Bulk_max_lun(struct us_data *us)
-{
-        int result;
-
-        /* issue the command */
-        result = usb_stor_control_msg(us, us->recv_ctrl_pipe,
-                                 US_BULK_GET_MAX_LUN, 
-                                 USB_DIR_IN | USB_TYPE_CLASS | 
-                                 USB_RECIP_INTERFACE,
-                                 0, us->ifnum, us->iobuf, 1, HZ);
-
-        /* 
-         * Some devices (i.e. Iomega Zip100) need this -- apparently
-         * the bulk pipes get STALLed when the GetMaxLUN request is
-         * processed.   This is, in theory, harmless to all other devices
-         * (regardless of if they stall or not).
-         */
-        if (result < 0) {
-                usb_stor_clear_halt(us, us->recv_bulk_pipe);
-                usb_stor_clear_halt(us, us->send_bulk_pipe);
-        }
-
-        US_DEBUGP("GetMaxLUN command result is %d, data is %d\n", 
-                  result, us->iobuf[0]);
-
-        /* if we have a successful request, return the result */
-        if (result == 1)
-                return us->iobuf[0];
-
-        /* return the default -- no LUNs */
-        return 0;
-}
-#endif
-
 /*
  * This is called from a process context.
  */
-static void ub_revalidate(struct ub_dev *sc)
+static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun)
 {
 
-        sc->readonly = 0;       /* XXX Query this from the device */
+        lun->readonly = 0;      /* XXX Query this from the device */
 
-        sc->capacity.nsec = 0;
-        sc->capacity.bsize = 512;
-        sc->capacity.bshift = 0;
+        lun->capacity.nsec = 0;
+        lun->capacity.bsize = 512;
+        lun->capacity.bshift = 0;
 
-        if (ub_sync_tur(sc) != 0)
+        if (ub_sync_tur(sc, lun) != 0)
                 return;                 /* Not ready */
-        sc->changed = 0;
+        lun->changed = 0;
 
-        if (ub_sync_read_cap(sc, &sc->capacity) != 0) {
+        if (ub_sync_read_cap(sc, lun, &lun->capacity) != 0) {
                 /*
                  * The retry here means something is wrong, either with the
                  * device, with the transport, or with our code.
                  * We keep this because sd.c has retries for capacity.
                  */
-                if (ub_sync_read_cap(sc, &sc->capacity) != 0) {
-                        sc->capacity.nsec = 0;
-                        sc->capacity.bsize = 512;
-                        sc->capacity.bshift = 0;
+                if (ub_sync_read_cap(sc, lun, &lun->capacity) != 0) {
+                        lun->capacity.nsec = 0;
+                        lun->capacity.bsize = 512;
+                        lun->capacity.bshift = 0;
                 }
         }
 }
@@ -1503,12 +1505,15 @@ static void ub_revalidate(struct ub_dev *sc)
 static int ub_bd_open(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
+        struct ub_lun *lun;
         struct ub_dev *sc;
         unsigned long flags;
         int rc;
 
-        if ((sc = disk->private_data) == NULL)
+        if ((lun = disk->private_data) == NULL)
                 return -ENXIO;
+        sc = lun->udev;
+
         spin_lock_irqsave(&ub_lock, flags);
         if (atomic_read(&sc->poison)) {
                 spin_unlock_irqrestore(&ub_lock, flags);
@@ -1529,15 +1534,15 @@ static int ub_bd_open(struct inode *inode, struct file *filp)
          * The bottom line is, Al Viro says that we should not allow
          * bdev->bd_invalidated to be set when doing add_disk no matter what.
          */
-        if (sc->first_open) {
-                if (sc->changed) {
-                        sc->first_open = 0;
+        if (lun->first_open) {
+                lun->first_open = 0;
+                if (lun->changed) {
                         rc = -ENOMEDIUM;
                         goto err_open;
                 }
         }
 
-        if (sc->removable || sc->readonly)
+        if (lun->removable || lun->readonly)
                 check_disk_change(inode->i_bdev);
 
         /*
@@ -1545,12 +1550,12 @@ static int ub_bd_open(struct inode *inode, struct file *filp)
          * under some pretty murky conditions (a failure of READ CAPACITY).
          * We may need it one day.
          */
-        if (sc->removable && sc->changed && !(filp->f_flags & O_NDELAY)) {
+        if (lun->removable && lun->changed && !(filp->f_flags & O_NDELAY)) {
                 rc = -ENOMEDIUM;
                 goto err_open;
         }
 
-        if (sc->readonly && (filp->f_mode & FMODE_WRITE)) {
+        if (lun->readonly && (filp->f_mode & FMODE_WRITE)) {
                 rc = -EROFS;
                 goto err_open;
         }
@@ -1567,7 +1572,8 @@ err_open:
 static int ub_bd_release(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
-        struct ub_dev *sc = disk->private_data;
+        struct ub_lun *lun = disk->private_data;
+        struct ub_dev *sc = lun->udev;
 
         ub_put(sc);
         return 0;
@@ -1597,20 +1603,14 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp,
  */
 static int ub_bd_revalidate(struct gendisk *disk)
 {
-        struct ub_dev *sc = disk->private_data;
-
-        ub_revalidate(sc);
-        /* This is pretty much a long term P3 */
-        if (!atomic_read(&sc->poison)) {                /* Cover sc->dev */
-                printk(KERN_INFO "%s: device %u capacity nsec %ld bsize %u\n",
-                    sc->name, sc->dev->devnum,
-                    sc->capacity.nsec, sc->capacity.bsize);
-        }
+        struct ub_lun *lun = disk->private_data;
+
+        ub_revalidate(lun->udev, lun);
 
         /* XXX Support sector size switching like in sr.c */
-        blk_queue_hardsect_size(disk->queue, sc->capacity.bsize);
-        set_capacity(disk, sc->capacity.nsec);
-        // set_disk_ro(sdkp->disk, sc->readonly);
+        blk_queue_hardsect_size(disk->queue, lun->capacity.bsize);
+        set_capacity(disk, lun->capacity.nsec);
+        // set_disk_ro(sdkp->disk, lun->readonly);
 
         return 0;
 }
@@ -1626,9 +1626,9 @@ static int ub_bd_revalidate(struct gendisk *disk)
  */
 static int ub_bd_media_changed(struct gendisk *disk)
 {
-        struct ub_dev *sc = disk->private_data;
+        struct ub_lun *lun = disk->private_data;
 
-        if (!sc->removable)
+        if (!lun->removable)
                 return 0;
 
         /*
@@ -1640,12 +1640,12 @@ static int ub_bd_media_changed(struct gendisk *disk)
          * will fail, then block layer discards the data. Since we never
          * spin drives up, such devices simply cannot be used with ub anyway.
          */
-        if (ub_sync_tur(sc) != 0) {
-                sc->changed = 1;
+        if (ub_sync_tur(lun->udev, lun) != 0) {
+                lun->changed = 1;
                 return 1;
         }
 
-        return sc->changed;
+        return lun->changed;
 }
 
 static struct block_device_operations ub_bd_fops = {
@@ -1669,7 +1669,7 @@ static void ub_probe_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 /*
  * Test if the device has a check condition on it, synchronously.
  */
-static int ub_sync_tur(struct ub_dev *sc)
+static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun)
 {
         struct ub_scsi_cmd *cmd;
         enum { ALLOC_SIZE = sizeof(struct ub_scsi_cmd) };
@@ -1688,6 +1688,7 @@ static int ub_sync_tur(struct ub_dev *sc)
         cmd->cdb_len = 6;
         cmd->dir = UB_DIR_NONE;
         cmd->state = UB_CMDST_INIT;
+        cmd->lun = lun;                 /* This may be NULL, but that's ok */
         cmd->done = ub_probe_done;
         cmd->back = &compl;
 
@@ -1718,7 +1719,8 @@ err_alloc:
 /*
  * Read the SCSI capacity synchronously (for probing).
  */
-static int ub_sync_read_cap(struct ub_dev *sc, struct ub_capacity *ret)
+static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
+    struct ub_capacity *ret)
 {
         struct ub_scsi_cmd *cmd;
         char *p;
@@ -1743,6 +1745,7 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_capacity *ret)
         cmd->state = UB_CMDST_INIT;
         cmd->data = p;
         cmd->len = 8;
+        cmd->lun = lun;
         cmd->done = ub_probe_done;
         cmd->back = &compl;
 
@@ -1812,6 +1815,90 @@ static void ub_probe_timeout(unsigned long arg)
 }
 
 /*
+ * Get number of LUNs by the way of Bulk GetMaxLUN command.
+ */
+static int ub_sync_getmaxlun(struct ub_dev *sc)
+{
+        int ifnum = sc->intf->cur_altsetting->desc.bInterfaceNumber;
+        unsigned char *p;
+        enum { ALLOC_SIZE = 1 };
+        struct usb_ctrlrequest *cr;
+        struct completion compl;
+        struct timer_list timer;
+        int nluns;
+        int rc;
+
+        init_completion(&compl);
+
+        rc = -ENOMEM;
+        if ((p = kmalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
+                goto err_alloc;
+        *p = 55;
+
+        cr = &sc->work_cr;
+        cr->bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        cr->bRequest = US_BULK_GET_MAX_LUN;
+        cr->wValue = cpu_to_le16(0);
+        cr->wIndex = cpu_to_le16(ifnum);
+        cr->wLength = cpu_to_le16(1);
+
+        usb_fill_control_urb(&sc->work_urb, sc->dev, sc->recv_ctrl_pipe,
+            (unsigned char*) cr, p, 1, ub_probe_urb_complete, &compl);
+        sc->work_urb.transfer_flags = 0;
+        sc->work_urb.actual_length = 0;
+        sc->work_urb.error_count = 0;
+        sc->work_urb.status = 0;
+
+        if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) {
+                if (rc == -EPIPE) {
+                        printk("%s: Stall at GetMaxLUN, using 1 LUN\n",
+                             sc->name); /* P3 */
+                } else {
+                        printk(KERN_WARNING
+                             "%s: Unable to submit GetMaxLUN (%d)\n",
+                             sc->name, rc);
+                }
+                goto err_submit;
+        }
+
+        init_timer(&timer);
+        timer.function = ub_probe_timeout;
+        timer.data = (unsigned long) &compl;
+        timer.expires = jiffies + UB_CTRL_TIMEOUT;
+        add_timer(&timer);
+
+        wait_for_completion(&compl);
+
+        del_timer_sync(&timer);
+        usb_kill_urb(&sc->work_urb);
+
+        if (sc->work_urb.actual_length != 1) {
+                printk("%s: GetMaxLUN returned %d bytes\n", sc->name,
+                    sc->work_urb.actual_length); /* P3 */
+                nluns = 0;
+        } else {
+                if ((nluns = *p) == 55) {
+                        nluns = 0;
+                } else {
+                        /* GetMaxLUN returns the maximum LUN number */
+                        nluns += 1;
+                        if (nluns > UB_MAX_LUNS)
+                                nluns = UB_MAX_LUNS;
+                }
+                printk("%s: GetMaxLUN returned %d, using %d LUNs\n", sc->name,
+                    *p, nluns); /* P3 */
+        }
+
+        kfree(p);
+        return nluns;
+
+err_submit:
+        kfree(p);
+err_alloc:
+        return rc;
+}
+
+/*
  * Clear initial stalls.
  */
 static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe)
@@ -1897,8 +1984,8 @@ static int ub_get_pipes(struct ub_dev *sc, struct usb_device *dev,
         }
 
         if (ep_in == NULL || ep_out == NULL) {
-                printk(KERN_NOTICE "%s: device %u failed endpoint check\n",
-                    sc->name, sc->dev->devnum);
+                printk(KERN_NOTICE "%s: failed endpoint check\n",
+                    sc->name);
                 return -EIO;
         }
 
@@ -1921,8 +2008,7 @@ static int ub_probe(struct usb_interface *intf,
     const struct usb_device_id *dev_id)
 {
         struct ub_dev *sc;
-        request_queue_t *q;
-        struct gendisk *disk;
+        int nluns;
         int rc;
         int i;
 
@@ -1931,6 +2017,7 @@ static int ub_probe(struct usb_interface *intf,
                 goto err_core;
         memset(sc, 0, sizeof(struct ub_dev));
         spin_lock_init(&sc->lock);
+        INIT_LIST_HEAD(&sc->luns);
         usb_init_urb(&sc->work_urb);
         tasklet_init(&sc->tasklet, ub_scsi_action, (unsigned long)sc);
         atomic_set(&sc->poison, 0);
@@ -1942,19 +2029,16 @@ static int ub_probe(struct usb_interface *intf,
         ub_init_completion(&sc->work_done);
         sc->work_done.done = 1;         /* A little yuk, but oh well... */
 
-        rc = -ENOSR;
-        if ((sc->id = ub_id_get()) == -1)
-                goto err_id;
-        snprintf(sc->name, 8, DRV_NAME "%c", sc->id + 'a');
-
         sc->dev = interface_to_usbdev(intf);
         sc->intf = intf;
         // sc->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
-
         usb_set_intfdata(intf, sc);
         usb_get_dev(sc->dev);
         // usb_get_intf(sc->intf);      /* Do we need this? */
 
+        snprintf(sc->name, 12, DRV_NAME "(%d.%d)",
+            sc->dev->bus->busnum, sc->dev->devnum);
+
         /* XXX Verify that we can handle the device (from descriptors) */
 
         ub_get_pipes(sc, sc->dev, intf);
@@ -1992,35 +2076,88 @@ static int ub_probe(struct usb_interface *intf,
          * In any case it's not our business how revaliadation is implemented.
          */
         for (i = 0; i < 3; i++) {       /* Retries for benh's key */
-                if ((rc = ub_sync_tur(sc)) <= 0) break;
+                if ((rc = ub_sync_tur(sc, NULL)) <= 0) break;
                 if (rc != 0x6) break;
                 msleep(10);
         }
 
-        sc->removable = 1;              /* XXX Query this from the device */
-        sc->changed = 1;                /* ub_revalidate clears only */
-        sc->first_open = 1;
+        nluns = 1;
+        for (i = 0; i < 3; i++) {
+                if ((rc = ub_sync_getmaxlun(sc)) < 0) {
+                        /* 
+                         * Some devices (i.e. Iomega Zip100) need this --
+                         * apparently the bulk pipes get STALLed when the
+                         * GetMaxLUN request is processed.
+                         * XXX I have a ZIP-100, verify it does this.
+                         */
+                        if (rc == -EPIPE) {
+                                ub_probe_clear_stall(sc, sc->recv_bulk_pipe);
+                                ub_probe_clear_stall(sc, sc->send_bulk_pipe);
+                        }
+                        break;
+                }
+                if (rc != 0) {
+                        nluns = rc;
+                        break;
+                }
+                msleep(100);
+        }
 
-        ub_revalidate(sc);
-        /* This is pretty much a long term P3 */
-        printk(KERN_INFO "%s: device %u capacity nsec %ld bsize %u\n",
-            sc->name, sc->dev->devnum, sc->capacity.nsec, sc->capacity.bsize);
+        for (i = 0; i < nluns; i++) {
+                ub_probe_lun(sc, i);
+        }
+        return 0;
+
+        /* device_remove_file(&sc->intf->dev, &dev_attr_diag); */
+err_diag:
+        usb_set_intfdata(intf, NULL);
+        // usb_put_intf(sc->intf);
+        usb_put_dev(sc->dev);
+        kfree(sc);
+err_core:
+        return rc;
+}
+
+static int ub_probe_lun(struct ub_dev *sc, int lnum)
+{
+        struct ub_lun *lun;
+        request_queue_t *q;
+        struct gendisk *disk;
+        int rc;
+
+        rc = -ENOMEM;
+        if ((lun = kmalloc(sizeof(struct ub_lun), GFP_KERNEL)) == NULL)
+                goto err_alloc;
+        memset(lun, 0, sizeof(struct ub_lun));
+        lun->num = lnum;
+
+        rc = -ENOSR;
+        if ((lun->id = ub_id_get()) == -1)
+                goto err_id;
+
+        lun->udev = sc;
+        list_add(&lun->link, &sc->luns);
+
+        snprintf(lun->name, 16, DRV_NAME "%c(%d.%d.%d)",
+            lun->id + 'a', sc->dev->bus->busnum, sc->dev->devnum, lun->num);
+
+        lun->removable = 1;             /* XXX Query this from the device */
+        lun->changed = 1;               /* ub_revalidate clears only */
+        lun->first_open = 1;
+        ub_revalidate(sc, lun);
 
-        /*
-         * Just one disk per sc currently, but maybe more.
-         */
         rc = -ENOMEM;
         if ((disk = alloc_disk(UB_MINORS_PER_MAJOR)) == NULL)
                 goto err_diskalloc;
 
-        sc->disk = disk;
-        sprintf(disk->disk_name, DRV_NAME "%c", sc->id + 'a');
-        sprintf(disk->devfs_name, DEVFS_NAME "/%c", sc->id + 'a');
+        lun->disk = disk;
+        sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a');
+        sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a');
         disk->major = UB_MAJOR;
-        disk->first_minor = sc->id * UB_MINORS_PER_MAJOR;
+        disk->first_minor = lun->id * UB_MINORS_PER_MAJOR;
         disk->fops = &ub_bd_fops;
-        disk->private_data = sc;
-        disk->driverfs_dev = &intf->dev;
+        disk->private_data = lun;
+        disk->driverfs_dev = &sc->intf->dev;    /* XXX Many to one ok? */
 
         rc = -ENOMEM;
         if ((q = blk_init_queue(ub_bd_rq_fn, &sc->lock)) == NULL)
@@ -2028,28 +2165,17 @@ static int ub_probe(struct usb_interface *intf,
 
         disk->queue = q;
 
-        // blk_queue_bounce_limit(q, hba[i]->pdev->dma_mask);
+        blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
         blk_queue_max_hw_segments(q, UB_MAX_REQ_SG);
         blk_queue_max_phys_segments(q, UB_MAX_REQ_SG);
-        // blk_queue_segment_boundary(q, CARM_SG_BOUNDARY);
+        blk_queue_segment_boundary(q, 0xffffffff);      /* Dubious. */
         blk_queue_max_sectors(q, UB_MAX_SECTORS);
-        blk_queue_hardsect_size(q, sc->capacity.bsize);
-
-        /*
-         * This is a serious infraction, caused by a deficiency in the
-         * USB sg interface (usb_sg_wait()). We plan to remove this once
-         * we get mileage on the driver and can justify a change to USB API.
-         * See blk_queue_bounce_limit() to understand this part.
-         *
-         * XXX And I still need to be aware of the DMA mask in the HC.
-         */
-        q->bounce_pfn = blk_max_low_pfn;
-        q->bounce_gfp = GFP_NOIO;
+        blk_queue_hardsect_size(q, lun->capacity.bsize);
 
-        q->queuedata = sc;
+        q->queuedata = lun;
 
-        set_capacity(disk, sc->capacity.nsec);
-        if (sc->removable)
+        set_capacity(disk, lun->capacity.nsec);
+        if (lun->removable)
                 disk->flags |= GENHD_FL_REMOVABLE;
 
         add_disk(disk);
@@ -2059,22 +2185,20 @@ static int ub_probe(struct usb_interface *intf,
 err_blkqinit:
         put_disk(disk);
 err_diskalloc:
-        device_remove_file(&sc->intf->dev, &dev_attr_diag);
-err_diag:
-        usb_set_intfdata(intf, NULL);
-        // usb_put_intf(sc->intf);
-        usb_put_dev(sc->dev);
-        ub_id_put(sc->id);
+        list_del(&lun->link);
+        ub_id_put(lun->id);
 err_id:
-        kfree(sc);
-err_core:
+        kfree(lun);
+err_alloc:
         return rc;
 }
 
 static void ub_disconnect(struct usb_interface *intf)
 {
         struct ub_dev *sc = usb_get_intfdata(intf);
-        struct gendisk *disk = sc->disk;
+        struct list_head *p;
+        struct ub_lun *lun;
+        struct gendisk *disk;
         unsigned long flags;
 
         /*
@@ -2124,14 +2248,18 @@ static void ub_disconnect(struct usb_interface *intf)
         /*
          * Unregister the upper layer.
          */
-        if (disk->flags & GENHD_FL_UP)
-                del_gendisk(disk);
-        /*
-         * I wish I could do:
-         *    set_bit(QUEUE_FLAG_DEAD, &q->queue_flags);
-         * As it is, we rely on our internal poisoning and let
-         * the upper levels to spin furiously failing all the I/O.
-         */
+        list_for_each (p, &sc->luns) {
+                lun = list_entry(p, struct ub_lun, link);
+                disk = lun->disk;
+                if (disk->flags & GENHD_FL_UP)
+                        del_gendisk(disk);
+                /*
+                 * I wish I could do:
+                 *    set_bit(QUEUE_FLAG_DEAD, &q->queue_flags);
+                 * As it is, we rely on our internal poisoning and let
+                 * the upper levels to spin furiously failing all the I/O.
+                 */
+        }
 
         /*
          * Taking a lock on a structure which is about to be freed
@@ -2182,8 +2310,8 @@ static int __init ub_init(void)
 {
         int rc;
 
-        /* P3 */ printk("ub: sizeof ub_scsi_cmd %zu ub_dev %zu\n",
-                        sizeof(struct ub_scsi_cmd), sizeof(struct ub_dev));
+        /* P3 */ printk("ub: sizeof ub_scsi_cmd %zu ub_dev %zu ub_lun %zu\n",
+                        sizeof(struct ub_scsi_cmd), sizeof(struct ub_dev), sizeof(struct ub_lun));
 
         if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
                 goto err_regblkdev;
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index fcca26c89bbc..38dd9ffbe8bc 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -488,6 +488,20 @@ static int viocd_packet(struct cdrom_device_info *cdi,
                                          & (CDC_DVD_RAM | CDC_RAM)) != 0;
                 }
                 break;
+        case GPCMD_GET_CONFIGURATION:
+                if (cgc->cmd[3] == CDF_RWRT) {
+                        struct rwrt_feature_desc *rfd = (struct rwrt_feature_desc *)(cgc->buffer + sizeof(struct feature_header));
+
+                        if ((buflen >=
+                             (sizeof(struct feature_header) + sizeof(*rfd))) &&
+                            (cdi->ops->capability & ~cdi->mask
+                             & (CDC_DVD_RAM | CDC_RAM))) {
+                                rfd->feature_code = cpu_to_be16(CDF_RWRT);
+                                rfd->curr = 1;
+                                ret = 0;
+                        }
+                }
+                break;
         default:
                 if (cgc->sense) {
                         /* indicate Unknown code */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 5ed6515ae01f..7ccf871d3c9d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -929,6 +929,10 @@ config SCx200_GPIO
 
           If compiled as a module, it will be called scx200_gpio.
 
+config GPIO_VR41XX
+        tristate "NEC VR4100 series General-purpose I/O Unit support"
+        depends on CPU_VR41XX
+
 config RAW_DRIVER
         tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
         help
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index e3f5c32aac55..1aff819f3832 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -80,6 +80,7 @@ obj-$(CONFIG_PPDEV) += ppdev.o
 obj-$(CONFIG_NWBUTTON) += nwbutton.o
 obj-$(CONFIG_NWFLASH) += nwflash.o
 obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
+obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
 obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
 
 obj-$(CONFIG_WATCHDOG)  += watchdog/
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index ad9c11391d81..c1fe013c64f3 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -278,6 +278,8 @@ void agp3_generic_cleanup(void);
 #define AGP_GENERIC_SIZES_ENTRIES 11
 extern struct aper_size_info_16 agp3_generic_sizes[];
 
+#define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))
+#define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))
 
 extern int agp_off;
 extern int agp_try_unsupported_boot;
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index 0212febda654..9c9c9c2247ce 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -150,7 +150,7 @@ static void *m1541_alloc_page(struct agp_bridge_data *bridge)
         pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
         pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
                         (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
-                          virt_to_phys(addr)) | ALI_CACHE_FLUSH_EN ));
+                          virt_to_gart(addr)) | ALI_CACHE_FLUSH_EN ));
         return addr;
 }
 
@@ -174,7 +174,7 @@ static void m1541_destroy_page(void * addr)
         pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
         pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
                         (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
-                          virt_to_phys(addr)) | ALI_CACHE_FLUSH_EN));
+                          virt_to_gart(addr)) | ALI_CACHE_FLUSH_EN));
         agp_generic_destroy_page(addr);
 }
 
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index e62a3c2c44a9..3a41672e4d66 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -43,7 +43,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
 
         SetPageReserved(virt_to_page(page_map->real));
         global_cache_flush();
-        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
+        page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
                                             PAGE_SIZE);
         if (page_map->remapped == NULL) {
                 ClearPageReserved(virt_to_page(page_map->real));
@@ -154,7 +154,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
 
         agp_bridge->gatt_table_real = (u32 *)page_dir.real;
         agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
-        agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
+        agp_bridge->gatt_bus_addr = virt_to_gart(page_dir.real);
 
         /* Get the address for the gart region.
          * This is a bus address even on the alpha, b/c its
@@ -167,7 +167,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)
 
         /* Calculate the agp offset */
         for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
-                writel(virt_to_phys(amd_irongate_private.gatt_pages[i]->real) | 1,
+                writel(virt_to_gart(amd_irongate_private.gatt_pages[i]->real) | 1,
                         page_dir.remapped+GET_PAGE_DIR_OFF(addr));
                 readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr));        /* PCI Posting. */
         }
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 399c042f68f0..1407945a5892 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -219,7 +219,7 @@ static struct aper_size_info_32 amd_8151_sizes[7] =
 
 static int amd_8151_configure(void)
 {
-        unsigned long gatt_bus = virt_to_phys(agp_bridge->gatt_table_real);
+        unsigned long gatt_bus = virt_to_gart(agp_bridge->gatt_table_real);
 
         /* Configure AGP regs in each x86-64 host bridge. */
         for_each_nb() {
@@ -591,7 +591,7 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
 {
         struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
 
-        release_mem_region(virt_to_phys(bridge->gatt_table_real),
+        release_mem_region(virt_to_gart(bridge->gatt_table_real),
                            amd64_aperture_sizes[bridge->aperture_size_idx].size);
         agp_remove_bridge(bridge);
         agp_put_bridge(bridge);
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index a65f8827c283..e572ced9100a 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -61,7 +61,7 @@ static int ati_create_page_map(ati_page_map *page_map)
 
         SetPageReserved(virt_to_page(page_map->real));
         err = map_page_into_agp(virt_to_page(page_map->real));
-        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
+        page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
                                             PAGE_SIZE);
         if (page_map->remapped == NULL || err) {
                 ClearPageReserved(virt_to_page(page_map->real));
@@ -343,7 +343,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
 
         agp_bridge->gatt_table_real = (u32 *)page_dir.real;
         agp_bridge->gatt_table = (u32 __iomem *) page_dir.remapped;
-        agp_bridge->gatt_bus_addr = virt_to_bus(page_dir.real);
+        agp_bridge->gatt_bus_addr = virt_to_gart(page_dir.real);
 
         /* Write out the size register */
         current_size = A_SIZE_LVL2(agp_bridge->current_size);
@@ -373,7 +373,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)
 
         /* Calculate the agp offset */
         for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
-                writel(virt_to_bus(ati_generic_private.gatt_pages[i]->real) | 1,
+                writel(virt_to_gart(ati_generic_private.gatt_pages[i]->real) | 1,
                         page_dir.remapped+GET_PAGE_DIR_OFF(addr));
                 readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr));        /* PCI Posting. */
         }
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 2f3dfb63bdc6..4d4e602fdc7e 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -148,7 +148,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
                         return -ENOMEM;
                 }
 
-                bridge->scratch_page_real = virt_to_phys(addr);
+                bridge->scratch_page_real = virt_to_gart(addr);
                 bridge->scratch_page =
                     bridge->driver->mask_memory(bridge, bridge->scratch_page_real, 0);
         }
@@ -189,7 +189,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
 err_out:
         if (bridge->driver->needs_scratch_page)
                 bridge->driver->agp_destroy_page(
-                                phys_to_virt(bridge->scratch_page_real));
+                                gart_to_virt(bridge->scratch_page_real));
         if (got_gatt)
                 bridge->driver->free_gatt_table(bridge);
         if (got_keylist) {
@@ -214,7 +214,7 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
         if (bridge->driver->agp_destroy_page &&
             bridge->driver->needs_scratch_page)
                 bridge->driver->agp_destroy_page(
-                                phys_to_virt(bridge->scratch_page_real));
+                                gart_to_virt(bridge->scratch_page_real));
 }
 
 /* When we remove the global variable agp_bridge from all drivers
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index 1383c3165ea1..ac19fdcd21c1 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -219,7 +219,7 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
 
                 efficeon_private.l1_table[index] = page;
 
-                value = __pa(page) | pati | present | index;
+                value = virt_to_gart(page) | pati | present | index;
 
                 pci_write_config_dword(agp_bridge->dev,
                         EFFICEON_ATTPAGE, value);
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index c321a924e38a..f0079e991bdc 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -153,7 +153,7 @@ void agp_free_memory(struct agp_memory *curr)
         }
         if (curr->page_count != 0) {
                 for (i = 0; i < curr->page_count; i++) {
-                        curr->bridge->driver->agp_destroy_page(phys_to_virt(curr->memory[i]));
+                        curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]));
                 }
         }
         agp_free_key(curr->key);
@@ -209,7 +209,7 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
                         agp_free_memory(new);
                         return NULL;
                 }
-                new->memory[i] = virt_to_phys(addr);
+                new->memory[i] = virt_to_gart(addr);
                 new->page_count++;
         }
        new->bridge = bridge;
@@ -295,19 +295,6 @@ int agp_num_entries(void)
 EXPORT_SYMBOL_GPL(agp_num_entries);
 
 
-static int check_bridge_mode(struct pci_dev *dev)
-{
-        u32 agp3;
-        u8 cap_ptr;
-
-        cap_ptr = pci_find_capability(dev, PCI_CAP_ID_AGP);
-        pci_read_config_dword(dev, cap_ptr+AGPSTAT, &agp3);
-        if (agp3 & AGPSTAT_MODE_3_0)
-                return 1;
-        return 0;
-}
-
-
 /**
  *      agp_copy_info  -  copy bridge state information
  *
@@ -328,7 +315,7 @@ int agp_copy_info(struct agp_bridge_data *bridge, struct agp_kern_info *info)
         info->version.minor = bridge->version->minor;
         info->chipset = SUPPORTED;
         info->device = bridge->dev;
-        if (check_bridge_mode(bridge->dev))
+        if (bridge->mode & AGPSTAT_MODE_3_0)
                 info->mode = bridge->mode & ~AGP3_RESERVED_MASK;
         else
                 info->mode = bridge->mode & ~AGP2_RESERVED_MASK;
@@ -661,7 +648,7 @@ u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 requested_mode
                 bridge_agpstat &= ~AGPSTAT_FW;
 
         /* Check to see if we are operating in 3.0 mode */
-        if (check_bridge_mode(agp_bridge->dev))
+        if (agp_bridge->mode & AGPSTAT_MODE_3_0)
                 agp_v3_parse_one(&requested_mode, &bridge_agpstat, &vga_agpstat);
         else
                 agp_v2_parse_one(&requested_mode, &bridge_agpstat, &vga_agpstat);
@@ -732,7 +719,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)
 
         /* Do AGP version specific frobbing. */
         if (bridge->major_version >= 3) {
-                if (check_bridge_mode(bridge->dev)) {
+                if (bridge->mode & AGPSTAT_MODE_3_0) {
                         /* If we have 3.5, we can do the isoch stuff. */
                         if (bridge->minor_version >= 5)
                                 agp_3_5_enable(bridge);
@@ -806,8 +793,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
                                 break;
                         }
 
-                        table = (char *) __get_free_pages(GFP_KERNEL,
-                                                          page_order);
+                        table = alloc_gatt_pages(page_order);
 
                         if (table == NULL) {
                                 i++;
@@ -838,7 +824,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
                 size = ((struct aper_size_info_fixed *) temp)->size;
                 page_order = ((struct aper_size_info_fixed *) temp)->page_order;
                 num_entries = ((struct aper_size_info_fixed *) temp)->num_entries;
-                table = (char *) __get_free_pages(GFP_KERNEL, page_order);
+                table = alloc_gatt_pages(page_order);
         }
 
         if (table == NULL)
@@ -853,7 +839,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
         agp_gatt_table = (void *)table;
 
         bridge->driver->cache_flush();
-        bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
+        bridge->gatt_table = ioremap_nocache(virt_to_gart(table),
                                         (PAGE_SIZE * (1 << page_order)));
         bridge->driver->cache_flush();
 
@@ -861,11 +847,11 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
                 for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
                         ClearPageReserved(page);
 
-                free_pages((unsigned long) table, page_order);
+                free_gatt_pages(table, page_order);
 
                 return -ENOMEM;
         }
-        bridge->gatt_bus_addr = virt_to_phys(bridge->gatt_table_real);
+        bridge->gatt_bus_addr = virt_to_gart(bridge->gatt_table_real);
 
         /* AK: bogus, should encode addresses > 4GB */
         for (i = 0; i < num_entries; i++) {
@@ -919,7 +905,7 @@ int agp_generic_free_gatt_table(struct agp_bridge_data *bridge)
         for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
                 ClearPageReserved(page);
 
-        free_pages((unsigned long) bridge->gatt_table_real, page_order);
+        free_gatt_pages(bridge->gatt_table_real, page_order);
 
         agp_gatt_table = NULL;
         bridge->gatt_table = NULL;
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 6052bfa04c72..99762b6c19ae 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -110,7 +110,7 @@ static int __init hp_zx1_ioc_shared(void)
         hp->gart_size = HP_ZX1_GART_SIZE;
         hp->gatt_entries = hp->gart_size / hp->io_page_size;
 
-        hp->io_pdir = phys_to_virt(readq(hp->ioc_regs+HP_ZX1_PDIR_BASE));
+        hp->io_pdir = gart_to_virt(readq(hp->ioc_regs+HP_ZX1_PDIR_BASE));
         hp->gatt = &hp->io_pdir[HP_ZX1_IOVA_TO_PDIR(hp->gart_base)];
 
         if (hp->gatt[0] != HP_ZX1_SBA_IOMMU_COOKIE) {
@@ -248,7 +248,7 @@ hp_zx1_configure (void)
         agp_bridge->mode = readl(hp->lba_regs+hp->lba_cap_offset+PCI_AGP_STATUS);
 
         if (hp->io_pdir_owner) {
-                writel(virt_to_phys(hp->io_pdir), hp->ioc_regs+HP_ZX1_PDIR_BASE);
+                writel(virt_to_gart(hp->io_pdir), hp->ioc_regs+HP_ZX1_PDIR_BASE);
                 readl(hp->ioc_regs+HP_ZX1_PDIR_BASE);
                 writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG);
                 readl(hp->ioc_regs+HP_ZX1_TCNFG);
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index adbea896c0d2..94943298c03e 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -372,7 +372,7 @@ static int i460_alloc_large_page (struct lp_desc *lp)
         }
         memset(lp->alloced_map, 0, map_size);
 
-        lp->paddr = virt_to_phys(lpage);
+        lp->paddr = virt_to_gart(lpage);
         lp->refcount = 0;
         atomic_add(I460_KPAGES_PER_IOPAGE, &agp_bridge->current_memory_agp);
         return 0;
@@ -383,7 +383,7 @@ static void i460_free_large_page (struct lp_desc *lp)
         kfree(lp->alloced_map);
         lp->alloced_map = NULL;
 
-        free_pages((unsigned long) phys_to_virt(lp->paddr), I460_IO_PAGE_SHIFT - PAGE_SHIFT);
+        free_pages((unsigned long) gart_to_virt(lp->paddr), I460_IO_PAGE_SHIFT - PAGE_SHIFT);
         atomic_sub(I460_KPAGES_PER_IOPAGE, &agp_bridge->current_memory_agp);
 }
 
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 8c7d727432bb..51266d6b4d78 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -286,7 +286,7 @@ static struct agp_memory *alloc_agpphysmem_i8xx(size_t pg_count, int type)
         if (new == NULL)
                 return NULL;
 
-        new->memory[0] = virt_to_phys(addr);
+        new->memory[0] = virt_to_gart(addr);
         if (pg_count == 4) {
                 /* kludge to get 4 physical pages for ARGB cursor */
                 new->memory[1] = new->memory[0] + PAGE_SIZE;
@@ -329,10 +329,10 @@ static void intel_i810_free_by_type(struct agp_memory *curr)
         agp_free_key(curr->key);
         if(curr->type == AGP_PHYS_MEMORY) {
                 if (curr->page_count == 4)
-                        i8xx_destroy_pages(phys_to_virt(curr->memory[0]));
+                        i8xx_destroy_pages(gart_to_virt(curr->memory[0]));
                 else
                         agp_bridge->driver->agp_destroy_page(
-                                 phys_to_virt(curr->memory[0]));
+                                 gart_to_virt(curr->memory[0]));
                 vfree(curr->memory);
         }
         kfree(curr);
@@ -418,7 +418,8 @@ static void intel_i830_init_gtt_entries(void)
                 case I915_GMCH_GMS_STOLEN_48M:
                         /* Check it's really I915G */
                         if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
-                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)
                                 gtt_entries = MB(48) - KB(size);
                         else
                                 gtt_entries = 0;
@@ -426,7 +427,8 @@ static void intel_i830_init_gtt_entries(void)
                 case I915_GMCH_GMS_STOLEN_64M:
                         /* Check it's really I915G */
                         if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
-                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)
                                 gtt_entries = MB(64) - KB(size);
                         else
                                 gtt_entries = 0;
@@ -1662,6 +1664,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 }
                 name = "915GM";
                 break;
+        case PCI_DEVICE_ID_INTEL_82945G_HB:
+                if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG)) {
+                        bridge->driver = &intel_915_driver;
+                } else {
+                        bridge->driver = &intel_845_driver;
+                }
+                name = "945G";
+                break;
         case PCI_DEVICE_ID_INTEL_7505_0:
                 bridge->driver = &intel_7505_driver;
                 name = "E7505";
@@ -1801,6 +1811,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_7205_0),
         ID(PCI_DEVICE_ID_INTEL_82915G_HB),
         ID(PCI_DEVICE_ID_INTEL_82915GM_HB),
+        ID(PCI_DEVICE_ID_INTEL_82945G_HB),
         { }
 };
 
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c
index 4b3eda267976..d3aa159c9dec 100644
--- a/drivers/char/agp/sgi-agp.c
+++ b/drivers/char/agp/sgi-agp.c
@@ -133,11 +133,14 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
         off_t j;
         void *temp;
         struct agp_bridge_data *bridge;
+        u64 *table;
 
         bridge = mem->bridge;
         if (!bridge)
                 return -EINVAL;
 
+        table = (u64 *)bridge->gatt_table;
+
         temp = bridge->current_size;
 
         switch (bridge->driver->size_type) {
@@ -175,7 +178,7 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
         j = pg_start;
 
         while (j < (pg_start + mem->page_count)) {
-                if (*(bridge->gatt_table + j))
+                if (table[j])
                         return -EBUSY;
                 j++;
         }
@@ -186,7 +189,7 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,
         }
 
         for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
-                *(bridge->gatt_table + j) =
+                table[j] =
                     bridge->driver->mask_memory(bridge, mem->memory[i],
                                                 mem->type);
         }
@@ -200,6 +203,7 @@ static int sgi_tioca_remove_memory(struct agp_memory *mem, off_t pg_start,
 {
         size_t i;
         struct agp_bridge_data *bridge;
+        u64 *table;
 
         bridge = mem->bridge;
         if (!bridge)
@@ -209,8 +213,10 @@ static int sgi_tioca_remove_memory(struct agp_memory *mem, off_t pg_start,
                 return -EINVAL;
         }
 
+        table = (u64 *)bridge->gatt_table;
+
         for (i = pg_start; i < (mem->page_count + pg_start); i++) {
-                *(bridge->gatt_table + i) = 0;
+                table[i] = 0;
         }
 
         bridge->driver->tlb_flush(mem);
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 10c23302dd84..a9fb12c20eb7 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -51,7 +51,7 @@ static int serverworks_create_page_map(struct serverworks_page_map *page_map)
         }
         SetPageReserved(virt_to_page(page_map->real));
         global_cache_flush();
-        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real), 
+        page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
                                             PAGE_SIZE);
         if (page_map->remapped == NULL) {
                 ClearPageReserved(virt_to_page(page_map->real));
@@ -162,7 +162,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
         /* Create a fake scratch directory */
         for(i = 0; i < 1024; i++) {
                 writel(agp_bridge->scratch_page, serverworks_private.scratch_dir.remapped+i);
-                writel(virt_to_phys(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
+                writel(virt_to_gart(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
         }
 
         retval = serverworks_create_gatt_pages(value->num_entries / 1024);
@@ -174,7 +174,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
 
         agp_bridge->gatt_table_real = (u32 *)page_dir.real;
         agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
-        agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
+        agp_bridge->gatt_bus_addr = virt_to_gart(page_dir.real);
 
         /* Get the address for the gart region.
          * This is a bus address even on the alpha, b/c its
@@ -187,7 +187,7 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge)
         /* Calculate the agp offset */  
 
         for(i = 0; i < value->num_entries / 1024; i++)
-                writel(virt_to_phys(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
+                writel(virt_to_gart(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
 
         return 0;
 }
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index a673971f2a90..c8255312b8c1 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -407,7 +407,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge)
 
         bridge->gatt_table_real = (u32 *) table;
         bridge->gatt_table = (u32 *)table;
-        bridge->gatt_bus_addr = virt_to_phys(table);
+        bridge->gatt_bus_addr = virt_to_gart(table);
 
         for (i = 0; i < num_entries; i++)
                 bridge->gatt_table[i] = 0;
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 54a2914e3a32..11c6950158b3 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -220,5 +220,6 @@
         {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 5b18bee6492e..cd25f28e26a3 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -123,11 +123,6 @@ static int radeon_wait_irq(drm_device_t *dev, int swi_nr)
 
         dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
 
-        /* This is a hack to work around mysterious freezes on certain
-         * systems:
-         */ 
-        radeon_acknowledge_irqs( dev_priv );
-
         DRM_WAIT_ON( ret, dev_priv->swi_queue, 3 * DRM_HZ, 
                      RADEON_READ( RADEON_LAST_SWI_REG ) >= swi_nr );
 
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 37d6649011ad..26271e3ca823 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -144,7 +144,7 @@ static struct dsp56k_device {
         int tx_wsize, rx_wsize;
 } dsp56k;
 
-static struct class_simple *dsp56k_class;
+static struct class *dsp56k_class;
 
 static int dsp56k_reset(void)
 {
@@ -510,12 +510,12 @@ static int __init dsp56k_init_driver(void)
                 printk("DSP56k driver: Unable to register driver\n");
                 return -ENODEV;
         }
-        dsp56k_class = class_simple_create(THIS_MODULE, "dsp56k");
+        dsp56k_class = class_create(THIS_MODULE, "dsp56k");
         if (IS_ERR(dsp56k_class)) {
                 err = PTR_ERR(dsp56k_class);
                 goto out_chrdev;
         }
-        class_simple_device_add(dsp56k_class, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
+        class_device_create(dsp56k_class, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
 
         err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
                       S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");
@@ -526,8 +526,8 @@ static int __init dsp56k_init_driver(void)
         goto out;
 
 out_class:
-        class_simple_device_remove(MKDEV(DSP56K_MAJOR, 0));
-        class_simple_destroy(dsp56k_class);
+        class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
+        class_destroy(dsp56k_class);
 out_chrdev:
         unregister_chrdev(DSP56K_MAJOR, "dsp56k");
 out:
@@ -537,8 +537,8 @@ module_init(dsp56k_init_driver);
 
 static void __exit dsp56k_cleanup_driver(void)
 {
-        class_simple_device_remove(MKDEV(DSP56K_MAJOR, 0));
-        class_simple_destroy(dsp56k_class);
+        class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
+        class_destroy(dsp56k_class);
         unregister_chrdev(DSP56K_MAJOR, "dsp56k");
         devfs_remove("dsp56k");
 }
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index dbac7e54e8e0..5745b74044ec 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -99,7 +99,7 @@ static struct file_operations zft_cdev =
         .release        = zft_close,
 };
 
-static struct class_simple *zft_class;
+static struct class *zft_class;
 
 /*      Open floppy tape device
  */
@@ -329,29 +329,29 @@ KERN_INFO
               "installing zftape VFS interface for ftape driver ...");
         TRACE_CATCH(register_chrdev(QIC117_TAPE_MAJOR, "zft", &zft_cdev),);
 
-        zft_class = class_simple_create(THIS_MODULE, "zft");
+        zft_class = class_create(THIS_MODULE, "zft");
         for (i = 0; i < 4; i++) {
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "qft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "zqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nzqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "rawqft%i", i);
-                class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
+                class_device_create(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
                 devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
                                 S_IFCHR | S_IRUSR | S_IWUSR,
                                 "nrawqft%i", i);
@@ -381,19 +381,19 @@ static void zft_exit(void)
         }
         for (i = 0; i < 4; i++) {
                 devfs_remove("qft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i));
                 devfs_remove("nqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 4));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4));
                 devfs_remove("zqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 16));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16));
                 devfs_remove("nzqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 20));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20));
                 devfs_remove("rawqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 32));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32));
                 devfs_remove("nrawqft%i", i);
-                class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 36));
+                class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36));
         }
-        class_simple_destroy(zft_class);
+        class_destroy(zft_class);
         zft_uninit_mem(); /* release remaining memory, if any */
         printk(KERN_INFO "zftape successfully unloaded.\n");
         TRACE_EXIT;
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index abfbdcfd4e72..3236d2404905 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -1466,7 +1466,7 @@ static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod)
 }
 /* The sysfs interface for the driver and devices */
 
-static ssize_t hvcs_partner_vtys_show(struct device *dev, char *buf)
+static ssize_t hvcs_partner_vtys_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct vio_dev *viod = to_vio_dev(dev);
         struct hvcs_struct *hvcsd = from_vio_dev(viod);
@@ -1480,7 +1480,7 @@ static ssize_t hvcs_partner_vtys_show(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(partner_vtys, S_IRUGO, hvcs_partner_vtys_show, NULL);
 
-static ssize_t hvcs_partner_clcs_show(struct device *dev, char *buf)
+static ssize_t hvcs_partner_clcs_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct vio_dev *viod = to_vio_dev(dev);
         struct hvcs_struct *hvcsd = from_vio_dev(viod);
@@ -1494,7 +1494,7 @@ static ssize_t hvcs_partner_clcs_show(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(partner_clcs, S_IRUGO, hvcs_partner_clcs_show, NULL);
 
-static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf,
+static ssize_t hvcs_current_vty_store(struct device *dev, struct device_attribute *attr, const char * buf,
                 size_t count)
 {
         /*
@@ -1505,7 +1505,7 @@ static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf,
         return -EPERM;
 }
 
-static ssize_t hvcs_current_vty_show(struct device *dev, char *buf)
+static ssize_t hvcs_current_vty_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct vio_dev *viod = to_vio_dev(dev);
         struct hvcs_struct *hvcsd = from_vio_dev(viod);
@@ -1521,7 +1521,7 @@ static ssize_t hvcs_current_vty_show(struct device *dev, char *buf)
 static DEVICE_ATTR(current_vty,
         S_IRUGO | S_IWUSR, hvcs_current_vty_show, hvcs_current_vty_store);
 
-static ssize_t hvcs_vterm_state_store(struct device *dev, const char *buf,
+static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct vio_dev *viod = to_vio_dev(dev);
@@ -1559,7 +1559,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t hvcs_vterm_state_show(struct device *dev, char *buf)
+static ssize_t hvcs_vterm_state_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct vio_dev *viod = to_vio_dev(dev);
         struct hvcs_struct *hvcsd = from_vio_dev(viod);
@@ -1574,7 +1574,7 @@ static ssize_t hvcs_vterm_state_show(struct device *dev, char *buf)
 static DEVICE_ATTR(vterm_state, S_IRUGO | S_IWUSR,
                 hvcs_vterm_state_show, hvcs_vterm_state_store);
 
-static ssize_t hvcs_index_show(struct device *dev, char *buf)
+static ssize_t hvcs_index_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct vio_dev *viod = to_vio_dev(dev);
         struct hvcs_struct *hvcsd = from_vio_dev(viod);
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index fca9a978fb73..3b8314b4249a 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -302,7 +302,7 @@ static char rirqs[IP2_MAX_BOARDS];
 static int Valid_Irqs[] = { 3, 4, 5, 7, 10, 11, 12, 15, 0};
 
 /* for sysfs class support */
-static struct class_simple *ip2_class;
+static struct class *ip2_class;
 
 // Some functions to keep track of what irq's we have
 
@@ -414,9 +414,9 @@ cleanup_module(void)
                         iiResetDelay( i2BoardPtrTable[i] );
                         /* free io addresses and Tibet */
                         release_region( ip2config.addr[i], 8 );
-                        class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i)); 
+                        class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i));
                         devfs_remove("ip2/ipl%d", i);
-                        class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
+                        class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
                         devfs_remove("ip2/stat%d", i);
                 }
                 /* Disable and remove interrupt handler. */
@@ -425,7 +425,7 @@ cleanup_module(void)
                         clear_requested_irq( ip2config.irq[i]);
                 }
         }
-        class_simple_destroy(ip2_class);
+        class_destroy(ip2_class);
         devfs_remove("ip2");
         if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) {
                 printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err);
@@ -700,7 +700,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                 printk(KERN_ERR "IP2: failed to register IPL device (%d)\n", err );
         } else {
                 /* create the sysfs class */
-                ip2_class = class_simple_create(THIS_MODULE, "ip2");
+                ip2_class = class_create(THIS_MODULE, "ip2");
                 if (IS_ERR(ip2_class)) {
                         err = PTR_ERR(ip2_class);
                         goto out_chrdev;        
@@ -722,25 +722,25 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                         }
 
                         if ( NULL != ( pB = i2BoardPtrTable[i] ) ) {
-                                class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 
+                                class_device_create(ip2_class, MKDEV(IP2_IPL_MAJOR,
                                                 4 * i), NULL, "ipl%d", i);
                                 err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
                                                 S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
                                                 "ip2/ipl%d", i);
                                 if (err) {
-                                        class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 
-                                                4 * i));
+                                        class_device_destroy(ip2_class,
+                                                MKDEV(IP2_IPL_MAJOR, 4 * i));
                                         goto out_class;
                                 }
 
-                                class_simple_device_add(ip2_class, MKDEV(IP2_IPL_MAJOR, 
+                                class_device_create(ip2_class, MKDEV(IP2_IPL_MAJOR,
                                                 4 * i + 1), NULL, "stat%d", i);
                                 err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
                                                 S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
                                                 "ip2/stat%d", i);
                                 if (err) {
-                                        class_simple_device_remove(MKDEV(IP2_IPL_MAJOR, 
-                                                4 * i + 1));
+                                        class_device_destroy(ip2_class,
+                                                MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
                                         goto out_class;
                                 }
 
@@ -798,7 +798,7 @@ retry:
         goto out;
 
 out_class:
-        class_simple_destroy(ip2_class);
+        class_destroy(ip2_class);
 out_chrdev:
         unregister_chrdev(IP2_IPL_MAJOR, "ip2");
 out:
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 6dc765dc5413..88d1ad656e99 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -520,7 +520,7 @@ MODULE_PARM_DESC(ipmi_major, "Sets the major number of the IPMI device.  By"
                  " interface.  Other values will set the major device number"
                  " to that value.");
 
-static struct class_simple *ipmi_class;
+static struct class *ipmi_class;
 
 static void ipmi_new_smi(int if_num)
 {
@@ -529,12 +529,12 @@ static void ipmi_new_smi(int if_num)
         devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
                       "ipmidev/%d", if_num);
 
-        class_simple_device_add(ipmi_class, dev, NULL, "ipmi%d", if_num);
+        class_device_create(ipmi_class, dev, NULL, "ipmi%d", if_num);
 }
 
 static void ipmi_smi_gone(int if_num)
 {
-        class_simple_device_remove(MKDEV(ipmi_major, if_num));
+        class_device_destroy(ipmi_class, MKDEV(ipmi_major, if_num));
         devfs_remove("ipmidev/%d", if_num);
 }
 
@@ -555,7 +555,7 @@ static __init int init_ipmi_devintf(void)
         printk(KERN_INFO "ipmi device interface version "
                IPMI_DEVINTF_VERSION "\n");
 
-        ipmi_class = class_simple_create(THIS_MODULE, "ipmi");
+        ipmi_class = class_create(THIS_MODULE, "ipmi");
         if (IS_ERR(ipmi_class)) {
                 printk(KERN_ERR "ipmi: can't register device class\n");
                 return PTR_ERR(ipmi_class);
@@ -563,7 +563,7 @@ static __init int init_ipmi_devintf(void)
 
         rv = register_chrdev(ipmi_major, DEVICE_NAME, &ipmi_fops);
         if (rv < 0) {
-                class_simple_destroy(ipmi_class);
+                class_destroy(ipmi_class);
                 printk(KERN_ERR "ipmi: can't get major %d\n", ipmi_major);
                 return rv;
         }
@@ -577,7 +577,7 @@ static __init int init_ipmi_devintf(void)
         rv = ipmi_smi_watcher_register(&smi_watcher);
         if (rv) {
                 unregister_chrdev(ipmi_major, DEVICE_NAME);
-                class_simple_destroy(ipmi_class);
+                class_destroy(ipmi_class);
                 printk(KERN_WARNING "ipmi: can't register smi watcher\n");
                 return rv;
         }
@@ -588,7 +588,7 @@ module_init(init_ipmi_devintf);
 
 static __exit void cleanup_ipmi(void)
 {
-        class_simple_destroy(ipmi_class);
+        class_destroy(ipmi_class);
         ipmi_smi_watcher_unregister(&smi_watcher);
         devfs_remove(DEVICE_NAME);
         unregister_chrdev(ipmi_major, DEVICE_NAME);
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index d7fb452af7f9..0c81652eaba6 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -641,7 +641,7 @@ int ipmi_create_user(unsigned int          if_num,
                 return -ENOMEM;
 
         down_read(&interfaces_sem);
-        if ((if_num > MAX_IPMI_INTERFACES) || ipmi_interfaces[if_num] == NULL)
+        if ((if_num >= MAX_IPMI_INTERFACES) || ipmi_interfaces[if_num] == NULL)
         {
                 rv = -EINVAL;
                 goto out_unlock;
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 21aed0e8779d..c02a21dbad5d 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -792,7 +792,7 @@ static int	stli_timeron;
 
 /*****************************************************************************/
 
-static struct class_simple *istallion_class;
+static struct class *istallion_class;
 
 #ifdef MODULE
 
@@ -854,10 +854,10 @@ static void __exit istallion_module_exit(void)
         put_tty_driver(stli_serial);
         for (i = 0; i < 4; i++) {
                 devfs_remove("staliomem/%d", i);
-                class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i));
+                class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i));
         }
         devfs_remove("staliomem");
-        class_simple_destroy(istallion_class);
+        class_destroy(istallion_class);
         if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
                 printk("STALLION: failed to un-register serial memory device, "
                         "errno=%d\n", -i);
@@ -5242,12 +5242,12 @@ int __init stli_init(void)
                                 "device\n");
 
         devfs_mk_dir("staliomem");
-        istallion_class = class_simple_create(THIS_MODULE, "staliomem");
+        istallion_class = class_create(THIS_MODULE, "staliomem");
         for (i = 0; i < 4; i++) {
                 devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
                                S_IFCHR | S_IRUSR | S_IWUSR,
                                "staliomem/%d", i);
-                class_simple_device_add(istallion_class, MKDEV(STL_SIOMEMMAJOR, i), 
+                class_device_create(istallion_class, MKDEV(STL_SIOMEMMAJOR, i),
                                 NULL, "staliomem%d", i);
         }
 
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 4dee945031d4..59eebe5a035f 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -146,7 +146,7 @@
 static struct lp_struct lp_table[LP_NO];
 
 static unsigned int lp_count = 0;
-static struct class_simple *lp_class;
+static struct class *lp_class;
 
 #ifdef CONFIG_LP_CONSOLE
 static struct parport *console_registered; // initially NULL
@@ -804,7 +804,7 @@ static int lp_register(int nr, struct parport *port)
         if (reset)
                 lp_reset(nr);
 
-        class_simple_device_add(lp_class, MKDEV(LP_MAJOR, nr), NULL,
+        class_device_create(lp_class, MKDEV(LP_MAJOR, nr), NULL,
                                 "lp%d", nr);
         devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO,
                         "printers/%d", nr);
@@ -907,7 +907,7 @@ static int __init lp_init (void)
         }
 
         devfs_mk_dir("printers");
-        lp_class = class_simple_create(THIS_MODULE, "printer");
+        lp_class = class_create(THIS_MODULE, "printer");
         if (IS_ERR(lp_class)) {
                 err = PTR_ERR(lp_class);
                 goto out_devfs;
@@ -930,7 +930,7 @@ static int __init lp_init (void)
         return 0;
 
 out_class:
-        class_simple_destroy(lp_class);
+        class_destroy(lp_class);
 out_devfs:
         devfs_remove("printers");
         unregister_chrdev(LP_MAJOR, "lp");
@@ -981,10 +981,10 @@ static void lp_cleanup_module (void)
                         continue;
                 parport_unregister_device(lp_table[offset].dev);
                 devfs_remove("printers/%d", offset);
-                class_simple_device_remove(MKDEV(LP_MAJOR, offset));
+                class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
         }
         devfs_remove("printers");
-        class_simple_destroy(lp_class);
+        class_destroy(lp_class);
 }
 
 __setup("lp=", lp_setup);
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index ac9cfa9701ea..115dbb35334b 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -699,7 +699,7 @@ static inline int mbcs_hw_init(struct mbcs_soft *soft)
         return 0;
 }
 
-static ssize_t show_algo(struct device *dev, char *buf)
+static ssize_t show_algo(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct cx_dev *cx_dev = to_cx_dev(dev);
         struct mbcs_soft *soft = cx_dev->soft;
@@ -715,7 +715,7 @@ static ssize_t show_algo(struct device *dev, char *buf)
                        (debug0 >> 32), (debug0 & 0xffffffff));
 }
 
-static ssize_t store_algo(struct device *dev, const char *buf, size_t count)
+static ssize_t store_algo(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         int n;
         struct cx_dev *cx_dev = to_cx_dev(dev);
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 947cb3cef816..e3085b22a365 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -484,7 +484,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
         return virtr + wrote;
 }
 
-#if defined(CONFIG_ISA) || !defined(__mc68000__)
+#if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI))
 static ssize_t read_port(struct file * file, char __user * buf,
                          size_t count, loff_t *ppos)
 {
@@ -744,7 +744,7 @@ static struct file_operations null_fops = {
         .write          = write_null,
 };
 
-#if defined(CONFIG_ISA) || !defined(__mc68000__)
+#if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI))
 static struct file_operations port_fops = {
         .llseek         = memory_lseek,
         .read           = read_port,
@@ -804,7 +804,7 @@ static int memory_open(struct inode * inode, struct file * filp)
                 case 3:
                         filp->f_op = &null_fops;
                         break;
-#if defined(CONFIG_ISA) || !defined(__mc68000__)
+#if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI))
                 case 4:
                         filp->f_op = &port_fops;
                         break;
@@ -846,7 +846,7 @@ static const struct {
         {1, "mem",     S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
         {2, "kmem",    S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
         {3, "null",    S_IRUGO | S_IWUGO,           &null_fops},
-#if defined(CONFIG_ISA) || !defined(__mc68000__)
+#if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI))
         {4, "port",    S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
 #endif
         {5, "zero",    S_IRUGO | S_IWUGO,           &zero_fops},
@@ -856,7 +856,7 @@ static const struct {
         {11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
 };
 
-static struct class_simple *mem_class;
+static struct class *mem_class;
 
 static int __init chr_dev_init(void)
 {
@@ -865,10 +865,9 @@ static int __init chr_dev_init(void)
         if (register_chrdev(MEM_MAJOR,"mem",&memory_fops))
                 printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
-        mem_class = class_simple_create(THIS_MODULE, "mem");
+        mem_class = class_create(THIS_MODULE, "mem");
         for (i = 0; i < ARRAY_SIZE(devlist); i++) {
-                class_simple_device_add(mem_class,
-                                        MKDEV(MEM_MAJOR, devlist[i].minor),
+                class_device_create(mem_class, MKDEV(MEM_MAJOR, devlist[i].minor),
                                         NULL, devlist[i].name);
                 devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor),
                                 S_IFCHR | devlist[i].mode, devlist[i].name);
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 0937544762da..3115d318b997 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -177,10 +177,10 @@ fail:
 
 /* 
  * TODO for 2.7:
- *  - add a struct class_device to struct miscdevice and make all usages of
+ *  - add a struct kref to struct miscdevice and make all usages of
  *    them dynamic.
  */
-static struct class_simple *misc_class;
+static struct class *misc_class;
 
 static struct file_operations misc_fops = {
         .owner          = THIS_MODULE,
@@ -238,8 +238,8 @@ int misc_register(struct miscdevice * misc)
         }
         dev = MKDEV(MISC_MAJOR, misc->minor);
 
-        misc->class = class_simple_device_add(misc_class, dev,
-                                              misc->dev, misc->name);
+        misc->class = class_device_create(misc_class, dev, misc->dev,
+                                          "%s", misc->name);
         if (IS_ERR(misc->class)) {
                 err = PTR_ERR(misc->class);
                 goto out;
@@ -248,7 +248,7 @@ int misc_register(struct miscdevice * misc)
         err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, 
                             misc->devfs_name);
         if (err) {
-                class_simple_device_remove(dev);
+                class_device_destroy(misc_class, dev);
                 goto out;
         }
 
@@ -281,7 +281,7 @@ int misc_deregister(struct miscdevice * misc)
 
         down(&misc_sem);
         list_del(&misc->list);
-        class_simple_device_remove(MKDEV(MISC_MAJOR, misc->minor));
+        class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
         devfs_remove(misc->devfs_name);
         if (i < DYNAMIC_MINORS && i>0) {
                 misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
@@ -302,7 +302,7 @@ static int __init misc_init(void)
         if (ent)
                 ent->proc_fops = &misc_proc_fops;
 #endif
-        misc_class = class_simple_create(THIS_MODULE, "misc");
+        misc_class = class_create(THIS_MODULE, "misc");
         if (IS_ERR(misc_class))
                 return PTR_ERR(misc_class);
 #ifdef CONFIG_MVME16x
@@ -323,7 +323,7 @@ static int __init misc_init(void)
         if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                 printk("unable to get major %d for misc devices\n",
                        MISC_MAJOR);
-                class_simple_destroy(misc_class);
+                class_destroy(misc_class);
                 return -EIO;
         }
         return 0;
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index d37625d47746..d568991ac6b3 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -472,7 +472,7 @@ struct device mwave_device;
 
 /* Prevent code redundancy, create a macro for mwave_show_* functions. */
 #define mwave_show_function(attr_name, format_string, field)            \
-static ssize_t mwave_show_##attr_name(struct device *dev, char *buf)    \
+static ssize_t mwave_show_##attr_name(struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                       \
         DSP_3780I_CONFIG_SETTINGS *pSettings =                          \
                 &mwave_s_mdd.rBDData.rDspSettings;                      \
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 7a245068e3e5..f022f0944434 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1995,9 +1995,6 @@ static void mxser_receive_chars(struct mxser_struct *info, int *status)
         unsigned char ch, gdl;
         int ignored = 0;
         int cnt = 0;
-        unsigned char *cp;
-        char *fp;
-        int count;
         int recv_room;
         int max = 256;
         unsigned long flags;
@@ -2011,10 +2008,6 @@ static void mxser_receive_chars(struct mxser_struct *info, int *status)
                 //return;
         }
 
-        cp = tty->flip.char_buf;
-        fp = tty->flip.flag_buf;
-        count = 0;
-
         // following add by Victor Yu. 09-02-2002
         if (info->IsMoxaMustChipFlag != MOXA_OTHER_UART) {
 
@@ -2041,12 +2034,10 @@ static void mxser_receive_chars(struct mxser_struct *info, int *status)
                 }
                 while (gdl--) {
                         ch = inb(info->base + UART_RX);
-                        count++;
-                        *cp++ = ch;
-                        *fp++ = 0;
+                        tty_insert_flip_char(tty, ch, 0);
                         cnt++;
                         /*
-                           if((count>=HI_WATER) && (info->stop_rx==0)){
+                           if((cnt>=HI_WATER) && (info->stop_rx==0)){
                            mxser_stoprx(tty);
                            info->stop_rx=1;
                            break;
@@ -2061,7 +2052,7 @@ intr_old:
                 if (max-- < 0)
                         break;
                 /*
-                   if((count>=HI_WATER) && (info->stop_rx==0)){
+                   if((cnt>=HI_WATER) && (info->stop_rx==0)){
                    mxser_stoprx(tty);
                    info->stop_rx=1;
                    break;
@@ -2078,36 +2069,33 @@ intr_old:
                         if (++ignored > 100)
                                 break;
                 } else {
-                        count++;
+                        char flag = 0;
                         if (*status & UART_LSR_SPECIAL) {
                                 if (*status & UART_LSR_BI) {
-                                        *fp++ = TTY_BREAK;
+                                        flag = TTY_BREAK;
 /* added by casper 1/11/2000 */
                                         info->icount.brk++;
-
 /* */
                                         if (info->flags & ASYNC_SAK)
                                                 do_SAK(tty);
                                 } else if (*status & UART_LSR_PE) {
-                                        *fp++ = TTY_PARITY;
+                                        flag = TTY_PARITY;
 /* added by casper 1/11/2000 */
                                         info->icount.parity++;
 /* */
                                 } else if (*status & UART_LSR_FE) {
-                                        *fp++ = TTY_FRAME;
+                                        flag = TTY_FRAME;
 /* added by casper 1/11/2000 */
                                         info->icount.frame++;
 /* */
                                 } else if (*status & UART_LSR_OE) {
-                                        *fp++ = TTY_OVERRUN;
+                                        flag = TTY_OVERRUN;
 /* added by casper 1/11/2000 */
                                         info->icount.overrun++;
 /* */
-                                } else
-                                        *fp++ = 0;
-                        } else
-                                *fp++ = 0;
-                        *cp++ = ch;
+                                }
+                        }
+                        tty_insert_flip_char(tty, ch, flag);
                         cnt++;
                         if (cnt >= recv_room) {
                                 if (!info->ldisc_stop_rx) {
@@ -2132,13 +2120,13 @@ intr_old:
                 // above add by Victor Yu. 09-02-2002
         } while (*status & UART_LSR_DR);
 
-      end_intr:         // add by Victor Yu. 09-02-2002
+end_intr:               // add by Victor Yu. 09-02-2002
 
         mxvar_log.rxcnt[info->port] += cnt;
         info->mon_data.rxcnt += cnt;
         info->mon_data.up_rxcnt += cnt;
         spin_unlock_irqrestore(&info->slock, flags);
-        
+
         tty_flip_buffer_push(tty);
 }
 
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 5eda075c62bd..0e22880432bc 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -737,7 +737,7 @@ static unsigned int pp_poll (struct file * file, poll_table * wait)
         return mask;
 }
 
-static struct class_simple *ppdev_class;
+static struct class *ppdev_class;
 
 static struct file_operations pp_fops = {
         .owner          = THIS_MODULE,
@@ -752,13 +752,13 @@ static struct file_operations pp_fops = {
 
 static void pp_attach(struct parport *port)
 {
-        class_simple_device_add(ppdev_class, MKDEV(PP_MAJOR, port->number),
+        class_device_create(ppdev_class, MKDEV(PP_MAJOR, port->number),
                         NULL, "parport%d", port->number);
 }
 
 static void pp_detach(struct parport *port)
 {
-        class_simple_device_remove(MKDEV(PP_MAJOR, port->number));
+        class_device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number));
 }
 
 static struct parport_driver pp_driver = {
@@ -776,7 +776,7 @@ static int __init ppdev_init (void)
                         PP_MAJOR);
                 return -EIO;
         }
-        ppdev_class = class_simple_create(THIS_MODULE, CHRDEV);
+        ppdev_class = class_create(THIS_MODULE, CHRDEV);
         if (IS_ERR(ppdev_class)) {
                 err = PTR_ERR(ppdev_class);
                 goto out_chrdev;
@@ -798,7 +798,7 @@ out_class:
         for (i = 0; i < PARPORT_MAX; i++)
                 devfs_remove("parports/%d", i);
         devfs_remove("parports");
-        class_simple_destroy(ppdev_class);
+        class_destroy(ppdev_class);
 out_chrdev:
         unregister_chrdev(PP_MAJOR, CHRDEV);
 out:
@@ -813,7 +813,7 @@ static void __exit ppdev_cleanup (void)
                 devfs_remove("parports/%d", i);
         parport_unregister_driver(&pp_driver);
         devfs_remove("parports");
-        class_simple_destroy(ppdev_class);
+        class_destroy(ppdev_class);
         unregister_chrdev (PP_MAJOR, CHRDEV);
 }
 
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index ca5f42bcaad9..f13e5de02207 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -27,7 +27,7 @@ struct raw_device_data {
         int inuse;
 };
 
-static struct class_simple *raw_class;
+static struct class *raw_class;
 static struct raw_device_data raw_devices[MAX_RAW_MINORS];
 static DECLARE_MUTEX(raw_mutex);
 static struct file_operations raw_ctl_fops;          /* forward declaration */
@@ -127,8 +127,8 @@ raw_ioctl(struct inode *inode, struct file *filp,
 
 static void bind_device(struct raw_config_request *rq)
 {
-        class_simple_device_remove(MKDEV(RAW_MAJOR, rq->raw_minor));
-        class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor),
+        class_device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
+        class_device_create(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor),
                                       NULL, "raw%d", rq->raw_minor);
 }
 
@@ -200,8 +200,8 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
                         if (rq.block_major == 0 && rq.block_minor == 0) {
                                 /* unbind */
                                 rawdev->binding = NULL;
-                                class_simple_device_remove(MKDEV(RAW_MAJOR,
-                                                                rq.raw_minor));
+                                class_device_destroy(raw_class,
+                                                MKDEV(RAW_MAJOR, rq.raw_minor));
                         } else {
                                 rawdev->binding = bdget(dev);
                                 if (rawdev->binding == NULL)
@@ -300,14 +300,14 @@ static int __init raw_init(void)
                 goto error;
         }
 
-        raw_class = class_simple_create(THIS_MODULE, "raw");
+        raw_class = class_create(THIS_MODULE, "raw");
         if (IS_ERR(raw_class)) {
                 printk(KERN_ERR "Error creating raw class.\n");
                 cdev_del(&raw_cdev);
                 unregister_chrdev_region(dev, MAX_RAW_MINORS);
                 goto error;
         }
-        class_simple_device_add(raw_class, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
+        class_device_create(raw_class, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
         devfs_mk_cdev(MKDEV(RAW_MAJOR, 0),
                       S_IFCHR | S_IRUGO | S_IWUGO,
@@ -331,8 +331,8 @@ static void __exit raw_exit(void)
                 devfs_remove("raw/raw%d", i);
         devfs_remove("raw/rawctl");
         devfs_remove("raw");
-        class_simple_device_remove(MKDEV(RAW_MAJOR, 0));
-        class_simple_destroy(raw_class);
+        class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
+        class_destroy(raw_class);
         cdev_del(&raw_cdev);
         unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);
 }
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index e3c0b52d943f..261a41bf6d02 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -357,6 +357,8 @@ static struct file_operations scdrv_fops = {
         .release =      scdrv_release,
 };
 
+static struct class *snsc_class;
+
 /*
  * scdrv_init
  *
@@ -372,7 +374,6 @@ scdrv_init(void)
         char *devnamep;
         struct sysctl_data_s *scd;
         void *salbuf;
-        struct class_simple *snsc_class;
         dev_t first_dev, dev;
         nasid_t event_nasid = ia64_sn_get_console_nasid();
 
@@ -382,7 +383,7 @@ scdrv_init(void)
                        __FUNCTION__);
                 return -ENODEV;
         }
-        snsc_class = class_simple_create(THIS_MODULE, SYSCTL_BASENAME);
+        snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME);
 
         for (cnode = 0; cnode < numionodes; cnode++) {
                         geoid = cnodeid_get_geoid(cnode);
@@ -436,7 +437,7 @@ scdrv_init(void)
                                 continue;
                         }
 
-                        class_simple_device_add(snsc_class, dev, NULL,
+                        class_device_create(snsc_class, dev, NULL,
                                                 "%s", devname);
 
                         ia64_sn_irtr_intr_enable(scd->scd_nasid,
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index b8899f560b5e..951545a6ef2d 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -719,7 +719,7 @@ static struct file_operations	stl_fsiomem = {
 
 /*****************************************************************************/
 
-static struct class_simple *stallion_class;
+static struct class *stallion_class;
 
 /*
  *      Loadable module initialization stuff.
@@ -777,13 +777,13 @@ static void __exit stallion_module_exit(void)
         }
         for (i = 0; i < 4; i++) {
                 devfs_remove("staliomem/%d", i);
-                class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i));
+                class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
         }
         devfs_remove("staliomem");
         if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
                 printk("STALLION: failed to un-register serial memory device, "
                         "errno=%d\n", -i);
-        class_simple_destroy(stallion_class);
+        class_destroy(stallion_class);
 
         if (stl_tmpwritebuf != (char *) NULL)
                 kfree(stl_tmpwritebuf);
@@ -3090,12 +3090,12 @@ static int __init stl_init(void)
                 printk("STALLION: failed to register serial board device\n");
         devfs_mk_dir("staliomem");
 
-        stallion_class = class_simple_create(THIS_MODULE, "staliomem");
+        stallion_class = class_create(THIS_MODULE, "staliomem");
         for (i = 0; i < 4; i++) {
                 devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
                                 S_IFCHR|S_IRUSR|S_IWUSR,
                                 "staliomem/%d", i);
-                class_simple_device_add(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem%d", i);
+                class_device_create(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem%d", i);
         }
 
         stl_serial->owner = THIS_MODULE;
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 0c5ba9dc9063..659335d80ee7 100644
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -90,7 +90,7 @@ static int timeout = TIMAXTIME;	/* timeout in tenth of seconds     */
 static unsigned int tp_count;   /* tipar count */
 static unsigned long opened;    /* opened devices */
 
-static struct class_simple *tipar_class;
+static struct class *tipar_class;
 
 /* --- macros for parport access -------------------------------------- */
 
@@ -436,7 +436,7 @@ tipar_register(int nr, struct parport *port)
                 goto out;
         }
 
-        class_simple_device_add(tipar_class, MKDEV(TIPAR_MAJOR,
+        class_device_create(tipar_class, MKDEV(TIPAR_MAJOR,
                         TIPAR_MINOR + nr), NULL, "par%d", nr);
         /* Use devfs, tree: /dev/ticables/par/[0..2] */
         err = devfs_mk_cdev(MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr),
@@ -458,8 +458,8 @@ tipar_register(int nr, struct parport *port)
         goto out;
 
 out_class:
-        class_simple_device_remove(MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr));
-        class_simple_destroy(tipar_class);
+        class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr));
+        class_destroy(tipar_class);
 out:
         return err;
 }
@@ -505,7 +505,7 @@ tipar_init_module(void)
         /* Use devfs with tree: /dev/ticables/par/[0..2] */
         devfs_mk_dir("ticables/par");
 
-        tipar_class = class_simple_create(THIS_MODULE, "ticables");
+        tipar_class = class_create(THIS_MODULE, "ticables");
         if (IS_ERR(tipar_class)) {
                 err = PTR_ERR(tipar_class);
                 goto out_chrdev;
@@ -539,10 +539,10 @@ tipar_cleanup_module(void)
                 if (table[i].dev == NULL)
                         continue;
                 parport_unregister_device(table[i].dev);
-                class_simple_device_remove(MKDEV(TIPAR_MAJOR, i));
+                class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, i));
                 devfs_remove("ticables/par/%d", i);
         }
-        class_simple_destroy(tipar_class);
+        class_destroy(tipar_class);
         devfs_remove("ticables/par");
 
         pr_info("tipar: module unloaded\n");
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 87235330fdbe..8ce508b29865 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -212,7 +212,7 @@ static u8 pcrread[] = {
         0, 0, 0, 0              /* PCR index */
 };
 
-static ssize_t show_pcrs(struct device *dev, char *buf)
+static ssize_t show_pcrs(struct device *dev, struct device_attribute *attr, char *buf)
 {
         u8 data[READ_PCR_RESULT_SIZE];
         ssize_t len;
@@ -255,7 +255,7 @@ static u8 readpubek[] = {
         0, 0, 0, 124,           /* TPM_ORD_ReadPubek */
 };
 
-static ssize_t show_pubek(struct device *dev, char *buf)
+static ssize_t show_pubek(struct device *dev, struct device_attribute *attr, char *buf)
 {
         u8 data[READ_PUBEK_RESULT_SIZE];
         ssize_t len;
@@ -330,7 +330,7 @@ static u8 cap_manufacturer[] = {
         0, 0, 1, 3
 };
 
-static ssize_t show_caps(struct device *dev, char *buf)
+static ssize_t show_caps(struct device *dev, struct device_attribute *attr, char *buf)
 {
         u8 data[READ_PUBEK_RESULT_SIZE];
         ssize_t len;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 26e5e19ed854..31831030f73f 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2654,7 +2654,7 @@ static void tty_default_put_char(struct tty_struct *tty, unsigned char ch)
         tty->driver->write(tty, &ch, 1);
 }
 
-static struct class_simple *tty_class;
+static struct class *tty_class;
 
 /**
  * tty_register_device - register a tty device
@@ -2687,7 +2687,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
                 pty_line_name(driver, index, name);
         else
                 tty_line_name(driver, index, name);
-        class_simple_device_add(tty_class, dev, device, name);
+        class_device_create(tty_class, dev, device, name);
 }
 
 /**
@@ -2701,7 +2701,7 @@ void tty_register_device(struct tty_driver *driver, unsigned index,
 void tty_unregister_device(struct tty_driver *driver, unsigned index)
 {
         devfs_remove("%s%d", driver->devfs_name, index + driver->name_base);
-        class_simple_device_remove(MKDEV(driver->major, driver->minor_start) + index);
+        class_device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index);
 }
 
 EXPORT_SYMBOL(tty_register_device);
@@ -2918,7 +2918,7 @@ extern int vty_init(void);
 
 static int __init tty_class_init(void)
 {
-        tty_class = class_simple_create(THIS_MODULE, "tty");
+        tty_class = class_create(THIS_MODULE, "tty");
         if (IS_ERR(tty_class))
                 return PTR_ERR(tty_class);
         return 0;
@@ -2947,14 +2947,14 @@ static int __init tty_init(void)
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
                 panic("Couldn't register /dev/tty driver\n");
         devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
-        class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
+        class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
 
         cdev_init(&console_cdev, &console_fops);
         if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
                 panic("Couldn't register /dev/console driver\n");
         devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");
-        class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
+        class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
 
 #ifdef CONFIG_UNIX98_PTYS
         cdev_init(&ptmx_cdev, &ptmx_fops);
@@ -2962,7 +2962,7 @@ static int __init tty_init(void)
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
                 panic("Couldn't register /dev/ptmx driver\n");
         devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");
-        class_simple_device_add(tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
+        class_device_create(tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 #endif
 
 #ifdef CONFIG_VT
@@ -2971,7 +2971,7 @@ static int __init tty_init(void)
             register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
                 panic("Couldn't register /dev/tty0 driver\n");
         devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");
-        class_simple_device_add(tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+        class_device_create(tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
 
         vty_init();
 #endif
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 7abe405b8657..79c2928a8817 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -474,7 +474,7 @@ static struct file_operations vcs_fops = {
         .open           = vcs_open,
 };
 
-static struct class_simple *vc_class;
+static struct class *vc_class;
 
 void vcs_make_devfs(struct tty_struct *tty)
 {
@@ -484,26 +484,26 @@ void vcs_make_devfs(struct tty_struct *tty)
         devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 129),
                         S_IFCHR|S_IRUSR|S_IWUSR,
                         "vcc/a%u", tty->index + 1);
-        class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, tty->index + 1), NULL, "vcs%u", tty->index + 1);
-        class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, tty->index + 129), NULL, "vcsa%u", tty->index + 1);
+        class_device_create(vc_class, MKDEV(VCS_MAJOR, tty->index + 1), NULL, "vcs%u", tty->index + 1);
+        class_device_create(vc_class, MKDEV(VCS_MAJOR, tty->index + 129), NULL, "vcsa%u", tty->index + 1);
 }
 void vcs_remove_devfs(struct tty_struct *tty)
 {
         devfs_remove("vcc/%u", tty->index + 1);
         devfs_remove("vcc/a%u", tty->index + 1);
-        class_simple_device_remove(MKDEV(VCS_MAJOR, tty->index + 1));
-        class_simple_device_remove(MKDEV(VCS_MAJOR, tty->index + 129));
+        class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1));
+        class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129));
 }
 
 int __init vcs_init(void)
 {
         if (register_chrdev(VCS_MAJOR, "vcs", &vcs_fops))
                 panic("unable to get major %d for vcs device", VCS_MAJOR);
-        vc_class = class_simple_create(THIS_MODULE, "vc");
+        vc_class = class_create(THIS_MODULE, "vc");
 
         devfs_mk_cdev(MKDEV(VCS_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/0");
         devfs_mk_cdev(MKDEV(VCS_MAJOR, 128), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/a0");
-        class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
-        class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
+        class_device_create(vc_class, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
+        class_device_create(vc_class, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
         return 0;
 }
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index aea3cbf5219d..4764b4f9555d 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -237,7 +237,7 @@ static dma_addr_t viotape_unitinfo_token;
 
 static struct mtget viomtget[VIOTAPE_MAX_TAPE];
 
-static struct class_simple *tape_class;
+static struct class *tape_class;
 
 static struct device *tape_device[VIOTAPE_MAX_TAPE];
 
@@ -956,9 +956,9 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         state[i].cur_part = 0;
         for (j = 0; j < MAX_PARTITIONS; ++j)
                 state[i].part_stat_rwi[j] = VIOT_IDLE;
-        class_simple_device_add(tape_class, MKDEV(VIOTAPE_MAJOR, i), NULL,
+        class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i), NULL,
                         "iseries!vt%d", i);
-        class_simple_device_add(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80),
+        class_device_create(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80),
                         NULL, "iseries!nvt%d", i);
         devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
                         "iseries/vt%d", i);
@@ -980,8 +980,8 @@ static int viotape_remove(struct vio_dev *vdev)
         devfs_remove("iseries/nvt%d", i);
         devfs_remove("iseries/vt%d", i);
         devfs_unregister_tape(state[i].dev_handle);
-        class_simple_device_remove(MKDEV(VIOTAPE_MAJOR, i | 0x80));
-        class_simple_device_remove(MKDEV(VIOTAPE_MAJOR, i));
+        class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80));
+        class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));
         return 0;
 }
 
@@ -1045,7 +1045,7 @@ int __init viotap_init(void)
                 goto clear_handler;
         }
 
-        tape_class = class_simple_create(THIS_MODULE, "tape");
+        tape_class = class_create(THIS_MODULE, "tape");
         if (IS_ERR(tape_class)) {
                 printk(VIOTAPE_KERN_WARN "Unable to allocat class\n");
                 ret = PTR_ERR(tape_class);
@@ -1070,7 +1070,7 @@ int __init viotap_init(void)
         return 0;
 
 unreg_class:
-        class_simple_destroy(tape_class);
+        class_destroy(tape_class);
 unreg_chrdev:
         unregister_chrdev(VIOTAPE_MAJOR, "viotape");
 clear_handler:
@@ -1110,7 +1110,7 @@ static void __exit viotap_exit(void)
 
         remove_proc_entry("iSeries/viotape", NULL);
         vio_unregister_driver(&viotape_driver);
-        class_simple_destroy(tape_class);
+        class_destroy(tape_class);
         ret = unregister_chrdev(VIOTAPE_MAJOR, "viotape");
         if (ret < 0)
                 printk(VIOTAPE_KERN_WARN "Error unregistering device: %d\n",
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
new file mode 100644
index 000000000000..683278bc5241
--- /dev/null
+++ b/drivers/char/vr41xx_giu.c
@@ -0,0 +1,743 @@
+/*
+ *  Driver for NEC VR4100 series General-purpose I/O Unit.
+ *
+ *  Copyright (C) 2002 MontaVista Software Inc.
+ *      Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
+ *  Copyright (C) 2003-2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *
+ *  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 program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/cpu.h>
+#include <asm/io.h>
+#include <asm/vr41xx/giu.h>
+#include <asm/vr41xx/vr41xx.h>
+
+MODULE_AUTHOR("Yoichi Yuasa <yuasa@hh.iij4u.or.jp>");
+MODULE_DESCRIPTION("NEC VR4100 series General-purpose I/O Unit driver");
+MODULE_LICENSE("GPL");
+
+static int major;       /* default is dynamic major device number */
+module_param(major, int, 0);
+MODULE_PARM_DESC(major, "Major device number");
+
+#define GIU_TYPE1_START         0x0b000100UL
+#define GIU_TYPE1_SIZE          0x20UL
+
+#define GIU_TYPE2_START         0x0f000140UL
+#define GIU_TYPE2_SIZE          0x20UL
+
+#define GIU_TYPE3_START         0x0f000140UL
+#define GIU_TYPE3_SIZE          0x28UL
+
+#define GIU_PULLUPDOWN_START    0x0b0002e0UL
+#define GIU_PULLUPDOWN_SIZE     0x04UL
+
+#define GIUIOSELL       0x00
+#define GIUIOSELH       0x02
+#define GIUPIODL        0x04
+#define GIUPIODH        0x06
+#define GIUINTSTATL     0x08
+#define GIUINTSTATH     0x0a
+#define GIUINTENL       0x0c
+#define GIUINTENH       0x0e
+#define GIUINTTYPL      0x10
+#define GIUINTTYPH      0x12
+#define GIUINTALSELL    0x14
+#define GIUINTALSELH    0x16
+#define GIUINTHTSELL    0x18
+#define GIUINTHTSELH    0x1a
+#define GIUPODATL       0x1c
+#define GIUPODATEN      0x1c
+#define GIUPODATH       0x1e
+ #define PIOEN0         0x0100
+ #define PIOEN1         0x0200
+#define GIUPODAT        0x1e
+#define GIUFEDGEINHL    0x20
+#define GIUFEDGEINHH    0x22
+#define GIUREDGEINHL    0x24
+#define GIUREDGEINHH    0x26
+
+#define GIUUSEUPDN      0x1e0
+#define GIUTERMUPDN     0x1e2
+
+#define GPIO_HAS_PULLUPDOWN_IO          0x0001
+#define GPIO_HAS_OUTPUT_ENABLE          0x0002
+#define GPIO_HAS_INTERRUPT_EDGE_SELECT  0x0100
+
+static spinlock_t giu_lock;
+static struct resource *giu_resource1;
+static struct resource *giu_resource2;
+static unsigned long giu_flags;
+static unsigned int giu_nr_pins;
+
+static void __iomem *giu_base;
+
+#define giu_read(offset)                readw(giu_base + (offset))
+#define giu_write(offset, value)        writew((value), giu_base + (offset))
+
+#define GPIO_PIN_OF_IRQ(irq)    ((irq) - GIU_IRQ_BASE)
+#define GIUINT_HIGH_OFFSET      16
+#define GIUINT_HIGH_MAX         32
+
+static inline uint16_t giu_set(uint16_t offset, uint16_t set)
+{
+        uint16_t data;
+
+        data = giu_read(offset);
+        data |= set;
+        giu_write(offset, data);
+
+        return data;
+}
+
+static inline uint16_t giu_clear(uint16_t offset, uint16_t clear)
+{
+        uint16_t data;
+
+        data = giu_read(offset);
+        data &= ~clear;
+        giu_write(offset, data);
+
+        return data;
+}
+
+static unsigned int startup_giuint_low_irq(unsigned int irq)
+{
+        unsigned int pin;
+
+        pin = GPIO_PIN_OF_IRQ(irq);
+        giu_write(GIUINTSTATL, 1 << pin);
+        giu_set(GIUINTENL, 1 << pin);
+
+        return 0;
+}
+
+static void shutdown_giuint_low_irq(unsigned int irq)
+{
+        giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
+}
+
+static void enable_giuint_low_irq(unsigned int irq)
+{
+        giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
+}
+
+#define disable_giuint_low_irq  shutdown_giuint_low_irq
+
+static void ack_giuint_low_irq(unsigned int irq)
+{
+        unsigned int pin;
+
+        pin = GPIO_PIN_OF_IRQ(irq);
+        giu_clear(GIUINTENL, 1 << pin);
+        giu_write(GIUINTSTATL, 1 << pin);
+}
+
+static void end_giuint_low_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+                giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
+}
+
+static struct hw_interrupt_type giuint_low_irq_type = {
+        .typename       = "GIUINTL",
+        .startup        = startup_giuint_low_irq,
+        .shutdown       = shutdown_giuint_low_irq,
+        .enable         = enable_giuint_low_irq,
+        .disable        = disable_giuint_low_irq,
+        .ack            = ack_giuint_low_irq,
+        .end            = end_giuint_low_irq,
+};
+
+static unsigned int startup_giuint_high_irq(unsigned int irq)
+{
+        unsigned int pin;
+
+        pin = GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET;
+        giu_write(GIUINTSTATH, 1 << pin);
+        giu_set(GIUINTENH, 1 << pin);
+
+        return 0;
+}
+
+static void shutdown_giuint_high_irq(unsigned int irq)
+{
+        giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
+}
+
+static void enable_giuint_high_irq(unsigned int irq)
+{
+        giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
+}
+
+#define disable_giuint_high_irq shutdown_giuint_high_irq
+
+static void ack_giuint_high_irq(unsigned int irq)
+{
+        unsigned int pin;
+
+        pin = GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET;
+        giu_clear(GIUINTENH, 1 << pin);
+        giu_write(GIUINTSTATH, 1 << pin);
+}
+
+static void end_giuint_high_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+                giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
+}
+
+static struct hw_interrupt_type giuint_high_irq_type = {
+        .typename       = "GIUINTH",
+        .startup        = startup_giuint_high_irq,
+        .shutdown       = shutdown_giuint_high_irq,
+        .enable         = enable_giuint_high_irq,
+        .disable        = disable_giuint_high_irq,
+        .ack            = ack_giuint_high_irq,
+        .end            = end_giuint_high_irq,
+};
+
+static int giu_get_irq(unsigned int irq, struct pt_regs *regs)
+{
+        uint16_t pendl, pendh, maskl, maskh;
+        int i;
+
+        pendl = giu_read(GIUINTSTATL);
+        pendh = giu_read(GIUINTSTATH);
+        maskl = giu_read(GIUINTENL);
+        maskh = giu_read(GIUINTENH);
+
+        maskl &= pendl;
+        maskh &= pendh;
+
+        if (maskl) {
+                for (i = 0; i < 16; i++) {
+                        if (maskl & (1 << i))
+                                return GIU_IRQ(i);
+                }
+        } else if (maskh) {
+                for (i = 0; i < 16; i++) {
+                        if (maskh & (1 << i))
+                                return GIU_IRQ(i + GIUINT_HIGH_OFFSET);
+                }
+        }
+
+        printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
+               maskl, pendl, maskh, pendh);
+
+        atomic_inc(&irq_err_count);
+
+        return -EINVAL;
+}
+
+void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_t signal)
+{
+        uint16_t mask;
+
+        if (pin < GIUINT_HIGH_OFFSET) {
+                mask = 1 << pin;
+                if (trigger != IRQ_TRIGGER_LEVEL) {
+                        giu_set(GIUINTTYPL, mask);
+                        if (signal == IRQ_SIGNAL_HOLD)
+                                giu_set(GIUINTHTSELL, mask);
+                        else
+                                giu_clear(GIUINTHTSELL, mask);
+                        if (current_cpu_data.cputype == CPU_VR4133) {
+                                switch (trigger) {
+                                case IRQ_TRIGGER_EDGE_FALLING:
+                                        giu_set(GIUFEDGEINHL, mask);
+                                        giu_clear(GIUREDGEINHL, mask);
+                                        break;
+                                case IRQ_TRIGGER_EDGE_RISING:
+                                        giu_clear(GIUFEDGEINHL, mask);
+                                        giu_set(GIUREDGEINHL, mask);
+                                        break;
+                                default:
+                                        giu_set(GIUFEDGEINHL, mask);
+                                        giu_set(GIUREDGEINHL, mask);
+                                        break;
+                                }
+                        }
+                } else {
+                        giu_clear(GIUINTTYPL, mask);
+                        giu_clear(GIUINTHTSELL, mask);
+                }
+                giu_write(GIUINTSTATL, mask);
+        } else if (pin < GIUINT_HIGH_MAX) {
+                mask = 1 << (pin - GIUINT_HIGH_OFFSET);
+                if (trigger != IRQ_TRIGGER_LEVEL) {
+                        giu_set(GIUINTTYPH, mask);
+                        if (signal == IRQ_SIGNAL_HOLD)
+                                giu_set(GIUINTHTSELH, mask);
+                        else
+                                giu_clear(GIUINTHTSELH, mask);
+                        if (current_cpu_data.cputype == CPU_VR4133) {
+                                switch (trigger) {
+                                case IRQ_TRIGGER_EDGE_FALLING:
+                                        giu_set(GIUFEDGEINHH, mask);
+                                        giu_clear(GIUREDGEINHH, mask);
+                                        break;
+                                case IRQ_TRIGGER_EDGE_RISING:
+                                        giu_clear(GIUFEDGEINHH, mask);
+                                        giu_set(GIUREDGEINHH, mask);
+                                        break;
+                                default:
+                                        giu_set(GIUFEDGEINHH, mask);
+                                        giu_set(GIUREDGEINHH, mask);
+                                        break;
+                                }
+                        }
+                } else {
+                        giu_clear(GIUINTTYPH, mask);
+                        giu_clear(GIUINTHTSELH, mask);
+                }
+                giu_write(GIUINTSTATH, mask);
+        }
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_set_irq_trigger);
+
+void vr41xx_set_irq_level(unsigned int pin, irq_level_t level)
+{
+        uint16_t mask;
+
+        if (pin < GIUINT_HIGH_OFFSET) {
+                mask = 1 << pin;
+                if (level == IRQ_LEVEL_HIGH)
+                        giu_set(GIUINTALSELL, mask);
+                else
+                        giu_clear(GIUINTALSELL, mask);
+                giu_write(GIUINTSTATL, mask);
+        } else if (pin < GIUINT_HIGH_MAX) {
+                mask = 1 << (pin - GIUINT_HIGH_OFFSET);
+                if (level == IRQ_LEVEL_HIGH)
+                        giu_set(GIUINTALSELH, mask);
+                else
+                        giu_clear(GIUINTALSELH, mask);
+                giu_write(GIUINTSTATH, mask);
+        }
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_set_irq_level);
+
+gpio_data_t vr41xx_gpio_get_pin(unsigned int pin)
+{
+        uint16_t reg, mask;
+
+        if (pin >= giu_nr_pins)
+                return GPIO_DATA_INVAL;
+
+        if (pin < 16) {
+                reg = giu_read(GIUPIODL);
+                mask = (uint16_t)1 << pin;
+        } else if (pin < 32) {
+                reg = giu_read(GIUPIODH);
+                mask = (uint16_t)1 << (pin - 16);
+        } else if (pin < 48) {
+                reg = giu_read(GIUPODATL);
+                mask = (uint16_t)1 << (pin - 32);
+        } else {
+                reg = giu_read(GIUPODATH);
+                mask = (uint16_t)1 << (pin - 48);
+        }
+
+        if (reg & mask)
+                return GPIO_DATA_HIGH;
+
+        return GPIO_DATA_LOW;
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_gpio_get_pin);
+
+int vr41xx_gpio_set_pin(unsigned int pin, gpio_data_t data)
+{
+        uint16_t offset, mask, reg;
+        unsigned long flags;
+
+        if (pin >= giu_nr_pins)
+                return -EINVAL;
+
+        if (pin < 16) {
+                offset = GIUPIODL;
+                mask = (uint16_t)1 << pin;
+        } else if (pin < 32) {
+                offset = GIUPIODH;
+                mask = (uint16_t)1 << (pin - 16);
+        } else if (pin < 48) {
+                offset = GIUPODATL;
+                mask = (uint16_t)1 << (pin - 32);
+        } else {
+                offset = GIUPODATH;
+                mask = (uint16_t)1 << (pin - 48);
+        }
+
+        spin_lock_irqsave(&giu_lock, flags);
+
+        reg = giu_read(offset);
+        if (data == GPIO_DATA_HIGH)
+                reg |= mask;
+        else
+                reg &= ~mask;
+        giu_write(offset, reg);
+
+        spin_unlock_irqrestore(&giu_lock, flags);
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_gpio_set_pin);
+
+int vr41xx_gpio_set_direction(unsigned int pin, gpio_direction_t dir)
+{
+        uint16_t offset, mask, reg;
+        unsigned long flags;
+
+        if (pin >= giu_nr_pins)
+                return -EINVAL;
+
+        if (pin < 16) {
+                offset = GIUIOSELL;
+                mask = (uint16_t)1 << pin;
+        } else if (pin < 32) {
+                offset = GIUIOSELH;
+                mask = (uint16_t)1 << (pin - 16);
+        } else {
+                if (giu_flags & GPIO_HAS_OUTPUT_ENABLE) {
+                        offset = GIUPODATEN;
+                        mask = (uint16_t)1 << (pin - 32);
+                } else {
+                        switch (pin) {
+                        case 48:
+                                offset = GIUPODATH;
+                                mask = PIOEN0;
+                                break;
+                        case 49:
+                                offset = GIUPODATH;
+                                mask = PIOEN1;
+                                break;
+                        default:
+                                return -EINVAL;
+                        }
+                }
+        }
+
+        spin_lock_irqsave(&giu_lock, flags);
+
+        reg = giu_read(offset);
+        if (dir == GPIO_OUTPUT)
+                reg |= mask;
+        else
+                reg &= ~mask;
+        giu_write(offset, reg);
+
+        spin_unlock_irqrestore(&giu_lock, flags);
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_gpio_set_direction);
+
+int vr41xx_gpio_pullupdown(unsigned int pin, gpio_pull_t pull)
+{
+        uint16_t reg, mask;
+        unsigned long flags;
+
+        if ((giu_flags & GPIO_HAS_PULLUPDOWN_IO) != GPIO_HAS_PULLUPDOWN_IO)
+                return -EPERM;
+
+        if (pin >= 15)
+                return -EINVAL;
+
+        mask = (uint16_t)1 << pin;
+
+        spin_lock_irqsave(&giu_lock, flags);
+
+        if (pull == GPIO_PULL_UP || pull == GPIO_PULL_DOWN) {
+                reg = giu_read(GIUTERMUPDN);
+                if (pull == GPIO_PULL_UP)
+                        reg |= mask;
+                else
+                        reg &= ~mask;
+                giu_write(GIUTERMUPDN, reg);
+
+                reg = giu_read(GIUUSEUPDN);
+                reg |= mask;
+                giu_write(GIUUSEUPDN, reg);
+        } else {
+                reg = giu_read(GIUUSEUPDN);
+                reg &= ~mask;
+                giu_write(GIUUSEUPDN, reg);
+        }
+
+        spin_unlock_irqrestore(&giu_lock, flags);
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(vr41xx_gpio_pullupdown);
+
+static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
+                         loff_t *ppos)
+{
+        unsigned int pin;
+        char value = '0';
+
+        pin = iminor(file->f_dentry->d_inode);
+        if (pin >= giu_nr_pins)
+                return -EBADF;
+
+        if (vr41xx_gpio_get_pin(pin) == GPIO_DATA_HIGH)
+                value = '1';
+
+        if (len <= 0)
+                return -EFAULT;
+
+        if (put_user(value, buf))
+                return -EFAULT;
+
+        return 1;
+}
+
+static ssize_t gpio_write(struct file *file, const char __user *data,
+                          size_t len, loff_t *ppos)
+{
+        unsigned int pin;
+        size_t i;
+        char c;
+        int retval = 0;
+
+        pin = iminor(file->f_dentry->d_inode);
+        if (pin >= giu_nr_pins)
+                return -EBADF;
+
+        for (i = 0; i < len; i++) {
+                if (get_user(c, data + i))
+                        return -EFAULT;
+
+                switch (c) {
+                case '0':
+                        retval = vr41xx_gpio_set_pin(pin, GPIO_DATA_LOW);
+                        break;
+                case '1':
+                        retval = vr41xx_gpio_set_pin(pin, GPIO_DATA_HIGH);
+                        break;
+                case 'D':
+                        printk(KERN_INFO "GPIO%d: pull down\n", pin);
+                        retval = vr41xx_gpio_pullupdown(pin, GPIO_PULL_DOWN);
+                        break;
+                case 'd':
+                        printk(KERN_INFO "GPIO%d: pull up/down disable\n", pin);
+                        retval = vr41xx_gpio_pullupdown(pin, GPIO_PULL_DISABLE);
+                        break;
+                case 'I':
+                        printk(KERN_INFO "GPIO%d: input\n", pin);
+                        retval = vr41xx_gpio_set_direction(pin, GPIO_INPUT);
+                        break;
+                case 'O':
+                        printk(KERN_INFO "GPIO%d: output\n", pin);
+                        retval = vr41xx_gpio_set_direction(pin, GPIO_OUTPUT);
+                        break;
+                case 'o':
+                        printk(KERN_INFO "GPIO%d: output disable\n", pin);
+                        retval = vr41xx_gpio_set_direction(pin, GPIO_OUTPUT_DISABLE);
+                        break;
+                case 'P':
+                        printk(KERN_INFO "GPIO%d: pull up\n", pin);
+                        retval = vr41xx_gpio_pullupdown(pin, GPIO_PULL_UP);
+                        break;
+                case 'p':
+                        printk(KERN_INFO "GPIO%d: pull up/down disable\n", pin);
+                        retval = vr41xx_gpio_pullupdown(pin, GPIO_PULL_DISABLE);
+                        break;
+                default:
+                        break;
+                }
+
+                if (retval < 0)
+                        break;
+        }
+
+        return i;
+}
+
+static int gpio_open(struct inode *inode, struct file *file)
+{
+        unsigned int pin;
+
+        pin = iminor(inode);
+        if (pin >= giu_nr_pins)
+                return -EBADF;
+
+        return nonseekable_open(inode, file);
+}
+
+static int gpio_release(struct inode *inode, struct file *file)
+{
+        unsigned int pin;
+
+        pin = iminor(inode);
+        if (pin >= giu_nr_pins)
+                return -EBADF;
+
+        return 0;
+}
+
+static struct file_operations gpio_fops = {
+        .owner          = THIS_MODULE,
+        .read           = gpio_read,
+        .write          = gpio_write,
+        .open           = gpio_open,
+        .release        = gpio_release,
+};
+
+static int giu_probe(struct device *dev)
+{
+        unsigned long start, size, flags = 0;
+        unsigned int nr_pins = 0;
+        struct resource *res1, *res2 = NULL;
+        void *base;
+        int retval, i;
+
+        switch (current_cpu_data.cputype) {
+        case CPU_VR4111:
+        case CPU_VR4121:
+                start = GIU_TYPE1_START;
+                size = GIU_TYPE1_SIZE;
+                flags = GPIO_HAS_PULLUPDOWN_IO;
+                nr_pins = 50;
+                break;
+        case CPU_VR4122:
+        case CPU_VR4131:
+                start = GIU_TYPE2_START;
+                size = GIU_TYPE2_SIZE;
+                nr_pins = 36;
+                break;
+        case CPU_VR4133:
+                start = GIU_TYPE3_START;
+                size = GIU_TYPE3_SIZE;
+                flags = GPIO_HAS_INTERRUPT_EDGE_SELECT;
+                nr_pins = 48;
+                break;
+        default:
+                return -ENODEV;
+        }
+
+        res1 = request_mem_region(start, size, "GIU");
+        if (res1 == NULL)
+                return -EBUSY;
+
+        base = ioremap(start, size);
+        if (base == NULL) {
+                release_resource(res1);
+                return -ENOMEM;
+        }
+
+        if (flags & GPIO_HAS_PULLUPDOWN_IO) {
+                res2 = request_mem_region(GIU_PULLUPDOWN_START, GIU_PULLUPDOWN_SIZE, "GIU");
+                if (res2 == NULL) {
+                        iounmap(base);
+                        release_resource(res1);
+                        return -EBUSY;
+                }
+        }
+
+        retval = register_chrdev(major, "GIU", &gpio_fops);
+        if (retval < 0) {
+                iounmap(base);
+                release_resource(res1);
+                release_resource(res2);
+                return retval;
+        }
+
+        if (major == 0) {
+                major = retval;
+                printk(KERN_INFO "GIU: major number %d\n", major);
+        }
+
+        spin_lock_init(&giu_lock);
+        giu_base = base;
+        giu_resource1 = res1;
+        giu_resource2 = res2;
+        giu_flags = flags;
+        giu_nr_pins = nr_pins;
+
+        giu_write(GIUINTENL, 0);
+        giu_write(GIUINTENH, 0);
+
+        for (i = GIU_IRQ_BASE; i <= GIU_IRQ_LAST; i++) {
+                if (i < GIU_IRQ(GIUINT_HIGH_OFFSET))
+                        irq_desc[i].handler = &giuint_low_irq_type;
+                else
+                        irq_desc[i].handler = &giuint_high_irq_type;
+        }
+
+        return cascade_irq(GIUINT_IRQ, giu_get_irq);
+}
+
+static int giu_remove(struct device *dev)
+{
+        iounmap(giu_base);
+
+        release_resource(giu_resource1);
+        if (giu_flags & GPIO_HAS_PULLUPDOWN_IO)
+                release_resource(giu_resource2);
+
+        return 0;
+}
+
+static struct platform_device *giu_platform_device;
+
+static struct device_driver giu_device_driver = {
+        .name           = "GIU",
+        .bus            = &platform_bus_type,
+        .probe          = giu_probe,
+        .remove         = giu_remove,
+};
+
+static int __devinit vr41xx_giu_init(void)
+{
+        int retval;
+
+        giu_platform_device = platform_device_register_simple("GIU", -1, NULL, 0);
+        if (IS_ERR(giu_platform_device))
+                return PTR_ERR(giu_platform_device);
+
+        retval = driver_register(&giu_device_driver);
+        if (retval < 0)
+                platform_device_unregister(giu_platform_device);
+
+        return retval;
+}
+
+static void __devexit vr41xx_giu_exit(void)
+{
+        driver_unregister(&giu_device_driver);
+
+        platform_device_unregister(giu_platform_device);
+}
+
+module_init(vr41xx_giu_init);
+module_exit(vr41xx_giu_exit);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index e5ef1dfc5482..d7aa7a29f67e 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2867,6 +2867,10 @@ void unblank_screen(void)
  */
 static void blank_screen_t(unsigned long dummy)
 {
+        if (unlikely(!keventd_up())) {
+                mod_timer(&console_timer, jiffies + blankinterval);
+                return;
+        }
         blank_timer_expired = 1;
         schedule_work(&console_work);
 }
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index ab659d37b4d2..4e98c215e5b1 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -192,7 +192,12 @@ static struct miscdevice ixp2000_wdt_miscdev =
 
 static int __init ixp2000_wdt_init(void)
 {
-        wdt_tick_rate = (*IXP2000_T1_CLD * HZ)/ 256;;
+        if ((*IXP2000_PRODUCT_ID & 0x001ffef0) == 0x00000000) {
+                printk(KERN_INFO "Unable to use IXP2000 watchdog due to IXP2800 erratum #25.\n");
+                return -EIO;
+        }
+
+        wdt_tick_rate = (*IXP2000_T1_CLD * HZ) / 256;
 
         return misc_register(&ixp2000_wdt_miscdev);
 }
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 95882bb1950e..60c9be99c6d9 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -46,6 +46,10 @@ config CPU_FREQ_STAT_DETAILS
          This will show detail CPU frequency translation table in sysfs file
          system
 
+# Note that it is not currently possible to set the other governors (such as ondemand)
+# as the default, since if they fail to initialise, cpufreq will be
+# left in an undefined state.
+
 choice
         prompt "Default CPUFreq governor"
         default CPU_FREQ_DEFAULT_GOV_USERSPACE if CPU_FREQ_SA1100 || CPU_FREQ_SA1110
@@ -115,4 +119,24 @@ config CPU_FREQ_GOV_ONDEMAND
 
           If in doubt, say N.
 
+config CPU_FREQ_GOV_CONSERVATIVE
+        tristate "'conservative' cpufreq governor"
+        depends on CPU_FREQ
+        help
+          'conservative' - this driver is rather similar to the 'ondemand'
+          governor both in its source code and its purpose, the difference is
+          its optimisation for better suitability in a battery powered
+          environment.  The frequency is gracefully increased and decreased
+          rather than jumping to 100% when speed is required.
+
+          If you have a desktop machine then you should really be considering
+          the 'ondemand' governor instead, however if you are using a laptop,
+          PDA or even an AMD64 based computer (due to the unacceptable
+          step-by-step latency issues between the minimum and maximum frequency
+          transitions in the CPU) you will probably want to use this governor.
+
+          For details, take a look at linux/Documentation/cpu-freq.
+
+          If in doubt, say N.
+
 endif   # CPU_FREQ
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 67b16e5a41a7..71fc3b4173f1 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE)	+= cpufreq_performance.o
 obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE)    += cpufreq_powersave.o
 obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE)    += cpufreq_userspace.o
 obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND)     += cpufreq_ondemand.o
+obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o
 
 # CPUfreq cross-arch helpers
 obj-$(CONFIG_CPU_FREQ_TABLE)            += freq_table.o
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 8e561313d094..bf62dfe4976a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -258,7 +258,7 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
                             (likely(cpufreq_cpu_data[freqs->cpu]->cur)) &&
                             (unlikely(freqs->old != cpufreq_cpu_data[freqs->cpu]->cur)))
                         {
-                                printk(KERN_WARNING "Warning: CPU frequency is %u, "
+                                dprintk(KERN_WARNING "Warning: CPU frequency is %u, "
                                        "cpufreq assumed %u kHz.\n", freqs->old, cpufreq_cpu_data[freqs->cpu]->cur);
                                 freqs->old = cpufreq_cpu_data[freqs->cpu]->cur;
                         }
@@ -521,7 +521,7 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf)
         policy = cpufreq_cpu_get(policy->cpu);
         if (!policy)
                 return -EINVAL;
-        ret = fattr->show ? fattr->show(policy,buf) : 0;
+        ret = fattr->show ? fattr->show(policy,buf) : -EIO;
         cpufreq_cpu_put(policy);
         return ret;
 }
@@ -535,7 +535,7 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr,
         policy = cpufreq_cpu_get(policy->cpu);
         if (!policy)
                 return -EINVAL;
-        ret = fattr->store ? fattr->store(policy,buf,count) : 0;
+        ret = fattr->store ? fattr->store(policy,buf,count) : -EIO;
         cpufreq_cpu_put(policy);
         return ret;
 }
@@ -814,7 +814,7 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, unsigne
 {
         struct cpufreq_freqs freqs;
 
-        printk(KERN_WARNING "Warning: CPU frequency out of sync: cpufreq and timing "
+        dprintk(KERN_WARNING "Warning: CPU frequency out of sync: cpufreq and timing "
                "core thinks of %u, is %u kHz.\n", old_freq, new_freq);
 
         freqs.cpu = cpu;
@@ -923,7 +923,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, u32 state)
                 struct cpufreq_freqs freqs;
 
                 if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
-                        printk(KERN_DEBUG "Warning: CPU frequency is %u, "
+                        dprintk(KERN_DEBUG "Warning: CPU frequency is %u, "
                                "cpufreq assumed %u kHz.\n",
                                cur_freq, cpu_policy->cur);
 
@@ -1004,7 +1004,7 @@ static int cpufreq_resume(struct sys_device * sysdev)
                         struct cpufreq_freqs freqs;
 
                         if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
-                                printk(KERN_WARNING "Warning: CPU frequency"
+                                dprintk(KERN_WARNING "Warning: CPU frequency"
                                        "is %u, cpufreq assumed %u kHz.\n",
                                        cur_freq, cpu_policy->cur);
 
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
new file mode 100644
index 000000000000..e1df376e709e
--- /dev/null
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -0,0 +1,586 @@
+/*
+ *  drivers/cpufreq/cpufreq_conservative.c
+ *
+ *  Copyright (C)  2001 Russell King
+ *            (C)  2003 Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>.
+ *                      Jun Nakajima <jun.nakajima@intel.com>
+ *            (C)  2004 Alexander Clouter <alex-kernel@digriz.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/smp.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/ctype.h>
+#include <linux/cpufreq.h>
+#include <linux/sysctl.h>
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/sysfs.h>
+#include <linux/sched.h>
+#include <linux/kmod.h>
+#include <linux/workqueue.h>
+#include <linux/jiffies.h>
+#include <linux/kernel_stat.h>
+#include <linux/percpu.h>
+
+/*
+ * dbs is used in this file as a shortform for demandbased switching
+ * It helps to keep variable names smaller, simpler
+ */
+
+#define DEF_FREQUENCY_UP_THRESHOLD              (80)
+#define MIN_FREQUENCY_UP_THRESHOLD              (0)
+#define MAX_FREQUENCY_UP_THRESHOLD              (100)
+
+#define DEF_FREQUENCY_DOWN_THRESHOLD            (20)
+#define MIN_FREQUENCY_DOWN_THRESHOLD            (0)
+#define MAX_FREQUENCY_DOWN_THRESHOLD            (100)
+
+/* 
+ * The polling frequency of this governor depends on the capability of 
+ * the processor. Default polling frequency is 1000 times the transition
+ * latency of the processor. The governor will work on any processor with 
+ * transition latency <= 10mS, using appropriate sampling 
+ * rate.
+ * For CPUs with transition latency > 10mS (mostly drivers with CPUFREQ_ETERNAL)
+ * this governor will not work.
+ * All times here are in uS.
+ */
+static unsigned int                             def_sampling_rate;
+#define MIN_SAMPLING_RATE                       (def_sampling_rate / 2)
+#define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
+#define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (100000)
+#define DEF_SAMPLING_DOWN_FACTOR                (5)
+#define TRANSITION_LATENCY_LIMIT                (10 * 1000)
+
+static void do_dbs_timer(void *data);
+
+struct cpu_dbs_info_s {
+        struct cpufreq_policy   *cur_policy;
+        unsigned int            prev_cpu_idle_up;
+        unsigned int            prev_cpu_idle_down;
+        unsigned int            enable;
+};
+static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
+
+static unsigned int dbs_enable; /* number of CPUs using this policy */
+
+static DECLARE_MUTEX    (dbs_sem);
+static DECLARE_WORK     (dbs_work, do_dbs_timer, NULL);
+
+struct dbs_tuners {
+        unsigned int            sampling_rate;
+        unsigned int            sampling_down_factor;
+        unsigned int            up_threshold;
+        unsigned int            down_threshold;
+        unsigned int            ignore_nice;
+        unsigned int            freq_step;
+};
+
+static struct dbs_tuners dbs_tuners_ins = {
+        .up_threshold           = DEF_FREQUENCY_UP_THRESHOLD,
+        .down_threshold         = DEF_FREQUENCY_DOWN_THRESHOLD,
+        .sampling_down_factor   = DEF_SAMPLING_DOWN_FACTOR,
+};
+
+static inline unsigned int get_cpu_idle_time(unsigned int cpu)
+{
+        return  kstat_cpu(cpu).cpustat.idle +
+                kstat_cpu(cpu).cpustat.iowait +
+                ( !dbs_tuners_ins.ignore_nice ? 
+                  kstat_cpu(cpu).cpustat.nice :
+                  0);
+}
+
+/************************** sysfs interface ************************/
+static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf)
+{
+        return sprintf (buf, "%u\n", MAX_SAMPLING_RATE);
+}
+
+static ssize_t show_sampling_rate_min(struct cpufreq_policy *policy, char *buf)
+{
+        return sprintf (buf, "%u\n", MIN_SAMPLING_RATE);
+}
+
+#define define_one_ro(_name)                                    \
+static struct freq_attr _name =                                 \
+__ATTR(_name, 0444, show_##_name, NULL)
+
+define_one_ro(sampling_rate_max);
+define_one_ro(sampling_rate_min);
+
+/* cpufreq_conservative Governor Tunables */
+#define show_one(file_name, object)                                     \
+static ssize_t show_##file_name                                         \
+(struct cpufreq_policy *unused, char *buf)                              \
+{                                                                       \
+        return sprintf(buf, "%u\n", dbs_tuners_ins.object);             \
+}
+show_one(sampling_rate, sampling_rate);
+show_one(sampling_down_factor, sampling_down_factor);
+show_one(up_threshold, up_threshold);
+show_one(down_threshold, down_threshold);
+show_one(ignore_nice, ignore_nice);
+show_one(freq_step, freq_step);
+
+static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused, 
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+        ret = sscanf (buf, "%u", &input);
+        if (ret != 1 )
+                return -EINVAL;
+
+        down(&dbs_sem);
+        dbs_tuners_ins.sampling_down_factor = input;
+        up(&dbs_sem);
+
+        return count;
+}
+
+static ssize_t store_sampling_rate(struct cpufreq_policy *unused, 
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+        ret = sscanf (buf, "%u", &input);
+
+        down(&dbs_sem);
+        if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
+                up(&dbs_sem);
+                return -EINVAL;
+        }
+
+        dbs_tuners_ins.sampling_rate = input;
+        up(&dbs_sem);
+
+        return count;
+}
+
+static ssize_t store_up_threshold(struct cpufreq_policy *unused, 
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+        ret = sscanf (buf, "%u", &input);
+
+        down(&dbs_sem);
+        if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
+                        input < MIN_FREQUENCY_UP_THRESHOLD ||
+                        input <= dbs_tuners_ins.down_threshold) {
+                up(&dbs_sem);
+                return -EINVAL;
+        }
+
+        dbs_tuners_ins.up_threshold = input;
+        up(&dbs_sem);
+
+        return count;
+}
+
+static ssize_t store_down_threshold(struct cpufreq_policy *unused, 
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+        ret = sscanf (buf, "%u", &input);
+
+        down(&dbs_sem);
+        if (ret != 1 || input > MAX_FREQUENCY_DOWN_THRESHOLD || 
+                        input < MIN_FREQUENCY_DOWN_THRESHOLD ||
+                        input >= dbs_tuners_ins.up_threshold) {
+                up(&dbs_sem);
+                return -EINVAL;
+        }
+
+        dbs_tuners_ins.down_threshold = input;
+        up(&dbs_sem);
+
+        return count;
+}
+
+static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+
+        unsigned int j;
+        
+        ret = sscanf (buf, "%u", &input);
+        if ( ret != 1 )
+                return -EINVAL;
+
+        if ( input > 1 )
+                input = 1;
+        
+        down(&dbs_sem);
+        if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
+                up(&dbs_sem);
+                return count;
+        }
+        dbs_tuners_ins.ignore_nice = input;
+
+        /* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */
+        for_each_online_cpu(j) {
+                struct cpu_dbs_info_s *j_dbs_info;
+                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
+                j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
+        }
+        up(&dbs_sem);
+
+        return count;
+}
+
+static ssize_t store_freq_step(struct cpufreq_policy *policy,
+                const char *buf, size_t count)
+{
+        unsigned int input;
+        int ret;
+
+        ret = sscanf (buf, "%u", &input);
+
+        if ( ret != 1 )
+                return -EINVAL;
+
+        if ( input > 100 )
+                input = 100;
+        
+        /* no need to test here if freq_step is zero as the user might actually
+         * want this, they would be crazy though :) */
+        down(&dbs_sem);
+        dbs_tuners_ins.freq_step = input;
+        up(&dbs_sem);
+
+        return count;
+}
+
+#define define_one_rw(_name) \
+static struct freq_attr _name = \
+__ATTR(_name, 0644, show_##_name, store_##_name)
+
+define_one_rw(sampling_rate);
+define_one_rw(sampling_down_factor);
+define_one_rw(up_threshold);
+define_one_rw(down_threshold);
+define_one_rw(ignore_nice);
+define_one_rw(freq_step);
+
+static struct attribute * dbs_attributes[] = {
+        &sampling_rate_max.attr,
+        &sampling_rate_min.attr,
+        &sampling_rate.attr,
+        &sampling_down_factor.attr,
+        &up_threshold.attr,
+        &down_threshold.attr,
+        &ignore_nice.attr,
+        &freq_step.attr,
+        NULL
+};
+
+static struct attribute_group dbs_attr_group = {
+        .attrs = dbs_attributes,
+        .name = "conservative",
+};
+
+/************************** sysfs end ************************/
+
+static void dbs_check_cpu(int cpu)
+{
+        unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
+        unsigned int freq_step;
+        unsigned int freq_down_sampling_rate;
+        static int down_skip[NR_CPUS];
+        static int requested_freq[NR_CPUS];
+        static unsigned short init_flag = 0;
+        struct cpu_dbs_info_s *this_dbs_info;
+        struct cpu_dbs_info_s *dbs_info;
+
+        struct cpufreq_policy *policy;
+        unsigned int j;
+
+        this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
+        if (!this_dbs_info->enable)
+                return;
+
+        policy = this_dbs_info->cur_policy;
+
+        if ( init_flag == 0 ) {
+                for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) {
+                        dbs_info = &per_cpu(cpu_dbs_info, init_flag);
+                        requested_freq[cpu] = dbs_info->cur_policy->cur;
+                }
+                init_flag = 1;
+        }
+        
+        /* 
+         * The default safe range is 20% to 80% 
+         * Every sampling_rate, we check
+         *      - If current idle time is less than 20%, then we try to 
+         *        increase frequency
+         * Every sampling_rate*sampling_down_factor, we check
+         *      - If current idle time is more than 80%, then we try to
+         *        decrease frequency
+         *
+         * Any frequency increase takes it to the maximum frequency. 
+         * Frequency reduction happens at minimum steps of 
+         * 5% (default) of max_frequency 
+         */
+
+        /* Check for frequency increase */
+
+        idle_ticks = UINT_MAX;
+        for_each_cpu_mask(j, policy->cpus) {
+                unsigned int tmp_idle_ticks, total_idle_ticks;
+                struct cpu_dbs_info_s *j_dbs_info;
+
+                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                /* Check for frequency increase */
+                total_idle_ticks = get_cpu_idle_time(j);
+                tmp_idle_ticks = total_idle_ticks -
+                        j_dbs_info->prev_cpu_idle_up;
+                j_dbs_info->prev_cpu_idle_up = total_idle_ticks;
+
+                if (tmp_idle_ticks < idle_ticks)
+                        idle_ticks = tmp_idle_ticks;
+        }
+
+        /* Scale idle ticks by 100 and compare with up and down ticks */
+        idle_ticks *= 100;
+        up_idle_ticks = (100 - dbs_tuners_ins.up_threshold) *
+                usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
+
+        if (idle_ticks < up_idle_ticks) {
+                down_skip[cpu] = 0;
+                for_each_cpu_mask(j, policy->cpus) {
+                        struct cpu_dbs_info_s *j_dbs_info;
+
+                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                        j_dbs_info->prev_cpu_idle_down = 
+                                        j_dbs_info->prev_cpu_idle_up;
+                }
+                /* if we are already at full speed then break out early */
+                if (requested_freq[cpu] == policy->max)
+                        return;
+                
+                freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100;
+
+                /* max freq cannot be less than 100. But who knows.... */
+                if (unlikely(freq_step == 0))
+                        freq_step = 5;
+                
+                requested_freq[cpu] += freq_step;
+                if (requested_freq[cpu] > policy->max)
+                        requested_freq[cpu] = policy->max;
+
+                __cpufreq_driver_target(policy, requested_freq[cpu], 
+                        CPUFREQ_RELATION_H);
+                return;
+        }
+
+        /* Check for frequency decrease */
+        down_skip[cpu]++;
+        if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
+                return;
+
+        idle_ticks = UINT_MAX;
+        for_each_cpu_mask(j, policy->cpus) {
+                unsigned int tmp_idle_ticks, total_idle_ticks;
+                struct cpu_dbs_info_s *j_dbs_info;
+
+                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
+                tmp_idle_ticks = total_idle_ticks -
+                        j_dbs_info->prev_cpu_idle_down;
+                j_dbs_info->prev_cpu_idle_down = total_idle_ticks;
+
+                if (tmp_idle_ticks < idle_ticks)
+                        idle_ticks = tmp_idle_ticks;
+        }
+
+        /* Scale idle ticks by 100 and compare with up and down ticks */
+        idle_ticks *= 100;
+        down_skip[cpu] = 0;
+
+        freq_down_sampling_rate = dbs_tuners_ins.sampling_rate *
+                dbs_tuners_ins.sampling_down_factor;
+        down_idle_ticks = (100 - dbs_tuners_ins.down_threshold) *
+                        usecs_to_jiffies(freq_down_sampling_rate);
+
+        if (idle_ticks > down_idle_ticks) {
+                /* if we are already at the lowest speed then break out early
+                 * or if we 'cannot' reduce the speed as the user might want
+                 * freq_step to be zero */
+                if (requested_freq[cpu] == policy->min
+                                || dbs_tuners_ins.freq_step == 0)
+                        return;
+
+                freq_step = (dbs_tuners_ins.freq_step * policy->max) / 100;
+
+                /* max freq cannot be less than 100. But who knows.... */
+                if (unlikely(freq_step == 0))
+                        freq_step = 5;
+
+                requested_freq[cpu] -= freq_step;
+                if (requested_freq[cpu] < policy->min)
+                        requested_freq[cpu] = policy->min;
+
+                __cpufreq_driver_target(policy,
+                        requested_freq[cpu],
+                        CPUFREQ_RELATION_H);
+                return;
+        }
+}
+
+static void do_dbs_timer(void *data)
+{ 
+        int i;
+        down(&dbs_sem);
+        for_each_online_cpu(i)
+                dbs_check_cpu(i);
+        schedule_delayed_work(&dbs_work, 
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
+        up(&dbs_sem);
+} 
+
+static inline void dbs_timer_init(void)
+{
+        INIT_WORK(&dbs_work, do_dbs_timer, NULL);
+        schedule_delayed_work(&dbs_work,
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
+        return;
+}
+
+static inline void dbs_timer_exit(void)
+{
+        cancel_delayed_work(&dbs_work);
+        return;
+}
+
+static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+                                   unsigned int event)
+{
+        unsigned int cpu = policy->cpu;
+        struct cpu_dbs_info_s *this_dbs_info;
+        unsigned int j;
+
+        this_dbs_info = &per_cpu(cpu_dbs_info, cpu);
+
+        switch (event) {
+        case CPUFREQ_GOV_START:
+                if ((!cpu_online(cpu)) || 
+                    (!policy->cur))
+                        return -EINVAL;
+
+                if (policy->cpuinfo.transition_latency >
+                                (TRANSITION_LATENCY_LIMIT * 1000))
+                        return -EINVAL;
+                if (this_dbs_info->enable) /* Already enabled */
+                        break;
+                 
+                down(&dbs_sem);
+                for_each_cpu_mask(j, policy->cpus) {
+                        struct cpu_dbs_info_s *j_dbs_info;
+                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                        j_dbs_info->cur_policy = policy;
+                
+                        j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
+                        j_dbs_info->prev_cpu_idle_down
+                                = j_dbs_info->prev_cpu_idle_up;
+                }
+                this_dbs_info->enable = 1;
+                sysfs_create_group(&policy->kobj, &dbs_attr_group);
+                dbs_enable++;
+                /*
+                 * Start the timerschedule work, when this governor
+                 * is used for first time
+                 */
+                if (dbs_enable == 1) {
+                        unsigned int latency;
+                        /* policy latency is in nS. Convert it to uS first */
+
+                        latency = policy->cpuinfo.transition_latency;
+                        if (latency < 1000)
+                                latency = 1000;
+
+                        def_sampling_rate = (latency / 1000) *
+                                        DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
+                        dbs_tuners_ins.sampling_rate = def_sampling_rate;
+                        dbs_tuners_ins.ignore_nice = 0;
+                        dbs_tuners_ins.freq_step = 5;
+
+                        dbs_timer_init();
+                }
+                
+                up(&dbs_sem);
+                break;
+
+        case CPUFREQ_GOV_STOP:
+                down(&dbs_sem);
+                this_dbs_info->enable = 0;
+                sysfs_remove_group(&policy->kobj, &dbs_attr_group);
+                dbs_enable--;
+                /*
+                 * Stop the timerschedule work, when this governor
+                 * is used for first time
+                 */
+                if (dbs_enable == 0) 
+                        dbs_timer_exit();
+                
+                up(&dbs_sem);
+
+                break;
+
+        case CPUFREQ_GOV_LIMITS:
+                down(&dbs_sem);
+                if (policy->max < this_dbs_info->cur_policy->cur)
+                        __cpufreq_driver_target(
+                                        this_dbs_info->cur_policy,
+                                        policy->max, CPUFREQ_RELATION_H);
+                else if (policy->min > this_dbs_info->cur_policy->cur)
+                        __cpufreq_driver_target(
+                                        this_dbs_info->cur_policy,
+                                        policy->min, CPUFREQ_RELATION_L);
+                up(&dbs_sem);
+                break;
+        }
+        return 0;
+}
+
+static struct cpufreq_governor cpufreq_gov_dbs = {
+        .name           = "conservative",
+        .governor       = cpufreq_governor_dbs,
+        .owner          = THIS_MODULE,
+};
+
+static int __init cpufreq_gov_dbs_init(void)
+{
+        return cpufreq_register_governor(&cpufreq_gov_dbs);
+}
+
+static void __exit cpufreq_gov_dbs_exit(void)
+{
+        /* Make sure that the scheduled work is indeed not running */
+        flush_scheduled_work();
+
+        cpufreq_unregister_governor(&cpufreq_gov_dbs);
+}
+
+
+MODULE_AUTHOR ("Alexander Clouter <alex-kernel@digriz.org.uk>");
+MODULE_DESCRIPTION ("'cpufreq_conservative' - A dynamic cpufreq governor for "
+                "Low Latency Frequency Transition capable processors "
+                "optimised for use in a battery environment");
+MODULE_LICENSE ("GPL");
+
+module_init(cpufreq_gov_dbs_init);
+module_exit(cpufreq_gov_dbs_exit);
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 8d83a21c6477..c1fc9c62bb51 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -34,13 +34,9 @@
  */
 
 #define DEF_FREQUENCY_UP_THRESHOLD              (80)
-#define MIN_FREQUENCY_UP_THRESHOLD              (0)
+#define MIN_FREQUENCY_UP_THRESHOLD              (11)
 #define MAX_FREQUENCY_UP_THRESHOLD              (100)
 
-#define DEF_FREQUENCY_DOWN_THRESHOLD            (20)
-#define MIN_FREQUENCY_DOWN_THRESHOLD            (0)
-#define MAX_FREQUENCY_DOWN_THRESHOLD            (100)
-
 /* 
  * The polling frequency of this governor depends on the capability of 
  * the processor. Default polling frequency is 1000 times the transition
@@ -55,9 +51,9 @@ static unsigned int 				def_sampling_rate;
 #define MIN_SAMPLING_RATE                       (def_sampling_rate / 2)
 #define MAX_SAMPLING_RATE                       (500 * def_sampling_rate)
 #define DEF_SAMPLING_RATE_LATENCY_MULTIPLIER    (1000)
-#define DEF_SAMPLING_DOWN_FACTOR                (10)
+#define DEF_SAMPLING_DOWN_FACTOR                (1)
+#define MAX_SAMPLING_DOWN_FACTOR                (10)
 #define TRANSITION_LATENCY_LIMIT                (10 * 1000)
-#define sampling_rate_in_HZ(x)                  (((x * HZ) < (1000 * 1000))?1:((x * HZ) / (1000 * 1000)))
 
 static void do_dbs_timer(void *data);
 
@@ -78,15 +74,23 @@ struct dbs_tuners {
         unsigned int            sampling_rate;
         unsigned int            sampling_down_factor;
         unsigned int            up_threshold;
-        unsigned int            down_threshold;
+        unsigned int            ignore_nice;
 };
 
 static struct dbs_tuners dbs_tuners_ins = {
         .up_threshold           = DEF_FREQUENCY_UP_THRESHOLD,
-        .down_threshold         = DEF_FREQUENCY_DOWN_THRESHOLD,
         .sampling_down_factor   = DEF_SAMPLING_DOWN_FACTOR,
 };
 
+static inline unsigned int get_cpu_idle_time(unsigned int cpu)
+{
+        return  kstat_cpu(cpu).cpustat.idle +
+                kstat_cpu(cpu).cpustat.iowait +
+                ( !dbs_tuners_ins.ignore_nice ? 
+                  kstat_cpu(cpu).cpustat.nice :
+                  0);
+}
+
 /************************** sysfs interface ************************/
 static ssize_t show_sampling_rate_max(struct cpufreq_policy *policy, char *buf)
 {
@@ -115,7 +119,7 @@ static ssize_t show_##file_name						\
 show_one(sampling_rate, sampling_rate);
 show_one(sampling_down_factor, sampling_down_factor);
 show_one(up_threshold, up_threshold);
-show_one(down_threshold, down_threshold);
+show_one(ignore_nice, ignore_nice);
 
 static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused, 
                 const char *buf, size_t count)
@@ -126,6 +130,9 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         if (ret != 1 )
                 return -EINVAL;
 
+        if (input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
+                return -EINVAL;
+
         down(&dbs_sem);
         dbs_tuners_ins.sampling_down_factor = input;
         up(&dbs_sem);
@@ -161,8 +168,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
 
         down(&dbs_sem);
         if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
-                        input < MIN_FREQUENCY_UP_THRESHOLD ||
-                        input <= dbs_tuners_ins.down_threshold) {
+                        input < MIN_FREQUENCY_UP_THRESHOLD) {
                 up(&dbs_sem);
                 return -EINVAL;
         }
@@ -173,22 +179,35 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         return count;
 }
 
-static ssize_t store_down_threshold(struct cpufreq_policy *unused, 
+static ssize_t store_ignore_nice(struct cpufreq_policy *policy,
                 const char *buf, size_t count)
 {
         unsigned int input;
         int ret;
+
+        unsigned int j;
+        
         ret = sscanf (buf, "%u", &input);
+        if ( ret != 1 )
+                return -EINVAL;
 
+        if ( input > 1 )
+                input = 1;
+        
         down(&dbs_sem);
-        if (ret != 1 || input > MAX_FREQUENCY_DOWN_THRESHOLD || 
-                        input < MIN_FREQUENCY_DOWN_THRESHOLD ||
-                        input >= dbs_tuners_ins.up_threshold) {
+        if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
                 up(&dbs_sem);
-                return -EINVAL;
+                return count;
         }
+        dbs_tuners_ins.ignore_nice = input;
 
-        dbs_tuners_ins.down_threshold = input;
+        /* we need to re-evaluate prev_cpu_idle_up and prev_cpu_idle_down */
+        for_each_online_cpu(j) {
+                struct cpu_dbs_info_s *j_dbs_info;
+                j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
+                j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
+        }
         up(&dbs_sem);
 
         return count;
@@ -201,7 +220,7 @@ __ATTR(_name, 0644, show_##_name, store_##_name)
 define_one_rw(sampling_rate);
 define_one_rw(sampling_down_factor);
 define_one_rw(up_threshold);
-define_one_rw(down_threshold);
+define_one_rw(ignore_nice);
 
 static struct attribute * dbs_attributes[] = {
         &sampling_rate_max.attr,
@@ -209,7 +228,7 @@ static struct attribute * dbs_attributes[] = {
         &sampling_rate.attr,
         &sampling_down_factor.attr,
         &up_threshold.attr,
-        &down_threshold.attr,
+        &ignore_nice.attr,
         NULL
 };
 
@@ -222,9 +241,8 @@ static struct attribute_group dbs_attr_group = {
 
 static void dbs_check_cpu(int cpu)
 {
-        unsigned int idle_ticks, up_idle_ticks, down_idle_ticks;
-        unsigned int total_idle_ticks;
-        unsigned int freq_down_step;
+        unsigned int idle_ticks, up_idle_ticks, total_ticks;
+        unsigned int freq_next;
         unsigned int freq_down_sampling_rate;
         static int down_skip[NR_CPUS];
         struct cpu_dbs_info_s *this_dbs_info;
@@ -238,38 +256,25 @@ static void dbs_check_cpu(int cpu)
 
         policy = this_dbs_info->cur_policy;
         /* 
-         * The default safe range is 20% to 80% 
-         * Every sampling_rate, we check
-         *      - If current idle time is less than 20%, then we try to 
-         *        increase frequency
-         * Every sampling_rate*sampling_down_factor, we check
-         *      - If current idle time is more than 80%, then we try to
-         *        decrease frequency
+         * Every sampling_rate, we check, if current idle time is less
+         * than 20% (default), then we try to increase frequency
+         * Every sampling_rate*sampling_down_factor, we look for a the lowest
+         * frequency which can sustain the load while keeping idle time over
+         * 30%. If such a frequency exist, we try to decrease to this frequency.
          *
          * Any frequency increase takes it to the maximum frequency. 
          * Frequency reduction happens at minimum steps of 
-         * 5% of max_frequency 
+         * 5% (default) of current frequency 
          */
 
         /* Check for frequency increase */
-        total_idle_ticks = kstat_cpu(cpu).cpustat.idle +
-                kstat_cpu(cpu).cpustat.iowait;
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_up;
-        this_dbs_info->prev_cpu_idle_up = total_idle_ticks;
-        
-
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                /* Check for frequency increase */
-                total_idle_ticks = kstat_cpu(j).cpustat.idle +
-                        kstat_cpu(j).cpustat.iowait;
+                total_idle_ticks = get_cpu_idle_time(j);
                 tmp_idle_ticks = total_idle_ticks -
                         j_dbs_info->prev_cpu_idle_up;
                 j_dbs_info->prev_cpu_idle_up = total_idle_ticks;
@@ -281,13 +286,23 @@ static void dbs_check_cpu(int cpu)
         /* Scale idle ticks by 100 and compare with up and down ticks */
         idle_ticks *= 100;
         up_idle_ticks = (100 - dbs_tuners_ins.up_threshold) *
-                        sampling_rate_in_HZ(dbs_tuners_ins.sampling_rate);
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 
         if (idle_ticks < up_idle_ticks) {
+                down_skip[cpu] = 0;
+                for_each_cpu_mask(j, policy->cpus) {
+                        struct cpu_dbs_info_s *j_dbs_info;
+
+                        j_dbs_info = &per_cpu(cpu_dbs_info, j);
+                        j_dbs_info->prev_cpu_idle_down = 
+                                        j_dbs_info->prev_cpu_idle_up;
+                }
+                /* if we are already at full speed then break out early */
+                if (policy->cur == policy->max)
+                        return;
+                
                 __cpufreq_driver_target(policy, policy->max, 
                         CPUFREQ_RELATION_H);
-                down_skip[cpu] = 0;
-                this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
                 return;
         }
 
@@ -296,23 +311,14 @@ static void dbs_check_cpu(int cpu)
         if (down_skip[cpu] < dbs_tuners_ins.sampling_down_factor)
                 return;
 
-        total_idle_ticks = kstat_cpu(cpu).cpustat.idle +
-                kstat_cpu(cpu).cpustat.iowait;
-        idle_ticks = total_idle_ticks -
-                this_dbs_info->prev_cpu_idle_down;
-        this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
-
+        idle_ticks = UINT_MAX;
         for_each_cpu_mask(j, policy->cpus) {
-                unsigned int tmp_idle_ticks;
+                unsigned int tmp_idle_ticks, total_idle_ticks;
                 struct cpu_dbs_info_s *j_dbs_info;
 
-                if (j == cpu)
-                        continue;
-
                 j_dbs_info = &per_cpu(cpu_dbs_info, j);
-                /* Check for frequency increase */
-                total_idle_ticks = kstat_cpu(j).cpustat.idle +
-                        kstat_cpu(j).cpustat.iowait;
+                /* Check for frequency decrease */
+                total_idle_ticks = j_dbs_info->prev_cpu_idle_up;
                 tmp_idle_ticks = total_idle_ticks -
                         j_dbs_info->prev_cpu_idle_down;
                 j_dbs_info->prev_cpu_idle_down = total_idle_ticks;
@@ -321,38 +327,37 @@ static void dbs_check_cpu(int cpu)
                         idle_ticks = tmp_idle_ticks;
         }
 
-        /* Scale idle ticks by 100 and compare with up and down ticks */
-        idle_ticks *= 100;
         down_skip[cpu] = 0;
+        /* if we cannot reduce the frequency anymore, break out early */
+        if (policy->cur == policy->min)
+                return;
 
+        /* Compute how many ticks there are between two measurements */
         freq_down_sampling_rate = dbs_tuners_ins.sampling_rate *
                 dbs_tuners_ins.sampling_down_factor;
-        down_idle_ticks = (100 - dbs_tuners_ins.down_threshold) *
-                        sampling_rate_in_HZ(freq_down_sampling_rate);
+        total_ticks = usecs_to_jiffies(freq_down_sampling_rate);
 
-        if (idle_ticks > down_idle_ticks ) {
-                freq_down_step = (5 * policy->max) / 100;
-
-                /* max freq cannot be less than 100. But who knows.... */
-                if (unlikely(freq_down_step == 0))
-                        freq_down_step = 5;
+        /*
+         * The optimal frequency is the frequency that is the lowest that
+         * can support the current CPU usage without triggering the up
+         * policy. To be safe, we focus 10 points under the threshold.
+         */
+        freq_next = ((total_ticks - idle_ticks) * 100) / total_ticks;
+        freq_next = (freq_next * policy->cur) / 
+                        (dbs_tuners_ins.up_threshold - 10);
 
-                __cpufreq_driver_target(policy,
-                        policy->cur - freq_down_step, 
-                        CPUFREQ_RELATION_H);
-                return;
-        }
+        if (freq_next <= ((policy->cur * 95) / 100))
+                __cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L);
 }
 
 static void do_dbs_timer(void *data)
 { 
         int i;
         down(&dbs_sem);
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_online(i))
-                        dbs_check_cpu(i);
+        for_each_online_cpu(i)
+                dbs_check_cpu(i);
         schedule_delayed_work(&dbs_work, 
-                        sampling_rate_in_HZ(dbs_tuners_ins.sampling_rate));
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
         up(&dbs_sem);
 } 
 
@@ -360,7 +365,7 @@ static inline void dbs_timer_init(void)
 {
         INIT_WORK(&dbs_work, do_dbs_timer, NULL);
         schedule_delayed_work(&dbs_work,
-                        sampling_rate_in_HZ(dbs_tuners_ins.sampling_rate));
+                        usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
         return;
 }
 
@@ -397,12 +402,9 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
                         j_dbs_info->cur_policy = policy;
                 
-                        j_dbs_info->prev_cpu_idle_up = 
-                                kstat_cpu(j).cpustat.idle +
-                                kstat_cpu(j).cpustat.iowait;
-                        j_dbs_info->prev_cpu_idle_down = 
-                                kstat_cpu(j).cpustat.idle +
-                                kstat_cpu(j).cpustat.iowait;
+                        j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
+                        j_dbs_info->prev_cpu_idle_down
+                                = j_dbs_info->prev_cpu_idle_up;
                 }
                 this_dbs_info->enable = 1;
                 sysfs_create_group(&policy->kobj, &dbs_attr_group);
@@ -422,6 +424,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         def_sampling_rate = (latency / 1000) *
                                         DEF_SAMPLING_RATE_LATENCY_MULTIPLIER;
                         dbs_tuners_ins.sampling_rate = def_sampling_rate;
+                        dbs_tuners_ins.ignore_nice = 0;
 
                         dbs_timer_init();
                 }
@@ -461,12 +464,11 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
         return 0;
 }
 
-struct cpufreq_governor cpufreq_gov_dbs = {
+static struct cpufreq_governor cpufreq_gov_dbs = {
         .name           = "ondemand",
         .governor       = cpufreq_governor_dbs,
         .owner          = THIS_MODULE,
 };
-EXPORT_SYMBOL(cpufreq_gov_dbs);
 
 static int __init cpufreq_gov_dbs_init(void)
 {
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 2084593937c6..741b6b191e6a 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -19,6 +19,7 @@
 #include <linux/percpu.h>
 #include <linux/kobject.h>
 #include <linux/spinlock.h>
+#include <asm/cputime.h>
 
 static spinlock_t cpufreq_stats_lock;
 
@@ -29,20 +30,14 @@ static struct freq_attr _attr_##_name = {\
         .show = _show,\
 };
 
-static unsigned long
-delta_time(unsigned long old, unsigned long new)
-{
-        return (old > new) ? (old - new): (new + ~old + 1);
-}
-
 struct cpufreq_stats {
         unsigned int cpu;
         unsigned int total_trans;
-        unsigned long long last_time;
+        unsigned long long  last_time;
         unsigned int max_state;
         unsigned int state_num;
         unsigned int last_index;
-        unsigned long long *time_in_state;
+        cputime64_t *time_in_state;
         unsigned int *freq_table;
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
         unsigned int *trans_table;
@@ -60,12 +55,16 @@ static int
 cpufreq_stats_update (unsigned int cpu)
 {
         struct cpufreq_stats *stat;
+        unsigned long long cur_time;
+
+        cur_time = get_jiffies_64();
         spin_lock(&cpufreq_stats_lock);
         stat = cpufreq_stats_table[cpu];
         if (stat->time_in_state)
-                stat->time_in_state[stat->last_index] +=
-                        delta_time(stat->last_time, jiffies);
-        stat->last_time = jiffies;
+                stat->time_in_state[stat->last_index] =
+                        cputime64_add(stat->time_in_state[stat->last_index],
+                                      cputime_sub(cur_time, stat->last_time));
+        stat->last_time = cur_time;
         spin_unlock(&cpufreq_stats_lock);
         return 0;
 }
@@ -90,8 +89,8 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf)
                 return 0;
         cpufreq_stats_update(stat->cpu);
         for (i = 0; i < stat->state_num; i++) {
-                len += sprintf(buf + len, "%u %llu\n",
-                        stat->freq_table[i], stat->time_in_state[i]);
+                len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i], 
+                        (unsigned long long)cputime64_to_clock_t(stat->time_in_state[i]));
         }
         return len;
 }
@@ -107,16 +106,30 @@ show_trans_table(struct cpufreq_policy *policy, char *buf)
         if(!stat)
                 return 0;
         cpufreq_stats_update(stat->cpu);
+        len += snprintf(buf + len, PAGE_SIZE - len, "   From  :    To\n");
+        len += snprintf(buf + len, PAGE_SIZE - len, "         : ");
+        for (i = 0; i < stat->state_num; i++) {
+                if (len >= PAGE_SIZE)
+                        break;
+                len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
+                                stat->freq_table[i]);
+        }
+        if (len >= PAGE_SIZE)
+                return len;
+
+        len += snprintf(buf + len, PAGE_SIZE - len, "\n");
+
         for (i = 0; i < stat->state_num; i++) {
                 if (len >= PAGE_SIZE)
                         break;
-                len += snprintf(buf + len, PAGE_SIZE - len, "%9u:\t",
+
+                len += snprintf(buf + len, PAGE_SIZE - len, "%9u: ",
                                 stat->freq_table[i]);
 
                 for (j = 0; j < stat->state_num; j++)   {
                         if (len >= PAGE_SIZE)
                                 break;
-                        len += snprintf(buf + len, PAGE_SIZE - len, "%u\t",
+                        len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
                                         stat->trans_table[i*stat->max_state+j]);
                 }
                 len += snprintf(buf + len, PAGE_SIZE - len, "\n");
@@ -197,7 +210,7 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
                 count++;
         }
 
-        alloc_size = count * sizeof(int) + count * sizeof(long long);
+        alloc_size = count * sizeof(int) + count * sizeof(cputime64_t);
 
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
         alloc_size += count * count * sizeof(int);
@@ -224,7 +237,7 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
         }
         stat->state_num = j;
         spin_lock(&cpufreq_stats_lock);
-        stat->last_time = jiffies;
+        stat->last_time = get_jiffies_64();
         stat->last_index = freq_table_get_index(stat, policy->cur);
         spin_unlock(&cpufreq_stats_lock);
         cpufreq_cpu_put(data);
diff --git a/drivers/dio/dio-sysfs.c b/drivers/dio/dio-sysfs.c
index d30591f69dd9..f46463038847 100644
--- a/drivers/dio/dio-sysfs.c
+++ b/drivers/dio/dio-sysfs.c
@@ -17,7 +17,7 @@
 
 /* show configuration fields */
 
-static ssize_t dio_show_id(struct device *dev, char *buf)
+static ssize_t dio_show_id(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dio_dev *d;
 
@@ -26,7 +26,7 @@ static ssize_t dio_show_id(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(id, S_IRUGO, dio_show_id, NULL);
 
-static ssize_t dio_show_ipl(struct device *dev, char *buf)
+static ssize_t dio_show_ipl(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dio_dev *d;
 
@@ -35,7 +35,7 @@ static ssize_t dio_show_ipl(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(ipl, S_IRUGO, dio_show_ipl, NULL);
 
-static ssize_t dio_show_secid(struct device *dev, char *buf)
+static ssize_t dio_show_secid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dio_dev *d;
 
@@ -44,7 +44,7 @@ static ssize_t dio_show_secid(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(secid, S_IRUGO, dio_show_secid, NULL);
 
-static ssize_t dio_show_name(struct device *dev, char *buf)
+static ssize_t dio_show_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dio_dev *d;
 
@@ -53,7 +53,7 @@ static ssize_t dio_show_name(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(name, S_IRUGO, dio_show_name, NULL);
 
-static ssize_t dio_show_resource(struct device *dev, char *buf)
+static ssize_t dio_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dio_dev *d = to_dio_dev(dev);
 
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 6381ba53853c..1937743c8e29 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -149,7 +149,7 @@ void eisa_driver_unregister (struct eisa_driver *edrv)
         driver_unregister (&edrv->driver);
 }
 
-static ssize_t eisa_show_sig (struct device *dev, char *buf)
+static ssize_t eisa_show_sig (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct eisa_device *edev = to_eisa_device (dev);
         return sprintf (buf,"%s\n", edev->id.sig);
@@ -157,7 +157,7 @@ static ssize_t eisa_show_sig (struct device *dev, char *buf)
 
 static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL);
 
-static ssize_t eisa_show_state (struct device *dev, char *buf)
+static ssize_t eisa_show_state (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct eisa_device *edev = to_eisa_device (dev);
         return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED);
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 1fbb219aa9ba..e3c958823533 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -765,12 +765,8 @@ void fcp_release(fc_channel *fcchain, int count)  /* count must > 0 */
 
 static void fcp_scsi_done (Scsi_Cmnd *SCpnt)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
         if (FCP_CMND(SCpnt)->done)
                 FCP_CMND(SCpnt)->done(SCpnt);
-        spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
 }
 
 static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, int prepare)
@@ -909,12 +905,8 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
          */
 
         if (++fc->abort_count < (fc->can_queue >> 1)) {
-                unsigned long flags;
-
                 SCpnt->result = DID_ABORT;
-                spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
                 fcmd->done(SCpnt);
-                spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
                 printk("FC: soft abort\n");
                 return SUCCESS;
         } else {
@@ -935,6 +927,7 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
 
 int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
 {
+        unsigned long flags;
         fcp_cmd *cmd;
         fcp_cmnd *fcmd;
         fc_channel *fc = FC_SCMND(SCpnt);
@@ -987,7 +980,10 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
         fc->rst_pkt->request->rq_status = RQ_SCSI_BUSY;
 
         fc->rst_pkt->done = fcp_scsi_reset_done;
+
+        spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
         fcp_scsi_queue_it(fc, fc->rst_pkt, fcmd, 0);
+        spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
         
         down(&sem);
 
@@ -1006,13 +1002,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
         return SUCCESS;
 }
 
-int fcp_scsi_bus_reset(Scsi_Cmnd *SCpnt)
-{
-        printk ("FC: bus reset!\n");
-        return FAILED;
-}
-
-int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
+static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
 {
         fc_channel *fc = FC_SCMND(SCpnt);
         fcp_cmnd *fcmd = FCP_CMND(SCpnt);
@@ -1033,6 +1023,18 @@ int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
         else return FAILED;
 }
 
+int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
+{
+        unsigned long flags;
+        int rc;
+
+        spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
+        rc = __fcp_scsi_host_reset(SCpnt);
+        spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
+
+        return rc;
+}
+
 static int fcp_els_queue_it(fc_channel *fc, fcp_cmnd *fcmd)
 {
         long i;
diff --git a/drivers/fc4/fc_syms.c b/drivers/fc4/fc_syms.c
index 8bac2c453027..ed85dfcef69a 100644
--- a/drivers/fc4/fc_syms.c
+++ b/drivers/fc4/fc_syms.c
@@ -27,7 +27,6 @@ EXPORT_SYMBOL(fc_do_prli);
 EXPORT_SYMBOL(fcp_scsi_queuecommand);
 EXPORT_SYMBOL(fcp_scsi_abort);
 EXPORT_SYMBOL(fcp_scsi_dev_reset);
-EXPORT_SYMBOL(fcp_scsi_bus_reset);
 EXPORT_SYMBOL(fcp_scsi_host_reset);
 
 #endif /* CONFIG_MODULES */
diff --git a/drivers/fc4/fcp_impl.h b/drivers/fc4/fcp_impl.h
index e44d652a83dc..c397c84bef63 100644
--- a/drivers/fc4/fcp_impl.h
+++ b/drivers/fc4/fcp_impl.h
@@ -158,7 +158,6 @@ int fc_do_prli(fc_channel *, unsigned char);
 int fcp_scsi_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
 int fcp_scsi_abort(Scsi_Cmnd *);
 int fcp_scsi_dev_reset(Scsi_Cmnd *);
-int fcp_scsi_bus_reset(Scsi_Cmnd *);
 int fcp_scsi_host_reset(Scsi_Cmnd *);
 
 #endif /* !(_FCP_SCSI_H) */
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 33b669e6f977..6996476669f1 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -115,7 +115,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
 {
         struct edd_device *dev = to_edd_device(kobj);
         struct edd_attribute *edd_attr = to_edd_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (edd_attr->show)
                 ret = edd_attr->show(dev, buf);
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 0287ff65963b..a3451cb94004 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -352,7 +352,7 @@ static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr,
 {
         struct efivar_entry *var = to_efivar_entry(kobj);
         struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -368,7 +368,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
 {
         struct efivar_entry *var = to_efivar_entry(kobj);
         struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 6d5df6c2efa2..df1b721154d2 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/config.h>
 #include <linux/acpi.h>
 #include <linux/console.h>
 #include <linux/efi.h>
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 35710818fe47..fdd881aee618 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -2,6 +2,7 @@
  *      i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge
  *
  *      Copyright (C) 2004 Patrick Mochel
+ *                    2005 Rudolf Marek <r.marek@sh.cvut.cz>
  *
  *      The 1563 southbridge is deceptively similar to the 1533, with a
  *      few notable exceptions. One of those happens to be the fact they
@@ -57,10 +58,11 @@
 #define HST_CNTL2_BLOCK         0x05
 
 
+#define HST_CNTL2_SIZEMASK      0x38
 
 static unsigned short ali1563_smba;
 
-static int ali1563_transaction(struct i2c_adapter * a)
+static int ali1563_transaction(struct i2c_adapter * a, int size)
 {
         u32 data;
         int timeout;
@@ -73,7 +75,7 @@ static int ali1563_transaction(struct i2c_adapter * a)
 
         data = inb_p(SMB_HST_STS);
         if (data & HST_STS_BAD) {
-                dev_warn(&a->dev,"ali1563: Trying to reset busy device\n");
+                dev_err(&a->dev, "ali1563: Trying to reset busy device\n");
                 outb_p(data | HST_STS_BAD,SMB_HST_STS);
                 data = inb_p(SMB_HST_STS);
                 if (data & HST_STS_BAD)
@@ -94,19 +96,31 @@ static int ali1563_transaction(struct i2c_adapter * a)
 
         if (timeout && !(data & HST_STS_BAD))
                 return 0;
-        dev_warn(&a->dev, "SMBus Error: %s%s%s%s%s\n",
-                timeout ? "Timeout " : "",
-                data & HST_STS_FAIL ? "Transaction Failed " : "",
-                data & HST_STS_BUSERR ? "No response or Bus Collision " : "",
-                data & HST_STS_DEVERR ? "Device Error " : "",
-                !(data & HST_STS_DONE) ? "Transaction Never Finished " : "");
 
-        if (!(data & HST_STS_DONE))
+        if (!timeout) {
+                dev_err(&a->dev, "Timeout - Trying to KILL transaction!\n");
                 /* Issue 'kill' to host controller */
                 outb_p(HST_CNTL2_KILL,SMB_HST_CNTL2);
-        else
-                /* Issue timeout to reset all devices on bus */
+                data = inb_p(SMB_HST_STS);
+        }
+
+        /* device error - no response, ignore the autodetection case */
+        if ((data & HST_STS_DEVERR) && (size != HST_CNTL2_QUICK)) {
+                dev_err(&a->dev, "Device error!\n");
+        }
+
+        /* bus collision */
+        if (data & HST_STS_BUSERR) {
+                dev_err(&a->dev, "Bus collision!\n");
+                /* Issue timeout, hoping it helps */
                 outb_p(HST_CNTL1_TIMEOUT,SMB_HST_CNTL1);
+        }
+
+        if (data & HST_STS_FAIL) {
+                dev_err(&a->dev, "Cleaning fail after KILL!\n");
+                outb_p(0x0,SMB_HST_CNTL2);
+        }
+
         return -1;
 }
 
@@ -149,7 +163,7 @@ static int ali1563_block_start(struct i2c_adapter * a)
 
         if (timeout && !(data & HST_STS_BAD))
                 return 0;
-        dev_warn(&a->dev, "SMBus Error: %s%s%s%s%s\n",
+        dev_err(&a->dev, "SMBus Error: %s%s%s%s%s\n",
                 timeout ? "Timeout " : "",
                 data & HST_STS_FAIL ? "Transaction Failed " : "",
                 data & HST_STS_BUSERR ? "No response or Bus Collision " : "",
@@ -242,13 +256,15 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
         }
 
         outb_p(((addr & 0x7f) << 1) | (rw & 0x01), SMB_HST_ADD);
-        outb_p(inb_p(SMB_HST_CNTL2) | (size << 3), SMB_HST_CNTL2);
+        outb_p((inb_p(SMB_HST_CNTL2) & ~HST_CNTL2_SIZEMASK) | (size << 3), SMB_HST_CNTL2);
 
         /* Write the command register */
+
         switch(size) {
         case HST_CNTL2_BYTE:
                 if (rw== I2C_SMBUS_WRITE)
-                        outb_p(cmd, SMB_HST_CMD);
+                        /* Beware it uses DAT0 register and not CMD! */
+                        outb_p(cmd, SMB_HST_DAT0);
                 break;
         case HST_CNTL2_BYTE_DATA:
                 outb_p(cmd, SMB_HST_CMD);
@@ -268,7 +284,7 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
                 goto Done;
         }
 
-        if ((error = ali1563_transaction(a)))
+        if ((error = ali1563_transaction(a, size)))
                 goto Done;
 
         if ((rw == I2C_SMBUS_WRITE) || (size == HST_CNTL2_QUICK))
diff --git a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c
index 9c59a370b6d9..9058c3956710 100644
--- a/drivers/i2c/chips/adm1021.c
+++ b/drivers/i2c/chips/adm1021.c
@@ -137,7 +137,7 @@ static struct i2c_driver adm1021_driver = {
 };
 
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct adm1021_data *data = adm1021_update_device(dev);         \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value));        \
@@ -150,7 +150,7 @@ show(remote_temp_hyst);
 show(remote_temp_input);
 
 #define show2(value)    \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct adm1021_data *data = adm1021_update_device(dev);         \
         return sprintf(buf, "%d\n", data->value);                       \
@@ -159,7 +159,7 @@ show2(alarms);
 show2(die_code);
 
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                               \
         struct i2c_client *client = to_i2c_client(dev);         \
         struct adm1021_data *data = i2c_get_clientdata(client); \
diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c
index e0771a3d05c9..111f0c86c933 100644
--- a/drivers/i2c/chips/adm1025.c
+++ b/drivers/i2c/chips/adm1025.c
@@ -153,19 +153,19 @@ struct adm1025_data {
  */
 
 #define show_in(offset) \
-static ssize_t show_in##offset(struct device *dev, char *buf) \
+static ssize_t show_in##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
@@ -180,17 +180,17 @@ show_in(4);
 show_in(5);
 
 #define show_temp(offset) \
-static ssize_t show_temp##offset(struct device *dev, char *buf) \
+static ssize_t show_temp##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
@@ -200,7 +200,7 @@ show_temp(1);
 show_temp(2);
 
 #define set_in(offset) \
-static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -214,7 +214,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -240,7 +240,7 @@ set_in(4);
 set_in(5);
 
 #define set_temp(offset) \
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -254,7 +254,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -275,26 +275,26 @@ static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
 set_temp(1);
 set_temp(2);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
 static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1025_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c
index 39e2f4a900bf..b15fafe8f111 100644
--- a/drivers/i2c/chips/adm1026.c
+++ b/drivers/i2c/chips/adm1026.c
@@ -30,6 +30,7 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/i2c-sysfs.h>
 #include <linux/i2c-vid.h>
 
 /* Addresses to scan */
@@ -711,19 +712,27 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
         return data;
 }
 
-static ssize_t show_in(struct device *dev, char *buf, int nr)
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in[nr]));
 }
-static ssize_t show_in_min(struct device *dev, char *buf, int nr) 
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev); 
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_min[nr]));
 }
-static ssize_t set_in_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -734,14 +743,19 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count; 
 }
-static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_max[nr]));
 }
-static ssize_t set_in_max(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -753,34 +767,13 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         return count;
 }
 
-#define in_reg(offset)                                                    \
-static ssize_t show_in##offset (struct device *dev, char *buf)            \
-{                                                                         \
-        return show_in(dev, buf, offset);                                 \
-}                                                                         \
-static ssize_t show_in##offset##_min (struct device *dev, char *buf)      \
-{                                                                         \
-        return show_in_min(dev, buf, offset);                             \
-}                                                                         \
-static ssize_t set_in##offset##_min (struct device *dev,                  \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_in_min(dev, buf, count, offset);                       \
-}                                                                         \
-static ssize_t show_in##offset##_max (struct device *dev, char *buf)      \
-{                                                                         \
-        return show_in_max(dev, buf, offset);                             \
-}                                                                         \
-static ssize_t set_in##offset##_max (struct device *dev,                  \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_in_max(dev, buf, count, offset);                       \
-}                                                                         \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);   \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,                   \
-                show_in##offset##_min, set_in##offset##_min);             \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,                   \
-                show_in##offset##_max, set_in##offset##_max);
+#define in_reg(offset)                                          \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \
+                NULL, offset);                                  \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,  \
+                show_in_min, set_in_min, offset);               \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,  \
+                show_in_max, set_in_max, offset);
 
 
 in_reg(0);
@@ -800,19 +793,19 @@ in_reg(13);
 in_reg(14);
 in_reg(15);
 
-static ssize_t show_in16(struct device *dev, char *buf)
+static ssize_t show_in16(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in[16]) -
                 NEG12_OFFSET);
 }
-static ssize_t show_in16_min(struct device *dev, char *buf) 
+static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev); 
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_min[16])
                 - NEG12_OFFSET);
 }
-static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count)
+static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -824,13 +817,13 @@ static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count)
         up(&data->update_lock);
         return count; 
 }
-static ssize_t show_in16_max(struct device *dev, char *buf)
+static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_max[16])
                         - NEG12_OFFSET);
 }
-static ssize_t set_in16_max(struct device *dev, const char *buf, size_t count)
+static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -843,30 +836,38 @@ static ssize_t set_in16_max(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL);
-static DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min);
-static DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max);
+static SENSOR_DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL, 16);
+static SENSOR_DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min, 16);
+static SENSOR_DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max, 16);
 
 
 
 
 /* Now add fan read/write functions */
 
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr],
                 data->fan_div[nr]));
 }
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan_min[nr],
                 data->fan_div[nr]));
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -879,23 +880,11 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         return count;
 }
 
-#define fan_offset(offset)                                                  \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)            \
-{                                                                           \
-        return show_fan(dev, buf, offset - 1);                              \
-}                                                                           \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)      \
-{                                                                           \
-        return show_fan_min(dev, buf, offset - 1);                          \
-}                                                                           \
-static ssize_t set_fan_##offset##_min (struct device *dev,                  \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_fan_min(dev, buf, count, offset - 1);                    \
-}                                                                           \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);  \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                    \
-                show_fan_##offset##_min, set_fan_##offset##_min);
+#define fan_offset(offset)                                                      \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL,         \
+                offset - 1);                                                    \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                 \
+                show_fan_min, set_fan_min, offset - 1);
 
 fan_offset(1);
 fan_offset(2);
@@ -926,14 +915,19 @@ static void fixup_fan_min(struct device *dev, int fan, int old_div)
 }
 
 /* Now add fan_div read/write functions */
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->fan_div[nr]);
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int    val,orig_div,new_div,shift;
@@ -967,17 +961,8 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define fan_offset_div(offset)                                          \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
-{                                                                       \
-        return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
-        const char *buf, size_t count)                                  \
-{                                                                       \
-        return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_div, set_fan_##offset##_div);
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,         \
+                show_fan_div, set_fan_div, offset - 1);
 
 fan_offset_div(1);
 fan_offset_div(2);
@@ -989,19 +974,27 @@ fan_offset_div(7);
 fan_offset_div(8);
 
 /* Temps */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp[nr]));
 }
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_min[nr]));
 }
-static ssize_t set_temp_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1013,14 +1006,19 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_max[nr]));
 }
-static ssize_t set_temp_max(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1032,48 +1030,34 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-#define temp_reg(offset)                                                      \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)             \
-{                                                                             \
-        return show_temp(dev, buf, offset - 1);                               \
-}                                                                             \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf)       \
-{                                                                             \
-        return show_temp_min(dev, buf, offset - 1);                           \
-}                                                                             \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf)       \
-{                                                                             \
-        return show_temp_max(dev, buf, offset - 1);                           \
-}                                                                             \
-static ssize_t set_temp_##offset##_min (struct device *dev,                   \
-        const char *buf, size_t count)                                        \
-{                                                                             \
-        return set_temp_min(dev, buf, count, offset - 1);                     \
-}                                                                             \
-static ssize_t set_temp_##offset##_max (struct device *dev,                   \
-        const char *buf, size_t count)                                        \
-{                                                                             \
-        return set_temp_max(dev, buf, count, offset - 1);                     \
-}                                                                             \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);  \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,                     \
-                show_temp_##offset##_min, set_temp_##offset##_min);           \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,                     \
-                show_temp_##offset##_max, set_temp_##offset##_max);
+
+#define temp_reg(offset)                                                \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,     \
+                NULL, offset - 1);                                      \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                show_temp_min, set_temp_min, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                show_temp_max, set_temp_max, offset - 1);
 
 
 temp_reg(1);
 temp_reg(2);
 temp_reg(3);
 
-static ssize_t show_temp_offset(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_offset(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_offset[nr]));
 }
-static ssize_t set_temp_offset(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_offset(struct device *dev,
+                struct device_attribute *attr, const char *buf,
+                size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1086,46 +1070,45 @@ static ssize_t set_temp_offset(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_offset_reg(offset)                                             \
-static ssize_t show_temp_##offset##_offset (struct device *dev, char *buf)  \
-{                                                                           \
-        return show_temp_offset(dev, buf, offset - 1);                      \
-}                                                                           \
-static ssize_t set_temp_##offset##_offset (struct device *dev,              \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_temp_offset(dev, buf, count, offset - 1);                \
-}                                                                           \
-static DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,                \
-                show_temp_##offset##_offset, set_temp_##offset##_offset);
+#define temp_offset_reg(offset)                                                 \
+static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,             \
+                show_temp_offset, set_temp_offset, offset - 1);
 
 temp_offset_reg(1);
 temp_offset_reg(2);
 temp_offset_reg(3);
 
-static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(
                 ADM1026_FAN_ACTIVATION_TEMP_HYST + data->temp_tmin[nr]));
 }
-static ssize_t show_temp_auto_point2_temp(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point2_temp(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr] +
                 ADM1026_FAN_CONTROL_TEMP_RANGE));
 }
-static ssize_t show_temp_auto_point1_temp(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point1_temp(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr]));
 }
-static ssize_t set_temp_auto_point1_temp(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_auto_point1_temp(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1138,46 +1121,27 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_auto_point(offset)                                             \
-static ssize_t show_temp##offset##_auto_point1_temp (struct device *dev,    \
-        char *buf)                                                          \
-{                                                                           \
-        return show_temp_auto_point1_temp(dev, buf, offset - 1);            \
-}                                                                           \
-static ssize_t set_temp##offset##_auto_point1_temp (struct device *dev,     \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_temp_auto_point1_temp(dev, buf, count, offset - 1);      \
-}                                                                           \
-static ssize_t show_temp##offset##_auto_point1_temp_hyst (struct device     \
-        *dev, char *buf)                                                    \
-{                                                                           \
-        return show_temp_auto_point1_temp_hyst(dev, buf, offset - 1);       \
-}                                                                           \
-static ssize_t show_temp##offset##_auto_point2_temp (struct device *dev,    \
-         char *buf)                                                         \
-{                                                                           \
-        return show_temp_auto_point2_temp(dev, buf, offset - 1);            \
-}                                                                           \
-static DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR,      \
-                show_temp##offset##_auto_point1_temp,                       \
-                set_temp##offset##_auto_point1_temp);                       \
-static DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,           \
-                show_temp##offset##_auto_point1_temp_hyst, NULL);           \
-static DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO,                \
-                show_temp##offset##_auto_point2_temp, NULL);
+#define temp_auto_point(offset)                                                 \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR,   \
+                show_temp_auto_point1_temp, set_temp_auto_point1_temp,          \
+                offset - 1);                                                    \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,        \
+                show_temp_auto_point1_temp_hyst, NULL, offset - 1);             \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO,             \
+                show_temp_auto_point2_temp, NULL, offset - 1);
 
 temp_auto_point(1);
 temp_auto_point(2);
 temp_auto_point(3);
 
-static ssize_t show_temp_crit_enable(struct device *dev, char *buf)
+static ssize_t show_temp_crit_enable(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", (data->config1 & CFG1_THERM_HOT) >> 4);
 }
-static ssize_t set_temp_crit_enable(struct device *dev, const char *buf,
-                size_t count)
+static ssize_t set_temp_crit_enable(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -1193,24 +1157,27 @@ static ssize_t set_temp_crit_enable(struct device *dev, const char *buf,
         return count;
 }
 
-static DEVICE_ATTR(temp1_crit_enable, S_IRUGO | S_IWUSR, 
-        show_temp_crit_enable, set_temp_crit_enable);
-
-static DEVICE_ATTR(temp2_crit_enable, S_IRUGO | S_IWUSR, 
-        show_temp_crit_enable, set_temp_crit_enable);
-
-static DEVICE_ATTR(temp3_crit_enable, S_IRUGO | S_IWUSR, 
+#define temp_crit_enable(offset)                                \
+static DEVICE_ATTR(temp##offset##_crit_enable, S_IRUGO | S_IWUSR, \
         show_temp_crit_enable, set_temp_crit_enable);
 
+temp_crit_enable(1);
+temp_crit_enable(2);
+temp_crit_enable(3);
 
-static ssize_t show_temp_crit(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_crit(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
 }
-static ssize_t set_temp_crit(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1223,29 +1190,20 @@ static ssize_t set_temp_crit(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_crit_reg(offset)                                             \
-static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf)  \
-{                                                                         \
-        return show_temp_crit(dev, buf, offset - 1);                      \
-}                                                                         \
-static ssize_t set_temp_##offset##_crit (struct device *dev,              \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_temp_crit(dev, buf, count, offset - 1);                \
-}                                                                         \
-static DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,                \
-                show_temp_##offset##_crit, set_temp_##offset##_crit);
+#define temp_crit_reg(offset)                                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,       \
+                show_temp_crit, set_temp_crit, offset - 1);
 
 temp_crit_reg(1);
 temp_crit_reg(2);
 temp_crit_reg(3);
 
-static ssize_t show_analog_out_reg(struct device *dev, char *buf)
+static ssize_t show_analog_out_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", DAC_FROM_REG(data->analog_out));
 }
-static ssize_t set_analog_out_reg(struct device *dev, const char *buf,
+static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1262,7 +1220,7 @@ static ssize_t set_analog_out_reg(struct device *dev, const char *buf,
 static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg, 
         set_analog_out_reg);
 
-static ssize_t show_vid_reg(struct device *dev, char *buf)
+static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
@@ -1270,12 +1228,12 @@ static ssize_t show_vid_reg(struct device *dev, char *buf)
 
 static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL);
 
-static ssize_t show_vrm_reg(struct device *dev, char *buf)
+static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->vrm);
 }
-static ssize_t store_vrm_reg(struct device *dev, const char *buf,
+static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1287,7 +1245,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf,
 
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 
-static ssize_t show_alarms_reg(struct device *dev, char *buf)
+static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf, "%ld\n", (long) (data->alarms));
@@ -1295,12 +1253,12 @@ static ssize_t show_alarms_reg(struct device *dev, char *buf)
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 
-static ssize_t show_alarm_mask(struct device *dev, char *buf)
+static ssize_t show_alarm_mask(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->alarm_mask);
 }
-static ssize_t set_alarm_mask(struct device *dev, const char *buf,
+static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1331,12 +1289,12 @@ static DEVICE_ATTR(alarm_mask, S_IRUGO | S_IWUSR, show_alarm_mask,
         set_alarm_mask);
 
 
-static ssize_t show_gpio(struct device *dev, char *buf)
+static ssize_t show_gpio(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->gpio);
 }
-static ssize_t set_gpio(struct device *dev, const char *buf,
+static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1359,12 +1317,12 @@ static ssize_t set_gpio(struct device *dev, const char *buf,
 static DEVICE_ATTR(gpio, S_IRUGO | S_IWUSR, show_gpio, set_gpio);
 
 
-static ssize_t show_gpio_mask(struct device *dev, char *buf)
+static ssize_t show_gpio_mask(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->gpio_mask);
 }
-static ssize_t set_gpio_mask(struct device *dev, const char *buf,
+static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1386,12 +1344,12 @@ static ssize_t set_gpio_mask(struct device *dev, const char *buf,
 
 static DEVICE_ATTR(gpio_mask, S_IRUGO | S_IWUSR, show_gpio_mask, set_gpio_mask);
 
-static ssize_t show_pwm_reg(struct device *dev, char *buf)
+static ssize_t show_pwm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", PWM_FROM_REG(data->pwm1.pwm));
 }
-static ssize_t set_pwm_reg(struct device *dev, const char *buf,
+static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1407,12 +1365,12 @@ static ssize_t set_pwm_reg(struct device *dev, const char *buf,
         }
         return count;
 }
-static ssize_t show_auto_pwm_min(struct device *dev, char *buf)
+static ssize_t show_auto_pwm_min(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->pwm1.auto_pwm_min);
 }
-static ssize_t set_auto_pwm_min(struct device *dev, const char *buf,
+static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1429,16 +1387,16 @@ static ssize_t set_auto_pwm_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t show_auto_pwm_max(struct device *dev, char *buf)
+static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return sprintf(buf,"%d\n", ADM1026_PWM_MAX);
 }
-static ssize_t show_pwm_enable(struct device *dev, char *buf)
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->pwm1.enable);
 }
-static ssize_t set_pwm_enable(struct device *dev, const char *buf,
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1597,114 +1555,114 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
         adm1026_init_client(new_client);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_in0_input);
-        device_create_file(&new_client->dev, &dev_attr_in0_max);
-        device_create_file(&new_client->dev, &dev_attr_in0_min);
-        device_create_file(&new_client->dev, &dev_attr_in1_input);
-        device_create_file(&new_client->dev, &dev_attr_in1_max);
-        device_create_file(&new_client->dev, &dev_attr_in1_min);
-        device_create_file(&new_client->dev, &dev_attr_in2_input);
-        device_create_file(&new_client->dev, &dev_attr_in2_max);
-        device_create_file(&new_client->dev, &dev_attr_in2_min);
-        device_create_file(&new_client->dev, &dev_attr_in3_input);
-        device_create_file(&new_client->dev, &dev_attr_in3_max);
-        device_create_file(&new_client->dev, &dev_attr_in3_min);
-        device_create_file(&new_client->dev, &dev_attr_in4_input);
-        device_create_file(&new_client->dev, &dev_attr_in4_max);
-        device_create_file(&new_client->dev, &dev_attr_in4_min);
-        device_create_file(&new_client->dev, &dev_attr_in5_input);
-        device_create_file(&new_client->dev, &dev_attr_in5_max);
-        device_create_file(&new_client->dev, &dev_attr_in5_min);
-        device_create_file(&new_client->dev, &dev_attr_in6_input);
-        device_create_file(&new_client->dev, &dev_attr_in6_max);
-        device_create_file(&new_client->dev, &dev_attr_in6_min);
-        device_create_file(&new_client->dev, &dev_attr_in7_input);
-        device_create_file(&new_client->dev, &dev_attr_in7_max);
-        device_create_file(&new_client->dev, &dev_attr_in7_min);
-        device_create_file(&new_client->dev, &dev_attr_in8_input);
-        device_create_file(&new_client->dev, &dev_attr_in8_max);
-        device_create_file(&new_client->dev, &dev_attr_in8_min);
-        device_create_file(&new_client->dev, &dev_attr_in9_input);
-        device_create_file(&new_client->dev, &dev_attr_in9_max);
-        device_create_file(&new_client->dev, &dev_attr_in9_min);
-        device_create_file(&new_client->dev, &dev_attr_in10_input);
-        device_create_file(&new_client->dev, &dev_attr_in10_max);
-        device_create_file(&new_client->dev, &dev_attr_in10_min);
-        device_create_file(&new_client->dev, &dev_attr_in11_input);
-        device_create_file(&new_client->dev, &dev_attr_in11_max);
-        device_create_file(&new_client->dev, &dev_attr_in11_min);
-        device_create_file(&new_client->dev, &dev_attr_in12_input);
-        device_create_file(&new_client->dev, &dev_attr_in12_max);
-        device_create_file(&new_client->dev, &dev_attr_in12_min);
-        device_create_file(&new_client->dev, &dev_attr_in13_input);
-        device_create_file(&new_client->dev, &dev_attr_in13_max);
-        device_create_file(&new_client->dev, &dev_attr_in13_min);
-        device_create_file(&new_client->dev, &dev_attr_in14_input);
-        device_create_file(&new_client->dev, &dev_attr_in14_max);
-        device_create_file(&new_client->dev, &dev_attr_in14_min);
-        device_create_file(&new_client->dev, &dev_attr_in15_input);
-        device_create_file(&new_client->dev, &dev_attr_in15_max);
-        device_create_file(&new_client->dev, &dev_attr_in15_min);
-        device_create_file(&new_client->dev, &dev_attr_in16_input);
-        device_create_file(&new_client->dev, &dev_attr_in16_max);
-        device_create_file(&new_client->dev, &dev_attr_in16_min);
-        device_create_file(&new_client->dev, &dev_attr_fan1_input);
-        device_create_file(&new_client->dev, &dev_attr_fan1_div);
-        device_create_file(&new_client->dev, &dev_attr_fan1_min);
-        device_create_file(&new_client->dev, &dev_attr_fan2_input);
-        device_create_file(&new_client->dev, &dev_attr_fan2_div);
-        device_create_file(&new_client->dev, &dev_attr_fan2_min);
-        device_create_file(&new_client->dev, &dev_attr_fan3_input);
-        device_create_file(&new_client->dev, &dev_attr_fan3_div);
-        device_create_file(&new_client->dev, &dev_attr_fan3_min);
-        device_create_file(&new_client->dev, &dev_attr_fan4_input);
-        device_create_file(&new_client->dev, &dev_attr_fan4_div);
-        device_create_file(&new_client->dev, &dev_attr_fan4_min);
-        device_create_file(&new_client->dev, &dev_attr_fan5_input);
-        device_create_file(&new_client->dev, &dev_attr_fan5_div);
-        device_create_file(&new_client->dev, &dev_attr_fan5_min);
-        device_create_file(&new_client->dev, &dev_attr_fan6_input);
-        device_create_file(&new_client->dev, &dev_attr_fan6_div);
-        device_create_file(&new_client->dev, &dev_attr_fan6_min);
-        device_create_file(&new_client->dev, &dev_attr_fan7_input);
-        device_create_file(&new_client->dev, &dev_attr_fan7_div);
-        device_create_file(&new_client->dev, &dev_attr_fan7_min);
-        device_create_file(&new_client->dev, &dev_attr_fan8_input);
-        device_create_file(&new_client->dev, &dev_attr_fan8_div);
-        device_create_file(&new_client->dev, &dev_attr_fan8_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_offset);
-        device_create_file(&new_client->dev, &dev_attr_temp2_offset);
-        device_create_file(&new_client->dev, &dev_attr_temp3_offset);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_offset.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_offset.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_offset.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp1_auto_point1_temp);
+                &sensor_dev_attr_temp1_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp2_auto_point1_temp);
+                &sensor_dev_attr_temp2_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp3_auto_point1_temp);
+                &sensor_dev_attr_temp3_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp1_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp1_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp2_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp2_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp3_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp3_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp1_auto_point2_temp);
+                &sensor_dev_attr_temp1_auto_point2_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp2_auto_point2_temp);
+                &sensor_dev_attr_temp2_auto_point2_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp3_auto_point2_temp);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp3_crit);
+                &sensor_dev_attr_temp3_auto_point2_temp.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c
index d4385a23f79a..2163dba467c4 100644
--- a/drivers/i2c/chips/adm1031.c
+++ b/drivers/i2c/chips/adm1031.c
@@ -292,11 +292,11 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define fan_auto_channel_offset(offset)                                         \
-static ssize_t show_fan_auto_channel_##offset (struct device *dev, char *buf)   \
+static ssize_t show_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                               \
         return show_fan_auto_channel(dev, buf, offset - 1);                     \
 }                                                                               \
-static ssize_t set_fan_auto_channel_##offset (struct device *dev,               \
+static ssize_t set_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                          \
 {                                                                               \
         return set_fan_auto_channel(dev, buf, count, offset - 1);               \
@@ -357,24 +357,24 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define auto_temp_reg(offset)                                                   \
-static ssize_t show_auto_temp_##offset##_off (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_off (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_off(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t show_auto_temp_##offset##_min (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_min(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t show_auto_temp_##offset##_max (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_max(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t set_auto_temp_##offset##_min (struct device *dev,                \
+static ssize_t set_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr,         \
                                              const char *buf, size_t count)     \
 {                                                                               \
         return set_auto_temp_min(dev, buf, count, offset - 1);          \
 }                                                                               \
-static ssize_t set_auto_temp_##offset##_max (struct device *dev,                \
+static ssize_t set_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr,         \
                                              const char *buf, size_t count)     \
 {                                                                               \
         return set_auto_temp_max(dev, buf, count, offset - 1);          \
@@ -421,11 +421,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define pwm_reg(offset)                                                 \
-static ssize_t show_pwm_##offset (struct device *dev, char *buf)        \
+static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_pwm(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t set_pwm_##offset (struct device *dev,                    \
+static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr,                     \
                                  const char *buf, size_t count)         \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);            \
@@ -557,24 +557,24 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define fan_offset(offset)                                              \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
+static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
@@ -667,33 +667,33 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define temp_reg(offset)                                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)               \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                               \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                               \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf)         \
+static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                               \
         return show_temp_min(dev, buf, offset - 1);                             \
 }                                                                               \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf)         \
+static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                               \
         return show_temp_max(dev, buf, offset - 1);                             \
 }                                                                               \
-static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf)        \
+static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                               \
         return show_temp_crit(dev, buf, offset - 1);                    \
 }                                                                               \
-static ssize_t set_temp_##offset##_min (struct device *dev,                     \
+static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,                      \
                                         const char *buf, size_t count)          \
 {                                                                               \
         return set_temp_min(dev, buf, count, offset - 1);                       \
 }                                                                               \
-static ssize_t set_temp_##offset##_max (struct device *dev,                     \
+static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,                      \
                                         const char *buf, size_t count)          \
 {                                                                               \
         return set_temp_max(dev, buf, count, offset - 1);                       \
 }                                                                               \
-static ssize_t set_temp_##offset##_crit (struct device *dev,                    \
+static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr,                     \
                                          const char *buf, size_t count)         \
 {                                                                               \
         return set_temp_crit(dev, buf, count, offset - 1);                      \
@@ -712,7 +712,7 @@ temp_reg(2);
 temp_reg(3);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1031_data *data = adm1031_update_device(dev);
         return sprintf(buf, "%d\n", data->alarm);
diff --git a/drivers/i2c/chips/asb100.c b/drivers/i2c/chips/asb100.c
index 7f899002bc54..4a47b4493e34 100644
--- a/drivers/i2c/chips/asb100.c
+++ b/drivers/i2c/chips/asb100.c
@@ -260,28 +260,28 @@ set_in_reg(MAX, max)
 
 #define sysfs_in(offset) \
 static ssize_t \
-        show_in##offset (struct device *dev, char *buf) \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
                 show_in##offset, NULL); \
 static ssize_t \
-        show_in##offset##_min (struct device *dev, char *buf) \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_min(dev, buf, offset); \
 } \
 static ssize_t \
-        show_in##offset##_max (struct device *dev, char *buf) \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_max(dev, buf, offset); \
 } \
-static ssize_t set_in##offset##_min (struct device *dev, \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return set_in_min(dev, buf, count, offset); \
 } \
-static ssize_t set_in##offset##_max (struct device *dev, \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return set_in_max(dev, buf, count, offset); \
@@ -389,24 +389,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define sysfs_fan(offset) \
-static ssize_t show_fan##offset(struct device *dev, char *buf) \
+static ssize_t show_fan##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset - 1); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset - 1); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div(dev, buf, offset - 1); \
 } \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_fan_min(dev, buf, count, offset - 1); \
 } \
-static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_fan_div(dev, buf, count, offset - 1); \
@@ -482,27 +482,27 @@ set_temp_reg(MAX, temp_max);
 set_temp_reg(HYST, temp_hyst);
 
 #define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, char *buf) \
+static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, num-1); \
 } \
 static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \
-static ssize_t show_temp_max##num(struct device *dev, char *buf) \
+static ssize_t show_temp_max##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_max(dev, buf, num-1); \
 } \
-static ssize_t set_temp_max##num(struct device *dev, const char *buf, \
+static ssize_t set_temp_max##num(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_temp_max(dev, buf, count, num-1); \
 } \
 static DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \
                 show_temp_max##num, set_temp_max##num); \
-static ssize_t show_temp_hyst##num(struct device *dev, char *buf) \
+static ssize_t show_temp_hyst##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_hyst(dev, buf, num-1); \
 } \
-static ssize_t set_temp_hyst##num(struct device *dev, const char *buf, \
+static ssize_t set_temp_hyst##num(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_temp_hyst(dev, buf, count, num-1); \
@@ -522,7 +522,7 @@ sysfs_temp(4);
         device_create_file(&client->dev, &dev_attr_temp##num##_max_hyst); \
 } while (0)
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
@@ -533,13 +533,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* VRM */
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
 
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -553,7 +553,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 #define device_create_file_vrm(client) \
 device_create_file(&client->dev, &dev_attr_vrm);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms));
@@ -564,13 +564,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 device_create_file(&client->dev, &dev_attr_alarms)
 
 /* 1 PWM */
-static ssize_t show_pwm1(struct device *dev, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", ASB100_PWM_FROM_REG(data->pwm & 0x0f));
 }
 
-static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -584,13 +584,13 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_pwm_enable1(struct device *dev, char *buf)
+static ssize_t show_pwm_enable1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", (data->pwm & 0x80) ? 1 : 0);
 }
 
-static ssize_t set_pwm_enable1(struct device *dev, const char *buf,
+static ssize_t set_pwm_enable1(struct device *dev, struct device_attribute *attr, const char *buf,
                                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
diff --git a/drivers/i2c/chips/ds1621.c b/drivers/i2c/chips/ds1621.c
index bb1fefb2162e..4ae15bd5dcfb 100644
--- a/drivers/i2c/chips/ds1621.c
+++ b/drivers/i2c/chips/ds1621.c
@@ -137,7 +137,7 @@ static void ds1621_init_client(struct i2c_client *client)
 }
 
 #define show(value)                                                     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct ds1621_data *data = ds1621_update_client(dev);           \
         return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
@@ -148,7 +148,7 @@ show(temp_min);
 show(temp_max);
 
 #define set_temp(suffix, value, reg)                                    \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf,   \
+static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf,    \
                                  size_t count)                          \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -165,7 +165,7 @@ static ssize_t set_temp_##suffix(struct device *dev, const char *buf,	\
 set_temp(min, temp_min, DS1621_REG_TEMP_MIN);
 set_temp(max, temp_max, DS1621_REG_TEMP_MAX);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ds1621_data *data = ds1621_update_client(dev);
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));
diff --git a/drivers/i2c/chips/fscher.c b/drivers/i2c/chips/fscher.c
index 18e33ac59d0c..c3f37dbec11a 100644
--- a/drivers/i2c/chips/fscher.c
+++ b/drivers/i2c/chips/fscher.c
@@ -157,8 +157,8 @@ struct fscher_data {
 
 #define sysfs_r(kind, sub, offset, reg) \
 static ssize_t show_##kind##sub (struct fscher_data *, char *, int); \
-static ssize_t show_##kind##offset##sub (struct device *, char *); \
-static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \
+static ssize_t show_##kind##offset##sub (struct device *, struct device_attribute *attr, char *); \
+static ssize_t show_##kind##offset##sub (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct fscher_data *data = fscher_update_device(dev); \
         return show_##kind##sub(data, buf, (offset)); \
@@ -166,8 +166,8 @@ static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \
 
 #define sysfs_w(kind, sub, offset, reg) \
 static ssize_t set_##kind##sub (struct i2c_client *, struct fscher_data *, const char *, size_t, int, int); \
-static ssize_t set_##kind##offset##sub (struct device *, const char *, size_t); \
-static ssize_t set_##kind##offset##sub (struct device *dev, const char *buf, size_t count) \
+static ssize_t set_##kind##offset##sub (struct device *, struct device_attribute *attr, const char *, size_t); \
+static ssize_t set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct fscher_data *data = i2c_get_clientdata(client); \
diff --git a/drivers/i2c/chips/fscpos.c b/drivers/i2c/chips/fscpos.c
index 2cac79145c75..3beaa6191ef4 100644
--- a/drivers/i2c/chips/fscpos.c
+++ b/drivers/i2c/chips/fscpos.c
@@ -245,19 +245,19 @@ static void reset_fan_alarm(struct i2c_client *client, int nr)
 /* Volts */
 #define VOLT_FROM_REG(val, mult)        ((val) * (mult) / 255)
 
-static ssize_t show_volt_12(struct device *dev, char *buf)
+static ssize_t show_volt_12(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[0], 14200));
 }
 
-static ssize_t show_volt_5(struct device *dev, char *buf)
+static ssize_t show_volt_5(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[1], 6600));
 }
 
-static ssize_t show_volt_batt(struct device *dev, char *buf)
+static ssize_t show_volt_batt(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[2], 3300));
@@ -327,7 +327,7 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data
 }
 
 /* Event */
-static ssize_t show_event(struct device *dev, char *buf)
+static ssize_t show_event(struct device *dev, struct device_attribute *attr, char *buf)
 {
         /* bits 5..7 reserved => mask with 0x1f */
         struct fscpos_data *data = fscpos_update_device(dev);
@@ -338,14 +338,14 @@ static ssize_t show_event(struct device *dev, char *buf)
  * Sysfs stuff
  */
 #define create_getter(kind, sub) \
-        static ssize_t sysfs_show_##kind##sub(struct device *dev, char *buf) \
+        static ssize_t sysfs_show_##kind##sub(struct device *dev, struct device_attribute *attr, char *buf) \
         { \
                 struct fscpos_data *data = fscpos_update_device(dev); \
                 return show_##kind##sub(data, buf); \
         }
 
 #define create_getter_n(kind, offset, sub) \
-        static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, char\
+        static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, struct device_attribute *attr, char\
                                                                         *buf) \
         { \
                 struct fscpos_data *data = fscpos_update_device(dev); \
@@ -353,7 +353,7 @@ static ssize_t show_event(struct device *dev, char *buf)
         }
 
 #define create_setter(kind, sub, reg) \
-        static ssize_t sysfs_set_##kind##sub (struct device *dev, const char \
+        static ssize_t sysfs_set_##kind##sub (struct device *dev, struct device_attribute *attr, const char \
                                                         *buf, size_t count) \
         { \
                 struct i2c_client *client = to_i2c_client(dev); \
@@ -362,7 +362,7 @@ static ssize_t show_event(struct device *dev, char *buf)
         }
 
 #define create_setter_n(kind, offset, sub, reg) \
-        static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, \
+        static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, \
                                         const char *buf, size_t count) \
         { \
                 struct i2c_client *client = to_i2c_client(dev); \
diff --git a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c
index c82d6ce21205..4316a1562251 100644
--- a/drivers/i2c/chips/gl518sm.c
+++ b/drivers/i2c/chips/gl518sm.c
@@ -164,14 +164,14 @@ static struct i2c_driver gl518_driver = {
  */
 
 #define show(type, suffix, value)                                       \
-static ssize_t show_##suffix(struct device *dev, char *buf)             \
+static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                       \
         struct gl518_data *data = gl518_update_device(dev);             \
         return sprintf(buf, "%d\n", type##_FROM_REG(data->value));      \
 }
 
 #define show_fan(suffix, value, index)                                  \
-static ssize_t show_##suffix(struct device *dev, char *buf)             \
+static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                       \
         struct gl518_data *data = gl518_update_device(dev);             \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->value[index],    \
@@ -205,7 +205,7 @@ show(BOOL, beep_enable, beep_enable);
 show(BEEP_MASK, beep_mask, beep_mask);
 
 #define set(type, suffix, value, reg)                                   \
-static ssize_t set_##suffix(struct device *dev, const char *buf,        \
+static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count)                                                   \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -220,7 +220,7 @@ static ssize_t set_##suffix(struct device *dev, const char *buf,	\
 }
 
 #define set_bits(type, suffix, value, reg, mask, shift)                 \
-static ssize_t set_##suffix(struct device *dev, const char *buf,        \
+static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count)                                                   \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -258,7 +258,7 @@ set_high(IN, in_max3, voltage_max[3], GL518_REG_VIN3_LIMIT);
 set_bits(BOOL, beep_enable, beep_enable, GL518_REG_CONF, 0x04, 2);
 set(BEEP_MASK, beep_mask, beep_mask, GL518_REG_ALARM);
 
-static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_fan_min1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct gl518_data *data = i2c_get_clientdata(client);
@@ -284,7 +284,7 @@ static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t set_fan_min2(struct device *dev, const char *buf, size_t count)
+static ssize_t set_fan_min2(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct gl518_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/gl520sm.c b/drivers/i2c/chips/gl520sm.c
index 3fd17e46ffc6..a13a504f5bfa 100644
--- a/drivers/i2c/chips/gl520sm.c
+++ b/drivers/i2c/chips/gl520sm.c
@@ -148,8 +148,8 @@ struct gl520_data {
 
 #define sysfs_r(type, n, item, reg) \
 static ssize_t get_##type##item (struct gl520_data *, char *, int); \
-static ssize_t get_##type##n##item (struct device *, char *); \
-static ssize_t get_##type##n##item (struct device *dev, char *buf) \
+static ssize_t get_##type##n##item (struct device *, struct device_attribute *attr, char *); \
+static ssize_t get_##type##n##item (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct gl520_data *data = gl520_update_device(dev); \
         return get_##type##item(data, buf, (n)); \
@@ -157,8 +157,8 @@ static ssize_t get_##type##n##item (struct device *dev, char *buf) \
 
 #define sysfs_w(type, n, item, reg) \
 static ssize_t set_##type##item (struct i2c_client *, struct gl520_data *, const char *, size_t, int, int); \
-static ssize_t set_##type##n##item (struct device *, const char *, size_t); \
-static ssize_t set_##type##n##item (struct device *dev, const char *buf, size_t count) \
+static ssize_t set_##type##n##item (struct device *, struct device_attribute *attr, const char *, size_t); \
+static ssize_t set_##type##n##item (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct gl520_data *data = i2c_get_clientdata(client); \
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index cf7e6898754f..007bdf9e7e2a 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/i2c/chips/it87.c
@@ -290,7 +290,7 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
@@ -298,21 +298,21 @@ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
 
 #define limit_in_offset(offset)                                 \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_min(dev, buf, offset);                   \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_max(dev, buf, offset);                   \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr,         \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                         const char *buf, size_t count)          \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -383,26 +383,26 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_offset(offset)                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                                       \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_max (struct device *dev, char *buf)                \
+show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)         \
 {                                                                       \
         return show_temp_max(dev, buf, offset - 1);                     \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_min (struct device *dev, char *buf)                \
+show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)         \
 {                                                                       \
         return show_temp_min(dev, buf, offset - 1);                     \
 }                                                                       \
-static ssize_t set_temp_##offset##_max (struct device *dev,             \
+static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,              \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_max(dev, buf, count, offset - 1);               \
 }                                                                       \
-static ssize_t set_temp_##offset##_min (struct device *dev,             \
+static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,              \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_min(dev, buf, count, offset - 1);               \
@@ -453,11 +453,11 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
         return count;
 }
 #define show_sensor_offset(offset)                                      \
-static ssize_t show_sensor_##offset (struct device *dev, char *buf)     \
+static ssize_t show_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf)      \
 {                                                                       \
         return show_sensor(dev, buf, offset - 1);                       \
 }                                                                       \
-static ssize_t set_sensor_##offset (struct device *dev,                 \
+static ssize_t set_sensor_##offset (struct device *dev, struct device_attribute *attr,          \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_sensor(dev, buf, count, offset - 1);                 \
@@ -600,24 +600,24 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
+static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
@@ -633,21 +633,21 @@ show_fan_offset(2);
 show_fan_offset(3);
 
 #define show_pwm_offset(offset)                                         \
-static ssize_t show_pwm##offset##_enable (struct device *dev,           \
+static ssize_t show_pwm##offset##_enable (struct device *dev, struct device_attribute *attr,            \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_enable(dev, buf, offset - 1);                   \
 }                                                                       \
-static ssize_t show_pwm##offset (struct device *dev, char *buf)         \
+static ssize_t show_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                       \
         return show_pwm(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t set_pwm##offset##_enable (struct device *dev,            \
+static ssize_t set_pwm##offset##_enable (struct device *dev, struct device_attribute *attr,             \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm_enable(dev, buf, count, offset - 1);             \
 }                                                                       \
-static ssize_t set_pwm##offset (struct device *dev,                     \
+static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                      \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);                    \
@@ -663,7 +663,7 @@ show_pwm_offset(2);
 show_pwm_offset(3);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
@@ -671,13 +671,13 @@ static ssize_t show_alarms(struct device *dev, char *buf)
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
@@ -693,7 +693,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 device_create_file(&client->dev, &dev_attr_vrm)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
diff --git a/drivers/i2c/chips/lm63.c b/drivers/i2c/chips/lm63.c
index 14cc5af03739..bc68e031392b 100644
--- a/drivers/i2c/chips/lm63.c
+++ b/drivers/i2c/chips/lm63.c
@@ -177,7 +177,7 @@ struct lm63_data {
  */
 
 #define show_fan(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm63_data *data = lm63_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->value)); \
@@ -185,7 +185,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
 show_fan(fan1_input);
 show_fan(fan1_low);
 
-static ssize_t set_fan1_low(struct device *dev, const char *buf,
+static ssize_t set_fan1_low(struct device *dev, struct device_attribute *attr, const char *buf,
         size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -202,7 +202,7 @@ static ssize_t set_fan1_low(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t show_pwm1(struct device *dev, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->pwm1_value >= 2 * data->pwm1_freq ?
@@ -210,7 +210,7 @@ static ssize_t show_pwm1(struct device *dev, char *buf)
                        (2 * data->pwm1_freq));
 }
 
-static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -229,20 +229,20 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_pwm1_enable(struct device *dev, char *buf)
+static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2);
 }
 
 #define show_temp8(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm63_data *data = lm63_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->value)); \
 }
 #define show_temp11(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm63_data *data = lm63_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->value)); \
@@ -255,7 +255,7 @@ show_temp11(temp2_low);
 show_temp8(temp2_crit);
 
 #define set_temp8(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -269,7 +269,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \
         return count; \
 }
 #define set_temp11(value, reg_msb, reg_lsb) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -289,7 +289,7 @@ set_temp11(temp2_low, LM63_REG_REMOTE_LOW_MSB, LM63_REG_REMOTE_LOW_LSB);
 
 /* Hysteresis register holds a relative value, while we want to present
    an absolute to user-space */
-static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp2_crit)
@@ -298,7 +298,7 @@ static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf)
 
 /* And now the other way around, user-space provides an absolute
    hysteresis value and we have to store a relative one */
-static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf,
+static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf,
         size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -314,7 +314,7 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c
index 0e86cc893981..57c51ac37c04 100644
--- a/drivers/i2c/chips/lm75.c
+++ b/drivers/i2c/chips/lm75.c
@@ -75,7 +75,7 @@ static struct i2c_driver lm75_driver = {
 };
 
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct lm75_data *data = lm75_update_device(dev);               \
         return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
@@ -85,7 +85,7 @@ show(temp_hyst);
 show(temp_input);
 
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                               \
         struct i2c_client *client = to_i2c_client(dev);         \
         struct lm75_data *data = i2c_get_clientdata(client);    \
diff --git a/drivers/i2c/chips/lm77.c b/drivers/i2c/chips/lm77.c
index f56b7a37de75..9d15cd5189f6 100644
--- a/drivers/i2c/chips/lm77.c
+++ b/drivers/i2c/chips/lm77.c
@@ -103,7 +103,7 @@ static inline int LM77_TEMP_FROM_REG(u16 reg)
 
 /* read routines for temperature limits */
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)      \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)       \
 {                                                               \
         struct lm77_data *data = lm77_update_device(dev);       \
         return sprintf(buf, "%d\n", data->value);               \
@@ -116,17 +116,17 @@ show(temp_max);
 show(alarms);
 
 /* read routines for hysteresis values */
-static ssize_t show_temp_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_crit - data->temp_hyst);
 }
-static ssize_t show_temp_min_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_min_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_min + data->temp_hyst);
 }
-static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_max_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_max - data->temp_hyst);
@@ -134,7 +134,7 @@ static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
 
 /* write routines */
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                                               \
         struct i2c_client *client = to_i2c_client(dev);                         \
         struct lm77_data *data = i2c_get_clientdata(client);                    \
@@ -152,7 +152,7 @@ set(temp_max, LM77_REG_TEMP_MAX);
 
 /* hysteresis is stored as a relative value on the chip, so it has to be
    converted first */
-static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm77_data *data = i2c_get_clientdata(client);
@@ -167,7 +167,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t co
 }
 
 /* preserve hysteresis when setting T_crit */
-static ssize_t set_temp_crit(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm77_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c
index 6d52d14eb31c..21b195ff3871 100644
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/i2c/chips/lm78.c
@@ -224,28 +224,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO,                 \
                 show_in##offset, NULL);                         \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                               \
         return show_in_min(dev, buf, offset);                   \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                               \
         return show_in_max(dev, buf, offset);                   \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -264,19 +264,19 @@ show_in_offset(5);
 show_in_offset(6);
 
 /* Temperature */
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
 }
 
-static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm78_data *data = i2c_get_clientdata(client);
@@ -289,13 +289,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_temp_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));
 }
 
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm78_data *data = i2c_get_clientdata(client);
@@ -398,19 +398,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -419,13 +419,13 @@ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
                 show_fan_##offset##_min, set_fan_##offset##_min);
 
-static ssize_t set_fan_1_div(struct device *dev, const char *buf,
+static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 0) ;
 }
 
-static ssize_t set_fan_2_div(struct device *dev, const char *buf,
+static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 1) ;
@@ -443,7 +443,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
 static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 
 /* VID */
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
@@ -451,7 +451,7 @@ static ssize_t show_vid(struct device *dev, char *buf)
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
diff --git a/drivers/i2c/chips/lm80.c b/drivers/i2c/chips/lm80.c
index a72f431971bb..404057b70e90 100644
--- a/drivers/i2c/chips/lm80.c
+++ b/drivers/i2c/chips/lm80.c
@@ -156,7 +156,7 @@ static struct i2c_driver lm80_driver = {
  */
 
 #define show_in(suffix, value) \
-static ssize_t show_in_##suffix(struct device *dev, char *buf) \
+static ssize_t show_in_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", IN_FROM_REG(data->value)); \
@@ -184,7 +184,7 @@ show_in(input5, in[5]);
 show_in(input6, in[6]);
 
 #define set_in(suffix, value, reg) \
-static ssize_t set_in_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_in_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -213,7 +213,7 @@ set_in(max5, in_max[5], LM80_REG_IN_MAX(5));
 set_in(max6, in_max[6], LM80_REG_IN_MAX(6));
 
 #define show_fan(suffix, value, div) \
-static ssize_t show_fan_##suffix(struct device *dev, char *buf) \
+static ssize_t show_fan_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->value, \
@@ -225,7 +225,7 @@ show_fan(input1, fan[0], fan_div[0]);
 show_fan(input2, fan[1], fan_div[1]);
 
 #define show_fan_div(suffix, value) \
-static ssize_t show_fan_div##suffix(struct device *dev, char *buf) \
+static ssize_t show_fan_div##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", DIV_FROM_REG(data->value)); \
@@ -234,7 +234,7 @@ show_fan_div(1, fan_div[0]);
 show_fan_div(2, fan_div[1]);
 
 #define set_fan(suffix, value, reg, div) \
-static ssize_t set_fan_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_fan_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -292,7 +292,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define set_fan_div(number) \
-static ssize_t set_fan_div##number(struct device *dev, const char *buf, \
+static ssize_t set_fan_div##number(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         return set_fan_div(dev, buf, count, number - 1); \
@@ -300,14 +300,14 @@ static ssize_t set_fan_div##number(struct device *dev, const char *buf, \
 set_fan_div(1);
 set_fan_div(2);
 
-static ssize_t show_temp_input1(struct device *dev, char *buf)
+static ssize_t show_temp_input1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm80_data *data = lm80_update_device(dev);
         return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp));
 }
 
 #define show_temp(suffix, value) \
-static ssize_t show_temp_##suffix(struct device *dev, char *buf) \
+static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data->value)); \
@@ -318,7 +318,7 @@ show_temp(os_max, temp_os_max);
 show_temp(os_hyst, temp_os_hyst);
 
 #define set_temp(suffix, value, reg) \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -336,7 +336,7 @@ set_temp(hot_hyst, temp_hot_hyst, LM80_REG_TEMP_HOT_HYST);
 set_temp(os_max, temp_os_max, LM80_REG_TEMP_OS_MAX);
 set_temp(os_hyst, temp_os_hyst, LM80_REG_TEMP_OS_HYST);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm80_data *data = lm80_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
diff --git a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c
index 3dafe60766ad..4d6d7d21e14b 100644
--- a/drivers/i2c/chips/lm83.c
+++ b/drivers/i2c/chips/lm83.c
@@ -155,7 +155,7 @@ struct lm83_data {
  */
 
 #define show_temp(suffix, value) \
-static ssize_t show_temp_##suffix(struct device *dev, char *buf) \
+static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm83_data *data = lm83_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -171,7 +171,7 @@ show_temp(high4, temp_high[3]);
 show_temp(crit, temp_crit);
 
 #define set_temp(suffix, value, reg) \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -190,7 +190,7 @@ set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH);
 set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH);
 set_temp(crit, temp_crit, LM83_REG_W_TCRIT);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm83_data *data = lm83_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c
index b1a0dc5f6b34..b1976775b4ba 100644
--- a/drivers/i2c/chips/lm85.c
+++ b/drivers/i2c/chips/lm85.c
@@ -426,15 +426,15 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -451,7 +451,7 @@ show_fan_offset(4);
 
 /* vid, vrm, alarms */
 
-static ssize_t show_vid_reg(struct device *dev, char *buf)
+static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -459,13 +459,13 @@ static ssize_t show_vid_reg(struct device *dev, char *buf)
 
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
-static ssize_t show_vrm_reg(struct device *dev, char *buf)
+static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 
-static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count)
+static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm85_data *data = i2c_get_clientdata(client);
@@ -478,7 +478,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count)
 
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 
-static ssize_t show_alarms_reg(struct device *dev, char *buf)
+static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
         return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
@@ -516,16 +516,16 @@ static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
 }
 
 #define show_pwm_reg(offset)                                            \
-static ssize_t show_pwm_##offset (struct device *dev, char *buf)        \
+static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_pwm(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t set_pwm_##offset (struct device *dev,                    \
+static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr,                     \
                                  const char *buf, size_t count)         \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);                    \
 }                                                                       \
-static ssize_t show_pwm_enable##offset (struct device *dev, char *buf)  \
+static ssize_t show_pwm_enable##offset (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_pwm_enable(dev, buf, offset - 1);                   \
 }                                                                       \
@@ -585,24 +585,24 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         return count;
 }
 #define show_in_reg(offset)                                             \
-static ssize_t show_in_##offset (struct device *dev, char *buf)         \
+static ssize_t show_in_##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                       \
         return show_in(dev, buf, offset);                               \
 }                                                                       \
-static ssize_t show_in_##offset##_min (struct device *dev, char *buf)   \
+static ssize_t show_in_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                       \
         return show_in_min(dev, buf, offset);                           \
 }                                                                       \
-static ssize_t show_in_##offset##_max (struct device *dev, char *buf)   \
+static ssize_t show_in_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                       \
         return show_in_max(dev, buf, offset);                           \
 }                                                                       \
-static ssize_t set_in_##offset##_min (struct device *dev,               \
+static ssize_t set_in_##offset##_min (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_in_min(dev, buf, count, offset);                     \
 }                                                                       \
-static ssize_t set_in_##offset##_max (struct device *dev,               \
+static ssize_t set_in_##offset##_max (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_in_max(dev, buf, count, offset);                     \
@@ -666,24 +666,24 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_reg(offset)                                           \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                                       \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                       \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf) \
+static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_temp_min(dev, buf, offset - 1);                     \
 }                                                                       \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf) \
+static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_temp_max(dev, buf, offset - 1);                     \
 }                                                                       \
-static ssize_t set_temp_##offset##_min (struct device *dev,             \
+static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,              \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_min(dev, buf, count, offset - 1);               \
 }                                                                       \
-static ssize_t set_temp_##offset##_max (struct device *dev,             \
+static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,              \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_max(dev, buf, count, offset - 1);               \
@@ -786,42 +786,42 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev, const char *buf,
         return count;
 }
 #define pwm_auto(offset)                                                \
-static ssize_t show_pwm##offset##_auto_channels (struct device *dev,    \
+static ssize_t show_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr,     \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_channels(dev, buf, offset - 1);            \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_channels (struct device *dev,     \
+static ssize_t set_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr,      \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_channels(dev, buf, count, offset - 1);      \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev,     \
+static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr,      \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_min(dev, buf, offset - 1);             \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev,      \
+static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr,       \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_min(dev, buf, count, offset - 1);       \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev,  \
+static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr,   \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_minctl(dev, buf, offset - 1);          \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev,   \
+static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr,    \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_minctl(dev, buf, count, offset - 1);    \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev,    \
+static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev, struct device_attribute *attr,     \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_freq(dev, buf, offset - 1);            \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev,      \
+static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev, struct device_attribute *attr,       \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_freq(dev, buf, count, offset - 1);      \
@@ -962,42 +962,42 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev, const char *buf,
         return count;
 }
 #define temp_auto(offset)                                               \
-static ssize_t show_temp##offset##_auto_temp_off (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_off(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_off (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_off(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_min (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_min(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_min (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_min(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_max (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_max(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_max (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_max(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev,  \
+static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr,   \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_crit(dev, buf, offset - 1);          \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev,   \
+static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr,    \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_crit(dev, buf, count, offset - 1);    \
diff --git a/drivers/i2c/chips/lm87.c b/drivers/i2c/chips/lm87.c
index 98cabd665063..4372b61a0882 100644
--- a/drivers/i2c/chips/lm87.c
+++ b/drivers/i2c/chips/lm87.c
@@ -218,19 +218,19 @@ static inline int lm87_write_value(struct i2c_client *client, u8 reg, u8 value)
 }
 
 #define show_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        data->in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        data->in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
@@ -274,13 +274,13 @@ static void set_in_max(struct device *dev, const char *buf, int nr)
 }
 
 #define set_in(offset) \
-static ssize_t set_in##offset##_min(struct device *dev, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_in_min(dev, buf, offset); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_in_max(dev, buf, offset); \
@@ -300,17 +300,17 @@ set_in(6);
 set_in(7);
 
 #define show_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_low(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_low(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[offset-1])); \
 } \
-static ssize_t show_temp##offset##_high(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_high(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[offset-1])); \
@@ -346,13 +346,13 @@ static void set_temp_high(struct device *dev, const char *buf, int nr)
 }
 
 #define set_temp(offset) \
-static ssize_t set_temp##offset##_low(struct device *dev, \
+static ssize_t set_temp##offset##_low(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_temp_low(dev, buf, offset-1); \
         return count; \
 } \
-static ssize_t set_temp##offset##_high(struct device *dev, \
+static ssize_t set_temp##offset##_high(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_temp_high(dev, buf, offset-1); \
@@ -366,13 +366,13 @@ set_temp(1);
 set_temp(2);
 set_temp(3);
 
-static ssize_t show_temp_crit_int(struct device *dev, char *buf)
+static ssize_t show_temp_crit_int(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_int));
 }
 
-static ssize_t show_temp_crit_ext(struct device *dev, char *buf)
+static ssize_t show_temp_crit_ext(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_ext));
@@ -383,19 +383,19 @@ static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit_ext, NULL);
 static DEVICE_ATTR(temp3_crit, S_IRUGO, show_temp_crit_ext, NULL);
 
 #define show_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[offset-1])); \
@@ -465,13 +465,13 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define set_fan(offset) \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
                 size_t count) \
 { \
         set_fan_min(dev, buf, offset-1); \
         return count; \
 } \
-static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
                 size_t count) \
 { \
         return set_fan_div(dev, buf, count, offset-1); \
@@ -483,26 +483,26 @@ static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
 set_fan(1);
 set_fan(2);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm87_data *data = i2c_get_clientdata(client);
@@ -511,12 +511,12 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
 }
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 
-static ssize_t show_aout(struct device *dev, char *buf)
+static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
 }
-static ssize_t set_aout(struct device *dev, const char *buf, size_t count)
+static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm87_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c
index 2c00ff83babc..9b127a07f56b 100644
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/i2c/chips/lm90.c
@@ -218,7 +218,7 @@ struct lm90_data {
  */
 
 #define show_temp(value, converter) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm90_data *data = lm90_update_device(dev); \
         return sprintf(buf, "%d\n", converter(data->value)); \
@@ -233,7 +233,7 @@ show_temp(temp_crit1, TEMP1_FROM_REG);
 show_temp(temp_crit2, TEMP1_FROM_REG);
 
 #define set_temp1(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -250,7 +250,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \
         return count; \
 }
 #define set_temp2(value, regh, regl) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -275,7 +275,7 @@ set_temp1(temp_crit1, LM90_REG_W_LOCAL_CRIT);
 set_temp1(temp_crit2, LM90_REG_W_REMOTE_CRIT);
 
 #define show_temp_hyst(value, basereg) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm90_data *data = lm90_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \
@@ -284,7 +284,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
 show_temp_hyst(temp_hyst1, temp_crit1);
 show_temp_hyst(temp_hyst2, temp_crit2);
 
-static ssize_t set_temp_hyst1(struct device *dev, const char *buf,
+static ssize_t set_temp_hyst1(struct device *dev, struct device_attribute *attr, const char *buf,
         size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -300,7 +300,7 @@ static ssize_t set_temp_hyst1(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm90_data *data = lm90_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/lm92.c b/drivers/i2c/chips/lm92.c
index fe6e83d70a72..215c8e40ffdd 100644
--- a/drivers/i2c/chips/lm92.c
+++ b/drivers/i2c/chips/lm92.c
@@ -140,7 +140,7 @@ static struct lm92_data *lm92_update_device(struct device *dev)
 }
 
 #define show_temp(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm92_data *data = lm92_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -151,7 +151,7 @@ show_temp(temp1_min);
 show_temp(temp1_max);
 
 #define set_temp(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -168,26 +168,26 @@ set_temp(temp1_crit, LM92_REG_TEMP_CRIT);
 set_temp(temp1_min, LM92_REG_TEMP_LOW);
 set_temp(temp1_max, LM92_REG_TEMP_HIGH);
 
-static ssize_t show_temp1_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_crit)
                        - TEMP_FROM_REG(data->temp1_hyst));
 }
-static ssize_t show_temp1_max_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_max_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_max)
                        - TEMP_FROM_REG(data->temp1_hyst));
 }
-static ssize_t show_temp1_min_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_min_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_min)
                        + TEMP_FROM_REG(data->temp1_hyst));
 }
 
-static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf,
+static ssize_t set_temp1_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf,
         size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -202,7 +202,7 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input));
diff --git a/drivers/i2c/chips/max1619.c b/drivers/i2c/chips/max1619.c
index 5afa961a5e10..30a196155fd9 100644
--- a/drivers/i2c/chips/max1619.c
+++ b/drivers/i2c/chips/max1619.c
@@ -122,7 +122,7 @@ struct max1619_data {
  */
 
 #define show_temp(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct max1619_data *data = max1619_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -135,7 +135,7 @@ show_temp(temp_crit2);
 show_temp(temp_hyst2);
 
 #define set_temp2(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -154,7 +154,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH);
 set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT);
 set_temp2(temp_hyst2, MAX1619_REG_W_TCRIT_HYST);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct max1619_data *data = max1619_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/pc87360.c b/drivers/i2c/chips/pc87360.c
index 6d94c36c9218..65637b2cd170 100644
--- a/drivers/i2c/chips/pc87360.c
+++ b/drivers/i2c/chips/pc87360.c
@@ -282,31 +282,31 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
 }
 
 #define show_and_set_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1])); \
 } \
-static ssize_t show_fan##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
                        FAN_STATUS_FROM_REG(data->fan_status[offset-1])); \
 } \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         return set_fan_min(dev, buf, count, offset-1); \
@@ -324,7 +324,7 @@ show_and_set_fan(2)
 show_and_set_fan(3)
 
 #define show_and_set_pwm(offset) \
-static ssize_t show_pwm##offset(struct device *dev, char *buf) \
+static ssize_t show_pwm##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
@@ -332,7 +332,7 @@ static ssize_t show_pwm##offset(struct device *dev, char *buf) \
                                     FAN_CONFIG_INVERT(data->fan_conf, \
                                                       offset-1))); \
 } \
-static ssize_t set_pwm##offset(struct device *dev, const char *buf, \
+static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -354,30 +354,30 @@ show_and_set_pwm(2)
 show_and_set_pwm(3)
 
 #define show_and_set_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", data->in_status[offset]); \
 } \
-static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -391,7 +391,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -427,36 +427,36 @@ show_and_set_in(9)
 show_and_set_in(10)
 
 #define show_and_set_therm(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_crit(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", data->in_status[offset+7]); \
 } \
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -470,7 +470,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -484,7 +484,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -512,19 +512,19 @@ show_and_set_therm(4)
 show_and_set_therm(5)
 show_and_set_therm(6)
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct pc87360_data *data = i2c_get_clientdata(client);
@@ -533,7 +533,7 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
 }
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 
-static ssize_t show_in_alarms(struct device *dev, char *buf)
+static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->in_alarms);
@@ -541,32 +541,32 @@ static ssize_t show_in_alarms(struct device *dev, char *buf)
 static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
 
 #define show_and_set_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
 }\
-static ssize_t show_temp##offset##_crit(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \
 }\
-static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", data->temp_status[offset-1]); \
 }\
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -580,7 +580,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -594,7 +594,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -622,7 +622,7 @@ show_and_set_temp(1)
 show_and_set_temp(2)
 show_and_set_temp(3)
 
-static ssize_t show_temp_alarms(struct device *dev, char *buf)
+static ssize_t show_temp_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->temp_alarms);
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 48b4e22eaffe..4956e9effd75 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -76,7 +76,7 @@ static struct i2c_driver pcf8574_driver = {
 };
 
 /* following are the sysfs callback functions */
-static ssize_t show_read(struct device *dev, char *buf)
+static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct pcf8574_data *data = i2c_get_clientdata(client);
@@ -86,13 +86,13 @@ static ssize_t show_read(struct device *dev, char *buf)
 
 static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
 
-static ssize_t show_write(struct device *dev, char *buf)
+static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%u\n", data->write);
 }
 
-static ssize_t set_write(struct device *dev, const char *buf,
+static ssize_t set_write(struct device *dev, struct device_attribute *attr, const char *buf,
                          size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index b6b927d8b372..db812ade8564 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -100,7 +100,7 @@ static struct i2c_driver pcf8591_driver = {
 
 /* following are the sysfs callback functions */
 #define show_in_channel(channel)                                        \
-static ssize_t show_in##channel##_input(struct device *dev, char *buf)  \
+static ssize_t show_in##channel##_input(struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return sprintf(buf, "%d\n", pcf8591_read_channel(dev, channel));\
 }                                                                       \
@@ -112,13 +112,13 @@ show_in_channel(1);
 show_in_channel(2);
 show_in_channel(3);
 
-static ssize_t show_out0_ouput(struct device *dev, char *buf)
+static ssize_t show_out0_ouput(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%d\n", data->aout * 10);
 }
 
-static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count)
+static ssize_t set_out0_output(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned int value;
         struct i2c_client *client = to_i2c_client(dev);
@@ -134,13 +134,13 @@ static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count
 static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO, 
                    show_out0_ouput, set_out0_output);
 
-static ssize_t show_out0_enable(struct device *dev, char *buf)
+static ssize_t show_out0_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF)));
 }
 
-static ssize_t set_out0_enable(struct device *dev, const char *buf, size_t count)
+static ssize_t set_out0_enable(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct pcf8591_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/sis5595.c b/drivers/i2c/chips/sis5595.c
index 7ea84532df32..c6650727a27d 100644
--- a/drivers/i2c/chips/sis5595.c
+++ b/drivers/i2c/chips/sis5595.c
@@ -256,28 +256,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO,                 \
                 show_in##offset, NULL);                         \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_min(dev, buf, offset);                   \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_max(dev, buf, offset);                   \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -294,19 +294,19 @@ show_in_offset(3);
 show_in_offset(4);
 
 /* Temperature */
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
 }
 
-static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct sis5595_data *data = i2c_get_clientdata(client);
@@ -319,13 +319,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_temp_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));
 }
 
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct sis5595_data *data = i2c_get_clientdata(client);
@@ -426,19 +426,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -450,13 +450,13 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\
 show_fan_offset(1);
 show_fan_offset(2);
 
-static ssize_t set_fan_1_div(struct device *dev, const char *buf,
+static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 0) ;
 }
 
-static ssize_t set_fan_2_div(struct device *dev, const char *buf,
+static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 1) ;
@@ -467,7 +467,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
                 show_fan_2_div, set_fan_2_div);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/smsc47b397.c b/drivers/i2c/chips/smsc47b397.c
index 1119c76791d9..251ac2659554 100644
--- a/drivers/i2c/chips/smsc47b397.c
+++ b/drivers/i2c/chips/smsc47b397.c
@@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr)
 }
 
 #define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, char *buf) \
+static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, num-1); \
 } \
@@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr)
 }
 
 #define sysfs_fan(num) \
-static ssize_t show_fan##num(struct device *dev, char *buf) \
+static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, num-1); \
 } \
diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c
index 0e12ca369413..13d6d4a8bc7d 100644
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/i2c/chips/smsc47m1.c
@@ -184,7 +184,7 @@ static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
         return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
 }
 
-static ssize_t get_alarms(struct device *dev, char *buf)
+static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
         return sprintf(buf, "%d\n", data->alarms);
@@ -298,42 +298,42 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
 }
 
 #define fan_present(offset)                                             \
-static ssize_t get_fan##offset (struct device *dev, char *buf)          \
+static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
 {                                                                       \
         return get_fan(dev, buf, offset - 1);                           \
 }                                                                       \
-static ssize_t get_fan##offset##_min (struct device *dev, char *buf)    \
+static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                       \
         return get_fan_min(dev, buf, offset - 1);                       \
 }                                                                       \
-static ssize_t set_fan##offset##_min (struct device *dev,               \
+static ssize_t set_fan##offset##_min (struct device *dev, struct device_attribute *attr,                \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t get_fan##offset##_div (struct device *dev, char *buf)    \
+static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                       \
         return get_fan_div(dev, buf, offset - 1);                       \
 }                                                                       \
-static ssize_t set_fan##offset##_div (struct device *dev,               \
+static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr,                \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t get_pwm##offset (struct device *dev, char *buf)          \
+static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
 {                                                                       \
         return get_pwm(dev, buf, offset - 1);                           \
 }                                                                       \
-static ssize_t set_pwm##offset (struct device *dev,                     \
+static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                      \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);                    \
 }                                                                       \
-static ssize_t get_pwm##offset##_en (struct device *dev, char *buf)     \
+static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf)      \
 {                                                                       \
         return get_pwm_en(dev, buf, offset - 1);                        \
 }                                                                       \
-static ssize_t set_pwm##offset##_en (struct device *dev,                \
+static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr,         \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm_en(dev, buf, count, offset - 1);                 \
diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
index 6614a59cecd4..fefc24a9251a 100644
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c
@@ -386,26 +386,26 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 }
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_min(dev, buf, offset);           \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_max(dev, buf, offset);           \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr,         \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                         const char *buf, size_t count)          \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -460,26 +460,26 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_offset(offset)                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                                       \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_over (struct device *dev, char *buf)               \
+show_temp_##offset##_over (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                       \
         return show_temp_over(dev, buf, offset - 1);                    \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_hyst (struct device *dev, char *buf)               \
+show_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                       \
         return show_temp_hyst(dev, buf, offset - 1);                    \
 }                                                                       \
-static ssize_t set_temp_##offset##_over (struct device *dev,            \
+static ssize_t set_temp_##offset##_over (struct device *dev, struct device_attribute *attr,             \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_over(dev, buf, count, offset - 1);              \
 }                                                                       \
-static ssize_t set_temp_##offset##_hyst (struct device *dev,            \
+static ssize_t set_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr,             \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_hyst(dev, buf, count, offset - 1);              \
@@ -538,24 +538,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
+static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
@@ -570,7 +570,7 @@ show_fan_offset(1);
 show_fan_offset(2);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf) {
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) {
         struct via686a_data *data = via686a_update_device(dev);
         return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
 }
diff --git a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c
index b1da5ed696d3..4f1bff572c1c 100644
--- a/drivers/i2c/chips/w83627hf.c
+++ b/drivers/i2c/chips/w83627hf.c
@@ -368,19 +368,19 @@ store_in_reg(MAX, max)
 
 #define sysfs_in_offset(offset) \
 static ssize_t \
-show_regs_in_##offset (struct device *dev, char *buf) \
+show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
 
 #define sysfs_in_reg_offset(reg, offset) \
-static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_##reg (dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_in_##reg##offset (struct device *dev, \
+store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, \
                             const char *buf, size_t count) \
 { \
         return store_in_##reg (dev, buf, count, offset); \
@@ -419,25 +419,25 @@ static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg)
         return sprintf(buf,"%ld\n", in0);
 }
 
-static ssize_t show_regs_in_0(struct device *dev, char *buf)
+static ssize_t show_regs_in_0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in[0]);
 }
 
-static ssize_t show_regs_in_min0(struct device *dev, char *buf)
+static ssize_t show_regs_in_min0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in_min[0]);
 }
 
-static ssize_t show_regs_in_max0(struct device *dev, char *buf)
+static ssize_t show_regs_in_max0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in_max[0]);
 }
 
-static ssize_t store_regs_in_min0(struct device *dev,
+static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -462,7 +462,7 @@ static ssize_t store_regs_in_min0(struct device *dev,
         return count;
 }
 
-static ssize_t store_regs_in_max0(struct device *dev,
+static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -531,19 +531,19 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_offset(offset) \
-static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset); \
 } \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
 
 #define sysfs_fan_min_offset(offset) \
-static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_min(dev, buf, count, offset); \
 } \
@@ -608,19 +608,19 @@ store_temp_reg(HYST, max_hyst);
 
 #define sysfs_temp_offset(offset) \
 static ssize_t \
-show_regs_temp_##offset (struct device *dev, char *buf) \
+show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, offset); \
 } \
 static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
 
 #define sysfs_temp_reg_offset(reg, offset) \
-static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_##reg (dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_temp_##reg##offset (struct device *dev, \
+store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, \
                               const char *buf, size_t count) \
 { \
         return store_temp_##reg (dev, buf, count, offset); \
@@ -645,7 +645,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
 } while (0)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -655,13 +655,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct w83627hf_data *data = i2c_get_clientdata(client);
@@ -677,7 +677,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 device_create_file(&client->dev, &dev_attr_vrm)
 
 static ssize_t
-show_alarms_reg(struct device *dev, char *buf)
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->alarms);
@@ -687,7 +687,7 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 device_create_file(&client->dev, &dev_attr_alarms)
 
 #define show_beep_reg(REG, reg) \
-static ssize_t show_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct w83627hf_data *data = w83627hf_update_device(dev); \
         return sprintf(buf,"%ld\n", \
@@ -732,12 +732,12 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 }
 
 #define sysfs_beep(REG, reg) \
-static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
-        return show_beep_##reg(dev, buf); \
+        return show_beep_##reg(dev, attr, buf); \
 } \
 static ssize_t \
-store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \
+store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_beep_reg(dev, buf, count, BEEP_##REG); \
 } \
@@ -801,12 +801,12 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_div(offset) \
-static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_fan_div_##offset (struct device *dev, \
+store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, \
                             const char *buf, size_t count) \
 { \
         return store_fan_div_reg(dev, buf, count, offset - 1); \
@@ -861,12 +861,12 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_pwm(offset) \
-static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwm_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_pwm_##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_pwm_reg(dev, buf, count, offset); \
 } \
@@ -937,12 +937,12 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_sensor(offset) \
-static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
     return show_sensor_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
     return store_sensor_reg(dev, buf, count, offset); \
 } \
diff --git a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c
index 4954e465c419..c3926d2d8ac6 100644
--- a/drivers/i2c/chips/w83781d.c
+++ b/drivers/i2c/chips/w83781d.c
@@ -309,18 +309,18 @@ store_in_reg(MAX, max);
 
 #define sysfs_in_offset(offset) \
 static ssize_t \
-show_regs_in_##offset (struct device *dev, char *buf) \
+show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
 
 #define sysfs_in_reg_offset(reg, offset) \
-static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_##reg (dev, buf, offset); \
 } \
-static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_in_##reg (dev, buf, count, offset); \
 } \
@@ -378,18 +378,18 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_offset(offset) \
-static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset); \
 } \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
 
 #define sysfs_fan_min_offset(offset) \
-static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset); \
 } \
-static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_min(dev, buf, count, offset); \
 } \
@@ -452,18 +452,18 @@ store_temp_reg(HYST, max_hyst);
 
 #define sysfs_temp_offset(offset) \
 static ssize_t \
-show_regs_temp_##offset (struct device *dev, char *buf) \
+show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, offset); \
 } \
 static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
 
 #define sysfs_temp_reg_offset(reg, offset) \
-static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_##reg (dev, buf, offset); \
 } \
-static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_temp_##reg (dev, buf, count, offset); \
 } \
@@ -486,7 +486,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
 } while (0)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -497,14 +497,14 @@ DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 #define device_create_file_vid(client) \
 device_create_file(&client->dev, &dev_attr_cpu0_vid);
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct w83781d_data *data = i2c_get_clientdata(client);
@@ -521,7 +521,7 @@ DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 #define device_create_file_vrm(client) \
 device_create_file(&client->dev, &dev_attr_vrm);
 static ssize_t
-show_alarms_reg(struct device *dev, char *buf)
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
@@ -531,13 +531,13 @@ static
 DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 #define device_create_file_alarms(client) \
 device_create_file(&client->dev, &dev_attr_alarms);
-static ssize_t show_beep_mask (struct device *dev, char *buf)
+static ssize_t show_beep_mask (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n",
                        (long)BEEP_MASK_FROM_REG(data->beep_mask, data->type));
 }
-static ssize_t show_beep_enable (struct device *dev, char *buf)
+static ssize_t show_beep_enable (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n",
@@ -583,11 +583,11 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 }
 
 #define sysfs_beep(REG, reg) \
-static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
-        return show_beep_##reg(dev, buf); \
+        return show_beep_##reg(dev, attr, buf); \
 } \
-static ssize_t store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_beep_reg(dev, buf, count, BEEP_##REG); \
 } \
@@ -653,11 +653,11 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_div(offset) \
-static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_fan_div_##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_div_reg(dev, buf, count, offset - 1); \
 } \
@@ -737,11 +737,11 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_pwm(offset) \
-static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwm_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_pwm_##offset (struct device *dev, \
+static ssize_t store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return store_pwm_reg(dev, buf, count, offset); \
@@ -750,11 +750,11 @@ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
                 show_regs_pwm_##offset, store_regs_pwm_##offset);
 
 #define sysfs_pwmenable(offset) \
-static ssize_t show_regs_pwmenable_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwmenable_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_pwmenable_##offset (struct device *dev, \
+static ssize_t store_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return store_pwmenable_reg(dev, buf, count, offset); \
@@ -832,11 +832,11 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_sensor(offset) \
-static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
     return show_sensor_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
     return store_sensor_reg(dev, buf, count, offset); \
 } \
diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/i2c/chips/w83l785ts.c
index 59bbc5881fa6..74d4b58e4237 100644
--- a/drivers/i2c/chips/w83l785ts.c
+++ b/drivers/i2c/chips/w83l785ts.c
@@ -118,13 +118,13 @@ struct w83l785ts_data {
  * Sysfs stuff
  */
 
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83l785ts_data *data = w83l785ts_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83l785ts_data *data = w83l785ts_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 9011627d7eb0..a22e53badacb 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -103,7 +103,7 @@ static struct class i2c_adapter_class = {
         .release =      &i2c_adapter_class_dev_release,
 };
 
-static ssize_t show_adapter_name(struct device *dev, char *buf)
+static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
         return sprintf(buf, "%s\n", adap->name);
@@ -117,7 +117,7 @@ static void i2c_client_release(struct device *dev)
         complete(&client->released);
 }
 
-static ssize_t show_client_name(struct device *dev, char *buf)
+static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
         return sprintf(buf, "%s\n", client->name);
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3ac0a535b4aa..0273f124a4f7 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -672,8 +672,8 @@ config BLK_DEV_SVWKS
           chipsets.
 
 config BLK_DEV_SGIIOC4
-        tristate "Silicon Graphics IOC4 chipset support"
-        depends on IA64_SGI_SN2 || IA64_GENERIC
+        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
+        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
         help
           This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
           chipset, which has one channel and can support two devices.
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 4f7ce7056228..39f3e9101ed4 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1932,8 +1932,11 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
 
                 /*
                  * check if dma is safe
+                 *
+                 * NOTE! The "len" and "addr" checks should possibly have
+                 * separate masks.
                  */
-                if ((rq->data_len & 3) || (addr & mask))
+                if ((rq->data_len & 15) || (addr & mask))
                         info->dma = 0;
         }
 
@@ -3255,16 +3258,12 @@ sector_t ide_cdrom_capacity (ide_drive_t *drive)
         return capacity * sectors_per_frame;
 }
 
-static
-int ide_cdrom_cleanup(ide_drive_t *drive)
+static int ide_cd_remove(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         struct cdrom_info *info = drive->driver_data;
 
-        if (ide_unregister_subdriver(drive)) {
-                printk(KERN_ERR "%s: %s: failed to ide_unregister_subdriver\n",
-                        __FUNCTION__, drive->name);
-                return 1;
-        }
+        ide_unregister_subdriver(drive, info->driver);
 
         del_gendisk(info->disk);
 
@@ -3297,7 +3296,7 @@ static void ide_cd_release(struct kref *kref)
         kfree(info);
 }
 
-static int ide_cdrom_attach (ide_drive_t *drive);
+static int ide_cd_probe(struct device *);
 
 #ifdef CONFIG_PROC_FS
 static int proc_idecd_read_capacity
@@ -3320,19 +3319,20 @@ static ide_proc_entry_t idecd_proc[] = {
 
 static ide_driver_t ide_cdrom_driver = {
         .owner                  = THIS_MODULE,
-        .name                   = "ide-cdrom",
+        .gen_driver = {
+                .name           = "ide-cdrom",
+                .bus            = &ide_bus_type,
+                .probe          = ide_cd_probe,
+                .remove         = ide_cd_remove,
+        },
         .version                = IDECD_VERSION,
         .media                  = ide_cdrom,
-        .busy                   = 0,
         .supports_dsc_overlap   = 1,
-        .cleanup                = ide_cdrom_cleanup,
         .do_request             = ide_do_rw_cdrom,
         .end_request            = ide_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
         .proc                   = idecd_proc,
-        .attach                 = ide_cdrom_attach,
-        .drives                 = LIST_HEAD_INIT(ide_cdrom_driver.drives),
 };
 
 static int idecd_open(struct inode * inode, struct file * file)
@@ -3418,8 +3418,9 @@ static char *ignore = NULL;
 module_param(ignore, charp, 0400);
 MODULE_DESCRIPTION("ATAPI CD-ROM Driver");
 
-static int ide_cdrom_attach (ide_drive_t *drive)
+static int ide_cd_probe(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         struct cdrom_info *info;
         struct gendisk *g;
         struct request_sense sense;
@@ -3453,11 +3454,8 @@ static int ide_cdrom_attach (ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        if (ide_register_subdriver(drive, &ide_cdrom_driver)) {
-                printk(KERN_ERR "%s: Failed to register the driver with ide.c\n",
-                        drive->name);
-                goto out_put_disk;
-        }
+        ide_register_subdriver(drive, &ide_cdrom_driver);
+
         memset(info, 0, sizeof (struct cdrom_info));
 
         kref_init(&info->kref);
@@ -3470,7 +3468,6 @@ static int ide_cdrom_attach (ide_drive_t *drive)
 
         drive->driver_data = info;
 
-        DRIVER(drive)->busy++;
         g->minors = 1;
         snprintf(g->devfs_name, sizeof(g->devfs_name),
                         "%s/cd", drive->devfs_name);
@@ -3478,8 +3475,7 @@ static int ide_cdrom_attach (ide_drive_t *drive)
         g->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE;
         if (ide_cdrom_setup(drive)) {
                 struct cdrom_device_info *devinfo = &info->devinfo;
-                DRIVER(drive)->busy--;
-                ide_unregister_subdriver(drive);
+                ide_unregister_subdriver(drive, &ide_cdrom_driver);
                 if (info->buffer != NULL)
                         kfree(info->buffer);
                 if (info->toc != NULL)
@@ -3492,7 +3488,6 @@ static int ide_cdrom_attach (ide_drive_t *drive)
                 drive->driver_data = NULL;
                 goto failed;
         }
-        DRIVER(drive)->busy--;
 
         cdrom_read_toc(drive, &sense);
         g->fops = &idecd_ops;
@@ -3500,23 +3495,20 @@ static int ide_cdrom_attach (ide_drive_t *drive)
         add_disk(g);
         return 0;
 
-out_put_disk:
-        put_disk(g);
 out_free_cd:
         kfree(info);
 failed:
-        return 1;
+        return -ENODEV;
 }
 
 static void __exit ide_cdrom_exit(void)
 {
-        ide_unregister_driver(&ide_cdrom_driver);
+        driver_unregister(&ide_cdrom_driver.gen_driver);
 }
  
 static int ide_cdrom_init(void)
 {
-        ide_register_driver(&ide_cdrom_driver);
-        return 0;
+        return driver_register(&ide_cdrom_driver.gen_driver);
 }
 
 module_init(ide_cdrom_init);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 5d54f7756100..3302cd8eab4c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1024,14 +1024,16 @@ static void ide_cacheflush_p(ide_drive_t *drive)
                 printk(KERN_INFO "%s: wcache flush failed!\n", drive->name);
 }
 
-static int idedisk_cleanup (ide_drive_t *drive)
+static int ide_disk_remove(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         struct ide_disk_obj *idkp = drive->driver_data;
         struct gendisk *g = idkp->disk;
 
         ide_cacheflush_p(drive);
-        if (ide_unregister_subdriver(drive))
-                return 1;
+
+        ide_unregister_subdriver(drive, idkp->driver);
+
         del_gendisk(g);
 
         ide_disk_put(idkp);
@@ -1052,7 +1054,7 @@ static void ide_disk_release(struct kref *kref)
         kfree(idkp);
 }
 
-static int idedisk_attach(ide_drive_t *drive);
+static int ide_disk_probe(struct device *dev);
 
 static void ide_device_shutdown(struct device *dev)
 {
@@ -1082,27 +1084,23 @@ static void ide_device_shutdown(struct device *dev)
         dev->bus->suspend(dev, PMSG_SUSPEND);
 }
 
-/*
- *      IDE subdriver functions, registered with ide.c
- */
 static ide_driver_t idedisk_driver = {
         .owner                  = THIS_MODULE,
         .gen_driver = {
+                .name           = "ide-disk",
+                .bus            = &ide_bus_type,
+                .probe          = ide_disk_probe,
+                .remove         = ide_disk_remove,
                 .shutdown       = ide_device_shutdown,
         },
-        .name                   = "ide-disk",
         .version                = IDEDISK_VERSION,
         .media                  = ide_disk,
-        .busy                   = 0,
         .supports_dsc_overlap   = 0,
-        .cleanup                = idedisk_cleanup,
         .do_request             = ide_do_rw_disk,
         .end_request            = ide_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
         .proc                   = idedisk_proc,
-        .attach                 = idedisk_attach,
-        .drives                 = LIST_HEAD_INIT(idedisk_driver.drives),
 };
 
 static int idedisk_open(struct inode *inode, struct file *filp)
@@ -1199,8 +1197,9 @@ static struct block_device_operations idedisk_ops = {
 
 MODULE_DESCRIPTION("ATA DISK Driver");
 
-static int idedisk_attach(ide_drive_t *drive)
+static int ide_disk_probe(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         struct ide_disk_obj *idkp;
         struct gendisk *g;
 
@@ -1222,10 +1221,7 @@ static int idedisk_attach(ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        if (ide_register_subdriver(drive, &idedisk_driver)) {
-                printk (KERN_ERR "ide-disk: %s: Failed to register the driver with ide.c\n", drive->name);
-                goto out_put_disk;
-        }
+        ide_register_subdriver(drive, &idedisk_driver);
 
         memset(idkp, 0, sizeof(*idkp));
 
@@ -1239,7 +1235,6 @@ static int idedisk_attach(ide_drive_t *drive)
 
         drive->driver_data = idkp;
 
-        DRIVER(drive)->busy++;
         idedisk_setup(drive);
         if ((!drive->head || drive->head > 16) && !drive->select.b.lba) {
                 printk(KERN_ERR "%s: INVALID GEOMETRY: %d PHYSICAL HEADS?\n",
@@ -1247,7 +1242,7 @@ static int idedisk_attach(ide_drive_t *drive)
                 drive->attach = 0;
         } else
                 drive->attach = 1;
-        DRIVER(drive)->busy--;
+
         g->minors = 1 << PARTN_BITS;
         strcpy(g->devfs_name, drive->devfs_name);
         g->driverfs_dev = &drive->gendev;
@@ -1257,22 +1252,20 @@ static int idedisk_attach(ide_drive_t *drive)
         add_disk(g);
         return 0;
 
-out_put_disk:
-        put_disk(g);
 out_free_idkp:
         kfree(idkp);
 failed:
-        return 1;
+        return -ENODEV;
 }
 
 static void __exit idedisk_exit (void)
 {
-        ide_unregister_driver(&idedisk_driver);
+        driver_unregister(&idedisk_driver.gen_driver);
 }
 
 static int idedisk_init (void)
 {
-        return ide_register_driver(&idedisk_driver);
+        return driver_register(&idedisk_driver.gen_driver);
 }
 
 module_init(idedisk_init);
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 36c0b74a4e45..c949e98df4b6 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1865,13 +1865,13 @@ static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy)
         idefloppy_add_settings(drive);
 }
 
-static int idefloppy_cleanup (ide_drive_t *drive)
+static int ide_floppy_remove(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         idefloppy_floppy_t *floppy = drive->driver_data;
         struct gendisk *g = floppy->disk;
 
-        if (ide_unregister_subdriver(drive))
-                return 1;
+        ide_unregister_subdriver(drive, floppy->driver);
 
         del_gendisk(g);
 
@@ -1916,26 +1916,24 @@ static ide_proc_entry_t idefloppy_proc[] = {
 
 #endif  /* CONFIG_PROC_FS */
 
-static int idefloppy_attach(ide_drive_t *drive);
+static int ide_floppy_probe(struct device *);
 
-/*
- *      IDE subdriver functions, registered with ide.c
- */
 static ide_driver_t idefloppy_driver = {
         .owner                  = THIS_MODULE,
-        .name                   = "ide-floppy",
+        .gen_driver = {
+                .name           = "ide-floppy",
+                .bus            = &ide_bus_type,
+                .probe          = ide_floppy_probe,
+                .remove         = ide_floppy_remove,
+        },
         .version                = IDEFLOPPY_VERSION,
         .media                  = ide_floppy,
-        .busy                   = 0,
         .supports_dsc_overlap   = 0,
-        .cleanup                = idefloppy_cleanup,
         .do_request             = idefloppy_do_request,
         .end_request            = idefloppy_do_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
         .proc                   = idefloppy_proc,
-        .attach                 = idefloppy_attach,
-        .drives                 = LIST_HEAD_INIT(idefloppy_driver.drives),
 };
 
 static int idefloppy_open(struct inode *inode, struct file *filp)
@@ -2122,8 +2120,9 @@ static struct block_device_operations idefloppy_ops = {
         .revalidate_disk= idefloppy_revalidate_disk
 };
 
-static int idefloppy_attach (ide_drive_t *drive)
+static int ide_floppy_probe(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         idefloppy_floppy_t *floppy;
         struct gendisk *g;
 
@@ -2152,10 +2151,7 @@ static int idefloppy_attach (ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        if (ide_register_subdriver(drive, &idefloppy_driver)) {
-                printk (KERN_ERR "ide-floppy: %s: Failed to register the driver with ide.c\n", drive->name);
-                goto out_put_disk;
-        }
+        ide_register_subdriver(drive, &idefloppy_driver);
 
         memset(floppy, 0, sizeof(*floppy));
 
@@ -2169,9 +2165,8 @@ static int idefloppy_attach (ide_drive_t *drive)
 
         drive->driver_data = floppy;
 
-        DRIVER(drive)->busy++;
         idefloppy_setup (drive, floppy);
-        DRIVER(drive)->busy--;
+
         g->minors = 1 << PARTN_BITS;
         g->driverfs_dev = &drive->gendev;
         strcpy(g->devfs_name, drive->devfs_name);
@@ -2181,19 +2176,17 @@ static int idefloppy_attach (ide_drive_t *drive)
         add_disk(g);
         return 0;
 
-out_put_disk:
-        put_disk(g);
 out_free_floppy:
         kfree(floppy);
 failed:
-        return 1;
+        return -ENODEV;
 }
 
 MODULE_DESCRIPTION("ATAPI FLOPPY Driver");
 
 static void __exit idefloppy_exit (void)
 {
-        ide_unregister_driver(&idefloppy_driver);
+        driver_unregister(&idefloppy_driver.gen_driver);
 }
 
 /*
@@ -2202,8 +2195,7 @@ static void __exit idefloppy_exit (void)
 static int idefloppy_init (void)
 {
         printk("ide-floppy driver " IDEFLOPPY_VERSION "\n");
-        ide_register_driver(&idefloppy_driver);
-        return 0;
+        return driver_register(&idefloppy_driver.gen_driver);
 }
 
 module_init(idefloppy_init);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 554473a95cf7..5d876f53c697 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -47,6 +47,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
+#include <linux/devfs_fs_kernel.h>
 #include <linux/spinlock.h>
 #include <linux/kmod.h>
 #include <linux/pci.h>
@@ -696,13 +697,13 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
         SELECT_DRIVE(&hwif->drives[0]);
         hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
         mdelay(2);
-        rc = ide_wait_not_busy(hwif, 10000);
+        rc = ide_wait_not_busy(hwif, 35000);
         if (rc)
                 return rc;
         SELECT_DRIVE(&hwif->drives[1]);
         hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
         mdelay(2);
-        rc = ide_wait_not_busy(hwif, 10000);
+        rc = ide_wait_not_busy(hwif, 35000);
 
         /* Exit function with master reselected (let's be sane) */
         SELECT_DRIVE(&hwif->drives[0]);
@@ -918,7 +919,7 @@ int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)
                            want them on default or a new "empty" class
                            for hotplug reprobing ? */
                         if (drive->present) {
-                                ata_attach(drive);
+                                device_register(&drive->gendev);
                         }
                 }
         }
@@ -1279,10 +1280,51 @@ void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)
 
 EXPORT_SYMBOL_GPL(ide_init_disk);
 
+static void ide_remove_drive_from_hwgroup(ide_drive_t *drive)
+{
+        ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
+
+        if (drive == drive->next) {
+                /* special case: last drive from hwgroup. */
+                BUG_ON(hwgroup->drive != drive);
+                hwgroup->drive = NULL;
+        } else {
+                ide_drive_t *walk;
+
+                walk = hwgroup->drive;
+                while (walk->next != drive)
+                        walk = walk->next;
+                walk->next = drive->next;
+                if (hwgroup->drive == drive) {
+                        hwgroup->drive = drive->next;
+                        hwgroup->hwif = hwgroup->drive->hwif;
+                }
+        }
+        BUG_ON(hwgroup->drive == drive);
+}
+
 static void drive_release_dev (struct device *dev)
 {
         ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);
 
+        spin_lock_irq(&ide_lock);
+        if (drive->devfs_name[0] != '\0') {
+                devfs_remove(drive->devfs_name);
+                drive->devfs_name[0] = '\0';
+        }
+        ide_remove_drive_from_hwgroup(drive);
+        if (drive->id != NULL) {
+                kfree(drive->id);
+                drive->id = NULL;
+        }
+        drive->present = 0;
+        /* Messed up locking ... */
+        spin_unlock_irq(&ide_lock);
+        blk_cleanup_queue(drive->queue);
+        spin_lock_irq(&ide_lock);
+        drive->queue = NULL;
+        spin_unlock_irq(&ide_lock);
+
         up(&drive->gendev_rel_sem);
 }
 
@@ -1306,7 +1348,6 @@ static void init_gendisk (ide_hwif_t *hwif)
                 drive->gendev.driver_data = drive;
                 drive->gendev.release = drive_release_dev;
                 if (drive->present) {
-                        device_register(&drive->gendev);
                         sprintf(drive->devfs_name, "ide/host%d/bus%d/target%d/lun%d",
                                 (hwif->channel && hwif->mate) ?
                                 hwif->mate->index : hwif->index,
@@ -1412,7 +1453,7 @@ int ideprobe_init (void)
                                 hwif->chipset = ide_generic;
                         for (unit = 0; unit < MAX_DRIVES; ++unit)
                                 if (hwif->drives[unit].present)
-                                        ata_attach(&hwif->drives[unit]);
+                                        device_register(&hwif->drives[unit].gendev);
                 }
         }
         return 0;
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 4b1e43b4118b..4063d2c34e3d 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -307,17 +307,41 @@ static int proc_ide_read_driver
         (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
         ide_drive_t     *drive = (ide_drive_t *) data;
-        ide_driver_t    *driver = drive->driver;
+        struct device   *dev = &drive->gendev;
+        ide_driver_t    *ide_drv;
         int             len;
 
-        if (driver) {
+        down_read(&dev->bus->subsys.rwsem);
+        if (dev->driver) {
+                ide_drv = container_of(dev->driver, ide_driver_t, gen_driver);
                 len = sprintf(page, "%s version %s\n",
-                                driver->name, driver->version);
+                                dev->driver->name, ide_drv->version);
         } else
                 len = sprintf(page, "ide-default version 0.9.newide\n");
+        up_read(&dev->bus->subsys.rwsem);
         PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
 }
 
+static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
+{
+        struct device *dev = &drive->gendev;
+        int ret = 1;
+
+        down_write(&dev->bus->subsys.rwsem);
+        device_release_driver(dev);
+        /* FIXME: device can still be in use by previous driver */
+        strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
+        device_attach(dev);
+        drive->driver_req[0] = 0;
+        if (dev->driver == NULL)
+                device_attach(dev);
+        if (dev->driver && !strcmp(dev->driver->name, driver))
+                ret = 0;
+        up_write(&dev->bus->subsys.rwsem);
+
+        return ret;
+}
+
 static int proc_ide_write_driver
         (struct file *file, const char __user *buffer, unsigned long count, void *data)
 {
@@ -488,16 +512,32 @@ void destroy_proc_ide_interface(ide_hwif_t *hwif)
         }
 }
 
-extern struct seq_operations ide_drivers_op;
+static int proc_print_driver(struct device_driver *drv, void *data)
+{
+        ide_driver_t *ide_drv = container_of(drv, ide_driver_t, gen_driver);
+        struct seq_file *s = data;
+
+        seq_printf(s, "%s version %s\n", drv->name, ide_drv->version);
+
+        return 0;
+}
+
+static int ide_drivers_show(struct seq_file *s, void *p)
+{
+        bus_for_each_drv(&ide_bus_type, NULL, s, proc_print_driver);
+        return 0;
+}
+
 static int ide_drivers_open(struct inode *inode, struct file *file)
 {
-        return seq_open(file, &ide_drivers_op);
+        return single_open(file, &ide_drivers_show, NULL);
 }
+
 static struct file_operations ide_drivers_operations = {
         .open           = ide_drivers_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-        .release        = seq_release,
+        .release        = single_release,
 };
 
 void proc_ide_create(void)
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 482544854985..5a3dc46008e6 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -4681,21 +4681,12 @@ static void idetape_setup (ide_drive_t *drive, idetape_tape_t *tape, int minor)
         idetape_add_settings(drive);
 }
 
-static int idetape_cleanup (ide_drive_t *drive)
+static int ide_tape_remove(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         idetape_tape_t *tape = drive->driver_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&ide_lock, flags);
-        if (test_bit(IDETAPE_BUSY, &tape->flags) || drive->usage ||
-            tape->first_stage != NULL || tape->merge_stage_size) {
-                spin_unlock_irqrestore(&ide_lock, flags);
-                return 1;
-        }
 
-        spin_unlock_irqrestore(&ide_lock, flags);
-        DRIVER(drive)->busy = 0;
-        (void) ide_unregister_subdriver(drive);
+        ide_unregister_subdriver(drive, tape->driver);
 
         ide_unregister_region(tape->disk);
 
@@ -4710,6 +4701,8 @@ static void ide_tape_release(struct kref *kref)
         ide_drive_t *drive = tape->drive;
         struct gendisk *g = tape->disk;
 
+        BUG_ON(tape->first_stage != NULL || tape->merge_stage_size);
+
         drive->dsc_overlap = 0;
         drive->driver_data = NULL;
         devfs_remove("%s/mt", drive->devfs_name);
@@ -4747,26 +4740,24 @@ static ide_proc_entry_t idetape_proc[] = {
 
 #endif
 
-static int idetape_attach(ide_drive_t *drive);
+static int ide_tape_probe(struct device *);
 
-/*
- *      IDE subdriver functions, registered with ide.c
- */
 static ide_driver_t idetape_driver = {
         .owner                  = THIS_MODULE,
-        .name                   = "ide-tape",
+        .gen_driver = {
+                .name           = "ide-tape",
+                .bus            = &ide_bus_type,
+                .probe          = ide_tape_probe,
+                .remove         = ide_tape_remove,
+        },
         .version                = IDETAPE_VERSION,
         .media                  = ide_tape,
-        .busy                   = 1,
         .supports_dsc_overlap   = 1,
-        .cleanup                = idetape_cleanup,
         .do_request             = idetape_do_request,
         .end_request            = idetape_end_request,
         .error                  = __ide_error,
         .abort                  = __ide_abort,
         .proc                   = idetape_proc,
-        .attach                 = idetape_attach,
-        .drives                 = LIST_HEAD_INIT(idetape_driver.drives),
 };
 
 /*
@@ -4829,8 +4820,9 @@ static struct block_device_operations idetape_block_ops = {
         .ioctl          = idetape_ioctl,
 };
 
-static int idetape_attach (ide_drive_t *drive)
+static int ide_tape_probe(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         idetape_tape_t *tape;
         struct gendisk *g;
         int minor;
@@ -4865,10 +4857,7 @@ static int idetape_attach (ide_drive_t *drive)
 
         ide_init_disk(g, drive);
 
-        if (ide_register_subdriver(drive, &idetape_driver)) {
-                printk(KERN_ERR "ide-tape: %s: Failed to register the driver with ide.c\n", drive->name);
-                goto out_put_disk;
-        }
+        ide_register_subdriver(drive, &idetape_driver);
 
         memset(tape, 0, sizeof(*tape));
 
@@ -4902,12 +4891,11 @@ static int idetape_attach (ide_drive_t *drive)
         ide_register_region(g);
 
         return 0;
-out_put_disk:
-        put_disk(g);
+
 out_free_tape:
         kfree(tape);
 failed:
-        return 1;
+        return -ENODEV;
 }
 
 MODULE_DESCRIPTION("ATAPI Streaming TAPE Driver");
@@ -4915,7 +4903,7 @@ MODULE_LICENSE("GPL");
 
 static void __exit idetape_exit (void)
 {
-        ide_unregister_driver(&idetape_driver);
+        driver_unregister(&idetape_driver.gen_driver);
         unregister_chrdev(IDETAPE_MAJOR, "ht");
 }
 
@@ -4928,8 +4916,7 @@ static int idetape_init (void)
                 printk(KERN_ERR "ide-tape: Failed to register character device interface\n");
                 return -EBUSY;
         }
-        ide_register_driver(&idetape_driver);
-        return 0;
+        return driver_register(&idetape_driver.gen_driver);
 }
 
 module_init(idetape_init);
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 973dec799b5c..dae1bd5b8c3e 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -196,8 +196,6 @@ ide_hwif_t ide_hwifs[MAX_HWIFS];	/* master data repository */
 
 EXPORT_SYMBOL(ide_hwifs);
 
-static struct list_head ide_drives = LIST_HEAD_INIT(ide_drives);
-
 /*
  * Do not even *think* about calling this!
  */
@@ -358,54 +356,6 @@ static int ide_system_bus_speed(void)
         return system_bus_speed;
 }
 
-/*
- *      drives_lock protects the list of drives, drivers_lock the
- *      list of drivers.  Currently nobody takes both at once.
- */
-
-static DEFINE_SPINLOCK(drives_lock);
-static DEFINE_SPINLOCK(drivers_lock);
-static LIST_HEAD(drivers);
-
-/* Iterator for the driver list. */
-
-static void *m_start(struct seq_file *m, loff_t *pos)
-{
-        struct list_head *p;
-        loff_t l = *pos;
-        spin_lock(&drivers_lock);
-        list_for_each(p, &drivers)
-                if (!l--)
-                        return list_entry(p, ide_driver_t, drivers);
-        return NULL;
-}
-
-static void *m_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        struct list_head *p = ((ide_driver_t *)v)->drivers.next;
-        (*pos)++;
-        return p==&drivers ? NULL : list_entry(p, ide_driver_t, drivers);
-}
-
-static void m_stop(struct seq_file *m, void *v)
-{
-        spin_unlock(&drivers_lock);
-}
-
-static int show_driver(struct seq_file *m, void *v)
-{
-        ide_driver_t *driver = v;
-        seq_printf(m, "%s version %s\n", driver->name, driver->version);
-        return 0;
-}
-
-struct seq_operations ide_drivers_op = {
-        .start  = m_start,
-        .next   = m_next,
-        .stop   = m_stop,
-        .show   = show_driver
-};
-
 #ifdef CONFIG_PROC_FS
 struct proc_dir_entry *proc_ide_root;
 #endif
@@ -630,7 +580,7 @@ void ide_unregister(unsigned int index)
         ide_hwif_t *hwif, *g;
         static ide_hwif_t tmp_hwif; /* protected by ide_cfg_sem */
         ide_hwgroup_t *hwgroup;
-        int irq_count = 0, unit, i;
+        int irq_count = 0, unit;
 
         BUG_ON(index >= MAX_HWIFS);
 
@@ -643,23 +593,22 @@ void ide_unregister(unsigned int index)
                 goto abort;
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 drive = &hwif->drives[unit];
-                if (!drive->present)
+                if (!drive->present) {
+                        if (drive->devfs_name[0] != '\0') {
+                                devfs_remove(drive->devfs_name);
+                                drive->devfs_name[0] = '\0';
+                        }
                         continue;
-                if (drive->usage || DRIVER(drive)->busy)
-                        goto abort;
-                drive->dead = 1;
+                }
+                spin_unlock_irq(&ide_lock);
+                device_unregister(&drive->gendev);
+                down(&drive->gendev_rel_sem);
+                spin_lock_irq(&ide_lock);
         }
         hwif->present = 0;
 
         spin_unlock_irq(&ide_lock);
 
-        for (unit = 0; unit < MAX_DRIVES; ++unit) {
-                drive = &hwif->drives[unit];
-                if (!drive->present)
-                        continue;
-                DRIVER(drive)->cleanup(drive);
-        }
-
         destroy_proc_ide_interface(hwif);
 
         hwgroup = hwif->hwgroup;
@@ -687,44 +636,6 @@ void ide_unregister(unsigned int index)
          * Remove us from the hwgroup, and free
          * the hwgroup if we were the only member
          */
-        for (i = 0; i < MAX_DRIVES; ++i) {
-                drive = &hwif->drives[i];
-                if (drive->devfs_name[0] != '\0') {
-                        devfs_remove(drive->devfs_name);
-                        drive->devfs_name[0] = '\0';
-                }
-                if (!drive->present)
-                        continue;
-                if (drive == drive->next) {
-                        /* special case: last drive from hwgroup. */
-                        BUG_ON(hwgroup->drive != drive);
-                        hwgroup->drive = NULL;
-                } else {
-                        ide_drive_t *walk;
-
-                        walk = hwgroup->drive;
-                        while (walk->next != drive)
-                                walk = walk->next;
-                        walk->next = drive->next;
-                        if (hwgroup->drive == drive) {
-                                hwgroup->drive = drive->next;
-                                hwgroup->hwif = HWIF(hwgroup->drive);
-                        }
-                }
-                BUG_ON(hwgroup->drive == drive);
-                if (drive->id != NULL) {
-                        kfree(drive->id);
-                        drive->id = NULL;
-                }
-                drive->present = 0;
-                /* Messed up locking ... */
-                spin_unlock_irq(&ide_lock);
-                blk_cleanup_queue(drive->queue);
-                device_unregister(&drive->gendev);
-                down(&drive->gendev_rel_sem);
-                spin_lock_irq(&ide_lock);
-                drive->queue = NULL;
-        }
         if (hwif->next == hwif) {
                 BUG_ON(hwgroup->hwif != hwif);
                 kfree(hwgroup);
@@ -1304,73 +1215,6 @@ int system_bus_clock (void)
 
 EXPORT_SYMBOL(system_bus_clock);
 
-/*
- *      Locking is badly broken here - since way back.  That sucker is
- * root-only, but that's not an excuse...  The real question is what
- * exclusion rules do we want here.
- */
-int ide_replace_subdriver (ide_drive_t *drive, const char *driver)
-{
-        if (!drive->present || drive->usage || drive->dead)
-                goto abort;
-        if (DRIVER(drive)->cleanup(drive))
-                goto abort;
-        strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
-        if (ata_attach(drive)) {
-                spin_lock(&drives_lock);
-                list_del_init(&drive->list);
-                spin_unlock(&drives_lock);
-                drive->driver_req[0] = 0;
-                ata_attach(drive);
-        } else {
-                drive->driver_req[0] = 0;
-        }
-        if (drive->driver && !strcmp(drive->driver->name, driver))
-                return 0;
-abort:
-        return 1;
-}
-
-/**
- *      ata_attach              -       attach an ATA/ATAPI device
- *      @drive: drive to attach
- *
- *      Takes a drive that is as yet not assigned to any midlayer IDE
- *      driver (or is assigned to the default driver) and figures out
- *      which driver would like to own it. If nobody claims the drive
- *      then it is automatically attached to the default driver used for
- *      unclaimed objects.
- *
- *      A return of zero indicates attachment to a driver, of one
- *      attachment to the default driver.
- *
- *      Takes drivers_lock.
- */
-
-int ata_attach(ide_drive_t *drive)
-{
-        struct list_head *p;
-        spin_lock(&drivers_lock);
-        list_for_each(p, &drivers) {
-                ide_driver_t *driver = list_entry(p, ide_driver_t, drivers);
-                if (!try_module_get(driver->owner))
-                        continue;
-                spin_unlock(&drivers_lock);
-                if (driver->attach(drive) == 0) {
-                        module_put(driver->owner);
-                        drive->gendev.driver = &driver->gen_driver;
-                        return 0;
-                }
-                spin_lock(&drivers_lock);
-                module_put(driver->owner);
-        }
-        drive->gendev.driver = NULL;
-        spin_unlock(&drivers_lock);
-        if (ide_register_subdriver(drive, NULL))
-                panic("ide: default attach failed");
-        return 1;
-}
-
 static int generic_ide_suspend(struct device *dev, pm_message_t state)
 {
         ide_drive_t *drive = dev->driver_data;
@@ -2013,27 +1857,11 @@ static void __init probe_for_hwifs (void)
 #endif
 }
 
-int ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver)
+void ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&ide_lock, flags);
-        if (!drive->present || drive->driver != NULL ||
-            drive->usage || drive->dead) {
-                spin_unlock_irqrestore(&ide_lock, flags);
-                return 1;
-        }
-        drive->driver = driver;
-        spin_unlock_irqrestore(&ide_lock, flags);
-        spin_lock(&drives_lock);
-        list_add_tail(&drive->list, driver ? &driver->drives : &ide_drives);
-        spin_unlock(&drives_lock);
-//      printk(KERN_INFO "%s: attached %s driver.\n", drive->name, driver->name);
 #ifdef CONFIG_PROC_FS
-        if (driver)
-                ide_add_proc_entries(drive->proc, driver->proc, drive);
+        ide_add_proc_entries(drive->proc, driver->proc, drive);
 #endif
-        return 0;
 }
 
 EXPORT_SYMBOL(ide_register_subdriver);
@@ -2041,136 +1869,51 @@ EXPORT_SYMBOL(ide_register_subdriver);
 /**
  *      ide_unregister_subdriver        -       disconnect drive from driver
  *      @drive: drive to unplug
+ *      @driver: driver
  *
  *      Disconnect a drive from the driver it was attached to and then
  *      clean up the various proc files and other objects attached to it.
  *
- *      Takes ide_setting_sem, ide_lock and drives_lock.
+ *      Takes ide_setting_sem and ide_lock.
  *      Caller must hold none of the locks.
- *
- *      No locking versus subdriver unload because we are moving to the
- *      default driver anyway. Wants double checking.
  */
 
-int ide_unregister_subdriver (ide_drive_t *drive)
+void ide_unregister_subdriver(ide_drive_t *drive, ide_driver_t *driver)
 {
         unsigned long flags;
         
         down(&ide_setting_sem);
         spin_lock_irqsave(&ide_lock, flags);
-        if (drive->usage || drive->driver == NULL || DRIVER(drive)->busy) {
-                spin_unlock_irqrestore(&ide_lock, flags);
-                up(&ide_setting_sem);
-                return 1;
-        }
 #ifdef CONFIG_PROC_FS
-        ide_remove_proc_entries(drive->proc, DRIVER(drive)->proc);
+        ide_remove_proc_entries(drive->proc, driver->proc);
 #endif
         auto_remove_settings(drive);
-        drive->driver = NULL;
         spin_unlock_irqrestore(&ide_lock, flags);
         up(&ide_setting_sem);
-        spin_lock(&drives_lock);
-        list_del_init(&drive->list);
-        spin_unlock(&drives_lock);
-        /* drive will be added to &ide_drives in ata_attach() */
-        return 0;
 }
 
 EXPORT_SYMBOL(ide_unregister_subdriver);
 
-static int ide_drive_remove(struct device * dev)
-{
-        ide_drive_t * drive = container_of(dev,ide_drive_t,gendev);
-        DRIVER(drive)->cleanup(drive);
-        return 0;
-}
-
-/**
- *      ide_register_driver     -       register IDE device driver
- *      @driver: the IDE device driver
- *
- *      Register a new device driver and then scan the devices
- *      on the IDE bus in case any should be attached to the
- *      driver we have just registered.  If so attach them.
- *
- *      Takes drivers_lock and drives_lock.
- */
-
-int ide_register_driver(ide_driver_t *driver)
-{
-        struct list_head list;
-        struct list_head *list_loop;
-        struct list_head *tmp_storage;
-
-        spin_lock(&drivers_lock);
-        list_add(&driver->drivers, &drivers);
-        spin_unlock(&drivers_lock);
-
-        INIT_LIST_HEAD(&list);
-        spin_lock(&drives_lock);
-        list_splice_init(&ide_drives, &list);
-        spin_unlock(&drives_lock);
-
-        list_for_each_safe(list_loop, tmp_storage, &list) {
-                ide_drive_t *drive = container_of(list_loop, ide_drive_t, list);
-                list_del_init(&drive->list);
-                if (drive->present)
-                        ata_attach(drive);
-        }
-        driver->gen_driver.name = (char *) driver->name;
-        driver->gen_driver.bus = &ide_bus_type;
-        driver->gen_driver.remove = ide_drive_remove;
-        return driver_register(&driver->gen_driver);
-}
-
-EXPORT_SYMBOL(ide_register_driver);
-
-/**
- *      ide_unregister_driver   -       unregister IDE device driver
- *      @driver: the IDE device driver
- *
- *      Called when a driver module is being unloaded. We reattach any
- *      devices to whatever driver claims them next (typically the default
- *      driver).
- *
- *      Takes drivers_lock and called functions will take ide_setting_sem.
- */
-
-void ide_unregister_driver(ide_driver_t *driver)
-{
-        ide_drive_t *drive;
-
-        spin_lock(&drivers_lock);
-        list_del(&driver->drivers);
-        spin_unlock(&drivers_lock);
-
-        driver_unregister(&driver->gen_driver);
-
-        while(!list_empty(&driver->drives)) {
-                drive = list_entry(driver->drives.next, ide_drive_t, list);
-                if (driver->cleanup(drive)) {
-                        printk(KERN_ERR "%s: cleanup_module() called while still busy\n", drive->name);
-                        BUG();
-                }
-                ata_attach(drive);
-        }
-}
-
-EXPORT_SYMBOL(ide_unregister_driver);
-
 /*
  * Probe module
  */
 
 EXPORT_SYMBOL(ide_lock);
 
+static int ide_bus_match(struct device *dev, struct device_driver *drv)
+{
+        return 1;
+}
+
 struct bus_type ide_bus_type = {
         .name           = "ide",
+        .match          = ide_bus_match,
         .suspend        = generic_ide_suspend,
         .resume         = generic_ide_resume,
 };
 
+EXPORT_SYMBOL_GPL(ide_bus_type);
+
 /*
  * This is gets invoked once during initialization, to set *everything* up
  */
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 47225e324356..4e0f13d1d060 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -72,6 +72,7 @@ static struct amd_ide_chip {
         { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,  0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,        0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,        0x50, AMD_UDMA_133 },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,        0x50, AMD_UDMA_133 },
         { 0 }
 };
 
@@ -487,6 +488,7 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
         /* 12 */ DECLARE_NV_DEV("NFORCE3-250-SATA2"),
         /* 13 */ DECLARE_NV_DEV("NFORCE-CK804"),
         /* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"),
+        /* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"),
 };
 
 static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -521,6 +523,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = {
 #endif
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },
+        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 4651a22bf12e..af526b671c4e 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/blkdev.h>
-#include <linux/ioc4_common.h>
+#include <linux/ioc4.h>
 #include <asm/io.h>
 
 #include <linux/ide.h>
@@ -715,14 +715,34 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
 };
 
 int
-ioc4_ide_attach_one(struct pci_dev *dev, const struct pci_device_id *id)
+ioc4_ide_attach_one(struct ioc4_driver_data *idd)
 {
-        return pci_init_sgiioc4(dev, &sgiioc4_chipsets[id->driver_data]);
+        return pci_init_sgiioc4(idd->idd_pdev,
+                                &sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
 }
 
+static struct ioc4_submodule ioc4_ide_submodule = {
+        .is_name = "IOC4_ide",
+        .is_owner = THIS_MODULE,
+        .is_probe = ioc4_ide_attach_one,
+/*      .is_remove = ioc4_ide_remove_one,       */
+};
+
+static int __devinit
+ioc4_ide_init(void)
+{
+        return ioc4_register_submodule(&ioc4_ide_submodule);
+}
+
+static void __devexit
+ioc4_ide_exit(void)
+{
+        ioc4_unregister_submodule(&ioc4_ide_submodule);
+}
+
+module_init(ioc4_ide_init);
+module_exit(ioc4_ide_exit);
 
 MODULE_AUTHOR("Aniket Malatpure - Silicon Graphics Inc. (SGI)");
 MODULE_DESCRIPTION("IDE PCI driver module for SGI IOC4 Base-IO Card");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(ioc4_ide_attach_one);
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 68c7a5f07842..4538b0235ca3 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -2343,8 +2343,8 @@ static void dv1394_remove_host (struct hpsb_host *host)
                         dv1394_un_init(video);
         } while (video != NULL);
 
-        class_simple_device_remove(MKDEV(
-                IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
+        class_device_destroy(hpsb_protocol_class,
+                MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)));
         devfs_remove("ieee1394/dv/host%d/NTSC", id);
         devfs_remove("ieee1394/dv/host%d/PAL", id);
         devfs_remove("ieee1394/dv/host%d", id);
@@ -2361,7 +2361,7 @@ static void dv1394_add_host (struct hpsb_host *host)
 
         ohci = (struct ti_ohci *)host->hostdata;
 
-        class_simple_device_add(hpsb_protocol_class, MKDEV(
+        class_device_create(hpsb_protocol_class, MKDEV(
                 IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), 
                 NULL, "dv1394-%d", id);
         devfs_mk_dir("ieee1394/dv/host%d", id);
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index a294e45c77cd..2d9a9b74e687 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -67,7 +67,7 @@ MODULE_LICENSE("GPL");
 
 /* Some globals used */
 const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" };
-struct class_simple *hpsb_protocol_class;
+struct class *hpsb_protocol_class;
 
 #ifdef CONFIG_IEEE1394_VERBOSEDEBUG
 static void dump_packet(const char *text, quadlet_t *data, int size)
@@ -1121,7 +1121,7 @@ static int __init ieee1394_init(void)
         if (ret < 0)
                 goto release_all_bus;
 
-        hpsb_protocol_class = class_simple_create(THIS_MODULE, "ieee1394_protocol");
+        hpsb_protocol_class = class_create(THIS_MODULE, "ieee1394_protocol");
         if (IS_ERR(hpsb_protocol_class)) {
                 ret = PTR_ERR(hpsb_protocol_class);
                 goto release_class_host;
@@ -1159,7 +1159,7 @@ static int __init ieee1394_init(void)
 cleanup_csr:
         cleanup_csr();
 release_class_protocol:
-        class_simple_destroy(hpsb_protocol_class);
+        class_destroy(hpsb_protocol_class);
 release_class_host:
         class_unregister(&hpsb_host_class);
 release_all_bus:
@@ -1189,7 +1189,7 @@ static void __exit ieee1394_cleanup(void)
 
         cleanup_csr();
 
-        class_simple_destroy(hpsb_protocol_class);
+        class_destroy(hpsb_protocol_class);
         class_unregister(&hpsb_host_class);
         for (i = 0; fw_bus_attrs[i]; i++)
                 bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]);
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h
index c4b4408e2e05..73bd8efd2b6c 100644
--- a/drivers/ieee1394/ieee1394_core.h
+++ b/drivers/ieee1394/ieee1394_core.h
@@ -223,6 +223,7 @@ extern int hpsb_disable_irm;
 /* Our sysfs bus entry */
 extern struct bus_type ieee1394_bus_type;
 extern struct class hpsb_host_class;
-extern struct class_simple *hpsb_protocol_class;
+extern struct class *hpsb_protocol_class;
 
 #endif /* _IEEE1394_CORE_H */
+
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 83e66ed97ab5..32abb6dda888 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -220,7 +220,7 @@ struct device nodemgr_dev_template_host = {
 
 
 #define fw_attr(class, class_type, field, type, format_string)          \
-static ssize_t fw_show_##class##_##field (struct device *dev, char *buf)\
+static ssize_t fw_show_##class##_##field (struct device *dev, struct device_attribute *attr, char *buf)\
 {                                                                       \
         class_type *class;                                              \
         class = container_of(dev, class_type, device);                  \
@@ -232,7 +232,7 @@ static struct device_attribute dev_attr_##class##_##field = {		\
 };
 
 #define fw_attr_td(class, class_type, td_kv)                            \
-static ssize_t fw_show_##class##_##td_kv (struct device *dev, char *buf)\
+static ssize_t fw_show_##class##_##td_kv (struct device *dev, struct device_attribute *attr, char *buf)\
 {                                                                       \
         int len;                                                        \
         class_type *class = container_of(dev, class_type, device);      \
@@ -265,7 +265,7 @@ static struct driver_attribute driver_attr_drv_##field = {	\
 };
 
 
-static ssize_t fw_show_ne_bus_options(struct device *dev, char *buf)
+static ssize_t fw_show_ne_bus_options(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct node_entry *ne = container_of(dev, struct node_entry, device);
 
@@ -281,7 +281,7 @@ static ssize_t fw_show_ne_bus_options(struct device *dev, char *buf)
 static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL);
 
 
-static ssize_t fw_show_ne_tlabels_free(struct device *dev, char *buf)
+static ssize_t fw_show_ne_tlabels_free(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct node_entry *ne = container_of(dev, struct node_entry, device);
         return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1);
@@ -289,7 +289,7 @@ static ssize_t fw_show_ne_tlabels_free(struct device *dev, char *buf)
 static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL);
 
 
-static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, char *buf)
+static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct node_entry *ne = container_of(dev, struct node_entry, device);
         return sprintf(buf, "%u\n", ne->tpool->allocations);
@@ -297,7 +297,7 @@ static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, char *buf)
 static DEVICE_ATTR(tlabels_allocations,S_IRUGO,fw_show_ne_tlabels_allocations,NULL);
 
 
-static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf)
+static ssize_t fw_show_ne_tlabels_mask(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct node_entry *ne = container_of(dev, struct node_entry, device);
 #if (BITS_PER_LONG <= 32)
@@ -309,7 +309,7 @@ static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf)
 static DEVICE_ATTR(tlabels_mask, S_IRUGO, fw_show_ne_tlabels_mask, NULL);
 
 
-static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t count)
+static ssize_t fw_set_ignore_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct unit_directory *ud = container_of(dev, struct unit_directory, device);
         int state = simple_strtoul(buf, NULL, 10);
@@ -324,7 +324,7 @@ static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t
 
         return count;
 }
-static ssize_t fw_get_ignore_driver(struct device *dev, char *buf)
+static ssize_t fw_get_ignore_driver(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct unit_directory *ud = container_of(dev, struct unit_directory, device);
 
@@ -695,14 +695,15 @@ static void nodemgr_remove_ne(struct node_entry *ne)
         put_device(dev);
 }
 
+static int __nodemgr_remove_host_dev(struct device *dev, void *data)
+{
+        nodemgr_remove_ne(container_of(dev, struct node_entry, device));
+        return 0;
+}
 
 static void nodemgr_remove_host_dev(struct device *dev)
 {
-        struct device *ne_dev, *next;
-
-        list_for_each_entry_safe(ne_dev, next, &dev->children, node)
-                nodemgr_remove_ne(container_of(ne_dev, struct node_entry, device));
-
+        device_for_each_child(dev, NULL, __nodemgr_remove_host_dev);
         sysfs_remove_link(&dev->kobj, "irm_id");
         sysfs_remove_link(&dev->kobj, "busmgr_id");
         sysfs_remove_link(&dev->kobj, "host_id");
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 6a08a8982ea8..7419af450bd1 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2901,7 +2901,7 @@ static int __init init_raw1394(void)
 
         hpsb_register_highlevel(&raw1394_highlevel);
 
-        if (IS_ERR(class_simple_device_add(hpsb_protocol_class, MKDEV(
+        if (IS_ERR(class_device_create(hpsb_protocol_class, MKDEV(
                 IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), 
                 NULL, RAW1394_DEVICE_NAME))) {
                 ret = -EFAULT;
@@ -2934,8 +2934,8 @@ static int __init init_raw1394(void)
 
 out_dev:
         devfs_remove(RAW1394_DEVICE_NAME);
-        class_simple_device_remove(MKDEV(
-                IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+        class_device_destroy(hpsb_protocol_class,
+                MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
 out_unreg:
         hpsb_unregister_highlevel(&raw1394_highlevel);
 out:
@@ -2944,8 +2944,8 @@ out:
 
 static void __exit cleanup_raw1394(void)
 {
-        class_simple_device_remove(MKDEV(
-                IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
+        class_device_destroy(hpsb_protocol_class,
+                MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16));
         cdev_del(&raw1394_cdev);
         devfs_remove(RAW1394_DEVICE_NAME);
         hpsb_unregister_highlevel(&raw1394_highlevel);
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 00c7b958361a..32368f3428ec 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -745,7 +745,8 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
         list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids);
 
         /* Register our host with the SCSI stack. */
-        scsi_host = scsi_host_alloc(&scsi_driver_template, 0);
+        scsi_host = scsi_host_alloc(&scsi_driver_template,
+                                    sizeof (unsigned long));
         if (!scsi_host) {
                 SBP2_ERR("failed to register scsi host");
                 goto failed_alloc;
@@ -1070,7 +1071,7 @@ static int sbp2_handle_physdma_read(struct hpsb_host *host, int nodeid, quadlet_
 static __inline__ int sbp2_command_conversion_device_type(u8 device_type)
 {
         return (((device_type == TYPE_DISK) ||
-                 (device_type == TYPE_SDAD) ||
+                 (device_type == TYPE_RBC) ||
                  (device_type == TYPE_ROM)) ? 1:0);
 }
 
@@ -2111,102 +2112,6 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,
  */
 static void sbp2_check_sbp2_command(struct scsi_id_instance_data *scsi_id, unchar *cmd)
 {
-        unchar new_cmd[16];
-        u8 device_type = SBP2_DEVICE_TYPE (scsi_id->sbp2_device_type_and_lun);
-
-        SBP2_DEBUG("sbp2_check_sbp2_command");
-
-        switch (*cmd) {
-
-                case READ_6:
-
-                        if (sbp2_command_conversion_device_type(device_type)) {
-
-                                SBP2_DEBUG("Convert READ_6 to READ_10");
-
-                                /*
-                                 * Need to turn read_6 into read_10
-                                 */
-                                new_cmd[0] = 0x28;
-                                new_cmd[1] = (cmd[1] & 0xe0);
-                                new_cmd[2] = 0x0;
-                                new_cmd[3] = (cmd[1] & 0x1f);
-                                new_cmd[4] = cmd[2];
-                                new_cmd[5] = cmd[3];
-                                new_cmd[6] = 0x0;
-                                new_cmd[7] = 0x0;
-                                new_cmd[8] = cmd[4];
-                                new_cmd[9] = cmd[5];
-
-                                memcpy(cmd, new_cmd, 10);
-
-                        }
-
-                        break;
-
-                case WRITE_6:
-
-                        if (sbp2_command_conversion_device_type(device_type)) {
-
-                                SBP2_DEBUG("Convert WRITE_6 to WRITE_10");
-
-                                /*
-                                 * Need to turn write_6 into write_10
-                                 */
-                                new_cmd[0] = 0x2a;
-                                new_cmd[1] = (cmd[1] & 0xe0);
-                                new_cmd[2] = 0x0;
-                                new_cmd[3] = (cmd[1] & 0x1f);
-                                new_cmd[4] = cmd[2];
-                                new_cmd[5] = cmd[3];
-                                new_cmd[6] = 0x0;
-                                new_cmd[7] = 0x0;
-                                new_cmd[8] = cmd[4];
-                                new_cmd[9] = cmd[5];
-
-                                memcpy(cmd, new_cmd, 10);
-
-                        }
-
-                        break;
-
-                case MODE_SENSE:
-
-                        if (sbp2_command_conversion_device_type(device_type)) {
-
-                                SBP2_DEBUG("Convert MODE_SENSE_6 to MODE_SENSE_10");
-
-                                /*
-                                 * Need to turn mode_sense_6 into mode_sense_10
-                                 */
-                                new_cmd[0] = 0x5a;
-                                new_cmd[1] = cmd[1];
-                                new_cmd[2] = cmd[2];
-                                new_cmd[3] = 0x0;
-                                new_cmd[4] = 0x0;
-                                new_cmd[5] = 0x0;
-                                new_cmd[6] = 0x0;
-                                new_cmd[7] = 0x0;
-                                new_cmd[8] = cmd[4];
-                                new_cmd[9] = cmd[5];
-
-                                memcpy(cmd, new_cmd, 10);
-
-                        }
-
-                        break;
-
-                case MODE_SELECT:
-
-                        /*
-                         * TODO. Probably need to change mode select to 10 byte version
-                         */
-
-                default:
-                        break;
-        }
-
-        return;
 }
 
 /*
@@ -2247,7 +2152,6 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
                                      struct scsi_cmnd *SCpnt)
 {
         u8 *scsi_buf = SCpnt->request_buffer;
-        u8 device_type = SBP2_DEVICE_TYPE (scsi_id->sbp2_device_type_and_lun);
 
         SBP2_DEBUG("sbp2_check_sbp2_response");
 
@@ -2272,14 +2176,6 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
                         }
 
                         /*
-                         * Check for Simple Direct Access Device and change it to TYPE_DISK
-                         */
-                        if ((scsi_buf[0] & 0x1f) == TYPE_SDAD) {
-                                SBP2_DEBUG("Changing TYPE_SDAD to TYPE_DISK");
-                                scsi_buf[0] &= 0xe0;
-                        }
-
-                        /*
                          * Fix ansi revision and response data format
                          */
                         scsi_buf[2] |= 2;
@@ -2287,27 +2183,6 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
 
                         break;
 
-                case MODE_SENSE:
-
-                        if (sbp2_command_conversion_device_type(device_type)) {
-
-                                SBP2_DEBUG("Modify mode sense response (10 byte version)");
-
-                                scsi_buf[0] = scsi_buf[1];      /* Mode data length */
-                                scsi_buf[1] = scsi_buf[2];      /* Medium type */
-                                scsi_buf[2] = scsi_buf[3];      /* Device specific parameter */
-                                scsi_buf[3] = scsi_buf[7];      /* Block descriptor length */
-                                memcpy(scsi_buf + 4, scsi_buf + 8, scsi_buf[0]);
-                        }
-
-                        break;
-
-                case MODE_SELECT:
-
-                        /*
-                         * TODO. Probably need to change mode select to 10 byte version
-                         */
-
                 default:
                         break;
         }
@@ -2579,8 +2454,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
                                       u32 scsi_status, struct scsi_cmnd *SCpnt,
                                       void (*done)(struct scsi_cmnd *))
 {
-        unsigned long flags;
-
         SBP2_DEBUG("sbp2scsi_complete_command");
 
         /*
@@ -2679,18 +2552,15 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
         /*
          * Tell scsi stack that we're done with this command
          */
-        spin_lock_irqsave(scsi_id->scsi_host->host_lock,flags);
         done (SCpnt);
-        spin_unlock_irqrestore(scsi_id->scsi_host->host_lock,flags);
-
-        return;
 }
 
 
 static int sbp2scsi_slave_configure (struct scsi_device *sdev)
 {
         blk_queue_dma_alignment(sdev->request_queue, (512 - 1));
-
+        sdev->use_10_for_rw = 1;
+        sdev->use_10_for_ms = 1;
         return 0;
 }
 
@@ -2746,7 +2616,7 @@ static int sbp2scsi_abort(struct scsi_cmnd *SCpnt)
 /*
  * Called by scsi stack when something has really gone wrong.
  */
-static int sbp2scsi_reset(struct scsi_cmnd *SCpnt)
+static int __sbp2scsi_reset(struct scsi_cmnd *SCpnt)
 {
         struct scsi_id_instance_data *scsi_id =
                 (struct scsi_id_instance_data *)SCpnt->device->host->hostdata[0];
@@ -2761,12 +2631,24 @@ static int sbp2scsi_reset(struct scsi_cmnd *SCpnt)
         return(SUCCESS);
 }
 
+static int sbp2scsi_reset(struct scsi_cmnd *SCpnt)
+{
+        unsigned long flags;
+        int rc;
+
+        spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
+        rc = __sbp2scsi_reset(SCpnt);
+        spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
+
+        return rc;
+}
+
 static const char *sbp2scsi_info (struct Scsi_Host *host)
 {
         return "SCSI emulation for IEEE-1394 SBP-2 Devices";
 }
 
-static ssize_t sbp2_sysfs_ieee1394_id_show(struct device *dev, char *buf)
+static ssize_t sbp2_sysfs_ieee1394_id_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev;
         struct scsi_id_instance_data *scsi_id;
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index a84b039a05b9..cd425be74841 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -266,10 +266,6 @@ struct sbp2_status_block {
 #define SBP2_MAX_UDS_PER_NODE           16      /* Maximum scsi devices per node */
 #define SBP2_MAX_SECTORS                255     /* Max sectors supported */
 
-#ifndef TYPE_SDAD
-#define TYPE_SDAD                       0x0e    /* simplified direct access device */
-#endif
-
 /*
  * SCSI direction table...
  * (now used as a back-up in case the direction passed down from above is "unknown")
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index d68c4658f2fc..06759b36afea 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1370,7 +1370,7 @@ static void video1394_add_host (struct hpsb_host *host)
         hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id);
 
         minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id;
-        class_simple_device_add(hpsb_protocol_class, MKDEV(
+        class_device_create(hpsb_protocol_class, MKDEV(
                 IEEE1394_MAJOR, minor), 
                 NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
         devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, minor),
@@ -1384,7 +1384,7 @@ static void video1394_remove_host (struct hpsb_host *host)
         struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host);
 
         if (ohci) {
-                class_simple_device_remove(MKDEV(IEEE1394_MAJOR, 
+                class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR,
                         IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id));
                 devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id);
         }
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 3a413f72ff6d..90d51b179abe 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -40,9 +40,7 @@ struct ib_port {
         struct kobject         kobj;
         struct ib_device      *ibdev;
         struct attribute_group gid_group;
-        struct attribute     **gid_attr;
         struct attribute_group pkey_group;
-        struct attribute     **pkey_attr;
         u8                     port_num;
 };
 
@@ -60,8 +58,9 @@ struct port_attribute port_attr_##_name = __ATTR(_name, _mode, _show, _store)
 struct port_attribute port_attr_##_name = __ATTR_RO(_name)
 
 struct port_table_attribute {
-        struct port_attribute attr;
-        int                   index;
+        struct port_attribute   attr;
+        char                    name[8];
+        int                     index;
 };
 
 static ssize_t port_attr_show(struct kobject *kobj,
@@ -72,7 +71,7 @@ static ssize_t port_attr_show(struct kobject *kobj,
         struct ib_port *p = container_of(kobj, struct ib_port, kobj);
 
         if (!port_attr->show)
-                return 0;
+                return -EIO;
 
         return port_attr->show(p, port_attr, buf);
 }
@@ -398,17 +397,16 @@ static void ib_port_release(struct kobject *kobj)
         struct attribute *a;
         int i;
 
-        for (i = 0; (a = p->gid_attr[i]); ++i) {
-                kfree(a->name);
+        for (i = 0; (a = p->gid_group.attrs[i]); ++i)
                 kfree(a);
-        }
 
-        for (i = 0; (a = p->pkey_attr[i]); ++i) {
-                kfree(a->name);
+        kfree(p->gid_group.attrs);
+
+        for (i = 0; (a = p->pkey_group.attrs[i]); ++i)
                 kfree(a);
-        }
 
-        kfree(p->gid_attr);
+        kfree(p->pkey_group.attrs);
+
         kfree(p);
 }
 
@@ -449,58 +447,45 @@ static int ib_device_hotplug(struct class_device *cdev, char **envp,
         return 0;
 }
 
-static int alloc_group(struct attribute ***attr,
-                       ssize_t (*show)(struct ib_port *,
-                                       struct port_attribute *, char *buf),
-                       int len)
+static struct attribute **
+alloc_group_attrs(ssize_t (*show)(struct ib_port *,
+                                  struct port_attribute *, char *buf),
+                  int len)
 {
-        struct port_table_attribute ***tab_attr =
-                (struct port_table_attribute ***) attr;
+        struct attribute **tab_attr;
+        struct port_table_attribute *element;
         int i;
-        int ret;
-
-        *tab_attr = kmalloc((1 + len) * sizeof *tab_attr, GFP_KERNEL);
-        if (!*tab_attr)
-                return -ENOMEM;
 
-        memset(*tab_attr, 0, (1 + len) * sizeof *tab_attr);
+        tab_attr = kcalloc(1 + len, sizeof(struct attribute *), GFP_KERNEL);
+        if (!tab_attr)
+                return NULL;
 
-        for (i = 0; i < len; ++i) {
-                (*tab_attr)[i] = kmalloc(sizeof *(*tab_attr)[i], GFP_KERNEL);
-                if (!(*tab_attr)[i]) {
-                        ret = -ENOMEM;
+        for (i = 0; i < len; i++) {
+                element = kcalloc(1, sizeof(struct port_table_attribute),
+                                  GFP_KERNEL);
+                if (!element)
                         goto err;
-                }
-                memset((*tab_attr)[i], 0, sizeof *(*tab_attr)[i]);
-                (*tab_attr)[i]->attr.attr.name = kmalloc(8, GFP_KERNEL);
-                if (!(*tab_attr)[i]->attr.attr.name) {
-                        ret = -ENOMEM;
-                        goto err;
-                }
 
-                if (snprintf((*tab_attr)[i]->attr.attr.name, 8, "%d", i) >= 8) {
-                        ret = -ENOMEM;
+                if (snprintf(element->name, sizeof(element->name),
+                             "%d", i) >= sizeof(element->name))
                         goto err;
-                }
 
-                (*tab_attr)[i]->attr.attr.mode  = S_IRUGO;
-                (*tab_attr)[i]->attr.attr.owner = THIS_MODULE;
-                (*tab_attr)[i]->attr.show       = show;
-                (*tab_attr)[i]->index           = i;
-        }
-
-        return 0;
+                element->attr.attr.name  = element->name;
+                element->attr.attr.mode  = S_IRUGO;
+                element->attr.attr.owner = THIS_MODULE;
+                element->attr.show       = show;
+                element->index           = i;
 
-err:
-        for (i = 0; i < len; ++i) {
-                if ((*tab_attr)[i])
-                        kfree((*tab_attr)[i]->attr.attr.name);
-                kfree((*tab_attr)[i]);
+                tab_attr[i] = &element->attr.attr;
         }
 
-        kfree(*tab_attr);
+        return tab_attr;
 
-        return ret;
+err:
+        while (--i >= 0)
+                kfree(tab_attr[i]);
+        kfree(tab_attr);
+        return NULL;
 }
 
 static int add_port(struct ib_device *device, int port_num)
@@ -541,23 +526,20 @@ static int add_port(struct ib_device *device, int port_num)
         if (ret)
                 goto err_put;
 
-        ret = alloc_group(&p->gid_attr, show_port_gid, attr.gid_tbl_len);
-        if (ret)
-                goto err_remove_pma;
-
         p->gid_group.name  = "gids";
-        p->gid_group.attrs = p->gid_attr;
+        p->gid_group.attrs = alloc_group_attrs(show_port_gid, attr.gid_tbl_len);
+        if (!p->gid_group.attrs)
+                goto err_remove_pma;
 
         ret = sysfs_create_group(&p->kobj, &p->gid_group);
         if (ret)
                 goto err_free_gid;
 
-        ret = alloc_group(&p->pkey_attr, show_port_pkey, attr.pkey_tbl_len);
-        if (ret)
-                goto err_remove_gid;
-
         p->pkey_group.name  = "pkeys";
-        p->pkey_group.attrs = p->pkey_attr;
+        p->pkey_group.attrs = alloc_group_attrs(show_port_pkey,
+                                                attr.pkey_tbl_len);
+        if (!p->pkey_group.attrs)
+                goto err_remove_gid;
 
         ret = sysfs_create_group(&p->kobj, &p->pkey_group);
         if (ret)
@@ -568,23 +550,19 @@ static int add_port(struct ib_device *device, int port_num)
         return 0;
 
 err_free_pkey:
-        for (i = 0; i < attr.pkey_tbl_len; ++i) {
-                kfree(p->pkey_attr[i]->name);
-                kfree(p->pkey_attr[i]);
-        }
+        for (i = 0; i < attr.pkey_tbl_len; ++i)
+                kfree(p->pkey_group.attrs[i]);
 
-        kfree(p->pkey_attr);
+        kfree(p->pkey_group.attrs);
 
 err_remove_gid:
         sysfs_remove_group(&p->kobj, &p->gid_group);
 
 err_free_gid:
-        for (i = 0; i < attr.gid_tbl_len; ++i) {
-                kfree(p->gid_attr[i]->name);
-                kfree(p->gid_attr[i]);
-        }
+        for (i = 0; i < attr.gid_tbl_len; ++i)
+                kfree(p->gid_group.attrs[i]);
 
-        kfree(p->gid_attr);
+        kfree(p->gid_group.attrs);
 
 err_remove_pma:
         sysfs_remove_group(&p->kobj, &pma_group);
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 17552a29978b..556264b43425 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -431,9 +431,9 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct
 
         devfs_mk_cdev(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/event%d", minor);
-        class_simple_device_add(input_class,
-                                MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
-                                dev->dev, "event%d", minor);
+        class_device_create(input_class,
+                        MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),
+                        dev->dev, "event%d", minor);
 
         return &evdev->handle;
 }
@@ -443,7 +443,8 @@ static void evdev_disconnect(struct input_handle *handle)
         struct evdev *evdev = handle->private;
         struct evdev_list *list;
 
-        class_simple_device_remove(MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
+        class_device_destroy(input_class,
+                        MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));
         devfs_remove("input/event%d", evdev->minor);
         evdev->exist = 0;
 
diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index 6282f460aba0..1d93f5092904 100644
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -68,23 +68,3 @@ config GAMEPORT_CS461X
         depends on PCI
 
 endif
-
-# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on
-# in every .config. Please don't touch it. It is here to handle an
-# unusual dependency between GAMEPORT and sound drivers.
-#
-# Some sound drivers call gameport functions. If GAMEPORT is
-# not selected, empty stubs are provided for the functions and all is
-# well.
-# If GAMEPORT is built in, everything is fine.
-# If GAMEPORT is a module, however, it would need to be loaded for the
-# sound driver to be able to link properly. Therefore, the sound
-# driver must be a module as well in that case. Since there's no way
-# to express that directly in Kconfig, we use SOUND_GAMEPORT to
-# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm',
-# anything that depends on SOUND_GAMEPORT must be 'm' as well. if
-# GAMEPORT is 'y' or 'n', it can be anything".
-config SOUND_GAMEPORT
-        tristate
-        default m if GAMEPORT=m
-        default y
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index f20c3f23388b..e152d0fa0cdd 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -134,7 +134,7 @@ static int gameport_measure_speed(struct gameport *gameport)
         }
 
         gameport_close(gameport);
-        return (cpu_data[_smp_processor_id()].loops_per_jiffy * (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
+        return (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
 
 #else
 
@@ -453,13 +453,13 @@ static int gameport_thread(void *nothing)
  * Gameport port operations
  */
 
-static ssize_t gameport_show_description(struct device *dev, char *buf)
+static ssize_t gameport_show_description(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct gameport *gameport = to_gameport_port(dev);
         return sprintf(buf, "%s\n", gameport->name);
 }
 
-static ssize_t gameport_rebind_driver(struct device *dev, const char *buf, size_t count)
+static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct gameport *gameport = to_gameport_port(dev);
         struct device_driver *drv;
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 3385dd03abfc..83c77c990dda 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -702,13 +702,13 @@ static int __init input_proc_init(void)
 static inline int input_proc_init(void) { return 0; }
 #endif
 
-struct class_simple *input_class;
+struct class *input_class;
 
 static int __init input_init(void)
 {
         int retval = -ENOMEM;
 
-        input_class = class_simple_create(THIS_MODULE, "input");
+        input_class = class_create(THIS_MODULE, "input");
         if (IS_ERR(input_class))
                 return PTR_ERR(input_class);
         input_proc_init();
@@ -718,7 +718,7 @@ static int __init input_init(void)
                 remove_proc_entry("devices", proc_bus_input_dir);
                 remove_proc_entry("handlers", proc_bus_input_dir);
                 remove_proc_entry("input", proc_bus);
-                class_simple_destroy(input_class);
+                class_destroy(input_class);
                 return retval;
         }
 
@@ -728,7 +728,7 @@ static int __init input_init(void)
                 remove_proc_entry("handlers", proc_bus_input_dir);
                 remove_proc_entry("input", proc_bus);
                 unregister_chrdev(INPUT_MAJOR, "input");
-                class_simple_destroy(input_class);
+                class_destroy(input_class);
         }
         return retval;
 }
@@ -741,7 +741,7 @@ static void __exit input_exit(void)
 
         devfs_remove("input");
         unregister_chrdev(INPUT_MAJOR, "input");
-        class_simple_destroy(input_class);
+        class_destroy(input_class);
 }
 
 subsys_initcall(input_init);
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 7d7527f8b02d..39775fc380c7 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -422,7 +422,7 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
                         joydev->nkey++;
                 }
 
-        for (i = 0; i < BTN_JOYSTICK - BTN_MISC + 1; i++)
+        for (i = 0; i < BTN_JOYSTICK - BTN_MISC; i++)
                 if (test_bit(i + BTN_MISC, dev->keybit)) {
                         joydev->keymap[i] = joydev->nkey;
                         joydev->keypam[joydev->nkey] = i + BTN_MISC;
@@ -452,9 +452,9 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
 
         devfs_mk_cdev(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/js%d", minor);
-        class_simple_device_add(input_class,
-                                MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
-                                dev->dev, "js%d", minor);
+        class_device_create(input_class,
+                        MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),
+                        dev->dev, "js%d", minor);
 
         return &joydev->handle;
 }
@@ -464,7 +464,7 @@ static void joydev_disconnect(struct input_handle *handle)
         struct joydev *joydev = handle->private;
         struct joydev_list *list;
 
-        class_simple_device_remove(MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
+        class_device_destroy(input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));
         devfs_remove("input/js%d", joydev->minor);
         joydev->exist = 0;
 
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 79c332f16fc7..82fad9a23ace 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -54,7 +54,7 @@ static int atkbd_softraw = 1;
 module_param_named(softraw, atkbd_softraw, bool, 0);
 MODULE_PARM_DESC(softraw, "Use software generated rawmode");
 
-static int atkbd_scroll = 1;
+static int atkbd_scroll = 0;
 module_param_named(scroll, atkbd_scroll, bool, 0);
 MODULE_PARM_DESC(scroll, "Enable scroll-wheel on MS Office and similar keyboards");
 
@@ -171,9 +171,9 @@ static struct {
         unsigned char set2;
 } atkbd_scroll_keys[] = {
         { ATKBD_SCR_1,     0xc5 },
-        { ATKBD_SCR_2,     0xa9 },
-        { ATKBD_SCR_4,     0xb6 },
-        { ATKBD_SCR_8,     0xa7 },
+        { ATKBD_SCR_2,     0x9d },
+        { ATKBD_SCR_4,     0xa4 },
+        { ATKBD_SCR_8,     0x9b },
         { ATKBD_SCR_CLICK, 0xe0 },
         { ATKBD_SCR_LEFT,  0xcb },
         { ATKBD_SCR_RIGHT, 0xd2 },
@@ -219,11 +219,11 @@ static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t
 #define ATKBD_DEFINE_ATTR(_name)                                                \
 static ssize_t atkbd_show_##_name(struct atkbd *, char *);                      \
 static ssize_t atkbd_set_##_name(struct atkbd *, const char *, size_t);         \
-static ssize_t atkbd_do_show_##_name(struct device *d, char *b)                 \
+static ssize_t atkbd_do_show_##_name(struct device *d, struct device_attribute *attr, char *b)                  \
 {                                                                               \
         return atkbd_attr_show_helper(d, b, atkbd_show_##_name);                \
 }                                                                               \
-static ssize_t atkbd_do_set_##_name(struct device *d, const char *b, size_t s)  \
+static ssize_t atkbd_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s)   \
 {                                                                               \
         return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name);               \
 }                                                                               \
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 42a9f7f6f8cb..7bf4be733e9a 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -352,7 +352,7 @@ static int alps_reconnect(struct psmouse *psmouse)
         if (alps_get_status(psmouse, param))
                 return -1;
 
-        if (param[0] & 0x04)
+        if (!(param[0] & 0x04))
                 alps_tap_mode(psmouse, 1);
 
         if (alps_absolute_mode(psmouse)) {
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index cd8509549eac..019034b21a0b 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -518,13 +518,16 @@ static int psmouse_probe(struct psmouse *psmouse)
 /*
  * First, we check if it's a mouse. It should send 0x00 or 0x03
  * in case of an IntelliMouse in 4-byte mode or 0x04 for IM Explorer.
+ * Sunrex K8561 IR Keyboard/Mouse reports 0xff on second and subsequent
+ * ID queries, probably due to a firmware bug.
  */
 
         param[0] = 0xa5;
         if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))
                 return -1;
 
-        if (param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04)
+        if (param[0] != 0x00 && param[0] != 0x03 &&
+            param[0] != 0x04 && param[0] != 0xff)
                 return -1;
 
 /*
@@ -972,7 +975,7 @@ static int psmouse_set_maxproto(const char *val, struct kernel_param *kp)
                 return -EINVAL;
 
         if (!strncmp(val, "any", 3)) {
-                *((unsigned int *)kp->arg) = -1UL;
+                *((unsigned int *)kp->arg) = -1U;
                 return 0;
         }
 
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index bda5b065d03c..79e17a0c4664 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -91,11 +91,11 @@ ssize_t psmouse_attr_set_helper(struct device *dev, const char *buf, size_t coun
 #define PSMOUSE_DEFINE_ATTR(_name)                                              \
 static ssize_t psmouse_attr_show_##_name(struct psmouse *, char *);             \
 static ssize_t psmouse_attr_set_##_name(struct psmouse *, const char *, size_t);\
-static ssize_t psmouse_do_show_##_name(struct device *d, char *b)               \
+static ssize_t psmouse_do_show_##_name(struct device *d, struct device_attribute *attr, char *b)                \
 {                                                                               \
         return psmouse_attr_show_helper(d, b, psmouse_attr_show_##_name);       \
 }                                                                               \
-static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s)\
+static ssize_t psmouse_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s)\
 {                                                                               \
         return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name);      \
 }                                                                               \
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 69832f8fb720..36c721227b68 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -143,39 +143,6 @@ static int synaptics_identify(struct psmouse *psmouse)
         return -1;
 }
 
-static void print_ident(struct synaptics_data *priv)
-{
-        printk(KERN_INFO "Synaptics Touchpad, model: %ld\n", SYN_ID_MODEL(priv->identity));
-        printk(KERN_INFO " Firmware: %ld.%ld\n", SYN_ID_MAJOR(priv->identity),
-               SYN_ID_MINOR(priv->identity));
-        if (SYN_MODEL_ROT180(priv->model_id))
-                printk(KERN_INFO " 180 degree mounted touchpad\n");
-        if (SYN_MODEL_PORTRAIT(priv->model_id))
-                printk(KERN_INFO " portrait touchpad\n");
-        printk(KERN_INFO " Sensor: %ld\n", SYN_MODEL_SENSOR(priv->model_id));
-        if (SYN_MODEL_NEWABS(priv->model_id))
-                printk(KERN_INFO " new absolute packet format\n");
-        if (SYN_MODEL_PEN(priv->model_id))
-                printk(KERN_INFO " pen detection\n");
-
-        if (SYN_CAP_EXTENDED(priv->capabilities)) {
-                printk(KERN_INFO " Touchpad has extended capability bits\n");
-                if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
-                        printk(KERN_INFO " -> %d multi-buttons, i.e. besides standard buttons\n",
-                               (int)(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)));
-                if (SYN_CAP_MIDDLE_BUTTON(priv->capabilities))
-                        printk(KERN_INFO " -> middle button\n");
-                if (SYN_CAP_FOUR_BUTTON(priv->capabilities))
-                        printk(KERN_INFO " -> four buttons\n");
-                if (SYN_CAP_MULTIFINGER(priv->capabilities))
-                        printk(KERN_INFO " -> multifinger detection\n");
-                if (SYN_CAP_PALMDETECT(priv->capabilities))
-                        printk(KERN_INFO " -> palm detection\n");
-                if (SYN_CAP_PASS_THROUGH(priv->capabilities))
-                        printk(KERN_INFO " -> pass-through port\n");
-        }
-}
-
 static int synaptics_query_hardware(struct psmouse *psmouse)
 {
         int retries = 0;
@@ -666,7 +633,11 @@ int synaptics_init(struct psmouse *psmouse)
 
         priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
 
-        print_ident(priv);
+        printk(KERN_INFO "Synaptics Touchpad, model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx\n",
+                SYN_ID_MODEL(priv->identity),
+                SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
+                priv->model_id, priv->capabilities, priv->ext_cap);
+
         set_input_params(&psmouse->dev, priv);
 
         psmouse->protocol_handler = synaptics_process_byte;
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 564974ce5793..062848ac7e6b 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -101,6 +101,7 @@ struct mousedev_list {
         unsigned char ready, buffer, bufsiz;
         unsigned char imexseq, impsseq;
         enum mousedev_emul mode;
+        unsigned long last_buttons;
 };
 
 #define MOUSEDEV_SEQ_LEN        6
@@ -224,7 +225,7 @@ static void mousedev_notify_readers(struct mousedev *mousedev, struct mousedev_h
                 spin_lock_irqsave(&list->packet_lock, flags);
 
                 p = &list->packets[list->head];
-                if (list->ready && p->buttons != packet->buttons) {
+                if (list->ready && p->buttons != mousedev->packet.buttons) {
                         unsigned int new_head = (list->head + 1) % PACKET_QUEUE_LEN;
                         if (new_head != list->tail) {
                                 p = &list->packets[list->head = new_head];
@@ -249,10 +250,13 @@ static void mousedev_notify_readers(struct mousedev *mousedev, struct mousedev_h
                 p->dz += packet->dz;
                 p->buttons = mousedev->packet.buttons;
 
-                list->ready = 1;
+                if (p->dx || p->dy || p->dz || p->buttons != list->last_buttons)
+                        list->ready = 1;
 
                 spin_unlock_irqrestore(&list->packet_lock, flags);
-                kill_fasync(&list->fasync, SIGIO, POLL_IN);
+
+                if (list->ready)
+                        kill_fasync(&list->fasync, SIGIO, POLL_IN);
         }
 
         wake_up_interruptible(&mousedev->wait);
@@ -477,9 +481,10 @@ static void mousedev_packet(struct mousedev_list *list, signed char *ps2_data)
         }
 
         if (!p->dx && !p->dy && !p->dz) {
-                if (list->tail == list->head)
+                if (list->tail == list->head) {
                         list->ready = 0;
-                else
+                        list->last_buttons = p->buttons;
+                } else
                         list->tail = (list->tail + 1) % PACKET_QUEUE_LEN;
         }
 
@@ -642,9 +647,9 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru
 
         devfs_mk_cdev(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/mouse%d", minor);
-        class_simple_device_add(input_class,
-                                MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
-                                dev->dev, "mouse%d", minor);
+        class_device_create(input_class,
+                        MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),
+                        dev->dev, "mouse%d", minor);
 
         return &mousedev->handle;
 }
@@ -654,7 +659,8 @@ static void mousedev_disconnect(struct input_handle *handle)
         struct mousedev *mousedev = handle->private;
         struct mousedev_list *list;
 
-        class_simple_device_remove(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
+        class_device_destroy(input_class,
+                        MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));
         devfs_remove("input/mouse%d", mousedev->minor);
         mousedev->exist = 0;
 
@@ -730,8 +736,8 @@ static int __init mousedev_init(void)
 
         devfs_mk_cdev(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX),
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/mice");
-        class_simple_device_add(input_class, MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX),
-                                NULL, "mice");
+        class_device_create(input_class,
+                        MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice");
 
 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
         if (!(psaux_registered = !misc_register(&psaux_mouse)))
@@ -750,7 +756,8 @@ static void __exit mousedev_exit(void)
                 misc_deregister(&psaux_mouse);
 #endif
         devfs_remove("input/mice");
-        class_simple_device_remove(MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));
+        class_device_destroy(input_class,
+                        MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));
         input_unregister_handler(&mousedev_handler);
 }
 
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index f64867808fea..0487ecbb8a49 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -88,9 +88,11 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
 };
 
 /*
- * Some Fujitsu notebooks are ahving trouble with touhcpads if
+ * Some Fujitsu notebooks are having trouble with touchpads if
  * active multiplexing mode is activated. Luckily they don't have
  * external PS/2 ports so we can safely disable it.
+ * ... apparently some Toshibas don't like MUX mode either and
+ * die horrible death on reboot.
  */
 static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
         {
@@ -115,12 +117,26 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                .ident = "Fujitsu Lifebook S6230",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"),
+                },
+        },
+        {
                 .ident = "Fujitsu T70H",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"),
                 },
         },
+        {
+                .ident = "Toshiba P10",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"),
+                },
+        },
         { }
 };
 
@@ -215,11 +231,15 @@ static struct pnp_driver i8042_pnp_aux_driver = {
 
 static void i8042_pnp_exit(void)
 {
-        if (i8042_pnp_kbd_registered)
+        if (i8042_pnp_kbd_registered) {
+                i8042_pnp_kbd_registered = 0;
                 pnp_unregister_driver(&i8042_pnp_kbd_driver);
+        }
 
-        if (i8042_pnp_aux_registered)
+        if (i8042_pnp_aux_registered) {
+                i8042_pnp_aux_registered = 0;
                 pnp_unregister_driver(&i8042_pnp_aux_driver);
+        }
 }
 
 static int i8042_pnp_init(void)
@@ -227,7 +247,7 @@ static int i8042_pnp_init(void)
         int result_kbd, result_aux;
 
         if (i8042_nopnp) {
-                printk("i8042: PNP detection disabled\n");
+                printk(KERN_INFO "i8042: PNP detection disabled\n");
                 return 0;
         }
 
@@ -241,7 +261,7 @@ static int i8042_pnp_init(void)
 #if defined(__ia64__)
                 return -ENODEV;
 #else
-                printk(KERN_WARNING "PNP: No PS/2 controller found. Probing ports directly.\n");
+                printk(KERN_INFO "PNP: No PS/2 controller found. Probing ports directly.\n");
                 return 0;
 #endif
         }
@@ -265,7 +285,7 @@ static int i8042_pnp_init(void)
                 i8042_pnp_kbd_irq = i8042_kbd_irq;
         }
 
-        if (result_aux > 0 && !i8042_pnp_aux_irq) {
+        if (!i8042_pnp_aux_irq) {
                 printk(KERN_WARNING "PNP: PS/2 controller doesn't have AUX irq; using default %#x\n", i8042_aux_irq);
                 i8042_pnp_aux_irq = i8042_aux_irq;
         }
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 8e63e464d361..5900de3c3f4f 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -698,6 +698,26 @@ static void i8042_timer_func(unsigned long data)
         i8042_interrupt(0, NULL, NULL);
 }
 
+static int i8042_ctl_test(void)
+{
+        unsigned char param;
+
+        if (!i8042_reset)
+                return 0;
+
+        if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
+                printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+                return -1;
+        }
+
+        if (param != I8042_RET_CTL_TEST) {
+                printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
+                         param, I8042_RET_CTL_TEST);
+                return -1;
+        }
+
+        return 0;
+}
 
 /*
  * i8042_controller init initializes the i8042 controller, and,
@@ -719,21 +739,8 @@ static int i8042_controller_init(void)
                 return -1;
         }
 
-        if (i8042_reset) {
-
-                unsigned char param;
-
-                if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-                        printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
-                        return -1;
-                }
-
-                if (param != I8042_RET_CTL_TEST) {
-                        printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
-                                 param, I8042_RET_CTL_TEST);
-                        return -1;
-                }
-        }
+        if (i8042_ctl_test())
+                return -1;
 
 /*
  * Save the CTR for restoral on unload / reboot.
@@ -802,15 +809,11 @@ static int i8042_controller_init(void)
  */
 static void i8042_controller_reset(void)
 {
-        unsigned char param;
-
 /*
  * Reset the controller if requested.
  */
 
-        if (i8042_reset)
-                if (i8042_command(&param, I8042_CMD_CTL_TEST))
-                        printk(KERN_ERR "i8042.c: i8042 controller reset timeout.\n");
+        i8042_ctl_test();
 
 /*
  * Disable MUX mode if present.
@@ -922,8 +925,11 @@ static int i8042_resume(struct device *dev, u32 level)
         if (level != RESUME_ENABLE)
                 return 0;
 
-        if (i8042_controller_init()) {
-                printk(KERN_ERR "i8042: resume failed\n");
+        if (i8042_ctl_test())
+                return -1;
+
+        if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+                printk(KERN_ERR "i8042: Can't write CTR\n");
                 return -1;
         }
 
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 0beacb77ee18..feab4970406e 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -358,31 +358,31 @@ static int serio_thread(void *nothing)
  * Serio port operations
  */
 
-static ssize_t serio_show_description(struct device *dev, char *buf)
+static ssize_t serio_show_description(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%s\n", serio->name);
 }
 
-static ssize_t serio_show_id_type(struct device *dev, char *buf)
+static ssize_t serio_show_id_type(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%02x\n", serio->id.type);
 }
 
-static ssize_t serio_show_id_proto(struct device *dev, char *buf)
+static ssize_t serio_show_id_proto(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%02x\n", serio->id.proto);
 }
 
-static ssize_t serio_show_id_id(struct device *dev, char *buf)
+static ssize_t serio_show_id_id(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%02x\n", serio->id.id);
 }
 
-static ssize_t serio_show_id_extra(struct device *dev, char *buf)
+static ssize_t serio_show_id_extra(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%02x\n", serio->id.extra);
@@ -406,7 +406,7 @@ static struct attribute_group serio_id_attr_group = {
         .attrs  = serio_device_id_attrs,
 };
 
-static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count)
+static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct serio *serio = to_serio_port(dev);
         struct device_driver *drv;
@@ -437,13 +437,13 @@ static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t c
         return retval;
 }
 
-static ssize_t serio_show_bind_mode(struct device *dev, char *buf)
+static ssize_t serio_show_bind_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct serio *serio = to_serio_port(dev);
         return sprintf(buf, "%s\n", serio->manual_bind ? "manual" : "auto");
 }
 
-static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t count)
+static ssize_t serio_set_bind_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct serio *serio = to_serio_port(dev);
         int retval;
diff --git a/drivers/input/touchscreen/gunze.c b/drivers/input/touchscreen/gunze.c
index c9d0a153671c..53a27e43dd23 100644
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
@@ -68,8 +68,7 @@ static void gunze_process_packet(struct gunze* gunze, struct pt_regs *regs)
 
         if (gunze->idx != GUNZE_MAX_LENGTH || gunze->data[5] != ',' ||
                 (gunze->data[0] != 'T' && gunze->data[0] != 'R')) {
-                gunze->data[10] = 0;
-                printk(KERN_WARNING "gunze.c: bad packet: >%s<\n", gunze->data);
+                printk(KERN_WARNING "gunze.c: bad packet: >%.*s<\n", GUNZE_MAX_LENGTH, gunze->data);
                 return;
         }
 
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index d0afba85720b..50c63a155156 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -414,9 +414,9 @@ static struct input_handle *tsdev_connect(struct input_handler *handler,
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/ts%d", minor);
         devfs_mk_cdev(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor + TSDEV_MINORS/2),
                         S_IFCHR|S_IRUGO|S_IWUSR, "input/tsraw%d", minor);
-        class_simple_device_add(input_class,
-                                MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
-                                dev->dev, "ts%d", minor);
+        class_device_create(input_class,
+                        MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),
+                        dev->dev, "ts%d", minor);
 
         return &tsdev->handle;
 }
@@ -426,7 +426,8 @@ static void tsdev_disconnect(struct input_handle *handle)
         struct tsdev *tsdev = handle->private;
         struct tsdev_list *list;
 
-        class_simple_device_remove(MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
+        class_device_destroy(input_class,
+                        MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));
         devfs_remove("input/ts%d", tsdev->minor);
         devfs_remove("input/tsraw%d", tsdev->minor);
         tsdev->exist = 0;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 12dee8e9fbbe..04fb606b5ddd 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL");
 
 /* -------- driver information -------------------------------------- */
 
-static struct class_simple *capi_class;
+static struct class *capi_class;
 
 static int capi_major = 68;             /* allocated */
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -1499,20 +1499,20 @@ static int __init capi_init(void)
                 return -EIO;
         }
 
-        capi_class = class_simple_create(THIS_MODULE, "capi");
+        capi_class = class_create(THIS_MODULE, "capi");
         if (IS_ERR(capi_class)) {
                 unregister_chrdev(capi_major, "capi20");
                 return PTR_ERR(capi_class);
         }
 
-        class_simple_device_add(capi_class, MKDEV(capi_major, 0), NULL, "capi");
+        class_device_create(capi_class, MKDEV(capi_major, 0), NULL, "capi");
         devfs_mk_cdev(MKDEV(capi_major, 0), S_IFCHR | S_IRUSR | S_IWUSR,
                         "isdn/capi20");
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
         if (capinc_tty_init() < 0) {
-                class_simple_device_remove(MKDEV(capi_major, 0));
-                class_simple_destroy(capi_class);
+                class_device_destroy(capi_class, MKDEV(capi_major, 0));
+                class_destroy(capi_class);
                 unregister_chrdev(capi_major, "capi20");
                 return -ENOMEM;
         }
@@ -1539,8 +1539,8 @@ static void __exit capi_exit(void)
 {
         proc_exit();
 
-        class_simple_device_remove(MKDEV(capi_major, 0));
-        class_simple_destroy(capi_class);
+        class_device_destroy(capi_class, MKDEV(capi_major, 0));
+        class_destroy(capi_class);
         unregister_chrdev(capi_major, "capi20");
         devfs_remove("isdn/capi20");
 
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 7297c77f99cf..493e2afa191c 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -77,7 +77,7 @@ static struct adb_driver *adb_driver_list[] = {
         NULL
 };
 
-static struct class_simple *adb_dev_class;
+static struct class *adb_dev_class;
 
 struct adb_driver *adb_controller;
 struct notifier_block *adb_client_list = NULL;
@@ -902,9 +902,8 @@ adbdev_init(void)
 
         devfs_mk_cdev(MKDEV(ADB_MAJOR, 0), S_IFCHR | S_IRUSR | S_IWUSR, "adb");
 
-        adb_dev_class = class_simple_create(THIS_MODULE, "adb");
-        if (IS_ERR(adb_dev_class)) {
+        adb_dev_class = class_create(THIS_MODULE, "adb");
+        if (IS_ERR(adb_dev_class))
                 return;
-        }
-        class_simple_device_add(adb_dev_class, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+        class_device_create(adb_dev_class, MKDEV(ADB_MAJOR, 0), NULL, "adb");
 }
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index d09308f30960..5ba190ce14a0 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -455,21 +455,22 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
  * pass around to the attribute functions, so we don't really have
  * choice but implement a bunch of them...
  *
+ * FIXME, it does now...
  */
 #define BUILD_SHOW_FUNC_INT(name, data)                         \
-static ssize_t show_##name(struct device *dev, char *buf)       \
+static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                               \
         return sprintf(buf, "%d\n", data);                      \
 }
 
 #define BUILD_SHOW_FUNC_STR(name, data)                         \
-static ssize_t show_##name(struct device *dev, char *buf)       \
+static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf)       \
 {                                                               \
         return sprintf(buf, "%s\n", data);                      \
 }
 
 #define BUILD_SHOW_FUNC_FAN(name, data)                         \
-static ssize_t show_##name(struct device *dev, char *buf)       \
+static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf)       \
 {                                                               \
         return sprintf(buf, "%d (%d rpm)\n",                    \
                 thermostat->last_speed[data],                   \
@@ -478,7 +479,7 @@ static ssize_t show_##name(struct device *dev, char *buf)       \
 }
 
 #define BUILD_STORE_FUNC_DEG(name, data)                        \
-static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
+static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \
 {                                                               \
         int val;                                                \
         int i;                                                  \
@@ -491,7 +492,7 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
 }
 
 #define BUILD_STORE_FUNC_INT(name, data)                        \
-static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
+static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \
 {                                                               \
         u32 val;                                                \
         val = simple_strtoul(buf, NULL, 10);                    \
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 82336a5a5474..feb4e2413858 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -685,7 +685,7 @@ static void fetch_cpu_pumps_minmax(void)
  * the input twice... I accept patches :)
  */
 #define BUILD_SHOW_FUNC_FIX(name, data)                         \
-static ssize_t show_##name(struct device *dev, char *buf)       \
+static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                               \
         ssize_t r;                                              \
         down(&driver_lock);                                     \
@@ -694,7 +694,7 @@ static ssize_t show_##name(struct device *dev, char *buf)	\
         return r;                                               \
 }
 #define BUILD_SHOW_FUNC_INT(name, data)                         \
-static ssize_t show_##name(struct device *dev, char *buf)       \
+static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                               \
         return sprintf(buf, "%d", data);                        \
 }
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index c153699d0f84..0bdb47f08c2a 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -107,13 +107,13 @@ print_temp( const char *s, int temp )
 }
 
 static ssize_t
-show_cpu_temperature( struct device *dev, char *buf )
+show_cpu_temperature( struct device *dev, struct device_attribute *attr, char *buf )
 {
         return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 );
 }
 
 static ssize_t
-show_case_temperature( struct device *dev, char *buf )
+show_case_temperature( struct device *dev, struct device_attribute *attr, char *buf )
 {
         return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 );
 }
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index e654aa5eecd4..b941ee220997 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2421,7 +2421,7 @@ pmac_wakeup_devices(void)
 
         /* Re-enable local CPU interrupts */
         local_irq_enable();
-        mdelay(100);
+        mdelay(10);
         preempt_enable();
 
         /* Re-enable clock spreading on some machines */
@@ -2549,7 +2549,9 @@ powerbook_sleep_Core99(void)
                 return ret;
         }
 
-        printk(KERN_DEBUG "HID1, before: %x\n", mfspr(SPRN_HID1));
+        /* Stop environment and ADB interrupts */
+        pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, 0);
+        pmu_wait_complete(&req);
 
         /* Tell PMU what events will wake us up */
         pmu_request(&req, NULL, 4, PMU_POWER_EVENTS, PMU_PWR_CLR_WAKEUP_EVENTS,
@@ -2591,6 +2593,9 @@ powerbook_sleep_Core99(void)
         /* Restore VIA */
         restore_via_state();
 
+        /* tweak LPJ before cpufreq is there */
+        loops_per_jiffy *= 2;
+
         /* Restore video */
         pmac_call_early_video_resume();
 
@@ -2611,7 +2616,8 @@ powerbook_sleep_Core99(void)
         pmu_request(&req, NULL, 2, PMU_SET_INTR_MASK, pmu_intr_mask);
         pmu_wait_complete(&req);
 
-        printk(KERN_DEBUG "HID1, after: %x\n", mfspr(SPRN_HID1));
+        /* Restore LPJ, cpufreq will adjust the cpu frequency */
+        loops_per_jiffy /= 2;
 
         pmac_wakeup_devices();
 
diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c
index ff9be67c2a15..09baa43b2599 100644
--- a/drivers/mca/mca-bus.c
+++ b/drivers/mca/mca-bus.c
@@ -69,7 +69,7 @@ struct bus_type mca_bus_type = {
 };
 EXPORT_SYMBOL (mca_bus_type);
 
-static ssize_t mca_show_pos_id(struct device *dev, char *buf)
+static ssize_t mca_show_pos_id(struct device *dev, struct device_attribute *attr, char *buf)
 {
         /* four digits, \n and trailing \0 */
         struct mca_device *mca_dev = to_mca_device(dev);
@@ -81,7 +81,7 @@ static ssize_t mca_show_pos_id(struct device *dev, char *buf)
                 len = sprintf(buf, "none\n");
         return len;
 }
-static ssize_t mca_show_pos(struct device *dev, char *buf)
+static ssize_t mca_show_pos(struct device *dev, struct device_attribute *attr, char *buf)
 {
         /* enough for 8 two byte hex chars plus space and new line */
         int j, len=0;
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 90de9c146a5f..d3efedf6a6ad 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -7,6 +7,7 @@ dm-mod-objs	:= dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \
 dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o
 dm-snapshot-objs := dm-snap.o dm-exception-store.o
 dm-mirror-objs  := dm-log.o dm-raid1.o
+md-mod-objs     := md.o bitmap.o
 raid6-objs      := raid6main.o raid6algos.o raid6recov.o raid6tables.o \
                    raid6int1.o raid6int2.o raid6int4.o \
                    raid6int8.o raid6int16.o raid6int32.o \
@@ -28,7 +29,7 @@ obj-$(CONFIG_MD_RAID5)		+= raid5.o xor.o
 obj-$(CONFIG_MD_RAID6)          += raid6.o xor.o
 obj-$(CONFIG_MD_MULTIPATH)      += multipath.o
 obj-$(CONFIG_MD_FAULTY)         += faulty.o
-obj-$(CONFIG_BLK_DEV_MD)        += md.o
+obj-$(CONFIG_BLK_DEV_MD)        += md-mod.o
 obj-$(CONFIG_BLK_DEV_DM)        += dm-mod.o
 obj-$(CONFIG_DM_CRYPT)          += dm-crypt.o
 obj-$(CONFIG_DM_MULTIPATH)      += dm-multipath.o dm-round-robin.o
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
new file mode 100644
index 000000000000..95980ad6b27b
--- /dev/null
+++ b/drivers/md/bitmap.c
@@ -0,0 +1,1586 @@
+/*
+ * bitmap.c two-level bitmap (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003
+ *
+ * bitmap_create  - sets up the bitmap structure
+ * bitmap_destroy - destroys the bitmap structure
+ *
+ * additions, Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.:
+ * - added disk storage for bitmap
+ * - changes to allow various bitmap chunk sizes
+ * - added bitmap daemon (to asynchronously clear bitmap bits from disk)
+ */
+
+/*
+ * Still to do:
+ *
+ * flush after percent set rather than just time based. (maybe both).
+ * wait if count gets too high, wake when it drops to half.
+ * allow bitmap to be mirrored with superblock (before or after...)
+ * allow hot-add to re-instate a current device.
+ * allow hot-add of bitmap after quiessing device
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/config.h>
+#include <linux/timer.h>
+#include <linux/sched.h>
+#include <linux/list.h>
+#include <linux/file.h>
+#include <linux/mount.h>
+#include <linux/buffer_head.h>
+#include <linux/raid/md.h>
+#include <linux/raid/bitmap.h>
+
+/* debug macros */
+
+#define DEBUG 0
+
+#if DEBUG
+/* these are for debugging purposes only! */
+
+/* define one and only one of these */
+#define INJECT_FAULTS_1 0 /* cause bitmap_alloc_page to fail always */
+#define INJECT_FAULTS_2 0 /* cause bitmap file to be kicked when first bit set*/
+#define INJECT_FAULTS_3 0 /* treat bitmap file as kicked at init time */
+#define INJECT_FAULTS_4 0 /* undef */
+#define INJECT_FAULTS_5 0 /* undef */
+#define INJECT_FAULTS_6 0
+
+/* if these are defined, the driver will fail! debug only */
+#define INJECT_FATAL_FAULT_1 0 /* fail kmalloc, causing bitmap_create to fail */
+#define INJECT_FATAL_FAULT_2 0 /* undef */
+#define INJECT_FATAL_FAULT_3 0 /* undef */
+#endif
+
+//#define DPRINTK PRINTK /* set this NULL to avoid verbose debug output */
+#define DPRINTK(x...) do { } while(0)
+
+#ifndef PRINTK
+#  if DEBUG > 0
+#    define PRINTK(x...) printk(KERN_DEBUG x)
+#  else
+#    define PRINTK(x...)
+#  endif
+#endif
+
+static inline char * bmname(struct bitmap *bitmap)
+{
+        return bitmap->mddev ? mdname(bitmap->mddev) : "mdX";
+}
+
+
+/*
+ * test if the bitmap is active
+ */
+int bitmap_active(struct bitmap *bitmap)
+{
+        unsigned long flags;
+        int res = 0;
+
+        if (!bitmap)
+                return res;
+        spin_lock_irqsave(&bitmap->lock, flags);
+        res = bitmap->flags & BITMAP_ACTIVE;
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+        return res;
+}
+
+#define WRITE_POOL_SIZE 256
+/* mempool for queueing pending writes on the bitmap file */
+static void *write_pool_alloc(unsigned int gfp_flags, void *data)
+{
+        return kmalloc(sizeof(struct page_list), gfp_flags);
+}
+
+static void write_pool_free(void *ptr, void *data)
+{
+        kfree(ptr);
+}
+
+/*
+ * just a placeholder - calls kmalloc for bitmap pages
+ */
+static unsigned char *bitmap_alloc_page(struct bitmap *bitmap)
+{
+        unsigned char *page;
+
+#if INJECT_FAULTS_1
+        page = NULL;
+#else
+        page = kmalloc(PAGE_SIZE, GFP_NOIO);
+#endif
+        if (!page)
+                printk("%s: bitmap_alloc_page FAILED\n", bmname(bitmap));
+        else
+                PRINTK("%s: bitmap_alloc_page: allocated page at %p\n",
+                        bmname(bitmap), page);
+        return page;
+}
+
+/*
+ * for now just a placeholder -- just calls kfree for bitmap pages
+ */
+static void bitmap_free_page(struct bitmap *bitmap, unsigned char *page)
+{
+        PRINTK("%s: bitmap_free_page: free page %p\n", bmname(bitmap), page);
+        kfree(page);
+}
+
+/*
+ * check a page and, if necessary, allocate it (or hijack it if the alloc fails)
+ *
+ * 1) check to see if this page is allocated, if it's not then try to alloc
+ * 2) if the alloc fails, set the page's hijacked flag so we'll use the
+ *    page pointer directly as a counter
+ *
+ * if we find our page, we increment the page's refcount so that it stays
+ * allocated while we're using it
+ */
+static int bitmap_checkpage(struct bitmap *bitmap, unsigned long page, int create)
+{
+        unsigned char *mappage;
+
+        if (page >= bitmap->pages) {
+                printk(KERN_ALERT
+                        "%s: invalid bitmap page request: %lu (> %lu)\n",
+                        bmname(bitmap), page, bitmap->pages-1);
+                return -EINVAL;
+        }
+
+
+        if (bitmap->bp[page].hijacked) /* it's hijacked, don't try to alloc */
+                return 0;
+
+        if (bitmap->bp[page].map) /* page is already allocated, just return */
+                return 0;
+
+        if (!create)
+                return -ENOENT;
+
+        spin_unlock_irq(&bitmap->lock);
+
+        /* this page has not been allocated yet */
+
+        if ((mappage = bitmap_alloc_page(bitmap)) == NULL) {
+                PRINTK("%s: bitmap map page allocation failed, hijacking\n",
+                        bmname(bitmap));
+                /* failed - set the hijacked flag so that we can use the
+                 * pointer as a counter */
+                spin_lock_irq(&bitmap->lock);
+                if (!bitmap->bp[page].map)
+                        bitmap->bp[page].hijacked = 1;
+                goto out;
+        }
+
+        /* got a page */
+
+        spin_lock_irq(&bitmap->lock);
+
+        /* recheck the page */
+
+        if (bitmap->bp[page].map || bitmap->bp[page].hijacked) {
+                /* somebody beat us to getting the page */
+                bitmap_free_page(bitmap, mappage);
+                return 0;
+        }
+
+        /* no page was in place and we have one, so install it */
+
+        memset(mappage, 0, PAGE_SIZE);
+        bitmap->bp[page].map = mappage;
+        bitmap->missing_pages--;
+out:
+        return 0;
+}
+
+
+/* if page is completely empty, put it back on the free list, or dealloc it */
+/* if page was hijacked, unmark the flag so it might get alloced next time */
+/* Note: lock should be held when calling this */
+static inline void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
+{
+        char *ptr;
+
+        if (bitmap->bp[page].count) /* page is still busy */
+                return;
+
+        /* page is no longer in use, it can be released */
+
+        if (bitmap->bp[page].hijacked) { /* page was hijacked, undo this now */
+                bitmap->bp[page].hijacked = 0;
+                bitmap->bp[page].map = NULL;
+                return;
+        }
+
+        /* normal case, free the page */
+
+#if 0
+/* actually ... let's not.  We will probably need the page again exactly when
+ * memory is tight and we are flusing to disk
+ */
+        return;
+#else
+        ptr = bitmap->bp[page].map;
+        bitmap->bp[page].map = NULL;
+        bitmap->missing_pages++;
+        bitmap_free_page(bitmap, ptr);
+        return;
+#endif
+}
+
+
+/*
+ * bitmap file handling - read and write the bitmap file and its superblock
+ */
+
+/* copy the pathname of a file to a buffer */
+char *file_path(struct file *file, char *buf, int count)
+{
+        struct dentry *d;
+        struct vfsmount *v;
+
+        if (!buf)
+                return NULL;
+
+        d = file->f_dentry;
+        v = file->f_vfsmnt;
+
+        buf = d_path(d, v, buf, count);
+
+        return IS_ERR(buf) ? NULL : buf;
+}
+
+/*
+ * basic page I/O operations
+ */
+
+/* IO operations when bitmap is stored near all superblocks */
+static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long index)
+{
+        /* choose a good rdev and read the page from there */
+
+        mdk_rdev_t *rdev;
+        struct list_head *tmp;
+        struct page *page = alloc_page(GFP_KERNEL);
+        sector_t target;
+
+        if (!page)
+                return ERR_PTR(-ENOMEM);
+        do {
+                ITERATE_RDEV(mddev, rdev, tmp)
+                        if (rdev->in_sync && !rdev->faulty)
+                                goto found;
+                return ERR_PTR(-EIO);
+
+        found:
+                target = (rdev->sb_offset << 1) + offset + index * (PAGE_SIZE/512);
+
+        } while (!sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ));
+
+        page->index = index;
+        return page;
+}
+
+static int write_sb_page(mddev_t *mddev, long offset, struct page *page, int wait)
+{
+        mdk_rdev_t *rdev;
+        struct list_head *tmp;
+
+        ITERATE_RDEV(mddev, rdev, tmp)
+                if (rdev->in_sync && !rdev->faulty)
+                        md_super_write(mddev, rdev,
+                                       (rdev->sb_offset<<1) + offset
+                                       + page->index * (PAGE_SIZE/512),
+                                       PAGE_SIZE,
+                                       page);
+
+        if (wait)
+                wait_event(mddev->sb_wait, atomic_read(&mddev->pending_writes)==0);
+        return 0;
+}
+
+/*
+ * write out a page to a file
+ */
+static int write_page(struct bitmap *bitmap, struct page *page, int wait)
+{
+        int ret = -ENOMEM;
+
+        if (bitmap->file == NULL)
+                return write_sb_page(bitmap->mddev, bitmap->offset, page, wait);
+
+        if (wait)
+                lock_page(page);
+        else {
+                if (TestSetPageLocked(page))
+                        return -EAGAIN; /* already locked */
+                if (PageWriteback(page)) {
+                        unlock_page(page);
+                        return -EAGAIN;
+                }
+        }
+
+        ret = page->mapping->a_ops->prepare_write(NULL, page, 0, PAGE_SIZE);
+        if (!ret)
+                ret = page->mapping->a_ops->commit_write(NULL, page, 0,
+                        PAGE_SIZE);
+        if (ret) {
+                unlock_page(page);
+                return ret;
+        }
+
+        set_page_dirty(page); /* force it to be written out */
+
+        if (!wait) {
+                /* add to list to be waited for by daemon */
+                struct page_list *item = mempool_alloc(bitmap->write_pool, GFP_NOIO);
+                item->page = page;
+                page_cache_get(page);
+                spin_lock(&bitmap->write_lock);
+                list_add(&item->list, &bitmap->complete_pages);
+                spin_unlock(&bitmap->write_lock);
+                md_wakeup_thread(bitmap->writeback_daemon);
+        }
+        return write_one_page(page, wait);
+}
+
+/* read a page from a file, pinning it into cache, and return bytes_read */
+static struct page *read_page(struct file *file, unsigned long index,
+                                        unsigned long *bytes_read)
+{
+        struct inode *inode = file->f_mapping->host;
+        struct page *page = NULL;
+        loff_t isize = i_size_read(inode);
+        unsigned long end_index = isize >> PAGE_CACHE_SHIFT;
+
+        PRINTK("read bitmap file (%dB @ %Lu)\n", (int)PAGE_CACHE_SIZE,
+                        (unsigned long long)index << PAGE_CACHE_SHIFT);
+
+        page = read_cache_page(inode->i_mapping, index,
+                        (filler_t *)inode->i_mapping->a_ops->readpage, file);
+        if (IS_ERR(page))
+                goto out;
+        wait_on_page_locked(page);
+        if (!PageUptodate(page) || PageError(page)) {
+                page_cache_release(page);
+                page = ERR_PTR(-EIO);
+                goto out;
+        }
+
+        if (index > end_index) /* we have read beyond EOF */
+                *bytes_read = 0;
+        else if (index == end_index) /* possible short read */
+                *bytes_read = isize & ~PAGE_CACHE_MASK;
+        else
+                *bytes_read = PAGE_CACHE_SIZE; /* got a full page */
+out:
+        if (IS_ERR(page))
+                printk(KERN_ALERT "md: bitmap read error: (%dB @ %Lu): %ld\n",
+                        (int)PAGE_CACHE_SIZE,
+                        (unsigned long long)index << PAGE_CACHE_SHIFT,
+                        PTR_ERR(page));
+        return page;
+}
+
+/*
+ * bitmap file superblock operations
+ */
+
+/* update the event counter and sync the superblock to disk */
+int bitmap_update_sb(struct bitmap *bitmap)
+{
+        bitmap_super_t *sb;
+        unsigned long flags;
+
+        if (!bitmap || !bitmap->mddev) /* no bitmap for this array */
+                return 0;
+        spin_lock_irqsave(&bitmap->lock, flags);
+        if (!bitmap->sb_page) { /* no superblock */
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+                return 0;
+        }
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+        sb = (bitmap_super_t *)kmap(bitmap->sb_page);
+        sb->events = cpu_to_le64(bitmap->mddev->events);
+        if (!bitmap->mddev->degraded)
+                sb->events_cleared = cpu_to_le64(bitmap->mddev->events);
+        kunmap(bitmap->sb_page);
+        return write_page(bitmap, bitmap->sb_page, 1);
+}
+
+/* print out the bitmap file superblock */
+void bitmap_print_sb(struct bitmap *bitmap)
+{
+        bitmap_super_t *sb;
+
+        if (!bitmap || !bitmap->sb_page)
+                return;
+        sb = (bitmap_super_t *)kmap(bitmap->sb_page);
+        printk(KERN_DEBUG "%s: bitmap file superblock:\n", bmname(bitmap));
+        printk(KERN_DEBUG "         magic: %08x\n", le32_to_cpu(sb->magic));
+        printk(KERN_DEBUG "       version: %d\n", le32_to_cpu(sb->version));
+        printk(KERN_DEBUG "          uuid: %08x.%08x.%08x.%08x\n",
+                                        *(__u32 *)(sb->uuid+0),
+                                        *(__u32 *)(sb->uuid+4),
+                                        *(__u32 *)(sb->uuid+8),
+                                        *(__u32 *)(sb->uuid+12));
+        printk(KERN_DEBUG "        events: %llu\n",
+                        (unsigned long long) le64_to_cpu(sb->events));
+        printk(KERN_DEBUG "events cleared: %llu\n",
+                        (unsigned long long) le64_to_cpu(sb->events_cleared));
+        printk(KERN_DEBUG "         state: %08x\n", le32_to_cpu(sb->state));
+        printk(KERN_DEBUG "     chunksize: %d B\n", le32_to_cpu(sb->chunksize));
+        printk(KERN_DEBUG "  daemon sleep: %ds\n", le32_to_cpu(sb->daemon_sleep));
+        printk(KERN_DEBUG "     sync size: %llu KB\n",
+                        (unsigned long long)le64_to_cpu(sb->sync_size)/2);
+        kunmap(bitmap->sb_page);
+}
+
+/* read the superblock from the bitmap file and initialize some bitmap fields */
+static int bitmap_read_sb(struct bitmap *bitmap)
+{
+        char *reason = NULL;
+        bitmap_super_t *sb;
+        unsigned long chunksize, daemon_sleep;
+        unsigned long bytes_read;
+        unsigned long long events;
+        int err = -EINVAL;
+
+        /* page 0 is the superblock, read it... */
+        if (bitmap->file)
+                bitmap->sb_page = read_page(bitmap->file, 0, &bytes_read);
+        else {
+                bitmap->sb_page = read_sb_page(bitmap->mddev, bitmap->offset, 0);
+                bytes_read = PAGE_SIZE;
+        }
+        if (IS_ERR(bitmap->sb_page)) {
+                err = PTR_ERR(bitmap->sb_page);
+                bitmap->sb_page = NULL;
+                return err;
+        }
+
+        sb = (bitmap_super_t *)kmap(bitmap->sb_page);
+
+        if (bytes_read < sizeof(*sb)) { /* short read */
+                printk(KERN_INFO "%s: bitmap file superblock truncated\n",
+                        bmname(bitmap));
+                err = -ENOSPC;
+                goto out;
+        }
+
+        chunksize = le32_to_cpu(sb->chunksize);
+        daemon_sleep = le32_to_cpu(sb->daemon_sleep);
+
+        /* verify that the bitmap-specific fields are valid */
+        if (sb->magic != cpu_to_le32(BITMAP_MAGIC))
+                reason = "bad magic";
+        else if (sb->version != cpu_to_le32(BITMAP_MAJOR))
+                reason = "unrecognized superblock version";
+        else if (chunksize < 512 || chunksize > (1024 * 1024 * 4))
+                reason = "bitmap chunksize out of range (512B - 4MB)";
+        else if ((1 << ffz(~chunksize)) != chunksize)
+                reason = "bitmap chunksize not a power of 2";
+        else if (daemon_sleep < 1 || daemon_sleep > 15)
+                reason = "daemon sleep period out of range";
+        if (reason) {
+                printk(KERN_INFO "%s: invalid bitmap file superblock: %s\n",
+                        bmname(bitmap), reason);
+                goto out;
+        }
+
+        /* keep the array size field of the bitmap superblock up to date */
+        sb->sync_size = cpu_to_le64(bitmap->mddev->resync_max_sectors);
+
+        if (!bitmap->mddev->persistent)
+                goto success;
+
+        /*
+         * if we have a persistent array superblock, compare the
+         * bitmap's UUID and event counter to the mddev's
+         */
+        if (memcmp(sb->uuid, bitmap->mddev->uuid, 16)) {
+                printk(KERN_INFO "%s: bitmap superblock UUID mismatch\n",
+                        bmname(bitmap));
+                goto out;
+        }
+        events = le64_to_cpu(sb->events);
+        if (events < bitmap->mddev->events) {
+                printk(KERN_INFO "%s: bitmap file is out of date (%llu < %llu) "
+                        "-- forcing full recovery\n", bmname(bitmap), events,
+                        (unsigned long long) bitmap->mddev->events);
+                sb->state |= BITMAP_STALE;
+        }
+success:
+        /* assign fields using values from superblock */
+        bitmap->chunksize = chunksize;
+        bitmap->daemon_sleep = daemon_sleep;
+        bitmap->flags |= sb->state;
+        bitmap->events_cleared = le64_to_cpu(sb->events_cleared);
+        err = 0;
+out:
+        kunmap(bitmap->sb_page);
+        if (err)
+                bitmap_print_sb(bitmap);
+        return err;
+}
+
+enum bitmap_mask_op {
+        MASK_SET,
+        MASK_UNSET
+};
+
+/* record the state of the bitmap in the superblock */
+static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,
+                                enum bitmap_mask_op op)
+{
+        bitmap_super_t *sb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        if (!bitmap || !bitmap->sb_page) { /* can't set the state */
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+                return;
+        }
+        page_cache_get(bitmap->sb_page);
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+        sb = (bitmap_super_t *)kmap(bitmap->sb_page);
+        switch (op) {
+                case MASK_SET: sb->state |= bits;
+                                break;
+                case MASK_UNSET: sb->state &= ~bits;
+                                break;
+                default: BUG();
+        }
+        kunmap(bitmap->sb_page);
+        page_cache_release(bitmap->sb_page);
+}
+
+/*
+ * general bitmap file operations
+ */
+
+/* calculate the index of the page that contains this bit */
+static inline unsigned long file_page_index(unsigned long chunk)
+{
+        return CHUNK_BIT_OFFSET(chunk) >> PAGE_BIT_SHIFT;
+}
+
+/* calculate the (bit) offset of this bit within a page */
+static inline unsigned long file_page_offset(unsigned long chunk)
+{
+        return CHUNK_BIT_OFFSET(chunk) & (PAGE_BITS - 1);
+}
+
+/*
+ * return a pointer to the page in the filemap that contains the given bit
+ *
+ * this lookup is complicated by the fact that the bitmap sb might be exactly
+ * 1 page (e.g., x86) or less than 1 page -- so the bitmap might start on page
+ * 0 or page 1
+ */
+static inline struct page *filemap_get_page(struct bitmap *bitmap,
+                                        unsigned long chunk)
+{
+        return bitmap->filemap[file_page_index(chunk) - file_page_index(0)];
+}
+
+
+static void bitmap_file_unmap(struct bitmap *bitmap)
+{
+        struct page **map, *sb_page;
+        unsigned long *attr;
+        int pages;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        map = bitmap->filemap;
+        bitmap->filemap = NULL;
+        attr = bitmap->filemap_attr;
+        bitmap->filemap_attr = NULL;
+        pages = bitmap->file_pages;
+        bitmap->file_pages = 0;
+        sb_page = bitmap->sb_page;
+        bitmap->sb_page = NULL;
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+
+        while (pages--)
+                if (map[pages]->index != 0) /* 0 is sb_page, release it below */
+                        page_cache_release(map[pages]);
+        kfree(map);
+        kfree(attr);
+
+        if (sb_page)
+                page_cache_release(sb_page);
+}
+
+static void bitmap_stop_daemons(struct bitmap *bitmap);
+
+/* dequeue the next item in a page list -- don't call from irq context */
+static struct page_list *dequeue_page(struct bitmap *bitmap)
+{
+        struct page_list *item = NULL;
+        struct list_head *head = &bitmap->complete_pages;
+
+        spin_lock(&bitmap->write_lock);
+        if (list_empty(head))
+                goto out;
+        item = list_entry(head->prev, struct page_list, list);
+        list_del(head->prev);
+out:
+        spin_unlock(&bitmap->write_lock);
+        return item;
+}
+
+static void drain_write_queues(struct bitmap *bitmap)
+{
+        struct page_list *item;
+
+        while ((item = dequeue_page(bitmap))) {
+                /* don't bother to wait */
+                page_cache_release(item->page);
+                mempool_free(item, bitmap->write_pool);
+        }
+
+        wake_up(&bitmap->write_wait);
+}
+
+static void bitmap_file_put(struct bitmap *bitmap)
+{
+        struct file *file;
+        struct inode *inode;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        file = bitmap->file;
+        bitmap->file = NULL;
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+
+        bitmap_stop_daemons(bitmap);
+
+        drain_write_queues(bitmap);
+
+        bitmap_file_unmap(bitmap);
+
+        if (file) {
+                inode = file->f_mapping->host;
+                spin_lock(&inode->i_lock);
+                atomic_set(&inode->i_writecount, 1); /* allow writes again */
+                spin_unlock(&inode->i_lock);
+                fput(file);
+        }
+}
+
+
+/*
+ * bitmap_file_kick - if an error occurs while manipulating the bitmap file
+ * then it is no longer reliable, so we stop using it and we mark the file
+ * as failed in the superblock
+ */
+static void bitmap_file_kick(struct bitmap *bitmap)
+{
+        char *path, *ptr = NULL;
+
+        bitmap_mask_state(bitmap, BITMAP_STALE, MASK_SET);
+        bitmap_update_sb(bitmap);
+
+        if (bitmap->file) {
+                path = kmalloc(PAGE_SIZE, GFP_KERNEL);
+                if (path)
+                        ptr = file_path(bitmap->file, path, PAGE_SIZE);
+
+                printk(KERN_ALERT "%s: kicking failed bitmap file %s from array!\n",
+                       bmname(bitmap), ptr ? ptr : "");
+
+                kfree(path);
+        }
+
+        bitmap_file_put(bitmap);
+
+        return;
+}
+
+enum bitmap_page_attr {
+        BITMAP_PAGE_DIRTY = 1, // there are set bits that need to be synced
+        BITMAP_PAGE_CLEAN = 2, // there are bits that might need to be cleared
+        BITMAP_PAGE_NEEDWRITE=4, // there are cleared bits that need to be synced
+};
+
+static inline void set_page_attr(struct bitmap *bitmap, struct page *page,
+                                enum bitmap_page_attr attr)
+{
+        bitmap->filemap_attr[page->index] |= attr;
+}
+
+static inline void clear_page_attr(struct bitmap *bitmap, struct page *page,
+                                enum bitmap_page_attr attr)
+{
+        bitmap->filemap_attr[page->index] &= ~attr;
+}
+
+static inline unsigned long get_page_attr(struct bitmap *bitmap, struct page *page)
+{
+        return bitmap->filemap_attr[page->index];
+}
+
+/*
+ * bitmap_file_set_bit -- called before performing a write to the md device
+ * to set (and eventually sync) a particular bit in the bitmap file
+ *
+ * we set the bit immediately, then we record the page number so that
+ * when an unplug occurs, we can flush the dirty pages out to disk
+ */
+static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)
+{
+        unsigned long bit;
+        struct page *page;
+        void *kaddr;
+        unsigned long chunk = block >> CHUNK_BLOCK_SHIFT(bitmap);
+
+        if (!bitmap->filemap) {
+                return;
+        }
+
+        page = filemap_get_page(bitmap, chunk);
+        bit = file_page_offset(chunk);
+
+
+        /* make sure the page stays cached until it gets written out */
+        if (! (get_page_attr(bitmap, page) & BITMAP_PAGE_DIRTY))
+                page_cache_get(page);
+
+        /* set the bit */
+        kaddr = kmap_atomic(page, KM_USER0);
+        set_bit(bit, kaddr);
+        kunmap_atomic(kaddr, KM_USER0);
+        PRINTK("set file bit %lu page %lu\n", bit, page->index);
+
+        /* record page number so it gets flushed to disk when unplug occurs */
+        set_page_attr(bitmap, page, BITMAP_PAGE_DIRTY);
+
+}
+
+/* this gets called when the md device is ready to unplug its underlying
+ * (slave) device queues -- before we let any writes go down, we need to
+ * sync the dirty pages of the bitmap file to disk */
+int bitmap_unplug(struct bitmap *bitmap)
+{
+        unsigned long i, attr, flags;
+        struct page *page;
+        int wait = 0;
+        int err;
+
+        if (!bitmap)
+                return 0;
+
+        /* look at each page to see if there are any set bits that need to be
+         * flushed out to disk */
+        for (i = 0; i < bitmap->file_pages; i++) {
+                spin_lock_irqsave(&bitmap->lock, flags);
+                if (!bitmap->filemap) {
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                        return 0;
+                }
+                page = bitmap->filemap[i];
+                attr = get_page_attr(bitmap, page);
+                clear_page_attr(bitmap, page, BITMAP_PAGE_DIRTY);
+                clear_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);
+                if ((attr & BITMAP_PAGE_DIRTY))
+                        wait = 1;
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+
+                if (attr & (BITMAP_PAGE_DIRTY | BITMAP_PAGE_NEEDWRITE)) {
+                        err = write_page(bitmap, page, 0);
+                        if (err == -EAGAIN) {
+                                if (attr & BITMAP_PAGE_DIRTY)
+                                        err = write_page(bitmap, page, 1);
+                                else
+                                        err = 0;
+                        }
+                        if (err)
+                                return 1;
+                }
+        }
+        if (wait) { /* if any writes were performed, we need to wait on them */
+                if (bitmap->file) {
+                        spin_lock_irq(&bitmap->write_lock);
+                        wait_event_lock_irq(bitmap->write_wait,
+                                            list_empty(&bitmap->complete_pages), bitmap->write_lock,
+                                            wake_up_process(bitmap->writeback_daemon->tsk));
+                        spin_unlock_irq(&bitmap->write_lock);
+                } else
+                        wait_event(bitmap->mddev->sb_wait,
+                                   atomic_read(&bitmap->mddev->pending_writes)==0);
+        }
+        return 0;
+}
+
+static void bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset,
+        unsigned long sectors, int in_sync);
+/* * bitmap_init_from_disk -- called at bitmap_create time to initialize
+ * the in-memory bitmap from the on-disk bitmap -- also, sets up the
+ * memory mapping of the bitmap file
+ * Special cases:
+ *   if there's no bitmap file, or if the bitmap file had been
+ *   previously kicked from the array, we mark all the bits as
+ *   1's in order to cause a full resync.
+ */
+static int bitmap_init_from_disk(struct bitmap *bitmap, int in_sync)
+{
+        unsigned long i, chunks, index, oldindex, bit;
+        struct page *page = NULL, *oldpage = NULL;
+        unsigned long num_pages, bit_cnt = 0;
+        struct file *file;
+        unsigned long bytes, offset, dummy;
+        int outofdate;
+        int ret = -ENOSPC;
+
+        chunks = bitmap->chunks;
+        file = bitmap->file;
+
+        BUG_ON(!file && !bitmap->offset);
+
+#if INJECT_FAULTS_3
+        outofdate = 1;
+#else
+        outofdate = bitmap->flags & BITMAP_STALE;
+#endif
+        if (outofdate)
+                printk(KERN_INFO "%s: bitmap file is out of date, doing full "
+                        "recovery\n", bmname(bitmap));
+
+        bytes = (chunks + 7) / 8;
+
+        num_pages = (bytes + sizeof(bitmap_super_t) + PAGE_SIZE - 1) / PAGE_SIZE;
+
+        if (file && i_size_read(file->f_mapping->host) < bytes + sizeof(bitmap_super_t)) {
+                printk(KERN_INFO "%s: bitmap file too short %lu < %lu\n",
+                        bmname(bitmap),
+                        (unsigned long) i_size_read(file->f_mapping->host),
+                        bytes + sizeof(bitmap_super_t));
+                goto out;
+        }
+
+        ret = -ENOMEM;
+
+        bitmap->filemap = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL);
+        if (!bitmap->filemap)
+                goto out;
+
+        bitmap->filemap_attr = kmalloc(sizeof(long) * num_pages, GFP_KERNEL);
+        if (!bitmap->filemap_attr)
+                goto out;
+
+        memset(bitmap->filemap_attr, 0, sizeof(long) * num_pages);
+
+        oldindex = ~0L;
+
+        for (i = 0; i < chunks; i++) {
+                index = file_page_index(i);
+                bit = file_page_offset(i);
+                if (index != oldindex) { /* this is a new page, read it in */
+                        /* unmap the old page, we're done with it */
+                        if (oldpage != NULL)
+                                kunmap(oldpage);
+                        if (index == 0) {
+                                /*
+                                 * if we're here then the superblock page
+                                 * contains some bits (PAGE_SIZE != sizeof sb)
+                                 * we've already read it in, so just use it
+                                 */
+                                page = bitmap->sb_page;
+                                offset = sizeof(bitmap_super_t);
+                        } else if (file) {
+                                page = read_page(file, index, &dummy);
+                                offset = 0;
+                        } else {
+                                page = read_sb_page(bitmap->mddev, bitmap->offset, index);
+                                offset = 0;
+                        }
+                        if (IS_ERR(page)) { /* read error */
+                                ret = PTR_ERR(page);
+                                goto out;
+                        }
+
+                        oldindex = index;
+                        oldpage = page;
+                        kmap(page);
+
+                        if (outofdate) {
+                                /*
+                                 * if bitmap is out of date, dirty the
+                                 * whole page and write it out
+                                 */
+                                memset(page_address(page) + offset, 0xff,
+                                        PAGE_SIZE - offset);
+                                ret = write_page(bitmap, page, 1);
+                                if (ret) {
+                                        kunmap(page);
+                                        /* release, page not in filemap yet */
+                                        page_cache_release(page);
+                                        goto out;
+                                }
+                        }
+
+                        bitmap->filemap[bitmap->file_pages++] = page;
+                }
+                if (test_bit(bit, page_address(page))) {
+                        /* if the disk bit is set, set the memory bit */
+                        bitmap_set_memory_bits(bitmap,
+                                        i << CHUNK_BLOCK_SHIFT(bitmap), 1, in_sync);
+                        bit_cnt++;
+                }
+        }
+
+        /* everything went OK */
+        ret = 0;
+        bitmap_mask_state(bitmap, BITMAP_STALE, MASK_UNSET);
+
+        if (page) /* unmap the last page */
+                kunmap(page);
+
+        if (bit_cnt) { /* Kick recovery if any bits were set */
+                set_bit(MD_RECOVERY_NEEDED, &bitmap->mddev->recovery);
+                md_wakeup_thread(bitmap->mddev->thread);
+        }
+
+out:
+        printk(KERN_INFO "%s: bitmap initialized from disk: "
+                "read %lu/%lu pages, set %lu bits, status: %d\n",
+                bmname(bitmap), bitmap->file_pages, num_pages, bit_cnt, ret);
+
+        return ret;
+}
+
+void bitmap_write_all(struct bitmap *bitmap)
+{
+        /* We don't actually write all bitmap blocks here,
+         * just flag them as needing to be written
+         */
+
+        unsigned long chunks = bitmap->chunks;
+        unsigned long bytes = (chunks+7)/8 + sizeof(bitmap_super_t);
+        unsigned long num_pages = (bytes + PAGE_SIZE-1) / PAGE_SIZE;
+        while (num_pages--)
+                bitmap->filemap_attr[num_pages] |= BITMAP_PAGE_NEEDWRITE;
+}
+
+
+static void bitmap_count_page(struct bitmap *bitmap, sector_t offset, int inc)
+{
+        sector_t chunk = offset >> CHUNK_BLOCK_SHIFT(bitmap);
+        unsigned long page = chunk >> PAGE_COUNTER_SHIFT;
+        bitmap->bp[page].count += inc;
+/*
+        if (page == 0) printk("count page 0, offset %llu: %d gives %d\n",
+                              (unsigned long long)offset, inc, bitmap->bp[page].count);
+*/
+        bitmap_checkfree(bitmap, page);
+}
+static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,
+                                            sector_t offset, int *blocks,
+                                            int create);
+
+/*
+ * bitmap daemon -- periodically wakes up to clean bits and flush pages
+ *                      out to disk
+ */
+
+int bitmap_daemon_work(struct bitmap *bitmap)
+{
+        unsigned long j;
+        unsigned long flags;
+        struct page *page = NULL, *lastpage = NULL;
+        int err = 0;
+        int blocks;
+        int attr;
+
+        if (bitmap == NULL)
+                return 0;
+        if (time_before(jiffies, bitmap->daemon_lastrun + bitmap->daemon_sleep*HZ))
+                return 0;
+        bitmap->daemon_lastrun = jiffies;
+
+        for (j = 0; j < bitmap->chunks; j++) {
+                bitmap_counter_t *bmc;
+                spin_lock_irqsave(&bitmap->lock, flags);
+                if (!bitmap->filemap) {
+                        /* error or shutdown */
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                        break;
+                }
+
+                page = filemap_get_page(bitmap, j);
+
+                if (page != lastpage) {
+                        /* skip this page unless it's marked as needing cleaning */
+                        if (!((attr=get_page_attr(bitmap, page)) & BITMAP_PAGE_CLEAN)) {
+                                if (attr & BITMAP_PAGE_NEEDWRITE) {
+                                        page_cache_get(page);
+                                        clear_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);
+                                }
+                                spin_unlock_irqrestore(&bitmap->lock, flags);
+                                if (attr & BITMAP_PAGE_NEEDWRITE) {
+                                        switch (write_page(bitmap, page, 0)) {
+                                        case -EAGAIN:
+                                                set_page_attr(bitmap, page, BITMAP_PAGE_NEEDWRITE);
+                                                break;
+                                        case 0:
+                                                break;
+                                        default:
+                                                bitmap_file_kick(bitmap);
+                                        }
+                                        page_cache_release(page);
+                                }
+                                continue;
+                        }
+
+                        /* grab the new page, sync and release the old */
+                        page_cache_get(page);
+                        if (lastpage != NULL) {
+                                if (get_page_attr(bitmap, lastpage) & BITMAP_PAGE_NEEDWRITE) {
+                                        clear_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                                        err = write_page(bitmap, lastpage, 0);
+                                        if (err == -EAGAIN) {
+                                                err = 0;
+                                                set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                                        }
+                                } else {
+                                        set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                                }
+                                kunmap(lastpage);
+                                page_cache_release(lastpage);
+                                if (err)
+                                        bitmap_file_kick(bitmap);
+                        } else
+                                spin_unlock_irqrestore(&bitmap->lock, flags);
+                        lastpage = page;
+                        kmap(page);
+/*
+                        printk("bitmap clean at page %lu\n", j);
+*/
+                        spin_lock_irqsave(&bitmap->lock, flags);
+                        clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);
+                }
+                bmc = bitmap_get_counter(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),
+                                        &blocks, 0);
+                if (bmc) {
+/*
+  if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc);
+*/
+                        if (*bmc == 2) {
+                                *bmc=1; /* maybe clear the bit next time */
+                                set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);
+                        } else if (*bmc == 1) {
+                                /* we can clear the bit */
+                                *bmc = 0;
+                                bitmap_count_page(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),
+                                                  -1);
+
+                                /* clear the bit */
+                                clear_bit(file_page_offset(j), page_address(page));
+                        }
+                }
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+        }
+
+        /* now sync the final page */
+        if (lastpage != NULL) {
+                kunmap(lastpage);
+                spin_lock_irqsave(&bitmap->lock, flags);
+                if (get_page_attr(bitmap, lastpage) &BITMAP_PAGE_NEEDWRITE) {
+                        clear_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                        err = write_page(bitmap, lastpage, 0);
+                        if (err == -EAGAIN) {
+                                set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                                err = 0;
+                        }
+                } else {
+                        set_page_attr(bitmap, lastpage, BITMAP_PAGE_NEEDWRITE);
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                }
+
+                page_cache_release(lastpage);
+        }
+
+        return err;
+}
+
+static void daemon_exit(struct bitmap *bitmap, mdk_thread_t **daemon)
+{
+        mdk_thread_t *dmn;
+        unsigned long flags;
+
+        /* if no one is waiting on us, we'll free the md thread struct
+         * and exit, otherwise we let the waiter clean things up */
+        spin_lock_irqsave(&bitmap->lock, flags);
+        if ((dmn = *daemon)) { /* no one is waiting, cleanup and exit */
+                *daemon = NULL;
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+                kfree(dmn);
+                complete_and_exit(NULL, 0); /* do_exit not exported */
+        }
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+}
+
+static void bitmap_writeback_daemon(mddev_t *mddev)
+{
+        struct bitmap *bitmap = mddev->bitmap;
+        struct page *page;
+        struct page_list *item;
+        int err = 0;
+
+        if (signal_pending(current)) {
+                printk(KERN_INFO
+                       "%s: bitmap writeback daemon got signal, exiting...\n",
+                       bmname(bitmap));
+                err = -EINTR;
+                goto out;
+        }
+
+        PRINTK("%s: bitmap writeback daemon woke up...\n", bmname(bitmap));
+        /* wait on bitmap page writebacks */
+        while ((item = dequeue_page(bitmap))) {
+                page = item->page;
+                mempool_free(item, bitmap->write_pool);
+                PRINTK("wait on page writeback: %p\n", page);
+                wait_on_page_writeback(page);
+                PRINTK("finished page writeback: %p\n", page);
+
+                err = PageError(page);
+                page_cache_release(page);
+                if (err) {
+                        printk(KERN_WARNING "%s: bitmap file writeback "
+                               "failed (page %lu): %d\n",
+                               bmname(bitmap), page->index, err);
+                        bitmap_file_kick(bitmap);
+                        goto out;
+                }
+        }
+ out:
+        wake_up(&bitmap->write_wait);
+        if (err) {
+                printk(KERN_INFO "%s: bitmap writeback daemon exiting (%d)\n",
+                       bmname(bitmap), err);
+                daemon_exit(bitmap, &bitmap->writeback_daemon);
+        }
+}
+
+static int bitmap_start_daemon(struct bitmap *bitmap, mdk_thread_t **ptr,
+                                void (*func)(mddev_t *), char *name)
+{
+        mdk_thread_t *daemon;
+        unsigned long flags;
+        char namebuf[32];
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        *ptr = NULL;
+
+        if (!bitmap->file) /* no need for daemon if there's no backing file */
+                goto out_unlock;
+
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+
+#if INJECT_FATAL_FAULT_2
+        daemon = NULL;
+#else
+        sprintf(namebuf, "%%s_%s", name);
+        daemon = md_register_thread(func, bitmap->mddev, namebuf);
+#endif
+        if (!daemon) {
+                printk(KERN_ERR "%s: failed to start bitmap daemon\n",
+                        bmname(bitmap));
+                return -ECHILD;
+        }
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        *ptr = daemon;
+
+        md_wakeup_thread(daemon); /* start it running */
+
+        PRINTK("%s: %s daemon (pid %d) started...\n",
+                bmname(bitmap), name, daemon->tsk->pid);
+out_unlock:
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+        return 0;
+}
+
+static int bitmap_start_daemons(struct bitmap *bitmap)
+{
+        int err = bitmap_start_daemon(bitmap, &bitmap->writeback_daemon,
+                                        bitmap_writeback_daemon, "bitmap_wb");
+        return err;
+}
+
+static void bitmap_stop_daemon(struct bitmap *bitmap, mdk_thread_t **ptr)
+{
+        mdk_thread_t *daemon;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bitmap->lock, flags);
+        daemon = *ptr;
+        *ptr = NULL;
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+        if (daemon)
+                md_unregister_thread(daemon); /* destroy the thread */
+}
+
+static void bitmap_stop_daemons(struct bitmap *bitmap)
+{
+        /* the daemons can't stop themselves... they'll just exit instead... */
+        if (bitmap->writeback_daemon &&
+            current->pid != bitmap->writeback_daemon->tsk->pid)
+                bitmap_stop_daemon(bitmap, &bitmap->writeback_daemon);
+}
+
+static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,
+                                            sector_t offset, int *blocks,
+                                            int create)
+{
+        /* If 'create', we might release the lock and reclaim it.
+         * The lock must have been taken with interrupts enabled.
+         * If !create, we don't release the lock.
+         */
+        sector_t chunk = offset >> CHUNK_BLOCK_SHIFT(bitmap);
+        unsigned long page = chunk >> PAGE_COUNTER_SHIFT;
+        unsigned long pageoff = (chunk & PAGE_COUNTER_MASK) << COUNTER_BYTE_SHIFT;
+        sector_t csize;
+
+        if (bitmap_checkpage(bitmap, page, create) < 0) {
+                csize = ((sector_t)1) << (CHUNK_BLOCK_SHIFT(bitmap));
+                *blocks = csize - (offset & (csize- 1));
+                return NULL;
+        }
+        /* now locked ... */
+
+        if (bitmap->bp[page].hijacked) { /* hijacked pointer */
+                /* should we use the first or second counter field
+                 * of the hijacked pointer? */
+                int hi = (pageoff > PAGE_COUNTER_MASK);
+                csize = ((sector_t)1) << (CHUNK_BLOCK_SHIFT(bitmap) +
+                                          PAGE_COUNTER_SHIFT - 1);
+                *blocks = csize - (offset & (csize- 1));
+                return  &((bitmap_counter_t *)
+                          &bitmap->bp[page].map)[hi];
+        } else { /* page is allocated */
+                csize = ((sector_t)1) << (CHUNK_BLOCK_SHIFT(bitmap));
+                *blocks = csize - (offset & (csize- 1));
+                return (bitmap_counter_t *)
+                        &(bitmap->bp[page].map[pageoff]);
+        }
+}
+
+int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors)
+{
+        if (!bitmap) return 0;
+        while (sectors) {
+                int blocks;
+                bitmap_counter_t *bmc;
+
+                spin_lock_irq(&bitmap->lock);
+                bmc = bitmap_get_counter(bitmap, offset, &blocks, 1);
+                if (!bmc) {
+                        spin_unlock_irq(&bitmap->lock);
+                        return 0;
+                }
+
+                switch(*bmc) {
+                case 0:
+                        bitmap_file_set_bit(bitmap, offset);
+                        bitmap_count_page(bitmap,offset, 1);
+                        blk_plug_device(bitmap->mddev->queue);
+                        /* fall through */
+                case 1:
+                        *bmc = 2;
+                }
+                if ((*bmc & COUNTER_MAX) == COUNTER_MAX) BUG();
+                (*bmc)++;
+
+                spin_unlock_irq(&bitmap->lock);
+
+                offset += blocks;
+                if (sectors > blocks)
+                        sectors -= blocks;
+                else sectors = 0;
+        }
+        return 0;
+}
+
+void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long sectors,
+                     int success)
+{
+        if (!bitmap) return;
+        while (sectors) {
+                int blocks;
+                unsigned long flags;
+                bitmap_counter_t *bmc;
+
+                spin_lock_irqsave(&bitmap->lock, flags);
+                bmc = bitmap_get_counter(bitmap, offset, &blocks, 0);
+                if (!bmc) {
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
+                        return;
+                }
+
+                if (!success && ! (*bmc & NEEDED_MASK))
+                        *bmc |= NEEDED_MASK;
+
+                (*bmc)--;
+                if (*bmc <= 2) {
+                        set_page_attr(bitmap,
+                                      filemap_get_page(bitmap, offset >> CHUNK_BLOCK_SHIFT(bitmap)),
+                                      BITMAP_PAGE_CLEAN);
+                }
+                spin_unlock_irqrestore(&bitmap->lock, flags);
+                offset += blocks;
+                if (sectors > blocks)
+                        sectors -= blocks;
+                else sectors = 0;
+        }
+}
+
+int bitmap_start_sync(struct bitmap *bitmap, sector_t offset, int *blocks)
+{
+        bitmap_counter_t *bmc;
+        int rv;
+        if (bitmap == NULL) {/* FIXME or bitmap set as 'failed' */
+                *blocks = 1024;
+                return 1; /* always resync if no bitmap */
+        }
+        spin_lock_irq(&bitmap->lock);
+        bmc = bitmap_get_counter(bitmap, offset, blocks, 0);
+        rv = 0;
+        if (bmc) {
+                /* locked */
+                if (RESYNC(*bmc))
+                        rv = 1;
+                else if (NEEDED(*bmc)) {
+                        rv = 1;
+                        *bmc |= RESYNC_MASK;
+                        *bmc &= ~NEEDED_MASK;
+                }
+        }
+        spin_unlock_irq(&bitmap->lock);
+        return rv;
+}
+
+void bitmap_end_sync(struct bitmap *bitmap, sector_t offset, int *blocks, int aborted)
+{
+        bitmap_counter_t *bmc;
+        unsigned long flags;
+/*
+        if (offset == 0) printk("bitmap_end_sync 0 (%d)\n", aborted);
+*/      if (bitmap == NULL) {
+                *blocks = 1024;
+                return;
+        }
+        spin_lock_irqsave(&bitmap->lock, flags);
+        bmc = bitmap_get_counter(bitmap, offset, blocks, 0);
+        if (bmc == NULL)
+                goto unlock;
+        /* locked */
+/*
+        if (offset == 0) printk("bitmap_end sync found 0x%x, blocks %d\n", *bmc, *blocks);
+*/
+        if (RESYNC(*bmc)) {
+                *bmc &= ~RESYNC_MASK;
+
+                if (!NEEDED(*bmc) && aborted)
+                        *bmc |= NEEDED_MASK;
+                else {
+                        if (*bmc <= 2) {
+                                set_page_attr(bitmap,
+                                              filemap_get_page(bitmap, offset >> CHUNK_BLOCK_SHIFT(bitmap)),
+                                              BITMAP_PAGE_CLEAN);
+                        }
+                }
+        }
+ unlock:
+        spin_unlock_irqrestore(&bitmap->lock, flags);
+}
+
+void bitmap_close_sync(struct bitmap *bitmap)
+{
+        /* Sync has finished, and any bitmap chunks that weren't synced
+         * properly have been aborted.  It remains to us to clear the
+         * RESYNC bit wherever it is still on
+         */
+        sector_t sector = 0;
+        int blocks;
+        if (!bitmap) return;
+        while (sector < bitmap->mddev->resync_max_sectors) {
+                bitmap_end_sync(bitmap, sector, &blocks, 0);
+/*
+                if (sector < 500) printk("bitmap_close_sync: sec %llu blks %d\n",
+                                         (unsigned long long)sector, blocks);
+*/              sector += blocks;
+        }
+}
+
+static void bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset,
+                                   unsigned long sectors, int in_sync)
+{
+        /* For each chunk covered by any of these sectors, set the
+         * counter to 1 and set resync_needed unless in_sync.  They should all
+         * be 0 at this point
+         */
+        while (sectors) {
+                int secs;
+                bitmap_counter_t *bmc;
+                spin_lock_irq(&bitmap->lock);
+                bmc = bitmap_get_counter(bitmap, offset, &secs, 1);
+                if (!bmc) {
+                        spin_unlock_irq(&bitmap->lock);
+                        return;
+                }
+                if (! *bmc) {
+                        struct page *page;
+                        *bmc = 1 | (in_sync? 0 : NEEDED_MASK);
+                        bitmap_count_page(bitmap, offset, 1);
+                        page = filemap_get_page(bitmap, offset >> CHUNK_BLOCK_SHIFT(bitmap));
+                        set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);
+                }
+                spin_unlock_irq(&bitmap->lock);
+                if (sectors > secs)
+                        sectors -= secs;
+                else
+                        sectors = 0;
+        }
+}
+
+/*
+ * free memory that was allocated
+ */
+void bitmap_destroy(mddev_t *mddev)
+{
+        unsigned long k, pages;
+        struct bitmap_page *bp;
+        struct bitmap *bitmap = mddev->bitmap;
+
+        if (!bitmap) /* there was no bitmap */
+                return;
+
+        mddev->bitmap = NULL; /* disconnect from the md device */
+
+        /* release the bitmap file and kill the daemon */
+        bitmap_file_put(bitmap);
+
+        bp = bitmap->bp;
+        pages = bitmap->pages;
+
+        /* free all allocated memory */
+
+        mempool_destroy(bitmap->write_pool);
+
+        if (bp) /* deallocate the page memory */
+                for (k = 0; k < pages; k++)
+                        if (bp[k].map && !bp[k].hijacked)
+                                kfree(bp[k].map);
+        kfree(bp);
+        kfree(bitmap);
+}
+
+/*
+ * initialize the bitmap structure
+ * if this returns an error, bitmap_destroy must be called to do clean up
+ */
+int bitmap_create(mddev_t *mddev)
+{
+        struct bitmap *bitmap;
+        unsigned long blocks = mddev->resync_max_sectors;
+        unsigned long chunks;
+        unsigned long pages;
+        struct file *file = mddev->bitmap_file;
+        int err;
+
+        BUG_ON(sizeof(bitmap_super_t) != 256);
+
+        if (!file && !mddev->bitmap_offset) /* bitmap disabled, nothing to do */
+                return 0;
+
+        BUG_ON(file && mddev->bitmap_offset);
+
+        bitmap = kmalloc(sizeof(*bitmap), GFP_KERNEL);
+        if (!bitmap)
+                return -ENOMEM;
+
+        memset(bitmap, 0, sizeof(*bitmap));
+
+        spin_lock_init(&bitmap->lock);
+        bitmap->mddev = mddev;
+        mddev->bitmap = bitmap;
+
+        spin_lock_init(&bitmap->write_lock);
+        INIT_LIST_HEAD(&bitmap->complete_pages);
+        init_waitqueue_head(&bitmap->write_wait);
+        bitmap->write_pool = mempool_create(WRITE_POOL_SIZE, write_pool_alloc,
+                                write_pool_free, NULL);
+        if (!bitmap->write_pool)
+                return -ENOMEM;
+
+        bitmap->file = file;
+        bitmap->offset = mddev->bitmap_offset;
+        if (file) get_file(file);
+        /* read superblock from bitmap file (this sets bitmap->chunksize) */
+        err = bitmap_read_sb(bitmap);
+        if (err)
+                return err;
+
+        bitmap->chunkshift = find_first_bit(&bitmap->chunksize,
+                                        sizeof(bitmap->chunksize));
+
+        /* now that chunksize and chunkshift are set, we can use these macros */
+        chunks = (blocks + CHUNK_BLOCK_RATIO(bitmap) - 1) /
+                        CHUNK_BLOCK_RATIO(bitmap);
+        pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO;
+
+        BUG_ON(!pages);
+
+        bitmap->chunks = chunks;
+        bitmap->pages = pages;
+        bitmap->missing_pages = pages;
+        bitmap->counter_bits = COUNTER_BITS;
+
+        bitmap->syncchunk = ~0UL;
+
+#if INJECT_FATAL_FAULT_1
+        bitmap->bp = NULL;
+#else
+        bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL);
+#endif
+        if (!bitmap->bp)
+                return -ENOMEM;
+        memset(bitmap->bp, 0, pages * sizeof(*bitmap->bp));
+
+        bitmap->flags |= BITMAP_ACTIVE;
+
+        /* now that we have some pages available, initialize the in-memory
+         * bitmap from the on-disk bitmap */
+        err = bitmap_init_from_disk(bitmap, mddev->recovery_cp == MaxSector);
+        if (err)
+                return err;
+
+        printk(KERN_INFO "created bitmap (%lu pages) for device %s\n",
+                pages, bmname(bitmap));
+
+        /* kick off the bitmap daemons */
+        err = bitmap_start_daemons(bitmap);
+        if (err)
+                return err;
+        return bitmap_update_sb(bitmap);
+}
+
+/* the bitmap API -- for raid personalities */
+EXPORT_SYMBOL(bitmap_startwrite);
+EXPORT_SYMBOL(bitmap_endwrite);
+EXPORT_SYMBOL(bitmap_start_sync);
+EXPORT_SYMBOL(bitmap_end_sync);
+EXPORT_SYMBOL(bitmap_unplug);
+EXPORT_SYMBOL(bitmap_close_sync);
+EXPORT_SYMBOL(bitmap_daemon_work);
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 0dd6c2b5391b..d0a4bab220e5 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -704,8 +704,7 @@ static void crypt_dtr(struct dm_target *ti)
         mempool_destroy(cc->page_pool);
         mempool_destroy(cc->io_pool);
 
-        if (cc->iv_mode)
-                kfree(cc->iv_mode);
+        kfree(cc->iv_mode);
         if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
                 cc->iv_gen_ops->dtr(cc);
         crypto_free_tfm(cc->tfm);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 1e97b3c12bd5..0c1b8520ef86 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -985,6 +985,9 @@ static int do_end_io(struct multipath *m, struct bio *bio,
         if (!error)
                 return 0;       /* I/O complete */
 
+        if ((error == -EWOULDBLOCK) && bio_rw_ahead(bio))
+                return error;
+
         spin_lock(&m->lock);
         if (!m->nr_valid_paths) {
                 if (!m->queue_if_no_path || m->suspended) {
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b1941b887f46..8d740013d74d 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -217,8 +217,7 @@ static int linear_run (mddev_t *mddev)
         return 0;
 
 out:
-        if (conf)
-                kfree(conf);
+        kfree(conf);
         return 1;
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d899204d3743..0c6b5b6baff6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -19,6 +19,9 @@
 
      Neil Brown <neilb@cse.unsw.edu.au>.
 
+   - persistent bitmap code
+     Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc.
+
    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, or (at your option)
@@ -33,6 +36,7 @@
 #include <linux/config.h>
 #include <linux/linkage.h>
 #include <linux/raid/md.h>
+#include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
@@ -40,6 +44,8 @@
 
 #include <linux/init.h>
 
+#include <linux/file.h>
+
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
@@ -189,8 +195,7 @@ static mddev_t * mddev_find(dev_t unit)
                 if (mddev->unit == unit) {
                         mddev_get(mddev);
                         spin_unlock(&all_mddevs_lock);
-                        if (new)
-                                kfree(new);
+                        kfree(new);
                         return mddev;
                 }
 
@@ -218,6 +223,8 @@ static mddev_t * mddev_find(dev_t unit)
         INIT_LIST_HEAD(&new->all_mddevs);
         init_timer(&new->safemode_timer);
         atomic_set(&new->active, 1);
+        spin_lock_init(&new->write_lock);
+        init_waitqueue_head(&new->sb_wait);
 
         new->queue = blk_alloc_queue(GFP_KERNEL);
         if (!new->queue) {
@@ -320,6 +327,40 @@ static void free_disk_sb(mdk_rdev_t * rdev)
 }
 
 
+static int super_written(struct bio *bio, unsigned int bytes_done, int error)
+{
+        mdk_rdev_t *rdev = bio->bi_private;
+        if (bio->bi_size)
+                return 1;
+
+        if (error || !test_bit(BIO_UPTODATE, &bio->bi_flags))
+                md_error(rdev->mddev, rdev);
+
+        if (atomic_dec_and_test(&rdev->mddev->pending_writes))
+                wake_up(&rdev->mddev->sb_wait);
+        return 0;
+}
+
+void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
+                   sector_t sector, int size, struct page *page)
+{
+        /* write first size bytes of page to sector of rdev
+         * Increment mddev->pending_writes before returning
+         * and decrement it on completion, waking up sb_wait
+         * if zero is reached.
+         * If an error occurred, call md_error
+         */
+        struct bio *bio = bio_alloc(GFP_NOIO, 1);
+
+        bio->bi_bdev = rdev->bdev;
+        bio->bi_sector = sector;
+        bio_add_page(bio, page, size, 0);
+        bio->bi_private = rdev;
+        bio->bi_end_io = super_written;
+        atomic_inc(&mddev->pending_writes);
+        submit_bio((1<<BIO_RW)|(1<<BIO_RW_SYNC), bio);
+}
+
 static int bi_complete(struct bio *bio, unsigned int bytes_done, int error)
 {
         if (bio->bi_size)
@@ -329,7 +370,7 @@ static int bi_complete(struct bio *bio, unsigned int bytes_done, int error)
         return 0;
 }
 
-static int sync_page_io(struct block_device *bdev, sector_t sector, int size,
+int sync_page_io(struct block_device *bdev, sector_t sector, int size,
                    struct page *page, int rw)
 {
         struct bio *bio = bio_alloc(GFP_NOIO, 1);
@@ -416,11 +457,8 @@ static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
                 ret = 1;
 
 abort:
-        if (tmp1)
-                kfree(tmp1);
-        if (tmp2)
-                kfree(tmp2);
-
+        kfree(tmp1);
+        kfree(tmp2);
         return ret;
 }
 
@@ -569,6 +607,8 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
         mdp_disk_t *desc;
         mdp_super_t *sb = (mdp_super_t *)page_address(rdev->sb_page);
 
+        rdev->raid_disk = -1;
+        rdev->in_sync = 0;
         if (mddev->raid_disks == 0) {
                 mddev->major_version = 0;
                 mddev->minor_version = sb->minor_version;
@@ -599,16 +639,35 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 memcpy(mddev->uuid+12,&sb->set_uuid3, 4);
 
                 mddev->max_disks = MD_SB_DISKS;
-        } else {
-                __u64 ev1;
-                ev1 = md_event(sb);
+
+                if (sb->state & (1<<MD_SB_BITMAP_PRESENT) &&
+                    mddev->bitmap_file == NULL) {
+                        if (mddev->level != 1) {
+                                /* FIXME use a better test */
+                                printk(KERN_WARNING "md: bitmaps only support for raid1\n");
+                                return -EINVAL;
+                        }
+                        mddev->bitmap_offset = (MD_SB_BYTES >> 9);
+                }
+
+        } else if (mddev->pers == NULL) {
+                /* Insist on good event counter while assembling */
+                __u64 ev1 = md_event(sb);
                 ++ev1;
                 if (ev1 < mddev->events) 
                         return -EINVAL;
-        }
+        } else if (mddev->bitmap) {
+                /* if adding to array with a bitmap, then we can accept an
+                 * older device ... but not too old.
+                 */
+                __u64 ev1 = md_event(sb);
+                if (ev1 < mddev->bitmap->events_cleared)
+                        return 0;
+        } else /* just a hot-add of a new device, leave raid_disk at -1 */
+                return 0;
+
         if (mddev->level != LEVEL_MULTIPATH) {
-                rdev->raid_disk = -1;
-                rdev->in_sync = rdev->faulty = 0;
+                rdev->faulty = 0;
                 desc = sb->disks + rdev->desc_nr;
 
                 if (desc->state & (1<<MD_DISK_FAULTY))
@@ -618,7 +677,8 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                         rdev->in_sync = 1;
                         rdev->raid_disk = desc->raid_disk;
                 }
-        }
+        } else /* MULTIPATH are always insync */
+                rdev->in_sync = 1;
         return 0;
 }
 
@@ -683,6 +743,9 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev)
         sb->layout = mddev->layout;
         sb->chunk_size = mddev->chunk_size;
 
+        if (mddev->bitmap && mddev->bitmap_file == NULL)
+                sb->state |= (1<<MD_SB_BITMAP_PRESENT);
+
         sb->disks[0].state = (1<<MD_DISK_REMOVED);
         ITERATE_RDEV(mddev,rdev2,tmp) {
                 mdp_disk_t *d;
@@ -780,7 +843,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
         case 0:
                 sb_offset = rdev->bdev->bd_inode->i_size >> 9;
                 sb_offset -= 8*2;
-                sb_offset &= ~(4*2-1);
+                sb_offset &= ~(sector_t)(4*2-1);
                 /* convert from sectors to K */
                 sb_offset /= 2;
                 break;
@@ -860,6 +923,8 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
 {
         struct mdp_superblock_1 *sb = (struct mdp_superblock_1*)page_address(rdev->sb_page);
 
+        rdev->raid_disk = -1;
+        rdev->in_sync = 0;
         if (mddev->raid_disks == 0) {
                 mddev->major_version = 1;
                 mddev->patch_version = 0;
@@ -877,13 +942,30 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 memcpy(mddev->uuid, sb->set_uuid, 16);
 
                 mddev->max_disks =  (4096-256)/2;
-        } else {
-                __u64 ev1;
-                ev1 = le64_to_cpu(sb->events);
+
+                if ((le32_to_cpu(sb->feature_map) & 1) &&
+                    mddev->bitmap_file == NULL ) {
+                        if (mddev->level != 1) {
+                                printk(KERN_WARNING "md: bitmaps only supported for raid1\n");
+                                return -EINVAL;
+                        }
+                        mddev->bitmap_offset = (__s32)le32_to_cpu(sb->bitmap_offset);
+                }
+        } else if (mddev->pers == NULL) {
+                /* Insist of good event counter while assembling */
+                __u64 ev1 = le64_to_cpu(sb->events);
                 ++ev1;
                 if (ev1 < mddev->events)
                         return -EINVAL;
-        }
+        } else if (mddev->bitmap) {
+                /* If adding to array with a bitmap, then we can accept an
+                 * older device, but not too old.
+                 */
+                __u64 ev1 = le64_to_cpu(sb->events);
+                if (ev1 < mddev->bitmap->events_cleared)
+                        return 0;
+        } else /* just a hot-add of a new device, leave raid_disk at -1 */
+                return 0;
 
         if (mddev->level != LEVEL_MULTIPATH) {
                 int role;
@@ -891,14 +973,10 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 role = le16_to_cpu(sb->dev_roles[rdev->desc_nr]);
                 switch(role) {
                 case 0xffff: /* spare */
-                        rdev->in_sync = 0;
                         rdev->faulty = 0;
-                        rdev->raid_disk = -1;
                         break;
                 case 0xfffe: /* faulty */
-                        rdev->in_sync = 0;
                         rdev->faulty = 1;
-                        rdev->raid_disk = -1;
                         break;
                 default:
                         rdev->in_sync = 1;
@@ -906,7 +984,9 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                         rdev->raid_disk = role;
                         break;
                 }
-        }
+        } else /* MULTIPATH are always insync */
+                rdev->in_sync = 1;
+
         return 0;
 }
 
@@ -933,6 +1013,11 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
         else
                 sb->resync_offset = cpu_to_le64(0);
 
+        if (mddev->bitmap && mddev->bitmap_file == NULL) {
+                sb->bitmap_offset = cpu_to_le32((__u32)mddev->bitmap_offset);
+                sb->feature_map = cpu_to_le32(1);
+        }
+
         max_dev = 0;
         ITERATE_RDEV(mddev,rdev2,tmp)
                 if (rdev2->desc_nr+1 > max_dev)
@@ -1196,8 +1281,11 @@ void md_print_devices(void)
         printk("md:     * <COMPLETE RAID STATE PRINTOUT> *\n");
         printk("md:     **********************************\n");
         ITERATE_MDDEV(mddev,tmp) {
-                printk("%s: ", mdname(mddev));
 
+                if (mddev->bitmap)
+                        bitmap_print_sb(mddev->bitmap);
+                else
+                        printk("%s: ", mdname(mddev));
                 ITERATE_RDEV(mddev,rdev,tmp2)
                         printk("<%s>", bdevname(rdev->bdev,b));
                 printk("\n");
@@ -1210,30 +1298,6 @@ void md_print_devices(void)
 }
 
 
-static int write_disk_sb(mdk_rdev_t * rdev)
-{
-        char b[BDEVNAME_SIZE];
-        if (!rdev->sb_loaded) {
-                MD_BUG();
-                return 1;
-        }
-        if (rdev->faulty) {
-                MD_BUG();
-                return 1;
-        }
-
-        dprintk(KERN_INFO "(write) %s's sb offset: %llu\n",
-                bdevname(rdev->bdev,b),
-               (unsigned long long)rdev->sb_offset);
-  
-        if (sync_page_io(rdev->bdev, rdev->sb_offset<<1, MD_SB_BYTES, rdev->sb_page, WRITE))
-                return 0;
-
-        printk("md: write_disk_sb failed for device %s\n", 
-                bdevname(rdev->bdev,b));
-        return 1;
-}
-
 static void sync_sbs(mddev_t * mddev)
 {
         mdk_rdev_t *rdev;
@@ -1248,12 +1312,14 @@ static void sync_sbs(mddev_t * mddev)
 
 static void md_update_sb(mddev_t * mddev)
 {
-        int err, count = 100;
+        int err;
         struct list_head *tmp;
         mdk_rdev_t *rdev;
+        int sync_req;
 
-        mddev->sb_dirty = 0;
 repeat:
+        spin_lock(&mddev->write_lock);
+        sync_req = mddev->in_sync;
         mddev->utime = get_seconds();
         mddev->events ++;
 
@@ -1266,20 +1332,26 @@ repeat:
                 MD_BUG();
                 mddev->events --;
         }
+        mddev->sb_dirty = 2;
         sync_sbs(mddev);
 
         /*
          * do not write anything to disk if using
          * nonpersistent superblocks
          */
-        if (!mddev->persistent)
+        if (!mddev->persistent) {
+                mddev->sb_dirty = 0;
+                spin_unlock(&mddev->write_lock);
+                wake_up(&mddev->sb_wait);
                 return;
+        }
+        spin_unlock(&mddev->write_lock);
 
         dprintk(KERN_INFO 
                 "md: updating %s RAID superblock on device (in sync %d)\n",
                 mdname(mddev),mddev->in_sync);
 
-        err = 0;
+        err = bitmap_update_sb(mddev->bitmap);
         ITERATE_RDEV(mddev,rdev,tmp) {
                 char b[BDEVNAME_SIZE];
                 dprintk(KERN_INFO "md: ");
@@ -1288,22 +1360,32 @@ repeat:
 
                 dprintk("%s ", bdevname(rdev->bdev,b));
                 if (!rdev->faulty) {
-                        err += write_disk_sb(rdev);
+                        md_super_write(mddev,rdev,
+                                       rdev->sb_offset<<1, MD_SB_BYTES,
+                                       rdev->sb_page);
+                        dprintk(KERN_INFO "(write) %s's sb offset: %llu\n",
+                                bdevname(rdev->bdev,b),
+                                (unsigned long long)rdev->sb_offset);
+
                 } else
                         dprintk(")\n");
-                if (!err && mddev->level == LEVEL_MULTIPATH)
+                if (mddev->level == LEVEL_MULTIPATH)
                         /* only need to write one superblock... */
                         break;
         }
-        if (err) {
-                if (--count) {
-                        printk(KERN_ERR "md: errors occurred during superblock"
-                                " update, repeating\n");
-                        goto repeat;
-                }
-                printk(KERN_ERR \
-                        "md: excessive errors occurred during superblock update, exiting\n");
+        wait_event(mddev->sb_wait, atomic_read(&mddev->pending_writes)==0);
+        /* if there was a failure, sb_dirty was set to 1, and we re-write super */
+
+        spin_lock(&mddev->write_lock);
+        if (mddev->in_sync != sync_req|| mddev->sb_dirty == 1) {
+                /* have to write it out again */
+                spin_unlock(&mddev->write_lock);
+                goto repeat;
         }
+        mddev->sb_dirty = 0;
+        spin_unlock(&mddev->write_lock);
+        wake_up(&mddev->sb_wait);
+
 }
 
 /*
@@ -1607,12 +1689,19 @@ static int do_md_run(mddev_t * mddev)
 
         mddev->resync_max_sectors = mddev->size << 1; /* may be over-ridden by personality */
 
-        err = mddev->pers->run(mddev);
+        /* before we start the array running, initialise the bitmap */
+        err = bitmap_create(mddev);
+        if (err)
+                printk(KERN_ERR "%s: failed to create bitmap (%d)\n",
+                        mdname(mddev), err);
+        else
+                err = mddev->pers->run(mddev);
         if (err) {
                 printk(KERN_ERR "md: pers->run() failed ...\n");
                 module_put(mddev->pers->owner);
                 mddev->pers = NULL;
-                return -EINVAL;
+                bitmap_destroy(mddev);
+                return err;
         }
         atomic_set(&mddev->writes_pending,0);
         mddev->safemode = 0;
@@ -1725,6 +1814,14 @@ static int do_md_stop(mddev_t * mddev, int ro)
                 if (ro)
                         set_disk_ro(disk, 1);
         }
+
+        bitmap_destroy(mddev);
+        if (mddev->bitmap_file) {
+                atomic_set(&mddev->bitmap_file->f_dentry->d_inode->i_writecount, 1);
+                fput(mddev->bitmap_file);
+                mddev->bitmap_file = NULL;
+        }
+
         /*
          * Free resources if final stop
          */
@@ -1983,6 +2080,42 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
         return 0;
 }
 
+static int get_bitmap_file(mddev_t * mddev, void * arg)
+{
+        mdu_bitmap_file_t *file = NULL; /* too big for stack allocation */
+        char *ptr, *buf = NULL;
+        int err = -ENOMEM;
+
+        file = kmalloc(sizeof(*file), GFP_KERNEL);
+        if (!file)
+                goto out;
+
+        /* bitmap disabled, zero the first byte and copy out */
+        if (!mddev->bitmap || !mddev->bitmap->file) {
+                file->pathname[0] = '\0';
+                goto copy_out;
+        }
+
+        buf = kmalloc(sizeof(file->pathname), GFP_KERNEL);
+        if (!buf)
+                goto out;
+
+        ptr = file_path(mddev->bitmap->file, buf, sizeof(file->pathname));
+        if (!ptr)
+                goto out;
+
+        strcpy(file->pathname, ptr);
+
+copy_out:
+        err = 0;
+        if (copy_to_user(arg, file, sizeof(*file)))
+                err = -EFAULT;
+out:
+        kfree(buf);
+        kfree(file);
+        return err;
+}
+
 static int get_disk_info(mddev_t * mddev, void __user * arg)
 {
         mdu_disk_info_t info;
@@ -2078,11 +2211,25 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                                 PTR_ERR(rdev));
                         return PTR_ERR(rdev);
                 }
+                /* set save_raid_disk if appropriate */
+                if (!mddev->persistent) {
+                        if (info->state & (1<<MD_DISK_SYNC)  &&
+                            info->raid_disk < mddev->raid_disks)
+                                rdev->raid_disk = info->raid_disk;
+                        else
+                                rdev->raid_disk = -1;
+                } else
+                        super_types[mddev->major_version].
+                                validate_super(mddev, rdev);
+                rdev->saved_raid_disk = rdev->raid_disk;
+
                 rdev->in_sync = 0; /* just to be sure */
                 rdev->raid_disk = -1;
                 err = bind_rdev_to_array(rdev, mddev);
                 if (err)
                         export_rdev(rdev);
+
+                set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
                 if (mddev->thread)
                         md_wakeup_thread(mddev->thread);
                 return err;
@@ -2256,6 +2403,49 @@ abort_export:
         return err;
 }
 
+/* similar to deny_write_access, but accounts for our holding a reference
+ * to the file ourselves */
+static int deny_bitmap_write_access(struct file * file)
+{
+        struct inode *inode = file->f_mapping->host;
+
+        spin_lock(&inode->i_lock);
+        if (atomic_read(&inode->i_writecount) > 1) {
+                spin_unlock(&inode->i_lock);
+                return -ETXTBSY;
+        }
+        atomic_set(&inode->i_writecount, -1);
+        spin_unlock(&inode->i_lock);
+
+        return 0;
+}
+
+static int set_bitmap_file(mddev_t *mddev, int fd)
+{
+        int err;
+
+        if (mddev->pers)
+                return -EBUSY;
+
+        mddev->bitmap_file = fget(fd);
+
+        if (mddev->bitmap_file == NULL) {
+                printk(KERN_ERR "%s: error: failed to get bitmap file\n",
+                        mdname(mddev));
+                return -EBADF;
+        }
+
+        err = deny_bitmap_write_access(mddev->bitmap_file);
+        if (err) {
+                printk(KERN_ERR "%s: error: bitmap file is already in use\n",
+                        mdname(mddev));
+                fput(mddev->bitmap_file);
+                mddev->bitmap_file = NULL;
+        } else
+                mddev->bitmap_offset = 0; /* file overrides offset */
+        return err;
+}
+
 /*
  * set_array_info is used two different ways
  * The original usage is when creating a new array.
@@ -2567,8 +2757,10 @@ static int md_ioctl(struct inode *inode, struct file *file,
         /*
          * Commands querying/configuring an existing array:
          */
-        /* if we are initialised yet, only ADD_NEW_DISK or STOP_ARRAY is allowed */
-        if (!mddev->raid_disks && cmd != ADD_NEW_DISK && cmd != STOP_ARRAY && cmd != RUN_ARRAY) {
+        /* if we are not initialised yet, only ADD_NEW_DISK, STOP_ARRAY,
+         * RUN_ARRAY, and SET_BITMAP_FILE are allowed */
+        if (!mddev->raid_disks && cmd != ADD_NEW_DISK && cmd != STOP_ARRAY
+                        && cmd != RUN_ARRAY && cmd != SET_BITMAP_FILE) {
                 err = -ENODEV;
                 goto abort_unlock;
         }
@@ -2582,6 +2774,10 @@ static int md_ioctl(struct inode *inode, struct file *file,
                         err = get_array_info(mddev, argp);
                         goto done_unlock;
 
+                case GET_BITMAP_FILE:
+                        err = get_bitmap_file(mddev, (void *)arg);
+                        goto done_unlock;
+
                 case GET_DISK_INFO:
                         err = get_disk_info(mddev, argp);
                         goto done_unlock;
@@ -2662,6 +2858,10 @@ static int md_ioctl(struct inode *inode, struct file *file,
                         err = do_md_run (mddev);
                         goto done_unlock;
 
+                case SET_BITMAP_FILE:
+                        err = set_bitmap_file(mddev, (int)arg);
+                        goto done_unlock;
+
                 default:
                         if (_IOC_TYPE(cmd) == MD_MAJOR)
                                 printk(KERN_WARNING "md: %s(pid %d) used"
@@ -2773,8 +2973,9 @@ static int md_thread(void * arg)
         while (thread->run) {
                 void (*run)(mddev_t *);
 
-                wait_event_interruptible(thread->wqueue,
-                                         test_bit(THREAD_WAKEUP, &thread->flags));
+                wait_event_interruptible_timeout(thread->wqueue,
+                                                 test_bit(THREAD_WAKEUP, &thread->flags),
+                                                 thread->timeout);
                 if (current->flags & PF_FREEZE)
                         refrigerator(PF_FREEZE);
 
@@ -2820,6 +3021,7 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev,
         thread->run = run;
         thread->mddev = mddev;
         thread->name = name;
+        thread->timeout = MAX_SCHEDULE_TIMEOUT;
         ret = kernel_thread(md_thread, thread, 0);
         if (ret < 0) {
                 kfree(thread);
@@ -2858,13 +3060,13 @@ void md_error(mddev_t *mddev, mdk_rdev_t *rdev)
 
         if (!rdev || rdev->faulty)
                 return;
-
+/*
         dprintk("md_error dev:%s, rdev:(%d:%d), (caller: %p,%p,%p,%p).\n",
                 mdname(mddev),
                 MAJOR(rdev->bdev->bd_dev), MINOR(rdev->bdev->bd_dev),
                 __builtin_return_address(0),__builtin_return_address(1),
                 __builtin_return_address(2),__builtin_return_address(3));
-
+*/
         if (!mddev->pers->error_handler)
                 return;
         mddev->pers->error_handler(mddev,rdev);
@@ -3018,6 +3220,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
         struct list_head *tmp2;
         mdk_rdev_t *rdev;
         int i;
+        struct bitmap *bitmap;
 
         if (v == (void*)1) {
                 seq_printf(seq, "Personalities : ");
@@ -3070,10 +3273,35 @@ static int md_seq_show(struct seq_file *seq, void *v)
                 if (mddev->pers) {
                         mddev->pers->status (seq, mddev);
                         seq_printf(seq, "\n      ");
-                        if (mddev->curr_resync > 2)
+                        if (mddev->curr_resync > 2) {
                                 status_resync (seq, mddev);
-                        else if (mddev->curr_resync == 1 || mddev->curr_resync == 2)
-                                seq_printf(seq, "       resync=DELAYED");
+                                seq_printf(seq, "\n      ");
+                        } else if (mddev->curr_resync == 1 || mddev->curr_resync == 2)
+                                seq_printf(seq, "       resync=DELAYED\n      ");
+                } else
+                        seq_printf(seq, "\n       ");
+
+                if ((bitmap = mddev->bitmap)) {
+                        unsigned long chunk_kb;
+                        unsigned long flags;
+                        spin_lock_irqsave(&bitmap->lock, flags);
+                        chunk_kb = bitmap->chunksize >> 10;
+                        seq_printf(seq, "bitmap: %lu/%lu pages [%luKB], "
+                                "%lu%s chunk",
+                                bitmap->pages - bitmap->missing_pages,
+                                bitmap->pages,
+                                (bitmap->pages - bitmap->missing_pages)
+                                        << (PAGE_SHIFT - 10),
+                                chunk_kb ? chunk_kb : bitmap->chunksize,
+                                chunk_kb ? "KB" : "B");
+                        if (bitmap->file) {
+                                seq_printf(seq, ", file: ");
+                                seq_path(seq, bitmap->file->f_vfsmnt,
+                                         bitmap->file->f_dentry," \t\n");
+                        }
+
+                        seq_printf(seq, "\n");
+                        spin_unlock_irqrestore(&bitmap->lock, flags);
                 }
 
                 seq_printf(seq, "\n");
@@ -3176,19 +3404,28 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok)
 }
 
 
-void md_write_start(mddev_t *mddev)
+/* md_write_start(mddev, bi)
+ * If we need to update some array metadata (e.g. 'active' flag
+ * in superblock) before writing, schedule a superblock update
+ * and wait for it to complete.
+ */
+void md_write_start(mddev_t *mddev, struct bio *bi)
 {
-        if (!atomic_read(&mddev->writes_pending)) {
-                mddev_lock_uninterruptible(mddev);
+        DEFINE_WAIT(w);
+        if (bio_data_dir(bi) != WRITE)
+                return;
+
+        atomic_inc(&mddev->writes_pending);
+        if (mddev->in_sync) {
+                spin_lock(&mddev->write_lock);
                 if (mddev->in_sync) {
                         mddev->in_sync = 0;
-                        del_timer(&mddev->safemode_timer);
-                        md_update_sb(mddev);
+                        mddev->sb_dirty = 1;
+                        md_wakeup_thread(mddev->thread);
                 }
-                atomic_inc(&mddev->writes_pending);
-                mddev_unlock(mddev);
-        } else
-                atomic_inc(&mddev->writes_pending);
+                spin_unlock(&mddev->write_lock);
+        }
+        wait_event(mddev->sb_wait, mddev->sb_dirty==0);
 }
 
 void md_write_end(mddev_t *mddev)
@@ -3201,37 +3438,6 @@ void md_write_end(mddev_t *mddev)
         }
 }
 
-static inline void md_enter_safemode(mddev_t *mddev)
-{
-        if (!mddev->safemode) return;
-        if (mddev->safemode == 2 &&
-            (atomic_read(&mddev->writes_pending) || mddev->in_sync ||
-                    mddev->recovery_cp != MaxSector))
-                return; /* avoid the lock */
-        mddev_lock_uninterruptible(mddev);
-        if (mddev->safemode && !atomic_read(&mddev->writes_pending) &&
-            !mddev->in_sync && mddev->recovery_cp == MaxSector) {
-                mddev->in_sync = 1;
-                md_update_sb(mddev);
-        }
-        mddev_unlock(mddev);
-
-        if (mddev->safemode == 1)
-                mddev->safemode = 0;
-}
-
-void md_handle_safemode(mddev_t *mddev)
-{
-        if (signal_pending(current)) {
-                printk(KERN_INFO "md: %s in immediate safe mode\n",
-                        mdname(mddev));
-                mddev->safemode = 2;
-                flush_signals(current);
-        }
-        md_enter_safemode(mddev);
-}
-
-
 static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
 
 #define SYNC_MARKS      10
@@ -3241,12 +3447,13 @@ static void md_do_sync(mddev_t *mddev)
         mddev_t *mddev2;
         unsigned int currspeed = 0,
                  window;
-        sector_t max_sectors,j;
+        sector_t max_sectors,j, io_sectors;
         unsigned long mark[SYNC_MARKS];
         sector_t mark_cnt[SYNC_MARKS];
         int last_mark,m;
         struct list_head *tmp;
         sector_t last_check;
+        int skipped = 0;
 
         /* just incase thread restarts... */
         if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))
@@ -3312,7 +3519,7 @@ static void md_do_sync(mddev_t *mddev)
 
         if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
                 /* resync follows the size requested by the personality,
-                 * which default to physical size, but can be virtual size
+                 * which defaults to physical size, but can be virtual size
                  */
                 max_sectors = mddev->resync_max_sectors;
         else
@@ -3327,13 +3534,15 @@ static void md_do_sync(mddev_t *mddev)
                sysctl_speed_limit_max);
 
         is_mddev_idle(mddev); /* this also initializes IO event counters */
-        if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
+        /* we don't use the checkpoint if there's a bitmap */
+        if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) && !mddev->bitmap)
                 j = mddev->recovery_cp;
         else
                 j = 0;
+        io_sectors = 0;
         for (m = 0; m < SYNC_MARKS; m++) {
                 mark[m] = jiffies;
-                mark_cnt[m] = j;
+                mark_cnt[m] = io_sectors;
         }
         last_mark = 0;
         mddev->resync_mark = mark[last_mark];
@@ -3358,21 +3567,29 @@ static void md_do_sync(mddev_t *mddev)
         }
 
         while (j < max_sectors) {
-                int sectors;
+                sector_t sectors;
 
-                sectors = mddev->pers->sync_request(mddev, j, currspeed < sysctl_speed_limit_min);
-                if (sectors < 0) {
+                skipped = 0;
+                sectors = mddev->pers->sync_request(mddev, j, &skipped,
+                                            currspeed < sysctl_speed_limit_min);
+                if (sectors == 0) {
                         set_bit(MD_RECOVERY_ERR, &mddev->recovery);
                         goto out;
                 }
-                atomic_add(sectors, &mddev->recovery_active);
+
+                if (!skipped) { /* actual IO requested */
+                        io_sectors += sectors;
+                        atomic_add(sectors, &mddev->recovery_active);
+                }
+
                 j += sectors;
                 if (j>1) mddev->curr_resync = j;
 
-                if (last_check + window > j || j == max_sectors)
+
+                if (last_check + window > io_sectors || j == max_sectors)
                         continue;
 
-                last_check = j;
+                last_check = io_sectors;
 
                 if (test_bit(MD_RECOVERY_INTR, &mddev->recovery) ||
                     test_bit(MD_RECOVERY_ERR, &mddev->recovery))
@@ -3386,7 +3603,7 @@ static void md_do_sync(mddev_t *mddev)
                         mddev->resync_mark = mark[next];
                         mddev->resync_mark_cnt = mark_cnt[next];
                         mark[next] = jiffies;
-                        mark_cnt[next] = j - atomic_read(&mddev->recovery_active);
+                        mark_cnt[next] = io_sectors - atomic_read(&mddev->recovery_active);
                         last_mark = next;
                 }
 
@@ -3413,7 +3630,8 @@ static void md_do_sync(mddev_t *mddev)
                 mddev->queue->unplug_fn(mddev->queue);
                 cond_resched();
 
-                currspeed = ((unsigned long)(j-mddev->resync_mark_cnt))/2/((jiffies-mddev->resync_mark)/HZ +1) +1;
+                currspeed = ((unsigned long)(io_sectors-mddev->resync_mark_cnt))/2
+                        /((jiffies-mddev->resync_mark)/HZ +1) +1;
 
                 if (currspeed > sysctl_speed_limit_min) {
                         if ((currspeed > sysctl_speed_limit_max) ||
@@ -3433,7 +3651,7 @@ static void md_do_sync(mddev_t *mddev)
         wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active));
 
         /* tell personality that we are finished */
-        mddev->pers->sync_request(mddev, max_sectors, 1);
+        mddev->pers->sync_request(mddev, max_sectors, &skipped, 1);
 
         if (!test_bit(MD_RECOVERY_ERR, &mddev->recovery) &&
             mddev->curr_resync > 2 &&
@@ -3447,7 +3665,6 @@ static void md_do_sync(mddev_t *mddev)
                         mddev->recovery_cp = MaxSector;
         }
 
-        md_enter_safemode(mddev);
  skip:
         mddev->curr_resync = 0;
         wake_up(&resync_wait);
@@ -3484,20 +3701,48 @@ void md_check_recovery(mddev_t *mddev)
         struct list_head *rtmp;
 
 
-        dprintk(KERN_INFO "md: recovery thread got woken up ...\n");
+        if (mddev->bitmap)
+                bitmap_daemon_work(mddev->bitmap);
 
         if (mddev->ro)
                 return;
+
+        if (signal_pending(current)) {
+                if (mddev->pers->sync_request) {
+                        printk(KERN_INFO "md: %s in immediate safe mode\n",
+                               mdname(mddev));
+                        mddev->safemode = 2;
+                }
+                flush_signals(current);
+        }
+
         if ( ! (
                 mddev->sb_dirty ||
                 test_bit(MD_RECOVERY_NEEDED, &mddev->recovery) ||
-                test_bit(MD_RECOVERY_DONE, &mddev->recovery)
+                test_bit(MD_RECOVERY_DONE, &mddev->recovery) ||
+                (mddev->safemode == 1) ||
+                (mddev->safemode == 2 && ! atomic_read(&mddev->writes_pending)
+                 && !mddev->in_sync && mddev->recovery_cp == MaxSector)
                 ))
                 return;
+
         if (mddev_trylock(mddev)==0) {
                 int spares =0;
+
+                spin_lock(&mddev->write_lock);
+                if (mddev->safemode && !atomic_read(&mddev->writes_pending) &&
+                    !mddev->in_sync && mddev->recovery_cp == MaxSector) {
+                        mddev->in_sync = 1;
+                        mddev->sb_dirty = 1;
+                }
+                if (mddev->safemode == 1)
+                        mddev->safemode = 0;
+                spin_unlock(&mddev->write_lock);
+
                 if (mddev->sb_dirty)
                         md_update_sb(mddev);
+
+
                 if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
                     !test_bit(MD_RECOVERY_DONE, &mddev->recovery)) {
                         /* resync/recovery still happening */
@@ -3515,6 +3760,14 @@ void md_check_recovery(mddev_t *mddev)
                                 mddev->pers->spare_active(mddev);
                         }
                         md_update_sb(mddev);
+
+                        /* if array is no-longer degraded, then any saved_raid_disk
+                         * information must be scrapped
+                         */
+                        if (!mddev->degraded)
+                                ITERATE_RDEV(mddev,rdev,rtmp)
+                                        rdev->saved_raid_disk = -1;
+
                         mddev->recovery = 0;
                         /* flag recovery needed just to double check */
                         set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
@@ -3557,6 +3810,13 @@ void md_check_recovery(mddev_t *mddev)
                         set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
                         if (!spares)
                                 set_bit(MD_RECOVERY_SYNC, &mddev->recovery);
+                        if (spares && mddev->bitmap && ! mddev->bitmap->file) {
+                                /* We are adding a device or devices to an array
+                                 * which has the bitmap stored on all devices.
+                                 * So make sure all bitmap pages get written
+                                 */
+                                bitmap_write_all(mddev->bitmap);
+                        }
                         mddev->sync_thread = md_register_thread(md_do_sync,
                                                                 mddev,
                                                                 "%s_resync");
@@ -3624,6 +3884,8 @@ static int __init md_init(void)
                         " MD_SB_DISKS=%d\n",
                         MD_MAJOR_VERSION, MD_MINOR_VERSION,
                         MD_PATCHLEVEL_VERSION, MAX_MD_DEVS, MD_SB_DISKS);
+        printk(KERN_INFO "md: bitmap version %d.%d\n", BITMAP_MAJOR,
+                        BITMAP_MINOR);
 
         if (register_blkdev(MAJOR_NR, "md"))
                 return -1;
@@ -3739,7 +4001,6 @@ EXPORT_SYMBOL(md_error);
 EXPORT_SYMBOL(md_done_sync);
 EXPORT_SYMBOL(md_write_start);
 EXPORT_SYMBOL(md_write_end);
-EXPORT_SYMBOL(md_handle_safemode);
 EXPORT_SYMBOL(md_register_thread);
 EXPORT_SYMBOL(md_unregister_thread);
 EXPORT_SYMBOL(md_wakeup_thread);
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 2ae2d709cb15..2d2ca7fa0265 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -533,8 +533,7 @@ static int multipath_run (mddev_t *mddev)
 out_free_conf:
         if (conf->pool)
                 mempool_destroy(conf->pool);
-        if (conf->multipaths)
-                kfree(conf->multipaths);
+        kfree(conf->multipaths);
         kfree(conf);
         mddev->private = NULL;
 out:
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index e7d934eca06f..e11dd14d0b43 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -371,10 +371,8 @@ static int raid0_run (mddev_t *mddev)
         return 0;
 
 out_free_conf:
-        if (conf->strip_zone)
-                kfree(conf->strip_zone);
-        if (conf->devlist)
-                kfree (conf->devlist);
+        kfree(conf->strip_zone);
+        kfree(conf->devlist);
         kfree(conf);
         mddev->private = NULL;
 out:
@@ -386,11 +384,11 @@ static int raid0_stop (mddev_t *mddev)
         raid0_conf_t *conf = mddev_to_conf(mddev);
 
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
-        kfree (conf->hash_table);
+        kfree(conf->hash_table);
         conf->hash_table = NULL;
-        kfree (conf->strip_zone);
+        kfree(conf->strip_zone);
         conf->strip_zone = NULL;
-        kfree (conf);
+        kfree(conf);
         mddev->private = NULL;
 
         return 0;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 1db5de52d376..ff1dbec864af 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -12,6 +12,15 @@
  * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk>
  * Various fixes by Neil Brown <neilb@cse.unsw.edu.au>
  *
+ * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support
+ * bitmapped intelligence in resync:
+ *
+ *      - bitmap marked during normal i/o
+ *      - bitmap used to skip nondirty blocks during sync
+ *
+ * Additions to bitmap code, (C) 2003-2004 Paul Clements, SteelEye Technology:
+ * - persistent bitmap code
+ *
  * 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, or (at your option)
@@ -22,7 +31,16 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "dm-bio-list.h"
 #include <linux/raid/raid1.h>
+#include <linux/raid/bitmap.h>
+
+#define DEBUG 0
+#if DEBUG
+#define PRINTK(x...) printk(x)
+#else
+#define PRINTK(x...)
+#endif
 
 /*
  * Number of guaranteed r1bios in case of extreme VM load:
@@ -287,9 +305,11 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
         /*
          * this branch is our 'one mirror IO has finished' event handler:
          */
-        if (!uptodate)
+        if (!uptodate) {
                 md_error(r1_bio->mddev, conf->mirrors[mirror].rdev);
-        else
+                /* an I/O failed, we can't clear the bitmap */
+                set_bit(R1BIO_Degraded, &r1_bio->state);
+        } else
                 /*
                  * Set R1BIO_Uptodate in our master bio, so that
                  * we will return a good error code for to the higher
@@ -309,6 +329,10 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
          * already.
          */
         if (atomic_dec_and_test(&r1_bio->remaining)) {
+                /* clear the bitmap if all writes complete successfully */
+                bitmap_endwrite(r1_bio->mddev->bitmap, r1_bio->sector,
+                                r1_bio->sectors,
+                                !test_bit(R1BIO_Degraded, &r1_bio->state));
                 md_write_end(r1_bio->mddev);
                 raid_end_bio_io(r1_bio);
         }
@@ -458,7 +482,10 @@ static void unplug_slaves(mddev_t *mddev)
 
 static void raid1_unplug(request_queue_t *q)
 {
-        unplug_slaves(q->queuedata);
+        mddev_t *mddev = q->queuedata;
+
+        unplug_slaves(mddev);
+        md_wakeup_thread(mddev->thread);
 }
 
 static int raid1_issue_flush(request_queue_t *q, struct gendisk *disk,
@@ -501,16 +528,16 @@ static void device_barrier(conf_t *conf, sector_t sect)
 {
         spin_lock_irq(&conf->resync_lock);
         wait_event_lock_irq(conf->wait_idle, !waitqueue_active(&conf->wait_resume),
-                            conf->resync_lock, unplug_slaves(conf->mddev));
+                            conf->resync_lock, raid1_unplug(conf->mddev->queue));
         
         if (!conf->barrier++) {
                 wait_event_lock_irq(conf->wait_idle, !conf->nr_pending,
-                                    conf->resync_lock, unplug_slaves(conf->mddev));
+                                    conf->resync_lock, raid1_unplug(conf->mddev->queue));
                 if (conf->nr_pending)
                         BUG();
         }
         wait_event_lock_irq(conf->wait_resume, conf->barrier < RESYNC_DEPTH,
-                            conf->resync_lock, unplug_slaves(conf->mddev));
+                            conf->resync_lock, raid1_unplug(conf->mddev->queue));
         conf->next_resync = sect;
         spin_unlock_irq(&conf->resync_lock);
 }
@@ -522,14 +549,20 @@ static int make_request(request_queue_t *q, struct bio * bio)
         mirror_info_t *mirror;
         r1bio_t *r1_bio;
         struct bio *read_bio;
-        int i, disks;
+        int i, targets = 0, disks;
         mdk_rdev_t *rdev;
+        struct bitmap *bitmap = mddev->bitmap;
+        unsigned long flags;
+        struct bio_list bl;
+
 
         /*
          * Register the new request and wait if the reconstruction
          * thread has put up a bar for new requests.
          * Continue immediately if no resync is active currently.
          */
+        md_write_start(mddev, bio); /* wait on superblock update early */
+
         spin_lock_irq(&conf->resync_lock);
         wait_event_lock_irq(conf->wait_resume, !conf->barrier, conf->resync_lock, );
         conf->nr_pending++;
@@ -552,7 +585,7 @@ static int make_request(request_queue_t *q, struct bio * bio)
 
         r1_bio->master_bio = bio;
         r1_bio->sectors = bio->bi_size >> 9;
-
+        r1_bio->state = 0;
         r1_bio->mddev = mddev;
         r1_bio->sector = bio->bi_sector;
 
@@ -595,6 +628,13 @@ static int make_request(request_queue_t *q, struct bio * bio)
          * bios[x] to bio
          */
         disks = conf->raid_disks;
+#if 0
+        { static int first=1;
+        if (first) printk("First Write sector %llu disks %d\n",
+                          (unsigned long long)r1_bio->sector, disks);
+        first = 0;
+        }
+#endif
         rcu_read_lock();
         for (i = 0;  i < disks; i++) {
                 if ((rdev=conf->mirrors[i].rdev) != NULL &&
@@ -605,13 +645,21 @@ static int make_request(request_queue_t *q, struct bio * bio)
                                 r1_bio->bios[i] = NULL;
                         } else
                                 r1_bio->bios[i] = bio;
+                        targets++;
                 } else
                         r1_bio->bios[i] = NULL;
         }
         rcu_read_unlock();
 
-        atomic_set(&r1_bio->remaining, 1);
-        md_write_start(mddev);
+        if (targets < conf->raid_disks) {
+                /* array is degraded, we will not clear the bitmap
+                 * on I/O completion (see raid1_end_write_request) */
+                set_bit(R1BIO_Degraded, &r1_bio->state);
+        }
+
+        atomic_set(&r1_bio->remaining, 0);
+
+        bio_list_init(&bl);
         for (i = 0; i < disks; i++) {
                 struct bio *mbio;
                 if (!r1_bio->bios[i])
@@ -627,14 +675,23 @@ static int make_request(request_queue_t *q, struct bio * bio)
                 mbio->bi_private = r1_bio;
 
                 atomic_inc(&r1_bio->remaining);
-                generic_make_request(mbio);
-        }
 
-        if (atomic_dec_and_test(&r1_bio->remaining)) {
-                md_write_end(mddev);
-                raid_end_bio_io(r1_bio);
+                bio_list_add(&bl, mbio);
         }
 
+        bitmap_startwrite(bitmap, bio->bi_sector, r1_bio->sectors);
+        spin_lock_irqsave(&conf->device_lock, flags);
+        bio_list_merge(&conf->pending_bio_list, &bl);
+        bio_list_init(&bl);
+
+        blk_plug_device(mddev->queue);
+        spin_unlock_irqrestore(&conf->device_lock, flags);
+
+#if 0
+        while ((bio = bio_list_pop(&bl)) != NULL)
+                generic_make_request(bio);
+#endif
+
         return 0;
 }
 
@@ -714,7 +771,7 @@ static void close_sync(conf_t *conf)
 {
         spin_lock_irq(&conf->resync_lock);
         wait_event_lock_irq(conf->wait_resume, !conf->barrier,
-                            conf->resync_lock,  unplug_slaves(conf->mddev));
+                            conf->resync_lock,  raid1_unplug(conf->mddev->queue));
         spin_unlock_irq(&conf->resync_lock);
 
         if (conf->barrier) BUG();
@@ -754,9 +811,12 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
 {
         conf_t *conf = mddev->private;
         int found = 0;
-        int mirror;
+        int mirror = 0;
         mirror_info_t *p;
 
+        if (rdev->saved_raid_disk >= 0 &&
+            conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
+                mirror = rdev->saved_raid_disk;
         for (mirror=0; mirror < mddev->raid_disks; mirror++)
                 if ( !(p=conf->mirrors+mirror)->rdev) {
 
@@ -773,6 +833,8 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                         p->head_position = 0;
                         rdev->raid_disk = mirror;
                         found = 1;
+                        if (rdev->saved_raid_disk != mirror)
+                                conf->fullsync = 1;
                         p->rdev = rdev;
                         break;
                 }
@@ -828,10 +890,11 @@ static int end_sync_read(struct bio *bio, unsigned int bytes_done, int error)
          * or re-read if the read failed.
          * We don't do much here, just schedule handling by raid1d
          */
-        if (!uptodate)
+        if (!uptodate) {
                 md_error(r1_bio->mddev,
                          conf->mirrors[r1_bio->read_disk].rdev);
-        else
+                set_bit(R1BIO_Degraded, &r1_bio->state);
+        } else
                 set_bit(R1BIO_Uptodate, &r1_bio->state);
         rdev_dec_pending(conf->mirrors[r1_bio->read_disk].rdev, conf->mddev);
         reschedule_retry(r1_bio);
@@ -855,8 +918,10 @@ static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)
                         mirror = i;
                         break;
                 }
-        if (!uptodate)
+        if (!uptodate) {
                 md_error(mddev, conf->mirrors[mirror].rdev);
+                set_bit(R1BIO_Degraded, &r1_bio->state);
+        }
         update_head_pos(mirror, r1_bio);
 
         if (atomic_dec_and_test(&r1_bio->remaining)) {
@@ -876,6 +941,9 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
 
         bio = r1_bio->bios[r1_bio->read_disk];
 
+/*
+        if (r1_bio->sector == 0) printk("First sync write startss\n");
+*/
         /*
          * schedule writes
          */
@@ -903,10 +971,12 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
                 atomic_inc(&conf->mirrors[i].rdev->nr_pending);
                 atomic_inc(&r1_bio->remaining);
                 md_sync_acct(conf->mirrors[i].rdev->bdev, wbio->bi_size >> 9);
+
                 generic_make_request(wbio);
         }
 
         if (atomic_dec_and_test(&r1_bio->remaining)) {
+                /* if we're here, all write(s) have completed, so clean up */
                 md_done_sync(mddev, r1_bio->sectors, 1);
                 put_buf(r1_bio);
         }
@@ -931,11 +1001,30 @@ static void raid1d(mddev_t *mddev)
         mdk_rdev_t *rdev;
 
         md_check_recovery(mddev);
-        md_handle_safemode(mddev);
         
         for (;;) {
                 char b[BDEVNAME_SIZE];
                 spin_lock_irqsave(&conf->device_lock, flags);
+
+                if (conf->pending_bio_list.head) {
+                        bio = bio_list_get(&conf->pending_bio_list);
+                        blk_remove_plug(mddev->queue);
+                        spin_unlock_irqrestore(&conf->device_lock, flags);
+                        /* flush any pending bitmap writes to disk before proceeding w/ I/O */
+                        if (bitmap_unplug(mddev->bitmap) != 0)
+                                printk("%s: bitmap file write failed!\n", mdname(mddev));
+
+                        while (bio) { /* submit pending writes */
+                                struct bio *next = bio->bi_next;
+                                bio->bi_next = NULL;
+                                generic_make_request(bio);
+                                bio = next;
+                        }
+                        unplug = 1;
+
+                        continue;
+                }
+
                 if (list_empty(head))
                         break;
                 r1_bio = list_entry(head->prev, r1bio_t, retry_list);
@@ -1009,7 +1098,7 @@ static int init_resync(conf_t *conf)
  * that can be installed to exclude normal IO requests.
  */
 
-static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
+static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)
 {
         conf_t *conf = mddev_to_conf(mddev);
         mirror_info_t *mirror;
@@ -1019,17 +1108,43 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
         int disk;
         int i;
         int write_targets = 0;
+        int sync_blocks;
 
         if (!conf->r1buf_pool)
+        {
+/*
+                printk("sync start - bitmap %p\n", mddev->bitmap);
+*/
                 if (init_resync(conf))
-                        return -ENOMEM;
+                        return 0;
+        }
 
         max_sector = mddev->size << 1;
         if (sector_nr >= max_sector) {
+                /* If we aborted, we need to abort the
+                 * sync on the 'current' bitmap chunk (there will
+                 * only be one in raid1 resync.
+                 * We can find the current addess in mddev->curr_resync
+                 */
+                if (!conf->fullsync) {
+                        if (mddev->curr_resync < max_sector)
+                                bitmap_end_sync(mddev->bitmap,
+                                                mddev->curr_resync,
+                                                &sync_blocks, 1);
+                        bitmap_close_sync(mddev->bitmap);
+                }
+                if (mddev->curr_resync >= max_sector)
+                        conf->fullsync = 0;
                 close_sync(conf);
                 return 0;
         }
 
+        if (!conf->fullsync &&
+            !bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks)) {
+                /* We can skip this block, and probably several more */
+                *skipped = 1;
+                return sync_blocks;
+        }
         /*
          * If there is non-resync activity waiting for us then
          * put in a delay to throttle resync.
@@ -1068,6 +1183,7 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
 
         r1_bio->mddev = mddev;
         r1_bio->sector = sector_nr;
+        r1_bio->state = 0;
         set_bit(R1BIO_IsSync, &r1_bio->state);
         r1_bio->read_disk = disk;
 
@@ -1102,18 +1218,24 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
                 bio->bi_bdev = conf->mirrors[i].rdev->bdev;
                 bio->bi_private = r1_bio;
         }
+
+        if (write_targets + 1 < conf->raid_disks)
+                /* array degraded, can't clear bitmap */
+                set_bit(R1BIO_Degraded, &r1_bio->state);
+
         if (write_targets == 0) {
                 /* There is nowhere to write, so all non-sync
                  * drives must be failed - so we are finished
                  */
-                int rv = max_sector - sector_nr;
-                md_done_sync(mddev, rv, 1);
+                sector_t rv = max_sector - sector_nr;
+                *skipped = 1;
                 put_buf(r1_bio);
                 rdev_dec_pending(conf->mirrors[disk].rdev, mddev);
                 return rv;
         }
 
         nr_sectors = 0;
+        sync_blocks = 0;
         do {
                 struct page *page;
                 int len = PAGE_SIZE;
@@ -1121,6 +1243,17 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
                         len = (max_sector - sector_nr) << 9;
                 if (len == 0)
                         break;
+                if (!conf->fullsync) {
+                        if (sync_blocks == 0) {
+                                if (!bitmap_start_sync(mddev->bitmap,
+                                                       sector_nr, &sync_blocks))
+                                        break;
+                                if (sync_blocks < (PAGE_SIZE>>9))
+                                        BUG();
+                                if (len > (sync_blocks<<9)) len = sync_blocks<<9;
+                        }
+                }
+
                 for (i=0 ; i < conf->raid_disks; i++) {
                         bio = r1_bio->bios[i];
                         if (bio->bi_end_io) {
@@ -1143,6 +1276,7 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
                 }
                 nr_sectors += len>>9;
                 sector_nr += len>>9;
+                sync_blocks -= (len>>9);
         } while (r1_bio->bios[disk]->bi_vcnt < RESYNC_PAGES);
  bio_full:
         bio = r1_bio->bios[disk];
@@ -1231,6 +1365,9 @@ static int run(mddev_t *mddev)
         init_waitqueue_head(&conf->wait_idle);
         init_waitqueue_head(&conf->wait_resume);
 
+        bio_list_init(&conf->pending_bio_list);
+        bio_list_init(&conf->flushing_bio_list);
+
         if (!conf->working_disks) {
                 printk(KERN_ERR "raid1: no operational mirrors for %s\n",
                         mdname(mddev));
@@ -1259,16 +1396,15 @@ static int run(mddev_t *mddev)
         conf->last_used = j;
 
 
-
-        {
-                mddev->thread = md_register_thread(raid1d, mddev, "%s_raid1");
-                if (!mddev->thread) {
-                        printk(KERN_ERR 
-                                "raid1: couldn't allocate thread for %s\n", 
-                                mdname(mddev));
-                        goto out_free_conf;
-                }
+        mddev->thread = md_register_thread(raid1d, mddev, "%s_raid1");
+        if (!mddev->thread) {
+                printk(KERN_ERR
+                       "raid1: couldn't allocate thread for %s\n",
+                       mdname(mddev));
+                goto out_free_conf;
         }
+        if (mddev->bitmap) mddev->thread->timeout = mddev->bitmap->daemon_sleep * HZ;
+
         printk(KERN_INFO 
                 "raid1: raid set %s active with %d out of %d mirrors\n",
                 mdname(mddev), mddev->raid_disks - mddev->degraded, 
@@ -1291,10 +1427,8 @@ out_free_conf:
         if (conf) {
                 if (conf->r1bio_pool)
                         mempool_destroy(conf->r1bio_pool);
-                if (conf->mirrors)
-                        kfree(conf->mirrors);
-                if (conf->poolinfo)
-                        kfree(conf->poolinfo);
+                kfree(conf->mirrors);
+                kfree(conf->poolinfo);
                 kfree(conf);
                 mddev->private = NULL;
         }
@@ -1311,10 +1445,8 @@ static int stop(mddev_t *mddev)
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         if (conf->r1bio_pool)
                 mempool_destroy(conf->r1bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
-        if (conf->poolinfo)
-                kfree(conf->poolinfo);
+        kfree(conf->mirrors);
+        kfree(conf->poolinfo);
         kfree(conf);
         mddev->private = NULL;
         return 0;
@@ -1349,17 +1481,26 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
          * We allocate a new r1bio_pool if we can.
          * Then raise a device barrier and wait until all IO stops.
          * Then resize conf->mirrors and swap in the new r1bio pool.
+         *
+         * At the same time, we "pack" the devices so that all the missing
+         * devices have the higher raid_disk numbers.
          */
         mempool_t *newpool, *oldpool;
         struct pool_info *newpoolinfo;
         mirror_info_t *newmirrors;
         conf_t *conf = mddev_to_conf(mddev);
+        int cnt;
 
-        int d;
+        int d, d2;
 
-        for (d= raid_disks; d < conf->raid_disks; d++)
-                if (conf->mirrors[d].rdev)
+        if (raid_disks < conf->raid_disks) {
+                cnt=0;
+                for (d= 0; d < conf->raid_disks; d++)
+                        if (conf->mirrors[d].rdev)
+                                cnt++;
+                if (cnt > raid_disks)
                         return -EBUSY;
+        }
 
         newpoolinfo = kmalloc(sizeof(*newpoolinfo), GFP_KERNEL);
         if (!newpoolinfo)
@@ -1384,14 +1525,18 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
         spin_lock_irq(&conf->resync_lock);
         conf->barrier++;
         wait_event_lock_irq(conf->wait_idle, !conf->nr_pending,
-                            conf->resync_lock, unplug_slaves(mddev));
+                            conf->resync_lock, raid1_unplug(mddev->queue));
         spin_unlock_irq(&conf->resync_lock);
 
         /* ok, everything is stopped */
         oldpool = conf->r1bio_pool;
         conf->r1bio_pool = newpool;
-        for (d=0; d < raid_disks && d < conf->raid_disks; d++)
-                newmirrors[d] = conf->mirrors[d];
+
+        for (d=d2=0; d < conf->raid_disks; d++)
+                if (conf->mirrors[d].rdev) {
+                        conf->mirrors[d].rdev->raid_disk = d2;
+                        newmirrors[d2++].rdev = conf->mirrors[d].rdev;
+                }
         kfree(conf->mirrors);
         conf->mirrors = newmirrors;
         kfree(conf->poolinfo);
@@ -1400,6 +1545,7 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
         mddev->degraded += (raid_disks - conf->raid_disks);
         conf->raid_disks = mddev->raid_disks = raid_disks;
 
+        conf->last_used = 0; /* just make sure it is in-range */
         spin_lock_irq(&conf->resync_lock);
         conf->barrier--;
         spin_unlock_irq(&conf->resync_lock);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3c37be6423d7..62ebb1bc72be 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -700,6 +700,8 @@ static int make_request(request_queue_t *q, struct bio * bio)
                 return 0;
         }
 
+        md_write_start(mddev, bio);
+
         /*
          * Register the new request and wait if the reconstruction
          * thread has put up a bar for new requests.
@@ -774,7 +776,7 @@ static int make_request(request_queue_t *q, struct bio * bio)
         rcu_read_unlock();
 
         atomic_set(&r10_bio->remaining, 1);
-        md_write_start(mddev);
+
         for (i = 0; i < conf->copies; i++) {
                 struct bio *mbio;
                 int d = r10_bio->devs[i].devnum;
@@ -1216,7 +1218,6 @@ static void raid10d(mddev_t *mddev)
         mdk_rdev_t *rdev;
 
         md_check_recovery(mddev);
-        md_handle_safemode(mddev);
 
         for (;;) {
                 char b[BDEVNAME_SIZE];
@@ -1319,7 +1320,7 @@ static int init_resync(conf_t *conf)
  *
  */
 
-static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
+static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)
 {
         conf_t *conf = mddev_to_conf(mddev);
         r10bio_t *r10_bio;
@@ -1333,7 +1334,7 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
 
         if (!conf->r10buf_pool)
                 if (init_resync(conf))
-                        return -ENOMEM;
+                        return 0;
 
  skipped:
         max_sector = mddev->size << 1;
@@ -1341,15 +1342,15 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
                 max_sector = mddev->resync_max_sectors;
         if (sector_nr >= max_sector) {
                 close_sync(conf);
+                *skipped = 1;
                 return sectors_skipped;
         }
         if (chunks_skipped >= conf->raid_disks) {
                 /* if there has been nothing to do on any drive,
                  * then there is nothing to do at all..
                  */
-                sector_t sec = max_sector - sector_nr;
-                md_done_sync(mddev, sec, 1);
-                return sec + sectors_skipped;
+                *skipped = 1;
+                return (max_sector - sector_nr) + sectors_skipped;
         }
 
         /* make sure whole request will fit in a chunk - if chunks
@@ -1563,17 +1564,22 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
                 }
         }
 
+        if (sectors_skipped)
+                /* pretend they weren't skipped, it makes
+                 * no important difference in this case
+                 */
+                md_done_sync(mddev, sectors_skipped, 1);
+
         return sectors_skipped + nr_sectors;
  giveup:
         /* There is nowhere to write, so all non-sync
          * drives must be failed, so try the next chunk...
          */
         {
-        int sec = max_sector - sector_nr;
+        sector_t sec = max_sector - sector_nr;
         sectors_skipped += sec;
         chunks_skipped ++;
         sector_nr = max_sector;
-        md_done_sync(mddev, sec, 1);
         goto skipped;
         }
 }
@@ -1731,8 +1737,7 @@ static int run(mddev_t *mddev)
 out_free_conf:
         if (conf->r10bio_pool)
                 mempool_destroy(conf->r10bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
+        kfree(conf->mirrors);
         kfree(conf);
         mddev->private = NULL;
 out:
@@ -1748,8 +1753,7 @@ static int stop(mddev_t *mddev)
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
         if (conf->r10bio_pool)
                 mempool_destroy(conf->r10bio_pool);
-        if (conf->mirrors)
-                kfree(conf->mirrors);
+        kfree(conf->mirrors);
         kfree(conf);
         mddev->private = NULL;
         return 0;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 3cb11ac232fa..93a9726cc2d6 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1411,6 +1411,8 @@ static int make_request (request_queue_t *q, struct bio * bi)
         sector_t logical_sector, last_sector;
         struct stripe_head *sh;
 
+        md_write_start(mddev, bi);
+
         if (bio_data_dir(bi)==WRITE) {
                 disk_stat_inc(mddev->gendisk, writes);
                 disk_stat_add(mddev->gendisk, write_sectors, bio_sectors(bi));
@@ -1423,8 +1425,7 @@ static int make_request (request_queue_t *q, struct bio * bi)
         last_sector = bi->bi_sector + (bi->bi_size>>9);
         bi->bi_next = NULL;
         bi->bi_phys_segments = 1;       /* over-loaded to count active stripes */
-        if ( bio_data_dir(bi) == WRITE )
-                md_write_start(mddev);
+
         for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
                 DEFINE_WAIT(w);
                 
@@ -1475,7 +1476,7 @@ static int make_request (request_queue_t *q, struct bio * bi)
 }
 
 /* FIXME go_faster isn't used */
-static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster)
+static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)
 {
         raid5_conf_t *conf = (raid5_conf_t *) mddev->private;
         struct stripe_head *sh;
@@ -1498,8 +1499,8 @@ static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster)
          * nothing we can do.
          */
         if (mddev->degraded >= 1 && test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
-                int rv = (mddev->size << 1) - sector_nr;
-                md_done_sync(mddev, rv, 1);
+                sector_t rv = (mddev->size << 1) - sector_nr;
+                *skipped = 1;
                 return rv;
         }
 
@@ -1546,7 +1547,6 @@ static void raid5d (mddev_t *mddev)
         PRINTK("+++ raid5d active\n");
 
         md_check_recovery(mddev);
-        md_handle_safemode(mddev);
 
         handled = 0;
         spin_lock_irq(&conf->device_lock);
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 908edd78a792..f62ea1a73d0d 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -1570,6 +1570,8 @@ static int make_request (request_queue_t *q, struct bio * bi)
         sector_t logical_sector, last_sector;
         struct stripe_head *sh;
 
+        md_write_start(mddev, bi);
+
         if (bio_data_dir(bi)==WRITE) {
                 disk_stat_inc(mddev->gendisk, writes);
                 disk_stat_add(mddev->gendisk, write_sectors, bio_sectors(bi));
@@ -1583,8 +1585,7 @@ static int make_request (request_queue_t *q, struct bio * bi)
 
         bi->bi_next = NULL;
         bi->bi_phys_segments = 1;       /* over-loaded to count active stripes */
-        if ( bio_data_dir(bi) == WRITE )
-                md_write_start(mddev);
+
         for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
                 DEFINE_WAIT(w);
 
@@ -1634,7 +1635,7 @@ static int make_request (request_queue_t *q, struct bio * bi)
 }
 
 /* FIXME go_faster isn't used */
-static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster)
+static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, int go_faster)
 {
         raid6_conf_t *conf = (raid6_conf_t *) mddev->private;
         struct stripe_head *sh;
@@ -1657,8 +1658,8 @@ static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster)
          * nothing we can do.
          */
         if (mddev->degraded >= 2 && test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
-                int rv = (mddev->size << 1) - sector_nr;
-                md_done_sync(mddev, rv, 1);
+                sector_t rv = (mddev->size << 1) - sector_nr;
+                *skipped = 1;
                 return rv;
         }
 
@@ -1705,7 +1706,6 @@ static void raid6d (mddev_t *mddev)
         PRINTK("+++ raid6d active\n");
 
         md_check_recovery(mddev);
-        md_handle_safemode(mddev);
 
         handled = 0;
         spin_lock_irq(&conf->device_lock);
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index d047e349d706..1339912c308b 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -906,22 +906,12 @@ static int dst_tone_power_cmd(struct dst_state* state)
         if (state->dst_type == DST_TYPE_IS_TERR)
                 return 0;
 
-        if (state->voltage == SEC_VOLTAGE_OFF)
-                paket[4] = 0;
-        else
-                paket[4] = 1;
-
-        if (state->tone == SEC_TONE_ON)
-                paket[2] = 0x02;
-        else
-                paket[2] = 0;
-        if (state->minicmd == SEC_MINI_A)
-                paket[3] = 0x02;
-        else
-                paket[3] = 0;
-
+        paket[4] = state->tx_tuna[4];
+        paket[2] = state->tx_tuna[2];
+        paket[3] = state->tx_tuna[3];
         paket[7] = dst_check_sum (paket, 7);
         dst_command(state, paket, 8);
+
         return 0;
 }
 
@@ -980,7 +970,7 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
 
 static int dst_write_tuna(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         int retval;
         u8 reply;
 
@@ -1048,10 +1038,10 @@ static int dst_write_tuna(struct dvb_frontend* fe)
 
 static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         u8 paket[8] = { 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec };
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
         if (cmd->msg_len == 0 || cmd->msg_len > 4)
@@ -1064,39 +1054,32 @@ static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd*
 
 static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
-        u8 *val;
         int need_cmd;
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         state->voltage = voltage;
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
         need_cmd = 0;
-        val = &state->tx_tuna[0];
-        val[8] &= ~0x40;
         switch (voltage) {
-        case SEC_VOLTAGE_13:
-                if ((state->diseq_flags & HAS_POWER) == 0)
-                        need_cmd = 1;
-                state->diseq_flags |= HAS_POWER;
-                break;
+                case SEC_VOLTAGE_13:
+                case SEC_VOLTAGE_18:
+                        if ((state->diseq_flags & HAS_POWER) == 0)
+                                need_cmd = 1;
+                        state->diseq_flags |= HAS_POWER;
+                        state->tx_tuna[4] = 0x01;
+                        break;
 
-        case SEC_VOLTAGE_18:
-                if ((state->diseq_flags & HAS_POWER) == 0)
+                case SEC_VOLTAGE_OFF:
                         need_cmd = 1;
-                state->diseq_flags |= HAS_POWER;
-                val[8] |= 0x40;
-                break;
-
-        case SEC_VOLTAGE_OFF:
-                need_cmd = 1;
-                state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE);
-                break;
+                        state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE);
+                        state->tx_tuna[4] = 0x00;
+                        break;
 
-        default:
-                return -EINVAL;
+                default:
+                        return -EINVAL;
         }
         if (need_cmd)
                 dst_tone_power_cmd(state);
@@ -1106,37 +1089,56 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 
 static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
-        u8 *val;
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         state->tone = tone;
 
-        if (state->dst_type == DST_TYPE_IS_TERR)
+        if (state->dst_type != DST_TYPE_IS_SAT)
                 return 0;
 
-        val = &state->tx_tuna[0];
+        switch (tone) {
+                case SEC_TONE_OFF:
+                        state->tx_tuna[2] = 0xff;
+                        break;
 
-        val[8] &= ~0x1;
+                case SEC_TONE_ON:
+                        state->tx_tuna[2] = 0x02;
+                        break;
 
-        switch (tone) {
-        case SEC_TONE_OFF:
-                break;
+                default:
+                        return -EINVAL;
+        }
+        dst_tone_power_cmd(state);
 
-        case SEC_TONE_ON:
-                val[8] |= 1;
-                break;
+        return 0;
+}
 
-        default:
-                return -EINVAL;
+static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
+{
+        struct dst_state *state = fe->demodulator_priv;
+
+        if (state->dst_type != DST_TYPE_IS_SAT)
+                return 0;
+
+        state->minicmd = minicmd;
+
+        switch (minicmd) {
+                case SEC_MINI_A:
+                        state->tx_tuna[3] = 0x02;
+                        break;
+                case SEC_MINI_B:
+                        state->tx_tuna[3] = 0xff;
+                        break;
         }
         dst_tone_power_cmd(state);
 
         return 0;
 }
 
+
 static int dst_init(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         static u8 ini_satci_tuna[] = { 9, 0, 3, 0xb6, 1, 0, 0x73, 0x21, 0, 0 };
         static u8 ini_satfta_tuna[] = { 0, 0, 3, 0xb6, 1, 0x55, 0xbd, 0x50, 0, 0 };
         static u8 ini_tvfta_tuna[] = { 0, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 };
@@ -1168,7 +1170,7 @@ static int dst_init(struct dvb_frontend* fe)
 
 static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         *status = 0;
         if (state->diseq_flags & HAS_LOCK) {
@@ -1182,7 +1184,7 @@ static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status)
 
 static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_get_signal(state);
         *strength = state->decode_strength;
@@ -1192,7 +1194,7 @@ static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength)
 
 static int dst_read_snr(struct dvb_frontend* fe, u16* snr)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_get_signal(state);
         *snr = state->decode_snr;
@@ -1202,7 +1204,7 @@ static int dst_read_snr(struct dvb_frontend* fe, u16* snr)
 
 static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         dst_set_freq(state, p->frequency);
         if (verbose > 4)
@@ -1228,7 +1230,7 @@ static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
 
 static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
 
         p->frequency = state->decode_freq;
         p->inversion = state->inversion;
@@ -1248,7 +1250,7 @@ static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
 
 static void dst_release(struct dvb_frontend* fe)
 {
-        struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
+        struct dst_state* state = fe->demodulator_priv;
         kfree(state);
 }
 
@@ -1346,7 +1348,7 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
         .read_signal_strength = dst_read_signal_strength,
         .read_snr = dst_read_snr,
 
-        .diseqc_send_burst = dst_set_tone,
+        .diseqc_send_burst = dst_send_burst,
         .diseqc_send_master_cmd = dst_set_diseqc,
         .set_voltage = dst_set_voltage,
         .set_tone = dst_set_tone,
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 9d9662f4b8e6..4b7adca3e286 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -56,8 +56,7 @@ static const char * const dnames[] = {
 #define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
 #define MAX_DVB_MINORS          (DVB_MAX_ADAPTERS*64)
 
-struct class_simple *dvb_class;
-EXPORT_SYMBOL(dvb_class);
+static struct class *dvb_class;
 
 static struct dvb_device* dvbdev_find_device (int minor)
 {
@@ -236,8 +235,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
                         S_IFCHR | S_IRUSR | S_IWUSR,
                         "dvb/adapter%d/%s%d", adap->num, dnames[type], id);
 
-        class_simple_device_add(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
-                                NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
+        class_device_create(dvb_class, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
+                            NULL, "dvb%d.%s%d", adap->num, dnames[type], id);
 
         dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
                 adap->num, dnames[type], id, nums2minor(adap->num, type, id),
@@ -256,7 +255,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
         devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num,
                         dnames[dvbdev->type], dvbdev->id);
 
-        class_simple_device_remove(MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
+        class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,
                                         dvbdev->type, dvbdev->id)));
 
         list_del (&dvbdev->list_head);
@@ -412,7 +411,7 @@ static int __init init_dvbdev(void)
 
         devfs_mk_dir("dvb");
 
-        dvb_class = class_simple_create(THIS_MODULE, "dvb");
+        dvb_class = class_create(THIS_MODULE, "dvb");
         if (IS_ERR(dvb_class)) {
                 retval = PTR_ERR(dvb_class);
                 goto error;
@@ -429,7 +428,7 @@ error:
 static void __exit exit_dvbdev(void)
 {
         devfs_remove("dvb");
-        class_simple_destroy(dvb_class);
+        class_destroy(dvb_class);
         cdev_del(&dvb_device_cdev);
         unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
 }
diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index 452418b24d7b..33f209a39cb6 100644
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -2,34 +2,54 @@
 menu "Fusion MPT device support"
 
 config FUSION
-        tristate "Fusion MPT (base + ScsiHost) drivers"
+        bool
+        default n
+
+config FUSION_SPI
+        tristate "Fusion MPT ScsiHost drivers for SPI"
+        depends on PCI && SCSI
+        select FUSION
+        ---help---
+          SCSI HOST support for a parallel SCSI host adapters.
+
+          List of supported controllers:
+
+          LSI53C1020
+          LSI53C1020A
+          LSI53C1030
+          LSI53C1035
+
+config FUSION_FC
+        tristate "Fusion MPT ScsiHost drivers for FC"
         depends on PCI && SCSI
+        select FUSION
         ---help---
-          LSI Logic Fusion(TM) Message Passing Technology (MPT) device support
-          provides high performance SCSI host initiator, and LAN [1] interface
-          services to a host system.  The Fusion architecture is capable of
-          duplexing these protocols on high-speed Fibre Channel
-          (up to 2 GHz x 2 ports = 4 GHz) and parallel SCSI (up to Ultra-320)
-          physical medium.
+          SCSI HOST support for a Fiber Channel host adapters.
 
-          [1] LAN is not supported on parallel SCSI medium.
+          List of supported controllers:
+
+          LSIFC909
+          LSIFC919
+          LSIFC919X
+          LSIFC929
+          LSIFC929X
+          LSIFC929XL
 
 config FUSION_MAX_SGE
-        int "Maximum number of scatter gather entries"
+        int "Maximum number of scatter gather entries (16 - 128)"
         depends on FUSION
-        default "40"
+        default "128"
+        range 16 128
         help
           This option allows you to specify the maximum number of scatter-
-          gather entries per I/O. The driver defaults to 40, a reasonable number
-          for most systems. However, the user may increase this up to 128.
-          Increasing this parameter will require significantly more memory 
-          on a per controller instance. Increasing the parameter is not
-          necessary (or recommended) unless the user will be running 
-          large I/O's via the raw interface.
+          gather entries per I/O. The driver default is 128, which matches
+          SCSI_MAX_PHYS_SEGMENTS. However, it may decreased down to 16.
+          Decreasing this parameter will reduce memory requirements
+          on a per controller instance.
 
 config FUSION_CTL
         tristate "Fusion MPT misc device (ioctl) driver"
-        depends on FUSION
+        depends on FUSION_SPI || FUSION_FC
         ---help---
           The Fusion MPT misc device driver provides specialized control
           of MPT adapters via system ioctl calls.  Use of ioctl calls to
@@ -48,7 +68,7 @@ config FUSION_CTL
 
 config FUSION_LAN
         tristate "Fusion MPT LAN driver"
-        depends on FUSION && NET_FC
+        depends on FUSION_FC && NET_FC
         ---help---
           This module supports LAN IP traffic over Fibre Channel port(s)
           on Fusion MPT compatible hardware (LSIFC9xx chips).
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index f6fdcaaefc89..1d2f9db813c1 100644
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -1,52 +1,38 @@
-#
-# Makefile for the LSI Logic Fusion MPT (Message Passing Technology) drivers.
-#
-# Note! If you want to turn on various debug defines for an extended period of
-# time but don't want them lingering around in the Makefile when you pass it on
-# to someone else, use the MPT_CFLAGS env variable (thanks Steve). -nromer
-
-#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-{ LSI_LOGIC
-
-#  Architecture-specific...
-#                       # intel
-#EXTRA_CFLAGS += -g
-#                       # sparc64
-#EXTRA_CFLAGS += -gstabs+
-
-EXTRA_CFLAGS += ${MPT_CFLAGS}
-
 # Fusion MPT drivers; recognized debug defines...
 #  MPT general:
-#EXTRA_CFLAGS += -DMPT_DEBUG_SCSI
 #EXTRA_CFLAGS += -DMPT_DEBUG
 #EXTRA_CFLAGS += -DMPT_DEBUG_MSG_FRAME
 #EXTRA_CFLAGS += -DMPT_DEBUG_SG
+#EXTRA_CFLAGS += -DMPT_DEBUG_EVENTS
+#EXTRA_CFLAGS += -DMPT_DEBUG_INIT
+#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT
+#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL
+
 
 #
 # driver/module specifics...
 #
 #  For mptbase:
 #CFLAGS_mptbase.o += -DMPT_DEBUG_HANDSHAKE
+#CFLAGS_mptbase.o += -DMPT_DEBUG_CONFIG
+#CFLAGS_mptbase.o += -DMPT_DEBUG_DL
 #CFLAGS_mptbase.o += -DMPT_DEBUG_IRQ
+#CFLAGS_mptbase.o += -DMPT_DEBUG_RESET
 #
 #  For mptscsih:
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_SCANDV
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_RESET
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_NEH
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_DV
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_NEGO
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_TM
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_SCSI
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_REPLY
 #
 #  For mptctl:
 #CFLAGS_mptctl.o += -DMPT_DEBUG_IOCTL
 #
-#  For mptlan:
-#CFLAGS_mptlan.o += -DMPT_LAN_IO_DEBUG
-#
-#  For isense:
-
-#  EXP...
-##mptscsih-objs := scsihost.o scsiherr.o
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
-obj-$(CONFIG_FUSION)            += mptbase.o mptscsih.o
+obj-$(CONFIG_FUSION_SPI)        += mptbase.o mptscsih.o mptspi.o
+obj-$(CONFIG_FUSION_FC)         += mptbase.o mptscsih.o mptfc.o
 obj-$(CONFIG_FUSION_CTL)        += mptctl.o
 obj-$(CONFIG_FUSION_LAN)        += mptlan.o
diff --git a/drivers/message/fusion/lsi/mpi.h b/drivers/message/fusion/lsi/mpi.h
index 9dbb061265fe..9f98334e5076 100644
--- a/drivers/message/fusion/lsi/mpi.h
+++ b/drivers/message/fusion/lsi/mpi.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi.h
  *          Title:  MPI Message independent structures and definitions
  *  Creation Date:  July 27, 2000
  *
- *    mpi.h Version:  01.05.xx
+ *    mpi.h Version:  01.05.07
  *
  *  Version History
  *  ---------------
@@ -52,6 +52,25 @@
  *                      obsoleted define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX.
  *  04-01-03  01.02.09  New IOCStatus code: MPI_IOCSTATUS_FC_EXCHANGE_CANCELED
  *  06-26-03  01.02.10  Bumped MPI_HEADER_VERSION_UNIT value.
+ *  01-16-04  01.02.11  Added define for MPI_IOCLOGINFO_TYPE_SHIFT.
+ *  04-29-04  01.02.12  Added function codes for MPI_FUNCTION_DIAG_BUFFER_POST
+ *                      and MPI_FUNCTION_DIAG_RELEASE.
+ *                      Added MPI_IOCSTATUS_DIAGNOSTIC_RELEASED define.
+ *                      Bumped MPI_HEADER_VERSION_UNIT value.
+ *  05-11-04  01.03.01  Bumped MPI_VERSION_MINOR for MPI v1.3.
+ *                      Added codes for Inband.
+ *  08-19-04  01.05.01  Added defines for Host Buffer Access Control doorbell.
+ *                      Added define for offset of High Priority Request Queue.
+ *                      Added new function codes and new IOCStatus codes.
+ *                      Added a IOCLogInfo type of SAS.
+ *  12-07-04  01.05.02  Bumped MPI_HEADER_VERSION_UNIT.
+ *  12-09-04  01.05.03  Bumped MPI_HEADER_VERSION_UNIT.
+ *  01-15-05  01.05.04  Bumped MPI_HEADER_VERSION_UNIT.
+ *  02-09-05  01.05.05  Bumped MPI_HEADER_VERSION_UNIT.
+ *  02-22-05  01.05.06  Bumped MPI_HEADER_VERSION_UNIT.
+ *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Removed EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
  */
 
@@ -82,7 +101,7 @@
 /* Note: The major versions of 0xe0 through 0xff are reserved */
 
 /* versioning for this MPI header set */
-#define MPI_HEADER_VERSION_UNIT             (0x00)
+#define MPI_HEADER_VERSION_UNIT             (0x09)
 #define MPI_HEADER_VERSION_DEV              (0x00)
 #define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)
 #define MPI_HEADER_VERSION_UNIT_SHIFT       (8)
@@ -122,7 +141,11 @@
 *
 *****************************************************************************/
 
-/* S y s t e m    D o o r b e l l */
+/*
+ * Defines for working with the System Doorbell register.
+ * Values for doorbell function codes are included in the section that defines
+ * all the function codes (further on in this file).
+ */
 #define MPI_DOORBELL_OFFSET                 (0x00000000)
 #define MPI_DOORBELL_ACTIVE                 (0x08000000) /* DoorbellUsed */
 #define MPI_DOORBELL_USED                   (MPI_DOORBELL_ACTIVE)
@@ -134,6 +157,13 @@
 #define MPI_DOORBELL_ADD_DWORDS_MASK        (0x00FF0000)
 #define MPI_DOORBELL_ADD_DWORDS_SHIFT       (16)
 #define MPI_DOORBELL_DATA_MASK              (0x0000FFFF)
+#define MPI_DOORBELL_FUNCTION_SPECIFIC_MASK (0x0000FFFF)
+
+/* values for Host Buffer Access Control doorbell function */
+#define MPI_DB_HPBAC_VALUE_MASK             (0x0000F000)
+#define MPI_DB_HPBAC_ENABLE_ACCESS          (0x01)
+#define MPI_DB_HPBAC_DISABLE_ACCESS         (0x02)
+#define MPI_DB_HPBAC_FREE_BUFFER            (0x03)
 
 
 #define MPI_WRITE_SEQUENCE_OFFSET           (0x00000004)
@@ -257,16 +287,18 @@
 
 #define MPI_FUNCTION_SMP_PASSTHROUGH                (0x1A)
 #define MPI_FUNCTION_SAS_IO_UNIT_CONTROL            (0x1B)
+#define MPI_FUNCTION_SATA_PASSTHROUGH               (0x1C)
 
-#define MPI_DIAG_BUFFER_POST                        (0x1D)
-#define MPI_DIAG_RELEASE                            (0x1E)
-
-#define MPI_FUNCTION_SCSI_IO_32                     (0x1F)
+#define MPI_FUNCTION_DIAG_BUFFER_POST               (0x1D)
+#define MPI_FUNCTION_DIAG_RELEASE                   (0x1E)
 
 #define MPI_FUNCTION_LAN_SEND                       (0x20)
 #define MPI_FUNCTION_LAN_RECEIVE                    (0x21)
 #define MPI_FUNCTION_LAN_RESET                      (0x22)
 
+#define MPI_FUNCTION_TARGET_CMD_BUF_BASE_POST       (0x24)
+#define MPI_FUNCTION_TARGET_CMD_BUF_LIST_POST       (0x25)
+
 #define MPI_FUNCTION_INBAND_BUFFER_POST             (0x28)
 #define MPI_FUNCTION_INBAND_SEND                    (0x29)
 #define MPI_FUNCTION_INBAND_RSP                     (0x2A)
@@ -276,6 +308,7 @@
 #define MPI_FUNCTION_IO_UNIT_RESET                  (0x41)
 #define MPI_FUNCTION_HANDSHAKE                      (0x42)
 #define MPI_FUNCTION_REPLY_FRAME_REMOVAL            (0x43)
+#define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL    (0x44)
 
 
 /* standard version format */
@@ -328,8 +361,8 @@ typedef struct _SGE_SIMPLE_UNION
         U32                 Address32;
         U64                 Address64;
     }u;
-} SGESimpleUnion_t, MPI_POINTER pSGESimpleUnion_t,
-  SGE_SIMPLE_UNION, MPI_POINTER PTR_SGE_SIMPLE_UNION;
+} SGE_SIMPLE_UNION, MPI_POINTER PTR_SGE_SIMPLE_UNION,
+  SGESimpleUnion_t, MPI_POINTER pSGESimpleUnion_t;
 
 /****************************************************************************/
 /*  Chain element structures                                                */
@@ -648,27 +681,21 @@ typedef struct _MSG_DEFAULT_REPLY
 #define MPI_IOCSTATUS_SCSI_EXT_TERMINATED       (0x004C)
 
 /****************************************************************************/
-/*  For use by SCSI Initiator and SCSI Target end-to-end data protection    */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_EEDP_CRC_ERROR            (0x004D)
-#define MPI_IOCSTATUS_EEDP_LBA_TAG_ERROR        (0x004E)
-#define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR        (0x004F)
-
-
-/****************************************************************************/
-/*  SCSI (SPI & FCP) target values                                          */
+/*  SCSI Target values                                                      */
 /****************************************************************************/
 
 #define MPI_IOCSTATUS_TARGET_PRIORITY_IO         (0x0060)
 #define MPI_IOCSTATUS_TARGET_INVALID_PORT        (0x0061)
-#define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX    (0x0062)   /* obsolete */
+#define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX    (0x0062)   /* obsolete name */
 #define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX    (0x0062)
 #define MPI_IOCSTATUS_TARGET_ABORTED             (0x0063)
 #define MPI_IOCSTATUS_TARGET_NO_CONN_RETRYABLE   (0x0064)
 #define MPI_IOCSTATUS_TARGET_NO_CONNECTION       (0x0065)
 #define MPI_IOCSTATUS_TARGET_XFER_COUNT_MISMATCH (0x006A)
 #define MPI_IOCSTATUS_TARGET_STS_DATA_NOT_SENT   (0x006B)
+#define MPI_IOCSTATUS_TARGET_DATA_OFFSET_ERROR   (0x006D)
+#define MPI_IOCSTATUS_TARGET_TOO_MUCH_WRITE_DATA (0x006E)
+#define MPI_IOCSTATUS_TARGET_IU_TOO_SHORT        (0x006F)
 
 /****************************************************************************/
 /*  Additional FCP target values (obsolete)                                 */
@@ -707,6 +734,7 @@ typedef struct _MSG_DEFAULT_REPLY
 /****************************************************************************/
 
 #define MPI_IOCSTATUS_SAS_SMP_REQUEST_FAILED    (0x0090)
+#define MPI_IOCSTATUS_SAS_SMP_DATA_OVERRUN      (0x0091)
 
 /****************************************************************************/
 /*  Inband values                                                           */
diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
index a5680d864bf0..15b12b06799d 100644
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_cnfg.h
  *          Title:  MPI Config message, structures, and Pages
  *  Creation Date:  July 27, 2000
  *
- *    mpi_cnfg.h Version:  01.05.xx
+ *    mpi_cnfg.h Version:  01.05.08
  *
  *  Version History
  *  ---------------
@@ -145,6 +145,93 @@
  *                      In CONFIG_PAGE_FC_DEVICE_0, replaced Reserved1 field
  *                      with ADISCHardALPA.
  *                      Added MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY define.
+ *  01-16-04 01.02.13   Added InitiatorDeviceTimeout and InitiatorIoPendTimeout
+ *                      fields and related defines to CONFIG_PAGE_FC_PORT_1.
+ *                      Added define for
+ *                      MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK.
+ *                      Added new fields to the substructures of
+ *                      CONFIG_PAGE_FC_PORT_10.
+ *  04-29-04 01.02.14   Added define for IDP bit for CONFIG_PAGE_SCSI_PORT_0,
+ *                      CONFIG_PAGE_SCSI_DEVICE_0, and
+ *                      CONFIG_PAGE_SCSI_DEVICE_1. Also bumped Page Version for
+ *                      these pages.
+ *  05-11-04 01.03.01   Added structure for CONFIG_PAGE_INBAND_0.
+ *  08-19-04 01.05.01   Modified MSG_CONFIG request to support extended config
+ *                      pages.
+ *                      Added a new structure for extended config page header.
+ *                      Added new extended config pages types and structures for
+ *                      SAS IO Unit, SAS Expander, SAS Device, and SAS PHY.
+ *                      Replaced a reserved byte in CONFIG_PAGE_MANUFACTURING_4
+ *                      to add a Flags field.
+ *                      Two new Manufacturing config pages (5 and 6).
+ *                      Two new bits defined for IO Unit Page 1 Flags field.
+ *                      Modified CONFIG_PAGE_IO_UNIT_2 to add three new fields
+ *                      to specify the BIOS boot device.
+ *                      Four new Flags bits defined for IO Unit Page 2.
+ *                      Added IO Unit Page 4.
+ *                      Added EEDP Flags settings to IOC Page 1.
+ *                      Added new BIOS Page 1 config page.
+ *  10-05-04 01.05.02   Added define for
+ *                      MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE.
+ *                      Added new Flags field to CONFIG_PAGE_MANUFACTURING_5 and
+ *                      associated defines.
+ *                      Added more defines for SAS IO Unit Page 0
+ *                      DiscoveryStatus field.
+ *                      Added define for MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK
+ *                      and MPI_SAS_IOUNIT0_DS_TABLE_LINK.
+ *                      Added defines for Physical Mapping Modes to SAS IO Unit
+ *                      Page 2.
+ *                      Added define for
+ *                      MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH.
+ *  10-27-04 01.05.03   Added defines for new SAS PHY page addressing mode.
+ *                      Added defines for MaxTargetSpinUp to BIOS Page 1.
+ *                      Added 5 new ControlFlags defines for SAS IO Unit
+ *                      Page 1.
+ *                      Added MaxNumPhysicalMappedIDs field to SAS IO Unit
+ *                      Page 2.
+ *                      Added AccessStatus field to SAS Device Page 0 and added
+ *                      new Flags bits for supported SATA features.
+ *  12-07-04  01.05.04  Added config page structures for BIOS Page 2, RAID
+ *                      Volume Page 1, and RAID Physical Disk Page 1.
+ *                      Replaced IO Unit Page 1 BootTargetID,BootBus, and
+ *                      BootAdapterNum with reserved field.
+ *                      Added DataScrubRate and ResyncRate to RAID Volume
+ *                      Page 0.
+ *                      Added MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT
+ *                      define.
+ *  12-09-04  01.05.05  Added Target Mode Large CDB Enable to FC Port Page 1
+ *                      Flags field.
+ *                      Added Auto Port Config flag define for SAS IOUNIT
+ *                      Page 1 ControlFlags.
+ *                      Added Disabled bad Phy define to Expander Page 1
+ *                      Discovery Info field.
+ *                      Added SAS/SATA device support to SAS IOUnit Page 1
+ *                      ControlFlags.
+ *                      Added Unsupported device to SAS Dev Page 0 Flags field
+ *                      Added disable use SATA Hash Address for SAS IOUNIT
+ *                      page 1 in ControlFields.
+ *  01-15-05  01.05.06  Added defaults for data scrub rate and resync rate to
+ *                      Manufacturing Page 4.
+ *                      Added new defines for BIOS Page 1 IOCSettings field.
+ *                      Added ExtDiskIdentifier field to RAID Physical Disk
+ *                      Page 0.
+ *                      Added new defines for SAS IO Unit Page 1 ControlFlags
+ *                      and to SAS Device Page 0 Flags to control SATA devices.
+ *                      Added defines and structures for the new Log Page 0, a
+ *                      new type of configuration page.
+ *  02-09-05  01.05.07  Added InactiveStatus field to RAID Volume Page 0.
+ *                      Added WWID field to RAID Volume Page 1.
+ *                      Added PhysicalPort field to SAS Expander pages 0 and 1.
+ *  03-11-05  01.05.08  Removed the EEDP flags from IOC Page 1.
+ *                      Added Enclosure/Slot boot device format to BIOS Page 2.
+ *                      New status value for RAID Volume Page 0 VolumeStatus
+ *                      (VolumeState subfield).
+ *                      New value for RAID Physical Page 0 InactiveStatus.
+ *                      Added Inactive Volume Member flag RAID Physical Disk
+ *                      Page 0 PhysDiskStatus field.
+ *                      New physical mapping mode in SAS IO Unit Page 2.
+ *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
+ *                      Added Slot and Enclosure fields to SAS Device Page 0.
  *  --------------------------------------------------------------------------
  */
 
@@ -164,7 +251,7 @@ typedef struct _CONFIG_PAGE_HEADER
     U8                      PageLength;                 /* 01h */
     U8                      PageNumber;                 /* 02h */
     U8                      PageType;                   /* 03h */
-} fCONFIG_PAGE_HEADER, MPI_POINTER PTR_CONFIG_PAGE_HEADER,
+} CONFIG_PAGE_HEADER, MPI_POINTER PTR_CONFIG_PAGE_HEADER,
   ConfigPageHeader_t, MPI_POINTER pConfigPageHeader_t;
 
 typedef union _CONFIG_PAGE_HEADER_UNION
@@ -174,7 +261,7 @@ typedef union _CONFIG_PAGE_HEADER_UNION
    U16                 Word16[2];
    U32                 Word32;
 } ConfigPageHeaderUnion, MPI_POINTER pConfigPageHeaderUnion,
-  fCONFIG_PAGE_HEADER_UNION, MPI_POINTER PTR_CONFIG_PAGE_HEADER_UNION;
+  CONFIG_PAGE_HEADER_UNION, MPI_POINTER PTR_CONFIG_PAGE_HEADER_UNION;
 
 typedef struct _CONFIG_EXTENDED_PAGE_HEADER
 {
@@ -185,7 +272,7 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
     U16                 ExtPageLength;              /* 04h */
     U8                  ExtPageType;                /* 06h */
     U8                  Reserved2;                  /* 07h */
-} fCONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER,
+} CONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER,
   ConfigExtendedPageHeader_t, MPI_POINTER pConfigExtendedPageHeader_t;
 
 
@@ -224,6 +311,8 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
 #define MPI_CONFIG_EXTPAGETYPE_SAS_EXPANDER         (0x11)
 #define MPI_CONFIG_EXTPAGETYPE_SAS_DEVICE           (0x12)
 #define MPI_CONFIG_EXTPAGETYPE_SAS_PHY              (0x13)
+#define MPI_CONFIG_EXTPAGETYPE_LOG                  (0x14)
+#define MPI_CONFIG_EXTPAGETYPE_ENCLOSURE            (0x15)
 
 
 /****************************************************************************
@@ -231,10 +320,19 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
 ****************************************************************************/
 #define MPI_SCSI_PORT_PGAD_PORT_MASK                (0x000000FF)
 
+#define MPI_SCSI_DEVICE_FORM_MASK                   (0xF0000000)
+#define MPI_SCSI_DEVICE_FORM_BUS_TID                (0x00000000)
 #define MPI_SCSI_DEVICE_TARGET_ID_MASK              (0x000000FF)
 #define MPI_SCSI_DEVICE_TARGET_ID_SHIFT             (0)
 #define MPI_SCSI_DEVICE_BUS_MASK                    (0x0000FF00)
 #define MPI_SCSI_DEVICE_BUS_SHIFT                   (8)
+#define MPI_SCSI_DEVICE_FORM_TARGET_MODE            (0x10000000)
+#define MPI_SCSI_DEVICE_TM_RESPOND_ID_MASK          (0x000000FF)
+#define MPI_SCSI_DEVICE_TM_RESPOND_ID_SHIFT         (0)
+#define MPI_SCSI_DEVICE_TM_BUS_MASK                 (0x0000FF00)
+#define MPI_SCSI_DEVICE_TM_BUS_SHIFT                (8)
+#define MPI_SCSI_DEVICE_TM_INIT_ID_MASK             (0x00FF0000)
+#define MPI_SCSI_DEVICE_TM_INIT_ID_SHIFT            (16)
 
 #define MPI_FC_PORT_PGAD_PORT_MASK                  (0xF0000000)
 #define MPI_FC_PORT_PGAD_PORT_SHIFT                 (28)
@@ -260,6 +358,20 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
 #define MPI_PHYSDISK_PGAD_PHYSDISKNUM_MASK          (0x000000FF)
 #define MPI_PHYSDISK_PGAD_PHYSDISKNUM_SHIFT         (0)
 
+#define MPI_SAS_EXPAND_PGAD_FORM_MASK             (0xF0000000)
+#define MPI_SAS_EXPAND_PGAD_FORM_SHIFT            (28)
+#define MPI_SAS_EXPAND_PGAD_FORM_GET_NEXT_HANDLE  (0x00000000)
+#define MPI_SAS_EXPAND_PGAD_FORM_HANDLE_PHY_NUM   (0x00000001)
+#define MPI_SAS_EXPAND_PGAD_FORM_HANDLE           (0x00000002)
+#define MPI_SAS_EXPAND_PGAD_GNH_MASK_HANDLE       (0x0000FFFF)
+#define MPI_SAS_EXPAND_PGAD_GNH_SHIFT_HANDLE      (0)
+#define MPI_SAS_EXPAND_PGAD_HPN_MASK_PHY          (0x00FF0000)
+#define MPI_SAS_EXPAND_PGAD_HPN_SHIFT_PHY         (16)
+#define MPI_SAS_EXPAND_PGAD_HPN_MASK_HANDLE       (0x0000FFFF)
+#define MPI_SAS_EXPAND_PGAD_HPN_SHIFT_HANDLE      (0)
+#define MPI_SAS_EXPAND_PGAD_H_MASK_HANDLE         (0x0000FFFF)
+#define MPI_SAS_EXPAND_PGAD_H_SHIFT_HANDLE        (0)
+
 #define MPI_SAS_DEVICE_PGAD_FORM_MASK               (0xF0000000)
 #define MPI_SAS_DEVICE_PGAD_FORM_SHIFT              (28)
 #define MPI_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE    (0x00000000)
@@ -274,10 +386,24 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER
 #define MPI_SAS_DEVICE_PGAD_H_HANDLE_MASK           (0x0000FFFF)
 #define MPI_SAS_DEVICE_PGAD_H_HANDLE_SHIFT          (0)
 
-#define MPI_SAS_PHY_PGAD_PHY_NUMBER_MASK            (0x00FF0000)
-#define MPI_SAS_PHY_PGAD_PHY_NUMBER_SHIFT           (16)
-#define MPI_SAS_PHY_PGAD_DEVHANDLE_MASK             (0x0000FFFF)
-#define MPI_SAS_PHY_PGAD_DEVHANDLE_SHIFT            (0)
+#define MPI_SAS_PHY_PGAD_FORM_MASK                  (0xF0000000)
+#define MPI_SAS_PHY_PGAD_FORM_SHIFT                 (28)
+#define MPI_SAS_PHY_PGAD_FORM_PHY_NUMBER            (0x0)
+#define MPI_SAS_PHY_PGAD_FORM_PHY_TBL_INDEX         (0x1)
+#define MPI_SAS_PHY_PGAD_PHY_NUMBER_MASK            (0x000000FF)
+#define MPI_SAS_PHY_PGAD_PHY_NUMBER_SHIFT           (0)
+#define MPI_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK         (0x0000FFFF)
+#define MPI_SAS_PHY_PGAD_PHY_TBL_INDEX_SHIFT        (0)
+
+#define MPI_SAS_ENCLOS_PGAD_FORM_MASK               (0xF0000000)
+#define MPI_SAS_ENCLOS_PGAD_FORM_SHIFT              (28)
+#define MPI_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE    (0x00000000)
+#define MPI_SAS_ENCLOS_PGAD_FORM_HANDLE             (0x00000001)
+#define MPI_SAS_ENCLOS_PGAD_GNH_HANDLE_MASK         (0x0000FFFF)
+#define MPI_SAS_ENCLOS_PGAD_GNH_HANDLE_SHIFT        (0)
+#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_MASK           (0x0000FFFF)
+#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_SHIFT          (0)
+
 
 
 /****************************************************************************
@@ -294,7 +420,7 @@ typedef struct _MSG_CONFIG
     U8                      MsgFlags;                   /* 07h */
     U32                     MsgContext;                 /* 08h */
     U8                      Reserved2[8];               /* 0Ch */
-    fCONFIG_PAGE_HEADER      Header;                     /* 14h */
+    CONFIG_PAGE_HEADER      Header;                     /* 14h */
     U32                     PageAddress;                /* 18h */
     SGE_IO_UNION            PageBufferSGE;              /* 1Ch */
 } MSG_CONFIG, MPI_POINTER PTR_MSG_CONFIG,
@@ -327,7 +453,7 @@ typedef struct _MSG_CONFIG_REPLY
     U8                      Reserved2[2];               /* 0Ch */
     U16                     IOCStatus;                  /* 0Eh */
     U32                     IOCLogInfo;                 /* 10h */
-    fCONFIG_PAGE_HEADER      Header;                     /* 14h */
+    CONFIG_PAGE_HEADER      Header;                     /* 14h */
 } MSG_CONFIG_REPLY, MPI_POINTER PTR_MSG_CONFIG_REPLY,
   ConfigReply_t, MPI_POINTER pConfigReply_t;
 
@@ -349,6 +475,8 @@ typedef struct _MSG_CONFIG_REPLY
 #define MPI_MANUFACTPAGE_DEVICEID_FC929             (0x0622)
 #define MPI_MANUFACTPAGE_DEVICEID_FC919X            (0x0628)
 #define MPI_MANUFACTPAGE_DEVICEID_FC929X            (0x0626)
+#define MPI_MANUFACTPAGE_DEVICEID_FC939X            (0x0642)
+#define MPI_MANUFACTPAGE_DEVICEID_FC949X            (0x0640)
 /* SCSI */
 #define MPI_MANUFACTPAGE_DEVID_53C1030              (0x0030)
 #define MPI_MANUFACTPAGE_DEVID_53C1030ZC            (0x0031)
@@ -358,18 +486,25 @@ typedef struct _MSG_CONFIG_REPLY
 #define MPI_MANUFACTPAGE_DEVID_53C1035ZC            (0x0041)
 /* SAS */
 #define MPI_MANUFACTPAGE_DEVID_SAS1064              (0x0050)
+#define MPI_MANUFACTPAGE_DEVID_SAS1064A             (0x005C)
+#define MPI_MANUFACTPAGE_DEVID_SAS1064E             (0x0056)
+#define MPI_MANUFACTPAGE_DEVID_SAS1066              (0x005E)
+#define MPI_MANUFACTPAGE_DEVID_SAS1066E             (0x005A)
+#define MPI_MANUFACTPAGE_DEVID_SAS1068              (0x0054)
+#define MPI_MANUFACTPAGE_DEVID_SAS1068E             (0x0058)
+#define MPI_MANUFACTPAGE_DEVID_SAS1078              (0x0060)
 
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U8                      ChipName[16];               /* 04h */
     U8                      ChipRevision[8];            /* 14h */
     U8                      BoardName[16];              /* 1Ch */
     U8                      BoardAssembly[16];          /* 2Ch */
     U8                      BoardTracerNumber[16];      /* 3Ch */
 
-} fCONFIG_PAGE_MANUFACTURING_0, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_0,
+} CONFIG_PAGE_MANUFACTURING_0, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_0,
   ManufacturingPage0_t, MPI_POINTER pManufacturingPage0_t;
 
 #define MPI_MANUFACTURING0_PAGEVERSION                 (0x00)
@@ -377,9 +512,9 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_0
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U8                      VPD[256];                   /* 04h */
-} fCONFIG_PAGE_MANUFACTURING_1, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_1,
+} CONFIG_PAGE_MANUFACTURING_1, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_1,
   ManufacturingPage1_t, MPI_POINTER pManufacturingPage1_t;
 
 #define MPI_MANUFACTURING1_PAGEVERSION                 (0x00)
@@ -404,10 +539,10 @@ typedef struct _MPI_CHIP_REVISION_ID
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_2
 {
-    fCONFIG_PAGE_HEADER      Header;                                 /* 00h */
+    CONFIG_PAGE_HEADER      Header;                                 /* 00h */
     MPI_CHIP_REVISION_ID    ChipId;                                 /* 04h */
     U32                     HwSettings[MPI_MAN_PAGE_2_HW_SETTINGS_WORDS];/* 08h */
-} fCONFIG_PAGE_MANUFACTURING_2, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_2,
+} CONFIG_PAGE_MANUFACTURING_2, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_2,
   ManufacturingPage2_t, MPI_POINTER pManufacturingPage2_t;
 
 #define MPI_MANUFACTURING2_PAGEVERSION                  (0x00)
@@ -423,10 +558,10 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_2
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_3
 {
-    fCONFIG_PAGE_HEADER                  Header;                     /* 00h */
+    CONFIG_PAGE_HEADER                  Header;                     /* 00h */
     MPI_CHIP_REVISION_ID                ChipId;                     /* 04h */
     U32                                 Info[MPI_MAN_PAGE_3_INFO_WORDS];/* 08h */
-} fCONFIG_PAGE_MANUFACTURING_3, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_3,
+} CONFIG_PAGE_MANUFACTURING_3, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_3,
   ManufacturingPage3_t, MPI_POINTER pManufacturingPage3_t;
 
 #define MPI_MANUFACTURING3_PAGEVERSION                  (0x00)
@@ -434,7 +569,7 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_3
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_4
 {
-    fCONFIG_PAGE_HEADER              Header;             /* 00h */
+    CONFIG_PAGE_HEADER              Header;             /* 00h */
     U32                             Reserved1;          /* 04h */
     U8                              InfoOffset0;        /* 08h */
     U8                              InfoSize0;          /* 09h */
@@ -447,10 +582,23 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4
     U32                             ISVolumeSettings;   /* 48h */
     U32                             IMEVolumeSettings;  /* 4Ch */
     U32                             IMVolumeSettings;   /* 50h */
-} fCONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,
+    U32                             Reserved3;          /* 54h */
+    U32                             Reserved4;          /* 58h */
+    U8                              ISDataScrubRate;    /* 5Ch */
+    U8                              ISResyncRate;       /* 5Dh */
+    U16                             Reserved5;          /* 5Eh */
+    U8                              IMEDataScrubRate;   /* 60h */
+    U8                              IMEResyncRate;      /* 61h */
+    U16                             Reserved6;          /* 62h */
+    U8                              IMDataScrubRate;    /* 64h */
+    U8                              IMResyncRate;       /* 65h */
+    U16                             Reserved7;          /* 66h */
+    U32                             Reserved8;          /* 68h */
+    U32                             Reserved9;          /* 6Ch */
+} CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,
   ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t;
 
-#define MPI_MANUFACTURING4_PAGEVERSION                  (0x01)
+#define MPI_MANUFACTURING4_PAGEVERSION                  (0x02)
 
 /* defines for the Flags field */
 #define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA                 (0x01)
@@ -458,19 +606,25 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_5
 {
-    fCONFIG_PAGE_HEADER              Header;             /* 00h */
+    CONFIG_PAGE_HEADER              Header;             /* 00h */
     U64                             BaseWWID;           /* 04h */
-} fCONFIG_PAGE_MANUFACTURING_5, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_5,
+    U8                              Flags;              /* 0Ch */
+    U8                              Reserved1;          /* 0Dh */
+    U16                             Reserved2;          /* 0Eh */
+} CONFIG_PAGE_MANUFACTURING_5, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_5,
   ManufacturingPage5_t, MPI_POINTER pManufacturingPage5_t;
 
-#define MPI_MANUFACTURING5_PAGEVERSION                  (0x00)
+#define MPI_MANUFACTURING5_PAGEVERSION                  (0x01)
+
+/* defines for the Flags field */
+#define MPI_MANPAGE5_TWO_WWID_PER_PHY                   (0x01)
 
 
 typedef struct _CONFIG_PAGE_MANUFACTURING_6
 {
-    fCONFIG_PAGE_HEADER              Header;             /* 00h */
+    CONFIG_PAGE_HEADER              Header;             /* 00h */
     U32                             ProductSpecificInfo;/* 04h */
-} fCONFIG_PAGE_MANUFACTURING_6, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_6,
+} CONFIG_PAGE_MANUFACTURING_6, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_6,
   ManufacturingPage6_t, MPI_POINTER pManufacturingPage6_t;
 
 #define MPI_MANUFACTURING6_PAGEVERSION                  (0x00)
@@ -482,9 +636,9 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6
 
 typedef struct _CONFIG_PAGE_IO_UNIT_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U64                     UniqueValue;                /* 04h */
-} fCONFIG_PAGE_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_0,
+} CONFIG_PAGE_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_0,
   IOUnitPage0_t, MPI_POINTER pIOUnitPage0_t;
 
 #define MPI_IOUNITPAGE0_PAGEVERSION                     (0x00)
@@ -492,9 +646,9 @@ typedef struct _CONFIG_PAGE_IO_UNIT_0
 
 typedef struct _CONFIG_PAGE_IO_UNIT_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Flags;                      /* 04h */
-} fCONFIG_PAGE_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_1,
+} CONFIG_PAGE_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_1,
   IOUnitPage1_t, MPI_POINTER pIOUnitPage1_t;
 
 #define MPI_IOUNITPAGE1_PAGEVERSION                     (0x01)
@@ -524,14 +678,15 @@ typedef struct _MPI_ADAPTER_INFO
 
 typedef struct _CONFIG_PAGE_IO_UNIT_2
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Flags;                      /* 04h */
     U32                     BiosVersion;                /* 08h */
     MPI_ADAPTER_INFO        AdapterOrder[4];            /* 0Ch */
-} fCONFIG_PAGE_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_2,
+    U32                     Reserved1;                  /* 1Ch */
+} CONFIG_PAGE_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_2,
   IOUnitPage2_t, MPI_POINTER pIOUnitPage2_t;
 
-#define MPI_IOUNITPAGE2_PAGEVERSION                     (0x00)
+#define MPI_IOUNITPAGE2_PAGEVERSION                     (0x02)
 
 #define MPI_IOUNITPAGE2_FLAGS_PAUSE_ON_ERROR            (0x00000002)
 #define MPI_IOUNITPAGE2_FLAGS_VERBOSE_ENABLE            (0x00000004)
@@ -554,12 +709,12 @@ typedef struct _CONFIG_PAGE_IO_UNIT_2
 
 typedef struct _CONFIG_PAGE_IO_UNIT_3
 {
-    fCONFIG_PAGE_HEADER      Header;                                   /* 00h */
+    CONFIG_PAGE_HEADER      Header;                                   /* 00h */
     U8                      GPIOCount;                                /* 04h */
     U8                      Reserved1;                                /* 05h */
     U16                     Reserved2;                                /* 06h */
     U16                     GPIOVal[MPI_IO_UNIT_PAGE_3_GPIO_VAL_MAX]; /* 08h */
-} fCONFIG_PAGE_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_3,
+} CONFIG_PAGE_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_3,
   IOUnitPage3_t, MPI_POINTER pIOUnitPage3_t;
 
 #define MPI_IOUNITPAGE3_PAGEVERSION                     (0x01)
@@ -570,13 +725,24 @@ typedef struct _CONFIG_PAGE_IO_UNIT_3
 #define MPI_IOUNITPAGE3_GPIO_SETTING_ON                 (0x01)
 
 
+typedef struct _CONFIG_PAGE_IO_UNIT_4
+{
+    CONFIG_PAGE_HEADER      Header;                                   /* 00h */
+    U32                     Reserved1;                                /* 04h */
+    SGE_SIMPLE_UNION        FWImageSGE;                               /* 08h */
+} CONFIG_PAGE_IO_UNIT_4, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_4,
+  IOUnitPage4_t, MPI_POINTER pIOUnitPage4_t;
+
+#define MPI_IOUNITPAGE4_PAGEVERSION                     (0x00)
+
+
 /****************************************************************************
 *   IOC Config Pages
 ****************************************************************************/
 
 typedef struct _CONFIG_PAGE_IOC_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     TotalNVStore;               /* 04h */
     U32                     FreeNVStore;                /* 08h */
     U16                     VendorID;                   /* 0Ch */
@@ -586,7 +752,7 @@ typedef struct _CONFIG_PAGE_IOC_0
     U32                     ClassCode;                  /* 14h */
     U16                     SubsystemVendorID;          /* 18h */
     U16                     SubsystemID;                /* 1Ah */
-} fCONFIG_PAGE_IOC_0, MPI_POINTER PTR_CONFIG_PAGE_IOC_0,
+} CONFIG_PAGE_IOC_0, MPI_POINTER PTR_CONFIG_PAGE_IOC_0,
   IOCPage0_t, MPI_POINTER pIOCPage0_t;
 
 #define MPI_IOCPAGE0_PAGEVERSION                        (0x01)
@@ -594,23 +760,19 @@ typedef struct _CONFIG_PAGE_IOC_0
 
 typedef struct _CONFIG_PAGE_IOC_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Flags;                      /* 04h */
     U32                     CoalescingTimeout;          /* 08h */
     U8                      CoalescingDepth;            /* 0Ch */
     U8                      PCISlotNum;                 /* 0Dh */
     U8                      Reserved[2];                /* 0Eh */
-} fCONFIG_PAGE_IOC_1, MPI_POINTER PTR_CONFIG_PAGE_IOC_1,
+} CONFIG_PAGE_IOC_1, MPI_POINTER PTR_CONFIG_PAGE_IOC_1,
   IOCPage1_t, MPI_POINTER pIOCPage1_t;
 
-#define MPI_IOCPAGE1_PAGEVERSION                        (0x01)
+#define MPI_IOCPAGE1_PAGEVERSION                        (0x02)
 
 /* defines for the Flags field */
-#define MPI_IOCPAGE1_EEDP_HOST_SUPPORTS_DIF             (0x08000000)
-#define MPI_IOCPAGE1_EEDP_MODE_MASK                     (0x07000000)
-#define MPI_IOCPAGE1_EEDP_MODE_OFF                      (0x00000000)
-#define MPI_IOCPAGE1_EEDP_MODE_T10                      (0x01000000)
-#define MPI_IOCPAGE1_EEDP_MODE_LSI_1                    (0x02000000)
+#define MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE    (0x00000010)
 #define MPI_IOCPAGE1_REPLY_COALESCING                   (0x00000001)
 
 #define MPI_IOCPAGE1_PCISLOTNUM_UNKNOWN                 (0xFF)
@@ -625,7 +787,7 @@ typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
     U8                          VolumeType;             /* 04h */
     U8                          Flags;                  /* 05h */
     U16                         Reserved3;              /* 06h */
-} fCONFIG_PAGE_IOC_2_RAID_VOL, MPI_POINTER PTR_CONFIG_PAGE_IOC_2_RAID_VOL,
+} CONFIG_PAGE_IOC_2_RAID_VOL, MPI_POINTER PTR_CONFIG_PAGE_IOC_2_RAID_VOL,
   ConfigPageIoc2RaidVol_t, MPI_POINTER pConfigPageIoc2RaidVol_t;
 
 /* IOC Page 2 Volume RAID Type values, also used in RAID Volume pages */
@@ -648,14 +810,14 @@ typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
 
 typedef struct _CONFIG_PAGE_IOC_2
 {
-    fCONFIG_PAGE_HEADER          Header;                              /* 00h */
+    CONFIG_PAGE_HEADER          Header;                              /* 00h */
     U32                         CapabilitiesFlags;                   /* 04h */
     U8                          NumActiveVolumes;                    /* 08h */
     U8                          MaxVolumes;                          /* 09h */
     U8                          NumActivePhysDisks;                  /* 0Ah */
     U8                          MaxPhysDisks;                        /* 0Bh */
-    fCONFIG_PAGE_IOC_2_RAID_VOL  RaidVolume[MPI_IOC_PAGE_2_RAID_VOLUME_MAX];/* 0Ch */
-} fCONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
+    CONFIG_PAGE_IOC_2_RAID_VOL  RaidVolume[MPI_IOC_PAGE_2_RAID_VOLUME_MAX];/* 0Ch */
+} CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
   IOCPage2_t, MPI_POINTER pIOCPage2_t;
 
 #define MPI_IOCPAGE2_PAGEVERSION                        (0x02)
@@ -689,12 +851,12 @@ typedef struct _IOC_3_PHYS_DISK
 
 typedef struct _CONFIG_PAGE_IOC_3
 {
-    fCONFIG_PAGE_HEADER          Header;                                /* 00h */
+    CONFIG_PAGE_HEADER          Header;                                /* 00h */
     U8                          NumPhysDisks;                          /* 04h */
     U8                          Reserved1;                             /* 05h */
     U16                         Reserved2;                             /* 06h */
     IOC_3_PHYS_DISK             PhysDisk[MPI_IOC_PAGE_3_PHYSDISK_MAX]; /* 08h */
-} fCONFIG_PAGE_IOC_3, MPI_POINTER PTR_CONFIG_PAGE_IOC_3,
+} CONFIG_PAGE_IOC_3, MPI_POINTER PTR_CONFIG_PAGE_IOC_3,
   IOCPage3_t, MPI_POINTER pIOCPage3_t;
 
 #define MPI_IOCPAGE3_PAGEVERSION                        (0x00)
@@ -718,12 +880,12 @@ typedef struct _IOC_4_SEP
 
 typedef struct _CONFIG_PAGE_IOC_4
 {
-    fCONFIG_PAGE_HEADER          Header;                         /* 00h */
+    CONFIG_PAGE_HEADER          Header;                         /* 00h */
     U8                          ActiveSEP;                      /* 04h */
     U8                          MaxSEP;                         /* 05h */
     U16                         Reserved1;                      /* 06h */
     IOC_4_SEP                   SEP[MPI_IOC_PAGE_4_SEP_MAX];    /* 08h */
-} fCONFIG_PAGE_IOC_4, MPI_POINTER PTR_CONFIG_PAGE_IOC_4,
+} CONFIG_PAGE_IOC_4, MPI_POINTER PTR_CONFIG_PAGE_IOC_4,
   IOCPage4_t, MPI_POINTER pIOCPage4_t;
 
 #define MPI_IOCPAGE4_PAGEVERSION                        (0x00)
@@ -751,25 +913,25 @@ typedef struct _IOC_5_HOT_SPARE
 
 typedef struct _CONFIG_PAGE_IOC_5
 {
-    fCONFIG_PAGE_HEADER          Header;                         /* 00h */
+    CONFIG_PAGE_HEADER          Header;                         /* 00h */
     U32                         Reserved1;                      /* 04h */
     U8                          NumHotSpares;                   /* 08h */
     U8                          Reserved2;                      /* 09h */
     U16                         Reserved3;                      /* 0Ah */
     IOC_5_HOT_SPARE             HotSpare[MPI_IOC_PAGE_5_HOT_SPARE_MAX]; /* 0Ch */
-} fCONFIG_PAGE_IOC_5, MPI_POINTER PTR_CONFIG_PAGE_IOC_5,
+} CONFIG_PAGE_IOC_5, MPI_POINTER PTR_CONFIG_PAGE_IOC_5,
   IOCPage5_t, MPI_POINTER pIOCPage5_t;
 
 #define MPI_IOCPAGE5_PAGEVERSION                        (0x00)
 
 
 /****************************************************************************
-*   BIOS Port Config Pages
+*   BIOS Config Pages
 ****************************************************************************/
 
 typedef struct _CONFIG_PAGE_BIOS_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     BiosOptions;                /* 04h */
     U32                     IOCSettings;                /* 08h */
     U32                     Reserved1;                  /* 0Ch */
@@ -780,10 +942,10 @@ typedef struct _CONFIG_PAGE_BIOS_1
     U16                     IOTimeoutSequential;        /* 1Ah */
     U16                     IOTimeoutOther;             /* 1Ch */
     U16                     IOTimeoutBlockDevicesRM;    /* 1Eh */
-} fCONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1,
+} CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1,
   BIOSPage1_t, MPI_POINTER pBIOSPage1_t;
 
-#define MPI_BIOSPAGE1_PAGEVERSION                       (0x00)
+#define MPI_BIOSPAGE1_PAGEVERSION                       (0x01)
 
 /* values for the BiosOptions field */
 #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE                (0x00000400)
@@ -792,6 +954,13 @@ typedef struct _CONFIG_PAGE_BIOS_1
 #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS              (0x00000001)
 
 /* values for the IOCSettings field */
+#define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE       (0x00030000)
+#define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT        (0x00000000)
+#define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT           (0x00010000)
+
+#define MPI_BIOSPAGE1_IOCSET_MASK_MAX_TARGET_SPIN_UP    (0x0000F000)
+#define MPI_BIOSPAGE1_IOCSET_SHIFT_MAX_TARGET_SPIN_UP   (12)
+
 #define MPI_BIOSPAGE1_IOCSET_MASK_SPINUP_DELAY          (0x00000F00)
 #define MPI_BIOSPAGE1_IOCSET_SHIFT_SPINUP_DELAY         (8)
 
@@ -814,6 +983,191 @@ typedef struct _CONFIG_PAGE_BIOS_1
 #define MPI_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN         (0x00000002)
 #define MPI_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN          (0x00000001)
 
+typedef struct _MPI_BOOT_DEVICE_ADAPTER_ORDER
+{
+    U32         Reserved1;                              /* 00h */
+    U32         Reserved2;                              /* 04h */
+    U32         Reserved3;                              /* 08h */
+    U32         Reserved4;                              /* 0Ch */
+    U32         Reserved5;                              /* 10h */
+    U32         Reserved6;                              /* 14h */
+    U32         Reserved7;                              /* 18h */
+    U32         Reserved8;                              /* 1Ch */
+    U32         Reserved9;                              /* 20h */
+    U32         Reserved10;                             /* 24h */
+    U32         Reserved11;                             /* 28h */
+    U32         Reserved12;                             /* 2Ch */
+    U32         Reserved13;                             /* 30h */
+    U32         Reserved14;                             /* 34h */
+    U32         Reserved15;                             /* 38h */
+    U32         Reserved16;                             /* 3Ch */
+    U32         Reserved17;                             /* 40h */
+} MPI_BOOT_DEVICE_ADAPTER_ORDER, MPI_POINTER PTR_MPI_BOOT_DEVICE_ADAPTER_ORDER;
+
+typedef struct _MPI_BOOT_DEVICE_ADAPTER_NUMBER
+{
+    U8          TargetID;                               /* 00h */
+    U8          Bus;                                    /* 01h */
+    U8          AdapterNumber;                          /* 02h */
+    U8          Reserved1;                              /* 03h */
+    U32         Reserved2;                              /* 04h */
+    U32         Reserved3;                              /* 08h */
+    U32         Reserved4;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U32         Reserved5;                              /* 18h */
+    U32         Reserved6;                              /* 1Ch */
+    U32         Reserved7;                              /* 20h */
+    U32         Reserved8;                              /* 24h */
+    U32         Reserved9;                              /* 28h */
+    U32         Reserved10;                             /* 2Ch */
+    U32         Reserved11;                             /* 30h */
+    U32         Reserved12;                             /* 34h */
+    U32         Reserved13;                             /* 38h */
+    U32         Reserved14;                             /* 3Ch */
+    U32         Reserved15;                             /* 40h */
+} MPI_BOOT_DEVICE_ADAPTER_NUMBER, MPI_POINTER PTR_MPI_BOOT_DEVICE_ADAPTER_NUMBER;
+
+typedef struct _MPI_BOOT_DEVICE_PCI_ADDRESS
+{
+    U8          TargetID;                               /* 00h */
+    U8          Bus;                                    /* 01h */
+    U16         PCIAddress;                             /* 02h */
+    U32         Reserved1;                              /* 04h */
+    U32         Reserved2;                              /* 08h */
+    U32         Reserved3;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U32         Reserved4;                              /* 18h */
+    U32         Reserved5;                              /* 1Ch */
+    U32         Reserved6;                              /* 20h */
+    U32         Reserved7;                              /* 24h */
+    U32         Reserved8;                              /* 28h */
+    U32         Reserved9;                              /* 2Ch */
+    U32         Reserved10;                             /* 30h */
+    U32         Reserved11;                             /* 34h */
+    U32         Reserved12;                             /* 38h */
+    U32         Reserved13;                             /* 3Ch */
+    U32         Reserved14;                             /* 40h */
+} MPI_BOOT_DEVICE_PCI_ADDRESS, MPI_POINTER PTR_MPI_BOOT_DEVICE_PCI_ADDRESS;
+
+typedef struct _MPI_BOOT_DEVICE_SLOT_NUMBER
+{
+    U8          TargetID;                               /* 00h */
+    U8          Bus;                                    /* 01h */
+    U8          PCISlotNumber;                          /* 02h */
+    U8          Reserved1;                              /* 03h */
+    U32         Reserved2;                              /* 04h */
+    U32         Reserved3;                              /* 08h */
+    U32         Reserved4;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U32         Reserved5;                              /* 18h */
+    U32         Reserved6;                              /* 1Ch */
+    U32         Reserved7;                              /* 20h */
+    U32         Reserved8;                              /* 24h */
+    U32         Reserved9;                              /* 28h */
+    U32         Reserved10;                             /* 2Ch */
+    U32         Reserved11;                             /* 30h */
+    U32         Reserved12;                             /* 34h */
+    U32         Reserved13;                             /* 38h */
+    U32         Reserved14;                             /* 3Ch */
+    U32         Reserved15;                             /* 40h */
+} MPI_BOOT_DEVICE_PCI_SLOT_NUMBER, MPI_POINTER PTR_MPI_BOOT_DEVICE_PCI_SLOT_NUMBER;
+
+typedef struct _MPI_BOOT_DEVICE_FC_WWN
+{
+    U64         WWPN;                                   /* 00h */
+    U32         Reserved1;                              /* 08h */
+    U32         Reserved2;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U32         Reserved3;                              /* 18h */
+    U32         Reserved4;                              /* 1Ch */
+    U32         Reserved5;                              /* 20h */
+    U32         Reserved6;                              /* 24h */
+    U32         Reserved7;                              /* 28h */
+    U32         Reserved8;                              /* 2Ch */
+    U32         Reserved9;                              /* 30h */
+    U32         Reserved10;                             /* 34h */
+    U32         Reserved11;                             /* 38h */
+    U32         Reserved12;                             /* 3Ch */
+    U32         Reserved13;                             /* 40h */
+} MPI_BOOT_DEVICE_FC_WWN, MPI_POINTER PTR_MPI_BOOT_DEVICE_FC_WWN;
+
+typedef struct _MPI_BOOT_DEVICE_SAS_WWN
+{
+    U64         SASAddress;                             /* 00h */
+    U32         Reserved1;                              /* 08h */
+    U32         Reserved2;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U32         Reserved3;                              /* 18h */
+    U32         Reserved4;                              /* 1Ch */
+    U32         Reserved5;                              /* 20h */
+    U32         Reserved6;                              /* 24h */
+    U32         Reserved7;                              /* 28h */
+    U32         Reserved8;                              /* 2Ch */
+    U32         Reserved9;                              /* 30h */
+    U32         Reserved10;                             /* 34h */
+    U32         Reserved11;                             /* 38h */
+    U32         Reserved12;                             /* 3Ch */
+    U32         Reserved13;                             /* 40h */
+} MPI_BOOT_DEVICE_SAS_WWN, MPI_POINTER PTR_MPI_BOOT_DEVICE_SAS_WWN;
+
+typedef struct _MPI_BOOT_DEVICE_ENCLOSURE_SLOT
+{
+    U64         EnclosureLogicalID;                     /* 00h */
+    U32         Reserved1;                              /* 08h */
+    U32         Reserved2;                              /* 0Ch */
+    U8          LUN[8];                                 /* 10h */
+    U16         SlotNumber;                             /* 18h */
+    U16         Reserved3;                              /* 1Ah */
+    U32         Reserved4;                              /* 1Ch */
+    U32         Reserved5;                              /* 20h */
+    U32         Reserved6;                              /* 24h */
+    U32         Reserved7;                              /* 28h */
+    U32         Reserved8;                              /* 2Ch */
+    U32         Reserved9;                              /* 30h */
+    U32         Reserved10;                             /* 34h */
+    U32         Reserved11;                             /* 38h */
+    U32         Reserved12;                             /* 3Ch */
+    U32         Reserved13;                             /* 40h */
+} MPI_BOOT_DEVICE_ENCLOSURE_SLOT,
+  MPI_POINTER PTR_MPI_BOOT_DEVICE_ENCLOSURE_SLOT;
+
+typedef union _MPI_BIOSPAGE2_BOOT_DEVICE
+{
+    MPI_BOOT_DEVICE_ADAPTER_ORDER   AdapterOrder;
+    MPI_BOOT_DEVICE_ADAPTER_NUMBER  AdapterNumber;
+    MPI_BOOT_DEVICE_PCI_ADDRESS     PCIAddress;
+    MPI_BOOT_DEVICE_PCI_SLOT_NUMBER PCISlotNumber;
+    MPI_BOOT_DEVICE_FC_WWN          FcWwn;
+    MPI_BOOT_DEVICE_SAS_WWN         SasWwn;
+    MPI_BOOT_DEVICE_ENCLOSURE_SLOT  EnclosureSlot;
+} MPI_BIOSPAGE2_BOOT_DEVICE, MPI_POINTER PTR_MPI_BIOSPAGE2_BOOT_DEVICE;
+
+typedef struct _CONFIG_PAGE_BIOS_2
+{
+    CONFIG_PAGE_HEADER          Header;                 /* 00h */
+    U32                         Reserved1;              /* 04h */
+    U32                         Reserved2;              /* 08h */
+    U32                         Reserved3;              /* 0Ch */
+    U32                         Reserved4;              /* 10h */
+    U32                         Reserved5;              /* 14h */
+    U32                         Reserved6;              /* 18h */
+    U8                          BootDeviceForm;         /* 1Ch */
+    U8                          Reserved7;              /* 1Dh */
+    U16                         Reserved8;              /* 1Eh */
+    MPI_BIOSPAGE2_BOOT_DEVICE   BootDevice;             /* 20h */
+} CONFIG_PAGE_BIOS_2, MPI_POINTER PTR_CONFIG_PAGE_BIOS_2,
+  BIOSPage2_t, MPI_POINTER pBIOSPage2_t;
+
+#define MPI_BIOSPAGE2_PAGEVERSION                       (0x01)
+
+#define MPI_BIOSPAGE2_FORM_MASK                         (0x0F)
+#define MPI_BIOSPAGE2_FORM_ADAPTER_ORDER                (0x00)
+#define MPI_BIOSPAGE2_FORM_ADAPTER_NUMBER               (0x01)
+#define MPI_BIOSPAGE2_FORM_PCI_ADDRESS                  (0x02)
+#define MPI_BIOSPAGE2_FORM_PCI_SLOT_NUMBER              (0x03)
+#define MPI_BIOSPAGE2_FORM_FC_WWN                       (0x04)
+#define MPI_BIOSPAGE2_FORM_SAS_WWN                      (0x05)
+
 
 /****************************************************************************
 *   SCSI Port Config Pages
@@ -821,13 +1175,13 @@ typedef struct _CONFIG_PAGE_BIOS_1
 
 typedef struct _CONFIG_PAGE_SCSI_PORT_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Capabilities;               /* 04h */
     U32                     PhysicalInterface;          /* 08h */
-} fCONFIG_PAGE_SCSI_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_0,
+} CONFIG_PAGE_SCSI_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_0,
   SCSIPortPage0_t, MPI_POINTER pSCSIPortPage0_t;
 
-#define MPI_SCSIPORTPAGE0_PAGEVERSION                   (0x01)
+#define MPI_SCSIPORTPAGE0_PAGEVERSION                   (0x02)
 
 #define MPI_SCSIPORTPAGE0_CAP_IU                        (0x00000001)
 #define MPI_SCSIPORTPAGE0_CAP_DT                        (0x00000002)
@@ -854,6 +1208,7 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_0
     (  ((Cap) & MPI_SCSIPORTPAGE0_CAP_MASK_MAX_SYNC_OFFSET) \
     >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET          \
     )
+#define MPI_SCSIPORTPAGE0_CAP_IDP                       (0x08000000)
 #define MPI_SCSIPORTPAGE0_CAP_WIDE                      (0x20000000)
 #define MPI_SCSIPORTPAGE0_CAP_AIP                       (0x80000000)
 
@@ -869,13 +1224,13 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_0
 
 typedef struct _CONFIG_PAGE_SCSI_PORT_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Configuration;              /* 04h */
     U32                     OnBusTimerValue;            /* 08h */
     U8                      TargetConfig;               /* 0Ch */
     U8                      Reserved1;                  /* 0Dh */
     U16                     IDConfig;                   /* 0Eh */
-} fCONFIG_PAGE_SCSI_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_1,
+} CONFIG_PAGE_SCSI_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_1,
   SCSIPortPage1_t, MPI_POINTER pSCSIPortPage1_t;
 
 #define MPI_SCSIPORTPAGE1_PAGEVERSION                   (0x03)
@@ -900,11 +1255,11 @@ typedef struct _MPI_DEVICE_INFO
 
 typedef struct _CONFIG_PAGE_SCSI_PORT_2
 {
-    fCONFIG_PAGE_HEADER  Header;                         /* 00h */
+    CONFIG_PAGE_HEADER  Header;                         /* 00h */
     U32                 PortFlags;                      /* 04h */
     U32                 PortSettings;                   /* 08h */
     MPI_DEVICE_INFO     DeviceSettings[16];             /* 0Ch */
-} fCONFIG_PAGE_SCSI_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_2,
+} CONFIG_PAGE_SCSI_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_2,
   SCSIPortPage2_t, MPI_POINTER pSCSIPortPage2_t;
 
 #define MPI_SCSIPORTPAGE2_PAGEVERSION                       (0x02)
@@ -953,13 +1308,13 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2
 
 typedef struct _CONFIG_PAGE_SCSI_DEVICE_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     NegotiatedParameters;       /* 04h */
     U32                     Information;                /* 08h */
-} fCONFIG_PAGE_SCSI_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_0,
+} CONFIG_PAGE_SCSI_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_0,
   SCSIDevicePage0_t, MPI_POINTER pSCSIDevicePage0_t;
 
-#define MPI_SCSIDEVPAGE0_PAGEVERSION                    (0x03)
+#define MPI_SCSIDEVPAGE0_PAGEVERSION                    (0x04)
 
 #define MPI_SCSIDEVPAGE0_NP_IU                          (0x00000001)
 #define MPI_SCSIDEVPAGE0_NP_DT                          (0x00000002)
@@ -973,6 +1328,7 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_0
 #define MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD           (8)
 #define MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK        (0x00FF0000)
 #define MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_OFFSET           (16)
+#define MPI_SCSIDEVPAGE0_NP_IDP                         (0x08000000)
 #define MPI_SCSIDEVPAGE0_NP_WIDE                        (0x20000000)
 #define MPI_SCSIDEVPAGE0_NP_AIP                         (0x80000000)
 
@@ -984,14 +1340,14 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_0
 
 typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     RequestedParameters;        /* 04h */
     U32                     Reserved;                   /* 08h */
     U32                     Configuration;              /* 0Ch */
-} fCONFIG_PAGE_SCSI_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_1,
+} CONFIG_PAGE_SCSI_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_1,
   SCSIDevicePage1_t, MPI_POINTER pSCSIDevicePage1_t;
 
-#define MPI_SCSIDEVPAGE1_PAGEVERSION                    (0x04)
+#define MPI_SCSIDEVPAGE1_PAGEVERSION                    (0x05)
 
 #define MPI_SCSIDEVPAGE1_RP_IU                          (0x00000001)
 #define MPI_SCSIDEVPAGE1_RP_DT                          (0x00000002)
@@ -1005,6 +1361,7 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
 #define MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD       (8)
 #define MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK        (0x00FF0000)
 #define MPI_SCSIDEVPAGE1_RP_SHIFT_MAX_SYNC_OFFSET       (16)
+#define MPI_SCSIDEVPAGE1_RP_IDP                         (0x08000000)
 #define MPI_SCSIDEVPAGE1_RP_WIDE                        (0x20000000)
 #define MPI_SCSIDEVPAGE1_RP_AIP                         (0x80000000)
 
@@ -1016,11 +1373,11 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
 
 typedef struct _CONFIG_PAGE_SCSI_DEVICE_2
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     DomainValidation;           /* 04h */
     U32                     ParityPipeSelect;           /* 08h */
     U32                     DataPipeSelect;             /* 0Ch */
-} fCONFIG_PAGE_SCSI_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_2,
+} CONFIG_PAGE_SCSI_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_2,
   SCSIDevicePage2_t, MPI_POINTER pSCSIDevicePage2_t;
 
 #define MPI_SCSIDEVPAGE2_PAGEVERSION                    (0x01)
@@ -1057,12 +1414,12 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_2
 
 typedef struct _CONFIG_PAGE_SCSI_DEVICE_3
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U16                     MsgRejectCount;             /* 04h */
     U16                     PhaseErrorCount;            /* 06h */
     U16                     ParityErrorCount;           /* 08h */
     U16                     Reserved;                   /* 0Ah */
-} fCONFIG_PAGE_SCSI_DEVICE_3, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_3,
+} CONFIG_PAGE_SCSI_DEVICE_3, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_3,
   SCSIDevicePage3_t, MPI_POINTER pSCSIDevicePage3_t;
 
 #define MPI_SCSIDEVPAGE3_PAGEVERSION                    (0x00)
@@ -1077,7 +1434,7 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_3
 
 typedef struct _CONFIG_PAGE_FC_PORT_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Flags;                      /* 04h */
     U8                      MPIPortNumber;              /* 08h */
     U8                      LinkType;                   /* 09h */
@@ -1098,7 +1455,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_0
     U8                      MaxHardAliasesSupported;    /* 49h */
     U8                      NumCurrentAliases;          /* 4Ah */
     U8                      Reserved1;                  /* 4Bh */
-} fCONFIG_PAGE_FC_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_0,
+} CONFIG_PAGE_FC_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_0,
   FCPortPage0_t, MPI_POINTER pFCPortPage0_t;
 
 #define MPI_FCPORTPAGE0_PAGEVERSION                     (0x02)
@@ -1164,10 +1521,9 @@ typedef struct _CONFIG_PAGE_FC_PORT_0
 #define MPI_FCPORTPAGE0_CURRENT_SPEED_NOT_NEGOTIATED    (0x00008000)        /* (SNIA)HBA_PORTSPEED_NOT_NEGOTIATED (1<<15) Speed not established */
 
 
-
 typedef struct _CONFIG_PAGE_FC_PORT_1
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Flags;                      /* 04h */
     U64                     NoSEEPROMWWNN;              /* 08h */
     U64                     NoSEEPROMWWPN;              /* 10h */
@@ -1179,7 +1535,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_1
     U8                      RR_TOV;                     /* 1Dh */
     U8                      InitiatorDeviceTimeout;     /* 1Eh */
     U8                      InitiatorIoPendTimeout;     /* 1Fh */
-} fCONFIG_PAGE_FC_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_1,
+} CONFIG_PAGE_FC_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_1,
   FCPortPage1_t, MPI_POINTER pFCPortPage1_t;
 
 #define MPI_FCPORTPAGE1_PAGEVERSION                     (0x06)
@@ -1191,6 +1547,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_1
 #define MPI_FCPORTPAGE1_FLAGS_TARGET_MODE_OXID          (0x00800000)
 #define MPI_FCPORTPAGE1_FLAGS_PORT_OFFLINE              (0x00400000)
 #define MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK        (0x00200000)
+#define MPI_FCPORTPAGE1_FLAGS_TARGET_LARGE_CDB_ENABLE   (0x00000080)
 #define MPI_FCPORTPAGE1_FLAGS_MASK_RR_TOV_UNITS         (0x00000070)
 #define MPI_FCPORTPAGE1_FLAGS_SUPPRESS_PROT_REG         (0x00000008)
 #define MPI_FCPORTPAGE1_FLAGS_PLOGI_ON_LOGO             (0x00000004)
@@ -1227,14 +1584,15 @@ typedef struct _CONFIG_PAGE_FC_PORT_1
 #define MPI_FCPORTPAGE1_ALT_CONN_UNKNOWN                (0x00)
 
 #define MPI_FCPORTPAGE1_INITIATOR_DEV_TIMEOUT_MASK      (0x7F)
+#define MPI_FCPORTPAGE1_INITIATOR_DEV_UNIT_16           (0x80)
 
 
 typedef struct _CONFIG_PAGE_FC_PORT_2
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U8                      NumberActive;               /* 04h */
     U8                      ALPA[127];                  /* 05h */
-} fCONFIG_PAGE_FC_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_2,
+} CONFIG_PAGE_FC_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_2,
   FCPortPage2_t, MPI_POINTER pFCPortPage2_t;
 
 #define MPI_FCPORTPAGE2_PAGEVERSION                     (0x01)
@@ -1280,9 +1638,9 @@ typedef struct _FC_PORT_PERSISTENT
 
 typedef struct _CONFIG_PAGE_FC_PORT_3
 {
-    fCONFIG_PAGE_HEADER      Header;                                 /* 00h */
+    CONFIG_PAGE_HEADER      Header;                                 /* 00h */
     FC_PORT_PERSISTENT      Entry[MPI_FC_PORT_PAGE_3_ENTRY_MAX];    /* 04h */
-} fCONFIG_PAGE_FC_PORT_3, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_3,
+} CONFIG_PAGE_FC_PORT_3, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_3,
   FCPortPage3_t, MPI_POINTER pFCPortPage3_t;
 
 #define MPI_FCPORTPAGE3_PAGEVERSION                     (0x01)
@@ -1290,10 +1648,10 @@ typedef struct _CONFIG_PAGE_FC_PORT_3
 
 typedef struct _CONFIG_PAGE_FC_PORT_4
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     PortFlags;                  /* 04h */
     U32                     PortSettings;               /* 08h */
-} fCONFIG_PAGE_FC_PORT_4, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_4,
+} CONFIG_PAGE_FC_PORT_4, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_4,
   FCPortPage4_t, MPI_POINTER pFCPortPage4_t;
 
 #define MPI_FCPORTPAGE4_PAGEVERSION                     (0x00)
@@ -1316,15 +1674,15 @@ typedef struct _CONFIG_PAGE_FC_PORT_5_ALIAS_INFO
     U16     Reserved;                                   /* 02h */
     U64     AliasWWNN;                                  /* 04h */
     U64     AliasWWPN;                                  /* 0Ch */
-} fCONFIG_PAGE_FC_PORT_5_ALIAS_INFO,
+} CONFIG_PAGE_FC_PORT_5_ALIAS_INFO,
   MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5_ALIAS_INFO,
   FcPortPage5AliasInfo_t, MPI_POINTER pFcPortPage5AliasInfo_t;
 
 typedef struct _CONFIG_PAGE_FC_PORT_5
 {
-    fCONFIG_PAGE_HEADER                  Header;         /* 00h */
-    fCONFIG_PAGE_FC_PORT_5_ALIAS_INFO    AliasInfo;      /* 04h */
-} fCONFIG_PAGE_FC_PORT_5, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5,
+    CONFIG_PAGE_HEADER                  Header;         /* 00h */
+    CONFIG_PAGE_FC_PORT_5_ALIAS_INFO    AliasInfo;      /* 04h */
+} CONFIG_PAGE_FC_PORT_5, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5,
   FCPortPage5_t, MPI_POINTER pFCPortPage5_t;
 
 #define MPI_FCPORTPAGE5_PAGEVERSION                     (0x02)
@@ -1337,7 +1695,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_5
 
 typedef struct _CONFIG_PAGE_FC_PORT_6
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Reserved;                   /* 04h */
     U64                     TimeSinceReset;             /* 08h */
     U64                     TxFrames;                   /* 10h */
@@ -1355,7 +1713,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_6
     U64                     InvalidTxWordCount;         /* 70h */
     U64                     InvalidCrcCount;            /* 78h */
     U64                     FcpInitiatorIoCount;        /* 80h */
-} fCONFIG_PAGE_FC_PORT_6, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_6,
+} CONFIG_PAGE_FC_PORT_6, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_6,
   FCPortPage6_t, MPI_POINTER pFCPortPage6_t;
 
 #define MPI_FCPORTPAGE6_PAGEVERSION                     (0x00)
@@ -1363,10 +1721,10 @@ typedef struct _CONFIG_PAGE_FC_PORT_6
 
 typedef struct _CONFIG_PAGE_FC_PORT_7
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Reserved;                   /* 04h */
     U8                      PortSymbolicName[256];      /* 08h */
-} fCONFIG_PAGE_FC_PORT_7, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_7,
+} CONFIG_PAGE_FC_PORT_7, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_7,
   FCPortPage7_t, MPI_POINTER pFCPortPage7_t;
 
 #define MPI_FCPORTPAGE7_PAGEVERSION                     (0x00)
@@ -1374,9 +1732,9 @@ typedef struct _CONFIG_PAGE_FC_PORT_7
 
 typedef struct _CONFIG_PAGE_FC_PORT_8
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     BitVector[8];               /* 04h */
-} fCONFIG_PAGE_FC_PORT_8, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_8,
+} CONFIG_PAGE_FC_PORT_8, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_8,
   FCPortPage8_t, MPI_POINTER pFCPortPage8_t;
 
 #define MPI_FCPORTPAGE8_PAGEVERSION                     (0x00)
@@ -1384,7 +1742,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_8
 
 typedef struct _CONFIG_PAGE_FC_PORT_9
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U32                     Reserved;                   /* 04h */
     U64                     GlobalWWPN;                 /* 08h */
     U64                     GlobalWWNN;                 /* 10h */
@@ -1396,7 +1754,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_9
     U8                      IPAddress[16];              /* 28h */
     U16                     Reserved1;                  /* 38h */
     U16                     TopologyDiscoveryFlags;     /* 3Ah */
-} fCONFIG_PAGE_FC_PORT_9, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_9,
+} CONFIG_PAGE_FC_PORT_9, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_9,
   FCPortPage9_t, MPI_POINTER pFCPortPage9_t;
 
 #define MPI_FCPORTPAGE9_PAGEVERSION                     (0x00)
@@ -1422,10 +1780,10 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA
     U8                      VendorOUI[3];               /* 35h */
     U8                      VendorPN[16];               /* 38h */
     U8                      VendorRev[4];               /* 48h */
-    U16                     Reserved4;                  /* 4Ch */
-    U8                      Reserved5;                  /* 4Eh */
+    U16                     Wavelength;                 /* 4Ch */
+    U8                      Reserved4;                  /* 4Eh */
     U8                      CC_BASE;                    /* 4Fh */
-} fCONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA,
+} CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA,
   MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA,
   FCPortPage10BaseSfpData_t, MPI_POINTER pFCPortPage10BaseSfpData_t;
 
@@ -1481,9 +1839,11 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA
     U8                      BitRateMin;                 /* 53h */
     U8                      VendorSN[16];               /* 54h */
     U8                      DateCode[8];                /* 64h */
-    U8                      Reserved5[3];               /* 6Ch */
+    U8                      DiagMonitoringType;         /* 6Ch */
+    U8                      EnhancedOptions;            /* 6Dh */
+    U8                      SFF8472Compliance;          /* 6Eh */
     U8                      CC_EXT;                     /* 6Fh */
-} fCONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA,
+} CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA,
   MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA,
   FCPortPage10ExtendedSfpData_t, MPI_POINTER pFCPortPage10ExtendedSfpData_t;
 
@@ -1496,19 +1856,19 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA
 
 typedef struct _CONFIG_PAGE_FC_PORT_10
 {
-    fCONFIG_PAGE_HEADER                          Header;             /* 00h */
+    CONFIG_PAGE_HEADER                          Header;             /* 00h */
     U8                                          Flags;              /* 04h */
     U8                                          Reserved1;          /* 05h */
     U16                                         Reserved2;          /* 06h */
     U32                                         HwConfig1;          /* 08h */
     U32                                         HwConfig2;          /* 0Ch */
-    fCONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA        Base;               /* 10h */
-    fCONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA    Extended;           /* 50h */
+    CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA        Base;               /* 10h */
+    CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA    Extended;           /* 50h */
     U8                                          VendorSpecific[32]; /* 70h */
-} fCONFIG_PAGE_FC_PORT_10, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10,
+} CONFIG_PAGE_FC_PORT_10, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10,
   FCPortPage10_t, MPI_POINTER pFCPortPage10_t;
 
-#define MPI_FCPORTPAGE10_PAGEVERSION                    (0x00)
+#define MPI_FCPORTPAGE10_PAGEVERSION                    (0x01)
 
 /* standard MODDEF pin definitions (from GBIC spec.) */
 #define MPI_FCPORTPAGE10_FLAGS_MODDEF_MASK              (0x00000007)
@@ -1534,7 +1894,7 @@ typedef struct _CONFIG_PAGE_FC_PORT_10
 
 typedef struct _CONFIG_PAGE_FC_DEVICE_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     U64                     WWNN;                       /* 04h */
     U64                     WWPN;                       /* 0Ch */
     U32                     PortIdentifier;             /* 14h */
@@ -1548,7 +1908,7 @@ typedef struct _CONFIG_PAGE_FC_DEVICE_0
     U8                      FcPhHighestVersion;         /* 21h */
     U8                      CurrentTargetID;            /* 22h */
     U8                      CurrentBus;                 /* 23h */
-} fCONFIG_PAGE_FC_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_FC_DEVICE_0,
+} CONFIG_PAGE_FC_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_FC_DEVICE_0,
   FCDevicePage0_t, MPI_POINTER pFCDevicePage0_t;
 
 #define MPI_FC_DEVICE_PAGE0_PAGEVERSION                 (0x03)
@@ -1606,6 +1966,7 @@ typedef struct _RAID_VOL0_STATUS
 #define MPI_RAIDVOL0_STATUS_STATE_OPTIMAL               (0x00)
 #define MPI_RAIDVOL0_STATUS_STATE_DEGRADED              (0x01)
 #define MPI_RAIDVOL0_STATUS_STATE_FAILED                (0x02)
+#define MPI_RAIDVOL0_STATUS_STATE_MISSING               (0x03)
 
 typedef struct _RAID_VOL0_SETTINGS
 {
@@ -1616,11 +1977,11 @@ typedef struct _RAID_VOL0_SETTINGS
   RaidVol0Settings, MPI_POINTER pRaidVol0Settings;
 
 /* RAID Volume Page 0 VolumeSettings defines */
-
 #define MPI_RAIDVOL0_SETTING_WRITE_CACHING_ENABLE       (0x0001)
 #define MPI_RAIDVOL0_SETTING_OFFLINE_ON_SMART           (0x0002)
 #define MPI_RAIDVOL0_SETTING_AUTO_CONFIGURE             (0x0004)
 #define MPI_RAIDVOL0_SETTING_PRIORITY_RESYNC            (0x0008)
+#define MPI_RAIDVOL0_SETTING_FAST_DATA_SCRUBBING_0102   (0x0020) /* obsolete */
 #define MPI_RAIDVOL0_SETTING_USE_PRODUCT_ID_SUFFIX      (0x0010)
 #define MPI_RAIDVOL0_SETTING_USE_DEFAULTS               (0x8000)
 
@@ -1644,7 +2005,7 @@ typedef struct _RAID_VOL0_SETTINGS
 
 typedef struct _CONFIG_PAGE_RAID_VOL_0
 {
-    fCONFIG_PAGE_HEADER      Header;         /* 00h */
+    CONFIG_PAGE_HEADER      Header;         /* 00h */
     U8                      VolumeID;       /* 04h */
     U8                      VolumeBus;      /* 05h */
     U8                      VolumeIOC;      /* 06h */
@@ -1657,13 +2018,41 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
     U32                     Reserved2;      /* 1Ch */
     U32                     Reserved3;      /* 20h */
     U8                      NumPhysDisks;   /* 24h */
-    U8                      Reserved4;      /* 25h */
-    U16                     Reserved5;      /* 26h */
+    U8                      DataScrubRate;  /* 25h */
+    U8                      ResyncRate;     /* 26h */
+    U8                      InactiveStatus; /* 27h */
     RAID_VOL0_PHYS_DISK     PhysDisk[MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX];/* 28h */
-} fCONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
+} CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
   RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;
 
-#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x01)
+#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x04)
+
+/* values for RAID Volume Page 0 InactiveStatus field */
+#define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE               (0x00)
+#define MPI_RAIDVOLPAGE0_STALE_METADATA_INACTIVE        (0x01)
+#define MPI_RAIDVOLPAGE0_FOREIGN_VOLUME_INACTIVE        (0x02)
+#define MPI_RAIDVOLPAGE0_INSUFFICIENT_RESOURCE_INACTIVE (0x03)
+#define MPI_RAIDVOLPAGE0_CLONE_VOLUME_INACTIVE          (0x04)
+#define MPI_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05)
+#define MPI_RAIDVOLPAGE0_PREVIOUSLY_DELETED             (0x06)
+
+
+typedef struct _CONFIG_PAGE_RAID_VOL_1
+{
+    CONFIG_PAGE_HEADER      Header;         /* 00h */
+    U8                      VolumeID;       /* 01h */
+    U8                      VolumeBus;      /* 02h */
+    U8                      VolumeIOC;      /* 03h */
+    U8                      Reserved0;      /* 04h */
+    U8                      GUID[24];       /* 05h */
+    U8                      Name[32];       /* 20h */
+    U64                     WWID;           /* 40h */
+    U32                     Reserved1;      /* 48h */
+    U32                     Reserved2;      /* 4Ch */
+} CONFIG_PAGE_RAID_VOL_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_1,
+  RaidVolumePage1_t, MPI_POINTER pRaidVolumePage1_t;
+
+#define MPI_RAIDVOLPAGE1_PAGEVERSION                    (0x01)
 
 
 /****************************************************************************
@@ -1714,6 +2103,7 @@ typedef struct _RAID_PHYS_DISK0_STATUS
 
 #define MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC           (0x01)
 #define MPI_PHYSDISK0_STATUS_FLAG_QUIESCED              (0x02)
+#define MPI_PHYSDISK0_STATUS_FLAG_INACTIVE_VOLUME       (0x04)
 
 #define MPI_PHYSDISK0_STATUS_ONLINE                     (0x00)
 #define MPI_PHYSDISK0_STATUS_MISSING                    (0x01)
@@ -1726,24 +2116,54 @@ typedef struct _RAID_PHYS_DISK0_STATUS
 
 typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0
 {
-    fCONFIG_PAGE_HEADER              Header;             /* 00h */
+    CONFIG_PAGE_HEADER              Header;             /* 00h */
     U8                              PhysDiskID;         /* 04h */
     U8                              PhysDiskBus;        /* 05h */
     U8                              PhysDiskIOC;        /* 06h */
     U8                              PhysDiskNum;        /* 07h */
     RAID_PHYS_DISK0_SETTINGS        PhysDiskSettings;   /* 08h */
     U32                             Reserved1;          /* 0Ch */
-    U32                             Reserved2;          /* 10h */
-    U32                             Reserved3;          /* 14h */
+    U8                              ExtDiskIdentifier[8]; /* 10h */
     U8                              DiskIdentifier[16]; /* 18h */
     RAID_PHYS_DISK0_INQUIRY_DATA    InquiryData;        /* 28h */
     RAID_PHYS_DISK0_STATUS          PhysDiskStatus;     /* 64h */
     U32                             MaxLBA;             /* 68h */
     RAID_PHYS_DISK0_ERROR_DATA      ErrorData;          /* 6Ch */
-} fCONFIG_PAGE_RAID_PHYS_DISK_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_0,
+} CONFIG_PAGE_RAID_PHYS_DISK_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_0,
   RaidPhysDiskPage0_t, MPI_POINTER pRaidPhysDiskPage0_t;
 
-#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x00)
+#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x01)
+
+
+typedef struct _RAID_PHYS_DISK1_PATH
+{
+    U8                              PhysDiskID;         /* 00h */
+    U8                              PhysDiskBus;        /* 01h */
+    U16                             Reserved1;          /* 02h */
+    U64                             WWID;               /* 04h */
+    U64                             OwnerWWID;          /* 0Ch */
+    U8                              OwnerIdentifier;    /* 14h */
+    U8                              Reserved2;          /* 15h */
+    U16                             Flags;              /* 16h */
+} RAID_PHYS_DISK1_PATH, MPI_POINTER PTR_RAID_PHYS_DISK1_PATH,
+  RaidPhysDisk1Path_t, MPI_POINTER pRaidPhysDisk1Path_t;
+
+/* RAID Physical Disk Page 1 Flags field defines */
+#define MPI_RAID_PHYSDISK1_FLAG_BROKEN          (0x0002)
+#define MPI_RAID_PHYSDISK1_FLAG_INVALID         (0x0001)
+
+typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
+{
+    CONFIG_PAGE_HEADER              Header;             /* 00h */
+    U8                              NumPhysDiskPaths;   /* 04h */
+    U8                              PhysDiskNum;        /* 05h */
+    U16                             Reserved2;          /* 06h */
+    U32                             Reserved1;          /* 08h */
+    RAID_PHYS_DISK1_PATH            Path[1];            /* 0Ch */
+} CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,
+  RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
+
+#define MPI_RAIDPHYSDISKPAGE1_PAGEVERSION       (0x00)
 
 
 /****************************************************************************
@@ -1756,7 +2176,7 @@ typedef struct _CONFIG_PAGE_LAN_0
     U16                     TxRxModes;                  /* 04h */
     U16                     Reserved;                   /* 06h */
     U32                     PacketPrePad;               /* 08h */
-} fCONFIG_PAGE_LAN_0, MPI_POINTER PTR_CONFIG_PAGE_LAN_0,
+} CONFIG_PAGE_LAN_0, MPI_POINTER PTR_CONFIG_PAGE_LAN_0,
   LANPage0_t, MPI_POINTER pLANPage0_t;
 
 #define MPI_LAN_PAGE0_PAGEVERSION                       (0x01)
@@ -1781,7 +2201,7 @@ typedef struct _CONFIG_PAGE_LAN_1
     U32                     MaxReplySize;               /* 24h */
     U32                     NegWireSpeedLow;            /* 28h */
     U32                     NegWireSpeedHigh;           /* 2Ch */
-} fCONFIG_PAGE_LAN_1, MPI_POINTER PTR_CONFIG_PAGE_LAN_1,
+} CONFIG_PAGE_LAN_1, MPI_POINTER PTR_CONFIG_PAGE_LAN_1,
   LANPage1_t, MPI_POINTER pLANPage1_t;
 
 #define MPI_LAN_PAGE1_PAGEVERSION                       (0x03)
@@ -1796,11 +2216,11 @@ typedef struct _CONFIG_PAGE_LAN_1
 
 typedef struct _CONFIG_PAGE_INBAND_0
 {
-    fCONFIG_PAGE_HEADER      Header;                     /* 00h */
+    CONFIG_PAGE_HEADER      Header;                     /* 00h */
     MPI_VERSION_FORMAT      InbandVersion;              /* 04h */
     U16                     MaximumBuffers;             /* 08h */
     U16                     Reserved1;                  /* 0Ah */
-} fCONFIG_PAGE_INBAND_0, MPI_POINTER PTR_CONFIG_PAGE_INBAND_0,
+} CONFIG_PAGE_INBAND_0, MPI_POINTER PTR_CONFIG_PAGE_INBAND_0,
   InbandPage0_t, MPI_POINTER pInbandPage0_t;
 
 #define MPI_INBAND_PAGEVERSION          (0x00)
@@ -1820,7 +2240,7 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA
     U32         ControllerPhyDeviceInfo;/* 04h */
     U16         AttachedDeviceHandle;   /* 08h */
     U16         ControllerDevHandle;    /* 0Ah */
-    U32         Reserved2;              /* 0Ch */
+    U32         DiscoveryStatus;        /* 0Ch */
 } MPI_SAS_IO_UNIT0_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT0_PHY_DATA,
   SasIOUnit0PhyData, MPI_POINTER pSasIOUnit0PhyData;
 
@@ -1834,22 +2254,21 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 {
-    fCONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */
     U32                             Reserved1;                          /* 08h */
     U8                              NumPhys;                            /* 0Ch */
     U8                              Reserved2;                          /* 0Dh */
     U16                             Reserved3;                          /* 0Eh */
     MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[MPI_SAS_IOUNIT0_PHY_MAX];   /* 10h */
-} fCONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
+} CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
   SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;
 
-#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x00)
+#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x02)
 
 /* values for SAS IO Unit Page 0 PortFlags */
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS    (0x08)
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_0_TARGET_IOC_NUM         (0x00)
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_1_TARGET_IOC_NUM         (0x04)
-#define MPI_SAS_IOUNIT0_PORT_FLAGS_WAIT_FOR_PORTENABLE      (0x02)
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_AUTO_PORT_CONFIG         (0x01)
 
 /* values for SAS IO Unit Page 0 PhyFlags */
@@ -1867,6 +2286,20 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 
 /* see mpi_sas.h for values for SAS IO Unit Page 0 ControllerPhyDeviceInfo values */
 
+/* values for SAS IO Unit Page 0 DiscoveryStatus */
+#define MPI_SAS_IOUNIT0_DS_LOOP_DETECTED                    (0x00000001)
+#define MPI_SAS_IOUNIT0_DS_UNADDRESSABLE_DEVICE             (0x00000002)
+#define MPI_SAS_IOUNIT0_DS_MULTIPLE_PORTS                   (0x00000004)
+#define MPI_SAS_IOUNIT0_DS_EXPANDER_ERR                     (0x00000008)
+#define MPI_SAS_IOUNIT0_DS_SMP_TIMEOUT                      (0x00000010)
+#define MPI_SAS_IOUNIT0_DS_OUT_ROUTE_ENTRIES                (0x00000020)
+#define MPI_SAS_IOUNIT0_DS_INDEX_NOT_EXIST                  (0x00000040)
+#define MPI_SAS_IOUNIT0_DS_SMP_FUNCTION_FAILED              (0x00000080)
+#define MPI_SAS_IOUNIT0_DS_SMP_CRC_ERROR                    (0x00000100)
+#define MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK                 (0x00000200)
+#define MPI_SAS_IOUNIT0_DS_TABLE_LINK                       (0x00000400)
+#define MPI_SAS_IOUNIT0_DS_UNSUPPORTED_DEVICE               (0x00000800)
+
 
 typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
 {
@@ -1889,52 +2322,75 @@ typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
 {
-    fCONFIG_EXTENDED_PAGE_HEADER Header;                             /* 00h */
-    U32                         Reserved1;                          /* 08h */
-    U8                          NumPhys;                            /* 0Ch */
-    U8                          Reserved2;                          /* 0Dh */
-    U16                         Reserved3;                          /* 0Eh */
-    MPI_SAS_IO_UNIT1_PHY_DATA   PhyData[MPI_SAS_IOUNIT1_PHY_MAX];   /* 10h */
-} fCONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,
+    CONFIG_EXTENDED_PAGE_HEADER Header;                             /* 00h */
+    U16                         ControlFlags;                       /* 08h */
+    U16                         MaxNumSATATargets;                  /* 0Ah */
+    U32                         Reserved1;                          /* 0Ch */
+    U8                          NumPhys;                            /* 10h */
+    U8                          SATAMaxQDepth;                      /* 11h */
+    U16                         Reserved2;                          /* 12h */
+    MPI_SAS_IO_UNIT1_PHY_DATA   PhyData[MPI_SAS_IOUNIT1_PHY_MAX];   /* 14h */
+} CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,
   SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t;
 
-#define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x00)
-
-/* values for SAS IO Unit Page 0 PortFlags */
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM         (0x00)
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM         (0x04)
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_WAIT_FOR_PORTENABLE      (0x02)
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_AUTO_PORT_CONFIG         (0x01)
+#define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x04)
+
+/* values for SAS IO Unit Page 1 ControlFlags */
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_3_0_MAX            (0x4000)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_1_5_MAX            (0x2000)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_SW_PRESERVE        (0x1000)
+#define MPI_SAS_IOUNIT1_CONTROL_DISABLE_SAS_HASH        (0x0800)
+
+#define MPI_SAS_IOUNIT1_CONTROL_MASK_DEV_SUPPORT        (0x0600)
+#define MPI_SAS_IOUNIT1_CONTROL_SHIFT_DEV_SUPPORT       (9)
+#define MPI_SAS_IOUNIT1_CONTROL_DEV_SUPPORT_BOTH        (0x00)
+#define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT         (0x01)
+#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT        (0x10)
+
+#define MPI_SAS_IOUNIT1_CONTROL_AUTO_PORT_SAME_SAS_ADDR (0x0100)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED     (0x0040)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED       (0x0020)
+#define MPI_SAS_IOUNIT1_CONTROL_SATA_FUA_REQUIRED       (0x0010)
+#define MPI_SAS_IOUNIT1_CONTROL_PHY_ENABLE_ORDER_HIGH   (0x0008)
+#define MPI_SAS_IOUNIT1_CONTROL_SUBTRACTIVE_ILLEGAL     (0x0004)
+#define MPI_SAS_IOUNIT1_CONTROL_FIRST_LVL_DISC_ONLY     (0x0002)
+#define MPI_SAS_IOUNIT1_CONTROL_CLEAR_AFFILIATION       (0x0001)
+
+/* values for SAS IO Unit Page 1 PortFlags */
+#define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM     (0x00)
+#define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM     (0x04)
+#define MPI_SAS_IOUNIT1_PORT_FLAGS_AUTO_PORT_CONFIG     (0x01)
 
 /* values for SAS IO Unit Page 0 PhyFlags */
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_PHY_DISABLE               (0x04)
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_TX_INVERT                 (0x02)
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_RX_INVERT                 (0x01)
+#define MPI_SAS_IOUNIT1_PHY_FLAGS_PHY_DISABLE           (0x04)
+#define MPI_SAS_IOUNIT1_PHY_FLAGS_TX_INVERT             (0x02)
+#define MPI_SAS_IOUNIT1_PHY_FLAGS_RX_INVERT             (0x01)
 
 /* values for SAS IO Unit Page 0 MaxMinLinkRate */
-#define MPI_SAS_IOUNIT1_MAX_RATE_MASK                       (0xF0)
-#define MPI_SAS_IOUNIT1_MAX_RATE_1_5                        (0x80)
-#define MPI_SAS_IOUNIT1_MAX_RATE_3_0                        (0x90)
-#define MPI_SAS_IOUNIT1_MIN_RATE_MASK                       (0x0F)
-#define MPI_SAS_IOUNIT1_MIN_RATE_1_5                        (0x08)
-#define MPI_SAS_IOUNIT1_MIN_RATE_3_0                        (0x09)
+#define MPI_SAS_IOUNIT1_MAX_RATE_MASK                   (0xF0)
+#define MPI_SAS_IOUNIT1_MAX_RATE_1_5                    (0x80)
+#define MPI_SAS_IOUNIT1_MAX_RATE_3_0                    (0x90)
+#define MPI_SAS_IOUNIT1_MIN_RATE_MASK                   (0x0F)
+#define MPI_SAS_IOUNIT1_MIN_RATE_1_5                    (0x08)
+#define MPI_SAS_IOUNIT1_MIN_RATE_3_0                    (0x09)
 
 /* see mpi_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */
 
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 {
-    fCONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
     U32                                 Reserved1;              /* 08h */
     U16                                 MaxPersistentIDs;       /* 0Ch */
     U16                                 NumPersistentIDsUsed;   /* 0Eh */
     U8                                  Status;                 /* 10h */
     U8                                  Flags;                  /* 11h */
-    U16                                 Reserved2;              /* 12h */
-} fCONFIG_PAGE_SAS_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_2,
+    U16                                 MaxNumPhysicalMappedIDs;/* 12h */              /* 12h */
+} CONFIG_PAGE_SAS_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_2,
   SasIOUnitPage2_t, MPI_POINTER pSasIOUnitPage2_t;
 
-#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x00)
+#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x03)
 
 /* values for SAS IO Unit Page 2 Status field */
 #define MPI_SAS_IOUNIT2_STATUS_DISABLED_PERSISTENT_MAPPINGS (0x02)
@@ -1942,11 +2398,19 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 
 /* values for SAS IO Unit Page 2 Flags field */
 #define MPI_SAS_IOUNIT2_FLAGS_DISABLE_PERSISTENT_MAPPINGS   (0x01)
+/* Physical Mapping Modes */
+#define MPI_SAS_IOUNIT2_FLAGS_MASK_PHYS_MAP_MODE            (0x0E)
+#define MPI_SAS_IOUNIT2_FLAGS_SHIFT_PHYS_MAP_MODE           (1)
+#define MPI_SAS_IOUNIT2_FLAGS_NO_PHYS_MAP                   (0x00)
+#define MPI_SAS_IOUNIT2_FLAGS_DIRECT_ATTACH_PHYS_MAP        (0x01)
+#define MPI_SAS_IOUNIT2_FLAGS_ENCLOSURE_SLOT_PHYS_MAP       (0x02)
+
+#define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT         (0x10)
 
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
 {
-    fCONFIG_EXTENDED_PAGE_HEADER Header;                         /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER Header;                         /* 00h */
     U32                         Reserved1;                      /* 08h */
     U32                         MaxInvalidDwordCount;           /* 0Ch */
     U32                         InvalidDwordCountTime;          /* 10h */
@@ -1956,18 +2420,24 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
     U32                         LossDwordSynchCountTime;        /* 20h */
     U32                         MaxPhyResetProblemCount;        /* 24h */
     U32                         PhyResetProblemTime;            /* 28h */
-} fCONFIG_PAGE_SAS_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_3,
+} CONFIG_PAGE_SAS_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_3,
   SasIOUnitPage3_t, MPI_POINTER pSasIOUnitPage3_t;
 
 #define MPI_SASIOUNITPAGE3_PAGEVERSION      (0x00)
 
 
+/****************************************************************************
+*   SAS Expander Config Pages
+****************************************************************************/
+
 typedef struct _CONFIG_PAGE_SAS_EXPANDER_0
 {
-    fCONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    U8                                  PhysicalPort;           /* 08h */
+    U8                                  Reserved1;              /* 09h */
+    U16                                 Reserved2;              /* 0Ah */
     U64                                 SASAddress;             /* 0Ch */
-    U32                                 Reserved2;              /* 14h */
+    U32                                 DiscoveryStatus;        /* 14h */
     U16                                 DevHandle;              /* 18h */
     U16                                 ParentDevHandle;        /* 1Ah */
     U16                                 ExpanderChangeCount;    /* 1Ch */
@@ -1976,45 +2446,127 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_0
     U8                                  SASLevel;               /* 21h */
     U8                                  Flags;                  /* 22h */
     U8                                  Reserved3;              /* 23h */
-} fCONFIG_PAGE_SAS_EXPANDER_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_EXPANDER_0,
+} CONFIG_PAGE_SAS_EXPANDER_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_EXPANDER_0,
   SasExpanderPage0_t, MPI_POINTER pSasExpanderPage0_t;
 
-#define MPI_SASEXPANDER0_PAGEVERSION        (0x00)
+#define MPI_SASEXPANDER0_PAGEVERSION        (0x02)
+
+/* values for SAS Expander Page 0 DiscoveryStatus field */
+#define MPI_SAS_EXPANDER0_DS_LOOP_DETECTED              (0x00000001)
+#define MPI_SAS_EXPANDER0_DS_UNADDRESSABLE_DEVICE       (0x00000002)
+#define MPI_SAS_EXPANDER0_DS_MULTIPLE_PORTS             (0x00000004)
+#define MPI_SAS_EXPANDER0_DS_EXPANDER_ERR               (0x00000008)
+#define MPI_SAS_EXPANDER0_DS_SMP_TIMEOUT                (0x00000010)
+#define MPI_SAS_EXPANDER0_DS_OUT_ROUTE_ENTRIES          (0x00000020)
+#define MPI_SAS_EXPANDER0_DS_INDEX_NOT_EXIST            (0x00000040)
+#define MPI_SAS_EXPANDER0_DS_SMP_FUNCTION_FAILED        (0x00000080)
+#define MPI_SAS_EXPANDER0_DS_SMP_CRC_ERROR              (0x00000100)
+#define MPI_SAS_EXPANDER0_DS_SUBTRACTIVE_LINK           (0x00000200)
+#define MPI_SAS_EXPANDER0_DS_TABLE_LINK                 (0x00000400)
+#define MPI_SAS_EXPANDER0_DS_UNSUPPORTED_DEVICE         (0x00000800)
 
 /* values for SAS Expander Page 0 Flags field */
 #define MPI_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG      (0x02)
 #define MPI_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS      (0x01)
 
 
+typedef struct _CONFIG_PAGE_SAS_EXPANDER_1
+{
+    CONFIG_EXTENDED_PAGE_HEADER Header;                 /* 00h */
+    U8                          PhysicalPort;           /* 08h */
+    U8                          Reserved1;              /* 09h */
+    U16                         Reserved2;              /* 0Ah */
+    U8                          NumPhys;                /* 0Ch */
+    U8                          Phy;                    /* 0Dh */
+    U16                         NumTableEntriesProgrammed; /* 0Eh */
+    U8                          ProgrammedLinkRate;     /* 10h */
+    U8                          HwLinkRate;             /* 11h */
+    U16                         AttachedDevHandle;      /* 12h */
+    U32                         PhyInfo;                /* 14h */
+    U32                         AttachedDeviceInfo;     /* 18h */
+    U16                         OwnerDevHandle;         /* 1Ch */
+    U8                          ChangeCount;            /* 1Eh */
+    U8                          NegotiatedLinkRate;     /* 1Fh */
+    U8                          PhyIdentifier;          /* 20h */
+    U8                          AttachedPhyIdentifier;  /* 21h */
+    U8                          NumTableEntriesProg;    /* 22h */
+    U8                          DiscoveryInfo;          /* 23h */
+    U32                         Reserved3;              /* 24h */
+} CONFIG_PAGE_SAS_EXPANDER_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_EXPANDER_1,
+  SasExpanderPage1_t, MPI_POINTER pSasExpanderPage1_t;
+
+#define MPI_SASEXPANDER1_PAGEVERSION        (0x01)
+
+/* use MPI_SAS_PHY0_PRATE_ defines for ProgrammedLinkRate */
+
+/* use MPI_SAS_PHY0_HWRATE_ defines for HwLinkRate */
+
+/* use MPI_SAS_PHY0_PHYINFO_ defines for PhyInfo */
+
+/* see mpi_sas.h for values for SAS Expander Page 1 AttachedDeviceInfo values */
+
+/* values for SAS Expander Page 1 DiscoveryInfo field */
+#define MPI_SAS_EXPANDER1_DISCINFO_BAD_PHY DISABLED     (0x04)
+#define MPI_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE   (0x02)
+#define MPI_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES   (0x01)
+
+/* values for SAS Expander Page 1 NegotiatedLinkRate field */
+#define MPI_SAS_EXPANDER1_NEG_RATE_UNKNOWN              (0x00)
+#define MPI_SAS_EXPANDER1_NEG_RATE_PHY_DISABLED         (0x01)
+#define MPI_SAS_EXPANDER1_NEG_RATE_FAILED_NEGOTIATION   (0x02)
+#define MPI_SAS_EXPANDER1_NEG_RATE_SATA_OOB_COMPLETE    (0x03)
+#define MPI_SAS_EXPANDER1_NEG_RATE_1_5                  (0x08)
+#define MPI_SAS_EXPANDER1_NEG_RATE_3_0                  (0x09)
+
+
+/****************************************************************************
+*   SAS Device Config Pages
+****************************************************************************/
+
 typedef struct _CONFIG_PAGE_SAS_DEVICE_0
 {
-    fCONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    U16                                 Slot;                   /* 08h */
+    U16                                 EnclosureHandle;        /* 0Ah */
     U64                                 SASAddress;             /* 0Ch */
-    U32                                 Reserved2;              /* 14h */
+    U16                                 ParentDevHandle;        /* 14h */
+    U8                                  PhyNum;                 /* 16h */
+    U8                                  AccessStatus;           /* 17h */
     U16                                 DevHandle;              /* 18h */
     U8                                  TargetID;               /* 1Ah */
     U8                                  Bus;                    /* 1Bh */
     U32                                 DeviceInfo;             /* 1Ch */
     U16                                 Flags;                  /* 20h */
     U8                                  PhysicalPort;           /* 22h */
-    U8                                  Reserved3;              /* 23h */
-} fCONFIG_PAGE_SAS_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_0,
+    U8                                  Reserved2;              /* 23h */
+} CONFIG_PAGE_SAS_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_0,
   SasDevicePage0_t, MPI_POINTER pSasDevicePage0_t;
 
-#define MPI_SASDEVICE0_PAGEVERSION          (0x00)
+#define MPI_SASDEVICE0_PAGEVERSION          (0x04)
+
+/* values for SAS Device Page 0 AccessStatus field */
+#define MPI_SAS_DEVICE0_ASTATUS_NO_ERRORS               (0x00)
+#define MPI_SAS_DEVICE0_ASTATUS_SATA_INIT_FAILED        (0x01)
+#define MPI_SAS_DEVICE0_ASTATUS_SATA_CAPABILITY_FAILED  (0x02)
 
 /* values for SAS Device Page 0 Flags field */
-#define MPI_SAS_DEVICE0_FLAGS_MAPPING_PERSISTENT    (0x04)
-#define MPI_SAS_DEVICE0_FLAGS_DEVICE_MAPPED         (0x02)
-#define MPI_SAS_DEVICE0_FLAGS_DEVICE_PRESENT        (0x01)
+#define MPI_SAS_DEVICE0_FLAGS_SATA_SW_PRESERVE          (0x0200)
+#define MPI_SAS_DEVICE0_FLAGS_UNSUPPORTED_DEVICE        (0x0100)
+#define MPI_SAS_DEVICE0_FLAGS_SATA_48BIT_LBA_SUPPORTED  (0x0080)
+#define MPI_SAS_DEVICE0_FLAGS_SATA_SMART_SUPPORTED      (0x0040)
+#define MPI_SAS_DEVICE0_FLAGS_SATA_NCQ_SUPPORTED        (0x0020)
+#define MPI_SAS_DEVICE0_FLAGS_SATA_FUA_SUPPORTED        (0x0010)
+#define MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH      (0x0008)
+#define MPI_SAS_DEVICE0_FLAGS_MAPPING_PERSISTENT        (0x0004)
+#define MPI_SAS_DEVICE0_FLAGS_DEVICE_MAPPED             (0x0002)
+#define MPI_SAS_DEVICE0_FLAGS_DEVICE_PRESENT            (0x0001)
 
 /* see mpi_sas.h for values for SAS Device Page 0 DeviceInfo values */
 
 
 typedef struct _CONFIG_PAGE_SAS_DEVICE_1
 {
-    fCONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
     U32                                 Reserved1;              /* 08h */
     U64                                 SASAddress;             /* 0Ch */
     U32                                 Reserved2;              /* 14h */
@@ -2022,15 +2574,30 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_1
     U8                                  TargetID;               /* 1Ah */
     U8                                  Bus;                    /* 1Bh */
     U8                                  InitialRegDeviceFIS[20];/* 1Ch */
-} fCONFIG_PAGE_SAS_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_1,
+} CONFIG_PAGE_SAS_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_1,
   SasDevicePage1_t, MPI_POINTER pSasDevicePage1_t;
 
 #define MPI_SASDEVICE1_PAGEVERSION          (0x00)
 
 
+typedef struct _CONFIG_PAGE_SAS_DEVICE_2
+{
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    U64                                 PhysicalIdentifier;     /* 08h */
+    U32                                 Reserved1;              /* 10h */
+} CONFIG_PAGE_SAS_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_2,
+  SasDevicePage2_t, MPI_POINTER pSasDevicePage2_t;
+
+#define MPI_SASDEVICE2_PAGEVERSION          (0x00)
+
+
+/****************************************************************************
+*   SAS PHY Config Pages
+****************************************************************************/
+
 typedef struct _CONFIG_PAGE_SAS_PHY_0
 {
-    fCONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
     U32                                 Reserved1;              /* 08h */
     U64                                 SASAddress;             /* 0Ch */
     U16                                 AttachedDevHandle;      /* 14h */
@@ -2042,7 +2609,7 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
     U8                                  ChangeCount;            /* 22h */
     U8                                  Reserved3;              /* 23h */
     U32                                 PhyInfo;                /* 24h */
-} fCONFIG_PAGE_SAS_PHY_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_0,
+} CONFIG_PAGE_SAS_PHY_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_0,
   SasPhyPage0_t, MPI_POINTER pSasPhyPage0_t;
 
 #define MPI_SASPHY0_PAGEVERSION             (0x00)
@@ -2089,17 +2656,95 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
 
 typedef struct _CONFIG_PAGE_SAS_PHY_1
 {
-    fCONFIG_EXTENDED_PAGE_HEADER Header;                     /* 00h */
+    CONFIG_EXTENDED_PAGE_HEADER Header;                     /* 00h */
     U32                         Reserved1;                  /* 08h */
     U32                         InvalidDwordCount;          /* 0Ch */
     U32                         RunningDisparityErrorCount; /* 10h */
     U32                         LossDwordSynchCount;        /* 14h */
     U32                         PhyResetProblemCount;       /* 18h */
-} fCONFIG_PAGE_SAS_PHY_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_1,
+} CONFIG_PAGE_SAS_PHY_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_1,
   SasPhyPage1_t, MPI_POINTER pSasPhyPage1_t;
 
 #define MPI_SASPHY1_PAGEVERSION             (0x00)
 
 
+/****************************************************************************
+*   SAS Enclosure Config Pages
+****************************************************************************/
+
+typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
+{
+    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
+    U32                                 Reserved1;              /* 08h */
+    U64                                 EnclosureLogicalID;     /* 0Ch */
+    U16                                 Flags;                  /* 14h */
+    U16                                 EnclosureHandle;        /* 16h */
+    U16                                 NumSlots;               /* 18h */
+    U16                                 StartSlot;              /* 1Ah */
+    U8                                  StartTargetID;          /* 1Ch */
+    U8                                  StartBus;               /* 1Dh */
+    U8                                  SEPTargetID;            /* 1Eh */
+    U8                                  SEPBus;                 /* 1Fh */
+    U32                                 Reserved2;              /* 20h */
+    U32                                 Reserved3;              /* 24h */
+} CONFIG_PAGE_SAS_ENCLOSURE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_ENCLOSURE_0,
+  SasEnclosurePage0_t, MPI_POINTER pSasEnclosurePage0_t;
+
+#define MPI_SASENCLOSURE0_PAGEVERSION       (0x00)
+
+/* values for SAS Enclosure Page 0 Flags field */
+#define MPI_SAS_ENCLS0_FLAGS_SEP_BUS_ID_VALID       (0x0020)
+#define MPI_SAS_ENCLS0_FLAGS_START_BUS_ID_VALID     (0x0010)
+
+#define MPI_SAS_ENCLS0_FLAGS_MNG_MASK               (0x000F)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_UNKNOWN            (0x0000)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SES            (0x0001)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SGPIO          (0x0002)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_EXP_SGPIO          (0x0003)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE      (0x0004)
+
+
+/****************************************************************************
+*   Log Config Pages
+****************************************************************************/
+/*
+ * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
+ * one and check NumLogEntries at runtime.
+ */
+#ifndef MPI_LOG_0_NUM_LOG_ENTRIES
+#define MPI_LOG_0_NUM_LOG_ENTRIES        (1)
+#endif
+
+#define MPI_LOG_0_LOG_DATA_LENGTH        (20)
+
+typedef struct _MPI_LOG_0_ENTRY
+{
+    U64         WWID;                               /* 00h */
+    U32         TimeStamp;                          /* 08h */
+    U32         Reserved1;                          /* 0Ch */
+    U16         LogSequence;                        /* 10h */
+    U16         LogEntryQualifier;                  /* 12h */
+    U8          LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 14h */
+} MPI_LOG_0_ENTRY, MPI_POINTER PTR_MPI_LOG_0_ENTRY,
+  MpiLog0Entry_t, MPI_POINTER pMpiLog0Entry_t;
+
+/* values for Log Page 0 LogEntry LogEntryQualifier field */
+#define MPI_LOG_0_ENTRY_QUAL_ENTRY_UNUSED           (0x0000)
+#define MPI_LOG_0_ENTRY_QUAL_POWER_ON_RESET         (0x0001)
+
+typedef struct _CONFIG_PAGE_LOG_0
+{
+    CONFIG_EXTENDED_PAGE_HEADER Header;                     /* 00h */
+    U32                         Reserved1;                  /* 08h */
+    U32                         Reserved2;                  /* 0Ch */
+    U16                         NumLogEntries;              /* 10h */
+    U16                         Reserved3;                  /* 12h */
+    MPI_LOG_0_ENTRY             LogEntry[MPI_LOG_0_NUM_LOG_ENTRIES]; /* 14h */
+} CONFIG_PAGE_LOG_0, MPI_POINTER PTR_CONFIG_PAGE_LOG_0,
+  LogPage0_t, MPI_POINTER pLogPage0_t;
+
+#define MPI_LOG_0_PAGEVERSION               (0x00)
+
+
 #endif
 
diff --git a/drivers/message/fusion/lsi/mpi_fc.h b/drivers/message/fusion/lsi/mpi_fc.h
index ea266b236c1f..51a6aeb990ba 100644
--- a/drivers/message/fusion/lsi/mpi_fc.h
+++ b/drivers/message/fusion/lsi/mpi_fc.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_fc.h
  *          Title:  MPI Fibre Channel messages and structures
  *  Creation Date:  June 12, 2000
  *
- *    mpi_fc.h Version:  01.05.xx
+ *    mpi_fc.h Version:  01.05.01
  *
  *  Version History
  *  ---------------
@@ -36,6 +36,9 @@
  *  09-28-01  01.02.02  Change name of reserved field in
  *                      MSG_LINK_SERVICE_RSP_REPLY.
  *  05-31-02  01.02.03  Adding AliasIndex to FC Direct Access requests.
+ *  01-16-04  01.02.04  Added define for MPI_FC_PRIM_SEND_FLAGS_ML_RESET_LINK.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
  */
 
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt
index 0deb7721e936..c9edbee41edf 100644
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
@@ -3,25 +3,28 @@
  MPI Header File Change History
  ==============================
 
- Copyright (c) 2000-2001 LSI Logic Corporation.
+ Copyright (c) 2000-2005 LSI Logic Corporation.
 
  ---------------------------------------
- Header Set Release Version:    01.01.10
- Header Set Release Date:       04-09-01
+ Header Set Release Version:    01.05.09
+ Header Set Release Date:       03-11-05
  ---------------------------------------
 
  Filename               Current version     Prior version
  ----------             ---------------     -------------
- mpi.h                  01.01.07            01.01.06
- mpi_ioc.h              01.01.07            01.01.06
- mpi_cnfg.h             01.01.11            01.01.10
- mpi_init.h             01.01.05            01.01.04
- mpi_targ.h             01.01.04            01.01.04
- mpi_fc.h               01.01.07            01.01.06
- mpi_lan.h              01.01.03            01.01.03
- mpi_raid.h             01.01.02            01.01.02
- mpi_type.h             01.01.02            01.01.02
- mpi_history.txt        01.01.09            01.01.09
+ mpi.h                  01.05.07            01.05.06
+ mpi_ioc.h              01.05.08            01.05.07
+ mpi_cnfg.h             01.05.08            01.05.07
+ mpi_init.h             01.05.04            01.05.03
+ mpi_targ.h             01.05.04            01.05.03
+ mpi_fc.h               01.05.01            01.05.01
+ mpi_lan.h              01.05.01            01.05.01
+ mpi_raid.h             01.05.02            01.05.02
+ mpi_tool.h             01.05.03            01.05.03
+ mpi_inb.h              01.05.01            01.05.01
+ mpi_sas.h              01.05.01            01.05.01
+ mpi_type.h             01.05.01            01.05.01
+ mpi_history.txt        01.05.09            01.05.08
 
 
  *  Date      Version   Description
@@ -53,6 +56,38 @@ mpi.h
  *                      Added function codes for RAID.
  *  04-09-01  01.01.07  Added alternate define for MPI_DOORBELL_ACTIVE,
  *                      MPI_DOORBELL_USED, to better match the spec.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *                      Changed MPI_VERSION_MINOR from 0x01 to 0x02.
+ *                      Added define MPI_FUNCTION_TOOLBOX.
+ *  09-28-01  01.02.02  New function code MPI_SCSI_ENCLOSURE_PROCESSOR.
+ *  11-01-01  01.02.03  Changed name to MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR.
+ *  03-14-02  01.02.04  Added MPI_HEADER_VERSION_ defines.
+ *  05-31-02  01.02.05  Bumped MPI_HEADER_VERSION_UNIT.
+ *  07-12-02  01.02.06  Added define for MPI_FUNCTION_MAILBOX.
+ *  09-16-02  01.02.07  Bumped value for MPI_HEADER_VERSION_UNIT.
+ *  11-15-02  01.02.08  Added define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX and
+ *                      obsoleted define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX.
+ *  04-01-03  01.02.09  New IOCStatus code: MPI_IOCSTATUS_FC_EXCHANGE_CANCELED
+ *  06-26-03  01.02.10  Bumped MPI_HEADER_VERSION_UNIT value.
+ *  01-16-04  01.02.11  Added define for MPI_IOCLOGINFO_TYPE_SHIFT.
+ *  04-29-04  01.02.12  Added function codes for MPI_FUNCTION_DIAG_BUFFER_POST
+ *                      and MPI_FUNCTION_DIAG_RELEASE.
+ *                      Added MPI_IOCSTATUS_DIAGNOSTIC_RELEASED define.
+ *                      Bumped MPI_HEADER_VERSION_UNIT value.
+ *  05-11-04  01.03.01  Bumped MPI_VERSION_MINOR for MPI v1.3.
+ *                      Added codes for Inband.
+ *  08-19-04  01.05.01  Added defines for Host Buffer Access Control doorbell.
+ *                      Added define for offset of High Priority Request Queue.
+ *                      Added new function codes and new IOCStatus codes.
+ *                      Added a IOCLogInfo type of SAS.
+ *  12-07-04  01.05.02  Bumped MPI_HEADER_VERSION_UNIT.
+ *  12-09-04  01.05.03  Bumped MPI_HEADER_VERSION_UNIT.
+ *  01-15-05  01.05.04  Bumped MPI_HEADER_VERSION_UNIT.
+ *  02-09-05  01.05.05  Bumped MPI_HEADER_VERSION_UNIT.
+ *  02-22-05  01.05.06  Bumped MPI_HEADER_VERSION_UNIT.
+ *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Removed EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
 
 mpi_ioc.h
@@ -81,6 +116,49 @@ mpi_ioc.h
  *  03-27-01  01.01.06  Added defines for ProductId field of MPI_FW_HEADER.
  *                      Added structure offset comments.
  *  04-09-01  01.01.07  Added structure EVENT_DATA_EVENT_CHANGE.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *                      New format for FWVersion and ProductId in
+ *                      MSG_IOC_FACTS_REPLY and MPI_FW_HEADER.
+ *  08-31-01  01.02.02  Addded event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and
+ *                      related structure and defines.
+ *                      Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED.
+ *                      Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE.
+ *                      Replaced a reserved field in MSG_IOC_FACTS_REPLY with
+ *                      IOCExceptions and changed DataImageSize to reserved.
+ *                      Added MPI_FW_DOWNLOAD_ITYPE_NVSTORE_DATA and
+ *                      MPI_FW_UPLOAD_ITYPE_NVDATA.
+ *  09-28-01  01.02.03  Modified Event Data for Integrated RAID.
+ *  11-01-01  01.02.04  Added defines for MPI_EXT_IMAGE_HEADER ImageType field.
+ *  03-14-02  01.02.05  Added HeaderVersion field to MSG_IOC_FACTS_REPLY.
+ *  05-31-02  01.02.06  Added define for
+ *                      MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID.
+ *                      Added AliasIndex to EVENT_DATA_LOGOUT structure.
+ *  04-01-03  01.02.07  Added defines for MPI_FW_HEADER_SIGNATURE_.
+ *  06-26-03  01.02.08  Added new values to the product family defines.
+ *  04-29-04  01.02.09  Added IOCCapabilities field to MSG_IOC_FACTS_REPLY and
+ *                      added related defines.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added four new fields to MSG_IOC_INIT.
+ *                      Added three new fields to MSG_IOC_FACTS_REPLY.
+ *                      Defined four new bits for the IOCCapabilities field of
+ *                      the IOCFacts reply.
+ *                      Added two new PortTypes for the PortFacts reply.
+ *                      Added six new events along with their EventData
+ *                      structures.
+ *                      Added a new MsgFlag to the FwDownload request to
+ *                      indicate last segment.
+ *                      Defined a new image type of boot loader.
+ *                      Added FW family codes for SAS product families.
+ *  10-05-04  01.05.02  Added ReplyFifoHostSignalingAddr field to
+ *                      MSG_IOC_FACTS_REPLY.
+ *  12-07-04  01.05.03  Added more defines for SAS Discovery Error event.
+ *  12-09-04  01.05.04  Added Unsupported device to SAS Device event.
+ *  01-15-05  01.05.05  Added event data for SAS SES Event.
+ *  02-09-05  01.05.06  Added MPI_FW_UPLOAD_ITYPE_FW_BACKUP define.
+ *  02-22-05  01.05.07  Added Host Page Buffer Persistent flag to IOC Facts
+ *                      Reply and IOC Init Request.
+ *  03-11-05  01.05.08  Added family code for 1068E family.
+ *                      Removed IOCFacts Reply EEDP Capability bit.
  *  --------------------------------------------------------------------------
 
 mpi_cnfg.h
@@ -142,6 +220,166 @@ mpi_cnfg.h
  *                      Added IO Unit Page 3.
  *                      Modified defines for Scsi Port Page 2.
  *                      Modified RAID Volume Pages.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *                      Added SepID and SepBus to RVP2 IMPhysicalDisk struct.
+ *                      Added defines for the SEP bits in RVP2 VolumeSettings.
+ *                      Modified the DeviceSettings field in RVP2 to use the
+ *                      proper structure.
+ *                      Added defines for SES, SAF-TE, and cross channel for
+ *                      IOCPage2 CapabilitiesFlags.
+ *                      Removed define for MPI_IOUNITPAGE2_FLAGS_RAID_DISABLE.
+ *                      Removed define for
+ *                      MPI_SCSIPORTPAGE2_PORT_FLAGS_PARITY_ENABLE.
+ *                      Added define for MPI_CONFIG_PAGEATTR_RO_PERSISTENT.
+ *  08-29-01 01.02.02   Fixed value for MPI_MANUFACTPAGE_DEVID_53C1035.
+ *                      Added defines for MPI_FCPORTPAGE1_FLAGS_HARD_ALPA_ONLY
+ *                      and MPI_FCPORTPAGE1_FLAGS_IMMEDIATE_ERROR_REPLY.
+ *                      Removed MPI_SCSIPORTPAGE0_CAP_PACING_TRANSFERS,
+ *                      MPI_SCSIDEVPAGE0_NP_PACING_TRANSFERS, and
+ *                      MPI_SCSIDEVPAGE1_RP_PACING_TRANSFERS, and
+ *                      MPI_SCSIDEVPAGE1_CONF_PPR_ALLOWED.
+ *                      Added defines for MPI_SCSIDEVPAGE1_CONF_WDTR_DISALLOWED
+ *                      and MPI_SCSIDEVPAGE1_CONF_SDTR_DISALLOWED.
+ *                      Added OnBusTimerValue to CONFIG_PAGE_SCSI_PORT_1.
+ *                      Added rejected bits to SCSI Device Page 0 Information.
+ *                      Increased size of ALPA array in FC Port Page 2 by one
+ *                      and removed a one byte reserved field.
+ *  09-28-01 01.02.03   Swapped NegWireSpeedLow and NegWireSpeedLow in
+ *                      CONFIG_PAGE_LAN_1 to match preferred 64-bit ordering.
+ *                      Added structures for Manufacturing Page 4, IO Unit
+ *                      Page 3, IOC Page 3, IOC Page 4, RAID Volume Page 0, and
+ *                      RAID PhysDisk Page 0.
+ *  10-04-01 01.02.04   Added define for MPI_CONFIG_PAGETYPE_RAID_PHYSDISK.
+ *                      Modified some of the new defines to make them 32
+ *                      character unique.
+ *                      Modified how variable length pages (arrays) are defined.
+ *                      Added generic defines for hot spare pools and RAID
+ *                      volume types.
+ *  11-01-01 01.02.05   Added define for MPI_IOUNITPAGE1_DISABLE_IR.
+ *  03-14-02 01.02.06   Added PCISlotNum field to CONFIG_PAGE_IOC_1 along with
+ *                      related define, and bumped the page version define.
+ *  05-31-02 01.02.07   Added a Flags field to CONFIG_PAGE_IOC_2_RAID_VOL in a
+ *                      reserved byte and added a define.
+ *                      Added define for
+ *                      MPI_RAIDVOL0_STATUS_FLAG_VOLUME_INACTIVE.
+ *                      Added new config page: CONFIG_PAGE_IOC_5.
+ *                      Added MaxAliases, MaxHardAliases, and NumCurrentAliases
+ *                      fields to CONFIG_PAGE_FC_PORT_0.
+ *                      Added AltConnector and NumRequestedAliases fields to
+ *                      CONFIG_PAGE_FC_PORT_1.
+ *                      Added new config page: CONFIG_PAGE_FC_PORT_10.
+ *  07-12-02 01.02.08   Added more MPI_MANUFACTPAGE_DEVID_ defines.
+ *                      Added additional MPI_SCSIDEVPAGE0_NP_ defines.
+ *                      Added more MPI_SCSIDEVPAGE1_RP_ defines.
+ *                      Added define for
+ *                      MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE.
+ *                      Added new config page: CONFIG_PAGE_SCSI_DEVICE_3.
+ *                      Modified MPI_FCPORTPAGE5_FLAGS_ defines.
+ *  09-16-02 01.02.09   Added MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG define.
+ *  11-15-02 01.02.10   Added ConnectedID defines for CONFIG_PAGE_SCSI_PORT_0.
+ *                      Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
+ *                      Added more Flags defines for CONFIG_PAGE_FC_DEVICE_0.
+ *  04-01-03 01.02.11   Added RR_TOV field and additional Flags defines for
+ *                      CONFIG_PAGE_FC_PORT_1.
+ *                      Added define MPI_FCPORTPAGE5_FLAGS_DISABLE to disable
+ *                      an alias.
+ *                      Added more device id defines.
+ *  06-26-03 01.02.12   Added MPI_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID define.
+ *                      Added TargetConfig and IDConfig fields to
+ *                      CONFIG_PAGE_SCSI_PORT_1.
+ *                      Added more PortFlags defines for CONFIG_PAGE_SCSI_PORT_2
+ *                      to control DV.
+ *                      Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
+ *                      In CONFIG_PAGE_FC_DEVICE_0, replaced Reserved1 field
+ *                      with ADISCHardALPA.
+ *                      Added MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY define.
+ *  01-16-04  01.02.13  Added InitiatorDeviceTimeout and InitiatorIoPendTimeout
+ *                      fields and related defines to CONFIG_PAGE_FC_PORT_1.
+ *                      Added define for
+ *                      MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK.
+ *                      Added new fields to the substructures of
+ *                      CONFIG_PAGE_FC_PORT_10.
+ *  04-29-04 01.02.14   Added define for IDP bit for CONFIG_PAGE_SCSI_PORT_0,
+ *                      CONFIG_PAGE_SCSI_DEVICE_0, and
+ *                      CONFIG_PAGE_SCSI_DEVICE_1. Also bumped Page Version for
+ *                      these pages.
+ *  05-11-04 01.03.01   Added structure for CONFIG_PAGE_INBAND_0.
+ *  08-19-04 01.05.01   Modified MSG_CONFIG request to support extended config
+ *                      pages.
+ *                      Added a new structure for extended config page header.
+ *                      Added new extended config pages types and structures for
+ *                      SAS IO Unit, SAS Expander, SAS Device, and SAS PHY.
+ *                      Replaced a reserved byte in CONFIG_PAGE_MANUFACTURING_4
+ *                      to add a Flags field.
+ *                      Two new Manufacturing config pages (5 and 6).
+ *                      Two new bits defined for IO Unit Page 1 Flags field.
+ *                      Modified CONFIG_PAGE_IO_UNIT_2 to add three new fields
+ *                      to specify the BIOS boot device.
+ *                      Four new Flags bits defined for IO Unit Page 2.
+ *                      Added IO Unit Page 4.
+ *                      Added EEDP Flags settings to IOC Page 1.
+ *                      Added new BIOS Page 1 config page.
+ *  10-05-04 01.05.02   Added define for
+ *                      MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE.
+ *                      Added new Flags field to CONFIG_PAGE_MANUFACTURING_5 and
+ *                      associated defines.
+ *                      Added more defines for SAS IO Unit Page 0
+ *                      DiscoveryStatus field.
+ *                      Added define for MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK
+ *                      and MPI_SAS_IOUNIT0_DS_TABLE_LINK.
+ *                      Added defines for Physical Mapping Modes to SAS IO Unit
+ *                      Page 2.
+ *                      Added define for
+ *                      MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH.
+ *  10-27-04 01.05.03   Added defines for new SAS PHY page addressing mode.
+ *                      Added defines for MaxTargetSpinUp to BIOS Page 1.
+ *                      Added 5 new ControlFlags defines for SAS IO Unit
+ *                      Page 1.
+ *                      Added MaxNumPhysicalMappedIDs field to SAS IO Unit
+ *                      Page 2.
+ *                      Added AccessStatus field to SAS Device Page 0 and added
+ *                      new Flags bits for supported SATA features.
+ *  12-07-04  01.05.04  Added config page structures for BIOS Page 2, RAID
+ *                      Volume Page 1, and RAID Physical Disk Page 1.
+ *                      Replaced IO Unit Page 1 BootTargetID,BootBus, and
+ *                      BootAdapterNum with reserved field.
+ *                      Added DataScrubRate and ResyncRate to RAID Volume
+ *                      Page 0.
+ *                      Added MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT
+ *                      define.
+ *  12-09-04  01.05.05  Added Target Mode Large CDB Enable to FC Port Page 1
+ *                      Flags field.
+ *                      Added Auto Port Config flag define for SAS IOUNIT
+ *                      Page 1 ControlFlags.
+ *                      Added Disabled bad Phy define to Expander Page 1
+ *                      Discovery Info field.
+ *                      Added SAS/SATA device support to SAS IOUnit Page 1
+ *                      ControlFlags.
+ *                      Added Unsupported device to SAS Dev Page 0 Flags field
+ *                      Added disable use SATA Hash Address for SAS IOUNIT
+ *                      page 1 in ControlFields.
+ *  01-15-05  01.05.06  Added defaults for data scrub rate and resync rate to
+ *                      Manufacturing Page 4.
+ *                      Added new defines for BIOS Page 1 IOCSettings field.
+ *                      Added ExtDiskIdentifier field to RAID Physical Disk
+ *                      Page 0.
+ *                      Added new defines for SAS IO Unit Page 1 ControlFlags
+ *                      and to SAS Device Page 0 Flags to control SATA devices.
+ *                      Added defines and structures for the new Log Page 0, a
+ *                      new type of configuration page.
+ *  02-09-05  01.05.07  Added InactiveStatus field to RAID Volume Page 0.
+ *                      Added WWID field to RAID Volume Page 1.
+ *                      Added PhysicalPort field to SAS Expander pages 0 and 1.
+ *  03-11-05  01.05.08  Removed the EEDP flags from IOC Page 1.
+ *                      Added Enclosure/Slot boot device format to BIOS Page 2.
+ *                      New status value for RAID Volume Page 0 VolumeStatus
+ *                      (VolumeState subfield).
+ *                      New value for RAID Physical Page 0 InactiveStatus.
+ *                      Added Inactive Volume Member flag RAID Physical Disk
+ *                      Page 0 PhysDiskStatus field.
+ *                      New physical mapping mode in SAS IO Unit Page 2.
+ *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
+ *                      Added Slot and Enclosure fields to SAS Device Page 0.
  *  --------------------------------------------------------------------------
 
 mpi_init.h
@@ -154,6 +392,32 @@ mpi_init.h
  *  02-20-01  01.01.03  Started using MPI_POINTER.
  *  03-27-01  01.01.04  Added structure offset comments.
  *  04-10-01  01.01.05  Added new MsgFlag for MSG_SCSI_TASK_MGMT.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  08-29-01  01.02.02  Added MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET.
+ *                      Added MPI_SCSI_STATE_QUEUE_TAG_REJECTED for
+ *                      MSG_SCSI_IO_REPLY.
+ *  09-28-01  01.02.03  Added structures and defines for SCSI Enclosure
+ *                      Processor messages.
+ *  10-04-01  01.02.04  Added defines for SEP request Action field.
+ *  05-31-02  01.02.05  Added MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR define
+ *                      for SCSI IO requests.
+ *  11-15-02  01.02.06  Added special extended SCSI Status defines for FCP.
+ *  06-26-03  01.02.07  Added MPI_SCSI_STATUS_FCPEXT_UNASSIGNED define.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added MsgFlags defines for EEDP to SCSI IO request.
+ *                      Added new word to MSG_SCSI_IO_REPLY to add TaskTag field
+ *                      and a reserved U16.
+ *                      Added new MSG_SCSI_IO32_REQUEST structure.
+ *                      Added a TaskType of Clear Task Set to SCSI
+ *                      Task Management request.
+ *  12-07-04  01.05.02  Added support for Task Management Query Task.
+ *  01-15-05  01.05.03  Modified SCSI Enclosure Processor Request to support
+ *                      WWID addressing.
+ *  03-11-05  01.05.04  Removed EEDP flags from SCSI IO Request.
+ *                      Removed SCSI IO 32 Request.
+ *                      Modified SCSI Enclosure Processor Request and Reply to
+ *                      support Enclosure/Slot addressing rather than WWID
+ *                      addressing.
  *  --------------------------------------------------------------------------
 
 mpi_targ.h
@@ -170,6 +434,33 @@ mpi_targ.h
  *                      Added structures for MPI_TARGET_SCSI_SPI_CMD_BUFFER and
  *                      MPI_TARGET_FCP_CMD_BUFFER.
  *  03-27-01  01.01.04  Added structure offset comments.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  09-28-01  01.02.02  Added structure for MPI_TARGET_SCSI_SPI_STATUS_IU.
+ *                      Added PriorityReason field to some replies and
+ *                      defined more PriorityReason codes.
+ *                      Added some defines for to support previous version
+ *                      of MPI.
+ *  10-04-01  01.02.03  Added PriorityReason to MSG_TARGET_ERROR_REPLY.
+ *  11-01-01  01.02.04  Added define for TARGET_STATUS_SEND_FLAGS_HIGH_PRIORITY.
+ *  03-14-02  01.02.05  Modified MPI_TARGET_FCP_RSP_BUFFER to get the proper
+ *                      byte ordering.
+ *  05-31-02  01.02.06  Modified TARGET_MODE_REPLY_ALIAS_MASK to only include
+ *                      one bit.
+ *                      Added AliasIndex field to MPI_TARGET_FCP_CMD_BUFFER.
+ *  09-16-02  01.02.07  Added flags for confirmed completion.
+ *                      Added PRIORITY_REASON_TARGET_BUSY.
+ *  11-15-02  01.02.08  Added AliasID field to MPI_TARGET_SCSI_SPI_CMD_BUFFER.
+ *  04-01-03  01.02.09  Added OptionalOxid field to MPI_TARGET_FCP_CMD_BUFFER.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added new request message structures for
+ *                      MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
+ *                      MSG_TARGET_CMD_BUF_POST_LIST_REQUEST, and
+ *                      MSG_TARGET_ASSIST_EXT_REQUEST.
+ *                      Added new structures for SAS SSP Command buffer, SSP
+ *                      Task buffer, and SSP Status IU.
+ *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
+ *  02-22-05  01.05.03  Changed a comment.
+ *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
  *  --------------------------------------------------------------------------
 
 mpi_fc.h
@@ -192,6 +483,13 @@ mpi_fc.h
  *                      Added MPI_FC_PRIM_SEND_FLAGS_RESET_LINK define.
  *                      Added structure offset comments.
  *  04-09-01  01.01.07  Added RspLength field to MSG_LINK_SERVICE_RSP_REQUEST.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  09-28-01  01.02.02  Change name of reserved field in
+ *                      MSG_LINK_SERVICE_RSP_REPLY.
+ *  05-31-02  01.02.03  Adding AliasIndex to FC Direct Access requests.
+ *  01-16-04  01.02.04  Added define for MPI_FC_PRIM_SEND_FLAGS_ML_RESET_LINK.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
 
 mpi_lan.h
@@ -209,11 +507,56 @@ mpi_lan.h
  *  11-02-00  01.01.01  Original release for post 1.0 work
  *  02-20-01  01.01.02  Started using MPI_POINTER.
  *  03-27-01  01.01.03  Added structure offset comments.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
 
 mpi_raid.h
  *  02-27-01  01.01.01  Original release for this file.
  *  03-27-01  01.01.02  Added structure offset comments.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  08-29-01  01.02.02  Added DIAG_DATA_UPLOAD_HEADER and related defines.
+ *  09-28-01  01.02.02  Major rework for MPI v1.2 Integrated RAID changes.
+ *  10-04-01  01.02.03  Added ActionData defines for
+ *                      MPI_RAID_ACTION_DELETE_VOLUME action.
+ *  11-01-01  01.02.04  Added define for MPI_RAID_ACTION_ADATA_DO_NOT_SYNC.
+ *  03-14-02  01.02.05  Added define for MPI_RAID_ACTION_ADATA_LOW_LEVEL_INIT.
+ *  05-07-02  01.02.06  Added define for MPI_RAID_ACTION_ACTIVATE_VOLUME,
+ *                      MPI_RAID_ACTION_INACTIVATE_VOLUME, and
+ *                      MPI_RAID_ACTION_ADATA_INACTIVATE_ALL.
+ *  07-12-02  01.02.07  Added structures for Mailbox request and reply.
+ *  11-15-02  01.02.08  Added missing MsgContext field to MSG_MAILBOX_REQUEST.
+ *  04-01-03  01.02.09  New action data option flag for
+ *                      MPI_RAID_ACTION_DELETE_VOLUME.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
+ *  01-15-05  01.05.02  Added defines for the two new RAID Actions for
+ *                      _SET_RESYNC_RATE and _SET_DATA_SCRUB_RATE.
+ *  --------------------------------------------------------------------------
+
+mpi_tool.h
+ *  08-08-01  01.02.01  Original release.
+ *  08-29-01  01.02.02  Added DIAG_DATA_UPLOAD_HEADER and related defines.
+ *  01-16-04  01.02.03  Added defines and structures for new tools
+ *.                     MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL and
+ *                      MPI_TOOLBOX_FC_MANAGEMENT_TOOL.
+ *  04-29-04  01.02.04  Added message structures for Diagnostic Buffer Post and
+ *                      Diagnostic Release requests and replies.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
+ *  10-06-04  01.05.02  Added define for MPI_DIAG_BUF_TYPE_COUNT.
+ *  02-09-05  01.05.03  Added frame size option to FC management tool.
+ *                      Added Beacon tool to the Toolbox.
+ *  --------------------------------------------------------------------------
+
+mpi_inb.h
+ *  05-11-04  01.03.01  Original release.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
+ *  --------------------------------------------------------------------------
+
+mpi_sas.h
+ *  08-19-04  01.05.01  Original release.
  *  --------------------------------------------------------------------------
 
 mpi_type.h
@@ -221,21 +564,83 @@ mpi_type.h
  *  06-06-00  01.00.01  Update version number for 1.0 release.
  *  11-02-00  01.01.01  Original release for post 1.0 work
  *  02-20-01  01.01.02  Added define and ifdef for MPI_POINTER.
+ *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
 
 mpi_history.txt         Parts list history
 
-Filename    01.01.10
+Filename    01.05.09
 ----------  --------
-mpi.h       01.01.07
-mpi_ioc.h   01.01.07
-mpi_cnfg.h  01.01.11
-mpi_init.h  01.01.05
-mpi_targ.h  01.01.04
-mpi_fc.h    01.01.07
-mpi_lan.h   01.01.03
-mpi_raid.h  01.01.02
-mpi_type.h  01.01.02
+mpi.h       01.05.07
+mpi_ioc.h   01.05.08
+mpi_cnfg.h  01.05.08
+mpi_init.h  01.05.04
+mpi_targ.h  01.05.04
+mpi_fc.h    01.05.01
+mpi_lan.h   01.05.01
+mpi_raid.h  01.05.02
+mpi_tool.h  01.05.03
+mpi_inb.h   01.05.01
+mpi_sas.h   01.05.01
+mpi_type.h  01.05.01
+
+Filename    01.05.08   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03
+----------  --------   --------   --------   --------   --------   --------
+mpi.h       01.05.06   01.05.05   01.05.04   01.05.03   01.05.02   01.05.01
+mpi_ioc.h   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03   01.05.02
+mpi_cnfg.h  01.05.07   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03
+mpi_init.h  01.05.03   01.05.03   01.05.03   01.05.02   01.05.02   01.05.01
+mpi_targ.h  01.05.03   01.05.02   01.05.02   01.05.02   01.05.02   01.05.02
+mpi_fc.h    01.05.01   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01
+mpi_lan.h   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01
+mpi_raid.h  01.05.02   01.05.02   01.05.02   01.05.01   01.05.01   01.05.01
+mpi_tool.h  01.05.03   01.05.03   01.05.02   01.05.02   01.05.02   01.05.02
+mpi_inb.h   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01
+mpi_sas.h   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01
+mpi_type.h  01.05.01   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01
+
+Filename    01.05.02   01.05.01   01.03.01   01.02.14   01.02.13   01.02.12
+----------  --------   --------   --------   --------   --------   --------
+mpi.h       01.05.01   01.05.01   01.03.01   01.02.12   01.02.11   01.02.10
+mpi_ioc.h   01.05.02   01.05.01   01.03.01   01.02.09   01.02.08   01.02.08
+mpi_cnfg.h  01.05.02   01.05.01   01.03.01   01.02.14   01.02.13   01.02.12
+mpi_init.h  01.05.01   01.05.01   01.03.01   01.02.07   01.02.07   01.02.07
+mpi_targ.h  01.05.02   01.05.01   01.03.01   01.02.09   01.02.09   01.02.09
+mpi_fc.h    01.05.01   01.05.01   01.03.01   01.02.04   01.02.04   01.02.03
+mpi_lan.h   01.05.01   01.05.01   01.03.01   01.02.01   01.02.01   01.02.01
+mpi_raid.h  01.05.01   01.05.01   01.03.01   01.02.09   01.02.09   01.02.09
+mpi_tool.h  01.05.02   01.05.01   01.03.01   01.02.01   01.02.01   01.02.01
+mpi_inb.h   01.05.01   01.05.01   01.03.01
+mpi_sas.h   01.05.01   01.05.01
+mpi_type.h  01.05.01   01.05.01   01.03.01   01.02.04   01.02.03   01.02.02
+
+Filename    01.02.11   01.02.10   01.02.09   01.02.08   01.02.07   01.02.06
+----------  --------   --------   --------   --------   --------   --------
+mpi.h       01.02.09   01.02.08   01.02.07   01.02.06   01.02.05   01.02.04
+mpi_ioc.h   01.02.07   01.02.06   01.02.06   01.02.06   01.02.06   01.02.05
+mpi_cnfg.h  01.02.11   01.02.10   01.02.09   01.02.08   01.02.07   01.02.06
+mpi_init.h  01.02.06   01.02.06   01.02.05   01.02.05   01.02.05   01.02.04
+mpi_targ.h  01.02.09   01.02.08   01.02.07   01.02.06   01.02.06   01.02.05
+mpi_fc.h    01.02.03   01.02.03   01.02.03   01.02.03   01.02.03   01.02.02
+mpi_lan.h   01.02.01   01.02.01   01.02.01   01.02.01   01.02.01   01.02.01
+mpi_raid.h  01.02.09   01.02.08   01.02.07   01.02.07   01.02.06   01.02.05
+mpi_tool.h  01.02.01   01.02.01   01.02.01   01.02.01   01.02.01   01.02.01
+mpi_type.h  01.02.02   01.02.02   01.02.02   01.02.02   01.02.02   01.02.02
+
+Filename    01.02.05   01.02.04   01.02.03   01.02.02   01.02.01   01.01.10
+----------  --------   --------   --------   --------   --------   --------
+mpi.h       01.02.03   01.02.02   01.02.02   01.02.01   01.02.01   01.01.07
+mpi_ioc.h   01.02.04   01.02.03   01.02.03   01.02.02   01.02.01   01.01.07
+mpi_cnfg.h  01.02.05   01.02.04   01.02.03   01.02.02   01.02.01   01.01.11
+mpi_init.h  01.02.04   01.02.04   01.02.03   01.02.02   01.02.01   01.01.05
+mpi_targ.h  01.02.04   01.02.03   01.02.02   01.02.01   01.02.01   01.01.04
+mpi_fc.h    01.02.02   01.02.02   01.02.02   01.02.01   01.02.01   01.01.07
+mpi_lan.h   01.02.01   01.02.01   01.02.01   01.02.01   01.02.01   01.01.03
+mpi_raid.h  01.02.04   01.02.03   01.02.02   01.02.01   01.02.01   01.01.02
+mpi_tool.h  01.02.02   01.02.02   01.02.02   01.02.02   01.02.01
+mpi_type.h  01.02.02   01.02.02   01.02.02   01.02.02   01.02.01   01.01.02
 
 Filename    01.01.09   01.01.08   01.01.07   01.01.06   01.01.05   01.01.04
 ----------  --------   --------   --------   --------   --------   --------
diff --git a/drivers/message/fusion/lsi/mpi_inb.h b/drivers/message/fusion/lsi/mpi_inb.h
index dae29fbed56f..ff167309ba27 100644
--- a/drivers/message/fusion/lsi/mpi_inb.h
+++ b/drivers/message/fusion/lsi/mpi_inb.h
@@ -1,19 +1,20 @@
 /*
- *  Copyright (c) 2003 LSI Logic Corporation.
+ *  Copyright (c) 2003-2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_inb.h
  *          Title:  MPI Inband structures and definitions
  *  Creation Date:  September 30, 2003
  *
- *    mpi_inb.h Version:  01.03.xx
+ *    mpi_inb.h Version:  01.05.01
  *
  *  Version History
  *  ---------------
  *
  *  Date      Version   Description
  *  --------  --------  ------------------------------------------------------
- *  ??-??-??  01.03.01  Original release.
+ *  05-11-04  01.03.01  Original release.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
  */
 
diff --git a/drivers/message/fusion/lsi/mpi_init.h b/drivers/message/fusion/lsi/mpi_init.h
index b3c95fd7256f..aca035801a86 100644
--- a/drivers/message/fusion/lsi/mpi_init.h
+++ b/drivers/message/fusion/lsi/mpi_init.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_init.h
  *          Title:  MPI initiator mode messages and structures
  *  Creation Date:  June 8, 2000
  *
- *    mpi_init.h Version:  01.05.xx
+ *    mpi_init.h Version:  01.05.04
  *
  *  Version History
  *  ---------------
@@ -33,6 +33,21 @@
  *                      for SCSI IO requests.
  *  11-15-02  01.02.06  Added special extended SCSI Status defines for FCP.
  *  06-26-03  01.02.07  Added MPI_SCSI_STATUS_FCPEXT_UNASSIGNED define.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added MsgFlags defines for EEDP to SCSI IO request.
+ *                      Added new word to MSG_SCSI_IO_REPLY to add TaskTag field
+ *                      and a reserved U16.
+ *                      Added new MSG_SCSI_IO32_REQUEST structure.
+ *                      Added a TaskType of Clear Task Set to SCSI
+ *                      Task Management request.
+ *  12-07-04  01.05.02  Added support for Task Management Query Task.
+ *  01-15-05  01.05.03  Modified SCSI Enclosure Processor Request to support
+ *                      WWID addressing.
+ *  03-11-05  01.05.04  Removed EEDP flags from SCSI IO Request.
+ *                      Removed SCSI IO 32 Request.
+ *                      Modified SCSI Enclosure Processor Request and Reply to
+ *                      support Enclosure/Slot addressing rather than WWID
+ *                      addressing.
  *  --------------------------------------------------------------------------
  */
 
@@ -76,20 +91,12 @@ typedef struct _MSG_SCSI_IO_REQUEST
 #define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH              (0x01)
 #define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH_32           (0x00)
 #define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH_64           (0x01)
+
 #define MPI_SCSIIO_MSGFLGS_SENSE_LOCATION           (0x02)
 #define MPI_SCSIIO_MSGFLGS_SENSE_LOC_HOST           (0x00)
 #define MPI_SCSIIO_MSGFLGS_SENSE_LOC_IOC            (0x02)
-#define MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR  (0x04)
-#define MPI_SCSIIO_MSGFLGS_EEDP_TYPE_MASK           (0xE0)
-#define MPI_SCSIIO_MSGFLGS_EEDP_NONE                (0x00)
-#define MPI_SCSIIO_MSGFLGS_EEDP_RDPROTECT_T10       (0x20)
-#define MPI_SCSIIO_MSGFLGS_EEDP_VRPROTECT_T10       (0x40)
-#define MPI_SCSIIO_MSGFLGS_EEDP_WRPROTECT_T10       (0x60)
-#define MPI_SCSIIO_MSGFLGS_EEDP_520_READ_MODE1      (0x20)
-#define MPI_SCSIIO_MSGFLGS_EEDP_520_WRITE_MODE1     (0x40)
-#define MPI_SCSIIO_MSGFLGS_EEDP_8_9_READ_MODE1      (0x60)
-#define MPI_SCSIIO_MSGFLGS_EEDP_8_9_WRITE_MODE1     (0x80)
 
+#define MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR  (0x04)
 
 /* SCSI IO LUN fields */
 
@@ -148,6 +155,8 @@ typedef struct _MSG_SCSI_IO_REPLY
     U32                     TransferCount;      /* 14h */
     U32                     SenseCount;         /* 18h */
     U32                     ResponseInfo;       /* 1Ch */
+    U16                     TaskTag;            /* 20h */
+    U16                     Reserved1;          /* 22h */
 } MSG_SCSI_IO_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_REPLY,
   SCSIIOReply_t, MPI_POINTER pSCSIIOReply_t;
 
@@ -190,32 +199,7 @@ typedef struct _MSG_SCSI_IO_REPLY
 #define MPI_SCSI_RSP_INFO_TASK_MGMT_FAILED      (0x05000000)
 #define MPI_SCSI_RSP_INFO_SPI_LQ_INVALID_TYPE   (0x06000000)
 
-
-/****************************************************************************/
-/*  SCSI IO 32 Request message structure                                    */
-/****************************************************************************/
-
-typedef struct _MSG_SCSI_IO32_REQUEST
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      CDBLength;          /* 04h */
-    U8                      SenseBufferLength;  /* 05h */
-    U8                      Reserved;           /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      LUN[8];             /* 0Ch */
-    U32                     Control;            /* 14h */
-    U8                      CDB[32];            /* 18h */
-    U32                     DataLength;         /* 38h */
-    U32                     SenseBufferLowAddr; /* 3Ch */
-    SGE_IO_UNION            SGL;                /* 40h */
-} MSG_SCSI_IO32_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO32_REQUEST,
-  SCSIIO32Request_t, MPI_POINTER pSCSIIO32Request_t;
-
-/* SCSI IO 32 uses the same defines as above for SCSI IO */
+#define MPI_SCSI_TASKTAG_UNKNOWN                (0xFFFF)
 
 
 /****************************************************************************/
@@ -247,6 +231,7 @@ typedef struct _MSG_SCSI_TASK_MGMT
 #define MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS             (0x04)
 #define MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET    (0x05)
 #define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_TASK_SET        (0x06)
+#define MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK            (0x07)
 
 /* MsgFlags bits */
 #define MPI_SCSITASKMGMT_MSGFLAGS_TARGET_RESET_OPTION   (0x00)
@@ -260,7 +245,7 @@ typedef struct _MSG_SCSI_TASK_MGMT_REPLY
     U8                      Bus;                /* 01h */
     U8                      MsgLength;          /* 02h */
     U8                      Function;           /* 03h */
-    U8                      Reserved;           /* 04h */
+    U8                      ResponseCode;       /* 04h */
     U8                      TaskType;           /* 05h */
     U8                      Reserved1;          /* 06h */
     U8                      MsgFlags;           /* 07h */
@@ -272,6 +257,15 @@ typedef struct _MSG_SCSI_TASK_MGMT_REPLY
 } MSG_SCSI_TASK_MGMT_REPLY, MPI_POINTER PTR_MSG_SCSI_TASK_MGMT_REPLY,
   SCSITaskMgmtReply_t, MPI_POINTER pSCSITaskMgmtReply_t;
 
+/* ResponseCode values */
+#define MPI_SCSITASKMGMT_RSP_TM_COMPLETE                (0x00)
+#define MPI_SCSITASKMGMT_RSP_INVALID_FRAME              (0x02)
+#define MPI_SCSITASKMGMT_RSP_TM_NOT_SUPPORTED           (0x04)
+#define MPI_SCSITASKMGMT_RSP_TM_FAILED                  (0x05)
+#define MPI_SCSITASKMGMT_RSP_TM_SUCCEEDED               (0x08)
+#define MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN             (0x09)
+#define MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC           (0x80)
+
 
 /****************************************************************************/
 /*  SCSI Enclosure Processor messages                                       */
@@ -284,11 +278,16 @@ typedef struct _MSG_SEP_REQUEST
     U8                      ChainOffset;        /* 02h */
     U8                      Function;           /* 03h */
     U8                      Action;             /* 04h */
-    U8                      Reserved1;          /* 05h */
-    U8                      Reserved2;          /* 06h */
+    U8                      Flags;              /* 05h */
+    U8                      Reserved1;          /* 06h */
     U8                      MsgFlags;           /* 07h */
     U32                     MsgContext;         /* 08h */
     U32                     SlotStatus;         /* 0Ch */
+    U32                     Reserved2;          /* 10h */
+    U32                     Reserved3;          /* 14h */
+    U32                     Reserved4;          /* 18h */
+    U16                     Slot;               /* 1Ch */
+    U16                     EnclosureHandle;    /* 1Eh */
 } MSG_SEP_REQUEST, MPI_POINTER PTR_MSG_SEP_REQUEST,
   SEPRequest_t, MPI_POINTER pSEPRequest_t;
 
@@ -296,6 +295,10 @@ typedef struct _MSG_SEP_REQUEST
 #define MPI_SEP_REQ_ACTION_WRITE_STATUS                 (0x00)
 #define MPI_SEP_REQ_ACTION_READ_STATUS                  (0x01)
 
+/* Flags defines */
+#define MPI_SEP_REQ_FLAGS_ENCLOSURE_SLOT_ADDRESS        (0x01)
+#define MPI_SEP_REQ_FLAGS_BUS_TARGETID_ADDRESS          (0x00)
+
 /* SlotStatus bits for MSG_SEP_REQUEST */
 #define MPI_SEP_REQ_SLOTSTATUS_NO_ERROR                 (0x00000001)
 #define MPI_SEP_REQ_SLOTSTATUS_DEV_FAULTY               (0x00000002)
@@ -332,6 +335,9 @@ typedef struct _MSG_SEP_REPLY
     U16                     IOCStatus;          /* 0Eh */
     U32                     IOCLogInfo;         /* 10h */
     U32                     SlotStatus;         /* 14h */
+    U32                     Reserved4;          /* 18h */
+    U16                     Slot;               /* 1Ch */
+    U16                     EnclosureHandle;    /* 1Eh */
 } MSG_SEP_REPLY, MPI_POINTER PTR_MSG_SEP_REPLY,
   SEPReply_t, MPI_POINTER pSEPReply_t;
 
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index 82445d18b4d5..f91eb4efe8cc 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_ioc.h
  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
  *  Creation Date:  August 11, 2000
  *
- *    mpi_ioc.h Version:  01.05.xx
+ *    mpi_ioc.h Version:  01.05.08
  *
  *  Version History
  *  ---------------
@@ -57,6 +57,30 @@
  *                      Added AliasIndex to EVENT_DATA_LOGOUT structure.
  *  04-01-03  01.02.07  Added defines for MPI_FW_HEADER_SIGNATURE_.
  *  06-26-03  01.02.08  Added new values to the product family defines.
+ *  04-29-04  01.02.09  Added IOCCapabilities field to MSG_IOC_FACTS_REPLY and
+ *                      added related defines.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added four new fields to MSG_IOC_INIT.
+ *                      Added three new fields to MSG_IOC_FACTS_REPLY.
+ *                      Defined four new bits for the IOCCapabilities field of
+ *                      the IOCFacts reply.
+ *                      Added two new PortTypes for the PortFacts reply.
+ *                      Added six new events along with their EventData
+ *                      structures.
+ *                      Added a new MsgFlag to the FwDownload request to
+ *                      indicate last segment.
+ *                      Defined a new image type of boot loader.
+ *                      Added FW family codes for SAS product families.
+ *  10-05-04  01.05.02  Added ReplyFifoHostSignalingAddr field to
+ *                      MSG_IOC_FACTS_REPLY.
+ *  12-07-04  01.05.03  Added more defines for SAS Discovery Error event.
+ *  12-09-04  01.05.04  Added Unsupported device to SAS Device event.
+ *  01-15-05  01.05.05  Added event data for SAS SES Event.
+ *  02-09-05  01.05.06  Added MPI_FW_UPLOAD_ITYPE_FW_BACKUP define.
+ *  02-22-05  01.05.07  Added Host Page Buffer Persistent flag to IOC Facts
+ *                      Reply and IOC Init Request.
+ *  03-11-05  01.05.08  Added family code for 1068E family.
+ *                      Removed IOCFacts Reply EEDP Capability bit.
  *  --------------------------------------------------------------------------
  */
 
@@ -90,20 +114,37 @@ typedef struct _MSG_IOC_INIT
     U32                     HostMfaHighAddr;            /* 10h */
     U32                     SenseBufferHighAddr;        /* 14h */
     U32                     ReplyFifoHostSignalingAddr; /* 18h */
+    SGE_SIMPLE_UNION        HostPageBufferSGE;          /* 1Ch */
+    U16                     MsgVersion;                 /* 28h */
+    U16                     HeaderVersion;              /* 2Ah */
 } MSG_IOC_INIT, MPI_POINTER PTR_MSG_IOC_INIT,
   IOCInit_t, MPI_POINTER pIOCInit_t;
 
 /* WhoInit values */
-#define MPI_WHOINIT_NO_ONE                          (0x00)
-#define MPI_WHOINIT_SYSTEM_BIOS                     (0x01)
-#define MPI_WHOINIT_ROM_BIOS                        (0x02)
-#define MPI_WHOINIT_PCI_PEER                        (0x03)
-#define MPI_WHOINIT_HOST_DRIVER                     (0x04)
-#define MPI_WHOINIT_MANUFACTURER                    (0x05)
+#define MPI_WHOINIT_NO_ONE                              (0x00)
+#define MPI_WHOINIT_SYSTEM_BIOS                         (0x01)
+#define MPI_WHOINIT_ROM_BIOS                            (0x02)
+#define MPI_WHOINIT_PCI_PEER                            (0x03)
+#define MPI_WHOINIT_HOST_DRIVER                         (0x04)
+#define MPI_WHOINIT_MANUFACTURER                        (0x05)
 
 /* Flags values */
-#define MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE          (0x01)
-#define MPI_IOCINIT_FLAGS_REPLY_FIFO_HOST_SIGNAL    (0x02)
+#define MPI_IOCINIT_FLAGS_HOST_PAGE_BUFFER_PERSISTENT   (0x04)
+#define MPI_IOCINIT_FLAGS_REPLY_FIFO_HOST_SIGNAL        (0x02)
+#define MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE              (0x01)
+
+/* MsgVersion */
+#define MPI_IOCINIT_MSGVERSION_MAJOR_MASK               (0xFF00)
+#define MPI_IOCINIT_MSGVERSION_MAJOR_SHIFT              (8)
+#define MPI_IOCINIT_MSGVERSION_MINOR_MASK               (0x00FF)
+#define MPI_IOCINIT_MSGVERSION_MINOR_SHIFT              (0)
+
+/* HeaderVersion */
+#define MPI_IOCINIT_HEADERVERSION_UNIT_MASK             (0xFF00)
+#define MPI_IOCINIT_HEADERVERSION_UNIT_SHIFT            (8)
+#define MPI_IOCINIT_HEADERVERSION_DEV_MASK              (0x00FF)
+#define MPI_IOCINIT_HEADERVERSION_DEV_SHIFT             (0)
+
 
 typedef struct _MSG_IOC_INIT_REPLY
 {
@@ -187,32 +228,39 @@ typedef struct _MSG_IOC_FACTS_REPLY
     MPI_FW_VERSION          FWVersion;                  /* 38h */
     U16                     HighPriorityQueueDepth;     /* 3Ch */
     U16                     Reserved2;                  /* 3Eh */
+    SGE_SIMPLE_UNION        HostPageBufferSGE;          /* 40h */
+    U32                     ReplyFifoHostSignalingAddr; /* 4Ch */
 } MSG_IOC_FACTS_REPLY, MPI_POINTER PTR_MSG_IOC_FACTS_REPLY,
   IOCFactsReply_t, MPI_POINTER pIOCFactsReply_t;
 
-#define MPI_IOCFACTS_MSGVERSION_MAJOR_MASK          (0xFF00)
-#define MPI_IOCFACTS_MSGVERSION_MINOR_MASK          (0x00FF)
+#define MPI_IOCFACTS_MSGVERSION_MAJOR_MASK              (0xFF00)
+#define MPI_IOCFACTS_MSGVERSION_MAJOR_SHIFT             (8)
+#define MPI_IOCFACTS_MSGVERSION_MINOR_MASK              (0x00FF)
+#define MPI_IOCFACTS_MSGVERSION_MINOR_SHIFT             (0)
 
-#define MPI_IOCFACTS_HEADERVERSION_UNIT_MASK        (0xFF00)
-#define MPI_IOCFACTS_HEADERVERSION_DEV_MASK         (0x00FF)
+#define MPI_IOCFACTS_HDRVERSION_UNIT_MASK               (0xFF00)
+#define MPI_IOCFACTS_HDRVERSION_UNIT_SHIFT              (8)
+#define MPI_IOCFACTS_HDRVERSION_DEV_MASK                (0x00FF)
+#define MPI_IOCFACTS_HDRVERSION_DEV_SHIFT               (0)
 
-#define MPI_IOCFACTS_EXCEPT_CONFIG_CHECKSUM_FAIL    (0x0001)
-#define MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID     (0x0002)
-#define MPI_IOCFACTS_EXCEPT_FW_CHECKSUM_FAIL        (0x0004)
-#define MPI_IOCFACTS_EXCEPT_PERSISTENT_TABLE_FULL   (0x0008)
+#define MPI_IOCFACTS_EXCEPT_CONFIG_CHECKSUM_FAIL        (0x0001)
+#define MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID         (0x0002)
+#define MPI_IOCFACTS_EXCEPT_FW_CHECKSUM_FAIL            (0x0004)
+#define MPI_IOCFACTS_EXCEPT_PERSISTENT_TABLE_FULL       (0x0008)
 
-#define MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT         (0x01)
+#define MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT             (0x01)
+#define MPI_IOCFACTS_FLAGS_REPLY_FIFO_HOST_SIGNAL       (0x02)
+#define MPI_IOCFACTS_FLAGS_HOST_PAGE_BUFFER_PERSISTENT  (0x04)
 
-#define MPI_IOCFACTS_EVENTSTATE_DISABLED            (0x00)
-#define MPI_IOCFACTS_EVENTSTATE_ENABLED             (0x01)
+#define MPI_IOCFACTS_EVENTSTATE_DISABLED                (0x00)
+#define MPI_IOCFACTS_EVENTSTATE_ENABLED                 (0x01)
 
-#define MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q          (0x00000001)
-#define MPI_IOCFACTS_CAPABILITY_REPLY_HOST_SIGNAL   (0x00000002)
-#define MPI_IOCFACTS_CAPABILITY_QUEUE_FULL_HANDLING (0x00000004)
-#define MPI_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER   (0x00000008)
-#define MPI_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER     (0x00000010)
-#define MPI_IOCFACTS_CAPABILITY_EXTENDED_BUFFER     (0x00000020)
-#define MPI_IOCFACTS_CAPABILITY_EEDP                (0x00000040)
+#define MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q              (0x00000001)
+#define MPI_IOCFACTS_CAPABILITY_REPLY_HOST_SIGNAL       (0x00000002)
+#define MPI_IOCFACTS_CAPABILITY_QUEUE_FULL_HANDLING     (0x00000004)
+#define MPI_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER       (0x00000008)
+#define MPI_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER         (0x00000010)
+#define MPI_IOCFACTS_CAPABILITY_EXTENDED_BUFFER         (0x00000020)
 
 
 
@@ -408,6 +456,8 @@ typedef struct _MSG_EVENT_ACK_REPLY
 #define MPI_EVENT_SAS_DEVICE_STATUS_CHANGE  (0x0000000F)
 #define MPI_EVENT_SAS_SES                   (0x00000010)
 #define MPI_EVENT_PERSISTENT_TABLE_FULL     (0x00000011)
+#define MPI_EVENT_SAS_PHY_LINK_STATUS       (0x00000012)
+#define MPI_EVENT_SAS_DISCOVERY_ERROR       (0x00000013)
 
 /* AckRequired field values */
 
@@ -467,6 +517,10 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
     U8                      ASCQ;                       /* 05h */
     U16                     DevHandle;                  /* 06h */
     U32                     DeviceInfo;                 /* 08h */
+    U16                     ParentDevHandle;            /* 0Ch */
+    U8                      PhyNum;                     /* 0Eh */
+    U8                      Reserved1;                  /* 0Fh */
+    U64                     SASAddress;                 /* 10h */
 } EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,
   MPI_POINTER PTR_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,
   MpiEventDataSasDeviceStatusChange_t,
@@ -477,6 +531,8 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
 #define MPI_EVENT_SAS_DEV_STAT_RC_NOT_RESPONDING        (0x04)
 #define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA            (0x05)
 #define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED      (0x06)
+#define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED           (0x07)
+
 
 /* SCSI Event data for Queue Full event */
 
@@ -488,6 +544,35 @@ typedef struct _EVENT_DATA_QUEUE_FULL
 } EVENT_DATA_QUEUE_FULL, MPI_POINTER PTR_EVENT_DATA_QUEUE_FULL,
   EventDataQueueFull_t, MPI_POINTER pEventDataQueueFull_t;
 
+/* MPI Integrated RAID Event data */
+
+typedef struct _EVENT_DATA_RAID
+{
+    U8                      VolumeID;                   /* 00h */
+    U8                      VolumeBus;                  /* 01h */
+    U8                      ReasonCode;                 /* 02h */
+    U8                      PhysDiskNum;                /* 03h */
+    U8                      ASC;                        /* 04h */
+    U8                      ASCQ;                       /* 05h */
+    U16                     Reserved;                   /* 06h */
+    U32                     SettingsStatus;             /* 08h */
+} EVENT_DATA_RAID, MPI_POINTER PTR_EVENT_DATA_RAID,
+  MpiEventDataRaid_t, MPI_POINTER pMpiEventDataRaid_t;
+
+/* MPI Integrated RAID Event data ReasonCode values */
+#define MPI_EVENT_RAID_RC_VOLUME_CREATED                (0x00)
+#define MPI_EVENT_RAID_RC_VOLUME_DELETED                (0x01)
+#define MPI_EVENT_RAID_RC_VOLUME_SETTINGS_CHANGED       (0x02)
+#define MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED         (0x03)
+#define MPI_EVENT_RAID_RC_VOLUME_PHYSDISK_CHANGED       (0x04)
+#define MPI_EVENT_RAID_RC_PHYSDISK_CREATED              (0x05)
+#define MPI_EVENT_RAID_RC_PHYSDISK_DELETED              (0x06)
+#define MPI_EVENT_RAID_RC_PHYSDISK_SETTINGS_CHANGED     (0x07)
+#define MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED       (0x08)
+#define MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED             (0x09)
+#define MPI_EVENT_RAID_RC_SMART_DATA                    (0x0A)
+#define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED        (0x0B)
+
 /* MPI Link Status Change Event data */
 
 typedef struct _EVENT_DATA_LINK_STATUS
@@ -535,35 +620,63 @@ typedef struct _EVENT_DATA_LOGOUT
 
 #define MPI_EVENT_LOGOUT_ALL_ALIASES        (0xFF)
 
+/* SAS SES Event data */
 
-/* MPI Integrated RAID Event data */
-
-typedef struct _EVENT_DATA_RAID
+typedef struct _EVENT_DATA_SAS_SES
 {
-    U8                      VolumeID;                   /* 00h */
-    U8                      VolumeBus;                  /* 01h */
-    U8                      ReasonCode;                 /* 02h */
-    U8                      PhysDiskNum;                /* 03h */
-    U8                      ASC;                        /* 04h */
-    U8                      ASCQ;                       /* 05h */
-    U16                     Reserved;                   /* 06h */
-    U32                     SettingsStatus;             /* 08h */
-} EVENT_DATA_RAID, MPI_POINTER PTR_EVENT_DATA_RAID,
-  MpiEventDataRaid_t, MPI_POINTER pMpiEventDataRaid_t;
+    U8                      PhyNum;                     /* 00h */
+    U8                      Port;                       /* 01h */
+    U8                      PortWidth;                  /* 02h */
+    U8                      Reserved1;                  /* 04h */
+} EVENT_DATA_SAS_SES, MPI_POINTER PTR_EVENT_DATA_SAS_SES,
+  MpiEventDataSasSes_t, MPI_POINTER pMpiEventDataSasSes_t;
 
-/* MPI Integrated RAID Event data ReasonCode values */
-#define MPI_EVENT_RAID_RC_VOLUME_CREATED                (0x00)
-#define MPI_EVENT_RAID_RC_VOLUME_DELETED                (0x01)
-#define MPI_EVENT_RAID_RC_VOLUME_SETTINGS_CHANGED       (0x02)
-#define MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED         (0x03)
-#define MPI_EVENT_RAID_RC_VOLUME_PHYSDISK_CHANGED       (0x04)
-#define MPI_EVENT_RAID_RC_PHYSDISK_CREATED              (0x05)
-#define MPI_EVENT_RAID_RC_PHYSDISK_DELETED              (0x06)
-#define MPI_EVENT_RAID_RC_PHYSDISK_SETTINGS_CHANGED     (0x07)
-#define MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED       (0x08)
-#define MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED             (0x09)
-#define MPI_EVENT_RAID_RC_SMART_DATA                    (0x0A)
-#define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED        (0x0B)
+/* SAS Phy Link Status Event data */
+
+typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS
+{
+    U8                      PhyNum;                     /* 00h */
+    U8                      LinkRates;                  /* 01h */
+    U16                     DevHandle;                  /* 02h */
+    U64                     SASAddress;                 /* 04h */
+} EVENT_DATA_SAS_PHY_LINK_STATUS, MPI_POINTER PTR_EVENT_DATA_SAS_PHY_LINK_STATUS,
+  MpiEventDataSasPhyLinkStatus_t, MPI_POINTER pMpiEventDataSasPhyLinkStatus_t;
+
+/* defines for the LinkRates field of the SAS PHY Link Status event */
+#define MPI_EVENT_SAS_PLS_LR_CURRENT_MASK                   (0xF0)
+#define MPI_EVENT_SAS_PLS_LR_CURRENT_SHIFT                  (4)
+#define MPI_EVENT_SAS_PLS_LR_PREVIOUS_MASK                  (0x0F)
+#define MPI_EVENT_SAS_PLS_LR_PREVIOUS_SHIFT                 (0)
+#define MPI_EVENT_SAS_PLS_LR_RATE_UNKNOWN                   (0x00)
+#define MPI_EVENT_SAS_PLS_LR_RATE_PHY_DISABLED              (0x01)
+#define MPI_EVENT_SAS_PLS_LR_RATE_FAILED_SPEED_NEGOTIATION  (0x02)
+#define MPI_EVENT_SAS_PLS_LR_RATE_SATA_OOB_COMPLETE         (0x03)
+#define MPI_EVENT_SAS_PLS_LR_RATE_1_5                       (0x08)
+#define MPI_EVENT_SAS_PLS_LR_RATE_3_0                       (0x09)
+
+/* SAS Discovery Errror Event data */
+
+typedef struct _EVENT_DATA_DISCOVERY_ERROR
+{
+    U32                     DiscoveryStatus;            /* 00h */
+    U8                      Port;                       /* 04h */
+    U8                      Reserved1;                  /* 05h */
+    U16                     Reserved2;                  /* 06h */
+} EVENT_DATA_DISCOVERY_ERROR, MPI_POINTER PTR_EVENT_DATA_DISCOVERY_ERROR,
+  EventDataDiscoveryError_t, MPI_POINTER pEventDataDiscoveryError_t;
+
+#define MPI_EVENT_DSCVRY_ERR_DS_LOOP_DETECTED               (0x00000001)
+#define MPI_EVENT_DSCVRY_ERR_DS_UNADDRESSABLE_DEVICE        (0x00000002)
+#define MPI_EVENT_DSCVRY_ERR_DS_MULTIPLE_PORTS              (0x00000004)
+#define MPI_EVENT_DSCVRY_ERR_DS_EXPANDER_ERR                (0x00000008)
+#define MPI_EVENT_DSCVRY_ERR_DS_SMP_TIMEOUT                 (0x00000010)
+#define MPI_EVENT_DSCVRY_ERR_DS_OUT_ROUTE_ENTRIES           (0x00000020)
+#define MPI_EVENT_DSCVRY_ERR_DS_INDEX_NOT_EXIST             (0x00000040)
+#define MPI_EVENT_DSCVRY_ERR_DS_SMP_FUNCTION_FAILED         (0x00000080)
+#define MPI_EVENT_DSCVRY_ERR_DS_SMP_CRC_ERROR               (0x00000100)
+#define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_SUBTRACTIVE          (0x00000200)
+#define MPI_EVENT_DSCVRY_ERR_DS_TABLE_TO_TABLE              (0x00000400)
+#define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_PATHS                (0x00000800)
 
 
 /*****************************************************************************
@@ -589,11 +702,13 @@ typedef struct _MSG_FW_DOWNLOAD
 } MSG_FW_DOWNLOAD, MPI_POINTER PTR_MSG_FW_DOWNLOAD,
   FWDownload_t, MPI_POINTER pFWDownload_t;
 
-#define MPI_FW_DOWNLOAD_ITYPE_RESERVED      (0x00)
-#define MPI_FW_DOWNLOAD_ITYPE_FW            (0x01)
-#define MPI_FW_DOWNLOAD_ITYPE_BIOS          (0x02)
-#define MPI_FW_DOWNLOAD_ITYPE_NVDATA        (0x03)
-#define MPI_FW_DOWNLOAD_ITYPE_BOOTLOADER    (0x04)
+#define MPI_FW_DOWNLOAD_MSGFLGS_LAST_SEGMENT    (0x01)
+
+#define MPI_FW_DOWNLOAD_ITYPE_RESERVED          (0x00)
+#define MPI_FW_DOWNLOAD_ITYPE_FW                (0x01)
+#define MPI_FW_DOWNLOAD_ITYPE_BIOS              (0x02)
+#define MPI_FW_DOWNLOAD_ITYPE_NVDATA            (0x03)
+#define MPI_FW_DOWNLOAD_ITYPE_BOOTLOADER        (0x04)
 
 
 typedef struct _FWDownloadTCSGE
@@ -647,6 +762,7 @@ typedef struct _MSG_FW_UPLOAD
 #define MPI_FW_UPLOAD_ITYPE_BIOS_FLASH      (0x02)
 #define MPI_FW_UPLOAD_ITYPE_NVDATA          (0x03)
 #define MPI_FW_UPLOAD_ITYPE_BOOTLOADER      (0x04)
+#define MPI_FW_UPLOAD_ITYPE_FW_BACKUP       (0x05)
 
 typedef struct _FWUploadTCSGE
 {
@@ -723,6 +839,7 @@ typedef struct _MPI_FW_HEADER
 #define MPI_FW_HEADER_PID_PROD_IM_SCSI                  (0x0400)
 #define MPI_FW_HEADER_PID_PROD_IS_SCSI                  (0x0500)
 #define MPI_FW_HEADER_PID_PROD_CTX_SCSI                 (0x0600)
+#define MPI_FW_HEADER_PID_PROD_IR_SCSI                  (0x0700)
 
 #define MPI_FW_HEADER_PID_FAMILY_MASK           (0x00FF)
 /* SCSI */
@@ -740,13 +857,16 @@ typedef struct _MPI_FW_HEADER
 #define MPI_FW_HEADER_PID_FAMILY_1020TA0_SCSI   (0x000C)
 /* Fibre Channel */
 #define MPI_FW_HEADER_PID_FAMILY_909_FC         (0x0000)
-#define MPI_FW_HEADER_PID_FAMILY_919_FC         (0x0001)
-#define MPI_FW_HEADER_PID_FAMILY_919X_FC        (0x0002)
-#define MPI_FW_HEADER_PID_FAMILY_919XL_FC       (0x0003)
-#define MPI_FW_HEADER_PID_FAMILY_949_FC         (0x0004)
+#define MPI_FW_HEADER_PID_FAMILY_919_FC         (0x0001) /* 919 and 929     */
+#define MPI_FW_HEADER_PID_FAMILY_919X_FC        (0x0002) /* 919X and 929X   */
+#define MPI_FW_HEADER_PID_FAMILY_919XL_FC       (0x0003) /* 919XL and 929XL */
+#define MPI_FW_HEADER_PID_FAMILY_939X_FC        (0x0004) /* 939X and 949X   */
 #define MPI_FW_HEADER_PID_FAMILY_959_FC         (0x0005)
 /* SAS */
 #define MPI_FW_HEADER_PID_FAMILY_1064_SAS       (0x0001)
+#define MPI_FW_HEADER_PID_FAMILY_1068_SAS       (0x0002)
+#define MPI_FW_HEADER_PID_FAMILY_1078_SAS       (0x0003)
+#define MPI_FW_HEADER_PID_FAMILY_106xE_SAS      (0x0004) /* 1068E, 1066E, and 1064E */
 
 typedef struct _MPI_EXT_IMAGE_HEADER
 {
diff --git a/drivers/message/fusion/lsi/mpi_lan.h b/drivers/message/fusion/lsi/mpi_lan.h
index 3ced12784ee8..dc0b52ae83dd 100644
--- a/drivers/message/fusion/lsi/mpi_lan.h
+++ b/drivers/message/fusion/lsi/mpi_lan.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_lan.h
  *          Title:  MPI LAN messages and structures
  *  Creation Date:  June 30, 2000
  *
- *    mpi_lan.h Version:  01.05.xx
+ *    mpi_lan.h Version:  01.05.01
  *
  *  Version History
  *  ---------------
@@ -28,6 +28,8 @@
  *  02-20-01  01.01.02  Started using MPI_POINTER.
  *  03-27-01  01.01.03  Added structure offset comments.
  *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
  */
 
diff --git a/drivers/message/fusion/lsi/mpi_raid.h b/drivers/message/fusion/lsi/mpi_raid.h
index 9580a9de7fd2..802255d2747c 100644
--- a/drivers/message/fusion/lsi/mpi_raid.h
+++ b/drivers/message/fusion/lsi/mpi_raid.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2001-2003 LSI Logic Corporation.
+ *  Copyright (c) 2001-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_raid.h
  *          Title:  MPI RAID message and structures
  *  Creation Date:  February 27, 2001
  *
- *    mpi_raid.h Version:  01.05.xx
+ *    mpi_raid.h Version:  01.05.02
  *
  *  Version History
  *  ---------------
@@ -28,6 +28,10 @@
  *  11-15-02  01.02.08  Added missing MsgContext field to MSG_MAILBOX_REQUEST.
  *  04-01-03  01.02.09  New action data option flag for
  *                      MPI_RAID_ACTION_DELETE_VOLUME.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
+ *  01-15-05  01.05.02  Added defines for the two new RAID Actions for
+ *                      _SET_RESYNC_RATE and _SET_DATA_SCRUB_RATE.
  *  --------------------------------------------------------------------------
  */
 
@@ -84,6 +88,8 @@ typedef struct _MSG_RAID_ACTION
 #define MPI_RAID_ACTION_REPLACE_PHYSDISK            (0x10)
 #define MPI_RAID_ACTION_ACTIVATE_VOLUME             (0x11)
 #define MPI_RAID_ACTION_INACTIVATE_VOLUME           (0x12)
+#define MPI_RAID_ACTION_SET_RESYNC_RATE             (0x13)
+#define MPI_RAID_ACTION_SET_DATA_SCRUB_RATE         (0x14)
 
 /* ActionDataWord defines for use with MPI_RAID_ACTION_CREATE_VOLUME action */
 #define MPI_RAID_ACTION_ADATA_DO_NOT_SYNC           (0x00000001)
@@ -99,6 +105,13 @@ typedef struct _MSG_RAID_ACTION
 /* ActionDataWord defines for use with MPI_RAID_ACTION_ACTIVATE_VOLUME action */
 #define MPI_RAID_ACTION_ADATA_INACTIVATE_ALL        (0x00000001)
 
+/* ActionDataWord defines for use with MPI_RAID_ACTION_SET_RESYNC_RATE action */
+#define MPI_RAID_ACTION_ADATA_RESYNC_RATE_MASK      (0x000000FF)
+
+/* ActionDataWord defines for use with MPI_RAID_ACTION_SET_DATA_SCRUB_RATE action */
+#define MPI_RAID_ACTION_ADATA_DATA_SCRUB_RATE_MASK  (0x000000FF)
+
+
 
 /* RAID Action reply message */
 
diff --git a/drivers/message/fusion/lsi/mpi_sas.h b/drivers/message/fusion/lsi/mpi_sas.h
index cb878f9c65de..230fa69b5353 100644
--- a/drivers/message/fusion/lsi/mpi_sas.h
+++ b/drivers/message/fusion/lsi/mpi_sas.h
@@ -1,25 +1,76 @@
 /*
- *  Copyright (c) 2003 LSI Logic Corporation.
+ *  Copyright (c) 2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_sas.h
  *          Title:  MPI Serial Attached SCSI structures and definitions
- *  Creation Date:  April 23, 2003
+ *  Creation Date:  August 19, 2004
  *
- *    mpi_sas.h Version:  01.05.xx
+ *    mpi_sas.h Version:  01.05.01
  *
  *  Version History
  *  ---------------
  *
  *  Date      Version   Description
  *  --------  --------  ------------------------------------------------------
- *  xx-yy-zz  01.05.01  Original release.
+ *  08-19-04  01.05.01  Original release.
  *  --------------------------------------------------------------------------
  */
 
 #ifndef MPI_SAS_H
 #define MPI_SAS_H
 
+
+/*
+ * Values for SASStatus.
+ */
+#define MPI_SASSTATUS_SUCCESS                           (0x00)
+#define MPI_SASSTATUS_UNKNOWN_ERROR                     (0x01)
+#define MPI_SASSTATUS_INVALID_FRAME                     (0x02)
+#define MPI_SASSTATUS_UTC_BAD_DEST                      (0x03)
+#define MPI_SASSTATUS_UTC_BREAK_RECEIVED                (0x04)
+#define MPI_SASSTATUS_UTC_CONNECT_RATE_NOT_SUPPORTED    (0x05)
+#define MPI_SASSTATUS_UTC_PORT_LAYER_REQUEST            (0x06)
+#define MPI_SASSTATUS_UTC_PROTOCOL_NOT_SUPPORTED        (0x07)
+#define MPI_SASSTATUS_UTC_STP_RESOURCES_BUSY            (0x08)
+#define MPI_SASSTATUS_UTC_WRONG_DESTINATION             (0x09)
+#define MPI_SASSTATUS_SHORT_INFORMATION_UNIT            (0x0A)
+#define MPI_SASSTATUS_LONG_INFORMATION_UNIT             (0x0B)
+#define MPI_SASSTATUS_XFER_RDY_INCORRECT_WRITE_DATA     (0x0C)
+#define MPI_SASSTATUS_XFER_RDY_REQUEST_OFFSET_ERROR     (0x0D)
+#define MPI_SASSTATUS_XFER_RDY_NOT_EXPECTED             (0x0E)
+#define MPI_SASSTATUS_DATA_INCORRECT_DATA_LENGTH        (0x0F)
+#define MPI_SASSTATUS_DATA_TOO_MUCH_READ_DATA           (0x10)
+#define MPI_SASSTATUS_DATA_OFFSET_ERROR                 (0x11)
+#define MPI_SASSTATUS_SDSF_NAK_RECEIVED                 (0x12)
+#define MPI_SASSTATUS_SDSF_CONNECTION_FAILED            (0x13)
+#define MPI_SASSTATUS_INITIATOR_RESPONSE_TIMEOUT        (0x14)
+
+
+/*
+ * Values for the SAS DeviceInfo field used in SAS Device Status Change Event
+ * data and SAS IO Unit Configuration pages.
+ */
+#define MPI_SAS_DEVICE_INFO_ATAPI_DEVICE        (0x00002000)
+#define MPI_SAS_DEVICE_INFO_LSI_DEVICE          (0x00001000)
+#define MPI_SAS_DEVICE_INFO_DIRECT_ATTACH       (0x00000800)
+#define MPI_SAS_DEVICE_INFO_SSP_TARGET          (0x00000400)
+#define MPI_SAS_DEVICE_INFO_STP_TARGET          (0x00000200)
+#define MPI_SAS_DEVICE_INFO_SMP_TARGET          (0x00000100)
+#define MPI_SAS_DEVICE_INFO_SATA_DEVICE         (0x00000080)
+#define MPI_SAS_DEVICE_INFO_SSP_INITIATOR       (0x00000040)
+#define MPI_SAS_DEVICE_INFO_STP_INITIATOR       (0x00000020)
+#define MPI_SAS_DEVICE_INFO_SMP_INITIATOR       (0x00000010)
+#define MPI_SAS_DEVICE_INFO_SATA_HOST           (0x00000008)
+
+#define MPI_SAS_DEVICE_INFO_MASK_DEVICE_TYPE    (0x00000007)
+#define MPI_SAS_DEVICE_INFO_NO_DEVICE           (0x00000000)
+#define MPI_SAS_DEVICE_INFO_END_DEVICE          (0x00000001)
+#define MPI_SAS_DEVICE_INFO_EDGE_EXPANDER       (0x00000002)
+#define MPI_SAS_DEVICE_INFO_FANOUT_EXPANDER     (0x00000003)
+
+
+
 /*****************************************************************************
 *
 *        S e r i a l    A t t a c h e d    S C S I     M e s s a g e s
@@ -48,8 +99,10 @@ typedef struct _MSG_SMP_PASSTHROUGH_REQUEST
 } MSG_SMP_PASSTHROUGH_REQUEST, MPI_POINTER PTR_MSG_SMP_PASSTHROUGH_REQUEST,
   SmpPassthroughRequest_t, MPI_POINTER pSmpPassthroughRequest_t;
 
+/* values for PassthroughFlags field */
 #define MPI_SMP_PT_REQ_PT_FLAGS_IMMEDIATE       (0x80)
 
+/* values for ConnectionRate field */
 #define MPI_SMP_PT_REQ_CONNECT_RATE_NEGOTIATED  (0x00)
 #define MPI_SMP_PT_REQ_CONNECT_RATE_1_5         (0x08)
 #define MPI_SMP_PT_REQ_CONNECT_RATE_3_0         (0x09)
@@ -77,51 +130,69 @@ typedef struct _MSG_SMP_PASSTHROUGH_REPLY
 
 #define MPI_SMP_PT_REPLY_PT_FLAGS_IMMEDIATE     (0x80)
 
-/* values for the SASStatus field */
-#define MPI_SASSTATUS_SUCCESS                           (0x00)
-#define MPI_SASSTATUS_UNKNOWN_ERROR                     (0x01)
-#define MPI_SASSTATUS_INVALID_FRAME                     (0x02)
-#define MPI_SASSTATUS_UTC_BAD_DEST                      (0x03)
-#define MPI_SASSTATUS_UTC_BREAK_RECEIVED                (0x04)
-#define MPI_SASSTATUS_UTC_CONNECT_RATE_NOT_SUPPORTED    (0x05)
-#define MPI_SASSTATUS_UTC_PORT_LAYER_REQUEST            (0x06)
-#define MPI_SASSTATUS_UTC_PROTOCOL_NOT_SUPPORTED        (0x07)
-#define MPI_SASSTATUS_UTC_STP_RESOURCES_BUSY            (0x08)
-#define MPI_SASSTATUS_UTC_WRONG_DESTINATION             (0x09)
-#define MPI_SASSTATUS_SHORT_INFORMATION_UNIT            (0x0A)
-#define MPI_SASSTATUS_LONG_INFORMATION_UNIT             (0x0B)
-#define MPI_SASSTATUS_XFER_RDY_INCORRECT_WRITE_DATA     (0x0C)
-#define MPI_SASSTATUS_XFER_RDY_REQUEST_OFFSET_ERROR     (0x0D)
-#define MPI_SASSTATUS_XFER_RDY_NOT_EXPECTED             (0x0E)
-#define MPI_SASSTATUS_DATA_INCORRECT_DATA_LENGTH        (0x0F)
-#define MPI_SASSTATUS_DATA_TOO_MUCH_READ_DATA           (0x10)
-#define MPI_SASSTATUS_DATA_OFFSET_ERROR                 (0x11)
-#define MPI_SASSTATUS_SDSF_NAK_RECEIVED                 (0x12)
-#define MPI_SASSTATUS_SDSF_CONNECTION_FAILED            (0x13)
-#define MPI_SASSTATUS_INITIATOR_RESPONSE_TIMEOUT        (0x14)
 
+/****************************************************************************/
+/* SATA Passthrough Request                                                 */
+/****************************************************************************/
+
+typedef struct _MSG_SATA_PASSTHROUGH_REQUEST
+{
+    U8                      TargetID;           /* 00h */
+    U8                      Bus;                /* 01h */
+    U8                      ChainOffset;        /* 02h */
+    U8                      Function;           /* 03h */
+    U16                     PassthroughFlags;   /* 04h */
+    U8                      ConnectionRate;     /* 06h */
+    U8                      MsgFlags;           /* 07h */
+    U32                     MsgContext;         /* 08h */
+    U32                     Reserved1;          /* 0Ch */
+    U32                     Reserved2;          /* 10h */
+    U32                     Reserved3;          /* 14h */
+    U32                     DataLength;         /* 18h */
+    U8                      CommandFIS[20];     /* 1Ch */
+    SGE_SIMPLE_UNION        SGL;                /* 30h */
+} MSG_SATA_PASSTHROUGH_REQUEST, MPI_POINTER PTR_MSG_SATA_PASSTHROUGH_REQUEST,
+  SataPassthroughRequest_t, MPI_POINTER pSataPassthroughRequest_t;
+
+/* values for PassthroughFlags field */
+#define MPI_SATA_PT_REQ_PT_FLAGS_RESET_DEVICE   (0x0200)
+#define MPI_SATA_PT_REQ_PT_FLAGS_EXECUTE_DIAG   (0x0100)
+#define MPI_SATA_PT_REQ_PT_FLAGS_DMA_QUEUED     (0x0080)
+#define MPI_SATA_PT_REQ_PT_FLAGS_PACKET_COMMAND (0x0040)
+#define MPI_SATA_PT_REQ_PT_FLAGS_DMA            (0x0020)
+#define MPI_SATA_PT_REQ_PT_FLAGS_PIO            (0x0010)
+#define MPI_SATA_PT_REQ_PT_FLAGS_UNSPECIFIED_VU (0x0004)
+#define MPI_SATA_PT_REQ_PT_FLAGS_WRITE          (0x0002)
+#define MPI_SATA_PT_REQ_PT_FLAGS_READ           (0x0001)
+
+/* values for ConnectionRate field */
+#define MPI_SATA_PT_REQ_CONNECT_RATE_NEGOTIATED (0x00)
+#define MPI_SATA_PT_REQ_CONNECT_RATE_1_5        (0x08)
+#define MPI_SATA_PT_REQ_CONNECT_RATE_3_0        (0x09)
+
+
+/* SATA Passthrough Reply */
+typedef struct _MSG_SATA_PASSTHROUGH_REPLY
+{
+    U8                      TargetID;           /* 00h */
+    U8                      Bus;                /* 01h */
+    U8                      MsgLength;          /* 02h */
+    U8                      Function;           /* 03h */
+    U16                     PassthroughFlags;   /* 04h */
+    U8                      Reserved1;          /* 06h */
+    U8                      MsgFlags;           /* 07h */
+    U32                     MsgContext;         /* 08h */
+    U8                      Reserved2;          /* 0Ch */
+    U8                      SASStatus;          /* 0Dh */
+    U16                     IOCStatus;          /* 0Eh */
+    U32                     IOCLogInfo;         /* 10h */
+    U8                      StatusFIS[20];      /* 14h */
+    U32                     StatusControlRegisters; /* 28h */
+    U32                     TransferCount;      /* 2Ch */
+} MSG_SATA_PASSTHROUGH_REPLY, MPI_POINTER PTR_MSG_SATA_PASSTHROUGH_REPLY,
+  SataPassthroughReply_t, MPI_POINTER pSataPassthroughReply_t;
 
-/*
- * Values for the SAS DeviceInfo field used in SAS Device Status Change Event
- * data and SAS IO Unit Configuration pages.
- */
-#define MPI_SAS_DEVICE_INFO_ATAPI_DEVICE        (0x00002000)
-#define MPI_SAS_DEVICE_INFO_LSI_DEVICE          (0x00001000)
-#define MPI_SAS_DEVICE_INFO_DIRECT_ATTACH       (0x00000800)
-#define MPI_SAS_DEVICE_INFO_SSP_TARGET          (0x00000400)
-#define MPI_SAS_DEVICE_INFO_STP_TARGET          (0x00000200)
-#define MPI_SAS_DEVICE_INFO_SMP_TARGET          (0x00000100)
-#define MPI_SAS_DEVICE_INFO_SATA_DEVICE         (0x00000080)
-#define MPI_SAS_DEVICE_INFO_SSP_INITIATOR       (0x00000040)
-#define MPI_SAS_DEVICE_INFO_STP_INITIATOR       (0x00000020)
-#define MPI_SAS_DEVICE_INFO_SMP_INITIATOR       (0x00000010)
-#define MPI_SAS_DEVICE_INFO_SATA_HOST           (0x00000008)
 
-#define MPI_SAS_DEVICE_INFO_MASK_DEVICE_TYPE    (0x00000007)
-#define MPI_SAS_DEVICE_INFO_NO_DEVICE           (0x00000000)
-#define MPI_SAS_DEVICE_INFO_END_DEVICE          (0x00000001)
-#define MPI_SAS_DEVICE_INFO_EDGE_EXPANDER       (0x00000002)
-#define MPI_SAS_DEVICE_INFO_FANOUT_EXPANDER     (0x00000003)
 
 
 /****************************************************************************/
@@ -148,15 +219,13 @@ typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST
 } MSG_SAS_IOUNIT_CONTROL_REQUEST, MPI_POINTER PTR_MSG_SAS_IOUNIT_CONTROL_REQUEST,
   SasIoUnitControlRequest_t, MPI_POINTER pSasIoUnitControlRequest_t;
 
-/* values for the ... field */
+/* values for the Operation field */
 #define MPI_SAS_OP_CLEAR_NOT_PRESENT             (0x01)
-#define MPI_SAS_OP_CLEAR_ALL                     (0x02)
-#define MPI_SAS_OP_MAP                           (0x03)
-#define MPI_SAS_OP_MOVE                          (0x04)
-#define MPI_SAS_OP_CLEAR                         (0x05)
+#define MPI_SAS_OP_CLEAR_ALL_PERSISTENT          (0x02)
 #define MPI_SAS_OP_PHY_LINK_RESET                (0x06)
 #define MPI_SAS_OP_PHY_HARD_RESET                (0x07)
 #define MPI_SAS_OP_PHY_CLEAR_ERROR_LOG           (0x08)
+#define MPI_SAS_OP_MAP_CURRENT                   (0x09)
 
 
 /* SAS IO Unit Control Reply */
diff --git a/drivers/message/fusion/lsi/mpi_targ.h b/drivers/message/fusion/lsi/mpi_targ.h
index 804dc85426c1..623901fd82be 100644
--- a/drivers/message/fusion/lsi/mpi_targ.h
+++ b/drivers/message/fusion/lsi/mpi_targ.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_targ.h
  *          Title:  MPI Target mode messages and structures
  *  Creation Date:  June 22, 2000
  *
- *    mpi_targ.h Version:  01.05.xx
+ *    mpi_targ.h Version:  01.05.04
  *
  *  Version History
  *  ---------------
@@ -43,6 +43,16 @@
  *                      Added PRIORITY_REASON_TARGET_BUSY.
  *  11-15-02  01.02.08  Added AliasID field to MPI_TARGET_SCSI_SPI_CMD_BUFFER.
  *  04-01-03  01.02.09  Added OptionalOxid field to MPI_TARGET_FCP_CMD_BUFFER.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Added new request message structures for
+ *                      MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
+ *                      MSG_TARGET_CMD_BUF_POST_LIST_REQUEST, and
+ *                      MSG_TARGET_ASSIST_EXT_REQUEST.
+ *                      Added new structures for SAS SSP Command buffer, SSP
+ *                      Task buffer, and SSP Status IU.
+ *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
+ *  02-22-05  01.05.03  Changed a comment.
+ *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
  *  --------------------------------------------------------------------------
  */
 
@@ -133,6 +143,25 @@ typedef struct _MSG_PRIORITY_CMD_RECEIVED_REPLY
 } MSG_PRIORITY_CMD_RECEIVED_REPLY, MPI_POINTER PTR_MSG_PRIORITY_CMD_RECEIVED_REPLY,
   PriorityCommandReceivedReply_t, MPI_POINTER pPriorityCommandReceivedReply_t;
 
+
+typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
+{
+    U16                     Reserved;                   /* 00h */
+    U8                      MsgLength;                  /* 02h */
+    U8                      Function;                   /* 03h */
+    U16                     Reserved1;                  /* 04h */
+    U8                      Reserved2;                  /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U8                      PriorityReason;             /* 0Ch */
+    U8                      Reserved3;                  /* 0Dh */
+    U16                     IOCStatus;                  /* 0Eh */
+    U32                     IOCLogInfo;                 /* 10h */
+    U32                     ReplyWord;                  /* 14h */
+} MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
+  MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
+  TargetCmdBufferPostErrorReply_t, MPI_POINTER pTargetCmdBufferPostErrorReply_t;
+
 #define PRIORITY_REASON_NO_DISCONNECT           (0x00)
 #define PRIORITY_REASON_SCSI_TASK_MANAGEMENT    (0x01)
 #define PRIORITY_REASON_CMD_PARITY_ERR          (0x02)
@@ -146,7 +175,34 @@ typedef struct _MSG_PRIORITY_CMD_RECEIVED_REPLY
 #define PRIORITY_REASON_UNKNOWN                 (0xFF)
 
 
-typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
+/****************************************************************************/
+/* Target Command Buffer Post Base Request                                  */
+/****************************************************************************/
+
+typedef struct _MSG_TARGET_CMD_BUF_POST_BASE_REQUEST
+{
+    U8                      BufferPostFlags;            /* 00h */
+    U8                      PortNumber;                 /* 01h */
+    U8                      ChainOffset;                /* 02h */
+    U8                      Function;                   /* 03h */
+    U16                     TotalCmdBuffers;            /* 04h */
+    U8                      Reserved;                   /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U32                     Reserved1;                  /* 0Ch */
+    U16                     CmdBufferLength;            /* 10h */
+    U16                     NextCmdBufferOffset;        /* 12h */
+    U32                     BaseAddressLow;             /* 14h */
+    U32                     BaseAddressHigh;            /* 18h */
+} MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
+  MPI_POINTER PTR__MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
+  TargetCmdBufferPostBaseRequest_t,
+  MPI_POINTER pTargetCmdBufferPostBaseRequest_t;
+
+#define CMD_BUFFER_POST_BASE_FLAGS_AUTO_POST_ALL    (0x01)
+
+
+typedef struct _MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY
 {
     U16                     Reserved;                   /* 00h */
     U8                      MsgLength;                  /* 02h */
@@ -155,16 +211,41 @@ typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
     U8                      Reserved2;                  /* 06h */
     U8                      MsgFlags;                   /* 07h */
     U32                     MsgContext;                 /* 08h */
-    U8                      PriorityReason;             /* 0Ch */
-    U8                      Reserved3;                  /* 0Dh */
+    U16                     Reserved3;                  /* 0Ch */
     U16                     IOCStatus;                  /* 0Eh */
     U32                     IOCLogInfo;                 /* 10h */
-    U32                     ReplyWord;                  /* 14h */
-} MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
-  MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
-  TargetCmdBufferPostErrorReply_t, MPI_POINTER pTargetCmdBufferPostErrorReply_t;
+} MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY,
+  MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY,
+  TargetCmdBufferPostBaseListReply_t,
+  MPI_POINTER pTargetCmdBufferPostBaseListReply_t;
+
+
+/****************************************************************************/
+/* Target Command Buffer Post List Request                                  */
+/****************************************************************************/
+
+typedef struct _MSG_TARGET_CMD_BUF_POST_LIST_REQUEST
+{
+    U8                      Reserved;                   /* 00h */
+    U8                      PortNumber;                 /* 01h */
+    U8                      ChainOffset;                /* 02h */
+    U8                      Function;                   /* 03h */
+    U16                     CmdBufferCount;             /* 04h */
+    U8                      Reserved1;                  /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U32                     Reserved2;                  /* 0Ch */
+    U16                     IoIndex[2];                 /* 10h */
+} MSG_TARGET_CMD_BUF_POST_LIST_REQUEST,
+  MPI_POINTER PTR_MSG_TARGET_CMD_BUF_POST_LIST_REQUEST,
+  TargetCmdBufferPostListRequest_t,
+  MPI_POINTER pTargetCmdBufferPostListRequest_t;
 
 
+/****************************************************************************/
+/* Command Buffer Formats (with 16 byte CDB)                                */
+/****************************************************************************/
+
 typedef struct _MPI_TARGET_FCP_CMD_BUFFER
 {
     U8      FcpLun[8];                                  /* 00h */
@@ -201,6 +282,46 @@ typedef struct _MPI_TARGET_SCSI_SPI_CMD_BUFFER
   MpiTargetScsiSpiCmdBuffer, MPI_POINTER pMpiTargetScsiSpiCmdBuffer;
 
 
+typedef struct _MPI_TARGET_SSP_CMD_BUFFER
+{
+    U8      FrameType;                                  /* 00h */
+    U8      Reserved1;                                  /* 01h */
+    U16     Reserved2;                                  /* 02h */
+    U16     InitiatorTag;                               /* 04h */
+    U16     DevHandle;                                  /* 06h */
+    /* COMMAND information unit starts here */
+    U8      LogicalUnitNumber[8];                       /* 08h */
+    U8      Reserved3;                                  /* 10h */
+    U8      TaskAttribute; /* lower 3 bits */           /* 11h */
+    U8      Reserved4;                                  /* 12h */
+    U8      AdditionalCDBLength; /* upper 5 bits */     /* 13h */
+    U8      CDB[16];                                    /* 14h */
+    /* Additional CDB bytes extend past the CDB field */
+} MPI_TARGET_SSP_CMD_BUFFER, MPI_POINTER PTR_MPI_TARGET_SSP_CMD_BUFFER,
+  MpiTargetSspCmdBuffer, MPI_POINTER pMpiTargetSspCmdBuffer;
+
+typedef struct _MPI_TARGET_SSP_TASK_BUFFER
+{
+    U8      FrameType;                                  /* 00h */
+    U8      Reserved1;                                  /* 01h */
+    U16     Reserved2;                                  /* 02h */
+    U16     InitiatorTag;                               /* 04h */
+    U16     DevHandle;                                  /* 06h */
+    /* TASK information unit starts here */
+    U8      LogicalUnitNumber[8];                       /* 08h */
+    U8      Reserved3;                                  /* 10h */
+    U8      Reserved4;                                  /* 11h */
+    U8      TaskManagementFunction;                     /* 12h */
+    U8      Reserved5;                                  /* 13h */
+    U16     ManagedTaskTag;                             /* 14h */
+    U16     Reserved6;                                  /* 16h */
+    U32     Reserved7;                                  /* 18h */
+    U32     Reserved8;                                  /* 1Ch */
+    U32     Reserved9;                                  /* 20h */
+} MPI_TARGET_SSP_TASK_BUFFER, MPI_POINTER PTR_MPI_TARGET_SSP_TASK_BUFFER,
+  MpiTargetSspTaskBuffer, MPI_POINTER pMpiTargetSspTaskBuffer;
+
+
 /****************************************************************************/
 /* Target Assist Request                                                    */
 /****************************************************************************/
@@ -308,6 +429,27 @@ typedef struct _MPI_TARGET_SCSI_SPI_STATUS_IU
 } MPI_TARGET_SCSI_SPI_STATUS_IU, MPI_POINTER PTR_MPI_TARGET_SCSI_SPI_STATUS_IU,
   TargetScsiSpiStatusIU_t, MPI_POINTER pTargetScsiSpiStatusIU_t;
 
+/*
+ * NOTE: The SSP status IU is big-endian. When used on a little-endian system,
+ * this structure properly orders the bytes.
+ */
+typedef struct _MPI_TARGET_SSP_RSP_IU
+{
+    U32     Reserved0[6]; /* reserved for SSP header */ /* 00h */
+    /* start of RESPONSE information unit */
+    U32     Reserved1;                                  /* 18h */
+    U32     Reserved2;                                  /* 1Ch */
+    U16     Reserved3;                                  /* 20h */
+    U8      DataPres; /* lower 2 bits */                /* 22h */
+    U8      Status;                                     /* 23h */
+    U32     Reserved4;                                  /* 24h */
+    U32     SenseDataLength;                            /* 28h */
+    U32     ResponseDataLength;                         /* 2Ch */
+    U8      ResponseSenseData[4];                       /* 30h */
+} MPI_TARGET_SSP_RSP_IU, MPI_POINTER PTR_MPI_TARGET_SSP_RSP_IU,
+  MpiTargetSspRspIu_t, MPI_POINTER pMpiTargetSspRspIu_t;
+
+
 /****************************************************************************/
 /* Target Mode Abort Request                                                */
 /****************************************************************************/
diff --git a/drivers/message/fusion/lsi/mpi_tool.h b/drivers/message/fusion/lsi/mpi_tool.h
index 536d197c4142..aa9053da1f58 100644
--- a/drivers/message/fusion/lsi/mpi_tool.h
+++ b/drivers/message/fusion/lsi/mpi_tool.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2001-2003 LSI Logic Corporation.
+ *  Copyright (c) 2001-2005 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_tool.h
  *          Title:  MPI Toolbox structures and definitions
  *  Creation Date:  July 30, 2001
  *
- *    mpi_tool.h Version:  01.05.xx
+ *    mpi_tool.h Version:  01.05.03
  *
  *  Version History
  *  ---------------
@@ -15,6 +15,16 @@
  *  --------  --------  ------------------------------------------------------
  *  08-08-01  01.02.01  Original release.
  *  08-29-01  01.02.02  Added DIAG_DATA_UPLOAD_HEADER and related defines.
+ *  01-16-04  01.02.03  Added defines and structures for new tools
+ *.                     MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL and
+ *                      MPI_TOOLBOX_FC_MANAGEMENT_TOOL.
+ *  04-29-04  01.02.04  Added message structures for Diagnostic Buffer Post and
+ *                      Diagnostic Release requests and replies.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
+ *  10-06-04  01.05.02  Added define for MPI_DIAG_BUF_TYPE_COUNT.
+ *  02-09-05  01.05.03  Added frame size option to FC management tool.
+ *                      Added Beacon tool to the Toolbox.
  *  --------------------------------------------------------------------------
  */
 
@@ -26,6 +36,7 @@
 #define MPI_TOOLBOX_DIAG_DATA_UPLOAD_TOOL           (0x02)
 #define MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL           (0x03)
 #define MPI_TOOLBOX_FC_MANAGEMENT_TOOL              (0x04)
+#define MPI_TOOLBOX_BEACON_TOOL                     (0x05)
 
 
 /****************************************************************************/
@@ -185,11 +196,21 @@ typedef struct _MPI_TB_FC_MANAGE_PID_AI
 } MPI_TB_FC_MANAGE_PID_AI, MPI_POINTER PTR_MPI_TB_FC_MANAGE_PID_AI,
   MpiTbFcManagePidAi_t, MPI_POINTER pMpiTbFcManagePidAi_t;
 
+/* ActionInfo for set max frame size */
+typedef struct _MPI_TB_FC_MANAGE_FRAME_SIZE_AI
+{
+    U16                     FrameSize;                  /* 00h */
+    U8                      PortNum;                    /* 02h */
+    U8                      Reserved1;                  /* 03h */
+} MPI_TB_FC_MANAGE_FRAME_SIZE_AI, MPI_POINTER PTR_MPI_TB_FC_MANAGE_FRAME_SIZE_AI,
+  MpiTbFcManageFrameSizeAi_t, MPI_POINTER pMpiTbFcManageFrameSizeAi_t;
+
 /* union of ActionInfo */
 typedef union _MPI_TB_FC_MANAGE_AI_UNION
 {
     MPI_TB_FC_MANAGE_BUS_TID_AI     BusTid;
     MPI_TB_FC_MANAGE_PID_AI         Port;
+    MPI_TB_FC_MANAGE_FRAME_SIZE_AI  FrameSize;
 } MPI_TB_FC_MANAGE_AI_UNION, MPI_POINTER PTR_MPI_TB_FC_MANAGE_AI_UNION,
   MpiTbFcManageAiUnion_t, MPI_POINTER pMpiTbFcManageAiUnion_t;
 
@@ -214,6 +235,32 @@ typedef struct _MSG_TOOLBOX_FC_MANAGE_REQUEST
 #define MPI_TB_FC_MANAGE_ACTION_DISC_ALL            (0x00)
 #define MPI_TB_FC_MANAGE_ACTION_DISC_PID            (0x01)
 #define MPI_TB_FC_MANAGE_ACTION_DISC_BUS_TID        (0x02)
+#define MPI_TB_FC_MANAGE_ACTION_SET_MAX_FRAME_SIZE  (0x03)
+
+
+/****************************************************************************/
+/* Toolbox Beacon Tool request                                               */
+/****************************************************************************/
+
+typedef struct _MSG_TOOLBOX_BEACON_REQUEST
+{
+    U8                      Tool;                       /* 00h */
+    U8                      Reserved;                   /* 01h */
+    U8                      ChainOffset;                /* 02h */
+    U8                      Function;                   /* 03h */
+    U16                     Reserved1;                  /* 04h */
+    U8                      Reserved2;                  /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U8                      ConnectNum;                 /* 0Ch */
+    U8                      PortNum;                    /* 0Dh */
+    U8                      Reserved3;                  /* 0Eh */
+    U8                      Flags;                      /* 0Fh */
+} MSG_TOOLBOX_BEACON_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_BEACON_REQUEST,
+  ToolboxBeaconRequest_t, MPI_POINTER pToolboxBeaconRequest_t;
+
+#define MPI_TOOLBOX_FLAGS_BEACON_MODE_OFF       (0x00)
+#define MPI_TOOLBOX_FLAGS_BEACON_MODE_ON        (0x01)
 
 
 /****************************************************************************/
@@ -233,14 +280,16 @@ typedef struct _MSG_DIAG_BUFFER_POST_REQUEST
     U32                     ExtendedType;               /* 0Ch */
     U32                     BufferLength;               /* 10h */
     U32                     ProductSpecific[4];         /* 14h */
-    U32                     Reserved3;                  /* 18h */
-    SGE_SIMPLE_UNION        SGL;                        /* 28h */
+    U32                     Reserved3;                  /* 24h */
+    U64                     BufferAddress;              /* 28h */
 } MSG_DIAG_BUFFER_POST_REQUEST, MPI_POINTER PTR_MSG_DIAG_BUFFER_POST_REQUEST,
   DiagBufferPostRequest_t, MPI_POINTER pDiagBufferPostRequest_t;
 
 #define MPI_DIAG_BUF_TYPE_TRACE                     (0x00)
 #define MPI_DIAG_BUF_TYPE_SNAPSHOT                  (0x01)
 #define MPI_DIAG_BUF_TYPE_EXTENDED                  (0x02)
+/* count of the number of buffer types */
+#define MPI_DIAG_BUF_TYPE_COUNT                     (0x03)
 
 #define MPI_DIAG_EXTENDED_QTAG                      (0x00000001)
 
diff --git a/drivers/message/fusion/lsi/mpi_type.h b/drivers/message/fusion/lsi/mpi_type.h
index 239328a7689c..32cc9b1151b8 100644
--- a/drivers/message/fusion/lsi/mpi_type.h
+++ b/drivers/message/fusion/lsi/mpi_type.h
@@ -1,12 +1,12 @@
 /*
- *  Copyright (c) 2000-2003 LSI Logic Corporation.
+ *  Copyright (c) 2000-2004 LSI Logic Corporation.
  *
  *
  *           Name:  mpi_type.h
  *          Title:  MPI Basic type definitions
  *  Creation Date:  June 6, 2000
  *
- *    mpi_type.h Version:  01.05.xx
+ *    mpi_type.h Version:  01.05.01
  *
  *  Version History
  *  ---------------
@@ -18,6 +18,8 @@
  *  11-02-00  01.01.01  Original release for post 1.0 work
  *  02-20-01  01.01.02  Added define and ifdef for MPI_POINTER.
  *  08-08-01  01.02.01  Original release for v1.2 work.
+ *  05-11-04  01.03.01  Original release for MPI v1.3.
+ *  08-19-04  01.05.01  Original release for MPI v1.5.
  *  --------------------------------------------------------------------------
  */
 
@@ -50,11 +52,6 @@ typedef unsigned short  U16;
 typedef int32_t   S32;
 typedef u_int32_t U32;
 
-/*
- *  The only way crap below could work on big-endian boxen would be if it
- *  wasn't used at all.
- */
-
 typedef struct _S64
 {
     U32          Low;
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 8b22630f1aef..8b623278ccd2 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1,55 +1,13 @@
 /*
  *  linux/drivers/message/fusion/mptbase.c
- *      High performance SCSI + LAN / Fibre Channel device drivers.
  *      This is the Fusion MPT base driver which supports multiple
  *      (SCSI + LAN) specialized protocol drivers.
- *      For use with PCI chip/adapter(s):
- *          LSIFC9xx/LSI409xx Fibre Channel
+ *      For use with LSI Logic PCI chip/adapter(s)
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      There are lots of people not mentioned below that deserve credit
- *      and thanks but won't get it here - sorry in advance that you
- *      got overlooked.
- *
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
- *
- *      A special thanks to Noah Romer (LSI Logic) for tons of work
- *      and tough debugging on the LAN driver, especially early on;-)
- *      And to Roger Hickerson (LSI Logic) for tirelessly supporting
- *      this driver project.
- *
- *      A special thanks to Pamela Delaney (LSI Logic) for tons of work
- *      and countless enhancements while adding support for the 1030
- *      chip family.  Pam has been instrumental in the development of
- *      of the 2.xx.xx series fusion drivers, and her contributions are
- *      far too numerous to hope to list in one place.
- *
- *      All manner of help from Stephen Shirron (LSI Logic):
- *      low-level FC analysis, debug + various fixes in FCxx firmware,
- *      initial port to alpha platform, various driver code optimizations,
- *      being a faithful sounding board on all sorts of issues & ideas,
- *      etc.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      Special thanks goes to the I2O LAN driver people at the
- *      University of Helsinki, who, unbeknownst to them, provided
- *      the inspiration and initial structure for this driver.
- *
- *      A really huge debt of gratitude is owed to Eddie C. Dost
- *      for gobs of hard work fixing and optimizing LAN code.
- *      THANK YOU!
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Originally By: Steven J. Ralston
- *  (mailto:sjralston1@netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptbase.c,v 1.126 2002/12/16 15:28:45 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -101,6 +59,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>            /* needed for in_interrupt() proto */
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
@@ -218,41 +177,35 @@ static void	mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info);
 static void     mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info);
 
 /* module entry point */
-static int  __devinit mptbase_probe (struct pci_dev *, const struct pci_device_id *);
-static void __devexit mptbase_remove(struct pci_dev *);
-static void mptbase_shutdown(struct device * );
 static int  __init    fusion_init  (void);
 static void __exit    fusion_exit  (void);
 
-/****************************************************************************
- * Supported hardware
- */
-
-static struct pci_device_id mptbase_pci_table[] = {
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC909,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929X,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919X,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1030,
-                PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_1030_53C1035,
-                PCI_ANY_ID, PCI_ANY_ID },
-        {0}     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(pci, mptbase_pci_table);
-
 #define CHIPREG_READ32(addr)            readl_relaxed(addr)
 #define CHIPREG_READ32_dmasync(addr)    readl(addr)
 #define CHIPREG_WRITE32(addr,val)       writel(val, addr)
 #define CHIPREG_PIO_WRITE32(addr,val)   outl(val, (unsigned long)addr)
 #define CHIPREG_PIO_READ32(addr)        inl((unsigned long)addr)
 
+static void
+pci_disable_io_access(struct pci_dev *pdev)
+{
+        u16 command_reg;
+
+        pci_read_config_word(pdev, PCI_COMMAND, &command_reg);
+        command_reg &= ~1;
+        pci_write_config_word(pdev, PCI_COMMAND, command_reg);
+}
+
+static void
+pci_enable_io_access(struct pci_dev *pdev)
+{
+        u16 command_reg;
+
+        pci_read_config_word(pdev, PCI_COMMAND, &command_reg);
+        command_reg |= 1;
+        pci_write_config_word(pdev, PCI_COMMAND, command_reg);
+}
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *      mpt_interrupt - MPT adapter (IOC) specific interrupt handler.
@@ -330,8 +283,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                                         ioc->name, mr, req_idx));
                         DBG_DUMP_REPLY_FRAME(mr)
 
-                        /* NEW!  20010301 -sralston
-                         *  Check/log IOC log info
+                        /*  Check/log IOC log info
                          */
                         ioc_stat = le16_to_cpu(mr->u.reply.IOCStatus);
                         if (ioc_stat & MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {
@@ -357,9 +309,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                                 mr = (MPT_FRAME_HDR *) CAST_U32_TO_PTR(pa);
                         } else if (type == MPI_CONTEXT_REPLY_TYPE_LAN) {
                                 cb_idx = mpt_lan_index;
-                                /*
-                                 * BUG FIX!  20001218 -sralston
-                                 *  Blind set of mf to NULL here was fatal
+                                 /*  Blind set of mf to NULL here was fatal
                                  *  after lan_reply says "freeme"
                                  *  Fix sort of combined with an optimization here;
                                  *  added explicit check for case where lan_reply
@@ -430,15 +380,8 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                 }
 
                 if (freeme) {
-                        unsigned long flags;
-
                         /*  Put Request back on FreeQ!  */
-                        spin_lock_irqsave(&ioc->FreeQlock, flags);
-                        list_add_tail(&mf->u.frame.linkage.list, &ioc->FreeQ);
-#ifdef MFCNT
-                        ioc->mfcnt--;
-#endif
-                        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
+                        mpt_free_msg_frame(ioc, mf);
                 }
 
                 mb();
@@ -725,11 +668,9 @@ int
 mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, int cb_idx)
 {
         MPT_ADAPTER     *ioc;
-        int             error=0;
 
         if (cb_idx < 1 || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) {
-                error= -EINVAL;
-                return error;
+                return -EINVAL;
         }
 
         MptDeviceDriverHandlers[cb_idx] = dd_cbfunc;
@@ -737,14 +678,12 @@ mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, int cb_idx)
         /* call per pci device probe entry point */
         list_for_each_entry(ioc, &ioc_list, list) {
                 if(dd_cbfunc->probe) {
-                        error = dd_cbfunc->probe(ioc->pcidev,
+                        dd_cbfunc->probe(ioc->pcidev,
                           ioc->pcidev->driver->id_table);
-                        if(error != 0)
-                                return error;
                 }
          }
 
-        return error;
+        return 0;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -809,8 +748,8 @@ mpt_get_msg_frame(int handle, MPT_ADAPTER *ioc)
                 mf->u.frame.hwhdr.msgctxu.fld.cb_idx = handle;  /* byte */
                 req_offset = (u8 *)mf - (u8 *)ioc->req_frames;
                                                                 /* u16! */
-                req_idx = cpu_to_le16(req_offset / ioc->req_sz);
-                mf->u.frame.hwhdr.msgctxu.fld.req_idx = req_idx;
+                req_idx = req_offset / ioc->req_sz;
+                mf->u.frame.hwhdr.msgctxu.fld.req_idx = cpu_to_le16(req_idx);
                 mf->u.frame.hwhdr.msgctxu.fld.rsvd = 0;
                 ioc->RequestNB[req_idx] = ioc->NB_for_64_byte_frame; /* Default, will be changed if necessary in SG generation */
 #ifdef MFCNT
@@ -856,8 +795,8 @@ mpt_put_msg_frame(int handle, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
         mf->u.frame.hwhdr.msgctxu.fld.cb_idx = handle;          /* byte */
         req_offset = (u8 *)mf - (u8 *)ioc->req_frames;
                                                                 /* u16! */
-        req_idx = cpu_to_le16(req_offset / ioc->req_sz);
-        mf->u.frame.hwhdr.msgctxu.fld.req_idx = req_idx;
+        req_idx = req_offset / ioc->req_sz;
+        mf->u.frame.hwhdr.msgctxu.fld.req_idx = cpu_to_le16(req_idx);
         mf->u.frame.hwhdr.msgctxu.fld.rsvd = 0;
 
 #ifdef MPT_DEBUG_MSG_FRAME
@@ -1058,7 +997,7 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptbase_probe - Install a PCI intelligent MPT adapter.
+ *      mpt_attach - Install a PCI intelligent MPT adapter.
  *      @pdev: Pointer to pci_dev structure
  *
  *      This routine performs all the steps necessary to bring the IOC of
@@ -1073,8 +1012,8 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
  *
  *      TODO: Add support for polled controllers
  */
-static int __devinit
-mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+int
+mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         MPT_ADAPTER     *ioc;
         u8              __iomem *mem;
@@ -1084,7 +1023,6 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         u32              psize;
         int              ii;
         int              r = -ENODEV;
-        u64              mask = 0xffffffffffffffffULL;
         u8               revision;
         u8               pcixcmd;
         static int       mpt_ids = 0;
@@ -1097,15 +1035,15 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         
         dinitprintk((KERN_WARNING MYNAM ": mpt_adapter_install\n"));
         
-        if (!pci_set_dma_mask(pdev, mask)) {
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 dprintk((KERN_INFO MYNAM
                         ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
-        } else if (pci_set_dma_mask(pdev, (u64) 0xffffffff)) {
+        } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING MYNAM ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n");
                 return r;
         }
 
-        if (!pci_set_consistent_dma_mask(pdev, mask))
+        if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
                 dprintk((KERN_INFO MYNAM
                         ": Using 64 bit consistent mask\n"));
         else
@@ -1243,6 +1181,16 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 pcixcmd &= 0x8F;
                 pci_write_config_byte(pdev, 0x6a, pcixcmd);
         }
+        else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC939X) {
+                ioc->prod_name = "LSIFC939X";
+                ioc->bus_type = FC;
+                ioc->errata_flag_1064 = 1;
+        }
+        else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC949X) {
+                ioc->prod_name = "LSIFC949X";
+                ioc->bus_type = FC;
+                ioc->errata_flag_1064 = 1;
+        }
         else if (pdev->device == MPI_MANUFACTPAGE_DEVID_53C1030) {
                 ioc->prod_name = "LSI53C1030";
                 ioc->bus_type = SCSI;
@@ -1261,6 +1209,9 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 ioc->bus_type = SCSI;
         }
 
+        if (ioc->errata_flag_1064)
+                pci_disable_io_access(pdev);
+
         sprintf(ioc->name, "ioc%d", ioc->id);
 
         spin_lock_init(&ioc->FreeQlock);
@@ -1303,8 +1254,7 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 #endif
         }
 
-        /* NEW!  20010220 -sralston
-         * Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.
+        /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.
          */
         mpt_detect_bound_ports(ioc, pdev);
 
@@ -1354,13 +1304,13 @@ mptbase_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptbase_remove - Remove a PCI intelligent MPT adapter.
+ *      mpt_detach - Remove a PCI intelligent MPT adapter.
  *      @pdev: Pointer to pci_dev structure
  *
  */
 
-static void __devexit
-mptbase_remove(struct pci_dev *pdev)
+void
+mpt_detach(struct pci_dev *pdev)
 {
         MPT_ADAPTER     *ioc = pci_get_drvdata(pdev);
         char pname[32];
@@ -1397,43 +1347,21 @@ mptbase_remove(struct pci_dev *pdev)
         pci_set_drvdata(pdev, NULL);
 }
 
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
- *      mptbase_shutdown -
- *
- */
-static void
-mptbase_shutdown(struct device * dev)
-{
-        int ii;
-
-        /* call per device driver shutdown entry point */
-        for(ii=0; ii<MPT_MAX_PROTOCOL_DRIVERS; ii++) {
-                if(MptDeviceDriverHandlers[ii] &&
-                  MptDeviceDriverHandlers[ii]->shutdown) {
-                        MptDeviceDriverHandlers[ii]->shutdown(dev);
-                }
-        }
-
-}
-
-
 /**************************************************************************
  * Power Management
  */
 #ifdef CONFIG_PM
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptbase_suspend - Fusion MPT base driver suspend routine.
+ *      mpt_suspend - Fusion MPT base driver suspend routine.
  *
  *
  */
-static int
-mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
+int
+mpt_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         u32 device_state;
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
-        int ii;
 
         switch(state)
         {
@@ -1453,14 +1381,6 @@ mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
         "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n",
                 ioc->name, pdev, pci_name(pdev), device_state);
 
-        /* call per device driver suspend entry point */
-        for(ii=0; ii<MPT_MAX_PROTOCOL_DRIVERS; ii++) {
-                if(MptDeviceDriverHandlers[ii] &&
-                  MptDeviceDriverHandlers[ii]->suspend) {
-                        MptDeviceDriverHandlers[ii]->suspend(pdev, state);
-                }
-        }
-
         pci_save_state(pdev);
 
         /* put ioc into READY_STATE */
@@ -1484,18 +1404,18 @@ mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptbase_resume - Fusion MPT base driver resume routine.
+ *      mpt_resume - Fusion MPT base driver resume routine.
  *
  *
  */
-static int
-mptbase_resume(struct pci_dev *pdev)
+int
+mpt_resume(struct pci_dev *pdev)
 {
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         u32 device_state = pdev->current_state;
         int recovery_state;
         int ii;
-
+        
         printk(MYIOC_s_INFO_FMT
         "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
                 ioc->name, pdev, pci_name(pdev), device_state);
@@ -1533,14 +1453,6 @@ mptbase_resume(struct pci_dev *pdev)
                         "pci-resume: success\n", ioc->name);
         }
 
-        /* call per device driver resume entry point */
-        for(ii=0; ii<MPT_MAX_PROTOCOL_DRIVERS; ii++) {
-                if(MptDeviceDriverHandlers[ii] &&
-                  MptDeviceDriverHandlers[ii]->resume) {
-                        MptDeviceDriverHandlers[ii]->resume(pdev);
-                }
-        }
-
         return 0;
 }
 #endif
@@ -1719,8 +1631,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                 ioc->alt_ioc->active = 1;
         }
 
-        /* NEW!  20010120 -sralston
-         *  Enable MPT base driver management of EventNotification
+        /*  Enable MPT base driver management of EventNotification
          *  and EventAck handling.
          */
         if ((ret == 0) && (!ioc->facts.EventState))
@@ -1729,9 +1640,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
         if (ioc->alt_ioc && alt_ioc_ready && !ioc->alt_ioc->facts.EventState)
                 (void) SendEventNotification(ioc->alt_ioc, 1);  /* 1=Enable EventNotification */
 
-        /* (Bugzilla:fibrebugs, #513)
-         * Bug fix (part 2)!  20010905 -sralston
-         *      Add additional "reason" check before call to GetLanConfigPages
+        /*      Add additional "reason" check before call to GetLanConfigPages
          *      (combined with GetIoUnitPage2 call).  This prevents a somewhat
          *      recursive scenario; GetLanConfigPages times out, timer expired
          *      routine calls HardResetHandler, which calls into here again,
@@ -1829,37 +1738,43 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
 static void
 mpt_detect_bound_ports(MPT_ADAPTER *ioc, struct pci_dev *pdev)
 {
-        unsigned int match_lo, match_hi;
+        struct pci_dev *peer=NULL;
+        unsigned int slot = PCI_SLOT(pdev->devfn);
+        unsigned int func = PCI_FUNC(pdev->devfn);
         MPT_ADAPTER *ioc_srch;
 
-        match_lo = pdev->devfn-1;
-        match_hi = pdev->devfn+1;
-        dprintk((MYIOC_s_INFO_FMT "PCI bus/devfn=%x/%x, searching for devfn match on %x or %x\n",
-                        ioc->name, pdev->bus->number, pdev->devfn, match_lo, match_hi));
+        dprintk((MYIOC_s_INFO_FMT "PCI device %s devfn=%x/%x,"
+            " searching for devfn match on %x or %x\n",
+                ioc->name, pci_name(pdev), pdev->devfn,
+                func-1, func+1));
+
+        peer = pci_get_slot(pdev->bus, PCI_DEVFN(slot,func-1));
+        if (!peer) {
+                peer = pci_get_slot(pdev->bus, PCI_DEVFN(slot,func+1));
+                if (!peer)
+                        return;
+        }
 
         list_for_each_entry(ioc_srch, &ioc_list, list) {
                 struct pci_dev *_pcidev = ioc_srch->pcidev;
-
-                if ((_pcidev->device == pdev->device) &&
-                    (_pcidev->bus->number == pdev->bus->number) &&
-                    (_pcidev->devfn == match_lo || _pcidev->devfn == match_hi) ) {
+                if (_pcidev == peer) {
                         /* Paranoia checks */
                         if (ioc->alt_ioc != NULL) {
                                 printk(KERN_WARNING MYNAM ": Oops, already bound (%s <==> %s)!\n",
-                                                ioc->name, ioc->alt_ioc->name);
+                                        ioc->name, ioc->alt_ioc->name);
                                 break;
                         } else if (ioc_srch->alt_ioc != NULL) {
                                 printk(KERN_WARNING MYNAM ": Oops, already bound (%s <==> %s)!\n",
-                                                ioc_srch->name, ioc_srch->alt_ioc->name);
+                                        ioc_srch->name, ioc_srch->alt_ioc->name);
                                 break;
                         }
                         dprintk((KERN_INFO MYNAM ": FOUND! binding %s <==> %s\n",
-                                        ioc->name, ioc_srch->name));
+                                ioc->name, ioc_srch->name));
                         ioc_srch->alt_ioc = ioc;
                         ioc->alt_ioc = ioc_srch;
-                        break;
                 }
         }
+        pci_dev_put(peer);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1922,15 +1837,10 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
                 ioc->alloc_total -= sz;
         }
 
-        if (ioc->spi_data.nvram != NULL) {
-                kfree(ioc->spi_data.nvram);
-                ioc->spi_data.nvram = NULL;
-        }
-
-        if (ioc->spi_data.pIocPg3 != NULL) {
-                kfree(ioc->spi_data.pIocPg3);
-                ioc->spi_data.pIocPg3 = NULL;
-        }
+        kfree(ioc->spi_data.nvram);
+        kfree(ioc->spi_data.pIocPg3);
+        ioc->spi_data.nvram = NULL;
+        ioc->spi_data.pIocPg3 = NULL;
 
         if (ioc->spi_data.pIocPg4 != NULL) {
                 sz = ioc->spi_data.IocPg4Sz;
@@ -1947,10 +1857,8 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
                 ioc->ReqToChain = NULL;
         }
 
-        if (ioc->ChainToChain != NULL) {
-                kfree(ioc->ChainToChain);
-                ioc->ChainToChain = NULL;
-        }
+        kfree(ioc->ChainToChain);
+        ioc->ChainToChain = NULL;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -2333,7 +2241,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                         return -55;
                 }
 
-                r = sz = le32_to_cpu(facts->BlockSize);
+                r = sz = facts->BlockSize;
                 vv = ((63 / (sz * 4)) + 1) & 0x03;
                 ioc->NB_for_64_byte_frame = vv;
                 while ( sz )
@@ -2785,7 +2693,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
         /* prevent a second downloadboot and memory free with alt_ioc */
         if (ioc->alt_ioc && ioc->alt_ioc->cached_fw)
                 ioc->alt_ioc->cached_fw = NULL;
-        
+
         CHIPREG_WRITE32(&ioc->chip->WriteSequence, 0xFF);
         CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_1ST_KEY_VALUE);
         CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_2ND_KEY_VALUE);
@@ -2843,6 +2751,9 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
         /* Write the LoadStartAddress to the DiagRw Address Register
          * using Programmed IO
          */
+        if (ioc->errata_flag_1064)
+                pci_enable_io_access(ioc->pcidev);
+
         CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwAddress, pFwHeader->LoadStartAddress);
         ddlprintk((MYIOC_s_INFO_FMT "LoadStart addr written 0x%x \n",
                 ioc->name, pFwHeader->LoadStartAddress));
@@ -2889,6 +2800,9 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
         CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwAddress, 0x3F000000);
         CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwData, diagRwData);
 
+        if (ioc->errata_flag_1064)
+                pci_disable_io_access(ioc->pcidev);
+
         diag0val = CHIPREG_READ32(&ioc->chip->Diagnostic);
         ddlprintk((MYIOC_s_INFO_FMT "downloadboot diag0val=%x, turning off PREVENT_IOC_BOOT, DISABLE_ARM\n",
                 ioc->name, diag0val));
@@ -4250,7 +4164,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 if ((ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD) ||
                                         (ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE))  {
 
-                                        if (ioc->spi_data.minSyncFactor < MPT_ULTRA)
+                                if (ioc->spi_data.minSyncFactor < MPT_ULTRA)
                                                 ioc->spi_data.minSyncFactor = MPT_ULTRA;
                                 }
                         }
@@ -4482,10 +4396,8 @@ mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)
 
         /* Free the old page
          */
-        if (ioc->spi_data.pIocPg3) {
-                kfree(ioc->spi_data.pIocPg3);
-                ioc->spi_data.pIocPg3 = NULL;
-        }
+        kfree(ioc->spi_data.pIocPg3);
+        ioc->spi_data.pIocPg3 = NULL;
 
         /* There is at least one physical disk.
          * Read and save IOC Page 3
@@ -4753,9 +4665,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         u32              flagsLength;
         int              in_isr;
 
-        /* (Bugzilla:fibrebugs, #513)
-         * Bug fix (part 1)!  20010905 -sralston
-         *      Prevent calling wait_event() (below), if caller happens
+        /*      Prevent calling wait_event() (below), if caller happens
          *      to be in ISR context, because that is fatal!
          */
         in_isr = in_interrupt();
@@ -4861,9 +4771,7 @@ mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         u32              flagsLength;
         int              in_isr;
 
-        /* (Bugzilla:fibrebugs, #513)
-         * Bug fix (part 1)!  20010905 -sralston
-         *      Prevent calling wait_event() (below), if caller happens
+        /*      Prevent calling wait_event() (below), if caller happens
          *      to be in ISR context, because that is fatal!
          */
         in_isr = in_interrupt();
@@ -5130,20 +5038,26 @@ static int
 procmpt_version_read(char *buf, char **start, off_t offset, int request, int *eof, void *data)
 {
         int      ii;
-        int      scsi, lan, ctl, targ, dmp;
+        int      scsi, fc, sas, lan, ctl, targ, dmp;
         char    *drvname;
         int      len;
 
         len = sprintf(buf, "%s-%s\n", "mptlinux", MPT_LINUX_VERSION_COMMON);
         len += sprintf(buf+len, "  Fusion MPT base driver\n");
 
-        scsi = lan = ctl = targ = dmp = 0;
+        scsi = fc = sas = lan = ctl = targ = dmp = 0;
         for (ii=MPT_MAX_PROTOCOL_DRIVERS-1; ii; ii--) {
                 drvname = NULL;
                 if (MptCallbacks[ii]) {
                         switch (MptDriverClass[ii]) {
-                        case MPTSCSIH_DRIVER:
-                                if (!scsi++) drvname = "SCSI host";
+                        case MPTSPI_DRIVER:
+                                if (!scsi++) drvname = "SPI host";
+                                break;
+                        case MPTFC_DRIVER:
+                                if (!fc++) drvname = "FC host";
+                                break;
+                        case MPTSAS_DRIVER:
+                                if (!sas++) drvname = "SAS host";
                                 break;
                         case MPTLAN_DRIVER:
                                 if (!lan++) drvname = "LAN";
@@ -5832,6 +5746,12 @@ mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+EXPORT_SYMBOL(mpt_attach);
+EXPORT_SYMBOL(mpt_detach);
+#ifdef CONFIG_PM
+EXPORT_SYMBOL(mpt_resume);
+EXPORT_SYMBOL(mpt_suspend);
+#endif
 EXPORT_SYMBOL(ioc_list);
 EXPORT_SYMBOL(mpt_proc_root_dir);
 EXPORT_SYMBOL(mpt_register);
@@ -5860,19 +5780,6 @@ EXPORT_SYMBOL(mpt_read_ioc_pg_3);
 EXPORT_SYMBOL(mpt_alloc_fw_memory);
 EXPORT_SYMBOL(mpt_free_fw_memory);
 
-static struct pci_driver mptbase_driver = {
-        .name           = "mptbase",
-        .id_table       = mptbase_pci_table,
-        .probe          = mptbase_probe,
-        .remove         = __devexit_p(mptbase_remove),
-        .driver         = {
-                .shutdown = mptbase_shutdown,
-        },
-#ifdef CONFIG_PM
-        .suspend        = mptbase_suspend,
-        .resume         = mptbase_resume,
-#endif
-};
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -5884,7 +5791,6 @@ static int __init
 fusion_init(void)
 {
         int i;
-        int r;
 
         show_mptmod_ver(my_NAME, my_VERSION);
         printk(KERN_INFO COPYRIGHT "\n");
@@ -5896,8 +5802,7 @@ fusion_init(void)
                 MptResetHandlers[i] = NULL;
         }
 
-        /* NEW!  20010120 -sralston
-         *  Register ourselves (mptbase) in order to facilitate
+        /*  Register ourselves (mptbase) in order to facilitate
          *  EventNotification handling.
          */
         mpt_base_index = mpt_register(mpt_base_reply, MPTBASE_DRIVER);
@@ -5913,11 +5818,7 @@ fusion_init(void)
 #ifdef CONFIG_PROC_FS
         (void) procmpt_create();
 #endif
-        r = pci_register_driver(&mptbase_driver);
-        if(r)
-                return(r);
-
-        return r;
+        return 0;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -5933,7 +5834,6 @@ fusion_exit(void)
 
         dexitprintk((KERN_INFO MYNAM ": fusion_exit() called!\n"));
 
-        pci_unregister_driver(&mptbase_driver);
         mpt_reset_deregister(mpt_base_index);
 
 #ifdef CONFIG_PROC_FS
@@ -5941,6 +5841,5 @@ fusion_exit(void)
 #endif
 }
 
-
 module_init(fusion_init);
 module_exit(fusion_exit);
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 6d16acc7a179..848fb236b175 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -5,15 +5,9 @@
  *          LSIFC9xx/LSI409xx Fibre Channel
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *     (see mptbase.c)
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Originally By: Steven J. Ralston
- *  (mailto:sjralston1@netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptbase.h,v 1.144 2003/01/28 21:31:56 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -71,7 +65,6 @@
 #include "lsi/mpi_fc.h"         /* Fibre Channel (lowlevel) support */
 #include "lsi/mpi_targ.h"       /* SCSI/FCP Target protcol support */
 #include "lsi/mpi_tool.h"       /* Tools support */
-#include "lsi/fc_log.h"
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
@@ -80,11 +73,11 @@
 #endif
 
 #ifndef COPYRIGHT
-#define COPYRIGHT       "Copyright (c) 1999-2004 " MODULEAUTHOR
+#define COPYRIGHT       "Copyright (c) 1999-2005 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.01.20"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.01.20"
+#define MPT_LINUX_VERSION_COMMON        "3.03.02"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.02"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -203,7 +196,9 @@
 typedef enum {
         MPTBASE_DRIVER,         /* MPT base class */
         MPTCTL_DRIVER,          /* MPT ioctl class */
-        MPTSCSIH_DRIVER,        /* MPT SCSI host (initiator) class */
+        MPTSPI_DRIVER,          /* MPT SPI host class */
+        MPTFC_DRIVER,           /* MPT FC host class */
+        MPTSAS_DRIVER,          /* MPT SAS host class */
         MPTLAN_DRIVER,          /* MPT LAN class */
         MPTSTM_DRIVER,          /* MPT SCSI target mode class */
         MPTUNKNOWN_DRIVER
@@ -212,11 +207,6 @@ typedef enum {
 struct mpt_pci_driver{
         int  (*probe) (struct pci_dev *dev, const struct pci_device_id *id);
         void (*remove) (struct pci_dev *dev);
-        void (*shutdown) (struct device * dev);
-#ifdef CONFIG_PM
-        int  (*resume) (struct pci_dev *dev);
-        int  (*suspend) (struct pci_dev *dev, pm_message_t state);
-#endif
 };
 
 /*
@@ -483,6 +473,7 @@ typedef	struct _ScsiCfgData {
         u8               forceDv;               /* 1 to force DV scheduling */
         u8               noQas;                 /* Disable QAS for this adapter */
         u8               Saf_Te;                /* 1 to force all Processors as SAF-TE if Inquiry data length is too short to check for SAF-TE */
+        u8               mpt_dv;                /* command line option: enhanced=1, basic=0 */
         u8               rsvd[1];
 } ScsiCfgData;
 
@@ -571,11 +562,21 @@ typedef struct _MPT_ADAPTER
         FCPortPage0_t            fc_port_page0[2];
         LANPage0_t               lan_cnfg_page0;
         LANPage1_t               lan_cnfg_page1;
+        /*  
+         * Description: errata_flag_1064
+         * If a PCIX read occurs within 1 or 2 cycles after the chip receives
+         * a split completion for a read data, an internal address pointer incorrectly
+         * increments by 32 bytes
+         */
+        int                      errata_flag_1064;      
         u8                       FirstWhoInit;
         u8                       upload_fw;     /* If set, do a fw upload */
         u8                       reload_fw;     /* Force a FW Reload on next reset */
         u8                       NBShiftFactor;  /* NB Shift Factor based on Block Size (Facts)  */     
         u8                       pad1[4];
+        int                      DoneCtx;
+        int                      TaskCtx;
+        int                      InternalCtx;
         struct list_head         list; 
         struct net_device       *netdev;
 } MPT_ADAPTER;
@@ -773,12 +774,6 @@ typedef struct _mpt_sge {
 #define DBG_DUMP_TM_REPLY_FRAME(mfp)
 #endif
 
-#ifdef MPT_DEBUG_NEH
-#define nehprintk(x) printk x
-#else
-#define nehprintk(x)
-#endif
-
 #if defined(MPT_DEBUG_CONFIG) || defined(MPT_DEBUG)
 #define dcprintk(x) printk x
 #else
@@ -898,6 +893,11 @@ typedef struct _MPT_SCSI_HOST {
         unsigned long             soft_resets;          /* fw/external bus resets count */
         unsigned long             timeouts;             /* cmd timeouts */
         ushort                    sel_timeout[MPT_MAX_FC_DEVICES];
+        char                      *info_kbuf;
+        wait_queue_head_t         scandv_waitq;
+        int                       scandv_wait_done;
+        long                      last_queue_full;
+        u8                        mpt_pq_filter;
 } MPT_SCSI_HOST;
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -931,6 +931,12 @@ typedef struct _x_config_parms {
 /*
  *  Public entry points...
  */
+extern int       mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id);
+extern void      mpt_detach(struct pci_dev *pdev);
+#ifdef CONFIG_PM
+extern int       mpt_suspend(struct pci_dev *pdev, pm_message_t state);
+extern int       mpt_resume(struct pci_dev *pdev);
+#endif
 extern int       mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass);
 extern void      mpt_deregister(int cb_idx);
 extern int       mpt_event_register(int cb_idx, MPT_EVHANDLER ev_cbfunc);
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 70b0cfb5ac5c..05ea5944c487 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1,40 +1,12 @@
 /*
  *  linux/drivers/message/fusion/mptctl.c
- *      Fusion MPT misc device (ioctl) driver.
- *      For use with PCI chip/adapter(s):
- *          LSIFC9xx/LSI409xx Fibre Channel
+ *      mpt Ioctl driver.
+ *      For use with LSI Logic PCI chip/adapters
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
- *
- *      A special thanks to Pamela Delaney (LSI Logic) for tons of work
- *      and countless enhancements while adding support for the 1030
- *      chip family.  Pam has been instrumental in the development of
- *      of the 2.xx.xx series fusion drivers, and her contributions are
- *      far too numerous to hope to list in one place.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      A big THANKS to Eddie C. Dost for fixing the ioctl path
- *      and most importantly f/w download on sparc64 platform!
- *      (plus Eddie's other helpful hints and insights)
- *
- *      Thanks to Arnaldo Carvalho de Melo for finding and patching
- *      a potential memory leak in mptctl_do_fw_download(),
- *      and for some kmalloc insight:-)
- *
- *      (see also mptbase.c)
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Originally By: Steven J. Ralston, Noah Romer
- *  (mailto:sjralston1@netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptctl.c,v 1.63 2002/12/03 21:26:33 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -95,8 +67,8 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
 
-#define COPYRIGHT       "Copyright (c) 1999-2004 LSI Logic Corporation"
-#define MODULEAUTHOR    "Steven J. Ralston, Noah Romer, Pamela Delaney"
+#define COPYRIGHT       "Copyright (c) 1999-2005 LSI Logic Corporation"
+#define MODULEAUTHOR    "LSI Logic Corporation"
 #include "mptbase.h"
 #include "mptctl.h"
 
@@ -127,14 +99,14 @@ struct buflist {
  * arg contents specific to function.
  */
 static int mptctl_fw_download(unsigned long arg);
-static int mptctl_getiocinfo (unsigned long arg, unsigned int cmd);
-static int mptctl_gettargetinfo (unsigned long arg);
-static int mptctl_readtest (unsigned long arg);
-static int mptctl_mpt_command (unsigned long arg);
-static int mptctl_eventquery (unsigned long arg);
-static int mptctl_eventenable (unsigned long arg);
-static int mptctl_eventreport (unsigned long arg);
-static int mptctl_replace_fw (unsigned long arg);
+static int mptctl_getiocinfo(unsigned long arg, unsigned int cmd);
+static int mptctl_gettargetinfo(unsigned long arg);
+static int mptctl_readtest(unsigned long arg);
+static int mptctl_mpt_command(unsigned long arg);
+static int mptctl_eventquery(unsigned long arg);
+static int mptctl_eventenable(unsigned long arg);
+static int mptctl_eventreport(unsigned long arg);
+static int mptctl_replace_fw(unsigned long arg);
 
 static int mptctl_do_reset(unsigned long arg);
 static int mptctl_hp_hostinfo(unsigned long arg, unsigned int cmd);
@@ -149,11 +121,11 @@ static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg);
 /*
  * Private function calls.
  */
-static int mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr);
+static int mptctl_do_mpt_command(struct mpt_ioctl_command karg, void __user *mfPtr);
 static int mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen);
-static MptSge_t *kbuf_alloc_2_sgl( int bytes, u32 dir, int sge_offset, int *frags,
+static MptSge_t *kbuf_alloc_2_sgl(int bytes, u32 dir, int sge_offset, int *frags,
                 struct buflist **blp, dma_addr_t *sglbuf_dma, MPT_ADAPTER *ioc);
-static void kfree_sgl( MptSge_t *sgl, dma_addr_t sgl_dma,
+static void kfree_sgl(MptSge_t *sgl, dma_addr_t sgl_dma,
                 struct buflist *buflist, MPT_ADAPTER *ioc);
 static void mptctl_timeout_expired (MPT_IOCTL *ioctl);
 static int  mptctl_bus_reset(MPT_IOCTL *ioctl);
@@ -1119,7 +1091,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         int                     numDevices = 0;
         unsigned int            max_id;
         int                     ii;
-        int                     port;
+        unsigned int            port;
         int                     cim_rev;
         u8                      revision;
 
@@ -1162,9 +1134,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
                 return -ENODEV;
         }
 
-        /* Verify the data transfer size is correct.
-         * Ignore the port setting.
-         */
+        /* Verify the data transfer size is correct. */
         if (karg->hdr.maxDataSize != data_size) {
                 printk(KERN_ERR "%s@%d::mptctl_getiocinfo - "
                         "Structure size mismatch. Command not completed.\n",
@@ -1181,6 +1151,8 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         else
                 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
 
+        if (karg->hdr.port > 1)
+                return -EINVAL;
         port = karg->hdr.port;
 
         karg->port = port;
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h
index cc4ecf0382df..28754a9cb803 100644
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
@@ -5,22 +5,9 @@
  *          LSIFC9xx/LSI409xx Fibre Channel
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      (see also mptbase.c)
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Originally By: Steven J. Ralston
- *  (mailto:sjralston1@netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptctl.h,v 1.13 2002/12/03 21:26:33 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
new file mode 100644
index 000000000000..d8d65397e06e
--- /dev/null
+++ b/drivers/message/fusion/mptfc.c
@@ -0,0 +1,431 @@
+/*
+ *  linux/drivers/message/fusion/mptfc.c
+ *      For use with LSI Logic PCI chip/adapter(s)
+ *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
+ *
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  (mailto:mpt_linux_developer@lsil.com)
+ *
+ */
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+    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; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    NO WARRANTY
+    THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
+    LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+    solely responsible for determining the appropriateness of using and
+    distributing the Program and assumes all risks associated with its
+    exercise of rights under this Agreement, including but not limited to
+    the risks and costs of program errors, damage to or loss of data,
+    programs or equipment, and unavailability or interruption of operations.
+
+    DISCLAIMER OF LIABILITY
+    NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
+
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+#include "linux_compat.h"       /* linux-2.6 tweaks */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kdev_t.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>        /* for mdelay */
+#include <linux/interrupt.h>    /* needed for in_interrupt() proto */
+#include <linux/reboot.h>       /* notifier code */
+#include <linux/sched.h>
+#include <linux/workqueue.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+
+#include "mptbase.h"
+#include "mptscsih.h"
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+#define my_NAME         "Fusion MPT FC Host driver"
+#define my_VERSION      MPT_LINUX_VERSION_COMMON
+#define MYNAM           "mptfc"
+
+MODULE_AUTHOR(MODULEAUTHOR);
+MODULE_DESCRIPTION(my_NAME);
+MODULE_LICENSE("GPL");
+
+/* Command line args */
+static int mpt_pq_filter = 0;
+module_param(mpt_pq_filter, int, 0);
+MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1  (default=0)");
+
+static int      mptfcDoneCtx = -1;
+static int      mptfcTaskCtx = -1;
+static int      mptfcInternalCtx = -1; /* Used only for internal commands */
+
+static struct device_attribute mptfc_queue_depth_attr = {
+        .attr = {
+                .name =         "queue_depth",
+                .mode =         S_IWUSR,
+        },
+        .store = mptscsih_store_queue_depth,
+};
+
+static struct device_attribute *mptfc_dev_attrs[] = {
+        &mptfc_queue_depth_attr,
+        NULL,
+};
+
+static struct scsi_host_template mptfc_driver_template = {
+        .proc_name                      = "mptfc",
+        .proc_info                      = mptscsih_proc_info,
+        .name                           = "MPT FC Host",
+        .info                           = mptscsih_info,
+        .queuecommand                   = mptscsih_qcmd,
+        .slave_alloc                    = mptscsih_slave_alloc,
+        .slave_configure                = mptscsih_slave_configure,
+        .slave_destroy                  = mptscsih_slave_destroy,
+        .eh_abort_handler               = mptscsih_abort,
+        .eh_device_reset_handler        = mptscsih_dev_reset,
+        .eh_bus_reset_handler           = mptscsih_bus_reset,
+        .eh_host_reset_handler          = mptscsih_host_reset,
+        .bios_param                     = mptscsih_bios_param,
+        .can_queue                      = MPT_FC_CAN_QUEUE,
+        .this_id                        = -1,
+        .sg_tablesize                   = MPT_SCSI_SG_DEPTH,
+        .max_sectors                    = 8192,
+        .cmd_per_lun                    = 7,
+        .use_clustering                 = ENABLE_CLUSTERING,
+        .sdev_attrs                     = mptfc_dev_attrs,
+};
+
+/****************************************************************************
+ * Supported hardware
+ */
+
+static struct pci_device_id mptfc_pci_table[] = {
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC909,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC919X,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC929X,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC939X,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FC949X,
+                PCI_ANY_ID, PCI_ANY_ID },
+        {0}     /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, mptfc_pci_table);
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+ *      mptfc_probe - Installs scsi devices per bus.
+ *      @pdev: Pointer to pci_dev structure
+ *
+ *      Returns 0 for success, non-zero for failure.
+ *
+ */
+static int
+mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        struct Scsi_Host        *sh;
+        MPT_SCSI_HOST           *hd;
+        MPT_ADAPTER             *ioc;
+        unsigned long            flags;
+        int                      sz, ii;
+        int                      numSGE = 0;
+        int                      scale;
+        int                      ioc_cap;
+        u8                      *mem;
+        int                     error=0;
+        int                     r;
+                
+        if ((r = mpt_attach(pdev,id)) != 0)
+                return r;
+        
+        ioc = pci_get_drvdata(pdev);
+        ioc->DoneCtx = mptfcDoneCtx;
+        ioc->TaskCtx = mptfcTaskCtx;
+        ioc->InternalCtx = mptfcInternalCtx;
+
+        /*  Added sanity check on readiness of the MPT adapter.
+         */
+        if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
+                printk(MYIOC_s_WARN_FMT
+                  "Skipping because it's not operational!\n",
+                  ioc->name);
+                return -ENODEV;
+        }
+
+        if (!ioc->active) {
+                printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",
+                  ioc->name);
+                return -ENODEV;
+        }
+
+        /*  Sanity check - ensure at least 1 port is INITIATOR capable
+         */
+        ioc_cap = 0;
+        for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
+                if (ioc->pfacts[ii].ProtocolFlags &
+                    MPI_PORTFACTS_PROTOCOL_INITIATOR)
+                        ioc_cap ++;
+        }
+
+        if (!ioc_cap) {
+                printk(MYIOC_s_WARN_FMT
+                        "Skipping ioc=%p because SCSI Initiator mode is NOT enabled!\n",
+                        ioc->name, ioc);
+                return -ENODEV;
+        }
+
+        sh = scsi_host_alloc(&mptfc_driver_template, sizeof(MPT_SCSI_HOST));
+
+        if (!sh) {
+                printk(MYIOC_s_WARN_FMT
+                        "Unable to register controller with SCSI subsystem\n",
+                        ioc->name);
+                return -1;
+        }
+
+        spin_lock_irqsave(&ioc->FreeQlock, flags);
+
+        /* Attach the SCSI Host to the IOC structure
+         */
+        ioc->sh = sh;
+
+        sh->io_port = 0;
+        sh->n_io_port = 0;
+        sh->irq = 0;
+
+        /* set 16 byte cdb's */
+        sh->max_cmd_len = 16;
+
+        sh->max_id = MPT_MAX_FC_DEVICES<256 ? MPT_MAX_FC_DEVICES : 255;
+
+        sh->max_lun = MPT_LAST_LUN + 1;
+        sh->max_channel = 0;
+        sh->this_id = ioc->pfacts[0].PortSCSIID;
+
+        /* Required entry.
+         */
+        sh->unique_id = ioc->id;
+
+        /* Verify that we won't exceed the maximum
+         * number of chain buffers
+         * We can optimize:  ZZ = req_sz/sizeof(SGE)
+         * For 32bit SGE's:
+         *  numSGE = 1 + (ZZ-1)*(maxChain -1) + ZZ
+         *               + (req_sz - 64)/sizeof(SGE)
+         * A slightly different algorithm is required for
+         * 64bit SGEs.
+         */
+        scale = ioc->req_sz/(sizeof(dma_addr_t) + sizeof(u32));
+        if (sizeof(dma_addr_t) == sizeof(u64)) {
+                numSGE = (scale - 1) *
+                  (ioc->facts.MaxChainDepth-1) + scale +
+                  (ioc->req_sz - 60) / (sizeof(dma_addr_t) +
+                  sizeof(u32));
+        } else {
+                numSGE = 1 + (scale - 1) *
+                  (ioc->facts.MaxChainDepth-1) + scale +
+                  (ioc->req_sz - 64) / (sizeof(dma_addr_t) +
+                  sizeof(u32));
+        }
+
+        if (numSGE < sh->sg_tablesize) {
+                /* Reset this value */
+                dprintk((MYIOC_s_INFO_FMT
+                  "Resetting sg_tablesize to %d from %d\n",
+                  ioc->name, numSGE, sh->sg_tablesize));
+                sh->sg_tablesize = numSGE;
+        }
+
+        /* Set the pci device pointer in Scsi_Host structure.
+         */
+        scsi_set_device(sh, &ioc->pcidev->dev);
+
+        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
+
+        hd = (MPT_SCSI_HOST *) sh->hostdata;
+        hd->ioc = ioc;
+
+        /* SCSI needs scsi_cmnd lookup table!
+         * (with size equal to req_depth*PtrSz!)
+         */
+        sz = ioc->req_depth * sizeof(void *);
+        mem = kmalloc(sz, GFP_ATOMIC);
+        if (mem == NULL) {
+                error = -ENOMEM;
+                goto mptfc_probe_failed;
+        }
+
+        memset(mem, 0, sz);
+        hd->ScsiLookup = (struct scsi_cmnd **) mem;
+
+        dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p, sz=%d\n",
+                 ioc->name, hd->ScsiLookup, sz));
+
+        /* Allocate memory for the device structures.
+         * A non-Null pointer at an offset
+         * indicates a device exists.
+         * max_id = 1 + maximum id (hosts.h)
+         */
+        sz = sh->max_id * sizeof(void *);
+        mem = kmalloc(sz, GFP_ATOMIC);
+        if (mem == NULL) {
+                error = -ENOMEM;
+                goto mptfc_probe_failed;
+        }
+
+        memset(mem, 0, sz);
+        hd->Targets = (VirtDevice **) mem;
+
+        dprintk((KERN_INFO
+          "  Targets @ %p, sz=%d\n", hd->Targets, sz));
+
+        /* Clear the TM flags
+         */
+        hd->tmPending = 0;
+        hd->tmState = TM_STATE_NONE;
+        hd->resetPending = 0;
+        hd->abortSCpnt = NULL;
+
+        /* Clear the pointer used to store
+         * single-threaded commands, i.e., those
+         * issued during a bus scan, dv and
+         * configuration pages.
+         */
+        hd->cmdPtr = NULL;
+
+        /* Initialize this SCSI Hosts' timers
+         * To use, set the timer expires field
+         * and add_timer
+         */
+        init_timer(&hd->timer);
+        hd->timer.data = (unsigned long) hd;
+        hd->timer.function = mptscsih_timer_expired;
+
+        hd->mpt_pq_filter = mpt_pq_filter;
+
+        ddvprintk((MYIOC_s_INFO_FMT
+                "mpt_pq_filter %x\n",
+                ioc->name, 
+                mpt_pq_filter));
+
+        init_waitqueue_head(&hd->scandv_waitq);
+        hd->scandv_wait_done = 0;
+        hd->last_queue_full = 0;
+
+        error = scsi_add_host (sh, &ioc->pcidev->dev);
+        if(error) {
+                dprintk((KERN_ERR MYNAM
+                  "scsi_add_host failed\n"));
+                goto mptfc_probe_failed;
+        }
+
+        scsi_scan_host(sh);
+        return 0;
+
+mptfc_probe_failed:
+
+        mptscsih_remove(pdev);
+        return error;
+}
+
+static struct pci_driver mptfc_driver = {
+        .name           = "mptfc",
+        .id_table       = mptfc_pci_table,
+        .probe          = mptfc_probe,
+        .remove         = __devexit_p(mptscsih_remove),
+        .driver         = {
+                .shutdown = mptscsih_shutdown,
+        },
+#ifdef CONFIG_PM
+        .suspend        = mptscsih_suspend,
+        .resume         = mptscsih_resume,
+#endif
+};
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/**
+ *      mptfc_init - Register MPT adapter(s) as SCSI host(s) with
+ *      linux scsi mid-layer.
+ *
+ *      Returns 0 for success, non-zero for failure.
+ */
+static int __init
+mptfc_init(void)
+{
+
+        show_mptmod_ver(my_NAME, my_VERSION);
+
+        mptfcDoneCtx = mpt_register(mptscsih_io_done, MPTFC_DRIVER);
+        mptfcTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTFC_DRIVER);
+        mptfcInternalCtx = mpt_register(mptscsih_scandv_complete, MPTFC_DRIVER);
+
+        if (mpt_event_register(mptfcDoneCtx, mptscsih_event_process) == 0) {
+                devtprintk((KERN_INFO MYNAM
+                  ": Registered for IOC event notifications\n"));
+        }
+
+        if (mpt_reset_register(mptfcDoneCtx, mptscsih_ioc_reset) == 0) {
+                dprintk((KERN_INFO MYNAM
+                  ": Registered for IOC reset notifications\n"));
+        }
+
+        return pci_register_driver(&mptfc_driver);
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/**
+ *      mptfc_exit - Unregisters MPT adapter(s)
+ *
+ */
+static void __exit
+mptfc_exit(void)
+{
+        pci_unregister_driver(&mptfc_driver);
+        
+        mpt_reset_deregister(mptfcDoneCtx);
+        dprintk((KERN_INFO MYNAM
+          ": Deregistered for IOC reset notifications\n"));
+
+        mpt_event_deregister(mptfcDoneCtx);
+        dprintk((KERN_INFO MYNAM
+          ": Deregistered for IOC event notifications\n"));
+
+        mpt_deregister(mptfcInternalCtx);
+        mpt_deregister(mptfcTaskCtx);
+        mpt_deregister(mptfcDoneCtx);
+}
+
+module_init(mptfc_init);
+module_exit(mptfc_exit);
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index ef2713b93fab..52794be5a95c 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -1,33 +1,11 @@
 /*
  *  linux/drivers/message/fusion/mptlan.c
  *      IP Over Fibre Channel device driver.
- *      For use with PCI chip/adapter(s):
- *          LSIFC9xx/LSI409xx Fibre Channel
+ *      For use with LSI Logic Fibre Channel PCI chip/adapters
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
+ *  Copyright (c) 2000-2005 LSI Logic Corporation
  *
- *      Special thanks goes to the I2O LAN driver people at the
- *      University of Helsinki, who, unbeknownst to them, provided
- *      the inspiration and initial structure for this driver.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      A really huge debt of gratitude is owed to Eddie C. Dost
- *      for gobs of hard work fixing and optimizing LAN code.
- *      THANK YOU!
- *
- *      (see also mptbase.c)
- *
- *  Copyright (c) 2000-2004 LSI Logic Corporation
- *  Originally By: Noah Romer
- *  (mailto:mpt_linux_developer@lsil.com)
- *
- *  $Id: mptlan.c,v 1.53 2002/10/17 20:15:58 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -221,7 +199,7 @@ lan_reply (MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
 
                 // NOTE!  (Optimization) First case here is now caught in
                 //  mptbase.c::mpt_interrupt() routine and callcack here
-                //  is now skipped for this case!  20001218 -sralston
+                //  is now skipped for this case!
 #if 0
                 case LAN_REPLY_FORM_MESSAGE_CONTEXT:
 //                      dioprintk((KERN_INFO MYNAM "/lan_reply: "
@@ -234,7 +212,7 @@ lan_reply (MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
 //                      dioprintk((MYNAM "/lan_reply: "
 //                                "calling mpt_lan_send_reply (turbo)\n"));
 
-                        // Potential BUG here?  -sralston
+                        // Potential BUG here?
                         //      FreeReqFrame = mpt_lan_send_turbo(dev, tmsg);
                         //  If/when mpt_lan_send_turbo would return 1 here,
                         //  calling routine (mptbase.c|mpt_interrupt)
@@ -310,8 +288,7 @@ lan_reply (MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
 
         case MPI_FUNCTION_EVENT_NOTIFICATION:
         case MPI_FUNCTION_EVENT_ACK:
-                /* UPDATE!  20010120 -sralston
-                 *  _EVENT_NOTIFICATION should NOT come down this path any more.
+                /*  _EVENT_NOTIFICATION should NOT come down this path any more.
                  *  Should be routed to mpt_lan_event_process(), but just in case...
                  */
                 FreeReqFrame = 1;
@@ -561,8 +538,8 @@ mpt_lan_close(struct net_device *dev)
                 }
         }
 
-        kfree (priv->RcvCtl);
-        kfree (priv->mpt_rxfidx);
+        kfree(priv->RcvCtl);
+        kfree(priv->mpt_rxfidx);
 
         for (i = 0; i < priv->tx_max_out; i++) {
                 if (priv->SendCtl[i].skb != NULL) {
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 057904260ab1..750e343eb981 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -1,3 +1,49 @@
+/*
+ *  linux/drivers/message/fusion/mptlan.h
+ *      IP Over Fibre Channel device driver.
+ *      For use with LSI Logic Fibre Channel PCI chip/adapters
+ *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
+ *
+ *  Copyright (c) 2000-2005 LSI Logic Corporation
+ *
+ */
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+    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; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    NO WARRANTY
+    THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
+    LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+    solely responsible for determining the appropriateness of using and
+    distributing the Program and assumes all risks associated with its
+    exercise of rights under this Agreement, including but not limited to
+    the risks and costs of program errors, damage to or loss of data,
+    programs or equipment, and unavailability or interruption of operations.
+
+    DISCLAIMER OF LIABILITY
+    NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
+
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+
 /* mptlan.h */
 
 #ifndef LINUX_MPTLAN_H_INCLUDED
@@ -29,7 +75,7 @@
 #include <asm/io.h>
 
     /* Override mptbase.h by pre-defining these! */
-    #define MODULEAUTHOR "Noah Romer, Eddie C. Dost"
+#define MODULEAUTHOR    "LSI Logic Corporation"
 
 #include "mptbase.h"
 
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 3a3ef127df04..a0078ae5b9b8 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1,32 +1,11 @@
 /*
  *  linux/drivers/message/fusion/mptscsih.c
- *      High performance SCSI / Fibre Channel SCSI Host device driver.
- *      For use with PCI chip/adapter(s):
- *          LSIFC9xx/LSI409xx Fibre Channel
+ *      For use with LSI Logic PCI chip/adapter(s)
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
- *
- *      A special thanks to Pamela Delaney (LSI Logic) for tons of work
- *      and countless enhancements while adding support for the 1030
- *      chip family.  Pam has been instrumental in the development of
- *      of the 2.xx.xx series fusion drivers, and her contributions are
- *      far too numerous to hope to list in one place.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      (see mptbase.c)
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Original author: Steven J. Ralston
- *  (mailto:sjralston1@netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptscsih.c,v 1.104 2002/12/03 21:26:34 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -96,27 +75,6 @@ MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
 
-/* Command line args */
-static int mpt_dv = MPTSCSIH_DOMAIN_VALIDATION;
-MODULE_PARM(mpt_dv, "i");
-MODULE_PARM_DESC(mpt_dv, " DV Algorithm: enhanced=1, basic=0 (default=MPTSCSIH_DOMAIN_VALIDATION=1)");
-
-static int mpt_width = MPTSCSIH_MAX_WIDTH;
-MODULE_PARM(mpt_width, "i");
-MODULE_PARM_DESC(mpt_width, " Max Bus Width: wide=1, narrow=0 (default=MPTSCSIH_MAX_WIDTH=1)");
-
-static int mpt_factor = MPTSCSIH_MIN_SYNC;
-MODULE_PARM(mpt_factor, "h");
-MODULE_PARM_DESC(mpt_factor, " Min Sync Factor (default=MPTSCSIH_MIN_SYNC=0x08)");
-
-static int mpt_saf_te = MPTSCSIH_SAF_TE;
-MODULE_PARM(mpt_saf_te, "i");
-MODULE_PARM_DESC(mpt_saf_te, " Force enabling SEP Processor: enable=1  (default=MPTSCSIH_SAF_TE=0)");
-
-static int mpt_pq_filter = 0;
-MODULE_PARM(mpt_pq_filter, "i");
-MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1  (default=0)");
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
 typedef struct _BIG_SENSE_BUF {
@@ -169,18 +127,17 @@ typedef struct _dv_parameters {
         u16              pad1;
 } DVPARAMETERS;
 
-
 /*
  *  Other private/forward protos...
  */
-static int      mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
+int             mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
 static void     mptscsih_report_queue_full(struct scsi_cmnd *sc, SCSIIOReply_t *pScsiReply, SCSIIORequest_t *pScsiReq);
-static int      mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
+int             mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
 
 static int      mptscsih_AddSGE(MPT_ADAPTER *ioc, struct scsi_cmnd *SCpnt,
                                  SCSIIORequest_t *pReq, int req_idx);
 static void     mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx);
-static void     copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply);
+static void     mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply);
 static int      mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd);
 static int      mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout );
 static u32      SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc);
@@ -188,8 +145,8 @@ static u32	SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc);
 static int      mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout);
 static int      mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout);
 
-static int      mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
-static int      mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
+int             mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
+int             mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
 
 static void     mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int target_id, u8 lun, char *data, int dlen);
 static void     mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtDevice *target, char byte56);
@@ -198,8 +155,7 @@ static void	mptscsih_setDevicePage1Flags (u8 width, u8 factor, u8 offset, int *r
 static void     mptscsih_no_negotiate(MPT_SCSI_HOST *hd, int target_id);
 static int      mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target, int flags);
 static int      mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus);
-static int      mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
-static void     mptscsih_timer_expired(unsigned long data);
+int             mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
 static int      mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *iocmd);
 static int      mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum);
 
@@ -212,29 +168,14 @@ static int	mptscsih_doDv(MPT_SCSI_HOST *hd, int channel, int target);
 static void     mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage);
 static void     mptscsih_fillbuf(char *buffer, int size, int index, int width);
 #endif
-/* module entry point */
-static int  __init   mptscsih_init  (void);
-static void __exit   mptscsih_exit  (void);
 
-static int  mptscsih_probe (struct pci_dev *, const struct pci_device_id *);
-static void mptscsih_remove(struct pci_dev *);
-static void mptscsih_shutdown(struct device *);
+void            mptscsih_remove(struct pci_dev *);
+void            mptscsih_shutdown(struct device *);
 #ifdef CONFIG_PM
-static int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
-static int mptscsih_resume(struct pci_dev *pdev);
+int             mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
+int             mptscsih_resume(struct pci_dev *pdev);
 #endif
 
-
-/*
- *      Private data...
- */
-
-static int      mpt_scsi_hosts = 0;
-
-static int      ScsiDoneCtx = -1;
-static int      ScsiTaskCtx = -1;
-static int      ScsiScanDvCtx = -1; /* Used only for bus scan and dv */
-
 #define SNS_LEN(scp)    sizeof((scp)->sense_buffer)
 
 #ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
@@ -244,20 +185,9 @@ static int	ScsiScanDvCtx = -1; /* Used only for bus scan and dv */
 static DEFINE_SPINLOCK(dvtaskQ_lock);
 static int dvtaskQ_active = 0;
 static int dvtaskQ_release = 0;
-static struct work_struct       mptscsih_dvTask;
+static struct work_struct       dvTaskQ_task;
 #endif
 
-/*
- * Wait Queue setup
- */
-static DECLARE_WAIT_QUEUE_HEAD (scandv_waitq);
-static int scandv_wait_done = 1;
-
-
-/* Driver command line structure
- */
-static struct scsi_host_template driver_template;
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_add_sge - Place a simple SGE at address pAddr.
@@ -619,7 +549,7 @@ nextSGEset:
  *
  *      Returns 1 indicating alloc'd request frame ptr should be freed.
  */
-static int
+int
 mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
 {
         struct scsi_cmnd        *sc;
@@ -677,8 +607,8 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         sc->request_bufflen, xfer_cnt));
 
                 if (scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID)
-                        copy_sense_data(sc, hd, mf, pScsiReply);
-                
+                        mptscsih_copy_sense_data(sc, hd, mf, pScsiReply);
+
                 /*
                  *  Look for + dump FCP ResponseInfo[]!
                  */
@@ -740,7 +670,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         }
                         dreplyprintk((KERN_NOTICE "RESIDUAL_MISMATCH: result=%x on id=%d\n", sc->result, sc->target));
                         break;
-                
+
                 case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN:          /* 0x0045 */
                         /*
                          *  Do upfront check for valid SenseData and give it
@@ -773,7 +703,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                          */
                         if (scsi_status == MPI_SCSI_STATUS_TASK_SET_FULL)
                                 mptscsih_report_queue_full(sc, pScsiReply, pScsiReq);
-                        
+
                         break;
 
                 case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:        /* 0x0040 */
@@ -905,18 +835,16 @@ mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd)
                          * Do OS callback
                          * Free driver resources (chain, msg buffers)
                          */
-                        if (scsi_device_online(SCpnt->device)) {
-                                if (SCpnt->use_sg) {
-                                        pci_unmap_sg(ioc->pcidev,
-                                                (struct scatterlist *) SCpnt->request_buffer,
-                                                SCpnt->use_sg,
-                                                SCpnt->sc_data_direction);
-                                } else if (SCpnt->request_bufflen) {
-                                        pci_unmap_single(ioc->pcidev,
-                                                SCpnt->SCp.dma_handle,
-                                                SCpnt->request_bufflen,
-                                                SCpnt->sc_data_direction);
-                                }
+                        if (SCpnt->use_sg) {
+                                pci_unmap_sg(ioc->pcidev,
+                                        (struct scatterlist *) SCpnt->request_buffer,
+                                        SCpnt->use_sg,
+                                        SCpnt->sc_data_direction);
+                        } else if (SCpnt->request_bufflen) {
+                                pci_unmap_single(ioc->pcidev,
+                                        SCpnt->SCp.dma_handle,
+                                        SCpnt->request_bufflen,
+                                        SCpnt->sc_data_direction);
                         }
                         SCpnt->result = DID_RESET << 16;
                         SCpnt->host_scribble = NULL;
@@ -981,11 +909,6 @@ mptscsih_search_running_cmds(MPT_SCSI_HOST *hd, uint target, uint lun)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
- *  Hack! It might be nice to report if a device is returning QUEUE_FULL
- *  but maybe not each and every time...
- */
-static long last_queue_full = 0;
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -1003,280 +926,20 @@ static void
 mptscsih_report_queue_full(struct scsi_cmnd *sc, SCSIIOReply_t *pScsiReply, SCSIIORequest_t *pScsiReq)
 {
         long time = jiffies;
-
-        if (time - last_queue_full > 10 * HZ) {
-                char *ioc_str = "ioc?";
-
-                if (sc->device && sc->device->host != NULL && sc->device->host->hostdata != NULL)
-                        ioc_str = ((MPT_SCSI_HOST *)sc->device->host->hostdata)->ioc->name;
-                dprintk((MYIOC_s_WARN_FMT "Device (%d:%d:%d) reported QUEUE_FULL!\n",
-                                ioc_str, 0, sc->device->id, sc->device->lun));
-                last_queue_full = time;
-        }
-}
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-static char *info_kbuf = NULL;
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
- *      mptscsih_probe - Installs scsi devices per bus.
- *      @pdev: Pointer to pci_dev structure
- *
- *      Returns 0 for success, non-zero for failure.
- *
- */
-
-static int
-mptscsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
-{
-        struct Scsi_Host        *sh;
         MPT_SCSI_HOST           *hd;
-        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
-        unsigned long            flags;
-        int                      sz, ii;
-        int                      numSGE = 0;
-        int                      scale;
-        int                      ioc_cap;
-        u8                      *mem;
-        int                     error=0;
-
-
-        /* 20010202 -sralston
-         *  Added sanity check on readiness of the MPT adapter.
-         */
-        if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
-                printk(MYIOC_s_WARN_FMT
-                  "Skipping because it's not operational!\n",
-                  ioc->name);
-                return -ENODEV;
-        }
-
-        if (!ioc->active) {
-                printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",
-                  ioc->name);
-                return -ENODEV;
-        }
-
-        /*  Sanity check - ensure at least 1 port is INITIATOR capable
-         */
-        ioc_cap = 0;
-        for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
-                if (ioc->pfacts[ii].ProtocolFlags &
-                    MPI_PORTFACTS_PROTOCOL_INITIATOR)
-                        ioc_cap ++;
-        }
-
-        if (!ioc_cap) {
-                printk(MYIOC_s_WARN_FMT
-                        "Skipping ioc=%p because SCSI Initiator mode is NOT enabled!\n",
-                        ioc->name, ioc);
-                return -ENODEV;
-        }
-
-        sh = scsi_host_alloc(&driver_template, sizeof(MPT_SCSI_HOST));
-        
-        if (!sh) {
-                printk(MYIOC_s_WARN_FMT
-                        "Unable to register controller with SCSI subsystem\n",
-                        ioc->name);
-                return -1;
-        }
-        
-        spin_lock_irqsave(&ioc->FreeQlock, flags);
-
-        /* Attach the SCSI Host to the IOC structure
-         */
-        ioc->sh = sh;
-
-        sh->io_port = 0;
-        sh->n_io_port = 0;
-        sh->irq = 0;
-
-        /* set 16 byte cdb's */
-        sh->max_cmd_len = 16;
-
-        /* Yikes!  This is important!
-         * Otherwise, by default, linux
-         * only scans target IDs 0-7!
-         * pfactsN->MaxDevices unreliable
-         * (not supported in early
-         *      versions of the FW).
-         * max_id = 1 + actual max id,
-         * max_lun = 1 + actual last lun,
-         *      see hosts.h :o(
-         */
-        if (ioc->bus_type == SCSI) {
-                sh->max_id = MPT_MAX_SCSI_DEVICES;
-        } else {
-        /* For FC, increase the queue depth
-         * from MPT_SCSI_CAN_QUEUE (31)
-         * to MPT_FC_CAN_QUEUE (63).
-         */
-                sh->can_queue = MPT_FC_CAN_QUEUE;
-                sh->max_id =
-                  MPT_MAX_FC_DEVICES<256 ? MPT_MAX_FC_DEVICES : 255;
-        }
-                
-        sh->max_lun = MPT_LAST_LUN + 1;
-        sh->max_channel = 0;
-        sh->this_id = ioc->pfacts[0].PortSCSIID;
-                
-        /* Required entry.
-         */
-        sh->unique_id = ioc->id;
-
-        /* Verify that we won't exceed the maximum
-         * number of chain buffers
-         * We can optimize:  ZZ = req_sz/sizeof(SGE)
-         * For 32bit SGE's:
-         *  numSGE = 1 + (ZZ-1)*(maxChain -1) + ZZ
-         *               + (req_sz - 64)/sizeof(SGE)
-         * A slightly different algorithm is required for
-         * 64bit SGEs.
-         */
-        scale = ioc->req_sz/(sizeof(dma_addr_t) + sizeof(u32));
-        if (sizeof(dma_addr_t) == sizeof(u64)) {
-                numSGE = (scale - 1) *
-                  (ioc->facts.MaxChainDepth-1) + scale +
-                  (ioc->req_sz - 60) / (sizeof(dma_addr_t) +
-                  sizeof(u32));
-        } else {
-                numSGE = 1 + (scale - 1) *
-                  (ioc->facts.MaxChainDepth-1) + scale +
-                  (ioc->req_sz - 64) / (sizeof(dma_addr_t) +
-                  sizeof(u32));
-        }
-                
-        if (numSGE < sh->sg_tablesize) {
-                /* Reset this value */
-                dprintk((MYIOC_s_INFO_FMT
-                  "Resetting sg_tablesize to %d from %d\n",
-                  ioc->name, numSGE, sh->sg_tablesize));
-                sh->sg_tablesize = numSGE;
-        }
-
-        /* Set the pci device pointer in Scsi_Host structure.
-         */
-        scsi_set_device(sh, &ioc->pcidev->dev);
-
-        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
-
-        hd = (MPT_SCSI_HOST *) sh->hostdata;
-        hd->ioc = ioc;
-
-        /* SCSI needs scsi_cmnd lookup table!
-         * (with size equal to req_depth*PtrSz!)
-         */
-        sz = ioc->req_depth * sizeof(void *);
-        mem = kmalloc(sz, GFP_ATOMIC);
-        if (mem == NULL) {
-                error = -ENOMEM;
-                goto mptscsih_probe_failed;
-        }
-
-        memset(mem, 0, sz);
-        hd->ScsiLookup = (struct scsi_cmnd **) mem;
-
-        dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p, sz=%d\n",
-                 ioc->name, hd->ScsiLookup, sz));
-                
-        /* Allocate memory for the device structures.
-         * A non-Null pointer at an offset
-         * indicates a device exists.
-         * max_id = 1 + maximum id (hosts.h)
-         */
-        sz = sh->max_id * sizeof(void *);
-        mem = kmalloc(sz, GFP_ATOMIC);
-        if (mem == NULL) {
-                error = -ENOMEM;
-                goto mptscsih_probe_failed;
-        }
-
-        memset(mem, 0, sz);
-        hd->Targets = (VirtDevice **) mem;
-
-        dprintk((KERN_INFO
-          "  Targets @ %p, sz=%d\n", hd->Targets, sz));
-
-        /* Clear the TM flags
-         */
-        hd->tmPending = 0;
-        hd->tmState = TM_STATE_NONE;
-        hd->resetPending = 0;
-        hd->abortSCpnt = NULL;
-
-        /* Clear the pointer used to store
-         * single-threaded commands, i.e., those
-         * issued during a bus scan, dv and
-         * configuration pages.
-         */
-        hd->cmdPtr = NULL;
 
-        /* Initialize this SCSI Hosts' timers
-         * To use, set the timer expires field
-         * and add_timer
-         */
-        init_timer(&hd->timer);
-        hd->timer.data = (unsigned long) hd;
-        hd->timer.function = mptscsih_timer_expired;
-
-        if (ioc->bus_type == SCSI) {
-                /* Update with the driver setup
-                 * values.
-                 */
-                if (ioc->spi_data.maxBusWidth > mpt_width)
-                        ioc->spi_data.maxBusWidth = mpt_width;
-                if (ioc->spi_data.minSyncFactor < mpt_factor)
-                        ioc->spi_data.minSyncFactor = mpt_factor;
-
-                if (ioc->spi_data.minSyncFactor == MPT_ASYNC) {
-                        ioc->spi_data.maxSyncOffset = 0;
-                }
-
-                ioc->spi_data.Saf_Te = mpt_saf_te;
-
-                hd->negoNvram = 0;
-#ifndef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
-                hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
-#endif
-                ioc->spi_data.forceDv = 0;
-                ioc->spi_data.noQas = 0;
-                for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++) {
-                        ioc->spi_data.dvStatus[ii] =
-                          MPT_SCSICFG_NEGOTIATE;
-                }
-
-                for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
-                        ioc->spi_data.dvStatus[ii] |=
-                          MPT_SCSICFG_DV_NOT_DONE;
-
-                dinitprintk((MYIOC_s_INFO_FMT
-                        "dv %x width %x factor %x saf_te %x\n",
-                        ioc->name, mpt_dv,
-                        mpt_width,
-                        mpt_factor,
-                        mpt_saf_te));
-        }
-
-        mpt_scsi_hosts++;
+        if (sc->device == NULL)
+                return;
+        if (sc->device->host == NULL)
+                return;
+        if ((hd = (MPT_SCSI_HOST *)sc->device->host->hostdata) == NULL)
+                return;
 
-        error = scsi_add_host (sh, &ioc->pcidev->dev);
-        if(error) {
-                dprintk((KERN_ERR MYNAM
-                  "scsi_add_host failed\n"));
-                goto mptscsih_probe_failed;
+        if (time - hd->last_queue_full > 10 * HZ) {
+                dprintk((MYIOC_s_WARN_FMT "Device (%d:%d:%d) reported QUEUE_FULL!\n",
+                                hd->ioc->name, 0, sc->device->id, sc->device->lun));
+                hd->last_queue_full = time;
         }
-
-        scsi_scan_host(sh);
-        return 0;
-
-mptscsih_probe_failed:
-
-        mptscsih_remove(pdev);
-        return error;
-
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1286,7 +949,7 @@ mptscsih_probe_failed:
  *
  *
  */
-static void
+void
 mptscsih_remove(struct pci_dev *pdev)
 {
         MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
@@ -1294,12 +957,16 @@ mptscsih_remove(struct pci_dev *pdev)
         MPT_SCSI_HOST           *hd;
         int                     count;
         unsigned long           flags;
+        int sz1;
 
         if(!host)
                 return;
 
         scsi_remove_host(host);
 
+        if((hd = (MPT_SCSI_HOST *)host->hostdata) == NULL)
+                return;
+
 #ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
         /* Check DV thread active */
         count = 10 * HZ;
@@ -1321,40 +988,36 @@ mptscsih_remove(struct pci_dev *pdev)
 #endif
 #endif
 
-        hd = (MPT_SCSI_HOST *)host->hostdata;
-        if (hd != NULL) {
-                int sz1;
+        mptscsih_shutdown(&pdev->dev);
 
-                mptscsih_shutdown(&pdev->dev);
+        sz1=0;
 
-                sz1=0;
+        if (hd->ScsiLookup != NULL) {
+                sz1 = hd->ioc->req_depth * sizeof(void *);
+                kfree(hd->ScsiLookup);
+                hd->ScsiLookup = NULL;
+        }
 
-                if (hd->ScsiLookup != NULL) {
-                        sz1 = hd->ioc->req_depth * sizeof(void *);
-                        kfree(hd->ScsiLookup);
-                        hd->ScsiLookup = NULL;
-                }
+        /*
+         * Free pointer array.
+         */
+        kfree(hd->Targets);
+        hd->Targets = NULL;
 
-                if (hd->Targets != NULL) {
-                        /*
-                         * Free pointer array.
-                         */
-                        kfree(hd->Targets);
-                        hd->Targets = NULL;
-                }
+        dprintk((MYIOC_s_INFO_FMT
+            "Free'd ScsiLookup (%d) memory\n",
+            hd->ioc->name, sz1));
 
-                dprintk((MYIOC_s_INFO_FMT 
-                    "Free'd ScsiLookup (%d) memory\n",
-                    hd->ioc->name, sz1));
+        kfree(hd->info_kbuf);
 
-                /* NULL the Scsi_Host pointer
-                 */
-                hd->ioc->sh = NULL;
-        }
+        /* NULL the Scsi_Host pointer
+         */
+        hd->ioc->sh = NULL;
 
         scsi_host_put(host);
-        mpt_scsi_hosts--;
 
+        mpt_detach(pdev);
+        
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1362,7 +1025,7 @@ mptscsih_remove(struct pci_dev *pdev)
  *      mptscsih_shutdown - reboot notifier
  *
  */
-static void
+void
 mptscsih_shutdown(struct device * dev)
 {
         MPT_ADAPTER             *ioc = pci_get_drvdata(to_pci_dev(dev));
@@ -1384,15 +1047,15 @@ mptscsih_shutdown(struct device * dev)
 #ifdef CONFIG_PM
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptscsih_suspend - Fusion MPT scsie driver suspend routine.
+ *      mptscsih_suspend - Fusion MPT scsi driver suspend routine.
  *
  *
  */
-static int
+int
 mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         mptscsih_shutdown(&pdev->dev);
-        return 0;
+        return mpt_suspend(pdev,state);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1401,13 +1064,15 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
  *
  *
  */
-static int
+int
 mptscsih_resume(struct pci_dev *pdev)
 {
         MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
         struct Scsi_Host        *host = ioc->sh;
         MPT_SCSI_HOST           *hd;
 
+        mpt_resume(pdev);
+        
         if(!host)
                 return 0;
 
@@ -1422,9 +1087,9 @@ mptscsih_resume(struct pci_dev *pdev)
         if (!dvtaskQ_active) {
                 dvtaskQ_active = 1;
                 spin_unlock_irqrestore(&dvtaskQ_lock, lflags);
-                INIT_WORK(&mptscsih_dvTask,
+                INIT_WORK(&dvTaskQ_task,
                   mptscsih_domainValidation, (void *) hd);
-                schedule_work(&mptscsih_dvTask);
+                schedule_work(&dvTaskQ_task);
         } else {
                 spin_unlock_irqrestore(&dvtaskQ_lock, lflags);
         }
@@ -1435,82 +1100,6 @@ mptscsih_resume(struct pci_dev *pdev)
 
 #endif
 
-static struct mpt_pci_driver mptscsih_driver = {
-        .probe          = mptscsih_probe,
-        .remove         = mptscsih_remove,
-        .shutdown       = mptscsih_shutdown,
-#ifdef CONFIG_PM
-        .suspend        = mptscsih_suspend,
-        .resume         = mptscsih_resume,
-#endif
-};
-
-/*  SCSI host fops start here...  */
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      mptscsih_init - Register MPT adapter(s) as SCSI host(s) with
- *      linux scsi mid-layer.
- *
- *      Returns 0 for success, non-zero for failure.
- */
-static int __init
-mptscsih_init(void)
-{
-
-        show_mptmod_ver(my_NAME, my_VERSION);
-
-        ScsiDoneCtx = mpt_register(mptscsih_io_done, MPTSCSIH_DRIVER);
-        ScsiTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTSCSIH_DRIVER);
-        ScsiScanDvCtx = mpt_register(mptscsih_scandv_complete, MPTSCSIH_DRIVER);
-
-        if (mpt_event_register(ScsiDoneCtx, mptscsih_event_process) == 0) {
-                devtprintk((KERN_INFO MYNAM
-                  ": Registered for IOC event notifications\n"));
-        }
-
-        if (mpt_reset_register(ScsiDoneCtx, mptscsih_ioc_reset) == 0) {
-                dprintk((KERN_INFO MYNAM
-                  ": Registered for IOC reset notifications\n"));
-        }
-
-        if(mpt_device_driver_register(&mptscsih_driver,
-          MPTSCSIH_DRIVER) != 0 ) {
-                dprintk((KERN_INFO MYNAM
-                ": failed to register dd callbacks\n"));
-        }
-
-        return 0;
-
-}
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      mptscsih_exit - Unregisters MPT adapter(s)
- *
- */
-static void __exit
-mptscsih_exit(void)
-{
-        mpt_device_driver_deregister(MPTSCSIH_DRIVER);
-
-        mpt_reset_deregister(ScsiDoneCtx);
-        dprintk((KERN_INFO MYNAM
-          ": Deregistered for IOC reset notifications\n"));
-
-        mpt_event_deregister(ScsiDoneCtx);
-        dprintk((KERN_INFO MYNAM
-          ": Deregistered for IOC event notifications\n"));
-
-        mpt_deregister(ScsiScanDvCtx);
-        mpt_deregister(ScsiTaskCtx);
-        mpt_deregister(ScsiDoneCtx);
-
-        if (info_kbuf != NULL)
-                kfree(info_kbuf);
-
-}
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_info - Return information about MPT adapter
@@ -1520,24 +1109,25 @@ mptscsih_exit(void)
  *
  *      Returns pointer to buffer where information was written.
  */
-static const char *
+const char *
 mptscsih_info(struct Scsi_Host *SChost)
 {
         MPT_SCSI_HOST *h;
         int size = 0;
 
-        if (info_kbuf == NULL)
-                if ((info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
-                        return info_kbuf;
-
         h = (MPT_SCSI_HOST *)SChost->hostdata;
-        info_kbuf[0] = '\0';
+
         if (h) {
-                mpt_print_ioc_summary(h->ioc, info_kbuf, &size, 0, 0);
-                info_kbuf[size-1] = '\0';
+                if (h->info_kbuf == NULL)
+                        if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
+                                return h->info_kbuf;
+                h->info_kbuf[0] = '\0';
+
+                mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
+                h->info_kbuf[size-1] = '\0';
         }
 
-        return info_kbuf;
+        return h->info_kbuf;
 }
 
 struct info_str {
@@ -1547,7 +1137,8 @@ struct info_str {
         int   pos;
 };
 
-static void copy_mem_info(struct info_str *info, char *data, int len)
+static void
+mptscsih_copy_mem_info(struct info_str *info, char *data, int len)
 {
         if (info->pos + len > info->length)
                 len = info->length - info->pos;
@@ -1568,7 +1159,8 @@ static void copy_mem_info(struct info_str *info, char *data, int len)
         }
 }
 
-static int copy_info(struct info_str *info, char *fmt, ...)
+static int
+mptscsih_copy_info(struct info_str *info, char *fmt, ...)
 {
         va_list args;
         char buf[81];
@@ -1578,11 +1170,12 @@ static int copy_info(struct info_str *info, char *fmt, ...)
         len = vsprintf(buf, fmt, args);
         va_end(args);
 
-        copy_mem_info(info, buf, len);
+        mptscsih_copy_mem_info(info, buf, len);
         return len;
 }
 
-static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int len)
+static int
+mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int len)
 {
         struct info_str info;
 
@@ -1591,10 +1184,10 @@ static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int le
         info.offset     = offset;
         info.pos        = 0;
 
-        copy_info(&info, "%s: %s, ", ioc->name, ioc->prod_name);
-        copy_info(&info, "%s%08xh, ", MPT_FW_REV_MAGIC_ID_STRING, ioc->facts.FWVersion.Word);
-        copy_info(&info, "Ports=%d, ", ioc->facts.NumberOfPorts);
-        copy_info(&info, "MaxQ=%d\n", ioc->req_depth);
+        mptscsih_copy_info(&info, "%s: %s, ", ioc->name, ioc->prod_name);
+        mptscsih_copy_info(&info, "%s%08xh, ", MPT_FW_REV_MAGIC_ID_STRING, ioc->facts.FWVersion.Word);
+        mptscsih_copy_info(&info, "Ports=%d, ", ioc->facts.NumberOfPorts);
+        mptscsih_copy_info(&info, "MaxQ=%d\n", ioc->req_depth);
 
         return ((info.pos > info.offset) ? info.pos - info.offset : 0);
 }
@@ -1612,7 +1205,7 @@ static int mptscsih_host_info(MPT_ADAPTER *ioc, char *pbuf, off_t offset, int le
  *      hostno: scsi host number
  *      func:   if write = 1; if read = 0
  */
-static int
+int
 mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,
                         int length, int func)
 {
@@ -1649,7 +1242,7 @@ mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
  *
  *      Returns 0. (rtn value discarded by linux scsi mid-layer)
  */
-static int
+int
 mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         MPT_SCSI_HOST           *hd;
@@ -1684,7 +1277,7 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         /*
          *  Put together a MPT SCSI request...
          */
-        if ((mf = mpt_get_msg_frame(ScsiDoneCtx, hd->ioc)) == NULL) {
+        if ((mf = mpt_get_msg_frame(hd->ioc->DoneCtx, hd->ioc)) == NULL) {
                 dprintk((MYIOC_s_WARN_FMT "QueueCmd, no msg frames!!\n",
                                 hd->ioc->name));
                 return SCSI_MLQUEUE_HOST_BUSY;
@@ -1696,8 +1289,7 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 
         ADD_INDEX_LOG(my_idx);
 
-        /*  BUG FIX!  19991030 -sralston
-         *    TUR's being issued with scsictl=0x02000000 (DATA_IN)!
+        /*    TUR's being issued with scsictl=0x02000000 (DATA_IN)!
          *    Seems we may receive a buffer (datalen>0) even when there
          *    will be no data transfer!  GRRRRR...
          */
@@ -1791,9 +1383,9 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
                                 if (!dvtaskQ_active) {
                                         dvtaskQ_active = 1;
                                         spin_unlock_irqrestore(&dvtaskQ_lock, lflags);
-                                        INIT_WORK(&mptscsih_dvTask, mptscsih_domainValidation, (void *) hd);
+                                        INIT_WORK(&dvTaskQ_task, mptscsih_domainValidation, (void *) hd);
 
-                                        schedule_work(&mptscsih_dvTask);
+                                        schedule_work(&dvTaskQ_task);
                                 } else {
                                         spin_unlock_irqrestore(&dvtaskQ_lock, lflags);
                                 }
@@ -1819,7 +1411,7 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         }
 #endif
 
-        mpt_put_msg_frame(ScsiDoneCtx, hd->ioc, mf);
+        mpt_put_msg_frame(hd->ioc->DoneCtx, hd->ioc, mf);
         dmfprintk((MYIOC_s_INFO_FMT "Issued SCSI cmd (%p) mf=%p idx=%d\n",
                         hd->ioc->name, SCpnt, mf, my_idx));
         DBG_DUMP_REQUEST_FRAME(mf)
@@ -2036,7 +1628,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
 
         /* Return Fail to calling function if no message frames available.
          */
-        if ((mf = mpt_get_msg_frame(ScsiTaskCtx, hd->ioc)) == NULL) {
+        if ((mf = mpt_get_msg_frame(hd->ioc->TaskCtx, hd->ioc)) == NULL) {
                 dfailprintk((MYIOC_s_ERR_FMT "IssueTaskMgmt, no msg frames!!\n",
                                 hd->ioc->name));
                 //return FAILED;
@@ -2075,7 +1667,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
 
         DBG_DUMP_TM_REQUEST_FRAME((u32 *)pScsiTm);
 
-        if ((retval = mpt_send_handshake_request(ScsiTaskCtx, hd->ioc,
+        if ((retval = mpt_send_handshake_request(hd->ioc->TaskCtx, hd->ioc,
                 sizeof(SCSITaskMgmt_t), (u32*)pScsiTm,
                 CAN_SLEEP)) != 0) {
                 dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!"
@@ -2107,7 +1699,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
  *
  *      Returns SUCCESS or FAILED.
  */
-static int
+int
 mptscsih_abort(struct scsi_cmnd * SCpnt)
 {
         MPT_SCSI_HOST   *hd;
@@ -2115,7 +1707,6 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
         MPT_FRAME_HDR   *mf;
         u32              ctx2abort;
         int              scpnt_idx;
-        spinlock_t      *host_lock = SCpnt->device->host->host_lock;
 
         /* If we can't locate our host adapter structure, return FAILED status.
          */
@@ -2163,7 +1754,6 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
 
         hd->abortSCpnt = SCpnt;
 
-        spin_unlock_irq(host_lock);
         if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK,
                 SCpnt->device->channel, SCpnt->device->id, SCpnt->device->lun,
                 ctx2abort, 2 /* 2 second timeout */)
@@ -2180,8 +1770,6 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                 hd->tmPending = 0;
                 hd->tmState = TM_STATE_NONE;
 
-                spin_lock_irq(host_lock);
-
                 /* Unmap the DMA buffers, if any. */
                 if (SCpnt->use_sg) {
                         pci_unmap_sg(ioc->pcidev, (struct scatterlist *) SCpnt->request_buffer,
@@ -2197,7 +1785,6 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                 mpt_free_msg_frame(ioc, mf);
                 return FAILED;
         }
-        spin_lock_irq(host_lock);
         return SUCCESS;
 }
 
@@ -2210,11 +1797,10 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
  *
  *      Returns SUCCESS or FAILED.
  */
-static int
+int
 mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
 {
         MPT_SCSI_HOST   *hd;
-        spinlock_t      *host_lock = SCpnt->device->host->host_lock;
 
         /* If we can't locate our host adapter structure, return FAILED status.
          */
@@ -2231,7 +1817,6 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
         printk(KERN_WARNING MYNAM ": %s: >> Attempting target reset! (sc=%p)\n",
                hd->ioc->name, SCpnt);
 
-        spin_unlock_irq(host_lock);
         if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,
                 SCpnt->device->channel, SCpnt->device->id,
                 0, 0, 5 /* 5 second timeout */)
@@ -2243,12 +1828,10 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
                                 hd->ioc->name, SCpnt);
                 hd->tmPending = 0;
                 hd->tmState = TM_STATE_NONE;
-                spin_lock_irq(host_lock);
                 return FAILED;
         }
-        spin_lock_irq(host_lock);
-        return SUCCESS;
 
+        return SUCCESS;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -2260,7 +1843,7 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
  *
  *      Returns SUCCESS or FAILED.
  */
-static int
+int
 mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
 {
         MPT_SCSI_HOST   *hd;
@@ -2282,7 +1865,6 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
                 hd->timeouts++;
 
         /* We are now ready to execute the task management request. */
-        spin_unlock_irq(host_lock);
         if (mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
                 SCpnt->device->channel, 0, 0, 0, 5 /* 5 second timeout */)
             < 0){
@@ -2298,7 +1880,7 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
                 spin_lock_irq(host_lock);
                 return FAILED;
         }
-        spin_lock_irq(host_lock);
+
         return SUCCESS;
 }
 
@@ -2312,12 +1894,11 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
  *
  *      Returns SUCCESS or FAILED.
  */
-static int
+int
 mptscsih_host_reset(struct scsi_cmnd *SCpnt)
 {
         MPT_SCSI_HOST *  hd;
         int              status = SUCCESS;
-        spinlock_t      *host_lock = SCpnt->device->host->host_lock;
 
         /*  If we can't locate the host to reset, then we failed. */
         if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){
@@ -2333,7 +1914,6 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
         /*  If our attempts to reset the host failed, then return a failed
          *  status.  The host will be taken off line by the SCSI mid-layer.
          */
-        spin_unlock_irq(host_lock);
         if (mpt_HardResetHandler(hd->ioc, CAN_SLEEP) < 0){
                 status = FAILED;
         } else {
@@ -2343,8 +1923,6 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
                 hd->tmPending = 0;
                 hd->tmState = TM_STATE_NONE;
         }
-        spin_lock_irq(host_lock);
-
 
         dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "
                      "Status = %s\n",
@@ -2426,7 +2004,7 @@ mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout )
  *
  *      Returns 1 indicating alloc'd request frame ptr should be freed.
  */
-static int
+int
 mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
 {
         SCSITaskMgmtReply_t     *pScsiTmReply;
@@ -2509,7 +2087,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *m
 /*
  *      This is anyones guess quite frankly.
  */
-static int
+int
 mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev,
                 sector_t capacity, int geom[])
 {
@@ -2556,7 +2134,7 @@ mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev,
  *      Return non-zero if allocation fails.
  *      Init memory once per id (not LUN).
  */
-static int
+int
 mptscsih_slave_alloc(struct scsi_device *device)
 {
         struct Scsi_Host        *host = device->host;
@@ -2599,7 +2177,8 @@ mptscsih_slave_alloc(struct scsi_device *device)
         return 0;
 }
 
-static int mptscsih_is_raid_volume(MPT_SCSI_HOST *hd, uint id)
+static int 
+mptscsih_is_raid_volume(MPT_SCSI_HOST *hd, uint id)
 {
         int i;
 
@@ -2618,7 +2197,7 @@ static int mptscsih_is_raid_volume(MPT_SCSI_HOST *hd, uint id)
  *      OS entry point to allow for host driver to free allocated memory
  *      Called if no device present or device being unloaded
  */
-static void
+void
 mptscsih_slave_destroy(struct scsi_device *device)
 {
         struct Scsi_Host        *host = device->host;
@@ -2639,7 +2218,7 @@ mptscsih_slave_destroy(struct scsi_device *device)
 
         kfree(hd->Targets[target]);
         hd->Targets[target] = NULL;
-        
+
         if (hd->ioc->bus_type == SCSI) {
                 if (mptscsih_is_raid_volume(hd, target)) {
                         hd->ioc->spi_data.forceDv |= MPT_SCSICFG_RELOAD_IOC_PG3;
@@ -2695,7 +2274,7 @@ mptscsih_set_queue_depth(struct scsi_device *device, MPT_SCSI_HOST *hd,
  *      member to 1 if a device does not support Q tags.
  *      Return non-zero if fails.
  */
-static int
+int
 mptscsih_slave_configure(struct scsi_device *device)
 {
         struct Scsi_Host        *sh = device->host;
@@ -2758,8 +2337,8 @@ slave_configure_exit:
         return 0;
 }
 
-static ssize_t
-mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count)
+ssize_t
+mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         int                      depth;
         struct scsi_device      *sdev = to_scsi_device(dev);
@@ -2788,7 +2367,7 @@ mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count)
  *
  */
 static void
-copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply)
+mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply)
 {
         VirtDevice      *target;
         SCSIIORequest_t *pReq;
@@ -2854,7 +2433,7 @@ SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-static int
+int
 mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 {
         MPT_SCSI_HOST   *hd;
@@ -2949,8 +2528,8 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
                          */
                         hd->pLocal = &hd->localReply;
                         hd->pLocal->completion = MPT_SCANDV_DID_RESET;
-                        scandv_wait_done = 1;
-                        wake_up(&scandv_waitq);
+                        hd->scandv_wait_done = 1;
+                        wake_up(&hd->scandv_waitq);
                         hd->cmdPtr = NULL;
                 }
 
@@ -2969,7 +2548,7 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-static int
+int
 mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
 {
         MPT_SCSI_HOST *hd;
@@ -3085,42 +2664,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
         return 1;               /* currently means nothing really */
 }
 
-static struct device_attribute mptscsih_queue_depth_attr = {
-        .attr = {
-                .name =         "queue_depth",
-                .mode =         S_IWUSR,
-        },
-        .store = mptscsih_store_queue_depth,
-};
-
-static struct device_attribute *mptscsih_dev_attrs[] = {
-        &mptscsih_queue_depth_attr,
-        NULL,
-};
-
-static struct scsi_host_template driver_template = {
-        .proc_name                      = "mptscsih",
-        .proc_info                      = mptscsih_proc_info,
-        .name                           = "MPT SCSI Host",
-        .info                           = mptscsih_info,
-        .queuecommand                   = mptscsih_qcmd,
-        .slave_alloc                    = mptscsih_slave_alloc,
-        .slave_configure                = mptscsih_slave_configure,
-        .slave_destroy                  = mptscsih_slave_destroy,
-        .eh_abort_handler               = mptscsih_abort,
-        .eh_device_reset_handler        = mptscsih_dev_reset,
-        .eh_bus_reset_handler           = mptscsih_bus_reset,
-        .eh_host_reset_handler          = mptscsih_host_reset,
-        .bios_param                     = mptscsih_bios_param,
-        .can_queue                      = MPT_SCSI_CAN_QUEUE,
-        .this_id                        = -1,
-        .sg_tablesize                   = MPT_SCSI_SG_DEPTH,
-        .max_sectors                    = 8192,
-        .cmd_per_lun                    = 7,
-        .use_clustering                 = ENABLE_CLUSTERING,
-        .sdev_attrs                     = mptscsih_dev_attrs,
-};
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *      mptscsih_initTarget - Target, LUN alloc/free functionality.
@@ -3158,9 +2701,9 @@ mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int target_id, u8 lun, char *
          * around a bug in th emid-layer in some distributions in which the mid-layer will
          * continue to try to communicate to the LUN and evntually create a dummy LUN.
         */
-        if (mpt_pq_filter && dlen && (data[0] & 0xE0))
+        if (hd->mpt_pq_filter && dlen && (data[0] & 0xE0))
                 data[0] |= 0x40;
-        
+
         /* Is LUN supported? If so, upper 2 bits will be 0
         * in first byte of inquiry data.
         */
@@ -3307,7 +2850,7 @@ mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtDevice *target, char byte56)
                                 ddvtprintk((KERN_INFO "Enabling QAS on id=%d due to ~TARGET_FLAGS_VALID_56!\n", id));
                                 noQas = 0;
                         }
-                                
+
                         offset = pspi_data->maxSyncOffset;
 
                         /* If RAID, never disable QAS
@@ -3401,7 +2944,7 @@ mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtDevice *target, char byte56)
                                 if ( (vdev = hd->Targets[ii]) ) {
                                         vdev->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
                                         mptscsih_writeSDP1(hd, 0, ii, vdev->negoFlags);
-                                }       
+                                }
                         }
                 }
         }
@@ -3426,14 +2969,15 @@ mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtDevice *target, char byte56)
  * Tapes, initTarget will set this flag on completion of Inquiry command.
  * Called only if DV_NOT_DONE flag is set
  */
-static void mptscsih_set_dvflags(MPT_SCSI_HOST *hd, SCSIIORequest_t *pReq)
+static void
+mptscsih_set_dvflags(MPT_SCSI_HOST *hd, SCSIIORequest_t *pReq)
 {
         u8 cmd;
         ScsiCfgData *pSpi;
 
         ddvtprintk((" set_dvflags: id=%d lun=%d negoNvram=%x cmd=%x\n", 
                 pReq->TargetID, pReq->LUN[1], hd->negoNvram, pReq->CDB[0]));
-        
+
         if ((pReq->LUN[1] != 0) || (hd->negoNvram != 0))
                 return;
 
@@ -3464,7 +3008,8 @@ static void mptscsih_set_dvflags(MPT_SCSI_HOST *hd, SCSIIORequest_t *pReq)
  * If no Target, bus reset on 1st I/O. Set the flag to
  * prevent any future negotiations to this device.
  */
-static void mptscsih_no_negotiate(MPT_SCSI_HOST *hd, int target_id)
+static void
+mptscsih_no_negotiate(MPT_SCSI_HOST *hd, int target_id)
 {
 
         if ((hd->Targets) && (hd->Targets[target_id] == NULL))
@@ -3631,7 +3176,7 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags)
                         offset = pTarget->maxOffset;
                         negoFlags = pTarget->negoFlags;
                 }
-                
+
 #ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
                 /* Force to async and narrow if DV has not been executed
                  * for this ID
@@ -3653,7 +3198,7 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags)
 
                 /* Get a MF for this command.
                  */
-                if ((mf = mpt_get_msg_frame(ScsiDoneCtx, ioc)) == NULL) {
+                if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
                         dprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",
                                                 ioc->name));
                         return -EAGAIN;
@@ -3717,7 +3262,7 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags)
                                 ioc->name, id, (id | (bus<<8)),
                                 requested, configuration));
 
-                mpt_put_msg_frame(ScsiDoneCtx, ioc, mf);
+                mpt_put_msg_frame(ioc->DoneCtx, ioc, mf);
         }
 
         return 0;
@@ -3748,7 +3293,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
 
         /* Get a MF for this command.
          */
-        if ((mf = mpt_get_msg_frame(ScsiDoneCtx, ioc)) == NULL) {
+        if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
                 dprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",
                                         ioc->name));
                 return -EAGAIN;
@@ -3794,7 +3339,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
                 "writeIOCPage4: MaxSEP=%d ActiveSEP=%d id=%d bus=%d\n",
                         ioc->name, IOCPage4Ptr->MaxSEP, IOCPage4Ptr->ActiveSEP, target_id, bus));
 
-        mpt_put_msg_frame(ScsiDoneCtx, ioc, mf);
+        mpt_put_msg_frame(ioc->DoneCtx, ioc, mf);
 
         return 0;
 }
@@ -3824,7 +3369,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
  *      in the IOC member localReply structure.
  *      Used ONLY for DV and other internal commands.
  */
-static int
+int
 mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
 {
         MPT_SCSI_HOST   *hd;
@@ -3832,6 +3377,8 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
         int              completionCode;
         u16              req_idx;
 
+        hd = (MPT_SCSI_HOST *) ioc->sh->hostdata;
+
         if ((mf == NULL) ||
             (mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))) {
                 printk(MYIOC_s_ERR_FMT
@@ -3840,7 +3387,6 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                 goto wakeup;
         }
 
-        hd = (MPT_SCSI_HOST *) ioc->sh->hostdata;
         del_timer(&hd->timer);
         req_idx = le16_to_cpu(mf->u.frame.hwhdr.msgctxu.fld.req_idx);
         hd->ScsiLookup[req_idx] = NULL;
@@ -3972,8 +3518,8 @@ wakeup:
         /*
          * Wake up the original calling thread
          */
-        scandv_wait_done = 1;
-        wake_up(&scandv_waitq);
+        hd->scandv_wait_done = 1;
+        wake_up(&hd->scandv_waitq);
 
         return 1;
 }
@@ -3984,7 +3530,8 @@ wakeup:
  *      @data: Pointer to MPT_SCSI_HOST recast as an unsigned long
  *
  */
-static void mptscsih_timer_expired(unsigned long data)
+void
+mptscsih_timer_expired(unsigned long data)
 {
         MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) data;
 
@@ -4051,7 +3598,7 @@ mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io)
 
         /* Get and Populate a free Frame
          */
-        if ((mf = mpt_get_msg_frame(ScsiScanDvCtx, hd->ioc)) == NULL) {
+        if ((mf = mpt_get_msg_frame(hd->ioc->InternalCtx, hd->ioc)) == NULL) {
                 ddvprintk((MYIOC_s_WARN_FMT "_do_raid: no msg frames!\n",
                                         hd->ioc->name));
                 return -EAGAIN;
@@ -4077,7 +3624,7 @@ mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io)
 
         hd->pLocal = NULL;
         hd->timer.expires = jiffies + HZ*10; /* 10 second timeout */
-        scandv_wait_done = 0;
+        hd->scandv_wait_done = 0;
 
         /* Save cmd pointer, for resource free if timeout or
          * FW reload occurs
@@ -4085,8 +3632,8 @@ mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io)
         hd->cmdPtr = mf;
 
         add_timer(&hd->timer);
-        mpt_put_msg_frame(ScsiScanDvCtx, hd->ioc, mf);
-        wait_event(scandv_waitq, scandv_wait_done);
+        mpt_put_msg_frame(hd->ioc->InternalCtx, hd->ioc, mf);
+        wait_event(hd->scandv_waitq, hd->scandv_wait_done);
 
         if ((hd->pLocal == NULL) || (hd->pLocal->completion != MPT_SCANDV_GOOD))
                 return -1;
@@ -4232,7 +3779,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
 
         /* Get and Populate a free Frame
          */
-        if ((mf = mpt_get_msg_frame(ScsiScanDvCtx, hd->ioc)) == NULL) {
+        if ((mf = mpt_get_msg_frame(hd->ioc->InternalCtx, hd->ioc)) == NULL) {
                 ddvprintk((MYIOC_s_WARN_FMT "No msg frames!\n",
                                         hd->ioc->name));
                 return -EBUSY;
@@ -4314,7 +3861,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
          */
         hd->pLocal = NULL;
         hd->timer.expires = jiffies + HZ*cmdTimeout;
-        scandv_wait_done = 0;
+        hd->scandv_wait_done = 0;
 
         /* Save cmd pointer, for resource free if timeout or
          * FW reload occurs
@@ -4322,8 +3869,8 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
         hd->cmdPtr = mf;
 
         add_timer(&hd->timer);
-        mpt_put_msg_frame(ScsiScanDvCtx, hd->ioc, mf);
-        wait_event(scandv_waitq, scandv_wait_done);
+        mpt_put_msg_frame(hd->ioc->InternalCtx, hd->ioc, mf);
+        wait_event(hd->scandv_waitq, hd->scandv_wait_done);
 
         if (hd->pLocal) {
                 rc = hd->pLocal->completion;
@@ -4640,7 +4187,8 @@ mptscsih_domainValidation(void *arg)
 
 /* Search IOC page 3 to determine if this is hidden physical disk
  */
-static int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, int id)
+static int 
+mptscsih_is_phys_disk(MPT_ADAPTER *ioc, int id)
 {
         if (ioc->spi_data.pIocPg3) {
                 Ioc3PhysDisk_t *pPDisk =  ioc->spi_data.pIocPg3->PhysDisk;
@@ -4659,7 +4207,8 @@ static int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, int id)
 
 /* Write SDP1 if no QAS has been enabled
  */
-static void mptscsih_qas_check(MPT_SCSI_HOST *hd, int id)
+static void
+mptscsih_qas_check(MPT_SCSI_HOST *hd, int id)
 {
         VirtDevice *pTarget;
         int ii;
@@ -5157,7 +4706,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
         }
         ddvprintk((MYIOC_s_NOTE_FMT "DV: Basic test on id=%d completed OK.\n", ioc->name, id));
 
-        if (mpt_dv == 0)
+        if (ioc->spi_data.mpt_dv == 0)
                 goto target_done;
 
         inq0 = (*pbuf1) & 0x1F;
@@ -6015,7 +5564,29 @@ mptscsih_fillbuf(char *buffer, int size, int index, int width)
 }
 #endif /* ~MPTSCSIH_ENABLE_DOMAIN_VALIDATION */
 
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+EXPORT_SYMBOL(mptscsih_remove);
+EXPORT_SYMBOL(mptscsih_shutdown);
+#ifdef CONFIG_PM
+EXPORT_SYMBOL(mptscsih_suspend);
+EXPORT_SYMBOL(mptscsih_resume);
+#endif
+EXPORT_SYMBOL(mptscsih_proc_info);
+EXPORT_SYMBOL(mptscsih_info);
+EXPORT_SYMBOL(mptscsih_qcmd);
+EXPORT_SYMBOL(mptscsih_slave_alloc);
+EXPORT_SYMBOL(mptscsih_slave_destroy);
+EXPORT_SYMBOL(mptscsih_slave_configure);
+EXPORT_SYMBOL(mptscsih_abort);
+EXPORT_SYMBOL(mptscsih_dev_reset);
+EXPORT_SYMBOL(mptscsih_bus_reset);
+EXPORT_SYMBOL(mptscsih_host_reset);
+EXPORT_SYMBOL(mptscsih_bios_param);
+EXPORT_SYMBOL(mptscsih_io_done);
+EXPORT_SYMBOL(mptscsih_taskmgmt_complete);
+EXPORT_SYMBOL(mptscsih_scandv_complete);
+EXPORT_SYMBOL(mptscsih_event_process);
+EXPORT_SYMBOL(mptscsih_ioc_reset);
+EXPORT_SYMBOL(mptscsih_store_queue_depth);
+EXPORT_SYMBOL(mptscsih_timer_expired);
 
-module_init(mptscsih_init);
-module_exit(mptscsih_exit);
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 5cb2fd45c38f..d73aec33e16a 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -1,26 +1,13 @@
 /*
- *  linux/drivers/message/fusion/mptscsih.h
+ *  linux/drivers/message/fusion/mptscsi.h
  *      High performance SCSI / Fibre Channel SCSI Host device driver.
  *      For use with PCI chip/adapter(s):
  *          LSIFC9xx/LSI409xx Fibre Channel
  *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
  *
- *  Credits:
- *      This driver would not exist if not for Alan Cox's development
- *      of the linux i2o driver.
- *
- *      A huge debt of gratitude is owed to David S. Miller (DaveM)
- *      for fixing much of the stupid and broken stuff in the early
- *      driver while porting to sparc64 platform.  THANK YOU!
- *
- *      (see also mptbase.c)
- *
- *  Copyright (c) 1999-2004 LSI Logic Corporation
- *  Originally By: Steven J. Ralston
- *  (mailto:netscape.net)
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
  *  (mailto:mpt_linux_developer@lsil.com)
  *
- *  $Id: mptscsih.h,v 1.21 2002/12/03 21:26:35 pdelaney Exp $
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -91,4 +78,30 @@
 #define MPTSCSIH_MIN_SYNC               0x08
 #define MPTSCSIH_SAF_TE                 0
 
+
+#endif
+
+extern void mptscsih_remove(struct pci_dev *);
+extern void mptscsih_shutdown(struct device *);
+#ifdef CONFIG_PM
+extern int mptscsih_suspend(struct pci_dev *pdev, u32 state);
+extern int mptscsih_resume(struct pci_dev *pdev);
 #endif
+extern int mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int func);
+extern const char * mptscsih_info(struct Scsi_Host *SChost);
+extern int mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *));
+extern int mptscsih_slave_alloc(struct scsi_device *device);
+extern void mptscsih_slave_destroy(struct scsi_device *device);
+extern int mptscsih_slave_configure(struct scsi_device *device);
+extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
+extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
+extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
+extern int mptscsih_host_reset(struct scsi_cmnd *SCpnt);
+extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
+extern int mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
+extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
+extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
+extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
+extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
+extern ssize_t mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);
+extern void mptscsih_timer_expired(unsigned long data);
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
new file mode 100644
index 000000000000..5f9a61b85b3b
--- /dev/null
+++ b/drivers/message/fusion/mptspi.c
@@ -0,0 +1,486 @@
+/*
+ *  linux/drivers/message/fusion/mptspi.c
+ *      For use with LSI Logic PCI chip/adapter(s)
+ *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
+ *
+ *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  (mailto:mpt_linux_developer@lsil.com)
+ *
+ */
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+    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; version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    NO WARRANTY
+    THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
+    LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+    solely responsible for determining the appropriateness of using and
+    distributing the Program and assumes all risks associated with its
+    exercise of rights under this Agreement, including but not limited to
+    the risks and costs of program errors, damage to or loss of data,
+    programs or equipment, and unavailability or interruption of operations.
+
+    DISCLAIMER OF LIABILITY
+    NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
+    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
+
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+
+#include "linux_compat.h"       /* linux-2.6 tweaks */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kdev_t.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>        /* for mdelay */
+#include <linux/interrupt.h>    /* needed for in_interrupt() proto */
+#include <linux/reboot.h>       /* notifier code */
+#include <linux/sched.h>
+#include <linux/workqueue.h>
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+
+#include "mptbase.h"
+#include "mptscsih.h"
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+#define my_NAME         "Fusion MPT SPI Host driver"
+#define my_VERSION      MPT_LINUX_VERSION_COMMON
+#define MYNAM           "mptspi"
+
+MODULE_AUTHOR(MODULEAUTHOR);
+MODULE_DESCRIPTION(my_NAME);
+MODULE_LICENSE("GPL");
+
+/* Command line args */
+#ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
+static int mpt_dv = MPTSCSIH_DOMAIN_VALIDATION;
+module_param(mpt_dv, int, 0);
+MODULE_PARM_DESC(mpt_dv, " DV Algorithm: enhanced=1, basic=0 (default=MPTSCSIH_DOMAIN_VALIDATION=1)");
+
+static int mpt_width = MPTSCSIH_MAX_WIDTH;
+module_param(mpt_width, int, 0);
+MODULE_PARM_DESC(mpt_width, " Max Bus Width: wide=1, narrow=0 (default=MPTSCSIH_MAX_WIDTH=1)");
+
+static ushort mpt_factor = MPTSCSIH_MIN_SYNC;
+module_param(mpt_factor, ushort, 0);
+MODULE_PARM_DESC(mpt_factor, " Min Sync Factor (default=MPTSCSIH_MIN_SYNC=0x08)");
+#endif
+
+static int mpt_saf_te = MPTSCSIH_SAF_TE;
+module_param(mpt_saf_te, int, 0);
+MODULE_PARM_DESC(mpt_saf_te, " Force enabling SEP Processor: enable=1  (default=MPTSCSIH_SAF_TE=0)");
+
+static int mpt_pq_filter = 0;
+module_param(mpt_pq_filter, int, 0);
+MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1  (default=0)");
+
+static int      mptspiDoneCtx = -1;
+static int      mptspiTaskCtx = -1;
+static int      mptspiInternalCtx = -1; /* Used only for internal commands */
+
+static struct device_attribute mptspi_queue_depth_attr = {
+        .attr = {
+                .name =         "queue_depth",
+                .mode =         S_IWUSR,
+        },
+        .store = mptscsih_store_queue_depth,
+};
+
+static struct device_attribute *mptspi_dev_attrs[] = {
+        &mptspi_queue_depth_attr,
+        NULL,
+};
+
+static struct scsi_host_template mptspi_driver_template = {
+        .proc_name                      = "mptspi",
+        .proc_info                      = mptscsih_proc_info,
+        .name                           = "MPT SPI Host",
+        .info                           = mptscsih_info,
+        .queuecommand                   = mptscsih_qcmd,
+        .slave_alloc                    = mptscsih_slave_alloc,
+        .slave_configure                = mptscsih_slave_configure,
+        .slave_destroy                  = mptscsih_slave_destroy,
+        .eh_abort_handler               = mptscsih_abort,
+        .eh_device_reset_handler        = mptscsih_dev_reset,
+        .eh_bus_reset_handler           = mptscsih_bus_reset,
+        .eh_host_reset_handler          = mptscsih_host_reset,
+        .bios_param                     = mptscsih_bios_param,
+        .can_queue                      = MPT_SCSI_CAN_QUEUE,
+        .this_id                        = -1,
+        .sg_tablesize                   = MPT_SCSI_SG_DEPTH,
+        .max_sectors                    = 8192,
+        .cmd_per_lun                    = 7,
+        .use_clustering                 = ENABLE_CLUSTERING,
+        .sdev_attrs                     = mptspi_dev_attrs,
+};
+
+
+/****************************************************************************
+ * Supported hardware
+ */
+
+static struct pci_device_id mptspi_pci_table[] = {
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1030,
+                PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_1030_53C1035,
+                PCI_ANY_ID, PCI_ANY_ID },
+        {0}     /* Terminating entry */
+};
+MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*
+ *      mptspi_probe - Installs scsi devices per bus.
+ *      @pdev: Pointer to pci_dev structure
+ *
+ *      Returns 0 for success, non-zero for failure.
+ *
+ */
+static int
+mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        struct Scsi_Host        *sh;
+        MPT_SCSI_HOST           *hd;
+        MPT_ADAPTER             *ioc;
+        unsigned long            flags;
+        int                      sz, ii;
+        int                      numSGE = 0;
+        int                      scale;
+        int                      ioc_cap;
+        u8                      *mem;
+        int                     error=0;
+        int                     r;
+        
+        if ((r = mpt_attach(pdev,id)) != 0)
+                return r;
+        
+        ioc = pci_get_drvdata(pdev);
+        ioc->DoneCtx = mptspiDoneCtx;
+        ioc->TaskCtx = mptspiTaskCtx;
+        ioc->InternalCtx = mptspiInternalCtx;
+        
+        /*  Added sanity check on readiness of the MPT adapter.
+         */
+        if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
+                printk(MYIOC_s_WARN_FMT
+                  "Skipping because it's not operational!\n",
+                  ioc->name);
+                return -ENODEV;
+        }
+
+        if (!ioc->active) {
+                printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",
+                  ioc->name);
+                return -ENODEV;
+        }
+
+        /*  Sanity check - ensure at least 1 port is INITIATOR capable
+         */
+        ioc_cap = 0;
+        for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
+                if (ioc->pfacts[ii].ProtocolFlags &
+                    MPI_PORTFACTS_PROTOCOL_INITIATOR)
+                        ioc_cap ++;
+        }
+
+        if (!ioc_cap) {
+                printk(MYIOC_s_WARN_FMT
+                        "Skipping ioc=%p because SCSI Initiator mode is NOT enabled!\n",
+                        ioc->name, ioc);
+                return -ENODEV;
+        }
+
+        sh = scsi_host_alloc(&mptspi_driver_template, sizeof(MPT_SCSI_HOST));
+
+        if (!sh) {
+                printk(MYIOC_s_WARN_FMT
+                        "Unable to register controller with SCSI subsystem\n",
+                        ioc->name);
+                return -1;
+        }
+
+        spin_lock_irqsave(&ioc->FreeQlock, flags);
+
+        /* Attach the SCSI Host to the IOC structure
+         */
+        ioc->sh = sh;
+
+        sh->io_port = 0;
+        sh->n_io_port = 0;
+        sh->irq = 0;
+
+        /* set 16 byte cdb's */
+        sh->max_cmd_len = 16;
+
+        /* Yikes!  This is important!
+         * Otherwise, by default, linux
+         * only scans target IDs 0-7!
+         * pfactsN->MaxDevices unreliable
+         * (not supported in early
+         *      versions of the FW).
+         * max_id = 1 + actual max id,
+         * max_lun = 1 + actual last lun,
+         *      see hosts.h :o(
+         */
+        sh->max_id = MPT_MAX_SCSI_DEVICES;
+
+        sh->max_lun = MPT_LAST_LUN + 1;
+        sh->max_channel = 0;
+        sh->this_id = ioc->pfacts[0].PortSCSIID;
+
+        /* Required entry.
+         */
+        sh->unique_id = ioc->id;
+
+        /* Verify that we won't exceed the maximum
+         * number of chain buffers
+         * We can optimize:  ZZ = req_sz/sizeof(SGE)
+         * For 32bit SGE's:
+         *  numSGE = 1 + (ZZ-1)*(maxChain -1) + ZZ
+         *               + (req_sz - 64)/sizeof(SGE)
+         * A slightly different algorithm is required for
+         * 64bit SGEs.
+         */
+        scale = ioc->req_sz/(sizeof(dma_addr_t) + sizeof(u32));
+        if (sizeof(dma_addr_t) == sizeof(u64)) {
+                numSGE = (scale - 1) *
+                  (ioc->facts.MaxChainDepth-1) + scale +
+                  (ioc->req_sz - 60) / (sizeof(dma_addr_t) +
+                  sizeof(u32));
+        } else {
+                numSGE = 1 + (scale - 1) *
+                  (ioc->facts.MaxChainDepth-1) + scale +
+                  (ioc->req_sz - 64) / (sizeof(dma_addr_t) +
+                  sizeof(u32));
+        }
+
+        if (numSGE < sh->sg_tablesize) {
+                /* Reset this value */
+                dprintk((MYIOC_s_INFO_FMT
+                  "Resetting sg_tablesize to %d from %d\n",
+                  ioc->name, numSGE, sh->sg_tablesize));
+                sh->sg_tablesize = numSGE;
+        }
+
+        /* Set the pci device pointer in Scsi_Host structure.
+         */
+        scsi_set_device(sh, &ioc->pcidev->dev);
+
+        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
+
+        hd = (MPT_SCSI_HOST *) sh->hostdata;
+        hd->ioc = ioc;
+
+        /* SCSI needs scsi_cmnd lookup table!
+         * (with size equal to req_depth*PtrSz!)
+         */
+        sz = ioc->req_depth * sizeof(void *);
+        mem = kmalloc(sz, GFP_ATOMIC);
+        if (mem == NULL) {
+                error = -ENOMEM;
+                goto mptspi_probe_failed;
+        }
+
+        memset(mem, 0, sz);
+        hd->ScsiLookup = (struct scsi_cmnd **) mem;
+
+        dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p, sz=%d\n",
+                 ioc->name, hd->ScsiLookup, sz));
+
+        /* Allocate memory for the device structures.
+         * A non-Null pointer at an offset
+         * indicates a device exists.
+         * max_id = 1 + maximum id (hosts.h)
+         */
+        sz = sh->max_id * sizeof(void *);
+        mem = kmalloc(sz, GFP_ATOMIC);
+        if (mem == NULL) {
+                error = -ENOMEM;
+                goto mptspi_probe_failed;
+        }
+
+        memset(mem, 0, sz);
+        hd->Targets = (VirtDevice **) mem;
+
+        dprintk((KERN_INFO
+          "  Targets @ %p, sz=%d\n", hd->Targets, sz));
+
+        /* Clear the TM flags
+         */
+        hd->tmPending = 0;
+        hd->tmState = TM_STATE_NONE;
+        hd->resetPending = 0;
+        hd->abortSCpnt = NULL;
+
+        /* Clear the pointer used to store
+         * single-threaded commands, i.e., those
+         * issued during a bus scan, dv and
+         * configuration pages.
+         */
+        hd->cmdPtr = NULL;
+
+        /* Initialize this SCSI Hosts' timers
+         * To use, set the timer expires field
+         * and add_timer
+         */
+        init_timer(&hd->timer);
+        hd->timer.data = (unsigned long) hd;
+        hd->timer.function = mptscsih_timer_expired;
+
+        ioc->spi_data.Saf_Te = mpt_saf_te;
+        hd->mpt_pq_filter = mpt_pq_filter;
+
+#ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
+        if (ioc->spi_data.maxBusWidth > mpt_width)
+                ioc->spi_data.maxBusWidth = mpt_width;
+        if (ioc->spi_data.minSyncFactor < mpt_factor)
+                ioc->spi_data.minSyncFactor = mpt_factor;
+        if (ioc->spi_data.minSyncFactor == MPT_ASYNC) {
+                ioc->spi_data.maxSyncOffset = 0;
+        }
+        ioc->spi_data.mpt_dv = mpt_dv;
+        hd->negoNvram = 0;
+
+        ddvprintk((MYIOC_s_INFO_FMT
+                "dv %x width %x factor %x saf_te %x mpt_pq_filter %x\n",
+                ioc->name,
+                mpt_dv,
+                mpt_width,
+                mpt_factor,
+                mpt_saf_te,
+                mpt_pq_filter));
+#else
+        hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
+        ddvprintk((MYIOC_s_INFO_FMT
+                "saf_te %x mpt_pq_filter %x\n",
+                ioc->name,
+                mpt_saf_te,
+                mpt_pq_filter));
+#endif
+
+        ioc->spi_data.forceDv = 0;
+        ioc->spi_data.noQas = 0;
+
+        for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
+                ioc->spi_data.dvStatus[ii] =
+                  MPT_SCSICFG_NEGOTIATE;
+
+        for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
+                ioc->spi_data.dvStatus[ii] |=
+                  MPT_SCSICFG_DV_NOT_DONE;
+
+        init_waitqueue_head(&hd->scandv_waitq);
+        hd->scandv_wait_done = 0;
+        hd->last_queue_full = 0;
+
+        error = scsi_add_host (sh, &ioc->pcidev->dev);
+        if(error) {
+                dprintk((KERN_ERR MYNAM
+                  "scsi_add_host failed\n"));
+                goto mptspi_probe_failed;
+        }
+
+        scsi_scan_host(sh);
+        return 0;
+
+mptspi_probe_failed:
+
+        mptscsih_remove(pdev);
+        return error;
+}
+
+static struct pci_driver mptspi_driver = {
+        .name           = "mptspi",
+        .id_table       = mptspi_pci_table,
+        .probe          = mptspi_probe,
+        .remove         = __devexit_p(mptscsih_remove),
+        .driver         = {
+                .shutdown = mptscsih_shutdown,
+        },
+#ifdef CONFIG_PM
+        .suspend        = mptscsih_suspend,
+        .resume         = mptscsih_resume,
+#endif
+};
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/**
+ *      mptspi_init - Register MPT adapter(s) as SCSI host(s) with
+ *      linux scsi mid-layer.
+ *
+ *      Returns 0 for success, non-zero for failure.
+ */
+static int __init
+mptspi_init(void)
+{
+
+        show_mptmod_ver(my_NAME, my_VERSION);
+
+        mptspiDoneCtx = mpt_register(mptscsih_io_done, MPTSPI_DRIVER);
+        mptspiTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTSPI_DRIVER);
+        mptspiInternalCtx = mpt_register(mptscsih_scandv_complete, MPTSPI_DRIVER);
+
+        if (mpt_event_register(mptspiDoneCtx, mptscsih_event_process) == 0) {
+                devtprintk((KERN_INFO MYNAM
+                  ": Registered for IOC event notifications\n"));
+        }
+
+        if (mpt_reset_register(mptspiDoneCtx, mptscsih_ioc_reset) == 0) {
+                dprintk((KERN_INFO MYNAM
+                  ": Registered for IOC reset notifications\n"));
+        }
+
+        return pci_register_driver(&mptspi_driver);
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/**
+ *      mptspi_exit - Unregisters MPT adapter(s)
+ *
+ */
+static void __exit
+mptspi_exit(void)
+{
+        pci_unregister_driver(&mptspi_driver);
+        
+        mpt_reset_deregister(mptspiDoneCtx);
+        dprintk((KERN_INFO MYNAM
+          ": Deregistered for IOC reset notifications\n"));
+
+        mpt_event_deregister(mptspiDoneCtx);
+        dprintk((KERN_INFO MYNAM
+          ": Deregistered for IOC event notifications\n"));
+
+        mpt_deregister(mptspiInternalCtx);
+        mpt_deregister(mptspiTaskCtx);
+        mpt_deregister(mptspiDoneCtx);
+}
+
+module_init(mptspi_init);
+module_exit(mptspi_exit);
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 7b74c87b569e..4830b7759061 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -573,6 +573,7 @@ static int i2o_block_reply(struct i2o_controller *c, u32 m,
 static void i2o_block_event(struct i2o_event *evt)
 {
         osm_info("block-osm: event received\n");
+        kfree(evt);
 };
 
 /*
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c
index 245b0058381d..07a085ccbd5b 100644
--- a/drivers/misc/ibmasm/command.c
+++ b/drivers/misc/ibmasm/command.c
@@ -23,6 +23,7 @@
  */
 
 #include "ibmasm.h"
+#include "lowlevel.h"
 
 static void exec_next_command(struct service_processor *sp);
 static void free_command(struct kobject *kobj);
@@ -31,8 +32,9 @@ static struct kobj_type ibmasm_cmd_kobj_type = {
         .release = free_command,
 };
 
+static atomic_t command_count = ATOMIC_INIT(0);
 
-struct command *ibmasm_new_command(size_t buffer_size)
+struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_size)
 {
         struct command *cmd;
 
@@ -55,11 +57,15 @@ struct command *ibmasm_new_command(size_t buffer_size)
 
         kobject_init(&cmd->kobj);
         cmd->kobj.ktype = &ibmasm_cmd_kobj_type;
+        cmd->lock = &sp->lock;
 
         cmd->status = IBMASM_CMD_PENDING;
         init_waitqueue_head(&cmd->wait);
         INIT_LIST_HEAD(&cmd->queue_node);
 
+        atomic_inc(&command_count);
+        dbg("command count: %d\n", atomic_read(&command_count));
+
         return cmd;
 }
 
@@ -68,6 +74,8 @@ static void free_command(struct kobject *kobj)
         struct command *cmd = to_command(kobj);
  
         list_del(&cmd->queue_node);
+        atomic_dec(&command_count);
+        dbg("command count: %d\n", atomic_read(&command_count));
         kfree(cmd->buffer);
         kfree(cmd);
 }
@@ -94,8 +102,14 @@ static struct command *dequeue_command(struct service_processor *sp)
 
 static inline void do_exec_command(struct service_processor *sp)
 {
+        char tsbuf[32];
+
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+
         if (ibmasm_send_i2o_message(sp)) {
                 sp->current_command->status = IBMASM_CMD_FAILED;
+                wake_up(&sp->current_command->wait);
+                command_put(sp->current_command);
                 exec_next_command(sp);
         }
 }
@@ -111,14 +125,16 @@ static inline void do_exec_command(struct service_processor *sp)
 void ibmasm_exec_command(struct service_processor *sp, struct command *cmd)
 {
         unsigned long flags;
+        char tsbuf[32];
+
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
 
         spin_lock_irqsave(&sp->lock, flags);
 
         if (!sp->current_command) {
-                command_get(cmd);
                 sp->current_command = cmd;
+                command_get(sp->current_command);
                 spin_unlock_irqrestore(&sp->lock, flags);
-
                 do_exec_command(sp);
         } else {
                 enqueue_command(sp, cmd);
@@ -129,9 +145,9 @@ void ibmasm_exec_command(struct service_processor *sp, struct command *cmd)
 static void exec_next_command(struct service_processor *sp)
 {
         unsigned long flags;
+        char tsbuf[32];
 
-        wake_up(&sp->current_command->wait);
-        command_put(sp->current_command);
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
 
         spin_lock_irqsave(&sp->lock, flags);
         sp->current_command = dequeue_command(sp);
@@ -169,7 +185,9 @@ void ibmasm_receive_command_response(struct service_processor *sp, void *respons
         if (!sp->current_command) 
                 return; 
 
-        memcpy(cmd->buffer, response, min(size, cmd->buffer_size));
+        memcpy_fromio(cmd->buffer, response, min(size, cmd->buffer_size));
         cmd->status = IBMASM_CMD_COMPLETE;
+        wake_up(&sp->current_command->wait);
+        command_put(sp->current_command);
         exec_next_command(sp);
 }
diff --git a/drivers/misc/ibmasm/dot_command.c b/drivers/misc/ibmasm/dot_command.c
index 478a8d898fc1..13c52f866e2e 100644
--- a/drivers/misc/ibmasm/dot_command.c
+++ b/drivers/misc/ibmasm/dot_command.c
@@ -33,7 +33,13 @@ void ibmasm_receive_message(struct service_processor *sp, void *message, int mes
         u32 size;
         struct dot_command_header *header = (struct dot_command_header *)message;
 
+        if (message_size == 0)
+                return;
+
         size = get_dot_command_size(message);
+        if (size == 0)
+                return;
+
         if (size > message_size)
                 size = message_size;
 
@@ -67,7 +73,7 @@ int ibmasm_send_driver_vpd(struct service_processor *sp)
         u8 *vpd_data;
         int result = 0;
 
-        command = ibmasm_new_command(INIT_BUFFER_SIZE);
+        command = ibmasm_new_command(sp, INIT_BUFFER_SIZE);
         if (command == NULL)
                 return -ENOMEM;
 
@@ -121,7 +127,7 @@ int ibmasm_send_os_state(struct service_processor *sp, int os_state)
         struct os_state_command *os_state_cmd;
         int result = 0;
 
-        cmd = ibmasm_new_command(sizeof(struct os_state_command));
+        cmd = ibmasm_new_command(sp, sizeof(struct os_state_command));
         if (cmd == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index e100f34f1587..fe1e819235a4 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -23,6 +23,7 @@
  */
 
 #include "ibmasm.h"
+#include "lowlevel.h"
 
 /*
  * ASM service processor event handling routines.
@@ -34,7 +35,6 @@
  * circular buffer.
  */
 
-
 static void wake_up_event_readers(struct service_processor *sp)
 {
         struct event_reader *reader;
@@ -63,7 +63,7 @@ void ibmasm_receive_event(struct service_processor *sp, void *data, unsigned int
         spin_lock_irqsave(&sp->lock, flags);
         /* copy the event into the next slot in the circular buffer */
         event = &buffer->events[buffer->next_index];
-        memcpy(event->data, data, data_size);
+        memcpy_fromio(event->data, data, data_size);
         event->data_size = data_size;
         event->serial_number = buffer->next_serial_number;
 
@@ -93,7 +93,10 @@ int ibmasm_get_next_event(struct service_processor *sp, struct event_reader *rea
         unsigned int index;
         unsigned long flags;
 
-        if (wait_event_interruptible(reader->wait, event_available(buffer, reader)))
+        reader->cancelled = 0;
+
+        if (wait_event_interruptible(reader->wait,
+                        event_available(buffer, reader) || reader->cancelled))
                 return -ERESTARTSYS;
 
         if (!event_available(buffer, reader))
@@ -116,6 +119,12 @@ int ibmasm_get_next_event(struct service_processor *sp, struct event_reader *rea
         return event->data_size;
 }
 
+void ibmasm_cancel_next_event(struct event_reader *reader)
+{
+        reader->cancelled = 1;
+        wake_up_interruptible(&reader->wait);
+}
+
 void ibmasm_event_reader_register(struct service_processor *sp, struct event_reader *reader)
 {
         unsigned long flags;
@@ -131,8 +140,6 @@ void ibmasm_event_reader_unregister(struct service_processor *sp, struct event_r
 {
         unsigned long flags;
 
-        wake_up_interruptible(&reader->wait);
-
         spin_lock_irqsave(&sp->lock, flags);
         list_del(&reader->node);
         spin_unlock_irqrestore(&sp->lock, flags);
@@ -164,6 +171,5 @@ int ibmasm_event_buffer_init(struct service_processor *sp)
 
 void ibmasm_event_buffer_exit(struct service_processor *sp)
 {
-        wake_up_event_readers(sp);
         kfree(sp->event_buffer);
 }
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index ce09309174d6..f295401fac21 100644
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -25,6 +25,7 @@
 #include <linux/notifier.h>
 #include "ibmasm.h"
 #include "dot_command.h"
+#include "lowlevel.h"
 
 static int suspend_heartbeats = 0;
 
@@ -62,7 +63,7 @@ void ibmasm_unregister_panic_notifier(void)
 
 int ibmasm_heartbeat_init(struct service_processor *sp)
 {
-        sp->heartbeat = ibmasm_new_command(HEARTBEAT_BUFFER_SIZE);
+        sp->heartbeat = ibmasm_new_command(sp, HEARTBEAT_BUFFER_SIZE);
         if (sp->heartbeat == NULL)
                 return -ENOMEM;
 
@@ -71,6 +72,12 @@ int ibmasm_heartbeat_init(struct service_processor *sp)
 
 void ibmasm_heartbeat_exit(struct service_processor *sp)
 {
+        char tsbuf[32];
+
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        ibmasm_wait_for_response(sp->heartbeat, IBMASM_CMD_TIMEOUT_NORMAL);
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
+        suspend_heartbeats = 1;
         command_put(sp->heartbeat);
 }
 
@@ -78,14 +85,16 @@ void ibmasm_receive_heartbeat(struct service_processor *sp,  void *message, size
 {
         struct command *cmd = sp->heartbeat;
         struct dot_command_header *header = (struct dot_command_header *)cmd->buffer;
+        char tsbuf[32];
 
+        dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf));
         if (suspend_heartbeats)
                 return;
 
         /* return the received dot command to sender */
         cmd->status = IBMASM_CMD_PENDING;
         size = min(size, cmd->buffer_size);
-        memcpy(cmd->buffer, message, size);
+        memcpy_fromio(cmd->buffer, message, size);
         header->type = sp_write;
         ibmasm_exec_command(sp, cmd);
 }
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 6fec7fd8cd1a..ecce4ffd3e23 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -34,16 +34,31 @@
 #include <linux/version.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/input.h>
 
 /* Driver identification */
 #define DRIVER_NAME     "ibmasm"
-#define DRIVER_VERSION  "0.4"
-#define DRIVER_AUTHOR   "Max Asbock"
+#define DRIVER_VERSION  "1.0"
+#define DRIVER_AUTHOR   "Max Asbock <masbock@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>"
 #define DRIVER_DESC     "IBM ASM Service Processor Driver"
 
 #define err(msg) printk(KERN_ERR "%s: " msg "\n", DRIVER_NAME)
 #define info(msg) printk(KERN_INFO "%s: " msg "\n", DRIVER_NAME)
 
+extern int ibmasm_debug;
+#define dbg(STR, ARGS...)                                       \
+        do {                                                    \
+                if (ibmasm_debug)                               \
+                        printk(KERN_DEBUG STR , ##ARGS);        \
+        } while (0)
+
+static inline char *get_timestamp(char *buf)
+{
+        struct timeval now;
+        do_gettimeofday(&now);
+        sprintf(buf, "%lu.%lu", now.tv_sec, now.tv_usec);
+        return buf;
+}
 
 #define IBMASM_CMD_PENDING      0       
 #define IBMASM_CMD_COMPLETE     1       
@@ -52,7 +67,7 @@
 #define IBMASM_CMD_TIMEOUT_NORMAL       45
 #define IBMASM_CMD_TIMEOUT_EXTRA        240
 
-#define IBMASM_CMD_MAX_BUFFER_SIZE      0x4000
+#define IBMASM_CMD_MAX_BUFFER_SIZE      0x8000
 
 #define REVERSE_HEARTBEAT_TIMEOUT       120
 
@@ -80,12 +95,17 @@ struct command {
         size_t                  buffer_size;
         int                     status;
         struct kobject          kobj;
+        spinlock_t              *lock;
 };
 #define to_command(c) container_of(c, struct command, kobj)
 
 static inline void command_put(struct command *cmd)
 {
+        unsigned long flags;
+
+        spin_lock_irqsave(cmd->lock, flags);
         kobject_put(&cmd->kobj);
+        spin_unlock_irqrestore(cmd->lock, flags);
 }
 
 static inline void command_get(struct command *cmd)
@@ -108,6 +128,7 @@ struct event_buffer {
 };
 
 struct event_reader {
+        int                     cancelled;
         unsigned int            next_serial_number;
         wait_queue_head_t       wait;
         struct list_head        node;
@@ -120,41 +141,11 @@ struct reverse_heartbeat {
         unsigned int            stopped;
 };
 
-
-/* remote console events */
-struct mouse_event {
-        long            x;
-        long            y;
-        unsigned char   buttons;
-        unsigned char   transitions;
-};
-
-struct keyboard_event {
-        unsigned long   key_code;
-        unsigned char   key_down;
+struct ibmasm_remote {
+        struct input_dev keybd_dev;
+        struct input_dev mouse_dev;
 };
 
-struct remote_event {
-        unsigned long   type;
-        union {
-                struct mouse_event      mouse;
-                struct keyboard_event   keyboard;
-        } data;
-};
-
-#define DRIVER_REMOTE_QUEUE_SIZE 240
-
-struct remote_queue {
-        struct remote_event     *start;
-        struct remote_event     *end;
-        struct remote_event     *reader;
-        struct remote_event     *writer;
-        unsigned int            size;
-        int                     open;
-        wait_queue_head_t       wait;
-};
-
-
 struct service_processor {
         struct list_head        node;
         spinlock_t              lock;
@@ -167,13 +158,13 @@ struct service_processor {
         char                    dirname[IBMASM_NAME_SIZE];
         char                    devname[IBMASM_NAME_SIZE];
         unsigned int            number;
-        struct remote_queue     remote_queue;
+        struct ibmasm_remote    *remote;
         int                     serial_line;
         struct device           *dev;
 };
 
 /* command processing */
-extern struct command *ibmasm_new_command(size_t buffer_size);
+extern struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_size);
 extern void ibmasm_exec_command(struct service_processor *sp, struct command *cmd);
 extern void ibmasm_wait_for_response(struct command *cmd, int timeout);
 extern void ibmasm_receive_command_response(struct service_processor *sp, void *response,  size_t size);
@@ -185,6 +176,7 @@ extern void ibmasm_receive_event(struct service_processor *sp, void *data,  unsi
 extern void ibmasm_event_reader_register(struct service_processor *sp, struct event_reader *reader);
 extern void ibmasm_event_reader_unregister(struct service_processor *sp, struct event_reader *reader);
 extern int ibmasm_get_next_event(struct service_processor *sp, struct event_reader *reader);
+extern void ibmasm_cancel_next_event(struct event_reader *reader);
 
 /* heartbeat - from SP to OS */
 extern void ibmasm_register_panic_notifier(void);
@@ -208,11 +200,9 @@ extern int ibmasm_send_i2o_message(struct service_processor *sp);
 extern irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *regs);
 
 /* remote console */
-extern void ibmasm_handle_mouse_interrupt(struct service_processor *sp);
-extern int ibmasm_init_remote_queue(struct service_processor *sp);
-extern void ibmasm_free_remote_queue(struct service_processor *sp);
-extern void ibmasm_advance_reader(struct remote_queue *q, unsigned int n);
-extern size_t ibmasm_events_available(struct remote_queue *q);
+extern void ibmasm_handle_mouse_interrupt(struct service_processor *sp, struct pt_regs *regs);
+extern int ibmasm_init_remote_input_dev(struct service_processor *sp);
+extern void ibmasm_free_remote_input_dev(struct service_processor *sp);
 
 /* file system */
 extern int ibmasmfs_register(void);
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 866e867e68f2..5c550fcac2c4 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -37,9 +37,7 @@
  *    |   |-- event
  *    |   |-- reverse_heartbeat
  *    |   `-- remote_video
- *    |       |-- connected
  *    |       |-- depth
- *    |       |-- events
  *    |       |-- height
  *    |       `-- width
  *    .
@@ -50,9 +48,7 @@
  *        |-- event
  *        |-- reverse_heartbeat
  *        `-- remote_video
- *            |-- connected
  *            |-- depth
- *            |-- events
  *            |-- height
  *            `-- width
  *
@@ -75,14 +71,6 @@
  * remote_video/width: control remote display settings
  *      write: set value
  *      read: read value
- *
- * remote_video/connected
- *      read: return "1" if web browser VNC java applet is connected, 
- *              "0" otherwise
- *
- * remote_video/events
- *      read: sleep until a remote mouse or keyboard event occurs, then return
- *              then event.
  */
 
 #include <linux/fs.h>
@@ -333,7 +321,7 @@ static ssize_t command_file_write(struct file *file, const char __user *ubuff, s
         if (command_data->command)
                 return -EAGAIN;
 
-        cmd = ibmasm_new_command(count);
+        cmd = ibmasm_new_command(command_data->sp, count);
         if (!cmd)
                 return -ENOMEM;
 
@@ -374,6 +362,7 @@ static int event_file_open(struct inode *inode, struct file *file)
         ibmasm_event_reader_register(sp, &event_data->reader);
 
         event_data->sp = sp;
+        event_data->active = 0;
         file->private_data = event_data;
         return 0;
 }
@@ -391,7 +380,9 @@ static ssize_t event_file_read(struct file *file, char __user *buf, size_t count
 {
         struct ibmasmfs_event_data *event_data = file->private_data;
         struct event_reader *reader = &event_data->reader;
+        struct service_processor *sp = event_data->sp;
         int ret;
+        unsigned long flags;
 
         if (*offset < 0)
                 return -EINVAL;
@@ -400,17 +391,32 @@ static ssize_t event_file_read(struct file *file, char __user *buf, size_t count
         if (*offset != 0)
                 return 0;
 
-        ret = ibmasm_get_next_event(event_data->sp, reader);
+        spin_lock_irqsave(&sp->lock, flags);
+        if (event_data->active) {
+                spin_unlock_irqrestore(&sp->lock, flags);
+                return -EBUSY;
+        }
+        event_data->active = 1;
+        spin_unlock_irqrestore(&sp->lock, flags);
+
+        ret = ibmasm_get_next_event(sp, reader);
         if (ret <= 0)
-                return ret;
+                goto out;
 
-        if (count < reader->data_size)
-                return -EINVAL;
+        if (count < reader->data_size) {
+                ret = -EINVAL;
+                goto out;
+        }
 
-        if (copy_to_user(buf, reader->data, reader->data_size))
-                return -EFAULT;
+        if (copy_to_user(buf, reader->data, reader->data_size)) {
+                ret = -EFAULT;
+                goto out;
+        }
+        ret = reader->data_size;
 
-        return reader->data_size;
+out:
+        event_data->active = 0;
+        return ret;
 }
 
 static ssize_t event_file_write(struct file *file, const char __user *buf, size_t count, loff_t *offset)
@@ -424,7 +430,7 @@ static ssize_t event_file_write(struct file *file, const char __user *buf, size_
         if (*offset != 0)
                 return 0;
 
-        wake_up_interruptible(&event_data->reader.wait);
+        ibmasm_cancel_next_event(&event_data->reader);
         return 0;
 }
 
@@ -575,75 +581,6 @@ static ssize_t remote_settings_file_write(struct file *file, const char __user *
         return count;
 }
 
-static int remote_event_file_open(struct inode *inode, struct file *file)
-{
-        struct service_processor *sp;
-        unsigned long flags;
-        struct remote_queue *q;
-        
-        file->private_data = inode->u.generic_ip;
-        sp = file->private_data;
-        q = &sp->remote_queue;
-
-        /* allow only one event reader */
-        spin_lock_irqsave(&sp->lock, flags);
-        if (q->open) {
-                spin_unlock_irqrestore(&sp->lock, flags);
-                return -EBUSY;
-        }
-        q->open = 1;
-        spin_unlock_irqrestore(&sp->lock, flags);
-
-        enable_mouse_interrupts(sp);
-        
-        return 0;
-}
-
-static int remote_event_file_close(struct inode *inode, struct file *file)
-{
-        struct service_processor *sp = file->private_data;
-
-        disable_mouse_interrupts(sp);
-        wake_up_interruptible(&sp->remote_queue.wait);
-        sp->remote_queue.open = 0;
-
-        return 0;
-}
-
-static ssize_t remote_event_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
-{
-        struct service_processor *sp = file->private_data;
-        struct remote_queue *q = &sp->remote_queue;
-        size_t data_size;
-        struct remote_event *reader = q->reader;
-        size_t num_events;
-
-        if (*offset < 0)
-                return -EINVAL;
-        if (count == 0 || count > 1024)
-                return 0;
-        if (*offset != 0)
-                return 0;
-
-        if (wait_event_interruptible(q->wait, q->reader != q->writer))
-                return -ERESTARTSYS;
-
-        /* only get multiples of struct remote_event */
-        num_events = min((count/sizeof(struct remote_event)), ibmasm_events_available(q));
-        if (!num_events)
-                return 0;
-
-        data_size = num_events * sizeof(struct remote_event);
-
-        if (copy_to_user(buf, reader, data_size))
-                return -EFAULT;
-
-        ibmasm_advance_reader(q, num_events);
-
-        return data_size;
-}
-
-
 static struct file_operations command_fops = {
         .open =         command_file_open,
         .release =      command_file_close,
@@ -672,12 +609,6 @@ static struct file_operations remote_settings_fops = {
         .write =        remote_settings_file_write,
 };
 
-static struct file_operations remote_event_fops = {
-        .open =         remote_event_file_open,
-        .release =      remote_event_file_close,
-        .read =         remote_event_file_read,
-};
-
 
 static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
 {
@@ -703,7 +634,5 @@ static void ibmasmfs_create_files (struct super_block *sb, struct dentry *root)
                 ibmasmfs_create_file(sb, remote_dir, "width", &remote_settings_fops, (void *)display_width(sp), S_IRUSR|S_IWUSR);
                 ibmasmfs_create_file(sb, remote_dir, "height", &remote_settings_fops, (void *)display_height(sp), S_IRUSR|S_IWUSR);
                 ibmasmfs_create_file(sb, remote_dir, "depth", &remote_settings_fops, (void *)display_depth(sp), S_IRUSR|S_IWUSR);
-                ibmasmfs_create_file(sb, remote_dir, "connected", &remote_settings_fops, (void *)vnc_status(sp), S_IRUSR);
-                ibmasmfs_create_file(sb, remote_dir, "events", &remote_event_fops, (void *)sp, S_IRUSR);
         }
 }
diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c
index 5156de2759d8..47949a2c7e94 100644
--- a/drivers/misc/ibmasm/lowlevel.c
+++ b/drivers/misc/ibmasm/lowlevel.c
@@ -46,8 +46,8 @@ int ibmasm_send_i2o_message(struct service_processor *sp)
 
         message = get_i2o_message(sp->base_address, mfa);
 
-        memcpy(&message->header, &header, sizeof(struct i2o_header));
-        memcpy(&message->data, command->buffer, command_size);
+        memcpy_toio(&message->header, &header, sizeof(struct i2o_header));
+        memcpy_toio(&message->data, command->buffer, command_size);
 
         set_mfa_inbound(sp->base_address, mfa);
 
@@ -59,23 +59,27 @@ irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *reg
         u32     mfa;
         struct service_processor *sp = (struct service_processor *)dev_id;
         void __iomem *base_address = sp->base_address;
+        char tsbuf[32];
 
         if (!sp_interrupt_pending(base_address))
                 return IRQ_NONE;
 
+        dbg("respond to interrupt at %s\n", get_timestamp(tsbuf));
+
         if (mouse_interrupt_pending(sp)) {
-                ibmasm_handle_mouse_interrupt(sp);
-                mfa = get_mfa_outbound(base_address);
+                ibmasm_handle_mouse_interrupt(sp, regs);
                 clear_mouse_interrupt(sp);
-                set_mfa_outbound(base_address, mfa);
-                return IRQ_HANDLED;
         }
 
         mfa = get_mfa_outbound(base_address);
         if (valid_mfa(mfa)) {
                 struct i2o_message *msg = get_i2o_message(base_address, mfa);
                 ibmasm_receive_message(sp, &msg->data, incoming_data_size(msg));
-        }
+        } else
+                dbg("didn't get a valid MFA\n");
+
         set_mfa_outbound(base_address, mfa);
+        dbg("finished interrupt at   %s\n", get_timestamp(tsbuf));
+
         return IRQ_HANDLED;
 }
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 777432ae764a..1fdf03fd2da7 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -56,17 +56,26 @@
 #include "lowlevel.h"
 #include "remote.h"
 
+int ibmasm_debug = 0;
+module_param(ibmasm_debug, int , S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ibmasm_debug, " Set debug mode on or off");
+
 
 static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        int err, result = -ENOMEM;
+        int result;
         struct service_processor *sp;
 
-        if ((err = pci_enable_device(pdev))) {
-                printk(KERN_ERR "%s: can't enable PCI device at %s\n",
-                        DRIVER_NAME, pci_name(pdev));
-                return err;
+        if ((result = pci_enable_device(pdev))) {
+                dev_err(&pdev->dev, "Failed to enable PCI device\n");
+                return result;
         }
+        if ((result = pci_request_regions(pdev, DRIVER_NAME))) {
+                dev_err(&pdev->dev, "Failed to allocate PCI resources\n");
+                goto error_resources;
+        }
+        /* vnc client won't work without bus-mastering */
+        pci_set_master(pdev);
 
         sp = kmalloc(sizeof(struct service_processor), GFP_KERNEL);
         if (sp == NULL) {
@@ -76,6 +85,9 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
         }
         memset(sp, 0, sizeof(struct service_processor));
 
+        sp->lock = SPIN_LOCK_UNLOCKED;
+        INIT_LIST_HEAD(&sp->command_queue);
+
         pci_set_drvdata(pdev, (void *)sp);
         sp->dev = &pdev->dev;
         sp->number = pdev->bus->number;
@@ -101,15 +113,6 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
                 goto error_ioremap;
         }
 
-        result = ibmasm_init_remote_queue(sp);
-        if (result) {
-                dev_err(sp->dev, "Failed to initialize remote queue\n");
-                goto error_remote_queue;
-        }
-
-        spin_lock_init(&sp->lock);
-        INIT_LIST_HEAD(&sp->command_queue);
-
         result = request_irq(sp->irq, ibmasm_interrupt_handler, SA_SHIRQ, sp->devname, (void*)sp);
         if (result) {
                 dev_err(sp->dev, "Failed to register interrupt handler\n");
@@ -117,7 +120,12 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
         }
 
         enable_sp_interrupts(sp->base_address);
-        disable_mouse_interrupts(sp);
+
+        result = ibmasm_init_remote_input_dev(sp);
+        if (result) {
+                dev_err(sp->dev, "Failed to initialize remote queue\n");
+                goto error_send_message;
+        }
 
         result = ibmasm_send_driver_vpd(sp);
         if (result) {
@@ -133,30 +141,25 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
 
         ibmasm_register_uart(sp);
 
-        dev_printk(KERN_DEBUG, &pdev->dev, "WARNING: This software may not be supported or function\n");
-        dev_printk(KERN_DEBUG, &pdev->dev, "correctly on your IBM server. Please consult the IBM\n");
-        dev_printk(KERN_DEBUG, &pdev->dev, "ServerProven website\n");
-        dev_printk(KERN_DEBUG, &pdev->dev, "http://www.pc.ibm.com/ww/eserver/xseries/serverproven\n");
-        dev_printk(KERN_DEBUG, &pdev->dev, "for information on the specific driver level and support\n");
-        dev_printk(KERN_DEBUG, &pdev->dev, "statement for your IBM server.\n");
-
         return 0;
 
 error_send_message:
         disable_sp_interrupts(sp->base_address);
+        ibmasm_free_remote_input_dev(sp);
         free_irq(sp->irq, (void *)sp);
 error_request_irq:
-        ibmasm_free_remote_queue(sp);
-error_remote_queue:
         iounmap(sp->base_address);
 error_ioremap:
         ibmasm_heartbeat_exit(sp);
 error_heartbeat:
         ibmasm_event_buffer_exit(sp);
 error_eventbuffer:
+        pci_set_drvdata(pdev, NULL);
         kfree(sp);
 error_kmalloc:
-        pci_disable_device(pdev);
+        pci_release_regions(pdev);
+error_resources:
+        pci_disable_device(pdev);
 
         return result;
 }
@@ -165,16 +168,24 @@ static void __devexit ibmasm_remove_one(struct pci_dev *pdev)
 {
         struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev);
 
+        dbg("Unregistering UART\n");
         ibmasm_unregister_uart(sp);
-        ibmasm_send_os_state(sp, SYSTEM_STATE_OS_DOWN);
+        dbg("Sending OS down message\n");
+        if (ibmasm_send_os_state(sp, SYSTEM_STATE_OS_DOWN))
+                err("failed to get repsonse to 'Send OS State' command\n");
+        dbg("Disabling heartbeats\n");
+        ibmasm_heartbeat_exit(sp);
+        dbg("Disabling interrupts\n");
         disable_sp_interrupts(sp->base_address);
-        disable_mouse_interrupts(sp);
+        dbg("Freeing SP irq\n");
         free_irq(sp->irq, (void *)sp);
-        ibmasm_heartbeat_exit(sp);
-        ibmasm_free_remote_queue(sp);
+        dbg("Cleaning up\n");
+        ibmasm_free_remote_input_dev(sp);
         iounmap(sp->base_address);
         ibmasm_event_buffer_exit(sp);
+        pci_set_drvdata(pdev, NULL);
         kfree(sp);
+        pci_release_regions(pdev);
         pci_disable_device(pdev);
 }
 
diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c
index 93d9c1b2ad6f..f8fdb2d5417e 100644
--- a/drivers/misc/ibmasm/r_heartbeat.c
+++ b/drivers/misc/ibmasm/r_heartbeat.c
@@ -63,7 +63,7 @@ int ibmasm_start_reverse_heartbeat(struct service_processor *sp, struct reverse_
         int times_failed = 0;
         int result = 1;
 
-        cmd = ibmasm_new_command(sizeof rhb_dot_cmd);
+        cmd = ibmasm_new_command(sp, sizeof rhb_dot_cmd);
         if (!cmd)
                 return -ENOMEM;
 
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 520c3f10c271..d3c48d23ee51 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -1,4 +1,3 @@
-
 /*
  * IBM ASM Service Processor Device Driver
  *
@@ -18,135 +17,256 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asböck <amax@us.ibm.com> 
+ * Authors: Max Asböck <amax@us.ibm.com>
+ *          Vernon Mauery <vernux@us.ibm.com>
  *
  */
 
 /* Remote mouse and keyboard event handling functions */
 
+#include <linux/pci.h>
 #include "ibmasm.h"
 #include "remote.h"
 
-int ibmasm_init_remote_queue(struct service_processor *sp)
-{
-        struct remote_queue *q = &sp->remote_queue;
-
-        disable_mouse_interrupts(sp);
+static int xmax = 1600;
+static int ymax = 1200;
 
-        q->open = 0;
-        q->size = 0;
 
-        q->start = kmalloc(DRIVER_REMOTE_QUEUE_SIZE * sizeof(struct remote_event), GFP_KERNEL);
-        if (q->start == 0)
-                return -ENOMEM;
+static unsigned short xlate_high[XLATE_SIZE] = {
+        [KEY_SYM_ENTER & 0xff] = KEY_ENTER,
+        [KEY_SYM_KPSLASH & 0xff] = KEY_KPSLASH,
+        [KEY_SYM_KPSTAR & 0xff] = KEY_KPASTERISK,
+        [KEY_SYM_KPMINUS & 0xff] = KEY_KPMINUS,
+        [KEY_SYM_KPDOT & 0xff] = KEY_KPDOT,
+        [KEY_SYM_KPPLUS & 0xff] = KEY_KPPLUS,
+        [KEY_SYM_KP0 & 0xff] = KEY_KP0,
+        [KEY_SYM_KP1 & 0xff] = KEY_KP1,
+        [KEY_SYM_KP2 & 0xff] = KEY_KP2, [KEY_SYM_KPDOWN & 0xff] = KEY_KP2,
+        [KEY_SYM_KP3 & 0xff] = KEY_KP3,
+        [KEY_SYM_KP4 & 0xff] = KEY_KP4, [KEY_SYM_KPLEFT & 0xff] = KEY_KP4,
+        [KEY_SYM_KP5 & 0xff] = KEY_KP5,
+        [KEY_SYM_KP6 & 0xff] = KEY_KP6, [KEY_SYM_KPRIGHT & 0xff] = KEY_KP6,
+        [KEY_SYM_KP7 & 0xff] = KEY_KP7,
+        [KEY_SYM_KP8 & 0xff] = KEY_KP8, [KEY_SYM_KPUP & 0xff] = KEY_KP8,
+        [KEY_SYM_KP9 & 0xff] = KEY_KP9,
+        [KEY_SYM_BK_SPC & 0xff] = KEY_BACKSPACE,
+        [KEY_SYM_TAB & 0xff] = KEY_TAB,
+        [KEY_SYM_CTRL & 0xff] = KEY_LEFTCTRL,
+        [KEY_SYM_ALT & 0xff] = KEY_LEFTALT,
+        [KEY_SYM_INSERT & 0xff] = KEY_INSERT,
+        [KEY_SYM_DELETE & 0xff] = KEY_DELETE,
+        [KEY_SYM_SHIFT & 0xff] = KEY_LEFTSHIFT,
+        [KEY_SYM_UARROW & 0xff] = KEY_UP,
+        [KEY_SYM_DARROW & 0xff] = KEY_DOWN,
+        [KEY_SYM_LARROW & 0xff] = KEY_LEFT,
+        [KEY_SYM_RARROW & 0xff] = KEY_RIGHT,
+        [KEY_SYM_ESCAPE & 0xff] = KEY_ESC,
+        [KEY_SYM_PAGEUP & 0xff] = KEY_PAGEUP,
+        [KEY_SYM_PAGEDOWN & 0xff] = KEY_PAGEDOWN,
+        [KEY_SYM_HOME & 0xff] = KEY_HOME,
+        [KEY_SYM_END & 0xff] = KEY_END,
+        [KEY_SYM_F1 & 0xff] = KEY_F1,
+        [KEY_SYM_F2 & 0xff] = KEY_F2,
+        [KEY_SYM_F3 & 0xff] = KEY_F3,
+        [KEY_SYM_F4 & 0xff] = KEY_F4,
+        [KEY_SYM_F5 & 0xff] = KEY_F5,
+        [KEY_SYM_F6 & 0xff] = KEY_F6,
+        [KEY_SYM_F7 & 0xff] = KEY_F7,
+        [KEY_SYM_F8 & 0xff] = KEY_F8,
+        [KEY_SYM_F9 & 0xff] = KEY_F9,
+        [KEY_SYM_F10 & 0xff] = KEY_F10,
+        [KEY_SYM_F11 & 0xff] = KEY_F11,
+        [KEY_SYM_F12 & 0xff] = KEY_F12,
+        [KEY_SYM_CAP_LOCK & 0xff] = KEY_CAPSLOCK,
+        [KEY_SYM_NUM_LOCK & 0xff] = KEY_NUMLOCK,
+        [KEY_SYM_SCR_LOCK & 0xff] = KEY_SCROLLLOCK,
+};
+static unsigned short xlate[XLATE_SIZE] = {
+        [NO_KEYCODE] = KEY_RESERVED,
+        [KEY_SYM_SPACE] = KEY_SPACE,
+        [KEY_SYM_TILDE] = KEY_GRAVE,        [KEY_SYM_BKTIC] = KEY_GRAVE,
+        [KEY_SYM_ONE] = KEY_1,              [KEY_SYM_BANG] = KEY_1,
+        [KEY_SYM_TWO] = KEY_2,              [KEY_SYM_AT] = KEY_2,
+        [KEY_SYM_THREE] = KEY_3,            [KEY_SYM_POUND] = KEY_3,
+        [KEY_SYM_FOUR] = KEY_4,             [KEY_SYM_DOLLAR] = KEY_4,
+        [KEY_SYM_FIVE] = KEY_5,             [KEY_SYM_PERCENT] = KEY_5,
+        [KEY_SYM_SIX] = KEY_6,              [KEY_SYM_CARAT] = KEY_6,
+        [KEY_SYM_SEVEN] = KEY_7,            [KEY_SYM_AMPER] = KEY_7,
+        [KEY_SYM_EIGHT] = KEY_8,            [KEY_SYM_STAR] = KEY_8,
+        [KEY_SYM_NINE] = KEY_9,             [KEY_SYM_LPAREN] = KEY_9,
+        [KEY_SYM_ZERO] = KEY_0,             [KEY_SYM_RPAREN] = KEY_0,
+        [KEY_SYM_MINUS] = KEY_MINUS,        [KEY_SYM_USCORE] = KEY_MINUS,
+        [KEY_SYM_EQUAL] = KEY_EQUAL,        [KEY_SYM_PLUS] = KEY_EQUAL,
+        [KEY_SYM_LBRKT] = KEY_LEFTBRACE,    [KEY_SYM_LCURLY] = KEY_LEFTBRACE,
+        [KEY_SYM_RBRKT] = KEY_RIGHTBRACE,   [KEY_SYM_RCURLY] = KEY_RIGHTBRACE,
+        [KEY_SYM_SLASH] = KEY_BACKSLASH,    [KEY_SYM_PIPE] = KEY_BACKSLASH,
+        [KEY_SYM_TIC] = KEY_APOSTROPHE,     [KEY_SYM_QUOTE] = KEY_APOSTROPHE,
+        [KEY_SYM_SEMIC] = KEY_SEMICOLON,    [KEY_SYM_COLON] = KEY_SEMICOLON,
+        [KEY_SYM_COMMA] = KEY_COMMA,        [KEY_SYM_LT] = KEY_COMMA,
+        [KEY_SYM_PERIOD] = KEY_DOT,         [KEY_SYM_GT] = KEY_DOT,
+        [KEY_SYM_BSLASH] = KEY_SLASH,       [KEY_SYM_QMARK] = KEY_SLASH,
+        [KEY_SYM_A] = KEY_A,                [KEY_SYM_a] = KEY_A,
+        [KEY_SYM_B] = KEY_B,                [KEY_SYM_b] = KEY_B,
+        [KEY_SYM_C] = KEY_C,                [KEY_SYM_c] = KEY_C,
+        [KEY_SYM_D] = KEY_D,                [KEY_SYM_d] = KEY_D,
+        [KEY_SYM_E] = KEY_E,                [KEY_SYM_e] = KEY_E,
+        [KEY_SYM_F] = KEY_F,                [KEY_SYM_f] = KEY_F,
+        [KEY_SYM_G] = KEY_G,                [KEY_SYM_g] = KEY_G,
+        [KEY_SYM_H] = KEY_H,                [KEY_SYM_h] = KEY_H,
+        [KEY_SYM_I] = KEY_I,                [KEY_SYM_i] = KEY_I,
+        [KEY_SYM_J] = KEY_J,                [KEY_SYM_j] = KEY_J,
+        [KEY_SYM_K] = KEY_K,                [KEY_SYM_k] = KEY_K,
+        [KEY_SYM_L] = KEY_L,                [KEY_SYM_l] = KEY_L,
+        [KEY_SYM_M] = KEY_M,                [KEY_SYM_m] = KEY_M,
+        [KEY_SYM_N] = KEY_N,                [KEY_SYM_n] = KEY_N,
+        [KEY_SYM_O] = KEY_O,                [KEY_SYM_o] = KEY_O,
+        [KEY_SYM_P] = KEY_P,                [KEY_SYM_p] = KEY_P,
+        [KEY_SYM_Q] = KEY_Q,                [KEY_SYM_q] = KEY_Q,
+        [KEY_SYM_R] = KEY_R,                [KEY_SYM_r] = KEY_R,
+        [KEY_SYM_S] = KEY_S,                [KEY_SYM_s] = KEY_S,
+        [KEY_SYM_T] = KEY_T,                [KEY_SYM_t] = KEY_T,
+        [KEY_SYM_U] = KEY_U,                [KEY_SYM_u] = KEY_U,
+        [KEY_SYM_V] = KEY_V,                [KEY_SYM_v] = KEY_V,
+        [KEY_SYM_W] = KEY_W,                [KEY_SYM_w] = KEY_W,
+        [KEY_SYM_X] = KEY_X,                [KEY_SYM_x] = KEY_X,
+        [KEY_SYM_Y] = KEY_Y,                [KEY_SYM_y] = KEY_Y,
+        [KEY_SYM_Z] = KEY_Z,                [KEY_SYM_z] = KEY_Z,
+};
 
-        q->end = q->start + DRIVER_REMOTE_QUEUE_SIZE;
-        q->reader = q->start;
-        q->writer = q->start;
-        q->size = DRIVER_REMOTE_QUEUE_SIZE;
-        init_waitqueue_head(&q->wait);
+static char remote_mouse_name[] = "ibmasm RSA I remote mouse";
+static char remote_keybd_name[] = "ibmasm RSA I remote keyboard";
 
-        return 0;
-}
-
-void ibmasm_free_remote_queue(struct service_processor *sp)
+static void print_input(struct remote_input *input)
 {
-        kfree(sp->remote_queue.start);
+        if (input->type == INPUT_TYPE_MOUSE) {
+                unsigned char buttons = input->mouse_buttons;
+                dbg("remote mouse movement: (x,y)=(%d,%d)%s%s%s%s\n",
+                        input->data.mouse.x, input->data.mouse.y,
+                        (buttons)?" -- buttons:":"",
+                        (buttons & REMOTE_BUTTON_LEFT)?"left ":"",
+                        (buttons & REMOTE_BUTTON_MIDDLE)?"middle ":"",
+                        (buttons & REMOTE_BUTTON_RIGHT)?"right":""
+                      );
+        } else {
+                dbg("remote keypress (code, flag, down):"
+                           "%d (0x%x) [0x%x] [0x%x]\n",
+                                input->data.keyboard.key_code,
+                                input->data.keyboard.key_code,
+                                input->data.keyboard.key_flag,
+                                input->data.keyboard.key_down
+                      );
+        }
 }
 
-void ibmasm_advance_reader(struct remote_queue *q, unsigned int n)
+static void send_mouse_event(struct input_dev *dev, struct pt_regs *regs,
+                struct remote_input *input)
 {
-        q->reader += n;
-        if (q->reader >= q->end)
-                q->reader -= q->size;
-}
+        unsigned char buttons = input->mouse_buttons;
 
-size_t ibmasm_events_available(struct remote_queue *q)
-{
-        ssize_t diff = q->writer - q->reader;
- 
-        return (diff >= 0) ? diff : q->end - q->reader; 
+        input_regs(dev, regs);
+        input_report_abs(dev, ABS_X, input->data.mouse.x);
+        input_report_abs(dev, ABS_Y, input->data.mouse.y);
+        input_report_key(dev, BTN_LEFT, buttons & REMOTE_BUTTON_LEFT);
+        input_report_key(dev, BTN_MIDDLE, buttons & REMOTE_BUTTON_MIDDLE);
+        input_report_key(dev, BTN_RIGHT, buttons & REMOTE_BUTTON_RIGHT);
+        input_sync(dev);
 }
-        
 
-static int space_free(struct remote_queue *q)
+static void send_keyboard_event(struct input_dev *dev, struct pt_regs *regs,
+                struct remote_input *input)
 {
-        if (q->reader == q->writer)
-                return q->size - 1;
+        unsigned int key;
+        unsigned short code = input->data.keyboard.key_code;
 
-        return ( (q->reader + q->size - q->writer) % q->size ) - 1;
+        if (code & 0xff00)
+                key = xlate_high[code & 0xff];
+        else
+                key = xlate[code];
+        input_regs(dev, regs);
+        input_report_key(dev, key, (input->data.keyboard.key_down) ? 1 : 0);
+        input_sync(dev);
 }
 
-static void set_mouse_event(struct remote_input *input, struct mouse_event *mouse)
+void ibmasm_handle_mouse_interrupt(struct service_processor *sp,
+                struct pt_regs *regs)
 {
-        static char last_buttons = 0;
+        unsigned long reader;
+        unsigned long writer;
+        struct remote_input input;
 
-        mouse->x = input->data.mouse.x;
-        mouse->y = input->data.mouse.y;
+        reader = get_queue_reader(sp);
+        writer = get_queue_writer(sp);
 
-        if (input->mouse_buttons == REMOTE_MOUSE_DOUBLE_CLICK) {
-                mouse->buttons = REMOTE_MOUSE_DOUBLE_CLICK;
-                last_buttons = 0;
-                return;
-        }
-        mouse->transitions = last_buttons ^ input->mouse_buttons;
-        mouse->buttons = input->mouse_buttons;
+        while (reader != writer) {
+                memcpy_fromio(&input, get_queue_entry(sp, reader),
+                                sizeof(struct remote_input));
 
-        last_buttons = input->mouse_buttons;
-}
+                print_input(&input);
+                if (input.type == INPUT_TYPE_MOUSE) {
+                        send_mouse_event(&sp->remote->mouse_dev, regs, &input);
+                } else if (input.type == INPUT_TYPE_KEYBOARD) {
+                        send_keyboard_event(&sp->remote->keybd_dev, regs, &input);
+                } else
+                        break;
 
-static void set_keyboard_event(struct remote_input *input, struct keyboard_event *keyboard)
-{
-        keyboard->key_code = input->data.keyboard.key_code;
-        keyboard->key_down = input->data.keyboard.key_down;
+                reader = advance_queue_reader(sp, reader);
+                writer = get_queue_writer(sp);
+        }
 }
 
-static int add_to_driver_queue(struct remote_queue *q, struct remote_input *input)
+int ibmasm_init_remote_input_dev(struct service_processor *sp)
 {
-        struct remote_event *event = q->writer;
+        /* set up the mouse input device */
+        struct ibmasm_remote *remote;
+        struct pci_dev *pdev = to_pci_dev(sp->dev);
+        int i;
 
-        if (space_free(q) < 1) {
-                return 1;
-        }
+        sp->remote = remote = kmalloc(sizeof(*remote), GFP_KERNEL);
+        if (!remote)
+                return -ENOMEM;
 
-        switch(input->type) {
-        case (INPUT_TYPE_MOUSE):
-                event->type = INPUT_TYPE_MOUSE;
-                set_mouse_event(input, &event->data.mouse);
-                break;
-        case (INPUT_TYPE_KEYBOARD):
-                event->type = INPUT_TYPE_KEYBOARD;
-                set_keyboard_event(input, &event->data.keyboard);
-                break;
-        default:
-                return 0;
-        }
-        event->type = input->type;
+        memset(remote, 0, sizeof(*remote));
 
-        q->writer++;
-        if (q->writer == q->end)
-                q->writer = q->start;
+        remote->mouse_dev.private = remote;
+        init_input_dev(&remote->mouse_dev);
+        remote->mouse_dev.id.vendor = pdev->vendor;
+        remote->mouse_dev.id.product = pdev->device;
+        remote->mouse_dev.evbit[0]  = BIT(EV_KEY) | BIT(EV_ABS);
+        remote->mouse_dev.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) |
+                BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
+        set_bit(BTN_TOUCH, remote->mouse_dev.keybit);
+        remote->mouse_dev.name = remote_mouse_name;
+        input_set_abs_params(&remote->mouse_dev, ABS_X, 0, xmax, 0, 0);
+        input_set_abs_params(&remote->mouse_dev, ABS_Y, 0, ymax, 0, 0);
 
-        return 0;
-}
-        
+        remote->keybd_dev.private = remote;
+        init_input_dev(&remote->keybd_dev);
+        remote->keybd_dev.id.vendor = pdev->vendor;
+        remote->keybd_dev.id.product = pdev->device;
+        remote->keybd_dev.evbit[0]  = BIT(EV_KEY);
+        remote->keybd_dev.name = remote_keybd_name;
 
-void ibmasm_handle_mouse_interrupt(struct service_processor *sp)
-{
-        unsigned long reader;
-        unsigned long writer;
-        struct remote_input input;
+        for (i=0; i<XLATE_SIZE; i++) {
+                if (xlate_high[i])
+                        set_bit(xlate_high[i], remote->keybd_dev.keybit);
+                if (xlate[i])
+                        set_bit(xlate[i], remote->keybd_dev.keybit);
+        }
 
-        reader = get_queue_reader(sp);
-        writer = get_queue_writer(sp);
+        input_register_device(&remote->mouse_dev);
+        input_register_device(&remote->keybd_dev);
+        enable_mouse_interrupts(sp);
 
-        while (reader != writer) {
-                memcpy(&input, (void *)get_queue_entry(sp, reader), sizeof(struct remote_input));
+        printk(KERN_INFO "ibmasm remote responding to events on RSA card %d\n", sp->number);
 
-                if (add_to_driver_queue(&sp->remote_queue, &input))
-                        break;
+        return 0;
+}
 
-                reader = advance_queue_reader(sp, reader);
-        }
-        wake_up_interruptible(&sp->remote_queue.wait);
+void ibmasm_free_remote_input_dev(struct service_processor *sp)
+{
+        disable_mouse_interrupts(sp);
+        input_unregister_device(&sp->remote->keybd_dev);
+        input_unregister_device(&sp->remote->mouse_dev);
+        kfree(sp->remote);
 }
+
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h
index a8eb19f02d3f..b7076a8442d2 100644
--- a/drivers/misc/ibmasm/remote.h
+++ b/drivers/misc/ibmasm/remote.h
@@ -51,11 +51,13 @@
 
 
 /* mouse button states received from SP */
-#define REMOTE_MOUSE_DOUBLE_CLICK       0xF0
-#define REMOTE_MOUSE_BUTTON_LEFT        0x01
-#define REMOTE_MOUSE_BUTTON_MIDDLE      0x02
-#define REMOTE_MOUSE_BUTTON_RIGHT       0x04
+#define REMOTE_DOUBLE_CLICK     0xF0
+#define REMOTE_BUTTON_LEFT      0x01
+#define REMOTE_BUTTON_MIDDLE    0x02
+#define REMOTE_BUTTON_RIGHT     0x04
 
+/* size of keysym/keycode translation matricies */
+#define XLATE_SIZE 256
 
 struct mouse_input {
         unsigned short  y;
@@ -83,11 +85,13 @@ struct remote_input {
         unsigned char   pad3;
 };
 
-#define mouse_addr(sp)          sp->base_address + CONDOR_MOUSE_DATA
-#define display_width(sp)       mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX
-#define display_height(sp)      mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY
-#define display_depth(sp)       mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS
-#define vnc_status(sp)          mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS
+#define mouse_addr(sp)          (sp->base_address + CONDOR_MOUSE_DATA)
+#define display_width(sp)       (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX)
+#define display_height(sp)      (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY)
+#define display_depth(sp)       (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS)
+#define desktop_info(sp)        (mouse_addr(sp) + CONDOR_INPUT_DESKTOP_INFO)
+#define vnc_status(sp)          (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS)
+#define isr_control(sp)         (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
 
 #define mouse_interrupt_pending(sp)     readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
 #define clear_mouse_interrupt(sp)       writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
@@ -101,10 +105,10 @@ struct remote_input {
 #define get_queue_reader(sp)    readl(mouse_addr(sp) + CONDOR_MOUSE_Q_READER)
 #define set_queue_reader(sp, reader)    writel(reader, mouse_addr(sp) + CONDOR_MOUSE_Q_READER)
 
-#define queue_begin     mouse_addr(sp) + CONDOR_MOUSE_Q_BEGIN
+#define queue_begin     (mouse_addr(sp) + CONDOR_MOUSE_Q_BEGIN)
 
 #define get_queue_entry(sp, read_index) \
-        queue_begin + read_index * sizeof(struct remote_input)
+        ((void*)(queue_begin + read_index * sizeof(struct remote_input)))
 
 static inline int advance_queue_reader(struct service_processor *sp, unsigned long reader)
 {
@@ -116,4 +120,151 @@ static inline int advance_queue_reader(struct service_processor *sp, unsigned lo
         return reader;
 }
 
+#define NO_KEYCODE 0
+#define KEY_SYM_BK_SPC   0xFF08
+#define KEY_SYM_TAB      0xFF09
+#define KEY_SYM_ENTER    0xFF0D
+#define KEY_SYM_SCR_LOCK 0xFF14
+#define KEY_SYM_ESCAPE   0xFF1B
+#define KEY_SYM_HOME     0xFF50
+#define KEY_SYM_LARROW   0xFF51
+#define KEY_SYM_UARROW   0xFF52
+#define KEY_SYM_RARROW   0xFF53
+#define KEY_SYM_DARROW   0xFF54
+#define KEY_SYM_PAGEUP   0xFF55
+#define KEY_SYM_PAGEDOWN 0xFF56
+#define KEY_SYM_END      0xFF57
+#define KEY_SYM_INSERT   0xFF63
+#define KEY_SYM_NUM_LOCK 0xFF7F
+#define KEY_SYM_KPSTAR   0xFFAA
+#define KEY_SYM_KPPLUS   0xFFAB
+#define KEY_SYM_KPMINUS  0xFFAD
+#define KEY_SYM_KPDOT    0xFFAE
+#define KEY_SYM_KPSLASH  0xFFAF
+#define KEY_SYM_KPRIGHT  0xFF96
+#define KEY_SYM_KPUP     0xFF97
+#define KEY_SYM_KPLEFT   0xFF98
+#define KEY_SYM_KPDOWN   0xFF99
+#define KEY_SYM_KP0      0xFFB0
+#define KEY_SYM_KP1      0xFFB1
+#define KEY_SYM_KP2      0xFFB2
+#define KEY_SYM_KP3      0xFFB3
+#define KEY_SYM_KP4      0xFFB4
+#define KEY_SYM_KP5      0xFFB5
+#define KEY_SYM_KP6      0xFFB6
+#define KEY_SYM_KP7      0xFFB7
+#define KEY_SYM_KP8      0xFFB8
+#define KEY_SYM_KP9      0xFFB9
+#define KEY_SYM_F1       0xFFBE      // 1B 5B 5B 41
+#define KEY_SYM_F2       0xFFBF      // 1B 5B 5B 42
+#define KEY_SYM_F3       0xFFC0      // 1B 5B 5B 43
+#define KEY_SYM_F4       0xFFC1      // 1B 5B 5B 44
+#define KEY_SYM_F5       0xFFC2      // 1B 5B 5B 45
+#define KEY_SYM_F6       0xFFC3      // 1B 5B 31 37 7E
+#define KEY_SYM_F7       0xFFC4      // 1B 5B 31 38 7E
+#define KEY_SYM_F8       0xFFC5      // 1B 5B 31 39 7E
+#define KEY_SYM_F9       0xFFC6      // 1B 5B 32 30 7E
+#define KEY_SYM_F10      0xFFC7      // 1B 5B 32 31 7E
+#define KEY_SYM_F11      0xFFC8      // 1B 5B 32 33 7E
+#define KEY_SYM_F12      0xFFC9      // 1B 5B 32 34 7E
+#define KEY_SYM_SHIFT    0xFFE1
+#define KEY_SYM_CTRL     0xFFE3
+#define KEY_SYM_ALT      0xFFE9
+#define KEY_SYM_CAP_LOCK 0xFFE5
+#define KEY_SYM_DELETE   0xFFFF
+#define KEY_SYM_TILDE    0x60
+#define KEY_SYM_BKTIC    0x7E
+#define KEY_SYM_ONE      0x31
+#define KEY_SYM_BANG     0x21
+#define KEY_SYM_TWO      0x32
+#define KEY_SYM_AT       0x40
+#define KEY_SYM_THREE    0x33
+#define KEY_SYM_POUND    0x23
+#define KEY_SYM_FOUR     0x34
+#define KEY_SYM_DOLLAR   0x24
+#define KEY_SYM_FIVE     0x35
+#define KEY_SYM_PERCENT  0x25
+#define KEY_SYM_SIX      0x36
+#define KEY_SYM_CARAT    0x5E
+#define KEY_SYM_SEVEN    0x37
+#define KEY_SYM_AMPER    0x26
+#define KEY_SYM_EIGHT    0x38
+#define KEY_SYM_STAR     0x2A
+#define KEY_SYM_NINE     0x39
+#define KEY_SYM_LPAREN   0x28
+#define KEY_SYM_ZERO     0x30
+#define KEY_SYM_RPAREN   0x29
+#define KEY_SYM_MINUS    0x2D
+#define KEY_SYM_USCORE   0x5F
+#define KEY_SYM_EQUAL    0x2B
+#define KEY_SYM_PLUS     0x3D
+#define KEY_SYM_LBRKT    0x5B
+#define KEY_SYM_LCURLY   0x7B
+#define KEY_SYM_RBRKT    0x5D
+#define KEY_SYM_RCURLY   0x7D
+#define KEY_SYM_SLASH    0x5C
+#define KEY_SYM_PIPE     0x7C
+#define KEY_SYM_TIC      0x27
+#define KEY_SYM_QUOTE    0x22
+#define KEY_SYM_SEMIC    0x3B
+#define KEY_SYM_COLON    0x3A
+#define KEY_SYM_COMMA    0x2C
+#define KEY_SYM_LT       0x3C
+#define KEY_SYM_PERIOD   0x2E
+#define KEY_SYM_GT       0x3E
+#define KEY_SYM_BSLASH   0x2F
+#define KEY_SYM_QMARK    0x3F
+#define KEY_SYM_A        0x41
+#define KEY_SYM_B        0x42
+#define KEY_SYM_C        0x43
+#define KEY_SYM_D        0x44
+#define KEY_SYM_E        0x45
+#define KEY_SYM_F        0x46
+#define KEY_SYM_G        0x47
+#define KEY_SYM_H        0x48
+#define KEY_SYM_I        0x49
+#define KEY_SYM_J        0x4A
+#define KEY_SYM_K        0x4B
+#define KEY_SYM_L        0x4C
+#define KEY_SYM_M        0x4D
+#define KEY_SYM_N        0x4E
+#define KEY_SYM_O        0x4F
+#define KEY_SYM_P        0x50
+#define KEY_SYM_Q        0x51
+#define KEY_SYM_R        0x52
+#define KEY_SYM_S        0x53
+#define KEY_SYM_T        0x54
+#define KEY_SYM_U        0x55
+#define KEY_SYM_V        0x56
+#define KEY_SYM_W        0x57
+#define KEY_SYM_X        0x58
+#define KEY_SYM_Y        0x59
+#define KEY_SYM_Z        0x5A
+#define KEY_SYM_a        0x61
+#define KEY_SYM_b        0x62
+#define KEY_SYM_c        0x63
+#define KEY_SYM_d        0x64
+#define KEY_SYM_e        0x65
+#define KEY_SYM_f        0x66
+#define KEY_SYM_g        0x67
+#define KEY_SYM_h        0x68
+#define KEY_SYM_i        0x69
+#define KEY_SYM_j        0x6A
+#define KEY_SYM_k        0x6B
+#define KEY_SYM_l        0x6C
+#define KEY_SYM_m        0x6D
+#define KEY_SYM_n        0x6E
+#define KEY_SYM_o        0x6F
+#define KEY_SYM_p        0x70
+#define KEY_SYM_q        0x71
+#define KEY_SYM_r        0x72
+#define KEY_SYM_s        0x73
+#define KEY_SYM_t        0x74
+#define KEY_SYM_u        0x75
+#define KEY_SYM_v        0x76
+#define KEY_SYM_w        0x77
+#define KEY_SYM_x        0x78
+#define KEY_SYM_y        0x79
+#define KEY_SYM_z        0x7A
+#define KEY_SYM_SPACE    0x20
 #endif /* _IBMASM_REMOTE_H_ */
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index 29a56e9cd5b3..5556cd3b5559 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -22,7 +22,7 @@
 #define to_mmc_driver(d)        container_of(d, struct mmc_driver, drv)
 
 #define MMC_ATTR(name, fmt, args...)                                    \
-static ssize_t mmc_##name##_show (struct device *dev, char *buf)        \
+static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         struct mmc_card *card = dev_to_mmc_card(dev);                   \
         return sprintf(buf, fmt, args);                                 \
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index b5e076043431..80ec9aa575bb 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2202,9 +2202,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (vortex_debug > 6) {
                 printk(KERN_DEBUG "boomerang_start_xmit()\n");
-                if (vortex_debug > 3)
-                        printk(KERN_DEBUG "%s: Trying to send a packet, Tx index %d.\n",
-                                   dev->name, vp->cur_tx);
+                printk(KERN_DEBUG "%s: Trying to send a packet, Tx index %d.\n",
+                           dev->name, vp->cur_tx);
         }
 
         if (vp->cur_tx - vp->dirty_tx >= TX_RING_SIZE) {
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index d639cb8dc461..72cdf19e1be1 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -54,6 +54,7 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/compiler.h>
 #include <linux/netdevice.h>
@@ -91,16 +92,17 @@ KERN_INFO DRV_NAME ": 10/100 PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE
 
 MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
 MODULE_DESCRIPTION("RealTek RTL-8139C+ series 10/100 PCI Ethernet driver");
+MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
 
 static int debug = -1;
-MODULE_PARM (debug, "i");
+module_param(debug, int, 0);
 MODULE_PARM_DESC (debug, "8139cp: bitmapped message enable number");
 
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
    The RTL chips use a 64 element hash table based on the Ethernet CRC.  */
 static int multicast_filter_limit = 32;
-MODULE_PARM (multicast_filter_limit, "i");
+module_param(multicast_filter_limit, int, 0);
 MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered multicast addresses");
 
 #define PFX                     DRV_NAME ": "
@@ -186,6 +188,9 @@ enum {
         RingEnd         = (1 << 30), /* End of descriptor ring */
         FirstFrag       = (1 << 29), /* First segment of a packet */
         LastFrag        = (1 << 28), /* Final segment of a packet */
+        LargeSend       = (1 << 27), /* TCP Large Send Offload (TSO) */
+        MSSShift        = 16,        /* MSS value position */
+        MSSMask         = 0xfff,     /* MSS value: 11 bits */
         TxError         = (1 << 23), /* Tx error summary */
         RxError         = (1 << 20), /* Rx error summary */
         IPCS            = (1 << 18), /* Calculate IP checksum */
@@ -312,7 +317,7 @@ struct cp_desc {
 struct ring_info {
         struct sk_buff          *skb;
         dma_addr_t              mapping;
-        unsigned                frag;
+        u32                     len;
 };
 
 struct cp_dma_stats {
@@ -394,6 +399,9 @@ struct cp_private {
 static void __cp_set_rx_mode (struct net_device *dev);
 static void cp_tx (struct cp_private *cp);
 static void cp_clean_rings (struct cp_private *cp);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void cp_poll_controller(struct net_device *dev);
+#endif
 
 static struct pci_device_id cp_pci_tbl[] = {
         { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139,
@@ -688,6 +696,19 @@ cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
         return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling receive - used by netconsole and other diagnostic tools
+ * to allow network i/o with interrupts disabled.
+ */
+static void cp_poll_controller(struct net_device *dev)
+{
+        disable_irq(dev->irq);
+        cp_interrupt(dev->irq, dev, NULL);
+        enable_irq(dev->irq);
+}
+#endif
+
 static void cp_tx (struct cp_private *cp)
 {
         unsigned tx_head = cp->tx_head;
@@ -707,7 +728,7 @@ static void cp_tx (struct cp_private *cp)
                         BUG();
 
                 pci_unmap_single(cp->pdev, cp->tx_skb[tx_tail].mapping,
-                                        skb->len, PCI_DMA_TODEVICE);
+                                 cp->tx_skb[tx_tail].len, PCI_DMA_TODEVICE);
 
                 if (status & LastFrag) {
                         if (status & (TxError | TxFIFOUnder)) {
@@ -749,10 +770,11 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
         struct cp_private *cp = netdev_priv(dev);
         unsigned entry;
-        u32 eor;
+        u32 eor, flags;
 #if CP_VLAN_TAG_USED
         u32 vlan_tag = 0;
 #endif
+        int mss = 0;
 
         spin_lock_irq(&cp->lock);
 
@@ -772,6 +794,9 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
         entry = cp->tx_head;
         eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
+        if (dev->features & NETIF_F_TSO)
+                mss = skb_shinfo(skb)->tso_size;
+
         if (skb_shinfo(skb)->nr_frags == 0) {
                 struct cp_desc *txd = &cp->tx_ring[entry];
                 u32 len;
@@ -783,26 +808,26 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                 txd->addr = cpu_to_le64(mapping);
                 wmb();
 
-                if (skb->ip_summed == CHECKSUM_HW) {
+                flags = eor | len | DescOwn | FirstFrag | LastFrag;
+
+                if (mss)
+                        flags |= LargeSend | ((mss & MSSMask) << MSSShift);
+                else if (skb->ip_summed == CHECKSUM_HW) {
                         const struct iphdr *ip = skb->nh.iph;
                         if (ip->protocol == IPPROTO_TCP)
-                                txd->opts1 = cpu_to_le32(eor | len | DescOwn |
-                                                         FirstFrag | LastFrag |
-                                                         IPCS | TCPCS);
+                                flags |= IPCS | TCPCS;
                         else if (ip->protocol == IPPROTO_UDP)
-                                txd->opts1 = cpu_to_le32(eor | len | DescOwn |
-                                                         FirstFrag | LastFrag |
-                                                         IPCS | UDPCS);
+                                flags |= IPCS | UDPCS;
                         else
-                                BUG();
-                } else
-                        txd->opts1 = cpu_to_le32(eor | len | DescOwn |
-                                                 FirstFrag | LastFrag);
+                                WARN_ON(1);     /* we need a WARN() */
+                }
+
+                txd->opts1 = cpu_to_le32(flags);
                 wmb();
 
                 cp->tx_skb[entry].skb = skb;
                 cp->tx_skb[entry].mapping = mapping;
-                cp->tx_skb[entry].frag = 0;
+                cp->tx_skb[entry].len = len;
                 entry = NEXT_TX(entry);
         } else {
                 struct cp_desc *txd;
@@ -820,7 +845,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                                                first_len, PCI_DMA_TODEVICE);
                 cp->tx_skb[entry].skb = skb;
                 cp->tx_skb[entry].mapping = first_mapping;
-                cp->tx_skb[entry].frag = 1;
+                cp->tx_skb[entry].len = first_len;
                 entry = NEXT_TX(entry);
 
                 for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
@@ -836,16 +861,19 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                                                  len, PCI_DMA_TODEVICE);
                         eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
 
-                        if (skb->ip_summed == CHECKSUM_HW) {
-                                ctrl = eor | len | DescOwn | IPCS;
+                        ctrl = eor | len | DescOwn;
+
+                        if (mss)
+                                ctrl |= LargeSend |
+                                        ((mss & MSSMask) << MSSShift);
+                        else if (skb->ip_summed == CHECKSUM_HW) {
                                 if (ip->protocol == IPPROTO_TCP)
-                                        ctrl |= TCPCS;
+                                        ctrl |= IPCS | TCPCS;
                                 else if (ip->protocol == IPPROTO_UDP)
-                                        ctrl |= UDPCS;
+                                        ctrl |= IPCS | UDPCS;
                                 else
                                         BUG();
-                        } else
-                                ctrl = eor | len | DescOwn;
+                        }
 
                         if (frag == skb_shinfo(skb)->nr_frags - 1)
                                 ctrl |= LastFrag;
@@ -860,7 +888,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
                         cp->tx_skb[entry].skb = skb;
                         cp->tx_skb[entry].mapping = mapping;
-                        cp->tx_skb[entry].frag = frag + 2;
+                        cp->tx_skb[entry].len = len;
                         entry = NEXT_TX(entry);
                 }
 
@@ -1074,7 +1102,6 @@ static int cp_refill_rx (struct cp_private *cp)
                 cp->rx_skb[i].mapping = pci_map_single(cp->pdev,
                         skb->tail, cp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                 cp->rx_skb[i].skb = skb;
-                cp->rx_skb[i].frag = 0;
 
                 cp->rx_ring[i].opts2 = 0;
                 cp->rx_ring[i].addr = cpu_to_le64(cp->rx_skb[i].mapping);
@@ -1126,9 +1153,6 @@ static void cp_clean_rings (struct cp_private *cp)
 {
         unsigned i;
 
-        memset(cp->rx_ring, 0, sizeof(struct cp_desc) * CP_RX_RING_SIZE);
-        memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
-
         for (i = 0; i < CP_RX_RING_SIZE; i++) {
                 if (cp->rx_skb[i].skb) {
                         pci_unmap_single(cp->pdev, cp->rx_skb[i].mapping,
@@ -1140,13 +1164,18 @@ static void cp_clean_rings (struct cp_private *cp)
         for (i = 0; i < CP_TX_RING_SIZE; i++) {
                 if (cp->tx_skb[i].skb) {
                         struct sk_buff *skb = cp->tx_skb[i].skb;
+
                         pci_unmap_single(cp->pdev, cp->tx_skb[i].mapping,
-                                         skb->len, PCI_DMA_TODEVICE);
-                        dev_kfree_skb(skb);
+                                         cp->tx_skb[i].len, PCI_DMA_TODEVICE);
+                        if (le32_to_cpu(cp->tx_ring[i].opts1) & LastFrag)
+                                dev_kfree_skb(skb);
                         cp->net_stats.tx_dropped++;
                 }
         }
 
+        memset(cp->rx_ring, 0, sizeof(struct cp_desc) * CP_RX_RING_SIZE);
+        memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
+
         memset(&cp->rx_skb, 0, sizeof(struct ring_info) * CP_RX_RING_SIZE);
         memset(&cp->tx_skb, 0, sizeof(struct ring_info) * CP_TX_RING_SIZE);
 }
@@ -1538,6 +1567,8 @@ static struct ethtool_ops cp_ethtool_ops = {
         .set_tx_csum            = ethtool_op_set_tx_csum, /* local! */
         .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
+        .get_tso                = ethtool_op_get_tso,
+        .set_tso                = ethtool_op_set_tso,
         .get_regs               = cp_get_regs,
         .get_wol                = cp_get_wol,
         .set_wol                = cp_set_wol,
@@ -1749,6 +1780,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->get_stats = cp_get_stats;
         dev->do_ioctl = cp_ioctl;
         dev->poll = cp_rx_poll;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = cp_poll_controller;
+#endif
         dev->weight = 16;       /* arbitrary? from NAPI_HOWTO.txt. */
 #ifdef BROKEN
         dev->change_mtu = cp_change_mtu;
@@ -1768,6 +1802,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (pci_using_dac)
                 dev->features |= NETIF_F_HIGHDMA;
 
+#if 0 /* disabled by default until verified */
+        dev->features |= NETIF_F_TSO;
+#endif
+
         dev->irq = pdev->irq;
 
         rc = register_netdev(dev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index d4bd20c21a1f..047202c4d9a8 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -569,7 +569,7 @@ struct rtl_extra_stats {
 };
 
 struct rtl8139_private {
-        void *mmio_addr;
+        void __iomem *mmio_addr;
         int drv_flags;
         struct pci_dev *pci_dev;
         u32 msg_enable;
@@ -614,7 +614,7 @@ MODULE_PARM_DESC (multicast_filter_limit, "8139too maximum number of filtered mu
 MODULE_PARM_DESC (media, "8139too: Bits 4+9: force full duplex, bit 5: 100Mbps");
 MODULE_PARM_DESC (full_duplex, "8139too: Force full duplex for board(s) (1)");
 
-static int read_eeprom (void *ioaddr, int location, int addr_len);
+static int read_eeprom (void __iomem *ioaddr, int location, int addr_len);
 static int rtl8139_open (struct net_device *dev);
 static int mdio_read (struct net_device *dev, int phy_id, int location);
 static void mdio_write (struct net_device *dev, int phy_id, int location,
@@ -638,46 +638,20 @@ static void __set_rx_mode (struct net_device *dev);
 static void rtl8139_hw_start (struct net_device *dev);
 static struct ethtool_ops rtl8139_ethtool_ops;
 
-#ifdef USE_IO_OPS
-
-#define RTL_R8(reg)             inb (((unsigned long)ioaddr) + (reg))
-#define RTL_R16(reg)            inw (((unsigned long)ioaddr) + (reg))
-#define RTL_R32(reg)            ((unsigned long) inl (((unsigned long)ioaddr) + (reg)))
-#define RTL_W8(reg, val8)       outb ((val8), ((unsigned long)ioaddr) + (reg))
-#define RTL_W16(reg, val16)     outw ((val16), ((unsigned long)ioaddr) + (reg))
-#define RTL_W32(reg, val32)     outl ((val32), ((unsigned long)ioaddr) + (reg))
-#define RTL_W8_F                RTL_W8
-#define RTL_W16_F               RTL_W16
-#define RTL_W32_F               RTL_W32
-#undef readb
-#undef readw
-#undef readl
-#undef writeb
-#undef writew
-#undef writel
-#define readb(addr) inb((unsigned long)(addr))
-#define readw(addr) inw((unsigned long)(addr))
-#define readl(addr) inl((unsigned long)(addr))
-#define writeb(val,addr) outb((val),(unsigned long)(addr))
-#define writew(val,addr) outw((val),(unsigned long)(addr))
-#define writel(val,addr) outl((val),(unsigned long)(addr))
-
-#else
-
 /* write MMIO register, with flush */
 /* Flush avoids rtl8139 bug w/ posted MMIO writes */
-#define RTL_W8_F(reg, val8)     do { writeb ((val8), ioaddr + (reg)); readb (ioaddr + (reg)); } while (0)
-#define RTL_W16_F(reg, val16)   do { writew ((val16), ioaddr + (reg)); readw (ioaddr + (reg)); } while (0)
-#define RTL_W32_F(reg, val32)   do { writel ((val32), ioaddr + (reg)); readl (ioaddr + (reg)); } while (0)
+#define RTL_W8_F(reg, val8)     do { iowrite8 ((val8), ioaddr + (reg)); ioread8 (ioaddr + (reg)); } while (0)
+#define RTL_W16_F(reg, val16)   do { iowrite16 ((val16), ioaddr + (reg)); ioread16 (ioaddr + (reg)); } while (0)
+#define RTL_W32_F(reg, val32)   do { iowrite32 ((val32), ioaddr + (reg)); ioread32 (ioaddr + (reg)); } while (0)
 
 
 #define MMIO_FLUSH_AUDIT_COMPLETE 1
 #if MMIO_FLUSH_AUDIT_COMPLETE
 
 /* write MMIO register */
-#define RTL_W8(reg, val8)       writeb ((val8), ioaddr + (reg))
-#define RTL_W16(reg, val16)     writew ((val16), ioaddr + (reg))
-#define RTL_W32(reg, val32)     writel ((val32), ioaddr + (reg))
+#define RTL_W8(reg, val8)       iowrite8 ((val8), ioaddr + (reg))
+#define RTL_W16(reg, val16)     iowrite16 ((val16), ioaddr + (reg))
+#define RTL_W32(reg, val32)     iowrite32 ((val32), ioaddr + (reg))
 
 #else
 
@@ -689,11 +663,9 @@ static struct ethtool_ops rtl8139_ethtool_ops;
 #endif /* MMIO_FLUSH_AUDIT_COMPLETE */
 
 /* read MMIO register */
-#define RTL_R8(reg)             readb (ioaddr + (reg))
-#define RTL_R16(reg)            readw (ioaddr + (reg))
-#define RTL_R32(reg)            ((unsigned long) readl (ioaddr + (reg)))
-
-#endif /* USE_IO_OPS */
+#define RTL_R8(reg)             ioread8 (ioaddr + (reg))
+#define RTL_R16(reg)            ioread16 (ioaddr + (reg))
+#define RTL_R32(reg)            ((unsigned long) ioread32 (ioaddr + (reg)))
 
 
 static const u16 rtl8139_intr_mask =
@@ -740,10 +712,13 @@ static void __rtl8139_cleanup_dev (struct net_device *dev)
         assert (tp->pci_dev != NULL);
         pdev = tp->pci_dev;
 
-#ifndef USE_IO_OPS
+#ifdef USE_IO_OPS
+        if (tp->mmio_addr)
+                ioport_unmap (tp->mmio_addr);
+#else
         if (tp->mmio_addr)
-                iounmap (tp->mmio_addr);
-#endif /* !USE_IO_OPS */
+                pci_iounmap (pdev, tp->mmio_addr);
+#endif /* USE_IO_OPS */
 
         /* it's ok to call this even if we have no regions to free */
         pci_release_regions (pdev);
@@ -753,7 +728,7 @@ static void __rtl8139_cleanup_dev (struct net_device *dev)
 }
 
 
-static void rtl8139_chip_reset (void *ioaddr)
+static void rtl8139_chip_reset (void __iomem *ioaddr)
 {
         int i;
 
@@ -773,7 +748,7 @@ static void rtl8139_chip_reset (void *ioaddr)
 static int __devinit rtl8139_init_board (struct pci_dev *pdev,
                                          struct net_device **dev_out)
 {
-        void *ioaddr;
+        void __iomem *ioaddr;
         struct net_device *dev;
         struct rtl8139_private *tp;
         u8 tmp8;
@@ -855,13 +830,18 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
         pci_set_master (pdev);
 
 #ifdef USE_IO_OPS
-        ioaddr = (void *) pio_start;
+        ioaddr = ioport_map(pio_start, pio_len);
+        if (!ioaddr) {
+                printk (KERN_ERR PFX "%s: cannot map PIO, aborting\n", pci_name(pdev));
+                rc = -EIO;
+                goto err_out;
+        }
         dev->base_addr = pio_start;
         tp->mmio_addr = ioaddr;
         tp->regs_len = pio_len;
 #else
         /* ioremap MMIO region */
-        ioaddr = ioremap (mmio_start, mmio_len);
+        ioaddr = pci_iomap(pdev, 1, 0);
         if (ioaddr == NULL) {
                 printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pci_name(pdev));
                 rc = -EIO;
@@ -947,7 +927,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         struct net_device *dev = NULL;
         struct rtl8139_private *tp;
         int i, addr_len, option;
-        void *ioaddr;
+        void __iomem *ioaddr;
         static int board_idx = -1;
         u8 pci_rev;
 
@@ -1147,47 +1127,46 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
    No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
  */
 
-#define eeprom_delay()  readl(ee_addr)
+#define eeprom_delay()  RTL_R32(Cfg9346)
 
 /* The EEPROM commands include the alway-set leading bit. */
 #define EE_WRITE_CMD    (5)
 #define EE_READ_CMD             (6)
 #define EE_ERASE_CMD    (7)
 
-static int __devinit read_eeprom (void *ioaddr, int location, int addr_len)
+static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_len)
 {
         int i;
         unsigned retval = 0;
-        void *ee_addr = ioaddr + Cfg9346;
         int read_cmd = location | (EE_READ_CMD << addr_len);
 
-        writeb (EE_ENB & ~EE_CS, ee_addr);
-        writeb (EE_ENB, ee_addr);
+        RTL_W8 (Cfg9346, EE_ENB & ~EE_CS);
+        RTL_W8 (Cfg9346, EE_ENB);
         eeprom_delay ();
 
         /* Shift the read command bits out. */
         for (i = 4 + addr_len; i >= 0; i--) {
                 int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
-                writeb (EE_ENB | dataval, ee_addr);
+                RTL_W8 (Cfg9346, EE_ENB | dataval);
                 eeprom_delay ();
-                writeb (EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);
+                RTL_W8 (Cfg9346, EE_ENB | dataval | EE_SHIFT_CLK);
                 eeprom_delay ();
         }
-        writeb (EE_ENB, ee_addr);
+        RTL_W8 (Cfg9346, EE_ENB);
         eeprom_delay ();
 
         for (i = 16; i > 0; i--) {
-                writeb (EE_ENB | EE_SHIFT_CLK, ee_addr);
+                RTL_W8 (Cfg9346, EE_ENB | EE_SHIFT_CLK);
                 eeprom_delay ();
                 retval =
-                    (retval << 1) | ((readb (ee_addr) & EE_DATA_READ) ? 1 :
+                    (retval << 1) | ((RTL_R8 (Cfg9346) & EE_DATA_READ) ? 1 :
                                      0);
-                writeb (EE_ENB, ee_addr);
+                RTL_W8 (Cfg9346, EE_ENB);
                 eeprom_delay ();
         }
 
         /* Terminate the EEPROM access. */
-        writeb (~EE_CS, ee_addr);
+        RTL_W8 (Cfg9346, ~EE_CS);
         eeprom_delay ();
 
         return retval;
@@ -1206,7 +1185,7 @@ static int __devinit read_eeprom (void *ioaddr, int location, int addr_len)
 #define MDIO_WRITE0 (MDIO_DIR)
 #define MDIO_WRITE1 (MDIO_DIR | MDIO_DATA_OUT)
 
-#define mdio_delay(mdio_addr)   readb(mdio_addr)
+#define mdio_delay()    RTL_R8(Config4)
 
 
 static char mii_2_8139_map[8] = {
@@ -1223,15 +1202,15 @@ static char mii_2_8139_map[8] = {
 
 #ifdef CONFIG_8139TOO_8129
 /* Syncronize the MII management interface by shifting 32 one bits out. */
-static void mdio_sync (void *mdio_addr)
+static void mdio_sync (void __iomem *ioaddr)
 {
         int i;
 
         for (i = 32; i >= 0; i--) {
-                writeb (MDIO_WRITE1, mdio_addr);
-                mdio_delay (mdio_addr);
-                writeb (MDIO_WRITE1 | MDIO_CLK, mdio_addr);
-                mdio_delay (mdio_addr);
+                RTL_W8 (Config4, MDIO_WRITE1);
+                mdio_delay ();
+                RTL_W8 (Config4, MDIO_WRITE1 | MDIO_CLK);
+                mdio_delay ();
         }
 }
 #endif
@@ -1241,35 +1220,36 @@ static int mdio_read (struct net_device *dev, int phy_id, int location)
         struct rtl8139_private *tp = netdev_priv(dev);
         int retval = 0;
 #ifdef CONFIG_8139TOO_8129
-        void *mdio_addr = tp->mmio_addr + Config4;
+        void __iomem *ioaddr = tp->mmio_addr;
         int mii_cmd = (0xf6 << 10) | (phy_id << 5) | location;
         int i;
 #endif
 
         if (phy_id > 31) {      /* Really a 8139.  Use internal registers. */
+                void __iomem *ioaddr = tp->mmio_addr;
                 return location < 8 && mii_2_8139_map[location] ?
-                    readw (tp->mmio_addr + mii_2_8139_map[location]) : 0;
+                    RTL_R16 (mii_2_8139_map[location]) : 0;
         }
 
 #ifdef CONFIG_8139TOO_8129
-        mdio_sync (mdio_addr);
+        mdio_sync (ioaddr);
         /* Shift the read command bits out. */
         for (i = 15; i >= 0; i--) {
                 int dataval = (mii_cmd & (1 << i)) ? MDIO_DATA_OUT : 0;
 
-                writeb (MDIO_DIR | dataval, mdio_addr);
-                mdio_delay (mdio_addr);
-                writeb (MDIO_DIR | dataval | MDIO_CLK, mdio_addr);
-                mdio_delay (mdio_addr);
+                RTL_W8 (Config4, MDIO_DIR | dataval);
+                mdio_delay ();
+                RTL_W8 (Config4, MDIO_DIR | dataval | MDIO_CLK);
+                mdio_delay ();
         }
 
         /* Read the two transition, 16 data, and wire-idle bits. */
         for (i = 19; i > 0; i--) {
-                writeb (0, mdio_addr);
-                mdio_delay (mdio_addr);
-                retval = (retval << 1) | ((readb (mdio_addr) & MDIO_DATA_IN) ? 1 : 0);
-                writeb (MDIO_CLK, mdio_addr);
-                mdio_delay (mdio_addr);
+                RTL_W8 (Config4, 0);
+                mdio_delay ();
+                retval = (retval << 1) | ((RTL_R8 (Config4) & MDIO_DATA_IN) ? 1 : 0);
+                RTL_W8 (Config4, MDIO_CLK);
+                mdio_delay ();
         }
 #endif
 
@@ -1282,13 +1262,13 @@ static void mdio_write (struct net_device *dev, int phy_id, int location,
 {
         struct rtl8139_private *tp = netdev_priv(dev);
 #ifdef CONFIG_8139TOO_8129
-        void *mdio_addr = tp->mmio_addr + Config4;
+        void __iomem *ioaddr = tp->mmio_addr;
         int mii_cmd = (0x5002 << 16) | (phy_id << 23) | (location << 18) | value;
         int i;
 #endif
 
         if (phy_id > 31) {      /* Really a 8139.  Use internal registers. */
-                void *ioaddr = tp->mmio_addr;
+                void __iomem *ioaddr = tp->mmio_addr;
                 if (location == 0) {
                         RTL_W8 (Cfg9346, Cfg9346_Unlock);
                         RTL_W16 (BasicModeCtrl, value);
@@ -1299,23 +1279,23 @@ static void mdio_write (struct net_device *dev, int phy_id, int location,
         }
 
 #ifdef CONFIG_8139TOO_8129
-        mdio_sync (mdio_addr);
+        mdio_sync (ioaddr);
 
         /* Shift the command bits out. */
         for (i = 31; i >= 0; i--) {
                 int dataval =
                     (mii_cmd & (1 << i)) ? MDIO_WRITE1 : MDIO_WRITE0;
-                writeb (dataval, mdio_addr);
-                mdio_delay (mdio_addr);
-                writeb (dataval | MDIO_CLK, mdio_addr);
-                mdio_delay (mdio_addr);
+                RTL_W8 (Config4, dataval);
+                mdio_delay ();
+                RTL_W8 (Config4, dataval | MDIO_CLK);
+                mdio_delay ();
         }
         /* Clear out extra bits. */
         for (i = 2; i > 0; i--) {
-                writeb (0, mdio_addr);
-                mdio_delay (mdio_addr);
-                writeb (MDIO_CLK, mdio_addr);
-                mdio_delay (mdio_addr);
+                RTL_W8 (Config4, 0);
+                mdio_delay ();
+                RTL_W8 (Config4, MDIO_CLK);
+                mdio_delay ();
         }
 #endif
 }
@@ -1325,7 +1305,7 @@ static int rtl8139_open (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
         int retval;
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         retval = request_irq (dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
         if (retval)
@@ -1382,7 +1362,7 @@ static void rtl_check_media (struct net_device *dev, unsigned int init_media)
 static void rtl8139_hw_start (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 i;
         u8 tmp;
 
@@ -1484,7 +1464,7 @@ static void rtl8139_tune_twister (struct net_device *dev,
                                   struct rtl8139_private *tp)
 {
         int linkcase;
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         /* This is a complicated state machine to configure the "twister" for
            impedance/echos based on the cable length.
@@ -1568,7 +1548,7 @@ static void rtl8139_tune_twister (struct net_device *dev,
 
 static inline void rtl8139_thread_iter (struct net_device *dev,
                                  struct rtl8139_private *tp,
-                                 void *ioaddr)
+                                 void __iomem *ioaddr)
 {
         int mii_lpa;
 
@@ -1676,7 +1656,7 @@ static inline void rtl8139_tx_clear (struct rtl8139_private *tp)
 static void rtl8139_tx_timeout (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
         u8 tmp8;
         unsigned long flags;
@@ -1721,7 +1701,7 @@ static void rtl8139_tx_timeout (struct net_device *dev)
 static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         unsigned int entry;
         unsigned int len = skb->len;
 
@@ -1763,7 +1743,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
 static void rtl8139_tx_interrupt (struct net_device *dev,
                                   struct rtl8139_private *tp,
-                                  void *ioaddr)
+                                  void __iomem *ioaddr)
 {
         unsigned long dirty_tx, tx_left;
 
@@ -1833,7 +1813,7 @@ static void rtl8139_tx_interrupt (struct net_device *dev,
 
 /* TODO: clean this up!  Rx reset need not be this intensive */
 static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,
-                            struct rtl8139_private *tp, void *ioaddr)
+                            struct rtl8139_private *tp, void __iomem *ioaddr)
 {
         u8 tmp8;
 #ifdef CONFIG_8139_OLD_RX_RESET
@@ -1930,7 +1910,7 @@ static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
 
 static void rtl8139_isr_ack(struct rtl8139_private *tp)
 {
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         u16 status;
 
         status = RTL_R16 (IntrStatus) & RxAckBits;
@@ -1949,7 +1929,7 @@ static void rtl8139_isr_ack(struct rtl8139_private *tp)
 static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
                       int budget)
 {
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         int received = 0;
         unsigned char *rx_ring = tp->rx_ring;
         unsigned int cur_rx = tp->cur_rx;
@@ -2087,7 +2067,7 @@ out:
 
 static void rtl8139_weird_interrupt (struct net_device *dev,
                                      struct rtl8139_private *tp,
-                                     void *ioaddr,
+                                     void __iomem *ioaddr,
                                      int status, int link_changed)
 {
         DPRINTK ("%s: Abnormal interrupt, status %8.8x.\n",
@@ -2127,7 +2107,7 @@ static void rtl8139_weird_interrupt (struct net_device *dev,
 static int rtl8139_poll(struct net_device *dev, int *budget)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         int orig_budget = min(*budget, dev->quota);
         int done = 1;
 
@@ -2165,7 +2145,7 @@ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance,
 {
         struct net_device *dev = (struct net_device *) dev_instance;
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         u16 status, ackstat;
         int link_changed = 0; /* avoid bogus "uninit" warning */
         int handled = 0;
@@ -2241,7 +2221,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
 static int rtl8139_close (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         int ret = 0;
         unsigned long flags;
 
@@ -2304,7 +2284,7 @@ static int rtl8139_close (struct net_device *dev)
 static void rtl8139_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8139_private *np = netdev_priv(dev);
-        void *ioaddr = np->mmio_addr;
+        void __iomem *ioaddr = np->mmio_addr;
 
         spin_lock_irq(&np->lock);
         if (rtl_chip_info[np->chipset].flags & HasLWake) {
@@ -2338,7 +2318,7 @@ static void rtl8139_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 static int rtl8139_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
         struct rtl8139_private *np = netdev_priv(dev);
-        void *ioaddr = np->mmio_addr;
+        void __iomem *ioaddr = np->mmio_addr;
         u32 support;
         u8 cfg3, cfg5;
 
@@ -2506,7 +2486,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 static struct net_device_stats *rtl8139_get_stats (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         unsigned long flags;
 
         if (netif_running(dev)) {
@@ -2525,7 +2505,7 @@ static struct net_device_stats *rtl8139_get_stats (struct net_device *dev)
 static void __set_rx_mode (struct net_device *dev)
 {
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 mc_filter[2];       /* Multicast hash filter */
         int i, rx_mode;
         u32 tmp;
@@ -2586,7 +2566,7 @@ static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
         struct rtl8139_private *tp = netdev_priv(dev);
-        void *ioaddr = tp->mmio_addr;
+        void __iomem *ioaddr = tp->mmio_addr;
         unsigned long flags;
 
         pci_save_state (pdev);
diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index bab16bcc9ae5..6d76f3a99b17 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -225,9 +225,9 @@ void ei_tx_timeout(struct net_device *dev)
         unsigned long icucr;
 
         local_irq_save(flags);
-        icucr = inl(ICUCR1);
+        icucr = inl(M32R_ICU_CR1_PORTL);
         icucr |= M32R_ICUCR_ISMOD11;
-        outl(icucr, ICUCR1);
+        outl(icucr, M32R_ICU_CR1_PORTL);
         local_irq_restore(flags);
 #endif
         ei_local->stat.tx_errors++;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3a0a55b62aaf..fa9f76c953dd 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -824,6 +824,18 @@ config SMC9194
           <file:Documentation/networking/net-modules.txt>. The module
           will be called smc9194.
 
+config DM9000
+        tristate "DM9000 support"
+        depends on ARM && NET_ETHERNET
+        select CRC32
+        select MII
+        ---help---
+          Support for DM9000 chipset.
+
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/networking/net-modules.txt>.  The module will be
+          called dm9000.
+
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI cards"
         depends on NET_ETHERNET && ISA
@@ -989,21 +1001,6 @@ config EEXPRESS_PRO
           <file:Documentation/networking/net-modules.txt>. The module
           will be called eepro.
 
-config FMV18X
-        tristate "FMV-181/182/183/184 support (OBSOLETE)"
-        depends on NET_ISA && OBSOLETE
-        ---help---
-          If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,
-          say Y and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          If you use an FMV-183 or FMV-184 and it is not working, you may need
-          to disable Plug & Play mode of the card.
-
-          To compile this driver as a module, choose M here and read
-          <file:Documentation/networking/net-modules.txt>. The module
-          will be called fmv18x.
-
 config HPLAN_PLUS
         tristate "HP PCLAN+ (27247B and 27252A) support"
         depends on NET_ISA
@@ -1092,14 +1089,6 @@ config SEEQ8005
           <file:Documentation/networking/net-modules.txt>. The module
           will be called seeq8005.
 
-config SK_G16
-        tristate "SK_G16 support (OBSOLETE)"
-        depends on NET_ISA && OBSOLETE
-        help
-          If you have a network (Ethernet) card of this type, say Y and read
-          the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
 config SKMC
         tristate "SKnet MCA support"
         depends on NET_ETHERNET && MCA && BROKEN
@@ -1555,6 +1544,7 @@ config SIS900
         tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
         depends on NET_PCI && PCI
         select CRC32
+        select MII
         ---help---
           This is a driver for the Fast Ethernet PCI network cards based on
           the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
@@ -1931,6 +1921,18 @@ config R8169_VLAN
           
           If in doubt, say Y.
 
+config SKGE
+        tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        select CRC32
+        ---help---
+          This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
+          and related Gigabit Ethernet adapters. It is a new smaller driver
+          driver with better performance and more complete ethtool support.
+
+          It does not support the link failover and network management 
+          features that "portable" vendor supplied sk98lin driver does.
+        
 config SK98LIN
         tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
         depends on PCI
@@ -2031,6 +2033,15 @@ config TIGON3
           To compile this driver as a module, choose M here: the module
           will be called tg3.  This is recommended.
 
+config BNX2
+        tristate "Broadcom NetXtremeII support"
+        depends on PCI
+        help
+          This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called bnx2.  This is recommended.
+
 config GIANFAR
         tristate "Gianfar Ethernet"
         depends on 85xx || 83xx
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e038d55e4f6f..63c6d1e6d4d9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -51,7 +51,9 @@ obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
+obj-$(CONFIG_BNX2) += bnx2.o
 obj-$(CONFIG_TC35815) += tc35815.o
+obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@ -73,7 +75,6 @@ obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
 obj-$(CONFIG_APNE) += apne.o 8390.o
 obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
 obj-$(CONFIG_SHAPER) += shaper.o
-obj-$(CONFIG_SK_G16) += sk_g16.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
@@ -121,7 +122,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
 obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_FMV18X) += fmv18x.o
 obj-$(CONFIG_EL1) += 3c501.o
 obj-$(CONFIG_EL16) += 3c507.o
 obj-$(CONFIG_ELMC) += 3c523.o
@@ -179,6 +179,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_SMC91X) += smc91x.o
+obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
 
 obj-$(CONFIG_ARM) += arm/
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index fb433325aa27..3707df6b0cfa 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -210,9 +210,6 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_AT1700
         {at1700_probe, 0},
 #endif
-#ifdef CONFIG_FMV18X            /* Fujitsu FMV-181/182 */
-        {fmv18x_probe, 0},
-#endif
 #ifdef CONFIG_ETH16I
         {eth16i_probe, 0},      /* ICL EtherTeam 16i/32 */
 #endif
@@ -243,9 +240,6 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_ELPLUS            /* 3c505 */
         {elplus_probe, 0},
 #endif
-#ifdef CONFIG_SK_G16
-        {SK_init, 0},
-#endif
 #ifdef CONFIG_NI5010
         {ni5010_probe, 0},
 #endif
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 942a2819576c..2e28c201dcc0 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -68,6 +68,7 @@ struct etherh_priv {
         void __iomem    *dma_base;
         unsigned int    id;
         void __iomem    *ctrl_port;
+        void __iomem    *base;
         unsigned char   ctrl;
         u32             supported;
 };
@@ -177,7 +178,7 @@ etherh_setif(struct net_device *dev)
         switch (etherh_priv(dev)->id) {
         case PROD_I3_ETHERLAN600:
         case PROD_I3_ETHERLAN600A:
-                addr = (void *)dev->base_addr + EN0_RCNTHI;
+                addr = etherh_priv(dev)->base + EN0_RCNTHI;
 
                 switch (dev->if_port) {
                 case IF_PORT_10BASE2:
@@ -218,7 +219,7 @@ etherh_getifstat(struct net_device *dev)
         switch (etherh_priv(dev)->id) {
         case PROD_I3_ETHERLAN600:
         case PROD_I3_ETHERLAN600A:
-                addr = (void *)dev->base_addr + EN0_RCNTHI;
+                addr = etherh_priv(dev)->base + EN0_RCNTHI;
                 switch (dev->if_port) {
                 case IF_PORT_10BASE2:
                         stat = 1;
@@ -281,7 +282,7 @@ static void
 etherh_reset(struct net_device *dev)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        void __iomem *addr = (void *)dev->base_addr;
+        void __iomem *addr = etherh_priv(dev)->base;
 
         writeb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr);
 
@@ -327,7 +328,7 @@ etherh_block_output (struct net_device *dev, int count, const unsigned char *buf
 
         ei_local->dmaing = 1;
 
-        addr = (void *)dev->base_addr;
+        addr = etherh_priv(dev)->base;
         dma_base = etherh_priv(dev)->dma_base;
 
         count = (count + 1) & ~1;
@@ -387,7 +388,7 @@ etherh_block_input (struct net_device *dev, int count, struct sk_buff *skb, int
 
         ei_local->dmaing = 1;
 
-        addr = (void *)dev->base_addr;
+        addr = etherh_priv(dev)->base;
         dma_base = etherh_priv(dev)->dma_base;
 
         buf = skb->data;
@@ -427,7 +428,7 @@ etherh_get_header (struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_p
 
         ei_local->dmaing = 1;
 
-        addr = (void *)dev->base_addr;
+        addr = etherh_priv(dev)->base;
         dma_base = etherh_priv(dev)->dma_base;
 
         writeb (E8390_NODMA | E8390_PAGE0 | E8390_START, addr + E8390_CMD);
@@ -696,7 +697,8 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
                 eh->ctrl_port = eh->ioc_fast;
         }
 
-        dev->base_addr = (unsigned long)eh->memc + data->ns8390_offset;
+        eh->base = eh->memc + data->ns8390_offset;
+        dev->base_addr = (unsigned long)eh->base;
         eh->dma_base = eh->memc + data->dataport_offset;
         eh->ctrl_port += data->ctrlport_offset;
 
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 5a2efd343db4..c82b9cd1c924 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -1681,10 +1681,6 @@ static int au1000_init(struct net_device *dev)
                 control |= MAC_FULL_DUPLEX;
         }
 
-        /* fix for startup without cable */
-        if (!link) 
-                dev->flags &= ~IFF_RUNNING;
-
         aup->mac->control = control;
         aup->mac->vlan1_tag = 0x8100; /* activate vlan support */
         au_sync();
@@ -1709,16 +1705,14 @@ static void au1000_timer(unsigned long data)
         if_port = dev->if_port;
         if (aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed) == 0) {
                 if (link) {
-                        if (!(dev->flags & IFF_RUNNING)) {
+                        if (!netif_carrier_ok(dev)) {
                                 netif_carrier_on(dev);
-                                dev->flags |= IFF_RUNNING;
                                 printk(KERN_INFO "%s: link up\n", dev->name);
                         }
                 }
                 else {
-                        if (dev->flags & IFF_RUNNING) {
+                        if (netif_carrier_ok(dev)) {
                                 netif_carrier_off(dev);
-                                dev->flags &= ~IFF_RUNNING;
                                 dev->if_port = 0;
                                 printk(KERN_INFO "%s: link down\n", dev->name);
                         }
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 734bd4ee3f9b..00e5257b176f 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1412,7 +1412,6 @@ static int bmac_open(struct net_device *dev)
         bp->opened = 1;
         bmac_reset_and_enable(dev);
         enable_irq(dev->irq);
-        dev->flags |= IFF_RUNNING;
         return 0;
 }
 
@@ -1425,7 +1424,6 @@ static int bmac_close(struct net_device *dev)
         int i;
 
         bp->sleeping = 1;
-        dev->flags &= ~(IFF_UP | IFF_RUNNING);
 
         /* disable rx and tx */
         config = bmread(dev, RXCFG);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
new file mode 100644
index 000000000000..8acc655ec1e8
--- /dev/null
+++ b/drivers/net/bnx2.c
@@ -0,0 +1,5530 @@
+/* bnx2.c: Broadcom NX2 network driver.
+ *
+ * Copyright (c) 2004, 2005 Broadcom Corporation
+ *
+ * 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.
+ *
+ * Written by: Michael Chan  (mchan@broadcom.com)
+ */
+
+#include "bnx2.h"
+#include "bnx2_fw.h"
+
+#define DRV_MODULE_NAME         "bnx2"
+#define PFX DRV_MODULE_NAME     ": "
+#define DRV_MODULE_VERSION      "1.2.19"
+#define DRV_MODULE_RELDATE      "May 23, 2005"
+
+#define RUN_AT(x) (jiffies + (x))
+
+/* Time in jiffies before concluding the transmitter is hung. */
+#define TX_TIMEOUT  (5*HZ)
+
+static char version[] __devinitdata =
+        "Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+
+MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
+MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706 Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
+
+static int disable_msi = 0;
+
+module_param(disable_msi, int, 0);
+MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
+
+typedef enum {
+        BCM5706 = 0,
+        NC370T,
+        NC370I,
+        BCM5706S,
+        NC370F,
+} board_t;
+
+/* indexed by board_t, above */
+static struct {
+        char *name;
+} board_info[] __devinitdata = {
+        { "Broadcom NetXtreme II BCM5706 1000Base-T" },
+        { "HP NC370T Multifunction Gigabit Server Adapter" },
+        { "HP NC370i Multifunction Gigabit Server Adapter" },
+        { "Broadcom NetXtreme II BCM5706 1000Base-SX" },
+        { "HP NC370F Multifunction Gigabit Server Adapter" },
+        { 0 },
+        };
+
+static struct pci_device_id bnx2_pci_tbl[] = {
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
+          PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
+          PCI_VENDOR_ID_HP, 0x3106, 0, 0, NC370I },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706 },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
+          PCI_VENDOR_ID_HP, 0x3102, 0, 0, NC370F },
+        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706S },
+        { 0, }
+};
+
+static struct flash_spec flash_table[] =
+{
+        /* Slow EEPROM */
+        {0x00000000, 0x40030380, 0x009f0081, 0xa184a053, 0xaf000400,
+         1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
+         SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE,
+         "EEPROM - slow"},
+        /* Fast EEPROM */
+        {0x02000000, 0x62008380, 0x009f0081, 0xa184a053, 0xaf000400,
+         1, SEEPROM_PAGE_BITS, SEEPROM_PAGE_SIZE,
+         SEEPROM_BYTE_ADDR_MASK, SEEPROM_TOTAL_SIZE,
+         "EEPROM - fast"},
+        /* ATMEL AT45DB011B (buffered flash) */
+        {0x02000003, 0x6e008173, 0x00570081, 0x68848353, 0xaf000400,
+         1, BUFFERED_FLASH_PAGE_BITS, BUFFERED_FLASH_PAGE_SIZE,
+         BUFFERED_FLASH_BYTE_ADDR_MASK, BUFFERED_FLASH_TOTAL_SIZE,
+         "Buffered flash"},
+        /* Saifun SA25F005 (non-buffered flash) */
+        /* strap, cfg1, & write1 need updates */
+        {0x01000003, 0x5f008081, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE,
+         "Non-buffered flash (64kB)"},
+        /* Saifun SA25F010 (non-buffered flash) */
+        /* strap, cfg1, & write1 need updates */
+        {0x00000001, 0x47008081, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*2,
+         "Non-buffered flash (128kB)"},
+        /* Saifun SA25F020 (non-buffered flash) */
+        /* strap, cfg1, & write1 need updates */
+        {0x00000003, 0x4f008081, 0x00050081, 0x03840253, 0xaf020406,
+         0, SAIFUN_FLASH_PAGE_BITS, SAIFUN_FLASH_PAGE_SIZE,
+         SAIFUN_FLASH_BYTE_ADDR_MASK, SAIFUN_FLASH_BASE_TOTAL_SIZE*4,
+         "Non-buffered flash (256kB)"},
+};
+
+MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);
+
+static u32
+bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset)
+{
+        REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
+        return (REG_RD(bp, BNX2_PCICFG_REG_WINDOW));
+}
+
+static void
+bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val)
+{
+        REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
+        REG_WR(bp, BNX2_PCICFG_REG_WINDOW, val);
+}
+
+static void
+bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
+{
+        offset += cid_addr;
+        REG_WR(bp, BNX2_CTX_DATA_ADR, offset);
+        REG_WR(bp, BNX2_CTX_DATA, val);
+}
+
+static int
+bnx2_read_phy(struct bnx2 *bp, u32 reg, u32 *val)
+{
+        u32 val1;
+        int i, ret;
+
+        if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+                val1 &= ~BNX2_EMAC_MDIO_MODE_AUTO_POLL;
+
+                REG_WR(bp, BNX2_EMAC_MDIO_MODE, val1);
+                REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+
+                udelay(40);
+        }
+
+        val1 = (bp->phy_addr << 21) | (reg << 16) |
+                BNX2_EMAC_MDIO_COMM_COMMAND_READ | BNX2_EMAC_MDIO_COMM_DISEXT |
+                BNX2_EMAC_MDIO_COMM_START_BUSY;
+        REG_WR(bp, BNX2_EMAC_MDIO_COMM, val1);
+
+        for (i = 0; i < 50; i++) {
+                udelay(10);
+
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_COMM);
+                if (!(val1 & BNX2_EMAC_MDIO_COMM_START_BUSY)) {
+                        udelay(5);
+
+                        val1 = REG_RD(bp, BNX2_EMAC_MDIO_COMM);
+                        val1 &= BNX2_EMAC_MDIO_COMM_DATA;
+
+                        break;
+                }
+        }
+
+        if (val1 & BNX2_EMAC_MDIO_COMM_START_BUSY) {
+                *val = 0x0;
+                ret = -EBUSY;
+        }
+        else {
+                *val = val1;
+                ret = 0;
+        }
+
+        if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+                val1 |= BNX2_EMAC_MDIO_MODE_AUTO_POLL;
+
+                REG_WR(bp, BNX2_EMAC_MDIO_MODE, val1);
+                REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+
+                udelay(40);
+        }
+
+        return ret;
+}
+
+static int
+bnx2_write_phy(struct bnx2 *bp, u32 reg, u32 val)
+{
+        u32 val1;
+        int i, ret;
+
+        if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+                val1 &= ~BNX2_EMAC_MDIO_MODE_AUTO_POLL;
+
+                REG_WR(bp, BNX2_EMAC_MDIO_MODE, val1);
+                REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+
+                udelay(40);
+        }
+
+        val1 = (bp->phy_addr << 21) | (reg << 16) | val |
+                BNX2_EMAC_MDIO_COMM_COMMAND_WRITE |
+                BNX2_EMAC_MDIO_COMM_START_BUSY | BNX2_EMAC_MDIO_COMM_DISEXT;
+        REG_WR(bp, BNX2_EMAC_MDIO_COMM, val1);
+    
+        for (i = 0; i < 50; i++) {
+                udelay(10);
+
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_COMM);
+                if (!(val1 & BNX2_EMAC_MDIO_COMM_START_BUSY)) {
+                        udelay(5);
+                        break;
+                }
+        }
+
+        if (val1 & BNX2_EMAC_MDIO_COMM_START_BUSY)
+                ret = -EBUSY;
+        else
+                ret = 0;
+
+        if (bp->phy_flags & PHY_INT_MODE_AUTO_POLLING_FLAG) {
+                val1 = REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+                val1 |= BNX2_EMAC_MDIO_MODE_AUTO_POLL;
+
+                REG_WR(bp, BNX2_EMAC_MDIO_MODE, val1);
+                REG_RD(bp, BNX2_EMAC_MDIO_MODE);
+
+                udelay(40);
+        }
+
+        return ret;
+}
+
+static void
+bnx2_disable_int(struct bnx2 *bp)
+{
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+               BNX2_PCICFG_INT_ACK_CMD_MASK_INT);
+        REG_RD(bp, BNX2_PCICFG_INT_ACK_CMD);
+}
+
+static void
+bnx2_enable_int(struct bnx2 *bp)
+{
+        u32 val;
+
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+               BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | bp->last_status_idx);
+
+        val = REG_RD(bp, BNX2_HC_COMMAND);
+        REG_WR(bp, BNX2_HC_COMMAND, val | BNX2_HC_COMMAND_COAL_NOW);
+}
+
+static void
+bnx2_disable_int_sync(struct bnx2 *bp)
+{
+        atomic_inc(&bp->intr_sem);
+        bnx2_disable_int(bp);
+        synchronize_irq(bp->pdev->irq);
+}
+
+static void
+bnx2_netif_stop(struct bnx2 *bp)
+{
+        bnx2_disable_int_sync(bp);
+        if (netif_running(bp->dev)) {
+                netif_poll_disable(bp->dev);
+                netif_tx_disable(bp->dev);
+                bp->dev->trans_start = jiffies; /* prevent tx timeout */
+        }
+}
+
+static void
+bnx2_netif_start(struct bnx2 *bp)
+{
+        if (atomic_dec_and_test(&bp->intr_sem)) {
+                if (netif_running(bp->dev)) {
+                        netif_wake_queue(bp->dev);
+                        netif_poll_enable(bp->dev);
+                        bnx2_enable_int(bp);
+                }
+        }
+}
+
+static void
+bnx2_free_mem(struct bnx2 *bp)
+{
+        if (bp->stats_blk) {
+                pci_free_consistent(bp->pdev, sizeof(struct statistics_block),
+                                    bp->stats_blk, bp->stats_blk_mapping);
+                bp->stats_blk = NULL;
+        }
+        if (bp->status_blk) {
+                pci_free_consistent(bp->pdev, sizeof(struct status_block),
+                                    bp->status_blk, bp->status_blk_mapping);
+                bp->status_blk = NULL;
+        }
+        if (bp->tx_desc_ring) {
+                pci_free_consistent(bp->pdev,
+                                    sizeof(struct tx_bd) * TX_DESC_CNT,
+                                    bp->tx_desc_ring, bp->tx_desc_mapping);
+                bp->tx_desc_ring = NULL;
+        }
+        if (bp->tx_buf_ring) {
+                kfree(bp->tx_buf_ring);
+                bp->tx_buf_ring = NULL;
+        }
+        if (bp->rx_desc_ring) {
+                pci_free_consistent(bp->pdev,
+                                    sizeof(struct rx_bd) * RX_DESC_CNT,
+                                    bp->rx_desc_ring, bp->rx_desc_mapping);
+                bp->rx_desc_ring = NULL;
+        }
+        if (bp->rx_buf_ring) {
+                kfree(bp->rx_buf_ring);
+                bp->rx_buf_ring = NULL;
+        }
+}
+
+static int
+bnx2_alloc_mem(struct bnx2 *bp)
+{
+        bp->tx_buf_ring = kmalloc(sizeof(struct sw_bd) * TX_DESC_CNT,
+                                     GFP_KERNEL);
+        if (bp->tx_buf_ring == NULL)
+                return -ENOMEM;
+
+        memset(bp->tx_buf_ring, 0, sizeof(struct sw_bd) * TX_DESC_CNT);
+        bp->tx_desc_ring = pci_alloc_consistent(bp->pdev,
+                                                sizeof(struct tx_bd) *
+                                                TX_DESC_CNT,
+                                                &bp->tx_desc_mapping);
+        if (bp->tx_desc_ring == NULL)
+                goto alloc_mem_err;
+
+        bp->rx_buf_ring = kmalloc(sizeof(struct sw_bd) * RX_DESC_CNT,
+                                     GFP_KERNEL);
+        if (bp->rx_buf_ring == NULL)
+                goto alloc_mem_err;
+
+        memset(bp->rx_buf_ring, 0, sizeof(struct sw_bd) * RX_DESC_CNT);
+        bp->rx_desc_ring = pci_alloc_consistent(bp->pdev,
+                                                sizeof(struct rx_bd) *
+                                                RX_DESC_CNT,
+                                                &bp->rx_desc_mapping);
+        if (bp->rx_desc_ring == NULL)
+                goto alloc_mem_err;
+
+        bp->status_blk = pci_alloc_consistent(bp->pdev,
+                                              sizeof(struct status_block),
+                                              &bp->status_blk_mapping);
+        if (bp->status_blk == NULL)
+                goto alloc_mem_err;
+
+        memset(bp->status_blk, 0, sizeof(struct status_block));
+
+        bp->stats_blk = pci_alloc_consistent(bp->pdev,
+                                             sizeof(struct statistics_block),
+                                             &bp->stats_blk_mapping);
+        if (bp->stats_blk == NULL)
+                goto alloc_mem_err;
+
+        memset(bp->stats_blk, 0, sizeof(struct statistics_block));
+
+        return 0;
+
+alloc_mem_err:
+        bnx2_free_mem(bp);
+        return -ENOMEM;
+}
+
+static void
+bnx2_report_link(struct bnx2 *bp)
+{
+        if (bp->link_up) {
+                netif_carrier_on(bp->dev);
+                printk(KERN_INFO PFX "%s NIC Link is Up, ", bp->dev->name);
+
+                printk("%d Mbps ", bp->line_speed);
+
+                if (bp->duplex == DUPLEX_FULL)
+                        printk("full duplex");
+                else
+                        printk("half duplex");
+
+                if (bp->flow_ctrl) {
+                        if (bp->flow_ctrl & FLOW_CTRL_RX) {
+                                printk(", receive ");
+                                if (bp->flow_ctrl & FLOW_CTRL_TX)
+                                        printk("& transmit ");
+                        }
+                        else {
+                                printk(", transmit ");
+                        }
+                        printk("flow control ON");
+                }
+                printk("\n");
+        }
+        else {
+                netif_carrier_off(bp->dev);
+                printk(KERN_ERR PFX "%s NIC Link is Down\n", bp->dev->name);
+        }
+}
+
+static void
+bnx2_resolve_flow_ctrl(struct bnx2 *bp)
+{
+        u32 local_adv, remote_adv;
+
+        bp->flow_ctrl = 0;
+        if ((bp->autoneg & (AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) != 
+                (AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) {
+
+                if (bp->duplex == DUPLEX_FULL) {
+                        bp->flow_ctrl = bp->req_flow_ctrl;
+                }
+                return;
+        }
+
+        if (bp->duplex != DUPLEX_FULL) {
+                return;
+        }
+
+        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
+        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                u32 new_local_adv = 0;
+                u32 new_remote_adv = 0;
+
+                if (local_adv & ADVERTISE_1000XPAUSE)
+                        new_local_adv |= ADVERTISE_PAUSE_CAP;
+                if (local_adv & ADVERTISE_1000XPSE_ASYM)
+                        new_local_adv |= ADVERTISE_PAUSE_ASYM;
+                if (remote_adv & ADVERTISE_1000XPAUSE)
+                        new_remote_adv |= ADVERTISE_PAUSE_CAP;
+                if (remote_adv & ADVERTISE_1000XPSE_ASYM)
+                        new_remote_adv |= ADVERTISE_PAUSE_ASYM;
+
+                local_adv = new_local_adv;
+                remote_adv = new_remote_adv;
+        }
+
+        /* See Table 28B-3 of 802.3ab-1999 spec. */
+        if (local_adv & ADVERTISE_PAUSE_CAP) {
+                if(local_adv & ADVERTISE_PAUSE_ASYM) {
+                        if (remote_adv & ADVERTISE_PAUSE_CAP) {
+                                bp->flow_ctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
+                        }
+                        else if (remote_adv & ADVERTISE_PAUSE_ASYM) {
+                                bp->flow_ctrl = FLOW_CTRL_RX;
+                        }
+                }
+                else {
+                        if (remote_adv & ADVERTISE_PAUSE_CAP) {
+                                bp->flow_ctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
+                        }
+                }
+        }
+        else if (local_adv & ADVERTISE_PAUSE_ASYM) {
+                if ((remote_adv & ADVERTISE_PAUSE_CAP) &&
+                        (remote_adv & ADVERTISE_PAUSE_ASYM)) {
+
+                        bp->flow_ctrl = FLOW_CTRL_TX;
+                }
+        }
+}
+
+static int
+bnx2_serdes_linkup(struct bnx2 *bp)
+{
+        u32 bmcr, local_adv, remote_adv, common;
+
+        bp->link_up = 1;
+        bp->line_speed = SPEED_1000;
+
+        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        if (bmcr & BMCR_FULLDPLX) {
+                bp->duplex = DUPLEX_FULL;
+        }
+        else {
+                bp->duplex = DUPLEX_HALF;
+        }
+
+        if (!(bmcr & BMCR_ANENABLE)) {
+                return 0;
+        }
+
+        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
+        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+
+        common = local_adv & remote_adv;
+        if (common & (ADVERTISE_1000XHALF | ADVERTISE_1000XFULL)) {
+
+                if (common & ADVERTISE_1000XFULL) {
+                        bp->duplex = DUPLEX_FULL;
+                }
+                else {
+                        bp->duplex = DUPLEX_HALF;
+                }
+        }
+
+        return 0;
+}
+
+static int
+bnx2_copper_linkup(struct bnx2 *bp)
+{
+        u32 bmcr;
+
+        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        if (bmcr & BMCR_ANENABLE) {
+                u32 local_adv, remote_adv, common;
+
+                bnx2_read_phy(bp, MII_CTRL1000, &local_adv);
+                bnx2_read_phy(bp, MII_STAT1000, &remote_adv);
+
+                common = local_adv & (remote_adv >> 2);
+                if (common & ADVERTISE_1000FULL) {
+                        bp->line_speed = SPEED_1000;
+                        bp->duplex = DUPLEX_FULL;
+                }
+                else if (common & ADVERTISE_1000HALF) {
+                        bp->line_speed = SPEED_1000;
+                        bp->duplex = DUPLEX_HALF;
+                }
+                else {
+                        bnx2_read_phy(bp, MII_ADVERTISE, &local_adv);
+                        bnx2_read_phy(bp, MII_LPA, &remote_adv);
+
+                        common = local_adv & remote_adv;
+                        if (common & ADVERTISE_100FULL) {
+                                bp->line_speed = SPEED_100;
+                                bp->duplex = DUPLEX_FULL;
+                        }
+                        else if (common & ADVERTISE_100HALF) {
+                                bp->line_speed = SPEED_100;
+                                bp->duplex = DUPLEX_HALF;
+                        }
+                        else if (common & ADVERTISE_10FULL) {
+                                bp->line_speed = SPEED_10;
+                                bp->duplex = DUPLEX_FULL;
+                        }
+                        else if (common & ADVERTISE_10HALF) {
+                                bp->line_speed = SPEED_10;
+                                bp->duplex = DUPLEX_HALF;
+                        }
+                        else {
+                                bp->line_speed = 0;
+                                bp->link_up = 0;
+                        }
+                }
+        }
+        else {
+                if (bmcr & BMCR_SPEED100) {
+                        bp->line_speed = SPEED_100;
+                }
+                else {
+                        bp->line_speed = SPEED_10;
+                }
+                if (bmcr & BMCR_FULLDPLX) {
+                        bp->duplex = DUPLEX_FULL;
+                }
+                else {
+                        bp->duplex = DUPLEX_HALF;
+                }
+        }
+
+        return 0;
+}
+
+static int
+bnx2_set_mac_link(struct bnx2 *bp)
+{
+        u32 val;
+
+        REG_WR(bp, BNX2_EMAC_TX_LENGTHS, 0x2620);
+        if (bp->link_up && (bp->line_speed == SPEED_1000) &&
+                (bp->duplex == DUPLEX_HALF)) {
+                REG_WR(bp, BNX2_EMAC_TX_LENGTHS, 0x26ff);
+        }
+
+        /* Configure the EMAC mode register. */
+        val = REG_RD(bp, BNX2_EMAC_MODE);
+
+        val &= ~(BNX2_EMAC_MODE_PORT | BNX2_EMAC_MODE_HALF_DUPLEX |
+                BNX2_EMAC_MODE_MAC_LOOP | BNX2_EMAC_MODE_FORCE_LINK);
+
+        if (bp->link_up) {
+                if (bp->line_speed != SPEED_1000)
+                        val |= BNX2_EMAC_MODE_PORT_MII;
+                else
+                        val |= BNX2_EMAC_MODE_PORT_GMII;
+        }
+        else {
+                val |= BNX2_EMAC_MODE_PORT_GMII;
+        }
+
+        /* Set the MAC to operate in the appropriate duplex mode. */
+        if (bp->duplex == DUPLEX_HALF)
+                val |= BNX2_EMAC_MODE_HALF_DUPLEX;
+        REG_WR(bp, BNX2_EMAC_MODE, val);
+
+        /* Enable/disable rx PAUSE. */
+        bp->rx_mode &= ~BNX2_EMAC_RX_MODE_FLOW_EN;
+
+        if (bp->flow_ctrl & FLOW_CTRL_RX)
+                bp->rx_mode |= BNX2_EMAC_RX_MODE_FLOW_EN;
+        REG_WR(bp, BNX2_EMAC_RX_MODE, bp->rx_mode);
+
+        /* Enable/disable tx PAUSE. */
+        val = REG_RD(bp, BNX2_EMAC_TX_MODE);
+        val &= ~BNX2_EMAC_TX_MODE_FLOW_EN;
+
+        if (bp->flow_ctrl & FLOW_CTRL_TX)
+                val |= BNX2_EMAC_TX_MODE_FLOW_EN;
+        REG_WR(bp, BNX2_EMAC_TX_MODE, val);
+
+        /* Acknowledge the interrupt. */
+        REG_WR(bp, BNX2_EMAC_STATUS, BNX2_EMAC_STATUS_LINK_CHANGE);
+
+        return 0;
+}
+
+static int
+bnx2_set_link(struct bnx2 *bp)
+{
+        u32 bmsr;
+        u8 link_up;
+
+        if (bp->loopback == MAC_LOOPBACK) {
+                bp->link_up = 1;
+                return 0;
+        }
+
+        link_up = bp->link_up;
+
+        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+
+        if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+            (CHIP_NUM(bp) == CHIP_NUM_5706)) {
+                u32 val;
+
+                val = REG_RD(bp, BNX2_EMAC_STATUS);
+                if (val & BNX2_EMAC_STATUS_LINK)
+                        bmsr |= BMSR_LSTATUS;
+                else
+                        bmsr &= ~BMSR_LSTATUS;
+        }
+
+        if (bmsr & BMSR_LSTATUS) {
+                bp->link_up = 1;
+
+                if (bp->phy_flags & PHY_SERDES_FLAG) {
+                        bnx2_serdes_linkup(bp);
+                }
+                else {
+                        bnx2_copper_linkup(bp);
+                }
+                bnx2_resolve_flow_ctrl(bp);
+        }
+        else {
+                if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+                        (bp->autoneg & AUTONEG_SPEED)) {
+
+                        u32 bmcr;
+
+                        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+                        if (!(bmcr & BMCR_ANENABLE)) {
+                                bnx2_write_phy(bp, MII_BMCR, bmcr |
+                                        BMCR_ANENABLE);
+                        }
+                }
+                bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
+                bp->link_up = 0;
+        }
+
+        if (bp->link_up != link_up) {
+                bnx2_report_link(bp);
+        }
+
+        bnx2_set_mac_link(bp);
+
+        return 0;
+}
+
+static int
+bnx2_reset_phy(struct bnx2 *bp)
+{
+        int i;
+        u32 reg;
+
+        bnx2_write_phy(bp, MII_BMCR, BMCR_RESET);
+
+#define PHY_RESET_MAX_WAIT 100
+        for (i = 0; i < PHY_RESET_MAX_WAIT; i++) {
+                udelay(10);
+
+                bnx2_read_phy(bp, MII_BMCR, &reg);
+                if (!(reg & BMCR_RESET)) {
+                        udelay(20);
+                        break;
+                }
+        }
+        if (i == PHY_RESET_MAX_WAIT) {
+                return -EBUSY;
+        }
+        return 0;
+}
+
+static u32
+bnx2_phy_get_pause_adv(struct bnx2 *bp)
+{
+        u32 adv = 0;
+
+        if ((bp->req_flow_ctrl & (FLOW_CTRL_RX | FLOW_CTRL_TX)) ==
+                (FLOW_CTRL_RX | FLOW_CTRL_TX)) {
+
+                if (bp->phy_flags & PHY_SERDES_FLAG) {
+                        adv = ADVERTISE_1000XPAUSE;
+                }
+                else {
+                        adv = ADVERTISE_PAUSE_CAP;
+                }
+        }
+        else if (bp->req_flow_ctrl & FLOW_CTRL_TX) {
+                if (bp->phy_flags & PHY_SERDES_FLAG) {
+                        adv = ADVERTISE_1000XPSE_ASYM;
+                }
+                else {
+                        adv = ADVERTISE_PAUSE_ASYM;
+                }
+        }
+        else if (bp->req_flow_ctrl & FLOW_CTRL_RX) {
+                if (bp->phy_flags & PHY_SERDES_FLAG) {
+                        adv = ADVERTISE_1000XPAUSE | ADVERTISE_1000XPSE_ASYM;
+                }
+                else {
+                        adv = ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
+                }
+        }
+        return adv;
+}
+
+static int
+bnx2_setup_serdes_phy(struct bnx2 *bp)
+{
+        u32 adv, bmcr;
+        u32 new_adv = 0;
+
+        if (!(bp->autoneg & AUTONEG_SPEED)) {
+                u32 new_bmcr;
+
+                bnx2_read_phy(bp, MII_BMCR, &bmcr);
+                new_bmcr = bmcr & ~BMCR_ANENABLE;
+                new_bmcr |= BMCR_SPEED1000;
+                if (bp->req_duplex == DUPLEX_FULL) {
+                        new_bmcr |= BMCR_FULLDPLX;
+                }
+                else {
+                        new_bmcr &= ~BMCR_FULLDPLX;
+                }
+                if (new_bmcr != bmcr) {
+                        /* Force a link down visible on the other side */
+                        if (bp->link_up) {
+                                bnx2_read_phy(bp, MII_ADVERTISE, &adv);
+                                adv &= ~(ADVERTISE_1000XFULL |
+                                        ADVERTISE_1000XHALF);
+                                bnx2_write_phy(bp, MII_ADVERTISE, adv);
+                                bnx2_write_phy(bp, MII_BMCR, bmcr |
+                                        BMCR_ANRESTART | BMCR_ANENABLE);
+
+                                bp->link_up = 0;
+                                netif_carrier_off(bp->dev);
+                        }
+                        bnx2_write_phy(bp, MII_BMCR, new_bmcr);
+                }
+                return 0;
+        }
+
+        if (bp->advertising & ADVERTISED_1000baseT_Full)
+                new_adv |= ADVERTISE_1000XFULL;
+
+        new_adv |= bnx2_phy_get_pause_adv(bp);
+
+        bnx2_read_phy(bp, MII_ADVERTISE, &adv);
+        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+
+        bp->serdes_an_pending = 0;
+        if ((adv != new_adv) || ((bmcr & BMCR_ANENABLE) == 0)) {
+                /* Force a link down visible on the other side */
+                if (bp->link_up) {
+                        int i;
+
+                        bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                        for (i = 0; i < 110; i++) {
+                                udelay(100);
+                        }
+                }
+
+                bnx2_write_phy(bp, MII_ADVERTISE, new_adv);
+                bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART |
+                        BMCR_ANENABLE);
+                bp->serdes_an_pending = SERDES_AN_TIMEOUT / bp->timer_interval;
+        }
+
+        return 0;
+}
+
+#define ETHTOOL_ALL_FIBRE_SPEED                                         \
+        (ADVERTISED_1000baseT_Full)
+
+#define ETHTOOL_ALL_COPPER_SPEED                                        \
+        (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |            \
+        ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |           \
+        ADVERTISED_1000baseT_Full)
+
+#define PHY_ALL_10_100_SPEED (ADVERTISE_10HALF | ADVERTISE_10FULL | \
+        ADVERTISE_100HALF | ADVERTISE_100FULL | ADVERTISE_CSMA)
+        
+#define PHY_ALL_1000_SPEED (ADVERTISE_1000HALF | ADVERTISE_1000FULL)
+
+static int
+bnx2_setup_copper_phy(struct bnx2 *bp)
+{
+        u32 bmcr;
+        u32 new_bmcr;
+
+        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+
+        if (bp->autoneg & AUTONEG_SPEED) {
+                u32 adv_reg, adv1000_reg;
+                u32 new_adv_reg = 0;
+                u32 new_adv1000_reg = 0;
+
+                bnx2_read_phy(bp, MII_ADVERTISE, &adv_reg);
+                adv_reg &= (PHY_ALL_10_100_SPEED | ADVERTISE_PAUSE_CAP |
+                        ADVERTISE_PAUSE_ASYM);
+
+                bnx2_read_phy(bp, MII_CTRL1000, &adv1000_reg);
+                adv1000_reg &= PHY_ALL_1000_SPEED;
+
+                if (bp->advertising & ADVERTISED_10baseT_Half)
+                        new_adv_reg |= ADVERTISE_10HALF;
+                if (bp->advertising & ADVERTISED_10baseT_Full)
+                        new_adv_reg |= ADVERTISE_10FULL;
+                if (bp->advertising & ADVERTISED_100baseT_Half)
+                        new_adv_reg |= ADVERTISE_100HALF;
+                if (bp->advertising & ADVERTISED_100baseT_Full)
+                        new_adv_reg |= ADVERTISE_100FULL;
+                if (bp->advertising & ADVERTISED_1000baseT_Full)
+                        new_adv1000_reg |= ADVERTISE_1000FULL;
+                
+                new_adv_reg |= ADVERTISE_CSMA;
+
+                new_adv_reg |= bnx2_phy_get_pause_adv(bp);
+
+                if ((adv1000_reg != new_adv1000_reg) ||
+                        (adv_reg != new_adv_reg) ||
+                        ((bmcr & BMCR_ANENABLE) == 0)) {
+
+                        bnx2_write_phy(bp, MII_ADVERTISE, new_adv_reg);
+                        bnx2_write_phy(bp, MII_CTRL1000, new_adv1000_reg);
+                        bnx2_write_phy(bp, MII_BMCR, BMCR_ANRESTART |
+                                BMCR_ANENABLE);
+                }
+                else if (bp->link_up) {
+                        /* Flow ctrl may have changed from auto to forced */
+                        /* or vice-versa. */
+
+                        bnx2_resolve_flow_ctrl(bp);
+                        bnx2_set_mac_link(bp);
+                }
+                return 0;
+        }
+
+        new_bmcr = 0;
+        if (bp->req_line_speed == SPEED_100) {
+                new_bmcr |= BMCR_SPEED100;
+        }
+        if (bp->req_duplex == DUPLEX_FULL) {
+                new_bmcr |= BMCR_FULLDPLX;
+        }
+        if (new_bmcr != bmcr) {
+                u32 bmsr;
+                int i = 0;
+
+                bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                
+                if (bmsr & BMSR_LSTATUS) {
+                        /* Force link down */
+                        bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                        do {
+                                udelay(100);
+                                bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                                bnx2_read_phy(bp, MII_BMSR, &bmsr);
+                                i++;
+                        } while ((bmsr & BMSR_LSTATUS) && (i < 620));
+                }
+
+                bnx2_write_phy(bp, MII_BMCR, new_bmcr);
+
+                /* Normally, the new speed is setup after the link has
+                 * gone down and up again. In some cases, link will not go
+                 * down so we need to set up the new speed here.
+                 */
+                if (bmsr & BMSR_LSTATUS) {
+                        bp->line_speed = bp->req_line_speed;
+                        bp->duplex = bp->req_duplex;
+                        bnx2_resolve_flow_ctrl(bp);
+                        bnx2_set_mac_link(bp);
+                }
+        }
+        return 0;
+}
+
+static int
+bnx2_setup_phy(struct bnx2 *bp)
+{
+        if (bp->loopback == MAC_LOOPBACK)
+                return 0;
+
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                return (bnx2_setup_serdes_phy(bp));
+        }
+        else {
+                return (bnx2_setup_copper_phy(bp));
+        }
+}
+
+static int
+bnx2_init_serdes_phy(struct bnx2 *bp)
+{
+        bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5706) {
+                REG_WR(bp, BNX2_MISC_UNUSED0, 0x300);
+        }
+
+        if (bp->dev->mtu > 1500) {
+                u32 val;
+
+                /* Set extended packet length bit */
+                bnx2_write_phy(bp, 0x18, 0x7);
+                bnx2_read_phy(bp, 0x18, &val);
+                bnx2_write_phy(bp, 0x18, (val & 0xfff8) | 0x4000);
+
+                bnx2_write_phy(bp, 0x1c, 0x6c00);
+                bnx2_read_phy(bp, 0x1c, &val);
+                bnx2_write_phy(bp, 0x1c, (val & 0x3ff) | 0xec02);
+        }
+        else {
+                u32 val;
+
+                bnx2_write_phy(bp, 0x18, 0x7);
+                bnx2_read_phy(bp, 0x18, &val);
+                bnx2_write_phy(bp, 0x18, val & ~0x4007);
+
+                bnx2_write_phy(bp, 0x1c, 0x6c00);
+                bnx2_read_phy(bp, 0x1c, &val);
+                bnx2_write_phy(bp, 0x1c, (val & 0x3fd) | 0xec00);
+        }
+
+        return 0;
+}
+
+static int
+bnx2_init_copper_phy(struct bnx2 *bp)
+{
+        bp->phy_flags |= PHY_CRC_FIX_FLAG;
+
+        if (bp->phy_flags & PHY_CRC_FIX_FLAG) {
+                bnx2_write_phy(bp, 0x18, 0x0c00);
+                bnx2_write_phy(bp, 0x17, 0x000a);
+                bnx2_write_phy(bp, 0x15, 0x310b);
+                bnx2_write_phy(bp, 0x17, 0x201f);
+                bnx2_write_phy(bp, 0x15, 0x9506);
+                bnx2_write_phy(bp, 0x17, 0x401f);
+                bnx2_write_phy(bp, 0x15, 0x14e2);
+                bnx2_write_phy(bp, 0x18, 0x0400);
+        }
+
+        if (bp->dev->mtu > 1500) {
+                u32 val;
+
+                /* Set extended packet length bit */
+                bnx2_write_phy(bp, 0x18, 0x7);
+                bnx2_read_phy(bp, 0x18, &val);
+                bnx2_write_phy(bp, 0x18, val | 0x4000);
+
+                bnx2_read_phy(bp, 0x10, &val);
+                bnx2_write_phy(bp, 0x10, val | 0x1);
+        }
+        else {
+                u32 val;
+
+                bnx2_write_phy(bp, 0x18, 0x7);
+                bnx2_read_phy(bp, 0x18, &val);
+                bnx2_write_phy(bp, 0x18, val & ~0x4007);
+
+                bnx2_read_phy(bp, 0x10, &val);
+                bnx2_write_phy(bp, 0x10, val & ~0x1);
+        }
+
+        return 0;
+}
+
+
+static int
+bnx2_init_phy(struct bnx2 *bp)
+{
+        u32 val;
+        int rc = 0;
+
+        bp->phy_flags &= ~PHY_INT_MODE_MASK_FLAG;
+        bp->phy_flags |= PHY_INT_MODE_LINK_READY_FLAG;
+
+        REG_WR(bp, BNX2_EMAC_ATTENTION_ENA, BNX2_EMAC_ATTENTION_ENA_LINK);
+
+        bnx2_reset_phy(bp);
+
+        bnx2_read_phy(bp, MII_PHYSID1, &val);
+        bp->phy_id = val << 16;
+        bnx2_read_phy(bp, MII_PHYSID2, &val);
+        bp->phy_id |= val & 0xffff;
+
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                rc = bnx2_init_serdes_phy(bp);
+        }
+        else {
+                rc = bnx2_init_copper_phy(bp);
+        }
+
+        bnx2_setup_phy(bp);
+
+        return rc;
+}
+
+static int
+bnx2_set_mac_loopback(struct bnx2 *bp)
+{
+        u32 mac_mode;
+
+        mac_mode = REG_RD(bp, BNX2_EMAC_MODE);
+        mac_mode &= ~BNX2_EMAC_MODE_PORT;
+        mac_mode |= BNX2_EMAC_MODE_MAC_LOOP | BNX2_EMAC_MODE_FORCE_LINK;
+        REG_WR(bp, BNX2_EMAC_MODE, mac_mode);
+        bp->link_up = 1;
+        return 0;
+}
+
+static int
+bnx2_fw_sync(struct bnx2 *bp, u32 msg_data)
+{
+        int i;
+        u32 val;
+
+        if (bp->fw_timed_out)
+                return -EBUSY;
+
+        bp->fw_wr_seq++;
+        msg_data |= bp->fw_wr_seq;
+
+        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_MB, msg_data);
+
+        /* wait for an acknowledgement. */
+        for (i = 0; i < (FW_ACK_TIME_OUT_MS * 1000)/5; i++) {
+                udelay(5);
+
+                val = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_FW_MB);
+
+                if ((val & BNX2_FW_MSG_ACK) == (msg_data & BNX2_DRV_MSG_SEQ))
+                        break;
+        }
+
+        /* If we timed out, inform the firmware that this is the case. */
+        if (((val & BNX2_FW_MSG_ACK) != (msg_data & BNX2_DRV_MSG_SEQ)) &&
+                ((msg_data & BNX2_DRV_MSG_DATA) != BNX2_DRV_MSG_DATA_WAIT0)) {
+
+                msg_data &= ~BNX2_DRV_MSG_CODE;
+                msg_data |= BNX2_DRV_MSG_CODE_FW_TIMEOUT;
+
+                REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_MB, msg_data);
+
+                bp->fw_timed_out = 1;
+
+                return -EBUSY;
+        }
+
+        return 0;
+}
+
+static void
+bnx2_init_context(struct bnx2 *bp)
+{
+        u32 vcid;
+
+        vcid = 96;
+        while (vcid) {
+                u32 vcid_addr, pcid_addr, offset;
+
+                vcid--;
+
+                if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
+                        u32 new_vcid;
+
+                        vcid_addr = GET_PCID_ADDR(vcid);
+                        if (vcid & 0x8) {
+                                new_vcid = 0x60 + (vcid & 0xf0) + (vcid & 0x7);
+                        }
+                        else {
+                                new_vcid = vcid;
+                        }
+                        pcid_addr = GET_PCID_ADDR(new_vcid);
+                }
+                else {
+                        vcid_addr = GET_CID_ADDR(vcid);
+                        pcid_addr = vcid_addr;
+                }
+
+                REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);
+                REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+
+                /* Zero out the context. */
+                for (offset = 0; offset < PHY_CTX_SIZE; offset += 4) {
+                        CTX_WR(bp, 0x00, offset, 0);
+                }
+
+                REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);
+                REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+        }
+}
+
+static int
+bnx2_alloc_bad_rbuf(struct bnx2 *bp)
+{
+        u16 *good_mbuf;
+        u32 good_mbuf_cnt;
+        u32 val;
+
+        good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL);
+        if (good_mbuf == NULL) {
+                printk(KERN_ERR PFX "Failed to allocate memory in "
+                                    "bnx2_alloc_bad_rbuf\n");
+                return -ENOMEM;
+        }
+
+        REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
+                BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE);
+
+        good_mbuf_cnt = 0;
+
+        /* Allocate a bunch of mbufs and save the good ones in an array. */
+        val = REG_RD_IND(bp, BNX2_RBUF_STATUS1);
+        while (val & BNX2_RBUF_STATUS1_FREE_COUNT) {
+                REG_WR_IND(bp, BNX2_RBUF_COMMAND, BNX2_RBUF_COMMAND_ALLOC_REQ);
+
+                val = REG_RD_IND(bp, BNX2_RBUF_FW_BUF_ALLOC);
+
+                val &= BNX2_RBUF_FW_BUF_ALLOC_VALUE;
+
+                /* The addresses with Bit 9 set are bad memory blocks. */
+                if (!(val & (1 << 9))) {
+                        good_mbuf[good_mbuf_cnt] = (u16) val;
+                        good_mbuf_cnt++;
+                }
+
+                val = REG_RD_IND(bp, BNX2_RBUF_STATUS1);
+        }
+
+        /* Free the good ones back to the mbuf pool thus discarding
+         * all the bad ones. */
+        while (good_mbuf_cnt) {
+                good_mbuf_cnt--;
+
+                val = good_mbuf[good_mbuf_cnt];
+                val = (val << 9) | val | 1;
+
+                REG_WR_IND(bp, BNX2_RBUF_FW_BUF_FREE, val);
+        }
+        kfree(good_mbuf);
+        return 0;
+}
+
+static void
+bnx2_set_mac_addr(struct bnx2 *bp) 
+{
+        u32 val;
+        u8 *mac_addr = bp->dev->dev_addr;
+
+        val = (mac_addr[0] << 8) | mac_addr[1];
+
+        REG_WR(bp, BNX2_EMAC_MAC_MATCH0, val);
+
+        val = (mac_addr[2] << 24) | (mac_addr[3] << 16) | 
+                (mac_addr[4] << 8) | mac_addr[5];
+
+        REG_WR(bp, BNX2_EMAC_MAC_MATCH1, val);
+}
+
+static inline int
+bnx2_alloc_rx_skb(struct bnx2 *bp, u16 index)
+{
+        struct sk_buff *skb;
+        struct sw_bd *rx_buf = &bp->rx_buf_ring[index];
+        dma_addr_t mapping;
+        struct rx_bd *rxbd = &bp->rx_desc_ring[index];
+        unsigned long align;
+
+        skb = dev_alloc_skb(bp->rx_buf_size);
+        if (skb == NULL) {
+                return -ENOMEM;
+        }
+
+        if (unlikely((align = (unsigned long) skb->data & 0x7))) {
+                skb_reserve(skb, 8 - align);
+        }
+
+        skb->dev = bp->dev;
+        mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
+                PCI_DMA_FROMDEVICE);
+
+        rx_buf->skb = skb;
+        pci_unmap_addr_set(rx_buf, mapping, mapping);
+
+        rxbd->rx_bd_haddr_hi = (u64) mapping >> 32;
+        rxbd->rx_bd_haddr_lo = (u64) mapping & 0xffffffff;
+
+        bp->rx_prod_bseq += bp->rx_buf_use_size;
+
+        return 0;
+}
+
+static void
+bnx2_phy_int(struct bnx2 *bp)
+{
+        u32 new_link_state, old_link_state;
+
+        new_link_state = bp->status_blk->status_attn_bits &
+                STATUS_ATTN_BITS_LINK_STATE;
+        old_link_state = bp->status_blk->status_attn_bits_ack &
+                STATUS_ATTN_BITS_LINK_STATE;
+        if (new_link_state != old_link_state) {
+                if (new_link_state) {
+                        REG_WR(bp, BNX2_PCICFG_STATUS_BIT_SET_CMD,
+                                STATUS_ATTN_BITS_LINK_STATE);
+                }
+                else {
+                        REG_WR(bp, BNX2_PCICFG_STATUS_BIT_CLEAR_CMD,
+                                STATUS_ATTN_BITS_LINK_STATE);
+                }
+                bnx2_set_link(bp);
+        }
+}
+
+static void
+bnx2_tx_int(struct bnx2 *bp)
+{
+        u16 hw_cons, sw_cons, sw_ring_cons;
+        int tx_free_bd = 0;
+
+        hw_cons = bp->status_blk->status_tx_quick_consumer_index0;
+        if ((hw_cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT) {
+                hw_cons++;
+        }
+        sw_cons = bp->tx_cons;
+
+        while (sw_cons != hw_cons) {
+                struct sw_bd *tx_buf;
+                struct sk_buff *skb;
+                int i, last;
+
+                sw_ring_cons = TX_RING_IDX(sw_cons);
+
+                tx_buf = &bp->tx_buf_ring[sw_ring_cons];
+                skb = tx_buf->skb;
+#ifdef BCM_TSO 
+                /* partial BD completions possible with TSO packets */
+                if (skb_shinfo(skb)->tso_size) {
+                        u16 last_idx, last_ring_idx;
+
+                        last_idx = sw_cons +
+                                skb_shinfo(skb)->nr_frags + 1;
+                        last_ring_idx = sw_ring_cons +
+                                skb_shinfo(skb)->nr_frags + 1;
+                        if (unlikely(last_ring_idx >= MAX_TX_DESC_CNT)) {
+                                last_idx++;
+                        }
+                        if (((s16) ((s16) last_idx - (s16) hw_cons)) > 0) {
+                                break;
+                        }
+                }
+#endif
+                pci_unmap_single(bp->pdev, pci_unmap_addr(tx_buf, mapping),
+                        skb_headlen(skb), PCI_DMA_TODEVICE);
+
+                tx_buf->skb = NULL;
+                last = skb_shinfo(skb)->nr_frags;
+
+                for (i = 0; i < last; i++) {
+                        sw_cons = NEXT_TX_BD(sw_cons);
+
+                        pci_unmap_page(bp->pdev,
+                                pci_unmap_addr(
+                                        &bp->tx_buf_ring[TX_RING_IDX(sw_cons)],
+                                        mapping),
+                                skb_shinfo(skb)->frags[i].size,
+                                PCI_DMA_TODEVICE);
+                }
+
+                sw_cons = NEXT_TX_BD(sw_cons);
+
+                tx_free_bd += last + 1;
+
+                dev_kfree_skb_irq(skb);
+
+                hw_cons = bp->status_blk->status_tx_quick_consumer_index0;
+                if ((hw_cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT) {
+                        hw_cons++;
+                }
+        }
+
+        atomic_add(tx_free_bd, &bp->tx_avail_bd);
+
+        if (unlikely(netif_queue_stopped(bp->dev))) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&bp->tx_lock, flags);
+                if ((netif_queue_stopped(bp->dev)) &&
+                        (atomic_read(&bp->tx_avail_bd) > MAX_SKB_FRAGS)) {
+
+                        netif_wake_queue(bp->dev);
+                }
+                spin_unlock_irqrestore(&bp->tx_lock, flags);
+        }
+
+        bp->tx_cons = sw_cons;
+
+}
+
+static inline void
+bnx2_reuse_rx_skb(struct bnx2 *bp, struct sk_buff *skb,
+        u16 cons, u16 prod)
+{
+        struct sw_bd *cons_rx_buf = &bp->rx_buf_ring[cons];
+        struct sw_bd *prod_rx_buf = &bp->rx_buf_ring[prod];
+        struct rx_bd *cons_bd = &bp->rx_desc_ring[cons];
+        struct rx_bd *prod_bd = &bp->rx_desc_ring[prod];
+
+        pci_dma_sync_single_for_device(bp->pdev,
+                pci_unmap_addr(cons_rx_buf, mapping),
+                bp->rx_offset + RX_COPY_THRESH, PCI_DMA_FROMDEVICE);
+
+        prod_rx_buf->skb = cons_rx_buf->skb;
+        pci_unmap_addr_set(prod_rx_buf, mapping,
+                        pci_unmap_addr(cons_rx_buf, mapping));
+
+        memcpy(prod_bd, cons_bd, 8);
+
+        bp->rx_prod_bseq += bp->rx_buf_use_size;
+
+}
+
+static int
+bnx2_rx_int(struct bnx2 *bp, int budget)
+{
+        u16 hw_cons, sw_cons, sw_ring_cons, sw_prod, sw_ring_prod;
+        struct l2_fhdr *rx_hdr;
+        int rx_pkt = 0;
+
+        hw_cons = bp->status_blk->status_rx_quick_consumer_index0;
+        if ((hw_cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT) {
+                hw_cons++;
+        }
+        sw_cons = bp->rx_cons;
+        sw_prod = bp->rx_prod;
+
+        /* Memory barrier necessary as speculative reads of the rx
+         * buffer can be ahead of the index in the status block
+         */
+        rmb();
+        while (sw_cons != hw_cons) {
+                unsigned int len;
+                u16 status;
+                struct sw_bd *rx_buf;
+                struct sk_buff *skb;
+
+                sw_ring_cons = RX_RING_IDX(sw_cons);
+                sw_ring_prod = RX_RING_IDX(sw_prod);
+
+                rx_buf = &bp->rx_buf_ring[sw_ring_cons];
+                skb = rx_buf->skb;
+                pci_dma_sync_single_for_cpu(bp->pdev,
+                        pci_unmap_addr(rx_buf, mapping),
+                        bp->rx_offset + RX_COPY_THRESH, PCI_DMA_FROMDEVICE);
+
+                rx_hdr = (struct l2_fhdr *) skb->data;
+                len = rx_hdr->l2_fhdr_pkt_len - 4;
+
+                if (rx_hdr->l2_fhdr_errors &
+                        (L2_FHDR_ERRORS_BAD_CRC |
+                        L2_FHDR_ERRORS_PHY_DECODE |
+                        L2_FHDR_ERRORS_ALIGNMENT |
+                        L2_FHDR_ERRORS_TOO_SHORT |
+                        L2_FHDR_ERRORS_GIANT_FRAME)) {
+
+                        goto reuse_rx;
+                }
+
+                /* Since we don't have a jumbo ring, copy small packets
+                 * if mtu > 1500
+                 */
+                if ((bp->dev->mtu > 1500) && (len <= RX_COPY_THRESH)) {
+                        struct sk_buff *new_skb;
+
+                        new_skb = dev_alloc_skb(len + 2);
+                        if (new_skb == NULL)
+                                goto reuse_rx;
+
+                        /* aligned copy */
+                        memcpy(new_skb->data,
+                                skb->data + bp->rx_offset - 2,
+                                len + 2);
+
+                        skb_reserve(new_skb, 2);
+                        skb_put(new_skb, len);
+                        new_skb->dev = bp->dev;
+
+                        bnx2_reuse_rx_skb(bp, skb,
+                                sw_ring_cons, sw_ring_prod);
+
+                        skb = new_skb;
+                }
+                else if (bnx2_alloc_rx_skb(bp, sw_ring_prod) == 0) {
+                        pci_unmap_single(bp->pdev,
+                                pci_unmap_addr(rx_buf, mapping),
+                                bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+
+                        skb_reserve(skb, bp->rx_offset);
+                        skb_put(skb, len);
+                }
+                else {
+reuse_rx:
+                        bnx2_reuse_rx_skb(bp, skb,
+                                sw_ring_cons, sw_ring_prod);
+                        goto next_rx;
+                }
+
+                skb->protocol = eth_type_trans(skb, bp->dev);
+
+                if ((len > (bp->dev->mtu + ETH_HLEN)) &&
+                        (htons(skb->protocol) != 0x8100)) {
+
+                        dev_kfree_skb_irq(skb);
+                        goto next_rx;
+
+                }
+
+                status = rx_hdr->l2_fhdr_status;
+                skb->ip_summed = CHECKSUM_NONE;
+                if (bp->rx_csum &&
+                        (status & (L2_FHDR_STATUS_TCP_SEGMENT |
+                        L2_FHDR_STATUS_UDP_DATAGRAM))) {
+
+                        u16 cksum = rx_hdr->l2_fhdr_tcp_udp_xsum;
+
+                        if (cksum == 0xffff)
+                                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                }
+
+#ifdef BCM_VLAN
+                if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) && (bp->vlgrp != 0)) {
+                        vlan_hwaccel_receive_skb(skb, bp->vlgrp,
+                                rx_hdr->l2_fhdr_vlan_tag);
+                }
+                else
+#endif
+                        netif_receive_skb(skb);
+
+                bp->dev->last_rx = jiffies;
+                rx_pkt++;
+
+next_rx:
+                rx_buf->skb = NULL;
+
+                sw_cons = NEXT_RX_BD(sw_cons);
+                sw_prod = NEXT_RX_BD(sw_prod);
+
+                if ((rx_pkt == budget))
+                        break;
+        }
+        bp->rx_cons = sw_cons;
+        bp->rx_prod = sw_prod;
+
+        REG_WR16(bp, MB_RX_CID_ADDR + BNX2_L2CTX_HOST_BDIDX, sw_prod);
+
+        REG_WR(bp, MB_RX_CID_ADDR + BNX2_L2CTX_HOST_BSEQ, bp->rx_prod_bseq);
+
+        mmiowb();
+
+        return rx_pkt;
+
+}
+
+/* MSI ISR - The only difference between this and the INTx ISR
+ * is that the MSI interrupt is always serviced.
+ */
+static irqreturn_t
+bnx2_msi(int irq, void *dev_instance, struct pt_regs *regs)
+{
+        struct net_device *dev = dev_instance;
+        struct bnx2 *bp = dev->priv;
+
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+                BNX2_PCICFG_INT_ACK_CMD_USE_INT_HC_PARAM |
+                BNX2_PCICFG_INT_ACK_CMD_MASK_INT);
+
+        /* Return here if interrupt is disabled. */
+        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
+                return IRQ_RETVAL(1);
+        }
+
+        if (netif_rx_schedule_prep(dev)) {
+                __netif_rx_schedule(dev);
+        }
+
+        return IRQ_RETVAL(1);
+}
+
+static irqreturn_t
+bnx2_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
+{
+        struct net_device *dev = dev_instance;
+        struct bnx2 *bp = dev->priv;
+
+        /* When using INTx, it is possible for the interrupt to arrive
+         * at the CPU before the status block posted prior to the
+         * interrupt. Reading a register will flush the status block.
+         * When using MSI, the MSI message will always complete after
+         * the status block write.
+         */
+        if ((bp->status_blk->status_idx == bp->last_status_idx) ||
+            (REG_RD(bp, BNX2_PCICFG_MISC_STATUS) &
+             BNX2_PCICFG_MISC_STATUS_INTA_VALUE))
+                return IRQ_RETVAL(0);
+
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+                BNX2_PCICFG_INT_ACK_CMD_USE_INT_HC_PARAM |
+                BNX2_PCICFG_INT_ACK_CMD_MASK_INT);
+
+        /* Return here if interrupt is shared and is disabled. */
+        if (unlikely(atomic_read(&bp->intr_sem) != 0)) {
+                return IRQ_RETVAL(1);
+        }
+
+        if (netif_rx_schedule_prep(dev)) {
+                __netif_rx_schedule(dev);
+        }
+
+        return IRQ_RETVAL(1);
+}
+
+static int
+bnx2_poll(struct net_device *dev, int *budget)
+{
+        struct bnx2 *bp = dev->priv;
+        int rx_done = 1;
+
+        bp->last_status_idx = bp->status_blk->status_idx;
+
+        rmb();
+        if ((bp->status_blk->status_attn_bits &
+                STATUS_ATTN_BITS_LINK_STATE) !=
+                (bp->status_blk->status_attn_bits_ack &
+                STATUS_ATTN_BITS_LINK_STATE)) {
+
+                unsigned long flags;
+
+                spin_lock_irqsave(&bp->phy_lock, flags);
+                bnx2_phy_int(bp);
+                spin_unlock_irqrestore(&bp->phy_lock, flags);
+        }
+
+        if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_cons) {
+                bnx2_tx_int(bp);
+        }
+
+        if (bp->status_blk->status_rx_quick_consumer_index0 != bp->rx_cons) {
+                int orig_budget = *budget;
+                int work_done;
+
+                if (orig_budget > dev->quota)
+                        orig_budget = dev->quota;
+                
+                work_done = bnx2_rx_int(bp, orig_budget);
+                *budget -= work_done;
+                dev->quota -= work_done;
+                
+                if (work_done >= orig_budget) {
+                        rx_done = 0;
+                }
+        }
+        
+        if (rx_done) {
+                netif_rx_complete(dev);
+                REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+                        BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
+                        bp->last_status_idx);
+                return 0;
+        }
+
+        return 1;
+}
+
+/* Called with rtnl_lock from vlan functions and also dev->xmit_lock
+ * from set_multicast.
+ */
+static void
+bnx2_set_rx_mode(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        u32 rx_mode, sort_mode;
+        int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bp->phy_lock, flags);
+
+        rx_mode = bp->rx_mode & ~(BNX2_EMAC_RX_MODE_PROMISCUOUS |
+                                  BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
+        sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;
+#ifdef BCM_VLAN
+        if (!bp->vlgrp) {
+                rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
+        }
+#else
+        rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
+#endif
+        if (dev->flags & IFF_PROMISC) {
+                /* Promiscuous mode. */
+                rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS;
+                sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN;
+        }
+        else if (dev->flags & IFF_ALLMULTI) {
+                for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) {
+                        REG_WR(bp, BNX2_EMAC_MULTICAST_HASH0 + (i * 4),
+                               0xffffffff);
+                }
+                sort_mode |= BNX2_RPM_SORT_USER0_MC_EN;
+        }
+        else {
+                /* Accept one or more multicast(s). */
+                struct dev_mc_list *mclist;
+                u32 mc_filter[NUM_MC_HASH_REGISTERS];
+                u32 regidx;
+                u32 bit;
+                u32 crc;
+
+                memset(mc_filter, 0, 4 * NUM_MC_HASH_REGISTERS);
+
+                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+                     i++, mclist = mclist->next) {
+
+                        crc = ether_crc_le(ETH_ALEN, mclist->dmi_addr);
+                        bit = crc & 0xff;
+                        regidx = (bit & 0xe0) >> 5;
+                        bit &= 0x1f;
+                        mc_filter[regidx] |= (1 << bit);
+                }
+
+                for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) {
+                        REG_WR(bp, BNX2_EMAC_MULTICAST_HASH0 + (i * 4),
+                               mc_filter[i]);
+                }
+
+                sort_mode |= BNX2_RPM_SORT_USER0_MC_HSH_EN;
+        }
+
+        if (rx_mode != bp->rx_mode) {
+                bp->rx_mode = rx_mode;
+                REG_WR(bp, BNX2_EMAC_RX_MODE, rx_mode);
+        }
+
+        REG_WR(bp, BNX2_RPM_SORT_USER0, 0x0);
+        REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode);
+        REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode | BNX2_RPM_SORT_USER0_ENA);
+
+        spin_unlock_irqrestore(&bp->phy_lock, flags);
+}
+
+static void
+load_rv2p_fw(struct bnx2 *bp, u32 *rv2p_code, u32 rv2p_code_len,
+        u32 rv2p_proc)
+{
+        int i;
+        u32 val;
+
+
+        for (i = 0; i < rv2p_code_len; i += 8) {
+                REG_WR(bp, BNX2_RV2P_INSTR_HIGH, *rv2p_code);
+                rv2p_code++;
+                REG_WR(bp, BNX2_RV2P_INSTR_LOW, *rv2p_code);
+                rv2p_code++;
+
+                if (rv2p_proc == RV2P_PROC1) {
+                        val = (i / 8) | BNX2_RV2P_PROC1_ADDR_CMD_RDWR;
+                        REG_WR(bp, BNX2_RV2P_PROC1_ADDR_CMD, val);
+                }
+                else {
+                        val = (i / 8) | BNX2_RV2P_PROC2_ADDR_CMD_RDWR;
+                        REG_WR(bp, BNX2_RV2P_PROC2_ADDR_CMD, val);
+                }
+        }
+
+        /* Reset the processor, un-stall is done later. */
+        if (rv2p_proc == RV2P_PROC1) {
+                REG_WR(bp, BNX2_RV2P_COMMAND, BNX2_RV2P_COMMAND_PROC1_RESET);
+        }
+        else {
+                REG_WR(bp, BNX2_RV2P_COMMAND, BNX2_RV2P_COMMAND_PROC2_RESET);
+        }
+}
+
+static void
+load_cpu_fw(struct bnx2 *bp, struct cpu_reg *cpu_reg, struct fw_info *fw)
+{
+        u32 offset;
+        u32 val;
+
+        /* Halt the CPU. */
+        val = REG_RD_IND(bp, cpu_reg->mode);
+        val |= cpu_reg->mode_value_halt;
+        REG_WR_IND(bp, cpu_reg->mode, val);
+        REG_WR_IND(bp, cpu_reg->state, cpu_reg->state_value_clear);
+
+        /* Load the Text area. */
+        offset = cpu_reg->spad_base + (fw->text_addr - cpu_reg->mips_view_base);
+        if (fw->text) {
+                int j;
+
+                for (j = 0; j < (fw->text_len / 4); j++, offset += 4) {
+                        REG_WR_IND(bp, offset, fw->text[j]);
+                }
+        }
+
+        /* Load the Data area. */
+        offset = cpu_reg->spad_base + (fw->data_addr - cpu_reg->mips_view_base);
+        if (fw->data) {
+                int j;
+
+                for (j = 0; j < (fw->data_len / 4); j++, offset += 4) {
+                        REG_WR_IND(bp, offset, fw->data[j]);
+                }
+        }
+
+        /* Load the SBSS area. */
+        offset = cpu_reg->spad_base + (fw->sbss_addr - cpu_reg->mips_view_base);
+        if (fw->sbss) {
+                int j;
+
+                for (j = 0; j < (fw->sbss_len / 4); j++, offset += 4) {
+                        REG_WR_IND(bp, offset, fw->sbss[j]);
+                }
+        }
+
+        /* Load the BSS area. */
+        offset = cpu_reg->spad_base + (fw->bss_addr - cpu_reg->mips_view_base);
+        if (fw->bss) {
+                int j;
+
+                for (j = 0; j < (fw->bss_len/4); j++, offset += 4) {
+                        REG_WR_IND(bp, offset, fw->bss[j]);
+                }
+        }
+
+        /* Load the Read-Only area. */
+        offset = cpu_reg->spad_base +
+                (fw->rodata_addr - cpu_reg->mips_view_base);
+        if (fw->rodata) {
+                int j;
+
+                for (j = 0; j < (fw->rodata_len / 4); j++, offset += 4) {
+                        REG_WR_IND(bp, offset, fw->rodata[j]);
+                }
+        }
+
+        /* Clear the pre-fetch instruction. */
+        REG_WR_IND(bp, cpu_reg->inst, 0);
+        REG_WR_IND(bp, cpu_reg->pc, fw->start_addr);
+
+        /* Start the CPU. */
+        val = REG_RD_IND(bp, cpu_reg->mode);
+        val &= ~cpu_reg->mode_value_halt;
+        REG_WR_IND(bp, cpu_reg->state, cpu_reg->state_value_clear);
+        REG_WR_IND(bp, cpu_reg->mode, val);
+}
+
+static void
+bnx2_init_cpus(struct bnx2 *bp)
+{
+        struct cpu_reg cpu_reg;
+        struct fw_info fw;
+
+        /* Initialize the RV2P processor. */
+        load_rv2p_fw(bp, bnx2_rv2p_proc1, sizeof(bnx2_rv2p_proc1), RV2P_PROC1);
+        load_rv2p_fw(bp, bnx2_rv2p_proc2, sizeof(bnx2_rv2p_proc2), RV2P_PROC2);
+
+        /* Initialize the RX Processor. */
+        cpu_reg.mode = BNX2_RXP_CPU_MODE;
+        cpu_reg.mode_value_halt = BNX2_RXP_CPU_MODE_SOFT_HALT;
+        cpu_reg.mode_value_sstep = BNX2_RXP_CPU_MODE_STEP_ENA;
+        cpu_reg.state = BNX2_RXP_CPU_STATE;
+        cpu_reg.state_value_clear = 0xffffff;
+        cpu_reg.gpr0 = BNX2_RXP_CPU_REG_FILE;
+        cpu_reg.evmask = BNX2_RXP_CPU_EVENT_MASK;
+        cpu_reg.pc = BNX2_RXP_CPU_PROGRAM_COUNTER;
+        cpu_reg.inst = BNX2_RXP_CPU_INSTRUCTION;
+        cpu_reg.bp = BNX2_RXP_CPU_HW_BREAKPOINT;
+        cpu_reg.spad_base = BNX2_RXP_SCRATCH;
+        cpu_reg.mips_view_base = 0x8000000;
+    
+        fw.ver_major = bnx2_RXP_b06FwReleaseMajor;
+        fw.ver_minor = bnx2_RXP_b06FwReleaseMinor;
+        fw.ver_fix = bnx2_RXP_b06FwReleaseFix;
+        fw.start_addr = bnx2_RXP_b06FwStartAddr;
+
+        fw.text_addr = bnx2_RXP_b06FwTextAddr;
+        fw.text_len = bnx2_RXP_b06FwTextLen;
+        fw.text_index = 0;
+        fw.text = bnx2_RXP_b06FwText;
+
+        fw.data_addr = bnx2_RXP_b06FwDataAddr;
+        fw.data_len = bnx2_RXP_b06FwDataLen;
+        fw.data_index = 0;
+        fw.data = bnx2_RXP_b06FwData;
+
+        fw.sbss_addr = bnx2_RXP_b06FwSbssAddr;
+        fw.sbss_len = bnx2_RXP_b06FwSbssLen;
+        fw.sbss_index = 0;
+        fw.sbss = bnx2_RXP_b06FwSbss;
+
+        fw.bss_addr = bnx2_RXP_b06FwBssAddr;
+        fw.bss_len = bnx2_RXP_b06FwBssLen;
+        fw.bss_index = 0;
+        fw.bss = bnx2_RXP_b06FwBss;
+
+        fw.rodata_addr = bnx2_RXP_b06FwRodataAddr;
+        fw.rodata_len = bnx2_RXP_b06FwRodataLen;
+        fw.rodata_index = 0;
+        fw.rodata = bnx2_RXP_b06FwRodata;
+
+        load_cpu_fw(bp, &cpu_reg, &fw);
+
+        /* Initialize the TX Processor. */
+        cpu_reg.mode = BNX2_TXP_CPU_MODE;
+        cpu_reg.mode_value_halt = BNX2_TXP_CPU_MODE_SOFT_HALT;
+        cpu_reg.mode_value_sstep = BNX2_TXP_CPU_MODE_STEP_ENA;
+        cpu_reg.state = BNX2_TXP_CPU_STATE;
+        cpu_reg.state_value_clear = 0xffffff;
+        cpu_reg.gpr0 = BNX2_TXP_CPU_REG_FILE;
+        cpu_reg.evmask = BNX2_TXP_CPU_EVENT_MASK;
+        cpu_reg.pc = BNX2_TXP_CPU_PROGRAM_COUNTER;
+        cpu_reg.inst = BNX2_TXP_CPU_INSTRUCTION;
+        cpu_reg.bp = BNX2_TXP_CPU_HW_BREAKPOINT;
+        cpu_reg.spad_base = BNX2_TXP_SCRATCH;
+        cpu_reg.mips_view_base = 0x8000000;
+    
+        fw.ver_major = bnx2_TXP_b06FwReleaseMajor;
+        fw.ver_minor = bnx2_TXP_b06FwReleaseMinor;
+        fw.ver_fix = bnx2_TXP_b06FwReleaseFix;
+        fw.start_addr = bnx2_TXP_b06FwStartAddr;
+
+        fw.text_addr = bnx2_TXP_b06FwTextAddr;
+        fw.text_len = bnx2_TXP_b06FwTextLen;
+        fw.text_index = 0;
+        fw.text = bnx2_TXP_b06FwText;
+
+        fw.data_addr = bnx2_TXP_b06FwDataAddr;
+        fw.data_len = bnx2_TXP_b06FwDataLen;
+        fw.data_index = 0;
+        fw.data = bnx2_TXP_b06FwData;
+
+        fw.sbss_addr = bnx2_TXP_b06FwSbssAddr;
+        fw.sbss_len = bnx2_TXP_b06FwSbssLen;
+        fw.sbss_index = 0;
+        fw.sbss = bnx2_TXP_b06FwSbss;
+
+        fw.bss_addr = bnx2_TXP_b06FwBssAddr;
+        fw.bss_len = bnx2_TXP_b06FwBssLen;
+        fw.bss_index = 0;
+        fw.bss = bnx2_TXP_b06FwBss;
+
+        fw.rodata_addr = bnx2_TXP_b06FwRodataAddr;
+        fw.rodata_len = bnx2_TXP_b06FwRodataLen;
+        fw.rodata_index = 0;
+        fw.rodata = bnx2_TXP_b06FwRodata;
+
+        load_cpu_fw(bp, &cpu_reg, &fw);
+
+        /* Initialize the TX Patch-up Processor. */
+        cpu_reg.mode = BNX2_TPAT_CPU_MODE;
+        cpu_reg.mode_value_halt = BNX2_TPAT_CPU_MODE_SOFT_HALT;
+        cpu_reg.mode_value_sstep = BNX2_TPAT_CPU_MODE_STEP_ENA;
+        cpu_reg.state = BNX2_TPAT_CPU_STATE;
+        cpu_reg.state_value_clear = 0xffffff;
+        cpu_reg.gpr0 = BNX2_TPAT_CPU_REG_FILE;
+        cpu_reg.evmask = BNX2_TPAT_CPU_EVENT_MASK;
+        cpu_reg.pc = BNX2_TPAT_CPU_PROGRAM_COUNTER;
+        cpu_reg.inst = BNX2_TPAT_CPU_INSTRUCTION;
+        cpu_reg.bp = BNX2_TPAT_CPU_HW_BREAKPOINT;
+        cpu_reg.spad_base = BNX2_TPAT_SCRATCH;
+        cpu_reg.mips_view_base = 0x8000000;
+    
+        fw.ver_major = bnx2_TPAT_b06FwReleaseMajor;
+        fw.ver_minor = bnx2_TPAT_b06FwReleaseMinor;
+        fw.ver_fix = bnx2_TPAT_b06FwReleaseFix;
+        fw.start_addr = bnx2_TPAT_b06FwStartAddr;
+
+        fw.text_addr = bnx2_TPAT_b06FwTextAddr;
+        fw.text_len = bnx2_TPAT_b06FwTextLen;
+        fw.text_index = 0;
+        fw.text = bnx2_TPAT_b06FwText;
+
+        fw.data_addr = bnx2_TPAT_b06FwDataAddr;
+        fw.data_len = bnx2_TPAT_b06FwDataLen;
+        fw.data_index = 0;
+        fw.data = bnx2_TPAT_b06FwData;
+
+        fw.sbss_addr = bnx2_TPAT_b06FwSbssAddr;
+        fw.sbss_len = bnx2_TPAT_b06FwSbssLen;
+        fw.sbss_index = 0;
+        fw.sbss = bnx2_TPAT_b06FwSbss;
+
+        fw.bss_addr = bnx2_TPAT_b06FwBssAddr;
+        fw.bss_len = bnx2_TPAT_b06FwBssLen;
+        fw.bss_index = 0;
+        fw.bss = bnx2_TPAT_b06FwBss;
+
+        fw.rodata_addr = bnx2_TPAT_b06FwRodataAddr;
+        fw.rodata_len = bnx2_TPAT_b06FwRodataLen;
+        fw.rodata_index = 0;
+        fw.rodata = bnx2_TPAT_b06FwRodata;
+
+        load_cpu_fw(bp, &cpu_reg, &fw);
+
+        /* Initialize the Completion Processor. */
+        cpu_reg.mode = BNX2_COM_CPU_MODE;
+        cpu_reg.mode_value_halt = BNX2_COM_CPU_MODE_SOFT_HALT;
+        cpu_reg.mode_value_sstep = BNX2_COM_CPU_MODE_STEP_ENA;
+        cpu_reg.state = BNX2_COM_CPU_STATE;
+        cpu_reg.state_value_clear = 0xffffff;
+        cpu_reg.gpr0 = BNX2_COM_CPU_REG_FILE;
+        cpu_reg.evmask = BNX2_COM_CPU_EVENT_MASK;
+        cpu_reg.pc = BNX2_COM_CPU_PROGRAM_COUNTER;
+        cpu_reg.inst = BNX2_COM_CPU_INSTRUCTION;
+        cpu_reg.bp = BNX2_COM_CPU_HW_BREAKPOINT;
+        cpu_reg.spad_base = BNX2_COM_SCRATCH;
+        cpu_reg.mips_view_base = 0x8000000;
+    
+        fw.ver_major = bnx2_COM_b06FwReleaseMajor;
+        fw.ver_minor = bnx2_COM_b06FwReleaseMinor;
+        fw.ver_fix = bnx2_COM_b06FwReleaseFix;
+        fw.start_addr = bnx2_COM_b06FwStartAddr;
+
+        fw.text_addr = bnx2_COM_b06FwTextAddr;
+        fw.text_len = bnx2_COM_b06FwTextLen;
+        fw.text_index = 0;
+        fw.text = bnx2_COM_b06FwText;
+
+        fw.data_addr = bnx2_COM_b06FwDataAddr;
+        fw.data_len = bnx2_COM_b06FwDataLen;
+        fw.data_index = 0;
+        fw.data = bnx2_COM_b06FwData;
+
+        fw.sbss_addr = bnx2_COM_b06FwSbssAddr;
+        fw.sbss_len = bnx2_COM_b06FwSbssLen;
+        fw.sbss_index = 0;
+        fw.sbss = bnx2_COM_b06FwSbss;
+
+        fw.bss_addr = bnx2_COM_b06FwBssAddr;
+        fw.bss_len = bnx2_COM_b06FwBssLen;
+        fw.bss_index = 0;
+        fw.bss = bnx2_COM_b06FwBss;
+
+        fw.rodata_addr = bnx2_COM_b06FwRodataAddr;
+        fw.rodata_len = bnx2_COM_b06FwRodataLen;
+        fw.rodata_index = 0;
+        fw.rodata = bnx2_COM_b06FwRodata;
+
+        load_cpu_fw(bp, &cpu_reg, &fw);
+
+}
+
+static int
+bnx2_set_power_state(struct bnx2 *bp, int state)
+{
+        u16 pmcsr;
+
+        pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
+
+        switch (state) {
+        case 0: {
+                u32 val;
+
+                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
+                        (pmcsr & ~PCI_PM_CTRL_STATE_MASK) |
+                        PCI_PM_CTRL_PME_STATUS);
+
+                if (pmcsr & PCI_PM_CTRL_STATE_MASK)
+                        /* delay required during transition out of D3hot */
+                        msleep(20);
+
+                val = REG_RD(bp, BNX2_EMAC_MODE);
+                val |= BNX2_EMAC_MODE_MPKT_RCVD | BNX2_EMAC_MODE_ACPI_RCVD;
+                val &= ~BNX2_EMAC_MODE_MPKT;
+                REG_WR(bp, BNX2_EMAC_MODE, val);
+
+                val = REG_RD(bp, BNX2_RPM_CONFIG);
+                val &= ~BNX2_RPM_CONFIG_ACPI_ENA;
+                REG_WR(bp, BNX2_RPM_CONFIG, val);
+                break;
+        }
+        case 3: {
+                int i;
+                u32 val, wol_msg;
+
+                if (bp->wol) {
+                        u32 advertising;
+                        u8 autoneg;
+
+                        autoneg = bp->autoneg;
+                        advertising = bp->advertising;
+
+                        bp->autoneg = AUTONEG_SPEED;
+                        bp->advertising = ADVERTISED_10baseT_Half |
+                                ADVERTISED_10baseT_Full |
+                                ADVERTISED_100baseT_Half |
+                                ADVERTISED_100baseT_Full |
+                                ADVERTISED_Autoneg;
+
+                        bnx2_setup_copper_phy(bp);
+
+                        bp->autoneg = autoneg;
+                        bp->advertising = advertising;
+
+                        bnx2_set_mac_addr(bp);
+
+                        val = REG_RD(bp, BNX2_EMAC_MODE);
+
+                        /* Enable port mode. */
+                        val &= ~BNX2_EMAC_MODE_PORT;
+                        val |= BNX2_EMAC_MODE_PORT_MII |
+                               BNX2_EMAC_MODE_MPKT_RCVD |
+                               BNX2_EMAC_MODE_ACPI_RCVD |
+                               BNX2_EMAC_MODE_FORCE_LINK |
+                               BNX2_EMAC_MODE_MPKT;
+
+                        REG_WR(bp, BNX2_EMAC_MODE, val);
+
+                        /* receive all multicast */
+                        for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) {
+                                REG_WR(bp, BNX2_EMAC_MULTICAST_HASH0 + (i * 4),
+                                       0xffffffff);
+                        }
+                        REG_WR(bp, BNX2_EMAC_RX_MODE,
+                               BNX2_EMAC_RX_MODE_SORT_MODE);
+
+                        val = 1 | BNX2_RPM_SORT_USER0_BC_EN |
+                              BNX2_RPM_SORT_USER0_MC_EN;
+                        REG_WR(bp, BNX2_RPM_SORT_USER0, 0x0);
+                        REG_WR(bp, BNX2_RPM_SORT_USER0, val);
+                        REG_WR(bp, BNX2_RPM_SORT_USER0, val |
+                               BNX2_RPM_SORT_USER0_ENA);
+
+                        /* Need to enable EMAC and RPM for WOL. */
+                        REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
+                               BNX2_MISC_ENABLE_SET_BITS_RX_PARSER_MAC_ENABLE |
+                               BNX2_MISC_ENABLE_SET_BITS_TX_HEADER_Q_ENABLE |
+                               BNX2_MISC_ENABLE_SET_BITS_EMAC_ENABLE);
+
+                        val = REG_RD(bp, BNX2_RPM_CONFIG);
+                        val &= ~BNX2_RPM_CONFIG_ACPI_ENA;
+                        REG_WR(bp, BNX2_RPM_CONFIG, val);
+
+                        wol_msg = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
+                }
+                else {
+                        wol_msg = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
+                }
+
+                bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT3 | wol_msg);
+
+                pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+                if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
+                    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
+
+                        if (bp->wol)
+                                pmcsr |= 3;
+                }
+                else {
+                        pmcsr |= 3;
+                }
+                if (bp->wol) {
+                        pmcsr |= PCI_PM_CTRL_PME_ENABLE;
+                }
+                pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
+                                      pmcsr);
+
+                /* No more memory access after this point until
+                 * device is brought back to D0.
+                 */
+                udelay(50);
+                break;
+        }
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int
+bnx2_acquire_nvram_lock(struct bnx2 *bp)
+{
+        u32 val;
+        int j;
+
+        /* Request access to the flash interface. */
+        REG_WR(bp, BNX2_NVM_SW_ARB, BNX2_NVM_SW_ARB_ARB_REQ_SET2);
+        for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                val = REG_RD(bp, BNX2_NVM_SW_ARB);
+                if (val & BNX2_NVM_SW_ARB_ARB_ARB2)
+                        break;
+
+                udelay(5);
+        }
+
+        if (j >= NVRAM_TIMEOUT_COUNT)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int
+bnx2_release_nvram_lock(struct bnx2 *bp)
+{
+        int j;
+        u32 val;
+
+        /* Relinquish nvram interface. */
+        REG_WR(bp, BNX2_NVM_SW_ARB, BNX2_NVM_SW_ARB_ARB_REQ_CLR2);
+
+        for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                val = REG_RD(bp, BNX2_NVM_SW_ARB);
+                if (!(val & BNX2_NVM_SW_ARB_ARB_ARB2))
+                        break;
+
+                udelay(5);
+        }
+
+        if (j >= NVRAM_TIMEOUT_COUNT)
+                return -EBUSY;
+
+        return 0;
+}
+
+
+static int
+bnx2_enable_nvram_write(struct bnx2 *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, BNX2_MISC_CFG);
+        REG_WR(bp, BNX2_MISC_CFG, val | BNX2_MISC_CFG_NVM_WR_EN_PCI);
+
+        if (!bp->flash_info->buffered) {
+                int j;
+
+                REG_WR(bp, BNX2_NVM_COMMAND, BNX2_NVM_COMMAND_DONE);
+                REG_WR(bp, BNX2_NVM_COMMAND,
+                       BNX2_NVM_COMMAND_WREN | BNX2_NVM_COMMAND_DOIT);
+
+                for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                        udelay(5);
+
+                        val = REG_RD(bp, BNX2_NVM_COMMAND);
+                        if (val & BNX2_NVM_COMMAND_DONE)
+                                break;
+                }
+
+                if (j >= NVRAM_TIMEOUT_COUNT)
+                        return -EBUSY;
+        }
+        return 0;
+}
+
+static void
+bnx2_disable_nvram_write(struct bnx2 *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, BNX2_MISC_CFG);
+        REG_WR(bp, BNX2_MISC_CFG, val & ~BNX2_MISC_CFG_NVM_WR_EN);
+}
+
+
+static void
+bnx2_enable_nvram_access(struct bnx2 *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, BNX2_NVM_ACCESS_ENABLE);
+        /* Enable both bits, even on read. */
+        REG_WR(bp, BNX2_NVM_ACCESS_ENABLE, 
+               val | BNX2_NVM_ACCESS_ENABLE_EN | BNX2_NVM_ACCESS_ENABLE_WR_EN);
+}
+
+static void
+bnx2_disable_nvram_access(struct bnx2 *bp)
+{
+        u32 val;
+
+        val = REG_RD(bp, BNX2_NVM_ACCESS_ENABLE);
+        /* Disable both bits, even after read. */
+        REG_WR(bp, BNX2_NVM_ACCESS_ENABLE, 
+                val & ~(BNX2_NVM_ACCESS_ENABLE_EN |
+                        BNX2_NVM_ACCESS_ENABLE_WR_EN));
+}
+
+static int
+bnx2_nvram_erase_page(struct bnx2 *bp, u32 offset)
+{
+        u32 cmd;
+        int j;
+
+        if (bp->flash_info->buffered)
+                /* Buffered flash, no erase needed */
+                return 0;
+
+        /* Build an erase command */
+        cmd = BNX2_NVM_COMMAND_ERASE | BNX2_NVM_COMMAND_WR |
+              BNX2_NVM_COMMAND_DOIT;
+
+        /* Need to clear DONE bit separately. */
+        REG_WR(bp, BNX2_NVM_COMMAND, BNX2_NVM_COMMAND_DONE);
+
+        /* Address of the NVRAM to read from. */
+        REG_WR(bp, BNX2_NVM_ADDR, offset & BNX2_NVM_ADDR_NVM_ADDR_VALUE);
+
+        /* Issue an erase command. */
+        REG_WR(bp, BNX2_NVM_COMMAND, cmd);
+
+        /* Wait for completion. */
+        for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                u32 val;
+
+                udelay(5);
+
+                val = REG_RD(bp, BNX2_NVM_COMMAND);
+                if (val & BNX2_NVM_COMMAND_DONE)
+                        break;
+        }
+
+        if (j >= NVRAM_TIMEOUT_COUNT)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int
+bnx2_nvram_read_dword(struct bnx2 *bp, u32 offset, u8 *ret_val, u32 cmd_flags)
+{
+        u32 cmd;
+        int j;
+
+        /* Build the command word. */
+        cmd = BNX2_NVM_COMMAND_DOIT | cmd_flags;
+
+        /* Calculate an offset of a buffered flash. */
+        if (bp->flash_info->buffered) {
+                offset = ((offset / bp->flash_info->page_size) <<
+                           bp->flash_info->page_bits) +
+                          (offset % bp->flash_info->page_size);
+        }
+
+        /* Need to clear DONE bit separately. */
+        REG_WR(bp, BNX2_NVM_COMMAND, BNX2_NVM_COMMAND_DONE);
+
+        /* Address of the NVRAM to read from. */
+        REG_WR(bp, BNX2_NVM_ADDR, offset & BNX2_NVM_ADDR_NVM_ADDR_VALUE);
+
+        /* Issue a read command. */
+        REG_WR(bp, BNX2_NVM_COMMAND, cmd);
+
+        /* Wait for completion. */
+        for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                u32 val;
+
+                udelay(5);
+
+                val = REG_RD(bp, BNX2_NVM_COMMAND);
+                if (val & BNX2_NVM_COMMAND_DONE) {
+                        val = REG_RD(bp, BNX2_NVM_READ);
+
+                        val = be32_to_cpu(val);
+                        memcpy(ret_val, &val, 4);
+                        break;
+                }
+        }
+        if (j >= NVRAM_TIMEOUT_COUNT)
+                return -EBUSY;
+
+        return 0;
+}
+
+
+static int
+bnx2_nvram_write_dword(struct bnx2 *bp, u32 offset, u8 *val, u32 cmd_flags)
+{
+        u32 cmd, val32;
+        int j;
+
+        /* Build the command word. */
+        cmd = BNX2_NVM_COMMAND_DOIT | BNX2_NVM_COMMAND_WR | cmd_flags;
+
+        /* Calculate an offset of a buffered flash. */
+        if (bp->flash_info->buffered) {
+                offset = ((offset / bp->flash_info->page_size) <<
+                          bp->flash_info->page_bits) +
+                         (offset % bp->flash_info->page_size);
+        }
+
+        /* Need to clear DONE bit separately. */
+        REG_WR(bp, BNX2_NVM_COMMAND, BNX2_NVM_COMMAND_DONE);
+
+        memcpy(&val32, val, 4);
+        val32 = cpu_to_be32(val32);
+
+        /* Write the data. */
+        REG_WR(bp, BNX2_NVM_WRITE, val32);
+
+        /* Address of the NVRAM to write to. */
+        REG_WR(bp, BNX2_NVM_ADDR, offset & BNX2_NVM_ADDR_NVM_ADDR_VALUE);
+
+        /* Issue the write command. */
+        REG_WR(bp, BNX2_NVM_COMMAND, cmd);
+
+        /* Wait for completion. */
+        for (j = 0; j < NVRAM_TIMEOUT_COUNT; j++) {
+                udelay(5);
+
+                if (REG_RD(bp, BNX2_NVM_COMMAND) & BNX2_NVM_COMMAND_DONE)
+                        break;
+        }
+        if (j >= NVRAM_TIMEOUT_COUNT)
+                return -EBUSY;
+
+        return 0;
+}
+
+static int
+bnx2_init_nvram(struct bnx2 *bp)
+{
+        u32 val;
+        int j, entry_count, rc;
+        struct flash_spec *flash;
+
+        /* Determine the selected interface. */
+        val = REG_RD(bp, BNX2_NVM_CFG1);
+
+        entry_count = sizeof(flash_table) / sizeof(struct flash_spec);
+
+        rc = 0;
+        if (val & 0x40000000) {
+
+                /* Flash interface has been reconfigured */
+                for (j = 0, flash = &flash_table[0]; j < entry_count;
+                        j++, flash++) {
+
+                        if (val == flash->config1) {
+                                bp->flash_info = flash;
+                                break;
+                        }
+                }
+        }
+        else {
+                /* Not yet been reconfigured */
+
+                for (j = 0, flash = &flash_table[0]; j < entry_count;
+                        j++, flash++) {
+
+                        if ((val & FLASH_STRAP_MASK) == flash->strapping) {
+                                bp->flash_info = flash;
+
+                                /* Request access to the flash interface. */
+                                if ((rc = bnx2_acquire_nvram_lock(bp)) != 0)
+                                        return rc;
+
+                                /* Enable access to flash interface */
+                                bnx2_enable_nvram_access(bp);
+
+                                /* Reconfigure the flash interface */
+                                REG_WR(bp, BNX2_NVM_CFG1, flash->config1);
+                                REG_WR(bp, BNX2_NVM_CFG2, flash->config2);
+                                REG_WR(bp, BNX2_NVM_CFG3, flash->config3);
+                                REG_WR(bp, BNX2_NVM_WRITE1, flash->write1);
+
+                                /* Disable access to flash interface */
+                                bnx2_disable_nvram_access(bp);
+                                bnx2_release_nvram_lock(bp);
+
+                                break;
+                        }
+                }
+        } /* if (val & 0x40000000) */
+
+        if (j == entry_count) {
+                bp->flash_info = NULL;
+                printk(KERN_ALERT "Unknown flash/EEPROM type.\n");
+                rc = -ENODEV;
+        }
+
+        return rc;
+}
+
+static int
+bnx2_nvram_read(struct bnx2 *bp, u32 offset, u8 *ret_buf,
+                int buf_size)
+{
+        int rc = 0;
+        u32 cmd_flags, offset32, len32, extra;
+
+        if (buf_size == 0)
+                return 0;
+
+        /* Request access to the flash interface. */
+        if ((rc = bnx2_acquire_nvram_lock(bp)) != 0)
+                return rc;
+
+        /* Enable access to flash interface */
+        bnx2_enable_nvram_access(bp);
+
+        len32 = buf_size;
+        offset32 = offset;
+        extra = 0;
+
+        cmd_flags = 0;
+
+        if (offset32 & 3) {
+                u8 buf[4];
+                u32 pre_len;
+
+                offset32 &= ~3;
+                pre_len = 4 - (offset & 3);
+
+                if (pre_len >= len32) {
+                        pre_len = len32;
+                        cmd_flags = BNX2_NVM_COMMAND_FIRST |
+                                    BNX2_NVM_COMMAND_LAST;
+                }
+                else {
+                        cmd_flags = BNX2_NVM_COMMAND_FIRST;
+                }
+
+                rc = bnx2_nvram_read_dword(bp, offset32, buf, cmd_flags);
+
+                if (rc)
+                        return rc;
+
+                memcpy(ret_buf, buf + (offset & 3), pre_len);
+
+                offset32 += 4;
+                ret_buf += pre_len;
+                len32 -= pre_len;
+        }
+        if (len32 & 3) {
+                extra = 4 - (len32 & 3);
+                len32 = (len32 + 4) & ~3;
+        }
+
+        if (len32 == 4) {
+                u8 buf[4];
+
+                if (cmd_flags)
+                        cmd_flags = BNX2_NVM_COMMAND_LAST;
+                else
+                        cmd_flags = BNX2_NVM_COMMAND_FIRST |
+                                    BNX2_NVM_COMMAND_LAST;
+
+                rc = bnx2_nvram_read_dword(bp, offset32, buf, cmd_flags);
+
+                memcpy(ret_buf, buf, 4 - extra);
+        }
+        else if (len32 > 0) {
+                u8 buf[4];
+
+                /* Read the first word. */
+                if (cmd_flags)
+                        cmd_flags = 0;
+                else
+                        cmd_flags = BNX2_NVM_COMMAND_FIRST;
+
+                rc = bnx2_nvram_read_dword(bp, offset32, ret_buf, cmd_flags);
+
+                /* Advance to the next dword. */
+                offset32 += 4;
+                ret_buf += 4;
+                len32 -= 4;
+
+                while (len32 > 4 && rc == 0) {
+                        rc = bnx2_nvram_read_dword(bp, offset32, ret_buf, 0);
+
+                        /* Advance to the next dword. */
+                        offset32 += 4;
+                        ret_buf += 4;
+                        len32 -= 4;
+                }
+
+                if (rc)
+                        return rc;
+
+                cmd_flags = BNX2_NVM_COMMAND_LAST;
+                rc = bnx2_nvram_read_dword(bp, offset32, buf, cmd_flags);
+
+                memcpy(ret_buf, buf, 4 - extra);
+        }
+
+        /* Disable access to flash interface */
+        bnx2_disable_nvram_access(bp);
+
+        bnx2_release_nvram_lock(bp);
+
+        return rc;
+}
+
+static int
+bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
+                int buf_size)
+{
+        u32 written, offset32, len32;
+        u8 *buf, start[4], end[4];
+        int rc = 0;
+        int align_start, align_end;
+
+        buf = data_buf;
+        offset32 = offset;
+        len32 = buf_size;
+        align_start = align_end = 0;
+
+        if ((align_start = (offset32 & 3))) {
+                offset32 &= ~3;
+                len32 += align_start;
+                if ((rc = bnx2_nvram_read(bp, offset32, start, 4)))
+                        return rc;
+        }
+
+        if (len32 & 3) {
+                if ((len32 > 4) || !align_start) {
+                        align_end = 4 - (len32 & 3);
+                        len32 += align_end;
+                        if ((rc = bnx2_nvram_read(bp, offset32 + len32 - 4,
+                                end, 4))) {
+                                return rc;
+                        }
+                }
+        }
+
+        if (align_start || align_end) {
+                buf = kmalloc(len32, GFP_KERNEL);
+                if (buf == 0)
+                        return -ENOMEM;
+                if (align_start) {
+                        memcpy(buf, start, 4);
+                }
+                if (align_end) {
+                        memcpy(buf + len32 - 4, end, 4);
+                }
+                memcpy(buf + align_start, data_buf, buf_size);
+        }
+
+        written = 0;
+        while ((written < len32) && (rc == 0)) {
+                u32 page_start, page_end, data_start, data_end;
+                u32 addr, cmd_flags;
+                int i;
+                u8 flash_buffer[264];
+
+                /* Find the page_start addr */
+                page_start = offset32 + written;
+                page_start -= (page_start % bp->flash_info->page_size);
+                /* Find the page_end addr */
+                page_end = page_start + bp->flash_info->page_size;
+                /* Find the data_start addr */
+                data_start = (written == 0) ? offset32 : page_start;
+                /* Find the data_end addr */
+                data_end = (page_end > offset32 + len32) ? 
+                        (offset32 + len32) : page_end;
+
+                /* Request access to the flash interface. */
+                if ((rc = bnx2_acquire_nvram_lock(bp)) != 0)
+                        goto nvram_write_end;
+
+                /* Enable access to flash interface */
+                bnx2_enable_nvram_access(bp);
+
+                cmd_flags = BNX2_NVM_COMMAND_FIRST;
+                if (bp->flash_info->buffered == 0) {
+                        int j;
+
+                        /* Read the whole page into the buffer
+                         * (non-buffer flash only) */
+                        for (j = 0; j < bp->flash_info->page_size; j += 4) {
+                                if (j == (bp->flash_info->page_size - 4)) {
+                                        cmd_flags |= BNX2_NVM_COMMAND_LAST;
+                                }
+                                rc = bnx2_nvram_read_dword(bp,
+                                        page_start + j, 
+                                        &flash_buffer[j], 
+                                        cmd_flags);
+
+                                if (rc)
+                                        goto nvram_write_end;
+
+                                cmd_flags = 0;
+                        }
+                }
+
+                /* Enable writes to flash interface (unlock write-protect) */
+                if ((rc = bnx2_enable_nvram_write(bp)) != 0)
+                        goto nvram_write_end;
+
+                /* Erase the page */
+                if ((rc = bnx2_nvram_erase_page(bp, page_start)) != 0)
+                        goto nvram_write_end;
+
+                /* Re-enable the write again for the actual write */
+                bnx2_enable_nvram_write(bp);
+
+                /* Loop to write back the buffer data from page_start to
+                 * data_start */
+                i = 0;
+                if (bp->flash_info->buffered == 0) {
+                        for (addr = page_start; addr < data_start;
+                                addr += 4, i += 4) {
+                                
+                                rc = bnx2_nvram_write_dword(bp, addr,
+                                        &flash_buffer[i], cmd_flags);
+
+                                if (rc != 0)
+                                        goto nvram_write_end;
+
+                                cmd_flags = 0;
+                        }
+                }
+
+                /* Loop to write the new data from data_start to data_end */
+                for (addr = data_start; addr < data_end; addr += 4, i++) {
+                        if ((addr == page_end - 4) ||
+                                ((bp->flash_info->buffered) &&
+                                 (addr == data_end - 4))) {
+
+                                cmd_flags |= BNX2_NVM_COMMAND_LAST;
+                        }
+                        rc = bnx2_nvram_write_dword(bp, addr, buf,
+                                cmd_flags);
+
+                        if (rc != 0)
+                                goto nvram_write_end;
+
+                        cmd_flags = 0;
+                        buf += 4;
+                }
+
+                /* Loop to write back the buffer data from data_end
+                 * to page_end */
+                if (bp->flash_info->buffered == 0) {
+                        for (addr = data_end; addr < page_end;
+                                addr += 4, i += 4) {
+                        
+                                if (addr == page_end-4) {
+                                        cmd_flags = BNX2_NVM_COMMAND_LAST;
+                                }
+                                rc = bnx2_nvram_write_dword(bp, addr,
+                                        &flash_buffer[i], cmd_flags);
+
+                                if (rc != 0)
+                                        goto nvram_write_end;
+
+                                cmd_flags = 0;
+                        }
+                }
+
+                /* Disable writes to flash interface (lock write-protect) */
+                bnx2_disable_nvram_write(bp);
+
+                /* Disable access to flash interface */
+                bnx2_disable_nvram_access(bp);
+                bnx2_release_nvram_lock(bp);
+
+                /* Increment written */
+                written += data_end - data_start;
+        }
+
+nvram_write_end:
+        if (align_start || align_end)
+                kfree(buf);
+        return rc;
+}
+
+static int
+bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
+{
+        u32 val;
+        int i, rc = 0;
+
+        /* Wait for the current PCI transaction to complete before
+         * issuing a reset. */
+        REG_WR(bp, BNX2_MISC_ENABLE_CLR_BITS,
+               BNX2_MISC_ENABLE_CLR_BITS_TX_DMA_ENABLE |
+               BNX2_MISC_ENABLE_CLR_BITS_DMA_ENGINE_ENABLE |
+               BNX2_MISC_ENABLE_CLR_BITS_RX_DMA_ENABLE |
+               BNX2_MISC_ENABLE_CLR_BITS_HOST_COALESCE_ENABLE);
+        val = REG_RD(bp, BNX2_MISC_ENABLE_CLR_BITS);
+        udelay(5);
+
+        /* Deposit a driver reset signature so the firmware knows that
+         * this is a soft reset. */
+        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_RESET_SIGNATURE,
+                   BNX2_DRV_RESET_SIGNATURE_MAGIC);
+
+        bp->fw_timed_out = 0;
+
+        /* Wait for the firmware to tell us it is ok to issue a reset. */
+        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT0 | reset_code);
+
+        /* Do a dummy read to force the chip to complete all current transaction
+         * before we issue a reset. */
+        val = REG_RD(bp, BNX2_MISC_ID);
+
+        val = BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
+              BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
+              BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP;
+
+        /* Chip reset. */
+        REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
+
+        if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
+            (CHIP_ID(bp) == CHIP_ID_5706_A1))
+                msleep(15);
+
+        /* Reset takes approximate 30 usec */
+        for (i = 0; i < 10; i++) {
+                val = REG_RD(bp, BNX2_PCICFG_MISC_CONFIG);
+                if ((val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
+                            BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) == 0) {
+                        break;
+                }
+                udelay(10);
+        }
+
+        if (val & (BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ |
+                   BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY)) {
+                printk(KERN_ERR PFX "Chip reset did not complete\n");
+                return -EBUSY;
+        }
+
+        /* Make sure byte swapping is properly configured. */
+        val = REG_RD(bp, BNX2_PCI_SWAP_DIAG0);
+        if (val != 0x01020304) {
+                printk(KERN_ERR PFX "Chip not in correct endian mode\n");
+                return -ENODEV;
+        }
+
+        bp->fw_timed_out = 0;
+
+        /* Wait for the firmware to finish its initialization. */
+        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT1 | reset_code);
+
+        if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
+                /* Adjust the voltage regular to two steps lower.  The default
+                 * of this register is 0x0000000e. */
+                REG_WR(bp, BNX2_MISC_VREG_CONTROL, 0x000000fa);
+
+                /* Remove bad rbuf memory from the free pool. */
+                rc = bnx2_alloc_bad_rbuf(bp);
+        }
+
+        return rc;
+}
+
+static int
+bnx2_init_chip(struct bnx2 *bp)
+{
+        u32 val;
+
+        /* Make sure the interrupt is not active. */
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, BNX2_PCICFG_INT_ACK_CMD_MASK_INT);
+
+        val = BNX2_DMA_CONFIG_DATA_BYTE_SWAP |
+              BNX2_DMA_CONFIG_DATA_WORD_SWAP |
+#ifdef __BIG_ENDIAN
+              BNX2_DMA_CONFIG_CNTL_BYTE_SWAP | 
+#endif
+              BNX2_DMA_CONFIG_CNTL_WORD_SWAP | 
+              DMA_READ_CHANS << 12 |
+              DMA_WRITE_CHANS << 16;
+
+        val |= (0x2 << 20) | (1 << 11);
+
+        if ((bp->flags & PCIX_FLAG) && (bp->bus_speed_mhz = 133))
+                val |= (1 << 23);
+
+        if ((CHIP_NUM(bp) == CHIP_NUM_5706) &&
+            (CHIP_ID(bp) != CHIP_ID_5706_A0) && !(bp->flags & PCIX_FLAG))
+                val |= BNX2_DMA_CONFIG_CNTL_PING_PONG_DMA;
+
+        REG_WR(bp, BNX2_DMA_CONFIG, val);
+
+        if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
+                val = REG_RD(bp, BNX2_TDMA_CONFIG);
+                val |= BNX2_TDMA_CONFIG_ONE_DMA;
+                REG_WR(bp, BNX2_TDMA_CONFIG, val);
+        }
+
+        if (bp->flags & PCIX_FLAG) {
+                u16 val16;
+
+                pci_read_config_word(bp->pdev, bp->pcix_cap + PCI_X_CMD,
+                                     &val16);
+                pci_write_config_word(bp->pdev, bp->pcix_cap + PCI_X_CMD,
+                                      val16 & ~PCI_X_CMD_ERO);
+        }
+
+        REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
+               BNX2_MISC_ENABLE_SET_BITS_HOST_COALESCE_ENABLE |
+               BNX2_MISC_ENABLE_STATUS_BITS_RX_V2P_ENABLE |
+               BNX2_MISC_ENABLE_STATUS_BITS_CONTEXT_ENABLE);
+
+        /* Initialize context mapping and zero out the quick contexts.  The
+         * context block must have already been enabled. */
+        bnx2_init_context(bp);
+
+        bnx2_init_cpus(bp);
+        bnx2_init_nvram(bp);
+
+        bnx2_set_mac_addr(bp);
+
+        val = REG_RD(bp, BNX2_MQ_CONFIG);
+        val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE;
+        val |= BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;
+        REG_WR(bp, BNX2_MQ_CONFIG, val);
+
+        val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);
+        REG_WR(bp, BNX2_MQ_KNL_BYP_WIND_START, val);
+        REG_WR(bp, BNX2_MQ_KNL_WIND_END, val);
+
+        val = (BCM_PAGE_BITS - 8) << 24;
+        REG_WR(bp, BNX2_RV2P_CONFIG, val);
+
+        /* Configure page size. */
+        val = REG_RD(bp, BNX2_TBDR_CONFIG);
+        val &= ~BNX2_TBDR_CONFIG_PAGE_SIZE;
+        val |= (BCM_PAGE_BITS - 8) << 24 | 0x40;
+        REG_WR(bp, BNX2_TBDR_CONFIG, val);
+
+        val = bp->mac_addr[0] +
+              (bp->mac_addr[1] << 8) +
+              (bp->mac_addr[2] << 16) +
+              bp->mac_addr[3] +
+              (bp->mac_addr[4] << 8) +
+              (bp->mac_addr[5] << 16);
+        REG_WR(bp, BNX2_EMAC_BACKOFF_SEED, val);
+
+        /* Program the MTU.  Also include 4 bytes for CRC32. */
+        val = bp->dev->mtu + ETH_HLEN + 4;
+        if (val > (MAX_ETHERNET_PACKET_SIZE + 4))
+                val |= BNX2_EMAC_RX_MTU_SIZE_JUMBO_ENA;
+        REG_WR(bp, BNX2_EMAC_RX_MTU_SIZE, val);
+
+        bp->last_status_idx = 0;
+        bp->rx_mode = BNX2_EMAC_RX_MODE_SORT_MODE;
+
+        /* Set up how to generate a link change interrupt. */
+        REG_WR(bp, BNX2_EMAC_ATTENTION_ENA, BNX2_EMAC_ATTENTION_ENA_LINK);
+
+        REG_WR(bp, BNX2_HC_STATUS_ADDR_L,
+               (u64) bp->status_blk_mapping & 0xffffffff);
+        REG_WR(bp, BNX2_HC_STATUS_ADDR_H, (u64) bp->status_blk_mapping >> 32);
+
+        REG_WR(bp, BNX2_HC_STATISTICS_ADDR_L,
+               (u64) bp->stats_blk_mapping & 0xffffffff);
+        REG_WR(bp, BNX2_HC_STATISTICS_ADDR_H,
+               (u64) bp->stats_blk_mapping >> 32);
+
+        REG_WR(bp, BNX2_HC_TX_QUICK_CONS_TRIP, 
+               (bp->tx_quick_cons_trip_int << 16) | bp->tx_quick_cons_trip);
+
+        REG_WR(bp, BNX2_HC_RX_QUICK_CONS_TRIP,
+               (bp->rx_quick_cons_trip_int << 16) | bp->rx_quick_cons_trip);
+
+        REG_WR(bp, BNX2_HC_COMP_PROD_TRIP,
+               (bp->comp_prod_trip_int << 16) | bp->comp_prod_trip);
+
+        REG_WR(bp, BNX2_HC_TX_TICKS, (bp->tx_ticks_int << 16) | bp->tx_ticks);
+
+        REG_WR(bp, BNX2_HC_RX_TICKS, (bp->rx_ticks_int << 16) | bp->rx_ticks);
+
+        REG_WR(bp, BNX2_HC_COM_TICKS,
+               (bp->com_ticks_int << 16) | bp->com_ticks);
+
+        REG_WR(bp, BNX2_HC_CMD_TICKS,
+               (bp->cmd_ticks_int << 16) | bp->cmd_ticks);
+
+        REG_WR(bp, BNX2_HC_STATS_TICKS, bp->stats_ticks & 0xffff00);
+        REG_WR(bp, BNX2_HC_STAT_COLLECT_TICKS, 0xbb8);  /* 3ms */
+
+        if (CHIP_ID(bp) == CHIP_ID_5706_A1)
+                REG_WR(bp, BNX2_HC_CONFIG, BNX2_HC_CONFIG_COLLECT_STATS);
+        else {
+                REG_WR(bp, BNX2_HC_CONFIG, BNX2_HC_CONFIG_RX_TMR_MODE |
+                       BNX2_HC_CONFIG_TX_TMR_MODE |
+                       BNX2_HC_CONFIG_COLLECT_STATS);
+        }
+
+        /* Clear internal stats counters. */
+        REG_WR(bp, BNX2_HC_COMMAND, BNX2_HC_COMMAND_CLR_STAT_NOW);
+
+        REG_WR(bp, BNX2_HC_ATTN_BITS_ENABLE, STATUS_ATTN_BITS_LINK_STATE);
+
+        /* Initialize the receive filter. */
+        bnx2_set_rx_mode(bp->dev);
+
+        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT2 | BNX2_DRV_MSG_CODE_RESET);
+
+        REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS, 0x5ffffff);
+        REG_RD(bp, BNX2_MISC_ENABLE_SET_BITS);
+
+        udelay(20);
+
+        return 0;
+}
+
+
+static void
+bnx2_init_tx_ring(struct bnx2 *bp)
+{
+        struct tx_bd *txbd;
+        u32 val;
+
+        txbd = &bp->tx_desc_ring[MAX_TX_DESC_CNT];
+                
+        txbd->tx_bd_haddr_hi = (u64) bp->tx_desc_mapping >> 32;
+        txbd->tx_bd_haddr_lo = (u64) bp->tx_desc_mapping & 0xffffffff;
+
+        bp->tx_prod = 0;
+        bp->tx_cons = 0;
+        bp->tx_prod_bseq = 0;
+        atomic_set(&bp->tx_avail_bd, bp->tx_ring_size);
+        
+        val = BNX2_L2CTX_TYPE_TYPE_L2;
+        val |= BNX2_L2CTX_TYPE_SIZE_L2;
+        CTX_WR(bp, GET_CID_ADDR(TX_CID), BNX2_L2CTX_TYPE, val);
+
+        val = BNX2_L2CTX_CMD_TYPE_TYPE_L2;
+        val |= 8 << 16;
+        CTX_WR(bp, GET_CID_ADDR(TX_CID), BNX2_L2CTX_CMD_TYPE, val);
+
+        val = (u64) bp->tx_desc_mapping >> 32;
+        CTX_WR(bp, GET_CID_ADDR(TX_CID), BNX2_L2CTX_TBDR_BHADDR_HI, val);
+
+        val = (u64) bp->tx_desc_mapping & 0xffffffff;
+        CTX_WR(bp, GET_CID_ADDR(TX_CID), BNX2_L2CTX_TBDR_BHADDR_LO, val);
+}
+
+static void
+bnx2_init_rx_ring(struct bnx2 *bp)
+{
+        struct rx_bd *rxbd;
+        int i;
+        u16 prod, ring_prod; 
+        u32 val;
+
+        /* 8 for CRC and VLAN */
+        bp->rx_buf_use_size = bp->dev->mtu + ETH_HLEN + bp->rx_offset + 8;
+        /* 8 for alignment */
+        bp->rx_buf_size = bp->rx_buf_use_size + 8;
+
+        ring_prod = prod = bp->rx_prod = 0;
+        bp->rx_cons = 0;
+        bp->rx_prod_bseq = 0;
+                
+        rxbd = &bp->rx_desc_ring[0];
+        for (i = 0; i < MAX_RX_DESC_CNT; i++, rxbd++) {
+                rxbd->rx_bd_len = bp->rx_buf_use_size;
+                rxbd->rx_bd_flags = RX_BD_FLAGS_START | RX_BD_FLAGS_END;
+        }
+
+        rxbd->rx_bd_haddr_hi = (u64) bp->rx_desc_mapping >> 32;
+        rxbd->rx_bd_haddr_lo = (u64) bp->rx_desc_mapping & 0xffffffff;
+
+        val = BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE;
+        val |= BNX2_L2CTX_CTX_TYPE_SIZE_L2;
+        val |= 0x02 << 8;
+        CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_CTX_TYPE, val);
+
+        val = (u64) bp->rx_desc_mapping >> 32;
+        CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_NX_BDHADDR_HI, val);
+
+        val = (u64) bp->rx_desc_mapping & 0xffffffff;
+        CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_NX_BDHADDR_LO, val);
+
+        for ( ;ring_prod < bp->rx_ring_size; ) {
+                if (bnx2_alloc_rx_skb(bp, ring_prod) < 0) {
+                        break;
+                }
+                prod = NEXT_RX_BD(prod);
+                ring_prod = RX_RING_IDX(prod);
+        }
+        bp->rx_prod = prod;
+
+        REG_WR16(bp, MB_RX_CID_ADDR + BNX2_L2CTX_HOST_BDIDX, prod);
+
+        REG_WR(bp, MB_RX_CID_ADDR + BNX2_L2CTX_HOST_BSEQ, bp->rx_prod_bseq);
+}
+
+static void
+bnx2_free_tx_skbs(struct bnx2 *bp)
+{
+        int i;
+
+        if (bp->tx_buf_ring == NULL)
+                return;
+
+        for (i = 0; i < TX_DESC_CNT; ) {
+                struct sw_bd *tx_buf = &bp->tx_buf_ring[i];
+                struct sk_buff *skb = tx_buf->skb;
+                int j, last;
+
+                if (skb == NULL) {
+                        i++;
+                        continue;
+                }
+
+                pci_unmap_single(bp->pdev, pci_unmap_addr(tx_buf, mapping),
+                        skb_headlen(skb), PCI_DMA_TODEVICE);
+
+                tx_buf->skb = NULL;
+
+                last = skb_shinfo(skb)->nr_frags;
+                for (j = 0; j < last; j++) {
+                        tx_buf = &bp->tx_buf_ring[i + j + 1];
+                        pci_unmap_page(bp->pdev,
+                                pci_unmap_addr(tx_buf, mapping),
+                                skb_shinfo(skb)->frags[j].size,
+                                PCI_DMA_TODEVICE);
+                }
+                dev_kfree_skb_any(skb);
+                i += j + 1;
+        }
+
+}
+
+static void
+bnx2_free_rx_skbs(struct bnx2 *bp)
+{
+        int i;
+
+        if (bp->rx_buf_ring == NULL)
+                return;
+
+        for (i = 0; i < RX_DESC_CNT; i++) {
+                struct sw_bd *rx_buf = &bp->rx_buf_ring[i];
+                struct sk_buff *skb = rx_buf->skb;
+
+                if (skb == 0)
+                        continue;
+
+                pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping),
+                        bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
+
+                rx_buf->skb = NULL;
+
+                dev_kfree_skb_any(skb);
+        }
+}
+
+static void
+bnx2_free_skbs(struct bnx2 *bp)
+{
+        bnx2_free_tx_skbs(bp);
+        bnx2_free_rx_skbs(bp);
+}
+
+static int
+bnx2_reset_nic(struct bnx2 *bp, u32 reset_code)
+{
+        int rc;
+
+        rc = bnx2_reset_chip(bp, reset_code);
+        bnx2_free_skbs(bp);
+        if (rc)
+                return rc;
+
+        bnx2_init_chip(bp);
+        bnx2_init_tx_ring(bp);
+        bnx2_init_rx_ring(bp);
+        return 0;
+}
+
+static int
+bnx2_init_nic(struct bnx2 *bp)
+{
+        int rc;
+
+        if ((rc = bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET)) != 0)
+                return rc;
+
+        bnx2_init_phy(bp);
+        bnx2_set_link(bp);
+        return 0;
+}
+
+static int
+bnx2_test_registers(struct bnx2 *bp)
+{
+        int ret;
+        int i;
+        static struct {
+                u16   offset;
+                u16   flags;
+                u32   rw_mask;
+                u32   ro_mask;
+        } reg_tbl[] = {
+                { 0x006c, 0, 0x00000000, 0x0000003f },
+                { 0x0090, 0, 0xffffffff, 0x00000000 },
+                { 0x0094, 0, 0x00000000, 0x00000000 },
+
+                { 0x0404, 0, 0x00003f00, 0x00000000 },
+                { 0x0418, 0, 0x00000000, 0xffffffff },
+                { 0x041c, 0, 0x00000000, 0xffffffff },
+                { 0x0420, 0, 0x00000000, 0x80ffffff },
+                { 0x0424, 0, 0x00000000, 0x00000000 },
+                { 0x0428, 0, 0x00000000, 0x00000001 },
+                { 0x0450, 0, 0x00000000, 0x0000ffff },
+                { 0x0454, 0, 0x00000000, 0xffffffff },
+                { 0x0458, 0, 0x00000000, 0xffffffff },
+
+                { 0x0808, 0, 0x00000000, 0xffffffff },
+                { 0x0854, 0, 0x00000000, 0xffffffff },
+                { 0x0868, 0, 0x00000000, 0x77777777 },
+                { 0x086c, 0, 0x00000000, 0x77777777 },
+                { 0x0870, 0, 0x00000000, 0x77777777 },
+                { 0x0874, 0, 0x00000000, 0x77777777 },
+
+                { 0x0c00, 0, 0x00000000, 0x00000001 },
+                { 0x0c04, 0, 0x00000000, 0x03ff0001 },
+                { 0x0c08, 0, 0x0f0ff073, 0x00000000 },
+                { 0x0c0c, 0, 0x00ffffff, 0x00000000 },
+                { 0x0c30, 0, 0x00000000, 0xffffffff },
+                { 0x0c34, 0, 0x00000000, 0xffffffff },
+                { 0x0c38, 0, 0x00000000, 0xffffffff },
+                { 0x0c3c, 0, 0x00000000, 0xffffffff },
+                { 0x0c40, 0, 0x00000000, 0xffffffff },
+                { 0x0c44, 0, 0x00000000, 0xffffffff },
+                { 0x0c48, 0, 0x00000000, 0x0007ffff },
+                { 0x0c4c, 0, 0x00000000, 0xffffffff },
+                { 0x0c50, 0, 0x00000000, 0xffffffff },
+                { 0x0c54, 0, 0x00000000, 0xffffffff },
+                { 0x0c58, 0, 0x00000000, 0xffffffff },
+                { 0x0c5c, 0, 0x00000000, 0xffffffff },
+                { 0x0c60, 0, 0x00000000, 0xffffffff },
+                { 0x0c64, 0, 0x00000000, 0xffffffff },
+                { 0x0c68, 0, 0x00000000, 0xffffffff },
+                { 0x0c6c, 0, 0x00000000, 0xffffffff },
+                { 0x0c70, 0, 0x00000000, 0xffffffff },
+                { 0x0c74, 0, 0x00000000, 0xffffffff },
+                { 0x0c78, 0, 0x00000000, 0xffffffff },
+                { 0x0c7c, 0, 0x00000000, 0xffffffff },
+                { 0x0c80, 0, 0x00000000, 0xffffffff },
+                { 0x0c84, 0, 0x00000000, 0xffffffff },
+                { 0x0c88, 0, 0x00000000, 0xffffffff },
+                { 0x0c8c, 0, 0x00000000, 0xffffffff },
+                { 0x0c90, 0, 0x00000000, 0xffffffff },
+                { 0x0c94, 0, 0x00000000, 0xffffffff },
+                { 0x0c98, 0, 0x00000000, 0xffffffff },
+                { 0x0c9c, 0, 0x00000000, 0xffffffff },
+                { 0x0ca0, 0, 0x00000000, 0xffffffff },
+                { 0x0ca4, 0, 0x00000000, 0xffffffff },
+                { 0x0ca8, 0, 0x00000000, 0x0007ffff },
+                { 0x0cac, 0, 0x00000000, 0xffffffff },
+                { 0x0cb0, 0, 0x00000000, 0xffffffff },
+                { 0x0cb4, 0, 0x00000000, 0xffffffff },
+                { 0x0cb8, 0, 0x00000000, 0xffffffff },
+                { 0x0cbc, 0, 0x00000000, 0xffffffff },
+                { 0x0cc0, 0, 0x00000000, 0xffffffff },
+                { 0x0cc4, 0, 0x00000000, 0xffffffff },
+                { 0x0cc8, 0, 0x00000000, 0xffffffff },
+                { 0x0ccc, 0, 0x00000000, 0xffffffff },
+                { 0x0cd0, 0, 0x00000000, 0xffffffff },
+                { 0x0cd4, 0, 0x00000000, 0xffffffff },
+                { 0x0cd8, 0, 0x00000000, 0xffffffff },
+                { 0x0cdc, 0, 0x00000000, 0xffffffff },
+                { 0x0ce0, 0, 0x00000000, 0xffffffff },
+                { 0x0ce4, 0, 0x00000000, 0xffffffff },
+                { 0x0ce8, 0, 0x00000000, 0xffffffff },
+                { 0x0cec, 0, 0x00000000, 0xffffffff },
+                { 0x0cf0, 0, 0x00000000, 0xffffffff },
+                { 0x0cf4, 0, 0x00000000, 0xffffffff },
+                { 0x0cf8, 0, 0x00000000, 0xffffffff },
+                { 0x0cfc, 0, 0x00000000, 0xffffffff },
+                { 0x0d00, 0, 0x00000000, 0xffffffff },
+                { 0x0d04, 0, 0x00000000, 0xffffffff },
+
+                { 0x1000, 0, 0x00000000, 0x00000001 },
+                { 0x1004, 0, 0x00000000, 0x000f0001 },
+                { 0x1044, 0, 0x00000000, 0xffc003ff },
+                { 0x1080, 0, 0x00000000, 0x0001ffff },
+                { 0x1084, 0, 0x00000000, 0xffffffff },
+                { 0x1088, 0, 0x00000000, 0xffffffff },
+                { 0x108c, 0, 0x00000000, 0xffffffff },
+                { 0x1090, 0, 0x00000000, 0xffffffff },
+                { 0x1094, 0, 0x00000000, 0xffffffff },
+                { 0x1098, 0, 0x00000000, 0xffffffff },
+                { 0x109c, 0, 0x00000000, 0xffffffff },
+                { 0x10a0, 0, 0x00000000, 0xffffffff },
+
+                { 0x1408, 0, 0x01c00800, 0x00000000 },
+                { 0x149c, 0, 0x8000ffff, 0x00000000 },
+                { 0x14a8, 0, 0x00000000, 0x000001ff },
+                { 0x14ac, 0, 0x4fffffff, 0x10000000 },
+                { 0x14b0, 0, 0x00000002, 0x00000001 },
+                { 0x14b8, 0, 0x00000000, 0x00000000 },
+                { 0x14c0, 0, 0x00000000, 0x00000009 },
+                { 0x14c4, 0, 0x00003fff, 0x00000000 },
+                { 0x14cc, 0, 0x00000000, 0x00000001 },
+                { 0x14d0, 0, 0xffffffff, 0x00000000 },
+                { 0x1500, 0, 0x00000000, 0xffffffff },
+                { 0x1504, 0, 0x00000000, 0xffffffff },
+                { 0x1508, 0, 0x00000000, 0xffffffff },
+                { 0x150c, 0, 0x00000000, 0xffffffff },
+                { 0x1510, 0, 0x00000000, 0xffffffff },
+                { 0x1514, 0, 0x00000000, 0xffffffff },
+                { 0x1518, 0, 0x00000000, 0xffffffff },
+                { 0x151c, 0, 0x00000000, 0xffffffff },
+                { 0x1520, 0, 0x00000000, 0xffffffff },
+                { 0x1524, 0, 0x00000000, 0xffffffff },
+                { 0x1528, 0, 0x00000000, 0xffffffff },
+                { 0x152c, 0, 0x00000000, 0xffffffff },
+                { 0x1530, 0, 0x00000000, 0xffffffff },
+                { 0x1534, 0, 0x00000000, 0xffffffff },
+                { 0x1538, 0, 0x00000000, 0xffffffff },
+                { 0x153c, 0, 0x00000000, 0xffffffff },
+                { 0x1540, 0, 0x00000000, 0xffffffff },
+                { 0x1544, 0, 0x00000000, 0xffffffff },
+                { 0x1548, 0, 0x00000000, 0xffffffff },
+                { 0x154c, 0, 0x00000000, 0xffffffff },
+                { 0x1550, 0, 0x00000000, 0xffffffff },
+                { 0x1554, 0, 0x00000000, 0xffffffff },
+                { 0x1558, 0, 0x00000000, 0xffffffff },
+                { 0x1600, 0, 0x00000000, 0xffffffff },
+                { 0x1604, 0, 0x00000000, 0xffffffff },
+                { 0x1608, 0, 0x00000000, 0xffffffff },
+                { 0x160c, 0, 0x00000000, 0xffffffff },
+                { 0x1610, 0, 0x00000000, 0xffffffff },
+                { 0x1614, 0, 0x00000000, 0xffffffff },
+                { 0x1618, 0, 0x00000000, 0xffffffff },
+                { 0x161c, 0, 0x00000000, 0xffffffff },
+                { 0x1620, 0, 0x00000000, 0xffffffff },
+                { 0x1624, 0, 0x00000000, 0xffffffff },
+                { 0x1628, 0, 0x00000000, 0xffffffff },
+                { 0x162c, 0, 0x00000000, 0xffffffff },
+                { 0x1630, 0, 0x00000000, 0xffffffff },
+                { 0x1634, 0, 0x00000000, 0xffffffff },
+                { 0x1638, 0, 0x00000000, 0xffffffff },
+                { 0x163c, 0, 0x00000000, 0xffffffff },
+                { 0x1640, 0, 0x00000000, 0xffffffff },
+                { 0x1644, 0, 0x00000000, 0xffffffff },
+                { 0x1648, 0, 0x00000000, 0xffffffff },
+                { 0x164c, 0, 0x00000000, 0xffffffff },
+                { 0x1650, 0, 0x00000000, 0xffffffff },
+                { 0x1654, 0, 0x00000000, 0xffffffff },
+
+                { 0x1800, 0, 0x00000000, 0x00000001 },
+                { 0x1804, 0, 0x00000000, 0x00000003 },
+                { 0x1840, 0, 0x00000000, 0xffffffff },
+                { 0x1844, 0, 0x00000000, 0xffffffff },
+                { 0x1848, 0, 0x00000000, 0xffffffff },
+                { 0x184c, 0, 0x00000000, 0xffffffff },
+                { 0x1850, 0, 0x00000000, 0xffffffff },
+                { 0x1900, 0, 0x7ffbffff, 0x00000000 },
+                { 0x1904, 0, 0xffffffff, 0x00000000 },
+                { 0x190c, 0, 0xffffffff, 0x00000000 },
+                { 0x1914, 0, 0xffffffff, 0x00000000 },
+                { 0x191c, 0, 0xffffffff, 0x00000000 },
+                { 0x1924, 0, 0xffffffff, 0x00000000 },
+                { 0x192c, 0, 0xffffffff, 0x00000000 },
+                { 0x1934, 0, 0xffffffff, 0x00000000 },
+                { 0x193c, 0, 0xffffffff, 0x00000000 },
+                { 0x1944, 0, 0xffffffff, 0x00000000 },
+                { 0x194c, 0, 0xffffffff, 0x00000000 },
+                { 0x1954, 0, 0xffffffff, 0x00000000 },
+                { 0x195c, 0, 0xffffffff, 0x00000000 },
+                { 0x1964, 0, 0xffffffff, 0x00000000 },
+                { 0x196c, 0, 0xffffffff, 0x00000000 },
+                { 0x1974, 0, 0xffffffff, 0x00000000 },
+                { 0x197c, 0, 0xffffffff, 0x00000000 },
+                { 0x1980, 0, 0x0700ffff, 0x00000000 },
+
+                { 0x1c00, 0, 0x00000000, 0x00000001 },
+                { 0x1c04, 0, 0x00000000, 0x00000003 },
+                { 0x1c08, 0, 0x0000000f, 0x00000000 },
+                { 0x1c40, 0, 0x00000000, 0xffffffff },
+                { 0x1c44, 0, 0x00000000, 0xffffffff },
+                { 0x1c48, 0, 0x00000000, 0xffffffff },
+                { 0x1c4c, 0, 0x00000000, 0xffffffff },
+                { 0x1c50, 0, 0x00000000, 0xffffffff },
+                { 0x1d00, 0, 0x7ffbffff, 0x00000000 },
+                { 0x1d04, 0, 0xffffffff, 0x00000000 },
+                { 0x1d0c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d14, 0, 0xffffffff, 0x00000000 },
+                { 0x1d1c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d24, 0, 0xffffffff, 0x00000000 },
+                { 0x1d2c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d34, 0, 0xffffffff, 0x00000000 },
+                { 0x1d3c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d44, 0, 0xffffffff, 0x00000000 },
+                { 0x1d4c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d54, 0, 0xffffffff, 0x00000000 },
+                { 0x1d5c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d64, 0, 0xffffffff, 0x00000000 },
+                { 0x1d6c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d74, 0, 0xffffffff, 0x00000000 },
+                { 0x1d7c, 0, 0xffffffff, 0x00000000 },
+                { 0x1d80, 0, 0x0700ffff, 0x00000000 },
+
+                { 0x2004, 0, 0x00000000, 0x0337000f },
+                { 0x2008, 0, 0xffffffff, 0x00000000 },
+                { 0x200c, 0, 0xffffffff, 0x00000000 },
+                { 0x2010, 0, 0xffffffff, 0x00000000 },
+                { 0x2014, 0, 0x801fff80, 0x00000000 },
+                { 0x2018, 0, 0x000003ff, 0x00000000 },
+
+                { 0x2800, 0, 0x00000000, 0x00000001 },
+                { 0x2804, 0, 0x00000000, 0x00003f01 },
+                { 0x2808, 0, 0x0f3f3f03, 0x00000000 },
+                { 0x2810, 0, 0xffff0000, 0x00000000 },
+                { 0x2814, 0, 0xffff0000, 0x00000000 },
+                { 0x2818, 0, 0xffff0000, 0x00000000 },
+                { 0x281c, 0, 0xffff0000, 0x00000000 },
+                { 0x2834, 0, 0xffffffff, 0x00000000 },
+                { 0x2840, 0, 0x00000000, 0xffffffff },
+                { 0x2844, 0, 0x00000000, 0xffffffff },
+                { 0x2848, 0, 0xffffffff, 0x00000000 },
+                { 0x284c, 0, 0xf800f800, 0x07ff07ff },
+
+                { 0x2c00, 0, 0x00000000, 0x00000011 },
+                { 0x2c04, 0, 0x00000000, 0x00030007 },
+
+                { 0x3000, 0, 0x00000000, 0x00000001 },
+                { 0x3004, 0, 0x00000000, 0x007007ff },
+                { 0x3008, 0, 0x00000003, 0x00000000 },
+                { 0x300c, 0, 0xffffffff, 0x00000000 },
+                { 0x3010, 0, 0xffffffff, 0x00000000 },
+                { 0x3014, 0, 0xffffffff, 0x00000000 },
+                { 0x3034, 0, 0xffffffff, 0x00000000 },
+                { 0x3038, 0, 0xffffffff, 0x00000000 },
+                { 0x3050, 0, 0x00000001, 0x00000000 },
+
+                { 0x3c00, 0, 0x00000000, 0x00000001 },
+                { 0x3c04, 0, 0x00000000, 0x00070000 },
+                { 0x3c08, 0, 0x00007f71, 0x07f00000 },
+                { 0x3c0c, 0, 0x1f3ffffc, 0x00000000 },
+                { 0x3c10, 0, 0xffffffff, 0x00000000 },
+                { 0x3c14, 0, 0x00000000, 0xffffffff },
+                { 0x3c18, 0, 0x00000000, 0xffffffff },
+                { 0x3c1c, 0, 0xfffff000, 0x00000000 },
+                { 0x3c20, 0, 0xffffff00, 0x00000000 },
+                { 0x3c24, 0, 0xffffffff, 0x00000000 },
+                { 0x3c28, 0, 0xffffffff, 0x00000000 },
+                { 0x3c2c, 0, 0xffffffff, 0x00000000 },
+                { 0x3c30, 0, 0xffffffff, 0x00000000 },
+                { 0x3c34, 0, 0xffffffff, 0x00000000 },
+                { 0x3c38, 0, 0xffffffff, 0x00000000 },
+                { 0x3c3c, 0, 0xffffffff, 0x00000000 },
+                { 0x3c40, 0, 0xffffffff, 0x00000000 },
+                { 0x3c44, 0, 0xffffffff, 0x00000000 },
+                { 0x3c48, 0, 0xffffffff, 0x00000000 },
+                { 0x3c4c, 0, 0xffffffff, 0x00000000 },
+                { 0x3c50, 0, 0xffffffff, 0x00000000 },
+                { 0x3c54, 0, 0xffffffff, 0x00000000 },
+                { 0x3c58, 0, 0xffffffff, 0x00000000 },
+                { 0x3c5c, 0, 0xffffffff, 0x00000000 },
+                { 0x3c60, 0, 0xffffffff, 0x00000000 },
+                { 0x3c64, 0, 0xffffffff, 0x00000000 },
+                { 0x3c68, 0, 0xffffffff, 0x00000000 },
+                { 0x3c6c, 0, 0xffffffff, 0x00000000 },
+                { 0x3c70, 0, 0xffffffff, 0x00000000 },
+                { 0x3c74, 0, 0x0000003f, 0x00000000 },
+                { 0x3c78, 0, 0x00000000, 0x00000000 },
+                { 0x3c7c, 0, 0x00000000, 0x00000000 },
+                { 0x3c80, 0, 0x3fffffff, 0x00000000 },
+                { 0x3c84, 0, 0x0000003f, 0x00000000 },
+                { 0x3c88, 0, 0x00000000, 0xffffffff },
+                { 0x3c8c, 0, 0x00000000, 0xffffffff },
+
+                { 0x4000, 0, 0x00000000, 0x00000001 },
+                { 0x4004, 0, 0x00000000, 0x00030000 },
+                { 0x4008, 0, 0x00000ff0, 0x00000000 },
+                { 0x400c, 0, 0xffffffff, 0x00000000 },
+                { 0x4088, 0, 0x00000000, 0x00070303 },
+
+                { 0x4400, 0, 0x00000000, 0x00000001 },
+                { 0x4404, 0, 0x00000000, 0x00003f01 },
+                { 0x4408, 0, 0x7fff00ff, 0x00000000 },
+                { 0x440c, 0, 0xffffffff, 0x00000000 },
+                { 0x4410, 0, 0xffff,     0x0000 },
+                { 0x4414, 0, 0xffff,     0x0000 },
+                { 0x4418, 0, 0xffff,     0x0000 },
+                { 0x441c, 0, 0xffff,     0x0000 },
+                { 0x4428, 0, 0xffffffff, 0x00000000 },
+                { 0x442c, 0, 0xffffffff, 0x00000000 },
+                { 0x4430, 0, 0xffffffff, 0x00000000 },
+                { 0x4434, 0, 0xffffffff, 0x00000000 },
+                { 0x4438, 0, 0xffffffff, 0x00000000 },
+                { 0x443c, 0, 0xffffffff, 0x00000000 },
+                { 0x4440, 0, 0xffffffff, 0x00000000 },
+                { 0x4444, 0, 0xffffffff, 0x00000000 },
+
+                { 0x4c00, 0, 0x00000000, 0x00000001 },
+                { 0x4c04, 0, 0x00000000, 0x0000003f },
+                { 0x4c08, 0, 0xffffffff, 0x00000000 },
+                { 0x4c0c, 0, 0x0007fc00, 0x00000000 },
+                { 0x4c10, 0, 0x80003fe0, 0x00000000 },
+                { 0x4c14, 0, 0xffffffff, 0x00000000 },
+                { 0x4c44, 0, 0x00000000, 0x9fff9fff },
+                { 0x4c48, 0, 0x00000000, 0xb3009fff },
+                { 0x4c4c, 0, 0x00000000, 0x77f33b30 },
+                { 0x4c50, 0, 0x00000000, 0xffffffff },
+
+                { 0x5004, 0, 0x00000000, 0x0000007f },
+                { 0x5008, 0, 0x0f0007ff, 0x00000000 },
+                { 0x500c, 0, 0xf800f800, 0x07ff07ff },
+
+                { 0x5400, 0, 0x00000008, 0x00000001 },
+                { 0x5404, 0, 0x00000000, 0x0000003f },
+                { 0x5408, 0, 0x0000001f, 0x00000000 },
+                { 0x540c, 0, 0xffffffff, 0x00000000 },
+                { 0x5410, 0, 0xffffffff, 0x00000000 },
+                { 0x5414, 0, 0x0000ffff, 0x00000000 },
+                { 0x5418, 0, 0x0000ffff, 0x00000000 },
+                { 0x541c, 0, 0x0000ffff, 0x00000000 },
+                { 0x5420, 0, 0x0000ffff, 0x00000000 },
+                { 0x5428, 0, 0x000000ff, 0x00000000 },
+                { 0x542c, 0, 0xff00ffff, 0x00000000 },
+                { 0x5430, 0, 0x001fff80, 0x00000000 },
+                { 0x5438, 0, 0xffffffff, 0x00000000 },
+                { 0x543c, 0, 0xffffffff, 0x00000000 },
+                { 0x5440, 0, 0xf800f800, 0x07ff07ff },
+
+                { 0x5c00, 0, 0x00000000, 0x00000001 },
+                { 0x5c04, 0, 0x00000000, 0x0003000f },
+                { 0x5c08, 0, 0x00000003, 0x00000000 },
+                { 0x5c0c, 0, 0x0000fff8, 0x00000000 },
+                { 0x5c10, 0, 0x00000000, 0xffffffff },
+                { 0x5c80, 0, 0x00000000, 0x0f7113f1 },
+                { 0x5c84, 0, 0x00000000, 0x0000f333 },
+                { 0x5c88, 0, 0x00000000, 0x00077373 },
+                { 0x5c8c, 0, 0x00000000, 0x0007f737 },
+
+                { 0x6808, 0, 0x0000ff7f, 0x00000000 },
+                { 0x680c, 0, 0xffffffff, 0x00000000 },
+                { 0x6810, 0, 0xffffffff, 0x00000000 },
+                { 0x6814, 0, 0xffffffff, 0x00000000 },
+                { 0x6818, 0, 0xffffffff, 0x00000000 },
+                { 0x681c, 0, 0xffffffff, 0x00000000 },
+                { 0x6820, 0, 0x00ff00ff, 0x00000000 },
+                { 0x6824, 0, 0x00ff00ff, 0x00000000 },
+                { 0x6828, 0, 0x00ff00ff, 0x00000000 },
+                { 0x682c, 0, 0x03ff03ff, 0x00000000 },
+                { 0x6830, 0, 0x03ff03ff, 0x00000000 },
+                { 0x6834, 0, 0x03ff03ff, 0x00000000 },
+                { 0x6838, 0, 0x03ff03ff, 0x00000000 },
+                { 0x683c, 0, 0x0000ffff, 0x00000000 },
+                { 0x6840, 0, 0x00000ff0, 0x00000000 },
+                { 0x6844, 0, 0x00ffff00, 0x00000000 },
+                { 0x684c, 0, 0xffffffff, 0x00000000 },
+                { 0x6850, 0, 0x7f7f7f7f, 0x00000000 },
+                { 0x6854, 0, 0x7f7f7f7f, 0x00000000 },
+                { 0x6858, 0, 0x7f7f7f7f, 0x00000000 },
+                { 0x685c, 0, 0x7f7f7f7f, 0x00000000 },
+                { 0x6908, 0, 0x00000000, 0x0001ff0f },
+                { 0x690c, 0, 0x00000000, 0x0ffe00f0 },
+
+                { 0xffff, 0, 0x00000000, 0x00000000 },
+        };
+
+        ret = 0;
+        for (i = 0; reg_tbl[i].offset != 0xffff; i++) {
+                u32 offset, rw_mask, ro_mask, save_val, val;
+
+                offset = (u32) reg_tbl[i].offset;
+                rw_mask = reg_tbl[i].rw_mask;
+                ro_mask = reg_tbl[i].ro_mask;
+
+                save_val = readl((u8 *) bp->regview + offset);
+
+                writel(0, (u8 *) bp->regview + offset);
+
+                val = readl((u8 *) bp->regview + offset);
+                if ((val & rw_mask) != 0) {
+                        goto reg_test_err;
+                }
+
+                if ((val & ro_mask) != (save_val & ro_mask)) {
+                        goto reg_test_err;
+                }
+
+                writel(0xffffffff, (u8 *) bp->regview + offset);
+
+                val = readl((u8 *) bp->regview + offset);
+                if ((val & rw_mask) != rw_mask) {
+                        goto reg_test_err;
+                }
+
+                if ((val & ro_mask) != (save_val & ro_mask)) {
+                        goto reg_test_err;
+                }
+
+                writel(save_val, (u8 *) bp->regview + offset);
+                continue;
+
+reg_test_err:
+                writel(save_val, (u8 *) bp->regview + offset);
+                ret = -ENODEV;
+                break;
+        }
+        return ret;
+}
+
+static int
+bnx2_do_mem_test(struct bnx2 *bp, u32 start, u32 size)
+{
+        static u32 test_pattern[] = { 0x00000000, 0xffffffff, 0x55555555,
+                0xaaaaaaaa , 0xaa55aa55, 0x55aa55aa };
+        int i;
+
+        for (i = 0; i < sizeof(test_pattern) / 4; i++) {
+                u32 offset;
+
+                for (offset = 0; offset < size; offset += 4) {
+
+                        REG_WR_IND(bp, start + offset, test_pattern[i]);
+
+                        if (REG_RD_IND(bp, start + offset) !=
+                                test_pattern[i]) {
+                                return -ENODEV;
+                        }
+                }
+        }
+        return 0;
+}
+
+static int
+bnx2_test_memory(struct bnx2 *bp)
+{
+        int ret = 0;
+        int i;
+        static struct {
+                u32   offset;
+                u32   len;
+        } mem_tbl[] = {
+                { 0x60000,  0x4000 },
+                { 0xa0000,  0x4000 },
+                { 0xe0000,  0x4000 },
+                { 0x120000, 0x4000 },
+                { 0x1a0000, 0x4000 },
+                { 0x160000, 0x4000 },
+                { 0xffffffff, 0    },
+        };
+
+        for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) {
+                if ((ret = bnx2_do_mem_test(bp, mem_tbl[i].offset,
+                        mem_tbl[i].len)) != 0) {
+                        return ret;
+                }
+        }
+        
+        return ret;
+}
+
+static int
+bnx2_test_loopback(struct bnx2 *bp)
+{
+        unsigned int pkt_size, num_pkts, i;
+        struct sk_buff *skb, *rx_skb;
+        unsigned char *packet;
+        u16 rx_start_idx, rx_idx, send_idx;
+        u32 send_bseq, val;
+        dma_addr_t map;
+        struct tx_bd *txbd;
+        struct sw_bd *rx_buf;
+        struct l2_fhdr *rx_hdr;
+        int ret = -ENODEV;
+
+        if (!netif_running(bp->dev))
+                return -ENODEV;
+
+        bp->loopback = MAC_LOOPBACK;
+        bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_DIAG);
+        bnx2_set_mac_loopback(bp);
+
+        pkt_size = 1514;
+        skb = dev_alloc_skb(pkt_size);
+        packet = skb_put(skb, pkt_size);
+        memcpy(packet, bp->mac_addr, 6);
+        memset(packet + 6, 0x0, 8);
+        for (i = 14; i < pkt_size; i++)
+                packet[i] = (unsigned char) (i & 0xff);
+
+        map = pci_map_single(bp->pdev, skb->data, pkt_size,
+                PCI_DMA_TODEVICE);
+
+        val = REG_RD(bp, BNX2_HC_COMMAND);
+        REG_WR(bp, BNX2_HC_COMMAND, val | BNX2_HC_COMMAND_COAL_NOW_WO_INT);
+        REG_RD(bp, BNX2_HC_COMMAND);
+
+        udelay(5);
+        rx_start_idx = bp->status_blk->status_rx_quick_consumer_index0;
+
+        send_idx = 0;
+        send_bseq = 0;
+        num_pkts = 0;
+
+        txbd = &bp->tx_desc_ring[send_idx];
+
+        txbd->tx_bd_haddr_hi = (u64) map >> 32;
+        txbd->tx_bd_haddr_lo = (u64) map & 0xffffffff;
+        txbd->tx_bd_mss_nbytes = pkt_size;
+        txbd->tx_bd_vlan_tag_flags = TX_BD_FLAGS_START | TX_BD_FLAGS_END;
+
+        num_pkts++;
+        send_idx = NEXT_TX_BD(send_idx);
+
+        send_bseq += pkt_size;
+
+        REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, send_idx);
+        REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, send_bseq);
+
+
+        udelay(100);
+
+        val = REG_RD(bp, BNX2_HC_COMMAND);
+        REG_WR(bp, BNX2_HC_COMMAND, val | BNX2_HC_COMMAND_COAL_NOW_WO_INT);
+        REG_RD(bp, BNX2_HC_COMMAND);
+
+        udelay(5);
+
+        pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
+        dev_kfree_skb_irq(skb);
+
+        if (bp->status_blk->status_tx_quick_consumer_index0 != send_idx) {
+                goto loopback_test_done;
+        }
+
+        rx_idx = bp->status_blk->status_rx_quick_consumer_index0;
+        if (rx_idx != rx_start_idx + num_pkts) {
+                goto loopback_test_done;
+        }
+
+        rx_buf = &bp->rx_buf_ring[rx_start_idx];
+        rx_skb = rx_buf->skb;
+
+        rx_hdr = (struct l2_fhdr *) rx_skb->data;
+        skb_reserve(rx_skb, bp->rx_offset);
+
+        pci_dma_sync_single_for_cpu(bp->pdev,
+                pci_unmap_addr(rx_buf, mapping),
+                bp->rx_buf_size, PCI_DMA_FROMDEVICE);
+
+        if (rx_hdr->l2_fhdr_errors &
+                (L2_FHDR_ERRORS_BAD_CRC |
+                L2_FHDR_ERRORS_PHY_DECODE |
+                L2_FHDR_ERRORS_ALIGNMENT |
+                L2_FHDR_ERRORS_TOO_SHORT |
+                L2_FHDR_ERRORS_GIANT_FRAME)) {
+
+                goto loopback_test_done;
+        }
+
+        if ((rx_hdr->l2_fhdr_pkt_len - 4) != pkt_size) {
+                goto loopback_test_done;
+        }
+
+        for (i = 14; i < pkt_size; i++) {
+                if (*(rx_skb->data + i) != (unsigned char) (i & 0xff)) {
+                        goto loopback_test_done;
+                }
+        }
+
+        ret = 0;
+
+loopback_test_done:
+        bp->loopback = 0;
+        return ret;
+}
+
+#define NVRAM_SIZE 0x200
+#define CRC32_RESIDUAL 0xdebb20e3
+
+static int
+bnx2_test_nvram(struct bnx2 *bp)
+{
+        u32 buf[NVRAM_SIZE / 4];
+        u8 *data = (u8 *) buf;
+        int rc = 0;
+        u32 magic, csum;
+
+        if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
+                goto test_nvram_done;
+
+        magic = be32_to_cpu(buf[0]);
+        if (magic != 0x669955aa) {
+                rc = -ENODEV;
+                goto test_nvram_done;
+        }
+
+        if ((rc = bnx2_nvram_read(bp, 0x100, data, NVRAM_SIZE)) != 0)
+                goto test_nvram_done;
+
+        csum = ether_crc_le(0x100, data);
+        if (csum != CRC32_RESIDUAL) {
+                rc = -ENODEV;
+                goto test_nvram_done;
+        }
+
+        csum = ether_crc_le(0x100, data + 0x100);
+        if (csum != CRC32_RESIDUAL) {
+                rc = -ENODEV;
+        }
+
+test_nvram_done:
+        return rc;
+}
+
+static int
+bnx2_test_link(struct bnx2 *bp)
+{
+        u32 bmsr;
+
+        spin_lock_irq(&bp->phy_lock);
+        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+        bnx2_read_phy(bp, MII_BMSR, &bmsr);
+        spin_unlock_irq(&bp->phy_lock);
+                
+        if (bmsr & BMSR_LSTATUS) {
+                return 0;
+        }
+        return -ENODEV;
+}
+
+static int
+bnx2_test_intr(struct bnx2 *bp)
+{
+        int i;
+        u32 val;
+        u16 status_idx;
+
+        if (!netif_running(bp->dev))
+                return -ENODEV;
+
+        status_idx = REG_RD(bp, BNX2_PCICFG_INT_ACK_CMD) & 0xffff;
+
+        /* This register is not touched during run-time. */
+        val = REG_RD(bp, BNX2_HC_COMMAND);
+        REG_WR(bp, BNX2_HC_COMMAND, val | BNX2_HC_COMMAND_COAL_NOW);
+        REG_RD(bp, BNX2_HC_COMMAND);
+
+        for (i = 0; i < 10; i++) {
+                if ((REG_RD(bp, BNX2_PCICFG_INT_ACK_CMD) & 0xffff) !=
+                        status_idx) {
+
+                        break;
+                }
+
+                msleep_interruptible(10);
+        }
+        if (i < 10)
+                return 0;
+
+        return -ENODEV;
+}
+
+static void
+bnx2_timer(unsigned long data)
+{
+        struct bnx2 *bp = (struct bnx2 *) data;
+        u32 msg;
+
+        if (atomic_read(&bp->intr_sem) != 0)
+                goto bnx2_restart_timer;
+
+        msg = (u32) ++bp->fw_drv_pulse_wr_seq;
+        REG_WR_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DRV_PULSE_MB, msg);
+
+        if ((bp->phy_flags & PHY_SERDES_FLAG) &&
+            (CHIP_NUM(bp) == CHIP_NUM_5706)) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&bp->phy_lock, flags);
+                if (bp->serdes_an_pending) {
+                        bp->serdes_an_pending--;
+                }
+                else if ((bp->link_up == 0) && (bp->autoneg & AUTONEG_SPEED)) {
+                        u32 bmcr;
+
+                        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+
+                        if (bmcr & BMCR_ANENABLE) {
+                                u32 phy1, phy2;
+
+                                bnx2_write_phy(bp, 0x1c, 0x7c00);
+                                bnx2_read_phy(bp, 0x1c, &phy1);
+
+                                bnx2_write_phy(bp, 0x17, 0x0f01);
+                                bnx2_read_phy(bp, 0x15, &phy2);
+                                bnx2_write_phy(bp, 0x17, 0x0f01);
+                                bnx2_read_phy(bp, 0x15, &phy2);
+
+                                if ((phy1 & 0x10) &&    /* SIGNAL DETECT */
+                                        !(phy2 & 0x20)) {       /* no CONFIG */
+
+                                        bmcr &= ~BMCR_ANENABLE;
+                                        bmcr |= BMCR_SPEED1000 |
+                                                BMCR_FULLDPLX;
+                                        bnx2_write_phy(bp, MII_BMCR, bmcr);
+                                        bp->phy_flags |=
+                                                PHY_PARALLEL_DETECT_FLAG;
+                                }
+                        }
+                }
+                else if ((bp->link_up) && (bp->autoneg & AUTONEG_SPEED) &&
+                        (bp->phy_flags & PHY_PARALLEL_DETECT_FLAG)) {
+                        u32 phy2;
+
+                        bnx2_write_phy(bp, 0x17, 0x0f01);
+                        bnx2_read_phy(bp, 0x15, &phy2);
+                        if (phy2 & 0x20) {
+                                u32 bmcr;
+
+                                bnx2_read_phy(bp, MII_BMCR, &bmcr);
+                                bmcr |= BMCR_ANENABLE;
+                                bnx2_write_phy(bp, MII_BMCR, bmcr);
+
+                                bp->phy_flags &= ~PHY_PARALLEL_DETECT_FLAG;
+
+                        }
+                }
+
+                spin_unlock_irqrestore(&bp->phy_lock, flags);
+        }
+
+bnx2_restart_timer:
+        bp->timer.expires = RUN_AT(bp->timer_interval);
+
+        add_timer(&bp->timer);
+}
+
+/* Called with rtnl_lock */
+static int
+bnx2_open(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        int rc;
+
+        bnx2_set_power_state(bp, 0);
+        bnx2_disable_int(bp);
+
+        rc = bnx2_alloc_mem(bp);
+        if (rc)
+                return rc;
+
+        if ((CHIP_ID(bp) != CHIP_ID_5706_A0) &&
+                (CHIP_ID(bp) != CHIP_ID_5706_A1) &&
+                !disable_msi) {
+
+                if (pci_enable_msi(bp->pdev) == 0) {
+                        bp->flags |= USING_MSI_FLAG;
+                        rc = request_irq(bp->pdev->irq, bnx2_msi, 0, dev->name,
+                                        dev);
+                }
+                else {
+                        rc = request_irq(bp->pdev->irq, bnx2_interrupt,
+                                        SA_SHIRQ, dev->name, dev);
+                }
+        }
+        else {
+                rc = request_irq(bp->pdev->irq, bnx2_interrupt, SA_SHIRQ,
+                                dev->name, dev);
+        }
+        if (rc) {
+                bnx2_free_mem(bp);
+                return rc;
+        }
+
+        rc = bnx2_init_nic(bp);
+
+        if (rc) {
+                free_irq(bp->pdev->irq, dev);
+                if (bp->flags & USING_MSI_FLAG) {
+                        pci_disable_msi(bp->pdev);
+                        bp->flags &= ~USING_MSI_FLAG;
+                }
+                bnx2_free_skbs(bp);
+                bnx2_free_mem(bp);
+                return rc;
+        }
+        
+        init_timer(&bp->timer);
+
+        bp->timer.expires = RUN_AT(bp->timer_interval);
+        bp->timer.data = (unsigned long) bp;
+        bp->timer.function = bnx2_timer;
+        add_timer(&bp->timer);
+
+        atomic_set(&bp->intr_sem, 0);
+
+        bnx2_enable_int(bp);
+
+        if (bp->flags & USING_MSI_FLAG) {
+                /* Test MSI to make sure it is working
+                 * If MSI test fails, go back to INTx mode
+                 */
+                if (bnx2_test_intr(bp) != 0) {
+                        printk(KERN_WARNING PFX "%s: No interrupt was generated"
+                               " using MSI, switching to INTx mode. Please"
+                               " report this failure to the PCI maintainer"
+                               " and include system chipset information.\n",
+                               bp->dev->name);
+
+                        bnx2_disable_int(bp);
+                        free_irq(bp->pdev->irq, dev);
+                        pci_disable_msi(bp->pdev);
+                        bp->flags &= ~USING_MSI_FLAG;
+
+                        rc = bnx2_init_nic(bp);
+
+                        if (!rc) {
+                                rc = request_irq(bp->pdev->irq, bnx2_interrupt,
+                                        SA_SHIRQ, dev->name, dev);
+                        }
+                        if (rc) {
+                                bnx2_free_skbs(bp);
+                                bnx2_free_mem(bp);
+                                del_timer_sync(&bp->timer);
+                                return rc;
+                        }
+                        bnx2_enable_int(bp);
+                }
+        }
+        if (bp->flags & USING_MSI_FLAG) {
+                printk(KERN_INFO PFX "%s: using MSI\n", dev->name);
+        }
+
+        netif_start_queue(dev);
+
+        return 0;
+}
+
+static void
+bnx2_reset_task(void *data)
+{
+        struct bnx2 *bp = data;
+
+        bnx2_netif_stop(bp);
+
+        bnx2_init_nic(bp);
+
+        atomic_set(&bp->intr_sem, 1);
+        bnx2_netif_start(bp);
+}
+
+static void
+bnx2_tx_timeout(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+
+        /* This allows the netif to be shutdown gracefully before resetting */
+        schedule_work(&bp->reset_task);
+}
+
+#ifdef BCM_VLAN
+/* Called with rtnl_lock */
+static void
+bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp)
+{
+        struct bnx2 *bp = dev->priv;
+
+        bnx2_netif_stop(bp);
+
+        bp->vlgrp = vlgrp;
+        bnx2_set_rx_mode(dev);
+
+        bnx2_netif_start(bp);
+}
+
+/* Called with rtnl_lock */
+static void
+bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
+{
+        struct bnx2 *bp = dev->priv;
+
+        bnx2_netif_stop(bp);
+
+        if (bp->vlgrp)
+                bp->vlgrp->vlan_devices[vid] = NULL;
+        bnx2_set_rx_mode(dev);
+
+        bnx2_netif_start(bp);
+}
+#endif
+
+/* Called with dev->xmit_lock.
+ * hard_start_xmit is pseudo-lockless - a lock is only required when
+ * the tx queue is full. This way, we get the benefit of lockless
+ * operations most of the time without the complexities to handle
+ * netif_stop_queue/wake_queue race conditions.
+ */
+static int
+bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        dma_addr_t mapping;
+        struct tx_bd *txbd;
+        struct sw_bd *tx_buf;
+        u32 len, vlan_tag_flags, last_frag, mss;
+        u16 prod, ring_prod;
+        int i;
+
+        if (unlikely(atomic_read(&bp->tx_avail_bd) <
+                (skb_shinfo(skb)->nr_frags + 1))) {
+
+                netif_stop_queue(dev);
+                printk(KERN_ERR PFX "%s: BUG! Tx ring full when queue awake!\n",
+                        dev->name);
+
+                return NETDEV_TX_BUSY;
+        }
+        len = skb_headlen(skb);
+        prod = bp->tx_prod;
+        ring_prod = TX_RING_IDX(prod);
+
+        vlan_tag_flags = 0;
+        if (skb->ip_summed == CHECKSUM_HW) {
+                vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;
+        }
+
+        if (bp->vlgrp != 0 && vlan_tx_tag_present(skb)) {
+                vlan_tag_flags |=
+                        (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16));
+        }
+#ifdef BCM_TSO 
+        if ((mss = skb_shinfo(skb)->tso_size) &&
+                (skb->len > (bp->dev->mtu + ETH_HLEN))) {
+                u32 tcp_opt_len, ip_tcp_len;
+
+                if (skb_header_cloned(skb) &&
+                    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
+                        dev_kfree_skb(skb);
+                        return NETDEV_TX_OK;
+                }
+
+                tcp_opt_len = ((skb->h.th->doff - 5) * 4);
+                vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;
+
+                tcp_opt_len = 0;
+                if (skb->h.th->doff > 5) {
+                        tcp_opt_len = (skb->h.th->doff - 5) << 2;
+                }
+                ip_tcp_len = (skb->nh.iph->ihl << 2) + sizeof(struct tcphdr);
+
+                skb->nh.iph->check = 0;
+                skb->nh.iph->tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len);
+                skb->h.th->check =
+                        ~csum_tcpudp_magic(skb->nh.iph->saddr,
+                                            skb->nh.iph->daddr,
+                                            0, IPPROTO_TCP, 0);
+
+                if (tcp_opt_len || (skb->nh.iph->ihl > 5)) {
+                        vlan_tag_flags |= ((skb->nh.iph->ihl - 5) +
+                                (tcp_opt_len >> 2)) << 8;
+                }
+        }
+        else
+#endif
+        {
+                mss = 0;
+        }
+
+        mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE);
+        
+        tx_buf = &bp->tx_buf_ring[ring_prod];
+        tx_buf->skb = skb;
+        pci_unmap_addr_set(tx_buf, mapping, mapping);
+
+        txbd = &bp->tx_desc_ring[ring_prod];
+
+        txbd->tx_bd_haddr_hi = (u64) mapping >> 32;
+        txbd->tx_bd_haddr_lo = (u64) mapping & 0xffffffff;
+        txbd->tx_bd_mss_nbytes = len | (mss << 16);
+        txbd->tx_bd_vlan_tag_flags = vlan_tag_flags | TX_BD_FLAGS_START;
+
+        last_frag = skb_shinfo(skb)->nr_frags;
+
+        for (i = 0; i < last_frag; i++) {
+                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+
+                prod = NEXT_TX_BD(prod);
+                ring_prod = TX_RING_IDX(prod);
+                txbd = &bp->tx_desc_ring[ring_prod];
+
+                len = frag->size;
+                mapping = pci_map_page(bp->pdev, frag->page, frag->page_offset,
+                        len, PCI_DMA_TODEVICE);
+                pci_unmap_addr_set(&bp->tx_buf_ring[ring_prod],
+                                mapping, mapping);
+
+                txbd->tx_bd_haddr_hi = (u64) mapping >> 32;
+                txbd->tx_bd_haddr_lo = (u64) mapping & 0xffffffff;
+                txbd->tx_bd_mss_nbytes = len | (mss << 16);
+                txbd->tx_bd_vlan_tag_flags = vlan_tag_flags;
+
+        }
+        txbd->tx_bd_vlan_tag_flags |= TX_BD_FLAGS_END;
+
+        prod = NEXT_TX_BD(prod);
+        bp->tx_prod_bseq += skb->len;
+
+        atomic_sub(last_frag + 1, &bp->tx_avail_bd);
+
+        REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, prod);
+        REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, bp->tx_prod_bseq);
+
+        mmiowb();
+
+        bp->tx_prod = prod;
+        dev->trans_start = jiffies;
+
+        if (unlikely(atomic_read(&bp->tx_avail_bd) <= MAX_SKB_FRAGS)) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&bp->tx_lock, flags);
+                if (atomic_read(&bp->tx_avail_bd) <= MAX_SKB_FRAGS) {
+                        netif_stop_queue(dev);
+
+                        if (atomic_read(&bp->tx_avail_bd) > MAX_SKB_FRAGS)
+                                netif_wake_queue(dev);
+                }
+                spin_unlock_irqrestore(&bp->tx_lock, flags);
+        }
+
+        return NETDEV_TX_OK;
+}
+
+/* Called with rtnl_lock */
+static int
+bnx2_close(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        u32 reset_code;
+
+        flush_scheduled_work();
+        bnx2_netif_stop(bp);
+        del_timer_sync(&bp->timer);
+        if (bp->wol)
+                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
+        else
+                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
+        bnx2_reset_chip(bp, reset_code);
+        free_irq(bp->pdev->irq, dev);
+        if (bp->flags & USING_MSI_FLAG) {
+                pci_disable_msi(bp->pdev);
+                bp->flags &= ~USING_MSI_FLAG;
+        }
+        bnx2_free_skbs(bp);
+        bnx2_free_mem(bp);
+        bp->link_up = 0;
+        netif_carrier_off(bp->dev);
+        bnx2_set_power_state(bp, 3);
+        return 0;
+}
+
+#define GET_NET_STATS64(ctr)                                    \
+        (unsigned long) ((unsigned long) (ctr##_hi) << 32) +    \
+        (unsigned long) (ctr##_lo)
+
+#define GET_NET_STATS32(ctr)            \
+        (ctr##_lo)
+
+#if (BITS_PER_LONG == 64)
+#define GET_NET_STATS   GET_NET_STATS64
+#else
+#define GET_NET_STATS   GET_NET_STATS32
+#endif
+
+static struct net_device_stats *
+bnx2_get_stats(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        struct statistics_block *stats_blk = bp->stats_blk;
+        struct net_device_stats *net_stats = &bp->net_stats;
+
+        if (bp->stats_blk == NULL) {
+                return net_stats;
+        }
+        net_stats->rx_packets =
+                GET_NET_STATS(stats_blk->stat_IfHCInUcastPkts) +
+                GET_NET_STATS(stats_blk->stat_IfHCInMulticastPkts) +
+                GET_NET_STATS(stats_blk->stat_IfHCInBroadcastPkts);
+
+        net_stats->tx_packets =
+                GET_NET_STATS(stats_blk->stat_IfHCOutUcastPkts) +
+                GET_NET_STATS(stats_blk->stat_IfHCOutMulticastPkts) +
+                GET_NET_STATS(stats_blk->stat_IfHCOutBroadcastPkts);
+
+        net_stats->rx_bytes =
+                GET_NET_STATS(stats_blk->stat_IfHCInOctets);
+
+        net_stats->tx_bytes =
+                GET_NET_STATS(stats_blk->stat_IfHCOutOctets);
+
+        net_stats->multicast = 
+                GET_NET_STATS(stats_blk->stat_IfHCOutMulticastPkts);
+
+        net_stats->collisions = 
+                (unsigned long) stats_blk->stat_EtherStatsCollisions;
+
+        net_stats->rx_length_errors = 
+                (unsigned long) (stats_blk->stat_EtherStatsUndersizePkts +
+                stats_blk->stat_EtherStatsOverrsizePkts);
+
+        net_stats->rx_over_errors = 
+                (unsigned long) stats_blk->stat_IfInMBUFDiscards;
+
+        net_stats->rx_frame_errors = 
+                (unsigned long) stats_blk->stat_Dot3StatsAlignmentErrors;
+
+        net_stats->rx_crc_errors = 
+                (unsigned long) stats_blk->stat_Dot3StatsFCSErrors;
+
+        net_stats->rx_errors = net_stats->rx_length_errors +
+                net_stats->rx_over_errors + net_stats->rx_frame_errors +
+                net_stats->rx_crc_errors;
+
+        net_stats->tx_aborted_errors =
+                (unsigned long) (stats_blk->stat_Dot3StatsExcessiveCollisions +
+                stats_blk->stat_Dot3StatsLateCollisions);
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5706)
+                net_stats->tx_carrier_errors = 0;
+        else {
+                net_stats->tx_carrier_errors =
+                        (unsigned long)
+                        stats_blk->stat_Dot3StatsCarrierSenseErrors;
+        }
+
+        net_stats->tx_errors =
+                (unsigned long) 
+                stats_blk->stat_emac_tx_stat_dot3statsinternalmactransmiterrors
+                +
+                net_stats->tx_aborted_errors +
+                net_stats->tx_carrier_errors;
+
+        return net_stats;
+}
+
+/* All ethtool functions called with rtnl_lock */
+
+static int
+bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct bnx2 *bp = dev->priv;
+
+        cmd->supported = SUPPORTED_Autoneg;
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                cmd->supported |= SUPPORTED_1000baseT_Full |
+                        SUPPORTED_FIBRE;
+
+                cmd->port = PORT_FIBRE;
+        }
+        else {
+                cmd->supported |= SUPPORTED_10baseT_Half |
+                        SUPPORTED_10baseT_Full |
+                        SUPPORTED_100baseT_Half |
+                        SUPPORTED_100baseT_Full |
+                        SUPPORTED_1000baseT_Full |
+                        SUPPORTED_TP;
+
+                cmd->port = PORT_TP;
+        }
+
+        cmd->advertising = bp->advertising;
+
+        if (bp->autoneg & AUTONEG_SPEED) {
+                cmd->autoneg = AUTONEG_ENABLE;
+        }
+        else {
+                cmd->autoneg = AUTONEG_DISABLE;
+        }
+
+        if (netif_carrier_ok(dev)) {
+                cmd->speed = bp->line_speed;
+                cmd->duplex = bp->duplex;
+        }
+        else {
+                cmd->speed = -1;
+                cmd->duplex = -1;
+        }
+
+        cmd->transceiver = XCVR_INTERNAL;
+        cmd->phy_address = bp->phy_addr;
+
+        return 0;
+}
+  
+static int
+bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct bnx2 *bp = dev->priv;
+        u8 autoneg = bp->autoneg;
+        u8 req_duplex = bp->req_duplex;
+        u16 req_line_speed = bp->req_line_speed;
+        u32 advertising = bp->advertising;
+
+        if (cmd->autoneg == AUTONEG_ENABLE) {
+                autoneg |= AUTONEG_SPEED;
+
+                cmd->advertising &= ETHTOOL_ALL_COPPER_SPEED; 
+
+                /* allow advertising 1 speed */
+                if ((cmd->advertising == ADVERTISED_10baseT_Half) ||
+                        (cmd->advertising == ADVERTISED_10baseT_Full) ||
+                        (cmd->advertising == ADVERTISED_100baseT_Half) ||
+                        (cmd->advertising == ADVERTISED_100baseT_Full)) {
+
+                        if (bp->phy_flags & PHY_SERDES_FLAG)
+                                return -EINVAL;
+
+                        advertising = cmd->advertising;
+
+                }
+                else if (cmd->advertising == ADVERTISED_1000baseT_Full) {
+                        advertising = cmd->advertising;
+                }
+                else if (cmd->advertising == ADVERTISED_1000baseT_Half) {
+                        return -EINVAL;
+                }
+                else {
+                        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                                advertising = ETHTOOL_ALL_FIBRE_SPEED;
+                        }
+                        else {
+                                advertising = ETHTOOL_ALL_COPPER_SPEED;
+                        }
+                }
+                advertising |= ADVERTISED_Autoneg;
+        }
+        else {
+                if (bp->phy_flags & PHY_SERDES_FLAG) {
+                        if ((cmd->speed != SPEED_1000) ||
+                                (cmd->duplex != DUPLEX_FULL)) {
+                                return -EINVAL;
+                        }
+                }
+                else if (cmd->speed == SPEED_1000) {
+                        return -EINVAL;
+                }
+                autoneg &= ~AUTONEG_SPEED;
+                req_line_speed = cmd->speed;
+                req_duplex = cmd->duplex;
+                advertising = 0;
+        }
+
+        bp->autoneg = autoneg;
+        bp->advertising = advertising;
+        bp->req_line_speed = req_line_speed;
+        bp->req_duplex = req_duplex;
+
+        spin_lock_irq(&bp->phy_lock);
+
+        bnx2_setup_phy(bp);
+
+        spin_unlock_irq(&bp->phy_lock);
+
+        return 0;
+}
+
+static void
+bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        struct bnx2 *bp = dev->priv;
+
+        strcpy(info->driver, DRV_MODULE_NAME);
+        strcpy(info->version, DRV_MODULE_VERSION);
+        strcpy(info->bus_info, pci_name(bp->pdev));
+        info->fw_version[0] = ((bp->fw_ver & 0xff000000) >> 24) + '0';
+        info->fw_version[2] = ((bp->fw_ver & 0xff0000) >> 16) + '0';
+        info->fw_version[4] = ((bp->fw_ver & 0xff00) >> 8) + '0';
+        info->fw_version[6] = (bp->fw_ver & 0xff) + '0';
+        info->fw_version[1] = info->fw_version[3] = info->fw_version[5] = '.';
+        info->fw_version[7] = 0;
+}
+
+static void
+bnx2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct bnx2 *bp = dev->priv;
+
+        if (bp->flags & NO_WOL_FLAG) {
+                wol->supported = 0;
+                wol->wolopts = 0;
+        }
+        else {
+                wol->supported = WAKE_MAGIC;
+                if (bp->wol)
+                        wol->wolopts = WAKE_MAGIC;
+                else
+                        wol->wolopts = 0;
+        }
+        memset(&wol->sopass, 0, sizeof(wol->sopass));
+}
+
+static int
+bnx2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct bnx2 *bp = dev->priv;
+
+        if (wol->wolopts & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        if (wol->wolopts & WAKE_MAGIC) {
+                if (bp->flags & NO_WOL_FLAG)
+                        return -EINVAL;
+
+                bp->wol = 1;
+        }
+        else {
+                bp->wol = 0;
+        }
+        return 0;
+}
+
+static int
+bnx2_nway_reset(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+        u32 bmcr;
+
+        if (!(bp->autoneg & AUTONEG_SPEED)) {
+                return -EINVAL;
+        }
+
+        spin_lock_irq(&bp->phy_lock);
+
+        /* Force a link down visible on the other side */
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
+                spin_unlock_irq(&bp->phy_lock);
+
+                msleep(20);
+
+                spin_lock_irq(&bp->phy_lock);
+                if (CHIP_NUM(bp) == CHIP_NUM_5706) {
+                        bp->serdes_an_pending = SERDES_AN_TIMEOUT /
+                                bp->timer_interval;
+                }
+        }
+
+        bnx2_read_phy(bp, MII_BMCR, &bmcr);
+        bmcr &= ~BMCR_LOOPBACK;
+        bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART | BMCR_ANENABLE);
+
+        spin_unlock_irq(&bp->phy_lock);
+
+        return 0;
+}
+
+static int
+bnx2_get_eeprom_len(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+
+        if (bp->flash_info == 0)
+                return 0;
+
+        return (int) bp->flash_info->total_size;
+}
+
+static int
+bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
+                u8 *eebuf)
+{
+        struct bnx2 *bp = dev->priv;
+        int rc;
+
+        if (eeprom->offset > bp->flash_info->total_size)
+                return -EINVAL;
+
+        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
+                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+
+        rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
+
+        return rc;
+}
+
+static int
+bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
+                u8 *eebuf)
+{
+        struct bnx2 *bp = dev->priv;
+        int rc;
+
+        if (eeprom->offset > bp->flash_info->total_size)
+                return -EINVAL;
+
+        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
+                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+
+        rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
+
+        return rc;
+}
+
+static int
+bnx2_get_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
+{
+        struct bnx2 *bp = dev->priv;
+
+        memset(coal, 0, sizeof(struct ethtool_coalesce));
+
+        coal->rx_coalesce_usecs = bp->rx_ticks;
+        coal->rx_max_coalesced_frames = bp->rx_quick_cons_trip;
+        coal->rx_coalesce_usecs_irq = bp->rx_ticks_int;
+        coal->rx_max_coalesced_frames_irq = bp->rx_quick_cons_trip_int;
+
+        coal->tx_coalesce_usecs = bp->tx_ticks;
+        coal->tx_max_coalesced_frames = bp->tx_quick_cons_trip;
+        coal->tx_coalesce_usecs_irq = bp->tx_ticks_int;
+        coal->tx_max_coalesced_frames_irq = bp->tx_quick_cons_trip_int;
+
+        coal->stats_block_coalesce_usecs = bp->stats_ticks;
+
+        return 0;
+}
+
+static int
+bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
+{
+        struct bnx2 *bp = dev->priv;
+
+        bp->rx_ticks = (u16) coal->rx_coalesce_usecs;
+        if (bp->rx_ticks > 0x3ff) bp->rx_ticks = 0x3ff;
+
+        bp->rx_quick_cons_trip = (u16) coal->rx_max_coalesced_frames; 
+        if (bp->rx_quick_cons_trip > 0xff) bp->rx_quick_cons_trip = 0xff;
+
+        bp->rx_ticks_int = (u16) coal->rx_coalesce_usecs_irq;
+        if (bp->rx_ticks_int > 0x3ff) bp->rx_ticks_int = 0x3ff;
+
+        bp->rx_quick_cons_trip_int = (u16) coal->rx_max_coalesced_frames_irq;
+        if (bp->rx_quick_cons_trip_int > 0xff)
+                bp->rx_quick_cons_trip_int = 0xff;
+
+        bp->tx_ticks = (u16) coal->tx_coalesce_usecs;
+        if (bp->tx_ticks > 0x3ff) bp->tx_ticks = 0x3ff;
+
+        bp->tx_quick_cons_trip = (u16) coal->tx_max_coalesced_frames;
+        if (bp->tx_quick_cons_trip > 0xff) bp->tx_quick_cons_trip = 0xff;
+
+        bp->tx_ticks_int = (u16) coal->tx_coalesce_usecs_irq;
+        if (bp->tx_ticks_int > 0x3ff) bp->tx_ticks_int = 0x3ff;
+
+        bp->tx_quick_cons_trip_int = (u16) coal->tx_max_coalesced_frames_irq;
+        if (bp->tx_quick_cons_trip_int > 0xff) bp->tx_quick_cons_trip_int =
+                0xff;
+
+        bp->stats_ticks = coal->stats_block_coalesce_usecs;
+        if (bp->stats_ticks > 0xffff00) bp->stats_ticks = 0xffff00;
+        bp->stats_ticks &= 0xffff00;
+
+        if (netif_running(bp->dev)) {
+                bnx2_netif_stop(bp);
+                bnx2_init_nic(bp);
+                bnx2_netif_start(bp);
+        }
+
+        return 0;
+}
+
+static void
+bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
+{
+        struct bnx2 *bp = dev->priv;
+
+        ering->rx_max_pending = MAX_RX_DESC_CNT;
+        ering->rx_mini_max_pending = 0;
+        ering->rx_jumbo_max_pending = 0;
+
+        ering->rx_pending = bp->rx_ring_size;
+        ering->rx_mini_pending = 0;
+        ering->rx_jumbo_pending = 0;
+
+        ering->tx_max_pending = MAX_TX_DESC_CNT;
+        ering->tx_pending = bp->tx_ring_size;
+}
+
+static int
+bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
+{
+        struct bnx2 *bp = dev->priv;
+
+        if ((ering->rx_pending > MAX_RX_DESC_CNT) ||
+                (ering->tx_pending > MAX_TX_DESC_CNT) ||
+                (ering->tx_pending <= MAX_SKB_FRAGS)) {
+
+                return -EINVAL;
+        }
+        bp->rx_ring_size = ering->rx_pending;
+        bp->tx_ring_size = ering->tx_pending;
+
+        if (netif_running(bp->dev)) {
+                bnx2_netif_stop(bp);
+                bnx2_init_nic(bp);
+                bnx2_netif_start(bp);
+        }
+
+        return 0;
+}
+
+static void
+bnx2_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
+{
+        struct bnx2 *bp = dev->priv;
+
+        epause->autoneg = ((bp->autoneg & AUTONEG_FLOW_CTRL) != 0);
+        epause->rx_pause = ((bp->flow_ctrl & FLOW_CTRL_RX) != 0);
+        epause->tx_pause = ((bp->flow_ctrl & FLOW_CTRL_TX) != 0);
+}
+
+static int
+bnx2_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
+{
+        struct bnx2 *bp = dev->priv;
+
+        bp->req_flow_ctrl = 0;
+        if (epause->rx_pause)
+                bp->req_flow_ctrl |= FLOW_CTRL_RX;
+        if (epause->tx_pause)
+                bp->req_flow_ctrl |= FLOW_CTRL_TX;
+
+        if (epause->autoneg) {
+                bp->autoneg |= AUTONEG_FLOW_CTRL;
+        }
+        else {
+                bp->autoneg &= ~AUTONEG_FLOW_CTRL;
+        }
+
+        spin_lock_irq(&bp->phy_lock);
+
+        bnx2_setup_phy(bp);
+
+        spin_unlock_irq(&bp->phy_lock);
+
+        return 0;
+}
+
+static u32
+bnx2_get_rx_csum(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+
+        return bp->rx_csum;
+}
+
+static int
+bnx2_set_rx_csum(struct net_device *dev, u32 data)
+{
+        struct bnx2 *bp = dev->priv;
+
+        bp->rx_csum = data;
+        return 0;
+}
+
+#define BNX2_NUM_STATS 45
+
+struct {
+        char string[ETH_GSTRING_LEN];
+} bnx2_stats_str_arr[BNX2_NUM_STATS] = {
+        { "rx_bytes" },
+        { "rx_error_bytes" },
+        { "tx_bytes" },
+        { "tx_error_bytes" },
+        { "rx_ucast_packets" },
+        { "rx_mcast_packets" },
+        { "rx_bcast_packets" },
+        { "tx_ucast_packets" },
+        { "tx_mcast_packets" },
+        { "tx_bcast_packets" },
+        { "tx_mac_errors" },
+        { "tx_carrier_errors" },
+        { "rx_crc_errors" },
+        { "rx_align_errors" },
+        { "tx_single_collisions" },
+        { "tx_multi_collisions" },
+        { "tx_deferred" },
+        { "tx_excess_collisions" },
+        { "tx_late_collisions" },
+        { "tx_total_collisions" },
+        { "rx_fragments" },
+        { "rx_jabbers" },
+        { "rx_undersize_packets" },
+        { "rx_oversize_packets" },
+        { "rx_64_byte_packets" },
+        { "rx_65_to_127_byte_packets" },
+        { "rx_128_to_255_byte_packets" },
+        { "rx_256_to_511_byte_packets" },
+        { "rx_512_to_1023_byte_packets" },
+        { "rx_1024_to_1522_byte_packets" },
+        { "rx_1523_to_9022_byte_packets" },
+        { "tx_64_byte_packets" },
+        { "tx_65_to_127_byte_packets" },
+        { "tx_128_to_255_byte_packets" },
+        { "tx_256_to_511_byte_packets" },
+        { "tx_512_to_1023_byte_packets" },
+        { "tx_1024_to_1522_byte_packets" },
+        { "tx_1523_to_9022_byte_packets" },
+        { "rx_xon_frames" },
+        { "rx_xoff_frames" },
+        { "tx_xon_frames" },
+        { "tx_xoff_frames" },
+        { "rx_mac_ctrl_frames" },
+        { "rx_filtered_packets" },
+        { "rx_discards" },
+};
+
+#define STATS_OFFSET32(offset_name) (offsetof(struct statistics_block, offset_name) / 4)
+
+unsigned long bnx2_stats_offset_arr[BNX2_NUM_STATS] = {
+    STATS_OFFSET32(stat_IfHCInOctets_hi),
+    STATS_OFFSET32(stat_IfHCInBadOctets_hi),
+    STATS_OFFSET32(stat_IfHCOutOctets_hi),
+    STATS_OFFSET32(stat_IfHCOutBadOctets_hi),
+    STATS_OFFSET32(stat_IfHCInUcastPkts_hi),
+    STATS_OFFSET32(stat_IfHCInMulticastPkts_hi),
+    STATS_OFFSET32(stat_IfHCInBroadcastPkts_hi),
+    STATS_OFFSET32(stat_IfHCOutUcastPkts_hi),
+    STATS_OFFSET32(stat_IfHCOutMulticastPkts_hi),
+    STATS_OFFSET32(stat_IfHCOutBroadcastPkts_hi),
+    STATS_OFFSET32(stat_emac_tx_stat_dot3statsinternalmactransmiterrors),
+    STATS_OFFSET32(stat_Dot3StatsCarrierSenseErrors),                 
+    STATS_OFFSET32(stat_Dot3StatsFCSErrors),                          
+    STATS_OFFSET32(stat_Dot3StatsAlignmentErrors),                    
+    STATS_OFFSET32(stat_Dot3StatsSingleCollisionFrames),              
+    STATS_OFFSET32(stat_Dot3StatsMultipleCollisionFrames),            
+    STATS_OFFSET32(stat_Dot3StatsDeferredTransmissions),              
+    STATS_OFFSET32(stat_Dot3StatsExcessiveCollisions),                
+    STATS_OFFSET32(stat_Dot3StatsLateCollisions),                     
+    STATS_OFFSET32(stat_EtherStatsCollisions),                        
+    STATS_OFFSET32(stat_EtherStatsFragments),                         
+    STATS_OFFSET32(stat_EtherStatsJabbers),                           
+    STATS_OFFSET32(stat_EtherStatsUndersizePkts),                     
+    STATS_OFFSET32(stat_EtherStatsOverrsizePkts),                     
+    STATS_OFFSET32(stat_EtherStatsPktsRx64Octets),                    
+    STATS_OFFSET32(stat_EtherStatsPktsRx65Octetsto127Octets),         
+    STATS_OFFSET32(stat_EtherStatsPktsRx128Octetsto255Octets),        
+    STATS_OFFSET32(stat_EtherStatsPktsRx256Octetsto511Octets),        
+    STATS_OFFSET32(stat_EtherStatsPktsRx512Octetsto1023Octets),       
+    STATS_OFFSET32(stat_EtherStatsPktsRx1024Octetsto1522Octets),      
+    STATS_OFFSET32(stat_EtherStatsPktsRx1523Octetsto9022Octets),      
+    STATS_OFFSET32(stat_EtherStatsPktsTx64Octets),                    
+    STATS_OFFSET32(stat_EtherStatsPktsTx65Octetsto127Octets),         
+    STATS_OFFSET32(stat_EtherStatsPktsTx128Octetsto255Octets),        
+    STATS_OFFSET32(stat_EtherStatsPktsTx256Octetsto511Octets),        
+    STATS_OFFSET32(stat_EtherStatsPktsTx512Octetsto1023Octets),       
+    STATS_OFFSET32(stat_EtherStatsPktsTx1024Octetsto1522Octets),      
+    STATS_OFFSET32(stat_EtherStatsPktsTx1523Octetsto9022Octets),      
+    STATS_OFFSET32(stat_XonPauseFramesReceived),                      
+    STATS_OFFSET32(stat_XoffPauseFramesReceived),                     
+    STATS_OFFSET32(stat_OutXonSent),                                  
+    STATS_OFFSET32(stat_OutXoffSent),                                 
+    STATS_OFFSET32(stat_MacControlFramesReceived),                    
+    STATS_OFFSET32(stat_IfInFramesL2FilterDiscards),                  
+    STATS_OFFSET32(stat_IfInMBUFDiscards),                            
+};
+
+/* stat_IfHCInBadOctets and stat_Dot3StatsCarrierSenseErrors are
+ * skipped because of errata.
+ */               
+u8 bnx2_5706_stats_len_arr[BNX2_NUM_STATS] = {
+        8,0,8,8,8,8,8,8,8,8,
+        4,0,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,4,4,4,4,4,
+        4,4,4,4,4,
+};
+
+#define BNX2_NUM_TESTS 6
+
+struct {
+        char string[ETH_GSTRING_LEN];
+} bnx2_tests_str_arr[BNX2_NUM_TESTS] = {
+        { "register_test (offline)" },
+        { "memory_test (offline)" },
+        { "loopback_test (offline)" },
+        { "nvram_test (online)" },
+        { "interrupt_test (online)" },
+        { "link_test (online)" },
+};
+
+static int
+bnx2_self_test_count(struct net_device *dev)
+{
+        return BNX2_NUM_TESTS;
+}
+
+static void
+bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)
+{
+        struct bnx2 *bp = dev->priv;
+
+        memset(buf, 0, sizeof(u64) * BNX2_NUM_TESTS);
+        if (etest->flags & ETH_TEST_FL_OFFLINE) {
+                bnx2_netif_stop(bp);
+                bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_DIAG);
+                bnx2_free_skbs(bp);
+
+                if (bnx2_test_registers(bp) != 0) {
+                        buf[0] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+                if (bnx2_test_memory(bp) != 0) {
+                        buf[1] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+                if (bnx2_test_loopback(bp) != 0) {
+                        buf[2] = 1;
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                }
+
+                if (!netif_running(bp->dev)) {
+                        bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
+                }
+                else {
+                        bnx2_init_nic(bp);
+                        bnx2_netif_start(bp);
+                }
+
+                /* wait for link up */
+                msleep_interruptible(3000);
+                if ((!bp->link_up) && !(bp->phy_flags & PHY_SERDES_FLAG))
+                        msleep_interruptible(4000);
+        }
+
+        if (bnx2_test_nvram(bp) != 0) {
+                buf[3] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
+        if (bnx2_test_intr(bp) != 0) {
+                buf[4] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
+
+        if (bnx2_test_link(bp) != 0) {
+                buf[5] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+
+        }
+}
+
+static void
+bnx2_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
+{
+        switch (stringset) {
+        case ETH_SS_STATS:
+                memcpy(buf, bnx2_stats_str_arr,
+                        sizeof(bnx2_stats_str_arr));
+                break;
+        case ETH_SS_TEST:
+                memcpy(buf, bnx2_tests_str_arr,
+                        sizeof(bnx2_tests_str_arr));
+                break;
+        }
+}
+
+static int
+bnx2_get_stats_count(struct net_device *dev)
+{
+        return BNX2_NUM_STATS;
+}
+
+static void
+bnx2_get_ethtool_stats(struct net_device *dev,
+                struct ethtool_stats *stats, u64 *buf)
+{
+        struct bnx2 *bp = dev->priv;
+        int i;
+        u32 *hw_stats = (u32 *) bp->stats_blk;
+        u8 *stats_len_arr = 0;
+
+        if (hw_stats == NULL) {
+                memset(buf, 0, sizeof(u64) * BNX2_NUM_STATS);
+                return;
+        }
+
+        if (CHIP_NUM(bp) == CHIP_NUM_5706)
+                stats_len_arr = bnx2_5706_stats_len_arr;
+
+        for (i = 0; i < BNX2_NUM_STATS; i++) {
+                if (stats_len_arr[i] == 0) {
+                        /* skip this counter */
+                        buf[i] = 0;
+                        continue;
+                }
+                if (stats_len_arr[i] == 4) {
+                        /* 4-byte counter */
+                        buf[i] = (u64)
+                                *(hw_stats + bnx2_stats_offset_arr[i]);
+                        continue;
+                }
+                /* 8-byte counter */
+                buf[i] = (((u64) *(hw_stats +
+                                        bnx2_stats_offset_arr[i])) << 32) +
+                                *(hw_stats + bnx2_stats_offset_arr[i] + 1);
+        }
+}
+
+static int
+bnx2_phys_id(struct net_device *dev, u32 data)
+{
+        struct bnx2 *bp = dev->priv;
+        int i;
+        u32 save;
+
+        if (data == 0)
+                data = 2;
+
+        save = REG_RD(bp, BNX2_MISC_CFG);
+        REG_WR(bp, BNX2_MISC_CFG, BNX2_MISC_CFG_LEDMODE_MAC);
+
+        for (i = 0; i < (data * 2); i++) {
+                if ((i % 2) == 0) {
+                        REG_WR(bp, BNX2_EMAC_LED, BNX2_EMAC_LED_OVERRIDE);
+                }
+                else {
+                        REG_WR(bp, BNX2_EMAC_LED, BNX2_EMAC_LED_OVERRIDE |
+                                BNX2_EMAC_LED_1000MB_OVERRIDE |
+                                BNX2_EMAC_LED_100MB_OVERRIDE |
+                                BNX2_EMAC_LED_10MB_OVERRIDE |
+                                BNX2_EMAC_LED_TRAFFIC_OVERRIDE |
+                                BNX2_EMAC_LED_TRAFFIC);
+                }
+                msleep_interruptible(500);
+                if (signal_pending(current))
+                        break;
+        }
+        REG_WR(bp, BNX2_EMAC_LED, 0);
+        REG_WR(bp, BNX2_MISC_CFG, save);
+        return 0;
+}
+
+static struct ethtool_ops bnx2_ethtool_ops = {
+        .get_settings           = bnx2_get_settings,
+        .set_settings           = bnx2_set_settings,
+        .get_drvinfo            = bnx2_get_drvinfo,
+        .get_wol                = bnx2_get_wol,
+        .set_wol                = bnx2_set_wol,
+        .nway_reset             = bnx2_nway_reset,
+        .get_link               = ethtool_op_get_link,
+        .get_eeprom_len         = bnx2_get_eeprom_len,
+        .get_eeprom             = bnx2_get_eeprom,
+        .set_eeprom             = bnx2_set_eeprom,
+        .get_coalesce           = bnx2_get_coalesce,
+        .set_coalesce           = bnx2_set_coalesce,
+        .get_ringparam          = bnx2_get_ringparam,
+        .set_ringparam          = bnx2_set_ringparam,
+        .get_pauseparam         = bnx2_get_pauseparam,
+        .set_pauseparam         = bnx2_set_pauseparam,
+        .get_rx_csum            = bnx2_get_rx_csum,
+        .set_rx_csum            = bnx2_set_rx_csum,
+        .get_tx_csum            = ethtool_op_get_tx_csum,
+        .set_tx_csum            = ethtool_op_set_tx_csum,
+        .get_sg                 = ethtool_op_get_sg,
+        .set_sg                 = ethtool_op_set_sg,
+#ifdef BCM_TSO
+        .get_tso                = ethtool_op_get_tso,
+        .set_tso                = ethtool_op_set_tso,
+#endif
+        .self_test_count        = bnx2_self_test_count,
+        .self_test              = bnx2_self_test,
+        .get_strings            = bnx2_get_strings,
+        .phys_id                = bnx2_phys_id,
+        .get_stats_count        = bnx2_get_stats_count,
+        .get_ethtool_stats      = bnx2_get_ethtool_stats,
+};
+
+/* Called with rtnl_lock */
+static int
+bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        struct mii_ioctl_data *data = (struct mii_ioctl_data *)&ifr->ifr_data;
+        struct bnx2 *bp = dev->priv;
+        int err;
+
+        switch(cmd) {
+        case SIOCGMIIPHY:
+                data->phy_id = bp->phy_addr;
+
+                /* fallthru */
+        case SIOCGMIIREG: {
+                u32 mii_regval;
+
+                spin_lock_irq(&bp->phy_lock);
+                err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);
+                spin_unlock_irq(&bp->phy_lock);
+
+                data->val_out = mii_regval;
+
+                return err;
+        }
+
+        case SIOCSMIIREG:
+                if (!capable(CAP_NET_ADMIN))
+                        return -EPERM;
+
+                spin_lock_irq(&bp->phy_lock);
+                err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);
+                spin_unlock_irq(&bp->phy_lock);
+
+                return err;
+
+        default:
+                /* do nothing */
+                break;
+        }
+        return -EOPNOTSUPP;
+}
+
+/* Called with rtnl_lock */
+static int
+bnx2_change_mac_addr(struct net_device *dev, void *p)
+{
+        struct sockaddr *addr = p;
+        struct bnx2 *bp = dev->priv;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        if (netif_running(dev))
+                bnx2_set_mac_addr(bp);
+
+        return 0;
+}
+
+/* Called with rtnl_lock */
+static int
+bnx2_change_mtu(struct net_device *dev, int new_mtu)
+{
+        struct bnx2 *bp = dev->priv;
+
+        if (((new_mtu + ETH_HLEN) > MAX_ETHERNET_JUMBO_PACKET_SIZE) ||
+                ((new_mtu + ETH_HLEN) < MIN_ETHERNET_PACKET_SIZE))
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+        if (netif_running(dev)) {
+                bnx2_netif_stop(bp);
+
+                bnx2_init_nic(bp);
+
+                bnx2_netif_start(bp);
+        }
+        return 0;
+}
+
+#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
+static void
+poll_bnx2(struct net_device *dev)
+{
+        struct bnx2 *bp = dev->priv;
+
+        disable_irq(bp->pdev->irq);
+        bnx2_interrupt(bp->pdev->irq, dev, NULL);
+        enable_irq(bp->pdev->irq);
+}
+#endif
+
+static int __devinit
+bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
+{
+        struct bnx2 *bp;
+        unsigned long mem_len;
+        int rc;
+        u32 reg;
+
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        bp = dev->priv;
+
+        bp->flags = 0;
+        bp->phy_flags = 0;
+
+        /* enable device (incl. PCI PM wakeup), and bus-mastering */
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                printk(KERN_ERR PFX "Cannot enable PCI device, aborting.");
+                goto err_out;
+        }
+
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                printk(KERN_ERR PFX "Cannot find PCI device base address, "
+                       "aborting.\n");
+                rc = -ENODEV;
+                goto err_out_disable;
+        }
+
+        rc = pci_request_regions(pdev, DRV_MODULE_NAME);
+        if (rc) {
+                printk(KERN_ERR PFX "Cannot obtain PCI resources, aborting.\n");
+                goto err_out_disable;
+        }
+
+        pci_set_master(pdev);
+
+        bp->pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
+        if (bp->pm_cap == 0) {
+                printk(KERN_ERR PFX "Cannot find power management capability, "
+                               "aborting.\n");
+                rc = -EIO;
+                goto err_out_release;
+        }
+
+        bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
+        if (bp->pcix_cap == 0) {
+                printk(KERN_ERR PFX "Cannot find PCIX capability, aborting.\n");
+                rc = -EIO;
+                goto err_out_release;
+        }
+
+        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
+                bp->flags |= USING_DAC_FLAG;
+                if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
+                        printk(KERN_ERR PFX "pci_set_consistent_dma_mask "
+                               "failed, aborting.\n");
+                        rc = -EIO;
+                        goto err_out_release;
+                }
+        }
+        else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {
+                printk(KERN_ERR PFX "System does not support DMA, aborting.\n");
+                rc = -EIO;
+                goto err_out_release;
+        }
+
+        bp->dev = dev;
+        bp->pdev = pdev;
+
+        spin_lock_init(&bp->phy_lock);
+        spin_lock_init(&bp->tx_lock);
+        INIT_WORK(&bp->reset_task, bnx2_reset_task, bp);
+
+        dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0);
+        mem_len = MB_GET_CID_ADDR(17);
+        dev->mem_end = dev->mem_start + mem_len;
+        dev->irq = pdev->irq;
+
+        bp->regview = ioremap_nocache(dev->base_addr, mem_len);
+
+        if (!bp->regview) {
+                printk(KERN_ERR PFX "Cannot map register space, aborting.\n");
+                rc = -ENOMEM;
+                goto err_out_release;
+        }
+
+        /* Configure byte swap and enable write to the reg_window registers.
+         * Rely on CPU to do target byte swapping on big endian systems
+         * The chip's target access swapping will not swap all accesses
+         */
+        pci_write_config_dword(bp->pdev, BNX2_PCICFG_MISC_CONFIG,
+                               BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
+                               BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP);
+
+        bnx2_set_power_state(bp, 0);
+
+        bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
+
+        bp->phy_addr = 1;
+
+        /* Get bus information. */
+        reg = REG_RD(bp, BNX2_PCICFG_MISC_STATUS);
+        if (reg & BNX2_PCICFG_MISC_STATUS_PCIX_DET) {
+                u32 clkreg;
+
+                bp->flags |= PCIX_FLAG;
+
+                clkreg = REG_RD(bp, BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS);
+                
+                clkreg &= BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET;
+                switch (clkreg) {
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_133MHZ:
+                        bp->bus_speed_mhz = 133;
+                        break;
+
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_95MHZ:
+                        bp->bus_speed_mhz = 100;
+                        break;
+
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_66MHZ:
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_80MHZ:
+                        bp->bus_speed_mhz = 66;
+                        break;
+
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_48MHZ:
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_55MHZ:
+                        bp->bus_speed_mhz = 50;
+                        break;
+
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_LOW:
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_32MHZ:
+                case BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_38MHZ:
+                        bp->bus_speed_mhz = 33;
+                        break;
+                }
+        }
+        else {
+                if (reg & BNX2_PCICFG_MISC_STATUS_M66EN)
+                        bp->bus_speed_mhz = 66;
+                else
+                        bp->bus_speed_mhz = 33;
+        }
+
+        if (reg & BNX2_PCICFG_MISC_STATUS_32BIT_DET)
+                bp->flags |= PCI_32BIT_FLAG;
+
+        /* 5706A0 may falsely detect SERR and PERR. */
+        if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
+                reg = REG_RD(bp, PCI_COMMAND);
+                reg &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
+                REG_WR(bp, PCI_COMMAND, reg);
+        }
+        else if ((CHIP_ID(bp) == CHIP_ID_5706_A1) &&
+                !(bp->flags & PCIX_FLAG)) {
+
+                printk(KERN_ERR PFX "5706 A1 can only be used in a PCIX bus, "
+                       "aborting.\n");
+                goto err_out_unmap;
+        }
+
+        bnx2_init_nvram(bp);
+
+        /* Get the permanent MAC address.  First we need to make sure the
+         * firmware is actually running.
+         */
+        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_DEV_INFO_SIGNATURE);
+
+        if ((reg & BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK) !=
+            BNX2_DEV_INFO_SIGNATURE_MAGIC) {
+                printk(KERN_ERR PFX "Firmware not running, aborting.\n");
+                rc = -ENODEV;
+                goto err_out_unmap;
+        }
+
+        bp->fw_ver = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE +
+                                BNX2_DEV_INFO_BC_REV);
+
+        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_PORT_HW_CFG_MAC_UPPER);
+        bp->mac_addr[0] = (u8) (reg >> 8);
+        bp->mac_addr[1] = (u8) reg;
+
+        reg = REG_RD_IND(bp, HOST_VIEW_SHMEM_BASE + BNX2_PORT_HW_CFG_MAC_LOWER);
+        bp->mac_addr[2] = (u8) (reg >> 24);
+        bp->mac_addr[3] = (u8) (reg >> 16);
+        bp->mac_addr[4] = (u8) (reg >> 8);
+        bp->mac_addr[5] = (u8) reg;
+
+        bp->tx_ring_size = MAX_TX_DESC_CNT;
+        bp->rx_ring_size = 100;
+
+        bp->rx_csum = 1;
+
+        bp->rx_offset = sizeof(struct l2_fhdr) + 2;
+
+        bp->tx_quick_cons_trip_int = 20;
+        bp->tx_quick_cons_trip = 20;
+        bp->tx_ticks_int = 80;
+        bp->tx_ticks = 80;
+                
+        bp->rx_quick_cons_trip_int = 6;
+        bp->rx_quick_cons_trip = 6;
+        bp->rx_ticks_int = 18;
+        bp->rx_ticks = 18;
+
+        bp->stats_ticks = 1000000 & 0xffff00;
+
+        bp->timer_interval =  HZ;
+
+        /* Disable WOL support if we are running on a SERDES chip. */
+        if (CHIP_BOND_ID(bp) & CHIP_BOND_ID_SERDES_BIT) {
+                bp->phy_flags |= PHY_SERDES_FLAG;
+                bp->flags |= NO_WOL_FLAG;
+        }
+
+        if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
+                bp->tx_quick_cons_trip_int =
+                        bp->tx_quick_cons_trip;
+                bp->tx_ticks_int = bp->tx_ticks;
+                bp->rx_quick_cons_trip_int =
+                        bp->rx_quick_cons_trip;
+                bp->rx_ticks_int = bp->rx_ticks;
+                bp->comp_prod_trip_int = bp->comp_prod_trip;
+                bp->com_ticks_int = bp->com_ticks;
+                bp->cmd_ticks_int = bp->cmd_ticks;
+        }
+
+        bp->autoneg = AUTONEG_SPEED | AUTONEG_FLOW_CTRL;
+        bp->req_line_speed = 0;
+        if (bp->phy_flags & PHY_SERDES_FLAG) {
+                bp->advertising = ETHTOOL_ALL_FIBRE_SPEED | ADVERTISED_Autoneg;
+        }
+        else {
+                bp->advertising = ETHTOOL_ALL_COPPER_SPEED | ADVERTISED_Autoneg;
+        }
+
+        bp->req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;
+
+        return 0;
+
+err_out_unmap:
+        if (bp->regview) {
+                iounmap(bp->regview);
+        }
+
+err_out_release:
+        pci_release_regions(pdev);
+
+err_out_disable:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+err_out:
+        return rc;
+}
+
+static int __devinit
+bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        static int version_printed = 0;
+        struct net_device *dev = NULL;
+        struct bnx2 *bp;
+        int rc, i;
+
+        if (version_printed++ == 0)
+                printk(KERN_INFO "%s", version);
+
+        /* dev zeroed in init_etherdev */
+        dev = alloc_etherdev(sizeof(*bp));
+
+        if (!dev)
+                return -ENOMEM;
+
+        rc = bnx2_init_board(pdev, dev);
+        if (rc < 0) {
+                free_netdev(dev);
+                return rc;
+        }
+
+        dev->open = bnx2_open;
+        dev->hard_start_xmit = bnx2_start_xmit;
+        dev->stop = bnx2_close;
+        dev->get_stats = bnx2_get_stats;
+        dev->set_multicast_list = bnx2_set_rx_mode;
+        dev->do_ioctl = bnx2_ioctl;
+        dev->set_mac_address = bnx2_change_mac_addr;
+        dev->change_mtu = bnx2_change_mtu;
+        dev->tx_timeout = bnx2_tx_timeout;
+        dev->watchdog_timeo = TX_TIMEOUT;
+#ifdef BCM_VLAN
+        dev->vlan_rx_register = bnx2_vlan_rx_register;
+        dev->vlan_rx_kill_vid = bnx2_vlan_rx_kill_vid;
+#endif
+        dev->poll = bnx2_poll;
+        dev->ethtool_ops = &bnx2_ethtool_ops;
+        dev->weight = 64;
+
+        bp = dev->priv;
+
+#if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
+        dev->poll_controller = poll_bnx2;
+#endif
+
+        if ((rc = register_netdev(dev))) {
+                printk(KERN_ERR PFX "Cannot register net device\n");
+                if (bp->regview)
+                        iounmap(bp->regview);
+                pci_release_regions(pdev);
+                pci_disable_device(pdev);
+                pci_set_drvdata(pdev, NULL);
+                free_netdev(dev);
+                return rc;
+        }
+
+        pci_set_drvdata(pdev, dev);
+
+        memcpy(dev->dev_addr, bp->mac_addr, 6);
+        bp->name = board_info[ent->driver_data].name,
+        printk(KERN_INFO "%s: %s (%c%d) PCI%s %s %dMHz found at mem %lx, "
+                "IRQ %d, ",
+                dev->name,
+                bp->name,
+                ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
+                ((CHIP_ID(bp) & 0x0ff0) >> 4),
+                ((bp->flags & PCIX_FLAG) ? "-X" : ""),
+                ((bp->flags & PCI_32BIT_FLAG) ? "32-bit" : "64-bit"),
+                bp->bus_speed_mhz,
+                dev->base_addr,
+                bp->pdev->irq);
+
+        printk("node addr ");
+        for (i = 0; i < 6; i++)
+                printk("%2.2x", dev->dev_addr[i]);
+        printk("\n");
+
+        dev->features |= NETIF_F_SG;
+        if (bp->flags & USING_DAC_FLAG)
+                dev->features |= NETIF_F_HIGHDMA;
+        dev->features |= NETIF_F_IP_CSUM;
+#ifdef BCM_VLAN
+        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+#endif
+#ifdef BCM_TSO
+        dev->features |= NETIF_F_TSO;
+#endif
+
+        netif_carrier_off(bp->dev);
+
+        return 0;
+}
+
+static void __devexit
+bnx2_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct bnx2 *bp = dev->priv;
+
+        unregister_netdev(dev);
+
+        if (bp->regview)
+                iounmap(bp->regview);
+
+        free_netdev(dev);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+}
+
+static int
+bnx2_suspend(struct pci_dev *pdev, u32 state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct bnx2 *bp = dev->priv;
+        u32 reset_code;
+
+        if (!netif_running(dev))
+                return 0;
+
+        bnx2_netif_stop(bp);
+        netif_device_detach(dev);
+        del_timer_sync(&bp->timer);
+        if (bp->wol)
+                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
+        else
+                reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
+        bnx2_reset_chip(bp, reset_code);
+        bnx2_free_skbs(bp);
+        bnx2_set_power_state(bp, state);
+        return 0;
+}
+
+static int
+bnx2_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct bnx2 *bp = dev->priv;
+
+        if (!netif_running(dev))
+                return 0;
+
+        bnx2_set_power_state(bp, 0);
+        netif_device_attach(dev);
+        bnx2_init_nic(bp);
+        bnx2_netif_start(bp);
+        return 0;
+}
+
+static struct pci_driver bnx2_pci_driver = {
+        name:           DRV_MODULE_NAME,
+        id_table:       bnx2_pci_tbl,
+        probe:          bnx2_init_one,
+        remove:         __devexit_p(bnx2_remove_one),
+        suspend:        bnx2_suspend,
+        resume:         bnx2_resume,
+};
+
+static int __init bnx2_init(void)
+{
+        return pci_module_init(&bnx2_pci_driver);
+}
+
+static void __exit bnx2_cleanup(void)
+{
+        pci_unregister_driver(&bnx2_pci_driver);
+}
+
+module_init(bnx2_init);
+module_exit(bnx2_cleanup);
+
+
+
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
new file mode 100644
index 000000000000..8214a2853d0d
--- /dev/null
+++ b/drivers/net/bnx2.h
@@ -0,0 +1,4352 @@
+/* bnx2.h: Broadcom NX2 network driver.
+ *
+ * Copyright (c) 2004, 2005 Broadcom Corporation
+ *
+ * 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.
+ *
+ * Written by: Michael Chan  (mchan@broadcom.com)
+ */
+
+
+#ifndef BNX2_H
+#define BNX2_H
+
+#include <linux/config.h>
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+#include <linux/kernel.h>
+#include <linux/timer.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/dma-mapping.h>
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <linux/delay.h>
+#include <asm/byteorder.h>
+#include <linux/time.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#ifdef NETIF_F_HW_VLAN_TX
+#include <linux/if_vlan.h>
+#define BCM_VLAN 1
+#endif
+#ifdef NETIF_F_TSO
+#include <net/ip.h>
+#include <net/tcp.h>
+#include <net/checksum.h>
+#define BCM_TSO 1
+#endif
+#include <linux/workqueue.h>
+#include <linux/crc32.h>
+
+/* Hardware data structures and register definitions automatically
+ * generated from RTL code. Do not modify.
+ */
+
+/*
+ *  tx_bd definition
+ */
+struct tx_bd {
+        u32 tx_bd_haddr_hi;
+        u32 tx_bd_haddr_lo;                                   
+        u32 tx_bd_mss_nbytes;                                     
+        u32 tx_bd_vlan_tag_flags;                                      
+                #define TX_BD_FLAGS_CONN_FAULT          (1<<0)
+                #define TX_BD_FLAGS_TCP_UDP_CKSUM       (1<<1)
+                #define TX_BD_FLAGS_IP_CKSUM            (1<<2)
+                #define TX_BD_FLAGS_VLAN_TAG            (1<<3)
+                #define TX_BD_FLAGS_COAL_NOW            (1<<4)
+                #define TX_BD_FLAGS_DONT_GEN_CRC        (1<<5)
+                #define TX_BD_FLAGS_END                 (1<<6)
+                #define TX_BD_FLAGS_START               (1<<7)
+                #define TX_BD_FLAGS_SW_OPTION_WORD      (0x1f<<8)
+                #define TX_BD_FLAGS_SW_FLAGS            (1<<13)
+                #define TX_BD_FLAGS_SW_SNAP             (1<<14)
+                #define TX_BD_FLAGS_SW_LSO              (1<<15)
+
+};
+
+
+/*
+ *  rx_bd definition
+ */
+struct rx_bd {
+        u32 rx_bd_haddr_hi;
+        u32 rx_bd_haddr_lo;
+        u32 rx_bd_len;
+        u32 rx_bd_flags;
+                #define RX_BD_FLAGS_NOPUSH              (1<<0)
+                #define RX_BD_FLAGS_DUMMY               (1<<1)
+                #define RX_BD_FLAGS_END                 (1<<2)
+                #define RX_BD_FLAGS_START               (1<<3)
+
+};
+
+
+/*
+ *  status_block definition
+ */
+struct status_block {
+        u32 status_attn_bits;
+                #define STATUS_ATTN_BITS_LINK_STATE             (1L<<0)
+                #define STATUS_ATTN_BITS_TX_SCHEDULER_ABORT     (1L<<1)
+                #define STATUS_ATTN_BITS_TX_BD_READ_ABORT       (1L<<2)
+                #define STATUS_ATTN_BITS_TX_BD_CACHE_ABORT      (1L<<3)
+                #define STATUS_ATTN_BITS_TX_PROCESSOR_ABORT     (1L<<4)
+                #define STATUS_ATTN_BITS_TX_DMA_ABORT           (1L<<5)
+                #define STATUS_ATTN_BITS_TX_PATCHUP_ABORT       (1L<<6)
+                #define STATUS_ATTN_BITS_TX_ASSEMBLER_ABORT     (1L<<7)
+                #define STATUS_ATTN_BITS_RX_PARSER_MAC_ABORT    (1L<<8)
+                #define STATUS_ATTN_BITS_RX_PARSER_CATCHUP_ABORT        (1L<<9)
+                #define STATUS_ATTN_BITS_RX_MBUF_ABORT          (1L<<10)
+                #define STATUS_ATTN_BITS_RX_LOOKUP_ABORT        (1L<<11)
+                #define STATUS_ATTN_BITS_RX_PROCESSOR_ABORT     (1L<<12)
+                #define STATUS_ATTN_BITS_RX_V2P_ABORT           (1L<<13)
+                #define STATUS_ATTN_BITS_RX_BD_CACHE_ABORT      (1L<<14)
+                #define STATUS_ATTN_BITS_RX_DMA_ABORT           (1L<<15)
+                #define STATUS_ATTN_BITS_COMPLETION_ABORT       (1L<<16)
+                #define STATUS_ATTN_BITS_HOST_COALESCE_ABORT    (1L<<17)
+                #define STATUS_ATTN_BITS_MAILBOX_QUEUE_ABORT    (1L<<18)
+                #define STATUS_ATTN_BITS_CONTEXT_ABORT          (1L<<19)
+                #define STATUS_ATTN_BITS_CMD_SCHEDULER_ABORT    (1L<<20)
+                #define STATUS_ATTN_BITS_CMD_PROCESSOR_ABORT    (1L<<21)
+                #define STATUS_ATTN_BITS_MGMT_PROCESSOR_ABORT   (1L<<22)
+                #define STATUS_ATTN_BITS_MAC_ABORT              (1L<<23)
+                #define STATUS_ATTN_BITS_TIMER_ABORT            (1L<<24)
+                #define STATUS_ATTN_BITS_DMAE_ABORT             (1L<<25)
+                #define STATUS_ATTN_BITS_FLSH_ABORT             (1L<<26)
+                #define STATUS_ATTN_BITS_GRC_ABORT              (1L<<27)
+                #define STATUS_ATTN_BITS_PARITY_ERROR           (1L<<31)
+
+        u32 status_attn_bits_ack;
+#if defined(__BIG_ENDIAN)
+        u16 status_tx_quick_consumer_index0;
+        u16 status_tx_quick_consumer_index1;
+        u16 status_tx_quick_consumer_index2;
+        u16 status_tx_quick_consumer_index3;
+        u16 status_rx_quick_consumer_index0;
+        u16 status_rx_quick_consumer_index1;
+        u16 status_rx_quick_consumer_index2;
+        u16 status_rx_quick_consumer_index3;
+        u16 status_rx_quick_consumer_index4;
+        u16 status_rx_quick_consumer_index5;
+        u16 status_rx_quick_consumer_index6;
+        u16 status_rx_quick_consumer_index7;
+        u16 status_rx_quick_consumer_index8;
+        u16 status_rx_quick_consumer_index9;
+        u16 status_rx_quick_consumer_index10;
+        u16 status_rx_quick_consumer_index11;
+        u16 status_rx_quick_consumer_index12;
+        u16 status_rx_quick_consumer_index13;
+        u16 status_rx_quick_consumer_index14;
+        u16 status_rx_quick_consumer_index15;
+        u16 status_completion_producer_index;
+        u16 status_cmd_consumer_index;
+        u16 status_idx;
+        u16 status_unused;
+#elif defined(__LITTLE_ENDIAN)
+        u16 status_tx_quick_consumer_index1;
+        u16 status_tx_quick_consumer_index0;
+        u16 status_tx_quick_consumer_index3;
+        u16 status_tx_quick_consumer_index2;
+        u16 status_rx_quick_consumer_index1;
+        u16 status_rx_quick_consumer_index0;
+        u16 status_rx_quick_consumer_index3;
+        u16 status_rx_quick_consumer_index2;
+        u16 status_rx_quick_consumer_index5;
+        u16 status_rx_quick_consumer_index4;
+        u16 status_rx_quick_consumer_index7;
+        u16 status_rx_quick_consumer_index6;
+        u16 status_rx_quick_consumer_index9;
+        u16 status_rx_quick_consumer_index8;
+        u16 status_rx_quick_consumer_index11;
+        u16 status_rx_quick_consumer_index10;
+        u16 status_rx_quick_consumer_index13;
+        u16 status_rx_quick_consumer_index12;
+        u16 status_rx_quick_consumer_index15;
+        u16 status_rx_quick_consumer_index14;
+        u16 status_cmd_consumer_index;
+        u16 status_completion_producer_index;
+        u16 status_unused;
+        u16 status_idx;
+#endif
+};
+
+
+/*
+ *  statistics_block definition
+ */
+struct statistics_block {
+        u32 stat_IfHCInOctets_hi;
+        u32 stat_IfHCInOctets_lo;
+        u32 stat_IfHCInBadOctets_hi;
+        u32 stat_IfHCInBadOctets_lo;
+        u32 stat_IfHCOutOctets_hi;
+        u32 stat_IfHCOutOctets_lo;
+        u32 stat_IfHCOutBadOctets_hi;
+        u32 stat_IfHCOutBadOctets_lo;
+        u32 stat_IfHCInUcastPkts_hi;
+        u32 stat_IfHCInUcastPkts_lo;
+        u32 stat_IfHCInMulticastPkts_hi;
+        u32 stat_IfHCInMulticastPkts_lo;
+        u32 stat_IfHCInBroadcastPkts_hi;
+        u32 stat_IfHCInBroadcastPkts_lo;
+        u32 stat_IfHCOutUcastPkts_hi;
+        u32 stat_IfHCOutUcastPkts_lo;
+        u32 stat_IfHCOutMulticastPkts_hi;
+        u32 stat_IfHCOutMulticastPkts_lo;
+        u32 stat_IfHCOutBroadcastPkts_hi;
+        u32 stat_IfHCOutBroadcastPkts_lo;
+        u32 stat_emac_tx_stat_dot3statsinternalmactransmiterrors;
+        u32 stat_Dot3StatsCarrierSenseErrors;
+        u32 stat_Dot3StatsFCSErrors;
+        u32 stat_Dot3StatsAlignmentErrors;
+        u32 stat_Dot3StatsSingleCollisionFrames;
+        u32 stat_Dot3StatsMultipleCollisionFrames;
+        u32 stat_Dot3StatsDeferredTransmissions;
+        u32 stat_Dot3StatsExcessiveCollisions;
+        u32 stat_Dot3StatsLateCollisions;
+        u32 stat_EtherStatsCollisions;
+        u32 stat_EtherStatsFragments;
+        u32 stat_EtherStatsJabbers;
+        u32 stat_EtherStatsUndersizePkts;
+        u32 stat_EtherStatsOverrsizePkts;
+        u32 stat_EtherStatsPktsRx64Octets;
+        u32 stat_EtherStatsPktsRx65Octetsto127Octets;
+        u32 stat_EtherStatsPktsRx128Octetsto255Octets;
+        u32 stat_EtherStatsPktsRx256Octetsto511Octets;
+        u32 stat_EtherStatsPktsRx512Octetsto1023Octets;
+        u32 stat_EtherStatsPktsRx1024Octetsto1522Octets;
+        u32 stat_EtherStatsPktsRx1523Octetsto9022Octets;
+        u32 stat_EtherStatsPktsTx64Octets;
+        u32 stat_EtherStatsPktsTx65Octetsto127Octets;
+        u32 stat_EtherStatsPktsTx128Octetsto255Octets;
+        u32 stat_EtherStatsPktsTx256Octetsto511Octets;
+        u32 stat_EtherStatsPktsTx512Octetsto1023Octets;
+        u32 stat_EtherStatsPktsTx1024Octetsto1522Octets;
+        u32 stat_EtherStatsPktsTx1523Octetsto9022Octets;
+        u32 stat_XonPauseFramesReceived;
+        u32 stat_XoffPauseFramesReceived;
+        u32 stat_OutXonSent;
+        u32 stat_OutXoffSent;
+        u32 stat_FlowControlDone;
+        u32 stat_MacControlFramesReceived;
+        u32 stat_XoffStateEntered;
+        u32 stat_IfInFramesL2FilterDiscards;
+        u32 stat_IfInRuleCheckerDiscards;
+        u32 stat_IfInFTQDiscards;
+        u32 stat_IfInMBUFDiscards;
+        u32 stat_IfInRuleCheckerP4Hit;
+        u32 stat_CatchupInRuleCheckerDiscards;
+        u32 stat_CatchupInFTQDiscards;
+        u32 stat_CatchupInMBUFDiscards;
+        u32 stat_CatchupInRuleCheckerP4Hit;
+        u32 stat_GenStat00;
+        u32 stat_GenStat01;
+        u32 stat_GenStat02;
+        u32 stat_GenStat03;
+        u32 stat_GenStat04;
+        u32 stat_GenStat05;
+        u32 stat_GenStat06;
+        u32 stat_GenStat07;
+        u32 stat_GenStat08;
+        u32 stat_GenStat09;
+        u32 stat_GenStat10;
+        u32 stat_GenStat11;
+        u32 stat_GenStat12;
+        u32 stat_GenStat13;
+        u32 stat_GenStat14;
+        u32 stat_GenStat15;
+};
+
+
+/*
+ *  l2_fhdr definition
+ */
+struct l2_fhdr {
+#if defined(__BIG_ENDIAN)
+        u16 l2_fhdr_errors;
+        u16 l2_fhdr_status;
+#elif defined(__LITTLE_ENDIAN)
+        u16 l2_fhdr_status;
+        u16 l2_fhdr_errors;
+#endif
+                #define L2_FHDR_ERRORS_BAD_CRC          (1<<1)
+                #define L2_FHDR_ERRORS_PHY_DECODE       (1<<2)
+                #define L2_FHDR_ERRORS_ALIGNMENT        (1<<3)
+                #define L2_FHDR_ERRORS_TOO_SHORT        (1<<4)
+                #define L2_FHDR_ERRORS_GIANT_FRAME      (1<<5)
+
+                #define L2_FHDR_STATUS_RULE_CLASS       (0x7<<0)
+                #define L2_FHDR_STATUS_RULE_P2          (1<<3)
+                #define L2_FHDR_STATUS_RULE_P3          (1<<4)
+                #define L2_FHDR_STATUS_RULE_P4          (1<<5)
+                #define L2_FHDR_STATUS_L2_VLAN_TAG      (1<<6)
+                #define L2_FHDR_STATUS_L2_LLC_SNAP      (1<<7)
+                #define L2_FHDR_STATUS_RSS_HASH         (1<<8)
+                #define L2_FHDR_STATUS_IP_DATAGRAM      (1<<13)
+                #define L2_FHDR_STATUS_TCP_SEGMENT      (1<<14)
+                #define L2_FHDR_STATUS_UDP_DATAGRAM     (1<<15)
+
+        u32 l2_fhdr_hash;
+#if defined(__BIG_ENDIAN)
+        u16 l2_fhdr_pkt_len;
+        u16 l2_fhdr_vlan_tag;
+        u16 l2_fhdr_ip_xsum;
+        u16 l2_fhdr_tcp_udp_xsum;
+#elif defined(__LITTLE_ENDIAN)
+        u16 l2_fhdr_vlan_tag;
+        u16 l2_fhdr_pkt_len;
+        u16 l2_fhdr_tcp_udp_xsum;
+        u16 l2_fhdr_ip_xsum;
+#endif
+};
+
+
+/*
+ *  l2_context definition
+ */
+#define BNX2_L2CTX_TYPE                                 0x00000000
+#define BNX2_L2CTX_TYPE_SIZE_L2                          ((0xc0/0x20)<<16)
+#define BNX2_L2CTX_TYPE_TYPE                             (0xf<<28)
+#define BNX2_L2CTX_TYPE_TYPE_EMPTY                       (0<<28)
+#define BNX2_L2CTX_TYPE_TYPE_L2                          (1<<28)
+
+#define BNX2_L2CTX_TX_HOST_BIDX                         0x00000088
+#define BNX2_L2CTX_EST_NBD                              0x00000088
+#define BNX2_L2CTX_CMD_TYPE                             0x00000088
+#define BNX2_L2CTX_CMD_TYPE_TYPE                         (0xf<<24)
+#define BNX2_L2CTX_CMD_TYPE_TYPE_L2                      (0<<24)
+#define BNX2_L2CTX_CMD_TYPE_TYPE_TCP                     (1<<24)
+
+#define BNX2_L2CTX_TX_HOST_BSEQ                         0x00000090
+#define BNX2_L2CTX_TSCH_BSEQ                            0x00000094
+#define BNX2_L2CTX_TBDR_BSEQ                            0x00000098
+#define BNX2_L2CTX_TBDR_BOFF                            0x0000009c
+#define BNX2_L2CTX_TBDR_BIDX                            0x0000009c
+#define BNX2_L2CTX_TBDR_BHADDR_HI                       0x000000a0
+#define BNX2_L2CTX_TBDR_BHADDR_LO                       0x000000a4
+#define BNX2_L2CTX_TXP_BOFF                             0x000000a8
+#define BNX2_L2CTX_TXP_BIDX                             0x000000a8
+#define BNX2_L2CTX_TXP_BSEQ                             0x000000ac
+
+
+/*
+ *  l2_bd_chain_context definition
+ */
+#define BNX2_L2CTX_BD_PRE_READ                          0x00000000
+#define BNX2_L2CTX_CTX_SIZE                             0x00000000
+#define BNX2_L2CTX_CTX_TYPE                             0x00000000
+#define BNX2_L2CTX_CTX_TYPE_SIZE_L2                      ((0x20/20)<<16)
+#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE              (0xf<<28)
+#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_UNDEFINED    (0<<28)
+#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE        (1<<28)
+
+#define BNX2_L2CTX_HOST_BDIDX                           0x00000004
+#define BNX2_L2CTX_HOST_BSEQ                            0x00000008
+#define BNX2_L2CTX_NX_BSEQ                              0x0000000c
+#define BNX2_L2CTX_NX_BDHADDR_HI                        0x00000010
+#define BNX2_L2CTX_NX_BDHADDR_LO                        0x00000014
+#define BNX2_L2CTX_NX_BDIDX                             0x00000018
+
+
+/*
+ *  pci_config_l definition
+ *  offset: 0000
+ */
+#define BNX2_PCICFG_MISC_CONFIG                         0x00000068
+#define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP         (1L<<2)
+#define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP      (1L<<3)
+#define BNX2_PCICFG_MISC_CONFIG_CLOCK_CTL_ENA            (1L<<5)
+#define BNX2_PCICFG_MISC_CONFIG_TARGET_GRC_WORD_SWAP     (1L<<6)
+#define BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA           (1L<<7)
+#define BNX2_PCICFG_MISC_CONFIG_CORE_RST_REQ             (1L<<8)
+#define BNX2_PCICFG_MISC_CONFIG_CORE_RST_BSY             (1L<<9)
+#define BNX2_PCICFG_MISC_CONFIG_ASIC_METAL_REV           (0xffL<<16)
+#define BNX2_PCICFG_MISC_CONFIG_ASIC_BASE_REV            (0xfL<<24)
+#define BNX2_PCICFG_MISC_CONFIG_ASIC_ID                  (0xfL<<28)
+
+#define BNX2_PCICFG_MISC_STATUS                         0x0000006c
+#define BNX2_PCICFG_MISC_STATUS_INTA_VALUE               (1L<<0)
+#define BNX2_PCICFG_MISC_STATUS_32BIT_DET                (1L<<1)
+#define BNX2_PCICFG_MISC_STATUS_M66EN                    (1L<<2)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_DET                 (1L<<3)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_SPEED               (0x3L<<4)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_SPEED_66            (0L<<4)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_SPEED_100           (1L<<4)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_SPEED_133           (2L<<4)
+#define BNX2_PCICFG_MISC_STATUS_PCIX_SPEED_PCI_MODE      (3L<<4)
+
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS              0x00000070
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET       (0xfL<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_32MHZ         (0L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_38MHZ         (1L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_48MHZ         (2L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_55MHZ         (3L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_66MHZ         (4L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_80MHZ         (5L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_95MHZ         (6L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_133MHZ        (7L<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_LOW   (0xfL<<0)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_DISABLE      (1L<<6)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT  (1L<<7)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC      (0x7L<<8)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_UNDEF        (0L<<8)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_12   (1L<<8)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_6    (2L<<8)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_62   (4L<<8)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PLAY_DEAD     (1L<<11)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED    (0xfL<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_100        (0L<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_80         (1L<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_50         (2L<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_40         (4L<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_25         (8L<<12)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_CORE_CLK_PLL_STOP     (1L<<16)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_PCI_PLL_STOP  (1L<<17)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_RESERVED_18   (1L<<18)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_USE_SPD_DET   (1L<<19)
+#define BNX2_PCICFG_PCI_CLOCK_CONTROL_BITS_RESERVED      (0xfffL<<20)
+
+#define BNX2_PCICFG_REG_WINDOW_ADDRESS                  0x00000078
+#define BNX2_PCICFG_REG_WINDOW                          0x00000080
+#define BNX2_PCICFG_INT_ACK_CMD                         0x00000084
+#define BNX2_PCICFG_INT_ACK_CMD_INDEX                    (0xffffL<<0)
+#define BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID              (1L<<16)
+#define BNX2_PCICFG_INT_ACK_CMD_USE_INT_HC_PARAM         (1L<<17)
+#define BNX2_PCICFG_INT_ACK_CMD_MASK_INT                 (1L<<18)
+
+#define BNX2_PCICFG_STATUS_BIT_SET_CMD                  0x00000088
+#define BNX2_PCICFG_STATUS_BIT_CLEAR_CMD                0x0000008c
+#define BNX2_PCICFG_MAILBOX_QUEUE_ADDR                  0x00000090
+#define BNX2_PCICFG_MAILBOX_QUEUE_DATA                  0x00000094
+
+
+/*
+ *  pci_reg definition
+ *  offset: 0x400
+ */
+#define BNX2_PCI_GRC_WINDOW_ADDR                        0x00000400
+#define BNX2_PCI_GRC_WINDOW_ADDR_PCI_GRC_WINDOW_ADDR_VALUE       (0x3ffffL<<8)
+
+#define BNX2_PCI_CONFIG_1                               0x00000404
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY                  (0x7L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_OFF              (0L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_16               (1L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_32               (2L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_64               (3L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_128              (4L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_256              (5L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_512              (6L<<8)
+#define BNX2_PCI_CONFIG_1_READ_BOUNDARY_1024             (7L<<8)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY                 (0x7L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_OFF             (0L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_16              (1L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_32              (2L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_64              (3L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_128             (4L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_256             (5L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_512             (6L<<11)
+#define BNX2_PCI_CONFIG_1_WRITE_BOUNDARY_1024            (7L<<11)
+
+#define BNX2_PCI_CONFIG_2                               0x00000408
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE                      (0xfL<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_DISABLED             (0L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_64K                  (1L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_128K                 (2L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_256K                 (3L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_512K                 (4L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_1M                   (5L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_2M                   (6L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_4M                   (7L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_8M                   (8L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_16M                  (9L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_32M                  (10L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_64M                  (11L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_128M                 (12L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_256M                 (13L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_512M                 (14L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_SIZE_1G                   (15L<<0)
+#define BNX2_PCI_CONFIG_2_BAR1_64ENA                     (1L<<4)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_RETRY                  (1L<<5)
+#define BNX2_PCI_CONFIG_2_CFG_CYCLE_RETRY                (1L<<6)
+#define BNX2_PCI_CONFIG_2_FIRST_CFG_DONE                 (1L<<7)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE                   (0xffL<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_DISABLED          (0L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_1K                (1L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_2K                (2L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_4K                (3L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_8K                (4L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_16K               (5L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_32K               (6L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_64K               (7L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_128K              (8L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_256K              (9L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_512K              (10L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_1M                (11L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_2M                (12L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_4M                (13L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_8M                (14L<<8)
+#define BNX2_PCI_CONFIG_2_EXP_ROM_SIZE_16M               (15L<<8)
+#define BNX2_PCI_CONFIG_2_MAX_SPLIT_LIMIT                (0x1fL<<16)
+#define BNX2_PCI_CONFIG_2_MAX_READ_LIMIT                 (0x3L<<21)
+#define BNX2_PCI_CONFIG_2_MAX_READ_LIMIT_512             (0L<<21)
+#define BNX2_PCI_CONFIG_2_MAX_READ_LIMIT_1K              (1L<<21)
+#define BNX2_PCI_CONFIG_2_MAX_READ_LIMIT_2K              (2L<<21)
+#define BNX2_PCI_CONFIG_2_MAX_READ_LIMIT_4K              (3L<<21)
+#define BNX2_PCI_CONFIG_2_FORCE_32_BIT_MSTR              (1L<<23)
+#define BNX2_PCI_CONFIG_2_FORCE_32_BIT_TGT               (1L<<24)
+#define BNX2_PCI_CONFIG_2_KEEP_REQ_ASSERT                (1L<<25)
+
+#define BNX2_PCI_CONFIG_3                               0x0000040c
+#define BNX2_PCI_CONFIG_3_STICKY_BYTE                    (0xffL<<0)
+#define BNX2_PCI_CONFIG_3_FORCE_PME                      (1L<<24)
+#define BNX2_PCI_CONFIG_3_PME_STATUS                     (1L<<25)
+#define BNX2_PCI_CONFIG_3_PME_ENABLE                     (1L<<26)
+#define BNX2_PCI_CONFIG_3_PM_STATE                       (0x3L<<27)
+#define BNX2_PCI_CONFIG_3_VAUX_PRESET                    (1L<<30)
+#define BNX2_PCI_CONFIG_3_PCI_POWER                      (1L<<31)
+
+#define BNX2_PCI_PM_DATA_A                              0x00000410
+#define BNX2_PCI_PM_DATA_A_PM_DATA_0_PRG                 (0xffL<<0)
+#define BNX2_PCI_PM_DATA_A_PM_DATA_1_PRG                 (0xffL<<8)
+#define BNX2_PCI_PM_DATA_A_PM_DATA_2_PRG                 (0xffL<<16)
+#define BNX2_PCI_PM_DATA_A_PM_DATA_3_PRG                 (0xffL<<24)
+
+#define BNX2_PCI_PM_DATA_B                              0x00000414
+#define BNX2_PCI_PM_DATA_B_PM_DATA_4_PRG                 (0xffL<<0)
+#define BNX2_PCI_PM_DATA_B_PM_DATA_5_PRG                 (0xffL<<8)
+#define BNX2_PCI_PM_DATA_B_PM_DATA_6_PRG                 (0xffL<<16)
+#define BNX2_PCI_PM_DATA_B_PM_DATA_7_PRG                 (0xffL<<24)
+
+#define BNX2_PCI_SWAP_DIAG0                             0x00000418
+#define BNX2_PCI_SWAP_DIAG1                             0x0000041c
+#define BNX2_PCI_EXP_ROM_ADDR                           0x00000420
+#define BNX2_PCI_EXP_ROM_ADDR_ADDRESS                    (0x3fffffL<<2)
+#define BNX2_PCI_EXP_ROM_ADDR_REQ                        (1L<<31)
+
+#define BNX2_PCI_EXP_ROM_DATA                           0x00000424
+#define BNX2_PCI_VPD_INTF                               0x00000428
+#define BNX2_PCI_VPD_INTF_INTF_REQ                       (1L<<0)
+
+#define BNX2_PCI_VPD_ADDR_FLAG                          0x0000042c
+#define BNX2_PCI_VPD_ADDR_FLAG_ADDRESS                   (0x1fff<<2)
+#define BNX2_PCI_VPD_ADDR_FLAG_WR                        (1<<15)
+
+#define BNX2_PCI_VPD_DATA                               0x00000430
+#define BNX2_PCI_ID_VAL1                                0x00000434
+#define BNX2_PCI_ID_VAL1_DEVICE_ID                       (0xffffL<<0)
+#define BNX2_PCI_ID_VAL1_VENDOR_ID                       (0xffffL<<16)
+
+#define BNX2_PCI_ID_VAL2                                0x00000438
+#define BNX2_PCI_ID_VAL2_SUBSYSTEM_VENDOR_ID             (0xffffL<<0)
+#define BNX2_PCI_ID_VAL2_SUBSYSTEM_ID                    (0xffffL<<16)
+
+#define BNX2_PCI_ID_VAL3                                0x0000043c
+#define BNX2_PCI_ID_VAL3_CLASS_CODE                      (0xffffffL<<0)
+#define BNX2_PCI_ID_VAL3_REVISION_ID                     (0xffL<<24)
+
+#define BNX2_PCI_ID_VAL4                                0x00000440
+#define BNX2_PCI_ID_VAL4_CAP_ENA                         (0xfL<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_0                       (0L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_1                       (1L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_2                       (2L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_3                       (3L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_4                       (4L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_5                       (5L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_6                       (6L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_7                       (7L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_8                       (8L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_9                       (9L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_10                      (10L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_11                      (11L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_12                      (12L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_13                      (13L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_14                      (14L<<0)
+#define BNX2_PCI_ID_VAL4_CAP_ENA_15                      (15L<<0)
+#define BNX2_PCI_ID_VAL4_PM_SCALE_PRG                    (0x3L<<6)
+#define BNX2_PCI_ID_VAL4_PM_SCALE_PRG_0                  (0L<<6)
+#define BNX2_PCI_ID_VAL4_PM_SCALE_PRG_1                  (1L<<6)
+#define BNX2_PCI_ID_VAL4_PM_SCALE_PRG_2                  (2L<<6)
+#define BNX2_PCI_ID_VAL4_PM_SCALE_PRG_3                  (3L<<6)
+#define BNX2_PCI_ID_VAL4_MSI_LIMIT                       (0x7L<<9)
+#define BNX2_PCI_ID_VAL4_MSI_ADVERTIZE                   (0x7L<<12)
+#define BNX2_PCI_ID_VAL4_MSI_ENABLE                      (1L<<15)
+#define BNX2_PCI_ID_VAL4_MAX_64_ADVERTIZE                (1L<<16)
+#define BNX2_PCI_ID_VAL4_MAX_133_ADVERTIZE               (1L<<17)
+#define BNX2_PCI_ID_VAL4_MAX_MEM_READ_SIZE               (0x3L<<21)
+#define BNX2_PCI_ID_VAL4_MAX_SPLIT_SIZE                  (0x7L<<23)
+#define BNX2_PCI_ID_VAL4_MAX_CUMULATIVE_SIZE             (0x7L<<26)
+
+#define BNX2_PCI_ID_VAL5                                0x00000444
+#define BNX2_PCI_ID_VAL5_D1_SUPPORT                      (1L<<0)
+#define BNX2_PCI_ID_VAL5_D2_SUPPORT                      (1L<<1)
+#define BNX2_PCI_ID_VAL5_PME_IN_D0                       (1L<<2)
+#define BNX2_PCI_ID_VAL5_PME_IN_D1                       (1L<<3)
+#define BNX2_PCI_ID_VAL5_PME_IN_D2                       (1L<<4)
+#define BNX2_PCI_ID_VAL5_PME_IN_D3_HOT                   (1L<<5)
+
+#define BNX2_PCI_PCIX_EXTENDED_STATUS                   0x00000448
+#define BNX2_PCI_PCIX_EXTENDED_STATUS_NO_SNOOP           (1L<<8)
+#define BNX2_PCI_PCIX_EXTENDED_STATUS_LONG_BURST         (1L<<9)
+#define BNX2_PCI_PCIX_EXTENDED_STATUS_SPLIT_COMP_MSG_CLASS       (0xfL<<16)
+#define BNX2_PCI_PCIX_EXTENDED_STATUS_SPLIT_COMP_MSG_IDX         (0xffL<<24)
+
+#define BNX2_PCI_ID_VAL6                                0x0000044c
+#define BNX2_PCI_ID_VAL6_MAX_LAT                         (0xffL<<0)
+#define BNX2_PCI_ID_VAL6_MIN_GNT                         (0xffL<<8)
+#define BNX2_PCI_ID_VAL6_BIST                            (0xffL<<16)
+
+#define BNX2_PCI_MSI_DATA                               0x00000450
+#define BNX2_PCI_MSI_DATA_PCI_MSI_DATA                   (0xffffL<<0)
+
+#define BNX2_PCI_MSI_ADDR_H                             0x00000454
+#define BNX2_PCI_MSI_ADDR_L                             0x00000458
+
+
+/*
+ *  misc_reg definition
+ *  offset: 0x800
+ */
+#define BNX2_MISC_COMMAND                               0x00000800
+#define BNX2_MISC_COMMAND_ENABLE_ALL                     (1L<<0)
+#define BNX2_MISC_COMMAND_DISABLE_ALL                    (1L<<1)
+#define BNX2_MISC_COMMAND_CORE_RESET                     (1L<<4)
+#define BNX2_MISC_COMMAND_HARD_RESET                     (1L<<5)
+#define BNX2_MISC_COMMAND_PAR_ERROR                      (1L<<8)
+#define BNX2_MISC_COMMAND_PAR_ERR_RAM                    (0x7fL<<16)
+
+#define BNX2_MISC_CFG                                   0x00000804
+#define BNX2_MISC_CFG_PCI_GRC_TMOUT                      (1L<<0)
+#define BNX2_MISC_CFG_NVM_WR_EN                          (0x3L<<1)
+#define BNX2_MISC_CFG_NVM_WR_EN_PROTECT                  (0L<<1)
+#define BNX2_MISC_CFG_NVM_WR_EN_PCI                      (1L<<1)
+#define BNX2_MISC_CFG_NVM_WR_EN_ALLOW                    (2L<<1)
+#define BNX2_MISC_CFG_NVM_WR_EN_ALLOW2                   (3L<<1)
+#define BNX2_MISC_CFG_BIST_EN                            (1L<<3)
+#define BNX2_MISC_CFG_CK25_OUT_ALT_SRC                   (1L<<4)
+#define BNX2_MISC_CFG_BYPASS_BSCAN                       (1L<<5)
+#define BNX2_MISC_CFG_BYPASS_EJTAG                       (1L<<6)
+#define BNX2_MISC_CFG_CLK_CTL_OVERRIDE                   (1L<<7)
+#define BNX2_MISC_CFG_LEDMODE                            (0x3L<<8)
+#define BNX2_MISC_CFG_LEDMODE_MAC                        (0L<<8)
+#define BNX2_MISC_CFG_LEDMODE_GPHY1                      (1L<<8)
+#define BNX2_MISC_CFG_LEDMODE_GPHY2                      (2L<<8)
+
+#define BNX2_MISC_ID                                    0x00000808
+#define BNX2_MISC_ID_BOND_ID                             (0xfL<<0)
+#define BNX2_MISC_ID_CHIP_METAL                          (0xffL<<4)
+#define BNX2_MISC_ID_CHIP_REV                            (0xfL<<12)
+#define BNX2_MISC_ID_CHIP_NUM                            (0xffffL<<16)
+
+#define BNX2_MISC_ENABLE_STATUS_BITS                    0x0000080c
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_SCHEDULER_ENABLE         (1L<<0)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_BD_READ_ENABLE   (1L<<1)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_BD_CACHE_ENABLE  (1L<<2)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_PROCESSOR_ENABLE         (1L<<3)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_DMA_ENABLE       (1L<<4)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_PATCHUP_ENABLE   (1L<<5)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_PAYLOAD_Q_ENABLE         (1L<<6)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_HEADER_Q_ENABLE  (1L<<7)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TX_ASSEMBLER_ENABLE         (1L<<8)
+#define BNX2_MISC_ENABLE_STATUS_BITS_EMAC_ENABLE         (1L<<9)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_PARSER_MAC_ENABLE        (1L<<10)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_PARSER_CATCHUP_ENABLE    (1L<<11)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_MBUF_ENABLE      (1L<<12)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_LOOKUP_ENABLE    (1L<<13)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_PROCESSOR_ENABLE         (1L<<14)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_V2P_ENABLE       (1L<<15)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_BD_CACHE_ENABLE  (1L<<16)
+#define BNX2_MISC_ENABLE_STATUS_BITS_RX_DMA_ENABLE       (1L<<17)
+#define BNX2_MISC_ENABLE_STATUS_BITS_COMPLETION_ENABLE   (1L<<18)
+#define BNX2_MISC_ENABLE_STATUS_BITS_HOST_COALESCE_ENABLE        (1L<<19)
+#define BNX2_MISC_ENABLE_STATUS_BITS_MAILBOX_QUEUE_ENABLE        (1L<<20)
+#define BNX2_MISC_ENABLE_STATUS_BITS_CONTEXT_ENABLE      (1L<<21)
+#define BNX2_MISC_ENABLE_STATUS_BITS_CMD_SCHEDULER_ENABLE        (1L<<22)
+#define BNX2_MISC_ENABLE_STATUS_BITS_CMD_PROCESSOR_ENABLE        (1L<<23)
+#define BNX2_MISC_ENABLE_STATUS_BITS_MGMT_PROCESSOR_ENABLE       (1L<<24)
+#define BNX2_MISC_ENABLE_STATUS_BITS_TIMER_ENABLE        (1L<<25)
+#define BNX2_MISC_ENABLE_STATUS_BITS_DMA_ENGINE_ENABLE   (1L<<26)
+#define BNX2_MISC_ENABLE_STATUS_BITS_UMP_ENABLE          (1L<<27)
+
+#define BNX2_MISC_ENABLE_SET_BITS                       0x00000810
+#define BNX2_MISC_ENABLE_SET_BITS_TX_SCHEDULER_ENABLE    (1L<<0)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_BD_READ_ENABLE      (1L<<1)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_BD_CACHE_ENABLE     (1L<<2)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_PROCESSOR_ENABLE    (1L<<3)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_DMA_ENABLE          (1L<<4)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_PATCHUP_ENABLE      (1L<<5)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_PAYLOAD_Q_ENABLE    (1L<<6)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_HEADER_Q_ENABLE     (1L<<7)
+#define BNX2_MISC_ENABLE_SET_BITS_TX_ASSEMBLER_ENABLE    (1L<<8)
+#define BNX2_MISC_ENABLE_SET_BITS_EMAC_ENABLE            (1L<<9)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_PARSER_MAC_ENABLE   (1L<<10)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_PARSER_CATCHUP_ENABLE       (1L<<11)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE         (1L<<12)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_LOOKUP_ENABLE       (1L<<13)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_PROCESSOR_ENABLE    (1L<<14)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_V2P_ENABLE          (1L<<15)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_BD_CACHE_ENABLE     (1L<<16)
+#define BNX2_MISC_ENABLE_SET_BITS_RX_DMA_ENABLE          (1L<<17)
+#define BNX2_MISC_ENABLE_SET_BITS_COMPLETION_ENABLE      (1L<<18)
+#define BNX2_MISC_ENABLE_SET_BITS_HOST_COALESCE_ENABLE   (1L<<19)
+#define BNX2_MISC_ENABLE_SET_BITS_MAILBOX_QUEUE_ENABLE   (1L<<20)
+#define BNX2_MISC_ENABLE_SET_BITS_CONTEXT_ENABLE         (1L<<21)
+#define BNX2_MISC_ENABLE_SET_BITS_CMD_SCHEDULER_ENABLE   (1L<<22)
+#define BNX2_MISC_ENABLE_SET_BITS_CMD_PROCESSOR_ENABLE   (1L<<23)
+#define BNX2_MISC_ENABLE_SET_BITS_MGMT_PROCESSOR_ENABLE  (1L<<24)
+#define BNX2_MISC_ENABLE_SET_BITS_TIMER_ENABLE           (1L<<25)
+#define BNX2_MISC_ENABLE_SET_BITS_DMA_ENGINE_ENABLE      (1L<<26)
+#define BNX2_MISC_ENABLE_SET_BITS_UMP_ENABLE             (1L<<27)
+
+#define BNX2_MISC_ENABLE_CLR_BITS                       0x00000814
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_SCHEDULER_ENABLE    (1L<<0)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_BD_READ_ENABLE      (1L<<1)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_BD_CACHE_ENABLE     (1L<<2)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_PROCESSOR_ENABLE    (1L<<3)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_DMA_ENABLE          (1L<<4)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_PATCHUP_ENABLE      (1L<<5)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_PAYLOAD_Q_ENABLE    (1L<<6)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_HEADER_Q_ENABLE     (1L<<7)
+#define BNX2_MISC_ENABLE_CLR_BITS_TX_ASSEMBLER_ENABLE    (1L<<8)
+#define BNX2_MISC_ENABLE_CLR_BITS_EMAC_ENABLE            (1L<<9)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_PARSER_MAC_ENABLE   (1L<<10)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_PARSER_CATCHUP_ENABLE       (1L<<11)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_MBUF_ENABLE         (1L<<12)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_LOOKUP_ENABLE       (1L<<13)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_PROCESSOR_ENABLE    (1L<<14)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_V2P_ENABLE          (1L<<15)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_BD_CACHE_ENABLE     (1L<<16)
+#define BNX2_MISC_ENABLE_CLR_BITS_RX_DMA_ENABLE          (1L<<17)
+#define BNX2_MISC_ENABLE_CLR_BITS_COMPLETION_ENABLE      (1L<<18)
+#define BNX2_MISC_ENABLE_CLR_BITS_HOST_COALESCE_ENABLE   (1L<<19)
+#define BNX2_MISC_ENABLE_CLR_BITS_MAILBOX_QUEUE_ENABLE   (1L<<20)
+#define BNX2_MISC_ENABLE_CLR_BITS_CONTEXT_ENABLE         (1L<<21)
+#define BNX2_MISC_ENABLE_CLR_BITS_CMD_SCHEDULER_ENABLE   (1L<<22)
+#define BNX2_MISC_ENABLE_CLR_BITS_CMD_PROCESSOR_ENABLE   (1L<<23)
+#define BNX2_MISC_ENABLE_CLR_BITS_MGMT_PROCESSOR_ENABLE  (1L<<24)
+#define BNX2_MISC_ENABLE_CLR_BITS_TIMER_ENABLE           (1L<<25)
+#define BNX2_MISC_ENABLE_CLR_BITS_DMA_ENGINE_ENABLE      (1L<<26)
+#define BNX2_MISC_ENABLE_CLR_BITS_UMP_ENABLE             (1L<<27)
+
+#define BNX2_MISC_CLOCK_CONTROL_BITS                    0x00000818
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET     (0xfL<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_32MHZ       (0L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_38MHZ       (1L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_48MHZ       (2L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_55MHZ       (3L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_66MHZ       (4L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_80MHZ       (5L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_95MHZ       (6L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_133MHZ      (7L<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_CLK_SPD_DET_LOW         (0xfL<<0)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_DISABLE    (1L<<6)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT        (1L<<7)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC    (0x7L<<8)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_UNDEF      (0L<<8)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_12         (1L<<8)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_6  (2L<<8)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_ALT_SRC_62         (4L<<8)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PLAY_DEAD           (1L<<11)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED  (0xfL<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_100      (0L<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_80       (1L<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_50       (2L<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_40       (4L<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_SPEED_25       (8L<<12)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_CORE_CLK_PLL_STOP   (1L<<16)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_PCI_PLL_STOP        (1L<<17)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_RESERVED_18         (1L<<18)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_USE_SPD_DET         (1L<<19)
+#define BNX2_MISC_CLOCK_CONTROL_BITS_RESERVED            (0xfffL<<20)
+
+#define BNX2_MISC_GPIO                                  0x0000081c
+#define BNX2_MISC_GPIO_VALUE                             (0xffL<<0)
+#define BNX2_MISC_GPIO_SET                               (0xffL<<8)
+#define BNX2_MISC_GPIO_CLR                               (0xffL<<16)
+#define BNX2_MISC_GPIO_FLOAT                             (0xffL<<24)
+
+#define BNX2_MISC_GPIO_INT                              0x00000820
+#define BNX2_MISC_GPIO_INT_INT_STATE                     (0xfL<<0)
+#define BNX2_MISC_GPIO_INT_OLD_VALUE                     (0xfL<<8)
+#define BNX2_MISC_GPIO_INT_OLD_SET                       (0xfL<<16)
+#define BNX2_MISC_GPIO_INT_OLD_CLR                       (0xfL<<24)
+
+#define BNX2_MISC_CONFIG_LFSR                           0x00000824
+#define BNX2_MISC_CONFIG_LFSR_DIV                        (0xffffL<<0)
+
+#define BNX2_MISC_LFSR_MASK_BITS                        0x00000828
+#define BNX2_MISC_LFSR_MASK_BITS_TX_SCHEDULER_ENABLE     (1L<<0)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_BD_READ_ENABLE       (1L<<1)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_BD_CACHE_ENABLE      (1L<<2)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_PROCESSOR_ENABLE     (1L<<3)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_DMA_ENABLE           (1L<<4)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_PATCHUP_ENABLE       (1L<<5)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_PAYLOAD_Q_ENABLE     (1L<<6)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_HEADER_Q_ENABLE      (1L<<7)
+#define BNX2_MISC_LFSR_MASK_BITS_TX_ASSEMBLER_ENABLE     (1L<<8)
+#define BNX2_MISC_LFSR_MASK_BITS_EMAC_ENABLE             (1L<<9)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_PARSER_MAC_ENABLE    (1L<<10)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_PARSER_CATCHUP_ENABLE        (1L<<11)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_MBUF_ENABLE          (1L<<12)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_LOOKUP_ENABLE        (1L<<13)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_PROCESSOR_ENABLE     (1L<<14)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_V2P_ENABLE           (1L<<15)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_BD_CACHE_ENABLE      (1L<<16)
+#define BNX2_MISC_LFSR_MASK_BITS_RX_DMA_ENABLE           (1L<<17)
+#define BNX2_MISC_LFSR_MASK_BITS_COMPLETION_ENABLE       (1L<<18)
+#define BNX2_MISC_LFSR_MASK_BITS_HOST_COALESCE_ENABLE    (1L<<19)
+#define BNX2_MISC_LFSR_MASK_BITS_MAILBOX_QUEUE_ENABLE    (1L<<20)
+#define BNX2_MISC_LFSR_MASK_BITS_CONTEXT_ENABLE          (1L<<21)
+#define BNX2_MISC_LFSR_MASK_BITS_CMD_SCHEDULER_ENABLE    (1L<<22)
+#define BNX2_MISC_LFSR_MASK_BITS_CMD_PROCESSOR_ENABLE    (1L<<23)
+#define BNX2_MISC_LFSR_MASK_BITS_MGMT_PROCESSOR_ENABLE   (1L<<24)
+#define BNX2_MISC_LFSR_MASK_BITS_TIMER_ENABLE            (1L<<25)
+#define BNX2_MISC_LFSR_MASK_BITS_DMA_ENGINE_ENABLE       (1L<<26)
+#define BNX2_MISC_LFSR_MASK_BITS_UMP_ENABLE              (1L<<27)
+
+#define BNX2_MISC_ARB_REQ0                              0x0000082c
+#define BNX2_MISC_ARB_REQ1                              0x00000830
+#define BNX2_MISC_ARB_REQ2                              0x00000834
+#define BNX2_MISC_ARB_REQ3                              0x00000838
+#define BNX2_MISC_ARB_REQ4                              0x0000083c
+#define BNX2_MISC_ARB_FREE0                             0x00000840
+#define BNX2_MISC_ARB_FREE1                             0x00000844
+#define BNX2_MISC_ARB_FREE2                             0x00000848
+#define BNX2_MISC_ARB_FREE3                             0x0000084c
+#define BNX2_MISC_ARB_FREE4                             0x00000850
+#define BNX2_MISC_ARB_REQ_STATUS0                       0x00000854
+#define BNX2_MISC_ARB_REQ_STATUS1                       0x00000858
+#define BNX2_MISC_ARB_REQ_STATUS2                       0x0000085c
+#define BNX2_MISC_ARB_REQ_STATUS3                       0x00000860
+#define BNX2_MISC_ARB_REQ_STATUS4                       0x00000864
+#define BNX2_MISC_ARB_GNT0                              0x00000868
+#define BNX2_MISC_ARB_GNT0_0                             (0x7L<<0)
+#define BNX2_MISC_ARB_GNT0_1                             (0x7L<<4)
+#define BNX2_MISC_ARB_GNT0_2                             (0x7L<<8)
+#define BNX2_MISC_ARB_GNT0_3                             (0x7L<<12)
+#define BNX2_MISC_ARB_GNT0_4                             (0x7L<<16)
+#define BNX2_MISC_ARB_GNT0_5                             (0x7L<<20)
+#define BNX2_MISC_ARB_GNT0_6                             (0x7L<<24)
+#define BNX2_MISC_ARB_GNT0_7                             (0x7L<<28)
+
+#define BNX2_MISC_ARB_GNT1                              0x0000086c
+#define BNX2_MISC_ARB_GNT1_8                             (0x7L<<0)
+#define BNX2_MISC_ARB_GNT1_9                             (0x7L<<4)
+#define BNX2_MISC_ARB_GNT1_10                            (0x7L<<8)
+#define BNX2_MISC_ARB_GNT1_11                            (0x7L<<12)
+#define BNX2_MISC_ARB_GNT1_12                            (0x7L<<16)
+#define BNX2_MISC_ARB_GNT1_13                            (0x7L<<20)
+#define BNX2_MISC_ARB_GNT1_14                            (0x7L<<24)
+#define BNX2_MISC_ARB_GNT1_15                            (0x7L<<28)
+
+#define BNX2_MISC_ARB_GNT2                              0x00000870
+#define BNX2_MISC_ARB_GNT2_16                            (0x7L<<0)
+#define BNX2_MISC_ARB_GNT2_17                            (0x7L<<4)
+#define BNX2_MISC_ARB_GNT2_18                            (0x7L<<8)
+#define BNX2_MISC_ARB_GNT2_19                            (0x7L<<12)
+#define BNX2_MISC_ARB_GNT2_20                            (0x7L<<16)
+#define BNX2_MISC_ARB_GNT2_21                            (0x7L<<20)
+#define BNX2_MISC_ARB_GNT2_22                            (0x7L<<24)
+#define BNX2_MISC_ARB_GNT2_23                            (0x7L<<28)
+
+#define BNX2_MISC_ARB_GNT3                              0x00000874
+#define BNX2_MISC_ARB_GNT3_24                            (0x7L<<0)
+#define BNX2_MISC_ARB_GNT3_25                            (0x7L<<4)
+#define BNX2_MISC_ARB_GNT3_26                            (0x7L<<8)
+#define BNX2_MISC_ARB_GNT3_27                            (0x7L<<12)
+#define BNX2_MISC_ARB_GNT3_28                            (0x7L<<16)
+#define BNX2_MISC_ARB_GNT3_29                            (0x7L<<20)
+#define BNX2_MISC_ARB_GNT3_30                            (0x7L<<24)
+#define BNX2_MISC_ARB_GNT3_31                            (0x7L<<28)
+
+#define BNX2_MISC_PRBS_CONTROL                          0x00000878
+#define BNX2_MISC_PRBS_CONTROL_EN                        (1L<<0)
+#define BNX2_MISC_PRBS_CONTROL_RSTB                      (1L<<1)
+#define BNX2_MISC_PRBS_CONTROL_INV                       (1L<<2)
+#define BNX2_MISC_PRBS_CONTROL_ERR_CLR                   (1L<<3)
+#define BNX2_MISC_PRBS_CONTROL_ORDER                     (0x3L<<4)
+#define BNX2_MISC_PRBS_CONTROL_ORDER_7TH                 (0L<<4)
+#define BNX2_MISC_PRBS_CONTROL_ORDER_15TH                (1L<<4)
+#define BNX2_MISC_PRBS_CONTROL_ORDER_23RD                (2L<<4)
+#define BNX2_MISC_PRBS_CONTROL_ORDER_31ST                (3L<<4)
+
+#define BNX2_MISC_PRBS_STATUS                           0x0000087c
+#define BNX2_MISC_PRBS_STATUS_LOCK                       (1L<<0)
+#define BNX2_MISC_PRBS_STATUS_STKY                       (1L<<1)
+#define BNX2_MISC_PRBS_STATUS_ERRORS                     (0x3fffL<<2)
+#define BNX2_MISC_PRBS_STATUS_STATE                      (0xfL<<16)
+
+#define BNX2_MISC_SM_ASF_CONTROL                        0x00000880
+#define BNX2_MISC_SM_ASF_CONTROL_ASF_RST                 (1L<<0)
+#define BNX2_MISC_SM_ASF_CONTROL_TSC_EN                  (1L<<1)
+#define BNX2_MISC_SM_ASF_CONTROL_WG_TO                   (1L<<2)
+#define BNX2_MISC_SM_ASF_CONTROL_HB_TO                   (1L<<3)
+#define BNX2_MISC_SM_ASF_CONTROL_PA_TO                   (1L<<4)
+#define BNX2_MISC_SM_ASF_CONTROL_PL_TO                   (1L<<5)
+#define BNX2_MISC_SM_ASF_CONTROL_RT_TO                   (1L<<6)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_EVENT               (1L<<7)
+#define BNX2_MISC_SM_ASF_CONTROL_RES                     (0xfL<<8)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_EN                  (1L<<12)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_BB_EN               (1L<<13)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_NO_ADDR_FILT        (1L<<14)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_AUTOREAD            (1L<<15)
+#define BNX2_MISC_SM_ASF_CONTROL_NIC_SMB_ADDR1           (0x3fL<<16)
+#define BNX2_MISC_SM_ASF_CONTROL_NIC_SMB_ADDR2           (0x3fL<<24)
+#define BNX2_MISC_SM_ASF_CONTROL_EN_NIC_SMB_ADDR_0       (1L<<30)
+#define BNX2_MISC_SM_ASF_CONTROL_SMB_EARLY_ATTN          (1L<<31)
+
+#define BNX2_MISC_SMB_IN                                0x00000884
+#define BNX2_MISC_SMB_IN_DAT_IN                          (0xffL<<0)
+#define BNX2_MISC_SMB_IN_RDY                             (1L<<8)
+#define BNX2_MISC_SMB_IN_DONE                            (1L<<9)
+#define BNX2_MISC_SMB_IN_FIRSTBYTE                       (1L<<10)
+#define BNX2_MISC_SMB_IN_STATUS                          (0x7L<<11)
+#define BNX2_MISC_SMB_IN_STATUS_OK                       (0x0L<<11)
+#define BNX2_MISC_SMB_IN_STATUS_PEC                      (0x1L<<11)
+#define BNX2_MISC_SMB_IN_STATUS_OFLOW                    (0x2L<<11)
+#define BNX2_MISC_SMB_IN_STATUS_STOP                     (0x3L<<11)
+#define BNX2_MISC_SMB_IN_STATUS_TIMEOUT                  (0x4L<<11)
+
+#define BNX2_MISC_SMB_OUT                               0x00000888
+#define BNX2_MISC_SMB_OUT_DAT_OUT                        (0xffL<<0)
+#define BNX2_MISC_SMB_OUT_RDY                            (1L<<8)
+#define BNX2_MISC_SMB_OUT_START                          (1L<<9)
+#define BNX2_MISC_SMB_OUT_LAST                           (1L<<10)
+#define BNX2_MISC_SMB_OUT_ACC_TYPE                       (1L<<11)
+#define BNX2_MISC_SMB_OUT_ENB_PEC                        (1L<<12)
+#define BNX2_MISC_SMB_OUT_GET_RX_LEN                     (1L<<13)
+#define BNX2_MISC_SMB_OUT_SMB_READ_LEN                   (0x3fL<<14)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS                 (0xfL<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_OK              (0L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_FIRST_NACK      (1L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_SUB_NACK        (9L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_UFLOW           (2L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_STOP            (3L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_TIMEOUT         (4L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_FIRST_LOST      (5L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_SUB_LOST        (0xdL<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_STATUS_BADACK          (0x6L<<20)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_SLAVEMODE              (1L<<24)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_DAT_EN                 (1L<<25)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_DAT_IN                 (1L<<26)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_CLK_EN                 (1L<<27)
+#define BNX2_MISC_SMB_OUT_SMB_OUT_CLK_IN                 (1L<<28)
+
+#define BNX2_MISC_SMB_WATCHDOG                          0x0000088c
+#define BNX2_MISC_SMB_WATCHDOG_WATCHDOG                  (0xffffL<<0)
+
+#define BNX2_MISC_SMB_HEARTBEAT                         0x00000890
+#define BNX2_MISC_SMB_HEARTBEAT_HEARTBEAT                (0xffffL<<0)
+
+#define BNX2_MISC_SMB_POLL_ASF                          0x00000894
+#define BNX2_MISC_SMB_POLL_ASF_POLL_ASF                  (0xffffL<<0)
+
+#define BNX2_MISC_SMB_POLL_LEGACY                       0x00000898
+#define BNX2_MISC_SMB_POLL_LEGACY_POLL_LEGACY            (0xffffL<<0)
+
+#define BNX2_MISC_SMB_RETRAN                            0x0000089c
+#define BNX2_MISC_SMB_RETRAN_RETRAN                      (0xffL<<0)
+
+#define BNX2_MISC_SMB_TIMESTAMP                         0x000008a0
+#define BNX2_MISC_SMB_TIMESTAMP_TIMESTAMP                (0xffffffffL<<0)
+
+#define BNX2_MISC_PERR_ENA0                             0x000008a4
+#define BNX2_MISC_PERR_ENA0_COM_MISC_CTXC                (1L<<0)
+#define BNX2_MISC_PERR_ENA0_COM_MISC_REGF                (1L<<1)
+#define BNX2_MISC_PERR_ENA0_COM_MISC_SCPAD               (1L<<2)
+#define BNX2_MISC_PERR_ENA0_CP_MISC_CTXC                 (1L<<3)
+#define BNX2_MISC_PERR_ENA0_CP_MISC_REGF                 (1L<<4)
+#define BNX2_MISC_PERR_ENA0_CP_MISC_SCPAD                (1L<<5)
+#define BNX2_MISC_PERR_ENA0_CS_MISC_TMEM                 (1L<<6)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM0               (1L<<7)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM1               (1L<<8)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM2               (1L<<9)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM3               (1L<<10)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM4               (1L<<11)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_ACCM5               (1L<<12)
+#define BNX2_MISC_PERR_ENA0_CTX_MISC_PGTBL               (1L<<13)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DR0                (1L<<14)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DR1                (1L<<15)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DR2                (1L<<16)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DR3                (1L<<17)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DR4                (1L<<18)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DW0                (1L<<19)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DW1                (1L<<20)
+#define BNX2_MISC_PERR_ENA0_DMAE_MISC_DW2                (1L<<21)
+#define BNX2_MISC_PERR_ENA0_HC_MISC_DMA                  (1L<<22)
+#define BNX2_MISC_PERR_ENA0_MCP_MISC_REGF                (1L<<23)
+#define BNX2_MISC_PERR_ENA0_MCP_MISC_SCPAD               (1L<<24)
+#define BNX2_MISC_PERR_ENA0_MQ_MISC_CTX                  (1L<<25)
+#define BNX2_MISC_PERR_ENA0_RBDC_MISC                    (1L<<26)
+#define BNX2_MISC_PERR_ENA0_RBUF_MISC_MB                 (1L<<27)
+#define BNX2_MISC_PERR_ENA0_RBUF_MISC_PTR                (1L<<28)
+#define BNX2_MISC_PERR_ENA0_RDE_MISC_RPC                 (1L<<29)
+#define BNX2_MISC_PERR_ENA0_RDE_MISC_RPM                 (1L<<30)
+#define BNX2_MISC_PERR_ENA0_RV2P_MISC_CB0REGS            (1L<<31)
+
+#define BNX2_MISC_PERR_ENA1                             0x000008a8
+#define BNX2_MISC_PERR_ENA1_RV2P_MISC_CB1REGS            (1L<<0)
+#define BNX2_MISC_PERR_ENA1_RV2P_MISC_P1IRAM             (1L<<1)
+#define BNX2_MISC_PERR_ENA1_RV2P_MISC_P2IRAM             (1L<<2)
+#define BNX2_MISC_PERR_ENA1_RXP_MISC_CTXC                (1L<<3)
+#define BNX2_MISC_PERR_ENA1_RXP_MISC_REGF                (1L<<4)
+#define BNX2_MISC_PERR_ENA1_RXP_MISC_SCPAD               (1L<<5)
+#define BNX2_MISC_PERR_ENA1_RXP_MISC_RBUFC               (1L<<6)
+#define BNX2_MISC_PERR_ENA1_TBDC_MISC                    (1L<<7)
+#define BNX2_MISC_PERR_ENA1_TDMA_MISC                    (1L<<8)
+#define BNX2_MISC_PERR_ENA1_THBUF_MISC_MB0               (1L<<9)
+#define BNX2_MISC_PERR_ENA1_THBUF_MISC_MB1               (1L<<10)
+#define BNX2_MISC_PERR_ENA1_TPAT_MISC_REGF               (1L<<11)
+#define BNX2_MISC_PERR_ENA1_TPAT_MISC_SCPAD              (1L<<12)
+#define BNX2_MISC_PERR_ENA1_TPBUF_MISC_MB                (1L<<13)
+#define BNX2_MISC_PERR_ENA1_TSCH_MISC_LR                 (1L<<14)
+#define BNX2_MISC_PERR_ENA1_TXP_MISC_CTXC                (1L<<15)
+#define BNX2_MISC_PERR_ENA1_TXP_MISC_REGF                (1L<<16)
+#define BNX2_MISC_PERR_ENA1_TXP_MISC_SCPAD               (1L<<17)
+#define BNX2_MISC_PERR_ENA1_UMP_MISC_FIORX               (1L<<18)
+#define BNX2_MISC_PERR_ENA1_UMP_MISC_FIOTX               (1L<<19)
+#define BNX2_MISC_PERR_ENA1_UMP_MISC_RX                  (1L<<20)
+#define BNX2_MISC_PERR_ENA1_UMP_MISC_TX                  (1L<<21)
+#define BNX2_MISC_PERR_ENA1_RDMAQ_MISC                   (1L<<22)
+#define BNX2_MISC_PERR_ENA1_CSQ_MISC                     (1L<<23)
+#define BNX2_MISC_PERR_ENA1_CPQ_MISC                     (1L<<24)
+#define BNX2_MISC_PERR_ENA1_MCPQ_MISC                    (1L<<25)
+#define BNX2_MISC_PERR_ENA1_RV2PMQ_MISC                  (1L<<26)
+#define BNX2_MISC_PERR_ENA1_RV2PPQ_MISC                  (1L<<27)
+#define BNX2_MISC_PERR_ENA1_RV2PTQ_MISC                  (1L<<28)
+#define BNX2_MISC_PERR_ENA1_RXPQ_MISC                    (1L<<29)
+#define BNX2_MISC_PERR_ENA1_RXPCQ_MISC                   (1L<<30)
+#define BNX2_MISC_PERR_ENA1_RLUPQ_MISC                   (1L<<31)
+
+#define BNX2_MISC_PERR_ENA2                             0x000008ac
+#define BNX2_MISC_PERR_ENA2_COMQ_MISC                    (1L<<0)
+#define BNX2_MISC_PERR_ENA2_COMXQ_MISC                   (1L<<1)
+#define BNX2_MISC_PERR_ENA2_COMTQ_MISC                   (1L<<2)
+#define BNX2_MISC_PERR_ENA2_TSCHQ_MISC                   (1L<<3)
+#define BNX2_MISC_PERR_ENA2_TBDRQ_MISC                   (1L<<4)
+#define BNX2_MISC_PERR_ENA2_TXPQ_MISC                    (1L<<5)
+#define BNX2_MISC_PERR_ENA2_TDMAQ_MISC                   (1L<<6)
+#define BNX2_MISC_PERR_ENA2_TPATQ_MISC                   (1L<<7)
+#define BNX2_MISC_PERR_ENA2_TASQ_MISC                    (1L<<8)
+
+#define BNX2_MISC_DEBUG_VECTOR_SEL                      0x000008b0
+#define BNX2_MISC_DEBUG_VECTOR_SEL_0                     (0xfffL<<0)
+#define BNX2_MISC_DEBUG_VECTOR_SEL_1                     (0xfffL<<12)
+
+#define BNX2_MISC_VREG_CONTROL                          0x000008b4
+#define BNX2_MISC_VREG_CONTROL_1_2                       (0xfL<<0)
+#define BNX2_MISC_VREG_CONTROL_2_5                       (0xfL<<4)
+
+#define BNX2_MISC_FINAL_CLK_CTL_VAL                     0x000008b8
+#define BNX2_MISC_FINAL_CLK_CTL_VAL_MISC_FINAL_CLK_CTL_VAL       (0x3ffffffL<<6)
+
+#define BNX2_MISC_UNUSED0                               0x000008bc
+
+
+/*
+ *  nvm_reg definition
+ *  offset: 0x6400
+ */
+#define BNX2_NVM_COMMAND                                0x00006400
+#define BNX2_NVM_COMMAND_RST                             (1L<<0)
+#define BNX2_NVM_COMMAND_DONE                            (1L<<3)
+#define BNX2_NVM_COMMAND_DOIT                            (1L<<4)
+#define BNX2_NVM_COMMAND_WR                              (1L<<5)
+#define BNX2_NVM_COMMAND_ERASE                           (1L<<6)
+#define BNX2_NVM_COMMAND_FIRST                           (1L<<7)
+#define BNX2_NVM_COMMAND_LAST                            (1L<<8)
+#define BNX2_NVM_COMMAND_WREN                            (1L<<16)
+#define BNX2_NVM_COMMAND_WRDI                            (1L<<17)
+#define BNX2_NVM_COMMAND_EWSR                            (1L<<18)
+#define BNX2_NVM_COMMAND_WRSR                            (1L<<19)
+
+#define BNX2_NVM_STATUS                                 0x00006404
+#define BNX2_NVM_STATUS_PI_FSM_STATE                     (0xfL<<0)
+#define BNX2_NVM_STATUS_EE_FSM_STATE                     (0xfL<<4)
+#define BNX2_NVM_STATUS_EQ_FSM_STATE                     (0xfL<<8)
+
+#define BNX2_NVM_WRITE                                  0x00006408
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE                   (0xffffffffL<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_BIT_BANG          (0L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_EECLK             (1L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_EEDATA            (2L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_SCLK              (4L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_CS_B              (8L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_SO                (16L<<0)
+#define BNX2_NVM_WRITE_NVM_WRITE_VALUE_SI                (32L<<0)
+
+#define BNX2_NVM_ADDR                                   0x0000640c
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE                     (0xffffffL<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_BIT_BANG            (0L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_EECLK               (1L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_EEDATA              (2L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_SCLK                (4L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_CS_B                (8L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_SO                  (16L<<0)
+#define BNX2_NVM_ADDR_NVM_ADDR_VALUE_SI                  (32L<<0)
+
+#define BNX2_NVM_READ                                   0x00006410
+#define BNX2_NVM_READ_NVM_READ_VALUE                     (0xffffffffL<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_BIT_BANG            (0L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_EECLK               (1L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_EEDATA              (2L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_SCLK                (4L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_CS_B                (8L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_SO                  (16L<<0)
+#define BNX2_NVM_READ_NVM_READ_VALUE_SI                  (32L<<0)
+
+#define BNX2_NVM_CFG1                                   0x00006414
+#define BNX2_NVM_CFG1_FLASH_MODE                         (1L<<0)
+#define BNX2_NVM_CFG1_BUFFER_MODE                        (1L<<1)
+#define BNX2_NVM_CFG1_PASS_MODE                          (1L<<2)
+#define BNX2_NVM_CFG1_BITBANG_MODE                       (1L<<3)
+#define BNX2_NVM_CFG1_STATUS_BIT                         (0x7L<<4)
+#define BNX2_NVM_CFG1_STATUS_BIT_FLASH_RDY               (0L<<4)
+#define BNX2_NVM_CFG1_STATUS_BIT_BUFFER_RDY              (7L<<4)
+#define BNX2_NVM_CFG1_SPI_CLK_DIV                        (0xfL<<7)
+#define BNX2_NVM_CFG1_SEE_CLK_DIV                        (0x7ffL<<11)
+#define BNX2_NVM_CFG1_PROTECT_MODE                       (1L<<24)
+#define BNX2_NVM_CFG1_FLASH_SIZE                         (1L<<25)
+#define BNX2_NVM_CFG1_COMPAT_BYPASSS                     (1L<<31)
+
+#define BNX2_NVM_CFG2                                   0x00006418
+#define BNX2_NVM_CFG2_ERASE_CMD                          (0xffL<<0)
+#define BNX2_NVM_CFG2_DUMMY                              (0xffL<<8)
+#define BNX2_NVM_CFG2_STATUS_CMD                         (0xffL<<16)
+
+#define BNX2_NVM_CFG3                                   0x0000641c
+#define BNX2_NVM_CFG3_BUFFER_RD_CMD                      (0xffL<<0)
+#define BNX2_NVM_CFG3_WRITE_CMD                          (0xffL<<8)
+#define BNX2_NVM_CFG3_BUFFER_WRITE_CMD                   (0xffL<<16)
+#define BNX2_NVM_CFG3_READ_CMD                           (0xffL<<24)
+
+#define BNX2_NVM_SW_ARB                                 0x00006420
+#define BNX2_NVM_SW_ARB_ARB_REQ_SET0                     (1L<<0)
+#define BNX2_NVM_SW_ARB_ARB_REQ_SET1                     (1L<<1)
+#define BNX2_NVM_SW_ARB_ARB_REQ_SET2                     (1L<<2)
+#define BNX2_NVM_SW_ARB_ARB_REQ_SET3                     (1L<<3)
+#define BNX2_NVM_SW_ARB_ARB_REQ_CLR0                     (1L<<4)
+#define BNX2_NVM_SW_ARB_ARB_REQ_CLR1                     (1L<<5)
+#define BNX2_NVM_SW_ARB_ARB_REQ_CLR2                     (1L<<6)
+#define BNX2_NVM_SW_ARB_ARB_REQ_CLR3                     (1L<<7)
+#define BNX2_NVM_SW_ARB_ARB_ARB0                         (1L<<8)
+#define BNX2_NVM_SW_ARB_ARB_ARB1                         (1L<<9)
+#define BNX2_NVM_SW_ARB_ARB_ARB2                         (1L<<10)
+#define BNX2_NVM_SW_ARB_ARB_ARB3                         (1L<<11)
+#define BNX2_NVM_SW_ARB_REQ0                             (1L<<12)
+#define BNX2_NVM_SW_ARB_REQ1                             (1L<<13)
+#define BNX2_NVM_SW_ARB_REQ2                             (1L<<14)
+#define BNX2_NVM_SW_ARB_REQ3                             (1L<<15)
+
+#define BNX2_NVM_ACCESS_ENABLE                          0x00006424
+#define BNX2_NVM_ACCESS_ENABLE_EN                        (1L<<0)
+#define BNX2_NVM_ACCESS_ENABLE_WR_EN                     (1L<<1)
+
+#define BNX2_NVM_WRITE1                                 0x00006428
+#define BNX2_NVM_WRITE1_WREN_CMD                         (0xffL<<0)
+#define BNX2_NVM_WRITE1_WRDI_CMD                         (0xffL<<8)
+#define BNX2_NVM_WRITE1_SR_DATA                          (0xffL<<16)
+
+
+
+/*
+ *  dma_reg definition
+ *  offset: 0xc00
+ */
+#define BNX2_DMA_COMMAND                                0x00000c00
+#define BNX2_DMA_COMMAND_ENABLE                          (1L<<0)
+
+#define BNX2_DMA_STATUS                                 0x00000c04
+#define BNX2_DMA_STATUS_PAR_ERROR_STATE                  (1L<<0)
+#define BNX2_DMA_STATUS_READ_TRANSFERS_STAT              (1L<<16)
+#define BNX2_DMA_STATUS_READ_DELAY_PCI_CLKS_STAT         (1L<<17)
+#define BNX2_DMA_STATUS_BIG_READ_TRANSFERS_STAT          (1L<<18)
+#define BNX2_DMA_STATUS_BIG_READ_DELAY_PCI_CLKS_STAT     (1L<<19)
+#define BNX2_DMA_STATUS_BIG_READ_RETRY_AFTER_DATA_STAT   (1L<<20)
+#define BNX2_DMA_STATUS_WRITE_TRANSFERS_STAT             (1L<<21)
+#define BNX2_DMA_STATUS_WRITE_DELAY_PCI_CLKS_STAT        (1L<<22)
+#define BNX2_DMA_STATUS_BIG_WRITE_TRANSFERS_STAT         (1L<<23)
+#define BNX2_DMA_STATUS_BIG_WRITE_DELAY_PCI_CLKS_STAT    (1L<<24)
+#define BNX2_DMA_STATUS_BIG_WRITE_RETRY_AFTER_DATA_STAT  (1L<<25)
+
+#define BNX2_DMA_CONFIG                                 0x00000c08
+#define BNX2_DMA_CONFIG_DATA_BYTE_SWAP                   (1L<<0)
+#define BNX2_DMA_CONFIG_DATA_WORD_SWAP                   (1L<<1)
+#define BNX2_DMA_CONFIG_CNTL_BYTE_SWAP                   (1L<<4)
+#define BNX2_DMA_CONFIG_CNTL_WORD_SWAP                   (1L<<5)
+#define BNX2_DMA_CONFIG_ONE_DMA                          (1L<<6)
+#define BNX2_DMA_CONFIG_CNTL_TWO_DMA                     (1L<<7)
+#define BNX2_DMA_CONFIG_CNTL_FPGA_MODE                   (1L<<8)
+#define BNX2_DMA_CONFIG_CNTL_PING_PONG_DMA               (1L<<10)
+#define BNX2_DMA_CONFIG_CNTL_PCI_COMP_DLY                (1L<<11)
+#define BNX2_DMA_CONFIG_NO_RCHANS_IN_USE                 (0xfL<<12)
+#define BNX2_DMA_CONFIG_NO_WCHANS_IN_USE                 (0xfL<<16)
+#define BNX2_DMA_CONFIG_PCI_CLK_CMP_BITS                 (0x7L<<20)
+#define BNX2_DMA_CONFIG_PCI_FAST_CLK_CMP                 (1L<<23)
+#define BNX2_DMA_CONFIG_BIG_SIZE                         (0xfL<<24)
+#define BNX2_DMA_CONFIG_BIG_SIZE_NONE                    (0x0L<<24)
+#define BNX2_DMA_CONFIG_BIG_SIZE_64                      (0x1L<<24)
+#define BNX2_DMA_CONFIG_BIG_SIZE_128                     (0x2L<<24)
+#define BNX2_DMA_CONFIG_BIG_SIZE_256                     (0x4L<<24)
+#define BNX2_DMA_CONFIG_BIG_SIZE_512                     (0x8L<<24)
+
+#define BNX2_DMA_BLACKOUT                               0x00000c0c
+#define BNX2_DMA_BLACKOUT_RD_RETRY_BLACKOUT              (0xffL<<0)
+#define BNX2_DMA_BLACKOUT_2ND_RD_RETRY_BLACKOUT          (0xffL<<8)
+#define BNX2_DMA_BLACKOUT_WR_RETRY_BLACKOUT              (0xffL<<16)
+
+#define BNX2_DMA_RCHAN_STAT                             0x00000c30
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_0                  (0x7L<<0)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_0                    (1L<<3)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_1                  (0x7L<<4)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_1                    (1L<<7)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_2                  (0x7L<<8)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_2                    (1L<<11)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_3                  (0x7L<<12)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_3                    (1L<<15)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_4                  (0x7L<<16)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_4                    (1L<<19)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_5                  (0x7L<<20)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_5                    (1L<<23)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_6                  (0x7L<<24)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_6                    (1L<<27)
+#define BNX2_DMA_RCHAN_STAT_COMP_CODE_7                  (0x7L<<28)
+#define BNX2_DMA_RCHAN_STAT_PAR_ERR_7                    (1L<<31)
+
+#define BNX2_DMA_WCHAN_STAT                             0x00000c34
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_0                  (0x7L<<0)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_0                    (1L<<3)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_1                  (0x7L<<4)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_1                    (1L<<7)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_2                  (0x7L<<8)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_2                    (1L<<11)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_3                  (0x7L<<12)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_3                    (1L<<15)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_4                  (0x7L<<16)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_4                    (1L<<19)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_5                  (0x7L<<20)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_5                    (1L<<23)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_6                  (0x7L<<24)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_6                    (1L<<27)
+#define BNX2_DMA_WCHAN_STAT_COMP_CODE_7                  (0x7L<<28)
+#define BNX2_DMA_WCHAN_STAT_PAR_ERR_7                    (1L<<31)
+
+#define BNX2_DMA_RCHAN_ASSIGNMENT                       0x00000c38
+#define BNX2_DMA_RCHAN_ASSIGNMENT_0                      (0xfL<<0)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_1                      (0xfL<<4)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_2                      (0xfL<<8)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_3                      (0xfL<<12)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_4                      (0xfL<<16)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_5                      (0xfL<<20)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_6                      (0xfL<<24)
+#define BNX2_DMA_RCHAN_ASSIGNMENT_7                      (0xfL<<28)
+
+#define BNX2_DMA_WCHAN_ASSIGNMENT                       0x00000c3c
+#define BNX2_DMA_WCHAN_ASSIGNMENT_0                      (0xfL<<0)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_1                      (0xfL<<4)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_2                      (0xfL<<8)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_3                      (0xfL<<12)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_4                      (0xfL<<16)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_5                      (0xfL<<20)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_6                      (0xfL<<24)
+#define BNX2_DMA_WCHAN_ASSIGNMENT_7                      (0xfL<<28)
+
+#define BNX2_DMA_RCHAN_STAT_00                          0x00000c40
+#define BNX2_DMA_RCHAN_STAT_00_RCHAN_STA_HOST_ADDR_LOW   (0xffffffffL<<0)
+
+#define BNX2_DMA_RCHAN_STAT_01                          0x00000c44
+#define BNX2_DMA_RCHAN_STAT_01_RCHAN_STA_HOST_ADDR_HIGH  (0xffffffffL<<0)
+
+#define BNX2_DMA_RCHAN_STAT_02                          0x00000c48
+#define BNX2_DMA_RCHAN_STAT_02_LENGTH                    (0xffffL<<0)
+#define BNX2_DMA_RCHAN_STAT_02_WORD_SWAP                 (1L<<16)
+#define BNX2_DMA_RCHAN_STAT_02_BYTE_SWAP                 (1L<<17)
+#define BNX2_DMA_RCHAN_STAT_02_PRIORITY_LVL              (1L<<18)
+
+#define BNX2_DMA_RCHAN_STAT_10                          0x00000c4c
+#define BNX2_DMA_RCHAN_STAT_11                          0x00000c50
+#define BNX2_DMA_RCHAN_STAT_12                          0x00000c54
+#define BNX2_DMA_RCHAN_STAT_20                          0x00000c58
+#define BNX2_DMA_RCHAN_STAT_21                          0x00000c5c
+#define BNX2_DMA_RCHAN_STAT_22                          0x00000c60
+#define BNX2_DMA_RCHAN_STAT_30                          0x00000c64
+#define BNX2_DMA_RCHAN_STAT_31                          0x00000c68
+#define BNX2_DMA_RCHAN_STAT_32                          0x00000c6c
+#define BNX2_DMA_RCHAN_STAT_40                          0x00000c70
+#define BNX2_DMA_RCHAN_STAT_41                          0x00000c74
+#define BNX2_DMA_RCHAN_STAT_42                          0x00000c78
+#define BNX2_DMA_RCHAN_STAT_50                          0x00000c7c
+#define BNX2_DMA_RCHAN_STAT_51                          0x00000c80
+#define BNX2_DMA_RCHAN_STAT_52                          0x00000c84
+#define BNX2_DMA_RCHAN_STAT_60                          0x00000c88
+#define BNX2_DMA_RCHAN_STAT_61                          0x00000c8c
+#define BNX2_DMA_RCHAN_STAT_62                          0x00000c90
+#define BNX2_DMA_RCHAN_STAT_70                          0x00000c94
+#define BNX2_DMA_RCHAN_STAT_71                          0x00000c98
+#define BNX2_DMA_RCHAN_STAT_72                          0x00000c9c
+#define BNX2_DMA_WCHAN_STAT_00                          0x00000ca0
+#define BNX2_DMA_WCHAN_STAT_00_WCHAN_STA_HOST_ADDR_LOW   (0xffffffffL<<0)
+
+#define BNX2_DMA_WCHAN_STAT_01                          0x00000ca4
+#define BNX2_DMA_WCHAN_STAT_01_WCHAN_STA_HOST_ADDR_HIGH  (0xffffffffL<<0)
+
+#define BNX2_DMA_WCHAN_STAT_02                          0x00000ca8
+#define BNX2_DMA_WCHAN_STAT_02_LENGTH                    (0xffffL<<0)
+#define BNX2_DMA_WCHAN_STAT_02_WORD_SWAP                 (1L<<16)
+#define BNX2_DMA_WCHAN_STAT_02_BYTE_SWAP                 (1L<<17)
+#define BNX2_DMA_WCHAN_STAT_02_PRIORITY_LVL              (1L<<18)
+
+#define BNX2_DMA_WCHAN_STAT_10                          0x00000cac
+#define BNX2_DMA_WCHAN_STAT_11                          0x00000cb0
+#define BNX2_DMA_WCHAN_STAT_12                          0x00000cb4
+#define BNX2_DMA_WCHAN_STAT_20                          0x00000cb8
+#define BNX2_DMA_WCHAN_STAT_21                          0x00000cbc
+#define BNX2_DMA_WCHAN_STAT_22                          0x00000cc0
+#define BNX2_DMA_WCHAN_STAT_30                          0x00000cc4
+#define BNX2_DMA_WCHAN_STAT_31                          0x00000cc8
+#define BNX2_DMA_WCHAN_STAT_32                          0x00000ccc
+#define BNX2_DMA_WCHAN_STAT_40                          0x00000cd0
+#define BNX2_DMA_WCHAN_STAT_41                          0x00000cd4
+#define BNX2_DMA_WCHAN_STAT_42                          0x00000cd8
+#define BNX2_DMA_WCHAN_STAT_50                          0x00000cdc
+#define BNX2_DMA_WCHAN_STAT_51                          0x00000ce0
+#define BNX2_DMA_WCHAN_STAT_52                          0x00000ce4
+#define BNX2_DMA_WCHAN_STAT_60                          0x00000ce8
+#define BNX2_DMA_WCHAN_STAT_61                          0x00000cec
+#define BNX2_DMA_WCHAN_STAT_62                          0x00000cf0
+#define BNX2_DMA_WCHAN_STAT_70                          0x00000cf4
+#define BNX2_DMA_WCHAN_STAT_71                          0x00000cf8
+#define BNX2_DMA_WCHAN_STAT_72                          0x00000cfc
+#define BNX2_DMA_ARB_STAT_00                            0x00000d00
+#define BNX2_DMA_ARB_STAT_00_MASTER                      (0xffffL<<0)
+#define BNX2_DMA_ARB_STAT_00_MASTER_ENC                  (0xffL<<16)
+#define BNX2_DMA_ARB_STAT_00_CUR_BINMSTR                 (0xffL<<24)
+
+#define BNX2_DMA_ARB_STAT_01                            0x00000d04
+#define BNX2_DMA_ARB_STAT_01_LPR_RPTR                    (0xfL<<0)
+#define BNX2_DMA_ARB_STAT_01_LPR_WPTR                    (0xfL<<4)
+#define BNX2_DMA_ARB_STAT_01_LPB_RPTR                    (0xfL<<8)
+#define BNX2_DMA_ARB_STAT_01_LPB_WPTR                    (0xfL<<12)
+#define BNX2_DMA_ARB_STAT_01_HPR_RPTR                    (0xfL<<16)
+#define BNX2_DMA_ARB_STAT_01_HPR_WPTR                    (0xfL<<20)
+#define BNX2_DMA_ARB_STAT_01_HPB_RPTR                    (0xfL<<24)
+#define BNX2_DMA_ARB_STAT_01_HPB_WPTR                    (0xfL<<28)
+
+#define BNX2_DMA_FUSE_CTRL0_CMD                         0x00000f00
+#define BNX2_DMA_FUSE_CTRL0_CMD_PWRUP_DONE               (1L<<0)
+#define BNX2_DMA_FUSE_CTRL0_CMD_SHIFT_DONE               (1L<<1)
+#define BNX2_DMA_FUSE_CTRL0_CMD_SHIFT                    (1L<<2)
+#define BNX2_DMA_FUSE_CTRL0_CMD_LOAD                     (1L<<3)
+#define BNX2_DMA_FUSE_CTRL0_CMD_SEL                      (0xfL<<8)
+
+#define BNX2_DMA_FUSE_CTRL0_DATA                        0x00000f04
+#define BNX2_DMA_FUSE_CTRL1_CMD                         0x00000f08
+#define BNX2_DMA_FUSE_CTRL1_CMD_PWRUP_DONE               (1L<<0)
+#define BNX2_DMA_FUSE_CTRL1_CMD_SHIFT_DONE               (1L<<1)
+#define BNX2_DMA_FUSE_CTRL1_CMD_SHIFT                    (1L<<2)
+#define BNX2_DMA_FUSE_CTRL1_CMD_LOAD                     (1L<<3)
+#define BNX2_DMA_FUSE_CTRL1_CMD_SEL                      (0xfL<<8)
+
+#define BNX2_DMA_FUSE_CTRL1_DATA                        0x00000f0c
+#define BNX2_DMA_FUSE_CTRL2_CMD                         0x00000f10
+#define BNX2_DMA_FUSE_CTRL2_CMD_PWRUP_DONE               (1L<<0)
+#define BNX2_DMA_FUSE_CTRL2_CMD_SHIFT_DONE               (1L<<1)
+#define BNX2_DMA_FUSE_CTRL2_CMD_SHIFT                    (1L<<2)
+#define BNX2_DMA_FUSE_CTRL2_CMD_LOAD                     (1L<<3)
+#define BNX2_DMA_FUSE_CTRL2_CMD_SEL                      (0xfL<<8)
+
+#define BNX2_DMA_FUSE_CTRL2_DATA                        0x00000f14
+
+
+/*
+ *  context_reg definition
+ *  offset: 0x1000
+ */
+#define BNX2_CTX_COMMAND                                0x00001000
+#define BNX2_CTX_COMMAND_ENABLED                         (1L<<0)
+
+#define BNX2_CTX_STATUS                                 0x00001004
+#define BNX2_CTX_STATUS_LOCK_WAIT                        (1L<<0)
+#define BNX2_CTX_STATUS_READ_STAT                        (1L<<16)
+#define BNX2_CTX_STATUS_WRITE_STAT                       (1L<<17)
+#define BNX2_CTX_STATUS_ACC_STALL_STAT                   (1L<<18)
+#define BNX2_CTX_STATUS_LOCK_STALL_STAT                  (1L<<19)
+
+#define BNX2_CTX_VIRT_ADDR                              0x00001008
+#define BNX2_CTX_VIRT_ADDR_VIRT_ADDR                     (0x7fffL<<6)
+
+#define BNX2_CTX_PAGE_TBL                               0x0000100c
+#define BNX2_CTX_PAGE_TBL_PAGE_TBL                       (0x3fffL<<6)
+
+#define BNX2_CTX_DATA_ADR                               0x00001010
+#define BNX2_CTX_DATA_ADR_DATA_ADR                       (0x7ffffL<<2)
+
+#define BNX2_CTX_DATA                                   0x00001014
+#define BNX2_CTX_LOCK                                   0x00001018
+#define BNX2_CTX_LOCK_TYPE                               (0x7L<<0)
+#define BNX2_CTX_LOCK_TYPE_LOCK_TYPE_VOID                (0x0L<<0)
+#define BNX2_CTX_LOCK_TYPE_LOCK_TYPE_COMPLETE            (0x7L<<0)
+#define BNX2_CTX_LOCK_TYPE_LOCK_TYPE_PROTOCOL            (0x1L<<0)
+#define BNX2_CTX_LOCK_TYPE_LOCK_TYPE_TX                  (0x2L<<0)
+#define BNX2_CTX_LOCK_TYPE_LOCK_TYPE_TIMER               (0x4L<<0)
+#define BNX2_CTX_LOCK_CID_VALUE                          (0x3fffL<<7)
+#define BNX2_CTX_LOCK_GRANTED                            (1L<<26)
+#define BNX2_CTX_LOCK_MODE                               (0x7L<<27)
+#define BNX2_CTX_LOCK_MODE_UNLOCK                        (0x0L<<27)
+#define BNX2_CTX_LOCK_MODE_IMMEDIATE                     (0x1L<<27)
+#define BNX2_CTX_LOCK_MODE_SURE                          (0x2L<<27)
+#define BNX2_CTX_LOCK_STATUS                             (1L<<30)
+#define BNX2_CTX_LOCK_REQ                                (1L<<31)
+
+#define BNX2_CTX_ACCESS_STATUS                          0x00001040
+#define BNX2_CTX_ACCESS_STATUS_MASTERENCODED             (0xfL<<0)
+#define BNX2_CTX_ACCESS_STATUS_ACCESSMEMORYSM            (0x3L<<10)
+#define BNX2_CTX_ACCESS_STATUS_PAGETABLEINITSM           (0x3L<<12)
+#define BNX2_CTX_ACCESS_STATUS_ACCESSMEMORYINITSM        (0x3L<<14)
+#define BNX2_CTX_ACCESS_STATUS_QUALIFIED_REQUEST         (0x7ffL<<17)
+
+#define BNX2_CTX_DBG_LOCK_STATUS                        0x00001044
+#define BNX2_CTX_DBG_LOCK_STATUS_SM                      (0x3ffL<<0)
+#define BNX2_CTX_DBG_LOCK_STATUS_MATCH                   (0x3ffL<<22)
+
+#define BNX2_CTX_CHNL_LOCK_STATUS_0                     0x00001080
+#define BNX2_CTX_CHNL_LOCK_STATUS_0_CID                  (0x3fffL<<0)
+#define BNX2_CTX_CHNL_LOCK_STATUS_0_TYPE                 (0x3L<<14)
+#define BNX2_CTX_CHNL_LOCK_STATUS_0_MODE                 (1L<<16)
+
+#define BNX2_CTX_CHNL_LOCK_STATUS_1                     0x00001084
+#define BNX2_CTX_CHNL_LOCK_STATUS_2                     0x00001088
+#define BNX2_CTX_CHNL_LOCK_STATUS_3                     0x0000108c
+#define BNX2_CTX_CHNL_LOCK_STATUS_4                     0x00001090
+#define BNX2_CTX_CHNL_LOCK_STATUS_5                     0x00001094
+#define BNX2_CTX_CHNL_LOCK_STATUS_6                     0x00001098
+#define BNX2_CTX_CHNL_LOCK_STATUS_7                     0x0000109c
+#define BNX2_CTX_CHNL_LOCK_STATUS_8                     0x000010a0
+
+
+/*
+ *  emac_reg definition
+ *  offset: 0x1400
+ */
+#define BNX2_EMAC_MODE                                  0x00001400
+#define BNX2_EMAC_MODE_RESET                             (1L<<0)
+#define BNX2_EMAC_MODE_HALF_DUPLEX                       (1L<<1)
+#define BNX2_EMAC_MODE_PORT                              (0x3L<<2)
+#define BNX2_EMAC_MODE_PORT_NONE                         (0L<<2)
+#define BNX2_EMAC_MODE_PORT_MII                          (1L<<2)
+#define BNX2_EMAC_MODE_PORT_GMII                         (2L<<2)
+#define BNX2_EMAC_MODE_PORT_UNDEF                        (3L<<2)
+#define BNX2_EMAC_MODE_MAC_LOOP                          (1L<<4)
+#define BNX2_EMAC_MODE_TAGGED_MAC_CTL                    (1L<<7)
+#define BNX2_EMAC_MODE_TX_BURST                          (1L<<8)
+#define BNX2_EMAC_MODE_MAX_DEFER_DROP_ENA                (1L<<9)
+#define BNX2_EMAC_MODE_EXT_LINK_POL                      (1L<<10)
+#define BNX2_EMAC_MODE_FORCE_LINK                        (1L<<11)
+#define BNX2_EMAC_MODE_MPKT                              (1L<<18)
+#define BNX2_EMAC_MODE_MPKT_RCVD                         (1L<<19)
+#define BNX2_EMAC_MODE_ACPI_RCVD                         (1L<<20)
+
+#define BNX2_EMAC_STATUS                                0x00001404
+#define BNX2_EMAC_STATUS_LINK                            (1L<<11)
+#define BNX2_EMAC_STATUS_LINK_CHANGE                     (1L<<12)
+#define BNX2_EMAC_STATUS_MI_COMPLETE                     (1L<<22)
+#define BNX2_EMAC_STATUS_MI_INT                          (1L<<23)
+#define BNX2_EMAC_STATUS_AP_ERROR                        (1L<<24)
+#define BNX2_EMAC_STATUS_PARITY_ERROR_STATE              (1L<<31)
+
+#define BNX2_EMAC_ATTENTION_ENA                         0x00001408
+#define BNX2_EMAC_ATTENTION_ENA_LINK                     (1L<<11)
+#define BNX2_EMAC_ATTENTION_ENA_MI_COMPLETE              (1L<<22)
+#define BNX2_EMAC_ATTENTION_ENA_MI_INT                   (1L<<23)
+#define BNX2_EMAC_ATTENTION_ENA_AP_ERROR                 (1L<<24)
+
+#define BNX2_EMAC_LED                                   0x0000140c
+#define BNX2_EMAC_LED_OVERRIDE                           (1L<<0)
+#define BNX2_EMAC_LED_1000MB_OVERRIDE                    (1L<<1)
+#define BNX2_EMAC_LED_100MB_OVERRIDE                     (1L<<2)
+#define BNX2_EMAC_LED_10MB_OVERRIDE                      (1L<<3)
+#define BNX2_EMAC_LED_TRAFFIC_OVERRIDE                   (1L<<4)
+#define BNX2_EMAC_LED_BLNK_TRAFFIC                       (1L<<5)
+#define BNX2_EMAC_LED_TRAFFIC                            (1L<<6)
+#define BNX2_EMAC_LED_1000MB                             (1L<<7)
+#define BNX2_EMAC_LED_100MB                              (1L<<8)
+#define BNX2_EMAC_LED_10MB                               (1L<<9)
+#define BNX2_EMAC_LED_TRAFFIC_STAT                       (1L<<10)
+#define BNX2_EMAC_LED_BLNK_RATE                          (0xfffL<<19)
+#define BNX2_EMAC_LED_BLNK_RATE_ENA                      (1L<<31)
+
+#define BNX2_EMAC_MAC_MATCH0                            0x00001410
+#define BNX2_EMAC_MAC_MATCH1                            0x00001414
+#define BNX2_EMAC_MAC_MATCH2                            0x00001418
+#define BNX2_EMAC_MAC_MATCH3                            0x0000141c
+#define BNX2_EMAC_MAC_MATCH4                            0x00001420
+#define BNX2_EMAC_MAC_MATCH5                            0x00001424
+#define BNX2_EMAC_MAC_MATCH6                            0x00001428
+#define BNX2_EMAC_MAC_MATCH7                            0x0000142c
+#define BNX2_EMAC_MAC_MATCH8                            0x00001430
+#define BNX2_EMAC_MAC_MATCH9                            0x00001434
+#define BNX2_EMAC_MAC_MATCH10                           0x00001438
+#define BNX2_EMAC_MAC_MATCH11                           0x0000143c
+#define BNX2_EMAC_MAC_MATCH12                           0x00001440
+#define BNX2_EMAC_MAC_MATCH13                           0x00001444
+#define BNX2_EMAC_MAC_MATCH14                           0x00001448
+#define BNX2_EMAC_MAC_MATCH15                           0x0000144c
+#define BNX2_EMAC_MAC_MATCH16                           0x00001450
+#define BNX2_EMAC_MAC_MATCH17                           0x00001454
+#define BNX2_EMAC_MAC_MATCH18                           0x00001458
+#define BNX2_EMAC_MAC_MATCH19                           0x0000145c
+#define BNX2_EMAC_MAC_MATCH20                           0x00001460
+#define BNX2_EMAC_MAC_MATCH21                           0x00001464
+#define BNX2_EMAC_MAC_MATCH22                           0x00001468
+#define BNX2_EMAC_MAC_MATCH23                           0x0000146c
+#define BNX2_EMAC_MAC_MATCH24                           0x00001470
+#define BNX2_EMAC_MAC_MATCH25                           0x00001474
+#define BNX2_EMAC_MAC_MATCH26                           0x00001478
+#define BNX2_EMAC_MAC_MATCH27                           0x0000147c
+#define BNX2_EMAC_MAC_MATCH28                           0x00001480
+#define BNX2_EMAC_MAC_MATCH29                           0x00001484
+#define BNX2_EMAC_MAC_MATCH30                           0x00001488
+#define BNX2_EMAC_MAC_MATCH31                           0x0000148c
+#define BNX2_EMAC_BACKOFF_SEED                          0x00001498
+#define BNX2_EMAC_BACKOFF_SEED_EMAC_BACKOFF_SEED         (0x3ffL<<0)
+
+#define BNX2_EMAC_RX_MTU_SIZE                           0x0000149c
+#define BNX2_EMAC_RX_MTU_SIZE_MTU_SIZE                   (0xffffL<<0)
+#define BNX2_EMAC_RX_MTU_SIZE_JUMBO_ENA                  (1L<<31)
+
+#define BNX2_EMAC_SERDES_CNTL                           0x000014a4
+#define BNX2_EMAC_SERDES_CNTL_RXR                        (0x7L<<0)
+#define BNX2_EMAC_SERDES_CNTL_RXG                        (0x3L<<3)
+#define BNX2_EMAC_SERDES_CNTL_RXCKSEL                    (1L<<6)
+#define BNX2_EMAC_SERDES_CNTL_TXBIAS                     (0x7L<<7)
+#define BNX2_EMAC_SERDES_CNTL_BGMAX                      (1L<<10)
+#define BNX2_EMAC_SERDES_CNTL_BGMIN                      (1L<<11)
+#define BNX2_EMAC_SERDES_CNTL_TXMODE                     (1L<<12)
+#define BNX2_EMAC_SERDES_CNTL_TXEDGE                     (1L<<13)
+#define BNX2_EMAC_SERDES_CNTL_SERDES_MODE                (1L<<14)
+#define BNX2_EMAC_SERDES_CNTL_PLLTEST                    (1L<<15)
+#define BNX2_EMAC_SERDES_CNTL_CDET_EN                    (1L<<16)
+#define BNX2_EMAC_SERDES_CNTL_TBI_LBK                    (1L<<17)
+#define BNX2_EMAC_SERDES_CNTL_REMOTE_LBK                 (1L<<18)
+#define BNX2_EMAC_SERDES_CNTL_REV_PHASE                  (1L<<19)
+#define BNX2_EMAC_SERDES_CNTL_REGCTL12                   (0x3L<<20)
+#define BNX2_EMAC_SERDES_CNTL_REGCTL25                   (0x3L<<22)
+
+#define BNX2_EMAC_SERDES_STATUS                         0x000014a8
+#define BNX2_EMAC_SERDES_STATUS_RX_STAT                  (0xffL<<0)
+#define BNX2_EMAC_SERDES_STATUS_COMMA_DET                (1L<<8)
+
+#define BNX2_EMAC_MDIO_COMM                             0x000014ac
+#define BNX2_EMAC_MDIO_COMM_DATA                         (0xffffL<<0)
+#define BNX2_EMAC_MDIO_COMM_REG_ADDR                     (0x1fL<<16)
+#define BNX2_EMAC_MDIO_COMM_PHY_ADDR                     (0x1fL<<21)
+#define BNX2_EMAC_MDIO_COMM_COMMAND                      (0x3L<<26)
+#define BNX2_EMAC_MDIO_COMM_COMMAND_UNDEFINED_0          (0L<<26)
+#define BNX2_EMAC_MDIO_COMM_COMMAND_WRITE                (1L<<26)
+#define BNX2_EMAC_MDIO_COMM_COMMAND_READ                 (2L<<26)
+#define BNX2_EMAC_MDIO_COMM_COMMAND_UNDEFINED_3          (3L<<26)
+#define BNX2_EMAC_MDIO_COMM_FAIL                         (1L<<28)
+#define BNX2_EMAC_MDIO_COMM_START_BUSY                   (1L<<29)
+#define BNX2_EMAC_MDIO_COMM_DISEXT                       (1L<<30)
+
+#define BNX2_EMAC_MDIO_STATUS                           0x000014b0
+#define BNX2_EMAC_MDIO_STATUS_LINK                       (1L<<0)
+#define BNX2_EMAC_MDIO_STATUS_10MB                       (1L<<1)
+
+#define BNX2_EMAC_MDIO_MODE                             0x000014b4
+#define BNX2_EMAC_MDIO_MODE_SHORT_PREAMBLE               (1L<<1)
+#define BNX2_EMAC_MDIO_MODE_AUTO_POLL                    (1L<<4)
+#define BNX2_EMAC_MDIO_MODE_BIT_BANG                     (1L<<8)
+#define BNX2_EMAC_MDIO_MODE_MDIO                         (1L<<9)
+#define BNX2_EMAC_MDIO_MODE_MDIO_OE                      (1L<<10)
+#define BNX2_EMAC_MDIO_MODE_MDC                          (1L<<11)
+#define BNX2_EMAC_MDIO_MODE_MDINT                        (1L<<12)
+#define BNX2_EMAC_MDIO_MODE_CLOCK_CNT                    (0x1fL<<16)
+
+#define BNX2_EMAC_MDIO_AUTO_STATUS                      0x000014b8
+#define BNX2_EMAC_MDIO_AUTO_STATUS_AUTO_ERR              (1L<<0)
+
+#define BNX2_EMAC_TX_MODE                               0x000014bc
+#define BNX2_EMAC_TX_MODE_RESET                          (1L<<0)
+#define BNX2_EMAC_TX_MODE_EXT_PAUSE_EN                   (1L<<3)
+#define BNX2_EMAC_TX_MODE_FLOW_EN                        (1L<<4)
+#define BNX2_EMAC_TX_MODE_BIG_BACKOFF                    (1L<<5)
+#define BNX2_EMAC_TX_MODE_LONG_PAUSE                     (1L<<6)
+#define BNX2_EMAC_TX_MODE_LINK_AWARE                     (1L<<7)
+
+#define BNX2_EMAC_TX_STATUS                             0x000014c0
+#define BNX2_EMAC_TX_STATUS_XOFFED                       (1L<<0)
+#define BNX2_EMAC_TX_STATUS_XOFF_SENT                    (1L<<1)
+#define BNX2_EMAC_TX_STATUS_XON_SENT                     (1L<<2)
+#define BNX2_EMAC_TX_STATUS_LINK_UP                      (1L<<3)
+#define BNX2_EMAC_TX_STATUS_UNDERRUN                     (1L<<4)
+
+#define BNX2_EMAC_TX_LENGTHS                            0x000014c4
+#define BNX2_EMAC_TX_LENGTHS_SLOT                        (0xffL<<0)
+#define BNX2_EMAC_TX_LENGTHS_IPG                         (0xfL<<8)
+#define BNX2_EMAC_TX_LENGTHS_IPG_CRS                     (0x3L<<12)
+
+#define BNX2_EMAC_RX_MODE                               0x000014c8
+#define BNX2_EMAC_RX_MODE_RESET                          (1L<<0)
+#define BNX2_EMAC_RX_MODE_FLOW_EN                        (1L<<2)
+#define BNX2_EMAC_RX_MODE_KEEP_MAC_CONTROL               (1L<<3)
+#define BNX2_EMAC_RX_MODE_KEEP_PAUSE                     (1L<<4)
+#define BNX2_EMAC_RX_MODE_ACCEPT_OVERSIZE                (1L<<5)
+#define BNX2_EMAC_RX_MODE_ACCEPT_RUNTS                   (1L<<6)
+#define BNX2_EMAC_RX_MODE_LLC_CHK                        (1L<<7)
+#define BNX2_EMAC_RX_MODE_PROMISCUOUS                    (1L<<8)
+#define BNX2_EMAC_RX_MODE_NO_CRC_CHK                     (1L<<9)
+#define BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG                  (1L<<10)
+#define BNX2_EMAC_RX_MODE_FILT_BROADCAST                 (1L<<11)
+#define BNX2_EMAC_RX_MODE_SORT_MODE                      (1L<<12)
+
+#define BNX2_EMAC_RX_STATUS                             0x000014cc
+#define BNX2_EMAC_RX_STATUS_FFED                         (1L<<0)
+#define BNX2_EMAC_RX_STATUS_FF_RECEIVED                  (1L<<1)
+#define BNX2_EMAC_RX_STATUS_N_RECEIVED                   (1L<<2)
+
+#define BNX2_EMAC_MULTICAST_HASH0                       0x000014d0
+#define BNX2_EMAC_MULTICAST_HASH1                       0x000014d4
+#define BNX2_EMAC_MULTICAST_HASH2                       0x000014d8
+#define BNX2_EMAC_MULTICAST_HASH3                       0x000014dc
+#define BNX2_EMAC_MULTICAST_HASH4                       0x000014e0
+#define BNX2_EMAC_MULTICAST_HASH5                       0x000014e4
+#define BNX2_EMAC_MULTICAST_HASH6                       0x000014e8
+#define BNX2_EMAC_MULTICAST_HASH7                       0x000014ec
+#define BNX2_EMAC_RX_STAT_IFHCINOCTETS                  0x00001500
+#define BNX2_EMAC_RX_STAT_IFHCINBADOCTETS               0x00001504
+#define BNX2_EMAC_RX_STAT_ETHERSTATSFRAGMENTS           0x00001508
+#define BNX2_EMAC_RX_STAT_IFHCINUCASTPKTS               0x0000150c
+#define BNX2_EMAC_RX_STAT_IFHCINMULTICASTPKTS           0x00001510
+#define BNX2_EMAC_RX_STAT_IFHCINBROADCASTPKTS           0x00001514
+#define BNX2_EMAC_RX_STAT_DOT3STATSFCSERRORS            0x00001518
+#define BNX2_EMAC_RX_STAT_DOT3STATSALIGNMENTERRORS      0x0000151c
+#define BNX2_EMAC_RX_STAT_DOT3STATSCARRIERSENSEERRORS   0x00001520
+#define BNX2_EMAC_RX_STAT_XONPAUSEFRAMESRECEIVED        0x00001524
+#define BNX2_EMAC_RX_STAT_XOFFPAUSEFRAMESRECEIVED       0x00001528
+#define BNX2_EMAC_RX_STAT_MACCONTROLFRAMESRECEIVED      0x0000152c
+#define BNX2_EMAC_RX_STAT_XOFFSTATEENTERED              0x00001530
+#define BNX2_EMAC_RX_STAT_DOT3STATSFRAMESTOOLONG        0x00001534
+#define BNX2_EMAC_RX_STAT_ETHERSTATSJABBERS             0x00001538
+#define BNX2_EMAC_RX_STAT_ETHERSTATSUNDERSIZEPKTS       0x0000153c
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS64OCTETS        0x00001540
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS65OCTETSTO127OCTETS     0x00001544
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS128OCTETSTO255OCTETS    0x00001548
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS256OCTETSTO511OCTETS    0x0000154c
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS512OCTETSTO1023OCTETS   0x00001550
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS1024OCTETSTO1522OCTETS  0x00001554
+#define BNX2_EMAC_RX_STAT_ETHERSTATSPKTS1523OCTETSTO9022OCTETS  0x00001558
+#define BNX2_EMAC_RXMAC_DEBUG0                          0x0000155c
+#define BNX2_EMAC_RXMAC_DEBUG1                          0x00001560
+#define BNX2_EMAC_RXMAC_DEBUG1_LENGTH_NE_BYTE_COUNT      (1L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG1_LENGTH_OUT_RANGE          (1L<<1)
+#define BNX2_EMAC_RXMAC_DEBUG1_BAD_CRC                   (1L<<2)
+#define BNX2_EMAC_RXMAC_DEBUG1_RX_ERROR                  (1L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG1_ALIGN_ERROR               (1L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG1_LAST_DATA                 (1L<<5)
+#define BNX2_EMAC_RXMAC_DEBUG1_ODD_BYTE_START            (1L<<6)
+#define BNX2_EMAC_RXMAC_DEBUG1_BYTE_COUNT                (0xffffL<<7)
+#define BNX2_EMAC_RXMAC_DEBUG1_SLOT_TIME                 (0xffL<<23)
+
+#define BNX2_EMAC_RXMAC_DEBUG2                          0x00001564
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE                  (0x7L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_IDLE             (0x0L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_SFD              (0x1L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_DATA             (0x2L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_SKEEP            (0x3L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_EXT              (0x4L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_DROP             (0x5L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_SDROP            (0x6L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_SM_STATE_FC               (0x7L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE                 (0xfL<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_IDLE            (0x0L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_DATA0           (0x1L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_DATA1           (0x2L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_DATA2           (0x3L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_DATA3           (0x4L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_ABORT           (0x5L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_WAIT            (0x6L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_STATUS          (0x7L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_IDI_STATE_LAST            (0x8L<<3)
+#define BNX2_EMAC_RXMAC_DEBUG2_BYTE_IN                   (0xffL<<7)
+#define BNX2_EMAC_RXMAC_DEBUG2_FALSEC                    (1L<<15)
+#define BNX2_EMAC_RXMAC_DEBUG2_TAGGED                    (1L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG2_PAUSE_STATE               (1L<<18)
+#define BNX2_EMAC_RXMAC_DEBUG2_PAUSE_STATE_IDLE          (0L<<18)
+#define BNX2_EMAC_RXMAC_DEBUG2_PAUSE_STATE_PAUSED        (1L<<18)
+#define BNX2_EMAC_RXMAC_DEBUG2_SE_COUNTER                (0xfL<<19)
+#define BNX2_EMAC_RXMAC_DEBUG2_QUANTA                    (0x1fL<<23)
+
+#define BNX2_EMAC_RXMAC_DEBUG3                          0x00001568
+#define BNX2_EMAC_RXMAC_DEBUG3_PAUSE_CTR                 (0xffffL<<0)
+#define BNX2_EMAC_RXMAC_DEBUG3_TMP_PAUSE_CTR             (0xffffL<<16)
+
+#define BNX2_EMAC_RXMAC_DEBUG4                          0x0000156c
+#define BNX2_EMAC_RXMAC_DEBUG4_TYPE_FIELD                (0xffffL<<0)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE                (0x3fL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_IDLE           (0x0L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UMAC2          (0x1L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UMAC3          (0x2L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UNI            (0x3L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MMAC2          (0x7L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MMAC3          (0x5L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_PSA1           (0x6L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_PSA2           (0x7L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_PSA3           (0x8L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MC2            (0x9L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MC3            (0xaL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MWAIT1         (0xeL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MWAIT2         (0xfL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MCHECK         (0x10L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MC             (0x11L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BC2            (0x12L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BC3            (0x13L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BSA1           (0x14L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BSA2           (0x15L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BSA3           (0x16L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BTYPE          (0x17L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_BC             (0x18L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_PTYPE          (0x19L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_CMD            (0x1aL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MAC            (0x1bL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_LATCH          (0x1cL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_XOFF           (0x1dL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_XON            (0x1eL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_PAUSED         (0x1fL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_NPAUSED        (0x20L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_TTYPE          (0x21L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_TVAL           (0x22L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_USA1           (0x23L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_USA2           (0x24L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_USA3           (0x25L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UTYPE          (0x26L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UTTYPE         (0x27L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_UTVAL          (0x28L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_MTYPE          (0x29L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_FILT_STATE_DROP           (0x2aL<<16)
+#define BNX2_EMAC_RXMAC_DEBUG4_DROP_PKT                  (1L<<22)
+#define BNX2_EMAC_RXMAC_DEBUG4_SLOT_FILLED               (1L<<23)
+#define BNX2_EMAC_RXMAC_DEBUG4_FALSE_CARRIER             (1L<<24)
+#define BNX2_EMAC_RXMAC_DEBUG4_LAST_DATA                 (1L<<25)
+#define BNX2_EMAC_RXMAC_DEBUG4_sfd_FOUND                 (1L<<26)
+#define BNX2_EMAC_RXMAC_DEBUG4_ADVANCE                   (1L<<27)
+#define BNX2_EMAC_RXMAC_DEBUG4_START                     (1L<<28)
+
+#define BNX2_EMAC_RXMAC_DEBUG5                          0x00001570
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM                  (0x7L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_IDLE             (0L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_WAIT_EOF         (1L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_WAIT_STAT        (2L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_SET_EOF4FCRC     (3L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_SET_EOF4RDE      (4L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_SET_EOF4ALL      (5L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_PS_IDISM_1WD_WAIT_STAT    (6L<<0)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1                (0x7L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_VDW            (0x0L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_STAT           (0x1L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_AEOF           (0x2L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_NEOF           (0x3L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_SOF            (0x4L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_SAEOF          (0x6L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF1_SNEOF          (0x7L<<4)
+#define BNX2_EMAC_RXMAC_DEBUG5_EOF_DETECTED              (1L<<7)
+#define BNX2_EMAC_RXMAC_DEBUG5_CCODE_BUF0                (0x7L<<8)
+#define BNX2_EMAC_RXMAC_DEBUG5_RPM_IDI_FIFO_FULL         (1L<<11)
+#define BNX2_EMAC_RXMAC_DEBUG5_LOAD_CCODE                (1L<<12)
+#define BNX2_EMAC_RXMAC_DEBUG5_LOAD_DATA                 (1L<<13)
+#define BNX2_EMAC_RXMAC_DEBUG5_LOAD_STAT                 (1L<<14)
+#define BNX2_EMAC_RXMAC_DEBUG5_CLR_STAT                  (1L<<15)
+#define BNX2_EMAC_RXMAC_DEBUG5_IDI_RPM_CCODE             (0x3L<<16)
+#define BNX2_EMAC_RXMAC_DEBUG5_IDI_RPM_ACCEPT            (1L<<19)
+#define BNX2_EMAC_RXMAC_DEBUG5_FMLEN                     (0xfffL<<20)
+
+#define BNX2_EMAC_RX_STAT_AC0                           0x00001580
+#define BNX2_EMAC_RX_STAT_AC1                           0x00001584
+#define BNX2_EMAC_RX_STAT_AC2                           0x00001588
+#define BNX2_EMAC_RX_STAT_AC3                           0x0000158c
+#define BNX2_EMAC_RX_STAT_AC4                           0x00001590
+#define BNX2_EMAC_RX_STAT_AC5                           0x00001594
+#define BNX2_EMAC_RX_STAT_AC6                           0x00001598
+#define BNX2_EMAC_RX_STAT_AC7                           0x0000159c
+#define BNX2_EMAC_RX_STAT_AC8                           0x000015a0
+#define BNX2_EMAC_RX_STAT_AC9                           0x000015a4
+#define BNX2_EMAC_RX_STAT_AC10                          0x000015a8
+#define BNX2_EMAC_RX_STAT_AC11                          0x000015ac
+#define BNX2_EMAC_RX_STAT_AC12                          0x000015b0
+#define BNX2_EMAC_RX_STAT_AC13                          0x000015b4
+#define BNX2_EMAC_RX_STAT_AC14                          0x000015b8
+#define BNX2_EMAC_RX_STAT_AC15                          0x000015bc
+#define BNX2_EMAC_RX_STAT_AC16                          0x000015c0
+#define BNX2_EMAC_RX_STAT_AC17                          0x000015c4
+#define BNX2_EMAC_RX_STAT_AC18                          0x000015c8
+#define BNX2_EMAC_RX_STAT_AC19                          0x000015cc
+#define BNX2_EMAC_RX_STAT_AC20                          0x000015d0
+#define BNX2_EMAC_RX_STAT_AC21                          0x000015d4
+#define BNX2_EMAC_RX_STAT_AC22                          0x000015d8
+#define BNX2_EMAC_RXMAC_SUC_DBG_OVERRUNVEC              0x000015dc
+#define BNX2_EMAC_TX_STAT_IFHCOUTOCTETS                 0x00001600
+#define BNX2_EMAC_TX_STAT_IFHCOUTBADOCTETS              0x00001604
+#define BNX2_EMAC_TX_STAT_ETHERSTATSCOLLISIONS          0x00001608
+#define BNX2_EMAC_TX_STAT_OUTXONSENT                    0x0000160c
+#define BNX2_EMAC_TX_STAT_OUTXOFFSENT                   0x00001610
+#define BNX2_EMAC_TX_STAT_FLOWCONTROLDONE               0x00001614
+#define BNX2_EMAC_TX_STAT_DOT3STATSSINGLECOLLISIONFRAMES        0x00001618
+#define BNX2_EMAC_TX_STAT_DOT3STATSMULTIPLECOLLISIONFRAMES      0x0000161c
+#define BNX2_EMAC_TX_STAT_DOT3STATSDEFERREDTRANSMISSIONS        0x00001620
+#define BNX2_EMAC_TX_STAT_DOT3STATSEXCESSIVECOLLISIONS  0x00001624
+#define BNX2_EMAC_TX_STAT_DOT3STATSLATECOLLISIONS       0x00001628
+#define BNX2_EMAC_TX_STAT_IFHCOUTUCASTPKTS              0x0000162c
+#define BNX2_EMAC_TX_STAT_IFHCOUTMULTICASTPKTS          0x00001630
+#define BNX2_EMAC_TX_STAT_IFHCOUTBROADCASTPKTS          0x00001634
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS64OCTETS        0x00001638
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS65OCTETSTO127OCTETS     0x0000163c
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS128OCTETSTO255OCTETS    0x00001640
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS256OCTETSTO511OCTETS    0x00001644
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS512OCTETSTO1023OCTETS   0x00001648
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS1024OCTETSTO1522OCTETS  0x0000164c
+#define BNX2_EMAC_TX_STAT_ETHERSTATSPKTS1523OCTETSTO9022OCTETS  0x00001650
+#define BNX2_EMAC_TX_STAT_DOT3STATSINTERNALMACTRANSMITERRORS    0x00001654
+#define BNX2_EMAC_TXMAC_DEBUG0                          0x00001658
+#define BNX2_EMAC_TXMAC_DEBUG1                          0x0000165c
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE                 (0xfL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_IDLE            (0x0L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_START0          (0x1L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_DATA0           (0x4L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_DATA1           (0x5L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_DATA2           (0x6L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_DATA3           (0x7L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_WAIT0           (0x8L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_ODI_STATE_WAIT1           (0x9L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG1_CRS_ENABLE                (1L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG1_BAD_CRC                   (1L<<5)
+#define BNX2_EMAC_TXMAC_DEBUG1_SE_COUNTER                (0xfL<<6)
+#define BNX2_EMAC_TXMAC_DEBUG1_SEND_PAUSE                (1L<<10)
+#define BNX2_EMAC_TXMAC_DEBUG1_LATE_COLLISION            (1L<<11)
+#define BNX2_EMAC_TXMAC_DEBUG1_MAX_DEFER                 (1L<<12)
+#define BNX2_EMAC_TXMAC_DEBUG1_DEFERRED                  (1L<<13)
+#define BNX2_EMAC_TXMAC_DEBUG1_ONE_BYTE                  (1L<<14)
+#define BNX2_EMAC_TXMAC_DEBUG1_IPG_TIME                  (0xfL<<15)
+#define BNX2_EMAC_TXMAC_DEBUG1_SLOT_TIME                 (0xffL<<19)
+
+#define BNX2_EMAC_TXMAC_DEBUG2                          0x00001660
+#define BNX2_EMAC_TXMAC_DEBUG2_BACK_OFF                  (0x3ffL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG2_BYTE_COUNT                (0xffffL<<10)
+#define BNX2_EMAC_TXMAC_DEBUG2_COL_COUNT                 (0x1fL<<26)
+#define BNX2_EMAC_TXMAC_DEBUG2_COL_BIT                   (1L<<31)
+
+#define BNX2_EMAC_TXMAC_DEBUG3                          0x00001664
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE                  (0xfL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_IDLE             (0x0L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_PRE1             (0x1L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_PRE2             (0x2L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_SFD              (0x3L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_DATA             (0x4L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_CRC1             (0x5L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_CRC2             (0x6L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_EXT              (0x7L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_STATB            (0x8L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_STATG            (0x9L<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_JAM              (0xaL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_EJAM             (0xbL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_BJAM             (0xcL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_SWAIT            (0xdL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_SM_STATE_BACKOFF          (0xeL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE                (0x7L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_IDLE           (0x0L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_WAIT           (0x1L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_UNI            (0x2L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_MC             (0x3L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_BC2            (0x4L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_BC3            (0x5L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_FILT_STATE_BC             (0x6L<<4)
+#define BNX2_EMAC_TXMAC_DEBUG3_CRS_DONE                  (1L<<7)
+#define BNX2_EMAC_TXMAC_DEBUG3_XOFF                      (1L<<8)
+#define BNX2_EMAC_TXMAC_DEBUG3_SE_COUNTER                (0xfL<<9)
+#define BNX2_EMAC_TXMAC_DEBUG3_QUANTA_COUNTER            (0x1fL<<13)
+
+#define BNX2_EMAC_TXMAC_DEBUG4                          0x00001668
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_COUNTER             (0xffffL<<0)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE               (0xfL<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_IDLE          (0x0L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_MCA1          (0x2L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_MCA2          (0x3L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_MCA3          (0x6L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_SRC1          (0x7L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_SRC2          (0x5L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_SRC3          (0x4L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_TYPE          (0xcL<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_CMD           (0xeL<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_TIME          (0xaL<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_CRC1          (0x8L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_CRC2          (0x9L<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_PAUSE_STATE_WAIT          (0xdL<<16)
+#define BNX2_EMAC_TXMAC_DEBUG4_STATS0_VALID              (1L<<20)
+#define BNX2_EMAC_TXMAC_DEBUG4_APPEND_CRC                (1L<<21)
+#define BNX2_EMAC_TXMAC_DEBUG4_SLOT_FILLED               (1L<<22)
+#define BNX2_EMAC_TXMAC_DEBUG4_MAX_DEFER                 (1L<<23)
+#define BNX2_EMAC_TXMAC_DEBUG4_SEND_EXTEND               (1L<<24)
+#define BNX2_EMAC_TXMAC_DEBUG4_SEND_PADDING              (1L<<25)
+#define BNX2_EMAC_TXMAC_DEBUG4_EOF_LOC                   (1L<<26)
+#define BNX2_EMAC_TXMAC_DEBUG4_COLLIDING                 (1L<<27)
+#define BNX2_EMAC_TXMAC_DEBUG4_COL_IN                    (1L<<28)
+#define BNX2_EMAC_TXMAC_DEBUG4_BURSTING                  (1L<<29)
+#define BNX2_EMAC_TXMAC_DEBUG4_ADVANCE                   (1L<<30)
+#define BNX2_EMAC_TXMAC_DEBUG4_GO                        (1L<<31)
+
+#define BNX2_EMAC_TX_STAT_AC0                           0x00001680
+#define BNX2_EMAC_TX_STAT_AC1                           0x00001684
+#define BNX2_EMAC_TX_STAT_AC2                           0x00001688
+#define BNX2_EMAC_TX_STAT_AC3                           0x0000168c
+#define BNX2_EMAC_TX_STAT_AC4                           0x00001690
+#define BNX2_EMAC_TX_STAT_AC5                           0x00001694
+#define BNX2_EMAC_TX_STAT_AC6                           0x00001698
+#define BNX2_EMAC_TX_STAT_AC7                           0x0000169c
+#define BNX2_EMAC_TX_STAT_AC8                           0x000016a0
+#define BNX2_EMAC_TX_STAT_AC9                           0x000016a4
+#define BNX2_EMAC_TX_STAT_AC10                          0x000016a8
+#define BNX2_EMAC_TX_STAT_AC11                          0x000016ac
+#define BNX2_EMAC_TX_STAT_AC12                          0x000016b0
+#define BNX2_EMAC_TX_STAT_AC13                          0x000016b4
+#define BNX2_EMAC_TX_STAT_AC14                          0x000016b8
+#define BNX2_EMAC_TX_STAT_AC15                          0x000016bc
+#define BNX2_EMAC_TX_STAT_AC16                          0x000016c0
+#define BNX2_EMAC_TX_STAT_AC17                          0x000016c4
+#define BNX2_EMAC_TX_STAT_AC18                          0x000016c8
+#define BNX2_EMAC_TX_STAT_AC19                          0x000016cc
+#define BNX2_EMAC_TX_STAT_AC20                          0x000016d0
+#define BNX2_EMAC_TX_STAT_AC21                          0x000016d4
+#define BNX2_EMAC_TXMAC_SUC_DBG_OVERRUNVEC              0x000016d8
+
+
+/*
+ *  rpm_reg definition
+ *  offset: 0x1800
+ */
+#define BNX2_RPM_COMMAND                                0x00001800
+#define BNX2_RPM_COMMAND_ENABLED                         (1L<<0)
+#define BNX2_RPM_COMMAND_OVERRUN_ABORT                   (1L<<4)
+
+#define BNX2_RPM_STATUS                                 0x00001804
+#define BNX2_RPM_STATUS_MBUF_WAIT                        (1L<<0)
+#define BNX2_RPM_STATUS_FREE_WAIT                        (1L<<1)
+
+#define BNX2_RPM_CONFIG                                 0x00001808
+#define BNX2_RPM_CONFIG_NO_PSD_HDR_CKSUM                 (1L<<0)
+#define BNX2_RPM_CONFIG_ACPI_ENA                         (1L<<1)
+#define BNX2_RPM_CONFIG_ACPI_KEEP                        (1L<<2)
+#define BNX2_RPM_CONFIG_MP_KEEP                          (1L<<3)
+#define BNX2_RPM_CONFIG_SORT_VECT_VAL                    (0xfL<<4)
+#define BNX2_RPM_CONFIG_IGNORE_VLAN                      (1L<<31)
+
+#define BNX2_RPM_VLAN_MATCH0                            0x00001810
+#define BNX2_RPM_VLAN_MATCH0_RPM_VLAN_MTCH0_VALUE        (0xfffL<<0)
+
+#define BNX2_RPM_VLAN_MATCH1                            0x00001814
+#define BNX2_RPM_VLAN_MATCH1_RPM_VLAN_MTCH1_VALUE        (0xfffL<<0)
+
+#define BNX2_RPM_VLAN_MATCH2                            0x00001818
+#define BNX2_RPM_VLAN_MATCH2_RPM_VLAN_MTCH2_VALUE        (0xfffL<<0)
+
+#define BNX2_RPM_VLAN_MATCH3                            0x0000181c
+#define BNX2_RPM_VLAN_MATCH3_RPM_VLAN_MTCH3_VALUE        (0xfffL<<0)
+
+#define BNX2_RPM_SORT_USER0                             0x00001820
+#define BNX2_RPM_SORT_USER0_PM_EN                        (0xffffL<<0)
+#define BNX2_RPM_SORT_USER0_BC_EN                        (1L<<16)
+#define BNX2_RPM_SORT_USER0_MC_EN                        (1L<<17)
+#define BNX2_RPM_SORT_USER0_MC_HSH_EN                    (1L<<18)
+#define BNX2_RPM_SORT_USER0_PROM_EN                      (1L<<19)
+#define BNX2_RPM_SORT_USER0_VLAN_EN                      (0xfL<<20)
+#define BNX2_RPM_SORT_USER0_PROM_VLAN                    (1L<<24)
+#define BNX2_RPM_SORT_USER0_ENA                          (1L<<31)
+
+#define BNX2_RPM_SORT_USER1                             0x00001824
+#define BNX2_RPM_SORT_USER1_PM_EN                        (0xffffL<<0)
+#define BNX2_RPM_SORT_USER1_BC_EN                        (1L<<16)
+#define BNX2_RPM_SORT_USER1_MC_EN                        (1L<<17)
+#define BNX2_RPM_SORT_USER1_MC_HSH_EN                    (1L<<18)
+#define BNX2_RPM_SORT_USER1_PROM_EN                      (1L<<19)
+#define BNX2_RPM_SORT_USER1_VLAN_EN                      (0xfL<<20)
+#define BNX2_RPM_SORT_USER1_PROM_VLAN                    (1L<<24)
+#define BNX2_RPM_SORT_USER1_ENA                          (1L<<31)
+
+#define BNX2_RPM_SORT_USER2                             0x00001828
+#define BNX2_RPM_SORT_USER2_PM_EN                        (0xffffL<<0)
+#define BNX2_RPM_SORT_USER2_BC_EN                        (1L<<16)
+#define BNX2_RPM_SORT_USER2_MC_EN                        (1L<<17)
+#define BNX2_RPM_SORT_USER2_MC_HSH_EN                    (1L<<18)
+#define BNX2_RPM_SORT_USER2_PROM_EN                      (1L<<19)
+#define BNX2_RPM_SORT_USER2_VLAN_EN                      (0xfL<<20)
+#define BNX2_RPM_SORT_USER2_PROM_VLAN                    (1L<<24)
+#define BNX2_RPM_SORT_USER2_ENA                          (1L<<31)
+
+#define BNX2_RPM_SORT_USER3                             0x0000182c
+#define BNX2_RPM_SORT_USER3_PM_EN                        (0xffffL<<0)
+#define BNX2_RPM_SORT_USER3_BC_EN                        (1L<<16)
+#define BNX2_RPM_SORT_USER3_MC_EN                        (1L<<17)
+#define BNX2_RPM_SORT_USER3_MC_HSH_EN                    (1L<<18)
+#define BNX2_RPM_SORT_USER3_PROM_EN                      (1L<<19)
+#define BNX2_RPM_SORT_USER3_VLAN_EN                      (0xfL<<20)
+#define BNX2_RPM_SORT_USER3_PROM_VLAN                    (1L<<24)
+#define BNX2_RPM_SORT_USER3_ENA                          (1L<<31)
+
+#define BNX2_RPM_STAT_L2_FILTER_DISCARDS                0x00001840
+#define BNX2_RPM_STAT_RULE_CHECKER_DISCARDS             0x00001844
+#define BNX2_RPM_STAT_IFINFTQDISCARDS                   0x00001848
+#define BNX2_RPM_STAT_IFINMBUFDISCARD                   0x0000184c
+#define BNX2_RPM_STAT_RULE_CHECKER_P4_HIT               0x00001850
+#define BNX2_RPM_STAT_AC0                               0x00001880
+#define BNX2_RPM_STAT_AC1                               0x00001884
+#define BNX2_RPM_STAT_AC2                               0x00001888
+#define BNX2_RPM_STAT_AC3                               0x0000188c
+#define BNX2_RPM_STAT_AC4                               0x00001890
+#define BNX2_RPM_RC_CNTL_0                              0x00001900
+#define BNX2_RPM_RC_CNTL_0_OFFSET                        (0xffL<<0)
+#define BNX2_RPM_RC_CNTL_0_CLASS                         (0x7L<<8)
+#define BNX2_RPM_RC_CNTL_0_PRIORITY                      (1L<<11)
+#define BNX2_RPM_RC_CNTL_0_P4                            (1L<<12)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE                      (0x7L<<13)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE_START                (0L<<13)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE_IP                   (1L<<13)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE_TCP                  (2L<<13)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE_UDP                  (3L<<13)
+#define BNX2_RPM_RC_CNTL_0_HDR_TYPE_DATA                 (4L<<13)
+#define BNX2_RPM_RC_CNTL_0_COMP                          (0x3L<<16)
+#define BNX2_RPM_RC_CNTL_0_COMP_EQUAL                    (0L<<16)
+#define BNX2_RPM_RC_CNTL_0_COMP_NEQUAL                   (1L<<16)
+#define BNX2_RPM_RC_CNTL_0_COMP_GREATER                  (2L<<16)
+#define BNX2_RPM_RC_CNTL_0_COMP_LESS                     (3L<<16)
+#define BNX2_RPM_RC_CNTL_0_SBIT                          (1L<<19)
+#define BNX2_RPM_RC_CNTL_0_CMDSEL                        (0xfL<<20)
+#define BNX2_RPM_RC_CNTL_0_MAP                           (1L<<24)
+#define BNX2_RPM_RC_CNTL_0_DISCARD                       (1L<<25)
+#define BNX2_RPM_RC_CNTL_0_MASK                          (1L<<26)
+#define BNX2_RPM_RC_CNTL_0_P1                            (1L<<27)
+#define BNX2_RPM_RC_CNTL_0_P2                            (1L<<28)
+#define BNX2_RPM_RC_CNTL_0_P3                            (1L<<29)
+#define BNX2_RPM_RC_CNTL_0_NBIT                          (1L<<30)
+
+#define BNX2_RPM_RC_VALUE_MASK_0                        0x00001904
+#define BNX2_RPM_RC_VALUE_MASK_0_VALUE                   (0xffffL<<0)
+#define BNX2_RPM_RC_VALUE_MASK_0_MASK                    (0xffffL<<16)
+
+#define BNX2_RPM_RC_CNTL_1                              0x00001908
+#define BNX2_RPM_RC_CNTL_1_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_1_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_1                        0x0000190c
+#define BNX2_RPM_RC_CNTL_2                              0x00001910
+#define BNX2_RPM_RC_CNTL_2_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_2_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_2                        0x00001914
+#define BNX2_RPM_RC_CNTL_3                              0x00001918
+#define BNX2_RPM_RC_CNTL_3_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_3_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_3                        0x0000191c
+#define BNX2_RPM_RC_CNTL_4                              0x00001920
+#define BNX2_RPM_RC_CNTL_4_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_4_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_4                        0x00001924
+#define BNX2_RPM_RC_CNTL_5                              0x00001928
+#define BNX2_RPM_RC_CNTL_5_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_5_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_5                        0x0000192c
+#define BNX2_RPM_RC_CNTL_6                              0x00001930
+#define BNX2_RPM_RC_CNTL_6_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_6_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_6                        0x00001934
+#define BNX2_RPM_RC_CNTL_7                              0x00001938
+#define BNX2_RPM_RC_CNTL_7_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_7_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_7                        0x0000193c
+#define BNX2_RPM_RC_CNTL_8                              0x00001940
+#define BNX2_RPM_RC_CNTL_8_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_8_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_8                        0x00001944
+#define BNX2_RPM_RC_CNTL_9                              0x00001948
+#define BNX2_RPM_RC_CNTL_9_A                             (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_9_B                             (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_9                        0x0000194c
+#define BNX2_RPM_RC_CNTL_10                             0x00001950
+#define BNX2_RPM_RC_CNTL_10_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_10_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_10                       0x00001954
+#define BNX2_RPM_RC_CNTL_11                             0x00001958
+#define BNX2_RPM_RC_CNTL_11_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_11_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_11                       0x0000195c
+#define BNX2_RPM_RC_CNTL_12                             0x00001960
+#define BNX2_RPM_RC_CNTL_12_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_12_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_12                       0x00001964
+#define BNX2_RPM_RC_CNTL_13                             0x00001968
+#define BNX2_RPM_RC_CNTL_13_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_13_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_13                       0x0000196c
+#define BNX2_RPM_RC_CNTL_14                             0x00001970
+#define BNX2_RPM_RC_CNTL_14_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_14_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_14                       0x00001974
+#define BNX2_RPM_RC_CNTL_15                             0x00001978
+#define BNX2_RPM_RC_CNTL_15_A                            (0x3ffffL<<0)
+#define BNX2_RPM_RC_CNTL_15_B                            (0xfffL<<19)
+
+#define BNX2_RPM_RC_VALUE_MASK_15                       0x0000197c
+#define BNX2_RPM_RC_CONFIG                              0x00001980
+#define BNX2_RPM_RC_CONFIG_RULE_ENABLE                   (0xffffL<<0)
+#define BNX2_RPM_RC_CONFIG_DEF_CLASS                     (0x7L<<24)
+
+#define BNX2_RPM_DEBUG0                                 0x00001984
+#define BNX2_RPM_DEBUG0_FM_BCNT                          (0xffffL<<0)
+#define BNX2_RPM_DEBUG0_T_DATA_OFST_VLD                  (1L<<16)
+#define BNX2_RPM_DEBUG0_T_UDP_OFST_VLD                   (1L<<17)
+#define BNX2_RPM_DEBUG0_T_TCP_OFST_VLD                   (1L<<18)
+#define BNX2_RPM_DEBUG0_T_IP_OFST_VLD                    (1L<<19)
+#define BNX2_RPM_DEBUG0_IP_MORE_FRGMT                    (1L<<20)
+#define BNX2_RPM_DEBUG0_T_IP_NO_TCP_UDP_HDR              (1L<<21)
+#define BNX2_RPM_DEBUG0_LLC_SNAP                         (1L<<22)
+#define BNX2_RPM_DEBUG0_FM_STARTED                       (1L<<23)
+#define BNX2_RPM_DEBUG0_DONE                             (1L<<24)
+#define BNX2_RPM_DEBUG0_WAIT_4_DONE                      (1L<<25)
+#define BNX2_RPM_DEBUG0_USE_TPBUF_CKSUM                  (1L<<26)
+#define BNX2_RPM_DEBUG0_RX_NO_PSD_HDR_CKSUM              (1L<<27)
+#define BNX2_RPM_DEBUG0_IGNORE_VLAN                      (1L<<28)
+#define BNX2_RPM_DEBUG0_RP_ENA_ACTIVE                    (1L<<31)
+
+#define BNX2_RPM_DEBUG1                                 0x00001988
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST                       (0xffffL<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_IDLE                  (0L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ETYPE_B6_ALL          (1L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ETYPE_B2_IPLLC        (2L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ETYPE_B6_IP           (4L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ETYPE_B2_IP           (8L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_IP_START              (16L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_IP                    (32L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_TCP                   (64L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_UDP                   (128L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_AH                    (256L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ESP                   (512L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ESP_PAYLOAD           (1024L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_DATA                  (2048L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ADD_CARRY             (0x2000L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_ADD_CARRYOUT          (0x4000L<<0)
+#define BNX2_RPM_DEBUG1_FSM_CUR_ST_LATCH_RESULT          (0x8000L<<0)
+#define BNX2_RPM_DEBUG1_HDR_BCNT                         (0x7ffL<<16)
+#define BNX2_RPM_DEBUG1_UNKNOWN_ETYPE_D                  (1L<<28)
+#define BNX2_RPM_DEBUG1_VLAN_REMOVED_D2                  (1L<<29)
+#define BNX2_RPM_DEBUG1_VLAN_REMOVED_D1                  (1L<<30)
+#define BNX2_RPM_DEBUG1_EOF_0XTRA_WD                     (1L<<31)
+
+#define BNX2_RPM_DEBUG2                                 0x0000198c
+#define BNX2_RPM_DEBUG2_CMD_HIT_VEC                      (0xffffL<<0)
+#define BNX2_RPM_DEBUG2_IP_BCNT                          (0xffL<<16)
+#define BNX2_RPM_DEBUG2_THIS_CMD_M4                      (1L<<24)
+#define BNX2_RPM_DEBUG2_THIS_CMD_M3                      (1L<<25)
+#define BNX2_RPM_DEBUG2_THIS_CMD_M2                      (1L<<26)
+#define BNX2_RPM_DEBUG2_THIS_CMD_M1                      (1L<<27)
+#define BNX2_RPM_DEBUG2_IPIPE_EMPTY                      (1L<<28)
+#define BNX2_RPM_DEBUG2_FM_DISCARD                       (1L<<29)
+#define BNX2_RPM_DEBUG2_LAST_RULE_IN_FM_D2               (1L<<30)
+#define BNX2_RPM_DEBUG2_LAST_RULE_IN_FM_D1               (1L<<31)
+
+#define BNX2_RPM_DEBUG3                                 0x00001990
+#define BNX2_RPM_DEBUG3_AVAIL_MBUF_PTR                   (0x1ffL<<0)
+#define BNX2_RPM_DEBUG3_RDE_RLUPQ_WR_REQ_INT             (1L<<9)
+#define BNX2_RPM_DEBUG3_RDE_RBUF_WR_LAST_INT             (1L<<10)
+#define BNX2_RPM_DEBUG3_RDE_RBUF_WR_REQ_INT              (1L<<11)
+#define BNX2_RPM_DEBUG3_RDE_RBUF_FREE_REQ                (1L<<12)
+#define BNX2_RPM_DEBUG3_RDE_RBUF_ALLOC_REQ               (1L<<13)
+#define BNX2_RPM_DEBUG3_DFSM_MBUF_NOTAVAIL               (1L<<14)
+#define BNX2_RPM_DEBUG3_RBUF_RDE_SOF_DROP                (1L<<15)
+#define BNX2_RPM_DEBUG3_DFIFO_VLD_ENTRY_CT               (0xfL<<16)
+#define BNX2_RPM_DEBUG3_RDE_SRC_FIFO_ALMFULL             (1L<<21)
+#define BNX2_RPM_DEBUG3_DROP_NXT_VLD                     (1L<<22)
+#define BNX2_RPM_DEBUG3_DROP_NXT                         (1L<<23)
+#define BNX2_RPM_DEBUG3_FTQ_FSM                          (0x3L<<24)
+#define BNX2_RPM_DEBUG3_FTQ_FSM_IDLE                     (0x0L<<24)
+#define BNX2_RPM_DEBUG3_FTQ_FSM_WAIT_ACK                 (0x1L<<24)
+#define BNX2_RPM_DEBUG3_FTQ_FSM_WAIT_FREE                (0x2L<<24)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM                      (0x3L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_WAIT_SOF             (0x0L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_GET_MBUF             (0x1L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_DMA_DATA             (0x2L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_WAIT_DATA            (0x3L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_WAIT_EOF             (0x4L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_WAIT_MF_ACK          (0x5L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_WAIT_DROP_NXT_VLD    (0x6L<<26)
+#define BNX2_RPM_DEBUG3_MBWRITE_FSM_DONE                 (0x7L<<26)
+#define BNX2_RPM_DEBUG3_MBFREE_FSM                       (1L<<29)
+#define BNX2_RPM_DEBUG3_MBFREE_FSM_IDLE                  (0L<<29)
+#define BNX2_RPM_DEBUG3_MBFREE_FSM_WAIT_ACK              (1L<<29)
+#define BNX2_RPM_DEBUG3_MBALLOC_FSM                      (1L<<30)
+#define BNX2_RPM_DEBUG3_MBALLOC_FSM_ET_MBUF              (0x0L<<30)
+#define BNX2_RPM_DEBUG3_MBALLOC_FSM_IVE_MBUF             (0x1L<<30)
+#define BNX2_RPM_DEBUG3_CCODE_EOF_ERROR                  (1L<<31)
+
+#define BNX2_RPM_DEBUG4                                 0x00001994
+#define BNX2_RPM_DEBUG4_DFSM_MBUF_CLUSTER                (0x1ffffffL<<0)
+#define BNX2_RPM_DEBUG4_DFIFO_CUR_CCODE                  (0x7L<<25)
+#define BNX2_RPM_DEBUG4_MBWRITE_FSM                      (0x7L<<28)
+#define BNX2_RPM_DEBUG4_DFIFO_EMPTY                      (1L<<31)
+
+#define BNX2_RPM_DEBUG5                                 0x00001998
+#define BNX2_RPM_DEBUG5_RDROP_WPTR                       (0x1fL<<0)
+#define BNX2_RPM_DEBUG5_RDROP_ACPI_RPTR                  (0x1fL<<5)
+#define BNX2_RPM_DEBUG5_RDROP_MC_RPTR                    (0x1fL<<10)
+#define BNX2_RPM_DEBUG5_RDROP_RC_RPTR                    (0x1fL<<15)
+#define BNX2_RPM_DEBUG5_RDROP_ACPI_EMPTY                 (1L<<20)
+#define BNX2_RPM_DEBUG5_RDROP_MC_EMPTY                   (1L<<21)
+#define BNX2_RPM_DEBUG5_RDROP_AEOF_VEC_AT_RDROP_MC_RPTR  (1L<<22)
+#define BNX2_RPM_DEBUG5_HOLDREG_WOL_DROP_INT             (1L<<23)
+#define BNX2_RPM_DEBUG5_HOLDREG_DISCARD                  (1L<<24)
+#define BNX2_RPM_DEBUG5_HOLDREG_MBUF_NOTAVAIL            (1L<<25)
+#define BNX2_RPM_DEBUG5_HOLDREG_MC_EMPTY                 (1L<<26)
+#define BNX2_RPM_DEBUG5_HOLDREG_RC_EMPTY                 (1L<<27)
+#define BNX2_RPM_DEBUG5_HOLDREG_FC_EMPTY                 (1L<<28)
+#define BNX2_RPM_DEBUG5_HOLDREG_ACPI_EMPTY               (1L<<29)
+#define BNX2_RPM_DEBUG5_HOLDREG_FULL_T                   (1L<<30)
+#define BNX2_RPM_DEBUG5_HOLDREG_RD                       (1L<<31)
+
+#define BNX2_RPM_DEBUG6                                 0x0000199c
+#define BNX2_RPM_DEBUG6_ACPI_VEC                         (0xffffL<<0)
+#define BNX2_RPM_DEBUG6_VEC                              (0xffffL<<16)
+
+#define BNX2_RPM_DEBUG7                                 0x000019a0
+#define BNX2_RPM_DEBUG7_RPM_DBG7_LAST_CRC                (0xffffffffL<<0)
+
+#define BNX2_RPM_DEBUG8                                 0x000019a4
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM                      (0xfL<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_IDLE                 (0L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_SOF_W1_ADDR          (1L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_SOF_W2_ADDR          (2L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_SOF_W3_ADDR          (3L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_SOF_WAIT_THBUF       (4L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_W3_DATA              (5L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_W0_ADDR              (6L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_W1_ADDR              (7L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_W2_ADDR              (8L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_W3_ADDR              (9L<<0)
+#define BNX2_RPM_DEBUG8_PS_ACPI_FSM_WAIT_THBUF           (10L<<0)
+#define BNX2_RPM_DEBUG8_COMPARE_AT_W0                    (1L<<4)
+#define BNX2_RPM_DEBUG8_COMPARE_AT_W3_DATA               (1L<<5)
+#define BNX2_RPM_DEBUG8_COMPARE_AT_SOF_WAIT              (1L<<6)
+#define BNX2_RPM_DEBUG8_COMPARE_AT_SOF_W3                (1L<<7)
+#define BNX2_RPM_DEBUG8_COMPARE_AT_SOF_W2                (1L<<8)
+#define BNX2_RPM_DEBUG8_EOF_W_LTEQ6_VLDBYTES             (1L<<9)
+#define BNX2_RPM_DEBUG8_EOF_W_LTEQ4_VLDBYTES             (1L<<10)
+#define BNX2_RPM_DEBUG8_NXT_EOF_W_12_VLDBYTES            (1L<<11)
+#define BNX2_RPM_DEBUG8_EOF_DET                          (1L<<12)
+#define BNX2_RPM_DEBUG8_SOF_DET                          (1L<<13)
+#define BNX2_RPM_DEBUG8_WAIT_4_SOF                       (1L<<14)
+#define BNX2_RPM_DEBUG8_ALL_DONE                         (1L<<15)
+#define BNX2_RPM_DEBUG8_THBUF_ADDR                       (0x7fL<<16)
+#define BNX2_RPM_DEBUG8_BYTE_CTR                         (0xffL<<24)
+
+#define BNX2_RPM_DEBUG9                                 0x000019a8
+#define BNX2_RPM_DEBUG9_OUTFIFO_COUNT                    (0x7L<<0)
+#define BNX2_RPM_DEBUG9_RDE_ACPI_RDY                     (1L<<3)
+#define BNX2_RPM_DEBUG9_VLD_RD_ENTRY_CT                  (0x7L<<4)
+#define BNX2_RPM_DEBUG9_OUTFIFO_OVERRUN_OCCURRED         (1L<<28)
+#define BNX2_RPM_DEBUG9_INFIFO_OVERRUN_OCCURRED          (1L<<29)
+#define BNX2_RPM_DEBUG9_ACPI_MATCH_INT                   (1L<<30)
+#define BNX2_RPM_DEBUG9_ACPI_ENABLE_SYN                  (1L<<31)
+
+#define BNX2_RPM_ACPI_DBG_BUF_W00                       0x000019c0
+#define BNX2_RPM_ACPI_DBG_BUF_W01                       0x000019c4
+#define BNX2_RPM_ACPI_DBG_BUF_W02                       0x000019c8
+#define BNX2_RPM_ACPI_DBG_BUF_W03                       0x000019cc
+#define BNX2_RPM_ACPI_DBG_BUF_W10                       0x000019d0
+#define BNX2_RPM_ACPI_DBG_BUF_W11                       0x000019d4
+#define BNX2_RPM_ACPI_DBG_BUF_W12                       0x000019d8
+#define BNX2_RPM_ACPI_DBG_BUF_W13                       0x000019dc
+#define BNX2_RPM_ACPI_DBG_BUF_W20                       0x000019e0
+#define BNX2_RPM_ACPI_DBG_BUF_W21                       0x000019e4
+#define BNX2_RPM_ACPI_DBG_BUF_W22                       0x000019e8
+#define BNX2_RPM_ACPI_DBG_BUF_W23                       0x000019ec
+#define BNX2_RPM_ACPI_DBG_BUF_W30                       0x000019f0
+#define BNX2_RPM_ACPI_DBG_BUF_W31                       0x000019f4
+#define BNX2_RPM_ACPI_DBG_BUF_W32                       0x000019f8
+#define BNX2_RPM_ACPI_DBG_BUF_W33                       0x000019fc
+
+
+/*
+ *  rbuf_reg definition
+ *  offset: 0x200000
+ */
+#define BNX2_RBUF_COMMAND                               0x00200000
+#define BNX2_RBUF_COMMAND_ENABLED                        (1L<<0)
+#define BNX2_RBUF_COMMAND_FREE_INIT                      (1L<<1)
+#define BNX2_RBUF_COMMAND_RAM_INIT                       (1L<<2)
+#define BNX2_RBUF_COMMAND_OVER_FREE                      (1L<<4)
+#define BNX2_RBUF_COMMAND_ALLOC_REQ                      (1L<<5)
+
+#define BNX2_RBUF_STATUS1                               0x00200004
+#define BNX2_RBUF_STATUS1_FREE_COUNT                     (0x3ffL<<0)
+
+#define BNX2_RBUF_STATUS2                               0x00200008
+#define BNX2_RBUF_STATUS2_FREE_TAIL                      (0x3ffL<<0)
+#define BNX2_RBUF_STATUS2_FREE_HEAD                      (0x3ffL<<16)
+
+#define BNX2_RBUF_CONFIG                                0x0020000c
+#define BNX2_RBUF_CONFIG_XOFF_TRIP                       (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG_XON_TRIP                        (0x3ffL<<16)
+
+#define BNX2_RBUF_FW_BUF_ALLOC                          0x00200010
+#define BNX2_RBUF_FW_BUF_ALLOC_VALUE                     (0x1ffL<<7)
+
+#define BNX2_RBUF_FW_BUF_FREE                           0x00200014
+#define BNX2_RBUF_FW_BUF_FREE_COUNT                      (0x7fL<<0)
+#define BNX2_RBUF_FW_BUF_FREE_TAIL                       (0x1ffL<<7)
+#define BNX2_RBUF_FW_BUF_FREE_HEAD                       (0x1ffL<<16)
+
+#define BNX2_RBUF_FW_BUF_SEL                            0x00200018
+#define BNX2_RBUF_FW_BUF_SEL_COUNT                       (0x7fL<<0)
+#define BNX2_RBUF_FW_BUF_SEL_TAIL                        (0x1ffL<<7)
+#define BNX2_RBUF_FW_BUF_SEL_HEAD                        (0x1ffL<<16)
+
+#define BNX2_RBUF_CONFIG2                               0x0020001c
+#define BNX2_RBUF_CONFIG2_MAC_DROP_TRIP                  (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG2_MAC_KEEP_TRIP                  (0x3ffL<<16)
+
+#define BNX2_RBUF_CONFIG3                               0x00200020
+#define BNX2_RBUF_CONFIG3_CU_DROP_TRIP                   (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG3_CU_KEEP_TRIP                   (0x3ffL<<16)
+
+#define BNX2_RBUF_PKT_DATA                              0x00208000
+#define BNX2_RBUF_CLIST_DATA                            0x00210000
+#define BNX2_RBUF_BUF_DATA                              0x00220000
+
+
+/*
+ *  rv2p_reg definition
+ *  offset: 0x2800
+ */
+#define BNX2_RV2P_COMMAND                               0x00002800
+#define BNX2_RV2P_COMMAND_ENABLED                        (1L<<0)
+#define BNX2_RV2P_COMMAND_PROC1_INTRPT                   (1L<<1)
+#define BNX2_RV2P_COMMAND_PROC2_INTRPT                   (1L<<2)
+#define BNX2_RV2P_COMMAND_ABORT0                         (1L<<4)
+#define BNX2_RV2P_COMMAND_ABORT1                         (1L<<5)
+#define BNX2_RV2P_COMMAND_ABORT2                         (1L<<6)
+#define BNX2_RV2P_COMMAND_ABORT3                         (1L<<7)
+#define BNX2_RV2P_COMMAND_ABORT4                         (1L<<8)
+#define BNX2_RV2P_COMMAND_ABORT5                         (1L<<9)
+#define BNX2_RV2P_COMMAND_PROC1_RESET                    (1L<<16)
+#define BNX2_RV2P_COMMAND_PROC2_RESET                    (1L<<17)
+#define BNX2_RV2P_COMMAND_CTXIF_RESET                    (1L<<18)
+
+#define BNX2_RV2P_STATUS                                0x00002804
+#define BNX2_RV2P_STATUS_ALWAYS_0                        (1L<<0)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT0_CNT              (1L<<8)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT1_CNT              (1L<<9)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT2_CNT              (1L<<10)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT3_CNT              (1L<<11)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT4_CNT              (1L<<12)
+#define BNX2_RV2P_STATUS_RV2P_GEN_STAT5_CNT              (1L<<13)
+
+#define BNX2_RV2P_CONFIG                                0x00002808
+#define BNX2_RV2P_CONFIG_STALL_PROC1                     (1L<<0)
+#define BNX2_RV2P_CONFIG_STALL_PROC2                     (1L<<1)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT0           (1L<<8)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT1           (1L<<9)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT2           (1L<<10)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT3           (1L<<11)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT4           (1L<<12)
+#define BNX2_RV2P_CONFIG_PROC1_STALL_ON_ABORT5           (1L<<13)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT0           (1L<<16)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT1           (1L<<17)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT2           (1L<<18)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT3           (1L<<19)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT4           (1L<<20)
+#define BNX2_RV2P_CONFIG_PROC2_STALL_ON_ABORT5           (1L<<21)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE                       (0xfL<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_256                   (0L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_512                   (1L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_1K                    (2L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_2K                    (3L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_4K                    (4L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_8K                    (5L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_16K                   (6L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_32K                   (7L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_64K                   (8L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_128K                  (9L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_256K                  (10L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_512K                  (11L<<24)
+#define BNX2_RV2P_CONFIG_PAGE_SIZE_1M                    (12L<<24)
+
+#define BNX2_RV2P_GEN_BFR_ADDR_0                        0x00002810
+#define BNX2_RV2P_GEN_BFR_ADDR_0_VALUE                   (0xffffL<<16)
+
+#define BNX2_RV2P_GEN_BFR_ADDR_1                        0x00002814
+#define BNX2_RV2P_GEN_BFR_ADDR_1_VALUE                   (0xffffL<<16)
+
+#define BNX2_RV2P_GEN_BFR_ADDR_2                        0x00002818
+#define BNX2_RV2P_GEN_BFR_ADDR_2_VALUE                   (0xffffL<<16)
+
+#define BNX2_RV2P_GEN_BFR_ADDR_3                        0x0000281c
+#define BNX2_RV2P_GEN_BFR_ADDR_3_VALUE                   (0xffffL<<16)
+
+#define BNX2_RV2P_INSTR_HIGH                            0x00002830
+#define BNX2_RV2P_INSTR_HIGH_HIGH                        (0x1fL<<0)
+
+#define BNX2_RV2P_INSTR_LOW                             0x00002834
+#define BNX2_RV2P_PROC1_ADDR_CMD                        0x00002838
+#define BNX2_RV2P_PROC1_ADDR_CMD_ADD                     (0x3ffL<<0)
+#define BNX2_RV2P_PROC1_ADDR_CMD_RDWR                    (1L<<31)
+
+#define BNX2_RV2P_PROC2_ADDR_CMD                        0x0000283c
+#define BNX2_RV2P_PROC2_ADDR_CMD_ADD                     (0x3ffL<<0)
+#define BNX2_RV2P_PROC2_ADDR_CMD_RDWR                    (1L<<31)
+
+#define BNX2_RV2P_PROC1_GRC_DEBUG                       0x00002840
+#define BNX2_RV2P_PROC2_GRC_DEBUG                       0x00002844
+#define BNX2_RV2P_GRC_PROC_DEBUG                        0x00002848
+#define BNX2_RV2P_DEBUG_VECT_PEEK                       0x0000284c
+#define BNX2_RV2P_DEBUG_VECT_PEEK_1_VALUE                (0x7ffL<<0)
+#define BNX2_RV2P_DEBUG_VECT_PEEK_1_PEEK_EN              (1L<<11)
+#define BNX2_RV2P_DEBUG_VECT_PEEK_1_SEL                  (0xfL<<12)
+#define BNX2_RV2P_DEBUG_VECT_PEEK_2_VALUE                (0x7ffL<<16)
+#define BNX2_RV2P_DEBUG_VECT_PEEK_2_PEEK_EN              (1L<<27)
+#define BNX2_RV2P_DEBUG_VECT_PEEK_2_SEL                  (0xfL<<28)
+
+#define BNX2_RV2P_PFTQ_DATA                             0x00002b40
+#define BNX2_RV2P_PFTQ_CMD                              0x00002b78
+#define BNX2_RV2P_PFTQ_CMD_OFFSET                        (0x3ffL<<0)
+#define BNX2_RV2P_PFTQ_CMD_WR_TOP                        (1L<<10)
+#define BNX2_RV2P_PFTQ_CMD_WR_TOP_0                      (0L<<10)
+#define BNX2_RV2P_PFTQ_CMD_WR_TOP_1                      (1L<<10)
+#define BNX2_RV2P_PFTQ_CMD_SFT_RESET                     (1L<<25)
+#define BNX2_RV2P_PFTQ_CMD_RD_DATA                       (1L<<26)
+#define BNX2_RV2P_PFTQ_CMD_ADD_INTERVEN                  (1L<<27)
+#define BNX2_RV2P_PFTQ_CMD_ADD_DATA                      (1L<<28)
+#define BNX2_RV2P_PFTQ_CMD_INTERVENE_CLR                 (1L<<29)
+#define BNX2_RV2P_PFTQ_CMD_POP                           (1L<<30)
+#define BNX2_RV2P_PFTQ_CMD_BUSY                          (1L<<31)
+
+#define BNX2_RV2P_PFTQ_CTL                              0x00002b7c
+#define BNX2_RV2P_PFTQ_CTL_INTERVENE                     (1L<<0)
+#define BNX2_RV2P_PFTQ_CTL_OVERFLOW                      (1L<<1)
+#define BNX2_RV2P_PFTQ_CTL_FORCE_INTERVENE               (1L<<2)
+#define BNX2_RV2P_PFTQ_CTL_MAX_DEPTH                     (0x3ffL<<12)
+#define BNX2_RV2P_PFTQ_CTL_CUR_DEPTH                     (0x3ffL<<22)
+
+#define BNX2_RV2P_TFTQ_DATA                             0x00002b80
+#define BNX2_RV2P_TFTQ_CMD                              0x00002bb8
+#define BNX2_RV2P_TFTQ_CMD_OFFSET                        (0x3ffL<<0)
+#define BNX2_RV2P_TFTQ_CMD_WR_TOP                        (1L<<10)
+#define BNX2_RV2P_TFTQ_CMD_WR_TOP_0                      (0L<<10)
+#define BNX2_RV2P_TFTQ_CMD_WR_TOP_1                      (1L<<10)
+#define BNX2_RV2P_TFTQ_CMD_SFT_RESET                     (1L<<25)
+#define BNX2_RV2P_TFTQ_CMD_RD_DATA                       (1L<<26)
+#define BNX2_RV2P_TFTQ_CMD_ADD_INTERVEN                  (1L<<27)
+#define BNX2_RV2P_TFTQ_CMD_ADD_DATA                      (1L<<28)
+#define BNX2_RV2P_TFTQ_CMD_INTERVENE_CLR                 (1L<<29)
+#define BNX2_RV2P_TFTQ_CMD_POP                           (1L<<30)
+#define BNX2_RV2P_TFTQ_CMD_BUSY                          (1L<<31)
+
+#define BNX2_RV2P_TFTQ_CTL                              0x00002bbc
+#define BNX2_RV2P_TFTQ_CTL_INTERVENE                     (1L<<0)
+#define BNX2_RV2P_TFTQ_CTL_OVERFLOW                      (1L<<1)
+#define BNX2_RV2P_TFTQ_CTL_FORCE_INTERVENE               (1L<<2)
+#define BNX2_RV2P_TFTQ_CTL_MAX_DEPTH                     (0x3ffL<<12)
+#define BNX2_RV2P_TFTQ_CTL_CUR_DEPTH                     (0x3ffL<<22)
+
+#define BNX2_RV2P_MFTQ_DATA                             0x00002bc0
+#define BNX2_RV2P_MFTQ_CMD                              0x00002bf8
+#define BNX2_RV2P_MFTQ_CMD_OFFSET                        (0x3ffL<<0)
+#define BNX2_RV2P_MFTQ_CMD_WR_TOP                        (1L<<10)
+#define BNX2_RV2P_MFTQ_CMD_WR_TOP_0                      (0L<<10)
+#define BNX2_RV2P_MFTQ_CMD_WR_TOP_1                      (1L<<10)
+#define BNX2_RV2P_MFTQ_CMD_SFT_RESET                     (1L<<25)
+#define BNX2_RV2P_MFTQ_CMD_RD_DATA                       (1L<<26)
+#define BNX2_RV2P_MFTQ_CMD_ADD_INTERVEN                  (1L<<27)
+#define BNX2_RV2P_MFTQ_CMD_ADD_DATA                      (1L<<28)
+#define BNX2_RV2P_MFTQ_CMD_INTERVENE_CLR                 (1L<<29)
+#define BNX2_RV2P_MFTQ_CMD_POP                           (1L<<30)
+#define BNX2_RV2P_MFTQ_CMD_BUSY                          (1L<<31)
+
+#define BNX2_RV2P_MFTQ_CTL                              0x00002bfc
+#define BNX2_RV2P_MFTQ_CTL_INTERVENE                     (1L<<0)
+#define BNX2_RV2P_MFTQ_CTL_OVERFLOW                      (1L<<1)
+#define BNX2_RV2P_MFTQ_CTL_FORCE_INTERVENE               (1L<<2)
+#define BNX2_RV2P_MFTQ_CTL_MAX_DEPTH                     (0x3ffL<<12)
+#define BNX2_RV2P_MFTQ_CTL_CUR_DEPTH                     (0x3ffL<<22)
+
+
+
+/*
+ *  mq_reg definition
+ *  offset: 0x3c00
+ */
+#define BNX2_MQ_COMMAND                                 0x00003c00
+#define BNX2_MQ_COMMAND_ENABLED                          (1L<<0)
+#define BNX2_MQ_COMMAND_OVERFLOW                         (1L<<4)
+#define BNX2_MQ_COMMAND_WR_ERROR                         (1L<<5)
+#define BNX2_MQ_COMMAND_RD_ERROR                         (1L<<6)
+
+#define BNX2_MQ_STATUS                                  0x00003c04
+#define BNX2_MQ_STATUS_CTX_ACCESS_STAT                   (1L<<16)
+#define BNX2_MQ_STATUS_CTX_ACCESS64_STAT                 (1L<<17)
+#define BNX2_MQ_STATUS_PCI_STALL_STAT                    (1L<<18)
+
+#define BNX2_MQ_CONFIG                                  0x00003c08
+#define BNX2_MQ_CONFIG_TX_HIGH_PRI                       (1L<<0)
+#define BNX2_MQ_CONFIG_HALT_DIS                          (1L<<1)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE                  (0x7L<<4)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256              (0L<<4)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_512              (1L<<4)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_1K               (2L<<4)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_2K               (3L<<4)
+#define BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_4K               (4L<<4)
+#define BNX2_MQ_CONFIG_MAX_DEPTH                         (0x7fL<<8)
+#define BNX2_MQ_CONFIG_CUR_DEPTH                         (0x7fL<<20)
+
+#define BNX2_MQ_ENQUEUE1                                0x00003c0c
+#define BNX2_MQ_ENQUEUE1_OFFSET                          (0x3fL<<2)
+#define BNX2_MQ_ENQUEUE1_CID                             (0x3fffL<<8)
+#define BNX2_MQ_ENQUEUE1_BYTE_MASK                       (0xfL<<24)
+#define BNX2_MQ_ENQUEUE1_KNL_MODE                        (1L<<28)
+
+#define BNX2_MQ_ENQUEUE2                                0x00003c10
+#define BNX2_MQ_BAD_WR_ADDR                             0x00003c14
+#define BNX2_MQ_BAD_RD_ADDR                             0x00003c18
+#define BNX2_MQ_KNL_BYP_WIND_START                      0x00003c1c
+#define BNX2_MQ_KNL_BYP_WIND_START_VALUE                 (0xfffffL<<12)
+
+#define BNX2_MQ_KNL_WIND_END                            0x00003c20
+#define BNX2_MQ_KNL_WIND_END_VALUE                       (0xffffffL<<8)
+
+#define BNX2_MQ_KNL_WRITE_MASK1                         0x00003c24
+#define BNX2_MQ_KNL_TX_MASK1                            0x00003c28
+#define BNX2_MQ_KNL_CMD_MASK1                           0x00003c2c
+#define BNX2_MQ_KNL_COND_ENQUEUE_MASK1                  0x00003c30
+#define BNX2_MQ_KNL_RX_V2P_MASK1                        0x00003c34
+#define BNX2_MQ_KNL_WRITE_MASK2                         0x00003c38
+#define BNX2_MQ_KNL_TX_MASK2                            0x00003c3c
+#define BNX2_MQ_KNL_CMD_MASK2                           0x00003c40
+#define BNX2_MQ_KNL_COND_ENQUEUE_MASK2                  0x00003c44
+#define BNX2_MQ_KNL_RX_V2P_MASK2                        0x00003c48
+#define BNX2_MQ_KNL_BYP_WRITE_MASK1                     0x00003c4c
+#define BNX2_MQ_KNL_BYP_TX_MASK1                        0x00003c50
+#define BNX2_MQ_KNL_BYP_CMD_MASK1                       0x00003c54
+#define BNX2_MQ_KNL_BYP_COND_ENQUEUE_MASK1              0x00003c58
+#define BNX2_MQ_KNL_BYP_RX_V2P_MASK1                    0x00003c5c
+#define BNX2_MQ_KNL_BYP_WRITE_MASK2                     0x00003c60
+#define BNX2_MQ_KNL_BYP_TX_MASK2                        0x00003c64
+#define BNX2_MQ_KNL_BYP_CMD_MASK2                       0x00003c68
+#define BNX2_MQ_KNL_BYP_COND_ENQUEUE_MASK2              0x00003c6c
+#define BNX2_MQ_KNL_BYP_RX_V2P_MASK2                    0x00003c70
+#define BNX2_MQ_MEM_WR_ADDR                             0x00003c74
+#define BNX2_MQ_MEM_WR_ADDR_VALUE                        (0x3fL<<0)
+
+#define BNX2_MQ_MEM_WR_DATA0                            0x00003c78
+#define BNX2_MQ_MEM_WR_DATA0_VALUE                       (0xffffffffL<<0)
+
+#define BNX2_MQ_MEM_WR_DATA1                            0x00003c7c
+#define BNX2_MQ_MEM_WR_DATA1_VALUE                       (0xffffffffL<<0)
+
+#define BNX2_MQ_MEM_WR_DATA2                            0x00003c80
+#define BNX2_MQ_MEM_WR_DATA2_VALUE                       (0x3fffffffL<<0)
+
+#define BNX2_MQ_MEM_RD_ADDR                             0x00003c84
+#define BNX2_MQ_MEM_RD_ADDR_VALUE                        (0x3fL<<0)
+
+#define BNX2_MQ_MEM_RD_DATA0                            0x00003c88
+#define BNX2_MQ_MEM_RD_DATA0_VALUE                       (0xffffffffL<<0)
+
+#define BNX2_MQ_MEM_RD_DATA1                            0x00003c8c
+#define BNX2_MQ_MEM_RD_DATA1_VALUE                       (0xffffffffL<<0)
+
+#define BNX2_MQ_MEM_RD_DATA2                            0x00003c90
+#define BNX2_MQ_MEM_RD_DATA2_VALUE                       (0x3fffffffL<<0)
+
+
+
+/*
+ *  tbdr_reg definition
+ *  offset: 0x5000
+ */
+#define BNX2_TBDR_COMMAND                               0x00005000
+#define BNX2_TBDR_COMMAND_ENABLE                         (1L<<0)
+#define BNX2_TBDR_COMMAND_SOFT_RST                       (1L<<1)
+#define BNX2_TBDR_COMMAND_MSTR_ABORT                     (1L<<4)
+
+#define BNX2_TBDR_STATUS                                0x00005004
+#define BNX2_TBDR_STATUS_DMA_WAIT                        (1L<<0)
+#define BNX2_TBDR_STATUS_FTQ_WAIT                        (1L<<1)
+#define BNX2_TBDR_STATUS_FIFO_OVERFLOW                   (1L<<2)
+#define BNX2_TBDR_STATUS_FIFO_UNDERFLOW                  (1L<<3)
+#define BNX2_TBDR_STATUS_SEARCHMISS_ERROR                (1L<<4)
+#define BNX2_TBDR_STATUS_FTQ_ENTRY_CNT                   (1L<<5)
+#define BNX2_TBDR_STATUS_BURST_CNT                       (1L<<6)
+
+#define BNX2_TBDR_CONFIG                                0x00005008
+#define BNX2_TBDR_CONFIG_MAX_BDS                         (0xffL<<0)
+#define BNX2_TBDR_CONFIG_SWAP_MODE                       (1L<<8)
+#define BNX2_TBDR_CONFIG_PRIORITY                        (1L<<9)
+#define BNX2_TBDR_CONFIG_CACHE_NEXT_PAGE_PTRS            (1L<<10)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE                       (0xfL<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_256                   (0L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_512                   (1L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_1K                    (2L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_2K                    (3L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_4K                    (4L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_8K                    (5L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_16K                   (6L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_32K                   (7L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_64K                   (8L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_128K                  (9L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_256K                  (10L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_512K                  (11L<<24)
+#define BNX2_TBDR_CONFIG_PAGE_SIZE_1M                    (12L<<24)
+
+#define BNX2_TBDR_DEBUG_VECT_PEEK                       0x0000500c
+#define BNX2_TBDR_DEBUG_VECT_PEEK_1_VALUE                (0x7ffL<<0)
+#define BNX2_TBDR_DEBUG_VECT_PEEK_1_PEEK_EN              (1L<<11)
+#define BNX2_TBDR_DEBUG_VECT_PEEK_1_SEL                  (0xfL<<12)
+#define BNX2_TBDR_DEBUG_VECT_PEEK_2_VALUE                (0x7ffL<<16)
+#define BNX2_TBDR_DEBUG_VECT_PEEK_2_PEEK_EN              (1L<<27)
+#define BNX2_TBDR_DEBUG_VECT_PEEK_2_SEL                  (0xfL<<28)
+
+#define BNX2_TBDR_FTQ_DATA                              0x000053c0
+#define BNX2_TBDR_FTQ_CMD                               0x000053f8
+#define BNX2_TBDR_FTQ_CMD_OFFSET                         (0x3ffL<<0)
+#define BNX2_TBDR_FTQ_CMD_WR_TOP                         (1L<<10)
+#define BNX2_TBDR_FTQ_CMD_WR_TOP_0                       (0L<<10)
+#define BNX2_TBDR_FTQ_CMD_WR_TOP_1                       (1L<<10)
+#define BNX2_TBDR_FTQ_CMD_SFT_RESET                      (1L<<25)
+#define BNX2_TBDR_FTQ_CMD_RD_DATA                        (1L<<26)
+#define BNX2_TBDR_FTQ_CMD_ADD_INTERVEN                   (1L<<27)
+#define BNX2_TBDR_FTQ_CMD_ADD_DATA                       (1L<<28)
+#define BNX2_TBDR_FTQ_CMD_INTERVENE_CLR                  (1L<<29)
+#define BNX2_TBDR_FTQ_CMD_POP                            (1L<<30)
+#define BNX2_TBDR_FTQ_CMD_BUSY                           (1L<<31)
+
+#define BNX2_TBDR_FTQ_CTL                               0x000053fc
+#define BNX2_TBDR_FTQ_CTL_INTERVENE                      (1L<<0)
+#define BNX2_TBDR_FTQ_CTL_OVERFLOW                       (1L<<1)
+#define BNX2_TBDR_FTQ_CTL_FORCE_INTERVENE                (1L<<2)
+#define BNX2_TBDR_FTQ_CTL_MAX_DEPTH                      (0x3ffL<<12)
+#define BNX2_TBDR_FTQ_CTL_CUR_DEPTH                      (0x3ffL<<22)
+
+
+
+/*
+ *  tdma_reg definition
+ *  offset: 0x5c00
+ */
+#define BNX2_TDMA_COMMAND                               0x00005c00
+#define BNX2_TDMA_COMMAND_ENABLED                        (1L<<0)
+#define BNX2_TDMA_COMMAND_MASTER_ABORT                   (1L<<4)
+#define BNX2_TDMA_COMMAND_BAD_L2_LENGTH_ABORT            (1L<<7)
+
+#define BNX2_TDMA_STATUS                                0x00005c04
+#define BNX2_TDMA_STATUS_DMA_WAIT                        (1L<<0)
+#define BNX2_TDMA_STATUS_PAYLOAD_WAIT                    (1L<<1)
+#define BNX2_TDMA_STATUS_PATCH_FTQ_WAIT                  (1L<<2)
+#define BNX2_TDMA_STATUS_LOCK_WAIT                       (1L<<3)
+#define BNX2_TDMA_STATUS_FTQ_ENTRY_CNT                   (1L<<16)
+#define BNX2_TDMA_STATUS_BURST_CNT                       (1L<<17)
+
+#define BNX2_TDMA_CONFIG                                0x00005c08
+#define BNX2_TDMA_CONFIG_ONE_DMA                         (1L<<0)
+#define BNX2_TDMA_CONFIG_ONE_RECORD                      (1L<<1)
+#define BNX2_TDMA_CONFIG_LIMIT_SZ                        (0xfL<<4)
+#define BNX2_TDMA_CONFIG_LIMIT_SZ_64                     (0L<<4)
+#define BNX2_TDMA_CONFIG_LIMIT_SZ_128                    (0x4L<<4)
+#define BNX2_TDMA_CONFIG_LIMIT_SZ_256                    (0x6L<<4)
+#define BNX2_TDMA_CONFIG_LIMIT_SZ_512                    (0x8L<<4)
+#define BNX2_TDMA_CONFIG_LINE_SZ                         (0xfL<<8)
+#define BNX2_TDMA_CONFIG_LINE_SZ_64                      (0L<<8)
+#define BNX2_TDMA_CONFIG_LINE_SZ_128                     (4L<<8)
+#define BNX2_TDMA_CONFIG_LINE_SZ_256                     (6L<<8)
+#define BNX2_TDMA_CONFIG_LINE_SZ_512                     (8L<<8)
+#define BNX2_TDMA_CONFIG_ALIGN_ENA                       (1L<<15)
+#define BNX2_TDMA_CONFIG_CHK_L2_BD                       (1L<<16)
+#define BNX2_TDMA_CONFIG_FIFO_CMP                        (0xfL<<20)
+
+#define BNX2_TDMA_PAYLOAD_PROD                          0x00005c0c
+#define BNX2_TDMA_PAYLOAD_PROD_VALUE                     (0x1fffL<<3)
+
+#define BNX2_TDMA_DBG_WATCHDOG                          0x00005c10
+#define BNX2_TDMA_DBG_TRIGGER                           0x00005c14
+#define BNX2_TDMA_DMAD_FSM                              0x00005c80
+#define BNX2_TDMA_DMAD_FSM_BD_INVLD                      (1L<<0)
+#define BNX2_TDMA_DMAD_FSM_PUSH                          (0xfL<<4)
+#define BNX2_TDMA_DMAD_FSM_ARB_TBDC                      (0x3L<<8)
+#define BNX2_TDMA_DMAD_FSM_ARB_CTX                       (1L<<12)
+#define BNX2_TDMA_DMAD_FSM_DR_INTF                       (1L<<16)
+#define BNX2_TDMA_DMAD_FSM_DMAD                          (0x7L<<20)
+#define BNX2_TDMA_DMAD_FSM_BD                            (0xfL<<24)
+
+#define BNX2_TDMA_DMAD_STATUS                           0x00005c84
+#define BNX2_TDMA_DMAD_STATUS_RHOLD_PUSH_ENTRY           (0x3L<<0)
+#define BNX2_TDMA_DMAD_STATUS_RHOLD_DMAD_ENTRY           (0x3L<<4)
+#define BNX2_TDMA_DMAD_STATUS_RHOLD_BD_ENTRY             (0x3L<<8)
+#define BNX2_TDMA_DMAD_STATUS_IFTQ_ENUM                  (0xfL<<12)
+
+#define BNX2_TDMA_DR_INTF_FSM                           0x00005c88
+#define BNX2_TDMA_DR_INTF_FSM_L2_COMP                    (0x3L<<0)
+#define BNX2_TDMA_DR_INTF_FSM_TPATQ                      (0x7L<<4)
+#define BNX2_TDMA_DR_INTF_FSM_TPBUF                      (0x3L<<8)
+#define BNX2_TDMA_DR_INTF_FSM_DR_BUF                     (0x7L<<12)
+#define BNX2_TDMA_DR_INTF_FSM_DMAD                       (0x7L<<16)
+
+#define BNX2_TDMA_DR_INTF_STATUS                        0x00005c8c
+#define BNX2_TDMA_DR_INTF_STATUS_HOLE_PHASE              (0x7L<<0)
+#define BNX2_TDMA_DR_INTF_STATUS_DATA_AVAIL              (0x3L<<4)
+#define BNX2_TDMA_DR_INTF_STATUS_SHIFT_ADDR              (0x7L<<8)
+#define BNX2_TDMA_DR_INTF_STATUS_NXT_PNTR                (0xfL<<12)
+#define BNX2_TDMA_DR_INTF_STATUS_BYTE_COUNT              (0x7L<<16)
+
+#define BNX2_TDMA_FTQ_DATA                              0x00005fc0
+#define BNX2_TDMA_FTQ_CMD                               0x00005ff8
+#define BNX2_TDMA_FTQ_CMD_OFFSET                         (0x3ffL<<0)
+#define BNX2_TDMA_FTQ_CMD_WR_TOP                         (1L<<10)
+#define BNX2_TDMA_FTQ_CMD_WR_TOP_0                       (0L<<10)
+#define BNX2_TDMA_FTQ_CMD_WR_TOP_1                       (1L<<10)
+#define BNX2_TDMA_FTQ_CMD_SFT_RESET                      (1L<<25)
+#define BNX2_TDMA_FTQ_CMD_RD_DATA                        (1L<<26)
+#define BNX2_TDMA_FTQ_CMD_ADD_INTERVEN                   (1L<<27)
+#define BNX2_TDMA_FTQ_CMD_ADD_DATA                       (1L<<28)
+#define BNX2_TDMA_FTQ_CMD_INTERVENE_CLR                  (1L<<29)
+#define BNX2_TDMA_FTQ_CMD_POP                            (1L<<30)
+#define BNX2_TDMA_FTQ_CMD_BUSY                           (1L<<31)
+
+#define BNX2_TDMA_FTQ_CTL                               0x00005ffc
+#define BNX2_TDMA_FTQ_CTL_INTERVENE                      (1L<<0)
+#define BNX2_TDMA_FTQ_CTL_OVERFLOW                       (1L<<1)
+#define BNX2_TDMA_FTQ_CTL_FORCE_INTERVENE                (1L<<2)
+#define BNX2_TDMA_FTQ_CTL_MAX_DEPTH                      (0x3ffL<<12)
+#define BNX2_TDMA_FTQ_CTL_CUR_DEPTH                      (0x3ffL<<22)
+
+
+
+/*
+ *  hc_reg definition
+ *  offset: 0x6800
+ */
+#define BNX2_HC_COMMAND                                 0x00006800
+#define BNX2_HC_COMMAND_ENABLE                           (1L<<0)
+#define BNX2_HC_COMMAND_SKIP_ABORT                       (1L<<4)
+#define BNX2_HC_COMMAND_COAL_NOW                         (1L<<16)
+#define BNX2_HC_COMMAND_COAL_NOW_WO_INT                  (1L<<17)
+#define BNX2_HC_COMMAND_STATS_NOW                        (1L<<18)
+#define BNX2_HC_COMMAND_FORCE_INT                        (0x3L<<19)
+#define BNX2_HC_COMMAND_FORCE_INT_NULL                   (0L<<19)
+#define BNX2_HC_COMMAND_FORCE_INT_HIGH                   (1L<<19)
+#define BNX2_HC_COMMAND_FORCE_INT_LOW                    (2L<<19)
+#define BNX2_HC_COMMAND_FORCE_INT_FREE                   (3L<<19)
+#define BNX2_HC_COMMAND_CLR_STAT_NOW                     (1L<<21)
+
+#define BNX2_HC_STATUS                                  0x00006804
+#define BNX2_HC_STATUS_MASTER_ABORT                      (1L<<0)
+#define BNX2_HC_STATUS_PARITY_ERROR_STATE                (1L<<1)
+#define BNX2_HC_STATUS_PCI_CLK_CNT_STAT                  (1L<<16)
+#define BNX2_HC_STATUS_CORE_CLK_CNT_STAT                 (1L<<17)
+#define BNX2_HC_STATUS_NUM_STATUS_BLOCKS_STAT            (1L<<18)
+#define BNX2_HC_STATUS_NUM_INT_GEN_STAT                  (1L<<19)
+#define BNX2_HC_STATUS_NUM_INT_MBOX_WR_STAT              (1L<<20)
+#define BNX2_HC_STATUS_CORE_CLKS_TO_HW_INTACK_STAT       (1L<<23)
+#define BNX2_HC_STATUS_CORE_CLKS_TO_SW_INTACK_STAT       (1L<<24)
+#define BNX2_HC_STATUS_CORE_CLKS_DURING_SW_INTACK_STAT   (1L<<25)
+
+#define BNX2_HC_CONFIG                                  0x00006808
+#define BNX2_HC_CONFIG_COLLECT_STATS                     (1L<<0)
+#define BNX2_HC_CONFIG_RX_TMR_MODE                       (1L<<1)
+#define BNX2_HC_CONFIG_TX_TMR_MODE                       (1L<<2)
+#define BNX2_HC_CONFIG_COM_TMR_MODE                      (1L<<3)
+#define BNX2_HC_CONFIG_CMD_TMR_MODE                      (1L<<4)
+#define BNX2_HC_CONFIG_STATISTIC_PRIORITY                (1L<<5)
+#define BNX2_HC_CONFIG_STATUS_PRIORITY                   (1L<<6)
+#define BNX2_HC_CONFIG_STAT_MEM_ADDR                     (0xffL<<8)
+
+#define BNX2_HC_ATTN_BITS_ENABLE                        0x0000680c
+#define BNX2_HC_STATUS_ADDR_L                           0x00006810
+#define BNX2_HC_STATUS_ADDR_H                           0x00006814
+#define BNX2_HC_STATISTICS_ADDR_L                       0x00006818
+#define BNX2_HC_STATISTICS_ADDR_H                       0x0000681c
+#define BNX2_HC_TX_QUICK_CONS_TRIP                      0x00006820
+#define BNX2_HC_TX_QUICK_CONS_TRIP_VALUE                 (0xffL<<0)
+#define BNX2_HC_TX_QUICK_CONS_TRIP_INT                   (0xffL<<16)
+
+#define BNX2_HC_COMP_PROD_TRIP                          0x00006824
+#define BNX2_HC_COMP_PROD_TRIP_VALUE                     (0xffL<<0)
+#define BNX2_HC_COMP_PROD_TRIP_INT                       (0xffL<<16)
+
+#define BNX2_HC_RX_QUICK_CONS_TRIP                      0x00006828
+#define BNX2_HC_RX_QUICK_CONS_TRIP_VALUE                 (0xffL<<0)
+#define BNX2_HC_RX_QUICK_CONS_TRIP_INT                   (0xffL<<16)
+
+#define BNX2_HC_RX_TICKS                                0x0000682c
+#define BNX2_HC_RX_TICKS_VALUE                           (0x3ffL<<0)
+#define BNX2_HC_RX_TICKS_INT                             (0x3ffL<<16)
+
+#define BNX2_HC_TX_TICKS                                0x00006830
+#define BNX2_HC_TX_TICKS_VALUE                           (0x3ffL<<0)
+#define BNX2_HC_TX_TICKS_INT                             (0x3ffL<<16)
+
+#define BNX2_HC_COM_TICKS                               0x00006834
+#define BNX2_HC_COM_TICKS_VALUE                          (0x3ffL<<0)
+#define BNX2_HC_COM_TICKS_INT                            (0x3ffL<<16)
+
+#define BNX2_HC_CMD_TICKS                               0x00006838
+#define BNX2_HC_CMD_TICKS_VALUE                          (0x3ffL<<0)
+#define BNX2_HC_CMD_TICKS_INT                            (0x3ffL<<16)
+
+#define BNX2_HC_PERIODIC_TICKS                          0x0000683c
+#define BNX2_HC_PERIODIC_TICKS_HC_PERIODIC_TICKS         (0xffffL<<0)
+
+#define BNX2_HC_STAT_COLLECT_TICKS                      0x00006840
+#define BNX2_HC_STAT_COLLECT_TICKS_HC_STAT_COLL_TICKS    (0xffL<<4)
+
+#define BNX2_HC_STATS_TICKS                             0x00006844
+#define BNX2_HC_STATS_TICKS_HC_STAT_TICKS                (0xffffL<<8)
+
+#define BNX2_HC_STAT_MEM_DATA                           0x0000684c
+#define BNX2_HC_STAT_GEN_SEL_0                          0x00006850
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0                 (0x7fL<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT0       (0L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT1       (1L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT2       (2L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT3       (3L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT4       (4L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT5       (5L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT6       (6L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT7       (7L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT8       (8L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT9       (9L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT10      (10L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXP_STAT11      (11L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT0       (12L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT1       (13L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT2       (14L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT3       (15L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT4       (16L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT5       (17L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT6       (18L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXP_STAT7       (19L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT0       (20L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT1       (21L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT2       (22L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT3       (23L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT4       (24L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT5       (25L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT6       (26L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT7       (27L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT8       (28L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT9       (29L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT10      (30L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COM_STAT11      (31L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TPAT_STAT0      (32L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TPAT_STAT1      (33L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TPAT_STAT2      (34L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TPAT_STAT3      (35L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT0        (36L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT1        (37L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT2        (38L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT3        (39L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT4        (40L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT5        (41L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT6        (42L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CP_STAT7        (43L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT0       (44L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT1       (45L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT2       (46L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT3       (47L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT4       (48L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT5       (49L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT6       (50L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MCP_STAT7       (51L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_PCI_CLK_CNT     (52L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CORE_CLK_CNT    (53L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_NUM_STATUS_BLOCKS    (54L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_NUM_INT_GEN  (55L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_NUM_INT_MBOX_WR      (56L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_CORE_CLKS_TO_HW_INTACK       (59L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_CORE_CLKS_TO_SW_INTACK       (60L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_HC_CORE_CLKS_DURING_SW_INTACK   (61L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TSCH_CMD_CNT    (62L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TSCH_SLOT_CNT   (63L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CSCH_CMD_CNT    (64L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CSCH_SLOT_CNT   (65L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RLUPQ_VALID_CNT         (66L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXPQ_VALID_CNT  (67L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RXPCQ_VALID_CNT         (68L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2PPQ_VALID_CNT        (69L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2PMQ_VALID_CNT        (70L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2PTQ_VALID_CNT        (71L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RDMAQ_VALID_CNT         (72L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TSCHQ_VALID_CNT         (73L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TBDRQ_VALID_CNT         (74L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TXPQ_VALID_CNT  (75L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TDMAQ_VALID_CNT         (76L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TPATQ_VALID_CNT         (77L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TASQ_VALID_CNT  (78L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CSQ_VALID_CNT   (79L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CPQ_VALID_CNT   (80L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COMXQ_VALID_CNT         (81L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COMTQ_VALID_CNT         (82L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_COMQ_VALID_CNT  (83L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MGMQ_VALID_CNT  (84L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_READ_TRANSFERS_CNT         (85L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_READ_DELAY_PCI_CLKS_CNT    (86L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_READ_TRANSFERS_CNT     (87L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_READ_DELAY_PCI_CLKS_CNT        (88L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_READ_RETRY_AFTER_DATA_CNT      (89L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_WRITE_TRANSFERS_CNT        (90L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_WRITE_DELAY_PCI_CLKS_CNT   (91L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_WRITE_TRANSFERS_CNT    (92L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_WRITE_DELAY_PCI_CLKS_CNT       (93L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_DMAE_BIG_WRITE_RETRY_AFTER_DATA_CNT     (94L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CTX_WR_CNT64    (95L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CTX_RD_CNT64    (96L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CTX_ACC_STALL_CLKS      (97L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_CTX_LOCK_STALL_CLKS     (98L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MBQ_CTX_ACCESS_STAT     (99L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MBQ_CTX_ACCESS64_STAT   (100L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_MBQ_PCI_STALL_STAT      (101L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TBDR_FTQ_ENTRY_CNT      (102L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TBDR_BURST_CNT  (103L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TDMA_FTQ_ENTRY_CNT      (104L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TDMA_BURST_CNT  (105L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RDMA_FTQ_ENTRY_CNT      (106L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RDMA_BURST_CNT  (107L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RLUP_MATCH_CNT  (108L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_POLL_PASS_CNT       (109L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_TMR1_CNT    (110L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_TMR2_CNT    (111L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_TMR3_CNT    (112L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_TMR4_CNT    (113L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_TMR_TMR5_CNT    (114L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT0      (115L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT1      (116L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT2      (117L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT3      (118L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT4      (119L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2P_STAT5      (120L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RBDC_PROC1_MISS         (121L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RBDC_PROC2_MISS         (122L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_0_RBDC_BURST_CNT  (127L<<0)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_1                 (0x7fL<<8)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_2                 (0x7fL<<16)
+#define BNX2_HC_STAT_GEN_SEL_0_GEN_SEL_3                 (0x7fL<<24)
+
+#define BNX2_HC_STAT_GEN_SEL_1                          0x00006854
+#define BNX2_HC_STAT_GEN_SEL_1_GEN_SEL_4                 (0x7fL<<0)
+#define BNX2_HC_STAT_GEN_SEL_1_GEN_SEL_5                 (0x7fL<<8)
+#define BNX2_HC_STAT_GEN_SEL_1_GEN_SEL_6                 (0x7fL<<16)
+#define BNX2_HC_STAT_GEN_SEL_1_GEN_SEL_7                 (0x7fL<<24)
+
+#define BNX2_HC_STAT_GEN_SEL_2                          0x00006858
+#define BNX2_HC_STAT_GEN_SEL_2_GEN_SEL_8                 (0x7fL<<0)
+#define BNX2_HC_STAT_GEN_SEL_2_GEN_SEL_9                 (0x7fL<<8)
+#define BNX2_HC_STAT_GEN_SEL_2_GEN_SEL_10                (0x7fL<<16)
+#define BNX2_HC_STAT_GEN_SEL_2_GEN_SEL_11                (0x7fL<<24)
+
+#define BNX2_HC_STAT_GEN_SEL_3                          0x0000685c
+#define BNX2_HC_STAT_GEN_SEL_3_GEN_SEL_12                (0x7fL<<0)
+#define BNX2_HC_STAT_GEN_SEL_3_GEN_SEL_13                (0x7fL<<8)
+#define BNX2_HC_STAT_GEN_SEL_3_GEN_SEL_14                (0x7fL<<16)
+#define BNX2_HC_STAT_GEN_SEL_3_GEN_SEL_15                (0x7fL<<24)
+
+#define BNX2_HC_STAT_GEN_STAT0                          0x00006888
+#define BNX2_HC_STAT_GEN_STAT1                          0x0000688c
+#define BNX2_HC_STAT_GEN_STAT2                          0x00006890
+#define BNX2_HC_STAT_GEN_STAT3                          0x00006894
+#define BNX2_HC_STAT_GEN_STAT4                          0x00006898
+#define BNX2_HC_STAT_GEN_STAT5                          0x0000689c
+#define BNX2_HC_STAT_GEN_STAT6                          0x000068a0
+#define BNX2_HC_STAT_GEN_STAT7                          0x000068a4
+#define BNX2_HC_STAT_GEN_STAT8                          0x000068a8
+#define BNX2_HC_STAT_GEN_STAT9                          0x000068ac
+#define BNX2_HC_STAT_GEN_STAT10                         0x000068b0
+#define BNX2_HC_STAT_GEN_STAT11                         0x000068b4
+#define BNX2_HC_STAT_GEN_STAT12                         0x000068b8
+#define BNX2_HC_STAT_GEN_STAT13                         0x000068bc
+#define BNX2_HC_STAT_GEN_STAT14                         0x000068c0
+#define BNX2_HC_STAT_GEN_STAT15                         0x000068c4
+#define BNX2_HC_STAT_GEN_STAT_AC0                       0x000068c8
+#define BNX2_HC_STAT_GEN_STAT_AC1                       0x000068cc
+#define BNX2_HC_STAT_GEN_STAT_AC2                       0x000068d0
+#define BNX2_HC_STAT_GEN_STAT_AC3                       0x000068d4
+#define BNX2_HC_STAT_GEN_STAT_AC4                       0x000068d8
+#define BNX2_HC_STAT_GEN_STAT_AC5                       0x000068dc
+#define BNX2_HC_STAT_GEN_STAT_AC6                       0x000068e0
+#define BNX2_HC_STAT_GEN_STAT_AC7                       0x000068e4
+#define BNX2_HC_STAT_GEN_STAT_AC8                       0x000068e8
+#define BNX2_HC_STAT_GEN_STAT_AC9                       0x000068ec
+#define BNX2_HC_STAT_GEN_STAT_AC10                      0x000068f0
+#define BNX2_HC_STAT_GEN_STAT_AC11                      0x000068f4
+#define BNX2_HC_STAT_GEN_STAT_AC12                      0x000068f8
+#define BNX2_HC_STAT_GEN_STAT_AC13                      0x000068fc
+#define BNX2_HC_STAT_GEN_STAT_AC14                      0x00006900
+#define BNX2_HC_STAT_GEN_STAT_AC15                      0x00006904
+#define BNX2_HC_VIS                                     0x00006908
+#define BNX2_HC_VIS_STAT_BUILD_STATE                     (0xfL<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_IDLE                (0L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_START               (1L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_REQUEST             (2L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_UPDATE64            (3L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_UPDATE32            (4L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_UPDATE_DONE         (5L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_DMA                 (6L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_MSI_CONTROL         (7L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_MSI_LOW             (8L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_MSI_HIGH            (9L<<0)
+#define BNX2_HC_VIS_STAT_BUILD_STATE_MSI_DATA            (10L<<0)
+#define BNX2_HC_VIS_DMA_STAT_STATE                       (0xfL<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_IDLE                  (0L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_STATUS_PARAM          (1L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_STATUS_DMA            (2L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_WRITE_COMP            (3L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_COMP                  (4L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_STATISTIC_PARAM       (5L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_STATISTIC_DMA         (6L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_WRITE_COMP_1          (7L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_WRITE_COMP_2          (8L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_WAIT                  (9L<<8)
+#define BNX2_HC_VIS_DMA_STAT_STATE_ABORT                 (15L<<8)
+#define BNX2_HC_VIS_DMA_MSI_STATE                        (0x7L<<12)
+#define BNX2_HC_VIS_STATISTIC_DMA_EN_STATE               (0x3L<<15)
+#define BNX2_HC_VIS_STATISTIC_DMA_EN_STATE_IDLE          (0L<<15)
+#define BNX2_HC_VIS_STATISTIC_DMA_EN_STATE_COUNT         (1L<<15)
+#define BNX2_HC_VIS_STATISTIC_DMA_EN_STATE_START         (2L<<15)
+
+#define BNX2_HC_VIS_1                                   0x0000690c
+#define BNX2_HC_VIS_1_HW_INTACK_STATE                    (1L<<4)
+#define BNX2_HC_VIS_1_HW_INTACK_STATE_IDLE               (0L<<4)
+#define BNX2_HC_VIS_1_HW_INTACK_STATE_COUNT              (1L<<4)
+#define BNX2_HC_VIS_1_SW_INTACK_STATE                    (1L<<5)
+#define BNX2_HC_VIS_1_SW_INTACK_STATE_IDLE               (0L<<5)
+#define BNX2_HC_VIS_1_SW_INTACK_STATE_COUNT              (1L<<5)
+#define BNX2_HC_VIS_1_DURING_SW_INTACK_STATE             (1L<<6)
+#define BNX2_HC_VIS_1_DURING_SW_INTACK_STATE_IDLE        (0L<<6)
+#define BNX2_HC_VIS_1_DURING_SW_INTACK_STATE_COUNT       (1L<<6)
+#define BNX2_HC_VIS_1_MAILBOX_COUNT_STATE                (1L<<7)
+#define BNX2_HC_VIS_1_MAILBOX_COUNT_STATE_IDLE           (0L<<7)
+#define BNX2_HC_VIS_1_MAILBOX_COUNT_STATE_COUNT          (1L<<7)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE                   (0xfL<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_IDLE              (0L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_DMA               (1L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_UPDATE            (2L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_ASSIGN            (3L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_WAIT              (4L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_REG_UPDATE        (5L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_REG_ASSIGN        (6L<<17)
+#define BNX2_HC_VIS_1_RAM_RD_ARB_STATE_REG_WAIT          (7L<<17)
+#define BNX2_HC_VIS_1_RAM_WR_ARB_STATE                   (0x3L<<21)
+#define BNX2_HC_VIS_1_RAM_WR_ARB_STATE_NORMAL            (0L<<21)
+#define BNX2_HC_VIS_1_RAM_WR_ARB_STATE_CLEAR             (1L<<21)
+#define BNX2_HC_VIS_1_INT_GEN_STATE                      (1L<<23)
+#define BNX2_HC_VIS_1_INT_GEN_STATE_DLE                  (0L<<23)
+#define BNX2_HC_VIS_1_INT_GEN_STATE_NTERRUPT             (1L<<23)
+#define BNX2_HC_VIS_1_STAT_CHAN_ID                       (0x7L<<24)
+#define BNX2_HC_VIS_1_INT_B                              (1L<<27)
+
+#define BNX2_HC_DEBUG_VECT_PEEK                         0x00006910
+#define BNX2_HC_DEBUG_VECT_PEEK_1_VALUE                  (0x7ffL<<0)
+#define BNX2_HC_DEBUG_VECT_PEEK_1_PEEK_EN                (1L<<11)
+#define BNX2_HC_DEBUG_VECT_PEEK_1_SEL                    (0xfL<<12)
+#define BNX2_HC_DEBUG_VECT_PEEK_2_VALUE                  (0x7ffL<<16)
+#define BNX2_HC_DEBUG_VECT_PEEK_2_PEEK_EN                (1L<<27)
+#define BNX2_HC_DEBUG_VECT_PEEK_2_SEL                    (0xfL<<28)
+
+
+
+/*
+ *  txp_reg definition
+ *  offset: 0x40000
+ */
+#define BNX2_TXP_CPU_MODE                               0x00045000
+#define BNX2_TXP_CPU_MODE_LOCAL_RST                      (1L<<0)
+#define BNX2_TXP_CPU_MODE_STEP_ENA                       (1L<<1)
+#define BNX2_TXP_CPU_MODE_PAGE_0_DATA_ENA                (1L<<2)
+#define BNX2_TXP_CPU_MODE_PAGE_0_INST_ENA                (1L<<3)
+#define BNX2_TXP_CPU_MODE_MSG_BIT1                       (1L<<6)
+#define BNX2_TXP_CPU_MODE_INTERRUPT_ENA                  (1L<<7)
+#define BNX2_TXP_CPU_MODE_SOFT_HALT                      (1L<<10)
+#define BNX2_TXP_CPU_MODE_BAD_DATA_HALT_ENA              (1L<<11)
+#define BNX2_TXP_CPU_MODE_BAD_INST_HALT_ENA              (1L<<12)
+#define BNX2_TXP_CPU_MODE_FIO_ABORT_HALT_ENA             (1L<<13)
+#define BNX2_TXP_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA        (1L<<15)
+
+#define BNX2_TXP_CPU_STATE                              0x00045004
+#define BNX2_TXP_CPU_STATE_BREAKPOINT                    (1L<<0)
+#define BNX2_TXP_CPU_STATE_BAD_INST_HALTED               (1L<<2)
+#define BNX2_TXP_CPU_STATE_PAGE_0_DATA_HALTED            (1L<<3)
+#define BNX2_TXP_CPU_STATE_PAGE_0_INST_HALTED            (1L<<4)
+#define BNX2_TXP_CPU_STATE_BAD_DATA_ADDR_HALTED          (1L<<5)
+#define BNX2_TXP_CPU_STATE_BAD_pc_HALTED                 (1L<<6)
+#define BNX2_TXP_CPU_STATE_ALIGN_HALTED                  (1L<<7)
+#define BNX2_TXP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
+#define BNX2_TXP_CPU_STATE_SOFT_HALTED                   (1L<<10)
+#define BNX2_TXP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
+#define BNX2_TXP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_TXP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
+#define BNX2_TXP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
+#define BNX2_TXP_CPU_STATE_BLOCKED_READ                  (1L<<31)
+
+#define BNX2_TXP_CPU_EVENT_MASK                         0x00045008
+#define BNX2_TXP_CPU_EVENT_MASK_BREAKPOINT_MASK          (1L<<0)
+#define BNX2_TXP_CPU_EVENT_MASK_BAD_INST_HALTED_MASK     (1L<<2)
+#define BNX2_TXP_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK  (1L<<3)
+#define BNX2_TXP_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK  (1L<<4)
+#define BNX2_TXP_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK        (1L<<5)
+#define BNX2_TXP_CPU_EVENT_MASK_BAD_PC_HALTED_MASK       (1L<<6)
+#define BNX2_TXP_CPU_EVENT_MASK_ALIGN_HALTED_MASK        (1L<<7)
+#define BNX2_TXP_CPU_EVENT_MASK_FIO_ABORT_MASK           (1L<<8)
+#define BNX2_TXP_CPU_EVENT_MASK_SOFT_HALTED_MASK         (1L<<10)
+#define BNX2_TXP_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK      (1L<<11)
+#define BNX2_TXP_CPU_EVENT_MASK_INTERRUPT_MASK           (1L<<12)
+
+#define BNX2_TXP_CPU_PROGRAM_COUNTER                    0x0004501c
+#define BNX2_TXP_CPU_INSTRUCTION                        0x00045020
+#define BNX2_TXP_CPU_DATA_ACCESS                        0x00045024
+#define BNX2_TXP_CPU_INTERRUPT_ENABLE                   0x00045028
+#define BNX2_TXP_CPU_INTERRUPT_VECTOR                   0x0004502c
+#define BNX2_TXP_CPU_INTERRUPT_SAVED_PC                 0x00045030
+#define BNX2_TXP_CPU_HW_BREAKPOINT                      0x00045034
+#define BNX2_TXP_CPU_HW_BREAKPOINT_DISABLE               (1L<<0)
+#define BNX2_TXP_CPU_HW_BREAKPOINT_ADDRESS               (0x3fffffffL<<2)
+
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK                    0x00045038
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_1_VALUE             (0x7ffL<<0)
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_1_PEEK_EN           (1L<<11)
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_1_SEL               (0xfL<<12)
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_2_VALUE             (0x7ffL<<16)
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_2_PEEK_EN           (1L<<27)
+#define BNX2_TXP_CPU_DEBUG_VECT_PEEK_2_SEL               (0xfL<<28)
+
+#define BNX2_TXP_CPU_LAST_BRANCH_ADDR                   0x00045048
+#define BNX2_TXP_CPU_LAST_BRANCH_ADDR_TYPE               (1L<<1)
+#define BNX2_TXP_CPU_LAST_BRANCH_ADDR_TYPE_JUMP          (0L<<1)
+#define BNX2_TXP_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH        (1L<<1)
+#define BNX2_TXP_CPU_LAST_BRANCH_ADDR_LBA                (0x3fffffffL<<2)
+
+#define BNX2_TXP_CPU_REG_FILE                           0x00045200
+#define BNX2_TXP_FTQ_DATA                               0x000453c0
+#define BNX2_TXP_FTQ_CMD                                0x000453f8
+#define BNX2_TXP_FTQ_CMD_OFFSET                          (0x3ffL<<0)
+#define BNX2_TXP_FTQ_CMD_WR_TOP                          (1L<<10)
+#define BNX2_TXP_FTQ_CMD_WR_TOP_0                        (0L<<10)
+#define BNX2_TXP_FTQ_CMD_WR_TOP_1                        (1L<<10)
+#define BNX2_TXP_FTQ_CMD_SFT_RESET                       (1L<<25)
+#define BNX2_TXP_FTQ_CMD_RD_DATA                         (1L<<26)
+#define BNX2_TXP_FTQ_CMD_ADD_INTERVEN                    (1L<<27)
+#define BNX2_TXP_FTQ_CMD_ADD_DATA                        (1L<<28)
+#define BNX2_TXP_FTQ_CMD_INTERVENE_CLR                   (1L<<29)
+#define BNX2_TXP_FTQ_CMD_POP                             (1L<<30)
+#define BNX2_TXP_FTQ_CMD_BUSY                            (1L<<31)
+
+#define BNX2_TXP_FTQ_CTL                                0x000453fc
+#define BNX2_TXP_FTQ_CTL_INTERVENE                       (1L<<0)
+#define BNX2_TXP_FTQ_CTL_OVERFLOW                        (1L<<1)
+#define BNX2_TXP_FTQ_CTL_FORCE_INTERVENE                 (1L<<2)
+#define BNX2_TXP_FTQ_CTL_MAX_DEPTH                       (0x3ffL<<12)
+#define BNX2_TXP_FTQ_CTL_CUR_DEPTH                       (0x3ffL<<22)
+
+#define BNX2_TXP_SCRATCH                                0x00060000
+
+
+/*
+ *  tpat_reg definition
+ *  offset: 0x80000
+ */
+#define BNX2_TPAT_CPU_MODE                              0x00085000
+#define BNX2_TPAT_CPU_MODE_LOCAL_RST                     (1L<<0)
+#define BNX2_TPAT_CPU_MODE_STEP_ENA                      (1L<<1)
+#define BNX2_TPAT_CPU_MODE_PAGE_0_DATA_ENA               (1L<<2)
+#define BNX2_TPAT_CPU_MODE_PAGE_0_INST_ENA               (1L<<3)
+#define BNX2_TPAT_CPU_MODE_MSG_BIT1                      (1L<<6)
+#define BNX2_TPAT_CPU_MODE_INTERRUPT_ENA                 (1L<<7)
+#define BNX2_TPAT_CPU_MODE_SOFT_HALT                     (1L<<10)
+#define BNX2_TPAT_CPU_MODE_BAD_DATA_HALT_ENA             (1L<<11)
+#define BNX2_TPAT_CPU_MODE_BAD_INST_HALT_ENA             (1L<<12)
+#define BNX2_TPAT_CPU_MODE_FIO_ABORT_HALT_ENA            (1L<<13)
+#define BNX2_TPAT_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA       (1L<<15)
+
+#define BNX2_TPAT_CPU_STATE                             0x00085004
+#define BNX2_TPAT_CPU_STATE_BREAKPOINT                   (1L<<0)
+#define BNX2_TPAT_CPU_STATE_BAD_INST_HALTED              (1L<<2)
+#define BNX2_TPAT_CPU_STATE_PAGE_0_DATA_HALTED           (1L<<3)
+#define BNX2_TPAT_CPU_STATE_PAGE_0_INST_HALTED           (1L<<4)
+#define BNX2_TPAT_CPU_STATE_BAD_DATA_ADDR_HALTED         (1L<<5)
+#define BNX2_TPAT_CPU_STATE_BAD_pc_HALTED                (1L<<6)
+#define BNX2_TPAT_CPU_STATE_ALIGN_HALTED                 (1L<<7)
+#define BNX2_TPAT_CPU_STATE_FIO_ABORT_HALTED             (1L<<8)
+#define BNX2_TPAT_CPU_STATE_SOFT_HALTED                  (1L<<10)
+#define BNX2_TPAT_CPU_STATE_SPAD_UNDERFLOW               (1L<<11)
+#define BNX2_TPAT_CPU_STATE_INTERRRUPT                   (1L<<12)
+#define BNX2_TPAT_CPU_STATE_DATA_ACCESS_STALL            (1L<<14)
+#define BNX2_TPAT_CPU_STATE_INST_FETCH_STALL             (1L<<15)
+#define BNX2_TPAT_CPU_STATE_BLOCKED_READ                 (1L<<31)
+
+#define BNX2_TPAT_CPU_EVENT_MASK                        0x00085008
+#define BNX2_TPAT_CPU_EVENT_MASK_BREAKPOINT_MASK         (1L<<0)
+#define BNX2_TPAT_CPU_EVENT_MASK_BAD_INST_HALTED_MASK    (1L<<2)
+#define BNX2_TPAT_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK         (1L<<3)
+#define BNX2_TPAT_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK         (1L<<4)
+#define BNX2_TPAT_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK       (1L<<5)
+#define BNX2_TPAT_CPU_EVENT_MASK_BAD_PC_HALTED_MASK      (1L<<6)
+#define BNX2_TPAT_CPU_EVENT_MASK_ALIGN_HALTED_MASK       (1L<<7)
+#define BNX2_TPAT_CPU_EVENT_MASK_FIO_ABORT_MASK          (1L<<8)
+#define BNX2_TPAT_CPU_EVENT_MASK_SOFT_HALTED_MASK        (1L<<10)
+#define BNX2_TPAT_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK     (1L<<11)
+#define BNX2_TPAT_CPU_EVENT_MASK_INTERRUPT_MASK          (1L<<12)
+
+#define BNX2_TPAT_CPU_PROGRAM_COUNTER                   0x0008501c
+#define BNX2_TPAT_CPU_INSTRUCTION                       0x00085020
+#define BNX2_TPAT_CPU_DATA_ACCESS                       0x00085024
+#define BNX2_TPAT_CPU_INTERRUPT_ENABLE                  0x00085028
+#define BNX2_TPAT_CPU_INTERRUPT_VECTOR                  0x0008502c
+#define BNX2_TPAT_CPU_INTERRUPT_SAVED_PC                0x00085030
+#define BNX2_TPAT_CPU_HW_BREAKPOINT                     0x00085034
+#define BNX2_TPAT_CPU_HW_BREAKPOINT_DISABLE              (1L<<0)
+#define BNX2_TPAT_CPU_HW_BREAKPOINT_ADDRESS              (0x3fffffffL<<2)
+
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK                   0x00085038
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_1_VALUE            (0x7ffL<<0)
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_1_PEEK_EN          (1L<<11)
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_1_SEL              (0xfL<<12)
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_2_VALUE            (0x7ffL<<16)
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_2_PEEK_EN          (1L<<27)
+#define BNX2_TPAT_CPU_DEBUG_VECT_PEEK_2_SEL              (0xfL<<28)
+
+#define BNX2_TPAT_CPU_LAST_BRANCH_ADDR                  0x00085048
+#define BNX2_TPAT_CPU_LAST_BRANCH_ADDR_TYPE              (1L<<1)
+#define BNX2_TPAT_CPU_LAST_BRANCH_ADDR_TYPE_JUMP         (0L<<1)
+#define BNX2_TPAT_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH       (1L<<1)
+#define BNX2_TPAT_CPU_LAST_BRANCH_ADDR_LBA               (0x3fffffffL<<2)
+
+#define BNX2_TPAT_CPU_REG_FILE                          0x00085200
+#define BNX2_TPAT_FTQ_DATA                              0x000853c0
+#define BNX2_TPAT_FTQ_CMD                               0x000853f8
+#define BNX2_TPAT_FTQ_CMD_OFFSET                         (0x3ffL<<0)
+#define BNX2_TPAT_FTQ_CMD_WR_TOP                         (1L<<10)
+#define BNX2_TPAT_FTQ_CMD_WR_TOP_0                       (0L<<10)
+#define BNX2_TPAT_FTQ_CMD_WR_TOP_1                       (1L<<10)
+#define BNX2_TPAT_FTQ_CMD_SFT_RESET                      (1L<<25)
+#define BNX2_TPAT_FTQ_CMD_RD_DATA                        (1L<<26)
+#define BNX2_TPAT_FTQ_CMD_ADD_INTERVEN                   (1L<<27)
+#define BNX2_TPAT_FTQ_CMD_ADD_DATA                       (1L<<28)
+#define BNX2_TPAT_FTQ_CMD_INTERVENE_CLR                  (1L<<29)
+#define BNX2_TPAT_FTQ_CMD_POP                            (1L<<30)
+#define BNX2_TPAT_FTQ_CMD_BUSY                           (1L<<31)
+
+#define BNX2_TPAT_FTQ_CTL                               0x000853fc
+#define BNX2_TPAT_FTQ_CTL_INTERVENE                      (1L<<0)
+#define BNX2_TPAT_FTQ_CTL_OVERFLOW                       (1L<<1)
+#define BNX2_TPAT_FTQ_CTL_FORCE_INTERVENE                (1L<<2)
+#define BNX2_TPAT_FTQ_CTL_MAX_DEPTH                      (0x3ffL<<12)
+#define BNX2_TPAT_FTQ_CTL_CUR_DEPTH                      (0x3ffL<<22)
+
+#define BNX2_TPAT_SCRATCH                               0x000a0000
+
+
+/*
+ *  rxp_reg definition
+ *  offset: 0xc0000
+ */
+#define BNX2_RXP_CPU_MODE                               0x000c5000
+#define BNX2_RXP_CPU_MODE_LOCAL_RST                      (1L<<0)
+#define BNX2_RXP_CPU_MODE_STEP_ENA                       (1L<<1)
+#define BNX2_RXP_CPU_MODE_PAGE_0_DATA_ENA                (1L<<2)
+#define BNX2_RXP_CPU_MODE_PAGE_0_INST_ENA                (1L<<3)
+#define BNX2_RXP_CPU_MODE_MSG_BIT1                       (1L<<6)
+#define BNX2_RXP_CPU_MODE_INTERRUPT_ENA                  (1L<<7)
+#define BNX2_RXP_CPU_MODE_SOFT_HALT                      (1L<<10)
+#define BNX2_RXP_CPU_MODE_BAD_DATA_HALT_ENA              (1L<<11)
+#define BNX2_RXP_CPU_MODE_BAD_INST_HALT_ENA              (1L<<12)
+#define BNX2_RXP_CPU_MODE_FIO_ABORT_HALT_ENA             (1L<<13)
+#define BNX2_RXP_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA        (1L<<15)
+
+#define BNX2_RXP_CPU_STATE                              0x000c5004
+#define BNX2_RXP_CPU_STATE_BREAKPOINT                    (1L<<0)
+#define BNX2_RXP_CPU_STATE_BAD_INST_HALTED               (1L<<2)
+#define BNX2_RXP_CPU_STATE_PAGE_0_DATA_HALTED            (1L<<3)
+#define BNX2_RXP_CPU_STATE_PAGE_0_INST_HALTED            (1L<<4)
+#define BNX2_RXP_CPU_STATE_BAD_DATA_ADDR_HALTED          (1L<<5)
+#define BNX2_RXP_CPU_STATE_BAD_pc_HALTED                 (1L<<6)
+#define BNX2_RXP_CPU_STATE_ALIGN_HALTED                  (1L<<7)
+#define BNX2_RXP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
+#define BNX2_RXP_CPU_STATE_SOFT_HALTED                   (1L<<10)
+#define BNX2_RXP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
+#define BNX2_RXP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_RXP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
+#define BNX2_RXP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
+#define BNX2_RXP_CPU_STATE_BLOCKED_READ                  (1L<<31)
+
+#define BNX2_RXP_CPU_EVENT_MASK                         0x000c5008
+#define BNX2_RXP_CPU_EVENT_MASK_BREAKPOINT_MASK          (1L<<0)
+#define BNX2_RXP_CPU_EVENT_MASK_BAD_INST_HALTED_MASK     (1L<<2)
+#define BNX2_RXP_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK  (1L<<3)
+#define BNX2_RXP_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK  (1L<<4)
+#define BNX2_RXP_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK        (1L<<5)
+#define BNX2_RXP_CPU_EVENT_MASK_BAD_PC_HALTED_MASK       (1L<<6)
+#define BNX2_RXP_CPU_EVENT_MASK_ALIGN_HALTED_MASK        (1L<<7)
+#define BNX2_RXP_CPU_EVENT_MASK_FIO_ABORT_MASK           (1L<<8)
+#define BNX2_RXP_CPU_EVENT_MASK_SOFT_HALTED_MASK         (1L<<10)
+#define BNX2_RXP_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK      (1L<<11)
+#define BNX2_RXP_CPU_EVENT_MASK_INTERRUPT_MASK           (1L<<12)
+
+#define BNX2_RXP_CPU_PROGRAM_COUNTER                    0x000c501c
+#define BNX2_RXP_CPU_INSTRUCTION                        0x000c5020
+#define BNX2_RXP_CPU_DATA_ACCESS                        0x000c5024
+#define BNX2_RXP_CPU_INTERRUPT_ENABLE                   0x000c5028
+#define BNX2_RXP_CPU_INTERRUPT_VECTOR                   0x000c502c
+#define BNX2_RXP_CPU_INTERRUPT_SAVED_PC                 0x000c5030
+#define BNX2_RXP_CPU_HW_BREAKPOINT                      0x000c5034
+#define BNX2_RXP_CPU_HW_BREAKPOINT_DISABLE               (1L<<0)
+#define BNX2_RXP_CPU_HW_BREAKPOINT_ADDRESS               (0x3fffffffL<<2)
+
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK                    0x000c5038
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_1_VALUE             (0x7ffL<<0)
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_1_PEEK_EN           (1L<<11)
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_1_SEL               (0xfL<<12)
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_2_VALUE             (0x7ffL<<16)
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_2_PEEK_EN           (1L<<27)
+#define BNX2_RXP_CPU_DEBUG_VECT_PEEK_2_SEL               (0xfL<<28)
+
+#define BNX2_RXP_CPU_LAST_BRANCH_ADDR                   0x000c5048
+#define BNX2_RXP_CPU_LAST_BRANCH_ADDR_TYPE               (1L<<1)
+#define BNX2_RXP_CPU_LAST_BRANCH_ADDR_TYPE_JUMP          (0L<<1)
+#define BNX2_RXP_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH        (1L<<1)
+#define BNX2_RXP_CPU_LAST_BRANCH_ADDR_LBA                (0x3fffffffL<<2)
+
+#define BNX2_RXP_CPU_REG_FILE                           0x000c5200
+#define BNX2_RXP_CFTQ_DATA                              0x000c5380
+#define BNX2_RXP_CFTQ_CMD                               0x000c53b8
+#define BNX2_RXP_CFTQ_CMD_OFFSET                         (0x3ffL<<0)
+#define BNX2_RXP_CFTQ_CMD_WR_TOP                         (1L<<10)
+#define BNX2_RXP_CFTQ_CMD_WR_TOP_0                       (0L<<10)
+#define BNX2_RXP_CFTQ_CMD_WR_TOP_1                       (1L<<10)
+#define BNX2_RXP_CFTQ_CMD_SFT_RESET                      (1L<<25)
+#define BNX2_RXP_CFTQ_CMD_RD_DATA                        (1L<<26)
+#define BNX2_RXP_CFTQ_CMD_ADD_INTERVEN                   (1L<<27)
+#define BNX2_RXP_CFTQ_CMD_ADD_DATA                       (1L<<28)
+#define BNX2_RXP_CFTQ_CMD_INTERVENE_CLR                  (1L<<29)
+#define BNX2_RXP_CFTQ_CMD_POP                            (1L<<30)
+#define BNX2_RXP_CFTQ_CMD_BUSY                           (1L<<31)
+
+#define BNX2_RXP_CFTQ_CTL                               0x000c53bc
+#define BNX2_RXP_CFTQ_CTL_INTERVENE                      (1L<<0)
+#define BNX2_RXP_CFTQ_CTL_OVERFLOW                       (1L<<1)
+#define BNX2_RXP_CFTQ_CTL_FORCE_INTERVENE                (1L<<2)
+#define BNX2_RXP_CFTQ_CTL_MAX_DEPTH                      (0x3ffL<<12)
+#define BNX2_RXP_CFTQ_CTL_CUR_DEPTH                      (0x3ffL<<22)
+
+#define BNX2_RXP_FTQ_DATA                               0x000c53c0
+#define BNX2_RXP_FTQ_CMD                                0x000c53f8
+#define BNX2_RXP_FTQ_CMD_OFFSET                          (0x3ffL<<0)
+#define BNX2_RXP_FTQ_CMD_WR_TOP                          (1L<<10)
+#define BNX2_RXP_FTQ_CMD_WR_TOP_0                        (0L<<10)
+#define BNX2_RXP_FTQ_CMD_WR_TOP_1                        (1L<<10)
+#define BNX2_RXP_FTQ_CMD_SFT_RESET                       (1L<<25)
+#define BNX2_RXP_FTQ_CMD_RD_DATA                         (1L<<26)
+#define BNX2_RXP_FTQ_CMD_ADD_INTERVEN                    (1L<<27)
+#define BNX2_RXP_FTQ_CMD_ADD_DATA                        (1L<<28)
+#define BNX2_RXP_FTQ_CMD_INTERVENE_CLR                   (1L<<29)
+#define BNX2_RXP_FTQ_CMD_POP                             (1L<<30)
+#define BNX2_RXP_FTQ_CMD_BUSY                            (1L<<31)
+
+#define BNX2_RXP_FTQ_CTL                                0x000c53fc
+#define BNX2_RXP_FTQ_CTL_INTERVENE                       (1L<<0)
+#define BNX2_RXP_FTQ_CTL_OVERFLOW                        (1L<<1)
+#define BNX2_RXP_FTQ_CTL_FORCE_INTERVENE                 (1L<<2)
+#define BNX2_RXP_FTQ_CTL_MAX_DEPTH                       (0x3ffL<<12)
+#define BNX2_RXP_FTQ_CTL_CUR_DEPTH                       (0x3ffL<<22)
+
+#define BNX2_RXP_SCRATCH                                0x000e0000
+
+
+/*
+ *  com_reg definition
+ *  offset: 0x100000
+ */
+#define BNX2_COM_CPU_MODE                               0x00105000
+#define BNX2_COM_CPU_MODE_LOCAL_RST                      (1L<<0)
+#define BNX2_COM_CPU_MODE_STEP_ENA                       (1L<<1)
+#define BNX2_COM_CPU_MODE_PAGE_0_DATA_ENA                (1L<<2)
+#define BNX2_COM_CPU_MODE_PAGE_0_INST_ENA                (1L<<3)
+#define BNX2_COM_CPU_MODE_MSG_BIT1                       (1L<<6)
+#define BNX2_COM_CPU_MODE_INTERRUPT_ENA                  (1L<<7)
+#define BNX2_COM_CPU_MODE_SOFT_HALT                      (1L<<10)
+#define BNX2_COM_CPU_MODE_BAD_DATA_HALT_ENA              (1L<<11)
+#define BNX2_COM_CPU_MODE_BAD_INST_HALT_ENA              (1L<<12)
+#define BNX2_COM_CPU_MODE_FIO_ABORT_HALT_ENA             (1L<<13)
+#define BNX2_COM_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA        (1L<<15)
+
+#define BNX2_COM_CPU_STATE                              0x00105004
+#define BNX2_COM_CPU_STATE_BREAKPOINT                    (1L<<0)
+#define BNX2_COM_CPU_STATE_BAD_INST_HALTED               (1L<<2)
+#define BNX2_COM_CPU_STATE_PAGE_0_DATA_HALTED            (1L<<3)
+#define BNX2_COM_CPU_STATE_PAGE_0_INST_HALTED            (1L<<4)
+#define BNX2_COM_CPU_STATE_BAD_DATA_ADDR_HALTED          (1L<<5)
+#define BNX2_COM_CPU_STATE_BAD_pc_HALTED                 (1L<<6)
+#define BNX2_COM_CPU_STATE_ALIGN_HALTED                  (1L<<7)
+#define BNX2_COM_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
+#define BNX2_COM_CPU_STATE_SOFT_HALTED                   (1L<<10)
+#define BNX2_COM_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
+#define BNX2_COM_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_COM_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
+#define BNX2_COM_CPU_STATE_INST_FETCH_STALL              (1L<<15)
+#define BNX2_COM_CPU_STATE_BLOCKED_READ                  (1L<<31)
+
+#define BNX2_COM_CPU_EVENT_MASK                         0x00105008
+#define BNX2_COM_CPU_EVENT_MASK_BREAKPOINT_MASK          (1L<<0)
+#define BNX2_COM_CPU_EVENT_MASK_BAD_INST_HALTED_MASK     (1L<<2)
+#define BNX2_COM_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK  (1L<<3)
+#define BNX2_COM_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK  (1L<<4)
+#define BNX2_COM_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK        (1L<<5)
+#define BNX2_COM_CPU_EVENT_MASK_BAD_PC_HALTED_MASK       (1L<<6)
+#define BNX2_COM_CPU_EVENT_MASK_ALIGN_HALTED_MASK        (1L<<7)
+#define BNX2_COM_CPU_EVENT_MASK_FIO_ABORT_MASK           (1L<<8)
+#define BNX2_COM_CPU_EVENT_MASK_SOFT_HALTED_MASK         (1L<<10)
+#define BNX2_COM_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK      (1L<<11)
+#define BNX2_COM_CPU_EVENT_MASK_INTERRUPT_MASK           (1L<<12)
+
+#define BNX2_COM_CPU_PROGRAM_COUNTER                    0x0010501c
+#define BNX2_COM_CPU_INSTRUCTION                        0x00105020
+#define BNX2_COM_CPU_DATA_ACCESS                        0x00105024
+#define BNX2_COM_CPU_INTERRUPT_ENABLE                   0x00105028
+#define BNX2_COM_CPU_INTERRUPT_VECTOR                   0x0010502c
+#define BNX2_COM_CPU_INTERRUPT_SAVED_PC                 0x00105030
+#define BNX2_COM_CPU_HW_BREAKPOINT                      0x00105034
+#define BNX2_COM_CPU_HW_BREAKPOINT_DISABLE               (1L<<0)
+#define BNX2_COM_CPU_HW_BREAKPOINT_ADDRESS               (0x3fffffffL<<2)
+
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK                    0x00105038
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_1_VALUE             (0x7ffL<<0)
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_1_PEEK_EN           (1L<<11)
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_1_SEL               (0xfL<<12)
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_2_VALUE             (0x7ffL<<16)
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_2_PEEK_EN           (1L<<27)
+#define BNX2_COM_CPU_DEBUG_VECT_PEEK_2_SEL               (0xfL<<28)
+
+#define BNX2_COM_CPU_LAST_BRANCH_ADDR                   0x00105048
+#define BNX2_COM_CPU_LAST_BRANCH_ADDR_TYPE               (1L<<1)
+#define BNX2_COM_CPU_LAST_BRANCH_ADDR_TYPE_JUMP          (0L<<1)
+#define BNX2_COM_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH        (1L<<1)
+#define BNX2_COM_CPU_LAST_BRANCH_ADDR_LBA                (0x3fffffffL<<2)
+
+#define BNX2_COM_CPU_REG_FILE                           0x00105200
+#define BNX2_COM_COMXQ_FTQ_DATA                         0x00105340
+#define BNX2_COM_COMXQ_FTQ_CMD                          0x00105378
+#define BNX2_COM_COMXQ_FTQ_CMD_OFFSET                    (0x3ffL<<0)
+#define BNX2_COM_COMXQ_FTQ_CMD_WR_TOP                    (1L<<10)
+#define BNX2_COM_COMXQ_FTQ_CMD_WR_TOP_0                  (0L<<10)
+#define BNX2_COM_COMXQ_FTQ_CMD_WR_TOP_1                  (1L<<10)
+#define BNX2_COM_COMXQ_FTQ_CMD_SFT_RESET                 (1L<<25)
+#define BNX2_COM_COMXQ_FTQ_CMD_RD_DATA                   (1L<<26)
+#define BNX2_COM_COMXQ_FTQ_CMD_ADD_INTERVEN              (1L<<27)
+#define BNX2_COM_COMXQ_FTQ_CMD_ADD_DATA                  (1L<<28)
+#define BNX2_COM_COMXQ_FTQ_CMD_INTERVENE_CLR             (1L<<29)
+#define BNX2_COM_COMXQ_FTQ_CMD_POP                       (1L<<30)
+#define BNX2_COM_COMXQ_FTQ_CMD_BUSY                      (1L<<31)
+
+#define BNX2_COM_COMXQ_FTQ_CTL                          0x0010537c
+#define BNX2_COM_COMXQ_FTQ_CTL_INTERVENE                 (1L<<0)
+#define BNX2_COM_COMXQ_FTQ_CTL_OVERFLOW                  (1L<<1)
+#define BNX2_COM_COMXQ_FTQ_CTL_FORCE_INTERVENE           (1L<<2)
+#define BNX2_COM_COMXQ_FTQ_CTL_MAX_DEPTH                 (0x3ffL<<12)
+#define BNX2_COM_COMXQ_FTQ_CTL_CUR_DEPTH                 (0x3ffL<<22)
+
+#define BNX2_COM_COMTQ_FTQ_DATA                         0x00105380
+#define BNX2_COM_COMTQ_FTQ_CMD                          0x001053b8
+#define BNX2_COM_COMTQ_FTQ_CMD_OFFSET                    (0x3ffL<<0)
+#define BNX2_COM_COMTQ_FTQ_CMD_WR_TOP                    (1L<<10)
+#define BNX2_COM_COMTQ_FTQ_CMD_WR_TOP_0                  (0L<<10)
+#define BNX2_COM_COMTQ_FTQ_CMD_WR_TOP_1                  (1L<<10)
+#define BNX2_COM_COMTQ_FTQ_CMD_SFT_RESET                 (1L<<25)
+#define BNX2_COM_COMTQ_FTQ_CMD_RD_DATA                   (1L<<26)
+#define BNX2_COM_COMTQ_FTQ_CMD_ADD_INTERVEN              (1L<<27)
+#define BNX2_COM_COMTQ_FTQ_CMD_ADD_DATA                  (1L<<28)
+#define BNX2_COM_COMTQ_FTQ_CMD_INTERVENE_CLR             (1L<<29)
+#define BNX2_COM_COMTQ_FTQ_CMD_POP                       (1L<<30)
+#define BNX2_COM_COMTQ_FTQ_CMD_BUSY                      (1L<<31)
+
+#define BNX2_COM_COMTQ_FTQ_CTL                          0x001053bc
+#define BNX2_COM_COMTQ_FTQ_CTL_INTERVENE                 (1L<<0)
+#define BNX2_COM_COMTQ_FTQ_CTL_OVERFLOW                  (1L<<1)
+#define BNX2_COM_COMTQ_FTQ_CTL_FORCE_INTERVENE           (1L<<2)
+#define BNX2_COM_COMTQ_FTQ_CTL_MAX_DEPTH                 (0x3ffL<<12)
+#define BNX2_COM_COMTQ_FTQ_CTL_CUR_DEPTH                 (0x3ffL<<22)
+
+#define BNX2_COM_COMQ_FTQ_DATA                          0x001053c0
+#define BNX2_COM_COMQ_FTQ_CMD                           0x001053f8
+#define BNX2_COM_COMQ_FTQ_CMD_OFFSET                     (0x3ffL<<0)
+#define BNX2_COM_COMQ_FTQ_CMD_WR_TOP                     (1L<<10)
+#define BNX2_COM_COMQ_FTQ_CMD_WR_TOP_0                   (0L<<10)
+#define BNX2_COM_COMQ_FTQ_CMD_WR_TOP_1                   (1L<<10)
+#define BNX2_COM_COMQ_FTQ_CMD_SFT_RESET                  (1L<<25)
+#define BNX2_COM_COMQ_FTQ_CMD_RD_DATA                    (1L<<26)
+#define BNX2_COM_COMQ_FTQ_CMD_ADD_INTERVEN               (1L<<27)
+#define BNX2_COM_COMQ_FTQ_CMD_ADD_DATA                   (1L<<28)
+#define BNX2_COM_COMQ_FTQ_CMD_INTERVENE_CLR              (1L<<29)
+#define BNX2_COM_COMQ_FTQ_CMD_POP                        (1L<<30)
+#define BNX2_COM_COMQ_FTQ_CMD_BUSY                       (1L<<31)
+
+#define BNX2_COM_COMQ_FTQ_CTL                           0x001053fc
+#define BNX2_COM_COMQ_FTQ_CTL_INTERVENE                  (1L<<0)
+#define BNX2_COM_COMQ_FTQ_CTL_OVERFLOW                   (1L<<1)
+#define BNX2_COM_COMQ_FTQ_CTL_FORCE_INTERVENE            (1L<<2)
+#define BNX2_COM_COMQ_FTQ_CTL_MAX_DEPTH                  (0x3ffL<<12)
+#define BNX2_COM_COMQ_FTQ_CTL_CUR_DEPTH                  (0x3ffL<<22)
+
+#define BNX2_COM_SCRATCH                                0x00120000
+
+
+/*
+ *  cp_reg definition
+ *  offset: 0x180000
+ */
+#define BNX2_CP_CPU_MODE                                0x00185000
+#define BNX2_CP_CPU_MODE_LOCAL_RST                       (1L<<0)
+#define BNX2_CP_CPU_MODE_STEP_ENA                        (1L<<1)
+#define BNX2_CP_CPU_MODE_PAGE_0_DATA_ENA                 (1L<<2)
+#define BNX2_CP_CPU_MODE_PAGE_0_INST_ENA                 (1L<<3)
+#define BNX2_CP_CPU_MODE_MSG_BIT1                        (1L<<6)
+#define BNX2_CP_CPU_MODE_INTERRUPT_ENA                   (1L<<7)
+#define BNX2_CP_CPU_MODE_SOFT_HALT                       (1L<<10)
+#define BNX2_CP_CPU_MODE_BAD_DATA_HALT_ENA               (1L<<11)
+#define BNX2_CP_CPU_MODE_BAD_INST_HALT_ENA               (1L<<12)
+#define BNX2_CP_CPU_MODE_FIO_ABORT_HALT_ENA              (1L<<13)
+#define BNX2_CP_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA         (1L<<15)
+
+#define BNX2_CP_CPU_STATE                               0x00185004
+#define BNX2_CP_CPU_STATE_BREAKPOINT                     (1L<<0)
+#define BNX2_CP_CPU_STATE_BAD_INST_HALTED                (1L<<2)
+#define BNX2_CP_CPU_STATE_PAGE_0_DATA_HALTED             (1L<<3)
+#define BNX2_CP_CPU_STATE_PAGE_0_INST_HALTED             (1L<<4)
+#define BNX2_CP_CPU_STATE_BAD_DATA_ADDR_HALTED           (1L<<5)
+#define BNX2_CP_CPU_STATE_BAD_pc_HALTED                  (1L<<6)
+#define BNX2_CP_CPU_STATE_ALIGN_HALTED                   (1L<<7)
+#define BNX2_CP_CPU_STATE_FIO_ABORT_HALTED               (1L<<8)
+#define BNX2_CP_CPU_STATE_SOFT_HALTED                    (1L<<10)
+#define BNX2_CP_CPU_STATE_SPAD_UNDERFLOW                 (1L<<11)
+#define BNX2_CP_CPU_STATE_INTERRRUPT                     (1L<<12)
+#define BNX2_CP_CPU_STATE_DATA_ACCESS_STALL              (1L<<14)
+#define BNX2_CP_CPU_STATE_INST_FETCH_STALL               (1L<<15)
+#define BNX2_CP_CPU_STATE_BLOCKED_READ                   (1L<<31)
+
+#define BNX2_CP_CPU_EVENT_MASK                          0x00185008
+#define BNX2_CP_CPU_EVENT_MASK_BREAKPOINT_MASK           (1L<<0)
+#define BNX2_CP_CPU_EVENT_MASK_BAD_INST_HALTED_MASK      (1L<<2)
+#define BNX2_CP_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK   (1L<<3)
+#define BNX2_CP_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK   (1L<<4)
+#define BNX2_CP_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK         (1L<<5)
+#define BNX2_CP_CPU_EVENT_MASK_BAD_PC_HALTED_MASK        (1L<<6)
+#define BNX2_CP_CPU_EVENT_MASK_ALIGN_HALTED_MASK         (1L<<7)
+#define BNX2_CP_CPU_EVENT_MASK_FIO_ABORT_MASK            (1L<<8)
+#define BNX2_CP_CPU_EVENT_MASK_SOFT_HALTED_MASK          (1L<<10)
+#define BNX2_CP_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK       (1L<<11)
+#define BNX2_CP_CPU_EVENT_MASK_INTERRUPT_MASK            (1L<<12)
+
+#define BNX2_CP_CPU_PROGRAM_COUNTER                     0x0018501c
+#define BNX2_CP_CPU_INSTRUCTION                         0x00185020
+#define BNX2_CP_CPU_DATA_ACCESS                         0x00185024
+#define BNX2_CP_CPU_INTERRUPT_ENABLE                    0x00185028
+#define BNX2_CP_CPU_INTERRUPT_VECTOR                    0x0018502c
+#define BNX2_CP_CPU_INTERRUPT_SAVED_PC                  0x00185030
+#define BNX2_CP_CPU_HW_BREAKPOINT                       0x00185034
+#define BNX2_CP_CPU_HW_BREAKPOINT_DISABLE                (1L<<0)
+#define BNX2_CP_CPU_HW_BREAKPOINT_ADDRESS                (0x3fffffffL<<2)
+
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK                     0x00185038
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_1_VALUE              (0x7ffL<<0)
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_1_PEEK_EN            (1L<<11)
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_1_SEL                (0xfL<<12)
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_2_VALUE              (0x7ffL<<16)
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_2_PEEK_EN            (1L<<27)
+#define BNX2_CP_CPU_DEBUG_VECT_PEEK_2_SEL                (0xfL<<28)
+
+#define BNX2_CP_CPU_LAST_BRANCH_ADDR                    0x00185048
+#define BNX2_CP_CPU_LAST_BRANCH_ADDR_TYPE                (1L<<1)
+#define BNX2_CP_CPU_LAST_BRANCH_ADDR_TYPE_JUMP           (0L<<1)
+#define BNX2_CP_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH         (1L<<1)
+#define BNX2_CP_CPU_LAST_BRANCH_ADDR_LBA                 (0x3fffffffL<<2)
+
+#define BNX2_CP_CPU_REG_FILE                            0x00185200
+#define BNX2_CP_CPQ_FTQ_DATA                            0x001853c0
+#define BNX2_CP_CPQ_FTQ_CMD                             0x001853f8
+#define BNX2_CP_CPQ_FTQ_CMD_OFFSET                       (0x3ffL<<0)
+#define BNX2_CP_CPQ_FTQ_CMD_WR_TOP                       (1L<<10)
+#define BNX2_CP_CPQ_FTQ_CMD_WR_TOP_0                     (0L<<10)
+#define BNX2_CP_CPQ_FTQ_CMD_WR_TOP_1                     (1L<<10)
+#define BNX2_CP_CPQ_FTQ_CMD_SFT_RESET                    (1L<<25)
+#define BNX2_CP_CPQ_FTQ_CMD_RD_DATA                      (1L<<26)
+#define BNX2_CP_CPQ_FTQ_CMD_ADD_INTERVEN                 (1L<<27)
+#define BNX2_CP_CPQ_FTQ_CMD_ADD_DATA                     (1L<<28)
+#define BNX2_CP_CPQ_FTQ_CMD_INTERVENE_CLR                (1L<<29)
+#define BNX2_CP_CPQ_FTQ_CMD_POP                          (1L<<30)
+#define BNX2_CP_CPQ_FTQ_CMD_BUSY                         (1L<<31)
+
+#define BNX2_CP_CPQ_FTQ_CTL                             0x001853fc
+#define BNX2_CP_CPQ_FTQ_CTL_INTERVENE                    (1L<<0)
+#define BNX2_CP_CPQ_FTQ_CTL_OVERFLOW                     (1L<<1)
+#define BNX2_CP_CPQ_FTQ_CTL_FORCE_INTERVENE              (1L<<2)
+#define BNX2_CP_CPQ_FTQ_CTL_MAX_DEPTH                    (0x3ffL<<12)
+#define BNX2_CP_CPQ_FTQ_CTL_CUR_DEPTH                    (0x3ffL<<22)
+
+#define BNX2_CP_SCRATCH                                 0x001a0000
+
+
+/*
+ *  mcp_reg definition
+ *  offset: 0x140000
+ */
+#define BNX2_MCP_CPU_MODE                               0x00145000
+#define BNX2_MCP_CPU_MODE_LOCAL_RST                      (1L<<0)
+#define BNX2_MCP_CPU_MODE_STEP_ENA                       (1L<<1)
+#define BNX2_MCP_CPU_MODE_PAGE_0_DATA_ENA                (1L<<2)
+#define BNX2_MCP_CPU_MODE_PAGE_0_INST_ENA                (1L<<3)
+#define BNX2_MCP_CPU_MODE_MSG_BIT1                       (1L<<6)
+#define BNX2_MCP_CPU_MODE_INTERRUPT_ENA                  (1L<<7)
+#define BNX2_MCP_CPU_MODE_SOFT_HALT                      (1L<<10)
+#define BNX2_MCP_CPU_MODE_BAD_DATA_HALT_ENA              (1L<<11)
+#define BNX2_MCP_CPU_MODE_BAD_INST_HALT_ENA              (1L<<12)
+#define BNX2_MCP_CPU_MODE_FIO_ABORT_HALT_ENA             (1L<<13)
+#define BNX2_MCP_CPU_MODE_SPAD_UNDERFLOW_HALT_ENA        (1L<<15)
+
+#define BNX2_MCP_CPU_STATE                              0x00145004
+#define BNX2_MCP_CPU_STATE_BREAKPOINT                    (1L<<0)
+#define BNX2_MCP_CPU_STATE_BAD_INST_HALTED               (1L<<2)
+#define BNX2_MCP_CPU_STATE_PAGE_0_DATA_HALTED            (1L<<3)
+#define BNX2_MCP_CPU_STATE_PAGE_0_INST_HALTED            (1L<<4)
+#define BNX2_MCP_CPU_STATE_BAD_DATA_ADDR_HALTED          (1L<<5)
+#define BNX2_MCP_CPU_STATE_BAD_pc_HALTED                 (1L<<6)
+#define BNX2_MCP_CPU_STATE_ALIGN_HALTED                  (1L<<7)
+#define BNX2_MCP_CPU_STATE_FIO_ABORT_HALTED              (1L<<8)
+#define BNX2_MCP_CPU_STATE_SOFT_HALTED                   (1L<<10)
+#define BNX2_MCP_CPU_STATE_SPAD_UNDERFLOW                (1L<<11)
+#define BNX2_MCP_CPU_STATE_INTERRRUPT                    (1L<<12)
+#define BNX2_MCP_CPU_STATE_DATA_ACCESS_STALL             (1L<<14)
+#define BNX2_MCP_CPU_STATE_INST_FETCH_STALL              (1L<<15)
+#define BNX2_MCP_CPU_STATE_BLOCKED_READ                  (1L<<31)
+
+#define BNX2_MCP_CPU_EVENT_MASK                         0x00145008
+#define BNX2_MCP_CPU_EVENT_MASK_BREAKPOINT_MASK          (1L<<0)
+#define BNX2_MCP_CPU_EVENT_MASK_BAD_INST_HALTED_MASK     (1L<<2)
+#define BNX2_MCP_CPU_EVENT_MASK_PAGE_0_DATA_HALTED_MASK  (1L<<3)
+#define BNX2_MCP_CPU_EVENT_MASK_PAGE_0_INST_HALTED_MASK  (1L<<4)
+#define BNX2_MCP_CPU_EVENT_MASK_BAD_DATA_ADDR_HALTED_MASK        (1L<<5)
+#define BNX2_MCP_CPU_EVENT_MASK_BAD_PC_HALTED_MASK       (1L<<6)
+#define BNX2_MCP_CPU_EVENT_MASK_ALIGN_HALTED_MASK        (1L<<7)
+#define BNX2_MCP_CPU_EVENT_MASK_FIO_ABORT_MASK           (1L<<8)
+#define BNX2_MCP_CPU_EVENT_MASK_SOFT_HALTED_MASK         (1L<<10)
+#define BNX2_MCP_CPU_EVENT_MASK_SPAD_UNDERFLOW_MASK      (1L<<11)
+#define BNX2_MCP_CPU_EVENT_MASK_INTERRUPT_MASK           (1L<<12)
+
+#define BNX2_MCP_CPU_PROGRAM_COUNTER                    0x0014501c
+#define BNX2_MCP_CPU_INSTRUCTION                        0x00145020
+#define BNX2_MCP_CPU_DATA_ACCESS                        0x00145024
+#define BNX2_MCP_CPU_INTERRUPT_ENABLE                   0x00145028
+#define BNX2_MCP_CPU_INTERRUPT_VECTOR                   0x0014502c
+#define BNX2_MCP_CPU_INTERRUPT_SAVED_PC                 0x00145030
+#define BNX2_MCP_CPU_HW_BREAKPOINT                      0x00145034
+#define BNX2_MCP_CPU_HW_BREAKPOINT_DISABLE               (1L<<0)
+#define BNX2_MCP_CPU_HW_BREAKPOINT_ADDRESS               (0x3fffffffL<<2)
+
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK                    0x00145038
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_1_VALUE             (0x7ffL<<0)
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_1_PEEK_EN           (1L<<11)
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_1_SEL               (0xfL<<12)
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_2_VALUE             (0x7ffL<<16)
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_2_PEEK_EN           (1L<<27)
+#define BNX2_MCP_CPU_DEBUG_VECT_PEEK_2_SEL               (0xfL<<28)
+
+#define BNX2_MCP_CPU_LAST_BRANCH_ADDR                   0x00145048
+#define BNX2_MCP_CPU_LAST_BRANCH_ADDR_TYPE               (1L<<1)
+#define BNX2_MCP_CPU_LAST_BRANCH_ADDR_TYPE_JUMP          (0L<<1)
+#define BNX2_MCP_CPU_LAST_BRANCH_ADDR_TYPE_BRANCH        (1L<<1)
+#define BNX2_MCP_CPU_LAST_BRANCH_ADDR_LBA                (0x3fffffffL<<2)
+
+#define BNX2_MCP_CPU_REG_FILE                           0x00145200
+#define BNX2_MCP_MCPQ_FTQ_DATA                          0x001453c0
+#define BNX2_MCP_MCPQ_FTQ_CMD                           0x001453f8
+#define BNX2_MCP_MCPQ_FTQ_CMD_OFFSET                     (0x3ffL<<0)
+#define BNX2_MCP_MCPQ_FTQ_CMD_WR_TOP                     (1L<<10)
+#define BNX2_MCP_MCPQ_FTQ_CMD_WR_TOP_0                   (0L<<10)
+#define BNX2_MCP_MCPQ_FTQ_CMD_WR_TOP_1                   (1L<<10)
+#define BNX2_MCP_MCPQ_FTQ_CMD_SFT_RESET                  (1L<<25)
+#define BNX2_MCP_MCPQ_FTQ_CMD_RD_DATA                    (1L<<26)
+#define BNX2_MCP_MCPQ_FTQ_CMD_ADD_INTERVEN               (1L<<27)
+#define BNX2_MCP_MCPQ_FTQ_CMD_ADD_DATA                   (1L<<28)
+#define BNX2_MCP_MCPQ_FTQ_CMD_INTERVENE_CLR              (1L<<29)
+#define BNX2_MCP_MCPQ_FTQ_CMD_POP                        (1L<<30)
+#define BNX2_MCP_MCPQ_FTQ_CMD_BUSY                       (1L<<31)
+
+#define BNX2_MCP_MCPQ_FTQ_CTL                           0x001453fc
+#define BNX2_MCP_MCPQ_FTQ_CTL_INTERVENE                  (1L<<0)
+#define BNX2_MCP_MCPQ_FTQ_CTL_OVERFLOW                   (1L<<1)
+#define BNX2_MCP_MCPQ_FTQ_CTL_FORCE_INTERVENE            (1L<<2)
+#define BNX2_MCP_MCPQ_FTQ_CTL_MAX_DEPTH                  (0x3ffL<<12)
+#define BNX2_MCP_MCPQ_FTQ_CTL_CUR_DEPTH                  (0x3ffL<<22)
+
+#define BNX2_MCP_ROM                                    0x00150000
+#define BNX2_MCP_SCRATCH                                0x00160000
+
+
+#define NUM_MC_HASH_REGISTERS   8
+
+
+/* PHY_ID1: bits 31-16; PHY_ID2: bits 15-0.  */
+#define PHY_BCM5706_PHY_ID                          0x00206160
+
+#define PHY_ID(id)                                  ((id) & 0xfffffff0)
+#define PHY_REV_ID(id)                              ((id) & 0xf)
+
+#define MIN_ETHERNET_PACKET_SIZE        60
+#define MAX_ETHERNET_PACKET_SIZE        1514
+#define MAX_ETHERNET_JUMBO_PACKET_SIZE  9014
+
+#define RX_COPY_THRESH                  92
+
+#define DMA_READ_CHANS  5
+#define DMA_WRITE_CHANS 3
+
+#define BCM_PAGE_BITS   12
+#define BCM_PAGE_SIZE   (1 << BCM_PAGE_BITS)
+
+#define TX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct tx_bd))
+#define MAX_TX_DESC_CNT (TX_DESC_CNT - 1)
+
+#define RX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct rx_bd))
+#define MAX_RX_DESC_CNT (RX_DESC_CNT - 1)
+
+#define NEXT_TX_BD(x) (((x) & (MAX_TX_DESC_CNT - 1)) ==                 \
+                (MAX_TX_DESC_CNT - 1)) ?                                \
+        (x) + 2 : (x) + 1
+
+#define TX_RING_IDX(x) ((x) & MAX_TX_DESC_CNT)
+
+#define NEXT_RX_BD(x) (((x) & (MAX_RX_DESC_CNT - 1)) ==                 \
+                (MAX_RX_DESC_CNT - 1)) ?                                \
+        (x) + 2 : (x) + 1
+
+#define RX_RING_IDX(x) ((x) & MAX_RX_DESC_CNT)
+
+
+/* Context size. */
+#define CTX_SHIFT                   7
+#define CTX_SIZE                    (1 << CTX_SHIFT)
+#define CTX_MASK                    (CTX_SIZE - 1)
+#define GET_CID_ADDR(_cid)          ((_cid) << CTX_SHIFT)
+#define GET_CID(_cid_addr)          ((_cid_addr) >> CTX_SHIFT)
+
+#define PHY_CTX_SHIFT               6
+#define PHY_CTX_SIZE                (1 << PHY_CTX_SHIFT)
+#define PHY_CTX_MASK                (PHY_CTX_SIZE - 1)
+#define GET_PCID_ADDR(_pcid)        ((_pcid) << PHY_CTX_SHIFT)
+#define GET_PCID(_pcid_addr)        ((_pcid_addr) >> PHY_CTX_SHIFT)
+
+#define MB_KERNEL_CTX_SHIFT         8
+#define MB_KERNEL_CTX_SIZE          (1 << MB_KERNEL_CTX_SHIFT)
+#define MB_KERNEL_CTX_MASK          (MB_KERNEL_CTX_SIZE - 1)
+#define MB_GET_CID_ADDR(_cid)       (0x10000 + ((_cid) << MB_KERNEL_CTX_SHIFT))
+
+#define MAX_CID_CNT                 0x4000
+#define MAX_CID_ADDR                (GET_CID_ADDR(MAX_CID_CNT))
+#define INVALID_CID_ADDR            0xffffffff
+
+#define TX_CID          16
+#define RX_CID          0
+
+#define MB_TX_CID_ADDR  MB_GET_CID_ADDR(TX_CID)
+#define MB_RX_CID_ADDR  MB_GET_CID_ADDR(RX_CID)
+
+struct sw_bd {
+        struct sk_buff          *skb;
+        DECLARE_PCI_UNMAP_ADDR(mapping)
+};
+
+/* Buffered flash (Atmel: AT45DB011B) specific information */
+#define SEEPROM_PAGE_BITS                       2
+#define SEEPROM_PHY_PAGE_SIZE                   (1 << SEEPROM_PAGE_BITS)
+#define SEEPROM_BYTE_ADDR_MASK                  (SEEPROM_PHY_PAGE_SIZE-1)
+#define SEEPROM_PAGE_SIZE                       4
+#define SEEPROM_TOTAL_SIZE                      65536
+
+#define BUFFERED_FLASH_PAGE_BITS                9
+#define BUFFERED_FLASH_PHY_PAGE_SIZE            (1 << BUFFERED_FLASH_PAGE_BITS)
+#define BUFFERED_FLASH_BYTE_ADDR_MASK           (BUFFERED_FLASH_PHY_PAGE_SIZE-1)
+#define BUFFERED_FLASH_PAGE_SIZE                264
+#define BUFFERED_FLASH_TOTAL_SIZE               131072
+
+#define SAIFUN_FLASH_PAGE_BITS                  8
+#define SAIFUN_FLASH_PHY_PAGE_SIZE              (1 << SAIFUN_FLASH_PAGE_BITS)
+#define SAIFUN_FLASH_BYTE_ADDR_MASK             (SAIFUN_FLASH_PHY_PAGE_SIZE-1)
+#define SAIFUN_FLASH_PAGE_SIZE                  256
+#define SAIFUN_FLASH_BASE_TOTAL_SIZE            65536
+
+#define NVRAM_TIMEOUT_COUNT                     30000
+
+
+#define FLASH_STRAP_MASK                        (BNX2_NVM_CFG1_FLASH_MODE   | \
+                                                 BNX2_NVM_CFG1_BUFFER_MODE  | \
+                                                 BNX2_NVM_CFG1_PROTECT_MODE | \
+                                                 BNX2_NVM_CFG1_FLASH_SIZE)
+
+struct flash_spec {
+        u32 strapping;
+        u32 config1;
+        u32 config2;
+        u32 config3;
+        u32 write1;
+        u32 buffered;
+        u32 page_bits;
+        u32 page_size;
+        u32 addr_mask;
+        u32 total_size;
+        u8  *name;
+};
+
+struct bnx2 {
+        /* Fields used in the tx and intr/napi performance paths are grouped */
+        /* together in the beginning of the structure. */
+        void __iomem            *regview;
+
+        struct net_device       *dev;
+        struct pci_dev          *pdev;
+
+        atomic_t                intr_sem;
+
+        struct status_block     *status_blk;
+        u32                     last_status_idx;
+
+        atomic_t                tx_avail_bd;
+        struct tx_bd            *tx_desc_ring;
+        struct sw_bd            *tx_buf_ring;
+        u32                     tx_prod_bseq;
+        u16                     tx_prod;
+        u16                     tx_cons;
+
+#ifdef BCM_VLAN 
+        struct                  vlan_group *vlgrp;
+#endif
+
+        u32                     rx_offset;
+        u32                     rx_buf_use_size;        /* useable size */
+        u32                     rx_buf_size;            /* with alignment */
+        struct rx_bd            *rx_desc_ring;
+        struct sw_bd            *rx_buf_ring;
+        u32                     rx_prod_bseq;
+        u16                     rx_prod;
+        u16                     rx_cons;
+
+        u32                     rx_csum;
+
+        /* Only used to synchronize netif_stop_queue/wake_queue when tx */
+        /* ring is full */
+        spinlock_t              tx_lock;
+
+        /* End of fileds used in the performance code paths. */
+
+        char                    *name;
+
+        int                     timer_interval;
+        struct                  timer_list timer;
+        struct work_struct      reset_task;
+
+        /* Used to synchronize phy accesses. */
+        spinlock_t              phy_lock;
+
+        u32                     flags;
+#define PCIX_FLAG                       1
+#define PCI_32BIT_FLAG                  2
+#define ONE_TDMA_FLAG                   4       /* no longer used */
+#define NO_WOL_FLAG                     8
+#define USING_DAC_FLAG                  0x10
+#define USING_MSI_FLAG                  0x20
+
+        u32                     phy_flags;
+#define PHY_SERDES_FLAG                 1
+#define PHY_CRC_FIX_FLAG                2
+#define PHY_PARALLEL_DETECT_FLAG        4
+#define PHY_INT_MODE_MASK_FLAG          0x300
+#define PHY_INT_MODE_AUTO_POLLING_FLAG  0x100
+#define PHY_INT_MODE_LINK_READY_FLAG    0x200
+
+        u32                     chip_id;
+        /* chip num:16-31, rev:12-15, metal:4-11, bond_id:0-3 */
+#define CHIP_NUM(bp)                    (((bp)->chip_id) & 0xffff0000)
+#define CHIP_NUM_5706                   0x57060000
+
+#define CHIP_REV(bp)                    (((bp)->chip_id) & 0x0000f000)
+#define CHIP_REV_Ax                     0x00000000
+#define CHIP_REV_Bx                     0x00001000
+#define CHIP_REV_Cx                     0x00002000
+    
+#define CHIP_METAL(bp)                  (((bp)->chip_id) & 0x00000ff0)
+#define CHIP_BONDING(bp)                (((bp)->chip_id) & 0x0000000f)
+
+#define CHIP_ID(bp)                     (((bp)->chip_id) & 0xfffffff0)
+#define CHIP_ID_5706_A0                 0x57060000
+#define CHIP_ID_5706_A1                 0x57060010
+
+#define CHIP_BOND_ID(bp)                (((bp)->chip_id) & 0xf)
+
+/* A serdes chip will have the first bit of the bond id set. */
+#define CHIP_BOND_ID_SERDES_BIT         0x01
+
+        u32                     phy_addr;
+        u32                     phy_id;
+        
+        u16                     bus_speed_mhz;
+        u8                      wol;
+
+        u8                      fw_timed_out;
+
+        u16                     fw_wr_seq;
+        u16                     fw_drv_pulse_wr_seq;
+
+        int                     tx_ring_size;
+        dma_addr_t              tx_desc_mapping;
+
+
+        int                     rx_ring_size;
+        dma_addr_t              rx_desc_mapping;
+
+        u16                     tx_quick_cons_trip;
+        u16                     tx_quick_cons_trip_int;
+        u16                     rx_quick_cons_trip;
+        u16                     rx_quick_cons_trip_int;
+        u16                     comp_prod_trip;
+        u16                     comp_prod_trip_int;
+        u16                     tx_ticks;
+        u16                     tx_ticks_int;
+        u16                     com_ticks;
+        u16                     com_ticks_int;
+        u16                     cmd_ticks;
+        u16                     cmd_ticks_int;
+        u16                     rx_ticks;
+        u16                     rx_ticks_int;
+
+        u32                     stats_ticks;
+
+        dma_addr_t              status_blk_mapping;
+
+        struct statistics_block *stats_blk;
+        dma_addr_t              stats_blk_mapping;
+
+        u32                     rx_mode;
+
+        u16                     req_line_speed;
+        u8                      req_duplex;
+
+        u8                      link_up;
+
+        u16                     line_speed;
+        u8                      duplex;
+        u8                      flow_ctrl;      /* actual flow ctrl settings */
+                                                /* may be different from     */
+                                                /* req_flow_ctrl if autoneg  */
+#define FLOW_CTRL_TX            1
+#define FLOW_CTRL_RX            2
+
+        u32                     advertising;
+
+        u8                      req_flow_ctrl;  /* flow ctrl advertisement */ 
+                                                /* settings or forced      */
+                                                /* settings                */
+        u8                      autoneg;
+#define AUTONEG_SPEED           1
+#define AUTONEG_FLOW_CTRL       2
+
+        u8                      loopback;
+#define MAC_LOOPBACK            1
+#define PHY_LOOPBACK            2
+
+        u8                      serdes_an_pending;
+#define SERDES_AN_TIMEOUT       (2 * HZ)
+
+        u8                      mac_addr[8];
+
+        u32                     fw_ver;
+
+        int                     pm_cap;
+        int                     pcix_cap;
+
+        struct net_device_stats net_stats;
+
+        struct flash_spec       *flash_info;
+};
+
+static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset);
+static void bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val);
+
+#define REG_RD(bp, offset)                                      \
+        readl(bp->regview + offset)
+
+#define REG_WR(bp, offset, val)                                 \
+        writel(val, bp->regview + offset)
+
+#define REG_WR16(bp, offset, val)                               \
+        writew(val, bp->regview + offset)
+
+#define REG_RD_IND(bp, offset)                                  \
+        bnx2_reg_rd_ind(bp, offset)
+
+#define REG_WR_IND(bp, offset, val)                             \
+        bnx2_reg_wr_ind(bp, offset, val)
+
+/* Indirect context access.  Unlike the MBQ_WR, these macros will not
+ * trigger a chip event. */
+static void bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val);
+
+#define CTX_WR(bp, cid_addr, offset, val)                       \
+        bnx2_ctx_wr(bp, cid_addr, offset, val)
+
+struct cpu_reg {
+        u32 mode;
+        u32 mode_value_halt;
+        u32 mode_value_sstep;
+
+        u32 state;
+        u32 state_value_clear;
+
+        u32 gpr0;
+        u32 evmask;
+        u32 pc;
+        u32 inst;
+        u32 bp;
+
+        u32 spad_base;
+
+        u32 mips_view_base;
+};
+
+struct fw_info {
+        u32 ver_major;
+        u32 ver_minor;
+        u32 ver_fix;
+
+        u32 start_addr;
+
+        /* Text section. */
+        u32 text_addr;
+        u32 text_len;
+        u32 text_index;
+        u32 *text;
+
+        /* Data section. */
+        u32 data_addr;
+        u32 data_len;
+        u32 data_index;
+        u32 *data;
+
+        /* SBSS section. */
+        u32 sbss_addr;
+        u32 sbss_len;
+        u32 sbss_index;
+        u32 *sbss;
+
+        /* BSS section. */
+        u32 bss_addr;
+        u32 bss_len;
+        u32 bss_index;
+        u32 *bss;
+
+        /* Read-only section. */
+        u32 rodata_addr;
+        u32 rodata_len;
+        u32 rodata_index;
+        u32 *rodata;
+};
+
+#define RV2P_PROC1                              0
+#define RV2P_PROC2                              1
+
+
+/* This value (in milliseconds) determines the frequency of the driver
+ * issuing the PULSE message code.  The firmware monitors this periodic
+ * pulse to determine when to switch to an OS-absent mode. */
+#define DRV_PULSE_PERIOD_MS                 250
+
+/* This value (in milliseconds) determines how long the driver should
+ * wait for an acknowledgement from the firmware before timing out.  Once
+ * the firmware has timed out, the driver will assume there is no firmware
+ * running and there won't be any firmware-driver synchronization during a
+ * driver reset. */
+#define FW_ACK_TIME_OUT_MS                  50
+
+
+#define BNX2_DRV_RESET_SIGNATURE                0x00000000
+#define BNX2_DRV_RESET_SIGNATURE_MAGIC           0x4841564b /* HAVK */
+//#define DRV_RESET_SIGNATURE_MAGIC              0x47495352 /* RSIG */
+
+#define BNX2_DRV_MB                             0x00000004
+#define BNX2_DRV_MSG_CODE                        0xff000000
+#define BNX2_DRV_MSG_CODE_RESET                  0x01000000
+#define BNX2_DRV_MSG_CODE_UNLOAD                 0x02000000
+#define BNX2_DRV_MSG_CODE_SHUTDOWN               0x03000000
+#define BNX2_DRV_MSG_CODE_SUSPEND_WOL            0x04000000
+#define BNX2_DRV_MSG_CODE_FW_TIMEOUT             0x05000000
+#define BNX2_DRV_MSG_CODE_PULSE                  0x06000000
+#define BNX2_DRV_MSG_CODE_DIAG                   0x07000000
+#define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL         0x09000000
+
+#define BNX2_DRV_MSG_DATA                        0x00ff0000
+#define BNX2_DRV_MSG_DATA_WAIT0                  0x00010000
+#define BNX2_DRV_MSG_DATA_WAIT1                  0x00020000
+#define BNX2_DRV_MSG_DATA_WAIT2                  0x00030000
+#define BNX2_DRV_MSG_DATA_WAIT3                  0x00040000
+        
+#define BNX2_DRV_MSG_SEQ                         0x0000ffff
+
+#define BNX2_FW_MB                              0x00000008
+#define BNX2_FW_MSG_ACK                          0x0000ffff
+#define BNX2_FW_MSG_STATUS_MASK                  0x00ff0000
+#define BNX2_FW_MSG_STATUS_OK                    0x00000000
+#define BNX2_FW_MSG_STATUS_FAILURE               0x00ff0000
+
+#define BNX2_LINK_STATUS                        0x0000000c
+
+#define BNX2_DRV_PULSE_MB                       0x00000010
+#define BNX2_DRV_PULSE_SEQ_MASK                  0x0000ffff
+
+/* Indicate to the firmware not to go into the
+ * OS absent when it is not getting driver pulse.
+ * This is used for debugging. */
+#define BNX2_DRV_MSG_DATA_PULSE_CODE_ALWAYS_ALIVE        0x00010000
+
+#define BNX2_DEV_INFO_SIGNATURE                 0x00000020
+#define BNX2_DEV_INFO_SIGNATURE_MAGIC            0x44564900
+#define BNX2_DEV_INFO_SIGNATURE_MAGIC_MASK       0xffffff00
+#define BNX2_DEV_INFO_FEATURE_CFG_VALID          0x01
+#define BNX2_DEV_INFO_SECONDARY_PORT             0x80
+#define BNX2_DEV_INFO_DRV_ALWAYS_ALIVE           0x40
+
+#define BNX2_SHARED_HW_CFG_PART_NUM             0x00000024
+
+#define BNX2_SHARED_HW_CFG_POWER_DISSIPATED     0x00000034
+#define BNX2_SHARED_HW_CFG_POWER_STATE_D3_MASK   0xff000000
+#define BNX2_SHARED_HW_CFG_POWER_STATE_D2_MASK   0xff0000
+#define BNX2_SHARED_HW_CFG_POWER_STATE_D1_MASK   0xff00
+#define BNX2_SHARED_HW_CFG_POWER_STATE_D0_MASK   0xff
+
+#define BNX2_SHARED_HW_CFG POWER_CONSUMED       0x00000038
+#define BNX2_SHARED_HW_CFG_CONFIG               0x0000003c
+#define BNX2_SHARED_HW_CFG_DESIGN_NIC            0
+#define BNX2_SHARED_HW_CFG_DESIGN_LOM            0x1
+#define BNX2_SHARED_HW_CFG_PHY_COPPER            0
+#define BNX2_SHARED_HW_CFG_PHY_FIBER             0x2
+#define BNX2_SHARED_HW_CFG_LED_MODE_SHIFT_BITS   8
+#define BNX2_SHARED_HW_CFG_LED_MODE_MASK         0x300
+#define BNX2_SHARED_HW_CFG_LED_MODE_MAC          0
+#define BNX2_SHARED_HW_CFG_LED_MODE_GPHY1        0x100
+#define BNX2_SHARED_HW_CFG_LED_MODE_GPHY2        0x200
+
+#define BNX2_DEV_INFO_BC_REV                    0x0000004c
+
+#define BNX2_PORT_HW_CFG_MAC_UPPER              0x00000050
+#define BNX2_PORT_HW_CFG_UPPERMAC_MASK           0xffff
+
+#define BNX2_PORT_HW_CFG_MAC_LOWER              0x00000054
+#define BNX2_PORT_HW_CFG_CONFIG                 0x00000058
+
+#define BNX2_PORT_HW_CFG_IMD_MAC_A_UPPER        0x00000068
+#define BNX2_PORT_HW_CFG_IMD_MAC_A_LOWER        0x0000006c
+#define BNX2_PORT_HW_CFG_IMD_MAC_B_UPPER        0x00000070
+#define BNX2_PORT_HW_CFG_IMD_MAC_B_LOWER        0x00000074
+#define BNX2_PORT_HW_CFG_ISCSI_MAC_UPPER        0x00000078
+#define BNX2_PORT_HW_CFG_ISCSI_MAC_LOWER        0x0000007c
+
+#define BNX2_DEV_INFO_PER_PORT_HW_CONFIG2       0x000000b4
+
+#define BNX2_DEV_INFO_FORMAT_REV                0x000000c4
+#define BNX2_DEV_INFO_FORMAT_REV_MASK            0xff000000
+#define BNX2_DEV_INFO_FORMAT_REV_ID              ('A' << 24)
+
+#define BNX2_SHARED_FEATURE                     0x000000c8
+#define BNX2_SHARED_FEATURE_MASK                 0xffffffff
+
+#define BNX2_PORT_FEATURE                       0x000000d8
+#define BNX2_PORT2_FEATURE                      0x00000014c
+#define BNX2_PORT_FEATURE_WOL_ENABLED            0x01000000
+#define BNX2_PORT_FEATURE_MBA_ENABLED            0x02000000
+#define BNX2_PORT_FEATURE_ASF_ENABLED            0x04000000
+#define BNX2_PORT_FEATURE_IMD_ENABLED            0x08000000
+#define BNX2_PORT_FEATURE_BAR1_SIZE_MASK         0xf
+#define BNX2_PORT_FEATURE_BAR1_SIZE_DISABLED     0x0
+#define BNX2_PORT_FEATURE_BAR1_SIZE_64K          0x1
+#define BNX2_PORT_FEATURE_BAR1_SIZE_128K         0x2
+#define BNX2_PORT_FEATURE_BAR1_SIZE_256K         0x3
+#define BNX2_PORT_FEATURE_BAR1_SIZE_512K         0x4
+#define BNX2_PORT_FEATURE_BAR1_SIZE_1M           0x5
+#define BNX2_PORT_FEATURE_BAR1_SIZE_2M           0x6
+#define BNX2_PORT_FEATURE_BAR1_SIZE_4M           0x7
+#define BNX2_PORT_FEATURE_BAR1_SIZE_8M           0x8
+#define BNX2_PORT_FEATURE_BAR1_SIZE_16M          0x9
+#define BNX2_PORT_FEATURE_BAR1_SIZE_32M          0xa
+#define BNX2_PORT_FEATURE_BAR1_SIZE_64M          0xb
+#define BNX2_PORT_FEATURE_BAR1_SIZE_128M         0xc
+#define BNX2_PORT_FEATURE_BAR1_SIZE_256M         0xd
+#define BNX2_PORT_FEATURE_BAR1_SIZE_512M         0xe
+#define BNX2_PORT_FEATURE_BAR1_SIZE_1G           0xf
+
+#define BNX2_PORT_FEATURE_WOL                   0xdc
+#define BNX2_PORT2_FEATURE_WOL                  0x150
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_SHIFT_BITS         4
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_MASK       0x30
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_DISABLE    0
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_MAGIC      0x10
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_ACPI       0x20
+#define BNX2_PORT_FEATURE_WOL_DEFAULT_MAGIC_AND_ACPI     0x30
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_MASK    0xf
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_AUTONEG         0
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_10HALF  1
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_10FULL  2
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_100HALF 3
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_100FULL 4
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_1000HALF        5
+#define BNX2_PORT_FEATURE_WOL_LINK_SPEED_1000FULL        6
+#define BNX2_PORT_FEATURE_WOL_AUTONEG_ADVERTISE_1000     0x40
+#define BNX2_PORT_FEATURE_WOL_RESERVED_PAUSE_CAP 0x400
+#define BNX2_PORT_FEATURE_WOL_RESERVED_ASYM_PAUSE_CAP    0x800
+
+#define BNX2_PORT_FEATURE_MBA                   0xe0
+#define BNX2_PORT2_FEATURE_MBA                  0x154
+#define BNX2_PORT_FEATURE_MBA_BOOT_AGENT_TYPE_SHIFT_BITS         0
+#define BNX2_PORT_FEATURE_MBA_BOOT_AGENT_TYPE_MASK       0x3
+#define BNX2_PORT_FEATURE_MBA_BOOT_AGENT_TYPE_PXE        0
+#define BNX2_PORT_FEATURE_MBA_BOOT_AGENT_TYPE_RPL        1
+#define BNX2_PORT_FEATURE_MBA_BOOT_AGENT_TYPE_BOOTP      2
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_SHIFT_BITS      2
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_MASK    0x3c
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_AUTONEG         0
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_10HALF  0x4
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_10FULL  0x8
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_100HALF         0xc
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_100FULL         0x10
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_1000HALF        0x14
+#define BNX2_PORT_FEATURE_MBA_LINK_SPEED_1000FULL        0x18
+#define BNX2_PORT_FEATURE_MBA_SETUP_PROMPT_ENABLE        0x40
+#define BNX2_PORT_FEATURE_MBA_HOTKEY_CTRL_S      0
+#define BNX2_PORT_FEATURE_MBA_HOTKEY_CTRL_B      0x80
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_SHIFT_BITS    8
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_MASK  0xff00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_DISABLED      0
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_1K    0x100
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_2K    0x200
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_4K    0x300
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_8K    0x400
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_16K   0x500
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_32K   0x600
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_64K   0x700
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_128K  0x800
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_256K  0x900
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_512K  0xa00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_1M    0xb00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_2M    0xc00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_4M    0xd00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_8M    0xe00
+#define BNX2_PORT_FEATURE_MBA_EXP_ROM_SIZE_16M   0xf00
+#define BNX2_PORT_FEATURE_MBA_MSG_TIMEOUT_SHIFT_BITS     16
+#define BNX2_PORT_FEATURE_MBA_MSG_TIMEOUT_MASK   0xf0000
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_SHIFT_BITS  20
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_MASK        0x300000
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_AUTO        0
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_BBS         0x100000
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_INT18H      0x200000
+#define BNX2_PORT_FEATURE_MBA_BIOS_BOOTSTRAP_INT19H      0x300000
+
+#define BNX2_PORT_FEATURE_IMD                   0xe4
+#define BNX2_PORT2_FEATURE_IMD                  0x158
+#define BNX2_PORT_FEATURE_IMD_LINK_OVERRIDE_DEFAULT      0
+#define BNX2_PORT_FEATURE_IMD_LINK_OVERRIDE_ENABLE       1
+
+#define BNX2_PORT_FEATURE_VLAN                  0xe8
+#define BNX2_PORT2_FEATURE_VLAN                 0x15c
+#define BNX2_PORT_FEATURE_MBA_VLAN_TAG_MASK      0xffff
+#define BNX2_PORT_FEATURE_MBA_VLAN_ENABLE        0x10000
+
+#define BNX2_BC_STATE_RESET_TYPE                0x000001c0
+#define BNX2_BC_STATE_RESET_TYPE_SIG             0x00005254
+#define BNX2_BC_STATE_RESET_TYPE_SIG_MASK        0x0000ffff
+#define BNX2_BC_STATE_RESET_TYPE_NONE    (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                          0x00010000)
+#define BNX2_BC_STATE_RESET_TYPE_PCI     (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                          0x00020000)
+#define BNX2_BC_STATE_RESET_TYPE_VAUX    (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                          0x00030000)
+#define BNX2_BC_STATE_RESET_TYPE_DRV_MASK        DRV_MSG_CODE         
+#define BNX2_BC_STATE_RESET_TYPE_DRV_RESET (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                            DRV_MSG_CODE_RESET)
+#define BNX2_BC_STATE_RESET_TYPE_DRV_UNLOAD (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                             DRV_MSG_CODE_UNLOAD)
+#define BNX2_BC_STATE_RESET_TYPE_DRV_SHUTDOWN (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                               DRV_MSG_CODE_SHUTDOWN)
+#define BNX2_BC_STATE_RESET_TYPE_DRV_WOL (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                          DRV_MSG_CODE_WOL)
+#define BNX2_BC_STATE_RESET_TYPE_DRV_DIAG (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                           DRV_MSG_CODE_DIAG)
+#define BNX2_BC_STATE_RESET_TYPE_VALUE(msg) (BNX2_BC_STATE_RESET_TYPE_SIG | \
+                                             (msg))
+
+#define BNX2_BC_STATE                           0x000001c4
+#define BNX2_BC_STATE_ERR_MASK                   0x0000ff00
+#define BNX2_BC_STATE_SIGN                       0x42530000
+#define BNX2_BC_STATE_SIGN_MASK                  0xffff0000
+#define BNX2_BC_STATE_BC1_START                  (BNX2_BC_STATE_SIGN | 0x1)
+#define BNX2_BC_STATE_GET_NVM_CFG1               (BNX2_BC_STATE_SIGN | 0x2)
+#define BNX2_BC_STATE_PROG_BAR                   (BNX2_BC_STATE_SIGN | 0x3)
+#define BNX2_BC_STATE_INIT_VID                   (BNX2_BC_STATE_SIGN | 0x4)
+#define BNX2_BC_STATE_GET_NVM_CFG2               (BNX2_BC_STATE_SIGN | 0x5)
+#define BNX2_BC_STATE_APPLY_WKARND               (BNX2_BC_STATE_SIGN | 0x6)
+#define BNX2_BC_STATE_LOAD_BC2                   (BNX2_BC_STATE_SIGN | 0x7)
+#define BNX2_BC_STATE_GOING_BC2                  (BNX2_BC_STATE_SIGN | 0x8)
+#define BNX2_BC_STATE_GOING_DIAG                 (BNX2_BC_STATE_SIGN | 0x9)
+#define BNX2_BC_STATE_RT_FINAL_INIT              (BNX2_BC_STATE_SIGN | 0x81)
+#define BNX2_BC_STATE_RT_WKARND                  (BNX2_BC_STATE_SIGN | 0x82)
+#define BNX2_BC_STATE_RT_DRV_PULSE               (BNX2_BC_STATE_SIGN | 0x83)
+#define BNX2_BC_STATE_RT_FIOEVTS                 (BNX2_BC_STATE_SIGN | 0x84)
+#define BNX2_BC_STATE_RT_DRV_CMD                 (BNX2_BC_STATE_SIGN | 0x85)
+#define BNX2_BC_STATE_RT_LOW_POWER               (BNX2_BC_STATE_SIGN | 0x86)
+#define BNX2_BC_STATE_RT_SET_WOL                 (BNX2_BC_STATE_SIGN | 0x87)
+#define BNX2_BC_STATE_RT_OTHER_FW                (BNX2_BC_STATE_SIGN | 0x88)
+#define BNX2_BC_STATE_RT_GOING_D3                (BNX2_BC_STATE_SIGN | 0x89)
+#define BNX2_BC_STATE_ERR_BAD_VERSION            (BNX2_BC_STATE_SIGN | 0x0100)
+#define BNX2_BC_STATE_ERR_BAD_BC2_CRC            (BNX2_BC_STATE_SIGN | 0x0200)
+#define BNX2_BC_STATE_ERR_BC1_LOOP               (BNX2_BC_STATE_SIGN | 0x0300)
+#define BNX2_BC_STATE_ERR_UNKNOWN_CMD            (BNX2_BC_STATE_SIGN | 0x0400)
+#define BNX2_BC_STATE_ERR_DRV_DEAD               (BNX2_BC_STATE_SIGN | 0x0500)
+#define BNX2_BC_STATE_ERR_NO_RXP                 (BNX2_BC_STATE_SIGN | 0x0600)
+#define BNX2_BC_STATE_ERR_TOO_MANY_RBUF          (BNX2_BC_STATE_SIGN | 0x0700)
+        
+#define BNX2_BC_STATE_DEBUG_CMD                 0x1dc
+#define BNX2_BC_STATE_BC_DBG_CMD_SIGNATURE       0x42440000
+#define BNX2_BC_STATE_BC_DBG_CMD_SIGNATURE_MASK  0xffff0000
+#define BNX2_BC_STATE_BC_DBG_CMD_LOOP_CNT_MASK   0xffff
+#define BNX2_BC_STATE_BC_DBG_CMD_LOOP_INFINITE   0xffff
+
+#define HOST_VIEW_SHMEM_BASE                    0x167c00
+
+#endif
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h
new file mode 100644
index 000000000000..35f3a2ae5ef1
--- /dev/null
+++ b/drivers/net/bnx2_fw.h
@@ -0,0 +1,2468 @@
+/* bnx2_fw.h: Broadcom NX2 network driver.
+ *
+ * Copyright (c) 2004, 2005 Broadcom Corporation
+ *
+ * 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, except as noted below.
+ *
+ * This file contains firmware data derived from proprietary unpublished
+ * source code, Copyright (c) 2004, 2005 Broadcom Corporation.
+ *
+ * Permission is hereby granted for the distribution of this firmware data
+ * in hexadecimal or equivalent format, provided this copyright notice is
+ * accompanying it.
+ */
+
+
+static int bnx2_COM_b06FwReleaseMajor = 0x0;
+static int bnx2_COM_b06FwReleaseMinor = 0x0;
+static int bnx2_COM_b06FwReleaseFix = 0x0;
+static u32 bnx2_COM_b06FwStartAddr = 0x080004a0;
+static u32 bnx2_COM_b06FwTextAddr = 0x08000000;
+static int bnx2_COM_b06FwTextLen = 0x4594;
+static u32 bnx2_COM_b06FwDataAddr = 0x080045e0;
+static int bnx2_COM_b06FwDataLen = 0x0;
+static u32 bnx2_COM_b06FwRodataAddr = 0x08004598;
+static int bnx2_COM_b06FwRodataLen = 0x18;
+static u32 bnx2_COM_b06FwBssAddr = 0x08004600;
+static int bnx2_COM_b06FwBssLen = 0x88;
+static u32 bnx2_COM_b06FwSbssAddr = 0x080045e0;
+static int bnx2_COM_b06FwSbssLen = 0x1c;
+static u32 bnx2_COM_b06FwText[(0x4594/4) + 1] = {
+        0x0a000128, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x302e362e,
+        0x39000000, 0x00060902, 0x00000000, 0x00000003, 0x00000014, 0x00000032,
+        0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000010, 0x000003e8, 0x0000ea60, 0x00000001, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x0000ffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d,
+        0x0000000d, 0x3c020800, 0x244245e0, 0x3c030800, 0x24634688, 0xac400000,
+        0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021,
+        0x3c100800, 0x261004a0, 0x3c1c0800, 0x279c45e0, 0x0e0001f2, 0x00000000,
+        0x0000000d, 0x27bdffe8, 0x3c1a8000, 0x3c020008, 0x0342d825, 0x3c036010,
+        0xafbf0010, 0x8c655000, 0x3c020800, 0x24470ac8, 0x3c040800, 0x24864600,
+        0x2402ff7f, 0x00a22824, 0x34a5380c, 0xac655000, 0x00002821, 0x24020037,
+        0x24030c80, 0xaf420008, 0xaf430024, 0xacc70000, 0x24a50001, 0x2ca20016,
+        0x1440fffc, 0x24c60004, 0x24844600, 0x3c020800, 0x24420ad4, 0x3c030800,
+        0x246309d4, 0xac820004, 0x3c020800, 0x24420618, 0x3c050800, 0x24a50ca0,
+        0xac82000c, 0x3c020800, 0x24423100, 0xac830008, 0x3c030800, 0x246325c8,
+        0xac820014, 0x3c020800, 0x24422b0c, 0xac830018, 0xac83001c, 0x3c030800,
+        0x24630adc, 0xac820024, 0x3c020800, 0x24423040, 0xac83002c, 0x3c030800,
+        0x24633060, 0xac820030, 0x3c020800, 0x24422f6c, 0xac830034, 0x3c030800,
+        0x24632c60, 0xac82003c, 0x3c020800, 0x24420b6c, 0xac850010, 0xac850020,
+        0xac830040, 0x0e000bd6, 0xac820050, 0x8fbf0010, 0x03e00008, 0x27bd0018,
+        0x27bdffe0, 0xafb00010, 0x27500100, 0xafbf0018, 0xafb10014, 0x9203000b,
+        0x24020003, 0x1462005b, 0x96110008, 0x32220001, 0x10400009, 0x27430080,
+        0x8e020000, 0x96040014, 0x000211c2, 0x00021040, 0x00621821, 0xa4640000,
+        0x0a0001cb, 0x3c020800, 0x3c020800, 0x8c430020, 0x1060002a, 0x3c030800,
+        0x0e001006, 0x00000000, 0x97420108, 0x8f850018, 0x9743010c, 0x3042003e,
+        0x00021400, 0x00621825, 0xaca30000, 0x8f840018, 0x8f420100, 0xac820004,
+        0x97430116, 0x9742010e, 0x8f840018, 0x00031c00, 0x00431025, 0xac820008,
+        0x97430110, 0x97440112, 0x8f850018, 0x00031c00, 0x00832025, 0xaca4000c,
+        0x97420114, 0x8f840018, 0x3042ffff, 0xac820010, 0x8f830018, 0xac600014,
+        0x8f820018, 0x3c030800, 0xac400018, 0x9462466e, 0x8f840018, 0x3c032000,
+        0x00431025, 0xac82001c, 0x0e001044, 0x24040001, 0x3c030800, 0x8c620040,
+        0x24420001, 0xac620040, 0x3c020800, 0x8c430044, 0x32240004, 0x24630001,
+        0x10800017, 0xac430044, 0x8f4202b8, 0x04430007, 0x8e020020, 0x3c040800,
+        0x8c830060, 0x24020001, 0x24630001, 0x0a0001ed, 0xac830060, 0x3c060800,
+        0x8cc4005c, 0xaf420280, 0x96030016, 0x00001021, 0xa7430284, 0x8e050004,
+        0x24840001, 0x3c031000, 0xaf450288, 0xaf4302b8, 0x0a0001ed, 0xacc4005c,
+        0x32220002, 0x0a0001ed, 0x0002102b, 0x3c026000, 0xac400808, 0x0000000d,
+        0x00001021, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
+        0x27bdffc8, 0xafbf0034, 0xafbe0030, 0xafb7002c, 0xafb60028, 0xafb50024,
+        0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014, 0x0e00013f, 0xafb00010,
+        0x24110020, 0x24150030, 0x2794000c, 0x27930008, 0x3c124000, 0x3c1e0800,
+        0x3c170800, 0x3c160800, 0x8f820004, 0x3c040800, 0x8c830020, 0x10430004,
+        0x00000000, 0xaf830004, 0x0e00110b, 0x00000000, 0x8f500000, 0x32020007,
+        0x1040fff5, 0x32020001, 0x1040002b, 0x32020002, 0x8f420100, 0xaf420020,
+        0x8f430104, 0xaf4300a8, 0x9342010b, 0x93630000, 0x306300ff, 0x10710005,
+        0x304400ff, 0x10750006, 0x2c820016, 0x0a000227, 0x00000000, 0xaf940000,
+        0x0a000228, 0x2c820016, 0xaf930000, 0x0a000228, 0x00000000, 0xaf800000,
+        0x14400005, 0x00041880, 0x0e0002b2, 0x00000000, 0x0a000234, 0x00000000,
+        0x3c020800, 0x24424600, 0x00621821, 0x8c620000, 0x0040f809, 0x00000000,
+        0x10400005, 0x8fc20034, 0x8f420104, 0x3c016020, 0xac220014, 0x8fc20034,
+        0xaf520138, 0x24420001, 0xafc20034, 0x32020002, 0x10400019, 0x32020004,
+        0x8f420140, 0xaf420020, 0x93630000, 0x306300ff, 0x10710005, 0x00000000,
+        0x10750006, 0x00000000, 0x0a000250, 0x00000000, 0xaf940000, 0x0a000251,
+        0x00000000, 0xaf930000, 0x0a000251, 0x00000000, 0xaf800000, 0x0e0008b9,
+        0x00000000, 0x8ee20038, 0xaf520178, 0x24420001, 0xaee20038, 0x32020004,
+        0x1040ffad, 0x00000000, 0x8f420180, 0xaf420020, 0x93630000, 0x306300ff,
+        0x10710005, 0x00000000, 0x10750006, 0x00000000, 0x0a00026a, 0x00000000,
+        0xaf940000, 0x0a00026b, 0x00000000, 0xaf930000, 0x0a00026b, 0x00000000,
+        0xaf800000, 0x93620000, 0x14510004, 0x8ec2003c, 0x0e000835, 0x00000000,
+        0x8ec2003c, 0xaf5201b8, 0x24420001, 0x0a000206, 0xaec2003c, 0x27bdffe8,
+        0xafbf0010, 0x97420108, 0x24033000, 0x30447000, 0x10830012, 0x28823001,
+        0x10400007, 0x24024000, 0x1080000b, 0x24022000, 0x1082001a, 0x24020001,
+        0x0a000299, 0x00000000, 0x1082000c, 0x24025000, 0x1082000e, 0x00000000,
+        0x0a000299, 0x00000000, 0x0000000d, 0x0a00029b, 0x00001021, 0x0e000300,
+        0x00000000, 0x0a00029b, 0x00001021, 0x0e00048f, 0x00000000, 0x0a00029b,
+        0x00001021, 0x0e000fdf, 0x00000000, 0x0a00029b, 0x00001021, 0x0000000d,
+        0x00001021, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x93620000, 0x24030020,
+        0x304400ff, 0x10830005, 0x24020030, 0x10820007, 0x00000000, 0x0a0002af,
+        0x00000000, 0x2782000c, 0xaf820000, 0x03e00008, 0x00000000, 0x27820008,
+        0xaf820000, 0x03e00008, 0x00000000, 0xaf800000, 0x03e00008, 0x00000000,
+        0x0000000d, 0x03e00008, 0x00001021, 0x03e00008, 0x00001021, 0x27440100,
+        0x94830008, 0x30620004, 0x10400017, 0x30620002, 0x8f4202b8, 0x04430007,
+        0x8c820020, 0x3c040800, 0x8c830060, 0x24020001, 0x24630001, 0x03e00008,
+        0xac830060, 0xaf420280, 0x94830016, 0x3c060800, 0xa7430284, 0x8c850004,
+        0x8cc4005c, 0x00001021, 0x3c031000, 0x24840001, 0xaf450288, 0xaf4302b8,
+        0x03e00008, 0xacc4005c, 0x14400003, 0x3c040800, 0x03e00008, 0x00001021,
+        0x8c830084, 0x24020001, 0x24630001, 0x03e00008, 0xac830084, 0x27450100,
+        0x3c040800, 0x8c820088, 0x94a3000c, 0x24420001, 0x007a1821, 0xac820088,
+        0x8ca40018, 0x90664000, 0xaf440038, 0x8ca2001c, 0x2403fff8, 0x00063600,
+        0x00431024, 0x34420004, 0x3c030005, 0xaf42003c, 0xaf430030, 0x00000000,
+        0x00000000, 0x00000000, 0xaf460404, 0x00000000, 0x00000000, 0x00000000,
+        0x3c020006, 0x34420001, 0xaf420030, 0x00000000, 0x00000000, 0x00000000,
+        0x8f420000, 0x30420010, 0x1040fffd, 0x00001021, 0x03e00008, 0x00000000,
+        0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x1060001e,
+        0xafbf0014, 0x0e001006, 0x00000000, 0x8f830018, 0x8e020018, 0xac620000,
+        0x8f840018, 0x9602000c, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018,
+        0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f840018,
+        0x3c026000, 0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e,
+        0x8f850018, 0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c,
+        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffc8, 0xafb3001c,
+        0x00009821, 0xafb7002c, 0x0000b821, 0xafbe0030, 0x0000f021, 0xafb50024,
+        0x27550100, 0xafbf0034, 0xafb60028, 0xafb40020, 0xafb20018, 0xafb10014,
+        0xafb00010, 0x96a20008, 0x8f540100, 0x8eb20018, 0x30420001, 0x10400037,
+        0x02a0b021, 0x8f630054, 0x2642ffff, 0x00431023, 0x18400006, 0x00000000,
+        0x0000000d, 0x00000000, 0x24000128, 0x0a000372, 0x00002021, 0x8f62004c,
+        0x02421023, 0x18400028, 0x00002021, 0x93650120, 0x93640121, 0x3c030800,
+        0x8c62008c, 0x308400ff, 0x24420001, 0x30a500ff, 0x00803821, 0x1485000b,
+        0xac62008c, 0x3c040800, 0x8c830090, 0x24630001, 0xac830090, 0x93620122,
+        0x30420001, 0x00021023, 0x30420005, 0x0a000372, 0x34440004, 0x27660100,
+        0x00041080, 0x00c21021, 0x8c430000, 0x02431823, 0x04600004, 0x24820001,
+        0x30440007, 0x1485fff9, 0x00041080, 0x10870007, 0x3c030800, 0xa3640121,
+        0x8c620094, 0x24040005, 0x24420001, 0x0a000372, 0xac620094, 0x24040004,
+        0x00809821, 0x9362003f, 0x304400ff, 0x38830016, 0x2c630001, 0x38820010,
+        0x2c420001, 0x00621825, 0x1460000c, 0x24020001, 0x38830008, 0x2c630001,
+        0x38820014, 0x2c420001, 0x00621825, 0x14600005, 0x24020001, 0x24020012,
+        0x14820002, 0x00001021, 0x24020001, 0x50400007, 0x8eb10020, 0x8ea20020,
+        0x8f630040, 0x00408821, 0x00431023, 0x5c400001, 0x8f710040, 0x9343010b,
+        0x24020004, 0x54620005, 0x36730080, 0x96a20008, 0x36730002, 0x24170001,
+        0x305e0020, 0x2402fffb, 0x02628024, 0x1200002a, 0x3c030800, 0x8c620030,
+        0x02021024, 0x10400026, 0x3c020800, 0x8c430020, 0x10600024, 0x32620004,
+        0x0e001006, 0x00000000, 0x8f830018, 0x8f420100, 0xac620000, 0x8f840018,
+        0x02201821, 0x32620002, 0xac900004, 0x8f840018, 0x50400001, 0x8ec30014,
+        0xac830008, 0x8f830018, 0x8ec20020, 0xac62000c, 0x8f840018, 0x8f620040,
+        0xac820010, 0x8f830018, 0x8ec20018, 0xac620014, 0x8f840018, 0x3c026000,
+        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c024010,
+        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x32620004, 0x10400076,
+        0x00003821, 0x3c029000, 0x34420001, 0x3c038000, 0x02821025, 0xa360007c,
+        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,
+        0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c,
+        0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff,
+        0x93620023, 0x3042007f, 0xa3620023, 0xaf720064, 0x3c023fff, 0x0a0003f1,
+        0x3442ffff, 0x8f62005c, 0x02421023, 0x04400011, 0x00000000, 0x8f65005c,
+        0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf720064, 0x00a32823,
+        0x00852821, 0x0045102b, 0x10400004, 0x02451021, 0x3c053fff, 0x34a5ffff,
+        0x02451021, 0xaf62005c, 0x24070001, 0xaf72004c, 0x8f620054, 0x16420005,
+        0x00000000, 0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a,
+        0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800,
+        0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021,
+        0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074,
+        0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001,
+        0x02821025, 0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,
+        0x00000000, 0x0e000f2a, 0x00000000, 0x00403821, 0x10e00017, 0x3c029000,
+        0x34420001, 0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02821025,
+        0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
+        0x3c031000, 0xaf5401c0, 0xa34201c4, 0xaf4301f8, 0x8ea30014, 0x8f620040,
+        0x14430003, 0x00431023, 0x0a000443, 0x00001021, 0x28420001, 0x10400034,
+        0x00000000, 0x8f620040, 0xaf630040, 0x9362003e, 0x30420001, 0x1440000b,
+        0x3c029000, 0x93620022, 0x24420001, 0xa3620022, 0x93630022, 0x3c020800,
+        0x8c440098, 0x0064182b, 0x1460001e, 0x3c020800, 0x3c029000, 0x34420001,
+        0x02821025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x3c038000, 0x9362007d, 0x34630001, 0x3c048000, 0x02831825,
+        0x34420001, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd,
+        0x24020002, 0x3c031000, 0xaf5401c0, 0xa34201c4, 0x24020001, 0xaf4301f8,
+        0xa7620012, 0x0a000476, 0xa3600022, 0x9743007a, 0x9444002a, 0x00641821,
+        0x3063fffe, 0xa7630012, 0x0e000b68, 0x00000000, 0x12e00003, 0x00000000,
+        0x0e000f27, 0x00000000, 0x53c00004, 0x96a20008, 0x0e000c10, 0x00000000,
+        0x96a20008, 0x8fbf0034, 0x8fbe0030, 0x8fb7002c, 0x8fb60028, 0x8fb50024,
+        0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042,
+        0x30420001, 0x03e00008, 0x27bd0038, 0x27bdffe8, 0xafbf0010, 0x97420108,
+        0x2403000b, 0x304400ff, 0x1083004e, 0x2882000c, 0x10400011, 0x24020006,
+        0x1082003e, 0x28820007, 0x10400007, 0x28820008, 0x1080002b, 0x24020001,
+        0x1082002e, 0x3c026000, 0x0a000504, 0x00000000, 0x14400061, 0x2882000a,
+        0x1440002b, 0x00000000, 0x0a0004ec, 0x00000000, 0x2402001c, 0x1082004e,
+        0x2882001d, 0x1040000e, 0x24020019, 0x10820041, 0x2882001a, 0x10400005,
+        0x2402000e, 0x10820036, 0x00000000, 0x0a000504, 0x00000000, 0x2402001b,
+        0x1082003c, 0x00000000, 0x0a000504, 0x00000000, 0x240200c1, 0x10820040,
+        0x288200c2, 0x10400005, 0x24020080, 0x1082001f, 0x00000000, 0x0a000504,
+        0x00000000, 0x240200c2, 0x1082003b, 0x00000000, 0x0a000504, 0x00000000,
+        0x3c026000, 0x0e000c7d, 0xac400808, 0x0a000506, 0x8fbf0010, 0x8c444448,
+        0x3c030800, 0xac640064, 0x0e000c7d, 0x00000000, 0x3c026000, 0x8c444448,
+        0x3c030800, 0x0a000505, 0xac640068, 0x8f440100, 0x0e000508, 0x00000000,
+        0x3c026000, 0x8c444448, 0x3c030800, 0x0a000505, 0xac64006c, 0x0e000cab,
+        0x00000000, 0x0a000506, 0x8fbf0010, 0x8f440100, 0x0e000cd5, 0x00000000,
+        0x0a000506, 0x8fbf0010, 0x0e000d1c, 0x00000000, 0x0a000506, 0x8fbf0010,
+        0x0000000d, 0x0a000506, 0x8fbf0010, 0x0e0005d7, 0x00000000, 0x0a000506,
+        0x8fbf0010, 0x8f440100, 0x0e000d7e, 0x00000000, 0x0a000506, 0x8fbf0010,
+        0x0e000e95, 0x00000000, 0x0a000506, 0x8fbf0010, 0x0e000626, 0x00000000,
+        0x0a000506, 0x8fbf0010, 0x0e000b68, 0x00000000, 0x0a000506, 0x8fbf0010,
+        0x0000000d, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0x3c029000,
+        0x34420001, 0xafb00010, 0x00808021, 0x02021025, 0x3c038000, 0xafbf0014,
+        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005,
+        0x34420001, 0xa3620005, 0x8f63004c, 0x8f620054, 0x10620019, 0x3c028000,
+        0x9762006a, 0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081,
+        0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,
+        0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021,
+        0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000,
+        0x34420001, 0x02021025, 0x0e000c7d, 0xaf420020, 0x3c029000, 0x34420001,
+        0x3c038000, 0x02021025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02021025, 0xa363007d,
+        0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x8fbf0014, 0xaf5001c0,
+        0x8fb00010, 0x24020002, 0x3c031000, 0xa34201c4, 0xaf4301f8, 0x03e00008,
+        0x27bd0018, 0x27bdffd8, 0xafbf0020, 0xafb3001c, 0xafb20018, 0xafb10014,
+        0xafb00010, 0x93630005, 0x00809021, 0x24020030, 0x30630030, 0x14620072,
+        0x00a09821, 0x3c020800, 0x8c430020, 0x1060006c, 0x00000000, 0x0e001006,
+        0x00000000, 0x8f820018, 0xac520000, 0x9363003e, 0x9362003f, 0x8f840018,
+        0x00031a00, 0x00431025, 0xac820004, 0x93630081, 0x93620082, 0x8f850018,
+        0x00031e00, 0x00021400, 0x00621825, 0xaca30008, 0x8f840018, 0x8f620040,
+        0xac82000c, 0x8f830018, 0x8f620048, 0xac620010, 0x8f840018, 0x8f62004c,
+        0x3c110800, 0xac820014, 0x8f830018, 0x8f620050, 0x26304660, 0x00002021,
+        0xac620018, 0x9602000e, 0x8f850018, 0x3c03c00b, 0x00431025, 0x0e001044,
+        0xaca2001c, 0x8f830018, 0x8f620054, 0xac620000, 0x8f840018, 0x8f620058,
+        0xac820004, 0x8f830018, 0x8f62005c, 0xac620008, 0x8f840018, 0x8f620060,
+        0xac82000c, 0x8f850018, 0x8f620064, 0xaca20010, 0x97630068, 0x9762006a,
+        0x8f840018, 0x00031c00, 0x00431025, 0xac820014, 0x8f830018, 0x00002021,
+        0xac600018, 0x9602000e, 0x8f850018, 0x3c03c00c, 0x00431025, 0x0e001044,
+        0xaca2001c, 0x8f840018, 0x8f630018, 0xac830000, 0x936200c4, 0x30420002,
+        0x10400006, 0x00000000, 0x976200c8, 0x8f830018, 0x3042ffff, 0x0a0005b5,
+        0xac620004, 0x8f820018, 0xac400004, 0x8f830018, 0x8f62006c, 0xac620008,
+        0x8f840018, 0x8f6200dc, 0xac82000c, 0x8f830018, 0xac600010, 0x93620005,
+        0x8f830018, 0x00021600, 0x00531025, 0xac620014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x26224660, 0xaca30018, 0x9443000e, 0x8f850018,
+        0x3c02400d, 0x00621825, 0x0e001044, 0xaca3001c, 0x0e000d48, 0x02402021,
+        0x8fbf0020, 0x8fb3001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
+        0x27bd0028, 0x27bdffe0, 0xafb00010, 0x27500100, 0xafbf0018, 0xafb10014,
+        0x9603000c, 0x240200c1, 0x5462001d, 0x8e040000, 0x3c029000, 0x8f440100,
+        0x34420001, 0x3c038000, 0x00821025, 0xaf420020, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d, 0x34630001, 0x3c058000,
+        0x00831825, 0x34420004, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00451024,
+        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0, 0xa34201c4, 0xaf4301f8,
+        0x0a000622, 0x8fbf0018, 0x8f65004c, 0x24060001, 0x0e000db5, 0x2407049f,
+        0x3c020800, 0x8c430020, 0x9611000c, 0x1060001d, 0x8e100000, 0x0e001006,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x00111400, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f840018, 0x240204a2, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448,
+        0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019,
+        0x00621825, 0x0e001044, 0xaca3001c, 0x8fbf0018, 0x8fb10014, 0x8fb00010,
+        0x03e00008, 0x27bd0020, 0x27bdffb0, 0xafb1002c, 0x27510100, 0xafbf004c,
+        0xafbe0048, 0xafb70044, 0xafb60040, 0xafb5003c, 0xafb40038, 0xafb30034,
+        0xafb20030, 0xafb00028, 0x8e350000, 0x9634000c, 0x3c026000, 0x8c434448,
+        0x0000f021, 0xaf630170, 0x8f620040, 0x8e230014, 0x0000b821, 0x00431023,
+        0x044001ec, 0x0000b021, 0x32820010, 0x1040002e, 0x3c026000, 0x9363003f,
+        0x9222000e, 0x10430006, 0x2402000c, 0x9223000f, 0x10620003, 0x24020014,
+        0x14620025, 0x3c026000, 0x32820004, 0x10400007, 0x241e0001, 0x8f620050,
+        0x24420001, 0xaf620050, 0x8f630054, 0x24630001, 0xaf630054, 0x32830102,
+        0x24020002, 0x5462000d, 0x9222000f, 0x8f620040, 0x24420001, 0xaf620040,
+        0x8f630048, 0x8f620040, 0x24630001, 0x54620005, 0x9222000f, 0x8f620048,
+        0x24420001, 0xaf620048, 0x9222000f, 0xa362003f, 0x9223000f, 0x24020012,
+        0x14620007, 0x3c026000, 0x3c030800, 0x8c620074, 0x24420001, 0x0e000f6e,
+        0xac620074, 0x3c026000, 0x8c434448, 0x32820040, 0xaf630174, 0x32830020,
+        0xafa30010, 0x32830080, 0xafa30014, 0x32830001, 0xafa3001c, 0x32830008,
+        0xafa30020, 0x32830100, 0x104000bb, 0xafa30018, 0x8e260010, 0x8f630054,
+        0x24c2ffff, 0x00431023, 0x18400006, 0x00000000, 0x0000000d, 0x00000000,
+        0x24000128, 0x0a0006b2, 0x00009021, 0x8f62004c, 0x00c21023, 0x18400028,
+        0x00009021, 0x93650120, 0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff,
+        0x24420001, 0x30a500ff, 0x00804021, 0x1485000b, 0xac62008c, 0x3c040800,
+        0x8c830090, 0x24630001, 0xac830090, 0x93620122, 0x30420001, 0x00021023,
+        0x30420005, 0x0a0006b2, 0x34520004, 0x27670100, 0x00041080, 0x00e21021,
+        0x8c430000, 0x00c31823, 0x04600004, 0x24820001, 0x30440007, 0x1485fff9,
+        0x00041080, 0x10880007, 0x3c030800, 0xa3640121, 0x8c620094, 0x24120005,
+        0x24420001, 0x0a0006b2, 0xac620094, 0x24120004, 0x32420001, 0x10400020,
+        0x3c020800, 0x8c430020, 0x8e300000, 0x1060001c, 0x8e330010, 0x0e001006,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac530014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024010, 0x00621825,
+        0x0e001044, 0xaca3001c, 0x32420004, 0x10400060, 0x00003821, 0x3c029000,
+        0x8e260010, 0x34420001, 0x3c038000, 0x02a21025, 0xa360007c, 0xaf420020,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023, 0x30420080,
+        0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c, 0x8f620064,
+        0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff, 0x93620023,
+        0x3042007f, 0xa3620023, 0xaf660064, 0x3c023fff, 0x0a000702, 0x3442ffff,
+        0x8f62005c, 0x00c21023, 0x04400011, 0x00000000, 0x8f65005c, 0x8f630064,
+        0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf660064, 0x00a32823, 0x00852821,
+        0x0045102b, 0x10400004, 0x00c51021, 0x3c053fff, 0x34a5ffff, 0x00c51021,
+        0xaf62005c, 0x24070001, 0xaf66004c, 0x8f620054, 0x14c20005, 0x00000000,
+        0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a, 0x00022880,
+        0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c,
+        0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800,
+        0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074, 0x2403fffe,
+        0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001, 0x02a21025,
+        0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620005, 0x00e0b021,
+        0x0e000f2a, 0x00000000, 0x00403821, 0x00e0b021, 0x8fa20010, 0x10400008,
+        0x00000000, 0x8e220018, 0xaf620018, 0x8e23001c, 0xaf63001c, 0x8e220020,
+        0x24160001, 0xaf620058, 0x13c00036, 0x32820004, 0x10400035, 0x8fa30014,
+        0x93620023, 0x30420040, 0x10400031, 0x3c020800, 0x8c430020, 0x1060001c,
+        0x8e300000, 0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x8f830018,
+        0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018,
+        0xac400010, 0x8f830018, 0x24020587, 0xac620014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
+        0x3c024019, 0x00621825, 0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001,
+        0x02a21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x24020001, 0xaf62000c, 0x93630023, 0x3c028000, 0x34420001, 0x02a21025,
+        0x306300bf, 0xa3630023, 0xaf420020, 0x8fa30014, 0x10600012, 0x8fa3001c,
+        0x9362007c, 0x24420001, 0xa362007c, 0x9363007e, 0x9362007a, 0x1462000b,
+        0x8fa3001c, 0x9362007c, 0x3c030800, 0x8c640024, 0x0044102b, 0x14400005,
+        0x8fa3001c, 0x0e000f2a, 0x00000000, 0x02c2b025, 0x8fa3001c, 0x3062ffff,
+        0x10400003, 0x32820200, 0x0a000793, 0x24170004, 0x10400003, 0x00000000,
+        0x24170040, 0x24160001, 0x13c0005d, 0x32820002, 0x1040005c, 0x8fa20020,
+        0x9222000a, 0x30420020, 0x10400033, 0x3c100800, 0x93620023, 0x30420040,
+        0x1040002f, 0x8e020020, 0x1040001e, 0x3c029000, 0x0e001006, 0x00000000,
+        0x8f820018, 0xac550000, 0x8f840018, 0x3c02008d, 0xac820004, 0x8f830018,
+        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f840018,
+        0x240205bf, 0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019, 0x00621825,
+        0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001, 0x02a21025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,
+        0x3c028000, 0x34420001, 0x02a21025, 0x306300bf, 0xa3630023, 0xaf420020,
+        0x8e020020, 0x10400023, 0x8fa20020, 0x0e001006, 0x00000000, 0x8f840018,
+        0x8e230000, 0xac830000, 0x9222000a, 0x8f830018, 0x00021600, 0xac620004,
+        0x8f840018, 0x8f620040, 0xac820008, 0x8f850018, 0x8f63004c, 0xaca3000c,
+        0x9362003f, 0x8f840018, 0x304200ff, 0xac820010, 0x8f830018, 0x3c026000,
+        0xac600014, 0x8f850018, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,
+        0x9443466e, 0x8f850018, 0x3c02401a, 0x00621825, 0x0e001044, 0xaca3001c,
+        0x8fa20020, 0x1040000e, 0x8fa20018, 0x9222000a, 0xa3620082, 0x56e00005,
+        0x36f70008, 0x8fa30018, 0x10600004, 0x00000000, 0x36f70008, 0x0a000801,
+        0x24160001, 0x0e000de1, 0x02a02021, 0x8fa20018, 0x10400003, 0x00000000,
+        0x36f70010, 0x24160001, 0x12c00019, 0x3c029000, 0x34420001, 0x02a21025,
+        0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
+        0x3c038000, 0x9362007d, 0x34630001, 0x3c048000, 0x02a31825, 0x02e21025,
+        0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
+        0x3c031000, 0xaf5501c0, 0xa34201c4, 0xaf4301f8, 0x9363003f, 0x24020012,
+        0x14620004, 0x3c026000, 0x0e000f6e, 0x00000000, 0x3c026000, 0x8c434448,
+        0xaf630178, 0x8fbf004c, 0x8fbe0048, 0x8fb70044, 0x8fb60040, 0x8fb5003c,
+        0x8fb40038, 0x8fb30034, 0x8fb20030, 0x8fb1002c, 0x8fb00028, 0x03e00008,
+        0x27bd0050, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f500180, 0x97420184,
+        0x30420200, 0x14400015, 0x00000000, 0x8f430188, 0x3c02ff00, 0x00621824,
+        0x3c020200, 0x10620031, 0x0043102b, 0x14400007, 0x3c020300, 0x1060000b,
+        0x3c020100, 0x1062000d, 0x00000000, 0x0a0008b4, 0x00000000, 0x10620027,
+        0x3c020400, 0x1062003e, 0x02002021, 0x0a0008b4, 0x00000000, 0x0e000e1e,
+        0x02002021, 0x0a0008b6, 0x8fbf0014, 0x93620005, 0x30420020, 0x1440005e,
+        0x8fbf0014, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c038000,
+        0x34630001, 0x02031825, 0x34420020, 0xa3620005, 0xaf430020, 0x93620005,
+        0x30420020, 0x14400003, 0x02002021, 0x0000000d, 0x02002021, 0x0e000553,
+        0x24055854, 0x0a0008b6, 0x8fbf0014, 0x93620005, 0x30420001, 0x1040003f,
+        0x3c029000, 0x34420001, 0x02021025, 0xaf420020, 0x3c038000, 0x8f420020,
+        0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c048000, 0x3c030800,
+        0x304200fe, 0xa3620005, 0x8c620020, 0x34840001, 0x02042025, 0xaf440020,
+        0x1040002d, 0x8fbf0014, 0x0a000894, 0x00000000, 0x00002821, 0x00003021,
+        0x0e000f78, 0x240706a4, 0x3c020800, 0x8c430020, 0x10600023, 0x8fbf0014,
+        0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x93630082, 0x9362003f,
+        0x8f840018, 0x00031a00, 0x00431025, 0xac820004, 0x8f830018, 0xac600008,
+        0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018, 0xac400014,
+        0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018,
+        0x9443466e, 0x8f850018, 0x3c02400a, 0x00621825, 0x0e001044, 0xaca3001c,
+        0x0a0008b6, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010, 0x03e00008,
+        0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93420148, 0x2444ffff, 0x2c830005,
+        0x10600047, 0x3c020800, 0x24424598, 0x00041880, 0x00621821, 0x8c640000,
+        0x00800008, 0x00000000, 0x8f430144, 0x8f62000c, 0x14620006, 0x24020001,
+        0xaf62000c, 0x0e000909, 0x00000000, 0x0a000907, 0x8fbf0010, 0x8f62000c,
+        0x0a000900, 0x00000000, 0x97630010, 0x8f420144, 0x14430006, 0x24020001,
+        0xa7620010, 0x0e000eeb, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620010,
+        0x0a000900, 0x00000000, 0x97630012, 0x8f420144, 0x14430006, 0x24020001,
+        0xa7620012, 0x0e000f06, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620012,
+        0x0a000900, 0x00000000, 0x97630014, 0x8f420144, 0x14430006, 0x24020001,
+        0xa7620014, 0x0e000f21, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620014,
+        0x0a000900, 0x00000000, 0x97630016, 0x8f420144, 0x14430006, 0x24020001,
+        0xa7620016, 0x0e000f24, 0x00000000, 0x0a000907, 0x8fbf0010, 0x97620016,
+        0x14400006, 0x8fbf0010, 0x3c030800, 0x8c620070, 0x24420001, 0xac620070,
+        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x93620081,
+        0x3c030800, 0x8c640048, 0x0044102b, 0x14400028, 0x3c029000, 0x8f460140,
+        0x34420001, 0x3c038000, 0x00c21025, 0xaf420020, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x3c048000, 0x34840001, 0x3c059000, 0x34a50001, 0x3c078000,
+        0x24020012, 0x24030080, 0x00c42025, 0x00c52825, 0xa362003f, 0xa3630082,
+        0xaf440020, 0xaf450020, 0x8f420020, 0x00471024, 0x1440fffd, 0x3c038000,
+        0x9362007d, 0x34630001, 0x3c048000, 0x00c31825, 0x34420020, 0xa362007d,
+        0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0x0a00096d, 0xaf4601c0, 0x93620081, 0x24420001, 0x0e000f2a, 0xa3620081,
+        0x9763006a, 0x00032880, 0x14a00002, 0x00403821, 0x24050001, 0x97630068,
+        0x93640081, 0x3c020800, 0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b,
+        0x54400001, 0x00a03021, 0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001,
+        0x00c02021, 0x8f420074, 0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c,
+        0x10e0001a, 0x3c029000, 0x8f440140, 0x34420001, 0x3c038000, 0x00821025,
+        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000,
+        0x9362007d, 0x34630001, 0x3c058000, 0x00831825, 0x34420004, 0xa362007d,
+        0xaf430020, 0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0xaf4401c0, 0xa34201c4, 0xaf4301f8, 0x8fbf0010, 0x03e00008, 0x27bd0018,
+        0x27bdffd8, 0xafb3001c, 0x27530100, 0xafbf0024, 0xafb40020, 0xafb20018,
+        0xafb10014, 0xafb00010, 0x96620008, 0x3c140800, 0x8f520100, 0x30420001,
+        0x104000cf, 0x00000000, 0x8e700018, 0x8f630054, 0x2602ffff, 0x00431023,
+        0x18400006, 0x00000000, 0x0000000d, 0x00000000, 0x24000128, 0x0a0009b6,
+        0x00008821, 0x8f62004c, 0x02021023, 0x18400028, 0x00008821, 0x93650120,
+        0x93640121, 0x3c030800, 0x8c62008c, 0x308400ff, 0x24420001, 0x30a500ff,
+        0x00803821, 0x1485000b, 0xac62008c, 0x3c040800, 0x8c830090, 0x24630001,
+        0xac830090, 0x93620122, 0x30420001, 0x00021023, 0x30420005, 0x0a0009b6,
+        0x34510004, 0x27660100, 0x00041080, 0x00c21021, 0x8c430000, 0x02031823,
+        0x04600004, 0x24820001, 0x30440007, 0x1485fff9, 0x00041080, 0x10870007,
+        0x3c030800, 0xa3640121, 0x8c620094, 0x24110005, 0x24420001, 0x0a0009b6,
+        0xac620094, 0x24110004, 0x32220001, 0x1040001e, 0x8e820020, 0x1040001d,
+        0x32220004, 0x0e001006, 0x00000000, 0x8f820018, 0xac520000, 0x8f840018,
+        0x24020001, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
+        0x8f830018, 0xac600010, 0x8f820018, 0xac500014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
+        0x3c024010, 0x00621825, 0x0e001044, 0xaca3001c, 0x32220004, 0x10400076,
+        0x00003821, 0x3c029000, 0x34420001, 0x3c038000, 0x02421025, 0xa360007c,
+        0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620023,
+        0x30420080, 0x10400011, 0x00000000, 0x8f65005c, 0x8f63004c, 0x9764003c,
+        0x8f620064, 0x00a32823, 0x00852821, 0x00a2102b, 0x54400006, 0x3c023fff,
+        0x93620023, 0x3042007f, 0xa3620023, 0xaf700064, 0x3c023fff, 0x0a000a03,
+        0x3442ffff, 0x8f62005c, 0x02021023, 0x04400011, 0x00000000, 0x8f65005c,
+        0x8f630064, 0x9764003c, 0x3c023fff, 0x3442ffff, 0xaf700064, 0x00a32823,
+        0x00852821, 0x0045102b, 0x10400004, 0x02051021, 0x3c053fff, 0x34a5ffff,
+        0x02051021, 0xaf62005c, 0x24070001, 0xaf70004c, 0x8f620054, 0x16020005,
+        0x00000000, 0x93620023, 0x30420040, 0x10400017, 0x24020001, 0x9762006a,
+        0x00022880, 0x50a00001, 0x24050001, 0x97630068, 0x93640081, 0x3c020800,
+        0x8c46004c, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001, 0x00a03021,
+        0x3c020800, 0x8c440050, 0x00c4182b, 0x54600001, 0x00c02021, 0x8f420074,
+        0x2403fffe, 0x00832824, 0x00a21021, 0xaf62000c, 0x3c028000, 0x34420001,
+        0x02421025, 0xa3600081, 0xaf420020, 0x9363007e, 0x9362007a, 0x10620004,
+        0x00000000, 0x0e000f2a, 0x00000000, 0x00403821, 0x10e00017, 0x3c029000,
+        0x34420001, 0x02421025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001, 0x3c048000, 0x02421025,
+        0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002,
+        0x3c031000, 0xaf5201c0, 0xa34201c4, 0xaf4301f8, 0x9342010b, 0x8e830020,
+        0x27500100, 0x38420006, 0x10600029, 0x2c510001, 0x0e001006, 0x00000000,
+        0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x96020008, 0xac820004,
+        0x8f830018, 0x8e020014, 0xac620008, 0x8f850018, 0x3c026000, 0x8c434448,
+        0xaca3000c, 0x8f840018, 0x96020012, 0xac820010, 0x8f850018, 0x8e030020,
+        0xaca30014, 0x9602000c, 0x9603000e, 0x8f840018, 0x00021400, 0x00431025,
+        0xac820018, 0x12200005, 0x3c020800, 0x9443466e, 0x8f840018, 0x0a000a78,
+        0x3c024013, 0x9443466e, 0x8f840018, 0x3c024014, 0x00621825, 0xac83001c,
+        0x0e001044, 0x24040001, 0x8e630014, 0x8f620040, 0x14430003, 0x00431023,
+        0x0a000a83, 0x00001021, 0x28420001, 0x10400034, 0x00000000, 0x8f620040,
+        0xaf630040, 0x9362003e, 0x30420001, 0x1440000b, 0x3c029000, 0x93620022,
+        0x24420001, 0xa3620022, 0x93630022, 0x3c020800, 0x8c440098, 0x0064182b,
+        0x1460001e, 0x3c020800, 0x3c029000, 0x34420001, 0x02421025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000,
+        0x9362007d, 0x34630001, 0x3c048000, 0x02431825, 0x34420001, 0xa362007d,
+        0xaf430020, 0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000,
+        0xaf5201c0, 0xa34201c4, 0x24020001, 0xaf4301f8, 0xa7620012, 0x0a000ab6,
+        0xa3600022, 0x9743007a, 0x9444002a, 0x00641821, 0x3063fffe, 0xa7630012,
+        0x0e000b68, 0x00000000, 0x97420108, 0x8fbf0024, 0x8fb40020, 0x8fb3001c,
+        0x8fb20018, 0x8fb10014, 0x8fb00010, 0x00021042, 0x30420001, 0x03e00008,
+        0x27bd0028, 0x27bdffe0, 0xafb20018, 0x3c120800, 0x8e420020, 0xafb00010,
+        0x27500100, 0xafbf001c, 0x10400046, 0xafb10014, 0x0e001006, 0x00000000,
+        0x8f840018, 0x8e020000, 0xac820000, 0x936300b1, 0x936200c5, 0x8f850018,
+        0x00031e00, 0x00021400, 0x34420100, 0x00621825, 0xaca30004, 0x8f840018,
+        0x8e02001c, 0xac820008, 0x8f830018, 0x8f620048, 0xac62000c, 0x8f840018,
+        0x96020012, 0xac820010, 0x8f830018, 0x8f620040, 0x24040001, 0xac620014,
+        0x8f850018, 0x3c026000, 0x8c434448, 0x3c020800, 0x24514660, 0xaca30018,
+        0x9623000e, 0x8f850018, 0x3c024016, 0x00621825, 0x0e001044, 0xaca3001c,
+        0x96030008, 0x30630010, 0x1060001c, 0x8e420020, 0x1040001a, 0x8e100000,
+        0x0e001006, 0x00000000, 0x8f820018, 0xac500000, 0x8f830018, 0xac600004,
+        0x8f820018, 0xac400008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010,
+        0x8f830018, 0xac600014, 0x8f850018, 0x3c036000, 0x8c634448, 0x24040001,
+        0xaca30018, 0x9622000e, 0x8f850018, 0x3c034015, 0x00431025, 0x0e001044,
+        0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010,
+        0x03e00008, 0x27bd0020, 0x27bdffe0, 0xafb20018, 0x3c120800, 0x8e420020,
+        0xafb00010, 0x27500100, 0xafbf001c, 0x10400041, 0xafb10014, 0x0e001006,
+        0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x24020100,
+        0xac820004, 0x8f830018, 0x8e02001c, 0xac620008, 0x8f840018, 0x8e020018,
+        0xac82000c, 0x8f830018, 0x96020012, 0xac620010, 0x8f840018, 0x96020008,
+        0xac820014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
+        0x24514660, 0xaca30018, 0x9623000e, 0x8f850018, 0x3c024017, 0x00621825,
+        0x0e001044, 0xaca3001c, 0x96030008, 0x30630010, 0x1060001c, 0x8e420020,
+        0x1040001a, 0x8e100000, 0x0e001006, 0x00000000, 0x8f820018, 0xac500000,
+        0x8f830018, 0xac600004, 0x8f820018, 0xac400008, 0x8f830018, 0xac60000c,
+        0x8f820018, 0xac400010, 0x8f830018, 0xac600014, 0x8f850018, 0x3c036000,
+        0x8c634448, 0x24040001, 0xaca30018, 0x9622000e, 0x8f850018, 0x3c034015,
+        0x00431025, 0x0e001044, 0xaca2001c, 0x00001021, 0x8fbf001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0xafbf0010,
+        0x936200c4, 0x30420002, 0x10400019, 0x00000000, 0x936200c5, 0x936300b1,
+        0x00431023, 0x304400ff, 0x30830080, 0x10600004, 0x00000000, 0x0000000d,
+        0x00000000, 0x24000a6a, 0x93620004, 0x00441023, 0x304400ff, 0x30830080,
+        0x10600004, 0x2482ffff, 0x8f650024, 0x0a000b82, 0x00000000, 0x00022b00,
+        0x8f620024, 0x0045102b, 0x10400002, 0x00000000, 0x8f650024, 0x8f620048,
+        0x8f630040, 0x00431823, 0x0065202b, 0x10800004, 0x00000000, 0x8f620040,
+        0x00451021, 0xaf620048, 0x9762003c, 0x0062102b, 0x10400041, 0x8fbf0010,
+        0x10a0003f, 0x3c029000, 0x34420001, 0x3c040800, 0x8c830080, 0x8f450100,
+        0x3c068000, 0x24630001, 0x00a21025, 0xac830080, 0xaf420020, 0x8f420020,
+        0x00461024, 0x1440fffd, 0x3c038000, 0x9362007d, 0x34630001, 0x3c048000,
+        0x00a31825, 0x34420004, 0xa362007d, 0xaf430020, 0x8f4201f8, 0x00441024,
+        0x1440fffd, 0x24020002, 0x3c030800, 0xaf4501c0, 0xa34201c4, 0x8c640020,
+        0x3c021000, 0xaf4201f8, 0x1080001f, 0x8fbf0010, 0x0e001006, 0x00000000,
+        0x8f830018, 0x8f420100, 0xac620000, 0x8f840018, 0x8f620040, 0xac820004,
+        0x8f850018, 0x8f620048, 0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018,
+        0xac400010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018, 0x8c434448,
+        0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c0240c2, 0x00621825,
+        0xac83001c, 0x0e001044, 0x24040001, 0x8fbf0010, 0x03e00008, 0x27bd0018,
+        0x3c020800, 0x24423958, 0xaf82000c, 0x03e00008, 0x00000000, 0x27bdffe8,
+        0xafb00010, 0x27500100, 0xafbf0014, 0x8e02001c, 0x14400003, 0x3c020800,
+        0x0000000d, 0x3c020800, 0x8c430020, 0x10600026, 0x00001021, 0x0e001006,
+        0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018, 0x8e02001c,
+        0xac820004, 0x8f830018, 0xac600008, 0x8f840018, 0x8e020018, 0xac82000c,
+        0x8f850018, 0x96020012, 0xaca20010, 0x8f830018, 0x3c106000, 0xac600014,
+        0x8f840018, 0x8e024448, 0x3c030800, 0xac820018, 0x9462466e, 0x8f840018,
+        0x3c034012, 0x00431025, 0xac82001c, 0x0e001044, 0x24040001, 0x8e036800,
+        0x00001021, 0x3c040001, 0x00641825, 0xae036800, 0x0a000c0d, 0x8fbf0014,
+        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x97430078,
+        0x9444002e, 0x00001021, 0x00641821, 0x3063fffe, 0x03e00008, 0xa7630010,
+        0x27450100, 0x8f640048, 0x8ca30018, 0x00641023, 0x18400021, 0x00000000,
+        0xaf630048, 0x8f620040, 0x9763003c, 0x00821023, 0x0043102a, 0x1040001a,
+        0x3c029000, 0x8ca40000, 0x34420001, 0x3c038000, 0x00821025, 0xaf420020,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d,
+        0x34630001, 0x3c058000, 0x00831825, 0x34420004, 0xa362007d, 0xaf430020,
+        0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0,
+        0xa34201c4, 0xaf4301f8, 0x03e00008, 0x00001021, 0x8f420100, 0x34420001,
+        0xaf4200a4, 0x03e00008, 0x00001021, 0x27bdffe0, 0xafbf0018, 0xafb10014,
+        0xafb00010, 0x9362007e, 0x30d000ff, 0x16020029, 0x00808821, 0x93620080,
+        0x16020026, 0x00000000, 0x9362007f, 0x16020023, 0x00000000, 0x9362007a,
+        0x16020004, 0x00000000, 0x0000000d, 0x00000000, 0x24000771, 0x0e000f49,
+        0x00000000, 0x3c039000, 0x34630001, 0x3c048000, 0x02231825, 0xa370007a,
+        0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd, 0x3c028000, 0x9363007d,
+        0x34420001, 0x3c048000, 0x02221025, 0xa363007d, 0xaf420020, 0x8f4201f8,
+        0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf5101c0, 0xa34201c4,
+        0xaf4301f8, 0x0a000c79, 0x8fbf0018, 0x0000000d, 0x00000000, 0x24000781,
+        0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800,
+        0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100, 0x10600024, 0xafbf0014,
+        0x0e001006, 0x00000000, 0x8f830018, 0x8e020000, 0xac620000, 0x8f840018,
+        0x8e020004, 0xac820004, 0x8f830018, 0x8e020018, 0xac620008, 0x8f840018,
+        0x8e03001c, 0xac83000c, 0x9602000c, 0x9203000a, 0x8f840018, 0x00021400,
+        0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,
+        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e, 0x8f850018,
+        0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c, 0x8fbf0014,
+        0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8,
+        0xafb00010, 0x27500100, 0x10600020, 0xafbf0014, 0x0e001006, 0x00000000,
+        0x8f820018, 0xac400000, 0x8f830018, 0xac600004, 0x8f820018, 0xac400008,
+        0x8f830018, 0xac60000c, 0x9602000c, 0x9603000e, 0x8f840018, 0x00021400,
+        0x00431025, 0xac820010, 0x8f830018, 0x3c026000, 0xac600014, 0x8f840018,
+        0x8c434448, 0xac830018, 0x96020008, 0x3c030800, 0x9464466e, 0x8f850018,
+        0x00021400, 0x00441025, 0x24040001, 0x0e001044, 0xaca2001c, 0x8fbf0014,
+        0x8fb00010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafb00010, 0x27500100,
+        0xafbf0014, 0x9602000c, 0x10400024, 0x00802821, 0x3c020800, 0x8c430020,
+        0x1060003a, 0x8fbf0014, 0x0e001006, 0x00000000, 0x8f840018, 0x8e030000,
+        0xac830000, 0x9602000c, 0x8f840018, 0x00021400, 0xac820004, 0x8f830018,
+        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,
+        0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001, 0x3c020800,
+        0xaca30018, 0x9443466e, 0x8f850018, 0x3c02400b, 0x00621825, 0x0e001044,
+        0xaca3001c, 0x0a000d19, 0x8fbf0014, 0x93620005, 0x30420010, 0x14400015,
+        0x3c029000, 0x34420001, 0x00a21025, 0xaf420020, 0x3c038000, 0x8f420020,
+        0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x93620005, 0x34630001,
+        0x00a02021, 0x00a31825, 0x24055852, 0x34420010, 0xa3620005, 0x0e000553,
+        0xaf430020, 0x0a000d19, 0x8fbf0014, 0x0000000d, 0x8fbf0014, 0x8fb00010,
+        0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010,
+        0x27500100, 0x10600022, 0xafbf0014, 0x0e001006, 0x00000000, 0x8f840018,
+        0x8e020004, 0xac820000, 0x9603000c, 0x9762002c, 0x8f840018, 0x00031c00,
+        0x00431025, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
+        0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f850018, 0x3c026000,
+        0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018,
+        0x3c02400e, 0x00621825, 0x0e001044, 0xaca3001c, 0x0e000d48, 0x8e040000,
+        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c038000, 0x8f420278,
+        0x00431024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf440240, 0xa3420244,
+        0x03e00008, 0xaf430278, 0x3c020800, 0x8c430020, 0x27bdffe0, 0xafb10014,
+        0x00808821, 0xafb20018, 0x00c09021, 0xafb00010, 0x30b0ffff, 0x1060001c,
+        0xafbf001c, 0x0e001006, 0x00000000, 0x8f820018, 0xac510000, 0x8f840018,
+        0x00101400, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
+        0x8f830018, 0xac600010, 0x8f820018, 0xac520014, 0x8f840018, 0x3c026000,
+        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c024019,
+        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x8fbf001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe8, 0x27450100,
+        0xafbf0010, 0x94a3000c, 0x240200c1, 0x14620029, 0x00803021, 0x3c029000,
+        0x34420001, 0x00c21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x3c028000, 0x34420001, 0x3c049000, 0x34840001, 0x3c058000,
+        0x24030012, 0x00c21025, 0x00c42025, 0xa363003f, 0xaf420020, 0xaf440020,
+        0x8f420020, 0x00451024, 0x1440fffd, 0x3c038000, 0x9362007d, 0x34630001,
+        0x3c048000, 0x00c31825, 0x34420020, 0xa362007d, 0xaf430020, 0x8f4201f8,
+        0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4,
+        0xaf4301f8, 0x0a000db3, 0x8fbf0010, 0x00c02021, 0x94a5000c, 0x24060001,
+        0x0e000f78, 0x240706d8, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800,
+        0x8c430020, 0x27bdffe0, 0xafb00010, 0x00808021, 0xafb20018, 0x00a09021,
+        0xafb10014, 0x30d100ff, 0x1060001c, 0xafbf001c, 0x0e001006, 0x00000000,
+        0x8f820018, 0xac500000, 0x8f840018, 0x24020001, 0xac820004, 0x8f830018,
+        0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010, 0x8f820018,
+        0xac520014, 0x8f840018, 0x3c026000, 0x8c434448, 0x3c020800, 0xac830018,
+        0x9443466e, 0x8f840018, 0x3c024010, 0x00621825, 0xac83001c, 0x0e001044,
+        0x02202021, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
+        0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x93620005, 0x30420001,
+        0x10400033, 0x00808021, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005,
+        0x3c048000, 0x3c030800, 0x304200fe, 0xa3620005, 0x8c620020, 0x34840001,
+        0x02042025, 0xaf440020, 0x10400020, 0x8fbf0014, 0x0e001006, 0x00000000,
+        0x8f820018, 0xac500000, 0x93630082, 0x9362003f, 0x8f840018, 0x00031a00,
+        0x00431025, 0xac820004, 0x8f830018, 0xac600008, 0x8f820018, 0xac40000c,
+        0x8f830018, 0xac600010, 0x8f820018, 0xac400014, 0x8f840018, 0x3c026000,
+        0x8c434448, 0x3c020800, 0xac830018, 0x9443466e, 0x8f840018, 0x3c02400a,
+        0x00621825, 0xac83001c, 0x0e001044, 0x24040001, 0x8fbf0014, 0x8fb00010,
+        0x03e00008, 0x27bd0018, 0x27bdffe8, 0xafbf0010, 0x8f420188, 0x00803021,
+        0x9364003f, 0x24030012, 0x00021402, 0x1483001c, 0x304500ff, 0x3c029000,
+        0x34420001, 0x3c038000, 0x00c21025, 0xa3650080, 0xa365007a, 0xaf420020,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x3c028000, 0x9363007d, 0x34420001,
+        0x3c048000, 0x00c21025, 0xa363007d, 0xaf420020, 0x8f4201f8, 0x00441024,
+        0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0, 0xa34201c4, 0xaf4301f8,
+        0x0a000e54, 0x8fbf0010, 0x9362007e, 0x1445000e, 0x00000000, 0x93620080,
+        0x1045000b, 0x00000000, 0xa3650080, 0x8f820000, 0x93660080, 0x8f440180,
+        0x8f65004c, 0x8c430000, 0x0060f809, 0x00000000, 0x0a000e54, 0x8fbf0010,
+        0xa3650080, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x3c020800, 0x8c430020,
+        0x27bdffe0, 0xafb10014, 0x00808821, 0xafb20018, 0x00a09021, 0xafb00010,
+        0x30d000ff, 0x1060002f, 0xafbf001c, 0x0e001006, 0x00000000, 0x8f820018,
+        0xac510000, 0x8f830018, 0xac700004, 0x8f820018, 0xac520008, 0x8f830018,
+        0xac60000c, 0x8f820018, 0xac400010, 0x9763006a, 0x00032880, 0x50a00001,
+        0x24050001, 0x97630068, 0x93640081, 0x3c020800, 0x8c46004c, 0x00652821,
+        0x00852804, 0x00c5102b, 0x54400001, 0x00a03021, 0x3c020800, 0x8c440050,
+        0x00c4182b, 0x54600001, 0x00c02021, 0x8f830018, 0x2402fffe, 0x00822824,
+        0x3c026000, 0xac650014, 0x8f840018, 0x8c434448, 0x3c020800, 0xac830018,
+        0x9443466e, 0x8f840018, 0x3c024011, 0x00621825, 0xac83001c, 0x0e001044,
+        0x24040001, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
+        0x27bd0020, 0x27bdffe8, 0xafbf0014, 0xafb00010, 0x8f440100, 0x27500100,
+        0x8f650050, 0x0e000c45, 0x9206001b, 0x3c020800, 0x8c430020, 0x1060001d,
+        0x8e100018, 0x0e001006, 0x00000000, 0x8f840018, 0x8f420100, 0xac820000,
+        0x8f830018, 0xac700004, 0x8f840018, 0x8f620050, 0xac820008, 0x8f830018,
+        0xac60000c, 0x8f820018, 0xac400010, 0x8f830018, 0x3c026000, 0xac600014,
+        0x8f850018, 0x8c434448, 0x24040001, 0x3c020800, 0xaca30018, 0x9443466e,
+        0x8f850018, 0x3c02401c, 0x00621825, 0x0e001044, 0xaca3001c, 0x8fbf0014,
+        0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c029000, 0x8f460140, 0x34420001,
+        0x3c038000, 0x00c21025, 0xaf420020, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x3c048000, 0x34840001, 0x3c059000, 0x34a50001, 0x3c078000, 0x24020012,
+        0x24030080, 0x00c42025, 0x00c52825, 0xa362003f, 0xa3630082, 0xaf440020,
+        0xaf450020, 0x8f420020, 0x00471024, 0x1440fffd, 0x3c038000, 0x9362007d,
+        0x34630001, 0x3c048000, 0x00c31825, 0x34420020, 0xa362007d, 0xaf430020,
+        0x8f4201f8, 0x00441024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4601c0,
+        0xa34201c4, 0x03e00008, 0xaf4301f8, 0x8f430238, 0x3c020800, 0x04610013,
+        0x8c44009c, 0x2406fffe, 0x3c050800, 0x3c038000, 0x2484ffff, 0x14800009,
+        0x00000000, 0x97420078, 0x8ca3007c, 0x24420001, 0x00461024, 0x24630001,
+        0xa7620010, 0x03e00008, 0xaca3007c, 0x8f420238, 0x00431024, 0x1440fff3,
+        0x2484ffff, 0x8f420140, 0x3c031000, 0xaf420200, 0x03e00008, 0xaf430238,
+        0x3c029000, 0x8f440140, 0x34420001, 0x3c038000, 0x00821025, 0xaf420020,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x3c038000, 0x9362007d,
+        0x34630001, 0x3c058000, 0x00831825, 0x34420001, 0xa362007d, 0xaf430020,
+        0x8f4201f8, 0x00451024, 0x1440fffd, 0x24020002, 0x3c031000, 0xaf4401c0,
+        0xa34201c4, 0x03e00008, 0xaf4301f8, 0x0000000d, 0x03e00008, 0x00000000,
+        0x0000000d, 0x03e00008, 0x00000000, 0x24020001, 0x03e00008, 0xa7620010,
+        0x9362003f, 0x304400ff, 0x3883000e, 0x2c630001, 0x38820010, 0x2c420001,
+        0x00621825, 0x14600003, 0x24020012, 0x14820003, 0x00000000, 0x03e00008,
+        0x00001021, 0x9363007e, 0x9362007a, 0x14620006, 0x00000000, 0x9363007e,
+        0x24020001, 0x24630001, 0x03e00008, 0xa363007e, 0x9363007e, 0x93620080,
+        0x14620004, 0x24020001, 0xa362000b, 0x03e00008, 0x24020001, 0x03e00008,
+        0x00001021, 0x9362000b, 0x10400021, 0x00001021, 0xa360000b, 0x9362003f,
+        0x304400ff, 0x3883000e, 0x2c630001, 0x38820010, 0x2c420001, 0x00621825,
+        0x14600015, 0x00001821, 0x24020012, 0x10820012, 0x00000000, 0x9363007e,
+        0x9362007a, 0x14620007, 0x00000000, 0x9362007e, 0x24030001, 0x24420001,
+        0xa362007e, 0x03e00008, 0x00601021, 0x9363007e, 0x93620080, 0x14620004,
+        0x00001821, 0x24020001, 0xa362000b, 0x24030001, 0x03e00008, 0x00601021,
+        0x03e00008, 0x00000000, 0x24040001, 0xaf64000c, 0x8f6300dc, 0x8f6200cc,
+        0x50620001, 0xa7640010, 0xa7640012, 0xa7640014, 0x03e00008, 0xa7640016,
+        0x27bdffd8, 0xafb00010, 0x00808021, 0xafb3001c, 0x00c09821, 0xafbf0020,
+        0xafb20018, 0xafb10014, 0x93620023, 0x00e09021, 0x30420040, 0x10400020,
+        0x30b1ffff, 0x3c020800, 0x8c430020, 0x1060001c, 0x00000000, 0x0e001006,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x3c02008d, 0xac820004,
+        0x8f830018, 0xac600008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac520014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c024019, 0x00621825,
+        0x0e001044, 0xaca3001c, 0x93620023, 0x30420020, 0x14400003, 0x3c020800,
+        0x52600020, 0x3c029000, 0x8c430020, 0x1060001d, 0x3c029000, 0x0e001006,
+        0x00000000, 0x8f820018, 0xac500000, 0x8f840018, 0x00111400, 0xac820004,
+        0x8f830018, 0xac720008, 0x8f820018, 0xac40000c, 0x8f830018, 0xac600010,
+        0x8f820018, 0xac400014, 0x8f850018, 0x3c026000, 0x8c434448, 0x24040001,
+        0x3c020800, 0xaca30018, 0x9443466e, 0x8f850018, 0x3c02401b, 0x00621825,
+        0x0e001044, 0xaca3001c, 0x3c029000, 0x34420001, 0x02021025, 0xaf420020,
+        0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93630023,
+        0x3c028000, 0x34420001, 0x02021025, 0x8fbf0020, 0x8fb3001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x3063009f, 0xa3630023, 0xaf420020, 0x03e00008,
+        0x27bd0028, 0x3c020800, 0x8c430020, 0x27bdffe8, 0xafb00010, 0x27500100,
+        0x1060001d, 0xafbf0014, 0x0e001006, 0x00000000, 0x8f830018, 0x8e020004,
+        0xac620000, 0x8f840018, 0x8e020018, 0xac820004, 0x8f850018, 0x8e020000,
+        0xaca20008, 0x8f830018, 0xac60000c, 0x8f820018, 0xac400010, 0x8f830018,
+        0xac600014, 0x8f820018, 0xac400018, 0x96030008, 0x3c020800, 0x9444466e,
+        0x8f850018, 0x00031c00, 0x00641825, 0x24040001, 0x0e001044, 0xaca3001c,
+        0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x3c060800, 0x24c54660,
+        0x3c02000a, 0x03421821, 0x94640006, 0x94a2000a, 0x00441023, 0x00021400,
+        0x00021c03, 0x04610006, 0xa4a40006, 0x0000000d, 0x00000000, 0x2400005a,
+        0x0a00101b, 0x24020001, 0x8f820014, 0x0062102b, 0x14400002, 0x00001021,
+        0x24020001, 0x304200ff, 0x1040001c, 0x274a0400, 0x3c07000a, 0x3c020800,
+        0x24454660, 0x94a9000a, 0x8f880014, 0x03471021, 0x94430006, 0x00402021,
+        0xa4a30006, 0x94820006, 0xa4a20006, 0x01221023, 0x00021400, 0x00021403,
+        0x04410006, 0x0048102b, 0x0000000d, 0x00000000, 0x2400005a, 0x0a001036,
+        0x24020001, 0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1440ffec,
+        0x03471021, 0x24c44660, 0x8c820010, 0xaf420038, 0x8c830014, 0x3c020005,
+        0xaf43003c, 0xaf420030, 0xaf800010, 0xaf8a0018, 0x03e00008, 0x00000000,
+        0x27bdffe0, 0x8f820010, 0x8f850018, 0x3c070800, 0x24e84660, 0xafbf001c,
+        0xafb20018, 0xafb10014, 0xafb00010, 0x9503000a, 0x8d060014, 0x00009021,
+        0x309000ff, 0x00e08821, 0x24420001, 0x24a50020, 0x24630001, 0xaf820010,
+        0xaf850018, 0xa503000a, 0x24c30020, 0x3c028000, 0x04c10007, 0xad030014,
+        0x00621024, 0x14400005, 0x26224660, 0x8d020010, 0x24420001, 0xad020010,
+        0x26224660, 0x9444000a, 0x94450018, 0x0010102b, 0x00a41826, 0x2c630001,
+        0x00621825, 0x1060001c, 0x3c030006, 0x8f820010, 0x24120001, 0x00021140,
+        0x00431025, 0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x27450400,
+        0x8f420000, 0x30420010, 0x1040fffd, 0x26224660, 0x9444000a, 0x94430018,
+        0xaf800010, 0xaf850018, 0x14830012, 0x26274660, 0x0e0010d2, 0x00000000,
+        0x1600000e, 0x26274660, 0x0e001006, 0x00000000, 0x0a00108f, 0x26274660,
+        0x00041c00, 0x00031c03, 0x00051400, 0x00021403, 0x00621823, 0x18600002,
+        0x3c026000, 0xac400808, 0x26274660, 0x94e2000e, 0x94e3000c, 0x24420001,
+        0xa4e2000e, 0x3042ffff, 0x50430001, 0xa4e0000e, 0x12000005, 0x3c02000a,
+        0x94e2000a, 0xa74200a2, 0x0a0010cc, 0x02401021, 0x03421821, 0x94640006,
+        0x94e2000a, 0x00441023, 0x00021400, 0x00021c03, 0x04610006, 0xa4e40006,
+        0x0000000d, 0x00000000, 0x2400005a, 0x0a0010ae, 0x24020001, 0x8f820014,
+        0x0062102b, 0x14400002, 0x00001021, 0x24020001, 0x304200ff, 0x1040001b,
+        0x3c020800, 0x3c06000a, 0x24454660, 0x94a8000a, 0x8f870014, 0x03461021,
+        0x94430006, 0x00402021, 0xa4a30006, 0x94820006, 0xa4a20006, 0x01021023,
+        0x00021400, 0x00021403, 0x04410006, 0x0047102b, 0x0000000d, 0x00000000,
+        0x2400005a, 0x0a0010c8, 0x24020001, 0x14400002, 0x00001021, 0x24020001,
+        0x304200ff, 0x1440ffec, 0x03461021, 0x02401021, 0x8fbf001c, 0x8fb20018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3c020800, 0x24454660,
+        0x94a3001a, 0x8ca40024, 0x00403021, 0x000318c0, 0x00832021, 0xaf44003c,
+        0x8ca20020, 0xaf420038, 0x3c020050, 0x34420008, 0xaf420030, 0x00000000,
+        0x00000000, 0x00000000, 0x8f420000, 0x30420020, 0x1040fffd, 0x00000000,
+        0x8f430400, 0x24c64660, 0xacc30010, 0x8f420404, 0x3c030020, 0xacc20014,
+        0xaf430030, 0x94c40018, 0x94c3001c, 0x94c2001a, 0x94c5001e, 0x00832021,
+        0x24420001, 0xa4c2001a, 0x3042ffff, 0x14450002, 0xa4c40018, 0xa4c0001a,
+        0x03e00008, 0x00000000, 0x8f820010, 0x3c030006, 0x00021140, 0x00431025,
+        0xaf420030, 0x00000000, 0x00000000, 0x00000000, 0x27430400, 0x8f420000,
+        0x30420010, 0x1040fffd, 0x00000000, 0xaf800010, 0xaf830018, 0x03e00008,
+        0x00000000, 0x27bdffe8, 0xafb00010, 0x3c100800, 0x26104660, 0x3c05000a,
+        0x02002021, 0x03452821, 0xafbf0014, 0x0e001128, 0x2406000a, 0x96020002,
+        0x9603001e, 0x3042000f, 0x24420003, 0x00431804, 0x24027fff, 0x0043102b,
+        0xaf830014, 0x10400004, 0x00000000, 0x0000000d, 0x00000000, 0x24000043,
+        0x0e0010d2, 0x00000000, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018,
+        0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,
+        0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a001137, 0x00a01021,
+        0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008,
+        0x00000000, 0x3c036000, 0x8c642b7c, 0x3c036010, 0x8c6553fc, 0x00041582,
+        0x00042302, 0x308403ff, 0x00052d82, 0x00441026, 0x0002102b, 0x0005282b,
+        0x00451025, 0x1440000d, 0x3c020050, 0x34420004, 0xaf400038, 0xaf40003c,
+        0xaf420030, 0x00000000, 0x00000000, 0x8f420000, 0x30420020, 0x1040fffd,
+        0x3c020020, 0xaf420030, 0x0000000d, 0x03e00008, 0x00000000, 0x3c020050,
+        0x34420004, 0xaf440038, 0xaf45003c, 0xaf420030, 0x00000000, 0x00000000,
+        0x8f420000, 0x30420020, 0x1040fffd, 0x3c020020, 0xaf420030, 0x03e00008,
+        0x00000000, 0x00000000 };
+
+static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_COM_b06FwRodata[(0x18/4) + 1] = {
+        0x08002318, 0x08002348, 0x08002378, 0x080023a8, 0x080023d8, 0x00000000,
+        0x00000000 };
+
+static u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x00000000 };
+static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x00000000 };
+
+static int bnx2_RXP_b06FwReleaseMajor = 0x0;
+static int bnx2_RXP_b06FwReleaseMinor = 0x0;
+static int bnx2_RXP_b06FwReleaseFix = 0x0;
+static u32 bnx2_RXP_b06FwStartAddr = 0x08000060;
+static u32 bnx2_RXP_b06FwTextAddr = 0x08000000;
+static int bnx2_RXP_b06FwTextLen = 0x20b8;
+static u32 bnx2_RXP_b06FwDataAddr = 0x080020e0;
+static int bnx2_RXP_b06FwDataLen = 0x0;
+static u32 bnx2_RXP_b06FwRodataAddr = 0x00000000;
+static int bnx2_RXP_b06FwRodataLen = 0x0;
+static u32 bnx2_RXP_b06FwBssAddr = 0x08002100;
+static int bnx2_RXP_b06FwBssLen = 0x239c;
+static u32 bnx2_RXP_b06FwSbssAddr = 0x080020e0;
+static int bnx2_RXP_b06FwSbssLen = 0x14;
+
+static u32 bnx2_RXP_b06FwText[(0x20b8/4) + 1] = {
+        0x0a000018, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x302e362e,
+        0x39000000, 0x00060903, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800,
+        0x244220e0, 0x3c030800, 0x2463449c, 0xac400000, 0x0043202b, 0x1480fffd,
+        0x24420004, 0x3c1d0800, 0x37bd3ffc, 0x03a0f021, 0x3c100800, 0x26100060,
+        0x3c1c0800, 0x279c20e0, 0x0e000329, 0x00000000, 0x0000000d, 0x8f870008,
+        0x2ce20080, 0x10400018, 0x3c030800, 0x24633490, 0x8f460100, 0x00072140,
+        0x00831021, 0xac460000, 0x8f450104, 0x00641021, 0xac450004, 0x8f460108,
+        0xac460008, 0x8f45010c, 0xac45000c, 0x8f460114, 0xac460010, 0x8f450118,
+        0xac450014, 0x8f460124, 0xac460018, 0x8f450128, 0x00641821, 0x24e20001,
+        0xaf820008, 0xac65001c, 0x03e00008, 0x00000000, 0x00804021, 0x8f830000,
+        0x24070001, 0x3c020001, 0x00621024, 0x10400037, 0x00603021, 0x9742010e,
+        0x3c038000, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x8f840004, 0x24020080, 0x24030002, 0xaf420180, 0xa743018c,
+        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000069, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x24020003, 0x30838000, 0x1060000d, 0xa7420188, 0x93420116, 0x304200fc,
+        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600005, 0x00000000,
+        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c,
+        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
+        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x30c21000,
+        0x1040000f, 0x00000000, 0x9742010c, 0x3042fc00, 0x5440000b, 0x24070005,
+        0x3c021000, 0x00c21024, 0x10400007, 0x3c030dff, 0x3463ffff, 0x3c020e00,
+        0x00c21024, 0x0062182b, 0x54600001, 0x24070005, 0x8f82000c, 0x30434000,
+        0x10600016, 0x00404821, 0x3c020f00, 0x00c21024, 0x14400012, 0x00000000,
+        0x93420116, 0x34424000, 0x03421821, 0x94650002, 0x2ca21389, 0x1040000b,
+        0x3c020800, 0x24422100, 0x00051942, 0x00031880, 0x00621821, 0x30a5001f,
+        0x8c640000, 0x24020001, 0x00a21004, 0x00822024, 0x01044025, 0x11000037,
+        0x3c021000, 0x9742010e, 0x34e60002, 0x3c038000, 0x24420004, 0x3045ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x8f840004,
+        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0x10800005, 0xa745018e,
+        0x9743011c, 0x9742011e, 0x0a0000cd, 0x00021400, 0x9743011e, 0x9742011c,
+        0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c,
+        0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,
+        0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c,
+        0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,
+        0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008,
+        0x00001021, 0x00c21024, 0x104000ba, 0x3c020800, 0x8c430030, 0x1060003e,
+        0x31224000, 0x1040003c, 0x3c030f00, 0x00c31824, 0x3c020100, 0x0043102b,
+        0x14400038, 0x3c030800, 0x9742010e, 0x34e60002, 0x3c038000, 0x24420004,
+        0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,
+        0x8f840004, 0x24020080, 0x24030002, 0xaf420180, 0xa743018c, 0x10800005,
+        0xa745018e, 0x9743011c, 0x9742011e, 0x0a000110, 0x00021400, 0x9743011e,
+        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000,
+        0x1040000c, 0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
+        0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
+        0x03e00008, 0x00001021, 0x3c030800, 0x8c620024, 0x30420008, 0x1040003d,
+        0x34e80002, 0x3c020f00, 0x00c21024, 0x5440003a, 0x3107ffff, 0x9742010c,
+        0x30420200, 0x50400036, 0x3107ffff, 0x9742010e, 0x30e6fffb, 0x3c038000,
+        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x8f840004, 0x24020180, 0x24030002, 0xaf420180, 0xa743018c,
+        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000153, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x30828000, 0x1040000c, 0xa7460188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x3107ffff, 0x8f820000, 0x3c068000, 0x9743010e, 0x00021442,
+        0x30440780, 0x24630004, 0x3065ffff, 0x8f4201b8, 0x00461024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf440180, 0xa742018c,
+        0x10600005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000189, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x03e00008, 0x00001021, 0x8f424000, 0x30420100, 0x104000ef,
+        0x3c020800, 0x8c440024, 0x24030001, 0x14830036, 0x00404021, 0x9742010e,
+        0x34e50002, 0x3c038000, 0x24420004, 0x3044ffff, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf400180,
+        0xa742018c, 0x10600005, 0xa744018e, 0x9743011c, 0x9742011e, 0x0a0001c6,
+        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
+        0x8f84000c, 0x30828000, 0x1040000c, 0xa7450188, 0x93420116, 0x304200fc,
+        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
+        0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104,
+        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
+        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x30820001, 0x10400035,
+        0x30e90004, 0x9742010e, 0x30e6fffb, 0x3c038000, 0x24420004, 0x3044ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004,
+        0x24020002, 0xaf400180, 0xa742018c, 0x10600005, 0xa744018e, 0x9743011c,
+        0x9742011e, 0x0a0001fe, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400,
+        0x00621825, 0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c, 0xa7470188,
+        0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff,
+        0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e,
+        0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825,
+        0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x30c7ffff, 0x8d020024,
+        0x30420004, 0x10400037, 0x8d020024, 0x9742010e, 0x30e6fffb, 0x3c038000,
+        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x8f840004, 0x24020100, 0x24030002, 0xaf420180, 0xa743018c,
+        0x10800005, 0xa745018e, 0x9743011c, 0x9742011e, 0x0a000237, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x30c7ffff, 0x8d020024, 0x30420008, 0x10400034, 0x00000000,
+        0x9742010e, 0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020003, 0xa342018b, 0x8f840004, 0x24020180, 0x24030002,
+        0xaf420180, 0xa743018c, 0x10800005, 0xa745018e, 0x9743011c, 0x9742011e,
+        0x0a00026f, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,
+        0xaf4301a8, 0x8f84000c, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116,
+        0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,
+        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c,
+        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
+        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x15200046, 0x00001021, 0x3c038000,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0x24032000, 0xa342018b,
+        0xa7430188, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x3c030800,
+        0x8c620024, 0x30420001, 0x10400035, 0x00001021, 0x9742010e, 0x34e50002,
+        0x3c038000, 0x24420004, 0x3044ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x8f830004, 0x24020002, 0xaf400180, 0xa742018c,
+        0x10600005, 0xa744018e, 0x9743011c, 0x9742011e, 0x0a0002b5, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x30828000, 0x1040000c, 0xa7450188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x00001021, 0x03e00008, 0x00000000, 0x27bdffe0, 0xafbf0018,
+        0xafb10014, 0xafb00010, 0x8f420140, 0xaf420020, 0x8f430148, 0x3c027000,
+        0x00621824, 0x3c024000, 0x1062000c, 0x0043102b, 0x14400006, 0x3c025000,
+        0x3c023000, 0x1062000b, 0x3c024000, 0x0a00031f, 0x00000000, 0x10620034,
+        0x3c024000, 0x0a00031f, 0x00000000, 0x0e00067c, 0x00000000, 0x0a00031f,
+        0x3c024000, 0x8f420148, 0x24030002, 0x3044ffff, 0x00021402, 0x305000ff,
+        0x1203000c, 0x27510180, 0x2a020003, 0x10400005, 0x24020003, 0x0600001d,
+        0x36053000, 0x0a00030a, 0x3c038000, 0x12020007, 0x00000000, 0x0a000317,
+        0x00000000, 0x0e000423, 0x00000000, 0x0a000308, 0x00402021, 0x0e000435,
+        0x00000000, 0x00402021, 0x36053000, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b, 0xa6240010, 0x8f420144,
+        0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00031f, 0x3c024000, 0x0000000d,
+        0x00000000, 0x240001c3, 0x0a00031f, 0x3c024000, 0x0e0007f7, 0x00000000,
+        0x3c024000, 0xaf420178, 0x00000000, 0x8fbf0018, 0x8fb10014, 0x8fb00010,
+        0x03e00008, 0x27bd0020, 0x24020800, 0x03e00008, 0xaf4201b8, 0x27bdffe8,
+        0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f,
+        0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000, 0x3c040008,
+        0xaf430008, 0x8e020808, 0x3c030800, 0xac600020, 0x3042fff0, 0x2c420001,
+        0xaf820004, 0x0e000819, 0x0344d825, 0x0e000781, 0x00000000, 0x3c020400,
+        0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c, 0x8e021980,
+        0x34420200, 0xae021980, 0x8f500000, 0x32020003, 0x1040fffd, 0x32020001,
+        0x10400004, 0x32020002, 0x0e0003bd, 0x00000000, 0x32020002, 0x1040fff6,
+        0x00000000, 0x0e0002d4, 0x00000000, 0x0a00034a, 0x00000000, 0x27bdffe8,
+        0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f,
+        0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000, 0x3c040008,
+        0xaf430008, 0x8e020808, 0x3c030800, 0xac600020, 0x3042fff0, 0x2c420001,
+        0xaf820004, 0x0e000819, 0x0344d825, 0x0e000781, 0x00000000, 0x3c020400,
+        0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c, 0x8e021980,
+        0x8fbf0014, 0x34420200, 0xae021980, 0x8fb00010, 0x03e00008, 0x27bd0018,
+        0x30a5ffff, 0x30c6ffff, 0x30e7ffff, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020003, 0xa342018b, 0x8f830004, 0xaf440180, 0xa745018c,
+        0x10600005, 0xa746018e, 0x9743011c, 0x9742011e, 0x0a000393, 0x00021400,
+        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f84000c,
+        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00821024, 0xaf82000c, 0x9782000e, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x03e00008, 0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x24020002, 0x24032000, 0xa342018b, 0xa7430188, 0x3c021000,
+        0xaf4201b8, 0x03e00008, 0x00000000, 0x27bdffe8, 0xafbf0010, 0x8f460128,
+        0xaf460020, 0x8f420104, 0x8f450100, 0x24030800, 0x3c040010, 0xaf820000,
+        0x00441024, 0xaf85000c, 0xaf4301b8, 0x14400005, 0x3c02001f, 0x3c030800,
+        0x8c620020, 0x0a0003d5, 0x00002021, 0x3442ff00, 0x14c20009, 0x2402bfff,
+        0x3c030800, 0x8c620020, 0x24040001, 0x24420001, 0x0e00004c, 0xac620020,
+        0x0a0003e4, 0x00000000, 0x00a21024, 0x14400006, 0x00000000, 0xaf400048,
+        0x0e000448, 0xaf400040, 0x0a0003e4, 0x00000000, 0x0e000783, 0x00000000,
+        0x10400005, 0x3c024000, 0x8f430124, 0x3c026020, 0xac430014, 0x3c024000,
+        0xaf420138, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0,
+        0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420148, 0x24030002, 0x3044ffff,
+        0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003, 0x10400005,
+        0x24020003, 0x0600001d, 0x36053000, 0x0a00040e, 0x3c038000, 0x12020007,
+        0x00000000, 0x0a00041b, 0x00000000, 0x0e000423, 0x00000000, 0x0a00040c,
+        0x00402021, 0x0e000435, 0x00000000, 0x00402021, 0x36053000, 0x3c038000,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b,
+        0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00041f,
+        0x8fbf0018, 0x0000000d, 0x00000000, 0x240001c3, 0x8fbf0018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x3084ffff, 0x2c821389, 0x1040000d,
+        0x00001021, 0x3c030800, 0x24632100, 0x00042942, 0x00052880, 0x00a32821,
+        0x3086001f, 0x8ca40000, 0x24030001, 0x00c31804, 0x00832025, 0x03e00008,
+        0xaca40000, 0x03e00008, 0x24020091, 0x3084ffff, 0x2c821389, 0x1040000e,
+        0x00001021, 0x3c030800, 0x24632100, 0x00042942, 0x00052880, 0x00a32821,
+        0x3086001f, 0x24030001, 0x8ca40000, 0x00c31804, 0x00031827, 0x00832024,
+        0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x27bdffb0, 0x3c026000,
+        0xafbf0048, 0x8c434448, 0xaf630140, 0x93620005, 0x30420001, 0x14400005,
+        0x00000000, 0x0e0007ed, 0x00000000, 0x0a00067a, 0x8fbf0048, 0x93420116,
+        0x93430112, 0x8f430104, 0x3c040020, 0x34424000, 0x00641824, 0x1060000d,
+        0x03426021, 0x8f430128, 0x27420180, 0xac430000, 0x8f650040, 0x24040008,
+        0x240340c1, 0xa4430008, 0x24030002, 0xa043000b, 0x3c031000, 0x0a000563,
+        0xa044000a, 0x8f420104, 0x3c030040, 0x00431024, 0x10400007, 0x00000000,
+        0x8f430128, 0x27420180, 0xac430000, 0x8f650040, 0x0a00055c, 0x24040010,
+        0xaf400048, 0xaf400054, 0xaf400040, 0x8f630048, 0x8f620040, 0x00624823,
+        0x05210004, 0x00000000, 0x0000000d, 0x00000000, 0x24000132, 0x9742011a,
+        0x3046ffff, 0x10c00004, 0x8d880004, 0x01061021, 0x0a000487, 0x2445ffff,
+        0x01002821, 0x918a000d, 0xa7a00020, 0xafa00028, 0x9364003f, 0x3c026000,
+        0x8c434448, 0x308700ff, 0x31420004, 0x10400033, 0xaf630144, 0x24090012,
+        0x14e90006, 0x3c040800, 0x8c830028, 0x24020001, 0x24630001, 0x0a00054e,
+        0xac830028, 0x8f620044, 0x15020012, 0x97a20020, 0x27a60010, 0x27450180,
+        0x3442001a, 0xa7a20020, 0x8f630040, 0x3c048000, 0x24020020, 0xa3a70022,
+        0xa3a90023, 0xa3a2001a, 0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd,
+        0x00000000, 0x0a000533, 0x00000000, 0x8f620044, 0x01021023, 0x0440009e,
+        0x24020001, 0x8f620048, 0x01021023, 0x0441009a, 0x24020001, 0x97a20020,
+        0x27a60010, 0x34420001, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000,
+        0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x0a000533,
+        0x00000000, 0x3c026000, 0x8c424448, 0xaf620148, 0x8f630040, 0x00685823,
+        0x19600013, 0x00cb102a, 0x54400007, 0x314a00fe, 0x5566000c, 0x010b4021,
+        0x31420001, 0x54400009, 0x010b4021, 0x314a00fe, 0x24020001, 0xa7a20020,
+        0x8f630040, 0x00c05821, 0x00003021, 0x0a0004dd, 0xafa30028, 0x00cb1023,
+        0x0a0004dd, 0x3046ffff, 0x00005821, 0x8f620048, 0x2442ffff, 0x00a21823,
+        0x18600019, 0x0066102a, 0x14400013, 0x24020001, 0xa7a20020, 0x8f630040,
+        0xafa30028, 0x8f620040, 0x55020005, 0x27a60010, 0x55200003, 0x27a60010,
+        0x0a0004f6, 0x00c01821, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x00000000, 0x0a000533, 0x00000000, 0x8f650048, 0x00c31023,
+        0x3046ffff, 0x314a00f6, 0x3c046000, 0x8c824448, 0x31430002, 0x1060001e,
+        0xaf62014c, 0x8f620044, 0x1502000e, 0x97a20020, 0x27a60010, 0x34420200,
+        0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000, 0xafa30028, 0x8f4201b8,
+        0x00441024, 0x1440fffd, 0x00000000, 0x0a000533, 0x00000000, 0x27a60010,
+        0x34420001, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000, 0xafa30028,
+        0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x0a000533, 0x00000000,
+        0x3c026000, 0x8c424448, 0x31430010, 0xaf620150, 0x54600003, 0x8d890008,
+        0x0a00054e, 0x24020001, 0x8f630054, 0x2522ffff, 0x00431023, 0x1840002a,
+        0x24020001, 0x27a60010, 0xa7a20020, 0x8f630040, 0x27450180, 0x3c048000,
+        0xafa30028, 0x8f4201b8, 0x00441024, 0x1440fffd, 0x00000000, 0x8f420128,
+        0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018, 0x90c4000a,
+        0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010, 0x90c30012,
+        0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014, 0x8cc20024,
+        0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001, 0x3c031000,
+        0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a00067a, 0x8fbf0048,
+        0x3c026000, 0x8c424448, 0x31430020, 0x10600019, 0xaf620154, 0x8f430128,
+        0x27420180, 0xac430000, 0x8f650040, 0x24040004, 0x240340c1, 0xa4430008,
+        0x24030002, 0xa044000a, 0x24040008, 0xa043000b, 0x3c031000, 0xa4440010,
+        0xa0400012, 0xa0400013, 0xac400014, 0xac400024, 0xac400028, 0xac40002c,
+        0xac450018, 0x0e0007ed, 0xaf4301b8, 0x0a00067a, 0x8fbf0048, 0x8f430104,
+        0x8c824448, 0x38e3000a, 0x2c630001, 0xaf620158, 0x38e2000c, 0x2c420001,
+        0x00621825, 0x14600003, 0x2402000e, 0x14e2002a, 0x00000000, 0x50c00008,
+        0x9584000e, 0x10c00004, 0xa7a60040, 0x01061021, 0x0a000583, 0x2445ffff,
+        0x01002821, 0x9584000e, 0x93630035, 0x8f62004c, 0x00642004, 0x00892021,
+        0x00821023, 0x1840001f, 0x3c026000, 0x8f620018, 0x01021023, 0x1c40000f,
+        0x97a20020, 0x8f620018, 0x15020018, 0x3c026000, 0x8f62001c, 0x01221023,
+        0x1c400008, 0x97a20020, 0x8f62001c, 0x15220011, 0x3c026000, 0x8f620058,
+        0x00821023, 0x1840000c, 0x97a20020, 0xafa50028, 0xafa80034, 0xafa90038,
+        0xafa4003c, 0x34420020, 0x0a0005a8, 0xa7a20020, 0x8f680040, 0x00003021,
+        0x8f640058, 0x01002821, 0x3c026000, 0x8c434448, 0xaf63015c, 0x8f62004c,
+        0x01221023, 0x18400009, 0x00000000, 0x8f620054, 0x01221023, 0x1c400005,
+        0x97a20020, 0xafa50028, 0xafa90024, 0x0a0005c3, 0x34420040, 0x9742011a,
+        0x1440000c, 0x24020014, 0x8f620058, 0x14820009, 0x24020014, 0x8f63004c,
+        0x8f620054, 0x10620004, 0x97a20020, 0xafa50028, 0x34420080, 0xa7a20020,
+        0x24020014, 0x10e2000a, 0x28e20015, 0x10400005, 0x2402000c, 0x10e20006,
+        0x3c026000, 0x0a000600, 0x00000000, 0x24020016, 0x14e20031, 0x3c026000,
+        0x8f620054, 0x24420001, 0x1522002d, 0x3c026000, 0x24020014, 0x10e2001e,
+        0x28e20015, 0x10400005, 0x2402000c, 0x10e20008, 0x3c026000, 0x0a000600,
+        0x00000000, 0x24020016, 0x10e2000c, 0x97a20020, 0x0a000600, 0x3c026000,
+        0x97a30020, 0x2402000e, 0xafa50028, 0xa3a70022, 0xa3a20023, 0xafa90024,
+        0x34630054, 0x0a0005ff, 0xa7a30020, 0x24030010, 0x24040002, 0xafa50028,
+        0xa3a70022, 0xa3a30023, 0xa3a4001a, 0xafa90024, 0x0a0005fe, 0x3442005d,
+        0x97a20020, 0x24030012, 0x24040002, 0xafa50028, 0xa3a70022, 0xa3a30023,
+        0xa3a4001a, 0xafa90024, 0x3042fffe, 0x3442005c, 0xa7a20020, 0x3c026000,
+        0x8c434448, 0x31420001, 0xaf630160, 0x1040002c, 0x2402000c, 0x10e20014,
+        0x28e2000d, 0x10400005, 0x2402000a, 0x10e20008, 0x97a20020, 0x0a000631,
+        0x3c026000, 0x2402000e, 0x10e20018, 0x3c026000, 0x0a000631, 0x00000000,
+        0x24030008, 0x24040002, 0xafa50028, 0xa3a70022, 0xa3a30023, 0xa3a4001a,
+        0x0a00062f, 0x34420013, 0x97a30020, 0x30620004, 0x1440000b, 0x97a20020,
+        0x3462001b, 0xa7a20020, 0x24020016, 0x24030002, 0xafa50028, 0xa3a70022,
+        0xa3a20023, 0x0a000630, 0xa3a3001a, 0x97a20020, 0x24030010, 0x24040002,
+        0xafa50028, 0xa3a70022, 0xa3a30023, 0xa3a4001a, 0x3442001b, 0xa7a20020,
+        0x3c026000, 0x8c434448, 0x31420009, 0x0002102b, 0x00021023, 0x30420007,
+        0x34440003, 0xaf630164, 0x10c00016, 0x24030800, 0x8f820010, 0x27450180,
+        0x24420001, 0xaf820010, 0x24020004, 0xaf4301b8, 0xa4a40008, 0xa0a2000b,
+        0x93440120, 0x3c031000, 0xa4a6000e, 0xaca90024, 0xaca80028, 0x008b2021,
+        0xa4a4000c, 0xaf4301b8, 0x97a20020, 0x00003021, 0x3042ffbf, 0x0a000650,
+        0xa7a20020, 0x24060001, 0x3c026000, 0x8c434448, 0xaf630168, 0x97a20020,
+        0x10400020, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x8f420128, 0xaca20000, 0x8fa30028, 0x240240c1, 0xa4a20008,
+        0xaca30018, 0x93a4001a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x97a20020,
+        0xa4a20010, 0x93a30022, 0xa0a30012, 0x93a20023, 0xa0a20013, 0x8fa30024,
+        0xaca30014, 0x8fa20034, 0xaca20024, 0x8fa30038, 0xaca30028, 0x8fa2003c,
+        0x3c031000, 0xaca2002c, 0xaf4301b8, 0x3c026000, 0x8c434448, 0x00c01021,
+        0xaf63016c, 0x8fbf0048, 0x03e00008, 0x27bd0050, 0x8f460140, 0x8f470148,
+        0x3c028000, 0x00e24024, 0x00072c02, 0x30a300ff, 0x2402000b, 0x1062008f,
+        0x27440180, 0x2862000c, 0x10400011, 0x24020006, 0x1062005a, 0x28620007,
+        0x10400007, 0x24020008, 0x10600024, 0x24020001, 0x10620037, 0x00000000,
+        0x0a00077e, 0x00000000, 0x106200a9, 0x24020009, 0x106200bb, 0x00071c02,
+        0x0a00077e, 0x00000000, 0x2402001b, 0x106200c7, 0x2862001c, 0x10400007,
+        0x2402000e, 0x106200b1, 0x24020019, 0x106200c2, 0x00071c02, 0x0a00077e,
+        0x00000000, 0x24020080, 0x10620060, 0x28620081, 0x10400005, 0x2402001c,
+        0x10620094, 0x00071c02, 0x0a00077e, 0x00000000, 0x240200c2, 0x106200c5,
+        0x00a01821, 0x0a00077e, 0x00000000, 0x00a01821, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac860000,
+        0xac800004, 0xa082000a, 0xa083000b, 0xa4870010, 0x8f430144, 0x3c021000,
+        0xac800028, 0xac830024, 0x3c036000, 0xaf4201b8, 0x03e00008, 0xac600808,
+        0x11000009, 0x00a01821, 0x3c020800, 0x24030002, 0xa0434490, 0x24424490,
+        0xac460008, 0x8f430144, 0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x24020002, 0xac800000, 0xac860004, 0xa4830008,
+        0xa082000a, 0xa082000b, 0xa4870010, 0xac800024, 0x8f420144, 0x3c031000,
+        0xac820028, 0x3c026000, 0xaf4301b8, 0x03e00008, 0xac400808, 0x00a01821,
+        0x3c080800, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x00000000,
+        0xac860000, 0x91024490, 0x00002821, 0x10400002, 0x25064490, 0x8cc50008,
+        0xac850004, 0xa4830008, 0x91034490, 0x24020002, 0xa082000b, 0xa4870010,
+        0x34630001, 0xa083000a, 0x8f420144, 0xac820024, 0x91034490, 0x10600002,
+        0x00001021, 0x8cc20004, 0xac820028, 0x3c021000, 0xaf4201b8, 0x3c026000,
+        0xa1004490, 0x03e00008, 0xac400808, 0x00a01821, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x24020002, 0xa082000b, 0xa4830008, 0xa4870010,
+        0x8f420144, 0x3c031000, 0xa4820012, 0x03e00008, 0xaf4301b8, 0x30e2ffff,
+        0x14400028, 0x00071c02, 0x93620005, 0x30420004, 0x14400020, 0x3c029000,
+        0x34420001, 0x00c21025, 0xaf420020, 0x3c038000, 0x8f420020, 0x00431024,
+        0x1440fffd, 0x00000000, 0x93620005, 0x3c038000, 0x34630001, 0x00c31825,
+        0x34420004, 0xa3620005, 0xaf430020, 0x93620005, 0x30420004, 0x14400003,
+        0x3c038000, 0x0000000d, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020005, 0x3c031000, 0xac860000, 0xa082000b, 0xaf4301b8, 0x0a00073d,
+        0x00071c02, 0x0000000d, 0x03e00008, 0x00000000, 0x00071c02, 0x3c058000,
+        0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002,
+        0xac860000, 0xac800004, 0xa082000a, 0xa083000b, 0xa4870010, 0x8f430144,
+        0x3c021000, 0xac800028, 0xac830024, 0x03e00008, 0xaf4201b8, 0x00071c02,
+        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xac800000,
+        0xac860004, 0xa4830008, 0xa082000a, 0xa082000b, 0xa4870010, 0xac800024,
+        0x8f420144, 0x3c031000, 0xac820028, 0x03e00008, 0xaf4301b8, 0x00071c02,
+        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001, 0xa4830008,
+        0x24030002, 0xa082000a, 0x3c021000, 0xac860000, 0xac800004, 0xa083000b,
+        0xa4870010, 0xac800024, 0xac800028, 0x03e00008, 0xaf4201b8, 0x3c058000,
+        0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xac860000, 0xac800004,
+        0xa4830008, 0xa080000a, 0x0a000748, 0xa082000b, 0x0000000d, 0x03e00008,
+        0x00000000, 0x03e00008, 0x00000000, 0x8f420100, 0x3042003e, 0x14400011,
+        0x24020001, 0xaf400048, 0x8f420100, 0x304207c0, 0x10400005, 0x00000000,
+        0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001, 0xaf400054, 0xaf400040,
+        0x8f420100, 0x30423800, 0x54400001, 0xaf400044, 0x24020001, 0x03e00008,
+        0x00000000, 0x3c029000, 0x34420001, 0x00822025, 0xaf440020, 0x3c038000,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x03e00008, 0x00000000,
+        0x3c028000, 0x34420001, 0x00822025, 0x03e00008, 0xaf440020, 0x8f430128,
+        0x27420180, 0xac430000, 0x8f650040, 0x240340c1, 0xa4430008, 0x24030002,
+        0xa044000a, 0x24040008, 0xa043000b, 0x3c031000, 0xa4440010, 0xa0400012,
+        0xa0400013, 0xac400014, 0xac400024, 0xac400028, 0xac40002c, 0xac450018,
+        0x03e00008, 0xaf4301b8, 0x24020001, 0xacc40000, 0x03e00008, 0xa4e50000,
+        0x03e00008, 0x24020001, 0x24020001, 0xaf400044, 0x03e00008, 0xaf400050,
+        0x00803021, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008,
+        0xaca30018, 0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010,
+        0xa4a20010, 0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014,
+        0xaca30014, 0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc2002c,
+        0x3c031000, 0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044, 0x03e00008,
+        0xaf400050, 0x27bdffe8, 0xafbf0010, 0x0e000326, 0x00000000, 0x00002021,
+        0x0e00004c, 0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f460148,
+        0x27450180, 0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x00000000, 0x8f440140, 0x00061202, 0x304200ff, 0x00061c02,
+        0xaca20004, 0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b, 0xaca30024,
+        0x10e0000a, 0xaca40000, 0x28e20004, 0x14400005, 0x24020001, 0x24020005,
+        0x54e20005, 0xa0a0000a, 0x24020001, 0x0a000816, 0xa0a2000a, 0xa0a0000a,
+        0x3c021000, 0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021, 0x10c00007,
+        0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb,
+        0x24840004, 0x03e00008, 0x00000000, 0x0a00082a, 0x00a01021, 0xac860000,
+        0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008, 0x00000000,
+        0x00000000 }; 
+
+static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_RXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_RXP_b06FwBss[(0x239c/4) + 1] = { 0x00000000 };
+static u32 bnx2_RXP_b06FwSbss[(0x14/4) + 1] = { 0x00000000 };
+
+static u32 bnx2_rv2p_proc1[] = {
+        0x00000008, 0xac000001, 0x0000000c, 0x2f800001, 0x00000010, 0x213f0004,
+        0x00000010, 0x20bf002c, 0x00000010, 0x203f0143, 0x00000018, 0x8000fffd,
+        0x00000010, 0xb1b8b017, 0x0000000b, 0x2fdf0002, 0x00000000, 0x03d80000,
+        0x00000000, 0x2c380000, 0x00000008, 0x2c800000, 0x00000008, 0x2d000000,
+        0x00000010, 0x91d40000, 0x00000008, 0x2d800108, 0x00000008, 0x02000002,
+        0x00000010, 0x91de0000, 0x0000000f, 0x42e0001c, 0x00000010, 0x91840a08,
+        0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008, 0x00000008, 0x2d800150,
+        0x00000000, 0x00000000, 0x00000010, 0x91de0000, 0x00000010, 0x2c620002,
+        0x00000018, 0x80000012, 0x0000000b, 0x2fdf0002, 0x0000000c, 0x1f800002,
+        0x00000000, 0x2c070000, 0x00000018, 0x8000ffe6, 0x00000008, 0x02000002,
+        0x0000000f, 0x42e0001c, 0x00000010, 0x91840a08, 0x00000008, 0x2c8000b0,
+        0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800108,
+        0x00000000, 0x00000000, 0x00000010, 0x91de0000, 0x00000018, 0x80000004,
+        0x0000000c, 0x1f800002, 0x00000000, 0x00000000, 0x00000018, 0x8000ffd9,
+        0x0000000c, 0x29800002, 0x0000000c, 0x1f800002, 0x00000000, 0x2adf0000,
+        0x00000008, 0x2a000005, 0x00000018, 0x8000ffd4, 0x00000008, 0x02240030,
+        0x00000018, 0x00040000, 0x00000018, 0x80000015, 0x00000018, 0x80000017,
+        0x00000018, 0x8000001b, 0x00000018, 0x8000004c, 0x00000018, 0x8000008c,
+        0x00000018, 0x8000000f, 0x00000018, 0x8000000e, 0x00000018, 0x8000000d,
+        0x00000018, 0x8000000c, 0x00000018, 0x800000c2, 0x00000018, 0x8000000a,
+        0x00000018, 0x80000009, 0x00000018, 0x80000008, 0x00000018, 0x800000fd,
+        0x00000018, 0x80000006, 0x00000018, 0x80000005, 0x00000018, 0x800000ff,
+        0x00000018, 0x80000104, 0x00000018, 0x80000002, 0x00000018, 0x80000098,
+        0x00000018, 0x80000000, 0x0000000c, 0x1f800001, 0x00000000, 0x00000000,
+        0x00000018, 0x8000ffba, 0x00000010, 0x91d40000, 0x0000000c, 0x29800001,
+        0x0000000c, 0x1f800001, 0x00000008, 0x2a000002, 0x00000018, 0x8000ffb5,
+        0x00000010, 0xb1a0b012, 0x0000000b, 0x2fdf0002, 0x00000000, 0x2c200000,
+        0x00000008, 0x2c800000, 0x00000008, 0x2d000000, 0x00000010, 0x91d40000,
+        0x00000008, 0x2d80011c, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,
+        0x0000000f, 0x47600008, 0x0000000f, 0x060e0001, 0x00000010, 0x001f0000,
+        0x00000000, 0x0f580000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,
+        0x00000000, 0x0b660000, 0x00000000, 0x0d610000, 0x00000018, 0x80000013,
+        0x0000000f, 0x47600008, 0x0000000b, 0x2fdf0002, 0x00000008, 0x2c800000,
+        0x00000008, 0x2d000000, 0x00000010, 0x91d40000, 0x00000008, 0x2d80011c,
+        0x0000000f, 0x060e0001, 0x00000010, 0x001f0000, 0x00000000, 0x0f580000,
+        0x00000010, 0x91de0000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,
+        0x00000000, 0x0b660000, 0x00000000, 0x0d610000, 0x00000000, 0x02620000,
+        0x0000000b, 0x2fdf0002, 0x00000000, 0x309a0000, 0x00000000, 0x31040000,
+        0x00000000, 0x0c961800, 0x00000009, 0x0c99ffff, 0x00000004, 0xcc993400,
+        0x00000010, 0xb1963202, 0x00000008, 0x0f800000, 0x0000000c, 0x29800001,
+        0x00000010, 0x00220002, 0x0000000c, 0x29520001, 0x0000000c, 0x29520000,
+        0x00000008, 0x22000001, 0x0000000c, 0x1f800001, 0x00000000, 0x2adf0000,
+        0x00000008, 0x2a000003, 0x00000018, 0x8000ff83, 0x00000010, 0xb1a0b01d,
+        0x0000000b, 0x2fdf0002, 0x00000000, 0x2c200000, 0x00000008, 0x2c8000b0,
+        0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800150,
+        0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800000,
+        0x00000008, 0x2d000000, 0x00000008, 0x2d800108, 0x00000000, 0x00000000,
+        0x00000010, 0x91de0000, 0x0000000f, 0x47600008, 0x00000000, 0x060e0000,
+        0x00000010, 0x001f0000, 0x00000000, 0x0f580000, 0x00000010, 0x91de0000,
+        0x00000000, 0x0a640000, 0x00000000, 0x0ae50000, 0x00000000, 0x0b670000,
+        0x00000000, 0x0d620000, 0x00000000, 0x0ce71800, 0x00000009, 0x0c99ffff,
+        0x00000004, 0xcc993400, 0x00000010, 0xb1963220, 0x00000008, 0x0f800000,
+        0x00000018, 0x8000001e, 0x0000000f, 0x47600008, 0x0000000b, 0x2fdf0002,
+        0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008, 0x00000010, 0x91d40000,
+        0x00000008, 0x2d80012c, 0x0000000f, 0x060e0001, 0x00000010, 0x001f0000,
+        0x00000000, 0x0f580000, 0x00000010, 0x91de0000, 0x00000000, 0x0a640000,
+        0x00000000, 0x0ae50000, 0x00000000, 0x0b670000, 0x00000000, 0x0d620000,
+        0x00000000, 0x02630000, 0x0000000f, 0x47620010, 0x00000000, 0x0ce71800,
+        0x0000000b, 0x2fdf0002, 0x00000000, 0x311a0000, 0x00000000, 0x31840000,
+        0x0000000b, 0xc20000ff, 0x00000002, 0x42040000, 0x00000001, 0x31620800,
+        0x0000000f, 0x020e0010, 0x00000002, 0x31620800, 0x00000009, 0x0c99ffff,
+        0x00000004, 0xcc993400, 0x00000010, 0xb1963202, 0x00000008, 0x0f800000,
+        0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x0000000c, 0x61420006,
+        0x00000008, 0x22000008, 0x00000000, 0x2adf0000, 0x00000008, 0x2a000004,
+        0x00000018, 0x8000ff42, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,
+        0x00000010, 0x91a0b008, 0x00000010, 0x91d40000, 0x0000000c, 0x31620018,
+        0x00000008, 0x2d800001, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,
+        0x00000008, 0xac000001, 0x00000018, 0x8000000e, 0x00000000, 0x0380b000,
+        0x0000000b, 0x2fdf0002, 0x00000000, 0x2c004000, 0x00000010, 0x91d40000,
+        0x00000008, 0x2d800101, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,
+        0x0000000c, 0x31620018, 0x00000008, 0x2d800001, 0x00000000, 0x00000000,
+        0x00000010, 0x91de0000, 0x0000000b, 0x2fdf0002, 0x00000000, 0x2c000e00,
+        0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000008, 0x2a000007,
+        0x00000018, 0x8000ff27, 0x00000010, 0xb1a0b016, 0x0000000b, 0x2fdf0002,
+        0x00000000, 0x03d80000, 0x00000000, 0x2c200000, 0x00000008, 0x2c8000b0,
+        0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800150,
+        0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800000,
+        0x00000008, 0x2d000000, 0x00000008, 0x2d800108, 0x00000008, 0x07000001,
+        0x00000010, 0xb5de1c00, 0x00000010, 0x2c620002, 0x00000018, 0x8000000a,
+        0x0000000b, 0x2fdf0002, 0x00000000, 0x2c070000, 0x0000000c, 0x1f800001,
+        0x00000010, 0x91de0000, 0x00000018, 0x8000ff11, 0x00000008, 0x2c8000b0,
+        0x00000008, 0x2d000008, 0x00000010, 0x91d40000, 0x00000008, 0x2d800108,
+        0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000010, 0x91de0000,
+        0x00000000, 0x2adf0000, 0x00000008, 0x2a00000a, 0x00000018, 0x8000ff07,
+        0x00000000, 0x82265600, 0x0000000f, 0x47220008, 0x00000009, 0x070e000f,
+        0x00000008, 0x070e0008, 0x00000008, 0x02800001, 0x00000007, 0x02851c00,
+        0x00000008, 0x82850001, 0x00000000, 0x02840a00, 0x00000007, 0x42851c00,
+        0x00000003, 0xc3aa5200, 0x00000000, 0x03b10e00, 0x00000010, 0x001f0000,
+        0x0000000f, 0x0f280007, 0x00000007, 0x4b071c00, 0x00000000, 0x00000000,
+        0x0000000f, 0x0a960003, 0x00000000, 0x0a955c00, 0x00000000, 0x4a005a00,
+        0x00000000, 0x0c960a00, 0x00000009, 0x0c99ffff, 0x00000008, 0x0d00ffff,
+        0x00000010, 0xb1963202, 0x00000008, 0x0f800005, 0x00000010, 0x00220020,
+        0x00000000, 0x02a70000, 0x00000010, 0xb1850002, 0x00000008, 0x82850200,
+        0x00000000, 0x02000000, 0x00000000, 0x03a60000, 0x00000018, 0x8000004e,
+        0x00000000, 0x072b0000, 0x00000001, 0x878c1c00, 0x00000000, 0x870e1e00,
+        0x00000000, 0x860c1e00, 0x00000000, 0x03061e00, 0x00000010, 0xb18e0003,
+        0x00000018, 0x80000047, 0x00000018, 0x8000fffa, 0x00000010, 0x918c0003,
+        0x00000010, 0xb1870002, 0x00000018, 0x80000043, 0x00000010, 0x91d40000,
+        0x0000000c, 0x29800001, 0x00000000, 0x2a860000, 0x00000000, 0x230c0000,
+        0x00000000, 0x2b070000, 0x00000010, 0xb187000e, 0x00000008, 0x2a000008,
+        0x00000018, 0x8000003b, 0x00000010, 0x91d40000, 0x00000000, 0x28d18c00,
+        0x00000000, 0x2a860000, 0x00000000, 0x230c0000, 0x00000000, 0x2b070000,
+        0x00000018, 0x8000fff8, 0x00000010, 0x91d40000, 0x0000000c, 0x29800001,
+        0x00000000, 0x2aab0000, 0x00000000, 0xa3265600, 0x00000000, 0x2b000000,
+        0x0000000c, 0x1f800001, 0x00000008, 0x2a000008, 0x00000018, 0x8000fec8,
+        0x00000010, 0x91d40000, 0x0000000c, 0x29800001, 0x0000000c, 0x1f800001,
+        0x00000008, 0x2a000009, 0x00000018, 0x8000fec3, 0x00000010, 0x91d40000,
+        0x0000000c, 0x29800001, 0x0000000c, 0x1f800001, 0x00000000, 0x29420000,
+        0x00000008, 0x2a000002, 0x00000018, 0x8000febd, 0x00000018, 0x8000febc,
+        0x00000010, 0xb1bcb016, 0x0000000b, 0x2fdf0002, 0x00000000, 0x03d80000,
+        0x00000000, 0x2c3c0000, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,
+        0x00000010, 0x91d40000, 0x00000008, 0x2d800150, 0x00000000, 0x00000000,
+        0x00000010, 0x205f0000, 0x00000008, 0x2c800000, 0x00000008, 0x2d000000,
+        0x00000008, 0x2d800108, 0x00000008, 0x07000001, 0x00000010, 0xb5de1c00,
+        0x00000010, 0x2c620002, 0x00000018, 0x8000000a, 0x0000000b, 0x2fdf0002,
+        0x00000000, 0x2c070000, 0x0000000c, 0x1f800000, 0x00000010, 0x91de0000,
+        0x00000018, 0x8000fea6, 0x00000008, 0x2c8000b0, 0x00000008, 0x2d000008,
+        0x00000010, 0x91d40000, 0x00000008, 0x2d800108, 0x0000000c, 0x29800000,
+        0x0000000c, 0x1f800000, 0x00000010, 0x91de0000, 0x00000000, 0x2adf0000,
+        0x00000008, 0x2a000006, 0x00000018, 0x8000fe9c, 0x00000008, 0x03050004,
+        0x00000006, 0x83040c00, 0x00000008, 0x02850200, 0x00000000, 0x86050c00,
+        0x00000001, 0x860c0e00, 0x00000008, 0x02040004, 0x00000000, 0x02041800,
+        0x00000000, 0x83871800, 0x00000018, 0x00020000 };
+
+static u32 bnx2_rv2p_proc2[] = {
+        0x00000000, 0x2a000000, 0x00000010, 0xb1d40000, 0x00000008, 0x02540003,
+        0x00000018, 0x00040000, 0x00000018, 0x8000000a, 0x00000018, 0x8000000a,
+        0x00000018, 0x8000000e, 0x00000018, 0x80000056, 0x00000018, 0x800001b9,
+        0x00000018, 0x800001e1, 0x00000018, 0x8000019b, 0x00000018, 0x800001f9,
+        0x00000018, 0x8000019f, 0x00000018, 0x800001a6, 0x00000018, 0x80000000,
+        0x0000000c, 0x29800001, 0x00000000, 0x2a000000, 0x0000000c, 0x29800000,
+        0x00000010, 0x20530000, 0x00000018, 0x8000ffee, 0x0000000c, 0x29800001,
+        0x00000010, 0x91de0000, 0x00000010, 0x001f0000, 0x00000000, 0x2f80aa00,
+        0x00000000, 0x2a000000, 0x00000000, 0x0d610000, 0x00000000, 0x03620000,
+        0x00000000, 0x2c400000, 0x00000000, 0x02638c00, 0x00000000, 0x26460000,
+        0x00000010, 0x00420002, 0x00000008, 0x02040012, 0x00000010, 0xb9060836,
+        0x00000000, 0x0f580000, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,
+        0x00000000, 0x0b660000, 0x00000000, 0x0c000000, 0x00000000, 0x0b800000,
+        0x00000010, 0x00420009, 0x00000008, 0x0cc60012, 0x00000008, 0x0f800003,
+        0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000008, 0x27110012,
+        0x00000000, 0x66900000, 0x00000008, 0xa31b0012, 0x00000018, 0x80000008,
+        0x00000000, 0x0cc60000, 0x00000008, 0x0f800003, 0x00000000, 0x00000000,
+        0x00000010, 0x009f0000, 0x00000000, 0x27110000, 0x00000000, 0x66900000,
+        0x00000000, 0x231b0000, 0x00000010, 0xb197320e, 0x00000000, 0x25960000,
+        0x00000000, 0x021b0000, 0x00000010, 0x001f0000, 0x00000008, 0x0f800003,
+        0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000000, 0x22c50800,
+        0x00000010, 0x009f0000, 0x00000000, 0x27002200, 0x00000000, 0x26802000,
+        0x00000000, 0x231b0000, 0x0000000c, 0x69520001, 0x00000018, 0x8000fff3,
+        0x00000010, 0x01130002, 0x00000010, 0xb1980003, 0x00000010, 0x001f0000,
+        0x00000008, 0x0f800004, 0x00000008, 0x22000003, 0x00000008, 0x2c80000c,
+        0x00000008, 0x2d00000c, 0x00000010, 0x009f0000, 0x00000000, 0x25960000,
+        0x0000000c, 0x29800000, 0x00000000, 0x32140000, 0x00000000, 0x32950000,
+        0x00000000, 0x33160000, 0x00000000, 0x31e32e00, 0x00000008, 0x2d800010,
+        0x00000010, 0x20530000, 0x00000018, 0x8000ffac, 0x00000000, 0x23000000,
+        0x00000000, 0x25e60000, 0x00000008, 0x2200000b, 0x0000000c, 0x69520000,
+        0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000018, 0x8000ffa5,
+        0x0000000c, 0x29800001, 0x00000010, 0x91de0000, 0x00000000, 0x2fd50000,
+        0x00000010, 0x001f0000, 0x00000000, 0x02700000, 0x00000000, 0x0d620000,
+        0x00000000, 0xbb630800, 0x00000000, 0x2a000000, 0x00000009, 0x076000ff,
+        0x0000000f, 0x2c0e0007, 0x00000008, 0x2c800000, 0x00000008, 0x2d000064,
+        0x00000008, 0x2d80011c, 0x00000009, 0x06420002, 0x0000000c, 0x61420001,
+        0x00000000, 0x0f400000, 0x00000000, 0x02d08c00, 0x00000000, 0x23000000,
+        0x00000004, 0x826da000, 0x00000000, 0x8304a000, 0x00000000, 0x22c50c00,
+        0x00000000, 0x03760000, 0x00000004, 0x83860a00, 0x00000000, 0x83870c00,
+        0x00000010, 0x91de0000, 0x00000000, 0x037c0000, 0x00000000, 0x837b0c00,
+        0x00000001, 0x83060e00, 0x00000000, 0x83870c00, 0x00000000, 0x82850e00,
+        0x00000010, 0xb1860016, 0x0000000f, 0x47610018, 0x00000000, 0x068e0000,
+        0x0000000f, 0x47670010, 0x0000000f, 0x47e20010, 0x00000000, 0x870e1e00,
+        0x00000010, 0xb70e1a10, 0x00000010, 0x0ce7000e, 0x00000008, 0x22000009,
+        0x00000000, 0x286d0000, 0x0000000f, 0x65680010, 0x00000003, 0xf66c9400,
+        0x00000010, 0xb972a003, 0x0000000c, 0x73e70019, 0x0000000c, 0x21420004,
+        0x00000018, 0x8000023f, 0x00000000, 0x37ed0000, 0x0000000c, 0x73e7001a,
+        0x00000010, 0x20530000, 0x00000008, 0x22000008, 0x0000000c, 0x61420004,
+        0x00000000, 0x02f60000, 0x00000004, 0x82840a00, 0x00000010, 0xb1840a2b,
+        0x00000010, 0x2d67000a, 0x00000010, 0xb96d0804, 0x00000004, 0xb6ed0a00,
+        0x00000000, 0x37ed0000, 0x00000018, 0x80000029, 0x0000000c, 0x61420000,
+        0x00000000, 0x37040000, 0x00000000, 0x37850000, 0x0000000c, 0x33e7001a,
+        0x00000018, 0x80000024, 0x00000010, 0xb96d0809, 0x00000004, 0xb6ed0a00,
+        0x00000000, 0x036d0000, 0x00000004, 0xb76e0c00, 0x00000010, 0x91ee0c1f,
+        0x0000000c, 0x73e7001a, 0x00000004, 0xb6ef0c00, 0x00000000, 0x37ed0000,
+        0x00000018, 0x8000001b, 0x0000000c, 0x61420000, 0x00000010, 0xb7ee0a05,
+        0x00000010, 0xb96f0815, 0x00000003, 0xb76e0800, 0x00000004, 0xb7ef0a00,
+        0x00000018, 0x80000015, 0x00000010, 0x0ce7000c, 0x00000008, 0x22000009,
+        0x00000000, 0x286d0000, 0x0000000f, 0x65680010, 0x00000003, 0xf66c9400,
+        0x00000010, 0xb972a003, 0x0000000c, 0x73e70019, 0x0000000c, 0x21420004,
+        0x00000018, 0x80000215, 0x00000010, 0x20530000, 0x00000008, 0x22000008,
+        0x0000000c, 0x61420004, 0x00000000, 0x37040000, 0x00000000, 0x37850000,
+        0x00000000, 0x036d0000, 0x00000003, 0xb8f10c00, 0x00000018, 0x80000004,
+        0x00000000, 0x02840000, 0x00000002, 0x21421800, 0x0000000c, 0x61420000,
+        0x00000000, 0x286d0000, 0x0000000f, 0x65ed0010, 0x00000009, 0x266dffff,
+        0x00000000, 0x23000000, 0x00000010, 0xb1840a3d, 0x00000010, 0x01420002,
+        0x00000004, 0xb8f10a00, 0x00000003, 0x83760a00, 0x00000010, 0xb8040c39,
+        0x00000010, 0xb7e6080a, 0x00000000, 0x0a640000, 0x00000000, 0x0ae50000,
+        0x00000009, 0x0c68ffff, 0x00000009, 0x0b67ffff, 0x00000000, 0x0be60000,
+        0x00000000, 0x0c840000, 0x00000010, 0xb197320c, 0x00000008, 0x0f800002,
+        0x00000018, 0x8000000a, 0x00000000, 0x0a6a0000, 0x00000000, 0x0aeb0000,
+        0x00000000, 0x0c000000, 0x00000009, 0x0b6cffff, 0x00000000, 0x0be90000,
+        0x00000000, 0x0c840000, 0x00000010, 0xb1973203, 0x00000008, 0x0f800002,
+        0x00000018, 0x80000001, 0x00000010, 0x001f0000, 0x00000000, 0x0c860000,
+        0x00000000, 0x06980000, 0x00000008, 0x0f800003, 0x00000000, 0x00000000,
+        0x00000010, 0x009f0000, 0x00000010, 0xb1973210, 0x00000000, 0x231b0000,
+        0x00000000, 0x02043600, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,
+        0x00000009, 0x2607ffff, 0x00000000, 0x27111a00, 0x00000000, 0x66900000,
+        0x0000000c, 0x29000000, 0x00000018, 0x800001de, 0x00000000, 0x06980000,
+        0x00000010, 0x20530000, 0x00000000, 0x22c58c00, 0x00000010, 0x001f0000,
+        0x00000008, 0x0f800003, 0x00000018, 0x8000fff0, 0x00000000, 0x02043600,
+        0x00000000, 0x231b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,
+        0x00000009, 0x2607ffff, 0x00000000, 0x27111a00, 0x00000000, 0x66900000,
+        0x0000000c, 0x29000000, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,
+        0x00000000, 0x32140000, 0x00000000, 0x32950000, 0x00000005, 0x73e72c00,
+        0x00000005, 0x74683000, 0x00000000, 0x33170000, 0x00000018, 0x80000138,
+        0x00000010, 0x91c60004, 0x00000008, 0x07000004, 0x00000010, 0xb1c41c02,
+        0x00000010, 0x91840a04, 0x00000018, 0x800001c3, 0x00000010, 0x20530000,
+        0x00000000, 0x22c58c00, 0x00000010, 0xb1840a8e, 0x0000000c, 0x21420006,
+        0x00000010, 0x0ce7001a, 0x0000000f, 0x43680010, 0x00000000, 0x03f30c00,
+        0x00000010, 0x91870850, 0x0000000f, 0x46ec0010, 0x00000010, 0xb68d0c4e,
+        0x00000000, 0x838d0c00, 0x00000000, 0xa3050800, 0x00000001, 0xa3460e00,
+        0x00000000, 0x02048c00, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,
+        0x00000010, 0x001f0000, 0x00000008, 0x22000008, 0x00000003, 0x8384a000,
+        0x0000000f, 0x65870010, 0x00000009, 0x2607ffff, 0x00000000, 0x27750c00,
+        0x00000000, 0x66f40000, 0x0000000c, 0x29000000, 0x00000018, 0x800001aa,
+        0x00000000, 0x03068c00, 0x00000003, 0xf4680c00, 0x00000010, 0x20530000,
+        0x00000000, 0x22c58c00, 0x00000018, 0x8000ffe5, 0x00000000, 0x39760000,
+        0x00000000, 0x39840000, 0x0000000c, 0x33e70019, 0x00000010, 0x001f0000,
+        0x00000000, 0x031e0000, 0x00000000, 0x0760fe00, 0x0000000f, 0x0f0e0007,
+        0x00000000, 0x83850800, 0x00000000, 0x0a7d0000, 0x00000000, 0x0afe0000,
+        0x00000000, 0x0b7f0000, 0x00000000, 0x0d7a0000, 0x00000000, 0x0c000000,
+        0x00000000, 0x0bfc0000, 0x00000000, 0x0c970e00, 0x00000008, 0x0f800003,
+        0x0000000f, 0x47670010, 0x00000008, 0x070e0001, 0x0000000b, 0xc38000ff,
+        0x00000002, 0x43870000, 0x00000001, 0x33e70e00, 0x0000000f, 0x038e0010,
+        0x00000002, 0x33e70e00, 0x00000000, 0x28f30000, 0x00000010, 0x009f0000,
+        0x00000000, 0x02043600, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,
+        0x00000008, 0x22000006, 0x00000000, 0x231b0000, 0x00000000, 0x23ff0000,
+        0x00000000, 0x241b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,
+        0x00000009, 0x2607ffff, 0x00000000, 0x27110000, 0x00000000, 0x26900000,
+        0x0000000c, 0x29000000, 0x00000018, 0x8000017e, 0x00000003, 0xf4683600,
+        0x00000000, 0x3a100000, 0x00000000, 0x3a910000, 0x00000003, 0xf66c2400,
+        0x00000010, 0x001f0000, 0x00000010, 0xb1923604, 0x00000008, 0x0f800004,
+        0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000000, 0x3e170000,
+        0x00000000, 0x3e940000, 0x00000000, 0x3f150000, 0x00000000, 0x3f960000,
+        0x00000010, 0x001f0000, 0x00000000, 0x0f060000, 0x00000010, 0x20530000,
+        0x00000000, 0x22c53600, 0x00000018, 0x8000ffac, 0x00000010, 0x001f0000,
+        0x00000000, 0x031e0000, 0x00000000, 0x83850800, 0x00000009, 0x076000ff,
+        0x0000000f, 0x0f0e0007, 0x00000000, 0x0c000000, 0x00000000, 0x0a7d0000,
+        0x00000000, 0x0afe0000, 0x00000000, 0x0b7f0000, 0x00000000, 0x0d7a0000,
+        0x00000000, 0x0bfc0000, 0x00000000, 0x0c970e00, 0x00000008, 0x0f800003,
+        0x0000000f, 0x47670010, 0x00000008, 0x070e0001, 0x0000000b, 0xc38000ff,
+        0x00000002, 0x43870000, 0x00000001, 0x33e70e00, 0x0000000f, 0x038e0010,
+        0x00000002, 0x33e70e00, 0x00000000, 0x39840000, 0x00000003, 0xb9720800,
+        0x00000000, 0x28f30000, 0x0000000f, 0x65680010, 0x00000010, 0x009f0000,
+        0x00000000, 0x02043600, 0x00000010, 0x91840a02, 0x00000002, 0x21421800,
+        0x00000008, 0x22000007, 0x00000000, 0x231b0000, 0x00000000, 0x23ff0000,
+        0x00000000, 0x241b0000, 0x00000003, 0x8384a000, 0x0000000f, 0x65870010,
+        0x00000009, 0x2607ffff, 0x00000000, 0x27110000, 0x00000000, 0x26900000,
+        0x0000000c, 0x29000000, 0x00000018, 0x80000145, 0x00000003, 0xf4683600,
+        0x00000000, 0x3a100000, 0x00000000, 0x3a910000, 0x00000003, 0xf66c2400,
+        0x00000010, 0x001f0000, 0x00000010, 0xb1923604, 0x00000008, 0x0f800004,
+        0x00000000, 0x00000000, 0x00000010, 0x009f0000, 0x00000000, 0x3e170000,
+        0x00000000, 0x3e940000, 0x00000000, 0x3f150000, 0x00000000, 0x3f960000,
+        0x00000010, 0x001f0000, 0x00000000, 0x0f060000, 0x00000010, 0x20530000,
+        0x00000000, 0x22c53600, 0x00000018, 0x8000ff73, 0x00000010, 0x0ce70005,
+        0x00000008, 0x2c80000c, 0x00000008, 0x2d000070, 0x00000008, 0x2d800010,
+        0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000018, 0x8000011d,
+        0x00000000, 0x2c1e0000, 0x00000008, 0x2c8000b8, 0x00000008, 0x2d000010,
+        0x00000008, 0x2d800048, 0x00000000, 0x00000000, 0x00000010, 0x91de0000,
+        0x00000018, 0x8000fe5d, 0x0000000c, 0x29800001, 0x00000000, 0x2a000000,
+        0x00000010, 0x001f0000, 0x00000000, 0x0f008000, 0x00000008, 0x0f800007,
+        0x00000018, 0x80000006, 0x0000000c, 0x29800001, 0x00000000, 0x2a000000,
+        0x00000010, 0x001f0000, 0x0000000f, 0x0f470007, 0x00000008, 0x0f800008,
+        0x00000018, 0x80000119, 0x00000010, 0x20530000, 0x00000018, 0x8000fe4f,
+        0x0000000c, 0x29800001, 0x00000010, 0x91de0000, 0x00000000, 0x2fd50000,
+        0x00000000, 0x2a000000, 0x00000009, 0x0261ffff, 0x0000000d, 0x70e10001,
+        0x00000018, 0x80000101, 0x00000000, 0x2c400000, 0x00000008, 0x2c8000c4,
+        0x00000008, 0x2d00001c, 0x00000008, 0x2d800001, 0x00000005, 0x70e10800,
+        0x00000010, 0x91de0000, 0x00000018, 0x8000fe41, 0x0000000c, 0x29800001,
+        0x00000010, 0x91de0000, 0x00000000, 0x2fd50000, 0x00000010, 0x001f0000,
+        0x00000000, 0x02700000, 0x00000000, 0x0d620000, 0x00000000, 0xbb630800,
+        0x00000000, 0x2a000000, 0x00000000, 0x0f400000, 0x00000000, 0x2c400000,
+        0x0000000c, 0x73e7001b, 0x00000010, 0x0ce7000e, 0x00000000, 0x286d0000,
+        0x0000000f, 0x65ed0010, 0x00000009, 0x266dffff, 0x00000018, 0x80000069,
+        0x00000008, 0x02000004, 0x00000010, 0x91c40803, 0x00000018, 0x800000f6,
+        0x00000010, 0x20530000, 0x00000018, 0x800000e5, 0x00000008, 0x2c8000b8,
+        0x00000008, 0x2d000010, 0x00000008, 0x2d800048, 0x00000018, 0x80000005,
+        0x00000008, 0x2c8000c4, 0x00000008, 0x2d00001c, 0x00000008, 0x2d800001,
+        0x00000000, 0x00000000, 0x00000010, 0x205f0000, 0x00000008, 0x2c800048,
+        0x00000008, 0x2d000068, 0x00000008, 0x2d800104, 0x00000000, 0x00000000,
+        0x00000010, 0x91de0000, 0x00000000, 0x27f60000, 0x00000010, 0xb87a9e04,
+        0x00000008, 0x2200000d, 0x00000018, 0x800000e2, 0x00000010, 0x20530000,
+        0x00000018, 0x8000fe18, 0x0000000c, 0x29800001, 0x00000010, 0x91de0000,
+        0x00000000, 0x2fd50000, 0x00000010, 0x001f0000, 0x00000000, 0x02700000,
+        0x00000000, 0x0d620000, 0x00000000, 0xbb630800, 0x00000000, 0x2a000000,
+        0x00000010, 0x0e670011, 0x00000000, 0x286d0000, 0x0000000f, 0x65ed0010,
+        0x00000009, 0x266dffff, 0x00000004, 0xb8f1a000, 0x00000000, 0x0f400000,
+        0x0000000c, 0x73e7001c, 0x00000018, 0x80000040, 0x00000008, 0x02000004,
+        0x00000010, 0x91c40802, 0x00000018, 0x800000cd, 0x00000000, 0x2c1e0000,
+        0x00000008, 0x2c8000b8, 0x00000008, 0x2d000010, 0x00000008, 0x2d800048,
+        0x00000010, 0x20530000, 0x00000010, 0x91de0000, 0x00000018, 0x8000fdfe,
+        0x0000000c, 0x29800001, 0x00000000, 0x03550000, 0x00000000, 0x06460000,
+        0x00000000, 0x03d60000, 0x00000000, 0x2a000000, 0x0000000f, 0x0f480007,
+        0x00000010, 0xb18c0027, 0x0000000f, 0x47420008, 0x00000009, 0x070e000f,
+        0x00000008, 0x070e0008, 0x00000010, 0x001f0000, 0x00000008, 0x09000001,
+        0x00000007, 0x09121c00, 0x00000003, 0xcbca9200, 0x00000000, 0x0b97a200,
+        0x00000007, 0x4b171c00, 0x0000000f, 0x0a960003, 0x00000000, 0x0a959c00,
+        0x00000000, 0x4a009a00, 0x00000008, 0x82120001, 0x00000001, 0x0c170800,
+        0x00000000, 0x02180000, 0x00000000, 0x0c971800, 0x00000008, 0x0d00ffff,
+        0x00000008, 0x0f800006, 0x0000000c, 0x29000000, 0x00000008, 0x22000001,
+        0x00000000, 0x22c50c00, 0x00000010, 0x009f0000, 0x00000010, 0xb197320b,
+        0x00000000, 0x231b0000, 0x00000000, 0x27110800, 0x00000000, 0x66900000,
+        0x00000018, 0x800000a4, 0x00000000, 0x02180000, 0x00000010, 0x20530000,
+        0x00000000, 0x22c53600, 0x00000010, 0x001f0000, 0x00000008, 0x0f800006,
+        0x00000018, 0x8000fff5, 0x00000010, 0x91870002, 0x00000008, 0x2200000a,
+        0x00000000, 0x231b0000, 0x00000000, 0x27110800, 0x00000000, 0x66900000,
+        0x00000018, 0x80000098, 0x00000008, 0x0200000a, 0x00000010, 0x91c40804,
+        0x00000010, 0x02c20003, 0x00000010, 0x001f0000, 0x00000008, 0x0f800008,
+        0x00000010, 0x20530000, 0x00000018, 0x8000fdc9, 0x00000000, 0x06820000,
+        0x00000010, 0x001f0000, 0x00000010, 0x0ce70028, 0x00000000, 0x03720000,
+        0x00000000, 0xa8760c00, 0x00000000, 0x0cf60000, 0x00000010, 0xb8723224,
+        0x00000000, 0x03440000, 0x00000008, 0x22000010, 0x00000000, 0x03ca0000,
+        0x0000000f, 0x65680010, 0x00000000, 0x0bcf0000, 0x00000000, 0x27f20000,
+        0x00000010, 0xb7ef3203, 0x0000000c, 0x21420004, 0x0000000c, 0x73e70019,
+        0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x00000018, 0x8000007e,
+        0x00000004, 0xb9723200, 0x00000010, 0x20530000, 0x00000000, 0x22060000,
+        0x0000000c, 0x61420004, 0x00000000, 0x25070000, 0x00000000, 0x27970000,
+        0x00000000, 0x290e0000, 0x00000010, 0x0ce70010, 0x00000010, 0xb873320f,
+        0x0000000f, 0x436c0010, 0x00000000, 0x03f30c00, 0x00000000, 0x03f30000,
+        0x00000000, 0x83990e00, 0x00000001, 0x83860e00, 0x00000000, 0x83060e00,
+        0x00000003, 0xf66c0c00, 0x00000000, 0x39f30e00, 0x00000000, 0x3af50e00,
+        0x00000000, 0x7a740000, 0x0000000f, 0x43680010, 0x00000001, 0x83860e00,
+        0x00000000, 0x83060e00, 0x00000003, 0xf4680c00, 0x00000000, 0x286d0000,
+        0x00000000, 0x03690000, 0x00000010, 0xb1f60c54, 0x00000000, 0x0a6a0000,
+        0x00000000, 0x0aeb0000, 0x00000009, 0x0b6cffff, 0x00000000, 0x0c000000,
+        0x00000000, 0x0be90000, 0x00000003, 0x8cf6a000, 0x0000000c, 0x09800002,
+        0x00000010, 0x009f0000, 0x00000010, 0xb8173209, 0x00000000, 0x35140000,
+        0x00000000, 0x35950000, 0x00000005, 0x766c2c00, 0x00000000, 0x34970000,
+        0x00000004, 0xb8f12e00, 0x00000010, 0x001f0000, 0x00000008, 0x0f800004,
+        0x00000018, 0x8000fff7, 0x00000000, 0x03e90000, 0x00000010, 0xb8f6a01a,
+        0x00000010, 0x20130019, 0x00000010, 0xb1f10e18, 0x00000000, 0x83973200,
+        0x00000000, 0x38700e00, 0x00000000, 0xbb760e00, 0x00000000, 0x37d00000,
+        0x0000000c, 0x73e7001a, 0x00000003, 0xb8f1a000, 0x00000000, 0x32140000,
+        0x00000000, 0x32950000, 0x00000005, 0x73e72c00, 0x00000000, 0x33190000,
+        0x00000005, 0x74680000, 0x00000010, 0x0ce7000d, 0x00000008, 0x22000009,
+        0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x0000000c, 0x73e70019,
+        0x0000000f, 0x65680010, 0x0000000c, 0x21420004, 0x00000018, 0x8000003c,
+        0x00000010, 0x20530000, 0x0000000c, 0x61420004, 0x00000000, 0x290e0000,
+        0x00000018, 0x80000002, 0x00000010, 0x91973206, 0x00000000, 0x35140000,
+        0x00000000, 0x35950000, 0x00000005, 0x766c2c00, 0x00000000, 0x34990000,
+        0x00000004, 0xb8f13200, 0x00000000, 0x83690c00, 0x00000010, 0xb1860013,
+        0x00000000, 0x28e90000, 0x00000008, 0x22000004, 0x00000000, 0x23ec0000,
+        0x00000000, 0x03690000, 0x00000010, 0xb8660c07, 0x00000009, 0x036cffff,
+        0x00000000, 0x326a0000, 0x00000000, 0x32eb0000, 0x00000005, 0x73e70c00,
+        0x00000000, 0x33690000, 0x00000005, 0x74680000, 0x0000000c, 0x73e7001c,
+        0x00000000, 0x03690000, 0x00000010, 0xb1f60c12, 0x00000010, 0xb1d00c11,
+        0x0000000c, 0x21420005, 0x0000000c, 0x33e7001c, 0x00000018, 0x8000000e,
+        0x00000010, 0x2e67000d, 0x00000000, 0x03690000, 0x00000010, 0xb1f60c0b,
+        0x00000010, 0xb1d00c0a, 0x00000000, 0x03440000, 0x00000008, 0x2200000c,
+        0x00000000, 0x07520000, 0x00000000, 0x29000000, 0x00000018, 0x80000015,
+        0x0000000c, 0x33e7001c, 0x00000010, 0x20530000, 0x00000000, 0x22060000,
+        0x00000000, 0x290e0000, 0x00000018, 0x000d0000, 0x00000000, 0x06820000,
+        0x00000010, 0x2de7000d, 0x00000010, 0x0ce7000c, 0x00000000, 0x27f20000,
+        0x00000010, 0xb96d9e0a, 0x00000000, 0xa86d9e00, 0x00000009, 0x0361ffff,
+        0x00000010, 0xb7500c07, 0x00000008, 0x2200000f, 0x0000000f, 0x65680010,
+        0x00000000, 0x29000000, 0x00000018, 0x80000004, 0x0000000c, 0x33e7001b,
+        0x00000010, 0x20530000, 0x00000018, 0x000d0000, 0x00000000, 0x2b820000,
+        0x00000010, 0x20d2002f, 0x00000010, 0x0052002e, 0x00000009, 0x054e0007,
+        0x00000010, 0xb18a002c, 0x00000000, 0x050a8c00, 0x00000008, 0x850a0008,
+        0x00000010, 0x918a0029, 0x00000003, 0xc5008800, 0x00000008, 0xa3460001,
+        0x00000010, 0xb1c60007, 0x00000008, 0x22000001, 0x0000000c, 0x29800000,
+        0x00000010, 0x20530000, 0x00000000, 0x274e8c00, 0x00000000, 0x66cd0000,
+        0x00000000, 0x22c58c00, 0x00000008, 0x22000014, 0x00000003, 0x22c58e00,
+        0x00000003, 0x23c58e00, 0x00000003, 0x22c58e00, 0x00000003, 0x26cd9e00,
+        0x00000003, 0x27cd9e00, 0x00000003, 0x26cd9e00, 0x00000003, 0x274ea000,
+        0x00000003, 0x284ea000, 0x00000003, 0x274ea000, 0x0000000c, 0x69520000,
+        0x0000000c, 0x29800000, 0x00000010, 0x20530000, 0x00000003, 0x22c58e00,
+        0x00000003, 0x23c58e00, 0x00000003, 0x22c58e00, 0x00000003, 0x26cd9e00,
+        0x00000003, 0x27cd9e00, 0x00000003, 0x26cd9e00, 0x00000003, 0x274ea000,
+        0x00000003, 0x284ea000, 0x00000003, 0x274ea000, 0x00000000, 0xa2c58c00,
+        0x00000000, 0xa74e8c00, 0x00000000, 0xe6cd0000, 0x0000000f, 0x620a0010,
+        0x00000008, 0x23460001, 0x0000000c, 0x29800000, 0x00000010, 0x20530000,
+        0x0000000c, 0x29520000, 0x00000018, 0x80000002, 0x0000000c, 0x29800000,
+        0x00000018, 0x00570000 };
+
+static int bnx2_TPAT_b06FwReleaseMajor = 0x0;
+static int bnx2_TPAT_b06FwReleaseMinor = 0x0;
+static int bnx2_TPAT_b06FwReleaseFix = 0x0;
+static u32 bnx2_TPAT_b06FwStartAddr = 0x08000858;
+static u32 bnx2_TPAT_b06FwTextAddr = 0x08000800;
+static int bnx2_TPAT_b06FwTextLen = 0x1314;
+static u32 bnx2_TPAT_b06FwDataAddr = 0x08001b40;
+static int bnx2_TPAT_b06FwDataLen = 0x0;
+static u32 bnx2_TPAT_b06FwRodataAddr = 0x00000000;
+static int bnx2_TPAT_b06FwRodataLen = 0x0;
+static u32 bnx2_TPAT_b06FwBssAddr = 0x08001b90;
+static int bnx2_TPAT_b06FwBssLen = 0x80;
+static u32 bnx2_TPAT_b06FwSbssAddr = 0x08001b40;
+static int bnx2_TPAT_b06FwSbssLen = 0x48;
+
+static u32 bnx2_TPAT_b06FwText[(0x1314/4) + 1] = {
+        0x0a000216, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20302e36,
+        0x2e390000, 0x00060901, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x10000003,
+        0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24421b40, 0x3c030800,
+        0x24631c10, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800,
+        0x37bd3ffc, 0x03a0f021, 0x3c100800, 0x26100858, 0x3c1c0800, 0x279c1b40,
+        0x0e00051f, 0x00000000, 0x0000000d, 0x8f820024, 0x27bdffe8, 0xafbf0014,
+        0x10400004, 0xafb00010, 0x0000000d, 0x00000000, 0x2400015f, 0x8f82001c,
+        0x8c450008, 0x24030800, 0xaf430178, 0x97430104, 0x3c020008, 0xaf420140,
+        0x8f820034, 0x30420001, 0x10400006, 0x3070ffff, 0x24020002, 0x2603fffe,
+        0xa7420146, 0x0a000246, 0xa7430148, 0xa7400146, 0x8f850034, 0x30a20020,
+        0x0002102b, 0x00021023, 0x30460009, 0x30a30c00, 0x24020400, 0x14620002,
+        0x34c40001, 0x34c40005, 0xa744014a, 0x3c020800, 0x8c440820, 0x3c030048,
+        0x24020002, 0x00832025, 0x30a30006, 0x1062000d, 0x2c620003, 0x50400005,
+        0x24020004, 0x10600012, 0x3c020001, 0x0a000271, 0x00000000, 0x10620007,
+        0x24020006, 0x1462000f, 0x3c020111, 0x0a000269, 0x00821025, 0x0a000268,
+        0x3c020101, 0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830030,
+        0x0a000271, 0x00000000, 0x00821025, 0xaf421000, 0xaf800030, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x8f830030, 0x1060003f, 0x3c048000,
+        0x8f421000, 0x00441024, 0x1040fffd, 0x00000000, 0x10600039, 0x00000000,
+        0x8f421000, 0x3c030020, 0x00431024, 0x10400034, 0x00000000, 0x97421014,
+        0x14400031, 0x00000000, 0x97421008, 0x8f84001c, 0x24420006, 0x00024082,
+        0x00081880, 0x00643821, 0x8ce50000, 0x30430003, 0x30420001, 0x10400004,
+        0x00000000, 0x0000000d, 0x0a0002b0, 0x00081080, 0x5460000f, 0x30a5ffff,
+        0x3c06ffff, 0x00a62824, 0x0005182b, 0x00a61026, 0x0002102b, 0x00621824,
+        0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x240001fc, 0x8ce20000,
+        0x0a0002af, 0x00462825, 0x0005182b, 0x38a2ffff, 0x0002102b, 0x00621824,
+        0x10600004, 0x00000000, 0x0000000d, 0x00000000, 0x24000206, 0x8ce20000,
+        0x3445ffff, 0x00081080, 0x00441021, 0x3c030800, 0xac450000, 0x8c620840,
+        0x24420001, 0xac620840, 0x8f820008, 0x10400003, 0x00000000, 0x0e000660,
+        0x00000000, 0x8f840028, 0x02002821, 0x24820008, 0x30421fff, 0x24434000,
+        0x0343d821, 0x30a30007, 0xaf840018, 0xaf820028, 0xaf420084, 0x10600002,
+        0x24a20007, 0x3045fff8, 0x8f820044, 0x8f840004, 0x00451821, 0xaf82002c,
+        0x0064102b, 0xaf830044, 0x14400002, 0x00641023, 0xaf820044, 0x8f840044,
+        0x34028000, 0x8fbf0014, 0x8fb00010, 0x00821021, 0x03421821, 0x3c021000,
+        0xaf83001c, 0xaf440080, 0xaf420178, 0x03e00008, 0x27bd0018, 0x8f820024,
+        0x27bdffe8, 0xafbf0014, 0x10400004, 0xafb00010, 0x0000000d, 0x00000000,
+        0x24000249, 0x8f85001c, 0x24020001, 0xaf820024, 0x8ca70008, 0xa3800023,
+        0x8f620004, 0x3c100800, 0x26041b90, 0x00021402, 0xa3820010, 0x304600ff,
+        0x24c60005, 0x0e00064a, 0x00063082, 0x8f640004, 0x8f430108, 0x3c021000,
+        0x00621824, 0xa7840020, 0x10600008, 0x00000000, 0x97420104, 0x93830023,
+        0x2442ffec, 0x34630002, 0xa3830023, 0x0a000304, 0x3045ffff, 0x97420104,
+        0x2442fff0, 0x3045ffff, 0x8f620004, 0x3042ffff, 0x2c420013, 0x14400004,
+        0x00000000, 0x93820023, 0x34420001, 0xa3820023, 0x93830023, 0x24020001,
+        0x10620009, 0x28620002, 0x14400014, 0x24020002, 0x10620012, 0x24020003,
+        0x1062000a, 0x00000000, 0x0a000325, 0x00000000, 0x8f82001c, 0x8c43000c,
+        0x3c04ffff, 0x00641824, 0x00651825, 0x0a000325, 0xac43000c, 0x8f82001c,
+        0x8c430010, 0x3c04ffff, 0x00641824, 0x00651825, 0xac430010, 0x8f620004,
+        0x3042ffff, 0x24420002, 0x00021083, 0xa3820038, 0x304500ff, 0x8f82001c,
+        0x3c04ffff, 0x00052880, 0x00a22821, 0x8ca70000, 0x97820020, 0x97430104,
+        0x00e42024, 0x24420002, 0x00621823, 0x00833825, 0xaca70000, 0x93840038,
+        0x26061b90, 0x00041080, 0x00461021, 0x90430000, 0x3063000f, 0x00832021,
+        0xa3840022, 0x308200ff, 0x3c04fff6, 0x24420003, 0x00021080, 0x00461021,
+        0x8c450000, 0x93830022, 0x8f82001c, 0x3484ffff, 0x00a43824, 0x00031880,
+        0x00621821, 0xaf850000, 0xac67000c, 0x93820022, 0x93830022, 0x8f84001c,
+        0x24420003, 0x00021080, 0x00461021, 0x24630004, 0x00031880, 0xac470000,
+        0x93820022, 0x00661821, 0x94670002, 0x00021080, 0x00441021, 0xac670000,
+        0x24030010, 0xac470010, 0xa7430140, 0x24030002, 0xa7400142, 0xa7400144,
+        0xa7430146, 0x97420104, 0x8f840034, 0x24030001, 0x2442fffe, 0x30840006,
+        0xa7420148, 0x24020002, 0xa743014a, 0x1082000d, 0x2c820003, 0x10400005,
+        0x24020004, 0x10800011, 0x3c020009, 0x0a000383, 0x00000000, 0x10820007,
+        0x24020006, 0x1482000d, 0x3c020119, 0x0a00037d, 0x24030001, 0x0a00037c,
+        0x3c020109, 0x3c020019, 0x24030001, 0xaf421000, 0xaf830030, 0x0a000383,
+        0x00000000, 0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x93820010, 0x24030008, 0x8f840030, 0x24420002, 0x30420007,
+        0x00621823, 0x30630007, 0xaf83000c, 0x10800005, 0x3c038000, 0x8f421000,
+        0x00431024, 0x1040fffd, 0x00000000, 0x8f820028, 0xaf820018, 0x24420010,
+        0x30421fff, 0xaf820028, 0xaf420084, 0x97430104, 0x24424000, 0x0342d821,
+        0x3063ffff, 0x30620007, 0x10400002, 0x24620007, 0x3043fff8, 0x8f820044,
+        0x8f840004, 0x00431821, 0xaf82002c, 0x0064102b, 0xaf830044, 0x14400002,
+        0x00641023, 0xaf820044, 0x8f840044, 0x34028000, 0x8fbf0014, 0x8fb00010,
+        0x00821021, 0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0xaf420178,
+        0x03e00008, 0x27bd0018, 0x8f820024, 0x27bdffe8, 0xafbf0014, 0x14400004,
+        0xafb00010, 0x0000000d, 0x00000000, 0x240002db, 0x8f620004, 0x04410009,
+        0x3c050800, 0x93820022, 0x8f830000, 0x24a41b90, 0xaf800024, 0x24420003,
+        0x00021080, 0x00441021, 0xac430000, 0x93820038, 0x24a51b90, 0x93860010,
+        0x3c040001, 0x27700008, 0x24420001, 0x00021080, 0x00451021, 0x8c430000,
+        0x24c60005, 0x00063082, 0x00641821, 0x02002021, 0x0e00064a, 0xac430000,
+        0x93840022, 0x3c057fff, 0x8f620004, 0x00042080, 0x00902021, 0x8c830004,
+        0x34a5ffff, 0x00451024, 0x00621821, 0xac830004, 0x93850038, 0x3c07ffff,
+        0x93840010, 0x00052880, 0x00b02821, 0x8ca30000, 0x97420104, 0x97860020,
+        0x00671824, 0x00441021, 0x00461023, 0x3042ffff, 0x00621825, 0xaca30000,
+        0x93830023, 0x24020001, 0x10620009, 0x28620002, 0x1440001a, 0x24020002,
+        0x10620018, 0x24020003, 0x1062000d, 0x00000000, 0x0a000411, 0x00000000,
+        0x93820010, 0x97430104, 0x8e04000c, 0x00621821, 0x2463fff2, 0x3063ffff,
+        0x00872024, 0x00832025, 0x0a000411, 0xae04000c, 0x93820010, 0x97430104,
+        0x8e040010, 0x00621821, 0x2463ffee, 0x3063ffff, 0x00872024, 0x00832025,
+        0xae040010, 0x9783000e, 0x8f840034, 0x2402000a, 0xa7420140, 0xa7430142,
+        0x93820010, 0xa7420144, 0xa7400146, 0x97430104, 0x30840006, 0x24020001,
+        0xa7430148, 0xa742014a, 0x24020002, 0x1082000d, 0x2c820003, 0x10400005,
+        0x24020004, 0x10800011, 0x3c020041, 0x0a000437, 0x00000000, 0x10820007,
+        0x24020006, 0x1482000d, 0x3c020151, 0x0a000431, 0x24030001, 0x0a000430,
+        0x3c020141, 0x3c020051, 0x24030001, 0xaf421000, 0xaf830030, 0x0a000437,
+        0x00000000, 0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x8f820030, 0x93840010, 0x8f850028, 0x10400005, 0x3c038000,
+        0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x2483000a, 0x30620007,
+        0x10400002, 0x24620007, 0x304303f8, 0x00a31021, 0x30421fff, 0xaf850018,
+        0xaf820028, 0xaf420084, 0x97430104, 0x24424000, 0x0342d821, 0x3063ffff,
+        0x30620007, 0x10400002, 0x24620007, 0x3043fff8, 0x8f820044, 0x8f840004,
+        0x00431821, 0xaf82002c, 0x0064102b, 0xaf830044, 0x14400002, 0x00641023,
+        0xaf820044, 0x8f840044, 0x34028000, 0x8fbf0014, 0x8fb00010, 0x00821021,
+        0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0xaf420178, 0x03e00008,
+        0x27bd0018, 0x3c026000, 0x8c444448, 0x3c030800, 0xac64082c, 0x8f620000,
+        0x97430104, 0x3c048000, 0x3046ffff, 0x3067ffff, 0x8f420178, 0x00441024,
+        0x1440fffd, 0x2402000a, 0x30c30007, 0xa7420140, 0x24020008, 0x00431023,
+        0x30420007, 0x24c3fffe, 0xa7420142, 0xa7430144, 0xa7400146, 0xa7470148,
+        0x8f420108, 0x3c036000, 0x8f850034, 0x30420020, 0x0002102b, 0x00021023,
+        0x30420009, 0x34420001, 0xa742014a, 0x8c644448, 0x3c020800, 0x30a50006,
+        0xac440830, 0x24020002, 0x10a2000d, 0x2ca20003, 0x10400005, 0x24020004,
+        0x10a00011, 0x3c020041, 0x0a0004a8, 0x00000000, 0x10a20007, 0x24020006,
+        0x14a2000d, 0x3c020151, 0x0a0004a2, 0x24030001, 0x0a0004a1, 0x3c020141,
+        0x3c020051, 0x24030001, 0xaf421000, 0xaf830030, 0x0a0004a8, 0x00000000,
+        0xaf421000, 0xaf800030, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x8f820030, 0x24c30008, 0x10400006, 0x30e6ffff, 0x3c048000, 0x8f421000,
+        0x00441024, 0x1040fffd, 0x00000000, 0x3c026000, 0x8c444448, 0x3065ffff,
+        0x3c020800, 0x30a30007, 0x10600003, 0xac440834, 0x24a20007, 0x3045fff8,
+        0x8f840028, 0x00851021, 0x30421fff, 0x24434000, 0x0343d821, 0x30c30007,
+        0xaf840018, 0xaf820028, 0xaf420084, 0x10600002, 0x24c20007, 0x3046fff8,
+        0x8f820044, 0x8f840004, 0x00461821, 0xaf82002c, 0x0064102b, 0xaf830044,
+        0x14400002, 0x00641023, 0xaf820044, 0x8f840044, 0x34028000, 0x3c030800,
+        0x8c650844, 0x00821021, 0x03421821, 0xaf83001c, 0xaf440080, 0x10a00006,
+        0x2402000e, 0x93830043, 0x14620004, 0x3c021000, 0x2402043f, 0xa7420148,
+        0x3c021000, 0x3c036000, 0xaf420178, 0x8c644448, 0x3c020800, 0x03e00008,
+        0xac440838, 0x8f820034, 0x30424000, 0x10400005, 0x24020800, 0x0000000d,
+        0x00000000, 0x24000405, 0x24020800, 0xaf420178, 0x97440104, 0x3c030008,
+        0xaf430140, 0x8f820034, 0x30420001, 0x10400006, 0x3085ffff, 0x24020002,
+        0x24a3fffe, 0xa7420146, 0x0a0004ff, 0xa7430148, 0xa7400146, 0x8f840028,
+        0x2402000d, 0xa742014a, 0x24830008, 0x30631fff, 0x24624000, 0x0342d821,
+        0x30a20007, 0xaf840018, 0xaf830028, 0xaf430084, 0x10400002, 0x24a20007,
+        0x3045fff8, 0x8f820044, 0x8f840004, 0x00451821, 0xaf82002c, 0x0064102b,
+        0xaf830044, 0x14400002, 0x00641023, 0xaf820044, 0x8f840044, 0x34028000,
+        0x00821021, 0x03421821, 0x3c021000, 0xaf83001c, 0xaf440080, 0x03e00008,
+        0xaf420178, 0x27bdffe8, 0x3c046008, 0xafbf0014, 0xafb00010, 0x8c825000,
+        0x3c1a8000, 0x2403ff7f, 0x375b4000, 0x00431024, 0x3442380c, 0xac825000,
+        0x8f430008, 0x3c100800, 0x37428000, 0x34630001, 0xaf430008, 0xaf82001c,
+        0x3c02601c, 0xaf800028, 0xaf400080, 0xaf400084, 0x8c450008, 0x3c036000,
+        0x8c620808, 0x3c040800, 0x3c030080, 0xac830820, 0x3042fff0, 0x38420010,
+        0x2c420001, 0xaf850004, 0xaf820008, 0x0e00062f, 0x00000000, 0x8f420000,
+        0x30420001, 0x1040fffb, 0x00000000, 0x8f440108, 0x30822000, 0xaf840034,
+        0x10400004, 0x8e02083c, 0x24420001, 0x0a00059d, 0xae02083c, 0x30820200,
+        0x10400027, 0x00000000, 0x97420104, 0x1040001c, 0x30824000, 0x14400005,
+        0x00000000, 0x0e00022d, 0x00000000, 0x0a000592, 0x00000000, 0x8f620008,
+        0x8f630000, 0x24020030, 0x00031e02, 0x306300f0, 0x10620007, 0x28620031,
+        0x14400031, 0x24020040, 0x10620007, 0x00000000, 0x0a000592, 0x00000000,
+        0x0e0002dd, 0x00000000, 0x0a000592, 0x00000000, 0x0e0003b8, 0x00000000,
+        0x0a000592, 0x00000000, 0x30820040, 0x1440002d, 0x00000000, 0x0000000d,
+        0x00000000, 0x240004a6, 0x0a00059d, 0x00000000, 0x8f430100, 0x24020d00,
+        0x1462000f, 0x30820006, 0x97420104, 0x10400005, 0x30820040, 0x0e0004e9,
+        0x00000000, 0x0a000592, 0x00000000, 0x1440001b, 0x00000000, 0x0000000d,
+        0x00000000, 0x240004b8, 0x0a00059d, 0x00000000, 0x1040000e, 0x30821000,
+        0x10400005, 0x00000000, 0x0e00065d, 0x00000000, 0x0a000592, 0x00000000,
+        0x0e00046b, 0x00000000, 0x8f820040, 0x24420001, 0xaf820040, 0x0a00059d,
+        0x00000000, 0x30820040, 0x14400004, 0x00000000, 0x0000000d, 0x00000000,
+        0x240004cf, 0x8f420138, 0x3c034000, 0x00431025, 0xaf420138, 0x0a00053f,
+        0x00000000, 0x3c046008, 0x8c835000, 0x3c1a8000, 0x2402ff7f, 0x375b4000,
+        0x00621824, 0x3463380c, 0xac835000, 0x8f420008, 0x3c056000, 0x3c03601c,
+        0x34420001, 0xaf420008, 0x37428000, 0xaf800028, 0xaf82001c, 0xaf400080,
+        0xaf400084, 0x8c660008, 0x8ca20808, 0x3c040800, 0x3c030080, 0xac830820,
+        0x3042fff0, 0x38420010, 0x2c420001, 0xaf860004, 0xaf820008, 0x03e00008,
+        0x00000000, 0x3084ffff, 0x30820007, 0x10400002, 0x24820007, 0x3044fff8,
+        0x8f820028, 0x00441821, 0x30631fff, 0x24644000, 0x0344d821, 0xaf820018,
+        0xaf830028, 0x03e00008, 0xaf430084, 0x3084ffff, 0x30820007, 0x10400002,
+        0x24820007, 0x3044fff8, 0x8f820044, 0x8f830004, 0x00442021, 0xaf82002c,
+        0x0083102b, 0xaf840044, 0x14400002, 0x00831023, 0xaf820044, 0x8f820044,
+        0x34038000, 0x00431821, 0x03432021, 0xaf84001c, 0x03e00008, 0xaf420080,
+        0x8f830034, 0x24020002, 0x30630006, 0x1062000d, 0x2c620003, 0x50400005,
+        0x24020004, 0x10600012, 0x3c020001, 0x0a000601, 0x00000000, 0x10620007,
+        0x24020006, 0x1462000f, 0x3c020111, 0x0a0005f9, 0x00821025, 0x0a0005f8,
+        0x3c020101, 0x3c020011, 0x00821025, 0x24030001, 0xaf421000, 0xaf830030,
+        0x0a000601, 0x00000000, 0x00821025, 0xaf421000, 0xaf800030, 0x00000000,
+        0x00000000, 0x00000000, 0x03e00008, 0x00000000, 0x8f820030, 0x10400005,
+        0x3c038000, 0x8f421000, 0x00431024, 0x1040fffd, 0x00000000, 0x03e00008,
+        0x00000000, 0x8f820034, 0x27bdffe8, 0x30424000, 0x14400005, 0xafbf0010,
+        0x0e00022d, 0x00000000, 0x0a00062d, 0x8fbf0010, 0x8f620008, 0x8f630000,
+        0x24020030, 0x00031e02, 0x306300f0, 0x10620008, 0x28620031, 0x1440000d,
+        0x8fbf0010, 0x24020040, 0x10620007, 0x00000000, 0x0a00062d, 0x00000000,
+        0x0e0002dd, 0x00000000, 0x0a00062d, 0x8fbf0010, 0x0e0003b8, 0x00000000,
+        0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f84003c, 0x1080000f, 0x3c026000,
+        0x8c430c3c, 0x30630fff, 0xaf830014, 0x14600011, 0x3082000f, 0x10400005,
+        0x308200f0, 0x10400003, 0x30820f00, 0x14400006, 0x00000000, 0x0000000d,
+        0x00000000, 0x2400050e, 0x03e00008, 0x00000000, 0x0000000d, 0x00000000,
+        0x24000513, 0x03e00008, 0x00000000, 0xaf83003c, 0x03e00008, 0x00000000,
+        0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,
+        0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a000659, 0x00a01021,
+        0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008,
+        0x00000000, 0x0000000d, 0x03e00008, 0x00000000, 0x3c040800, 0x8c82084c,
+        0x54400007, 0xac80084c, 0x8f820034, 0x24030400, 0x30420c00, 0x1443005b,
+        0x00000000, 0xac80084c, 0x0000000d, 0x00000000, 0x2400003c, 0x3c026000,
+        0x8c444448, 0x3c030800, 0xac640850, 0x24000043, 0x97420104, 0x3045ffff,
+        0x000530c2, 0x24a2007f, 0x000239c2, 0x2400004e, 0x3c046020, 0x24030020,
+        0xac830000, 0x8c820000, 0x30420020, 0x10400005, 0x3c036020, 0x8c620000,
+        0x30420020, 0x1440fffd, 0x00000000, 0x3c026020, 0x8c430010, 0x24040001,
+        0x0087102b, 0x30ea007f, 0x24abfffe, 0x10400010, 0x00034240, 0x3c056020,
+        0x24090020, 0xaca90000, 0x8ca20000, 0x30420020, 0x10400006, 0x24840001,
+        0x3c036020, 0x8c620000, 0x30420020, 0x1440fffd, 0x00000000, 0x0087102b,
+        0x1440fff4, 0x00000000, 0x8f85001c, 0x3c026020, 0x8c430010, 0x3c046020,
+        0x34848000, 0x006a1825, 0x01034025, 0x2400006b, 0x10c0000b, 0x00000000,
+        0x8ca30000, 0x24a50004, 0x8ca20000, 0x24a50004, 0x24c6ffff, 0xac820000,
+        0x24840004, 0xac830000, 0x14c0fff7, 0x24840004, 0x24000077, 0x3c020007,
+        0x34427700, 0x3c036000, 0xac6223c8, 0xac6b23cc, 0xac6823e4, 0x24000086,
+        0x3c046000, 0x3c038000, 0x8c8223f8, 0x00431024, 0x1440fffd, 0x3c021000,
+        0x3c056000, 0x24030019, 0xaca223f8, 0xa743014a, 0x8ca44448, 0x3c020800,
+        0xac440854, 0x03e00008, 0x00000000, 0x00000000 };
+
+static u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_TPAT_b06FwBss[(0x80/4) + 1] = { 0x00000000 };
+static u32 bnx2_TPAT_b06FwSbss[(0x48/4) + 1] = { 0x00000000 };
+
+static int bnx2_TXP_b06FwReleaseMajor = 0x0;
+static int bnx2_TXP_b06FwReleaseMinor = 0x0;
+static int bnx2_TXP_b06FwReleaseFix = 0x0;
+static u32 bnx2_TXP_b06FwStartAddr = 0x08002090;
+static u32 bnx2_TXP_b06FwTextAddr = 0x08000000;
+static int bnx2_TXP_b06FwTextLen = 0x3ffc;
+static u32 bnx2_TXP_b06FwDataAddr = 0x08004020;
+static int bnx2_TXP_b06FwDataLen = 0x0;
+static u32 bnx2_TXP_b06FwRodataAddr = 0x00000000;
+static int bnx2_TXP_b06FwRodataLen = 0x0;
+static u32 bnx2_TXP_b06FwBssAddr = 0x08004060;
+static int bnx2_TXP_b06FwBssLen = 0x194;
+static u32 bnx2_TXP_b06FwSbssAddr = 0x08004020;
+static int bnx2_TXP_b06FwSbssLen = 0x34;
+static u32 bnx2_TXP_b06FwText[(0x3ffc/4) + 1] = {
+        0x0a000824, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x302e362e,
+        0x39000000, 0x00060900, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d,
+        0x0000000d, 0x3c020800, 0x24424020, 0x3c030800, 0x246341f4, 0xac400000,
+        0x0043202b, 0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021,
+        0x3c100800, 0x26102090, 0x3c1c0800, 0x279c4020, 0x0e000a0e, 0x00000000,
+        0x0000000d, 0x8f840014, 0x27bdffe8, 0xafb00010, 0x8f460104, 0x8f830008,
+        0x8c8500ac, 0xaf430080, 0x948200a8, 0xa7420e10, 0x948300aa, 0xa7430e12,
+        0x8c8200ac, 0xaf420e18, 0x97430e10, 0xa7430e14, 0x97420e12, 0xa7420e16,
+        0x8f430e18, 0x00005021, 0x00c53023, 0x10c001a3, 0xaf430e1c, 0x240f0800,
+        0x3c0e1000, 0x2419fff8, 0x24100010, 0x3c188100, 0x93620008, 0x10400009,
+        0x00000000, 0x97620010, 0x00c2102b, 0x14400005, 0x00000000, 0x97620010,
+        0x3042ffff, 0x0a000862, 0xaf420e00, 0xaf460e00, 0x8f420000, 0x30420008,
+        0x1040fffd, 0x00000000, 0x97420e08, 0x8f450e04, 0x3044ffff, 0x30820001,
+        0x14400005, 0x00000000, 0x14a00005, 0x3083a040, 0x0a0009e6, 0x00000000,
+        0x0000000d, 0x3083a040, 0x24020040, 0x14620049, 0x3082a000, 0x8f87000c,
+        0x30880036, 0x30890008, 0xaf4f0178, 0x00e01821, 0x9742008a, 0x00431023,
+        0x2442ffff, 0x30421fff, 0x2c420008, 0x1440fffa, 0x00000000, 0x8f830018,
+        0x00a05021, 0x00c53023, 0x24e24000, 0x03422821, 0x306b00ff, 0x24630001,
+        0xaf830018, 0x93840012, 0x000b1400, 0x3c030100, 0x00431025, 0xaca20000,
+        0x8f820018, 0x30840007, 0x00042240, 0x34870001, 0x00e83825, 0x1120000f,
+        0xaca20004, 0x97430e0a, 0x8f84000c, 0x00ee3825, 0x2402000e, 0x00781825,
+        0xaf430160, 0x25430006, 0x24840008, 0x30841fff, 0xa742015a, 0xa7430158,
+        0xaf84000c, 0x0a0008a9, 0x00000000, 0x8f83000c, 0x25420002, 0xa7420158,
+        0x24630008, 0x30631fff, 0xaf83000c, 0x54c0000c, 0x8f420e14, 0x97420e10,
+        0x97430e12, 0x8f840014, 0x00021400, 0x00621825, 0xac8300a8, 0x8f850014,
+        0x8f420e18, 0x34e70040, 0xaca200ac, 0x8f420e14, 0x8f430e1c, 0xaf420144,
+        0xaf430148, 0xa34b0152, 0xaf470154, 0x0a0009f1, 0xaf4e0178, 0x10400128,
+        0x00000000, 0x97620010, 0x00a2102b, 0x10400003, 0x30820040, 0x10400122,
+        0x00000000, 0xafa60008, 0xa7840010, 0xaf850004, 0x93620008, 0x1440005e,
+        0x27ac0008, 0xaf60000c, 0x97820010, 0x30424000, 0x10400002, 0x2403000e,
+        0x24030016, 0xa363000a, 0x24034007, 0xaf630014, 0x93820012, 0x8f630014,
+        0x30420007, 0x00021240, 0x00621825, 0xaf630014, 0x97820010, 0x8f630014,
+        0x30420010, 0x00621825, 0xaf630014, 0x97820010, 0x30420008, 0x5040000e,
+        0x00002821, 0x8f620014, 0x004e1025, 0xaf620014, 0x97430e0a, 0x2402000e,
+        0x00781825, 0xaf630004, 0xa3620002, 0x9363000a, 0x3405fffc, 0x24630004,
+        0x0a0008f2, 0xa363000a, 0xaf600004, 0xa3600002, 0x97820010, 0x9363000a,
+        0x30421f00, 0x00021182, 0x24420028, 0x00621821, 0xa3630009, 0x97420e0c,
+        0xa7620010, 0x93630009, 0x24020008, 0x24630002, 0x30630007, 0x00431023,
+        0x30420007, 0xa362000b, 0x93640009, 0x97620010, 0x8f890004, 0x97830010,
+        0x00441021, 0x00a21021, 0x30630040, 0x10600006, 0x3045ffff, 0x15250005,
+        0x0125102b, 0x3c068000, 0x0a000925, 0x00005821, 0x0125102b, 0x144000c8,
+        0x00005021, 0x97420e14, 0xa7420e10, 0x97430e16, 0xa7430e12, 0x8f420e1c,
+        0xaf420e18, 0xaf450e00, 0x8f420000, 0x30420008, 0x1040fffd, 0x00000000,
+        0x97420e08, 0x00a04821, 0xa7820010, 0x8f430e04, 0x00003021, 0x240b0001,
+        0xaf830004, 0x97620010, 0x0a000936, 0x304dffff, 0x8f890004, 0x97820010,
+        0x30420040, 0x10400004, 0x01206821, 0x3c068000, 0x0a000936, 0x00005821,
+        0x97630010, 0x8f820004, 0x144300a7, 0x00005021, 0x00003021, 0x240b0001,
+        0x8d820000, 0x00491023, 0x1440000d, 0xad820000, 0x8f620014, 0x34420040,
+        0xaf620014, 0x97430e10, 0x97420e12, 0x8f840014, 0x00031c00, 0x00431025,
+        0xac8200a8, 0x8f830014, 0x8f420e18, 0xac6200ac, 0x93620008, 0x1440003f,
+        0x00000000, 0x25260002, 0x8f84000c, 0x9743008a, 0x3063ffff, 0xafa30000,
+        0x8fa20000, 0x00441023, 0x2442ffff, 0x30421fff, 0x2c420010, 0x1440fff7,
+        0x00000000, 0x8f82000c, 0x8f830018, 0x00021082, 0x00021080, 0x24424000,
+        0x03422821, 0x00605021, 0x24630001, 0x314200ff, 0x00021400, 0xaf830018,
+        0x3c033200, 0x00431025, 0xaca20000, 0x93630009, 0x9362000a, 0x00031c00,
+        0x00431025, 0xaca20004, 0x8f830018, 0xaca30008, 0x97820010, 0x30420008,
+        0x10400002, 0x00c04021, 0x25280006, 0x97430e14, 0x93640002, 0x8f450e1c,
+        0x8f660004, 0x8f670014, 0xaf4f0178, 0x3063ffff, 0xa7430144, 0x97420e16,
+        0xa7420146, 0xaf450148, 0xa34a0152, 0x8f82000c, 0x308400ff, 0xa744015a,
+        0xaf460160, 0xa7480158, 0xaf470154, 0xaf4e0178, 0x00501021, 0x30421fff,
+        0xaf82000c, 0x0a0009c5, 0x8d820000, 0x93620009, 0x9363000b, 0x8f85000c,
+        0x2463000a, 0x00435021, 0x25440007, 0x00992024, 0x9743008a, 0x3063ffff,
+        0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b,
+        0x1440fff7, 0x00000000, 0x8f82000c, 0x8f840018, 0x00021082, 0x00021080,
+        0x24424000, 0x03422821, 0x00804021, 0x24840001, 0xaf840018, 0x93630009,
+        0x310200ff, 0x00022400, 0x3c024100, 0x24630002, 0x00621825, 0x00832025,
+        0xaca40000, 0x8f62000c, 0x00461025, 0xaca20004, 0x97430e14, 0x93640002,
+        0x8f450e1c, 0x8f660004, 0x8f670014, 0xaf4f0178, 0x3063ffff, 0xa7430144,
+        0x97420e16, 0x308400ff, 0xa7420146, 0xaf450148, 0xa3480152, 0x8f83000c,
+        0x25420007, 0x00591024, 0xa744015a, 0xaf460160, 0xa7490158, 0xaf470154,
+        0xaf4e0178, 0x00621821, 0x30631fff, 0xaf83000c, 0x8d820000, 0x14400005,
+        0x00000000, 0x8f620014, 0x2403ffbf, 0x00431024, 0xaf620014, 0x8f62000c,
+        0x004d1021, 0xaf62000c, 0x93630008, 0x14600008, 0x00000000, 0x11600006,
+        0x00000000, 0x8f630014, 0x3c02efff, 0x3442fffe, 0x00621824, 0xaf630014,
+        0xa36b0008, 0x01205021, 0x15400016, 0x8fa60008, 0x97420e14, 0x97430e16,
+        0x8f850014, 0x00021400, 0x00621825, 0xaca300a8, 0x8f840014, 0x8f420e1c,
+        0x0a0009f3, 0xac8200ac, 0x97420e14, 0x97430e16, 0x8f840014, 0x00021400,
+        0x00621825, 0xac8300a8, 0x8f850014, 0x8f420e1c, 0x00005021, 0x0a0009f3,
+        0xaca200ac, 0x14c0fe64, 0x00000000, 0x55400018, 0x8fb00010, 0x3c038000,
+        0x8f420178, 0x00431024, 0x1440fffd, 0x00000000, 0x97430e14, 0x8f440e1c,
+        0x24020800, 0xaf420178, 0x3063ffff, 0xa7430144, 0x97420e16, 0x3c031000,
+        0xa7420146, 0x24020240, 0xaf440148, 0xa3400152, 0xa740015a, 0xaf400160,
+        0xa7400158, 0xaf420154, 0xaf430178, 0x8fb00010, 0x03e00008, 0x27bd0018,
+        0x27bdffd8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008, 0x03421821,
+        0xafbf0020, 0xafb3001c, 0xafb20018, 0xafb10014, 0xafb00010, 0xaf830014,
+        0xaf440e00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x3c0200ff, 0x3442fffd, 0x3c046004, 0xaf420e00, 0x8c835000, 0x24130d00,
+        0x3c120800, 0x3c114000, 0x2402ff7f, 0x00621824, 0x3463380c, 0x24020009,
+        0xac835000, 0xaf420008, 0xaf800018, 0xaf80000c, 0x0e000fa1, 0x00000000,
+        0x0e000a96, 0x00000000, 0x3c020800, 0x24504080, 0x8f420000, 0x30420001,
+        0x1040fffd, 0x00000000, 0x8f440100, 0xaf840008, 0xaf440020, 0x93430108,
+        0xa3830012, 0x93820012, 0x30420001, 0x10400008, 0x00000000, 0x93820012,
+        0x30420006, 0x00021100, 0x0e00083b, 0x0050d821, 0x0a000a52, 0x00000000,
+        0x14930005, 0x00000000, 0x0e00083b, 0x265b4100, 0x0a000a52, 0x00000000,
+        0x0e000ba3, 0x00000000, 0xaf510138, 0x0a000a36, 0x00000000, 0x27bdfff8,
+        0x3084ffff, 0x24820007, 0x3044fff8, 0x8f85000c, 0x9743008a, 0x3063ffff,
+        0xafa30000, 0x8fa20000, 0x00451023, 0x2442ffff, 0x30421fff, 0x0044102b,
+        0x1440fff7, 0x00000000, 0x8f82000c, 0x00021082, 0x00021080, 0x24424000,
+        0x03421021, 0x03e00008, 0x27bd0008, 0x3084ffff, 0x8f82000c, 0x24840007,
+        0x3084fff8, 0x00441021, 0x30421fff, 0xaf82000c, 0x03e00008, 0x00000000,
+        0x27bdffe8, 0x3c1a8000, 0x3c0420ff, 0x3484fffd, 0x3c020008, 0x03421821,
+        0xafbf0010, 0xaf830014, 0xaf440e00, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x3c0200ff, 0x3442fffd, 0x3c046004, 0xaf420e00,
+        0x8c825000, 0x2403ff7f, 0x00431024, 0x3442380c, 0x24030009, 0xac825000,
+        0xaf430008, 0xaf800018, 0xaf80000c, 0x0e000fa1, 0x00000000, 0x0e000a96,
+        0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe8, 0x3c02000a,
+        0x03421821, 0x3c040800, 0x24844120, 0x24050018, 0xafbf0010, 0xaf830024,
+        0x0e000fad, 0x00003021, 0x3c050800, 0x3c020800, 0x24423d60, 0xaca24180,
+        0x24a54180, 0x3c020800, 0x24423e18, 0x3c030800, 0x24633e2c, 0x3c040800,
+        0xaca20004, 0x3c020800, 0x24423d68, 0xaca30008, 0xac824190, 0x24844190,
+        0x3c020800, 0x24423da4, 0x3c070800, 0x24e73de4, 0x3c060800, 0x24c63e40,
+        0x3c050800, 0x24a52b28, 0x3c030800, 0xac820004, 0x3c020800, 0x24423e48,
+        0xac870008, 0xac86000c, 0xac850010, 0xac6241b0, 0x246341b0, 0x8fbf0010,
+        0x3c020800, 0x24423e60, 0xac620004, 0xac670008, 0xac66000c, 0xac650010,
+        0x03e00008, 0x27bd0018, 0x27bdffc8, 0x3c020800, 0x24424120, 0xafbf0030,
+        0xafb3002c, 0xafb20028, 0xafb10024, 0xafb00020, 0x90470021, 0x8c510008,
+        0x8c45001c, 0x8f900020, 0x3c060800, 0x3c038000, 0x8f420178, 0x00431024,
+        0x1440fffd, 0x8cc2414c, 0x24c3414c, 0x2473ffd4, 0xaf420144, 0x8e620030,
+        0x30b22000, 0xaf420148, 0x3c021000, 0xaf50014c, 0xa3470152, 0xa7510158,
+        0xaf450154, 0xaf420178, 0x12400004, 0x3c030800, 0x8c620030, 0x24420001,
+        0xac620030, 0x93420109, 0x9344010a, 0x00111c00, 0xafa30018, 0x00071a00,
+        0xafa50014, 0x8cc5414c, 0x00021600, 0x00042400, 0x00441025, 0x00431025,
+        0xafa20010, 0x8f440100, 0x8e660030, 0x0e000fe1, 0x02003821, 0x1640000e,
+        0x8fbf0030, 0x8f820000, 0x8e630030, 0x8c44017c, 0x02031823, 0x00711823,
+        0x00641823, 0x2c630002, 0x14600006, 0x8fb3002c, 0x0000000d, 0x00000000,
+        0x240000ca, 0x8fbf0030, 0x8fb3002c, 0x8fb20028, 0x8fb10024, 0x8fb00020,
+        0x03e00008, 0x27bd0038, 0x974309da, 0x00804021, 0xad030000, 0x8f4209dc,
+        0xad020004, 0x8f4309e0, 0xad030008, 0x934409d9, 0x24020001, 0x30840003,
+        0x1082001f, 0x30a900ff, 0x28820002, 0x10400005, 0x24020002, 0x10800009,
+        0x3c0a0800, 0x0a000b64, 0x93420934, 0x1082000b, 0x24020003, 0x10820026,
+        0x3c0a0800, 0x0a000b64, 0x93420934, 0x974209e4, 0x00021400, 0x34420800,
+        0xad02000c, 0x0a000b63, 0x25080010, 0x974209e4, 0x00021400, 0x34428100,
+        0xad02000c, 0x974309e8, 0x3c0a0800, 0x00031c00, 0x34630800, 0xad030010,
+        0x0a000b63, 0x25080014, 0x974409e4, 0x3c050800, 0x24a24120, 0x94430018,
+        0x94460010, 0x9447000c, 0x00a05021, 0x24020800, 0xad000010, 0xad020014,
+        0x00042400, 0x00661821, 0x00671823, 0x2463fff2, 0x00832025, 0xad04000c,
+        0x0a000b63, 0x25080018, 0x974209e4, 0x3c050800, 0x00021400, 0x34428100,
+        0xad02000c, 0x974409e8, 0x24a24120, 0x94430018, 0x94460010, 0x9447000c,
+        0x00a05021, 0x24020800, 0xad000014, 0xad020018, 0x00042400, 0x00661821,
+        0x00671823, 0x2463ffee, 0x00832025, 0xad040010, 0x2508001c, 0x93420934,
+        0x93450921, 0x3c074000, 0x25444120, 0x94830014, 0x94860010, 0x00021082,
+        0x00021600, 0x00052c00, 0x00a72825, 0x00451025, 0x00661821, 0x00431025,
+        0xad020000, 0x97830028, 0x974209ea, 0x00621821, 0x00031c00, 0xad030004,
+        0x97820028, 0x24420001, 0x30427fff, 0xa7820028, 0x93430920, 0x3c020006,
+        0x00031e00, 0x00621825, 0xad030008, 0x8f42092c, 0xad02000c, 0x8f430930,
+        0xad030010, 0x8f440938, 0x25080014, 0xad040000, 0x8f820020, 0x11200004,
+        0xad020004, 0x8f420940, 0x0a000b8d, 0x2442ffff, 0x8f420940, 0xad020008,
+        0x8f440948, 0x8f420940, 0x93430936, 0x00822823, 0x00652806, 0x3402ffff,
+        0x0045102b, 0x54400001, 0x3405ffff, 0x93420937, 0x25444120, 0x90830020,
+        0xad000010, 0x00021700, 0x34630010, 0x00031c00, 0x00431025, 0x00451025,
+        0xad02000c, 0x03e00008, 0x25020014, 0x27bdffb0, 0x3c020008, 0x03421821,
+        0xafbf004c, 0xafbe0048, 0xafb70044, 0xafb60040, 0xafb5003c, 0xafb40038,
+        0xafb30034, 0xafb20030, 0xafb1002c, 0xafb00028, 0xaf830000, 0x24020040,
+        0xaf420814, 0xaf400810, 0x8f420944, 0x8f430950, 0x8f440954, 0x8f45095c,
+        0xaf820030, 0xaf830020, 0xaf84001c, 0xaf85002c, 0x93430900, 0x24020020,
+        0x10620005, 0x24020030, 0x10620022, 0x3c030800, 0x0a000bf1, 0x8c62002c,
+        0x24020088, 0xaf420818, 0x3c020800, 0x24424180, 0xafa20020, 0x93430109,
+        0x3c020800, 0x10600009, 0x24574190, 0x3c026000, 0x24030100, 0xac43081c,
+        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x2400031d, 0x9342010a,
+        0x30420080, 0x1440001c, 0x00000000, 0x3c026000, 0x24030100, 0xac43081c,
+        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x24000324, 0x0a000bf4,
+        0x00000000, 0x93430109, 0x3063007f, 0x00031140, 0x000318c0, 0x00431021,
+        0x24430088, 0xaf430818, 0x0000000d, 0x3c020800, 0x244241d0, 0x3c030800,
+        0x247741e0, 0x0a000bf4, 0xafa20020, 0x24420001, 0x0a000f4c, 0xac62002c,
+        0x8f840000, 0x8f850020, 0x24020800, 0xaf420178, 0x8f4209a4, 0x8c83017c,
+        0x00a21023, 0x00431023, 0x2c420002, 0x14400004, 0x00000000, 0x0000000d,
+        0x00000000, 0x24000349, 0x8f420104, 0x8f430988, 0x00431023, 0x58400005,
+        0x8f4209a0, 0x0000000d, 0x00000000, 0x2400034d, 0x8f4209a0, 0x3c100800,
+        0xae02414c, 0x8f4309a4, 0x2604414c, 0x2491ffd4, 0xae230030, 0x8f420104,
+        0xae250024, 0x00431023, 0xac82ffd4, 0x8fa30020, 0x8c620000, 0x0040f809,
+        0x0200b021, 0x00409021, 0x32440010, 0x32420002, 0x10400007, 0xafa40024,
+        0x8e22001c, 0x32500040, 0x2403ffbf, 0x00431024, 0x0a000f13, 0xae22001c,
+        0x32420020, 0x10400002, 0x3c020800, 0x245741b0, 0x32420001, 0x14400007,
+        0x00000000, 0x8f820008, 0xaf420080, 0x8ec3414c, 0xaf430e10, 0x8e220030,
+        0xaf420e18, 0x9343010b, 0x93420905, 0x30420008, 0x1040003c, 0x307400ff,
+        0x8f820000, 0x8c430074, 0x0460000a, 0x00000000, 0x3c026000, 0x24030100,
+        0xac43081c, 0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x24000384,
+        0x8f820000, 0x9044007b, 0x9343010a, 0x14830027, 0x32500040, 0x24072000,
+        0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec2414c,
+        0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030100, 0xaf420148,
+        0x24020047, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000, 0xa7430158,
+        0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030, 0x24630001,
+        0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018, 0x00021600,
+        0x00031c00, 0x00431025, 0x34424700, 0xafa20010, 0x8f440100, 0x0e000fe1,
+        0x3c070100, 0x3c030800, 0x24624120, 0x0a000d01, 0x8c43001c, 0x32820002,
+        0x10400047, 0x3c039000, 0x34630001, 0x8f820008, 0x32500040, 0x3c048000,
+        0x00431025, 0xaf420020, 0x8f420020, 0x00441024, 0x1440fffd, 0x00000000,
+        0x8f830000, 0x90620005, 0x3c058000, 0x34420008, 0xa0620005, 0x8f860000,
+        0x34a50001, 0x8f840008, 0x8cc20074, 0x3c038000, 0x00852025, 0x00431025,
+        0xacc20074, 0xaf440020, 0x90c3007b, 0x9342010a, 0x14620028, 0x3c040800,
+        0x24072000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd,
+        0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030100,
+        0xaf420148, 0x24020046, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000,
+        0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030,
+        0x24630001, 0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018,
+        0x00021600, 0x00031c00, 0x00431025, 0x34424600, 0xafa20010, 0x8f440100,
+        0x0e000fe1, 0x3c070100, 0x3c040800, 0x24824120, 0x0a000d01, 0x8c43001c,
+        0x93420108, 0x30420010, 0x50400050, 0x9343093f, 0x8f860000, 0x90c3007f,
+        0x90c2007e, 0x90c40080, 0x306800ff, 0x00021600, 0x00081c00, 0x00431025,
+        0x00042200, 0x90c3007a, 0x90c5000a, 0x00441025, 0x11050028, 0x00623825,
+        0xa0c8000a, 0x24086000, 0x3c090800, 0x3c038000, 0x8f420178, 0x00431024,
+        0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030,
+        0x00001821, 0xaf420148, 0x24020052, 0xaf47014c, 0xa3420152, 0x3c021000,
+        0xa7430158, 0xaf480154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030,
+        0x24630001, 0xad230030, 0x93420109, 0x9343010a, 0xafa80014, 0xafa00018,
+        0x00021600, 0x00031c00, 0x00431025, 0x34425200, 0xafa20010, 0x0e000fe1,
+        0x8f440100, 0x0a000cfb, 0x00000000, 0x3c026000, 0x24030100, 0xac43081c,
+        0x3c030001, 0xac43081c, 0x0000000d, 0x00000000, 0x240003cd, 0x16800009,
+        0x3c040800, 0x3c030800, 0x24624120, 0x8c43001c, 0x32500040, 0x2404ffbf,
+        0x00641824, 0x0a000f13, 0xac43001c, 0x8c824120, 0x10400005, 0x3c030800,
+        0x8c620034, 0xac804120, 0x24420001, 0xac620034, 0x9343093f, 0x24020012,
+        0x1462000f, 0x329e0038, 0x17c0000c, 0x3c030800, 0x8f830000, 0x8c62004c,
+        0xac62005c, 0x3c020800, 0x24444120, 0x8c82001c, 0x32500040, 0x2403ffbf,
+        0x00431024, 0x0a000f13, 0xac82001c, 0xac604120, 0x97420908, 0x000211c0,
+        0xaf420024, 0x97420908, 0x3c030080, 0x34630003, 0x000211c0, 0xaf42080c,
+        0xaf43081c, 0x974209ec, 0x8f4309a4, 0xa7820028, 0x3c020800, 0x24444120,
+        0xac830028, 0x93420937, 0x93430934, 0x00021080, 0x00621821, 0xa4830014,
+        0x934209d8, 0x00621821, 0xa4830016, 0x934209d8, 0x93430934, 0x00809821,
+        0x00431021, 0x24420010, 0xa4820012, 0x0000a821, 0x24020006, 0x13c00003,
+        0xae62001c, 0x0a000d82, 0x24120008, 0x8f420958, 0x8f830020, 0x8f84002c,
+        0x00431023, 0x00832023, 0x04800003, 0xae620004, 0x04410003, 0x0082102b,
+        0x0a000d4e, 0xae600004, 0x54400001, 0xae640004, 0x8ee20000, 0x0040f809,
+        0x00000000, 0x00409021, 0x32420001, 0x5440001e, 0x8ee20004, 0x8e630008,
+        0x1060002b, 0x3c02c000, 0x00621025, 0xaf420e00, 0x8f420000, 0x30420008,
+        0x1040fffd, 0x00000000, 0x97420e08, 0xa7820010, 0x8f430e04, 0x8e620008,
+        0xaf830004, 0x8f840004, 0x0044102b, 0x1040000b, 0x24150001, 0x24020100,
+        0x3c016000, 0xac22081c, 0x3c020001, 0x3c016000, 0xac22081c, 0x0000000d,
+        0x00000000, 0x24000449, 0x24150001, 0x8ee20004, 0x0040f809, 0x00000000,
+        0x02429025, 0x32420002, 0x5040001d, 0x8f470940, 0x12a00006, 0x8ec2414c,
+        0x8f830000, 0xac6200a8, 0x8f840000, 0x8e620030, 0xac8200ac, 0x32420004,
+        0x50400013, 0x8f470940, 0x3c020800, 0x3283007d, 0x106000fe, 0x245741b0,
+        0x32820001, 0x50400006, 0x36520002, 0x8f830030, 0x8f420940, 0x106200f7,
+        0x00000000, 0x36520002, 0x24020008, 0xa660000c, 0xa662000e, 0xae600008,
+        0xa2600020, 0x8f470940, 0x3c030800, 0x24684120, 0x8d020028, 0x8d050008,
+        0x9504000c, 0x9506000a, 0x95030022, 0x00451021, 0x00862021, 0x00641821,
+        0xaf870030, 0xad020028, 0x32820030, 0x10400006, 0xa5030010, 0x91020020,
+        0x32910040, 0x34420004, 0x0a000dd4, 0xa1020020, 0x93420923, 0x30420040,
+        0x10400029, 0x32910040, 0x8f830000, 0x8f840020, 0x8c620084, 0x00441023,
+        0x0442000a, 0x3c039000, 0x95020010, 0x8c630084, 0x00821021, 0x00621823,
+        0x1c600004, 0x3c039000, 0x91020020, 0x34420001, 0xa1020020, 0x34630001,
+        0x8f820008, 0x32910040, 0x3c048000, 0x00431025, 0xaf420020, 0x8f420020,
+        0x00441024, 0x1440fffd, 0x00000000, 0x8f840000, 0x9083003f, 0x2402000a,
+        0x10620005, 0x2402000c, 0x9083003f, 0x24020008, 0x14620002, 0x24020014,
+        0xa082003f, 0x8f830008, 0x3c028000, 0x34420001, 0x00621825, 0xaf430020,
+        0x3c040800, 0x24904120, 0x9602000c, 0x96030016, 0x9604000e, 0x00431021,
+        0x00442021, 0x24840002, 0x3084ffff, 0x0e000a55, 0xa6020018, 0x8f850018,
+        0x00a01821, 0xa2030021, 0x8ee60008, 0x00402021, 0x24a50001, 0xaf850018,
+        0x00c0f809, 0x00000000, 0x00402021, 0x0e000b12, 0x02202821, 0x8ee3000c,
+        0x0060f809, 0x00402021, 0x96040018, 0x9602000e, 0x00822021, 0x24840002,
+        0x0e000a6b, 0x3084ffff, 0x3c030800, 0x8c624120, 0x8e030008, 0x3c040800,
+        0x00431023, 0x14400012, 0xac824120, 0x54600006, 0x8e02001c, 0x3243004a,
+        0x24020002, 0x14620005, 0x00000000, 0x8e02001c, 0x34420040, 0x0a000e0b,
+        0xae02001c, 0x52a00006, 0x36520002, 0x8e02002c, 0xaf420e10, 0x8e030030,
+        0xaf430e18, 0x36520002, 0x52a00008, 0x96670010, 0x8f830000, 0x8f420e10,
+        0xac6200a8, 0x8f840000, 0x8f420e18, 0xac8200ac, 0x96670010, 0x92680020,
+        0x24020040, 0xaf420814, 0x8f830020, 0x8f82001c, 0x00671821, 0x00621023,
+        0xaf830020, 0x58400005, 0x8f42095c, 0x8f820000, 0xaf83001c, 0xac430054,
+        0x8f42095c, 0x31030008, 0xaf82002c, 0x1060001a, 0x00000000, 0x8f840000,
+        0x90820120, 0x90830121, 0x304600ff, 0x00c31823, 0x30630007, 0x24020007,
+        0x1062000e, 0x00000000, 0x90820122, 0x304200fe, 0xa0820122, 0x8f850000,
+        0x00061880, 0x8f840020, 0x24a20100, 0x00431021, 0x24c30001, 0x30630007,
+        0xac440000, 0x0a000e40, 0xa0a30120, 0x90820122, 0x34420001, 0xa0820122,
+        0x14e00003, 0x31020001, 0x10400031, 0x32510002, 0x8f820000, 0x8c43000c,
+        0x30630001, 0x1060002c, 0x32510002, 0x3c029000, 0x8f830008, 0x34420001,
+        0x3c048000, 0x00621825, 0xaf430020, 0x8f420020, 0x00441024, 0x1440fffd,
+        0x00000000, 0x8f870000, 0x8ce2000c, 0x30420001, 0x10400018, 0x00000000,
+        0x94e2006a, 0x00022880, 0x50a00001, 0x24050001, 0x94e30068, 0x90e40081,
+        0x3c020800, 0x8c460024, 0x00652821, 0x00852804, 0x00c5102b, 0x54400001,
+        0x00a03021, 0x3c020800, 0x8c440028, 0x00c4182b, 0x54600001, 0x00c02021,
+        0x8f430074, 0x2402fffe, 0x00822824, 0x00a31821, 0xace3000c, 0x8f830008,
+        0x3c028000, 0x34420001, 0x00621825, 0xaf430020, 0x8f830020, 0x3c020800,
+        0x24504120, 0xae030024, 0x8ee20010, 0x0040f809, 0x00000000, 0x12a00005,
+        0x00000000, 0x8f420e10, 0xae02002c, 0x8f430e18, 0xae030030, 0x1220feba,
+        0x0000a821, 0x8f870024, 0x97860028, 0x8f830000, 0x8f820030, 0x8f840020,
+        0x8f85001c, 0x32500040, 0xa4e6002c, 0xac620044, 0x32420008, 0xac640050,
+        0xac650054, 0x1040007a, 0x32820020, 0x10400027, 0x32910010, 0x24072000,
+        0x3c090800, 0x3c038000, 0x8f420178, 0x00431024, 0x1440fffd, 0x8ec2414c,
+        0x26c4414c, 0x2484ffd4, 0xaf420144, 0x8c820030, 0x3c030400, 0xaf420148,
+        0x24020041, 0xaf43014c, 0x00001821, 0xa3420152, 0x3c021000, 0xa7430158,
+        0xaf470154, 0xaf420178, 0x8ec5414c, 0x8d230030, 0x8c860030, 0x24630001,
+        0xad230030, 0x93420109, 0x9343010a, 0xafa70014, 0xafa00018, 0x00021600,
+        0x00031c00, 0x00431025, 0x34424100, 0xafa20010, 0x8f440100, 0x0e000fe1,
+        0x3c070400, 0x12200028, 0x24072000, 0x3c090800, 0x3c038000, 0x8f420178,
+        0x00431024, 0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144,
+        0x8c820030, 0x3c030300, 0xaf420148, 0x2402004e, 0xaf43014c, 0x00001821,
+        0xa3420152, 0x3c021000, 0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c,
+        0x8d230030, 0x8c860030, 0x24630001, 0xad230030, 0x93420109, 0x9343010a,
+        0xafa70014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025, 0x34424e00,
+        0xafa20010, 0x8f440100, 0x0e000fe1, 0x3c070300, 0x0a000f0b, 0x8fa30024,
+        0x32820008, 0x10400026, 0x3c090800, 0x24072000, 0x3c038000, 0x8f420178,
+        0x00431024, 0x1440fffd, 0x8ec2414c, 0x26c4414c, 0x2484ffd4, 0xaf420144,
+        0x8c820030, 0x3c030200, 0xaf420148, 0x2402004b, 0xaf43014c, 0x00001821,
+        0xa3420152, 0x3c021000, 0xa7430158, 0xaf470154, 0xaf420178, 0x8ec5414c,
+        0x8d230030, 0x8c860030, 0x24630001, 0xad230030, 0x93420109, 0x9343010a,
+        0xafa70014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025, 0x34424b00,
+        0xafa20010, 0x8f440100, 0x0e000fe1, 0x3c070200, 0x8fa30024, 0x14600004,
+        0x8fa40020, 0x32420010, 0x10400004, 0x00000000, 0x8c820004, 0x0040f809,
+        0x00000000, 0x12000006, 0x8fa30020, 0x8c620008, 0x0040f809, 0x00000000,
+        0x0a000f4d, 0x8fbf004c, 0x3c030800, 0x8c62413c, 0x30420040, 0x1440002f,
+        0x8fbf004c, 0x24040040, 0x8f910020, 0x3c038000, 0x8f420178, 0x00431024,
+        0x1440fffd, 0x8ec2414c, 0x26d0414c, 0x2610ffd4, 0xaf420144, 0x8e020030,
+        0x00001821, 0xaf420148, 0x24020049, 0xaf51014c, 0xa3420152, 0x3c021000,
+        0xa7430158, 0xaf440154, 0xaf420178, 0x8ec5414c, 0x8e060030, 0x93420109,
+        0x9343010a, 0xafa40014, 0xafa00018, 0x00021600, 0x00031c00, 0x00431025,
+        0x34424900, 0xafa20010, 0x8f440100, 0x0e000fe1, 0x02203821, 0x8f830000,
+        0x8e020030, 0x8c64017c, 0x02221023, 0x00441023, 0x2c420002, 0x14400005,
+        0x8fbf004c, 0x0000000d, 0x00000000, 0x240000ca, 0x8fbf004c, 0x8fbe0048,
+        0x8fb70044, 0x8fb60040, 0x8fb5003c, 0x8fb40038, 0x8fb30034, 0x8fb20030,
+        0x8fb1002c, 0x8fb00028, 0x03e00008, 0x27bd0050, 0x03e00008, 0x00001021,
+        0x3c030800, 0x24654120, 0x8ca40004, 0x8c634120, 0x0064102b, 0x54400001,
+        0x00602021, 0x9743093c, 0x0083102b, 0x54400001, 0x00801821, 0x00001021,
+        0xaca30008, 0x03e00008, 0xa4a00022, 0x8f850004, 0x97840010, 0x3c030800,
+        0x24634120, 0x24020008, 0xa462000e, 0x8f820004, 0xa460000c, 0x000420c2,
+        0x30840008, 0x2c420001, 0x00021023, 0x30420006, 0xac650008, 0x03e00008,
+        0xa0640020, 0x3c020800, 0x24424120, 0x90450021, 0x94430018, 0x3c021100,
+        0xac800004, 0x00052c00, 0x24630002, 0x00621825, 0x00a32825, 0x24820008,
+        0x03e00008, 0xac850000, 0x0000000d, 0x00000000, 0x2400016f, 0x03e00008,
+        0x00000000, 0x0000000d, 0x00000000, 0x2400017b, 0x03e00008, 0x00000000,
+        0x03e00008, 0x00000000, 0x3c020800, 0x24424120, 0xac400008, 0xa4400022,
+        0x03e00008, 0x24020001, 0x3c020800, 0x24424120, 0x24030008, 0xac400008,
+        0xa440000c, 0xa443000e, 0xa0400020, 0x03e00008, 0x24020004, 0x03e00008,
+        0x00001021, 0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004,
+        0xac820000, 0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a000fb2,
+        0x00a01021, 0xac860000, 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff,
+        0x03e00008, 0x00000000, 0x3c0a0800, 0x8d490068, 0x3c050800, 0x24a51090,
+        0x00093140, 0x00c51021, 0xac440000, 0x8f440e04, 0x00a61021, 0xac440004,
+        0x97430e08, 0x97420e0c, 0x00a62021, 0x00031c00, 0x00431025, 0xac820008,
+        0x8f430e10, 0x00801021, 0xac43000c, 0x8f440e14, 0xac440010, 0x8f430e18,
+        0x3c0800ff, 0xac430014, 0x8f470e1c, 0x3508ffff, 0x25290001, 0xac470018,
+        0x3c070800, 0x8ce3006c, 0x9344010a, 0x3c026000, 0x24630001, 0xace3006c,
+        0x8c434448, 0x3129007f, 0x00a62821, 0xad490068, 0x00042600, 0x00681824,
+        0x00832025, 0x03e00008, 0xaca4001c, 0x8fac0010, 0x8fad0014, 0x8fae0018,
+        0x3c0b0800, 0x8d6a0060, 0x3c080800, 0x25080078, 0x000a4940, 0x01281021,
+        0x01091821, 0xac440000, 0x00601021, 0xac650004, 0xac460008, 0xac67000c,
+        0xac4c0010, 0xac6d0014, 0x3c036000, 0xac4e0018, 0x8c654448, 0x3c040800,
+        0x8c820064, 0x254a0001, 0x314a007f, 0x01094021, 0xad6a0060, 0x24420001,
+        0xac820064, 0x03e00008, 0xad05001c, 0x00000000 };
+
+static u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 };
+static u32 bnx2_TXP_b06FwBss[(0x194/4) + 1] = { 0x00000000 };
+static u32 bnx2_TXP_b06FwSbss[(0x34/4) + 1] = { 0x00000000 };
+
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 770e28f98fd5..269a5e407349 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3037,7 +3037,7 @@ static void bond_activebackup_arp_mon(struct net_device *bond_dev)
                         bond_set_slave_inactive_flags(bond->current_arp_slave);
 
                         /* search for next candidate */
-                        bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave) {
+                        bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave->next) {
                                 if (IS_UP(slave->dev)) {
                                         slave->link = BOND_LINK_BACK;
                                         bond_set_slave_active_flags(slave);
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
new file mode 100644
index 000000000000..f4ba0ffb8637
--- /dev/null
+++ b/drivers/net/dm9000.c
@@ -0,0 +1,1219 @@
+/*
+ *   dm9000.c: Version 1.2 03/18/2003
+ *
+ *         A Davicom DM9000 ISA NIC fast Ethernet driver for Linux.
+ *      Copyright (C) 1997  Sten Wang
+ *
+ *      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 program is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *   (C)Copyright 1997-1998 DAVICOM Semiconductor,Inc. All Rights Reserved.
+ *
+ * V0.11        06/20/2001      REG_0A bit3=1, default enable BP with DA match
+ *      06/22/2001      Support DM9801 progrmming
+ *                      E3: R25 = ((R24 + NF) & 0x00ff) | 0xf000
+ *                      E4: R25 = ((R24 + NF) & 0x00ff) | 0xc200
+ *                              R17 = (R17 & 0xfff0) | NF + 3
+ *                      E5: R25 = ((R24 + NF - 3) & 0x00ff) | 0xc200
+ *                              R17 = (R17 & 0xfff0) | NF
+ *
+ * v1.00                modify by simon 2001.9.5
+ *                         change for kernel 2.4.x
+ *
+ * v1.1   11/09/2001            fix force mode bug
+ *
+ * v1.2   03/18/2003       Weilun Huang <weilun_huang@davicom.com.tw>:
+ *                      Fixed phy reset.
+ *                      Added tx/rx 32 bit mode.
+ *                      Cleaned up for kernel merge.
+ *
+ *        03/03/2004    Sascha Hauer <s.hauer@pengutronix.de>
+ *                      Port to 2.6 kernel
+ *
+ *        24-Sep-2004   Ben Dooks <ben@simtec.co.uk>
+ *                      Cleanup of code to remove ifdefs
+ *                      Allowed platform device data to influence access width
+ *                      Reformatting areas of code
+ *
+ *        17-Mar-2005   Sascha Hauer <s.hauer@pengutronix.de>
+ *                      * removed 2.4 style module parameters
+ *                      * removed removed unused stat counter and fixed
+ *                        net_device_stats
+ *                      * introduced tx_timeout function
+ *                      * reworked locking
+ */
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
+#include <linux/spinlock.h>
+#include <linux/crc32.h>
+#include <linux/mii.h>
+#include <linux/dm9000.h>
+#include <linux/delay.h>
+
+#include <asm/delay.h>
+#include <asm/irq.h>
+#include <asm/io.h>
+
+#include "dm9000.h"
+
+/* Board/System/Debug information/definition ---------------- */
+
+#define DM9000_PHY              0x40    /* PHY address 0x01 */
+
+#define TRUE                    1
+#define FALSE                   0
+
+#define CARDNAME "dm9000"
+#define PFX CARDNAME ": "
+
+#define DM9000_TIMER_WUT  jiffies+(HZ*2)        /* timer wakeup time : 2 second */
+
+#define DM9000_DEBUG 0
+
+#if DM9000_DEBUG > 2
+#define PRINTK3(args...)  printk(CARDNAME ": " args)
+#else
+#define PRINTK3(args...)  do { } while(0)
+#endif
+
+#if DM9000_DEBUG > 1
+#define PRINTK2(args...)  printk(CARDNAME ": " args)
+#else
+#define PRINTK2(args...)  do { } while(0)
+#endif
+
+#if DM9000_DEBUG > 0
+#define PRINTK1(args...)  printk(CARDNAME ": " args)
+#define PRINTK(args...)   printk(CARDNAME ": " args)
+#else
+#define PRINTK1(args...)  do { } while(0)
+#define PRINTK(args...)   printk(KERN_DEBUG args)
+#endif
+
+/*
+ * Transmit timeout, default 5 seconds.
+ */
+static int watchdog = 5000;
+module_param(watchdog, int, 0400);
+MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");
+
+/* Structure/enum declaration ------------------------------- */
+typedef struct board_info {
+
+        void __iomem *io_addr;  /* Register I/O base address */
+        void __iomem *io_data;  /* Data I/O address */
+        u16 irq;                /* IRQ */
+
+        u16 tx_pkt_cnt;
+        u16 queue_pkt_len;
+        u16 queue_start_addr;
+        u16 dbug_cnt;
+        u8 io_mode;             /* 0:word, 2:byte */
+        u8 phy_addr;
+
+        void (*inblk)(void __iomem *port, void *data, int length);
+        void (*outblk)(void __iomem *port, void *data, int length);
+        void (*dumpblk)(void __iomem *port, int length);
+
+        struct resource *addr_res;   /* resources found */
+        struct resource *data_res;
+        struct resource *addr_req;   /* resources requested */
+        struct resource *data_req;
+        struct resource *irq_res;
+
+        struct timer_list timer;
+        struct net_device_stats stats;
+        unsigned char srom[128];
+        spinlock_t lock;
+
+        struct mii_if_info mii;
+        u32 msg_enable;
+} board_info_t;
+
+/* function declaration ------------------------------------- */
+static int dm9000_probe(struct device *);
+static int dm9000_open(struct net_device *);
+static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
+static int dm9000_stop(struct net_device *);
+static int dm9000_do_ioctl(struct net_device *, struct ifreq *, int);
+
+
+static void dm9000_timer(unsigned long);
+static void dm9000_init_dm9000(struct net_device *);
+
+static struct net_device_stats *dm9000_get_stats(struct net_device *);
+
+static irqreturn_t dm9000_interrupt(int, void *, struct pt_regs *);
+
+static int dm9000_phy_read(struct net_device *dev, int phyaddr_unsused, int reg);
+static void dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg,
+                           int value);
+static u16 read_srom_word(board_info_t *, int);
+static void dm9000_rx(struct net_device *);
+static void dm9000_hash_table(struct net_device *);
+
+//#define DM9000_PROGRAM_EEPROM
+#ifdef DM9000_PROGRAM_EEPROM
+static void program_eeprom(board_info_t * db);
+#endif
+/* DM9000 network board routine ---------------------------- */
+
+static void
+dm9000_reset(board_info_t * db)
+{
+        PRINTK1("dm9000x: resetting\n");
+        /* RESET device */
+        writeb(DM9000_NCR, db->io_addr);
+        udelay(200);
+        writeb(NCR_RST, db->io_data);
+        udelay(200);
+}
+
+/*
+ *   Read a byte from I/O port
+ */
+static u8
+ior(board_info_t * db, int reg)
+{
+        writeb(reg, db->io_addr);
+        return readb(db->io_data);
+}
+
+/*
+ *   Write a byte to I/O port
+ */
+
+static void
+iow(board_info_t * db, int reg, int value)
+{
+        writeb(reg, db->io_addr);
+        writeb(value, db->io_data);
+}
+
+/* routines for sending block to chip */
+
+static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)
+{
+        writesb(reg, data, count);
+}
+
+static void dm9000_outblk_16bit(void __iomem *reg, void *data, int count)
+{
+        writesw(reg, data, (count+1) >> 1);
+}
+
+static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count)
+{
+        writesl(reg, data, (count+3) >> 2);
+}
+
+/* input block from chip to memory */
+
+static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count)
+{
+        readsb(reg, data, count+1);
+}
+
+
+static void dm9000_inblk_16bit(void __iomem *reg, void *data, int count)
+{
+        readsw(reg, data, (count+1) >> 1);
+}
+
+static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count)
+{
+        readsl(reg, data, (count+3) >> 2);
+}
+
+/* dump block from chip to null */
+
+static void dm9000_dumpblk_8bit(void __iomem *reg, int count)
+{
+        int i;
+        int tmp;
+
+        for (i = 0; i < count; i++)
+                tmp = readb(reg);
+}
+
+static void dm9000_dumpblk_16bit(void __iomem *reg, int count)
+{
+        int i;
+        int tmp;
+
+        count = (count + 1) >> 1;
+
+        for (i = 0; i < count; i++)
+                tmp = readw(reg);
+}
+
+static void dm9000_dumpblk_32bit(void __iomem *reg, int count)
+{
+        int i;
+        int tmp;
+
+        count = (count + 3) >> 2;
+
+        for (i = 0; i < count; i++)
+                tmp = readl(reg);
+}
+
+/* dm9000_set_io
+ *
+ * select the specified set of io routines to use with the
+ * device
+ */
+
+static void dm9000_set_io(struct board_info *db, int byte_width)
+{
+        /* use the size of the data resource to work out what IO
+         * routines we want to use
+         */
+
+        switch (byte_width) {
+        case 1:
+                db->dumpblk = dm9000_dumpblk_8bit;
+                db->outblk  = dm9000_outblk_8bit;
+                db->inblk   = dm9000_inblk_8bit;
+                break;
+
+        case 2:
+                db->dumpblk = dm9000_dumpblk_16bit;
+                db->outblk  = dm9000_outblk_16bit;
+                db->inblk   = dm9000_inblk_16bit;
+                break;
+
+        case 3:
+                printk(KERN_ERR PFX ": 3 byte IO, falling back to 16bit\n");
+                db->dumpblk = dm9000_dumpblk_16bit;
+                db->outblk  = dm9000_outblk_16bit;
+                db->inblk   = dm9000_inblk_16bit;
+                break;
+
+        case 4:
+        default:
+                db->dumpblk = dm9000_dumpblk_32bit;
+                db->outblk  = dm9000_outblk_32bit;
+                db->inblk   = dm9000_inblk_32bit;
+                break;
+        }
+}
+
+
+/* Our watchdog timed out. Called by the networking layer */
+static void dm9000_timeout(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        u8 reg_save;
+        unsigned long flags;
+
+        /* Save previous register address */
+        reg_save = readb(db->io_addr);
+        spin_lock_irqsave(db->lock,flags);
+
+        netif_stop_queue(dev);
+        dm9000_reset(db);
+        dm9000_init_dm9000(dev);
+        /* We can accept TX packets again */
+        dev->trans_start = jiffies;
+        netif_wake_queue(dev);
+
+        /* Restore previous register address */
+        writeb(reg_save, db->io_addr);
+        spin_unlock_irqrestore(db->lock,flags);
+}
+
+
+/* dm9000_release_board
+ *
+ * release a board, and any mapped resources
+ */
+
+static void
+dm9000_release_board(struct platform_device *pdev, struct board_info *db)
+{
+        if (db->data_res == NULL) {
+                if (db->addr_res != NULL)
+                        release_mem_region((unsigned long)db->io_addr, 4);
+                return;
+        }
+
+        /* unmap our resources */
+
+        iounmap(db->io_addr);
+        iounmap(db->io_data);
+
+        /* release the resources */
+
+        if (db->data_req != NULL) {
+                release_resource(db->data_req);
+                kfree(db->data_req);
+        }
+
+        if (db->addr_res != NULL) {
+                release_resource(db->data_req);
+                kfree(db->addr_req);
+        }
+}
+
+#define res_size(_r) (((_r)->end - (_r)->start) + 1)
+
+/*
+ * Search DM9000 board, allocate space and register it
+ */
+static int
+dm9000_probe(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct dm9000_plat_data *pdata = pdev->dev.platform_data;
+        struct board_info *db;  /* Point a board information structure */
+        struct net_device *ndev;
+        unsigned long base;
+        int ret = 0;
+        int iosize;
+        int i;
+        u32 id_val;
+
+        printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);
+
+        /* Init network device */
+        ndev = alloc_etherdev(sizeof (struct board_info));
+        if (!ndev) {
+                printk("%s: could not allocate device.\n", CARDNAME);
+                return -ENOMEM;
+        }
+
+        SET_MODULE_OWNER(ndev);
+        SET_NETDEV_DEV(ndev, dev);
+
+        PRINTK2("dm9000_probe()");
+
+        /* setup board info structure */
+        db = (struct board_info *) ndev->priv;
+        memset(db, 0, sizeof (*db));
+
+        if (pdev->num_resources < 2) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        switch (pdev->num_resources) {
+        case 2:
+                base = pdev->resource[0].start;
+
+                if (!request_mem_region(base, 4, ndev->name)) {
+                        ret = -EBUSY;
+                        goto out;
+                }
+
+                ndev->base_addr = base;
+                ndev->irq = pdev->resource[1].start;
+                db->io_addr = (void *)base;
+                db->io_data = (void *)(base + 4);
+
+                break;
+
+        case 3:
+                db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+
+                if (db->addr_res == NULL || db->data_res == NULL) {
+                        printk(KERN_ERR PFX "insufficient resources\n");
+                        ret = -ENOENT;
+                        goto out;
+                }
+
+                i = res_size(db->addr_res);
+                db->addr_req = request_mem_region(db->addr_res->start, i,
+                                                  pdev->name);
+
+                if (db->addr_req == NULL) {
+                        printk(KERN_ERR PFX "cannot claim address reg area\n");
+                        ret = -EIO;
+                        goto out;
+                }
+
+                db->io_addr = ioremap(db->addr_res->start, i);
+
+                if (db->io_addr == NULL) {
+                        printk(KERN_ERR "failed to ioremap address reg\n");
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                iosize = res_size(db->data_res);
+                db->data_req = request_mem_region(db->data_res->start, iosize,
+                                                  pdev->name);
+
+                if (db->data_req == NULL) {
+                        printk(KERN_ERR PFX "cannot claim data reg area\n");
+                        ret = -EIO;
+                        goto out;
+                }
+
+                db->io_data = ioremap(db->data_res->start, iosize);
+
+                if (db->io_data == NULL) {
+                        printk(KERN_ERR "failed to ioremap data reg\n");
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                /* fill in parameters for net-dev structure */
+
+                ndev->base_addr = (unsigned long)db->io_addr;
+                ndev->irq       = db->irq_res->start;
+
+                /* ensure at least we have a default set of IO routines */
+                dm9000_set_io(db, iosize);
+
+        }
+
+        /* check to see if anything is being over-ridden */
+        if (pdata != NULL) {
+                /* check to see if the driver wants to over-ride the
+                 * default IO width */
+
+                if (pdata->flags & DM9000_PLATF_8BITONLY)
+                        dm9000_set_io(db, 1);
+
+                if (pdata->flags & DM9000_PLATF_16BITONLY)
+                        dm9000_set_io(db, 2);
+
+                if (pdata->flags & DM9000_PLATF_32BITONLY)
+                        dm9000_set_io(db, 4);
+
+                /* check to see if there are any IO routine
+                 * over-rides */
+
+                if (pdata->inblk != NULL)
+                        db->inblk = pdata->inblk;
+
+                if (pdata->outblk != NULL)
+                        db->outblk = pdata->outblk;
+
+                if (pdata->dumpblk != NULL)
+                        db->dumpblk = pdata->dumpblk;
+        }
+
+        dm9000_reset(db);
+
+        /* try two times, DM9000 sometimes gets the first read wrong */
+        for (i = 0; i < 2; i++) {
+                id_val  = ior(db, DM9000_VIDL);
+                id_val |= (u32)ior(db, DM9000_VIDH) << 8;
+                id_val |= (u32)ior(db, DM9000_PIDL) << 16;
+                id_val |= (u32)ior(db, DM9000_PIDH) << 24;
+
+                if (id_val == DM9000_ID)
+                        break;
+                printk("%s: read wrong id 0x%08x\n", CARDNAME, id_val);
+        }
+
+        if (id_val != DM9000_ID) {
+                printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
+                goto release;
+        }
+
+        /* from this point we assume that we have found a DM9000 */
+
+        /* driver system function */
+        ether_setup(ndev);
+
+        ndev->open               = &dm9000_open;
+        ndev->hard_start_xmit    = &dm9000_start_xmit;
+        ndev->tx_timeout         = &dm9000_timeout;
+        ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
+        ndev->stop               = &dm9000_stop;
+        ndev->get_stats          = &dm9000_get_stats;
+        ndev->set_multicast_list = &dm9000_hash_table;
+        ndev->do_ioctl           = &dm9000_do_ioctl;
+
+#ifdef DM9000_PROGRAM_EEPROM
+        program_eeprom(db);
+#endif
+        db->msg_enable       = NETIF_MSG_LINK;
+        db->mii.phy_id_mask  = 0x1f;
+        db->mii.reg_num_mask = 0x1f;
+        db->mii.force_media  = 0;
+        db->mii.full_duplex  = 0;
+        db->mii.dev          = ndev;
+        db->mii.mdio_read    = dm9000_phy_read;
+        db->mii.mdio_write   = dm9000_phy_write;
+
+        /* Read SROM content */
+        for (i = 0; i < 64; i++)
+                ((u16 *) db->srom)[i] = read_srom_word(db, i);
+
+        /* Set Node Address */
+        for (i = 0; i < 6; i++)
+                ndev->dev_addr[i] = db->srom[i];
+
+        if (!is_valid_ether_addr(ndev->dev_addr))
+                printk("%s: Invalid ethernet MAC address.  Please "
+                       "set using ifconfig\n", ndev->name);
+
+        dev_set_drvdata(dev, ndev);
+        ret = register_netdev(ndev);
+
+        if (ret == 0) {
+                printk("%s: dm9000 at %p,%p IRQ %d MAC: ",
+                       ndev->name,  db->io_addr, db->io_data, ndev->irq);
+                for (i = 0; i < 5; i++)
+                        printk("%02x:", ndev->dev_addr[i]);
+                printk("%02x\n", ndev->dev_addr[5]);
+        }
+        return 0;
+
+ release:
+ out:
+        printk("%s: not found (%d).\n", CARDNAME, ret);
+
+        dm9000_release_board(pdev, db);
+        kfree(ndev);
+
+        return ret;
+}
+
+/*
+ *  Open the interface.
+ *  The interface is opened whenever "ifconfig" actives it.
+ */
+static int
+dm9000_open(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+
+        PRINTK2("entering dm9000_open\n");
+
+        if (request_irq(dev->irq, &dm9000_interrupt, SA_SHIRQ, dev->name, dev))
+                return -EAGAIN;
+
+        /* Initialize DM9000 board */
+        dm9000_reset(db);
+        dm9000_init_dm9000(dev);
+
+        /* Init driver variable */
+        db->dbug_cnt = 0;
+
+        /* set and active a timer process */
+        init_timer(&db->timer);
+        db->timer.expires  = DM9000_TIMER_WUT * 2;
+        db->timer.data     = (unsigned long) dev;
+        db->timer.function = &dm9000_timer;
+        add_timer(&db->timer);
+
+        mii_check_media(&db->mii, netif_msg_link(db), 1);
+        netif_start_queue(dev);
+
+        return 0;
+}
+
+/*
+ * Initilize dm9000 board
+ */
+static void
+dm9000_init_dm9000(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+
+        PRINTK1("entering %s\n",__FUNCTION__);
+
+        /* I/O mode */
+        db->io_mode = ior(db, DM9000_ISR) >> 6; /* ISR bit7:6 keeps I/O mode */
+
+        /* GPIO0 on pre-activate PHY */
+        iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
+        iow(db, DM9000_GPCR, GPCR_GEP_CNTL);    /* Let GPIO0 output */
+        iow(db, DM9000_GPR, 0); /* Enable PHY */
+
+        /* Program operating register */
+        iow(db, DM9000_TCR, 0);         /* TX Polling clear */
+        iow(db, DM9000_BPTR, 0x3f);     /* Less 3Kb, 200us */
+        iow(db, DM9000_FCR, 0xff);      /* Flow Control */
+        iow(db, DM9000_SMCR, 0);        /* Special Mode */
+        /* clear TX status */
+        iow(db, DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END);
+        iow(db, DM9000_ISR, ISR_CLR_STATUS); /* Clear interrupt status */
+
+        /* Set address filter table */
+        dm9000_hash_table(dev);
+
+        /* Activate DM9000 */
+        iow(db, DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN);
+        /* Enable TX/RX interrupt mask */
+        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
+
+        /* Init Driver variable */
+        db->tx_pkt_cnt = 0;
+        db->queue_pkt_len = 0;
+        dev->trans_start = 0;
+        spin_lock_init(&db->lock);
+}
+
+/*
+ *  Hardware start transmission.
+ *  Send a packet to media from the upper layer.
+ */
+static int
+dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+
+        PRINTK3("dm9000_start_xmit\n");
+
+        if (db->tx_pkt_cnt > 1)
+                return 1;
+
+        netif_stop_queue(dev);
+
+        /* Disable all interrupts */
+        iow(db, DM9000_IMR, IMR_PAR);
+
+        /* Move data to DM9000 TX RAM */
+        writeb(DM9000_MWCMD, db->io_addr);
+
+        (db->outblk)(db->io_data, skb->data, skb->len);
+        db->stats.tx_bytes += skb->len;
+
+        /* TX control: First packet immediately send, second packet queue */
+        if (db->tx_pkt_cnt == 0) {
+
+                /* First Packet */
+                db->tx_pkt_cnt++;
+
+                /* Set TX length to DM9000 */
+                iow(db, DM9000_TXPLL, skb->len & 0xff);
+                iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
+
+                /* Issue TX polling command */
+                iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */
+
+                dev->trans_start = jiffies;     /* save the time stamp */
+
+        } else {
+                /* Second packet */
+                db->tx_pkt_cnt++;
+                db->queue_pkt_len = skb->len;
+        }
+
+        /* free this SKB */
+        dev_kfree_skb(skb);
+
+        /* Re-enable resource check */
+        if (db->tx_pkt_cnt == 1)
+                netif_wake_queue(dev);
+
+        /* Re-enable interrupt */
+        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
+
+        return 0;
+}
+
+static void
+dm9000_shutdown(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+
+        /* RESET device */
+        dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET); /* PHY RESET */
+        iow(db, DM9000_GPR, 0x01);      /* Power-Down PHY */
+        iow(db, DM9000_IMR, IMR_PAR);   /* Disable all interrupt */
+        iow(db, DM9000_RCR, 0x00);      /* Disable RX */
+}
+
+/*
+ * Stop the interface.
+ * The interface is stopped when it is brought.
+ */
+static int
+dm9000_stop(struct net_device *ndev)
+{
+        board_info_t *db = (board_info_t *) ndev->priv;
+
+        PRINTK1("entering %s\n",__FUNCTION__);
+
+        /* deleted timer */
+        del_timer(&db->timer);
+
+        netif_stop_queue(ndev);
+        netif_carrier_off(ndev);
+
+        /* free interrupt */
+        free_irq(ndev->irq, ndev);
+
+        dm9000_shutdown(ndev);
+
+        return 0;
+}
+
+/*
+ * DM9000 interrupt handler
+ * receive the packet to upper layer, free the transmitted packet
+ */
+
+void
+dm9000_tx_done(struct net_device *dev, board_info_t * db)
+{
+        int tx_status = ior(db, DM9000_NSR);    /* Got TX status */
+
+        if (tx_status & (NSR_TX2END | NSR_TX1END)) {
+                /* One packet sent complete */
+                db->tx_pkt_cnt--;
+                db->stats.tx_packets++;
+
+                /* Queue packet check & send */
+                if (db->tx_pkt_cnt > 0) {
+                        iow(db, DM9000_TXPLL, db->queue_pkt_len & 0xff);
+                        iow(db, DM9000_TXPLH, (db->queue_pkt_len >> 8) & 0xff);
+                        iow(db, DM9000_TCR, TCR_TXREQ);
+                        dev->trans_start = jiffies;
+                }
+                netif_wake_queue(dev);
+        }
+}
+
+static irqreturn_t
+dm9000_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *dev = dev_id;
+        board_info_t *db;
+        int int_status;
+        u8 reg_save;
+
+        PRINTK3("entering %s\n",__FUNCTION__);
+
+        if (!dev) {
+                PRINTK1("dm9000_interrupt() without DEVICE arg\n");
+                return IRQ_HANDLED;
+        }
+
+        /* A real interrupt coming */
+        db = (board_info_t *) dev->priv;
+        spin_lock(&db->lock);
+
+        /* Save previous register address */
+        reg_save = readb(db->io_addr);
+
+        /* Disable all interrupts */
+        iow(db, DM9000_IMR, IMR_PAR);
+
+        /* Got DM9000 interrupt status */
+        int_status = ior(db, DM9000_ISR);       /* Got ISR */
+        iow(db, DM9000_ISR, int_status);        /* Clear ISR status */
+
+        /* Received the coming packet */
+        if (int_status & ISR_PRS)
+                dm9000_rx(dev);
+
+        /* Trnasmit Interrupt check */
+        if (int_status & ISR_PTS)
+                dm9000_tx_done(dev, db);
+
+        /* Re-enable interrupt mask */
+        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
+
+        /* Restore previous register address */
+        writeb(reg_save, db->io_addr);
+
+        spin_unlock(&db->lock);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ *  Get statistics from driver.
+ */
+static struct net_device_stats *
+dm9000_get_stats(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        return &db->stats;
+}
+
+/*
+ *  Process the upper socket ioctl command
+ */
+static int
+dm9000_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        PRINTK1("entering %s\n",__FUNCTION__);
+        return 0;
+}
+
+/*
+ *  A periodic timer routine
+ *  Dynamic media sense, allocated Rx buffer...
+ */
+static void
+dm9000_timer(unsigned long data)
+{
+        struct net_device *dev = (struct net_device *) data;
+        board_info_t *db = (board_info_t *) dev->priv;
+        u8 reg_save;
+        unsigned long flags;
+
+        PRINTK3("dm9000_timer()\n");
+
+        spin_lock_irqsave(db->lock,flags);
+        /* Save previous register address */
+        reg_save = readb(db->io_addr);
+
+        mii_check_media(&db->mii, netif_msg_link(db), 0);
+
+        /* Restore previous register address */
+        writeb(reg_save, db->io_addr);
+        spin_unlock_irqrestore(db->lock,flags);
+
+        /* Set timer again */
+        db->timer.expires = DM9000_TIMER_WUT;
+        add_timer(&db->timer);
+}
+
+struct dm9000_rxhdr {
+        u16     RxStatus;
+        u16     RxLen;
+} __attribute__((__packed__));
+
+/*
+ *  Received a packet and pass to upper layer
+ */
+static void
+dm9000_rx(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        struct dm9000_rxhdr rxhdr;
+        struct sk_buff *skb;
+        u8 rxbyte, *rdptr;
+        int GoodPacket;
+        int RxLen;
+
+        /* Check packet ready or not */
+        do {
+                ior(db, DM9000_MRCMDX); /* Dummy read */
+
+                /* Get most updated data */
+                rxbyte = readb(db->io_data);
+
+                /* Status check: this byte must be 0 or 1 */
+                if (rxbyte > DM9000_PKT_RDY) {
+                        printk("status check failed: %d\n", rxbyte);
+                        iow(db, DM9000_RCR, 0x00);      /* Stop Device */
+                        iow(db, DM9000_ISR, IMR_PAR);   /* Stop INT request */
+                        return;
+                }
+
+                if (rxbyte != DM9000_PKT_RDY)
+                        return;
+
+                /* A packet ready now  & Get status/length */
+                GoodPacket = TRUE;
+                writeb(DM9000_MRCMD, db->io_addr);
+
+                (db->inblk)(db->io_data, &rxhdr, sizeof(rxhdr));
+
+                RxLen = rxhdr.RxLen;
+
+                /* Packet Status check */
+                if (RxLen < 0x40) {
+                        GoodPacket = FALSE;
+                        PRINTK1("Bad Packet received (runt)\n");
+                }
+
+                if (RxLen > DM9000_PKT_MAX) {
+                        PRINTK1("RST: RX Len:%x\n", RxLen);
+                }
+
+                if (rxhdr.RxStatus & 0xbf00) {
+                        GoodPacket = FALSE;
+                        if (rxhdr.RxStatus & 0x100) {
+                                PRINTK1("fifo error\n");
+                                db->stats.rx_fifo_errors++;
+                        }
+                        if (rxhdr.RxStatus & 0x200) {
+                                PRINTK1("crc error\n");
+                                db->stats.rx_crc_errors++;
+                        }
+                        if (rxhdr.RxStatus & 0x8000) {
+                                PRINTK1("length error\n");
+                                db->stats.rx_length_errors++;
+                        }
+                }
+
+                /* Move data from DM9000 */
+                if (GoodPacket
+                    && ((skb = dev_alloc_skb(RxLen + 4)) != NULL)) {
+                        skb->dev = dev;
+                        skb_reserve(skb, 2);
+                        rdptr = (u8 *) skb_put(skb, RxLen - 4);
+
+                        /* Read received packet from RX SRAM */
+
+                        (db->inblk)(db->io_data, rdptr, RxLen);
+                        db->stats.rx_bytes += RxLen;
+
+                        /* Pass to upper layer */
+                        skb->protocol = eth_type_trans(skb, dev);
+                        netif_rx(skb);
+                        db->stats.rx_packets++;
+
+                } else {
+                        /* need to dump the packet's data */
+
+                        (db->dumpblk)(db->io_data, RxLen);
+                }
+        } while (rxbyte == DM9000_PKT_RDY);
+}
+
+/*
+ *  Read a word data from SROM
+ */
+static u16
+read_srom_word(board_info_t * db, int offset)
+{
+        iow(db, DM9000_EPAR, offset);
+        iow(db, DM9000_EPCR, EPCR_ERPRR);
+        mdelay(8);              /* according to the datasheet 200us should be enough,
+                                   but it doesn't work */
+        iow(db, DM9000_EPCR, 0x0);
+        return (ior(db, DM9000_EPDRL) + (ior(db, DM9000_EPDRH) << 8));
+}
+
+#ifdef DM9000_PROGRAM_EEPROM
+/*
+ * Write a word data to SROM
+ */
+static void
+write_srom_word(board_info_t * db, int offset, u16 val)
+{
+        iow(db, DM9000_EPAR, offset);
+        iow(db, DM9000_EPDRH, ((val >> 8) & 0xff));
+        iow(db, DM9000_EPDRL, (val & 0xff));
+        iow(db, DM9000_EPCR, EPCR_WEP | EPCR_ERPRW);
+        mdelay(8);              /* same shit */
+        iow(db, DM9000_EPCR, 0);
+}
+
+/*
+ * Only for development:
+ * Here we write static data to the eeprom in case
+ * we don't have valid content on a new board
+ */
+static void
+program_eeprom(board_info_t * db)
+{
+        u16 eeprom[] = { 0x0c00, 0x007f, 0x1300,        /* MAC Address */
+                0x0000,         /* Autoload: accept nothing */
+                0x0a46, 0x9000, /* Vendor / Product ID */
+                0x0000,         /* pin control */
+                0x0000,
+        };                      /* Wake-up mode control */
+        int i;
+        for (i = 0; i < 8; i++)
+                write_srom_word(db, i, eeprom[i]);
+}
+#endif
+
+
+/*
+ *  Calculate the CRC valude of the Rx packet
+ *  flag = 1 : return the reverse CRC (for the received packet CRC)
+ *         0 : return the normal CRC (for Hash Table index)
+ */
+
+static unsigned long
+cal_CRC(unsigned char *Data, unsigned int Len, u8 flag)
+{
+
+       u32 crc = ether_crc_le(Len, Data);
+
+       if (flag)
+               return ~crc;
+
+       return crc;
+}
+
+/*
+ *  Set DM9000 multicast address
+ */
+static void
+dm9000_hash_table(struct net_device *dev)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        struct dev_mc_list *mcptr = dev->mc_list;
+        int mc_cnt = dev->mc_count;
+        u32 hash_val;
+        u16 i, oft, hash_table[4];
+        unsigned long flags;
+
+        PRINTK2("dm9000_hash_table()\n");
+
+        spin_lock_irqsave(&db->lock,flags);
+
+        for (i = 0, oft = 0x10; i < 6; i++, oft++)
+                iow(db, oft, dev->dev_addr[i]);
+
+        /* Clear Hash Table */
+        for (i = 0; i < 4; i++)
+                hash_table[i] = 0x0;
+
+        /* broadcast address */
+        hash_table[3] = 0x8000;
+
+        /* the multicast address in Hash Table : 64 bits */
+        for (i = 0; i < mc_cnt; i++, mcptr = mcptr->next) {
+                hash_val = cal_CRC((char *) mcptr->dmi_addr, 6, 0) & 0x3f;
+                hash_table[hash_val / 16] |= (u16) 1 << (hash_val % 16);
+        }
+
+        /* Write the hash table to MAC MD table */
+        for (i = 0, oft = 0x16; i < 4; i++) {
+                iow(db, oft++, hash_table[i] & 0xff);
+                iow(db, oft++, (hash_table[i] >> 8) & 0xff);
+        }
+
+        spin_unlock_irqrestore(&db->lock,flags);
+}
+
+
+/*
+ *   Read a word from phyxcer
+ */
+static int
+dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&db->lock,flags);
+        /* Fill the phyxcer register into REG_0C */
+        iow(db, DM9000_EPAR, DM9000_PHY | reg);
+
+        iow(db, DM9000_EPCR, 0xc);      /* Issue phyxcer read command */
+        udelay(100);            /* Wait read complete */
+        iow(db, DM9000_EPCR, 0x0);      /* Clear phyxcer read command */
+
+        /* The read data keeps on REG_0D & REG_0E */
+        ret = (ior(db, DM9000_EPDRH) << 8) | ior(db, DM9000_EPDRL);
+
+        spin_unlock_irqrestore(&db->lock,flags);
+
+        return ret;
+}
+
+/*
+ *   Write a word to phyxcer
+ */
+static void
+dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
+{
+        board_info_t *db = (board_info_t *) dev->priv;
+        unsigned long flags;
+
+        spin_lock_irqsave(&db->lock,flags);
+
+        /* Fill the phyxcer register into REG_0C */
+        iow(db, DM9000_EPAR, DM9000_PHY | reg);
+
+        /* Fill the written data into REG_0D & REG_0E */
+        iow(db, DM9000_EPDRL, (value & 0xff));
+        iow(db, DM9000_EPDRH, ((value >> 8) & 0xff));
+
+        iow(db, DM9000_EPCR, 0xa);      /* Issue phyxcer write command */
+        udelay(500);            /* Wait write complete */
+        iow(db, DM9000_EPCR, 0x0);      /* Clear phyxcer write command */
+
+        spin_unlock_irqrestore(&db->lock,flags);
+}
+
+static int
+dm9000_drv_suspend(struct device *dev, u32 state, u32 level)
+{
+        struct net_device *ndev = dev_get_drvdata(dev);
+
+        if (ndev && level == SUSPEND_DISABLE) {
+                if (netif_running(ndev)) {
+                        netif_device_detach(ndev);
+                        dm9000_shutdown(ndev);
+                }
+        }
+        return 0;
+}
+
+static int
+dm9000_drv_resume(struct device *dev, u32 level)
+{
+        struct net_device *ndev = dev_get_drvdata(dev);
+        board_info_t *db = (board_info_t *) ndev->priv;
+
+        if (ndev && level == RESUME_ENABLE) {
+
+                if (netif_running(ndev)) {
+                        dm9000_reset(db);
+                        dm9000_init_dm9000(ndev);
+
+                        netif_device_attach(ndev);
+                }
+        }
+        return 0;
+}
+
+static int
+dm9000_drv_remove(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct net_device *ndev = dev_get_drvdata(dev);
+
+        dev_set_drvdata(dev, NULL);
+
+        unregister_netdev(ndev);
+        dm9000_release_board(pdev, (board_info_t *) ndev->priv);
+        kfree(ndev);            /* free device structure */
+
+        PRINTK1("clean_module() exit\n");
+
+        return 0;
+}
+
+static struct device_driver dm9000_driver = {
+        .name    = "dm9000",
+        .bus     = &platform_bus_type,
+        .probe   = dm9000_probe,
+        .remove  = dm9000_drv_remove,
+        .suspend = dm9000_drv_suspend,
+        .resume  = dm9000_drv_resume,
+};
+
+static int __init
+dm9000_init(void)
+{
+        return driver_register(&dm9000_driver); /* search board and register */
+}
+
+static void __exit
+dm9000_cleanup(void)
+{
+        driver_unregister(&dm9000_driver);
+}
+
+module_init(dm9000_init);
+module_exit(dm9000_cleanup);
+
+MODULE_AUTHOR("Sascha Hauer, Ben Dooks");
+MODULE_DESCRIPTION("Davicom DM9000 network driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/dm9000.h b/drivers/net/dm9000.h
new file mode 100644
index 000000000000..82cad360bafc
--- /dev/null
+++ b/drivers/net/dm9000.h
@@ -0,0 +1,135 @@
+/*
+ * dm9000 Ethernet
+ */
+
+#ifndef _DM9000X_H_
+#define _DM9000X_H_
+
+#define DM9000_ID               0x90000A46
+
+/* although the registers are 16 bit, they are 32-bit aligned.
+ */
+
+#define DM9000_NCR             0x00
+#define DM9000_NSR             0x01
+#define DM9000_TCR             0x02
+#define DM9000_TSR1            0x03
+#define DM9000_TSR2            0x04
+#define DM9000_RCR             0x05
+#define DM9000_RSR             0x06
+#define DM9000_ROCR            0x07
+#define DM9000_BPTR            0x08
+#define DM9000_FCTR            0x09
+#define DM9000_FCR             0x0A
+#define DM9000_EPCR            0x0B
+#define DM9000_EPAR            0x0C
+#define DM9000_EPDRL           0x0D
+#define DM9000_EPDRH           0x0E
+#define DM9000_WCR             0x0F
+
+#define DM9000_PAR             0x10
+#define DM9000_MAR             0x16
+
+#define DM9000_GPCR            0x1e
+#define DM9000_GPR             0x1f
+#define DM9000_TRPAL           0x22
+#define DM9000_TRPAH           0x23
+#define DM9000_RWPAL           0x24
+#define DM9000_RWPAH           0x25
+
+#define DM9000_VIDL            0x28
+#define DM9000_VIDH            0x29
+#define DM9000_PIDL            0x2A
+#define DM9000_PIDH            0x2B
+
+#define DM9000_CHIPR           0x2C
+#define DM9000_SMCR            0x2F
+
+#define DM9000_MRCMDX          0xF0
+#define DM9000_MRCMD           0xF2
+#define DM9000_MRRL            0xF4
+#define DM9000_MRRH            0xF5
+#define DM9000_MWCMDX          0xF6
+#define DM9000_MWCMD           0xF8
+#define DM9000_MWRL            0xFA
+#define DM9000_MWRH            0xFB
+#define DM9000_TXPLL           0xFC
+#define DM9000_TXPLH           0xFD
+#define DM9000_ISR             0xFE
+#define DM9000_IMR             0xFF
+
+#define NCR_EXT_PHY         (1<<7)
+#define NCR_WAKEEN          (1<<6)
+#define NCR_FCOL            (1<<4)
+#define NCR_FDX             (1<<3)
+#define NCR_LBK             (3<<1)
+#define NCR_RST             (1<<0)
+
+#define NSR_SPEED           (1<<7)
+#define NSR_LINKST          (1<<6)
+#define NSR_WAKEST          (1<<5)
+#define NSR_TX2END          (1<<3)
+#define NSR_TX1END          (1<<2)
+#define NSR_RXOV            (1<<1)
+
+#define TCR_TJDIS           (1<<6)
+#define TCR_EXCECM          (1<<5)
+#define TCR_PAD_DIS2        (1<<4)
+#define TCR_CRC_DIS2        (1<<3)
+#define TCR_PAD_DIS1        (1<<2)
+#define TCR_CRC_DIS1        (1<<1)
+#define TCR_TXREQ           (1<<0)
+
+#define TSR_TJTO            (1<<7)
+#define TSR_LC              (1<<6)
+#define TSR_NC              (1<<5)
+#define TSR_LCOL            (1<<4)
+#define TSR_COL             (1<<3)
+#define TSR_EC              (1<<2)
+
+#define RCR_WTDIS           (1<<6)
+#define RCR_DIS_LONG        (1<<5)
+#define RCR_DIS_CRC         (1<<4)
+#define RCR_ALL             (1<<3)
+#define RCR_RUNT            (1<<2)
+#define RCR_PRMSC           (1<<1)
+#define RCR_RXEN            (1<<0)
+
+#define RSR_RF              (1<<7)
+#define RSR_MF              (1<<6)
+#define RSR_LCS             (1<<5)
+#define RSR_RWTO            (1<<4)
+#define RSR_PLE             (1<<3)
+#define RSR_AE              (1<<2)
+#define RSR_CE              (1<<1)
+#define RSR_FOE             (1<<0)
+
+#define FCTR_HWOT(ot)   (( ot & 0xf ) << 4 )
+#define FCTR_LWOT(ot)   ( ot & 0xf )
+
+#define IMR_PAR             (1<<7)
+#define IMR_ROOM            (1<<3)
+#define IMR_ROM             (1<<2)
+#define IMR_PTM             (1<<1)
+#define IMR_PRM             (1<<0)
+
+#define ISR_ROOS            (1<<3)
+#define ISR_ROS             (1<<2)
+#define ISR_PTS             (1<<1)
+#define ISR_PRS             (1<<0)
+#define ISR_CLR_STATUS      (ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS)
+
+#define EPCR_REEP           (1<<5)
+#define EPCR_WEP            (1<<4)
+#define EPCR_EPOS           (1<<3)
+#define EPCR_ERPRR          (1<<2)
+#define EPCR_ERPRW          (1<<1)
+#define EPCR_ERRE           (1<<0)
+
+#define GPCR_GEP_CNTL       (1<<0)
+
+#define DM9000_PKT_RDY          0x01    /* Packet ready to receive */
+#define DM9000_PKT_MAX          1536    /* Received packet max size */
+
+#endif /* _DM9000X_H_ */
+
diff --git a/drivers/net/fmv18x.c b/drivers/net/fmv18x.c
deleted file mode 100644
index 04c748523471..000000000000
--- a/drivers/net/fmv18x.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/* fmv18x.c: A network device driver for the Fujitsu FMV-181/182/183/184.
-
-        Original: at1700.c (1993-94 by Donald Becker).
-                Copyright 1993 United States Government as represented by the
-                Director, National Security Agency.
-                The author may be reached as becker@scyld.com, or C/O
-                        Scyld Computing Corporation
-                        410 Severn Ave., Suite 210
-                        Annapolis MD 21403
-
-        Modified by Yutaka TAMIYA (tamy@flab.fujitsu.co.jp)
-                Copyright 1994 Fujitsu Laboratories Ltd.
-        Special thanks to:
-                Masayoshi UTAKA (utaka@ace.yk.fujitsu.co.jp)
-                        for testing this driver.
-                H. NEGISHI (agy, negishi@sun45.psd.cs.fujitsu.co.jp)
-                        for suggestion of some program modification.
-                Masahiro SEKIGUCHI <seki@sysrap.cs.fujitsu.co.jp>
-                        for suggestion of some program modification.
-                Kazutoshi MORIOKA (morioka@aurora.oaks.cs.fujitsu.co.jp)
-                        for testing this driver.
-
-        This software may be used and distributed according to the terms
-        of the GNU General Public License, incorporated herein by reference.
-
-        This is a device driver for the Fujitsu FMV-181/182/183/184, which
-        is a straight-forward Fujitsu MB86965 implementation.
-
-  Sources:
-    at1700.c
-    The Fujitsu MB86965 datasheet.
-    The Fujitsu FMV-181/182 user's guide
-*/
-
-static const char version[] =
-        "fmv18x.c:v2.2.0 09/24/98  Yutaka TAMIYA (tamy@flab.fujitsu.co.jp)\n";
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/in.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/spinlock.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/bitops.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
-#define DRV_NAME "fmv18x"
-
-static unsigned fmv18x_probe_list[] __initdata = {
-        0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x300, 0x340, 0
-};
-
-/* use 0 for production, 1 for verification, >2 for debug */
-#ifndef NET_DEBUG
-#define NET_DEBUG 1
-#endif
-static unsigned int net_debug = NET_DEBUG;
-
-typedef unsigned char uchar;
-
-/* Information that need to be kept for each board. */
-struct net_local {
-        struct net_device_stats stats;
-        long open_time;                         /* Useless example local info. */
-        uint tx_started:1;                      /* Number of packet on the Tx queue. */
-        uint tx_queue_ready:1;          /* Tx queue is ready to be sent. */
-        uint rx_started:1;                      /* Packets are Rxing. */
-        uchar tx_queue;                         /* Number of packet on the Tx queue. */
-        ushort tx_queue_len;            /* Current length of the Tx queue. */
-        spinlock_t lock;
-};
-
-
-/* Offsets from the base address. */
-#define STATUS                  0
-#define TX_STATUS               0
-#define RX_STATUS               1
-#define TX_INTR                 2               /* Bit-mapped interrupt enable registers. */
-#define RX_INTR                 3
-#define TX_MODE                 4
-#define RX_MODE                 5
-#define CONFIG_0                6               /* Misc. configuration settings. */
-#define CONFIG_1                7
-/* Run-time register bank 2 definitions. */
-#define DATAPORT                8               /* Word-wide DMA or programmed-I/O dataport. */
-#define TX_START                10
-#define COL16CNTL               11              /* Controll Reg for 16 collisions */
-#define MODE13                  13
-/* Fujitsu FMV-18x Card Configuration */
-#define FJ_STATUS0              0x10
-#define FJ_STATUS1              0x11
-#define FJ_CONFIG0              0x12
-#define FJ_CONFIG1              0x13
-#define FJ_MACADDR              0x14    /* 0x14 - 0x19 */
-#define FJ_BUFCNTL              0x1A
-#define FJ_BUFDATA              0x1C
-#define FMV18X_IO_EXTENT        32
-
-/* Index to functions, as function prototypes. */
-
-static int fmv18x_probe1(struct net_device *dev, short ioaddr);
-static int net_open(struct net_device *dev);
-static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static void net_rx(struct net_device *dev);
-static void net_timeout(struct net_device *dev);
-static int net_close(struct net_device *dev);
-static struct net_device_stats *net_get_stats(struct net_device *dev);
-static void set_multicast_list(struct net_device *dev);
-
-
-/* Check for a network adaptor of this type, and return '0' iff one exists.
-   If dev->base_addr == 0, probe all likely locations.
-   If dev->base_addr == 1, always return failure.
-   If dev->base_addr == 2, allocate space for the device and return success
-   (detachable devices only).
-   */
-
-static int io = 0x220;
-static int irq;
-
-struct net_device * __init fmv18x_probe(int unit)
-{
-        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-        unsigned *port;
-        int err = 0;
-
-        if (!dev)
-                return ERR_PTR(-ENODEV);
-
-        if (unit >= 0) {
-                sprintf(dev->name, "eth%d", unit);
-                netdev_boot_setup_check(dev);
-                io = dev->base_addr;
-                irq = dev->irq;
-        }
-
-        SET_MODULE_OWNER(dev);
-
-        if (io > 0x1ff) {       /* Check a single specified location. */
-                err = fmv18x_probe1(dev, io);
-        } else if (io != 0) {   /* Don't probe at all. */
-                err = -ENXIO;
-        } else {
-                for (port = fmv18x_probe_list; *port; port++)
-                        if (fmv18x_probe1(dev, *port) == 0)
-                                break;
-                if (!*port)
-                        err = -ENODEV;
-        }
-        if (err)
-                goto out;
-        err = register_netdev(dev);
-        if (err)
-                goto out1;
-        return dev;
-out1:
-        free_irq(dev->irq, dev);
-        release_region(dev->base_addr, FMV18X_IO_EXTENT);
-out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-}
-
-/* The Fujitsu datasheet suggests that the NIC be probed for by checking its
-   "signature", the default bit pattern after a reset.  This *doesn't* work --
-   there is no way to reset the bus interface without a complete power-cycle!
-
-   It turns out that ATI came to the same conclusion I did: the only thing
-   that can be done is checking a few bits and then diving right into MAC
-   address check. */
-
-static int __init fmv18x_probe1(struct net_device *dev, short ioaddr)
-{
-        char irqmap[4] = {3, 7, 10, 15};
-        char irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
-        unsigned int i, retval;
-        struct net_local *lp;
-
-        /* Resetting the chip doesn't reset the ISA interface, so don't bother.
-           That means we have to be careful with the register values we probe for.
-           */
-
-        if (!request_region(ioaddr, FMV18X_IO_EXTENT, DRV_NAME))
-                return -EBUSY;
-
-        dev->irq = irq;
-        dev->base_addr = ioaddr;
-
-        /* Check I/O address configuration and Fujitsu vendor code */
-        if (inb(ioaddr+FJ_MACADDR  ) != 0x00
-        ||  inb(ioaddr+FJ_MACADDR+1) != 0x00
-        ||  inb(ioaddr+FJ_MACADDR+2) != 0x0e) {
-                retval = -ENODEV;
-                goto out;
-        }
-
-        /* Check PnP mode for FMV-183/184/183A/184A. */
-        /* This PnP routine is very poor. IO and IRQ should be known. */
-        if (inb(ioaddr + FJ_STATUS1) & 0x20) {
-                for (i = 0; i < 8; i++) {
-                        if (dev->irq == irqmap_pnp[i])
-                                break;
-                }
-                if (i == 8) {
-                        retval = -ENODEV;
-                        goto out;
-                }
-        } else {
-                if (fmv18x_probe_list[inb(ioaddr + FJ_CONFIG0) & 0x07] != ioaddr)
-                        return -ENODEV;
-                dev->irq = irqmap[(inb(ioaddr + FJ_CONFIG0)>>6) & 0x03];
-        }
-
-        /* Snarf the interrupt vector now. */
-        retval = request_irq(dev->irq, &net_interrupt, 0, DRV_NAME, dev);
-        if (retval) {
-                printk ("FMV-18x found at %#3x, but it's unusable due to a conflict on"
-                                "IRQ %d.\n", ioaddr, dev->irq);
-                goto out;
-        }
-
-        printk("%s: FMV-18x found at %#3x, IRQ %d, address ", dev->name,
-                   ioaddr, dev->irq);
-
-        for(i = 0; i < 6; i++) {
-                unsigned char val = inb(ioaddr + FJ_MACADDR + i);
-                printk("%02x", val);
-                dev->dev_addr[i] = val;
-        }
-
-        /* "FJ_STATUS0" 12 bit 0x0400 means use regular 100 ohm 10baseT signals,
-           rather than 150 ohm shielded twisted pair compensation.
-           0x0000 == auto-sense the interface
-           0x0800 == use TP interface
-           0x1800 == use coax interface
-           */
-        {
-                const char *porttype[] = {"auto-sense", "10baseT", "auto-sense", "10base2/5"};
-                ushort setup_value = inb(ioaddr + FJ_STATUS0);
-
-                switch( setup_value & 0x07 ){
-                case 0x01 /* 10base5 */:
-                case 0x02 /* 10base2 */: dev->if_port = 0x18; break;
-                case 0x04 /* 10baseT */: dev->if_port = 0x08; break;
-                default /* auto-sense*/: dev->if_port = 0x00; break;
-                }
-                printk(" %s interface.\n", porttype[(dev->if_port>>3) & 3]);
-        }
-
-        /* Initialize LAN Controller and LAN Card */
-        outb(0xda, ioaddr + CONFIG_0);   /* Initialize LAN Controller */
-        outb(0x00, ioaddr + CONFIG_1);   /* Stand by mode */
-        outb(0x00, ioaddr + FJ_CONFIG1); /* Disable IRQ of LAN Card */
-        outb(0x00, ioaddr + FJ_BUFCNTL); /* Reset ? I'm not sure (TAMIYA) */
-
-        /* wait for a while */
-        udelay(200);
-
-        /* Set the station address in bank zero. */
-        outb(0x00, ioaddr + CONFIG_1);
-        for (i = 0; i < 6; i++)
-                outb(dev->dev_addr[i], ioaddr + 8 + i);
-
-        /* Switch to bank 1 and set the multicast table to accept none. */
-        outb(0x04, ioaddr + CONFIG_1);
-        for (i = 0; i < 8; i++)
-                outb(0x00, ioaddr + 8 + i);
-
-        /* Switch to bank 2 and lock our I/O address. */
-        outb(0x08, ioaddr + CONFIG_1);
-        outb(dev->if_port, ioaddr + MODE13);
-        outb(0x00, ioaddr + COL16CNTL);
-
-        if (net_debug)
-                printk(version);
-
-        /* Initialize the device structure. */
-        dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
-        if (!dev->priv) {
-                retval = -ENOMEM;
-                goto out_irq;
-        }
-        memset(dev->priv, 0, sizeof(struct net_local));
-        lp = dev->priv;
-        spin_lock_init(&lp->lock);
-
-        dev->open               = net_open;
-        dev->stop               = net_close;
-        dev->hard_start_xmit    = net_send_packet;
-        dev->tx_timeout         = net_timeout;
-        dev->watchdog_timeo     = HZ/10;
-        dev->get_stats          = net_get_stats;
-        dev->set_multicast_list = set_multicast_list;
-        return 0;
-
-out_irq:
-        free_irq(dev->irq, dev);
-out:
-        release_region(ioaddr, FMV18X_IO_EXTENT);
-        return retval;
-}
-
-
-static int net_open(struct net_device *dev)
-{
-        struct net_local *lp = dev->priv;
-        int ioaddr = dev->base_addr;
-
-        /* Set the configuration register 0 to 32K 100ns. byte-wide memory,
-           16 bit bus access, and two 4K Tx, enable the Rx and Tx. */
-        outb(0x5a, ioaddr + CONFIG_0);
-
-        /* Powerup and switch to register bank 2 for the run-time registers. */
-        outb(0xe8, ioaddr + CONFIG_1);
-
-        lp->tx_started = 0;
-        lp->tx_queue_ready = 1;
-        lp->rx_started = 0;
-        lp->tx_queue = 0;
-        lp->tx_queue_len = 0;
-
-        /* Clear Tx and Rx Status */
-        outb(0xff, ioaddr + TX_STATUS);
-        outb(0xff, ioaddr + RX_STATUS);
-        lp->open_time = jiffies;
-
-        netif_start_queue(dev);
-        
-        /* Enable the IRQ of the LAN Card */
-        outb(0x80, ioaddr + FJ_CONFIG1);
-
-        /* Enable both Tx and Rx interrupts */
-        outw(0x8182, ioaddr+TX_INTR);
-
-        return 0;
-}
-
-static void net_timeout(struct net_device *dev)
-{
-        struct net_local *lp = dev->priv;
-        int ioaddr = dev->base_addr;
-        unsigned long flags;
-        
-        
-        printk(KERN_WARNING "%s: transmit timed out with status %04x, %s?\n", dev->name,
-                   htons(inw(ioaddr + TX_STATUS)),
-                   inb(ioaddr + TX_STATUS) & 0x80
-                   ? "IRQ conflict" : "network cable problem");
-        printk(KERN_WARNING "%s: timeout registers: %04x %04x %04x %04x %04x %04x %04x %04x.\n",
-                   dev->name, htons(inw(ioaddr + 0)),
-                   htons(inw(ioaddr + 2)), htons(inw(ioaddr + 4)),
-                   htons(inw(ioaddr + 6)), htons(inw(ioaddr + 8)),
-                   htons(inw(ioaddr +10)), htons(inw(ioaddr +12)),
-                   htons(inw(ioaddr +14)));
-        printk(KERN_WARNING "eth card: %04x %04x\n",
-                htons(inw(ioaddr+FJ_STATUS0)),
-                htons(inw(ioaddr+FJ_CONFIG0)));
-        lp->stats.tx_errors++;
-        /* ToDo: We should try to restart the adaptor... */
-        spin_lock_irqsave(&lp->lock, flags);
-
-        /* Initialize LAN Controller and LAN Card */
-        outb(0xda, ioaddr + CONFIG_0);   /* Initialize LAN Controller */
-        outb(0x00, ioaddr + CONFIG_1);   /* Stand by mode */
-        outb(0x00, ioaddr + FJ_CONFIG1); /* Disable IRQ of LAN Card */
-        outb(0x00, ioaddr + FJ_BUFCNTL); /* Reset ? I'm not sure */
-        net_open(dev);
-        spin_unlock_irqrestore(&lp->lock, flags);
-
-        netif_wake_queue(dev);
-}
-
-static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
-{
-        struct net_local *lp = dev->priv;
-        int ioaddr = dev->base_addr;
-        short length = skb->len;
-        unsigned char *buf;
-        unsigned long flags;
-
-        /* Block a transmit from overlapping.  */
-        
-        if (length > ETH_FRAME_LEN) {
-                if (net_debug)
-                        printk("%s: Attempting to send a large packet (%d bytes).\n",
-                                dev->name, length);
-                return 1;
-        }
-        
-        if (length < ETH_ZLEN) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
-                length = ETH_ZLEN;
-        }
-        buf = skb->data;
-        
-        if (net_debug > 4)
-                printk("%s: Transmitting a packet of length %lu.\n", dev->name,
-                           (unsigned long)skb->len);
-        /* We may not start transmitting unless we finish transferring
-           a packet into the Tx queue. During executing the following
-           codes we possibly catch a Tx interrupt. Thus we flag off
-           tx_queue_ready, so that we prevent the interrupt routine
-           (net_interrupt) to start transmitting. */
-        spin_lock_irqsave(&lp->lock, flags);
-        lp->tx_queue_ready = 0;
-        {
-                outw(length, ioaddr + DATAPORT);
-                outsw(ioaddr + DATAPORT, buf, (length + 1) >> 1);
-                lp->tx_queue++;
-                lp->tx_queue_len += length + 2;
-        }
-        lp->tx_queue_ready = 1;
-        spin_unlock_irqrestore(&lp->lock, flags);
-
-        if (lp->tx_started == 0) {
-                /* If the Tx is idle, always trigger a transmit. */
-                outb(0x80 | lp->tx_queue, ioaddr + TX_START);
-                lp->tx_queue = 0;
-                lp->tx_queue_len = 0;
-                dev->trans_start = jiffies;
-                lp->tx_started = 1;
-        } else if (lp->tx_queue_len >= 4096 - 1502) /* No room for a packet */
-                netif_stop_queue(dev);
-
-        dev_kfree_skb(skb);
-        return 0;
-}
-
-/* The typical workload of the driver:
-   Handle the network interface interrupts. */
-static irqreturn_t
-net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-        struct net_device *dev = dev_id;
-        struct net_local *lp;
-        int ioaddr, status;
-
-        ioaddr = dev->base_addr;
-        lp = dev->priv;
-        status = inw(ioaddr + TX_STATUS);
-        outw(status, ioaddr + TX_STATUS);
-
-        if (net_debug > 4)
-                printk("%s: Interrupt with status %04x.\n", dev->name, status);
-        if (lp->rx_started == 0 &&
-                (status & 0xff00 || (inb(ioaddr + RX_MODE) & 0x40) == 0)) {
-                /* Got a packet(s).
-                   We cannot execute net_rx more than once at the same time for
-                   the same device. During executing net_rx, we possibly catch a
-                   Tx interrupt. Thus we flag on rx_started, so that we prevent
-                   the interrupt routine (net_interrupt) to dive into net_rx
-                   again. */
-                lp->rx_started = 1;
-                outb(0x00, ioaddr + RX_INTR);   /* Disable RX intr. */
-                net_rx(dev);
-                outb(0x81, ioaddr + RX_INTR);   /* Enable  RX intr. */
-                lp->rx_started = 0;
-        }
-        if (status & 0x00ff) {
-                if (status & 0x02) {
-                        /* More than 16 collisions occurred */
-                        if (net_debug > 4)
-                                printk("%s: 16 Collision occur during Txing.\n", dev->name);
-                        /* Cancel sending a packet. */
-                        outb(0x03, ioaddr + COL16CNTL);
-                        lp->stats.collisions++;
-                }
-                if (status & 0x82) {
-                        spin_lock(&lp->lock);
-                        lp->stats.tx_packets++;
-                        if (lp->tx_queue && lp->tx_queue_ready) {
-                                outb(0x80 | lp->tx_queue, ioaddr + TX_START);
-                                lp->tx_queue = 0;
-                                lp->tx_queue_len = 0;
-                                dev->trans_start = jiffies;
-                                netif_wake_queue(dev);  /* Inform upper layers. */
-                        } else {
-                                lp->tx_started = 0;
-                                netif_wake_queue(dev);  /* Inform upper layers. */
-                        }
-                        spin_unlock(&lp->lock);
-                }
-        }
-        return IRQ_RETVAL(status);
-}
-
-/* We have a good packet(s), get it/them out of the buffers. */
-static void net_rx(struct net_device *dev)
-{
-        struct net_local *lp = dev->priv;
-        int ioaddr = dev->base_addr;
-        int boguscount = 5;
-
-        while ((inb(ioaddr + RX_MODE) & 0x40) == 0) {
-                /* Clear PKT_RDY bit: by agy 19940922 */
-                /* outb(0x80, ioaddr + RX_STATUS); */
-                ushort status = inw(ioaddr + DATAPORT);
-
-                if (net_debug > 4)
-                        printk("%s: Rxing packet mode %02x status %04x.\n",
-                                   dev->name, inb(ioaddr + RX_MODE), status);
-#ifndef final_version
-                if (status == 0) {
-                        outb(0x05, ioaddr + 14);
-                        break;
-                }
-#endif
-
-                if ((status & 0xF0) != 0x20) {  /* There was an error. */
-                        lp->stats.rx_errors++;
-                        if (status & 0x08) lp->stats.rx_length_errors++;
-                        if (status & 0x04) lp->stats.rx_frame_errors++;
-                        if (status & 0x02) lp->stats.rx_crc_errors++;
-                        if (status & 0x01) lp->stats.rx_over_errors++;
-                } else {
-                        ushort pkt_len = inw(ioaddr + DATAPORT);
-                        /* Malloc up new buffer. */
-                        struct sk_buff *skb;
-
-                        if (pkt_len > 1550) {
-                                printk("%s: The FMV-18x claimed a very large packet, size %d.\n",
-                                           dev->name, pkt_len);
-                                outb(0x05, ioaddr + 14);
-                                lp->stats.rx_errors++;
-                                break;
-                        }
-                        skb = dev_alloc_skb(pkt_len+3);
-                        if (skb == NULL) {
-                                printk("%s: Memory squeeze, dropping packet (len %d).\n",
-                                           dev->name, pkt_len);
-                                outb(0x05, ioaddr + 14);
-                                lp->stats.rx_dropped++;
-                                break;
-                        }
-                        skb->dev = dev;
-                        skb_reserve(skb,2);
-
-                        insw(ioaddr + DATAPORT, skb_put(skb,pkt_len), (pkt_len + 1) >> 1);
-
-                        if (net_debug > 5) {
-                                int i;
-                                printk("%s: Rxed packet of length %d: ", dev->name, pkt_len);
-                                for (i = 0; i < 14; i++)
-                                        printk(" %02x", skb->data[i]);
-                                printk(".\n");
-                        }
-
-                        skb->protocol=eth_type_trans(skb, dev);
-                        netif_rx(skb);
-                        dev->last_rx = jiffies;
-                        lp->stats.rx_packets++;
-                        lp->stats.rx_bytes += pkt_len;
-                }
-                if (--boguscount <= 0)
-                        break;
-        }
-
-        /* If any worth-while packets have been received, dev_rint()
-           has done a mark_bh(NET_BH) for us and will work on them
-           when we get to the bottom-half routine. */
-        {
-                int i;
-                for (i = 0; i < 20; i++) {
-                        if ((inb(ioaddr + RX_MODE) & 0x40) == 0x40)
-                                break;
-                        (void)inw(ioaddr + DATAPORT);                           /* dummy status read */
-                        outb(0x05, ioaddr + 14);
-                }
-
-                if (net_debug > 5 && i > 0)
-                        printk("%s: Exint Rx packet with mode %02x after %d ticks.\n",
-                                   dev->name, inb(ioaddr + RX_MODE), i);
-        }
-
-        return;
-}
-
-/* The inverse routine to net_open(). */
-static int net_close(struct net_device *dev)
-{
-        int ioaddr = dev->base_addr;
-
-        ((struct net_local *)dev->priv)->open_time = 0;
-
-        netif_stop_queue(dev);
-        
-        /* Set configuration register 0 to disable Tx and Rx. */
-        outb(0xda, ioaddr + CONFIG_0);
-
-        /* Update the statistics -- ToDo. */
-
-        /* Power-down the chip.  Green, green, green! */
-        outb(0x00, ioaddr + CONFIG_1);
-
-        /* Set the ethernet adaptor disable IRQ */
-        outb(0x00, ioaddr + FJ_CONFIG1);
-
-        return 0;
-}
-
-/* Get the current statistics.  This may be called with the card open or
-   closed. */
-static struct net_device_stats *net_get_stats(struct net_device *dev)
-{
-        struct net_local *lp = dev->priv;
-        return &lp->stats;
-}
-
-/* Set or clear the multicast filter for this adaptor.
-   num_addrs == -1      Promiscuous mode, receive all packets
-   num_addrs == 0       Normal mode, clear multicast list
-   num_addrs > 0        Multicast mode, receive normal and MC packets, and do
-                        best-effort filtering.
- */
- 
-static void set_multicast_list(struct net_device *dev)
-{
-        short ioaddr = dev->base_addr;
-        if (dev->mc_count || dev->flags&(IFF_PROMISC|IFF_ALLMULTI))
-        {
-                /*
-                 *      We must make the kernel realise we had to move
-                 *      into promisc mode or we start all out war on
-                 *      the cable. - AC
-                 */
-                dev->flags|=IFF_PROMISC;
-
-                outb(3, ioaddr + RX_MODE);      /* Enable promiscuous mode */
-        }
-        else
-                outb(2, ioaddr + RX_MODE);      /* Disable promiscuous, use normal mode */
-}
-
-#ifdef MODULE
-static struct net_device *dev_fmv18x;
-
-MODULE_PARM(io, "i");
-MODULE_PARM(irq, "i");
-MODULE_PARM(net_debug, "i");
-MODULE_PARM_DESC(io, "FMV-18X I/O address");
-MODULE_PARM_DESC(irq, "FMV-18X IRQ number");
-MODULE_PARM_DESC(net_debug, "FMV-18X debug level (0-1,5-6)");
-MODULE_LICENSE("GPL");
-
-int init_module(void)
-{
-        if (io == 0)
-                printk("fmv18x: You should not use auto-probing with insmod!\n");
-        dev_fmv18x = fmv18x_probe(-1);
-        if (IS_ERR(dev_fmv18x))
-                return PTR_ERR(dev_fmv18x);
-        return 0;
-}
-
-void
-cleanup_module(void)
-{
-        unregister_netdev(dev_fmv18x);
-        free_irq(dev_fmv18x->irq, dev_fmv18x);
-        release_region(dev_fmv18x->base_addr, FMV18X_IO_EXTENT);
-        free_netdev(dev_fmv18x);
-}
-#endif /* MODULE */
-
-/*
- * Local variables:
- *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c fmv18x.c"
- *  version-control: t
- *  kept-new-versions: 5
- *  tab-width: 4
- *  c-indent-level: 4
- * End:
- */
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index cda48c5d72a9..4ebcd052e150 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -81,6 +81,7 @@
  *                         cause DMA to kfree'd memory.
  *      0.31: 14 Nov 2004: ethtool support for getting/setting link
  *                         capabilities.
+ *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -92,7 +93,7 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#define FORCEDETH_VERSION               "0.31"
+#define FORCEDETH_VERSION               "0.32"
 #define DRV_NAME                        "forcedeth"
 
 #include <linux/module.h>
@@ -109,6 +110,7 @@
 #include <linux/mii.h>
 #include <linux/random.h>
 #include <linux/init.h>
+#include <linux/if_vlan.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -1013,6 +1015,59 @@ static void nv_tx_timeout(struct net_device *dev)
         spin_unlock_irq(&np->lock);
 }
 
+/*
+ * Called when the nic notices a mismatch between the actual data len on the
+ * wire and the len indicated in the 802 header
+ */
+static int nv_getlen(struct net_device *dev, void *packet, int datalen)
+{
+        int hdrlen;     /* length of the 802 header */
+        int protolen;   /* length as stored in the proto field */
+
+        /* 1) calculate len according to header */
+        if ( ((struct vlan_ethhdr *)packet)->h_vlan_proto == __constant_htons(ETH_P_8021Q)) {
+                protolen = ntohs( ((struct vlan_ethhdr *)packet)->h_vlan_encapsulated_proto );
+                hdrlen = VLAN_HLEN;
+        } else {
+                protolen = ntohs( ((struct ethhdr *)packet)->h_proto);
+                hdrlen = ETH_HLEN;
+        }
+        dprintk(KERN_DEBUG "%s: nv_getlen: datalen %d, protolen %d, hdrlen %d\n",
+                                dev->name, datalen, protolen, hdrlen);
+        if (protolen > ETH_DATA_LEN)
+                return datalen; /* Value in proto field not a len, no checks possible */
+
+        protolen += hdrlen;
+        /* consistency checks: */
+        if (datalen > ETH_ZLEN) {
+                if (datalen >= protolen) {
+                        /* more data on wire than in 802 header, trim of
+                         * additional data.
+                         */
+                        dprintk(KERN_DEBUG "%s: nv_getlen: accepting %d bytes.\n",
+                                        dev->name, protolen);
+                        return protolen;
+                } else {
+                        /* less data on wire than mentioned in header.
+                         * Discard the packet.
+                         */
+                        dprintk(KERN_DEBUG "%s: nv_getlen: discarding long packet.\n",
+                                        dev->name);
+                        return -1;
+                }
+        } else {
+                /* short packet. Accept only if 802 values are also short */
+                if (protolen > ETH_ZLEN) {
+                        dprintk(KERN_DEBUG "%s: nv_getlen: discarding short packet.\n",
+                                        dev->name);
+                        return -1;
+                }
+                dprintk(KERN_DEBUG "%s: nv_getlen: accepting %d bytes.\n",
+                                dev->name, datalen);
+                return datalen;
+        }
+}
+
 static void nv_rx_process(struct net_device *dev)
 {
         struct fe_priv *np = get_nvpriv(dev);
@@ -1064,7 +1119,7 @@ static void nv_rx_process(struct net_device *dev)
                                 np->stats.rx_errors++;
                                 goto next_pkt;
                         }
-                        if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3|NV_RX_ERROR4)) {
+                        if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
                                 np->stats.rx_errors++;
                                 goto next_pkt;
                         }
@@ -1078,22 +1133,24 @@ static void nv_rx_process(struct net_device *dev)
                                 np->stats.rx_errors++;
                                 goto next_pkt;
                         }
-                        if (Flags & NV_RX_ERROR) {
-                                /* framing errors are soft errors, the rest is fatal. */
-                                if (Flags & NV_RX_FRAMINGERR) {
-                                        if (Flags & NV_RX_SUBSTRACT1) {
-                                                len--;
-                                        }
-                                } else {
+                        if (Flags & NV_RX_ERROR4) {
+                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                if (len < 0) {
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
                         }
+                        /* framing errors are soft errors. */
+                        if (Flags & NV_RX_FRAMINGERR) {
+                                if (Flags & NV_RX_SUBSTRACT1) {
+                                        len--;
+                                }
+                        }
                 } else {
                         if (!(Flags & NV_RX2_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3|NV_RX2_ERROR4)) {
+                        if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
                                 np->stats.rx_errors++;
                                 goto next_pkt;
                         }
@@ -1107,17 +1164,19 @@ static void nv_rx_process(struct net_device *dev)
                                 np->stats.rx_errors++;
                                 goto next_pkt;
                         }
-                        if (Flags & NV_RX2_ERROR) {
-                                /* framing errors are soft errors, the rest is fatal. */
-                                if (Flags & NV_RX2_FRAMINGERR) {
-                                        if (Flags & NV_RX2_SUBSTRACT1) {
-                                                len--;
-                                        }
-                                } else {
+                        if (Flags & NV_RX2_ERROR4) {
+                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                if (len < 0) {
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
                         }
+                        /* framing errors are soft errors */
+                        if (Flags & NV_RX2_FRAMINGERR) {
+                                if (Flags & NV_RX2_SUBSTRACT1) {
+                                        len--;
+                                }
+                        }
                         Flags &= NV_RX2_CHECKSUMMASK;
                         if (Flags == NV_RX2_CHECKSUMOK1 ||
                                         Flags == NV_RX2_CHECKSUMOK2 ||
@@ -1480,6 +1539,13 @@ static void nv_do_nic_poll(unsigned long data)
         enable_irq(dev->irq);
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void nv_poll_controller(struct net_device *dev)
+{
+        nv_do_nic_poll((unsigned long) dev);
+}
+#endif
+
 static void nv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
         struct fe_priv *np = get_nvpriv(dev);
@@ -1962,6 +2028,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         dev->get_stats = nv_get_stats;
         dev->change_mtu = nv_change_mtu;
         dev->set_multicast_list = nv_set_multicast;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = nv_poll_controller;
+#endif
         SET_ETHTOOL_OPS(dev, &ops);
         dev->tx_timeout = nv_tx_timeout;
         dev->watchdog_timeo = NV_WATCHDOG_TIMEO;
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 1c563f905a59..a7f15d9f13e5 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -374,29 +374,6 @@ static inline void do_kiss_params(struct baycom_state *bc,
 }
 
 /* --------------------------------------------------------------------- */
-/*
- * high performance HDLC encoder
- * yes, it's ugly, but generates pretty good code
- */
-
-#define ENCODEITERA(j)                         \
-({                                             \
-        if (!(notbitstream & (0x1f0 << j)))    \
-                goto stuff##j;                 \
-  encodeend##j:         ;                      \
-})
-
-#define ENCODEITERB(j)                                          \
-({                                                              \
-  stuff##j:                                                     \
-        bitstream &= ~(0x100 << j);                             \
-        bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) |        \
-                ((bitbuf & ~(((2 << j) << numbit) - 1)) << 1);  \
-        numbit++;                                               \
-        notbitstream = ~bitstream;                              \
-        goto encodeend##j;                                      \
-})
-
 
 static void encode_hdlc(struct baycom_state *bc)
 {
@@ -405,6 +382,7 @@ static void encode_hdlc(struct baycom_state *bc)
         int pkt_len;
         unsigned bitstream, notbitstream, bitbuf, numbit, crc;
         unsigned char crcarr[2];
+        int j;
         
         if (bc->hdlctx.bufcnt > 0)
                 return;
@@ -429,24 +407,14 @@ static void encode_hdlc(struct baycom_state *bc)
                 pkt_len--;
                 if (!pkt_len)
                         bp = crcarr;
-                ENCODEITERA(0);
-                ENCODEITERA(1);
-                ENCODEITERA(2);
-                ENCODEITERA(3);
-                ENCODEITERA(4);
-                ENCODEITERA(5);
-                ENCODEITERA(6);
-                ENCODEITERA(7);
-                goto enditer;
-                ENCODEITERB(0);
-                ENCODEITERB(1);
-                ENCODEITERB(2);
-                ENCODEITERB(3);
-                ENCODEITERB(4);
-                ENCODEITERB(5);
-                ENCODEITERB(6);
-                ENCODEITERB(7);
-        enditer:
+                for (j = 0; j < 8; j++)
+                        if (unlikely(!(notbitstream & (0x1f0 << j)))) {
+                                bitstream &= ~(0x100 << j);
+                                bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) |
+                                        ((bitbuf & ~(((2 << j) << numbit) - 1)) << 1);
+                                numbit++;
+                                notbitstream = ~bitstream;
+                        }
                 numbit += 8;
                 while (numbit >= 8) {
                         *wp++ = bitbuf;
@@ -610,37 +578,6 @@ static void do_rxpacket(struct net_device *dev)
         bc->stats.rx_packets++;
 }
 
-#define DECODEITERA(j)                                                        \
-({                                                                            \
-        if (!(notbitstream & (0x0fc << j)))              /* flag or abort */  \
-                goto flgabrt##j;                                              \
-        if ((bitstream & (0x1f8 << j)) == (0xf8 << j))   /* stuffed bit */    \
-                goto stuff##j;                                                \
-  enditer##j:      ;                                                           \
-})
-
-#define DECODEITERB(j)                                                                 \
-({                                                                                     \
-  flgabrt##j:                                                                          \
-        if (!(notbitstream & (0x1fc << j))) {              /* abort received */        \
-                state = 0;                                                             \
-                goto enditer##j;                                                       \
-        }                                                                              \
-        if ((bitstream & (0x1fe << j)) != (0x0fc << j))   /* flag received */          \
-                goto enditer##j;                                                       \
-        if (state)                                                                     \
-                do_rxpacket(dev);                                                      \
-        bc->hdlcrx.bufcnt = 0;                                                         \
-        bc->hdlcrx.bufptr = bc->hdlcrx.buf;                                            \
-        state = 1;                                                                     \
-        numbits = 7-j;                                                                 \
-        goto enditer##j;                                                               \
-  stuff##j:                                                                            \
-        numbits--;                                                                     \
-        bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1);        \
-        goto enditer##j;                                                               \
-})
-        
 static int receive(struct net_device *dev, int cnt)
 {
         struct baycom_state *bc = netdev_priv(dev);
@@ -649,6 +586,7 @@ static int receive(struct net_device *dev, int cnt)
         unsigned char tmp[128];
         unsigned char *cp;
         int cnt2, ret = 0;
+        int j;
         
         numbits = bc->hdlcrx.numbits;
         state = bc->hdlcrx.state;
@@ -669,24 +607,32 @@ static int receive(struct net_device *dev, int cnt)
                         bitbuf |= (*cp) << 8;
                         numbits += 8;
                         notbitstream = ~bitstream;
-                        DECODEITERA(0);
-                        DECODEITERA(1);
-                        DECODEITERA(2);
-                        DECODEITERA(3);
-                        DECODEITERA(4);
-                        DECODEITERA(5);
-                        DECODEITERA(6);
-                        DECODEITERA(7);
-                        goto enddec;
-                        DECODEITERB(0);
-                        DECODEITERB(1);
-                        DECODEITERB(2);
-                        DECODEITERB(3);
-                        DECODEITERB(4);
-                        DECODEITERB(5);
-                        DECODEITERB(6);
-                        DECODEITERB(7);
-                enddec:
+                        for (j = 0; j < 8; j++) {
+
+                                /* flag or abort */
+                                if (unlikely(!(notbitstream & (0x0fc << j)))) {
+
+                                        /* abort received */
+                                        if (!(notbitstream & (0x1fc << j)))
+                                                state = 0;
+
+                                        /* not flag received */
+                                        else if (!(bitstream & (0x1fe << j)) != (0x0fc << j)) {
+                                                if (state)
+                                                        do_rxpacket(dev);
+                                                bc->hdlcrx.bufcnt = 0;
+                                                bc->hdlcrx.bufptr = bc->hdlcrx.buf;
+                                                state = 1;
+                                                numbits = 7-j;
+                                                }
+                                        }
+
+                                /* stuffed bit */
+                                else if (unlikely((bitstream & (0x1f8 << j)) == (0xf8 << j))) {
+                                        numbits--;
+                                        bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 1);
+                                        }
+                                }
                         while (state && numbits >= 8) {
                                 if (bc->hdlcrx.bufcnt >= TXBUFFER_SIZE) {
                                         state = 0;
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 1c553d7efdd9..ca5914091d3a 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -389,7 +389,7 @@ config VIA_FIR
         help
           Say Y here if you want to build support for the VIA VT8231
           and VIA VT1211 IrDA controllers, found on the motherboards using
-          those those VIA chipsets. To use this controller, you will need
+          those VIA chipsets. To use this controller, you will need
           to plug a specific 5 pins FIR IrDA dongle in the specific
           motherboard connector. The driver provides support for SIR, MIR
           and FIR (4Mbps) speeds.
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 855f8b2cf13b..55af32e9bf08 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -802,13 +802,14 @@ static void veth_tx_timeout(struct net_device *dev)
 
         spin_lock_irqsave(&port->pending_gate, flags);
 
+        if (!port->pending_lpmask) {
+                spin_unlock_irqrestore(&port->pending_gate, flags);
+                return;
+        }
+
         printk(KERN_WARNING "%s: Tx timeout!  Resetting lp connections: %08x\n",
                dev->name, port->pending_lpmask);
 
-        /* If we've timed out the queue must be stopped, which should
-         * only ever happen when there is a pending packet. */
-        WARN_ON(! port->pending_lpmask);
-
         for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
                 struct veth_lpar_connection *cnx = veth_cnx[i];
 
@@ -924,7 +925,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
 
         spin_lock_irqsave(&cnx->lock, flags);
 
-        if (! cnx->state & VETH_STATE_READY)
+        if (! (cnx->state & VETH_STATE_READY))
                 goto drop;
 
         if ((skb->len - 14) > VETH_MAX_MTU)
@@ -1023,6 +1024,8 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         lpmask = veth_transmit_to_many(skb, lpmask, dev);
 
+        dev->trans_start = jiffies;
+
         if (! lpmask) {
                 dev_kfree_skb(skb);
         } else {
@@ -1262,13 +1265,18 @@ static void veth_receive(struct veth_lpar_connection *cnx,
 
                 vlan = skb->data[9];
                 dev = veth_dev[vlan];
-                if (! dev)
-                        /* Some earlier versions of the driver sent
-                           broadcasts down all connections, even to
-                           lpars that weren't on the relevant vlan.
-                           So ignore packets belonging to a vlan we're
-                           not on. */
+                if (! dev) {
+                        /*
+                         * Some earlier versions of the driver sent
+                         * broadcasts down all connections, even to lpars
+                         * that weren't on the relevant vlan. So ignore
+                         * packets belonging to a vlan we're not on.
+                         * We can also be here if we receive packets while
+                         * the driver is going down, because then dev is NULL.
+                         */
+                        dev_kfree_skb_irq(skb);
                         continue;
+                }
 
                 port = (struct veth_port *)dev->priv;
                 dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000;
@@ -1381,18 +1389,25 @@ void __exit veth_module_cleanup(void)
 {
         int i;
 
-        vio_unregister_driver(&veth_driver);
+        /* Stop the queues first to stop any new packets being sent. */
+        for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++)
+                if (veth_dev[i])
+                        netif_stop_queue(veth_dev[i]);
 
+        /* Stop the connections before we unregister the driver. This
+         * ensures there's no skbs lying around holding the device open. */
         for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
                 veth_stop_connection(i);
 
         HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan);
 
         /* Hypervisor callbacks may have scheduled more work while we
-         * were destroying connections. Now that we've disconnected from
+         * were stoping connections. Now that we've disconnected from
          * the hypervisor make sure everything's finished. */
         flush_scheduled_work();
 
+        vio_unregister_driver(&veth_driver);
+
         for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
                 veth_destroy_connection(i);
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 223bdadd4c0d..babb59e146ea 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2433,9 +2433,9 @@ static void __set_rx_mode(struct net_device *dev)
                 rx_mode = RxFilterEnable | AcceptBroadcast
                         | AcceptMulticast | AcceptMyPhys;
                 for (i = 0; i < 64; i += 2) {
-                        writew(HASH_TABLE + i, ioaddr + RxFilterAddr);
-                        writew((mc_filter[i+1]<<8) + mc_filter[i],
-                                ioaddr + RxFilterData);
+                        writel(HASH_TABLE + i, ioaddr + RxFilterAddr);
+                        writel((mc_filter[i + 1] << 8) + mc_filter[i],
+                               ioaddr + RxFilterData);
                 }
         }
         writel(rx_mode, ioaddr + RxFilterAddr);
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 2fcc181a8624..c336b46bd332 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1,4 +1,4 @@
-#define _VERSION "0.20"
+#define VERSION "0.22"
 /* ns83820.c by Benjamin LaHaise with contributions.
  *
  * Questions/comments/discussion to linux-ns83820@kvack.org.
@@ -63,9 +63,11 @@
  *                           -  fix missed txok introduced during performance
  *                              tuning
  *                      0.20 -  fix stupid RFEN thinko.  i am such a smurf.
- *
  *      20040828        0.21 -  add hardware vlan accleration
  *                              by Neil Horman <nhorman@redhat.com>
+ *      20050406        0.22 -  improved DAC ifdefs from Andi Kleen     
+ *                           -  removal of dead code from Adrian Bunk
+ *                           -  fix half duplex collision behaviour
  * Driver Overview
  * ===============
  *
@@ -129,18 +131,6 @@ static int lnksts = 0;		/* CFG_LNKSTS bit polarity */
 #undef Dprintk
 #define Dprintk                 dprintk
 
-#if defined(CONFIG_HIGHMEM64G) || defined(__ia64__)
-#define USE_64BIT_ADDR  "+"
-#endif
-
-#if defined(USE_64BIT_ADDR)
-#define VERSION _VERSION USE_64BIT_ADDR
-#define TRY_DAC 1
-#else
-#define VERSION _VERSION
-#define TRY_DAC 0
-#endif
-
 /* tunables */
 #define RX_BUF_SIZE     1500    /* 8192 */
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
@@ -386,22 +376,16 @@ static int lnksts = 0;		/* CFG_LNKSTS bit polarity */
 #define LINK_DOWN               0x02
 #define LINK_UP                 0x04
 
-#ifdef USE_64BIT_ADDR
-#define HW_ADDR_LEN     8
+#define HW_ADDR_LEN     sizeof(dma_addr_t) 
 #define desc_addr_set(desc, addr)                               \
         do {                                                    \
-                u64 __addr = (addr);                            \
-                (desc)[0] = cpu_to_le32(__addr);                \
-                (desc)[1] = cpu_to_le32(__addr >> 32);          \
+                ((desc)[0] = cpu_to_le32(addr));                \
+                if (HW_ADDR_LEN == 8)                           \
+                        (desc)[1] = cpu_to_le32(((u64)addr) >> 32);     \
         } while(0)
 #define desc_addr_get(desc)                                     \
-                (((u64)le32_to_cpu((desc)[1]) << 32)            \
-                     | le32_to_cpu((desc)[0]))
-#else
-#define HW_ADDR_LEN     4
-#define desc_addr_set(desc, addr)       ((desc)[0] = cpu_to_le32(addr))
-#define desc_addr_get(desc)             (le32_to_cpu((desc)[0]))
-#endif
+        (le32_to_cpu((desc)[0]) | \
+        (HW_ADDR_LEN == 8 ? ((dma_addr_t)le32_to_cpu((desc)[1]))<<32 : 0))
 
 #define DESC_LINK               0
 #define DESC_BUFPTR             (DESC_LINK + HW_ADDR_LEN/4)
@@ -727,11 +711,23 @@ static void fastcall phy_intr(struct net_device *ndev)
                 speed = ((cfg / CFG_SPDSTS0) & 3);
                 fullduplex = (cfg & CFG_DUPSTS);
 
-                if (fullduplex)
+                if (fullduplex) {
                         new_cfg |= CFG_SB;
+                        writel(readl(dev->base + TXCFG)
+                                        | TXCFG_CSI | TXCFG_HBI,
+                               dev->base + TXCFG);
+                        writel(readl(dev->base + RXCFG) | RXCFG_RX_FD,
+                               dev->base + RXCFG);
+                } else {
+                        writel(readl(dev->base + TXCFG)
+                                        & ~(TXCFG_CSI | TXCFG_HBI),
+                               dev->base + TXCFG);
+                        writel(readl(dev->base + RXCFG) & ~(RXCFG_RX_FD),
+                               dev->base + RXCFG);
+                }
 
                 if ((cfg & CFG_LNKSTS) &&
-                    ((new_cfg ^ dev->CFG_cache) & CFG_MODE_1000)) {
+                    ((new_cfg ^ dev->CFG_cache) != 0)) {
                         writel(new_cfg, dev->base + CFG);
                         dev->CFG_cache = new_cfg;
                 }
@@ -1189,7 +1185,6 @@ again:
 
         for (;;) {
                 volatile u32 *desc = dev->tx_descs + (free_idx * DESC_SIZE);
-                u32 residue = 0;
 
                 dprintk("frag[%3u]: %4u @ 0x%08Lx\n", free_idx, len,
                         (unsigned long long)buf);
@@ -1199,17 +1194,11 @@ again:
                 desc_addr_set(desc + DESC_BUFPTR, buf);
                 desc[DESC_EXTSTS] = cpu_to_le32(extsts);
 
-                cmdsts = ((nr_frags|residue) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
+                cmdsts = ((nr_frags) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
                 cmdsts |= (desc == first_desc) ? 0 : CMDSTS_OWN;
                 cmdsts |= len;
                 desc[DESC_CMDSTS] = cpu_to_le32(cmdsts);
 
-                if (residue) {
-                        buf += len;
-                        len = residue;
-                        continue;
-                }
-
                 if (!nr_frags)
                         break;
 
@@ -1841,7 +1830,8 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         int using_dac = 0;
 
         /* See if we can set the dma mask early on; failure is fatal. */
-        if (TRY_DAC && !pci_set_dma_mask(pci_dev, 0xffffffffffffffffULL)) {
+        if (sizeof(dma_addr_t) == 8 && 
+                !pci_set_dma_mask(pci_dev, 0xffffffffffffffffULL)) {
                 using_dac = 1;
         } else if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
                 using_dac = 0;
@@ -1972,9 +1962,8 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         /* When compiled with 64 bit addressing, we must always enable
          * the 64 bit descriptor format.
          */
-#ifdef USE_64BIT_ADDR
-        dev->CFG_cache |= CFG_M64ADDR;
-#endif
+        if (sizeof(dma_addr_t) == 8) 
+                dev->CFG_cache |= CFG_M64ADDR;
         if (using_dac)
                 dev->CFG_cache |= CFG_T64ADDR;
 
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 41e517114807..c6e8b25f9685 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -1274,6 +1274,9 @@ static int el3_close(struct net_device *dev)
                 spin_lock_irqsave(&lp->window_lock, flags);
                 update_stats(dev);
                 spin_unlock_irqrestore(&lp->window_lock, flags);
+
+                /* force interrupts off */
+                outw(SetIntrEnb | 0x0000, ioaddr + EL3_CMD);
         }
 
         link->open--;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index b0126304ca08..181b6ed55003 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1537,20 +1537,20 @@ static void shmem_get_8390_hdr(struct net_device *dev,
 static void shmem_block_input(struct net_device *dev, int count,
                               struct sk_buff *skb, int ring_offset)
 {
-    void __iomem *xfer_start = ei_status.mem + (TX_PAGES<<8)
-                                + ring_offset
+    void __iomem *base = ei_status.mem;
+    unsigned long offset = (TX_PAGES<<8) + ring_offset
                                 - (ei_status.rx_start_page << 8);
     char *buf = skb->data;
     
-    if (xfer_start + count > (void __iomem *)ei_status.rmem_end) {
+    if (offset + count > ei_status.priv) {
         /* We must wrap the input move. */
-        int semi_count = (void __iomem *)ei_status.rmem_end - xfer_start;
-        copyin(buf, xfer_start, semi_count);
+        int semi_count = ei_status.priv - offset;
+        copyin(buf, base + offset, semi_count);
         buf += semi_count;
-        xfer_start = ei_status.mem + (TX_PAGES<<8);
+        offset = TX_PAGES<<8;
         count -= semi_count;
     }
-    copyin(buf, xfer_start, count);
+    copyin(buf, base + offset, count);
 }
 
 /*====================================================================*/
@@ -1611,8 +1611,9 @@ static int setup_shmem_window(dev_link_t *link, int start_pg,
     }
     
     ei_status.mem = info->base + offset;
+    ei_status.priv = req.Size;
     dev->mem_start = (u_long)ei_status.mem;
-    dev->mem_end = ei_status.rmem_end = (u_long)info->base + req.Size;
+    dev->mem_end = dev->mem_start + req.Size;
 
     ei_status.tx_start_page = start_pg;
     ei_status.rx_start_page = start_pg + TX_PAGES;
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 3b377f6cd4a0..ab726ab43798 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -273,7 +273,7 @@ static int ppp_connect_channel(struct channel *pch, int unit);
 static int ppp_disconnect_channel(struct channel *pch);
 static void ppp_destroy_channel(struct channel *pch);
 
-static struct class_simple *ppp_class;
+static struct class *ppp_class;
 
 /* Translates a PPP protocol number to a NP index (NP == network protocol) */
 static inline int proto_to_npindex(int proto)
@@ -858,12 +858,12 @@ static int __init ppp_init(void)
         printk(KERN_INFO "PPP generic driver version " PPP_VERSION "\n");
         err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
         if (!err) {
-                ppp_class = class_simple_create(THIS_MODULE, "ppp");
+                ppp_class = class_create(THIS_MODULE, "ppp");
                 if (IS_ERR(ppp_class)) {
                         err = PTR_ERR(ppp_class);
                         goto out_chrdev;
                 }
-                class_simple_device_add(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
+                class_device_create(ppp_class, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
                 err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
                                 S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
                 if (err)
@@ -876,8 +876,8 @@ out:
         return err;
 
 out_class:
-        class_simple_device_remove(MKDEV(PPP_MAJOR,0));
-        class_simple_destroy(ppp_class);
+        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
+        class_destroy(ppp_class);
 out_chrdev:
         unregister_chrdev(PPP_MAJOR, "ppp");
         goto out;
@@ -1217,36 +1217,43 @@ ppp_push(struct ppp *ppp)
  */
 static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 {
-        int nch, len, fragsize;
+        int len, fragsize;
         int i, bits, hdrlen, mtu;
-        int flen, fnb;
+        int flen;
+        int navail, nfree;
+        int nbigger;
         unsigned char *p, *q;
         struct list_head *list;
         struct channel *pch;
         struct sk_buff *frag;
         struct ppp_channel *chan;
 
-        nch = 0;
+        nfree = 0;      /* # channels which have no packet already queued */
+        navail = 0;     /* total # of usable channels (not deregistered) */
         hdrlen = (ppp->flags & SC_MP_XSHORTSEQ)? MPHDRLEN_SSN: MPHDRLEN;
+        i = 0;
         list = &ppp->channels;
         while ((list = list->next) != &ppp->channels) {
                 pch = list_entry(list, struct channel, clist);
-                nch += pch->avail = (skb_queue_len(&pch->file.xq) == 0);
-                /*
-                 * If a channel hasn't had a fragment yet, it has to get
-                 * one before we send any fragments on later channels.
-                 * If it can't take a fragment now, don't give any
-                 * to subsequent channels.
-                 */
-                if (!pch->had_frag && !pch->avail) {
-                        while ((list = list->next) != &ppp->channels) {
-                                pch = list_entry(list, struct channel, clist);
-                                pch->avail = 0;
+                navail += pch->avail = (pch->chan != NULL);
+                if (pch->avail) {
+                        if (skb_queue_len(&pch->file.xq) == 0
+                            || !pch->had_frag) {
+                                pch->avail = 2;
+                                ++nfree;
                         }
-                        break;
+                        if (!pch->had_frag && i < ppp->nxchan)
+                                ppp->nxchan = i;
                 }
+                ++i;
         }
-        if (nch == 0)
+
+        /*
+         * Don't start sending this packet unless at least half of
+         * the channels are free.  This gives much better TCP
+         * performance if we have a lot of channels.
+         */
+        if (nfree == 0 || nfree < navail / 2)
                 return 0;       /* can't take now, leave it in xmit_pending */
 
         /* Do protocol field compression (XXX this should be optional) */
@@ -1257,14 +1264,19 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
                 --len;
         }
 
-        /* decide on fragment size */
+        /*
+         * Decide on fragment size.
+         * We create a fragment for each free channel regardless of
+         * how small they are (i.e. even 0 length) in order to minimize
+         * the time that it will take to detect when a channel drops
+         * a fragment.
+         */
         fragsize = len;
-        if (nch > 1) {
-                int maxch = ROUNDUP(len, MIN_FRAG_SIZE);
-                if (nch > maxch)
-                        nch = maxch;
-                fragsize = ROUNDUP(fragsize, nch);
-        }
+        if (nfree > 1)
+                fragsize = ROUNDUP(fragsize, nfree);
+        /* nbigger channels get fragsize bytes, the rest get fragsize-1,
+           except if nbigger==0, then they all get fragsize. */
+        nbigger = len % nfree;
 
         /* skip to the channel after the one we last used
            and start at that one */
@@ -1278,7 +1290,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 
         /* create a fragment for each channel */
         bits = B;
-        do {
+        while (nfree > 0 || len > 0) {
                 list = list->next;
                 if (list == &ppp->channels) {
                         i = 0;
@@ -1289,61 +1301,92 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
                 if (!pch->avail)
                         continue;
 
+                /*
+                 * Skip this channel if it has a fragment pending already and
+                 * we haven't given a fragment to all of the free channels.
+                 */
+                if (pch->avail == 1) {
+                        if (nfree > 0)
+                                continue;
+                } else {
+                        --nfree;
+                        pch->avail = 1;
+                }
+
                 /* check the channel's mtu and whether it is still attached. */
                 spin_lock_bh(&pch->downl);
-                if (pch->chan == 0 || (mtu = pch->chan->mtu) < hdrlen) {
-                        /* can't use this channel */
+                if (pch->chan == NULL) {
+                        /* can't use this channel, it's being deregistered */
                         spin_unlock_bh(&pch->downl);
                         pch->avail = 0;
-                        if (--nch == 0)
+                        if (--navail == 0)
                                 break;
                         continue;
                 }
 
                 /*
-                 * We have to create multiple fragments for this channel
-                 * if fragsize is greater than the channel's mtu.
+                 * Create a fragment for this channel of
+                 * min(max(mtu+2-hdrlen, 4), fragsize, len) bytes.
+                 * If mtu+2-hdrlen < 4, that is a ridiculously small
+                 * MTU, so we use mtu = 2 + hdrlen.
                  */
                 if (fragsize > len)
                         fragsize = len;
-                for (flen = fragsize; flen > 0; flen -= fnb) {
-                        fnb = flen;
-                        if (fnb > mtu + 2 - hdrlen)
-                                fnb = mtu + 2 - hdrlen;
-                        if (fnb >= len)
-                                bits |= E;
-                        frag = alloc_skb(fnb + hdrlen, GFP_ATOMIC);
-                        if (frag == 0)
-                                goto noskb;
-                        q = skb_put(frag, fnb + hdrlen);
-                        /* make the MP header */
-                        q[0] = PPP_MP >> 8;
-                        q[1] = PPP_MP;
-                        if (ppp->flags & SC_MP_XSHORTSEQ) {
-                                q[2] = bits + ((ppp->nxseq >> 8) & 0xf);
-                                q[3] = ppp->nxseq;
-                        } else {
-                                q[2] = bits;
-                                q[3] = ppp->nxseq >> 16;
-                                q[4] = ppp->nxseq >> 8;
-                                q[5] = ppp->nxseq;
-                        }
-
-                        /* copy the data in */
-                        memcpy(q + hdrlen, p, fnb);
-
-                        /* try to send it down the channel */
-                        chan = pch->chan;
-                        if (!chan->ops->start_xmit(chan, frag))
-                                skb_queue_tail(&pch->file.xq, frag);
-                        pch->had_frag = 1;
-                        p += fnb;
-                        len -= fnb;
-                        ++ppp->nxseq;
-                        bits = 0;
+                flen = fragsize;
+                mtu = pch->chan->mtu + 2 - hdrlen;
+                if (mtu < 4)
+                        mtu = 4;
+                if (flen > mtu)
+                        flen = mtu;
+                if (flen == len && nfree == 0)
+                        bits |= E;
+                frag = alloc_skb(flen + hdrlen + (flen == 0), GFP_ATOMIC);
+                if (frag == 0)
+                        goto noskb;
+                q = skb_put(frag, flen + hdrlen);
+
+                /* make the MP header */
+                q[0] = PPP_MP >> 8;
+                q[1] = PPP_MP;
+                if (ppp->flags & SC_MP_XSHORTSEQ) {
+                        q[2] = bits + ((ppp->nxseq >> 8) & 0xf);
+                        q[3] = ppp->nxseq;
+                } else {
+                        q[2] = bits;
+                        q[3] = ppp->nxseq >> 16;
+                        q[4] = ppp->nxseq >> 8;
+                        q[5] = ppp->nxseq;
                 }
+
+                /*
+                 * Copy the data in.
+                 * Unfortunately there is a bug in older versions of
+                 * the Linux PPP multilink reconstruction code where it
+                 * drops 0-length fragments.  Therefore we make sure the
+                 * fragment has at least one byte of data.  Any bytes
+                 * we add in this situation will end up as padding on the
+                 * end of the reconstructed packet.
+                 */
+                if (flen == 0)
+                        *skb_put(frag, 1) = 0;
+                else
+                        memcpy(q + hdrlen, p, flen);
+
+                /* try to send it down the channel */
+                chan = pch->chan;
+                if (skb_queue_len(&pch->file.xq)
+                    || !chan->ops->start_xmit(chan, frag))
+                        skb_queue_tail(&pch->file.xq, frag);
+                pch->had_frag = 1;
+                p += flen;
+                len -= flen;
+                ++ppp->nxseq;
+                bits = 0;
                 spin_unlock_bh(&pch->downl);
-        } while (len > 0);
+
+                if (--nbigger == 0 && fragsize > 0)
+                        --fragsize;
+        }
         ppp->nxchan = i;
 
         return 1;
@@ -1422,7 +1465,7 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)
                 kfree_skb(skb);
                 return;
         }
-        
+
         proto = PPP_PROTO(skb);
         read_lock_bh(&pch->upl);
         if (pch->ppp == 0 || proto >= 0xc000 || proto == PPP_CCPFRAG) {
@@ -1691,7 +1734,7 @@ ppp_receive_mp_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
         struct list_head *l;
         int mphdrlen = (ppp->flags & SC_MP_SHORTSEQ)? MPHDRLEN_SSN: MPHDRLEN;
 
-        if (!pskb_may_pull(skb, mphdrlen + 1) || ppp->mrru == 0)
+        if (!pskb_may_pull(skb, mphdrlen) || ppp->mrru == 0)
                 goto err;               /* no good, throw it away */
 
         /* Decode sequence number and begin/end bits */
@@ -2611,8 +2654,8 @@ static void __exit ppp_cleanup(void)
         if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                 printk(KERN_ERR "PPP: failed to unregister PPP device\n");
         devfs_remove("ppp");
-        class_simple_device_remove(MKDEV(PPP_MAJOR, 0));
-        class_simple_destroy(ppp_class);
+        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
+        class_destroy(ppp_class);
 }
 
 /*
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c59507f8a76b..ce449fe90e6d 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -69,7 +69,13 @@ VERSION 2.2LK	<2005/01/25>
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#define RTL8169_VERSION "2.2LK"
+#ifdef CONFIG_R8169_NAPI
+#define NAPI_SUFFIX     "-NAPI"
+#else
+#define NAPI_SUFFIX     ""
+#endif
+
+#define RTL8169_VERSION "2.2LK" NAPI_SUFFIX
 #define MODULENAME "r8169"
 #define PFX MODULENAME ": "
 
@@ -85,6 +91,10 @@ VERSION 2.2LK	<2005/01/25>
 #define dprintk(fmt, args...)   do {} while (0)
 #endif /* RTL8169_DEBUG */
 
+#define R8169_MSG_DEFAULT \
+        (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | NETIF_MSG_IFUP | \
+         NETIF_MSG_IFDOWN)
+
 #define TX_BUFFS_AVAIL(tp) \
         (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
 
@@ -174,8 +184,9 @@ const static struct {
 #undef _R
 
 static struct pci_device_id rtl8169_pci_tbl[] = {
-        {0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x1186, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8169), },
+        { PCI_DEVICE(PCI_VENDOR_ID_DLINK,       0x4300), },
+        { PCI_DEVICE(0x16ec,                    0x0116), },
         {0,},
 };
 
@@ -183,10 +194,15 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
 
 static int rx_copybreak = 200;
 static int use_dac;
+static struct {
+        u32 msg_enable;
+} debug = { -1 };
 
 enum RTL8169_registers {
         MAC0 = 0,               /* Ethernet hardware address. */
         MAR0 = 8,               /* Multicast filter. */
+        CounterAddrLow = 0x10,
+        CounterAddrHigh = 0x14,
         TxDescStartAddrLow = 0x20,
         TxDescStartAddrHigh = 0x24,
         TxHDescStartAddrLow = 0x28,
@@ -328,6 +344,9 @@ enum RTL8169_register_content {
 
         /* _TBICSRBit */
         TBILinkOK = 0x02000000,
+
+        /* DumpCounterCommand */
+        CounterDump = 0x8,
 };
 
 enum _DescStatusBit {
@@ -385,6 +404,7 @@ struct rtl8169_private {
         struct pci_dev *pci_dev;        /* Index of PCI device */
         struct net_device_stats stats;  /* statistics of net device */
         spinlock_t lock;                /* spin lock flag */
+        u32 msg_enable;
         int chipset;
         int mac_version;
         int phy_version;
@@ -415,12 +435,16 @@ struct rtl8169_private {
         struct work_struct task;
 };
 
-MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@oss.sgi.com>");
+MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
 MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");
 module_param_array(media, int, &num_media, 0);
+MODULE_PARM_DESC(media, "force phy operation. Deprecated by ethtool (8).");
 module_param(rx_copybreak, int, 0);
+MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
 module_param(use_dac, int, 0);
 MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
+module_param_named(debug, debug.msg_enable, int, 0);
+MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(RTL8169_VERSION);
 
@@ -433,10 +457,10 @@ static void rtl8169_hw_start(struct net_device *dev);
 static int rtl8169_close(struct net_device *dev);
 static void rtl8169_set_rx_mode(struct net_device *dev);
 static void rtl8169_tx_timeout(struct net_device *dev);
-static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev);
+static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
 static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
                                 void __iomem *);
-static int rtl8169_change_mtu(struct net_device *netdev, int new_mtu);
+static int rtl8169_change_mtu(struct net_device *dev, int new_mtu);
 static void rtl8169_down(struct net_device *dev);
 
 #ifdef CONFIG_R8169_NAPI
@@ -543,9 +567,13 @@ static void rtl8169_check_link_status(struct net_device *dev,
         spin_lock_irqsave(&tp->lock, flags);
         if (tp->link_ok(ioaddr)) {
                 netif_carrier_on(dev);
-                printk(KERN_INFO PFX "%s: link up\n", dev->name);
-        } else
+                if (netif_msg_ifup(tp))
+                        printk(KERN_INFO PFX "%s: link up\n", dev->name);
+        } else {
+                if (netif_msg_ifdown(tp))
+                        printk(KERN_INFO PFX "%s: link down\n", dev->name);
                 netif_carrier_off(dev);
+        }
         spin_unlock_irqrestore(&tp->lock, flags);
 }
 
@@ -569,7 +597,7 @@ static void rtl8169_link_option(int idx, u8 *autoneg, u16 *speed, u8 *duplex)
         
         option = ((idx < MAX_UNITS) && (idx >= 0)) ? media[idx] : 0xff;
 
-        if ((option != 0xff) && !idx)
+        if ((option != 0xff) && !idx && netif_msg_drv(&debug))
                 printk(KERN_WARNING PFX "media option is deprecated.\n");
 
         for (p = link_settings; p->media != 0xff; p++) {
@@ -611,9 +639,11 @@ static int rtl8169_set_speed_tbi(struct net_device *dev,
         } else if (autoneg == AUTONEG_ENABLE)
                 RTL_W32(TBICSR, reg | TBINwEnable | TBINwRestart);
         else {
-                printk(KERN_WARNING PFX
-                       "%s: incorrect speed setting refused in TBI mode\n",
-                       dev->name);
+                if (netif_msg_link(tp)) {
+                        printk(KERN_WARNING "%s: "
+                               "incorrect speed setting refused in TBI mode\n",
+                               dev->name);
+                }
                 ret = -EOPNOTSUPP;
         }
 
@@ -871,12 +901,120 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
         spin_unlock_irqrestore(&tp->lock, flags);
 }
 
+static u32 rtl8169_get_msglevel(struct net_device *dev)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+
+        return tp->msg_enable;
+}
+
+static void rtl8169_set_msglevel(struct net_device *dev, u32 value)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+
+        tp->msg_enable = value;
+}
+
+static const char rtl8169_gstrings[][ETH_GSTRING_LEN] = {
+        "tx_packets",
+        "rx_packets",
+        "tx_errors",
+        "rx_errors",
+        "rx_missed",
+        "align_errors",
+        "tx_single_collisions",
+        "tx_multi_collisions",
+        "unicast",
+        "broadcast",
+        "multicast",
+        "tx_aborted",
+        "tx_underrun",
+};
+
+struct rtl8169_counters {
+        u64     tx_packets;
+        u64     rx_packets;
+        u64     tx_errors;
+        u32     rx_errors;
+        u16     rx_missed;
+        u16     align_errors;
+        u32     tx_one_collision;
+        u32     tx_multi_collision;
+        u64     rx_unicast;
+        u64     rx_broadcast;
+        u32     rx_multicast;
+        u16     tx_aborted;
+        u16     tx_underun;
+};
+
+static int rtl8169_get_stats_count(struct net_device *dev)
+{
+        return ARRAY_SIZE(rtl8169_gstrings);
+}
+
+static void rtl8169_get_ethtool_stats(struct net_device *dev,
+                                      struct ethtool_stats *stats, u64 *data)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct rtl8169_counters *counters;
+        dma_addr_t paddr;
+        u32 cmd;
+
+        ASSERT_RTNL();
+
+        counters = pci_alloc_consistent(tp->pci_dev, sizeof(*counters), &paddr);
+        if (!counters)
+                return;
+
+        RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
+        cmd = (u64)paddr & DMA_32BIT_MASK;
+        RTL_W32(CounterAddrLow, cmd);
+        RTL_W32(CounterAddrLow, cmd | CounterDump);
+
+        while (RTL_R32(CounterAddrLow) & CounterDump) {
+                if (msleep_interruptible(1))
+                        break;
+        }
+
+        RTL_W32(CounterAddrLow, 0);
+        RTL_W32(CounterAddrHigh, 0);
+
+        data[0] = le64_to_cpu(counters->tx_packets);
+        data[1] = le64_to_cpu(counters->rx_packets);
+        data[2] = le64_to_cpu(counters->tx_errors);
+        data[3] = le32_to_cpu(counters->rx_errors);
+        data[4] = le16_to_cpu(counters->rx_missed);
+        data[5] = le16_to_cpu(counters->align_errors);
+        data[6] = le32_to_cpu(counters->tx_one_collision);
+        data[7] = le32_to_cpu(counters->tx_multi_collision);
+        data[8] = le64_to_cpu(counters->rx_unicast);
+        data[9] = le64_to_cpu(counters->rx_broadcast);
+        data[10] = le32_to_cpu(counters->rx_multicast);
+        data[11] = le16_to_cpu(counters->tx_aborted);
+        data[12] = le16_to_cpu(counters->tx_underun);
+
+        pci_free_consistent(tp->pci_dev, sizeof(*counters), counters, paddr);
+}
+
+static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+{
+        switch(stringset) {
+        case ETH_SS_STATS:
+                memcpy(data, *rtl8169_gstrings, sizeof(rtl8169_gstrings));
+                break;
+        }
+}
+
+
 static struct ethtool_ops rtl8169_ethtool_ops = {
         .get_drvinfo            = rtl8169_get_drvinfo,
         .get_regs_len           = rtl8169_get_regs_len,
         .get_link               = ethtool_op_get_link,
         .get_settings           = rtl8169_get_settings,
         .set_settings           = rtl8169_set_settings,
+        .get_msglevel           = rtl8169_get_msglevel,
+        .set_msglevel           = rtl8169_set_msglevel,
         .get_rx_csum            = rtl8169_get_rx_csum,
         .set_rx_csum            = rtl8169_set_rx_csum,
         .get_tx_csum            = ethtool_op_get_tx_csum,
@@ -886,6 +1024,9 @@ static struct ethtool_ops rtl8169_ethtool_ops = {
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_regs               = rtl8169_get_regs,
+        .get_strings            = rtl8169_get_strings,
+        .get_stats_count        = rtl8169_get_stats_count,
+        .get_ethtool_stats      = rtl8169_get_ethtool_stats,
 };
 
 static void rtl8169_write_gmii_reg_bit(void __iomem *ioaddr, int reg, int bitnum,
@@ -1091,7 +1232,8 @@ static void rtl8169_phy_timer(unsigned long __opaque)
         if (tp->link_ok(ioaddr))
                 goto out_unlock;
 
-        printk(KERN_WARNING PFX "%s: PHY reset until link up\n", dev->name);
+        if (netif_msg_link(tp))
+                printk(KERN_WARNING "%s: PHY reset until link up\n", dev->name);
 
         tp->phy_reset_enable(ioaddr);
 
@@ -1169,18 +1311,23 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
         /* dev zeroed in alloc_etherdev */
         dev = alloc_etherdev(sizeof (*tp));
         if (dev == NULL) {
-                printk(KERN_ERR PFX "unable to alloc new ethernet\n");
+                if (netif_msg_drv(&debug))
+                        printk(KERN_ERR PFX "unable to alloc new ethernet\n");
                 goto err_out;
         }
 
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
         tp = netdev_priv(dev);
+        tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
 
         /* enable device (incl. PCI PM wakeup and hotplug setup) */
         rc = pci_enable_device(pdev);
-        if (rc) {
-                printk(KERN_ERR PFX "%s: enable failure\n", pci_name(pdev));
+        if (rc < 0) {
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_ERR PFX "%s: enable failure\n",
+                               pci_name(pdev));
+                }
                 goto err_out_free_dev;
         }
 
@@ -1196,29 +1343,39 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
                 pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &pwr_command);
                 acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
         } else {
-                printk(KERN_ERR PFX
-                       "Cannot find PowerManagement capability, aborting.\n");
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_ERR PFX
+                               "Cannot find PowerManagement capability. "
+                               "Aborting.\n");
+                }
                 goto err_out_mwi;
         }
 
         /* make sure PCI base addr 1 is MMIO */
         if (!(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-                printk(KERN_ERR PFX
-                       "region #1 not an MMIO resource, aborting\n");
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_ERR PFX
+                               "region #1 not an MMIO resource, aborting\n");
+                }
                 rc = -ENODEV;
                 goto err_out_mwi;
         }
         /* check for weird/broken PCI region reporting */
         if (pci_resource_len(pdev, 1) < R8169_REGS_SIZE) {
-                printk(KERN_ERR PFX "Invalid PCI region size(s), aborting\n");
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_ERR PFX
+                               "Invalid PCI region size(s), aborting\n");
+                }
                 rc = -ENODEV;
                 goto err_out_mwi;
         }
 
         rc = pci_request_regions(pdev, MODULENAME);
-        if (rc) {
-                printk(KERN_ERR PFX "%s: could not request regions.\n",
-                       pci_name(pdev));
+        if (rc < 0) {
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_ERR PFX "%s: could not request regions.\n",
+                               pci_name(pdev));
+                }
                 goto err_out_mwi;
         }
 
@@ -1231,7 +1388,10 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
         } else {
                 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc < 0) {
-                        printk(KERN_ERR PFX "DMA configuration failed.\n");
+                        if (netif_msg_probe(tp)) {
+                                printk(KERN_ERR PFX
+                                       "DMA configuration failed.\n");
+                        }
                         goto err_out_free_res;
                 }
         }
@@ -1241,7 +1401,8 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
         /* ioremap MMIO region */
         ioaddr = ioremap(pci_resource_start(pdev, 1), R8169_REGS_SIZE);
         if (ioaddr == NULL) {
-                printk(KERN_ERR PFX "cannot remap MMIO, aborting\n");
+                if (netif_msg_probe(tp))
+                        printk(KERN_ERR PFX "cannot remap MMIO, aborting\n");
                 rc = -EIO;
                 goto err_out_free_res;
         }
@@ -1272,9 +1433,11 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
         }
         if (i < 0) {
                 /* Unknown chip: assume array element #0, original RTL-8169 */
-                printk(KERN_DEBUG PFX
-                       "PCI device %s: unknown chip version, assuming %s\n",
-                       pci_name(pdev), rtl_chip_info[0].name);
+                if (netif_msg_probe(tp)) {
+                        printk(KERN_DEBUG PFX "PCI device %s: "
+                               "unknown chip version, assuming %s\n",
+                               pci_name(pdev), rtl_chip_info[0].name);
+                }
                 i++;
         }
         tp->chipset = i;
@@ -1308,7 +1471,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct rtl8169_private *tp;
         void __iomem *ioaddr = NULL;
         static int board_idx = -1;
-        static int printed_version = 0;
         u8 autoneg, duplex;
         u16 speed;
         int i, rc;
@@ -1318,10 +1480,9 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         board_idx++;
 
-        if (!printed_version) {
+        if (netif_msg_drv(&debug)) {
                 printk(KERN_INFO "%s Gigabit Ethernet driver %s loaded\n",
                        MODULENAME, RTL8169_VERSION);
-                printed_version = 1;
         }
 
         rc = rtl8169_init_board(pdev, &dev, &ioaddr);
@@ -1366,7 +1527,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef CONFIG_R8169_NAPI
         dev->poll = rtl8169_poll;
         dev->weight = R8169_NAPI_WEIGHT;
-        printk(KERN_INFO PFX "NAPI enabled\n");
 #endif
 
 #ifdef CONFIG_R8169_VLAN
@@ -1391,20 +1551,24 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return rc;
         }
 
-        printk(KERN_DEBUG "%s: Identified chip type is '%s'.\n", dev->name,
-               rtl_chip_info[tp->chipset].name);
+        if (netif_msg_probe(tp)) {
+                printk(KERN_DEBUG "%s: Identified chip type is '%s'.\n",
+                       dev->name, rtl_chip_info[tp->chipset].name);
+        }
 
         pci_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: %s at 0x%lx, "
-               "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-               "IRQ %d\n",
-               dev->name,
-               rtl_chip_info[ent->driver_data].name,
-               dev->base_addr,
-               dev->dev_addr[0], dev->dev_addr[1],
-               dev->dev_addr[2], dev->dev_addr[3],
-               dev->dev_addr[4], dev->dev_addr[5], dev->irq);
+        if (netif_msg_probe(tp)) {
+                printk(KERN_INFO "%s: %s at 0x%lx, "
+                       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
+                       "IRQ %d\n",
+                       dev->name,
+                       rtl_chip_info[ent->driver_data].name,
+                       dev->base_addr,
+                       dev->dev_addr[0], dev->dev_addr[1],
+                       dev->dev_addr[2], dev->dev_addr[3],
+                       dev->dev_addr[4], dev->dev_addr[5], dev->irq);
+        }
 
         rtl8169_hw_phy_config(dev);
 
@@ -1427,7 +1591,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         rtl8169_set_speed(dev, autoneg, speed, duplex);
         
-        if (RTL_R8(PHYstatus) & TBI_Enable)
+        if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp))
                 printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name);
 
         return 0;
@@ -1585,8 +1749,8 @@ rtl8169_hw_start(struct net_device *dev)
         RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
         RTL_W8(EarlyTxThres, EarlyTxThld);
 
-        /* For gigabit rtl8169, MTU + header + CRC + VLAN */
-        RTL_W16(RxMaxSize, tp->rx_buf_sz);
+        /* Low hurts. Let's disable the filtering. */
+        RTL_W16(RxMaxSize, 16383);
 
         /* Set Rx Config register */
         i = rtl8169_rx_config |
@@ -1860,8 +2024,13 @@ static void rtl8169_reinit_task(void *_data)
         ret = rtl8169_open(dev);
         if (unlikely(ret < 0)) {
                 if (net_ratelimit()) {
-                        printk(PFX KERN_ERR "%s: reinit failure (status = %d)."
-                               " Rescheduling.\n", dev->name, ret);
+                        struct rtl8169_private *tp = netdev_priv(dev);
+
+                        if (netif_msg_drv(tp)) {
+                                printk(PFX KERN_ERR
+                                       "%s: reinit failure (status = %d)."
+                                       " Rescheduling.\n", dev->name, ret);
+                        }
                 }
                 rtl8169_schedule_work(dev, rtl8169_reinit_task);
         }
@@ -1886,8 +2055,12 @@ static void rtl8169_reset_task(void *_data)
                 netif_wake_queue(dev);
         } else {
                 if (net_ratelimit()) {
-                        printk(PFX KERN_EMERG "%s: Rx buffers shortage\n",
-                               dev->name);
+                        struct rtl8169_private *tp = netdev_priv(dev);
+
+                        if (netif_msg_intr(tp)) {
+                                printk(PFX KERN_EMERG
+                                       "%s: Rx buffers shortage\n", dev->name);
+                        }
                 }
                 rtl8169_schedule_work(dev, rtl8169_reset_task);
         }
@@ -1973,8 +2146,11 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
         int ret = 0;
         
         if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {
-                printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
-                       dev->name);
+                if (netif_msg_drv(tp)) {
+                        printk(KERN_ERR
+                               "%s: BUG! Tx Ring full when queue awake!\n",
+                               dev->name);
+                }
                 goto err_stop;
         }
 
@@ -2049,8 +2225,11 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
         pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);
         pci_read_config_word(pdev, PCI_STATUS, &pci_status);
 
-        printk(KERN_ERR PFX "%s: PCI error (cmd = 0x%04x, status = 0x%04x).\n",
-               dev->name, pci_cmd, pci_status);
+        if (netif_msg_intr(tp)) {
+                printk(KERN_ERR
+                       "%s: PCI error (cmd = 0x%04x, status = 0x%04x).\n",
+                       dev->name, pci_cmd, pci_status);
+        }
 
         /*
          * The recovery sequence below admits a very elaborated explanation:
@@ -2069,7 +2248,8 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
 
         /* The infamous DAC f*ckup only happens at boot time */
         if ((tp->cp_cmd & PCIDAC) && !tp->dirty_rx && !tp->cur_rx) {
-                printk(KERN_INFO PFX "%s: disabling PCI DAC.\n", dev->name);
+                if (netif_msg_intr(tp))
+                        printk(KERN_INFO "%s: disabling PCI DAC.\n", dev->name);
                 tp->cp_cmd &= ~PCIDAC;
                 RTL_W16(CPlusCmd, tp->cp_cmd);
                 dev->features &= ~NETIF_F_HIGHDMA;
@@ -2127,6 +2307,11 @@ rtl8169_tx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
         }
 }
 
+static inline int rtl8169_fragmented_frame(u32 status)
+{
+        return (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag);
+}
+
 static inline void rtl8169_rx_csum(struct sk_buff *skb, struct RxDesc *desc)
 {
         u32 opts1 = le32_to_cpu(desc->opts1);
@@ -2175,29 +2360,46 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
         rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
         rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
 
-        while (rx_left > 0) {
+        for (; rx_left > 0; rx_left--, cur_rx++) {
                 unsigned int entry = cur_rx % NUM_RX_DESC;
+                struct RxDesc *desc = tp->RxDescArray + entry;
                 u32 status;
 
                 rmb();
-                status = le32_to_cpu(tp->RxDescArray[entry].opts1);
+                status = le32_to_cpu(desc->opts1);
 
                 if (status & DescOwn)
                         break;
-                if (status & RxRES) {
-                        printk(KERN_INFO "%s: Rx ERROR!!!\n", dev->name);
+                if (unlikely(status & RxRES)) {
+                        if (netif_msg_rx_err(tp)) {
+                                printk(KERN_INFO
+                                       "%s: Rx ERROR. status = %08x\n",
+                                       dev->name, status);
+                        }
                         tp->stats.rx_errors++;
                         if (status & (RxRWT | RxRUNT))
                                 tp->stats.rx_length_errors++;
                         if (status & RxCRC)
                                 tp->stats.rx_crc_errors++;
+                        rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
                 } else {
-                        struct RxDesc *desc = tp->RxDescArray + entry;
                         struct sk_buff *skb = tp->Rx_skbuff[entry];
                         int pkt_size = (status & 0x00001FFF) - 4;
                         void (*pci_action)(struct pci_dev *, dma_addr_t,
                                 size_t, int) = pci_dma_sync_single_for_device;
 
+                        /*
+                         * The driver does not support incoming fragmented
+                         * frames. They are seen as a symptom of over-mtu
+                         * sized frames.
+                         */
+                        if (unlikely(rtl8169_fragmented_frame(status))) {
+                                tp->stats.rx_dropped++;
+                                tp->stats.rx_length_errors++;
+                                rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
+                                continue;
+                        }
+
                         rtl8169_rx_csum(skb, desc);
                         
                         pci_dma_sync_single_for_cpu(tp->pci_dev,
@@ -2224,16 +2426,13 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
                         tp->stats.rx_bytes += pkt_size;
                         tp->stats.rx_packets++;
                 }
-                
-                cur_rx++; 
-                rx_left--;
         }
 
         count = cur_rx - tp->cur_rx;
         tp->cur_rx = cur_rx;
 
         delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
-        if (!delta && count)
+        if (!delta && count && netif_msg_intr(tp))
                 printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
         tp->dirty_rx += delta;
 
@@ -2244,7 +2443,7 @@ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
          *   after refill ?
          * - how do others driver handle this condition (Uh oh...).
          */
-        if (tp->dirty_rx + NUM_RX_DESC == tp->cur_rx)
+        if ((tp->dirty_rx + NUM_RX_DESC == tp->cur_rx) && netif_msg_intr(tp))
                 printk(KERN_EMERG "%s: Rx buffers exhausted\n", dev->name);
 
         return count;
@@ -2296,7 +2495,7 @@ rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
 
                 if (likely(netif_rx_schedule_prep(dev)))
                         __netif_rx_schedule(dev);
-                else {
+                else if (netif_msg_intr(tp)) {
                         printk(KERN_INFO "%s: interrupt %04x taken in poll\n",
                                dev->name, status);      
                 }
@@ -2315,8 +2514,10 @@ rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
         } while (boguscnt > 0);
 
         if (boguscnt <= 0) {
-                printk(KERN_WARNING "%s: Too much work at interrupt!\n",
-                       dev->name);
+                if (net_ratelimit() && netif_msg_intr(tp)) {
+                        printk(KERN_WARNING
+                               "%s: Too much work at interrupt!\n", dev->name);
+                }
                 /* Clear all interrupt sources. */
                 RTL_W16(IntrStatus, 0xffff);
         }
@@ -2439,8 +2640,10 @@ rtl8169_set_rx_mode(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC) {
                 /* Unconditionally log net taps. */
-                printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
-                       dev->name);
+                if (netif_msg_link(tp)) {
+                        printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
+                               dev->name);
+                }
                 rx_mode =
                     AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                     AcceptAllPhys;
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index e68cf5fb4920..20edeb345792 100644
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -100,35 +100,8 @@ static int sh_debug;		/* Debug flag */
 
 #define SHAPER_BANNER   "CymruNet Traffic Shaper BETA 0.04 for Linux 2.1\n"
 
-/*
- *      Locking
- */
- 
-static int shaper_lock(struct shaper *sh)
-{
-        /*
-         *      Lock in an interrupt must fail
-         */
-        while (test_and_set_bit(0, &sh->locked))
-        {
-                if (!in_interrupt())
-                        sleep_on(&sh->wait_queue);
-                else
-                        return 0;
-                        
-        }
-        return 1;
-}
-
 static void shaper_kick(struct shaper *sh);
 
-static void shaper_unlock(struct shaper *sh)
-{
-        clear_bit(0, &sh->locked);
-        wake_up(&sh->wait_queue);
-        shaper_kick(sh);
-}
-
 /*
  *      Compute clocks on a buffer
  */
@@ -157,17 +130,15 @@ static void shaper_setspeed(struct shaper *shaper, int bitspersec)
  *      Throw a frame at a shaper.
  */
   
-static int shaper_qframe(struct shaper *shaper, struct sk_buff *skb)
+
+static int shaper_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
+        struct shaper *shaper = dev->priv;
         struct sk_buff *ptr;
    
-        /*
-         *      Get ready to work on this shaper. Lock may fail if its
-         *      an interrupt and locked.
-         */
-         
-        if(!shaper_lock(shaper))
-                return -1;
+        if (down_trylock(&shaper->sem))
+                return -1;
+
         ptr=shaper->sendq.prev;
         
         /*
@@ -260,7 +231,8 @@ static int shaper_qframe(struct shaper *shaper, struct sk_buff *skb)
                 dev_kfree_skb(ptr);
                 shaper->stats.collisions++;
         }
-        shaper_unlock(shaper);
+        shaper_kick(shaper);
+        up(&shaper->sem);
         return 0;
 }
 
@@ -297,8 +269,13 @@ static void shaper_queue_xmit(struct shaper *shaper, struct sk_buff *skb)
  
 static void shaper_timer(unsigned long data)
 {
-        struct shaper *sh=(struct shaper *)data;
-        shaper_kick(sh);
+        struct shaper *shaper = (struct shaper *)data;
+
+        if (!down_trylock(&shaper->sem)) {
+                shaper_kick(shaper);
+                up(&shaper->sem);
+        } else
+                mod_timer(&shaper->timer, jiffies);
 }
 
 /*
@@ -311,19 +288,6 @@ static void shaper_kick(struct shaper *shaper)
         struct sk_buff *skb;
         
         /*
-         *      Shaper unlock will kick
-         */
-         
-        if (test_and_set_bit(0, &shaper->locked))
-        {
-                if(sh_debug)
-                        printk("Shaper locked.\n");
-                mod_timer(&shaper->timer, jiffies);
-                return;
-        }
-
-                
-        /*
          *      Walk the list (may be empty)
          */
          
@@ -364,8 +328,6 @@ static void shaper_kick(struct shaper *shaper)
          
         if(skb!=NULL)
                 mod_timer(&shaper->timer, SHAPERCB(skb)->shapeclock);
-
-        clear_bit(0, &shaper->locked);
 }
 
 
@@ -376,14 +338,12 @@ static void shaper_kick(struct shaper *shaper)
 static void shaper_flush(struct shaper *shaper)
 {
         struct sk_buff *skb;
-        if(!shaper_lock(shaper))
-        {
-                printk(KERN_ERR "shaper: shaper_flush() called by an irq!\n");
-                return;
-        }
+
+        down(&shaper->sem);
         while((skb=skb_dequeue(&shaper->sendq))!=NULL)
                 dev_kfree_skb(skb);
-        shaper_unlock(shaper);
+        shaper_kick(shaper);
+        up(&shaper->sem);
 }
 
 /*
@@ -426,13 +386,6 @@ static int shaper_close(struct net_device *dev)
  *      ARP and other resolutions and not before.
  */
 
-
-static int shaper_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct shaper *sh=dev->priv;
-        return shaper_qframe(sh, skb);
-}
-
 static struct net_device_stats *shaper_get_stats(struct net_device *dev)
 {
         struct shaper *sh=dev->priv;
@@ -623,7 +576,6 @@ static void shaper_init_priv(struct net_device *dev)
         init_timer(&sh->timer);
         sh->timer.function=shaper_timer;
         sh->timer.data=(unsigned long)sh;
-        init_waitqueue_head(&sh->wait_queue);
 }
 
 /*
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 3e9d9aab0588..3107aed0fb51 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -162,6 +162,7 @@ struct sis900_private {
         struct mii_phy * mii;
         struct mii_phy * first_mii; /* record the first mii structure */
         unsigned int cur_phy;
+        struct mii_if_info mii_info;
 
         struct timer_list timer; /* Link status detection timer. */
         u8 autong_complete; /* 1: auto-negotiate complete  */
@@ -203,7 +204,7 @@ static int sis900_open(struct net_device *net_dev);
 static int sis900_mii_probe (struct net_device * net_dev);
 static void sis900_init_rxfilter (struct net_device * net_dev);
 static u16 read_eeprom(long ioaddr, int location);
-static u16 mdio_read(struct net_device *net_dev, int phy_id, int location);
+static int mdio_read(struct net_device *net_dev, int phy_id, int location);
 static void mdio_write(struct net_device *net_dev, int phy_id, int location, int val);
 static void sis900_timer(unsigned long data);
 static void sis900_check_mode (struct net_device *net_dev, struct mii_phy *mii_phy);
@@ -478,7 +479,13 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                 sis_priv->msg_enable = sis900_debug;
         else
                 sis_priv->msg_enable = SIS900_DEF_MSG;
-                
+
+        sis_priv->mii_info.dev = net_dev;
+        sis_priv->mii_info.mdio_read = mdio_read;
+        sis_priv->mii_info.mdio_write = mdio_write;
+        sis_priv->mii_info.phy_id_mask = 0x1f;
+        sis_priv->mii_info.reg_num_mask = 0x1f;
+
         /* Get Mac address according to the chip revision */
         pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &(sis_priv->chipset_rev));
         if(netif_msg_probe(sis_priv))
@@ -725,6 +732,8 @@ static u16 sis900_default_phy(struct net_device * net_dev)
                        pci_name(sis_priv->pci_dev), sis_priv->cur_phy);
         }
         
+        sis_priv->mii_info.phy_id = sis_priv->cur_phy;
+
         status = mdio_read(net_dev, sis_priv->cur_phy, MII_CONTROL);
         status &= (~MII_CNTL_ISOLATE);
 
@@ -852,7 +861,7 @@ static void mdio_reset(long mdio_addr)
  *      Please see SiS7014 or ICS spec
  */
 
-static u16 mdio_read(struct net_device *net_dev, int phy_id, int location)
+static int mdio_read(struct net_device *net_dev, int phy_id, int location)
 {
         long mdio_addr = net_dev->base_addr + mear;
         int mii_cmd = MIIread|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
@@ -1966,10 +1975,47 @@ static void sis900_set_msglevel(struct net_device *net_dev, u32 value)
         sis_priv->msg_enable = value;
 }
 
+static u32 sis900_get_link(struct net_device *net_dev)
+{
+        struct sis900_private *sis_priv = net_dev->priv;
+        return mii_link_ok(&sis_priv->mii_info);
+}
+
+static int sis900_get_settings(struct net_device *net_dev,
+                                struct ethtool_cmd *cmd)
+{
+        struct sis900_private *sis_priv = net_dev->priv;
+        spin_lock_irq(&sis_priv->lock);
+        mii_ethtool_gset(&sis_priv->mii_info, cmd);
+        spin_unlock_irq(&sis_priv->lock);
+        return 0;
+}
+
+static int sis900_set_settings(struct net_device *net_dev,
+                                struct ethtool_cmd *cmd)
+{
+        struct sis900_private *sis_priv = net_dev->priv;
+        int rt;
+        spin_lock_irq(&sis_priv->lock);
+        rt = mii_ethtool_sset(&sis_priv->mii_info, cmd);
+        spin_unlock_irq(&sis_priv->lock);
+        return rt;
+}
+
+static int sis900_nway_reset(struct net_device *net_dev)
+{
+        struct sis900_private *sis_priv = net_dev->priv;
+        return mii_nway_restart(&sis_priv->mii_info);
+}
+
 static struct ethtool_ops sis900_ethtool_ops = {
         .get_drvinfo    = sis900_get_drvinfo,
         .get_msglevel   = sis900_get_msglevel,
         .set_msglevel   = sis900_set_msglevel,
+        .get_link       = sis900_get_link,
+        .get_settings   = sis900_get_settings,
+        .set_settings   = sis900_set_settings,
+        .nway_reset     = sis900_nway_reset,
 };
 
 /**
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 05b827f79f54..1ccb2989001c 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -4212,7 +4212,7 @@ SK_BOOL		DualNet;
                         Flags);
 
                 SkGeStopPort(pAC, IoC, FromPort, SK_STOP_ALL, SK_HARD_RST);
-                pAC->dev[Param.Para32[0]]->flags &= ~IFF_RUNNING;
+                netif_carrier_off(pAC->dev[Param.Para32[0]]);
                 spin_unlock_irqrestore(
                         &pAC->TxPort[FromPort][TX_PRIO_LOW].TxDesRingLock,
                         Flags);
@@ -4355,7 +4355,7 @@ SK_BOOL		DualNet;
                 }
 
                 /* Inform the world that link protocol is up. */
-                pAC->dev[Param.Para32[0]]->flags |= IFF_RUNNING;
+                netif_carrier_on(pAC->dev[Param.Para32[0]]);
 
                 break;
         case SK_DRV_NET_DOWN:    /* SK_U32 Reason */
@@ -4368,7 +4368,7 @@ SK_BOOL		DualNet;
                 } else {
                         DoPrintInterfaceChange = SK_TRUE;
                 }
-                pAC->dev[Param.Para32[1]]->flags &= ~IFF_RUNNING;
+                netif_carrier_off(pAC->dev[Param.Para32[1]]);
                 break;
         case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
                 SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
@@ -4961,7 +4961,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         dev->poll_controller =  &SkGePollController;
 #endif
-        dev->flags &=           ~IFF_RUNNING;
         SET_NETDEV_DEV(dev, &pdev->dev);
         SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
 
@@ -5035,7 +5034,6 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
                 dev->set_mac_address    = &SkGeSetMacAddr;
                 dev->do_ioctl           = &SkGeIoctl;
                 dev->change_mtu         = &SkGeChangeMtu;
-                dev->flags             &= ~IFF_RUNNING;
                 SET_NETDEV_DEV(dev, &pdev->dev);
                 SET_ETHTOOL_OPS(dev, &SkGeEthtoolOps);
 
diff --git a/drivers/net/sk_g16.c b/drivers/net/sk_g16.c
deleted file mode 100644
index 134ae0e6495b..000000000000
--- a/drivers/net/sk_g16.c
+++ /dev/null
@@ -1,2066 +0,0 @@
-/*-
- * Copyright (C) 1994 by PJD Weichmann & SWS Bern, Switzerland
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- * Module         : sk_g16.c
- *
- * Version        : $Revision: 1.1 $
- *
- * Author         : Patrick J.D. Weichmann
- *
- * Date Created   : 94/05/26
- * Last Updated   : $Date: 1994/06/30 16:25:15 $
- *
- * Description    : Schneider & Koch G16 Ethernet Device Driver for
- *                  Linux Kernel >= 1.1.22
- * Update History :
- *                  Paul Gortmaker, 03/97: Fix for v2.1.x to use read{b,w}
- *                  write{b,w} and memcpy -> memcpy_{to,from}io
- *
- *                  Jeff Garzik, 06/2000, Modularize
- *
--*/
-
-static const char rcsid[] = "$Id: sk_g16.c,v 1.1 1994/06/30 16:25:15 root Exp $";
-
-/*
- * The Schneider & Koch (SK) G16 Network device driver is based
- * on the 'ni6510' driver from Michael Hipp which can be found at
- * ftp://sunsite.unc.edu/pub/Linux/system/Network/drivers/nidrivers.tar.gz
- * 
- * Sources: 1) ni6510.c by M. Hipp
- *          2) depca.c  by D.C. Davies
- *          3) skeleton.c by D. Becker
- *          4) Am7990 Local Area Network Controller for Ethernet (LANCE),
- *             AMD, Pub. #05698, June 1989
- *
- * Many Thanks for helping me to get things working to: 
- *                 
- *                 A. Cox (A.Cox@swansea.ac.uk)
- *                 M. Hipp (mhipp@student.uni-tuebingen.de)
- *                 R. Bolz (Schneider & Koch, Germany)
- *
- * To Do: 
- *        - Support of SK_G8 and other SK Network Cards.
- *        - Autoset memory mapped RAM. Check for free memory and then
- *          configure RAM correctly. 
- *        - SK_close should really set card in to initial state.
- *        - Test if IRQ 3 is not switched off. Use autoirq() functionality.
- *          (as in /drivers/net/skeleton.c)
- *        - Implement Multicast addressing. At minimum something like
- *          in depca.c. 
- *        - Redo the statistics part.
- *        - Try to find out if the board is in 8 Bit or 16 Bit slot.
- *          If in 8 Bit mode don't use IRQ 11.
- *        - (Try to make it slightly faster.) 
- *        - Power management support
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/fcntl.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/string.h> 
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/bitops.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include "sk_g16.h"
-
-/* 
- * Schneider & Koch Card Definitions 
- * =================================
- */  
-
-#define SK_NAME   "SK_G16"
-
-/*
- * SK_G16 Configuration
- * --------------------
- */ 
-
-/* 
- * Abbreviations
- * -------------
- *  
- * RAM - used for the 16KB shared memory 
- * Boot_ROM, ROM - are used for referencing the BootEPROM
- *
- * SK_BOOT_ROM and SK_ADDR are symbolic constants used to configure
- * the behaviour of the driver and the SK_G16.
- *
- * ! See sk_g16.install on how to install and configure the driver !   
- *
- * SK_BOOT_ROM defines if the Boot_ROM should be switched off or not.
- *
- * SK_ADDR defines the address where the RAM will be mapped into the real
- *         host memory.
- *         valid addresses are from 0xa0000 to 0xfc000 in 16Kbyte steps.
- */  
- 
-#define SK_BOOT_ROM     1              /* 1=BootROM on 0=off */
-
-#define SK_ADDR         0xcc000
-
-/* 
- * In POS3 are bits A14-A19 of the address bus. These bits can be set
- * to choose the RAM address. That's why we only can choose the RAM address
- * in 16KB steps.
- */
-
-#define POS_ADDR       (rom_addr>>14)  /* Do not change this line */
-
-/* 
- * SK_G16 I/O PORT's + IRQ's + Boot_ROM locations
- * ----------------------------------------------
- */
-
-/* 
- * As nearly every card has also SK_G16 a specified I/O Port region and
- * only a few possible IRQ's.
- * In the Installation Guide from Schneider & Koch is listed a possible
- * Interrupt IRQ2. IRQ2 is always IRQ9 in boards with two cascaded interrupt
- * controllers. So we use in SK_IRQS IRQ9.
- */
-
-/* Don't touch any of the following #defines. */
-
-#define SK_IO_PORTS     { 0x100, 0x180, 0x208, 0x220, 0x288, 0x320, 0x328, 0x390, 0 }
-
-#define SK_IRQS         { 3, 5, 9, 11, 0 }
-
-#define SK_BOOT_ROM_LOCATIONS { 0xc0000, 0xc4000, 0xc8000, 0xcc000, 0xd0000, 0xd4000, 0xd8000, 0xdc000, 0 }
-
-#define SK_BOOT_ROM_ID  { 0x55, 0xaa, 0x10, 0x50, 0x06, 0x33 }
-
-/* 
- * SK_G16 POS REGISTERS 
- * --------------------
- */
-
-/*
- * SK_G16 has a Programmable Option Select (POS) Register.
- * The POS is composed of 8 separate registers (POS0-7) which 
- * are I/O mapped on an address set by the W1 switch.                    
- *
- */
-
-#define SK_POS_SIZE 8           /* 8 I/O Ports are used by SK_G16 */
-
-#define SK_POS0     ioaddr      /* Card-ID Low (R) */
-#define SK_POS1     ioaddr+1    /* Card-ID High (R) */
-#define SK_POS2     ioaddr+2    /* Card-Enable, Boot-ROM Disable (RW) */
-#define SK_POS3     ioaddr+3    /* Base address of RAM */
-#define SK_POS4     ioaddr+4    /* IRQ */
-
-/* POS5 - POS7 are unused */
-
-/* 
- * SK_G16 MAC PREFIX 
- * -----------------
- */
-
-/* 
- * Scheider & Koch manufacturer code (00:00:a5).
- * This must be checked, that we are sure it is a SK card.
- */
-
-#define SK_MAC0         0x00
-#define SK_MAC1         0x00
-#define SK_MAC2         0x5a
-
-/* 
- * SK_G16 ID 
- * ---------
- */ 
-
-/* 
- * If POS0,POS1 contain the following ID, then we know
- * at which I/O Port Address we are. 
- */
-
-#define SK_IDLOW  0xfd 
-#define SK_IDHIGH 0x6a
-
-
-/* 
- * LANCE POS Bit definitions 
- * -------------------------
- */
-
-#define SK_ROM_RAM_ON  (POS2_CARD)
-#define SK_ROM_RAM_OFF (POS2_EPROM)
-#define SK_ROM_ON      (inb(SK_POS2) & POS2_CARD)
-#define SK_ROM_OFF     (inb(SK_POS2) | POS2_EPROM)
-#define SK_RAM_ON      (inb(SK_POS2) | POS2_CARD)
-#define SK_RAM_OFF     (inb(SK_POS2) & POS2_EPROM) 
-
-#define POS2_CARD  0x0001              /* 1 = SK_G16 on      0 = off */
-#define POS2_EPROM 0x0002              /* 1 = Boot EPROM off 0 = on */ 
-
-/* 
- * SK_G16 Memory mapped Registers
- * ------------------------------
- *
- */ 
-
-#define SK_IOREG        (&board->ioreg) /* LANCE data registers.     */ 
-#define SK_PORT         (&board->port)  /* Control, Status register  */
-#define SK_IOCOM        (&board->iocom) /* I/O Command               */
-
-/* 
- * SK_G16 Status/Control Register bits
- * -----------------------------------
- *
- * (C) Controlreg (S) Statusreg 
- */
-
-/* 
- * Register transfer: 0 = no transfer
- *                    1 = transferring data between LANCE and I/O reg 
- */
-#define SK_IORUN        0x20   
-
-/* 
- * LANCE interrupt: 0 = LANCE interrupt occurred        
- *                  1 = no LANCE interrupt occurred
- */
-#define SK_IRQ          0x10   
-                        
-#define SK_RESET        0x08   /* Reset SK_CARD: 0 = RESET 1 = normal */
-#define SK_RW           0x02   /* 0 = write to 1 = read from */
-#define SK_ADR          0x01   /* 0 = REG DataPort 1 = RAP Reg addr port */
-
-  
-#define SK_RREG         SK_RW  /* Transferdirection to read from lance */
-#define SK_WREG         0      /* Transferdirection to write to lance */
-#define SK_RAP          SK_ADR /* Destination Register RAP */
-#define SK_RDATA        0      /* Destination Register REG DataPort */
-
-/* 
- * SK_G16 I/O Command 
- * ------------------
- */
-
-/* 
- * Any bitcombination sets the internal I/O bit (transfer will start) 
- * when written to I/O Command
- */
-
-#define SK_DOIO         0x80   /* Do Transfer */ 
- 
-/* 
- * LANCE RAP (Register Address Port). 
- * ---------------------------------
- */
-
-/*   
- * The LANCE internal registers are selected through the RAP. 
- * The Registers are:
- *
- * CSR0 - Status and Control flags 
- * CSR1 - Low order bits of initialize block (bits 15:00)
- * CSR2 - High order bits of initialize block (bits 07:00, 15:08 are reserved)
- * CSR3 - Allows redefinition of the Bus Master Interface.
- *        This register must be set to 0x0002, which means BSWAP = 0,
- *        ACON = 1, BCON = 0;
- *
- */
- 
-#define CSR0            0x00   
-#define CSR1            0x01  
-#define CSR2            0x02 
-#define CSR3            0x03
-
-/* 
- * General Definitions 
- * ===================
- */
-
-/* 
- * Set the number of Tx and Rx buffers, using Log_2(# buffers).
- * We have 16KB RAM which can be accessed by the LANCE. In the 
- * memory are not only the buffers but also the ring descriptors and
- * the initialize block. 
- * Don't change anything unless you really know what you do.
- */
-
-#define LC_LOG_TX_BUFFERS 1               /* (2 == 2^^1) 2 Transmit buffers */
-#define LC_LOG_RX_BUFFERS 3               /* (8 == 2^^3) 8 Receive buffers */
-
-/* Descriptor ring sizes */
-
-#define TMDNUM (1 << (LC_LOG_TX_BUFFERS)) /* 2 Transmit descriptor rings */
-#define RMDNUM (1 << (LC_LOG_RX_BUFFERS)) /* 8 Receive Buffers */
-
-/* Define Mask for setting RMD, TMD length in the LANCE init_block */
-
-#define TMDNUMMASK (LC_LOG_TX_BUFFERS << 29)
-#define RMDNUMMASK (LC_LOG_RX_BUFFERS << 29)
-
-/*
- * Data Buffer size is set to maximum packet length.
- */
-
-#define PKT_BUF_SZ              1518 
-
-/* 
- * The number of low I/O ports used by the ethercard. 
- */
-
-#define ETHERCARD_TOTAL_SIZE    SK_POS_SIZE
-
-/* 
- * SK_DEBUG
- *
- * Here you can choose what level of debugging wanted.
- *
- * If SK_DEBUG and SK_DEBUG2 are undefined, then only the
- *  necessary messages will be printed.
- *
- * If SK_DEBUG is defined, there will be many debugging prints
- *  which can help to find some mistakes in configuration or even
- *  in the driver code.
- *
- * If SK_DEBUG2 is defined, many many messages will be printed 
- *  which normally you don't need. I used this to check the interrupt
- *  routine. 
- *
- * (If you define only SK_DEBUG2 then only the messages for 
- *  checking interrupts will be printed!)
- *
- * Normal way of live is: 
- *
- * For the whole thing get going let both symbolic constants
- * undefined. If you face any problems and you know what's going
- * on (you know something about the card and you can interpret some
- * hex LANCE register output) then define SK_DEBUG
- * 
- */
-
-#undef  SK_DEBUG        /* debugging */
-#undef  SK_DEBUG2       /* debugging with more verbose report */
-
-#ifdef SK_DEBUG
-#define PRINTK(x) printk x
-#else
-#define PRINTK(x) /**/
-#endif
-
-#ifdef SK_DEBUG2
-#define PRINTK2(x) printk x
-#else
-#define PRINTK2(x) /**/
-#endif
-
-/* 
- * SK_G16 RAM
- *
- * The components are memory mapped and can be set in a region from
- * 0x00000 through 0xfc000 in 16KB steps. 
- *
- * The Network components are: dual ported RAM, Prom, I/O Reg, Status-,
- * Controlregister and I/O Command.
- *
- * dual ported RAM: This is the only memory region which the LANCE chip
- *      has access to. From the Lance it is addressed from 0x0000 to
- *      0x3fbf. The host accesses it normally.
- *
- * PROM: The PROM obtains the ETHERNET-MAC-Address. It is realised as a
- *       8-Bit PROM, this means only the 16 even addresses are used of the
- *       32 Byte Address region. Access to an odd address results in invalid
- *       data.
- * 
- * LANCE I/O Reg: The I/O Reg is build of 4 single Registers, Low-Byte Write,
- *       Hi-Byte Write, Low-Byte Read, Hi-Byte Read.
- *       Transfer from or to the LANCE is always in 16Bit so Low and High
- *       registers are always relevant.
- *
- *       The Data from the Readregister is not the data in the Writeregister!!
- *       
- * Port: Status- and Controlregister. 
- *       Two different registers which share the same address, Status is 
- *       read-only, Control is write-only.
- *    
- * I/O Command: 
- *       Any bitcombination written in here starts the transmission between
- *       Host and LANCE.
- */
-
-typedef struct
-{
-        unsigned char  ram[0x3fc0];   /* 16KB dual ported ram */
-        unsigned char  rom[0x0020];   /* 32Byte PROM containing 6Byte MAC */
-        unsigned char  res1[0x0010];  /* reserved */
-        unsigned volatile short ioreg;/* LANCE I/O Register */
-        unsigned volatile char  port; /* Statusregister and Controlregister */
-        unsigned char  iocom;         /* I/O Command Register */
-} SK_RAM;
-
-/* struct  */
-
-/* 
- * This is the structure for the dual ported ram. We
- * have exactly 16 320 Bytes. In here there must be:
- *
- *     - Initialize Block   (starting at a word boundary)
- *     - Receive and Transmit Descriptor Rings (quadword boundary)
- *     - Data Buffers (arbitrary boundary)
- *
- * This is because LANCE has on SK_G16 only access to the dual ported
- * RAM and nowhere else.
- */
-
-struct SK_ram
-{
-    struct init_block ib;
-    struct tmd tmde[TMDNUM];
-    struct rmd rmde[RMDNUM];
-    char tmdbuf[TMDNUM][PKT_BUF_SZ];
-    char rmdbuf[RMDNUM][PKT_BUF_SZ];
-};
-
-/* 
- * Structure where all necessary information is for ring buffer 
- * management and statistics.
- */
-
-struct priv
-{
-    struct SK_ram *ram;  /* dual ported ram structure */
-    struct rmd *rmdhead; /* start of receive ring descriptors */
-    struct tmd *tmdhead; /* start of transmit ring descriptors */
-    int        rmdnum;   /* actual used ring descriptor */
-    int        tmdnum;   /* actual transmit descriptor for transmitting data */
-    int        tmdlast;  /* last sent descriptor used for error handling, etc */
-    void       *rmdbufs[RMDNUM]; /* pointer to the receive buffers */
-    void       *tmdbufs[TMDNUM]; /* pointer to the transmit buffers */
-    struct net_device_stats stats; /* Device driver statistics */
-};
-
-/* global variable declaration */
-
-/* IRQ map used to reserve a IRQ (see SK_open()) */
-
-/* static variables */
-
-static SK_RAM *board;  /* pointer to our memory mapped board components */
-static DEFINE_SPINLOCK(SK_lock);
-
-/* Macros */
-
-
-/* Function Prototypes */
-
-/*
- * Device Driver functions
- * -----------------------
- * See for short explanation of each function its definitions header.
- */
-
-static int   SK_probe(struct net_device *dev, short ioaddr);
-
-static void  SK_timeout(struct net_device *dev);
-static int   SK_open(struct net_device *dev);
-static int   SK_send_packet(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t SK_interrupt(int irq, void *dev_id, struct pt_regs * regs);
-static void  SK_rxintr(struct net_device *dev);
-static void  SK_txintr(struct net_device *dev);
-static int   SK_close(struct net_device *dev);
-
-static struct net_device_stats *SK_get_stats(struct net_device *dev);
-
-unsigned int SK_rom_addr(void);
-
-static void set_multicast_list(struct net_device *dev);
-
-/*
- * LANCE Functions
- * ---------------
- */
-
-static int SK_lance_init(struct net_device *dev, unsigned short mode);
-void   SK_reset_board(void);
-void   SK_set_RAP(int reg_number);
-int    SK_read_reg(int reg_number);
-int    SK_rread_reg(void);
-void   SK_write_reg(int reg_number, int value);
-
-/* 
- * Debugging functions
- * -------------------
- */
-
-void SK_print_pos(struct net_device *dev, char *text);
-void SK_print_dev(struct net_device *dev, char *text);
-void SK_print_ram(struct net_device *dev);
-
-
-/*-
- * Function       : SK_init
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : Check for a SK_G16 network adaptor and initialize it.
- *                  This function gets called by dev_init which initializes
- *                  all Network devices.
- *
- * Parameters     : I : struct net_device *dev - structure preconfigured 
- *                                           from Space.c
- * Return Value   : 0 = Driver Found and initialized 
- * Errors         : ENODEV - no device found
- *                  ENXIO  - not probed
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static int io;  /* 0 == probe */
-
-/* 
- * Check for a network adaptor of this type, and return '0' if one exists.
- * If dev->base_addr == 0, probe all likely locations.
- * If dev->base_addr == 1, always return failure.
- */
-
-struct net_device * __init SK_init(int unit)
-{
-        int *port, ports[] = SK_IO_PORTS;  /* SK_G16 supported ports */
-        static unsigned version_printed;
-        struct net_device *dev = alloc_etherdev(sizeof(struct priv));
-        int err = -ENODEV;
-
-        if (!dev)
-                return ERR_PTR(-ENOMEM);
-
-        if (unit >= 0) {
-                sprintf(dev->name, "eth%d", unit);
-                netdev_boot_setup_check(dev);
-                io = dev->base_addr;
-        }
-
-        if (version_printed++ == 0)
-                PRINTK(("%s: %s", SK_NAME, rcsid));
-
-        if (io > 0xff) {        /* Check a single specified address */
-                err = -EBUSY;
-                /* Check if on specified address is a SK_G16 */
-                if (request_region(io, ETHERCARD_TOTAL_SIZE, "sk_g16")) {
-                        err = SK_probe(dev, io);
-                        if (!err)
-                                goto got_it;
-                        release_region(io, ETHERCARD_TOTAL_SIZE);
-                }
-        } else if (io > 0) {       /* Don't probe at all */
-                err = -ENXIO;
-        } else {
-                /* Autoprobe base_addr */
-                for (port = &ports[0]; *port; port++) {
-                        io = *port;
-
-                        /* Check if I/O Port region is used by another board */
-                        if (!request_region(io, ETHERCARD_TOTAL_SIZE, "sk_g16"))
-                                continue;       /* Try next Port address */
-
-                        /* Check if at ioaddr is a SK_G16 */
-                        if (SK_probe(dev, io) == 0)
-                                goto got_it;
-
-                        release_region(io, ETHERCARD_TOTAL_SIZE);
-                }
-        }
-err_out:
-        free_netdev(dev);
-        return ERR_PTR(err);
-
-got_it:
-        err = register_netdev(dev);
-        if (err) {
-                release_region(dev->base_addr, ETHERCARD_TOTAL_SIZE);
-                goto err_out;
-        }
-        return dev;
-
-} /* End of SK_init */
-
-
-MODULE_AUTHOR("Patrick J.D. Weichmann");
-MODULE_DESCRIPTION("Schneider & Koch G16 Ethernet Device Driver");
-MODULE_LICENSE("GPL");
-MODULE_PARM(io, "i");
-MODULE_PARM_DESC(io, "0 to probe common ports (unsafe), or the I/O base of the board");
-
-
-#ifdef MODULE
-
-static struct net_device *SK_dev;
-
-static int __init SK_init_module (void)
-{
-        SK_dev = SK_init(-1);
-        return IS_ERR(SK_dev) ? PTR_ERR(SK_dev) : 0;
-}
-
-static void __exit SK_cleanup_module (void)
-{
-        unregister_netdev(SK_dev);
-        release_region(SK_dev->base_addr, ETHERCARD_TOTAL_SIZE);
-        free_netdev(SK_dev);
-}
-
-module_init(SK_init_module);
-module_exit(SK_cleanup_module);
-#endif
-
-
-/*-
- * Function       : SK_probe
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : This function is called by SK_init and 
- *                  does the main part of initialization.
- *                  
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- *                  I : short ioaddr       - I/O Port address where POS is.
- * Return Value   : 0 = Initialization done             
- * Errors         : ENODEV - No SK_G16 found
- *                  -1     - Configuration problem
- * Globals        : board       - pointer to SK_RAM
- * Update History :
- *     YY/MM/DD  uid  Description
- *     94/06/30  pwe  SK_ADDR now checked and at the correct place
--*/
-
-int __init SK_probe(struct net_device *dev, short ioaddr)
-{
-    int i,j;                /* Counters */
-    int sk_addr_flag = 0;   /* SK ADDR correct? 1 - no, 0 - yes */
-    unsigned int rom_addr;  /* used to store RAM address used for POS_ADDR */
-
-    struct priv *p = netdev_priv(dev);  /* SK_G16 private structure */
-
-    if (inb(SK_POS0) != SK_IDLOW || inb(SK_POS1) != SK_IDHIGH)
-        return -ENODEV;
-    dev->base_addr = ioaddr;
-
-    if (SK_ADDR & 0x3fff || SK_ADDR < 0xa0000)
-    {
-      
-       sk_addr_flag = 1;
-
-       /* 
-        * Now here we could use a routine which searches for a free
-        * place in the ram and set SK_ADDR if found. TODO. 
-        */
-    }
-
-    if (SK_BOOT_ROM)            /* Shall we keep Boot_ROM on ? */
-    {
-        PRINTK(("## %s: SK_BOOT_ROM is set.\n", SK_NAME));
-
-        rom_addr = SK_rom_addr();
-
-        if (rom_addr == 0)      /* No Boot_ROM found */
-        {
-            if (sk_addr_flag)   /* No or Invalid SK_ADDR is defined */ 
-            {
-                printk("%s: SK_ADDR %#08x is not valid. Check configuration.\n",
-                       dev->name, SK_ADDR);
-                return -1;
-            }
-
-            rom_addr = SK_ADDR; /* assign predefined address */
-
-            PRINTK(("## %s: NO Bootrom found \n", SK_NAME));
-
-            outb(SK_ROM_RAM_OFF, SK_POS2); /* Boot_ROM + RAM off */
-            outb(POS_ADDR, SK_POS3);       /* Set RAM address */
-            outb(SK_RAM_ON, SK_POS2);      /* enable RAM */
-        }
-        else if (rom_addr == SK_ADDR) 
-        {
-            printk("%s: RAM + ROM are set to the same address %#08x\n"
-                   "   Check configuration. Now switching off Boot_ROM\n",
-                   SK_NAME, rom_addr);
-
-            outb(SK_ROM_RAM_OFF, SK_POS2); /* Boot_ROM + RAM off*/
-            outb(POS_ADDR, SK_POS3);       /* Set RAM address */
-            outb(SK_RAM_ON, SK_POS2);      /* enable RAM */
-        }
-        else
-        {
-            PRINTK(("## %s: Found ROM at %#08x\n", SK_NAME, rom_addr));
-            PRINTK(("## %s: Keeping Boot_ROM on\n", SK_NAME));
-
-            if (sk_addr_flag)       /* No or Invalid SK_ADDR is defined */ 
-            {
-                printk("%s: SK_ADDR %#08x is not valid. Check configuration.\n",
-                       dev->name, SK_ADDR);
-                return -1;
-            }
-
-            rom_addr = SK_ADDR;
-
-            outb(SK_ROM_RAM_OFF, SK_POS2); /* Boot_ROM + RAM off */ 
-            outb(POS_ADDR, SK_POS3);       /* Set RAM address */
-            outb(SK_ROM_RAM_ON, SK_POS2);  /* RAM on, BOOT_ROM on */
-        }
-    }
-    else /* Don't keep Boot_ROM */
-    {
-        PRINTK(("## %s: SK_BOOT_ROM is not set.\n", SK_NAME));
-
-        if (sk_addr_flag)           /* No or Invalid SK_ADDR is defined */ 
-        {
-            printk("%s: SK_ADDR %#08x is not valid. Check configuration.\n",
-                   dev->name, SK_ADDR);
-            return -1;
-        }
-
-        rom_addr = SK_rom_addr();          /* Try to find a Boot_ROM */
-
-        /* IF we find a Boot_ROM disable it */
-
-        outb(SK_ROM_RAM_OFF, SK_POS2);     /* Boot_ROM + RAM off */  
-
-        /* We found a Boot_ROM and it's gone. Set RAM address on
-         * Boot_ROM address. 
-         */ 
-
-        if (rom_addr) 
-        {
-            printk("%s: We found Boot_ROM at %#08x. Now setting RAM on"
-                   "that address\n", SK_NAME, rom_addr);
-
-            outb(POS_ADDR, SK_POS3);       /* Set RAM on Boot_ROM address */
-        }
-        else /* We did not find a Boot_ROM, use predefined SK_ADDR for ram */
-        {
-            if (sk_addr_flag)       /* No or Invalid SK_ADDR is defined */ 
-            {
-                printk("%s: SK_ADDR %#08x is not valid. Check configuration.\n",
-                       dev->name, SK_ADDR);
-                return -1;
-            }
-
-            rom_addr = SK_ADDR;
-
-            outb(POS_ADDR, SK_POS3);       /* Set RAM address */ 
-        }
-        outb(SK_RAM_ON, SK_POS2);          /* enable RAM */
-    }
-
-#ifdef SK_DEBUG
-    SK_print_pos(dev, "POS registers after ROM, RAM config");
-#endif
-
-    board = (SK_RAM *) isa_bus_to_virt(rom_addr);
-
-    /* Read in station address */
-    for (i = 0, j = 0; i < ETH_ALEN; i++, j+=2)
-    {
-        dev->dev_addr[i] = readb(board->rom+j);          
-    }
-
-    /* Check for manufacturer code */
-    if (!(dev->dev_addr[0] == SK_MAC0 &&
-          dev->dev_addr[1] == SK_MAC1 &&
-          dev->dev_addr[2] == SK_MAC2) )
-    {
-        PRINTK(("## %s: We did not find SK_G16 at RAM location.\n",
-                SK_NAME)); 
-        return -ENODEV;                     /* NO SK_G16 found */
-    }
-
-    printk("%s: %s found at %#3x, HW addr: %#04x:%02x:%02x:%02x:%02x:%02x\n",
-            dev->name,
-            "Schneider & Koch Netcard",
-            (unsigned int) dev->base_addr,
-            dev->dev_addr[0],
-            dev->dev_addr[1],
-            dev->dev_addr[2],
-            dev->dev_addr[3],
-            dev->dev_addr[4],
-            dev->dev_addr[5]);
-
-    memset((char *) dev->priv, 0, sizeof(struct priv)); /* clear memory */
-
-    /* Assign our Device Driver functions */
-
-    dev->open                   = SK_open;
-    dev->stop                   = SK_close;
-    dev->hard_start_xmit        = SK_send_packet;
-    dev->get_stats              = SK_get_stats;
-    dev->set_multicast_list     = set_multicast_list;
-    dev->tx_timeout             = SK_timeout;
-    dev->watchdog_timeo         = HZ/7;
-
-
-    dev->flags &= ~IFF_MULTICAST;
-
-    /* Initialize private structure */
-
-    p->ram = (struct SK_ram *) rom_addr; /* Set dual ported RAM addr */
-    p->tmdhead = &(p->ram)->tmde[0];     /* Set TMD head */
-    p->rmdhead = &(p->ram)->rmde[0];     /* Set RMD head */
-
-    /* Initialize buffer pointers */
-
-    for (i = 0; i < TMDNUM; i++)
-    {
-        p->tmdbufs[i] = &(p->ram)->tmdbuf[i];
-    }
-
-    for (i = 0; i < RMDNUM; i++)
-    {
-        p->rmdbufs[i] = &(p->ram)->rmdbuf[i]; 
-    }
-
-#ifdef SK_DEBUG
-    SK_print_pos(dev, "End of SK_probe");
-    SK_print_ram(dev);
-#endif 
-    return 0;                            /* Initialization done */
-} /* End of SK_probe() */
-
-
-/*- 
- * Function       : SK_open
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : This function is called sometimes after booting 
- *                  when ifconfig program is run.
- *
- *                  This function requests an IRQ, sets the correct
- *                  IRQ in the card. Then calls SK_lance_init() to 
- *                  init and start the LANCE chip. Then if everything is 
- *                  ok returns with 0 (OK), which means SK_G16 is now
- *                  opened and operational.
- *
- *                  (Called by dev_open() /net/inet/dev.c)
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- * Return Value   : 0 - Device opened
- * Errors         : -EAGAIN - Open failed
- * Side Effects   : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static int SK_open(struct net_device *dev)
-{
-    int i = 0;
-    int irqval = 0;
-    int ioaddr = dev->base_addr;
-
-    int irqtab[] = SK_IRQS; 
-
-    struct priv *p = netdev_priv(dev);
-
-    PRINTK(("## %s: At beginning of SK_open(). CSR0: %#06x\n", 
-           SK_NAME, SK_read_reg(CSR0)));
-
-    if (dev->irq == 0) /* Autoirq */
-    {
-        i = 0;
-
-        /* 
-         * Check if one IRQ out of SK_IRQS is free and install 
-         * interrupt handler.
-         * Most done by request_irq(). 
-         * irqval: 0       - interrupt handler installed for IRQ irqtab[i]
-         *         -EBUSY  - interrupt busy 
-         *         -EINVAL - irq > 15 or handler = NULL
-         */
-
-        do
-        {
-          irqval = request_irq(irqtab[i], &SK_interrupt, 0, "sk_g16", dev);
-          i++;
-        } while (irqval && irqtab[i]);
-
-        if (irqval) /* We tried every possible IRQ but no success */
-        {
-            printk("%s: unable to get an IRQ\n", dev->name);
-            return -EAGAIN;
-        }
-
-        dev->irq = irqtab[--i]; 
-        
-        outb(i<<2, SK_POS4);           /* Set Card on probed IRQ */
-
-    }
-    else if (dev->irq == 2) /* IRQ2 is always IRQ9 */
-    {
-        if (request_irq(9, &SK_interrupt, 0, "sk_g16", dev))
-        {
-            printk("%s: unable to get IRQ 9\n", dev->name);
-            return -EAGAIN;
-        } 
-        dev->irq = 9;
-        
-        /* 
-         * Now we set card on IRQ2.
-         * This can be confusing, but remember that IRQ2 on the network
-         * card is in reality IRQ9
-         */
-        outb(0x08, SK_POS4);           /* set card to IRQ2 */
-
-    }
-    else  /* Check IRQ as defined in Space.c */
-    {
-        int i = 0;
-
-        /* check if IRQ free and valid. Then install Interrupt handler */
-
-        if (request_irq(dev->irq, &SK_interrupt, 0, "sk_g16", dev))
-        {
-            printk("%s: unable to get selected IRQ\n", dev->name);
-            return -EAGAIN;
-        }
-
-        switch(dev->irq)
-        {
-            case 3: i = 0;
-                    break;
-            case 5: i = 1;
-                    break;
-            case 2: i = 2;
-                    break;
-            case 11:i = 3;
-                    break;
-            default: 
-                printk("%s: Preselected IRQ %d is invalid for %s boards",
-                       dev->name,
-                       dev->irq,
-                       SK_NAME);
-                return -EAGAIN;
-        }      
-  
-        outb(i<<2, SK_POS4);           /* Set IRQ on card */
-    }
-
-    printk("%s: Schneider & Koch G16 at %#3x, IRQ %d, shared mem at %#08x\n",
-            dev->name, (unsigned int)dev->base_addr, 
-            (int) dev->irq, (unsigned int) p->ram);
-
-    if (!(i = SK_lance_init(dev, 0)))  /* LANCE init OK? */
-    {
-        netif_start_queue(dev);
-
-#ifdef SK_DEBUG
-
-        /* 
-         * This debug block tries to stop LANCE,
-         * reinit LANCE with transmitter and receiver disabled,
-         * then stop again and reinit with NORMAL_MODE
-         */
-
-        printk("## %s: After lance init. CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0));
-        SK_write_reg(CSR0, CSR0_STOP);
-        printk("## %s: LANCE stopped. CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0));
-        SK_lance_init(dev, MODE_DTX | MODE_DRX);
-        printk("## %s: Reinit with DTX + DRX off. CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0));
-        SK_write_reg(CSR0, CSR0_STOP);
-        printk("## %s: LANCE stopped. CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0));
-        SK_lance_init(dev, MODE_NORMAL);
-        printk("## %s: LANCE back to normal mode. CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0));
-        SK_print_pos(dev, "POS regs before returning OK");
-
-#endif /* SK_DEBUG */
-       
-        return 0;              /* SK_open() is successful */
-    }
-    else /* LANCE init failed */
-    {
-
-        PRINTK(("## %s: LANCE init failed: CSR0: %#06x\n", 
-               SK_NAME, SK_read_reg(CSR0)));
-
-        return -EAGAIN;
-    }
-
-} /* End of SK_open() */
-
-
-/*-
- * Function       : SK_lance_init
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : Reset LANCE chip, fill RMD, TMD structures with
- *                  start values and Start LANCE.
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- *                  I : int mode - put LANCE into "mode" see data-sheet for
- *                                 more info.
- * Return Value   : 0  - Init done
- * Errors         : -1 - Init failed
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static int SK_lance_init(struct net_device *dev, unsigned short mode)
-{
-    int i;
-    unsigned long flags;
-    struct priv *p = netdev_priv(dev);
-    struct tmd  *tmdp;
-    struct rmd  *rmdp;
-
-    PRINTK(("## %s: At beginning of LANCE init. CSR0: %#06x\n", 
-           SK_NAME, SK_read_reg(CSR0)));
-
-    /* Reset LANCE */
-    SK_reset_board();
-
-    /* Initialize TMD's with start values */
-    p->tmdnum = 0;                   /* First descriptor for transmitting */ 
-    p->tmdlast = 0;                  /* First descriptor for reading stats */
-
-    for (i = 0; i < TMDNUM; i++)     /* Init all TMD's */
-    {
-        tmdp = p->tmdhead + i; 
-   
-        writel((unsigned long) p->tmdbufs[i], tmdp->u.buffer); /* assign buffer */
-        
-        /* Mark TMD as start and end of packet */
-        writeb(TX_STP | TX_ENP, &tmdp->u.s.status);
-    }
-
-
-    /* Initialize RMD's with start values */
-
-    p->rmdnum = 0;                   /* First RMD which will be used */
- 
-    for (i = 0; i < RMDNUM; i++)     /* Init all RMD's */
-    {
-        rmdp = p->rmdhead + i;
-
-        
-        writel((unsigned long) p->rmdbufs[i], rmdp->u.buffer); /* assign buffer */
-        
-        /* 
-         * LANCE must be owner at beginning so that he can fill in 
-         * receiving packets, set status and release RMD 
-         */
-
-        writeb(RX_OWN, &rmdp->u.s.status);
-
-        writew(-PKT_BUF_SZ, &rmdp->blen); /* Buffer Size (two's complement) */
-
-        writeb(0, &rmdp->mlen);           /* init message length */       
-        
-    }
-
-    /* Fill LANCE Initialize Block */
-
-    writew(mode, (&((p->ram)->ib.mode))); /* Set operation mode */
-
-    for (i = 0; i < ETH_ALEN; i++)   /* Set physical address */
-    {
-        writeb(dev->dev_addr[i], (&((p->ram)->ib.paddr[i]))); 
-    }
-
-    for (i = 0; i < 8; i++)          /* Set multicast, logical address */
-    {
-        writeb(0, (&((p->ram)->ib.laddr[i]))); /* We do not use logical addressing */
-    } 
-
-    /* Set ring descriptor pointers and set number of descriptors */
-
-    writel((int)p->rmdhead | RMDNUMMASK, (&((p->ram)->ib.rdrp)));
-    writel((int)p->tmdhead | TMDNUMMASK, (&((p->ram)->ib.tdrp)));
-
-    /* Prepare LANCE Control and Status Registers */
-
-    spin_lock_irqsave(&SK_lock, flags);
-
-    SK_write_reg(CSR3, CSR3_ACON);   /* Ale Control !!!THIS MUST BE SET!!!! */
- 
-    /* 
-     * LANCE addresses the RAM from 0x0000 to 0x3fbf and has no access to
-     * PC Memory locations.
-     *
-     * In structure SK_ram is defined that the first thing in ram
-     * is the initialization block. So his address is for LANCE always
-     * 0x0000
-     *
-     * CSR1 contains low order bits 15:0 of initialization block address
-     * CSR2 is built of: 
-     *    7:0  High order bits 23:16 of initialization block address
-     *   15:8  reserved, must be 0
-     */
-    
-    /* Set initialization block address (must be on word boundary) */
-    SK_write_reg(CSR1, 0);          /* Set low order bits 15:0 */
-    SK_write_reg(CSR2, 0);          /* Set high order bits 23:16 */ 
-    
-
-    PRINTK(("## %s: After setting CSR1-3. CSR0: %#06x\n", 
-           SK_NAME, SK_read_reg(CSR0)));
-
-    /* Initialize LANCE */
-
-    /* 
-     * INIT = Initialize, when set, causes the LANCE to begin the
-     * initialization procedure and access the Init Block.
-     */
-
-    SK_write_reg(CSR0, CSR0_INIT); 
-
-    spin_unlock_irqrestore(&SK_lock, flags);
-
-    /* Wait until LANCE finished initialization */
-    
-    SK_set_RAP(CSR0);              /* Register Address Pointer to CSR0 */
-
-    for (i = 0; (i < 100) && !(SK_rread_reg() & CSR0_IDON); i++) 
-        ; /* Wait until init done or go ahead if problems (i>=100) */
-
-    if (i >= 100) /* Something is wrong ! */
-    {
-        printk("%s: can't init am7990, status: %04x "
-               "init_block: %#08x\n", 
-                dev->name, (int) SK_read_reg(CSR0), 
-                (unsigned int) &(p->ram)->ib);
-
-#ifdef SK_DEBUG
-        SK_print_pos(dev, "LANCE INIT failed");
-        SK_print_dev(dev,"Device Structure:");
-#endif
-
-        return -1;                 /* LANCE init failed */
-    }
-
-    PRINTK(("## %s: init done after %d ticks\n", SK_NAME, i));
-
-    /* Clear Initialize done, enable Interrupts, start LANCE */
-
-    SK_write_reg(CSR0, CSR0_IDON | CSR0_INEA | CSR0_STRT);
-
-    PRINTK(("## %s: LANCE started. CSR0: %#06x\n", SK_NAME, 
-            SK_read_reg(CSR0)));
-
-    return 0;                      /* LANCE is up and running */
-
-} /* End of SK_lance_init() */
-
-
-
-/*-
- * Function       : SK_send_packet
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/27
- *
- * Description    : Writes an socket buffer into a transmit descriptor
- *                  and starts transmission.
- *
- * Parameters     : I : struct sk_buff *skb - packet to transfer
- *                  I : struct net_device *dev  - SK_G16 device structure
- * Return Value   : 0 - OK
- *                  1 - Could not transmit (dev_queue_xmit will queue it)
- *                      and try to sent it later
- * Globals        : None
- * Side Effects   : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static void SK_timeout(struct net_device *dev)
-{
-        printk(KERN_WARNING "%s: xmitter timed out, try to restart!\n", dev->name);
-        SK_lance_init(dev, MODE_NORMAL); /* Reinit LANCE */
-        netif_wake_queue(dev);           /* Clear Transmitter flag */
-        dev->trans_start = jiffies;      /* Mark Start of transmission */
-}
-
-static int SK_send_packet(struct sk_buff *skb, struct net_device *dev)
-{
-    struct priv *p = netdev_priv(dev);
-    struct tmd *tmdp;
-    static char pad[64];
-
-    PRINTK2(("## %s: SK_send_packet() called, CSR0 %#04x.\n", 
-            SK_NAME, SK_read_reg(CSR0)));
-
-
-    /* 
-     * Block a timer-based transmit from overlapping. 
-     * This means check if we are already in. 
-     */
-
-    netif_stop_queue (dev);
-
-    {
-
-        /* Evaluate Packet length */
-        short len = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; 
-       
-        tmdp = p->tmdhead + p->tmdnum; /* Which descriptor for transmitting */
-
-        /* Fill in Transmit Message Descriptor */
-
-        /* Copy data into dual ported ram */
-
-        memcpy_toio((tmdp->u.buffer & 0x00ffffff), skb->data, skb->len);
-        if (len != skb->len)
-                memcpy_toio((tmdp->u.buffer & 0x00ffffff) + skb->len, pad, len-skb->len);
-
-        writew(-len, &tmdp->blen);            /* set length to transmit */
-
-        /* 
-         * Packet start and end is always set because we use the maximum
-         * packet length as buffer length.
-         * Relinquish ownership to LANCE
-         */
-
-        writeb(TX_OWN | TX_STP | TX_ENP, &tmdp->u.s.status);
-        
-        /* Start Demand Transmission */
-        SK_write_reg(CSR0, CSR0_TDMD | CSR0_INEA);
-
-        dev->trans_start = jiffies;   /* Mark start of transmission */
-
-        /* Set pointer to next transmit buffer */
-        p->tmdnum++; 
-        p->tmdnum &= TMDNUM-1; 
-
-        /* Do we own the next transmit buffer ? */
-        if (! (readb(&((p->tmdhead + p->tmdnum)->u.s.status)) & TX_OWN) )
-        {
-           /* 
-            * We own next buffer and are ready to transmit, so
-            * clear busy flag
-            */
-           netif_start_queue(dev);
-        }
-
-        p->stats.tx_bytes += skb->len;
-
-    }
-
-    dev_kfree_skb(skb);
-    return 0;  
-} /* End of SK_send_packet */
-
-
-/*-
- * Function       : SK_interrupt
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/27
- *
- * Description    : SK_G16 interrupt handler which checks for LANCE
- *                  Errors, handles transmit and receive interrupts
- *
- * Parameters     : I : int irq, void *dev_id, struct pt_regs * regs -
- * Return Value   : None
- * Errors         : None
- * Globals        : None
- * Side Effects   : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static irqreturn_t SK_interrupt(int irq, void *dev_id, struct pt_regs * regs)
-{
-    int csr0;
-    struct net_device *dev = dev_id;
-    struct priv *p = netdev_priv(dev);
-
-
-    PRINTK2(("## %s: SK_interrupt(). status: %#06x\n", 
-            SK_NAME, SK_read_reg(CSR0)));
-
-    if (dev == NULL)
-    {
-        printk("SK_interrupt(): IRQ %d for unknown device.\n", irq);
-    }
-    
-    spin_lock (&SK_lock);
-
-    csr0 = SK_read_reg(CSR0);      /* store register for checking */
-
-    /* 
-     * Acknowledge all of the current interrupt sources, disable      
-     * Interrupts (INEA = 0) 
-     */
-
-    SK_write_reg(CSR0, csr0 & CSR0_CLRALL); 
-
-    if (csr0 & CSR0_ERR) /* LANCE Error */
-    {
-        printk("%s: error: %04x\n", dev->name, csr0);
-      
-        if (csr0 & CSR0_MISS)      /* No place to store packet ? */
-        { 
-            p->stats.rx_dropped++;
-        }
-    }
-
-    if (csr0 & CSR0_RINT)          /* Receive Interrupt (packet arrived) */ 
-    {
-        SK_rxintr(dev); 
-    }
-
-    if (csr0 & CSR0_TINT)          /* Transmit interrupt (packet sent) */
-    {
-        SK_txintr(dev);
-    }
-
-    SK_write_reg(CSR0, CSR0_INEA); /* Enable Interrupts */
-
-    spin_unlock (&SK_lock);
-    return IRQ_HANDLED;
-} /* End of SK_interrupt() */ 
-
-
-/*-
- * Function       : SK_txintr
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/27
- *
- * Description    : After sending a packet we check status, update
- *                  statistics and relinquish ownership of transmit 
- *                  descriptor ring.
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- * Return Value   : None
- * Errors         : None
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static void SK_txintr(struct net_device *dev)
-{
-    int tmdstat;
-    struct tmd *tmdp;
-    struct priv *p = netdev_priv(dev);
-
-
-    PRINTK2(("## %s: SK_txintr() status: %#06x\n", 
-            SK_NAME, SK_read_reg(CSR0)));
-
-    tmdp = p->tmdhead + p->tmdlast;     /* Which buffer we sent at last ? */
-
-    /* Set next buffer */
-    p->tmdlast++;
-    p->tmdlast &= TMDNUM-1;
-
-    tmdstat = readb(&tmdp->u.s.status);
-
-    /* 
-     * We check status of transmitted packet.
-     * see LANCE data-sheet for error explanation
-     */
-    if (tmdstat & TX_ERR) /* Error occurred */
-    {
-        int stat2 = readw(&tmdp->status2);
-
-        printk("%s: TX error: %04x %04x\n", dev->name, tmdstat, stat2);
-
-        if (stat2 & TX_TDR)    /* TDR problems? */
-        {
-            printk("%s: tdr-problems \n", dev->name);
-        }
-
-        if (stat2 & TX_RTRY)   /* Failed in 16 attempts to transmit ? */
-            p->stats.tx_aborted_errors++;   
-        if (stat2 & TX_LCOL)   /* Late collision ? */
-            p->stats.tx_window_errors++; 
-        if (stat2 & TX_LCAR)   /* Loss of Carrier ? */  
-            p->stats.tx_carrier_errors++;
-        if (stat2 & TX_UFLO)   /* Underflow error ? */
-        {
-            p->stats.tx_fifo_errors++;
-
-            /* 
-             * If UFLO error occurs it will turn transmitter of.
-             * So we must reinit LANCE
-             */
-
-            SK_lance_init(dev, MODE_NORMAL);
-        }
-        
-        p->stats.tx_errors++;
-
-        writew(0, &tmdp->status2);             /* Clear error flags */
-    }
-    else if (tmdstat & TX_MORE)        /* Collisions occurred ? */
-    {
-        /* 
-         * Here I have a problem.
-         * I only know that there must be one or up to 15 collisions.
-         * That's why TX_MORE is set, because after 16 attempts TX_RTRY
-         * will be set which means couldn't send packet aborted transfer.
-         *
-         * First I did not have this in but then I thought at minimum
-         * we see that something was not ok.
-         * If anyone knows something better than this to handle this
-         * please report it.
-         */ 
-
-        p->stats.collisions++; 
-    }
-    else   /* Packet sent without any problems */
-    {
-        p->stats.tx_packets++; 
-    }
-
-    /* 
-     * We mark transmitter not busy anymore, because now we have a free
-     * transmit descriptor which can be filled by SK_send_packet and
-     * afterwards sent by the LANCE
-     * 
-     * The function which do handle slow IRQ parts is do_bottom_half()
-     * which runs at normal kernel priority, that means all interrupt are
-     * enabled. (see kernel/irq.c)
-     *  
-     * net_bh does something like this:
-     *  - check if already in net_bh
-     *  - try to transmit something from the send queue
-     *  - if something is in the receive queue send it up to higher 
-     *    levels if it is a known protocol
-     *  - try to transmit something from the send queue
-     */
-
-    netif_wake_queue(dev);
-
-} /* End of SK_txintr() */
-
-
-/*-
- * Function       : SK_rxintr
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/27
- *
- * Description    : Buffer sent, check for errors, relinquish ownership
- *                  of the receive message descriptor. 
- *
- * Parameters     : I : SK_G16 device structure
- * Return Value   : None
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static void SK_rxintr(struct net_device *dev)
-{
-
-    struct rmd *rmdp;
-    int rmdstat;
-    struct priv *p = netdev_priv(dev);
-
-    PRINTK2(("## %s: SK_rxintr(). CSR0: %#06x\n", 
-            SK_NAME, SK_read_reg(CSR0)));
-
-    rmdp = p->rmdhead + p->rmdnum;
-
-    /* As long as we own the next entry, check status and send
-     * it up to higher layer 
-     */
-
-    while (!( (rmdstat = readb(&rmdp->u.s.status)) & RX_OWN))
-    {
-        /* 
-         * Start and end of packet must be set, because we use 
-         * the ethernet maximum packet length (1518) as buffer size.
-         * 
-         * Because our buffers are at maximum OFLO and BUFF errors are
-         * not to be concerned (see Data sheet)
-         */
-
-        if ((rmdstat & (RX_STP | RX_ENP)) != (RX_STP | RX_ENP))
-        {
-            /* Start of a frame > 1518 Bytes ? */
-
-            if (rmdstat & RX_STP) 
-            {
-                p->stats.rx_errors++;        /* bad packet received */
-                p->stats.rx_length_errors++; /* packet too long */
-
-                printk("%s: packet too long\n", dev->name);
-            }
-            
-            /* 
-             * All other packets will be ignored until a new frame with
-             * start (RX_STP) set follows.
-             * 
-             * What we do is just give descriptor free for new incoming
-             * packets. 
-             */
-
-            writeb(RX_OWN, &rmdp->u.s.status); /* Relinquish ownership to LANCE */ 
-
-        }
-        else if (rmdstat & RX_ERR)          /* Receive Error ? */
-        {
-            printk("%s: RX error: %04x\n", dev->name, (int) rmdstat);
-            
-            p->stats.rx_errors++;
-
-            if (rmdstat & RX_FRAM) p->stats.rx_frame_errors++;
-            if (rmdstat & RX_CRC)  p->stats.rx_crc_errors++;
-
-            writeb(RX_OWN, &rmdp->u.s.status); /* Relinquish ownership to LANCE */
-
-        }
-        else /* We have a packet which can be queued for the upper layers */
-        {
-
-            int len = readw(&rmdp->mlen) & 0x0fff;  /* extract message length from receive buffer */
-            struct sk_buff *skb;
-
-            skb = dev_alloc_skb(len+2); /* allocate socket buffer */ 
-
-            if (skb == NULL)                /* Could not get mem ? */
-            {
-    
-                /* 
-                 * Couldn't allocate sk_buffer so we give descriptor back
-                 * to Lance, update statistics and go ahead.
-                 */
-
-                writeb(RX_OWN, &rmdp->u.s.status); /* Relinquish ownership to LANCE */
-                printk("%s: Couldn't allocate sk_buff, deferring packet.\n",
-                       dev->name);
-                p->stats.rx_dropped++;
-
-                break;                      /* Jump out */
-            }
-            
-            /* Prepare sk_buff to queue for upper layers */
-
-            skb->dev = dev;
-            skb_reserve(skb,2);         /* Align IP header on 16 byte boundary */
-            
-            /* 
-             * Copy data out of our receive descriptor into sk_buff.
-             *
-             * (rmdp->u.buffer & 0x00ffffff) -> get address of buffer and 
-             * ignore status fields) 
-             */
-
-            memcpy_fromio(skb_put(skb,len), (rmdp->u.buffer & 0x00ffffff), len);
-
-
-            /* 
-             * Notify the upper protocol layers that there is another packet
-             * to handle
-             *
-             * netif_rx() always succeeds. see /net/inet/dev.c for more.
-             */
-
-            skb->protocol=eth_type_trans(skb,dev);
-            netif_rx(skb);                 /* queue packet and mark it for processing */
-           
-            /* 
-             * Packet is queued and marked for processing so we
-             * free our descriptor and update statistics 
-             */
-
-            writeb(RX_OWN, &rmdp->u.s.status);
-            dev->last_rx = jiffies;
-            p->stats.rx_packets++;
-            p->stats.rx_bytes += len;
-
-
-            p->rmdnum++;
-            p->rmdnum %= RMDNUM;
-
-            rmdp = p->rmdhead + p->rmdnum;
-        }
-    }
-} /* End of SK_rxintr() */
-
-
-/*-
- * Function       : SK_close
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : close gets called from dev_close() and should
- *                  deinstall the card (free_irq, mem etc).
- *
- * Parameters     : I : struct net_device *dev - our device structure
- * Return Value   : 0 - closed device driver
- * Errors         : None
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-/* I have tried to set BOOT_ROM on and RAM off but then, after a 'ifconfig
- * down' the system stops. So I don't shut set card to init state.
- */
-
-static int SK_close(struct net_device *dev)
-{
-
-    PRINTK(("## %s: SK_close(). CSR0: %#06x\n", 
-           SK_NAME, SK_read_reg(CSR0)));
-
-    netif_stop_queue(dev);         /* Transmitter busy */
-
-    printk("%s: Shutting %s down CSR0 %#06x\n", dev->name, SK_NAME, 
-           (int) SK_read_reg(CSR0));
-
-    SK_write_reg(CSR0, CSR0_STOP); /* STOP the LANCE */
-
-    free_irq(dev->irq, dev);      /* Free IRQ */
-
-    return 0; /* always succeed */
-    
-} /* End of SK_close() */
-
-
-/*-
- * Function       : SK_get_stats
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : Return current status structure to upper layers.
- *                  It is called by sprintf_stats (dev.c).
- *
- * Parameters     : I : struct net_device *dev   - our device structure
- * Return Value   : struct net_device_stats * - our current statistics
- * Errors         : None
- * Side Effects   : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-static struct net_device_stats *SK_get_stats(struct net_device *dev)
-{
-
-    struct priv *p = netdev_priv(dev);
-
-    PRINTK(("## %s: SK_get_stats(). CSR0: %#06x\n", 
-           SK_NAME, SK_read_reg(CSR0)));
-
-    return &p->stats;             /* Return Device status */
-
-} /* End of SK_get_stats() */
-
-
-/*-
- * Function       : set_multicast_list
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/26
- *
- * Description    : This function gets called when a program performs
- *                  a SIOCSIFFLAGS call. Ifconfig does this if you call
- *                  'ifconfig [-]allmulti' which enables or disables the
- *                  Promiscuous mode.
- *                  Promiscuous mode is when the Network card accepts all
- *                  packets, not only the packets which match our MAC 
- *                  Address. It is useful for writing a network monitor,
- *                  but it is also a security problem. You have to remember
- *                  that all information on the net is not encrypted.
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device Structure
- * Return Value   : None
- * Errors         : None
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
- *     95/10/18  ACox  New multicast calling scheme
--*/
-
-
-/* Set or clear the multicast filter for SK_G16.
- */
-
-static void set_multicast_list(struct net_device *dev)
-{
-
-    if (dev->flags&IFF_PROMISC)
-    {
-        /* Reinitialize LANCE with MODE_PROM set */
-        SK_lance_init(dev, MODE_PROM);
-    }
-    else if (dev->mc_count==0 && !(dev->flags&IFF_ALLMULTI))
-    {
-        /* Reinitialize LANCE without MODE_PROM */
-        SK_lance_init(dev, MODE_NORMAL);
-    }
-    else
-    {
-        /* Multicast with logical address filter on */
-        /* Reinitialize LANCE without MODE_PROM */
-        SK_lance_init(dev, MODE_NORMAL);
-        
-        /* Not implemented yet. */
-    }
-} /* End of set_multicast_list() */
-
-
-
-/*-
- * Function       : SK_rom_addr
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/06/01
- *
- * Description    : Try to find a Boot_ROM at all possible locations
- *
- * Parameters     : None
- * Return Value   : Address where Boot_ROM is
- * Errors         : 0 - Did not find Boot_ROM
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-unsigned int __init SK_rom_addr(void)
-{
-    int i,j;
-    int rom_found = 0;
-    unsigned int rom_location[] = SK_BOOT_ROM_LOCATIONS;
-    unsigned char rom_id[] = SK_BOOT_ROM_ID;
-    unsigned char test_byte;
-
-    /* Autodetect Boot_ROM */
-    PRINTK(("## %s: Autodetection of Boot_ROM\n", SK_NAME));
-
-    for (i = 0; (rom_location[i] != 0) && (rom_found == 0); i++)
-    {
-        
-        PRINTK(("##   Trying ROM location %#08x", rom_location[i]));
-        
-        rom_found = 1; 
-        for (j = 0; j < 6; j++)
-        {
-            test_byte = readb(rom_location[i]+j);
-            PRINTK((" %02x ", *test_byte));
-
-            if(test_byte != rom_id[j])
-            {
-                rom_found = 0;
-            } 
-        }
-        PRINTK(("\n"));
-    }
-
-    if (rom_found == 1)
-    {
-        PRINTK(("## %s: Boot_ROM found at %#08x\n", 
-               SK_NAME, rom_location[(i-1)]));
-
-        return (rom_location[--i]);
-    }
-    else
-    {
-        PRINTK(("%s: No Boot_ROM found\n", SK_NAME));
-        return 0;
-    }
-} /* End of SK_rom_addr() */
-
-
-
-/* LANCE access functions 
- *
- * ! CSR1-3 can only be accessed when in CSR0 the STOP bit is set !
- */
-
-
-/*-
- * Function       : SK_reset_board
- *
- * Author         : Patrick J.D. Weichmann
- *
- * Date Created   : 94/05/25
- *
- * Description    : This function resets SK_G16 and all components, but
- *                  POS registers are not changed
- *
- * Parameters     : None
- * Return Value   : None
- * Errors         : None
- * Globals        : SK_RAM *board - SK_RAM structure pointer
- *
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void SK_reset_board(void)
-{
-    writeb(0x00, SK_PORT);       /* Reset active */
-    mdelay(5);                /* Delay min 5ms */
-    writeb(SK_RESET, SK_PORT);   /* Set back to normal operation */
-
-} /* End of SK_reset_board() */
-
-
-/*-
- * Function       : SK_set_RAP
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/25
- *
- * Description    : Set LANCE Register Address Port to register
- *                  for later data transfer.
- *
- * Parameters     : I : reg_number - which CSR to read/write from/to
- * Return Value   : None
- * Errors         : None
- * Globals        : SK_RAM *board - SK_RAM structure pointer
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void SK_set_RAP(int reg_number)
-{
-    writew(reg_number, SK_IOREG);
-    writeb(SK_RESET | SK_RAP | SK_WREG, SK_PORT);
-    writeb(SK_DOIO, SK_IOCOM);
-
-    while (readb(SK_PORT) & SK_IORUN) 
-        barrier();
-} /* End of SK_set_RAP() */
-
-
-/*-
- * Function       : SK_read_reg
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/25
- *
- * Description    : Set RAP and read data from a LANCE CSR register
- *
- * Parameters     : I : reg_number - which CSR to read from
- * Return Value   : Register contents
- * Errors         : None
- * Globals        : SK_RAM *board - SK_RAM structure pointer
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-int SK_read_reg(int reg_number)
-{
-    SK_set_RAP(reg_number);
-
-    writeb(SK_RESET | SK_RDATA | SK_RREG, SK_PORT);
-    writeb(SK_DOIO, SK_IOCOM);
-
-    while (readb(SK_PORT) & SK_IORUN)
-        barrier();
-    return (readw(SK_IOREG));
-
-} /* End of SK_read_reg() */
-
-
-/*-
- * Function       : SK_rread_reg
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/28
- *
- * Description    : Read data from preseted register.
- *                  This function requires that you know which
- *                  Register is actually set. Be aware that CSR1-3
- *                  can only be accessed when in CSR0 STOP is set.
- *
- * Return Value   : Register contents
- * Errors         : None
- * Globals        : SK_RAM *board - SK_RAM structure pointer
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-int SK_rread_reg(void)
-{
-    writeb(SK_RESET | SK_RDATA | SK_RREG, SK_PORT);
-
-    writeb(SK_DOIO, SK_IOCOM);
-
-    while (readb(SK_PORT) & SK_IORUN)
-        barrier();
-    return (readw(SK_IOREG));
-
-} /* End of SK_rread_reg() */
-
-
-/*-
- * Function       : SK_write_reg
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/25
- *
- * Description    : This function sets the RAP then fills in the
- *                  LANCE I/O Reg and starts Transfer to LANCE.
- *                  It waits until transfer has ended which is max. 7 ms
- *                  and then it returns.
- *
- * Parameters     : I : reg_number - which CSR to write to
- *                  I : value      - what value to fill into register 
- * Return Value   : None
- * Errors         : None
- * Globals        : SK_RAM *board - SK_RAM structure pointer
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void SK_write_reg(int reg_number, int value)
-{
-    SK_set_RAP(reg_number);
-
-    writew(value, SK_IOREG);
-    writeb(SK_RESET | SK_RDATA | SK_WREG, SK_PORT);
-    writeb(SK_DOIO, SK_IOCOM);
-
-    while (readb(SK_PORT) & SK_IORUN)
-        barrier();
-} /* End of SK_write_reg */
-
-
-
-/* 
- * Debugging functions
- * -------------------
- */
-
-/*-
- * Function       : SK_print_pos
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/25
- *
- * Description    : This function prints out the 4 POS (Programmable
- *                  Option Select) Registers. Used mainly to debug operation.
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- *                  I : char * - Text which will be printed as title
- * Return Value   : None
- * Errors         : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void SK_print_pos(struct net_device *dev, char *text)
-{
-    int ioaddr = dev->base_addr;
-
-    unsigned char pos0 = inb(SK_POS0),
-                  pos1 = inb(SK_POS1),
-                  pos2 = inb(SK_POS2),
-                  pos3 = inb(SK_POS3),
-                  pos4 = inb(SK_POS4);
-
-
-    printk("## %s: %s.\n"
-           "##   pos0=%#4x pos1=%#4x pos2=%#04x pos3=%#08x pos4=%#04x\n",
-           SK_NAME, text, pos0, pos1, pos2, (pos3<<14), pos4);
-
-} /* End of SK_print_pos() */
-
-
-
-/*-
- * Function       : SK_print_dev
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/05/25
- *
- * Description    : This function simply prints out the important fields
- *                  of the device structure.
- *
- * Parameters     : I : struct net_device *dev  - SK_G16 device structure
- *                  I : char *text - Title for printing
- * Return Value   : None
- * Errors         : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void SK_print_dev(struct net_device *dev, char *text)
-{
-    if (dev == NULL)
-    {
-        printk("## %s: Device Structure. %s\n", SK_NAME, text);
-        printk("## DEVICE == NULL\n");
-    }
-    else
-    {
-        printk("## %s: Device Structure. %s\n", SK_NAME, text);
-        printk("## Device Name: %s Base Address: %#06lx IRQ: %d\n", 
-               dev->name, dev->base_addr, dev->irq);
-               
-        printk("## next device: %#08x init function: %#08x\n", 
-              (int) dev->next, (int) dev->init);
-    }
-
-} /* End of SK_print_dev() */
-
-
-
-/*-
- * Function       : SK_print_ram
- * Author         : Patrick J.D. Weichmann
- * Date Created   : 94/06/02
- *
- * Description    : This function is used to check how are things set up
- *                  in the 16KB RAM. Also the pointers to the receive and 
- *                  transmit descriptor rings and rx and tx buffers locations.
- *                  It contains a minor bug in printing, but has no effect to the values
- *                  only newlines are not correct.
- *
- * Parameters     : I : struct net_device *dev - SK_G16 device structure
- * Return Value   : None
- * Errors         : None
- * Globals        : None
- * Update History :
- *     YY/MM/DD  uid  Description
--*/
-
-void __init SK_print_ram(struct net_device *dev)
-{
-
-    int i;    
-    struct priv *p = netdev_priv(dev);
-
-    printk("## %s: RAM Details.\n"
-           "##   RAM at %#08x tmdhead: %#08x rmdhead: %#08x initblock: %#08x\n",
-           SK_NAME, 
-           (unsigned int) p->ram,
-           (unsigned int) p->tmdhead, 
-           (unsigned int) p->rmdhead, 
-           (unsigned int) &(p->ram)->ib);
-           
-    printk("##   ");
-
-    for(i = 0; i < TMDNUM; i++)
-    {
-           if (!(i % 3)) /* Every third line do a newline */
-           {
-               printk("\n##   ");
-           }
-        printk("tmdbufs%d: %#08x ", (i+1), (int) p->tmdbufs[i]);
-    }
-    printk("##   ");
-
-    for(i = 0; i < RMDNUM; i++)
-    {
-         if (!(i % 3)) /* Every third line do a newline */
-           {
-               printk("\n##   ");
-           }
-        printk("rmdbufs%d: %#08x ", (i+1), (int) p->rmdbufs[i]);
-    } 
-    printk("\n");
-
-} /* End of SK_print_ram() */
-
diff --git a/drivers/net/sk_g16.h b/drivers/net/sk_g16.h
deleted file mode 100644
index 0a5dc0908a04..000000000000
--- a/drivers/net/sk_g16.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- * Module         : sk_g16.h
- * Version        : $Revision$  
- *
- * Author         : M.Hipp (mhipp@student.uni-tuebingen.de)
- * changes by     : Patrick J.D. Weichmann
- *
- * Date Created   : 94/05/25
- *
- * Description    : In here are all necessary definitions of  
- *                  the am7990 (LANCE) chip used for writing a
- *                  network device driver which uses this chip 
- *
- * $Log$
--*/
-
-#ifndef SK_G16_H
-
-#define SK_G16_H
-
-
-/*
- *      Control and Status Register 0 (CSR0) bit definitions
- *
- * (R=Readable) (W=Writeable) (S=Set on write) (C-Clear on write)
- *
- */
-
-#define CSR0_ERR        0x8000  /* Error summary (R) */
-#define CSR0_BABL       0x4000  /* Babble transmitter timeout error (RC) */
-#define CSR0_CERR       0x2000  /* Collision Error (RC) */
-#define CSR0_MISS       0x1000  /* Missed packet (RC) */
-#define CSR0_MERR       0x0800  /* Memory Error  (RC) */ 
-#define CSR0_RINT       0x0400  /* Receiver Interrupt (RC) */
-#define CSR0_TINT       0x0200  /* Transmit Interrupt (RC) */ 
-#define CSR0_IDON       0x0100  /* Initialization Done (RC) */
-#define CSR0_INTR       0x0080  /* Interrupt Flag (R) */
-#define CSR0_INEA       0x0040  /* Interrupt Enable (RW) */
-#define CSR0_RXON       0x0020  /* Receiver on (R) */
-#define CSR0_TXON       0x0010  /* Transmitter on (R) */
-#define CSR0_TDMD       0x0008  /* Transmit Demand (RS) */
-#define CSR0_STOP       0x0004  /* Stop (RS) */
-#define CSR0_STRT       0x0002  /* Start (RS) */
-#define CSR0_INIT       0x0001  /* Initialize (RS) */
-
-#define CSR0_CLRALL     0x7f00  /* mask for all clearable bits */
-
-/*
- *    Control and Status Register 3 (CSR3) bit definitions
- *
- */
-
-#define CSR3_BSWAP      0x0004  /* Byte Swap (RW) */
-#define CSR3_ACON       0x0002  /* ALE Control (RW) */
-#define CSR3_BCON       0x0001  /* Byte Control (RW) */
-
-/*
- *      Initialization Block Mode operation Bit Definitions.
- */
-
-#define MODE_PROM       0x8000  /* Promiscuous Mode */
-#define MODE_INTL       0x0040  /* Internal Loopback */
-#define MODE_DRTY       0x0020  /* Disable Retry */ 
-#define MODE_COLL       0x0010  /* Force Collision */
-#define MODE_DTCR       0x0008  /* Disable Transmit CRC) */
-#define MODE_LOOP       0x0004  /* Loopback */
-#define MODE_DTX        0x0002  /* Disable the Transmitter */ 
-#define MODE_DRX        0x0001  /* Disable the Receiver */
-
-#define MODE_NORMAL     0x0000  /* Normal operation mode */
-
-/*
- *      Receive message descriptor status bit definitions.
- */
-
-#define RX_OWN          0x80    /* Owner bit 0 = host, 1 = lance */
-#define RX_ERR          0x40    /* Error Summary */
-#define RX_FRAM         0x20    /* Framing Error */
-#define RX_OFLO         0x10    /* Overflow Error */
-#define RX_CRC          0x08    /* CRC Error */ 
-#define RX_BUFF         0x04    /* Buffer Error */
-#define RX_STP          0x02    /* Start of Packet */
-#define RX_ENP          0x01    /* End of Packet */
-
-
-/*
- *      Transmit message descriptor status bit definitions.
- */
-
-#define TX_OWN          0x80    /* Owner bit 0 = host, 1 = lance */
-#define TX_ERR          0x40    /* Error Summary */
-#define TX_MORE         0x10    /* More the 1 retry needed to Xmit */
-#define TX_ONE          0x08    /* One retry needed to Xmit */
-#define TX_DEF          0x04    /* Deferred */
-#define TX_STP          0x02    /* Start of Packet */
-#define TX_ENP          0x01    /* End of Packet */
-
-/*
- *      Transmit status (2) (valid if TX_ERR == 1)
- */
-
-#define TX_BUFF         0x8000  /* Buffering error (no ENP) */
-#define TX_UFLO         0x4000  /* Underflow (late memory) */
-#define TX_LCOL         0x1000  /* Late collision */
-#define TX_LCAR         0x0400  /* Loss of Carrier */
-#define TX_RTRY         0x0200  /* Failed after 16 retransmissions  */
-#define TX_TDR          0x003f  /* Time-domain-reflectometer-value */
-
-
-/* 
- * Structures used for Communication with the LANCE 
- */
-
-/* LANCE Initialize Block */
-
-struct init_block 
-{
-  unsigned short mode;     /* Mode Register */
-  unsigned char  paddr[6]; /* Physical Address (MAC) */
-  unsigned char  laddr[8]; /* Logical Filter Address (not used) */
-  unsigned int   rdrp;     /* Receive Descriptor Ring pointer */
-  unsigned int   tdrp;     /* Transmit Descriptor Ring pointer */
-};
-
-
-/* Receive Message Descriptor Entry */
-
-struct rmd 
-{ 
-  union
-  {
-    unsigned long buffer;     /* Address of buffer */
-    struct 
-    {
-      unsigned char unused[3]; 
-      unsigned volatile char status;   /* Status Bits */
-    } s;
-  } u;
-  volatile short blen;        /* Buffer Length (two's complement) */
-  unsigned short mlen;        /* Message Byte Count */
-};
-
-
-/* Transmit Message Descriptor Entry */
-
-struct tmd   
-{
-  union 
-  {
-    unsigned long  buffer;    /* Address of buffer */
-    struct 
-    {
-      unsigned char unused[3];
-      unsigned volatile char status;   /* Status Bits */
-    } s;
-  } u;
-  unsigned short blen;             /* Buffer Length (two's complement) */
-  unsigned volatile short status2; /* Error Status Bits */
-};
-
-#endif /* End of SK_G16_H */
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
new file mode 100644
index 000000000000..30e8d589d167
--- /dev/null
+++ b/drivers/net/skge.c
@@ -0,0 +1,3386 @@
+/*
+ * New driver for Marvell Yukon chipset and SysKonnect Gigabit
+ * Ethernet adapters. Based on earlier sk98lin, e100 and
+ * FreeBSD if_sk drivers.
+ *
+ * This driver intentionally does not support all the features
+ * of the original driver such as link fail-over and link management because
+ * those should be done at higher levels.
+ *
+ * Copyright (C) 2004, Stephen Hemminger <shemminger@osdl.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 program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/if_vlan.h>
+#include <linux/ip.h>
+#include <linux/delay.h>
+#include <linux/crc32.h>
+#include <linux/dma-mapping.h>
+#include <asm/irq.h>
+
+#include "skge.h"
+
+#define DRV_NAME                "skge"
+#define DRV_VERSION             "0.6"
+#define PFX                     DRV_NAME " "
+
+#define DEFAULT_TX_RING_SIZE    128
+#define DEFAULT_RX_RING_SIZE    512
+#define MAX_TX_RING_SIZE        1024
+#define MAX_RX_RING_SIZE        4096
+#define PHY_RETRIES             1000
+#define ETH_JUMBO_MTU           9000
+#define TX_WATCHDOG             (5 * HZ)
+#define NAPI_WEIGHT             64
+#define BLINK_HZ                (HZ/4)
+#define LINK_POLL_HZ            (HZ/10)
+
+MODULE_DESCRIPTION("SysKonnect Gigabit Ethernet driver");
+MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+
+static const u32 default_msg
+        = NETIF_MSG_DRV| NETIF_MSG_PROBE| NETIF_MSG_LINK
+          | NETIF_MSG_IFUP| NETIF_MSG_IFDOWN;
+
+static int debug = -1;  /* defaults above */
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+
+static const struct pci_device_id skge_id_table[] = {
+        { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C940B,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_SYSKONNECT, 0x9E00, /* SK-9Exx  */
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_MARVELL, 0x4320, /* Gigabit Ethernet Controller */
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_MARVELL, 0x5005, /* Marvell (11ab), Belkin */
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1032,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { PCI_VENDOR_ID_LINKSYS, PCI_DEVICE_ID_LINKSYS_EG1064,
+          PCI_ANY_ID, PCI_ANY_ID },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, skge_id_table);
+
+static int skge_up(struct net_device *dev);
+static int skge_down(struct net_device *dev);
+static void skge_tx_clean(struct skge_port *skge);
+static void skge_xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+static void skge_gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+static void genesis_get_stats(struct skge_port *skge, u64 *data);
+static void yukon_get_stats(struct skge_port *skge, u64 *data);
+static void yukon_init(struct skge_hw *hw, int port);
+static void yukon_reset(struct skge_hw *hw, int port);
+static void genesis_mac_init(struct skge_hw *hw, int port);
+static void genesis_reset(struct skge_hw *hw, int port);
+
+static const int txqaddr[] = { Q_XA1, Q_XA2 };
+static const int rxqaddr[] = { Q_R1, Q_R2 };
+static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F };
+static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
+
+/* Don't need to look at whole 16K.
+ * last interesting register is descriptor poll timer.
+ */
+#define SKGE_REGS_LEN   (29*128)
+
+static int skge_get_regs_len(struct net_device *dev)
+{
+        return SKGE_REGS_LEN;
+}
+
+/*
+ * Returns copy of control register region
+ * I/O region is divided into banks and certain regions are unreadable
+ */
+static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                          void *p)
+{
+        const struct skge_port *skge = netdev_priv(dev);
+        unsigned long offs;
+        const void __iomem *io = skge->hw->regs;
+        static const unsigned long bankmap
+                = (1<<0) | (1<<2) | (1<<8) | (1<<9)
+                  | (1<<12) | (1<<13) | (1<<14) | (1<<15) | (1<<16)
+                  | (1<<17) | (1<<20) | (1<<21) | (1<<22) | (1<<23)
+                  | (1<<24)  | (1<<25) | (1<<26) | (1<<27) | (1<<28);
+
+        regs->version = 1;
+        for (offs = 0; offs < regs->len; offs += 128) {
+                u32 len = min_t(u32, 128, regs->len - offs);
+
+                if (bankmap & (1<<(offs/128)))
+                        memcpy_fromio(p + offs, io + offs, len);
+                else
+                        memset(p + offs, 0, len);
+        }
+}
+
+/* Wake on Lan only supported on Yukon chps with rev 1 or above */
+static int wol_supported(const struct skge_hw *hw)
+{
+        return !((hw->chip_id == CHIP_ID_GENESIS ||
+                  (hw->chip_id == CHIP_ID_YUKON && chip_rev(hw) == 0)));
+}
+
+static void skge_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        wol->supported = wol_supported(skge->hw) ? WAKE_MAGIC : 0;
+        wol->wolopts = skge->wol ? WAKE_MAGIC : 0;
+}
+
+static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+
+        if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
+                return -EOPNOTSUPP;
+
+        if (wol->wolopts == WAKE_MAGIC && !wol_supported(hw))
+                return -EOPNOTSUPP;
+
+        skge->wol = wol->wolopts == WAKE_MAGIC;
+
+        if (skge->wol) {
+                memcpy_toio(hw->regs + WOL_MAC_ADDR, dev->dev_addr, ETH_ALEN);
+
+                skge_write16(hw, WOL_CTRL_STAT,
+                             WOL_CTL_ENA_PME_ON_MAGIC_PKT |
+                             WOL_CTL_ENA_MAGIC_PKT_UNIT);
+        } else
+                skge_write16(hw, WOL_CTRL_STAT, WOL_CTL_DEFAULT);
+
+        return 0;
+}
+
+
+static int skge_get_settings(struct net_device *dev,
+                             struct ethtool_cmd *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+
+        ecmd->transceiver = XCVR_INTERNAL;
+
+        if (iscopper(hw)) {
+                if (hw->chip_id == CHIP_ID_GENESIS)
+                        ecmd->supported = SUPPORTED_1000baseT_Full
+                                | SUPPORTED_1000baseT_Half
+                                | SUPPORTED_Autoneg | SUPPORTED_TP;
+                else {
+                        ecmd->supported = SUPPORTED_10baseT_Half
+                                | SUPPORTED_10baseT_Full
+                                | SUPPORTED_100baseT_Half
+                                | SUPPORTED_100baseT_Full
+                                | SUPPORTED_1000baseT_Half
+                                | SUPPORTED_1000baseT_Full
+                                | SUPPORTED_Autoneg| SUPPORTED_TP;
+
+                        if (hw->chip_id == CHIP_ID_YUKON)
+                                ecmd->supported &= ~SUPPORTED_1000baseT_Half;
+
+                        else if (hw->chip_id == CHIP_ID_YUKON_FE)
+                                ecmd->supported &= ~(SUPPORTED_1000baseT_Half
+                                                     | SUPPORTED_1000baseT_Full);
+                }
+
+                ecmd->port = PORT_TP;
+                ecmd->phy_address = hw->phy_addr;
+        } else {
+                ecmd->supported = SUPPORTED_1000baseT_Full
+                        | SUPPORTED_FIBRE
+                        | SUPPORTED_Autoneg;
+
+                ecmd->port = PORT_FIBRE;
+        }
+
+        ecmd->advertising = skge->advertising;
+        ecmd->autoneg = skge->autoneg;
+        ecmd->speed = skge->speed;
+        ecmd->duplex = skge->duplex;
+        return 0;
+}
+
+static u32 skge_modes(const struct skge_hw *hw)
+{
+        u32 modes = ADVERTISED_Autoneg
+                | ADVERTISED_1000baseT_Full | ADVERTISED_1000baseT_Half
+                | ADVERTISED_100baseT_Full | ADVERTISED_100baseT_Half
+                | ADVERTISED_10baseT_Full | ADVERTISED_10baseT_Half;
+
+        if (iscopper(hw)) {
+                modes |= ADVERTISED_TP;
+                switch(hw->chip_id) {
+                case CHIP_ID_GENESIS:
+                        modes &= ~(ADVERTISED_100baseT_Full
+                                   | ADVERTISED_100baseT_Half
+                                   | ADVERTISED_10baseT_Full
+                                   | ADVERTISED_10baseT_Half);
+                        break;
+
+                case CHIP_ID_YUKON:
+                        modes &= ~ADVERTISED_1000baseT_Half;
+                        break;
+
+                case CHIP_ID_YUKON_FE:
+                        modes &= ~(ADVERTISED_1000baseT_Half|ADVERTISED_1000baseT_Full);
+                        break;
+                }
+        } else {
+                modes |= ADVERTISED_FIBRE;
+                modes &= ~ADVERTISED_1000baseT_Half;
+        }
+        return modes;
+}
+
+static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        const struct skge_hw *hw = skge->hw;
+
+        if (ecmd->autoneg == AUTONEG_ENABLE) {
+                if (ecmd->advertising & skge_modes(hw))
+                        return -EINVAL;
+        } else {
+                switch(ecmd->speed) {
+                case SPEED_1000:
+                        if (hw->chip_id == CHIP_ID_YUKON_FE)
+                                return -EINVAL;
+                        break;
+                case SPEED_100:
+                case SPEED_10:
+                        if (iscopper(hw) || hw->chip_id == CHIP_ID_GENESIS)
+                                return -EINVAL;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        }
+
+        skge->autoneg = ecmd->autoneg;
+        skge->speed = ecmd->speed;
+        skge->duplex = ecmd->duplex;
+        skge->advertising = ecmd->advertising;
+
+        if (netif_running(dev)) {
+                skge_down(dev);
+                skge_up(dev);
+        }
+        return (0);
+}
+
+static void skge_get_drvinfo(struct net_device *dev,
+                             struct ethtool_drvinfo *info)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->fw_version, "N/A");
+        strcpy(info->bus_info, pci_name(skge->hw->pdev));
+}
+
+static const struct skge_stat {
+        char       name[ETH_GSTRING_LEN];
+        u16        xmac_offset;
+        u16        gma_offset;
+} skge_stats[] = {
+        { "tx_bytes",           XM_TXO_OK_HI,  GM_TXO_OK_HI },
+        { "rx_bytes",           XM_RXO_OK_HI,  GM_RXO_OK_HI },
+
+        { "tx_broadcast",       XM_TXF_BC_OK,  GM_TXF_BC_OK },
+        { "rx_broadcast",       XM_RXF_BC_OK,  GM_RXF_BC_OK },
+        { "tx_multicast",       XM_TXF_MC_OK,  GM_TXF_MC_OK },
+        { "rx_multicast",       XM_RXF_MC_OK,  GM_RXF_MC_OK },
+        { "tx_unicast",         XM_TXF_UC_OK,  GM_TXF_UC_OK },
+        { "rx_unicast",         XM_RXF_UC_OK,  GM_RXF_UC_OK },
+        { "tx_mac_pause",       XM_TXF_MPAUSE, GM_TXF_MPAUSE },
+        { "rx_mac_pause",       XM_RXF_MPAUSE, GM_RXF_MPAUSE },
+
+        { "collisions",         XM_TXF_SNG_COL, GM_TXF_SNG_COL },
+        { "multi_collisions",   XM_TXF_MUL_COL, GM_TXF_MUL_COL },
+        { "aborted",            XM_TXF_ABO_COL, GM_TXF_ABO_COL },
+        { "late_collision",     XM_TXF_LAT_COL, GM_TXF_LAT_COL },
+        { "fifo_underrun",      XM_TXE_FIFO_UR, GM_TXE_FIFO_UR },
+        { "fifo_overflow",      XM_RXE_FIFO_OV, GM_RXE_FIFO_OV },
+
+        { "rx_toolong",         XM_RXF_LNG_ERR, GM_RXF_LNG_ERR },
+        { "rx_jabber",          XM_RXF_JAB_PKT, GM_RXF_JAB_PKT },
+        { "rx_runt",            XM_RXE_RUNT,    GM_RXE_FRAG },
+        { "rx_too_long",        XM_RXF_LNG_ERR, GM_RXF_LNG_ERR },
+        { "rx_fcs_error",       XM_RXF_FCS_ERR, GM_RXF_FCS_ERR },
+};
+
+static int skge_get_stats_count(struct net_device *dev)
+{
+        return ARRAY_SIZE(skge_stats);
+}
+
+static void skge_get_ethtool_stats(struct net_device *dev,
+                                   struct ethtool_stats *stats, u64 *data)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        if (skge->hw->chip_id == CHIP_ID_GENESIS)
+                genesis_get_stats(skge, data);
+        else
+                yukon_get_stats(skge, data);
+}
+
+/* Use hardware MIB variables for critical path statistics and
+ * transmit feedback not reported at interrupt.
+ * Other errors are accounted for in interrupt handler.
+ */
+static struct net_device_stats *skge_get_stats(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        u64 data[ARRAY_SIZE(skge_stats)];
+
+        if (skge->hw->chip_id == CHIP_ID_GENESIS)
+                genesis_get_stats(skge, data);
+        else
+                yukon_get_stats(skge, data);
+
+        skge->net_stats.tx_bytes = data[0];
+        skge->net_stats.rx_bytes = data[1];
+        skge->net_stats.tx_packets = data[2] + data[4] + data[6];
+        skge->net_stats.rx_packets = data[3] + data[5] + data[7];
+        skge->net_stats.multicast = data[5] + data[7];
+        skge->net_stats.collisions = data[10];
+        skge->net_stats.tx_aborted_errors = data[12];
+
+        return &skge->net_stats;
+}
+
+static void skge_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+{
+        int i;
+
+        switch(stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(skge_stats); i++)
+                        memcpy(data + i * ETH_GSTRING_LEN,
+                               skge_stats[i].name, ETH_GSTRING_LEN);
+                break;
+        }
+}
+
+static void skge_get_ring_param(struct net_device *dev,
+                                struct ethtool_ringparam *p)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        p->rx_max_pending = MAX_RX_RING_SIZE;
+        p->tx_max_pending = MAX_TX_RING_SIZE;
+        p->rx_mini_max_pending = 0;
+        p->rx_jumbo_max_pending = 0;
+
+        p->rx_pending = skge->rx_ring.count;
+        p->tx_pending = skge->tx_ring.count;
+        p->rx_mini_pending = 0;
+        p->rx_jumbo_pending = 0;
+}
+
+static int skge_set_ring_param(struct net_device *dev,
+                               struct ethtool_ringparam *p)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||
+            p->tx_pending == 0 || p->tx_pending > MAX_TX_RING_SIZE)
+                return -EINVAL;
+
+        skge->rx_ring.count = p->rx_pending;
+        skge->tx_ring.count = p->tx_pending;
+
+        if (netif_running(dev)) {
+                skge_down(dev);
+                skge_up(dev);
+        }
+
+        return 0;
+}
+
+static u32 skge_get_msglevel(struct net_device *netdev)
+{
+        struct skge_port *skge = netdev_priv(netdev);
+        return skge->msg_enable;
+}
+
+static void skge_set_msglevel(struct net_device *netdev, u32 value)
+{
+        struct skge_port *skge = netdev_priv(netdev);
+        skge->msg_enable = value;
+}
+
+static int skge_nway_reset(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        if (skge->autoneg != AUTONEG_ENABLE || !netif_running(dev))
+                return -EINVAL;
+
+        spin_lock_bh(&hw->phy_lock);
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                genesis_reset(hw, port);
+                genesis_mac_init(hw, port);
+        } else {
+                yukon_reset(hw, port);
+                yukon_init(hw, port);
+        }
+        spin_unlock_bh(&hw->phy_lock);
+        return 0;
+}
+
+static int skge_set_sg(struct net_device *dev, u32 data)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+
+        if (hw->chip_id == CHIP_ID_GENESIS && data)
+                return -EOPNOTSUPP;
+        return ethtool_op_set_sg(dev, data);
+}
+
+static int skge_set_tx_csum(struct net_device *dev, u32 data)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+
+        if (hw->chip_id == CHIP_ID_GENESIS && data)
+                return -EOPNOTSUPP;
+
+        return ethtool_op_set_tx_csum(dev, data);
+}
+
+static u32 skge_get_rx_csum(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        return skge->rx_csum;
+}
+
+/* Only Yukon supports checksum offload. */
+static int skge_set_rx_csum(struct net_device *dev, u32 data)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        if (skge->hw->chip_id == CHIP_ID_GENESIS && data)
+                return -EOPNOTSUPP;
+
+        skge->rx_csum = data;
+        return 0;
+}
+
+/* Only Yukon II supports TSO (not implemented yet) */
+static int skge_set_tso(struct net_device *dev, u32 data)
+{
+        if (data)
+                return -EOPNOTSUPP;
+        return 0;
+}
+
+static void skge_get_pauseparam(struct net_device *dev,
+                                struct ethtool_pauseparam *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        ecmd->tx_pause = (skge->flow_control == FLOW_MODE_LOC_SEND)
+                || (skge->flow_control == FLOW_MODE_SYMMETRIC);
+        ecmd->rx_pause = (skge->flow_control == FLOW_MODE_REM_SEND)
+                || (skge->flow_control == FLOW_MODE_SYMMETRIC);
+
+        ecmd->autoneg = skge->autoneg;
+}
+
+static int skge_set_pauseparam(struct net_device *dev,
+                               struct ethtool_pauseparam *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        skge->autoneg = ecmd->autoneg;
+        if (ecmd->rx_pause && ecmd->tx_pause)
+                skge->flow_control = FLOW_MODE_SYMMETRIC;
+        else if(ecmd->rx_pause && !ecmd->tx_pause)
+                skge->flow_control = FLOW_MODE_REM_SEND;
+        else if(!ecmd->rx_pause && ecmd->tx_pause)
+                skge->flow_control = FLOW_MODE_LOC_SEND;
+        else
+                skge->flow_control = FLOW_MODE_NONE;
+
+        if (netif_running(dev)) {
+                skge_down(dev);
+                skge_up(dev);
+        }
+        return 0;
+}
+
+/* Chip internal frequency for clock calculations */
+static inline u32 hwkhz(const struct skge_hw *hw)
+{
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                return 53215; /* or:  53.125 MHz */
+        else if (hw->chip_id == CHIP_ID_YUKON_EC)
+                return 125000; /* or: 125.000 MHz */
+        else
+                return 78215; /* or:  78.125 MHz */
+}
+
+/* Chip hz to microseconds */
+static inline u32 skge_clk2usec(const struct skge_hw *hw, u32 ticks)
+{
+        return (ticks * 1000) / hwkhz(hw);
+}
+
+/* Microseconds to chip hz */
+static inline u32 skge_usecs2clk(const struct skge_hw *hw, u32 usec)
+{
+        return hwkhz(hw) * usec / 1000;
+}
+
+static int skge_get_coalesce(struct net_device *dev,
+                             struct ethtool_coalesce *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        ecmd->rx_coalesce_usecs = 0;
+        ecmd->tx_coalesce_usecs = 0;
+
+        if (skge_read32(hw, B2_IRQM_CTRL) & TIM_START) {
+                u32 delay = skge_clk2usec(hw, skge_read32(hw, B2_IRQM_INI));
+                u32 msk = skge_read32(hw, B2_IRQM_MSK);
+
+                if (msk & rxirqmask[port])
+                        ecmd->rx_coalesce_usecs = delay;
+                if (msk & txirqmask[port])
+                        ecmd->tx_coalesce_usecs = delay;
+        }
+
+        return 0;
+}
+
+/* Note: interrupt timer is per board, but can turn on/off per port */
+static int skge_set_coalesce(struct net_device *dev,
+                             struct ethtool_coalesce *ecmd)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        u32 msk = skge_read32(hw, B2_IRQM_MSK);
+        u32 delay = 25;
+
+        if (ecmd->rx_coalesce_usecs == 0)
+                msk &= ~rxirqmask[port];
+        else if (ecmd->rx_coalesce_usecs < 25 ||
+                 ecmd->rx_coalesce_usecs > 33333)
+                return -EINVAL;
+        else {
+                msk |= rxirqmask[port];
+                delay = ecmd->rx_coalesce_usecs;
+        }
+
+        if (ecmd->tx_coalesce_usecs == 0)
+                msk &= ~txirqmask[port];
+        else if (ecmd->tx_coalesce_usecs < 25 ||
+                 ecmd->tx_coalesce_usecs > 33333)
+                return -EINVAL;
+        else {
+                msk |= txirqmask[port];
+                delay = min(delay, ecmd->rx_coalesce_usecs);
+        }
+
+        skge_write32(hw, B2_IRQM_MSK, msk);
+        if (msk == 0)
+                skge_write32(hw, B2_IRQM_CTRL, TIM_STOP);
+        else {
+                skge_write32(hw, B2_IRQM_INI, skge_usecs2clk(hw, delay));
+                skge_write32(hw, B2_IRQM_CTRL, TIM_START);
+        }
+        return 0;
+}
+
+static void skge_led_on(struct skge_hw *hw, int port)
+{
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_ON);
+                skge_write8(hw, B0_LED, LED_STAT_ON);
+
+                skge_write8(hw, SKGEMAC_REG(port, RX_LED_TST), LED_T_ON);
+                skge_write32(hw, SKGEMAC_REG(port, RX_LED_VAL), 100);
+                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_START);
+
+                switch (hw->phy_type) {
+                case SK_PHY_BCOM:
+                        skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL,
+                                          PHY_B_PEC_LED_ON);
+                        break;
+                case SK_PHY_LONE:
+                        skge_xm_phy_write(hw, port, PHY_LONE_LED_CFG,
+                                          0x0800);
+                        break;
+                default:
+                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_TST), LED_T_ON);
+                        skge_write32(hw, SKGEMAC_REG(port, TX_LED_VAL), 100);
+                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_START);
+                }
+        } else {
+                skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
+                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                                  PHY_M_LED_MO_DUP(MO_LED_ON)  |
+                                  PHY_M_LED_MO_10(MO_LED_ON)   |
+                                  PHY_M_LED_MO_100(MO_LED_ON)  |
+                                  PHY_M_LED_MO_1000(MO_LED_ON) |
+                                  PHY_M_LED_MO_RX(MO_LED_ON));
+        }
+}
+
+static void skge_led_off(struct skge_hw *hw, int port)
+{
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_OFF);
+                skge_write8(hw, B0_LED, LED_STAT_OFF);
+
+                skge_write32(hw, SKGEMAC_REG(port, RX_LED_VAL), 0);
+                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_T_OFF);
+
+                switch (hw->phy_type) {
+                case SK_PHY_BCOM:
+                        skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL,
+                                          PHY_B_PEC_LED_OFF);
+                        break;
+                case SK_PHY_LONE:
+                        skge_xm_phy_write(hw, port, PHY_LONE_LED_CFG,
+                                          PHY_L_LC_LEDT);
+                        break;
+                default:
+                        skge_write32(hw, SKGEMAC_REG(port, TX_LED_VAL), 0);
+                        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_T_OFF);
+                }
+        } else {
+                skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, 0);
+                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+                                  PHY_M_LED_MO_DUP(MO_LED_OFF)  |
+                                  PHY_M_LED_MO_10(MO_LED_OFF)   |
+                                  PHY_M_LED_MO_100(MO_LED_OFF)  |
+                                  PHY_M_LED_MO_1000(MO_LED_OFF) |
+                                  PHY_M_LED_MO_RX(MO_LED_OFF));
+        }
+}
+
+static void skge_blink_timer(unsigned long data)
+{
+        struct skge_port *skge = (struct skge_port *) data;
+        struct skge_hw *hw = skge->hw;
+        unsigned long flags;
+
+        spin_lock_irqsave(&hw->phy_lock, flags);
+        if (skge->blink_on)
+                skge_led_on(hw, skge->port);
+        else
+                skge_led_off(hw, skge->port);
+        spin_unlock_irqrestore(&hw->phy_lock, flags);
+
+        skge->blink_on = !skge->blink_on;
+        mod_timer(&skge->led_blink, jiffies + BLINK_HZ);
+}
+
+/* blink LED's for finding board */
+static int skge_phys_id(struct net_device *dev, u32 data)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
+                data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
+
+        /* start blinking */
+        skge->blink_on = 1;
+        mod_timer(&skge->led_blink, jiffies+1);
+
+        msleep_interruptible(data * 1000);
+        del_timer_sync(&skge->led_blink);
+
+        skge_led_off(skge->hw, skge->port);
+
+        return 0;
+}
+
+static struct ethtool_ops skge_ethtool_ops = {
+        .get_settings   = skge_get_settings,
+        .set_settings   = skge_set_settings,
+        .get_drvinfo    = skge_get_drvinfo,
+        .get_regs_len   = skge_get_regs_len,
+        .get_regs       = skge_get_regs,
+        .get_wol        = skge_get_wol,
+        .set_wol        = skge_set_wol,
+        .get_msglevel   = skge_get_msglevel,
+        .set_msglevel   = skge_set_msglevel,
+        .nway_reset     = skge_nway_reset,
+        .get_link       = ethtool_op_get_link,
+        .get_ringparam  = skge_get_ring_param,
+        .set_ringparam  = skge_set_ring_param,
+        .get_pauseparam = skge_get_pauseparam,
+        .set_pauseparam = skge_set_pauseparam,
+        .get_coalesce   = skge_get_coalesce,
+        .set_coalesce   = skge_set_coalesce,
+        .get_tso        = ethtool_op_get_tso,
+        .set_tso        = skge_set_tso,
+        .get_sg         = ethtool_op_get_sg,
+        .set_sg         = skge_set_sg,
+        .get_tx_csum    = ethtool_op_get_tx_csum,
+        .set_tx_csum    = skge_set_tx_csum,
+        .get_rx_csum    = skge_get_rx_csum,
+        .set_rx_csum    = skge_set_rx_csum,
+        .get_strings    = skge_get_strings,
+        .phys_id        = skge_phys_id,
+        .get_stats_count = skge_get_stats_count,
+        .get_ethtool_stats = skge_get_ethtool_stats,
+};
+
+/*
+ * Allocate ring elements and chain them together
+ * One-to-one association of board descriptors with ring elements
+ */
+static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u64 base)
+{
+        struct skge_tx_desc *d;
+        struct skge_element *e;
+        int i;
+
+        ring->start = kmalloc(sizeof(*e)*ring->count, GFP_KERNEL);
+        if (!ring->start)
+                return -ENOMEM;
+
+        for (i = 0, e = ring->start, d = vaddr; i < ring->count; i++, e++, d++) {
+                e->desc = d;
+                if (i == ring->count - 1) {
+                        e->next = ring->start;
+                        d->next_offset = base;
+                } else {
+                        e->next = e + 1;
+                        d->next_offset = base + (i+1) * sizeof(*d);
+                }
+        }
+        ring->to_use = ring->to_clean = ring->start;
+
+        return 0;
+}
+
+/* Setup buffer for receiving */
+static inline int skge_rx_alloc(struct skge_port *skge,
+                                struct skge_element *e)
+{
+        unsigned long bufsize = skge->netdev->mtu + ETH_HLEN; /* VLAN? */
+        struct skge_rx_desc *rd = e->desc;
+        struct sk_buff *skb;
+        u64 map;
+
+        skb = dev_alloc_skb(bufsize + NET_IP_ALIGN);
+        if (unlikely(!skb)) {
+                printk(KERN_DEBUG PFX "%s: out of memory for receive\n",
+                       skge->netdev->name);
+                return -ENOMEM;
+        }
+
+        skb->dev = skge->netdev;
+        skb_reserve(skb, NET_IP_ALIGN);
+
+        map = pci_map_single(skge->hw->pdev, skb->data, bufsize,
+                             PCI_DMA_FROMDEVICE);
+
+        rd->dma_lo = map;
+        rd->dma_hi = map >> 32;
+        e->skb = skb;
+        rd->csum1_start = ETH_HLEN;
+        rd->csum2_start = ETH_HLEN;
+        rd->csum1 = 0;
+        rd->csum2 = 0;
+
+        wmb();
+
+        rd->control = BMU_OWN | BMU_STF | BMU_IRQ_EOF | BMU_TCP_CHECK | bufsize;
+        pci_unmap_addr_set(e, mapaddr, map);
+        pci_unmap_len_set(e, maplen, bufsize);
+        return 0;
+}
+
+/* Free all unused buffers in receive ring, assumes receiver stopped */
+static void skge_rx_clean(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        struct skge_ring *ring = &skge->rx_ring;
+        struct skge_element *e;
+
+        for (e = ring->to_clean; e != ring->to_use; e = e->next) {
+                struct skge_rx_desc *rd = e->desc;
+                rd->control = 0;
+
+                pci_unmap_single(hw->pdev,
+                                 pci_unmap_addr(e, mapaddr),
+                                 pci_unmap_len(e, maplen),
+                                 PCI_DMA_FROMDEVICE);
+                dev_kfree_skb(e->skb);
+                e->skb = NULL;
+        }
+        ring->to_clean = e;
+}
+
+/* Allocate buffers for receive ring
+ * For receive: to_use   is refill location
+ *              to_clean is next received frame.
+ *
+ * if (to_use == to_clean)
+ *       then ring all frames in ring need buffers
+ * if (to_use->next == to_clean)
+ *       then ring all frames in ring have buffers
+ */
+static int skge_rx_fill(struct skge_port *skge)
+{
+        struct skge_ring *ring = &skge->rx_ring;
+        struct skge_element *e;
+        int ret = 0;
+
+        for (e = ring->to_use; e->next != ring->to_clean; e = e->next) {
+                if (skge_rx_alloc(skge, e)) {
+                        ret = 1;
+                        break;
+                }
+
+        }
+        ring->to_use = e;
+
+        return ret;
+}
+
+static void skge_link_up(struct skge_port *skge)
+{
+        netif_carrier_on(skge->netdev);
+        if (skge->tx_avail > MAX_SKB_FRAGS + 1)
+                netif_wake_queue(skge->netdev);
+
+        if (netif_msg_link(skge))
+                printk(KERN_INFO PFX
+                       "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",
+                       skge->netdev->name, skge->speed,
+                       skge->duplex == DUPLEX_FULL ? "full" : "half",
+                       (skge->flow_control == FLOW_MODE_NONE) ? "none" :
+                       (skge->flow_control == FLOW_MODE_LOC_SEND) ? "tx only" :
+                       (skge->flow_control == FLOW_MODE_REM_SEND) ? "rx only" :
+                       (skge->flow_control == FLOW_MODE_SYMMETRIC) ? "tx and rx" :
+                       "unknown");
+}
+
+static void skge_link_down(struct skge_port *skge)
+{
+        netif_carrier_off(skge->netdev);
+        netif_stop_queue(skge->netdev);
+
+        if (netif_msg_link(skge))
+                printk(KERN_INFO PFX "%s: Link is down.\n", skge->netdev->name);
+}
+
+static u16 skge_xm_phy_read(struct skge_hw *hw, int port,  u16 reg)
+{
+        int i;
+        u16 v;
+
+        skge_xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
+        v = skge_xm_read16(hw, port, XM_PHY_DATA);
+        if (hw->phy_type != SK_PHY_XMAC) {
+                for (i = 0; i < PHY_RETRIES; i++) {
+                        udelay(1);
+                        if (skge_xm_read16(hw, port, XM_MMU_CMD)
+                            & XM_MMU_PHY_RDY)
+                                goto ready;
+                }
+
+                printk(KERN_WARNING PFX "%s: phy read timed out\n",
+                       hw->dev[port]->name);
+                return 0;
+        ready:
+                v = skge_xm_read16(hw, port, XM_PHY_DATA);
+        }
+
+        return v;
+}
+
+static void skge_xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
+{
+        int i;
+
+        skge_xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
+        for (i = 0; i < PHY_RETRIES; i++) {
+                if (!(skge_xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
+                        goto ready;
+                cpu_relax();
+        }
+        printk(KERN_WARNING PFX "%s: phy write failed to come ready\n",
+               hw->dev[port]->name);
+
+
+ ready:
+        skge_xm_write16(hw, port, XM_PHY_DATA, val);
+        for (i = 0; i < PHY_RETRIES; i++) {
+                udelay(1);
+                if (!(skge_xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
+                        return;
+        }
+        printk(KERN_WARNING PFX "%s: phy write timed out\n",
+                       hw->dev[port]->name);
+}
+
+static void genesis_init(struct skge_hw *hw)
+{
+        /* set blink source counter */
+        skge_write32(hw, B2_BSC_INI, (SK_BLK_DUR * SK_FACT_53) / 100);
+        skge_write8(hw, B2_BSC_CTRL, BSC_START);
+
+        /* configure mac arbiter */
+        skge_write16(hw, B3_MA_TO_CTRL, MA_RST_CLR);
+
+        /* configure mac arbiter timeout values */
+        skge_write8(hw, B3_MA_TOINI_RX1, SK_MAC_TO_53);
+        skge_write8(hw, B3_MA_TOINI_RX2, SK_MAC_TO_53);
+        skge_write8(hw, B3_MA_TOINI_TX1, SK_MAC_TO_53);
+        skge_write8(hw, B3_MA_TOINI_TX2, SK_MAC_TO_53);
+
+        skge_write8(hw, B3_MA_RCINI_RX1, 0);
+        skge_write8(hw, B3_MA_RCINI_RX2, 0);
+        skge_write8(hw, B3_MA_RCINI_TX1, 0);
+        skge_write8(hw, B3_MA_RCINI_TX2, 0);
+
+        /* configure packet arbiter timeout */
+        skge_write16(hw, B3_PA_CTRL, PA_RST_CLR);
+        skge_write16(hw, B3_PA_TOINI_RX1, SK_PKT_TO_MAX);
+        skge_write16(hw, B3_PA_TOINI_TX1, SK_PKT_TO_MAX);
+        skge_write16(hw, B3_PA_TOINI_RX2, SK_PKT_TO_MAX);
+        skge_write16(hw, B3_PA_TOINI_TX2, SK_PKT_TO_MAX);
+}
+
+static void genesis_reset(struct skge_hw *hw, int port)
+{
+        int i;
+        u64 zero = 0;
+
+        /* reset the statistics module */
+        skge_xm_write32(hw, port, XM_GP_PORT, XM_GP_RES_STAT);
+        skge_xm_write16(hw, port, XM_IMSK, 0xffff);     /* disable XMAC IRQs */
+        skge_xm_write32(hw, port, XM_MODE, 0);          /* clear Mode Reg */
+        skge_xm_write16(hw, port, XM_TX_CMD, 0);        /* reset TX CMD Reg */
+        skge_xm_write16(hw, port, XM_RX_CMD, 0);        /* reset RX CMD Reg */
+
+        /* disable all PHY IRQs */
+        if  (hw->phy_type == SK_PHY_BCOM)
+                skge_xm_write16(hw, port, PHY_BCOM_INT_MASK, 0xffff);
+
+        skge_xm_outhash(hw, port, XM_HSM, (u8 *) &zero);
+        for (i = 0; i < 15; i++)
+                skge_xm_outaddr(hw, port, XM_EXM(i), (u8 *) &zero);
+        skge_xm_outhash(hw, port, XM_SRC_CHK, (u8 *) &zero);
+}
+
+
+static void genesis_mac_init(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        int i;
+        u32 r;
+        u16 id1;
+        u16 ctrl1, ctrl2, ctrl3, ctrl4, ctrl5;
+
+        /* magic workaround patterns for Broadcom */
+        static const struct {
+                u16 reg;
+                u16 val;
+        } A1hack[] = {
+                { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1104 },
+                { 0x17, 0x0013 }, { 0x15, 0x0404 }, { 0x17, 0x8006 },
+                { 0x15, 0x0132 }, { 0x17, 0x8006 }, { 0x15, 0x0232 },
+                { 0x17, 0x800D }, { 0x15, 0x000F }, { 0x18, 0x0420 },
+        }, C0hack[] = {
+                { 0x18, 0x0c20 }, { 0x17, 0x0012 }, { 0x15, 0x1204 },
+                { 0x17, 0x0013 }, { 0x15, 0x0A04 }, { 0x18, 0x0420 },
+        };
+
+
+        /* initialize Rx, Tx and Link LED */
+        skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_ON);
+        skge_write8(hw, SKGEMAC_REG(port, LNK_LED_REG), LINKLED_LINKSYNC_ON);
+
+        skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_START);
+        skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_START);
+
+        /* Unreset the XMAC. */
+        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+
+        /*
+         * Perform additional initialization for external PHYs,
+         * namely for the 1000baseTX cards that use the XMAC's
+         * GMII mode.
+         */
+        spin_lock_bh(&hw->phy_lock);
+        if (hw->phy_type != SK_PHY_XMAC) {
+                /* Take PHY out of reset. */
+                r = skge_read32(hw, B2_GP_IO);
+                if (port == 0)
+                        r |= GP_DIR_0|GP_IO_0;
+                else
+                        r |= GP_DIR_2|GP_IO_2;
+
+                skge_write32(hw, B2_GP_IO, r);
+                skge_read32(hw, B2_GP_IO);
+
+                /* Enable GMII mode on the XMAC. */
+                skge_xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD);
+
+                id1 = skge_xm_phy_read(hw, port, PHY_XMAC_ID1);
+
+                /* Optimize MDIO transfer by suppressing preamble. */
+                skge_xm_write16(hw, port, XM_MMU_CMD,
+                                skge_xm_read16(hw, port, XM_MMU_CMD)
+                                | XM_MMU_NO_PRE);
+
+                if (id1 == PHY_BCOM_ID1_C0) {
+                        /*
+                         * Workaround BCOM Errata for the C0 type.
+                         * Write magic patterns to reserved registers.
+                         */
+                        for (i = 0; i < ARRAY_SIZE(C0hack); i++)
+                                skge_xm_phy_write(hw, port,
+                                          C0hack[i].reg, C0hack[i].val);
+
+                } else if (id1 == PHY_BCOM_ID1_A1) {
+                        /*
+                         * Workaround BCOM Errata for the A1 type.
+                         * Write magic patterns to reserved registers.
+                         */
+                        for (i = 0; i < ARRAY_SIZE(A1hack); i++)
+                                skge_xm_phy_write(hw, port,
+                                          A1hack[i].reg, A1hack[i].val);
+                }
+
+                /*
+                 * Workaround BCOM Errata (#10523) for all BCom PHYs.
+                 * Disable Power Management after reset.
+                 */
+                r = skge_xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL);
+                skge_xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL, r | PHY_B_AC_DIS_PM);
+        }
+
+        /* Dummy read */
+        skge_xm_read16(hw, port, XM_ISRC);
+
+        r = skge_xm_read32(hw, port, XM_MODE);
+        skge_xm_write32(hw, port, XM_MODE, r|XM_MD_CSA);
+
+        /* We don't need the FCS appended to the packet. */
+        r = skge_xm_read16(hw, port, XM_RX_CMD);
+        skge_xm_write16(hw, port, XM_RX_CMD, r | XM_RX_STRIP_FCS);
+
+        /* We want short frames padded to 60 bytes. */
+        r = skge_xm_read16(hw, port, XM_TX_CMD);
+        skge_xm_write16(hw, port, XM_TX_CMD, r | XM_TX_AUTO_PAD);
+
+        /*
+         * Enable the reception of all error frames. This is is
+         * a necessary evil due to the design of the XMAC. The
+         * XMAC's receive FIFO is only 8K in size, however jumbo
+         * frames can be up to 9000 bytes in length. When bad
+         * frame filtering is enabled, the XMAC's RX FIFO operates
+         * in 'store and forward' mode. For this to work, the
+         * entire frame has to fit into the FIFO, but that means
+         * that jumbo frames larger than 8192 bytes will be
+         * truncated. Disabling all bad frame filtering causes
+         * the RX FIFO to operate in streaming mode, in which
+         * case the XMAC will start transfering frames out of the
+         * RX FIFO as soon as the FIFO threshold is reached.
+         */
+        r = skge_xm_read32(hw, port, XM_MODE);
+        skge_xm_write32(hw, port, XM_MODE,
+                     XM_MD_RX_CRCE|XM_MD_RX_LONG|XM_MD_RX_RUNT|
+                     XM_MD_RX_ERR|XM_MD_RX_IRLE);
+
+        skge_xm_outaddr(hw, port, XM_SA, hw->dev[port]->dev_addr);
+        skge_xm_outaddr(hw, port, XM_EXM(0), hw->dev[port]->dev_addr);
+
+        /*
+         * Bump up the transmit threshold. This helps hold off transmit
+         * underruns when we're blasting traffic from both ports at once.
+         */
+        skge_xm_write16(hw, port, XM_TX_THR, 512);
+
+        /* Configure MAC arbiter */
+        skge_write16(hw, B3_MA_TO_CTRL, MA_RST_CLR);
+
+        /* configure timeout values */
+        skge_write8(hw, B3_MA_TOINI_RX1, 72);
+        skge_write8(hw, B3_MA_TOINI_RX2, 72);
+        skge_write8(hw, B3_MA_TOINI_TX1, 72);
+        skge_write8(hw, B3_MA_TOINI_TX2, 72);
+
+        skge_write8(hw, B3_MA_RCINI_RX1, 0);
+        skge_write8(hw, B3_MA_RCINI_RX2, 0);
+        skge_write8(hw, B3_MA_RCINI_TX1, 0);
+        skge_write8(hw, B3_MA_RCINI_TX2, 0);
+
+        /* Configure Rx MAC FIFO */
+        skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_RST_CLR);
+        skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_ENA_TIM_PAT);
+        skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_ENA_OP_MD);
+
+        /* Configure Tx MAC FIFO */
+        skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_RST_CLR);
+        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_TX_CTRL_DEF);
+        skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_ENA_OP_MD);
+
+        if (hw->dev[port]->mtu > ETH_DATA_LEN) {
+                /* Enable frame flushing if jumbo frames used */
+                skge_write16(hw, SKGEMAC_REG(port,RX_MFF_CTRL1), MFF_ENA_FLUSH);
+        } else {
+                /* enable timeout timers if normal frames */
+                skge_write16(hw, B3_PA_CTRL,
+                             port == 0 ? PA_ENA_TO_TX1 : PA_ENA_TO_TX2);
+        }
+
+
+        r = skge_xm_read16(hw, port, XM_RX_CMD);
+        if (hw->dev[port]->mtu > ETH_DATA_LEN)
+                skge_xm_write16(hw, port, XM_RX_CMD, r | XM_RX_BIG_PK_OK);
+        else
+                skge_xm_write16(hw, port, XM_RX_CMD, r & ~(XM_RX_BIG_PK_OK));
+
+        switch (hw->phy_type) {
+        case SK_PHY_XMAC:
+                if (skge->autoneg == AUTONEG_ENABLE) {
+                        ctrl1 = PHY_X_AN_FD | PHY_X_AN_HD;
+
+                        switch (skge->flow_control) {
+                        case FLOW_MODE_NONE:
+                                ctrl1 |= PHY_X_P_NO_PAUSE;
+                                break;
+                        case FLOW_MODE_LOC_SEND:
+                                ctrl1 |= PHY_X_P_ASYM_MD;
+                                break;
+                        case FLOW_MODE_SYMMETRIC:
+                                ctrl1 |= PHY_X_P_SYM_MD;
+                                break;
+                        case FLOW_MODE_REM_SEND:
+                                ctrl1 |= PHY_X_P_BOTH_MD;
+                                break;
+                        }
+
+                        skge_xm_phy_write(hw, port, PHY_XMAC_AUNE_ADV, ctrl1);
+                        ctrl2 = PHY_CT_ANE | PHY_CT_RE_CFG;
+                } else {
+                        ctrl2 = 0;
+                        if (skge->duplex == DUPLEX_FULL)
+                                ctrl2 |= PHY_CT_DUP_MD;
+                }
+
+                skge_xm_phy_write(hw, port, PHY_XMAC_CTRL, ctrl2);
+                break;
+
+        case SK_PHY_BCOM:
+                ctrl1 = PHY_CT_SP1000;
+                ctrl2 = 0;
+                ctrl3 = PHY_SEL_TYPE;
+                ctrl4 = PHY_B_PEC_EN_LTR;
+                ctrl5 = PHY_B_AC_TX_TST;
+
+                if (skge->autoneg == AUTONEG_ENABLE) {
+                        /*
+                         * Workaround BCOM Errata #1 for the C5 type.
+                         * 1000Base-T Link Acquisition Failure in Slave Mode
+                         * Set Repeater/DTE bit 10 of the 1000Base-T Control Register
+                         */
+                        ctrl2 |= PHY_B_1000C_RD;
+                        if (skge->advertising & ADVERTISED_1000baseT_Half)
+                                ctrl2 |= PHY_B_1000C_AHD;
+                        if (skge->advertising & ADVERTISED_1000baseT_Full)
+                                ctrl2 |= PHY_B_1000C_AFD;
+
+                        /* Set Flow-control capabilities */
+                        switch (skge->flow_control) {
+                        case FLOW_MODE_NONE:
+                                ctrl3 |= PHY_B_P_NO_PAUSE;
+                                break;
+                        case FLOW_MODE_LOC_SEND:
+                                ctrl3 |= PHY_B_P_ASYM_MD;
+                                break;
+                        case FLOW_MODE_SYMMETRIC:
+                                ctrl3 |= PHY_B_P_SYM_MD;
+                                break;
+                        case FLOW_MODE_REM_SEND:
+                                ctrl3 |= PHY_B_P_BOTH_MD;
+                                break;
+                        }
+
+                        /* Restart Auto-negotiation */
+                        ctrl1 |= PHY_CT_ANE | PHY_CT_RE_CFG;
+                } else {
+                        if (skge->duplex == DUPLEX_FULL)
+                                ctrl1 |= PHY_CT_DUP_MD;
+
+                        ctrl2 |= PHY_B_1000C_MSE;       /* set it to Slave */
+                }
+
+                skge_xm_phy_write(hw, port, PHY_BCOM_1000T_CTRL, ctrl2);
+                skge_xm_phy_write(hw, port, PHY_BCOM_AUNE_ADV, ctrl3);
+
+                if (skge->netdev->mtu > ETH_DATA_LEN) {
+                        ctrl4 |= PHY_B_PEC_HIGH_LA;
+                        ctrl5 |= PHY_B_AC_LONG_PACK;
+
+                        skge_xm_phy_write(hw, port,PHY_BCOM_AUX_CTRL, ctrl5);
+                }
+
+                skge_xm_phy_write(hw, port, PHY_BCOM_P_EXT_CTRL, ctrl4);
+                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL, ctrl1);
+                break;
+        }
+        spin_unlock_bh(&hw->phy_lock);
+
+        /* Clear MIB counters */
+        skge_xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+        /* Clear two times according to Errata #3 */
+        skge_xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+
+        /* Start polling for link status */
+        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
+}
+
+static void genesis_stop(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        /* Clear Tx packet arbiter timeout IRQ */
+        skge_write16(hw, B3_PA_CTRL,
+                     port == 0 ? PA_CLR_TO_TX1 : PA_CLR_TO_TX2);
+
+        /*
+         * If the transfer stucks at the MAC the STOP command will not
+         * terminate if we don't flush the XMAC's transmit FIFO !
+         */
+        skge_xm_write32(hw, port, XM_MODE,
+                        skge_xm_read32(hw, port, XM_MODE)|XM_MD_FTF);
+
+
+        /* Reset the MAC */
+        skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1), MFF_SET_MAC_RST);
+
+        /* For external PHYs there must be special handling */
+        if (hw->phy_type != SK_PHY_XMAC) {
+                u32 reg = skge_read32(hw, B2_GP_IO);
+
+                if (port == 0) {
+                        reg |= GP_DIR_0;
+                        reg &= ~GP_IO_0;
+                } else {
+                        reg |= GP_DIR_2;
+                        reg &= ~GP_IO_2;
+                }
+                skge_write32(hw, B2_GP_IO, reg);
+                skge_read32(hw, B2_GP_IO);
+        }
+
+        skge_xm_write16(hw, port, XM_MMU_CMD,
+                        skge_xm_read16(hw, port, XM_MMU_CMD)
+                        & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
+
+        skge_xm_read16(hw, port, XM_MMU_CMD);
+}
+
+
+static void genesis_get_stats(struct skge_port *skge, u64 *data)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        int i;
+        unsigned long timeout = jiffies + HZ;
+
+        skge_xm_write16(hw, port,
+                        XM_STAT_CMD, XM_SC_SNP_TXC | XM_SC_SNP_RXC);
+
+        /* wait for update to complete */
+        while (skge_xm_read16(hw, port, XM_STAT_CMD)
+               & (XM_SC_SNP_TXC | XM_SC_SNP_RXC)) {
+                if (time_after(jiffies, timeout))
+                        break;
+                udelay(10);
+        }
+
+        /* special case for 64 bit octet counter */
+        data[0] = (u64) skge_xm_read32(hw, port, XM_TXO_OK_HI) << 32
+                | skge_xm_read32(hw, port, XM_TXO_OK_LO);
+        data[1] = (u64) skge_xm_read32(hw, port, XM_RXO_OK_HI) << 32
+                | skge_xm_read32(hw, port, XM_RXO_OK_LO);
+
+        for (i = 2; i < ARRAY_SIZE(skge_stats); i++)
+                data[i] = skge_xm_read32(hw, port, skge_stats[i].xmac_offset);
+}
+
+static void genesis_mac_intr(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        u16 status = skge_xm_read16(hw, port, XM_ISRC);
+
+        pr_debug("genesis_intr status %x\n", status);
+        if (hw->phy_type == SK_PHY_XMAC) {
+                /* LInk down, start polling for state change */
+                if (status & XM_IS_INP_ASS) {
+                        skge_xm_write16(hw, port, XM_IMSK,
+                                        skge_xm_read16(hw, port, XM_IMSK) | XM_IS_INP_ASS);
+                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
+                }
+                else if (status & XM_IS_AND)
+                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
+        }
+
+        if (status & XM_IS_TXF_UR) {
+                skge_xm_write32(hw, port, XM_MODE, XM_MD_FTF);
+                ++skge->net_stats.tx_fifo_errors;
+        }
+        if (status & XM_IS_RXF_OV) {
+                skge_xm_write32(hw, port, XM_MODE, XM_MD_FRF);
+                ++skge->net_stats.rx_fifo_errors;
+        }
+}
+
+static void skge_gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
+{
+        int i;
+
+        skge_gma_write16(hw, port, GM_SMI_DATA, val);
+        skge_gma_write16(hw, port, GM_SMI_CTRL,
+                         GM_SMI_CT_PHY_AD(hw->phy_addr) | GM_SMI_CT_REG_AD(reg));
+        for (i = 0; i < PHY_RETRIES; i++) {
+                udelay(1);
+
+                if (!(skge_gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY))
+                        break;
+        }
+}
+
+static u16 skge_gm_phy_read(struct skge_hw *hw, int port, u16 reg)
+{
+        int i;
+
+        skge_gma_write16(hw, port, GM_SMI_CTRL,
+                         GM_SMI_CT_PHY_AD(hw->phy_addr)
+                         | GM_SMI_CT_REG_AD(reg) | GM_SMI_CT_OP_RD);
+
+        for (i = 0; i < PHY_RETRIES; i++) {
+                udelay(1);
+                if (skge_gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_RD_VAL)
+                        goto ready;
+        }
+
+        printk(KERN_WARNING PFX "%s: phy read timeout\n",
+               hw->dev[port]->name);
+        return 0;
+ ready:
+        return skge_gma_read16(hw, port, GM_SMI_DATA);
+}
+
+static void genesis_link_down(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        pr_debug("genesis_link_down\n");
+
+        skge_xm_write16(hw, port, XM_MMU_CMD,
+                        skge_xm_read16(hw, port, XM_MMU_CMD)
+                        & ~(XM_MMU_ENA_RX | XM_MMU_ENA_TX));
+
+        /* dummy read to ensure writing */
+        (void) skge_xm_read16(hw, port, XM_MMU_CMD);
+
+        skge_link_down(skge);
+}
+
+static void genesis_link_up(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        u16 cmd;
+        u32 mode, msk;
+
+        pr_debug("genesis_link_up\n");
+        cmd = skge_xm_read16(hw, port, XM_MMU_CMD);
+
+        /*
+         * enabling pause frame reception is required for 1000BT
+         * because the XMAC is not reset if the link is going down
+         */
+        if (skge->flow_control == FLOW_MODE_NONE ||
+            skge->flow_control == FLOW_MODE_LOC_SEND)
+                cmd |= XM_MMU_IGN_PF;
+        else
+                /* Enable Pause Frame Reception */
+                cmd &= ~XM_MMU_IGN_PF;
+
+        skge_xm_write16(hw, port, XM_MMU_CMD, cmd);
+
+        mode = skge_xm_read32(hw, port, XM_MODE);
+        if (skge->flow_control == FLOW_MODE_SYMMETRIC ||
+            skge->flow_control == FLOW_MODE_LOC_SEND) {
+                /*
+                 * Configure Pause Frame Generation
+                 * Use internal and external Pause Frame Generation.
+                 * Sending pause frames is edge triggered.
+                 * Send a Pause frame with the maximum pause time if
+                 * internal oder external FIFO full condition occurs.
+                 * Send a zero pause time frame to re-start transmission.
+                 */
+                /* XM_PAUSE_DA = '010000C28001' (default) */
+                /* XM_MAC_PTIME = 0xffff (maximum) */
+                /* remember this value is defined in big endian (!) */
+                skge_xm_write16(hw, port, XM_MAC_PTIME, 0xffff);
+
+                mode |= XM_PAUSE_MODE;
+                skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_ENA_PAUSE);
+        } else {
+                /*
+                 * disable pause frame generation is required for 1000BT
+                 * because the XMAC is not reset if the link is going down
+                 */
+                /* Disable Pause Mode in Mode Register */
+                mode &= ~XM_PAUSE_MODE;
+
+                skge_write16(hw, SKGEMAC_REG(port, RX_MFF_CTRL1), MFF_DIS_PAUSE);
+        }
+
+        skge_xm_write32(hw, port, XM_MODE, mode);
+
+        msk = XM_DEF_MSK;
+        if (hw->phy_type != SK_PHY_XMAC)
+                msk |= XM_IS_INP_ASS;   /* disable GP0 interrupt bit */
+
+        skge_xm_write16(hw, port, XM_IMSK, msk);
+        skge_xm_read16(hw, port, XM_ISRC);
+
+        /* get MMU Command Reg. */
+        cmd = skge_xm_read16(hw, port, XM_MMU_CMD);
+        if (hw->phy_type != SK_PHY_XMAC && skge->duplex == DUPLEX_FULL)
+                cmd |= XM_MMU_GMII_FD;
+
+        if (hw->phy_type == SK_PHY_BCOM) {
+                /*
+                 * Workaround BCOM Errata (#10523) for all BCom Phys
+                 * Enable Power Management after link up
+                 */
+                skge_xm_phy_write(hw, port, PHY_BCOM_AUX_CTRL,
+                                  skge_xm_phy_read(hw, port, PHY_BCOM_AUX_CTRL)
+                                  & ~PHY_B_AC_DIS_PM);
+                skge_xm_phy_write(hw, port, PHY_BCOM_INT_MASK,
+                                  PHY_B_DEF_MSK);
+        }
+
+        /* enable Rx/Tx */
+        skge_xm_write16(hw, port, XM_MMU_CMD,
+                        cmd | XM_MMU_ENA_RX | XM_MMU_ENA_TX);
+        skge_link_up(skge);
+}
+
+
+static void genesis_bcom_intr(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        u16 stat = skge_xm_phy_read(hw, port, PHY_BCOM_INT_STAT);
+
+        pr_debug("genesis_bcom intr stat=%x\n", stat);
+
+        /* Workaround BCom Errata:
+         *      enable and disable loopback mode if "NO HCD" occurs.
+         */
+        if (stat & PHY_B_IS_NO_HDCL) {
+                u16 ctrl = skge_xm_phy_read(hw, port, PHY_BCOM_CTRL);
+                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL,
+                                  ctrl | PHY_CT_LOOP);
+                skge_xm_phy_write(hw, port, PHY_BCOM_CTRL,
+                                  ctrl & ~PHY_CT_LOOP);
+        }
+
+        stat = skge_xm_phy_read(hw, port, PHY_BCOM_STAT);
+        if (stat & (PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE)) {
+                u16 aux = skge_xm_phy_read(hw, port, PHY_BCOM_AUX_STAT);
+                if ( !(aux & PHY_B_AS_LS) && netif_carrier_ok(skge->netdev))
+                        genesis_link_down(skge);
+
+                else if (stat & PHY_B_IS_LST_CHANGE) {
+                        if (aux & PHY_B_AS_AN_C) {
+                                switch (aux & PHY_B_AS_AN_RES_MSK) {
+                                case PHY_B_RES_1000FD:
+                                        skge->duplex = DUPLEX_FULL;
+                                        break;
+                                case PHY_B_RES_1000HD:
+                                        skge->duplex = DUPLEX_HALF;
+                                        break;
+                                }
+
+                                switch (aux & PHY_B_AS_PAUSE_MSK) {
+                                case PHY_B_AS_PAUSE_MSK:
+                                        skge->flow_control = FLOW_MODE_SYMMETRIC;
+                                        break;
+                                case PHY_B_AS_PRR:
+                                        skge->flow_control = FLOW_MODE_REM_SEND;
+                                        break;
+                                case PHY_B_AS_PRT:
+                                        skge->flow_control = FLOW_MODE_LOC_SEND;
+                                        break;
+                                default:
+                                        skge->flow_control = FLOW_MODE_NONE;
+                                }
+                                skge->speed = SPEED_1000;
+                        }
+                        genesis_link_up(skge);
+                }
+                else
+                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
+        }
+}
+
+/* Perodic poll of phy status to check for link transistion  */
+static void skge_link_timer(unsigned long __arg)
+{
+        struct skge_port *skge = (struct skge_port *) __arg;
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        if (hw->chip_id != CHIP_ID_GENESIS || !netif_running(skge->netdev))
+                return;
+
+        spin_lock_bh(&hw->phy_lock);
+        if (hw->phy_type == SK_PHY_BCOM)
+                genesis_bcom_intr(skge);
+        else {
+                int i;
+                for (i = 0; i < 3; i++)
+                        if (skge_xm_read16(hw, port, XM_ISRC) & XM_IS_INP_ASS)
+                                break;
+
+                if (i == 3)
+                        mod_timer(&skge->link_check, jiffies + LINK_POLL_HZ);
+                else
+                        genesis_link_up(skge);
+        }
+        spin_unlock_bh(&hw->phy_lock);
+}
+
+/* Marvell Phy Initailization */
+static void yukon_init(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        u16 ctrl, ct1000, adv;
+        u16 ledctrl, ledover;
+
+        pr_debug("yukon_init\n");
+        if (skge->autoneg == AUTONEG_ENABLE) {
+                u16 ectrl = skge_gm_phy_read(hw, port, PHY_MARV_EXT_CTRL);
+
+                ectrl &= ~(PHY_M_EC_M_DSC_MSK | PHY_M_EC_S_DSC_MSK |
+                          PHY_M_EC_MAC_S_MSK);
+                ectrl |= PHY_M_EC_MAC_S(MAC_TX_CLK_25_MHZ);
+
+                /* on PHY 88E1111 there is a change for downshift control */
+                if (hw->chip_id == CHIP_ID_YUKON_EC)
+                        ectrl |= PHY_M_EC_M_DSC_2(0) | PHY_M_EC_DOWN_S_ENA;
+                else
+                        ectrl |= PHY_M_EC_M_DSC(0) | PHY_M_EC_S_DSC(1);
+
+                skge_gm_phy_write(hw, port, PHY_MARV_EXT_CTRL, ectrl);
+        }
+
+        ctrl = skge_gm_phy_read(hw, port, PHY_MARV_CTRL);
+        if (skge->autoneg == AUTONEG_DISABLE)
+                ctrl &= ~PHY_CT_ANE;
+
+        ctrl |= PHY_CT_RESET;
+        skge_gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+
+        ctrl = 0;
+        ct1000 = 0;
+        adv = PHY_SEL_TYPE;
+
+        if (skge->autoneg == AUTONEG_ENABLE) {
+                if (iscopper(hw)) {
+                        if (skge->advertising & ADVERTISED_1000baseT_Full)
+                                ct1000 |= PHY_M_1000C_AFD;
+                        if (skge->advertising & ADVERTISED_1000baseT_Half)
+                                ct1000 |= PHY_M_1000C_AHD;
+                        if (skge->advertising & ADVERTISED_100baseT_Full)
+                                adv |= PHY_M_AN_100_FD;
+                        if (skge->advertising & ADVERTISED_100baseT_Half)
+                                adv |= PHY_M_AN_100_HD;
+                        if (skge->advertising & ADVERTISED_10baseT_Full)
+                                adv |= PHY_M_AN_10_FD;
+                        if (skge->advertising & ADVERTISED_10baseT_Half)
+                                adv |= PHY_M_AN_10_HD;
+
+                        /* Set Flow-control capabilities */
+                        switch (skge->flow_control) {
+                        case FLOW_MODE_NONE:
+                                adv |= PHY_B_P_NO_PAUSE;
+                                break;
+                        case FLOW_MODE_LOC_SEND:
+                                adv |= PHY_B_P_ASYM_MD;
+                                break;
+                        case FLOW_MODE_SYMMETRIC:
+                                adv |= PHY_B_P_SYM_MD;
+                                break;
+                        case FLOW_MODE_REM_SEND:
+                                adv |= PHY_B_P_BOTH_MD;
+                                break;
+                        }
+                } else {        /* special defines for FIBER (88E1011S only) */
+                        adv |= PHY_M_AN_1000X_AHD | PHY_M_AN_1000X_AFD;
+
+                        /* Set Flow-control capabilities */
+                        switch (skge->flow_control) {
+                        case FLOW_MODE_NONE:
+                                adv |= PHY_M_P_NO_PAUSE_X;
+                                break;
+                        case FLOW_MODE_LOC_SEND:
+                                adv |= PHY_M_P_ASYM_MD_X;
+                                break;
+                        case FLOW_MODE_SYMMETRIC:
+                                adv |= PHY_M_P_SYM_MD_X;
+                                break;
+                        case FLOW_MODE_REM_SEND:
+                                adv |= PHY_M_P_BOTH_MD_X;
+                                break;
+                        }
+                }
+                /* Restart Auto-negotiation */
+                ctrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
+        } else {
+                /* forced speed/duplex settings */
+                ct1000 = PHY_M_1000C_MSE;
+
+                if (skge->duplex == DUPLEX_FULL)
+                        ctrl |= PHY_CT_DUP_MD;
+
+                switch (skge->speed) {
+                case SPEED_1000:
+                        ctrl |= PHY_CT_SP1000;
+                        break;
+                case SPEED_100:
+                        ctrl |= PHY_CT_SP100;
+                        break;
+                }
+
+                ctrl |= PHY_CT_RESET;
+        }
+
+        if (hw->chip_id != CHIP_ID_YUKON_FE)
+                skge_gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, ct1000);
+
+        skge_gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, adv);
+        skge_gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+
+        /* Setup Phy LED's */
+        ledctrl = PHY_M_LED_PULS_DUR(PULS_170MS);
+        ledover = 0;
+
+        if (hw->chip_id == CHIP_ID_YUKON_FE) {
+                /* on 88E3082 these bits are at 11..9 (shifted left) */
+                ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) << 1;
+
+                skge_gm_phy_write(hw, port, PHY_MARV_FE_LED_PAR,
+                                  ((skge_gm_phy_read(hw, port, PHY_MARV_FE_LED_PAR)
+
+                                    & ~PHY_M_FELP_LED1_MSK)
+                                   | PHY_M_FELP_LED1_CTRL(LED_PAR_CTRL_ACT_BL)));
+        } else {
+                /* set Tx LED (LED_TX) to blink mode on Rx OR Tx activity */
+                ledctrl |= PHY_M_LED_BLINK_RT(BLINK_84MS) | PHY_M_LEDC_TX_CTRL;
+
+                /* turn off the Rx LED (LED_RX) */
+                ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
+        }
+
+        /* disable blink mode (LED_DUPLEX) on collisions */
+        ctrl |= PHY_M_LEDC_DP_CTRL;
+        skge_gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+
+        if (skge->autoneg == AUTONEG_DISABLE || skge->speed == SPEED_100) {
+                /* turn on 100 Mbps LED (LED_LINK100) */
+                ledover |= PHY_M_LED_MO_100(MO_LED_ON);
+        }
+
+        if (ledover)
+                skge_gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
+
+        /* Enable phy interrupt on autonegotiation complete (or link up) */
+        if (skge->autoneg == AUTONEG_ENABLE)
+                skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);
+        else
+                skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+}
+
+static void yukon_reset(struct skge_hw *hw, int port)
+{
+        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);/* disable PHY IRQs */
+        skge_gma_write16(hw, port, GM_MC_ADDR_H1, 0);   /* clear MC hash */
+        skge_gma_write16(hw, port, GM_MC_ADDR_H2, 0);
+        skge_gma_write16(hw, port, GM_MC_ADDR_H3, 0);
+        skge_gma_write16(hw, port, GM_MC_ADDR_H4, 0);
+
+        skge_gma_write16(hw, port, GM_RX_CTRL,
+                         skge_gma_read16(hw, port, GM_RX_CTRL)
+                         | GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+}
+
+static void yukon_mac_init(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        int i;
+        u32 reg;
+        const u8 *addr = hw->dev[port]->dev_addr;
+
+        /* WA code for COMA mode -- set PHY reset */
+        if (hw->chip_id == CHIP_ID_YUKON_LITE &&
+            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+                skge_write32(hw, B2_GP_IO,
+                             (skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9));
+
+        /* hard reset */
+        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), GPC_RST_SET);
+        skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_RST_SET);
+
+        /* WA code for COMA mode -- clear PHY reset */
+        if (hw->chip_id == CHIP_ID_YUKON_LITE &&
+            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+                skge_write32(hw, B2_GP_IO,
+                             (skge_read32(hw, B2_GP_IO) | GP_DIR_9)
+                             & ~GP_IO_9);
+
+        /* Set hardware config mode */
+        reg = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
+                GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE;
+        reg |= iscopper(hw) ? GPC_HWCFG_GMII_COP : GPC_HWCFG_GMII_FIB;
+
+        /* Clear GMC reset */
+        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), reg | GPC_RST_SET);
+        skge_write32(hw, SKGEMAC_REG(port, GPHY_CTRL), reg | GPC_RST_CLR);
+        skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
+        if (skge->autoneg == AUTONEG_DISABLE) {
+                reg = GM_GPCR_AU_ALL_DIS;
+                skge_gma_write16(hw, port, GM_GP_CTRL,
+                                 skge_gma_read16(hw, port, GM_GP_CTRL) | reg);
+
+                switch (skge->speed) {
+                case SPEED_1000:
+                        reg |= GM_GPCR_SPEED_1000;
+                        /* fallthru */
+                case SPEED_100:
+                        reg |= GM_GPCR_SPEED_100;
+                }
+
+                if (skge->duplex == DUPLEX_FULL)
+                        reg |= GM_GPCR_DUP_FULL;
+        } else
+                reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL;
+        switch (skge->flow_control) {
+        case FLOW_MODE_NONE:
+                skge_write32(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+                reg |= GM_GPCR_FC_TX_DIS | GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+                break;
+        case FLOW_MODE_LOC_SEND:
+                /* disable Rx flow-control */
+                reg |= GM_GPCR_FC_RX_DIS | GM_GPCR_AU_FCT_DIS;
+        }
+
+        skge_gma_write16(hw, port, GM_GP_CTRL, reg);
+        skge_read16(hw, GMAC_IRQ_SRC);
+
+        spin_lock_bh(&hw->phy_lock);
+        yukon_init(hw, port);
+        spin_unlock_bh(&hw->phy_lock);
+
+        /* MIB clear */
+        reg = skge_gma_read16(hw, port, GM_PHY_ADDR);
+        skge_gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
+
+        for (i = 0; i < GM_MIB_CNT_SIZE; i++)
+                skge_gma_read16(hw, port, GM_MIB_CNT_BASE + 8*i);
+        skge_gma_write16(hw, port, GM_PHY_ADDR, reg);
+
+        /* transmit control */
+        skge_gma_write16(hw, port, GM_TX_CTRL, TX_COL_THR(TX_COL_DEF));
+
+        /* receive control reg: unicast + multicast + no FCS  */
+        skge_gma_write16(hw, port, GM_RX_CTRL,
+                         GM_RXCR_UCF_ENA | GM_RXCR_CRC_DIS | GM_RXCR_MCF_ENA);
+
+        /* transmit flow control */
+        skge_gma_write16(hw, port, GM_TX_FLOW_CTRL, 0xffff);
+
+        /* transmit parameter */
+        skge_gma_write16(hw, port, GM_TX_PARAM,
+                         TX_JAM_LEN_VAL(TX_JAM_LEN_DEF) |
+                         TX_JAM_IPG_VAL(TX_JAM_IPG_DEF) |
+                         TX_IPG_JAM_DATA(TX_IPG_JAM_DEF));
+
+        /* serial mode register */
+        reg = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(IPG_DATA_DEF);
+        if (hw->dev[port]->mtu > 1500)
+                reg |= GM_SMOD_JUMBO_ENA;
+
+        skge_gma_write16(hw, port, GM_SERIAL_MODE, reg);
+
+        /* physical address: used for pause frames */
+        skge_gm_set_addr(hw, port, GM_SRC_ADDR_1L, addr);
+        /* virtual address for data */
+        skge_gm_set_addr(hw, port, GM_SRC_ADDR_2L, addr);
+
+        /* enable interrupt mask for counter overflows */
+        skge_gma_write16(hw, port, GM_TX_IRQ_MSK, 0);
+        skge_gma_write16(hw, port, GM_RX_IRQ_MSK, 0);
+        skge_gma_write16(hw, port, GM_TR_IRQ_MSK, 0);
+
+        /* Initialize Mac Fifo */
+
+        /* Configure Rx MAC FIFO */
+        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_FL_MSK), RX_FF_FL_DEF_MSK);
+        reg = GMF_OPER_ON | GMF_RX_F_FL_ON;
+        if (hw->chip_id == CHIP_ID_YUKON_LITE &&
+            chip_rev(hw) == CHIP_REV_YU_LITE_A3)
+                reg &= ~GMF_RX_F_FL_ON;
+        skge_write8(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
+        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), reg);
+        skge_write16(hw, SKGEMAC_REG(port, RX_GMF_FL_THR), RX_GMF_FL_THR_DEF);
+
+        /* Configure Tx MAC FIFO */
+        skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
+        skge_write16(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
+}
+
+static void yukon_stop(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        if (hw->chip_id == CHIP_ID_YUKON_LITE &&
+            chip_rev(hw) == CHIP_REV_YU_LITE_A3) {
+                skge_write32(hw, B2_GP_IO,
+                             skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9);
+        }
+
+        skge_gma_write16(hw, port, GM_GP_CTRL,
+                         skge_gma_read16(hw, port, GM_GP_CTRL)
+                         & ~(GM_GPCR_RX_ENA|GM_GPCR_RX_ENA));
+        skge_gma_read16(hw, port, GM_GP_CTRL);
+
+        /* set GPHY Control reset */
+        skge_gma_write32(hw, port, GPHY_CTRL, GPC_RST_SET);
+        skge_gma_write32(hw, port, GMAC_CTRL, GMC_RST_SET);
+}
+
+static void yukon_get_stats(struct skge_port *skge, u64 *data)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        int i;
+
+        data[0] = (u64) skge_gma_read32(hw, port, GM_TXO_OK_HI) << 32
+                | skge_gma_read32(hw, port, GM_TXO_OK_LO);
+        data[1] = (u64) skge_gma_read32(hw, port, GM_RXO_OK_HI) << 32
+                | skge_gma_read32(hw, port, GM_RXO_OK_LO);
+
+        for (i = 2; i < ARRAY_SIZE(skge_stats); i++)
+                data[i] = skge_gma_read32(hw, port,
+                                          skge_stats[i].gma_offset);
+}
+
+static void yukon_mac_intr(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge = netdev_priv(hw->dev[port]);
+        u8 status = skge_read8(hw, SKGEMAC_REG(port, GMAC_IRQ_SRC));
+
+        pr_debug("yukon_intr status %x\n", status);
+        if (status & GM_IS_RX_FF_OR) {
+                ++skge->net_stats.rx_fifo_errors;
+                skge_gma_write8(hw, port, RX_GMF_CTRL_T, GMF_CLI_RX_FO);
+        }
+        if (status & GM_IS_TX_FF_UR) {
+                ++skge->net_stats.tx_fifo_errors;
+                skge_gma_write8(hw, port, TX_GMF_CTRL_T, GMF_CLI_TX_FU);
+        }
+
+}
+
+static u16 yukon_speed(const struct skge_hw *hw, u16 aux)
+{
+        if (hw->chip_id == CHIP_ID_YUKON_FE)
+                return (aux & PHY_M_PS_SPEED_100) ? SPEED_100 : SPEED_10;
+
+        switch(aux & PHY_M_PS_SPEED_MSK) {
+        case PHY_M_PS_SPEED_1000:
+                return SPEED_1000;
+        case PHY_M_PS_SPEED_100:
+                return SPEED_100;
+        default:
+                return SPEED_10;
+        }
+}
+
+static void yukon_link_up(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        u16 reg;
+
+        pr_debug("yukon_link_up\n");
+
+        /* Enable Transmit FIFO Underrun */
+        skge_write8(hw, GMAC_IRQ_MSK, GMAC_DEF_MSK);
+
+        reg = skge_gma_read16(hw, port, GM_GP_CTRL);
+        if (skge->duplex == DUPLEX_FULL || skge->autoneg == AUTONEG_ENABLE)
+                reg |= GM_GPCR_DUP_FULL;
+
+        /* enable Rx/Tx */
+        reg |= GM_GPCR_RX_ENA | GM_GPCR_TX_ENA;
+        skge_gma_write16(hw, port, GM_GP_CTRL, reg);
+
+        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+        skge_link_up(skge);
+}
+
+static void yukon_link_down(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        pr_debug("yukon_link_down\n");
+        skge_gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
+        skge_gm_phy_write(hw, port, GM_GP_CTRL,
+                          skge_gm_phy_read(hw, port, GM_GP_CTRL)
+                          & ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA));
+
+        if (hw->chip_id != CHIP_ID_YUKON_FE &&
+            skge->flow_control == FLOW_MODE_REM_SEND) {
+                /* restore Asymmetric Pause bit */
+                skge_gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
+                                  skge_gm_phy_read(hw, port,
+                                                   PHY_MARV_AUNE_ADV)
+                                  | PHY_M_AN_ASP);
+
+        }
+
+        yukon_reset(hw, port);
+        skge_link_down(skge);
+
+        yukon_init(hw, port);
+}
+
+static void yukon_phy_intr(struct skge_port *skge)
+{
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        const char *reason = NULL;
+        u16 istatus, phystat;
+
+        istatus = skge_gm_phy_read(hw, port, PHY_MARV_INT_STAT);
+        phystat = skge_gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
+        pr_debug("yukon phy intr istat=%x phy_stat=%x\n", istatus, phystat);
+
+        if (istatus & PHY_M_IS_AN_COMPL) {
+                if (skge_gm_phy_read(hw, port, PHY_MARV_AUNE_LP)
+                    & PHY_M_AN_RF) {
+                        reason = "remote fault";
+                        goto failed;
+                }
+
+                if (!(hw->chip_id == CHIP_ID_YUKON_FE || hw->chip_id == CHIP_ID_YUKON_EC)
+                    && (skge_gm_phy_read(hw, port, PHY_MARV_1000T_STAT)
+                        & PHY_B_1000S_MSF)) {
+                        reason = "master/slave fault";
+                        goto failed;
+                }
+
+                if (!(phystat & PHY_M_PS_SPDUP_RES)) {
+                        reason = "speed/duplex";
+                        goto failed;
+                }
+
+                skge->duplex = (phystat & PHY_M_PS_FULL_DUP)
+                        ? DUPLEX_FULL : DUPLEX_HALF;
+                skge->speed = yukon_speed(hw, phystat);
+
+                /* Tx & Rx Pause Enabled bits are at 9..8 */
+                if (hw->chip_id == CHIP_ID_YUKON_XL)
+                        phystat >>= 6;
+
+                /* We are using IEEE 802.3z/D5.0 Table 37-4 */
+                switch (phystat & PHY_M_PS_PAUSE_MSK) {
+                case PHY_M_PS_PAUSE_MSK:
+                        skge->flow_control = FLOW_MODE_SYMMETRIC;
+                        break;
+                case PHY_M_PS_RX_P_EN:
+                        skge->flow_control = FLOW_MODE_REM_SEND;
+                        break;
+                case PHY_M_PS_TX_P_EN:
+                        skge->flow_control = FLOW_MODE_LOC_SEND;
+                        break;
+                default:
+                        skge->flow_control = FLOW_MODE_NONE;
+                }
+
+                if (skge->flow_control == FLOW_MODE_NONE ||
+                    (skge->speed < SPEED_1000 && skge->duplex == DUPLEX_HALF))
+                        skge_write8(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
+                else
+                        skge_write8(hw, SKGEMAC_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
+                yukon_link_up(skge);
+                return;
+        }
+
+        if (istatus & PHY_M_IS_LSP_CHANGE)
+                skge->speed = yukon_speed(hw, phystat);
+
+        if (istatus & PHY_M_IS_DUP_CHANGE)
+                skge->duplex = (phystat & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;
+        if (istatus & PHY_M_IS_LST_CHANGE) {
+                if (phystat & PHY_M_PS_LINK_UP)
+                        yukon_link_up(skge);
+                else
+                        yukon_link_down(skge);
+        }
+        return;
+ failed:
+        printk(KERN_ERR PFX "%s: autonegotiation failed (%s)\n",
+               skge->netdev->name, reason);
+
+        /* XXX restart autonegotiation? */
+}
+
+static void skge_ramset(struct skge_hw *hw, u16 q, u32 start, size_t len)
+{
+        u32 end;
+
+        start /= 8;
+        len /= 8;
+        end = start + len - 1;
+
+        skge_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR);
+        skge_write32(hw, RB_ADDR(q, RB_START), start);
+        skge_write32(hw, RB_ADDR(q, RB_WP), start);
+        skge_write32(hw, RB_ADDR(q, RB_RP), start);
+        skge_write32(hw, RB_ADDR(q, RB_END), end);
+
+        if (q == Q_R1 || q == Q_R2) {
+                /* Set thresholds on receive queue's */
+                skge_write32(hw, RB_ADDR(q, RB_RX_UTPP),
+                             start + (2*len)/3);
+                skge_write32(hw, RB_ADDR(q, RB_RX_LTPP),
+                             start + (len/3));
+        } else {
+                /* Enable store & forward on Tx queue's because
+                 * Tx FIFO is only 4K on Genesis and 1K on Yukon
+                 */
+                skge_write8(hw, RB_ADDR(q, RB_CTRL), RB_ENA_STFWD);
+        }
+
+        skge_write8(hw, RB_ADDR(q, RB_CTRL), RB_ENA_OP_MD);
+}
+
+/* Setup Bus Memory Interface */
+static void skge_qset(struct skge_port *skge, u16 q,
+                      const struct skge_element *e)
+{
+        struct skge_hw *hw = skge->hw;
+        u32 watermark = 0x600;
+        u64 base = skge->dma + (e->desc - skge->mem);
+
+        /* optimization to reduce window on 32bit/33mhz */
+        if ((skge_read16(hw, B0_CTST) & (CS_BUS_CLOCK | CS_BUS_SLOT_SZ)) == 0)
+                watermark /= 2;
+
+        skge_write32(hw, Q_ADDR(q, Q_CSR), CSR_CLR_RESET);
+        skge_write32(hw, Q_ADDR(q, Q_F), watermark);
+        skge_write32(hw, Q_ADDR(q, Q_DA_H), (u32)(base >> 32));
+        skge_write32(hw, Q_ADDR(q, Q_DA_L), (u32)base);
+}
+
+static int skge_up(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        u32 chunk, ram_addr;
+        size_t rx_size, tx_size;
+        int err;
+
+        if (netif_msg_ifup(skge))
+                printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
+
+        rx_size = skge->rx_ring.count * sizeof(struct skge_rx_desc);
+        tx_size = skge->tx_ring.count * sizeof(struct skge_tx_desc);
+        skge->mem_size = tx_size + rx_size;
+        skge->mem = pci_alloc_consistent(hw->pdev, skge->mem_size, &skge->dma);
+        if (!skge->mem)
+                return -ENOMEM;
+
+        memset(skge->mem, 0, skge->mem_size);
+
+        if ((err = skge_ring_alloc(&skge->rx_ring, skge->mem, skge->dma)))
+                goto free_pci_mem;
+
+        if (skge_rx_fill(skge))
+                goto free_rx_ring;
+
+        if ((err = skge_ring_alloc(&skge->tx_ring, skge->mem + rx_size,
+                                   skge->dma + rx_size)))
+                goto free_rx_ring;
+
+        skge->tx_avail = skge->tx_ring.count - 1;
+
+        /* Initialze MAC */
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                genesis_mac_init(hw, port);
+        else
+                yukon_mac_init(hw, port);
+
+        /* Configure RAMbuffers */
+        chunk = hw->ram_size / (isdualport(hw) ? 4 : 2);
+        ram_addr = hw->ram_offset + 2 * chunk * port;
+
+        skge_ramset(hw, rxqaddr[port], ram_addr, chunk);
+        skge_qset(skge, rxqaddr[port], skge->rx_ring.to_clean);
+
+        BUG_ON(skge->tx_ring.to_use != skge->tx_ring.to_clean);
+        skge_ramset(hw, txqaddr[port], ram_addr+chunk, chunk);
+        skge_qset(skge, txqaddr[port], skge->tx_ring.to_use);
+
+        /* Start receiver BMU */
+        wmb();
+        skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F);
+
+        pr_debug("skge_up completed\n");
+        return 0;
+
+ free_rx_ring:
+        skge_rx_clean(skge);
+        kfree(skge->rx_ring.start);
+ free_pci_mem:
+        pci_free_consistent(hw->pdev, skge->mem_size, skge->mem, skge->dma);
+
+        return err;
+}
+
+static int skge_down(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+
+        if (netif_msg_ifdown(skge))
+                printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
+
+        netif_stop_queue(dev);
+
+        del_timer_sync(&skge->led_blink);
+        del_timer_sync(&skge->link_check);
+
+        /* Stop transmitter */
+        skge_write8(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_STOP);
+        skge_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL),
+                     RB_RST_SET|RB_DIS_OP_MD);
+
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                genesis_stop(skge);
+        else
+                yukon_stop(skge);
+
+        /* Disable Force Sync bit and Enable Alloc bit */
+        skge_write8(hw, SKGEMAC_REG(port, TXA_CTRL),
+                    TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);
+
+        /* Stop Interval Timer and Limit Counter of Tx Arbiter */
+        skge_write32(hw, SKGEMAC_REG(port, TXA_ITI_INI), 0L);
+        skge_write32(hw, SKGEMAC_REG(port, TXA_LIM_INI), 0L);
+
+        /* Reset PCI FIFO */
+        skge_write32(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_SET_RESET);
+        skge_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
+
+        /* Reset the RAM Buffer async Tx queue */
+        skge_write8(hw, RB_ADDR(port == 0 ? Q_XA1 : Q_XA2, RB_CTRL), RB_RST_SET);
+        /* stop receiver */
+        skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_STOP);
+        skge_write32(hw, RB_ADDR(port ? Q_R2 : Q_R1, RB_CTRL),
+                     RB_RST_SET|RB_DIS_OP_MD);
+        skge_write32(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_SET_RESET);
+
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                skge_write8(hw, SKGEMAC_REG(port, TX_MFF_CTRL2), MFF_RST_SET);
+                skge_write8(hw, SKGEMAC_REG(port, RX_MFF_CTRL2), MFF_RST_SET);
+                skge_write8(hw, SKGEMAC_REG(port, TX_LED_CTRL), LED_STOP);
+                skge_write8(hw, SKGEMAC_REG(port, RX_LED_CTRL), LED_STOP);
+        } else {
+                skge_write8(hw, SKGEMAC_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
+                skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
+        }
+
+        /* turn off led's */
+        skge_write16(hw, B0_LED, LED_STAT_OFF);
+
+        skge_tx_clean(skge);
+        skge_rx_clean(skge);
+
+        kfree(skge->rx_ring.start);
+        kfree(skge->tx_ring.start);
+        pci_free_consistent(hw->pdev, skge->mem_size, skge->mem, skge->dma);
+        return 0;
+}
+
+static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        struct skge_ring *ring = &skge->tx_ring;
+        struct skge_element *e;
+        struct skge_tx_desc *td;
+        int i;
+        u32 control, len;
+        u64 map;
+        unsigned long flags;
+
+        skb = skb_padto(skb, ETH_ZLEN);
+        if (!skb)
+                return NETDEV_TX_OK;
+
+        local_irq_save(flags);
+        if (!spin_trylock(&skge->tx_lock)) {
+                /* Collision - tell upper layer to requeue */ 
+                local_irq_restore(flags); 
+                return NETDEV_TX_LOCKED; 
+        } 
+
+        if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
+                netif_stop_queue(dev);
+                spin_unlock_irqrestore(&skge->tx_lock, flags);
+
+                printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
+                       dev->name);
+                return NETDEV_TX_BUSY;
+        }
+
+        e = ring->to_use;
+        td = e->desc;
+        e->skb = skb;
+        len = skb_headlen(skb);
+        map = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);
+        pci_unmap_addr_set(e, mapaddr, map);
+        pci_unmap_len_set(e, maplen, len);
+
+        td->dma_lo = map;
+        td->dma_hi = map >> 32;
+
+        if (skb->ip_summed == CHECKSUM_HW) {
+                const struct iphdr *ip
+                        = (const struct iphdr *) (skb->data + ETH_HLEN);
+                int offset = skb->h.raw - skb->data;
+
+                /* This seems backwards, but it is what the sk98lin
+                 * does.  Looks like hardware is wrong?
+                 */
+                if (ip->protocol == IPPROTO_UDP
+                    && chip_rev(hw) == 0 && hw->chip_id == CHIP_ID_YUKON)
+                        control = BMU_TCP_CHECK;
+                else
+                        control = BMU_UDP_CHECK;
+
+                td->csum_offs = 0;
+                td->csum_start = offset;
+                td->csum_write = offset + skb->csum;
+        } else
+                control = BMU_CHECK;
+
+        if (!skb_shinfo(skb)->nr_frags) /* single buffer i.e. no fragments */
+                control |= BMU_EOF| BMU_IRQ_EOF;
+        else {
+                struct skge_tx_desc *tf = td;
+
+                control |= BMU_STFWD;
+                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+
+                        map = pci_map_page(hw->pdev, frag->page, frag->page_offset,
+                                           frag->size, PCI_DMA_TODEVICE);
+
+                        e = e->next;
+                        e->skb = NULL;
+                        tf = e->desc;
+                        tf->dma_lo = map;
+                        tf->dma_hi = (u64) map >> 32;
+                        pci_unmap_addr_set(e, mapaddr, map);
+                        pci_unmap_len_set(e, maplen, frag->size);
+
+                        tf->control = BMU_OWN | BMU_SW | control | frag->size;
+                }
+                tf->control |= BMU_EOF | BMU_IRQ_EOF;
+        }
+        /* Make sure all the descriptors written */
+        wmb();
+        td->control = BMU_OWN | BMU_SW | BMU_STF | control | len;
+        wmb();
+
+        skge_write8(hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_START);
+
+        if (netif_msg_tx_queued(skge))
+                printk(KERN_DEBUG "%s: tx queued, slot %td, len %d\n",
+                       dev->name, e - ring->start, skb->len);
+
+        ring->to_use = e->next;
+        skge->tx_avail -= skb_shinfo(skb)->nr_frags + 1;
+        if (skge->tx_avail <= MAX_SKB_FRAGS + 1) {
+                pr_debug("%s: transmit queue full\n", dev->name);
+                netif_stop_queue(dev);
+        }
+
+        dev->trans_start = jiffies;
+        spin_unlock_irqrestore(&skge->tx_lock, flags);
+
+        return NETDEV_TX_OK;
+}
+
+static inline void skge_tx_free(struct skge_hw *hw, struct skge_element *e)
+{
+        if (e->skb) {
+                pci_unmap_single(hw->pdev,
+                               pci_unmap_addr(e, mapaddr),
+                               pci_unmap_len(e, maplen),
+                               PCI_DMA_TODEVICE);
+                dev_kfree_skb_any(e->skb);
+                e->skb = NULL;
+        } else {
+                pci_unmap_page(hw->pdev,
+                               pci_unmap_addr(e, mapaddr),
+                               pci_unmap_len(e, maplen),
+                               PCI_DMA_TODEVICE);
+        }
+}
+
+static void skge_tx_clean(struct skge_port *skge)
+{
+        struct skge_ring *ring = &skge->tx_ring;
+        struct skge_element *e;
+        unsigned long flags;
+
+        spin_lock_irqsave(&skge->tx_lock, flags);
+        for (e = ring->to_clean; e != ring->to_use; e = e->next) {
+                ++skge->tx_avail;
+                skge_tx_free(skge->hw, e);
+        }
+        ring->to_clean = e;
+        spin_unlock_irqrestore(&skge->tx_lock, flags);
+}
+
+static void skge_tx_timeout(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        if (netif_msg_timer(skge))
+                printk(KERN_DEBUG PFX "%s: tx timeout\n", dev->name);
+
+        skge_write8(skge->hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_STOP);
+        skge_tx_clean(skge);
+}
+
+static int skge_change_mtu(struct net_device *dev, int new_mtu)
+{
+        int err = 0;
+
+        if(new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+
+        if (netif_running(dev)) {
+                skge_down(dev);
+                skge_up(dev);
+        }
+
+        return err;
+}
+
+static void genesis_set_multicast(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        int i, count = dev->mc_count;
+        struct dev_mc_list *list = dev->mc_list;
+        u32 mode;
+        u8 filter[8];
+
+        mode = skge_xm_read32(hw, port, XM_MODE);
+        mode |= XM_MD_ENA_HASH;
+        if (dev->flags & IFF_PROMISC)
+                mode |= XM_MD_ENA_PROM;
+        else
+                mode &= ~XM_MD_ENA_PROM;
+
+        if (dev->flags & IFF_ALLMULTI)
+                memset(filter, 0xff, sizeof(filter));
+        else {
+                memset(filter, 0, sizeof(filter));
+                for(i = 0; list && i < count; i++, list = list->next) {
+                        u32 crc = crc32_le(~0, list->dmi_addr, ETH_ALEN);
+                        u8 bit = 63 - (crc & 63);
+
+                        filter[bit/8] |= 1 << (bit%8);
+                }
+        }
+
+        skge_xm_outhash(hw, port, XM_HSM, filter);
+
+        skge_xm_write32(hw, port, XM_MODE, mode);
+}
+
+static void yukon_set_multicast(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        int port = skge->port;
+        struct dev_mc_list *list = dev->mc_list;
+        u16 reg;
+        u8 filter[8];
+
+        memset(filter, 0, sizeof(filter));
+
+        reg = skge_gma_read16(hw, port, GM_RX_CTRL);
+        reg |= GM_RXCR_UCF_ENA;
+
+        if (dev->flags & IFF_PROMISC)           /* promiscious */
+                reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
+        else if (dev->flags & IFF_ALLMULTI)     /* all multicast */
+                memset(filter, 0xff, sizeof(filter));
+        else if (dev->mc_count == 0)            /* no multicast */
+                reg &= ~GM_RXCR_MCF_ENA;
+        else {
+                int i;
+                reg |= GM_RXCR_MCF_ENA;
+
+                for(i = 0; list && i < dev->mc_count; i++, list = list->next) {
+                        u32 bit = ether_crc(ETH_ALEN, list->dmi_addr) & 0x3f;
+                        filter[bit/8] |= 1 << (bit%8);
+                }
+        }
+
+
+        skge_gma_write16(hw, port, GM_MC_ADDR_H1,
+                         (u16)filter[0] | ((u16)filter[1] << 8));
+        skge_gma_write16(hw, port, GM_MC_ADDR_H2,
+                         (u16)filter[2] | ((u16)filter[3] << 8));
+        skge_gma_write16(hw, port, GM_MC_ADDR_H3,
+                         (u16)filter[4] | ((u16)filter[5] << 8));
+        skge_gma_write16(hw, port, GM_MC_ADDR_H4,
+                         (u16)filter[6] | ((u16)filter[7] << 8));
+
+        skge_gma_write16(hw, port, GM_RX_CTRL, reg);
+}
+
+static inline int bad_phy_status(const struct skge_hw *hw, u32 status)
+{
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                return (status & (XMR_FS_ERR | XMR_FS_2L_VLAN)) != 0;
+        else
+                return (status & GMR_FS_ANY_ERR) ||
+                        (status & GMR_FS_RX_OK) == 0;
+}
+
+static void skge_rx_error(struct skge_port *skge, int slot,
+                          u32 control, u32 status)
+{
+        if (netif_msg_rx_err(skge))
+                printk(KERN_DEBUG PFX "%s: rx err, slot %d control 0x%x status 0x%x\n",
+                       skge->netdev->name, slot, control, status);
+
+        if ((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF)
+            || (control & BMU_BBC) > skge->netdev->mtu + VLAN_ETH_HLEN)
+                skge->net_stats.rx_length_errors++;
+        else {
+                if (skge->hw->chip_id == CHIP_ID_GENESIS) {
+                        if (status & (XMR_FS_RUNT|XMR_FS_LNG_ERR))
+                                skge->net_stats.rx_length_errors++;
+                        if (status & XMR_FS_FRA_ERR)
+                                skge->net_stats.rx_frame_errors++;
+                        if (status & XMR_FS_FCS_ERR)
+                                skge->net_stats.rx_crc_errors++;
+                } else {
+                        if (status & (GMR_FS_LONG_ERR|GMR_FS_UN_SIZE))
+                                skge->net_stats.rx_length_errors++;
+                        if (status & GMR_FS_FRAGMENT)
+                                skge->net_stats.rx_frame_errors++;
+                        if (status & GMR_FS_CRC_ERR)
+                                skge->net_stats.rx_crc_errors++;
+                }
+        }
+}
+
+static int skge_poll(struct net_device *dev, int *budget)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        struct skge_ring *ring = &skge->rx_ring;
+        struct skge_element *e;
+        unsigned int to_do = min(dev->quota, *budget);
+        unsigned int work_done = 0;
+        int done;
+        static const u32 irqmask[] = { IS_PORT_1, IS_PORT_2 };
+
+        for (e = ring->to_clean; e != ring->to_use && work_done < to_do;
+             e = e->next) {
+                struct skge_rx_desc *rd = e->desc;
+                struct sk_buff *skb = e->skb;
+                u32 control, len, status;
+
+                rmb();
+                control = rd->control;
+                if (control & BMU_OWN)
+                        break;
+
+                len = control & BMU_BBC;
+                e->skb = NULL;
+
+                pci_unmap_single(hw->pdev,
+                                 pci_unmap_addr(e, mapaddr),
+                                 pci_unmap_len(e, maplen),
+                                 PCI_DMA_FROMDEVICE);
+
+                status = rd->status;
+                if ((control & (BMU_EOF|BMU_STF)) != (BMU_STF|BMU_EOF)
+                     || len > dev->mtu + VLAN_ETH_HLEN
+                     || bad_phy_status(hw, status)) {
+                        skge_rx_error(skge, e - ring->start, control, status);
+                        dev_kfree_skb(skb);
+                        continue;
+                }
+
+                if (netif_msg_rx_status(skge))
+                    printk(KERN_DEBUG PFX "%s: rx slot %td status 0x%x len %d\n",
+                           dev->name, e - ring->start, rd->status, len);
+
+                skb_put(skb, len);
+                skb->protocol = eth_type_trans(skb, dev);
+
+                if (skge->rx_csum) {
+                        skb->csum = le16_to_cpu(rd->csum2);
+                        skb->ip_summed = CHECKSUM_HW;
+                }
+
+                dev->last_rx = jiffies;
+                netif_receive_skb(skb);
+
+                ++work_done;
+        }
+        ring->to_clean = e;
+
+        *budget -= work_done;
+        dev->quota -= work_done;
+        done = work_done < to_do;
+
+        if (skge_rx_fill(skge))
+                done = 0;
+
+        /* restart receiver */
+        wmb();
+        skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR),
+                    CSR_START | CSR_IRQ_CL_F);
+
+        if (done) {
+                local_irq_disable();
+                hw->intr_mask |= irqmask[skge->port];
+                /* Order is important since data can get interrupted */
+                skge_write32(hw, B0_IMSK, hw->intr_mask);
+                __netif_rx_complete(dev);
+                local_irq_enable();
+        }
+
+        return !done;
+}
+
+static inline void skge_tx_intr(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct skge_hw *hw = skge->hw;
+        struct skge_ring *ring = &skge->tx_ring;
+        struct skge_element *e;
+
+        spin_lock(&skge->tx_lock);
+        for(e = ring->to_clean; e != ring->to_use; e = e->next) {
+                struct skge_tx_desc *td = e->desc;
+                u32 control;
+
+                rmb();
+                control = td->control;
+                if (control & BMU_OWN)
+                        break;
+
+                if (unlikely(netif_msg_tx_done(skge)))
+                        printk(KERN_DEBUG PFX "%s: tx done slot %td status 0x%x\n",
+                               dev->name, e - ring->start, td->status);
+
+                skge_tx_free(hw, e);
+                e->skb = NULL;
+                ++skge->tx_avail;
+        }
+        ring->to_clean = e;
+        skge_write8(hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_IRQ_CL_F);
+
+        if (skge->tx_avail > MAX_SKB_FRAGS + 1)
+                netif_wake_queue(dev);
+
+        spin_unlock(&skge->tx_lock);
+}
+
+static void skge_mac_parity(struct skge_hw *hw, int port)
+{
+        printk(KERN_ERR PFX "%s: mac data parity error\n",
+               hw->dev[port] ? hw->dev[port]->name
+               : (port == 0 ? "(port A)": "(port B"));
+
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                skge_write16(hw, SKGEMAC_REG(port, TX_MFF_CTRL1),
+                             MFF_CLR_PERR);
+        else
+                /* HW-Bug #8: cleared by GMF_CLI_TX_FC instead of GMF_CLI_TX_PE */
+                skge_write8(hw, SKGEMAC_REG(port, TX_GMF_CTRL_T),
+                            (hw->chip_id == CHIP_ID_YUKON && chip_rev(hw) == 0)
+                            ? GMF_CLI_TX_FC : GMF_CLI_TX_PE);
+}
+
+static void skge_pci_clear(struct skge_hw *hw)
+{
+        u16 status;
+
+        status = skge_read16(hw, SKGEPCI_REG(PCI_STATUS));
+        skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
+        skge_write16(hw, SKGEPCI_REG(PCI_STATUS),
+                     status | PCI_STATUS_ERROR_BITS);
+        skge_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
+}
+
+static void skge_mac_intr(struct skge_hw *hw, int port)
+{
+        if (hw->chip_id == CHIP_ID_GENESIS) 
+                genesis_mac_intr(hw, port);
+        else
+                yukon_mac_intr(hw, port);
+}
+
+/* Handle device specific framing and timeout interrupts */
+static void skge_error_irq(struct skge_hw *hw)
+{
+        u32 hwstatus = skge_read32(hw, B0_HWE_ISRC);
+
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                /* clear xmac errors */
+                if (hwstatus & (IS_NO_STAT_M1|IS_NO_TIST_M1))
+                        skge_write16(hw, SKGEMAC_REG(0, RX_MFF_CTRL1), MFF_CLR_INSTAT);
+                if (hwstatus & (IS_NO_STAT_M2|IS_NO_TIST_M2))
+                        skge_write16(hw, SKGEMAC_REG(0, RX_MFF_CTRL2), MFF_CLR_INSTAT);
+        } else {
+                /* Timestamp (unused) overflow */
+                if (hwstatus & IS_IRQ_TIST_OV)
+                        skge_write8(hw, GMAC_TI_ST_CTRL, GMT_ST_CLR_IRQ);
+
+                if (hwstatus & IS_IRQ_SENSOR) {
+                        /* no sensors on 32-bit Yukon */
+                        if (!(skge_read16(hw, B0_CTST) & CS_BUS_SLOT_SZ)) {
+                                printk(KERN_ERR PFX "ignoring bogus sensor interrups\n");
+                                skge_write32(hw, B0_HWE_IMSK,
+                                             IS_ERR_MSK & ~IS_IRQ_SENSOR);
+                        } else
+                                printk(KERN_WARNING PFX "sensor interrupt\n");
+                }
+
+
+        }
+
+        if (hwstatus & IS_RAM_RD_PAR) {
+                printk(KERN_ERR PFX "Ram read data parity error\n");
+                skge_write16(hw, B3_RI_CTRL, RI_CLR_RD_PERR);
+        }
+
+        if (hwstatus & IS_RAM_WR_PAR) {
+                printk(KERN_ERR PFX "Ram write data parity error\n");
+                skge_write16(hw, B3_RI_CTRL, RI_CLR_WR_PERR);
+        }
+
+        if (hwstatus & IS_M1_PAR_ERR)
+                skge_mac_parity(hw, 0);
+
+        if (hwstatus & IS_M2_PAR_ERR)
+                skge_mac_parity(hw, 1);
+
+        if (hwstatus & IS_R1_PAR_ERR)
+                skge_write32(hw, B0_R1_CSR, CSR_IRQ_CL_P);
+
+        if (hwstatus & IS_R2_PAR_ERR)
+                skge_write32(hw, B0_R2_CSR, CSR_IRQ_CL_P);
+
+        if (hwstatus & (IS_IRQ_MST_ERR|IS_IRQ_STAT)) {
+                printk(KERN_ERR PFX "hardware error detected (status 0x%x)\n",
+                       hwstatus);
+
+                skge_pci_clear(hw);
+
+                hwstatus = skge_read32(hw, B0_HWE_ISRC);
+                if (hwstatus & IS_IRQ_STAT) {
+                        printk(KERN_WARNING PFX "IRQ status %x: still set ignoring hardware errors\n",
+                               hwstatus);
+                        hw->intr_mask &= ~IS_HW_ERR;
+                }
+        }
+}
+
+/*
+ * Interrrupt from PHY are handled in tasklet (soft irq)
+ * because accessing phy registers requires spin wait which might
+ * cause excess interrupt latency.
+ */
+static void skge_extirq(unsigned long data)
+{
+        struct skge_hw *hw = (struct skge_hw *) data;
+        int port;
+
+        spin_lock(&hw->phy_lock);
+        for (port = 0; port < 2; port++) {
+                struct net_device *dev = hw->dev[port];
+
+                if (dev && netif_running(dev)) {
+                        struct skge_port *skge = netdev_priv(dev);
+
+                        if (hw->chip_id != CHIP_ID_GENESIS)
+                                yukon_phy_intr(skge);
+                        else if (hw->phy_type == SK_PHY_BCOM)
+                                genesis_bcom_intr(skge);
+                }
+        }
+        spin_unlock(&hw->phy_lock);
+
+        local_irq_disable();
+        hw->intr_mask |= IS_EXT_REG;
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
+        local_irq_enable();
+}
+
+static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct skge_hw *hw = dev_id;
+        u32 status = skge_read32(hw, B0_SP_ISRC);
+
+        if (status == 0 || status == ~0) /* hotplug or shared irq */
+                return IRQ_NONE;
+
+        status &= hw->intr_mask;
+
+        if ((status & IS_R1_F) && netif_rx_schedule_prep(hw->dev[0])) {
+                status &= ~IS_R1_F;
+                hw->intr_mask &= ~IS_R1_F;
+                skge_write32(hw, B0_IMSK, hw->intr_mask);
+                __netif_rx_schedule(hw->dev[0]);
+        }
+
+        if ((status & IS_R2_F) && netif_rx_schedule_prep(hw->dev[1])) {
+                status &= ~IS_R2_F;
+                hw->intr_mask &= ~IS_R2_F;
+                skge_write32(hw, B0_IMSK, hw->intr_mask);
+                __netif_rx_schedule(hw->dev[1]);
+        }
+
+        if (status & IS_XA1_F)
+                skge_tx_intr(hw->dev[0]);
+
+        if (status & IS_XA2_F)
+                skge_tx_intr(hw->dev[1]);
+
+        if (status & IS_MAC1)
+                skge_mac_intr(hw, 0);
+        
+        if (status & IS_MAC2)
+                skge_mac_intr(hw, 1);
+
+        if (status & IS_HW_ERR)
+                skge_error_irq(hw);
+
+        if (status & IS_EXT_REG) {
+                hw->intr_mask &= ~IS_EXT_REG;
+                tasklet_schedule(&hw->ext_tasklet);
+        }
+
+        if (status)
+                skge_write32(hw, B0_IMSK, hw->intr_mask);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void skge_netpoll(struct net_device *dev)
+{
+        struct skge_port *skge = netdev_priv(dev);
+
+        disable_irq(dev->irq);
+        skge_intr(dev->irq, skge->hw, NULL);
+        enable_irq(dev->irq);
+}
+#endif
+
+static int skge_set_mac_address(struct net_device *dev, void *p)
+{
+        struct skge_port *skge = netdev_priv(dev);
+        struct sockaddr *addr = p;
+        int err = 0;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        skge_down(dev);
+        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+        memcpy_toio(skge->hw->regs + B2_MAC_1 + skge->port*8,
+                    dev->dev_addr, ETH_ALEN);
+        memcpy_toio(skge->hw->regs + B2_MAC_2 + skge->port*8,
+                    dev->dev_addr, ETH_ALEN);
+        if (dev->flags & IFF_UP)
+                err = skge_up(dev);
+        return err;
+}
+
+static const struct {
+        u8 id;
+        const char *name;
+} skge_chips[] = {
+        { CHIP_ID_GENESIS,      "Genesis" },
+        { CHIP_ID_YUKON,         "Yukon" },
+        { CHIP_ID_YUKON_LITE,    "Yukon-Lite"},
+        { CHIP_ID_YUKON_LP,      "Yukon-LP"},
+        { CHIP_ID_YUKON_XL,      "Yukon-2 XL"},
+        { CHIP_ID_YUKON_EC,      "YUKON-2 EC"},
+        { CHIP_ID_YUKON_FE,      "YUKON-2 FE"},
+};
+
+static const char *skge_board_name(const struct skge_hw *hw)
+{
+        int i;
+        static char buf[16];
+
+        for (i = 0; i < ARRAY_SIZE(skge_chips); i++)
+                if (skge_chips[i].id == hw->chip_id)
+                        return skge_chips[i].name;
+
+        snprintf(buf, sizeof buf, "chipid 0x%x", hw->chip_id);
+        return buf;
+}
+
+
+/*
+ * Setup the board data structure, but don't bring up
+ * the port(s)
+ */
+static int skge_reset(struct skge_hw *hw)
+{
+        u16 ctst;
+        u8 t8;
+        int i, ports;
+
+        ctst = skge_read16(hw, B0_CTST);
+
+        /* do a SW reset */
+        skge_write8(hw, B0_CTST, CS_RST_SET);
+        skge_write8(hw, B0_CTST, CS_RST_CLR);
+
+        /* clear PCI errors, if any */
+        skge_pci_clear(hw);
+
+        skge_write8(hw, B0_CTST, CS_MRST_CLR);
+
+        /* restore CLK_RUN bits (for Yukon-Lite) */
+        skge_write16(hw, B0_CTST,
+                     ctst & (CS_CLK_RUN_HOT|CS_CLK_RUN_RST|CS_CLK_RUN_ENA));
+
+        hw->chip_id = skge_read8(hw, B2_CHIP_ID);
+        hw->phy_type = skge_read8(hw, B2_E_1) & 0xf;
+        hw->pmd_type = skge_read8(hw, B2_PMD_TYP);
+
+        switch(hw->chip_id) {
+        case CHIP_ID_GENESIS:
+                switch (hw->phy_type) {
+                case SK_PHY_XMAC:
+                        hw->phy_addr = PHY_ADDR_XMAC;
+                        break;
+                case SK_PHY_BCOM:
+                        hw->phy_addr = PHY_ADDR_BCOM;
+                        break;
+                default:
+                        printk(KERN_ERR PFX "%s: unsupported phy type 0x%x\n",
+                               pci_name(hw->pdev), hw->phy_type);
+                        return -EOPNOTSUPP;
+                }
+                break;
+
+        case CHIP_ID_YUKON:
+        case CHIP_ID_YUKON_LITE:
+        case CHIP_ID_YUKON_LP:
+                if (hw->phy_type < SK_PHY_MARV_COPPER && hw->pmd_type != 'S')
+                        hw->phy_type = SK_PHY_MARV_COPPER;
+
+                hw->phy_addr = PHY_ADDR_MARV;
+                if (!iscopper(hw))
+                        hw->phy_type = SK_PHY_MARV_FIBER;
+
+                break;
+
+        default:
+                printk(KERN_ERR PFX "%s: unsupported chip type 0x%x\n",
+                       pci_name(hw->pdev), hw->chip_id);
+                return -EOPNOTSUPP;
+        }
+
+        hw->mac_cfg = skge_read8(hw, B2_MAC_CFG);
+        ports = isdualport(hw) ? 2 : 1;
+
+        /* read the adapters RAM size */
+        t8 = skge_read8(hw, B2_E_0);
+        if (hw->chip_id == CHIP_ID_GENESIS) {
+                if (t8 == 3) {
+                        /* special case: 4 x 64k x 36, offset = 0x80000 */
+                        hw->ram_size = 0x100000;
+                        hw->ram_offset = 0x80000;
+                } else
+                        hw->ram_size = t8 * 512;
+        }
+        else if (t8 == 0)
+                hw->ram_size = 0x20000;
+        else
+                hw->ram_size = t8 * 4096;
+
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                genesis_init(hw);
+        else {
+                /* switch power to VCC (WA for VAUX problem) */
+                skge_write8(hw, B0_POWER_CTRL,
+                            PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_OFF | PC_VCC_ON);
+                for (i = 0; i < ports; i++) {
+                        skge_write16(hw, SKGEMAC_REG(i, GMAC_LINK_CTRL), GMLC_RST_SET);
+                        skge_write16(hw, SKGEMAC_REG(i, GMAC_LINK_CTRL), GMLC_RST_CLR);
+                }
+        }
+
+        /* turn off hardware timer (unused) */
+        skge_write8(hw, B2_TI_CTRL, TIM_STOP);
+        skge_write8(hw, B2_TI_CTRL, TIM_CLR_IRQ);
+        skge_write8(hw, B0_LED, LED_STAT_ON);
+
+        /* enable the Tx Arbiters */
+        for (i = 0; i < ports; i++)
+                skge_write8(hw, SKGEMAC_REG(i, TXA_CTRL), TXA_ENA_ARB);
+
+        /* Initialize ram interface */
+        skge_write16(hw, B3_RI_CTRL, RI_RST_CLR);
+
+        skge_write8(hw, B3_RI_WTO_R1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_WTO_XA1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_WTO_XS1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_R1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_XA1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_XS1, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_WTO_R2, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_WTO_XA2, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_WTO_XS2, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_R2, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_XA2, SK_RI_TO_53);
+        skge_write8(hw, B3_RI_RTO_XS2, SK_RI_TO_53);
+
+        skge_write32(hw, B0_HWE_IMSK, IS_ERR_MSK);
+
+        /* Set interrupt moderation for Transmit only
+         * Receive interrupts avoided by NAPI
+         */
+        skge_write32(hw, B2_IRQM_MSK, IS_XA1_F|IS_XA2_F);
+        skge_write32(hw, B2_IRQM_INI, skge_usecs2clk(hw, 100));
+        skge_write32(hw, B2_IRQM_CTRL, TIM_START);
+
+        hw->intr_mask = IS_HW_ERR | IS_EXT_REG | IS_PORT_1;
+        if (isdualport(hw))
+                hw->intr_mask |= IS_PORT_2;
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
+
+        if (hw->chip_id != CHIP_ID_GENESIS)
+                skge_write8(hw, GMAC_IRQ_MSK, 0);
+
+        spin_lock_bh(&hw->phy_lock);
+        for (i = 0; i < ports; i++) {
+                if (hw->chip_id == CHIP_ID_GENESIS)
+                        genesis_reset(hw, i);
+                else
+                        yukon_reset(hw, i);
+        }
+        spin_unlock_bh(&hw->phy_lock);
+
+        return 0;
+}
+
+/* Initialize network device */
+static struct net_device *skge_devinit(struct skge_hw *hw, int port)
+{
+        struct skge_port *skge;
+        struct net_device *dev = alloc_etherdev(sizeof(*skge));
+
+        if (!dev) {
+                printk(KERN_ERR "skge etherdev alloc failed");
+                return NULL;
+        }
+
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &hw->pdev->dev);
+        dev->open = skge_up;
+        dev->stop = skge_down;
+        dev->hard_start_xmit = skge_xmit_frame;
+        dev->get_stats = skge_get_stats;
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                dev->set_multicast_list = genesis_set_multicast;
+        else
+                dev->set_multicast_list = yukon_set_multicast;
+
+        dev->set_mac_address = skge_set_mac_address;
+        dev->change_mtu = skge_change_mtu;
+        SET_ETHTOOL_OPS(dev, &skge_ethtool_ops);
+        dev->tx_timeout = skge_tx_timeout;
+        dev->watchdog_timeo = TX_WATCHDOG;
+        dev->poll = skge_poll;
+        dev->weight = NAPI_WEIGHT;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = skge_netpoll;
+#endif
+        dev->irq = hw->pdev->irq;
+        dev->features = NETIF_F_LLTX;
+
+        skge = netdev_priv(dev);
+        skge->netdev = dev;
+        skge->hw = hw;
+        skge->msg_enable = netif_msg_init(debug, default_msg);
+        skge->tx_ring.count = DEFAULT_TX_RING_SIZE;
+        skge->rx_ring.count = DEFAULT_RX_RING_SIZE;
+
+        /* Auto speed and flow control */
+        skge->autoneg = AUTONEG_ENABLE;
+        skge->flow_control = FLOW_MODE_SYMMETRIC;
+        skge->duplex = -1;
+        skge->speed = -1;
+        skge->advertising = skge_modes(hw);
+
+        hw->dev[port] = dev;
+
+        skge->port = port;
+
+        spin_lock_init(&skge->tx_lock);
+
+        init_timer(&skge->link_check);
+        skge->link_check.function = skge_link_timer;
+        skge->link_check.data = (unsigned long) skge;
+
+        init_timer(&skge->led_blink);
+        skge->led_blink.function = skge_blink_timer;
+        skge->led_blink.data = (unsigned long) skge;
+
+        if (hw->chip_id != CHIP_ID_GENESIS) {
+                dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
+                skge->rx_csum = 1;
+        }
+
+        /* read the mac address */
+        memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
+
+        /* device is off until link detection */
+        netif_carrier_off(dev);
+        netif_stop_queue(dev);
+
+        return dev;
+}
+
+static void __devinit skge_show_addr(struct net_device *dev)
+{
+        const struct skge_port *skge = netdev_priv(dev);
+
+        if (netif_msg_probe(skge))
+                printk(KERN_INFO PFX "%s: addr %02x:%02x:%02x:%02x:%02x:%02x\n",
+                       dev->name,
+                       dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
+                       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+}
+
+static int __devinit skge_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        struct net_device *dev, *dev1;
+        struct skge_hw *hw;
+        int err, using_dac = 0;
+
+        if ((err = pci_enable_device(pdev))) {
+                printk(KERN_ERR PFX "%s cannot enable PCI device\n",
+                       pci_name(pdev));
+                goto err_out;
+        }
+
+        if ((err = pci_request_regions(pdev, DRV_NAME))) {
+                printk(KERN_ERR PFX "%s cannot obtain PCI resources\n",
+                       pci_name(pdev));
+                goto err_out_disable_pdev;
+        }
+
+        pci_set_master(pdev);
+
+        if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)))
+                using_dac = 1;
+        else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+                printk(KERN_ERR PFX "%s no usable DMA configuration\n",
+                       pci_name(pdev));
+                goto err_out_free_regions;
+        }
+
+#ifdef __BIG_ENDIAN
+        /* byte swap decriptors in hardware */
+        {
+                u32 reg;
+
+                pci_read_config_dword(pdev, PCI_DEV_REG2, &reg);
+                reg |= PCI_REV_DESC;
+                pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
+        }
+#endif
+
+        err = -ENOMEM;
+        hw = kmalloc(sizeof(*hw), GFP_KERNEL);
+        if (!hw) {
+                printk(KERN_ERR PFX "%s: cannot allocate hardware struct\n",
+                       pci_name(pdev));
+                goto err_out_free_regions;
+        }
+
+        memset(hw, 0, sizeof(*hw));
+        hw->pdev = pdev;
+        spin_lock_init(&hw->phy_lock);
+        tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw);
+
+        hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+        if (!hw->regs) {
+                printk(KERN_ERR PFX "%s: cannot map device registers\n",
+                       pci_name(pdev));
+                goto err_out_free_hw;
+        }
+
+        if ((err = request_irq(pdev->irq, skge_intr, SA_SHIRQ, DRV_NAME, hw))) {
+                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
+                       pci_name(pdev), pdev->irq);
+                goto err_out_iounmap;
+        }
+        pci_set_drvdata(pdev, hw);
+
+        err = skge_reset(hw);
+        if (err)
+                goto err_out_free_irq;
+
+        printk(KERN_INFO PFX "addr 0x%lx irq %d chip %s rev %d\n",
+               pci_resource_start(pdev, 0), pdev->irq,
+               skge_board_name(hw), chip_rev(hw));
+
+        if ((dev = skge_devinit(hw, 0)) == NULL)
+                goto err_out_led_off;
+
+        if (using_dac)
+                dev->features |= NETIF_F_HIGHDMA;
+
+        if ((err = register_netdev(dev))) {
+                printk(KERN_ERR PFX "%s: cannot register net device\n",
+                       pci_name(pdev));
+                goto err_out_free_netdev;
+        }
+
+        skge_show_addr(dev);
+
+        if (isdualport(hw) && (dev1 = skge_devinit(hw, 1))) {
+                if (using_dac)
+                        dev1->features |= NETIF_F_HIGHDMA;
+
+                if (register_netdev(dev1) == 0)
+                        skge_show_addr(dev1);
+                else {
+                        /* Failure to register second port need not be fatal */
+                        printk(KERN_WARNING PFX "register of second port failed\n");
+                        hw->dev[1] = NULL;
+                        free_netdev(dev1);
+                }
+        }
+
+        return 0;
+
+err_out_free_netdev:
+        free_netdev(dev);
+err_out_led_off:
+        skge_write16(hw, B0_LED, LED_STAT_OFF);
+err_out_free_irq:
+        free_irq(pdev->irq, hw);
+err_out_iounmap:
+        iounmap(hw->regs);
+err_out_free_hw:
+        kfree(hw);
+err_out_free_regions:
+        pci_release_regions(pdev);
+err_out_disable_pdev:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+err_out:
+        return err;
+}
+
+static void __devexit skge_remove(struct pci_dev *pdev)
+{
+        struct skge_hw *hw  = pci_get_drvdata(pdev);
+        struct net_device *dev0, *dev1;
+
+        if(!hw)
+                return;
+
+        if ((dev1 = hw->dev[1]))
+                unregister_netdev(dev1);
+        dev0 = hw->dev[0];
+        unregister_netdev(dev0);
+
+        tasklet_kill(&hw->ext_tasklet);
+
+        free_irq(pdev->irq, hw);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        if (dev1)
+                free_netdev(dev1);
+        free_netdev(dev0);
+        skge_write16(hw, B0_LED, LED_STAT_OFF);
+        iounmap(hw->regs);
+        kfree(hw);
+        pci_set_drvdata(pdev, NULL);
+}
+
+#ifdef CONFIG_PM
+static int skge_suspend(struct pci_dev *pdev, u32 state)
+{
+        struct skge_hw *hw  = pci_get_drvdata(pdev);
+        int i, wol = 0;
+
+        for(i = 0; i < 2; i++) {
+                struct net_device *dev = hw->dev[i];
+
+                if (dev) {
+                        struct skge_port *skge = netdev_priv(dev);
+                        if (netif_running(dev)) {
+                                netif_carrier_off(dev);
+                                skge_down(dev);
+                        }
+                        netif_device_detach(dev);
+                        wol |= skge->wol;
+                }
+        }
+
+        pci_save_state(pdev);
+        pci_enable_wake(pdev, state, wol);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int skge_resume(struct pci_dev *pdev)
+{
+        struct skge_hw *hw  = pci_get_drvdata(pdev);
+        int i;
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, PCI_D0, 0);
+
+        skge_reset(hw);
+
+        for(i = 0; i < 2; i++) {
+                struct net_device *dev = hw->dev[i];
+                if (dev) {
+                        netif_device_attach(dev);
+                        if(netif_running(dev))
+                                skge_up(dev);
+                }
+        }
+        return 0;
+}
+#endif
+
+static struct pci_driver skge_driver = {
+        .name =         DRV_NAME,
+        .id_table =     skge_id_table,
+        .probe =        skge_probe,
+        .remove =       __devexit_p(skge_remove),
+#ifdef CONFIG_PM
+        .suspend =      skge_suspend,
+        .resume =       skge_resume,
+#endif
+};
+
+static int __init skge_init_module(void)
+{
+        return pci_module_init(&skge_driver);
+}
+
+static void __exit skge_cleanup_module(void)
+{
+        pci_unregister_driver(&skge_driver);
+}
+
+module_init(skge_init_module);
+module_exit(skge_cleanup_module);
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
new file mode 100644
index 000000000000..36c62b68fab4
--- /dev/null
+++ b/drivers/net/skge.h
@@ -0,0 +1,3005 @@
+/*
+ * Definitions for the new Marvell Yukon / SysKonenct driver.
+ */
+#ifndef _SKGE_H
+#define _SKGE_H
+
+/* PCI config registers */
+#define PCI_DEV_REG1    0x40
+#define PCI_DEV_REG2    0x44
+#ifndef PCI_VPD
+#define PCI_VPD         0x50
+#endif
+
+/*      PCI_OUR_REG_2           32 bit  Our Register 2 */
+enum {
+        PCI_VPD_WR_THR  = 0xff<<24, /* Bit 31..24:      VPD Write Threshold */
+        PCI_DEV_SEL     = 0x7f<<17, /* Bit 23..17:      EEPROM Device Select */
+        PCI_VPD_ROM_SZ  = 7   <<14, /* Bit 16..14:      VPD ROM Size    */
+                                    /* Bit 13..12:      reserved        */
+        PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */
+        PCI_REV_DESC    = 1<<2, /* Reverse Desc. Bytes */
+        PCI_USEDATA64   = 1<<0, /* Use 64Bit Data bus ext */
+};
+
+/*      PCI_VPD_ADR_REG         16 bit  VPD Address Register */
+enum {
+        PCI_VPD_FLAG    = 1<<15,  /* starts VPD rd/wr cycle */
+        PCI_VPD_ADR_MSK =0x7fffL, /* Bit 14.. 0:        VPD Address Mask */
+        VPD_RES_ID      = 0x82,
+        VPD_RES_READ    = 0x90,
+        VPD_RES_WRITE   = 0x81,
+        VPD_RES_END     = 0x78,
+};
+
+
+#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
+                               PCI_STATUS_SIG_SYSTEM_ERROR | \
+                               PCI_STATUS_REC_MASTER_ABORT | \
+                               PCI_STATUS_REC_TARGET_ABORT | \
+                               PCI_STATUS_PARITY)
+
+
+enum csr_regs {
+        B0_RAP  = 0x0000,
+        B0_CTST = 0x0004,
+        B0_LED  = 0x0006,
+        B0_POWER_CTRL   = 0x0007,
+        B0_ISRC = 0x0008,
+        B0_IMSK = 0x000c,
+        B0_HWE_ISRC     = 0x0010,
+        B0_HWE_IMSK     = 0x0014,
+        B0_SP_ISRC      = 0x0018,
+        B0_XM1_IMSK     = 0x0020,
+        B0_XM1_ISRC     = 0x0028,
+        B0_XM1_PHY_ADDR = 0x0030,
+        B0_XM1_PHY_DATA = 0x0034,
+        B0_XM2_IMSK     = 0x0040,
+        B0_XM2_ISRC     = 0x0048,
+        B0_XM2_PHY_ADDR = 0x0050,
+        B0_XM2_PHY_DATA = 0x0054,
+        B0_R1_CSR       = 0x0060,
+        B0_R2_CSR       = 0x0064,
+        B0_XS1_CSR      = 0x0068,
+        B0_XA1_CSR      = 0x006c,
+        B0_XS2_CSR      = 0x0070,
+        B0_XA2_CSR      = 0x0074,
+
+        B2_MAC_1        = 0x0100,
+        B2_MAC_2        = 0x0108,
+        B2_MAC_3        = 0x0110,
+        B2_CONN_TYP     = 0x0118,
+        B2_PMD_TYP      = 0x0119,
+        B2_MAC_CFG      = 0x011a,
+        B2_CHIP_ID      = 0x011b,
+        B2_E_0          = 0x011c,
+        B2_E_1          = 0x011d,
+        B2_E_2          = 0x011e,
+        B2_E_3          = 0x011f,
+        B2_FAR          = 0x0120,
+        B2_FDP          = 0x0124,
+        B2_LD_CTRL      = 0x0128,
+        B2_LD_TEST      = 0x0129,
+        B2_TI_INI       = 0x0130,
+        B2_TI_VAL       = 0x0134,
+        B2_TI_CTRL      = 0x0138,
+        B2_TI_TEST      = 0x0139,
+        B2_IRQM_INI     = 0x0140,
+        B2_IRQM_VAL     = 0x0144,
+        B2_IRQM_CTRL    = 0x0148,
+        B2_IRQM_TEST    = 0x0149,
+        B2_IRQM_MSK     = 0x014c,
+        B2_IRQM_HWE_MSK = 0x0150,
+        B2_TST_CTRL1    = 0x0158,
+        B2_TST_CTRL2    = 0x0159,
+        B2_GP_IO        = 0x015c,
+        B2_I2C_CTRL     = 0x0160,
+        B2_I2C_DATA     = 0x0164,
+        B2_I2C_IRQ      = 0x0168,
+        B2_I2C_SW       = 0x016c,
+        B2_BSC_INI      = 0x0170,
+        B2_BSC_VAL      = 0x0174,
+        B2_BSC_CTRL     = 0x0178,
+        B2_BSC_STAT     = 0x0179,
+        B2_BSC_TST      = 0x017a,
+
+        B3_RAM_ADDR     = 0x0180,
+        B3_RAM_DATA_LO  = 0x0184,
+        B3_RAM_DATA_HI  = 0x0188,
+        B3_RI_WTO_R1    = 0x0190,
+        B3_RI_WTO_XA1   = 0x0191,
+        B3_RI_WTO_XS1   = 0x0192,
+        B3_RI_RTO_R1    = 0x0193,
+        B3_RI_RTO_XA1   = 0x0194,
+        B3_RI_RTO_XS1   = 0x0195,
+        B3_RI_WTO_R2    = 0x0196,
+        B3_RI_WTO_XA2   = 0x0197,
+        B3_RI_WTO_XS2   = 0x0198,
+        B3_RI_RTO_R2    = 0x0199,
+        B3_RI_RTO_XA2   = 0x019a,
+        B3_RI_RTO_XS2   = 0x019b,
+        B3_RI_TO_VAL    = 0x019c,
+        B3_RI_CTRL      = 0x01a0,
+        B3_RI_TEST      = 0x01a2,
+        B3_MA_TOINI_RX1 = 0x01b0,
+        B3_MA_TOINI_RX2 = 0x01b1,
+        B3_MA_TOINI_TX1 = 0x01b2,
+        B3_MA_TOINI_TX2 = 0x01b3,
+        B3_MA_TOVAL_RX1 = 0x01b4,
+        B3_MA_TOVAL_RX2 = 0x01b5,
+        B3_MA_TOVAL_TX1 = 0x01b6,
+        B3_MA_TOVAL_TX2 = 0x01b7,
+        B3_MA_TO_CTRL   = 0x01b8,
+        B3_MA_TO_TEST   = 0x01ba,
+        B3_MA_RCINI_RX1 = 0x01c0,
+        B3_MA_RCINI_RX2 = 0x01c1,
+        B3_MA_RCINI_TX1 = 0x01c2,
+        B3_MA_RCINI_TX2 = 0x01c3,
+        B3_MA_RCVAL_RX1 = 0x01c4,
+        B3_MA_RCVAL_RX2 = 0x01c5,
+        B3_MA_RCVAL_TX1 = 0x01c6,
+        B3_MA_RCVAL_TX2 = 0x01c7,
+        B3_MA_RC_CTRL   = 0x01c8,
+        B3_MA_RC_TEST   = 0x01ca,
+        B3_PA_TOINI_RX1 = 0x01d0,
+        B3_PA_TOINI_RX2 = 0x01d4,
+        B3_PA_TOINI_TX1 = 0x01d8,
+        B3_PA_TOINI_TX2 = 0x01dc,
+        B3_PA_TOVAL_RX1 = 0x01e0,
+        B3_PA_TOVAL_RX2 = 0x01e4,
+        B3_PA_TOVAL_TX1 = 0x01e8,
+        B3_PA_TOVAL_TX2 = 0x01ec,
+        B3_PA_CTRL      = 0x01f0,
+        B3_PA_TEST      = 0x01f2,
+};
+
+/*      B0_CTST                 16 bit  Control/Status register */
+enum {
+        CS_CLK_RUN_HOT  = 1<<13,/* CLK_RUN hot m. (YUKON-Lite only) */
+        CS_CLK_RUN_RST  = 1<<12,/* CLK_RUN reset  (YUKON-Lite only) */
+        CS_CLK_RUN_ENA  = 1<<11,/* CLK_RUN enable (YUKON-Lite only) */
+        CS_VAUX_AVAIL   = 1<<10,/* VAUX available (YUKON only) */
+        CS_BUS_CLOCK    = 1<<9, /* Bus Clock 0/1 = 33/66 MHz */
+        CS_BUS_SLOT_SZ  = 1<<8, /* Slot Size 0/1 = 32/64 bit slot */
+        CS_ST_SW_IRQ    = 1<<7, /* Set IRQ SW Request */
+        CS_CL_SW_IRQ    = 1<<6, /* Clear IRQ SW Request */
+        CS_STOP_DONE    = 1<<5, /* Stop Master is finished */
+        CS_STOP_MAST    = 1<<4, /* Command Bit to stop the master */
+        CS_MRST_CLR     = 1<<3, /* Clear Master reset   */
+        CS_MRST_SET     = 1<<2, /* Set Master reset     */
+        CS_RST_CLR      = 1<<1, /* Clear Software reset */
+        CS_RST_SET      = 1,    /* Set   Software reset */
+
+/*      B0_LED                   8 Bit  LED register */
+/* Bit  7.. 2:  reserved */
+        LED_STAT_ON     = 1<<1, /* Status LED on        */
+        LED_STAT_OFF    = 1,            /* Status LED off       */
+
+/*      B0_POWER_CTRL    8 Bit  Power Control reg (YUKON only) */
+        PC_VAUX_ENA     = 1<<7, /* Switch VAUX Enable  */
+        PC_VAUX_DIS     = 1<<6, /* Switch VAUX Disable */
+        PC_VCC_ENA      = 1<<5, /* Switch VCC Enable  */
+        PC_VCC_DIS      = 1<<4, /* Switch VCC Disable */
+        PC_VAUX_ON      = 1<<3, /* Switch VAUX On  */
+        PC_VAUX_OFF     = 1<<2, /* Switch VAUX Off */
+        PC_VCC_ON       = 1<<1, /* Switch VCC On  */
+        PC_VCC_OFF      = 1<<0, /* Switch VCC Off */
+};
+
+/*      B2_IRQM_MSK     32 bit  IRQ Moderation Mask */
+enum {
+        IS_ALL_MSK      = 0xbffffffful, /* All Interrupt bits */
+        IS_HW_ERR       = 1<<31,        /* Interrupt HW Error */
+                                        /* Bit 30:      reserved */
+        IS_PA_TO_RX1    = 1<<29,        /* Packet Arb Timeout Rx1 */
+        IS_PA_TO_RX2    = 1<<28,        /* Packet Arb Timeout Rx2 */
+        IS_PA_TO_TX1    = 1<<27,        /* Packet Arb Timeout Tx1 */
+        IS_PA_TO_TX2    = 1<<26,        /* Packet Arb Timeout Tx2 */
+        IS_I2C_READY    = 1<<25,        /* IRQ on end of I2C Tx */
+        IS_IRQ_SW       = 1<<24,        /* SW forced IRQ        */
+        IS_EXT_REG      = 1<<23,        /* IRQ from LM80 or PHY (GENESIS only) */
+                                        /* IRQ from PHY (YUKON only) */
+        IS_TIMINT       = 1<<22,        /* IRQ from Timer       */
+        IS_MAC1         = 1<<21,        /* IRQ from MAC 1       */
+        IS_LNK_SYNC_M1  = 1<<20,        /* Link Sync Cnt wrap MAC 1 */
+        IS_MAC2         = 1<<19,        /* IRQ from MAC 2       */
+        IS_LNK_SYNC_M2  = 1<<18,        /* Link Sync Cnt wrap MAC 2 */
+/* Receive Queue 1 */
+        IS_R1_B         = 1<<17,        /* Q_R1 End of Buffer */
+        IS_R1_F         = 1<<16,        /* Q_R1 End of Frame */
+        IS_R1_C         = 1<<15,        /* Q_R1 Encoding Error */
+/* Receive Queue 2 */
+        IS_R2_B         = 1<<14,        /* Q_R2 End of Buffer */
+        IS_R2_F         = 1<<13,        /* Q_R2 End of Frame */
+        IS_R2_C         = 1<<12,        /* Q_R2 Encoding Error */
+/* Synchronous Transmit Queue 1 */
+        IS_XS1_B        = 1<<11,        /* Q_XS1 End of Buffer */
+        IS_XS1_F        = 1<<10,        /* Q_XS1 End of Frame */
+        IS_XS1_C        = 1<<9,         /* Q_XS1 Encoding Error */
+/* Asynchronous Transmit Queue 1 */
+        IS_XA1_B        = 1<<8,         /* Q_XA1 End of Buffer */
+        IS_XA1_F        = 1<<7,         /* Q_XA1 End of Frame */
+        IS_XA1_C        = 1<<6,         /* Q_XA1 Encoding Error */
+/* Synchronous Transmit Queue 2 */
+        IS_XS2_B        = 1<<5,         /* Q_XS2 End of Buffer */
+        IS_XS2_F        = 1<<4,         /* Q_XS2 End of Frame */
+        IS_XS2_C        = 1<<3,         /* Q_XS2 Encoding Error */
+/* Asynchronous Transmit Queue 2 */
+        IS_XA2_B        = 1<<2,         /* Q_XA2 End of Buffer */
+        IS_XA2_F        = 1<<1,         /* Q_XA2 End of Frame */
+        IS_XA2_C        = 1<<0,         /* Q_XA2 Encoding Error */
+
+        IS_PORT_1       = IS_XA1_F| IS_R1_F| IS_MAC1,
+        IS_PORT_2       = IS_XA2_F| IS_R2_F| IS_MAC2,
+};
+
+
+/*      B2_IRQM_HWE_MSK 32 bit  IRQ Moderation HW Error Mask */
+enum {
+        IS_ERR_MSK      = 0x00003fff,/*                 All Error bits */
+
+        IS_IRQ_TIST_OV  = 1<<13, /* Time Stamp Timer Overflow (YUKON only) */
+        IS_IRQ_SENSOR   = 1<<12, /* IRQ from Sensor (YUKON only) */
+        IS_IRQ_MST_ERR  = 1<<11, /* IRQ master error detected */
+        IS_IRQ_STAT     = 1<<10, /* IRQ status exception */
+        IS_NO_STAT_M1   = 1<<9, /* No Rx Status from MAC 1 */
+        IS_NO_STAT_M2   = 1<<8, /* No Rx Status from MAC 2 */
+        IS_NO_TIST_M1   = 1<<7, /* No Time Stamp from MAC 1 */
+        IS_NO_TIST_M2   = 1<<6, /* No Time Stamp from MAC 2 */
+        IS_RAM_RD_PAR   = 1<<5, /* RAM Read  Parity Error */
+        IS_RAM_WR_PAR   = 1<<4, /* RAM Write Parity Error */
+        IS_M1_PAR_ERR   = 1<<3, /* MAC 1 Parity Error */
+        IS_M2_PAR_ERR   = 1<<2, /* MAC 2 Parity Error */
+        IS_R1_PAR_ERR   = 1<<1, /* Queue R1 Parity Error */
+        IS_R2_PAR_ERR   = 1<<0, /* Queue R2 Parity Error */
+};
+
+/*      B2_TST_CTRL1     8 bit  Test Control Register 1 */
+enum {
+        TST_FRC_DPERR_MR = 1<<7, /* force DATAPERR on MST RD */
+        TST_FRC_DPERR_MW = 1<<6, /* force DATAPERR on MST WR */
+        TST_FRC_DPERR_TR = 1<<5, /* force DATAPERR on TRG RD */
+        TST_FRC_DPERR_TW = 1<<4, /* force DATAPERR on TRG WR */
+        TST_FRC_APERR_M  = 1<<3, /* force ADDRPERR on MST */
+        TST_FRC_APERR_T  = 1<<2, /* force ADDRPERR on TRG */
+        TST_CFG_WRITE_ON = 1<<1, /* Enable  Config Reg WR */
+        TST_CFG_WRITE_OFF= 1<<0, /* Disable Config Reg WR */
+};
+
+/*      B2_MAC_CFG               8 bit  MAC Configuration / Chip Revision */
+enum {
+        CFG_CHIP_R_MSK    = 0xf<<4,     /* Bit 7.. 4: Chip Revision */
+                                        /* Bit 3.. 2:   reserved */
+        CFG_DIS_M2_CLK    = 1<<1,       /* Disable Clock for 2nd MAC */
+        CFG_SNG_MAC       = 1<<0,       /* MAC Config: 0=2 MACs / 1=1 MAC*/
+};
+
+/*      B2_CHIP_ID               8 bit  Chip Identification Number */
+enum {
+        CHIP_ID_GENESIS    = 0x0a, /* Chip ID for GENESIS */
+        CHIP_ID_YUKON      = 0xb0, /* Chip ID for YUKON */
+        CHIP_ID_YUKON_LITE = 0xb1, /* Chip ID for YUKON-Lite (Rev. A1-A3) */
+        CHIP_ID_YUKON_LP   = 0xb2, /* Chip ID for YUKON-LP */
+        CHIP_ID_YUKON_XL   = 0xb3, /* Chip ID for YUKON-2 XL */
+        CHIP_ID_YUKON_EC   = 0xb6, /* Chip ID for YUKON-2 EC */
+        CHIP_ID_YUKON_FE   = 0xb7, /* Chip ID for YUKON-2 FE */
+
+        CHIP_REV_YU_LITE_A1  = 3,       /* Chip Rev. for YUKON-Lite A1,A2 */
+        CHIP_REV_YU_LITE_A3  = 7,       /* Chip Rev. for YUKON-Lite A3 */
+};
+
+/*      B2_LD_TEST               8 bit  EPROM loader test register */
+enum {
+        LD_T_ON         = 1<<3, /* Loader Test mode on */
+        LD_T_OFF        = 1<<2, /* Loader Test mode off */
+        LD_T_STEP       = 1<<1, /* Decrement FPROM addr. Counter */
+        LD_START        = 1<<0, /* Start loading FPROM */
+};
+
+/*      B2_TI_CTRL               8 bit  Timer control */
+/*      B2_IRQM_CTRL     8 bit  IRQ Moderation Timer Control */
+enum {
+        TIM_START       = 1<<2, /* Start Timer */
+        TIM_STOP        = 1<<1, /* Stop  Timer */
+        TIM_CLR_IRQ     = 1<<0, /* Clear Timer IRQ (!IRQM) */
+};
+
+/*      B2_TI_TEST               8 Bit  Timer Test */
+/*      B2_IRQM_TEST     8 bit  IRQ Moderation Timer Test */
+/*      B28_DPT_TST              8 bit  Descriptor Poll Timer Test Reg */
+enum {
+        TIM_T_ON        = 1<<2, /* Test mode on */
+        TIM_T_OFF       = 1<<1, /* Test mode off */
+        TIM_T_STEP      = 1<<0, /* Test step */
+};
+
+/*      B28_DPT_INI     32 bit  Descriptor Poll Timer Init Val */
+/*      B28_DPT_VAL     32 bit  Descriptor Poll Timer Curr Val */
+/*      B28_DPT_CTRL     8 bit  Descriptor Poll Timer Ctrl Reg */
+enum {
+        DPT_MSK = 0x00ffffffL,  /* Bit 23.. 0:  Desc Poll Timer Bits */
+
+        DPT_START       = 1<<1, /* Start Descriptor Poll Timer */
+        DPT_STOP        = 1<<0, /* Stop  Descriptor Poll Timer */
+};
+
+/*      B2_GP_IO                32 bit  General Purpose I/O Register */
+enum {
+        GP_DIR_9 = 1<<25, /* IO_9 direct, 0=In/1=Out */
+        GP_DIR_8 = 1<<24, /* IO_8 direct, 0=In/1=Out */
+        GP_DIR_7 = 1<<23, /* IO_7 direct, 0=In/1=Out */
+        GP_DIR_6 = 1<<22, /* IO_6 direct, 0=In/1=Out */
+        GP_DIR_5 = 1<<21, /* IO_5 direct, 0=In/1=Out */
+        GP_DIR_4 = 1<<20, /* IO_4 direct, 0=In/1=Out */
+        GP_DIR_3 = 1<<19, /* IO_3 direct, 0=In/1=Out */
+        GP_DIR_2 = 1<<18, /* IO_2 direct, 0=In/1=Out */
+        GP_DIR_1 = 1<<17, /* IO_1 direct, 0=In/1=Out */
+        GP_DIR_0 = 1<<16, /* IO_0 direct, 0=In/1=Out */
+
+        GP_IO_9 = 1<<9, /* IO_9 pin */
+        GP_IO_8 = 1<<8, /* IO_8 pin */
+        GP_IO_7 = 1<<7, /* IO_7 pin */
+        GP_IO_6 = 1<<6, /* IO_6 pin */
+        GP_IO_5 = 1<<5, /* IO_5 pin */
+        GP_IO_4 = 1<<4, /* IO_4 pin */
+        GP_IO_3 = 1<<3, /* IO_3 pin */
+        GP_IO_2 = 1<<2, /* IO_2 pin */
+        GP_IO_1 = 1<<1, /* IO_1 pin */
+        GP_IO_0 = 1<<0, /* IO_0 pin */
+};
+
+/* Rx/Tx Path related Arbiter Test Registers */
+/*      B3_MA_TO_TEST   16 bit  MAC Arbiter Timeout Test Reg */
+/*      B3_MA_RC_TEST   16 bit  MAC Arbiter Recovery Test Reg */
+/*      B3_PA_TEST              16 bit  Packet Arbiter Test Register */
+/*                      Bit 15, 11, 7, and 3 are reserved in B3_PA_TEST */
+enum {
+        TX2_T_EV        = 1<<15,/* TX2 Timeout/Recv Event occured */
+        TX2_T_ON        = 1<<14,/* TX2 Timeout/Recv Timer Test On */
+        TX2_T_OFF       = 1<<13,/* TX2 Timeout/Recv Timer Tst Off */
+        TX2_T_STEP      = 1<<12,/* TX2 Timeout/Recv Timer Step */
+        TX1_T_EV        = 1<<11,/* TX1 Timeout/Recv Event occured */
+        TX1_T_ON        = 1<<10,/* TX1 Timeout/Recv Timer Test On */
+        TX1_T_OFF       = 1<<9, /* TX1 Timeout/Recv Timer Tst Off */
+        TX1_T_STEP      = 1<<8, /* TX1 Timeout/Recv Timer Step */
+        RX2_T_EV        = 1<<7, /* RX2 Timeout/Recv Event occured */
+        RX2_T_ON        = 1<<6, /* RX2 Timeout/Recv Timer Test On */
+        RX2_T_OFF       = 1<<5, /* RX2 Timeout/Recv Timer Tst Off */
+        RX2_T_STEP      = 1<<4, /* RX2 Timeout/Recv Timer Step */
+        RX1_T_EV        = 1<<3, /* RX1 Timeout/Recv Event occured */
+        RX1_T_ON        = 1<<2, /* RX1 Timeout/Recv Timer Test On */
+        RX1_T_OFF       = 1<<1, /* RX1 Timeout/Recv Timer Tst Off */
+        RX1_T_STEP      = 1<<0, /* RX1 Timeout/Recv Timer Step */
+};
+
+/* Descriptor Bit Definition */
+/*      TxCtrl          Transmit Buffer Control Field */
+/*      RxCtrl          Receive  Buffer Control Field */
+enum {
+        BMU_OWN         = 1<<31, /* OWN bit: 0=host/1=BMU */
+        BMU_STF         = 1<<30, /* Start of Frame */
+        BMU_EOF         = 1<<29, /* End of Frame */
+        BMU_IRQ_EOB     = 1<<28, /* Req "End of Buffer" IRQ */
+        BMU_IRQ_EOF     = 1<<27, /* Req "End of Frame" IRQ */
+                                /* TxCtrl specific bits */
+        BMU_STFWD       = 1<<26, /* (Tx)        Store & Forward Frame */
+        BMU_NO_FCS      = 1<<25, /* (Tx) Disable MAC FCS (CRC) generation */
+        BMU_SW  = 1<<24, /* (Tx)        1 bit res. for SW use */
+                                /* RxCtrl specific bits */
+        BMU_DEV_0       = 1<<26, /* (Rx)        Transfer data to Dev0 */
+        BMU_STAT_VAL    = 1<<25, /* (Rx)        Rx Status Valid */
+        BMU_TIST_VAL    = 1<<24, /* (Rx)        Rx TimeStamp Valid */
+                        /* Bit 23..16:  BMU Check Opcodes */
+        BMU_CHECK       = 0x55<<16, /* Default BMU check */
+        BMU_TCP_CHECK   = 0x56<<16, /* Descr with TCP ext */
+        BMU_UDP_CHECK   = 0x57<<16, /* Descr with UDP ext (YUKON only) */
+        BMU_BBC         = 0xffffL, /* Bit 15.. 0:       Buffer Byte Counter */
+};
+
+/*      B2_BSC_CTRL              8 bit  Blink Source Counter Control */
+enum {
+         BSC_START      = 1<<1, /* Start Blink Source Counter */
+         BSC_STOP       = 1<<0, /* Stop  Blink Source Counter */
+};
+
+/*      B2_BSC_STAT              8 bit  Blink Source Counter Status */
+enum {
+        BSC_SRC         = 1<<0, /* Blink Source, 0=Off / 1=On */
+};
+
+/*      B2_BSC_TST              16 bit  Blink Source Counter Test Reg */
+enum {
+        BSC_T_ON        = 1<<2, /* Test mode on */
+        BSC_T_OFF       = 1<<1, /* Test mode off */
+        BSC_T_STEP      = 1<<0, /* Test step */
+};
+
+/*      B3_RAM_ADDR             32 bit  RAM Address, to read or write */
+                                        /* Bit 31..19:  reserved */
+#define RAM_ADR_RAN     0x0007ffffL     /* Bit 18.. 0:  RAM Address Range */
+/* RAM Interface Registers */
+
+/*      B3_RI_CTRL              16 bit  RAM Iface Control Register */
+enum {
+        RI_CLR_RD_PERR  = 1<<9, /* Clear IRQ RAM Read Parity Err */
+        RI_CLR_WR_PERR  = 1<<8, /* Clear IRQ RAM Write Parity Err*/
+
+        RI_RST_CLR      = 1<<1, /* Clear RAM Interface Reset */
+        RI_RST_SET      = 1<<0, /* Set   RAM Interface Reset */
+};
+
+/*      B3_RI_TEST               8 bit  RAM Iface Test Register */
+enum {
+        RI_T_EV = 1<<3, /* Timeout Event occured */
+        RI_T_ON = 1<<2, /* Timeout Timer Test On */
+        RI_T_OFF        = 1<<1, /* Timeout Timer Test Off */
+        RI_T_STEP       = 1<<0, /* Timeout Timer Step */
+};
+
+/* MAC Arbiter Registers */
+/*      B3_MA_TO_CTRL   16 bit  MAC Arbiter Timeout Ctrl Reg */
+enum {
+        MA_FOE_ON       = 1<<3, /* XMAC Fast Output Enable ON */
+        MA_FOE_OFF      = 1<<2, /* XMAC Fast Output Enable OFF */
+        MA_RST_CLR      = 1<<1, /* Clear MAC Arbiter Reset */
+        MA_RST_SET      = 1<<0, /* Set   MAC Arbiter Reset */
+
+};
+
+/* Timeout values */
+#define SK_MAC_TO_53    72              /* MAC arbiter timeout */
+#define SK_PKT_TO_53    0x2000          /* Packet arbiter timeout */
+#define SK_PKT_TO_MAX   0xffff          /* Maximum value */
+#define SK_RI_TO_53     36              /* RAM interface timeout */
+
+
+/*      B3_MA_RC_CTRL   16 bit  MAC Arbiter Recovery Ctrl Reg */
+enum {
+        MA_ENA_REC_TX2  = 1<<7, /* Enable  Recovery Timer TX2 */
+        MA_DIS_REC_TX2  = 1<<6, /* Disable Recovery Timer TX2 */
+        MA_ENA_REC_TX1  = 1<<5, /* Enable  Recovery Timer TX1 */
+        MA_DIS_REC_TX1  = 1<<4, /* Disable Recovery Timer TX1 */
+        MA_ENA_REC_RX2  = 1<<3, /* Enable  Recovery Timer RX2 */
+        MA_DIS_REC_RX2  = 1<<2, /* Disable Recovery Timer RX2 */
+        MA_ENA_REC_RX1  = 1<<1, /* Enable  Recovery Timer RX1 */
+        MA_DIS_REC_RX1  = 1<<0, /* Disable Recovery Timer RX1 */
+};
+
+/* Packet Arbiter Registers */
+/*      B3_PA_CTRL              16 bit  Packet Arbiter Ctrl Register */
+enum {
+        PA_CLR_TO_TX2   = 1<<13,        /* Clear IRQ Packet Timeout TX2 */
+        PA_CLR_TO_TX1   = 1<<12,        /* Clear IRQ Packet Timeout TX1 */
+        PA_CLR_TO_RX2   = 1<<11,        /* Clear IRQ Packet Timeout RX2 */
+        PA_CLR_TO_RX1   = 1<<10,        /* Clear IRQ Packet Timeout RX1 */
+        PA_ENA_TO_TX2   = 1<<9, /* Enable  Timeout Timer TX2 */
+        PA_DIS_TO_TX2   = 1<<8, /* Disable Timeout Timer TX2 */
+        PA_ENA_TO_TX1   = 1<<7, /* Enable  Timeout Timer TX1 */
+        PA_DIS_TO_TX1   = 1<<6, /* Disable Timeout Timer TX1 */
+        PA_ENA_TO_RX2   = 1<<5, /* Enable  Timeout Timer RX2 */
+        PA_DIS_TO_RX2   = 1<<4, /* Disable Timeout Timer RX2 */
+        PA_ENA_TO_RX1   = 1<<3, /* Enable  Timeout Timer RX1 */
+        PA_DIS_TO_RX1   = 1<<2, /* Disable Timeout Timer RX1 */
+        PA_RST_CLR      = 1<<1, /* Clear MAC Arbiter Reset */
+        PA_RST_SET      = 1<<0, /* Set   MAC Arbiter Reset */
+};
+
+#define PA_ENA_TO_ALL   (PA_ENA_TO_RX1 | PA_ENA_TO_RX2 |\
+                                                PA_ENA_TO_TX1 | PA_ENA_TO_TX2)
+
+
+/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+/*      TXA_ITI_INI             32 bit  Tx Arb Interval Timer Init Val */
+/*      TXA_ITI_VAL             32 bit  Tx Arb Interval Timer Value */
+/*      TXA_LIM_INI             32 bit  Tx Arb Limit Counter Init Val */
+/*      TXA_LIM_VAL             32 bit  Tx Arb Limit Counter Value */
+
+#define TXA_MAX_VAL     0x00ffffffUL    /* Bit 23.. 0:  Max TXA Timer/Cnt Val */
+
+/*      TXA_CTRL                 8 bit  Tx Arbiter Control Register */
+enum {
+        TXA_ENA_FSYNC   = 1<<7, /* Enable  force of sync Tx queue */
+        TXA_DIS_FSYNC   = 1<<6, /* Disable force of sync Tx queue */
+        TXA_ENA_ALLOC   = 1<<5, /* Enable  alloc of free bandwidth */
+        TXA_DIS_ALLOC   = 1<<4, /* Disable alloc of free bandwidth */
+        TXA_START_RC    = 1<<3, /* Start sync Rate Control */
+        TXA_STOP_RC     = 1<<2, /* Stop  sync Rate Control */
+        TXA_ENA_ARB     = 1<<1, /* Enable  Tx Arbiter */
+        TXA_DIS_ARB     = 1<<0, /* Disable Tx Arbiter */
+};
+
+/*
+ *      Bank 4 - 5
+ */
+/* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+enum {
+        TXA_ITI_INI     = 0x0200,/* 32 bit      Tx Arb Interval Timer Init Val*/
+        TXA_ITI_VAL     = 0x0204,/* 32 bit      Tx Arb Interval Timer Value */
+        TXA_LIM_INI     = 0x0208,/* 32 bit      Tx Arb Limit Counter Init Val */
+        TXA_LIM_VAL     = 0x020c,/* 32 bit      Tx Arb Limit Counter Value */
+        TXA_CTRL        = 0x0210,/*  8 bit      Tx Arbiter Control Register */
+        TXA_TEST        = 0x0211,/*  8 bit      Tx Arbiter Test Register */
+        TXA_STAT        = 0x0212,/*  8 bit      Tx Arbiter Status Register */
+};
+
+
+enum {
+        B6_EXT_REG      = 0x0300,/* External registers (GENESIS only) */
+        B7_CFG_SPC      = 0x0380,/* copy of the Configuration register */
+        B8_RQ1_REGS     = 0x0400,/* Receive Queue 1 */
+        B8_RQ2_REGS     = 0x0480,/* Receive Queue 2 */
+        B8_TS1_REGS     = 0x0600,/* Transmit sync queue 1 */
+        B8_TA1_REGS     = 0x0680,/* Transmit async queue 1 */
+        B8_TS2_REGS     = 0x0700,/* Transmit sync queue 2 */
+        B8_TA2_REGS     = 0x0780,/* Transmit sync queue 2 */
+        B16_RAM_REGS    = 0x0800,/* RAM Buffer Registers */
+};
+
+/* Queue Register Offsets, use Q_ADDR() to access */
+enum {
+        B8_Q_REGS = 0x0400, /* base of Queue registers */       
+        Q_D     = 0x00, /* 8*32 bit     Current Descriptor */
+        Q_DA_L  = 0x20, /* 32 bit       Current Descriptor Address Low dWord */
+        Q_DA_H  = 0x24, /* 32 bit       Current Descriptor Address High dWord */
+        Q_AC_L  = 0x28, /* 32 bit       Current Address Counter Low dWord */
+        Q_AC_H  = 0x2c, /* 32 bit       Current Address Counter High dWord */
+        Q_BC    = 0x30, /* 32 bit       Current Byte Counter */
+        Q_CSR   = 0x34, /* 32 bit       BMU Control/Status Register */
+        Q_F     = 0x38, /* 32 bit       Flag Register */
+        Q_T1    = 0x3c, /* 32 bit       Test Register 1 */
+        Q_T1_TR = 0x3c, /*  8 bit       Test Register 1 Transfer SM */
+        Q_T1_WR = 0x3d, /*  8 bit       Test Register 1 Write Descriptor SM */
+        Q_T1_RD = 0x3e, /*  8 bit       Test Register 1 Read Descriptor SM */
+        Q_T1_SV = 0x3f, /*  8 bit       Test Register 1 Supervisor SM */
+        Q_T2    = 0x40, /* 32 bit       Test Register 2 */
+        Q_T3    = 0x44, /* 32 bit       Test Register 3 */
+
+/* Yukon-2 */
+        Q_DONE  = 0x24, /* 16 bit       Done Index              (Yukon-2 only) */
+        Q_WM    = 0x40, /* 16 bit       FIFO Watermark */
+        Q_AL    = 0x42, /*  8 bit       FIFO Alignment */
+        Q_RSP   = 0x44, /* 16 bit       FIFO Read Shadow Pointer */
+        Q_RSL   = 0x46, /*  8 bit       FIFO Read Shadow Level */
+        Q_RP    = 0x48, /*  8 bit       FIFO Read Pointer */
+        Q_RL    = 0x4a, /*  8 bit       FIFO Read Level */
+        Q_WP    = 0x4c, /*  8 bit       FIFO Write Pointer */
+        Q_WSP   = 0x4d, /*  8 bit       FIFO Write Shadow Pointer */
+        Q_WL    = 0x4e, /*  8 bit       FIFO Write Level */
+        Q_WSL   = 0x4f, /*  8 bit       FIFO Write Shadow Level */
+};
+#define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs))
+
+/* RAM Buffer Register Offsets */
+enum {
+
+        RB_START        = 0x00,/* 32 bit        RAM Buffer Start Address */
+        RB_END  = 0x04,/* 32 bit        RAM Buffer End Address */
+        RB_WP   = 0x08,/* 32 bit        RAM Buffer Write Pointer */
+        RB_RP   = 0x0c,/* 32 bit        RAM Buffer Read Pointer */
+        RB_RX_UTPP      = 0x10,/* 32 bit        Rx Upper Threshold, Pause Packet */
+        RB_RX_LTPP      = 0x14,/* 32 bit        Rx Lower Threshold, Pause Packet */
+        RB_RX_UTHP      = 0x18,/* 32 bit        Rx Upper Threshold, High Prio */
+        RB_RX_LTHP      = 0x1c,/* 32 bit        Rx Lower Threshold, High Prio */
+        /* 0x10 - 0x1f: reserved at Tx RAM Buffer Registers */
+        RB_PC   = 0x20,/* 32 bit        RAM Buffer Packet Counter */
+        RB_LEV  = 0x24,/* 32 bit        RAM Buffer Level Register */
+        RB_CTRL = 0x28,/* 32 bit        RAM Buffer Control Register */
+        RB_TST1 = 0x29,/*  8 bit        RAM Buffer Test Register 1 */
+        RB_TST2 = 0x2a,/*  8 bit        RAM Buffer Test Register 2 */
+};
+
+/* Receive and Transmit Queues */
+enum {
+        Q_R1    = 0x0000,       /* Receive Queue 1 */
+        Q_R2    = 0x0080,       /* Receive Queue 2 */
+        Q_XS1   = 0x0200,       /* Synchronous Transmit Queue 1 */
+        Q_XA1   = 0x0280,       /* Asynchronous Transmit Queue 1 */
+        Q_XS2   = 0x0300,       /* Synchronous Transmit Queue 2 */
+        Q_XA2   = 0x0380,       /* Asynchronous Transmit Queue 2 */
+};
+
+/* Different MAC Types */
+enum {
+        SK_MAC_XMAC =   0,      /* Xaqti XMAC II */
+        SK_MAC_GMAC =   1,      /* Marvell GMAC */
+};
+
+/* Different PHY Types */
+enum {
+        SK_PHY_XMAC     = 0,/* integrated in XMAC II */
+        SK_PHY_BCOM     = 1,/* Broadcom BCM5400 */
+        SK_PHY_LONE     = 2,/* Level One LXT1000  [not supported]*/
+        SK_PHY_NAT      = 3,/* National DP83891  [not supported] */
+        SK_PHY_MARV_COPPER= 4,/* Marvell 88E1011S */
+        SK_PHY_MARV_FIBER = 5,/* Marvell 88E1011S working on fiber */
+};
+
+/* PHY addresses (bits 12..8 of PHY address reg) */
+enum {
+        PHY_ADDR_XMAC   = 0<<8,
+        PHY_ADDR_BCOM   = 1<<8,
+        PHY_ADDR_LONE   = 3<<8,
+        PHY_ADDR_NAT    = 0<<8,
+/* GPHY address (bits 15..11 of SMI control reg) */
+        PHY_ADDR_MARV   = 0,
+};
+
+#define RB_ADDR(offs, queue) (B16_RAM_REGS + (queue) + (offs))
+
+/* Receive MAC FIFO, Receive LED, and Link_Sync regs (GENESIS only) */
+enum {
+        RX_MFF_EA       = 0x0c00,/* 32 bit      Receive MAC FIFO End Address */
+        RX_MFF_WP       = 0x0c04,/* 32 bit      Receive MAC FIFO Write Pointer */
+
+        RX_MFF_RP       = 0x0c0c,/* 32 bit      Receive MAC FIFO Read Pointer */
+        RX_MFF_PC       = 0x0c10,/* 32 bit      Receive MAC FIFO Packet Cnt */
+        RX_MFF_LEV      = 0x0c14,/* 32 bit      Receive MAC FIFO Level */
+        RX_MFF_CTRL1    = 0x0c18,/* 16 bit      Receive MAC FIFO Control Reg 1*/
+        RX_MFF_STAT_TO  = 0x0c1a,/*  8 bit      Receive MAC Status Timeout */
+        RX_MFF_TIST_TO  = 0x0c1b,/*  8 bit      Receive MAC Time Stamp Timeout */
+        RX_MFF_CTRL2    = 0x0c1c,/*  8 bit      Receive MAC FIFO Control Reg 2*/
+        RX_MFF_TST1     = 0x0c1d,/*  8 bit      Receive MAC FIFO Test Reg 1 */
+        RX_MFF_TST2     = 0x0c1e,/*  8 bit      Receive MAC FIFO Test Reg 2 */
+
+        RX_LED_INI      = 0x0c20,/* 32 bit      Receive LED Cnt Init Value */
+        RX_LED_VAL      = 0x0c24,/* 32 bit      Receive LED Cnt Current Value */
+        RX_LED_CTRL     = 0x0c28,/*  8 bit      Receive LED Cnt Control Reg */
+        RX_LED_TST      = 0x0c29,/*  8 bit      Receive LED Cnt Test Register */
+
+        LNK_SYNC_INI    = 0x0c30,/* 32 bit      Link Sync Cnt Init Value */
+        LNK_SYNC_VAL    = 0x0c34,/* 32 bit      Link Sync Cnt Current Value */
+        LNK_SYNC_CTRL   = 0x0c38,/*  8 bit      Link Sync Cnt Control Register */
+        LNK_SYNC_TST    = 0x0c39,/*  8 bit      Link Sync Cnt Test Register */
+        LNK_LED_REG     = 0x0c3c,/*  8 bit      Link LED Register */
+};
+
+/* Receive and Transmit MAC FIFO Registers (GENESIS only) */
+/*      RX_MFF_CTRL1    16 bit  Receive MAC FIFO Control Reg 1 */
+enum {
+        MFF_ENA_RDY_PAT = 1<<13,        /* Enable  Ready Patch */
+        MFF_DIS_RDY_PAT = 1<<12,        /* Disable Ready Patch */
+        MFF_ENA_TIM_PAT = 1<<11,        /* Enable  Timing Patch */
+        MFF_DIS_TIM_PAT = 1<<10,        /* Disable Timing Patch */
+        MFF_ENA_ALM_FUL = 1<<9, /* Enable  AlmostFull Sign */
+        MFF_DIS_ALM_FUL = 1<<8, /* Disable AlmostFull Sign */
+        MFF_ENA_PAUSE   = 1<<7, /* Enable  Pause Signaling */
+        MFF_DIS_PAUSE   = 1<<6, /* Disable Pause Signaling */
+        MFF_ENA_FLUSH   = 1<<5, /* Enable  Frame Flushing */
+        MFF_DIS_FLUSH   = 1<<4, /* Disable Frame Flushing */
+        MFF_ENA_TIST    = 1<<3, /* Enable  Time Stamp Gener */
+        MFF_DIS_TIST    = 1<<2, /* Disable Time Stamp Gener */
+        MFF_CLR_INTIST  = 1<<1, /* Clear IRQ No Time Stamp */
+        MFF_CLR_INSTAT  = 1<<0, /* Clear IRQ No Status */
+#define MFF_RX_CTRL_DEF MFF_ENA_TIM_PAT
+};
+
+/*      TX_MFF_CTRL1    16 bit  Transmit MAC FIFO Control Reg 1 */
+enum {
+        MFF_CLR_PERR    = 1<<15,        /* Clear Parity Error IRQ */
+                                                                /* Bit 14:      reserved */
+        MFF_ENA_PKT_REC = 1<<13,        /* Enable  Packet Recovery */
+        MFF_DIS_PKT_REC = 1<<12,        /* Disable Packet Recovery */
+
+        MFF_ENA_W4E     = 1<<7, /* Enable  Wait for Empty */
+        MFF_DIS_W4E     = 1<<6, /* Disable Wait for Empty */
+
+        MFF_ENA_LOOPB   = 1<<3, /* Enable  Loopback */
+        MFF_DIS_LOOPB   = 1<<2, /* Disable Loopback */
+        MFF_CLR_MAC_RST = 1<<1, /* Clear XMAC Reset */
+        MFF_SET_MAC_RST = 1<<0, /* Set   XMAC Reset */
+};
+
+#define MFF_TX_CTRL_DEF (MFF_ENA_PKT_REC | MFF_ENA_TIM_PAT | MFF_ENA_FLUSH)
+
+/*      RX_MFF_TST2              8 bit  Receive MAC FIFO Test Register 2 */
+/*      TX_MFF_TST2              8 bit  Transmit MAC FIFO Test Register 2 */
+enum {
+        MFF_WSP_T_ON    = 1<<6, /* Tx: Write Shadow Ptr TestOn */
+        MFF_WSP_T_OFF   = 1<<5, /* Tx: Write Shadow Ptr TstOff */
+        MFF_WSP_INC     = 1<<4, /* Tx: Write Shadow Ptr Increment */
+        MFF_PC_DEC      = 1<<3, /* Packet Counter Decrement */
+        MFF_PC_T_ON     = 1<<2, /* Packet Counter Test On */
+        MFF_PC_T_OFF    = 1<<1, /* Packet Counter Test Off */
+        MFF_PC_INC      = 1<<0, /* Packet Counter Increment */
+};
+
+/*      RX_MFF_TST1              8 bit  Receive MAC FIFO Test Register 1 */
+/*      TX_MFF_TST1              8 bit  Transmit MAC FIFO Test Register 1 */
+enum {
+        MFF_WP_T_ON     = 1<<6, /* Write Pointer Test On */
+        MFF_WP_T_OFF    = 1<<5, /* Write Pointer Test Off */
+        MFF_WP_INC      = 1<<4, /* Write Pointer Increm */
+
+        MFF_RP_T_ON     = 1<<2, /* Read Pointer Test On */
+        MFF_RP_T_OFF    = 1<<1, /* Read Pointer Test Off */
+        MFF_RP_DEC      = 1<<0, /* Read Pointer Decrement */
+};
+
+/*      RX_MFF_CTRL2     8 bit  Receive MAC FIFO Control Reg 2 */
+/*      TX_MFF_CTRL2     8 bit  Transmit MAC FIFO Control Reg 2 */
+enum {
+        MFF_ENA_OP_MD   = 1<<3, /* Enable  Operation Mode */
+        MFF_DIS_OP_MD   = 1<<2, /* Disable Operation Mode */
+        MFF_RST_CLR     = 1<<1, /* Clear MAC FIFO Reset */
+        MFF_RST_SET     = 1<<0, /* Set   MAC FIFO Reset */
+};
+
+
+/*      Link LED Counter Registers (GENESIS only) */
+
+/*      RX_LED_CTRL              8 bit  Receive LED Cnt Control Reg */
+/*      TX_LED_CTRL              8 bit  Transmit LED Cnt Control Reg */
+/*      LNK_SYNC_CTRL    8 bit  Link Sync Cnt Control Register */
+enum {
+        LED_START       = 1<<2, /* Start Timer */
+        LED_STOP        = 1<<1, /* Stop Timer */
+        LED_STATE       = 1<<0, /* Rx/Tx: LED State, 1=LED on */
+};
+
+/*      RX_LED_TST               8 bit  Receive LED Cnt Test Register */
+/*      TX_LED_TST               8 bit  Transmit LED Cnt Test Register */
+/*      LNK_SYNC_TST     8 bit  Link Sync Cnt Test Register */
+enum {
+        LED_T_ON        = 1<<2, /* LED Counter Test mode On */
+        LED_T_OFF       = 1<<1, /* LED Counter Test mode Off */
+        LED_T_STEP      = 1<<0, /* LED Counter Step */
+};
+
+/*      LNK_LED_REG              8 bit  Link LED Register */
+enum {
+        LED_BLK_ON      = 1<<5, /* Link LED Blinking On */
+        LED_BLK_OFF     = 1<<4, /* Link LED Blinking Off */
+        LED_SYNC_ON     = 1<<3, /* Use Sync Wire to switch LED */
+        LED_SYNC_OFF    = 1<<2, /* Disable Sync Wire Input */
+        LED_ON  = 1<<1, /* switch LED on */
+        LED_OFF = 1<<0, /* switch LED off */
+};
+
+/* Receive GMAC FIFO (YUKON and Yukon-2) */
+enum {
+        RX_GMF_EA       = 0x0c40,/* 32 bit      Rx GMAC FIFO End Address */
+        RX_GMF_AF_THR   = 0x0c44,/* 32 bit      Rx GMAC FIFO Almost Full Thresh. */
+        RX_GMF_CTRL_T   = 0x0c48,/* 32 bit      Rx GMAC FIFO Control/Test */
+        RX_GMF_FL_MSK   = 0x0c4c,/* 32 bit      Rx GMAC FIFO Flush Mask */
+        RX_GMF_FL_THR   = 0x0c50,/* 32 bit      Rx GMAC FIFO Flush Threshold */
+        RX_GMF_TR_THR   = 0x0c54,/* 32 bit      Rx Truncation Threshold (Yukon-2) */
+
+        RX_GMF_VLAN     = 0x0c5c,/* 32 bit      Rx VLAN Type Register (Yukon-2) */
+        RX_GMF_WP       = 0x0c60,/* 32 bit      Rx GMAC FIFO Write Pointer */
+
+        RX_GMF_WLEV     = 0x0c68,/* 32 bit      Rx GMAC FIFO Write Level */
+
+        RX_GMF_RP       = 0x0c70,/* 32 bit      Rx GMAC FIFO Read Pointer */
+
+        RX_GMF_RLEV     = 0x0c78,/* 32 bit      Rx GMAC FIFO Read Level */
+};
+
+
+/*      TXA_TEST                 8 bit  Tx Arbiter Test Register */
+enum {
+        TXA_INT_T_ON    = 1<<5, /* Tx Arb Interval Timer Test On */
+        TXA_INT_T_OFF   = 1<<4, /* Tx Arb Interval Timer Test Off */
+        TXA_INT_T_STEP  = 1<<3, /* Tx Arb Interval Timer Step */
+        TXA_LIM_T_ON    = 1<<2, /* Tx Arb Limit Timer Test On */
+        TXA_LIM_T_OFF   = 1<<1, /* Tx Arb Limit Timer Test Off */
+        TXA_LIM_T_STEP  = 1<<0, /* Tx Arb Limit Timer Step */
+};
+
+/*      TXA_STAT                 8 bit  Tx Arbiter Status Register */
+enum {
+        TXA_PRIO_XS     = 1<<0, /* sync queue has prio to send */
+};
+
+
+/*      Q_BC                    32 bit  Current Byte Counter */
+
+/* BMU Control Status Registers */
+/*      B0_R1_CSR               32 bit  BMU Ctrl/Stat Rx Queue 1 */
+/*      B0_R2_CSR               32 bit  BMU Ctrl/Stat Rx Queue 2 */
+/*      B0_XA1_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 1 */
+/*      B0_XS1_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 1 */
+/*      B0_XA2_CSR              32 bit  BMU Ctrl/Stat Sync Tx Queue 2 */
+/*      B0_XS2_CSR              32 bit  BMU Ctrl/Stat Async Tx Queue 2 */
+/*      Q_CSR                   32 bit  BMU Control/Status Register */
+
+enum {
+        CSR_SV_IDLE     = 1<<24,        /* BMU SM Idle */
+
+        CSR_DESC_CLR    = 1<<21,        /* Clear Reset for Descr */
+        CSR_DESC_SET    = 1<<20,        /* Set   Reset for Descr */
+        CSR_FIFO_CLR    = 1<<19,        /* Clear Reset for FIFO */
+        CSR_FIFO_SET    = 1<<18,        /* Set   Reset for FIFO */
+        CSR_HPI_RUN     = 1<<17,        /* Release HPI SM */
+        CSR_HPI_RST     = 1<<16,        /* Reset   HPI SM to Idle */
+        CSR_SV_RUN      = 1<<15,        /* Release Supervisor SM */
+        CSR_SV_RST      = 1<<14,        /* Reset   Supervisor SM */
+        CSR_DREAD_RUN   = 1<<13,        /* Release Descr Read SM */
+        CSR_DREAD_RST   = 1<<12,        /* Reset   Descr Read SM */
+        CSR_DWRITE_RUN  = 1<<11,        /* Release Descr Write SM */
+        CSR_DWRITE_RST  = 1<<10,        /* Reset   Descr Write SM */
+        CSR_TRANS_RUN   = 1<<9,         /* Release Transfer SM */
+        CSR_TRANS_RST   = 1<<8,         /* Reset   Transfer SM */
+        CSR_ENA_POL     = 1<<7,         /* Enable  Descr Polling */
+        CSR_DIS_POL     = 1<<6,         /* Disable Descr Polling */
+        CSR_STOP        = 1<<5,         /* Stop  Rx/Tx Queue */
+        CSR_START       = 1<<4,         /* Start Rx/Tx Queue */
+        CSR_IRQ_CL_P    = 1<<3,         /* (Rx) Clear Parity IRQ */
+        CSR_IRQ_CL_B    = 1<<2,         /* Clear EOB IRQ */
+        CSR_IRQ_CL_F    = 1<<1,         /* Clear EOF IRQ */
+        CSR_IRQ_CL_C    = 1<<0,         /* Clear ERR IRQ */
+};
+
+#define CSR_SET_RESET   (CSR_DESC_SET | CSR_FIFO_SET | CSR_HPI_RST |\
+                        CSR_SV_RST | CSR_DREAD_RST | CSR_DWRITE_RST |\
+                        CSR_TRANS_RST)
+#define CSR_CLR_RESET   (CSR_DESC_CLR | CSR_FIFO_CLR | CSR_HPI_RUN |\
+                        CSR_SV_RUN | CSR_DREAD_RUN | CSR_DWRITE_RUN |\
+                        CSR_TRANS_RUN)
+
+/*      Q_F                             32 bit  Flag Register */
+enum {
+        F_ALM_FULL      = 1<<27,        /* Rx FIFO: almost full */
+        F_EMPTY         = 1<<27,        /* Tx FIFO: empty flag */
+        F_FIFO_EOF      = 1<<26,        /* Tag (EOF Flag) bit in FIFO */
+        F_WM_REACHED    = 1<<25,        /* Watermark reached */
+
+        F_FIFO_LEVEL    = 0x1fL<<16,    /* Bit 23..16:  # of Qwords in FIFO */
+        F_WATER_MARK    = 0x0007ffL,    /* Bit 10.. 0:  Watermark */
+};
+
+/* RAM Buffer Register Offsets, use RB_ADDR(Queue, Offs) to access */
+/*      RB_START                32 bit  RAM Buffer Start Address */
+/*      RB_END                  32 bit  RAM Buffer End Address */
+/*      RB_WP                   32 bit  RAM Buffer Write Pointer */
+/*      RB_RP                   32 bit  RAM Buffer Read Pointer */
+/*      RB_RX_UTPP              32 bit  Rx Upper Threshold, Pause Pack */
+/*      RB_RX_LTPP              32 bit  Rx Lower Threshold, Pause Pack */
+/*      RB_RX_UTHP              32 bit  Rx Upper Threshold, High Prio */
+/*      RB_RX_LTHP              32 bit  Rx Lower Threshold, High Prio */
+/*      RB_PC                   32 bit  RAM Buffer Packet Counter */
+/*      RB_LEV                  32 bit  RAM Buffer Level Register */
+
+#define RB_MSK  0x0007ffff      /* Bit 18.. 0:  RAM Buffer Pointer Bits */
+/*      RB_TST2                  8 bit  RAM Buffer Test Register 2 */
+/*      RB_TST1                  8 bit  RAM Buffer Test Register 1 */
+
+/*      RB_CTRL                  8 bit  RAM Buffer Control Register */
+enum {
+        RB_ENA_STFWD    = 1<<5, /* Enable  Store & Forward */
+        RB_DIS_STFWD    = 1<<4, /* Disable Store & Forward */
+        RB_ENA_OP_MD    = 1<<3, /* Enable  Operation Mode */
+        RB_DIS_OP_MD    = 1<<2, /* Disable Operation Mode */
+        RB_RST_CLR      = 1<<1, /* Clear RAM Buf STM Reset */
+        RB_RST_SET      = 1<<0, /* Set   RAM Buf STM Reset */
+};
+
+/* Transmit MAC FIFO and Transmit LED Registers (GENESIS only), */
+enum {
+        TX_MFF_EA       = 0x0d00,/* 32 bit      Transmit MAC FIFO End Address */
+        TX_MFF_WP       = 0x0d04,/* 32 bit      Transmit MAC FIFO WR Pointer */
+        TX_MFF_WSP      = 0x0d08,/* 32 bit      Transmit MAC FIFO WR Shadow Ptr */
+        TX_MFF_RP       = 0x0d0c,/* 32 bit      Transmit MAC FIFO RD Pointer */
+        TX_MFF_PC       = 0x0d10,/* 32 bit      Transmit MAC FIFO Packet Cnt */
+        TX_MFF_LEV      = 0x0d14,/* 32 bit      Transmit MAC FIFO Level */
+        TX_MFF_CTRL1    = 0x0d18,/* 16 bit      Transmit MAC FIFO Ctrl Reg 1 */
+        TX_MFF_WAF      = 0x0d1a,/*  8 bit      Transmit MAC Wait after flush */
+
+        TX_MFF_CTRL2    = 0x0d1c,/*  8 bit      Transmit MAC FIFO Ctrl Reg 2 */
+        TX_MFF_TST1     = 0x0d1d,/*  8 bit      Transmit MAC FIFO Test Reg 1 */
+        TX_MFF_TST2     = 0x0d1e,/*  8 bit      Transmit MAC FIFO Test Reg 2 */
+
+        TX_LED_INI      = 0x0d20,/* 32 bit      Transmit LED Cnt Init Value */
+        TX_LED_VAL      = 0x0d24,/* 32 bit      Transmit LED Cnt Current Val */
+        TX_LED_CTRL     = 0x0d28,/*  8 bit      Transmit LED Cnt Control Reg */
+        TX_LED_TST      = 0x0d29,/*  8 bit      Transmit LED Cnt Test Reg */
+};
+
+/* Counter and Timer constants, for a host clock of 62.5 MHz */
+#define SK_XMIT_DUR             0x002faf08UL    /*  50 ms */
+#define SK_BLK_DUR              0x01dcd650UL    /* 500 ms */
+
+#define SK_DPOLL_DEF    0x00ee6b28UL    /* 250 ms at 62.5 MHz */
+
+#define SK_DPOLL_MAX    0x00ffffffUL    /* 268 ms at 62.5 MHz */
+                                        /* 215 ms at 78.12 MHz */
+
+#define SK_FACT_62              100     /* is given in percent */
+#define SK_FACT_53               85     /* on GENESIS:  53.12 MHz */
+#define SK_FACT_78              125     /* on YUKON:    78.12 MHz */
+
+
+/* Transmit GMAC FIFO (YUKON only) */
+enum {
+        TX_GMF_EA       = 0x0d40,/* 32 bit      Tx GMAC FIFO End Address */
+        TX_GMF_AE_THR   = 0x0d44,/* 32 bit      Tx GMAC FIFO Almost Empty Thresh.*/
+        TX_GMF_CTRL_T   = 0x0d48,/* 32 bit      Tx GMAC FIFO Control/Test */
+
+        TX_GMF_WP       = 0x0d60,/* 32 bit      Tx GMAC FIFO Write Pointer */
+        TX_GMF_WSP      = 0x0d64,/* 32 bit      Tx GMAC FIFO Write Shadow Ptr. */
+        TX_GMF_WLEV     = 0x0d68,/* 32 bit      Tx GMAC FIFO Write Level */
+
+        TX_GMF_RP       = 0x0d70,/* 32 bit      Tx GMAC FIFO Read Pointer */
+        TX_GMF_RSTP     = 0x0d74,/* 32 bit      Tx GMAC FIFO Restart Pointer */
+        TX_GMF_RLEV     = 0x0d78,/* 32 bit      Tx GMAC FIFO Read Level */
+
+        /* Descriptor Poll Timer Registers */
+        B28_DPT_INI     = 0x0e00,/* 24 bit      Descriptor Poll Timer Init Val */
+        B28_DPT_VAL     = 0x0e04,/* 24 bit      Descriptor Poll Timer Curr Val */
+        B28_DPT_CTRL    = 0x0e08,/*  8 bit      Descriptor Poll Timer Ctrl Reg */
+
+        B28_DPT_TST     = 0x0e0a,/*  8 bit      Descriptor Poll Timer Test Reg */
+
+        /* Time Stamp Timer Registers (YUKON only) */
+        GMAC_TI_ST_VAL  = 0x0e14,/* 32 bit      Time Stamp Timer Curr Val */
+        GMAC_TI_ST_CTRL = 0x0e18,/*  8 bit      Time Stamp Timer Ctrl Reg */
+        GMAC_TI_ST_TST  = 0x0e1a,/*  8 bit      Time Stamp Timer Test Reg */
+};
+
+/* Status BMU Registers (Yukon-2 only)*/
+enum {
+        STAT_CTRL       = 0x0e80,/* 32 bit      Status BMU Control Reg */
+        STAT_LAST_IDX   = 0x0e84,/* 16 bit      Status BMU Last Index */
+        /* 0x0e85 - 0x0e86:     reserved */
+        STAT_LIST_ADDR_LO       = 0x0e88,/* 32 bit      Status List Start Addr (low) */
+        STAT_LIST_ADDR_HI       = 0x0e8c,/* 32 bit      Status List Start Addr (high) */
+        STAT_TXA1_RIDX  = 0x0e90,/* 16 bit      Status TxA1 Report Index Reg */
+        STAT_TXS1_RIDX  = 0x0e92,/* 16 bit      Status TxS1 Report Index Reg */
+        STAT_TXA2_RIDX  = 0x0e94,/* 16 bit      Status TxA2 Report Index Reg */
+        STAT_TXS2_RIDX  = 0x0e96,/* 16 bit      Status TxS2 Report Index Reg */
+        STAT_TX_IDX_TH  = 0x0e98,/* 16 bit      Status Tx Index Threshold Reg */
+        STAT_PUT_IDX    = 0x0e9c,/* 16 bit      Status Put Index Reg */
+
+/* FIFO Control/Status Registers (Yukon-2 only)*/
+        STAT_FIFO_WP    = 0x0ea0,/*  8 bit      Status FIFO Write Pointer Reg */
+        STAT_FIFO_RP    = 0x0ea4,/*  8 bit      Status FIFO Read Pointer Reg */
+        STAT_FIFO_RSP   = 0x0ea6,/*  8 bit      Status FIFO Read Shadow Ptr */
+        STAT_FIFO_LEVEL = 0x0ea8,/*  8 bit      Status FIFO Level Reg */
+        STAT_FIFO_SHLVL = 0x0eaa,/*  8 bit      Status FIFO Shadow Level Reg */
+        STAT_FIFO_WM    = 0x0eac,/*  8 bit      Status FIFO Watermark Reg */
+        STAT_FIFO_ISR_WM        = 0x0ead,/*  8 bit      Status FIFO ISR Watermark Reg */
+
+/* Level and ISR Timer Registers (Yukon-2 only)*/
+        STAT_LEV_TIMER_INI      = 0x0eb0,/* 32 bit      Level Timer Init. Value Reg */
+        STAT_LEV_TIMER_CNT      = 0x0eb4,/* 32 bit      Level Timer Counter Reg */
+        STAT_LEV_TIMER_CTRL     = 0x0eb8,/*  8 bit      Level Timer Control Reg */
+        STAT_LEV_TIMER_TEST     = 0x0eb9,/*  8 bit      Level Timer Test Reg */
+        STAT_TX_TIMER_INI       = 0x0ec0,/* 32 bit      Tx Timer Init. Value Reg */
+        STAT_TX_TIMER_CNT       = 0x0ec4,/* 32 bit      Tx Timer Counter Reg */
+        STAT_TX_TIMER_CTRL      = 0x0ec8,/*  8 bit      Tx Timer Control Reg */
+        STAT_TX_TIMER_TEST      = 0x0ec9,/*  8 bit      Tx Timer Test Reg */
+        STAT_ISR_TIMER_INI      = 0x0ed0,/* 32 bit      ISR Timer Init. Value Reg */
+        STAT_ISR_TIMER_CNT      = 0x0ed4,/* 32 bit      ISR Timer Counter Reg */
+        STAT_ISR_TIMER_CTRL     = 0x0ed8,/*  8 bit      ISR Timer Control Reg */
+        STAT_ISR_TIMER_TEST     = 0x0ed9,/*  8 bit      ISR Timer Test Reg */
+
+        ST_LAST_IDX_MASK        = 0x007f,/* Last Index Mask */
+        ST_TXRP_IDX_MASK        = 0x0fff,/* Tx Report Index Mask */
+        ST_TXTH_IDX_MASK        = 0x0fff,/* Tx Threshold Index Mask */
+        ST_WM_IDX_MASK  = 0x3f,/* FIFO Watermark Index Mask */
+};
+
+enum {
+        LINKLED_OFF          = 0x01,
+        LINKLED_ON           = 0x02,
+        LINKLED_LINKSYNC_OFF = 0x04,
+        LINKLED_LINKSYNC_ON  = 0x08,
+        LINKLED_BLINK_OFF    = 0x10,
+        LINKLED_BLINK_ON     = 0x20,
+};
+        
+/* GMAC and GPHY Control Registers (YUKON only) */
+enum {
+        GMAC_CTRL       = 0x0f00,/* 32 bit      GMAC Control Reg */
+        GPHY_CTRL       = 0x0f04,/* 32 bit      GPHY Control Reg */
+        GMAC_IRQ_SRC    = 0x0f08,/*  8 bit      GMAC Interrupt Source Reg */
+        GMAC_IRQ_MSK    = 0x0f0c,/*  8 bit      GMAC Interrupt Mask Reg */
+        GMAC_LINK_CTRL  = 0x0f10,/* 16 bit      Link Control Reg */
+
+/* Wake-up Frame Pattern Match Control Registers (YUKON only) */
+
+        WOL_REG_OFFS    = 0x20,/* HW-Bug: Address is + 0x20 against spec. */
+
+        WOL_CTRL_STAT   = 0x0f20,/* 16 bit      WOL Control/Status Reg */
+        WOL_MATCH_CTL   = 0x0f22,/*  8 bit      WOL Match Control Reg */
+        WOL_MATCH_RES   = 0x0f23,/*  8 bit      WOL Match Result Reg */
+        WOL_MAC_ADDR    = 0x0f24,/* 32 bit      WOL MAC Address */
+        WOL_PATT_PME    = 0x0f2a,/*  8 bit      WOL PME Match Enable (Yukon-2) */
+        WOL_PATT_ASFM   = 0x0f2b,/*  8 bit      WOL ASF Match Enable (Yukon-2) */
+        WOL_PATT_RPTR   = 0x0f2c,/*  8 bit      WOL Pattern Read Pointer */
+
+/* WOL Pattern Length Registers (YUKON only) */
+
+        WOL_PATT_LEN_LO = 0x0f30,/* 32 bit      WOL Pattern Length 3..0 */
+        WOL_PATT_LEN_HI = 0x0f34,/* 24 bit      WOL Pattern Length 6..4 */
+
+/* WOL Pattern Counter Registers (YUKON only) */
+
+        WOL_PATT_CNT_0  = 0x0f38,/* 32 bit      WOL Pattern Counter 3..0 */
+        WOL_PATT_CNT_4  = 0x0f3c,/* 24 bit      WOL Pattern Counter 6..4 */
+};
+
+enum {
+        WOL_PATT_RAM_1  = 0x1000,/*  WOL Pattern RAM Link 1 */
+        WOL_PATT_RAM_2  = 0x1400,/*  WOL Pattern RAM Link 2 */
+};
+
+enum {
+        BASE_XMAC_1     = 0x2000,/* XMAC 1 registers */
+        BASE_GMAC_1     = 0x2800,/* GMAC 1 registers */
+        BASE_XMAC_2     = 0x3000,/* XMAC 2 registers */
+        BASE_GMAC_2     = 0x3800,/* GMAC 2 registers */
+};
+
+/*
+ * Receive Frame Status Encoding
+ */
+enum {
+        XMR_FS_LEN      = 0x3fff<<18,   /* Bit 31..18:  Rx Frame Length */
+        XMR_FS_2L_VLAN  = 1<<17, /* Bit 17:     tagged wh 2Lev VLAN ID*/
+        XMR_FS_1_VLAN   = 1<<16, /* Bit 16:     tagged wh 1ev VLAN ID*/
+        XMR_FS_BC       = 1<<15, /* Bit 15:     Broadcast Frame */
+        XMR_FS_MC       = 1<<14, /* Bit 14:     Multicast Frame */
+        XMR_FS_UC       = 1<<13, /* Bit 13:     Unicast Frame */
+
+        XMR_FS_BURST    = 1<<11, /* Bit 11:     Burst Mode */
+        XMR_FS_CEX_ERR  = 1<<10, /* Bit 10:     Carrier Ext. Error */
+        XMR_FS_802_3    = 1<<9, /* Bit  9:      802.3 Frame */
+        XMR_FS_COL_ERR  = 1<<8, /* Bit  8:      Collision Error */
+        XMR_FS_CAR_ERR  = 1<<7, /* Bit  7:      Carrier Event Error */
+        XMR_FS_LEN_ERR  = 1<<6, /* Bit  6:      In-Range Length Error */
+        XMR_FS_FRA_ERR  = 1<<5, /* Bit  5:      Framing Error */
+        XMR_FS_RUNT     = 1<<4, /* Bit  4:      Runt Frame */
+        XMR_FS_LNG_ERR  = 1<<3, /* Bit  3:      Giant (Jumbo) Frame */
+        XMR_FS_FCS_ERR  = 1<<2, /* Bit  2:      Frame Check Sequ Err */
+        XMR_FS_ERR      = 1<<1, /* Bit  1:      Frame Error */
+        XMR_FS_MCTRL    = 1<<0, /* Bit  0:      MAC Control Packet */
+
+/*
+ * XMR_FS_ERR will be set if
+ *      XMR_FS_FCS_ERR, XMR_FS_LNG_ERR, XMR_FS_RUNT,
+ *      XMR_FS_FRA_ERR, XMR_FS_LEN_ERR, or XMR_FS_CEX_ERR
+ * is set. XMR_FS_LNG_ERR and XMR_FS_LEN_ERR will issue
+ * XMR_FS_ERR unless the corresponding bit in the Receive Command
+ * Register is set.
+ */
+};
+
+/*
+,* XMAC-PHY Registers, indirect addressed over the XMAC
+ */
+enum {
+        PHY_XMAC_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
+        PHY_XMAC_STAT           = 0x01,/* 16 bit r/w    PHY Status Register */
+        PHY_XMAC_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
+        PHY_XMAC_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
+        PHY_XMAC_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+        PHY_XMAC_AUNE_LP        = 0x05,/* 16 bit r/o    Link Partner Abi Reg */
+        PHY_XMAC_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+        PHY_XMAC_NEPG   = 0x07,/* 16 bit r/w    Next Page Register */
+        PHY_XMAC_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
+
+        PHY_XMAC_EXT_STAT       = 0x0f,/* 16 bit r/o    Ext Status Register */
+        PHY_XMAC_RES_ABI        = 0x10,/* 16 bit r/o    PHY Resolved Ability */
+};
+/*
+ * Broadcom-PHY Registers, indirect addressed over XMAC
+ */
+enum {
+        PHY_BCOM_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
+        PHY_BCOM_STAT           = 0x01,/* 16 bit r/o    PHY Status Register */
+        PHY_BCOM_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
+        PHY_BCOM_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
+        PHY_BCOM_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+        PHY_BCOM_AUNE_LP        = 0x05,/* 16 bit r/o    Link Part Ability Reg */
+        PHY_BCOM_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+        PHY_BCOM_NEPG           = 0x07,/* 16 bit r/w    Next Page Register */
+        PHY_BCOM_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
+        /* Broadcom-specific registers */
+        PHY_BCOM_1000T_CTRL     = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
+        PHY_BCOM_1000T_STAT     = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
+        PHY_BCOM_EXT_STAT       = 0x0f,/* 16 bit r/o    Extended Status Reg */
+        PHY_BCOM_P_EXT_CTRL     = 0x10,/* 16 bit r/w    PHY Extended Ctrl Reg */
+        PHY_BCOM_P_EXT_STAT     = 0x11,/* 16 bit r/o    PHY Extended Stat Reg */
+        PHY_BCOM_RE_CTR         = 0x12,/* 16 bit r/w    Receive Error Counter */
+        PHY_BCOM_FC_CTR         = 0x13,/* 16 bit r/w    False Carrier Sense Cnt */
+        PHY_BCOM_RNO_CTR        = 0x14,/* 16 bit r/w    Receiver NOT_OK Cnt */
+
+        PHY_BCOM_AUX_CTRL       = 0x18,/* 16 bit r/w    Auxiliary Control Reg */
+        PHY_BCOM_AUX_STAT       = 0x19,/* 16 bit r/o    Auxiliary Stat Summary */
+        PHY_BCOM_INT_STAT       = 0x1a,/* 16 bit r/o    Interrupt Status Reg */
+        PHY_BCOM_INT_MASK       = 0x1b,/* 16 bit r/w    Interrupt Mask Reg */
+};
+
+/*
+ * Marvel-PHY Registers, indirect addressed over GMAC
+ */
+enum {
+        PHY_MARV_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
+        PHY_MARV_STAT           = 0x01,/* 16 bit r/o    PHY Status Register */
+        PHY_MARV_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
+        PHY_MARV_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
+        PHY_MARV_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+        PHY_MARV_AUNE_LP        = 0x05,/* 16 bit r/o    Link Part Ability Reg */
+        PHY_MARV_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+        PHY_MARV_NEPG           = 0x07,/* 16 bit r/w    Next Page Register */
+        PHY_MARV_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
+        /* Marvel-specific registers */
+        PHY_MARV_1000T_CTRL     = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
+        PHY_MARV_1000T_STAT     = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
+        PHY_MARV_EXT_STAT       = 0x0f,/* 16 bit r/o    Extended Status Reg */
+        PHY_MARV_PHY_CTRL       = 0x10,/* 16 bit r/w    PHY Specific Ctrl Reg */
+        PHY_MARV_PHY_STAT       = 0x11,/* 16 bit r/o    PHY Specific Stat Reg */
+        PHY_MARV_INT_MASK       = 0x12,/* 16 bit r/w    Interrupt Mask Reg */
+        PHY_MARV_INT_STAT       = 0x13,/* 16 bit r/o    Interrupt Status Reg */
+        PHY_MARV_EXT_CTRL       = 0x14,/* 16 bit r/w    Ext. PHY Specific Ctrl */
+        PHY_MARV_RXE_CNT        = 0x15,/* 16 bit r/w    Receive Error Counter */
+        PHY_MARV_EXT_ADR        = 0x16,/* 16 bit r/w    Ext. Ad. for Cable Diag. */
+        PHY_MARV_PORT_IRQ       = 0x17,/* 16 bit r/o    Port 0 IRQ (88E1111 only) */
+        PHY_MARV_LED_CTRL       = 0x18,/* 16 bit r/w    LED Control Reg */
+        PHY_MARV_LED_OVER       = 0x19,/* 16 bit r/w    Manual LED Override Reg */
+        PHY_MARV_EXT_CTRL_2     = 0x1a,/* 16 bit r/w    Ext. PHY Specific Ctrl 2 */
+        PHY_MARV_EXT_P_STAT     = 0x1b,/* 16 bit r/w    Ext. PHY Spec. Stat Reg */
+        PHY_MARV_CABLE_DIAG     = 0x1c,/* 16 bit r/o    Cable Diagnostic Reg */
+        PHY_MARV_PAGE_ADDR      = 0x1d,/* 16 bit r/w    Extended Page Address Reg */
+        PHY_MARV_PAGE_DATA      = 0x1e,/* 16 bit r/w    Extended Page Data Reg */
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+        PHY_MARV_FE_LED_PAR     = 0x16,/* 16 bit r/w    LED Parallel Select Reg. */
+        PHY_MARV_FE_LED_SER     = 0x17,/* 16 bit r/w    LED Stream Select S. LED */
+        PHY_MARV_FE_VCT_TX      = 0x1a,/* 16 bit r/w    VCT Reg. for TXP/N Pins */
+        PHY_MARV_FE_VCT_RX      = 0x1b,/* 16 bit r/o    VCT Reg. for RXP/N Pins */
+        PHY_MARV_FE_SPEC_2      = 0x1c,/* 16 bit r/w    Specific Control Reg. 2 */
+};
+
+/* Level One-PHY Registers, indirect addressed over XMAC */
+enum {
+        PHY_LONE_CTRL           = 0x00,/* 16 bit r/w    PHY Control Register */
+        PHY_LONE_STAT           = 0x01,/* 16 bit r/o    PHY Status Register */
+        PHY_LONE_ID0            = 0x02,/* 16 bit r/o    PHY ID0 Register */
+        PHY_LONE_ID1            = 0x03,/* 16 bit r/o    PHY ID1 Register */
+        PHY_LONE_AUNE_ADV       = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+        PHY_LONE_AUNE_LP        = 0x05,/* 16 bit r/o    Link Part Ability Reg */
+        PHY_LONE_AUNE_EXP       = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+        PHY_LONE_NEPG           = 0x07,/* 16 bit r/w    Next Page Register */
+        PHY_LONE_NEPG_LP        = 0x08,/* 16 bit r/o    Next Page Link Partner */
+        /* Level One-specific registers */
+        PHY_LONE_1000T_CTRL     = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
+        PHY_LONE_1000T_STAT     = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
+        PHY_LONE_EXT_STAT       = 0x0f,/* 16 bit r/o    Extended Status Reg */
+        PHY_LONE_PORT_CFG       = 0x10,/* 16 bit r/w    Port Configuration Reg*/
+        PHY_LONE_Q_STAT         = 0x11,/* 16 bit r/o    Quick Status Reg */
+        PHY_LONE_INT_ENAB       = 0x12,/* 16 bit r/w    Interrupt Enable Reg */
+        PHY_LONE_INT_STAT       = 0x13,/* 16 bit r/o    Interrupt Status Reg */
+        PHY_LONE_LED_CFG        = 0x14,/* 16 bit r/w    LED Configuration Reg */
+        PHY_LONE_PORT_CTRL      = 0x15,/* 16 bit r/w    Port Control Reg */
+        PHY_LONE_CIM            = 0x16,/* 16 bit r/o    CIM Reg */
+};
+
+/* National-PHY Registers, indirect addressed over XMAC */
+enum {
+        PHY_NAT_CTRL            = 0x00,/* 16 bit r/w    PHY Control Register */
+        PHY_NAT_STAT            = 0x01,/* 16 bit r/w    PHY Status Register */
+        PHY_NAT_ID0             = 0x02,/* 16 bit r/o    PHY ID0 Register */
+        PHY_NAT_ID1             = 0x03,/* 16 bit r/o    PHY ID1 Register */
+        PHY_NAT_AUNE_ADV        = 0x04,/* 16 bit r/w    Auto-Neg. Advertisement */
+        PHY_NAT_AUNE_LP         = 0x05,/* 16 bit r/o    Link Partner Ability Reg */
+        PHY_NAT_AUNE_EXP        = 0x06,/* 16 bit r/o    Auto-Neg. Expansion Reg */
+        PHY_NAT_NEPG            = 0x07,/* 16 bit r/w    Next Page Register */
+        PHY_NAT_NEPG_LP         = 0x08,/* 16 bit r/o    Next Page Link Partner Reg */
+        /* National-specific registers */
+        PHY_NAT_1000T_CTRL      = 0x09,/* 16 bit r/w    1000Base-T Control Reg */
+        PHY_NAT_1000T_STAT      = 0x0a,/* 16 bit r/o    1000Base-T Status Reg */
+        PHY_NAT_EXT_STAT        = 0x0f,/* 16 bit r/o    Extended Status Register */
+        PHY_NAT_EXT_CTRL1       = 0x10,/* 16 bit r/o    Extended Control Reg1 */
+        PHY_NAT_Q_STAT1         = 0x11,/* 16 bit r/o    Quick Status Reg1 */
+        PHY_NAT_10B_OP          = 0x12,/* 16 bit r/o    10Base-T Operations Reg */
+        PHY_NAT_EXT_CTRL2       = 0x13,/* 16 bit r/o    Extended Control Reg1 */
+        PHY_NAT_Q_STAT2         = 0x14,/* 16 bit r/o    Quick Status Reg2 */
+
+        PHY_NAT_PHY_ADDR        = 0x19,/* 16 bit r/o    PHY Address Register */
+};
+
+enum {
+        PHY_CT_RESET    = 1<<15, /* Bit 15: (sc)        clear all PHY related regs */
+        PHY_CT_LOOP     = 1<<14, /* Bit 14:     enable Loopback over PHY */
+        PHY_CT_SPS_LSB  = 1<<13, /* Bit 13:     Speed select, lower bit */
+        PHY_CT_ANE      = 1<<12, /* Bit 12:     Auto-Negotiation Enabled */
+        PHY_CT_PDOWN    = 1<<11, /* Bit 11:     Power Down Mode */
+        PHY_CT_ISOL     = 1<<10, /* Bit 10:     Isolate Mode */
+        PHY_CT_RE_CFG   = 1<<9, /* Bit  9:      (sc) Restart Auto-Negotiation */
+        PHY_CT_DUP_MD   = 1<<8, /* Bit  8:      Duplex Mode */
+        PHY_CT_COL_TST  = 1<<7, /* Bit  7:      Collision Test enabled */
+        PHY_CT_SPS_MSB  = 1<<6, /* Bit  6:      Speed select, upper bit */
+};
+
+enum {
+        PHY_CT_SP1000   = PHY_CT_SPS_MSB, /* enable speed of 1000 Mbps */
+        PHY_CT_SP100    = PHY_CT_SPS_LSB, /* enable speed of  100 Mbps */
+        PHY_CT_SP10     = 0,              /* enable speed of   10 Mbps */
+};
+
+enum {
+        PHY_ST_EXT_ST   = 1<<8, /* Bit  8:      Extended Status Present */
+
+        PHY_ST_PRE_SUP  = 1<<6, /* Bit  6:      Preamble Suppression */
+        PHY_ST_AN_OVER  = 1<<5, /* Bit  5:      Auto-Negotiation Over */
+        PHY_ST_REM_FLT  = 1<<4, /* Bit  4:      Remote Fault Condition Occured */
+        PHY_ST_AN_CAP   = 1<<3, /* Bit  3:      Auto-Negotiation Capability */
+        PHY_ST_LSYNC    = 1<<2, /* Bit  2:      Link Synchronized */
+        PHY_ST_JAB_DET  = 1<<1, /* Bit  1:      Jabber Detected */
+        PHY_ST_EXT_REG  = 1<<0, /* Bit  0:      Extended Register available */
+};
+
+enum {
+        PHY_I1_OUI_MSK  = 0x3f<<10, /* Bit 15..10:      Organization Unique ID */
+        PHY_I1_MOD_NUM  = 0x3f<<4, /* Bit  9.. 4:       Model Number */
+        PHY_I1_REV_MSK  = 0xf, /* Bit  3.. 0:   Revision Number */
+};
+
+/* different Broadcom PHY Ids */
+enum {
+        PHY_BCOM_ID1_A1 = 0x6041,
+        PHY_BCOM_ID1_B2 = 0x6043,
+        PHY_BCOM_ID1_C0 = 0x6044,
+        PHY_BCOM_ID1_C5 = 0x6047,
+};
+
+/* different Marvell PHY Ids */
+enum {
+        PHY_MARV_ID0_VAL= 0x0141, /* Marvell Unique Identifier */
+        PHY_MARV_ID1_B0 = 0x0C23, /* Yukon (PHY 88E1011) */
+        PHY_MARV_ID1_B2 = 0x0C25, /* Yukon-Plus (PHY 88E1011) */
+        PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC (PHY 88E1111) */
+        PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */
+};
+
+enum {
+        PHY_AN_NXT_PG   = 1<<15, /* Bit 15:     Request Next Page */
+        PHY_X_AN_ACK    = 1<<14, /* Bit 14:     (ro) Acknowledge Received */
+        PHY_X_AN_RFB    = 3<<12,/* Bit 13..12:  Remote Fault Bits */
+
+        PHY_X_AN_PAUSE  = 3<<7,/* Bit  8.. 7:   Pause Bits */
+        PHY_X_AN_HD     = 1<<6, /* Bit  6:      Half Duplex */
+        PHY_X_AN_FD     = 1<<5, /* Bit  5:      Full Duplex */
+};
+
+enum {
+        PHY_B_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
+
+        PHY_B_AN_ASP    = 1<<11, /* Bit 11:     Asymmetric Pause */
+        PHY_B_AN_PC     = 1<<10, /* Bit 10:     Pause Capable */
+        PHY_B_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+};
+
+enum {
+        PHY_L_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
+                                                                /* Bit 12:      reserved */
+        PHY_L_AN_ASP    = 1<<11, /* Bit 11:     Asymmetric Pause */
+        PHY_L_AN_PC     = 1<<10, /* Bit 10:     Pause Capable */
+
+        PHY_L_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+};
+
+/*  PHY_NAT_AUNE_ADV    16 bit r/w      Auto-Negotiation Advertisement */
+/*  PHY_NAT_AUNE_LP     16 bit r/o      Link Partner Ability Reg *****/
+/*  PHY_AN_NXT_PG       (see XMAC) Bit 15:      Request Next Page */
+enum {
+        PHY_N_AN_RF     = 1<<13, /* Bit 13:     Remote Fault */
+
+        PHY_N_AN_100F   = 1<<11, /* Bit 11:     100Base-T2 FD Support */
+        PHY_N_AN_100H   = 1<<10, /* Bit 10:     100Base-T2 HD Support */
+
+        PHY_N_AN_SEL    = 0x1f, /* Bit 4..0:    Selector Field, 00001=Ethernet*/
+};
+
+/* field type definition for PHY_x_AN_SEL */
+enum {
+        PHY_SEL_TYPE     = 1,   /* 00001 = Ethernet */
+};
+
+enum {
+        PHY_ANE_LP_NP   = 1<<3, /* Bit  3:      Link Partner can Next Page */
+        PHY_ANE_LOC_NP  = 1<<2, /* Bit  2:      Local PHY can Next Page */
+        PHY_ANE_RX_PG   = 1<<1, /* Bit  1:      Page Received */
+};
+
+enum {
+        PHY_ANE_PAR_DF  = 1<<4, /* Bit  4:      Parallel Detection Fault */
+
+        PHY_ANE_LP_CAP  = 1<<0, /* Bit  0:      Link Partner Auto-Neg. Cap. */  
+};
+
+enum {
+        PHY_NP_MORE     = 1<<15, /* Bit 15:     More, Next Pages to follow */
+        PHY_NP_ACK1     = 1<<14, /* Bit 14: (ro)        Ack1, for receiving a message */
+        PHY_NP_MSG_VAL  = 1<<13, /* Bit 13:     Message Page valid */
+        PHY_NP_ACK2     = 1<<12, /* Bit 12:     Ack2, comply with msg content */
+        PHY_NP_TOG      = 1<<11, /* Bit 11:     Toggle Bit, ensure sync */
+        PHY_NP_MSG      = 0x07ff, /* Bit 10..0: Message from/to Link Partner */
+};
+
+enum {
+        PHY_X_EX_FD     = 1<<15, /* Bit 15:     Device Supports Full Duplex */
+        PHY_X_EX_HD     = 1<<14, /* Bit 14:     Device Supports Half Duplex */
+};
+
+enum {
+        PHY_X_RS_PAUSE  = 3<<7,/* Bit  8..7:    selected Pause Mode */
+        PHY_X_RS_HD     = 1<<6, /* Bit  6:      Half Duplex Mode selected */
+        PHY_X_RS_FD     = 1<<5, /* Bit  5:      Full Duplex Mode selected */
+        PHY_X_RS_ABLMIS = 1<<4, /* Bit  4:      duplex or pause cap mismatch */
+        PHY_X_RS_PAUMIS = 1<<3, /* Bit  3:      pause capability mismatch */
+};
+
+/** Remote Fault Bits (PHY_X_AN_RFB) encoding  */
+enum {
+        X_RFB_OK        = 0<<12,/* Bit 13..12   No errors, Link OK */
+        X_RFB_LF        = 1<<12, /* Bit 13..12  Link Failure */
+        X_RFB_OFF       = 2<<12,/* Bit 13..12   Offline */
+        X_RFB_AN_ERR    = 3<<12,/* Bit 13..12   Auto-Negotiation Error */
+};
+
+/* Pause Bits (PHY_X_AN_PAUSE and PHY_X_RS_PAUSE) encoding */
+enum {
+        PHY_X_P_NO_PAUSE        = 0<<7,/* Bit  8..7:    no Pause Mode */
+        PHY_X_P_SYM_MD  = 1<<7, /* Bit  8..7:   symmetric Pause Mode */
+        PHY_X_P_ASYM_MD = 2<<7,/* Bit  8..7:    asymmetric Pause Mode */
+        PHY_X_P_BOTH_MD = 3<<7,/* Bit  8..7:    both Pause Mode */
+};
+
+
+/* Broadcom-Specific */
+/*****  PHY_BCOM_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+enum {
+        PHY_B_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
+        PHY_B_1000C_MSE = 1<<12, /* Bit 12:     Master/Slave Enable */
+        PHY_B_1000C_MSC = 1<<11, /* Bit 11:     M/S Configuration */
+        PHY_B_1000C_RD  = 1<<10, /* Bit 10:     Repeater/DTE */
+        PHY_B_1000C_AFD = 1<<9, /* Bit  9:      Advertise Full Duplex */
+        PHY_B_1000C_AHD = 1<<8, /* Bit  8:      Advertise Half Duplex */
+};
+
+/*****  PHY_BCOM_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
+/*****  PHY_MARV_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
+enum {
+        PHY_B_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
+        PHY_B_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
+        PHY_B_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
+        PHY_B_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status */
+        PHY_B_1000S_LP_FD       = 1<<11, /* Bit 11:     Link Partner can FD */
+        PHY_B_1000S_LP_HD       = 1<<10, /* Bit 10:     Link Partner can HD */
+                                                                        /* Bit  9..8:   reserved */
+        PHY_B_1000S_IEC = 0xff, /* Bit  7..0:   Idle Error Count */
+};
+
+/*****  PHY_BCOM_EXT_STAT       16 bit r/o      Extended Status Register *****/
+enum {
+        PHY_B_ES_X_FD_CAP       = 1<<15, /* Bit 15:     1000Base-X FD capable */
+        PHY_B_ES_X_HD_CAP       = 1<<14, /* Bit 14:     1000Base-X HD capable */
+        PHY_B_ES_T_FD_CAP       = 1<<13, /* Bit 13:     1000Base-T FD capable */
+        PHY_B_ES_T_HD_CAP       = 1<<12, /* Bit 12:     1000Base-T HD capable */
+};
+
+/*****  PHY_BCOM_P_EXT_CTRL     16 bit r/w      PHY Extended Control Reg *****/
+enum {
+        PHY_B_PEC_MAC_PHY       = 1<<15, /* Bit 15:     10BIT/GMI-Interface */
+        PHY_B_PEC_DIS_CROSS     = 1<<14, /* Bit 14:     Disable MDI Crossover */
+        PHY_B_PEC_TX_DIS        = 1<<13, /* Bit 13:     Tx output Disabled */
+        PHY_B_PEC_INT_DIS       = 1<<12, /* Bit 12:     Interrupts Disabled */
+        PHY_B_PEC_F_INT = 1<<11, /* Bit 11:     Force Interrupt */
+        PHY_B_PEC_BY_45 = 1<<10, /* Bit 10:     Bypass 4B5B-Decoder */
+        PHY_B_PEC_BY_SCR        = 1<<9, /* Bit  9:      Bypass Scrambler */
+        PHY_B_PEC_BY_MLT3       = 1<<8, /* Bit  8:      Bypass MLT3 Encoder */
+        PHY_B_PEC_BY_RXA        = 1<<7, /* Bit  7:      Bypass Rx Alignm. */
+        PHY_B_PEC_RES_SCR       = 1<<6, /* Bit  6:      Reset Scrambler */
+        PHY_B_PEC_EN_LTR        = 1<<5, /* Bit  5:      Ena LED Traffic Mode */
+        PHY_B_PEC_LED_ON        = 1<<4, /* Bit  4:      Force LED's on */
+        PHY_B_PEC_LED_OFF       = 1<<3, /* Bit  3:      Force LED's off */
+        PHY_B_PEC_EX_IPG        = 1<<2, /* Bit  2:      Extend Tx IPG Mode */
+        PHY_B_PEC_3_LED = 1<<1, /* Bit  1:      Three Link LED mode */
+        PHY_B_PEC_HIGH_LA       = 1<<0, /* Bit  0:      GMII FIFO Elasticy */
+};
+
+/*****  PHY_BCOM_P_EXT_STAT     16 bit r/o      PHY Extended Status Reg *****/
+enum {
+        PHY_B_PES_CROSS_STAT    = 1<<13, /* Bit 13:     MDI Crossover Status */
+        PHY_B_PES_INT_STAT      = 1<<12, /* Bit 12:     Interrupt Status */
+        PHY_B_PES_RRS   = 1<<11, /* Bit 11:     Remote Receiver Stat. */
+        PHY_B_PES_LRS   = 1<<10, /* Bit 10:     Local Receiver Stat. */
+        PHY_B_PES_LOCKED        = 1<<9, /* Bit  9:      Locked */
+        PHY_B_PES_LS    = 1<<8, /* Bit  8:      Link Status */
+        PHY_B_PES_RF    = 1<<7, /* Bit  7:      Remote Fault */
+        PHY_B_PES_CE_ER = 1<<6, /* Bit  6:      Carrier Ext Error */
+        PHY_B_PES_BAD_SSD       = 1<<5, /* Bit  5:      Bad SSD */
+        PHY_B_PES_BAD_ESD       = 1<<4, /* Bit  4:      Bad ESD */
+        PHY_B_PES_RX_ER = 1<<3, /* Bit  3:      Receive Error */
+        PHY_B_PES_TX_ER = 1<<2, /* Bit  2:      Transmit Error */
+        PHY_B_PES_LOCK_ER       = 1<<1, /* Bit  1:      Lock Error */
+        PHY_B_PES_MLT3_ER       = 1<<0, /* Bit  0:      MLT3 code Error */
+};
+
+/*****  PHY_BCOM_FC_CTR         16 bit r/w      False Carrier Counter *****/
+enum {
+        PHY_B_FC_CTR    = 0xff, /* Bit  7..0:   False Carrier Counter */
+
+/*****  PHY_BCOM_RNO_CTR        16 bit r/w      Receive NOT_OK Counter *****/
+        PHY_B_RC_LOC_MSK        = 0xff00, /* Bit 15..8: Local Rx NOT_OK cnt */
+        PHY_B_RC_REM_MSK        = 0x00ff, /* Bit  7..0: Remote Rx NOT_OK cnt */
+
+/*****  PHY_BCOM_AUX_CTRL       16 bit r/w      Auxiliary Control Reg *****/
+        PHY_B_AC_L_SQE          = 1<<15, /* Bit 15:     Low Squelch */
+        PHY_B_AC_LONG_PACK      = 1<<14, /* Bit 14:     Rx Long Packets */
+        PHY_B_AC_ER_CTRL        = 3<<12,/* Bit 13..12:  Edgerate Control */
+                                                                        /* Bit 11:      reserved */
+        PHY_B_AC_TX_TST = 1<<10, /* Bit 10:     Tx test bit, always 1 */
+                                                                        /* Bit  9.. 8:  reserved */
+        PHY_B_AC_DIS_PRF        = 1<<7, /* Bit  7:      dis part resp filter */
+                                                                        /* Bit  6:      reserved */
+        PHY_B_AC_DIS_PM = 1<<5, /* Bit  5:      dis power management */
+                                                                        /* Bit  4:      reserved */
+        PHY_B_AC_DIAG   = 1<<3, /* Bit  3:      Diagnostic Mode */
+};
+
+/*****  PHY_BCOM_AUX_STAT       16 bit r/o      Auxiliary Status Reg *****/
+enum {
+        PHY_B_AS_AN_C   = 1<<15, /* Bit 15:     AutoNeg complete */
+        PHY_B_AS_AN_CA  = 1<<14, /* Bit 14:     AN Complete Ack */
+        PHY_B_AS_ANACK_D        = 1<<13, /* Bit 13:     AN Ack Detect */
+        PHY_B_AS_ANAB_D = 1<<12, /* Bit 12:     AN Ability Detect */
+        PHY_B_AS_NPW    = 1<<11, /* Bit 11:     AN Next Page Wait */
+        PHY_B_AS_AN_RES_MSK     = 7<<8,/* Bit 10..8:    AN HDC */
+        PHY_B_AS_PDF    = 1<<7, /* Bit  7:      Parallel Detect. Fault */
+        PHY_B_AS_RF     = 1<<6, /* Bit  6:      Remote Fault */
+        PHY_B_AS_ANP_R  = 1<<5, /* Bit  5:      AN Page Received */
+        PHY_B_AS_LP_ANAB        = 1<<4, /* Bit  4:      LP AN Ability */
+        PHY_B_AS_LP_NPAB        = 1<<3, /* Bit  3:      LP Next Page Ability */
+        PHY_B_AS_LS     = 1<<2, /* Bit  2:      Link Status */
+        PHY_B_AS_PRR    = 1<<1, /* Bit  1:      Pause Resolution-Rx */
+        PHY_B_AS_PRT    = 1<<0, /* Bit  0:      Pause Resolution-Tx */
+};
+#define PHY_B_AS_PAUSE_MSK      (PHY_B_AS_PRR | PHY_B_AS_PRT)
+
+/*****  PHY_BCOM_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
+/*****  PHY_BCOM_INT_MASK       16 bit r/w      Interrupt Mask Reg *****/
+enum {
+        PHY_B_IS_PSE    = 1<<14, /* Bit 14:     Pair Swap Error */
+        PHY_B_IS_MDXI_SC        = 1<<13, /* Bit 13:     MDIX Status Change */
+        PHY_B_IS_HCT    = 1<<12, /* Bit 12:     counter above 32k */
+        PHY_B_IS_LCT    = 1<<11, /* Bit 11:     counter above 128 */
+        PHY_B_IS_AN_PR  = 1<<10, /* Bit 10:     Page Received */
+        PHY_B_IS_NO_HDCL        = 1<<9, /* Bit  9:      No HCD Link */
+        PHY_B_IS_NO_HDC = 1<<8, /* Bit  8:      No HCD */
+        PHY_B_IS_NEG_USHDC      = 1<<7, /* Bit  7:      Negotiated Unsup. HCD */
+        PHY_B_IS_SCR_S_ER       = 1<<6, /* Bit  6:      Scrambler Sync Error */
+        PHY_B_IS_RRS_CHANGE     = 1<<5, /* Bit  5:      Remote Rx Stat Change */
+        PHY_B_IS_LRS_CHANGE     = 1<<4, /* Bit  4:      Local Rx Stat Change */
+        PHY_B_IS_DUP_CHANGE     = 1<<3, /* Bit  3:      Duplex Mode Change */
+        PHY_B_IS_LSP_CHANGE     = 1<<2, /* Bit  2:      Link Speed Change */
+        PHY_B_IS_LST_CHANGE     = 1<<1, /* Bit  1:      Link Status Changed */
+        PHY_B_IS_CRC_ER = 1<<0, /* Bit  0:      CRC Error */
+};
+#define PHY_B_DEF_MSK   (~(PHY_B_IS_AN_PR | PHY_B_IS_LST_CHANGE))
+
+/* Pause Bits (PHY_B_AN_ASP and PHY_B_AN_PC) encoding */
+enum {
+        PHY_B_P_NO_PAUSE        = 0<<10,/* Bit 11..10:  no Pause Mode */
+        PHY_B_P_SYM_MD  = 1<<10, /* Bit 11..10: symmetric Pause Mode */
+        PHY_B_P_ASYM_MD = 2<<10,/* Bit 11..10:  asymmetric Pause Mode */
+        PHY_B_P_BOTH_MD = 3<<10,/* Bit 11..10:  both Pause Mode */
+};
+/*
+ * Resolved Duplex mode and Capabilities (Aux Status Summary Reg)
+ */
+enum {
+        PHY_B_RES_1000FD        = 7<<8,/* Bit 10..8:    1000Base-T Full Dup. */
+        PHY_B_RES_1000HD        = 6<<8,/* Bit 10..8:    1000Base-T Half Dup. */
+};
+
+/*
+ * Level One-Specific
+ */
+/*****  PHY_LONE_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+enum {
+        PHY_L_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
+        PHY_L_1000C_MSE = 1<<12, /* Bit 12:     Master/Slave Enable */
+        PHY_L_1000C_MSC = 1<<11, /* Bit 11:     M/S Configuration */
+        PHY_L_1000C_RD  = 1<<10, /* Bit 10:     Repeater/DTE */
+        PHY_L_1000C_AFD = 1<<9, /* Bit  9:      Advertise Full Duplex */
+        PHY_L_1000C_AHD = 1<<8, /* Bit  8:      Advertise Half Duplex */
+};
+
+/*****  PHY_LONE_1000T_STAT     16 bit r/o      1000Base-T Status Reg *****/
+enum {
+        PHY_L_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
+        PHY_L_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
+        PHY_L_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
+        PHY_L_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status */
+        PHY_L_1000S_LP_FD = 1<<11, /* Bit 11:   Link Partner can FD */
+        PHY_L_1000S_LP_HD = 1<<10, /* Bit 10:   Link Partner can HD */
+
+        PHY_L_1000S_IEC  = 0xff, /* Bit  7..0:  Idle Error Count */
+
+/*****  PHY_LONE_EXT_STAT       16 bit r/o      Extended Status Register *****/
+        PHY_L_ES_X_FD_CAP = 1<<15, /* Bit 15:   1000Base-X FD capable */
+        PHY_L_ES_X_HD_CAP = 1<<14, /* Bit 14:   1000Base-X HD capable */
+        PHY_L_ES_T_FD_CAP = 1<<13, /* Bit 13:   1000Base-T FD capable */
+        PHY_L_ES_T_HD_CAP = 1<<12, /* Bit 12:   1000Base-T HD capable */
+};
+
+/*****  PHY_LONE_PORT_CFG       16 bit r/w      Port Configuration Reg *****/
+enum {
+        PHY_L_PC_REP_MODE       = 1<<15, /* Bit 15:     Repeater Mode */
+
+        PHY_L_PC_TX_DIS = 1<<13, /* Bit 13:     Tx output Disabled */
+        PHY_L_PC_BY_SCR = 1<<12, /* Bit 12:     Bypass Scrambler */
+        PHY_L_PC_BY_45  = 1<<11, /* Bit 11:     Bypass 4B5B-Decoder */
+        PHY_L_PC_JAB_DIS        = 1<<10, /* Bit 10:     Jabber Disabled */
+        PHY_L_PC_SQE    = 1<<9, /* Bit  9:      Enable Heartbeat */
+        PHY_L_PC_TP_LOOP        = 1<<8, /* Bit  8:      TP Loopback */
+        PHY_L_PC_SSS    = 1<<7, /* Bit  7:      Smart Speed Selection */
+        PHY_L_PC_FIFO_SIZE      = 1<<6, /* Bit  6:      FIFO Size */
+        PHY_L_PC_PRE_EN = 1<<5, /* Bit  5:      Preamble Enable */
+        PHY_L_PC_CIM    = 1<<4, /* Bit  4:      Carrier Integrity Mon */
+        PHY_L_PC_10_SER = 1<<3, /* Bit  3:      Use Serial Output */
+        PHY_L_PC_ANISOL = 1<<2, /* Bit  2:      Unisolate Port */
+        PHY_L_PC_TEN_BIT        = 1<<1, /* Bit  1:      10bit iface mode on */
+        PHY_L_PC_ALTCLOCK       = 1<<0, /* Bit  0: (ro) ALTCLOCK Mode on */
+};
+
+/*****  PHY_LONE_Q_STAT         16 bit r/o      Quick Status Reg *****/
+enum {
+        PHY_L_QS_D_RATE = 3<<14,/* Bit 15..14:  Data Rate */
+        PHY_L_QS_TX_STAT        = 1<<13, /* Bit 13:     Transmitting */
+        PHY_L_QS_RX_STAT        = 1<<12, /* Bit 12:     Receiving */
+        PHY_L_QS_COL_STAT       = 1<<11, /* Bit 11:     Collision */
+        PHY_L_QS_L_STAT = 1<<10, /* Bit 10:     Link is up */
+        PHY_L_QS_DUP_MOD        = 1<<9, /* Bit  9:      Full/Half Duplex */
+        PHY_L_QS_AN     = 1<<8, /* Bit  8:      AutoNeg is On */
+        PHY_L_QS_AN_C   = 1<<7, /* Bit  7:      AN is Complete */
+        PHY_L_QS_LLE    = 7<<4,/* Bit  6..4:    Line Length Estim. */
+        PHY_L_QS_PAUSE  = 1<<3, /* Bit  3:      LP advertised Pause */
+        PHY_L_QS_AS_PAUSE       = 1<<2, /* Bit  2:      LP adv. asym. Pause */
+        PHY_L_QS_ISOLATE        = 1<<1, /* Bit  1:      CIM Isolated */
+        PHY_L_QS_EVENT  = 1<<0, /* Bit  0:      Event has occurred */
+};
+
+/*****  PHY_LONE_INT_ENAB       16 bit r/w      Interrupt Enable Reg *****/
+/*****  PHY_LONE_INT_STAT       16 bit r/o      Interrupt Status Reg *****/
+enum {
+        PHY_L_IS_AN_F   = 1<<13, /* Bit 13:     Auto-Negotiation fault */
+        PHY_L_IS_CROSS  = 1<<11, /* Bit 11:     Crossover used */
+        PHY_L_IS_POL    = 1<<10, /* Bit 10:     Polarity correct. used */
+        PHY_L_IS_SS     = 1<<9, /* Bit  9:      Smart Speed Downgrade */
+        PHY_L_IS_CFULL  = 1<<8, /* Bit  8:      Counter Full */
+        PHY_L_IS_AN_C   = 1<<7, /* Bit  7:      AutoNeg Complete */
+        PHY_L_IS_SPEED  = 1<<6, /* Bit  6:      Speed Changed */
+        PHY_L_IS_DUP    = 1<<5, /* Bit  5:      Duplex Changed */
+        PHY_L_IS_LS     = 1<<4, /* Bit  4:      Link Status Changed */
+        PHY_L_IS_ISOL   = 1<<3, /* Bit  3:      Isolate Occured */
+        PHY_L_IS_MDINT  = 1<<2, /* Bit  2: (ro) STAT: MII Int Pending */
+        PHY_L_IS_INTEN  = 1<<1, /* Bit  1:      ENAB: Enable IRQs */
+        PHY_L_IS_FORCE  = 1<<0, /* Bit  0:      ENAB: Force Interrupt */
+};
+
+/* int. mask */
+#define PHY_L_DEF_MSK   (PHY_L_IS_LS | PHY_L_IS_ISOL | PHY_L_IS_INTEN)
+
+/*****  PHY_LONE_LED_CFG        16 bit r/w      LED Configuration Reg *****/
+enum {
+        PHY_L_LC_LEDC   = 3<<14,/* Bit 15..14:  Col/Blink/On/Off */
+        PHY_L_LC_LEDR   = 3<<12,/* Bit 13..12:  Rx/Blink/On/Off */
+        PHY_L_LC_LEDT   = 3<<10,/* Bit 11..10:  Tx/Blink/On/Off */
+        PHY_L_LC_LEDG   = 3<<8,/* Bit  9..8:    Giga/Blink/On/Off */
+        PHY_L_LC_LEDS   = 3<<6,/* Bit  7..6:    10-100/Blink/On/Off */
+        PHY_L_LC_LEDL   = 3<<4,/* Bit  5..4:    Link/Blink/On/Off */
+        PHY_L_LC_LEDF   = 3<<2,/* Bit  3..2:    Duplex/Blink/On/Off */
+        PHY_L_LC_PSTRECH= 1<<1, /* Bit  1:      Strech LED Pulses */
+        PHY_L_LC_FREQ   = 1<<0, /* Bit  0:      30/100 ms */
+};
+
+/*****  PHY_LONE_PORT_CTRL      16 bit r/w      Port Control Reg *****/
+enum {
+        PHY_L_PC_TX_TCLK = 1<<15, /* Bit 15:    Enable TX_TCLK */
+        PHY_L_PC_ALT_NP  = 1<<13, /* Bit 14:    Alternate Next Page */
+        PHY_L_PC_GMII_ALT= 1<<12, /* Bit 13:    Alternate GMII driver */
+        PHY_L_PC_TEN_CRS = 1<<10, /* Bit 10:    Extend CRS*/
+};
+
+/*****  PHY_LONE_CIM            16 bit r/o      CIM Reg *****/
+enum {
+        PHY_L_CIM_ISOL      = 0xff<<8,/* Bit 15..8:     Isolate Count */
+        PHY_L_CIM_FALSE_CAR = 0xff,   /* Bit  7..0:     False Carrier Count */
+};
+
+/*
+ * Pause Bits (PHY_L_AN_ASP and PHY_L_AN_PC) encoding
+ */
+enum {
+        PHY_L_P_NO_PAUSE= 0<<10,/* Bit 11..10:  no Pause Mode */
+        PHY_L_P_SYM_MD  = 1<<10, /* Bit 11..10: symmetric Pause Mode */
+        PHY_L_P_ASYM_MD = 2<<10,/* Bit 11..10:  asymmetric Pause Mode */
+        PHY_L_P_BOTH_MD = 3<<10,/* Bit 11..10:  both Pause Mode */
+};
+
+/*
+ * National-Specific
+ */
+/*****  PHY_NAT_1000T_CTRL      16 bit r/w      1000Base-T Control Reg *****/
+enum {
+        PHY_N_1000C_TEST= 7<<13,/* Bit 15..13:  Test Modes */
+        PHY_N_1000C_MSE = 1<<12, /* Bit 12:     Master/Slave Enable */
+        PHY_N_1000C_MSC = 1<<11, /* Bit 11:     M/S Configuration */
+        PHY_N_1000C_RD  = 1<<10, /* Bit 10:     Repeater/DTE */
+        PHY_N_1000C_AFD = 1<<9, /* Bit  9:      Advertise Full Duplex */
+        PHY_N_1000C_AHD = 1<<8, /* Bit  8:      Advertise Half Duplex */
+        PHY_N_1000C_APC = 1<<7, /* Bit  7:      Asymmetric Pause Cap. */};
+
+
+/*****  PHY_NAT_1000T_STAT      16 bit r/o      1000Base-T Status Reg *****/
+enum {
+        PHY_N_1000S_MSF = 1<<15, /* Bit 15:     Master/Slave Fault */
+        PHY_N_1000S_MSR = 1<<14, /* Bit 14:     Master/Slave Result */
+        PHY_N_1000S_LRS = 1<<13, /* Bit 13:     Local Receiver Status */
+        PHY_N_1000S_RRS = 1<<12, /* Bit 12:     Remote Receiver Status*/
+        PHY_N_1000S_LP_FD= 1<<11, /* Bit 11:    Link Partner can FD */
+        PHY_N_1000S_LP_HD= 1<<10, /* Bit 10:    Link Partner can HD */
+        PHY_N_1000C_LP_APC= 1<<9, /* Bit  9:    LP Asym. Pause Cap. */
+        PHY_N_1000S_IEC = 0xff, /* Bit  7..0:   Idle Error Count */
+};
+
+/*****  PHY_NAT_EXT_STAT        16 bit r/o      Extended Status Register *****/
+enum {
+        PHY_N_ES_X_FD_CAP= 1<<15, /* Bit 15:    1000Base-X FD capable */
+        PHY_N_ES_X_HD_CAP= 1<<14, /* Bit 14:    1000Base-X HD capable */
+        PHY_N_ES_T_FD_CAP= 1<<13, /* Bit 13:    1000Base-T FD capable */
+        PHY_N_ES_T_HD_CAP= 1<<12, /* Bit 12:    1000Base-T HD capable */
+};
+
+/** Marvell-Specific */
+enum {
+        PHY_M_AN_NXT_PG = 1<<15, /* Request Next Page */
+        PHY_M_AN_ACK    = 1<<14, /* (ro)        Acknowledge Received */
+        PHY_M_AN_RF     = 1<<13, /* Remote Fault */
+
+        PHY_M_AN_ASP    = 1<<11, /* Asymmetric Pause */
+        PHY_M_AN_PC     = 1<<10, /* MAC Pause implemented */
+        PHY_M_AN_100_T4 = 1<<9, /* Not cap. 100Base-T4 (always 0) */
+        PHY_M_AN_100_FD = 1<<8, /* Advertise 100Base-TX Full Duplex */
+        PHY_M_AN_100_HD = 1<<7, /* Advertise 100Base-TX Half Duplex */
+        PHY_M_AN_10_FD  = 1<<6, /* Advertise 10Base-TX Full Duplex */
+        PHY_M_AN_10_HD  = 1<<5, /* Advertise 10Base-TX Half Duplex */
+        PHY_M_AN_SEL_MSK =0x1f<<4,      /* Bit  4.. 0: Selector Field Mask */
+};
+
+/* special defines for FIBER (88E1011S only) */
+enum {
+        PHY_M_AN_ASP_X  = 1<<8, /* Asymmetric Pause */
+        PHY_M_AN_PC_X   = 1<<7, /* MAC Pause implemented */
+        PHY_M_AN_1000X_AHD      = 1<<6, /* Advertise 10000Base-X Half Duplex */
+        PHY_M_AN_1000X_AFD      = 1<<5, /* Advertise 10000Base-X Full Duplex */
+};
+
+/* Pause Bits (PHY_M_AN_ASP_X and PHY_M_AN_PC_X) encoding */
+enum {
+        PHY_M_P_NO_PAUSE_X      = 0<<7,/* Bit  8.. 7:   no Pause Mode */
+        PHY_M_P_SYM_MD_X        = 1<<7, /* Bit  8.. 7:  symmetric Pause Mode */
+        PHY_M_P_ASYM_MD_X       = 2<<7,/* Bit  8.. 7:   asymmetric Pause Mode */
+        PHY_M_P_BOTH_MD_X       = 3<<7,/* Bit  8.. 7:   both Pause Mode */
+};
+
+/*****  PHY_MARV_1000T_CTRL     16 bit r/w      1000Base-T Control Reg *****/
+enum {
+        PHY_M_1000C_TEST        = 7<<13,/* Bit 15..13:  Test Modes */
+        PHY_M_1000C_MSE = 1<<12, /* Manual Master/Slave Enable */
+        PHY_M_1000C_MSC = 1<<11, /* M/S Configuration (1=Master) */
+        PHY_M_1000C_MPD = 1<<10, /* Multi-Port Device */
+        PHY_M_1000C_AFD = 1<<9, /* Advertise Full Duplex */
+        PHY_M_1000C_AHD = 1<<8, /* Advertise Half Duplex */
+};
+
+/*****  PHY_MARV_PHY_CTRL       16 bit r/w      PHY Specific Ctrl Reg *****/
+enum {
+        PHY_M_PC_TX_FFD_MSK     = 3<<14,/* Bit 15..14: Tx FIFO Depth Mask */
+        PHY_M_PC_RX_FFD_MSK     = 3<<12,/* Bit 13..12: Rx FIFO Depth Mask */
+        PHY_M_PC_ASS_CRS_TX     = 1<<11, /* Assert CRS on Transmit */
+        PHY_M_PC_FL_GOOD        = 1<<10, /* Force Link Good */
+        PHY_M_PC_EN_DET_MSK     = 3<<8,/* Bit  9.. 8: Energy Detect Mask */
+        PHY_M_PC_ENA_EXT_D      = 1<<7, /* Enable Ext. Distance (10BT) */
+        PHY_M_PC_MDIX_MSK       = 3<<5,/* Bit  6.. 5: MDI/MDIX Config. Mask */
+        PHY_M_PC_DIS_125CLK     = 1<<4, /* Disable 125 CLK */
+        PHY_M_PC_MAC_POW_UP     = 1<<3, /* MAC Power up */
+        PHY_M_PC_SQE_T_ENA      = 1<<2, /* SQE Test Enabled */
+        PHY_M_PC_POL_R_DIS      = 1<<1, /* Polarity Reversal Disabled */
+        PHY_M_PC_DIS_JABBER     = 1<<0, /* Disable Jabber */
+};
+
+enum {
+        PHY_M_PC_EN_DET         = 2<<8, /* Energy Detect (Mode 1) */
+        PHY_M_PC_EN_DET_PLUS    = 3<<8, /* Energy Detect Plus (Mode 2) */
+};
+
+#define PHY_M_PC_MDI_XMODE(x)   (((x)<<5) & PHY_M_PC_MDIX_MSK)  
+
+enum {
+        PHY_M_PC_MAN_MDI        = 0, /* 00 = Manual MDI configuration */
+        PHY_M_PC_MAN_MDIX       = 1, /* 01 = Manual MDIX configuration */
+        PHY_M_PC_ENA_AUTO       = 3, /* 11 = Enable Automatic Crossover */
+};
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+enum {
+        PHY_M_PC_ENA_DTE_DT     = 1<<15, /* Enable Data Terminal Equ. (DTE) Detect */
+        PHY_M_PC_ENA_ENE_DT     = 1<<14, /* Enable Energy Detect (sense & pulse) */
+        PHY_M_PC_DIS_NLP_CK     = 1<<13, /* Disable Normal Link Puls (NLP) Check */
+        PHY_M_PC_ENA_LIP_NP     = 1<<12, /* Enable Link Partner Next Page Reg. */
+        PHY_M_PC_DIS_NLP_GN     = 1<<11, /* Disable Normal Link Puls Generation */
+
+        PHY_M_PC_DIS_SCRAMB     = 1<<9, /* Disable Scrambler */
+        PHY_M_PC_DIS_FEFI       = 1<<8, /* Disable Far End Fault Indic. (FEFI) */
+
+        PHY_M_PC_SH_TP_SEL      = 1<<6, /* Shielded Twisted Pair Select */
+        PHY_M_PC_RX_FD_MSK      = 3<<2,/* Bit  3.. 2: Rx FIFO Depth Mask */
+};
+
+/*****  PHY_MARV_PHY_STAT       16 bit r/o      PHY Specific Status Reg *****/
+enum {
+        PHY_M_PS_SPEED_MSK      = 3<<14, /* Bit 15..14: Speed Mask */
+        PHY_M_PS_SPEED_1000     = 1<<15, /*             10 = 1000 Mbps */
+        PHY_M_PS_SPEED_100      = 1<<14, /*             01 =  100 Mbps */
+        PHY_M_PS_SPEED_10       = 0,     /*             00 =   10 Mbps */
+        PHY_M_PS_FULL_DUP       = 1<<13, /* Full Duplex */
+        PHY_M_PS_PAGE_REC       = 1<<12, /* Page Received */
+        PHY_M_PS_SPDUP_RES      = 1<<11, /* Speed & Duplex Resolved */
+        PHY_M_PS_LINK_UP        = 1<<10, /* Link Up */
+        PHY_M_PS_CABLE_MSK      = 7<<7,  /* Bit  9.. 7: Cable Length Mask */
+        PHY_M_PS_MDI_X_STAT     = 1<<6,  /* MDI Crossover Stat (1=MDIX) */
+        PHY_M_PS_DOWNS_STAT     = 1<<5,  /* Downshift Status (1=downsh.) */
+        PHY_M_PS_ENDET_STAT     = 1<<4,  /* Energy Detect Status (1=act) */
+        PHY_M_PS_TX_P_EN        = 1<<3,  /* Tx Pause Enabled */
+        PHY_M_PS_RX_P_EN        = 1<<2,  /* Rx Pause Enabled */
+        PHY_M_PS_POL_REV        = 1<<1,  /* Polarity Reversed */
+        PHY_M_PS_JABBER         = 1<<0,  /* Jabber */
+};
+
+#define PHY_M_PS_PAUSE_MSK      (PHY_M_PS_TX_P_EN | PHY_M_PS_RX_P_EN)
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+enum {
+        PHY_M_PS_DTE_DETECT     = 1<<15, /* Data Terminal Equipment (DTE) Detected */
+        PHY_M_PS_RES_SPEED      = 1<<14, /* Resolved Speed (1=100 Mbps, 0=10 Mbps */
+};
+
+enum {
+        PHY_M_IS_AN_ERROR       = 1<<15, /* Auto-Negotiation Error */
+        PHY_M_IS_LSP_CHANGE     = 1<<14, /* Link Speed Changed */
+        PHY_M_IS_DUP_CHANGE     = 1<<13, /* Duplex Mode Changed */
+        PHY_M_IS_AN_PR          = 1<<12, /* Page Received */
+        PHY_M_IS_AN_COMPL       = 1<<11, /* Auto-Negotiation Completed */
+        PHY_M_IS_LST_CHANGE     = 1<<10, /* Link Status Changed */
+        PHY_M_IS_SYMB_ERROR     = 1<<9, /* Symbol Error */
+        PHY_M_IS_FALSE_CARR     = 1<<8, /* False Carrier */
+        PHY_M_IS_FIFO_ERROR     = 1<<7, /* FIFO Overflow/Underrun Error */
+        PHY_M_IS_MDI_CHANGE     = 1<<6, /* MDI Crossover Changed */
+        PHY_M_IS_DOWNSH_DET     = 1<<5, /* Downshift Detected */
+        PHY_M_IS_END_CHANGE     = 1<<4, /* Energy Detect Changed */
+
+        PHY_M_IS_DTE_CHANGE     = 1<<2, /* DTE Power Det. Status Changed */
+        PHY_M_IS_POL_CHANGE     = 1<<1, /* Polarity Changed */
+        PHY_M_IS_JABBER         = 1<<0, /* Jabber */
+};
+
+#define PHY_M_DEF_MSK   ( PHY_M_IS_AN_ERROR | PHY_M_IS_LSP_CHANGE | \
+                          PHY_M_IS_LST_CHANGE | PHY_M_IS_FIFO_ERROR)
+
+/*****  PHY_MARV_EXT_CTRL       16 bit r/w      Ext. PHY Specific Ctrl *****/
+enum {
+        PHY_M_EC_ENA_BC_EXT = 1<<15, /* Enable Block Carr. Ext. (88E1111 only) */
+        PHY_M_EC_ENA_LIN_LB = 1<<14, /* Enable Line Loopback (88E1111 only) */
+
+        PHY_M_EC_DIS_LINK_P = 1<<12, /* Disable Link Pulses (88E1111 only) */
+        PHY_M_EC_M_DSC_MSK  = 3<<10, /* Bit 11..10:     Master Downshift Counter */
+                                        /* (88E1011 only) */
+        PHY_M_EC_S_DSC_MSK      = 3<<8,/* Bit  9.. 8:   Slave  Downshift Counter */
+                                       /* (88E1011 only) */
+        PHY_M_EC_M_DSC_MSK2     = 7<<9,/* Bit 11.. 9:   Master Downshift Counter */
+                                        /* (88E1111 only) */
+        PHY_M_EC_DOWN_S_ENA     = 1<<8, /* Downshift Enable (88E1111 only) */
+                                        /* !!! Errata in spec. (1 = disable) */
+        PHY_M_EC_RX_TIM_CT      = 1<<7, /* RGMII Rx Timing Control*/
+        PHY_M_EC_MAC_S_MSK      = 7<<4,/* Bit  6.. 4:   Def. MAC interface speed */
+        PHY_M_EC_FIB_AN_ENA     = 1<<3, /* Fiber Auto-Neg. Enable (88E1011S only) */
+        PHY_M_EC_DTE_D_ENA      = 1<<2, /* DTE Detect Enable (88E1111 only) */
+        PHY_M_EC_TX_TIM_CT      = 1<<1, /* RGMII Tx Timing Control */
+        PHY_M_EC_TRANS_DIS      = 1<<0, /* Transmitter Disable (88E1111 only) */};
+
+#define PHY_M_EC_M_DSC(x)       ((x)<<10) /* 00=1x; 01=2x; 10=3x; 11=4x */
+#define PHY_M_EC_S_DSC(x)       ((x)<<8) /* 00=dis; 01=1x; 10=2x; 11=3x */
+#define PHY_M_EC_MAC_S(x)       ((x)<<4) /* 01X=0; 110=2.5; 111=25 (MHz) */
+
+#define PHY_M_EC_M_DSC_2(x)     ((x)<<9) /* 000=1x; 001=2x; 010=3x; 011=4x */
+                                                                                        /* 100=5x; 101=6x; 110=7x; 111=8x */
+enum {
+        MAC_TX_CLK_0_MHZ        = 2,
+        MAC_TX_CLK_2_5_MHZ      = 6,
+        MAC_TX_CLK_25_MHZ       = 7,
+};
+
+/*****  PHY_MARV_LED_CTRL       16 bit r/w      LED Control Reg *****/
+enum {
+        PHY_M_LEDC_DIS_LED      = 1<<15, /* Disable LED */
+        PHY_M_LEDC_PULS_MSK     = 7<<12,/* Bit 14..12: Pulse Stretch Mask */
+        PHY_M_LEDC_F_INT        = 1<<11, /* Force Interrupt */
+        PHY_M_LEDC_BL_R_MSK     = 7<<8,/* Bit 10.. 8: Blink Rate Mask */
+        PHY_M_LEDC_DP_C_LSB     = 1<<7, /* Duplex Control (LSB, 88E1111 only) */
+        PHY_M_LEDC_TX_C_LSB     = 1<<6, /* Tx Control (LSB, 88E1111 only) */
+        PHY_M_LEDC_LK_C_MSK     = 7<<3,/* Bit  5.. 3: Link Control Mask */
+                                        /* (88E1111 only) */
+};
+
+enum {
+        PHY_M_LEDC_LINK_MSK     = 3<<3,/* Bit  4.. 3: Link Control Mask */
+                                                                        /* (88E1011 only) */
+        PHY_M_LEDC_DP_CTRL      = 1<<2, /* Duplex Control */
+        PHY_M_LEDC_DP_C_MSB     = 1<<2, /* Duplex Control (MSB, 88E1111 only) */
+        PHY_M_LEDC_RX_CTRL      = 1<<1, /* Rx Activity / Link */
+        PHY_M_LEDC_TX_CTRL      = 1<<0, /* Tx Activity / Link */
+        PHY_M_LEDC_TX_C_MSB     = 1<<0, /* Tx Control (MSB, 88E1111 only) */
+};
+
+#define PHY_M_LED_PULS_DUR(x)   (       ((x)<<12) & PHY_M_LEDC_PULS_MSK)
+
+enum {
+        PULS_NO_STR     = 0,/* no pulse stretching */
+        PULS_21MS       = 1,/* 21 ms to 42 ms */
+        PULS_42MS       = 2,/* 42 ms to 84 ms */
+        PULS_84MS       = 3,/* 84 ms to 170 ms */
+        PULS_170MS      = 4,/* 170 ms to 340 ms */
+        PULS_340MS      = 5,/* 340 ms to 670 ms */
+        PULS_670MS      = 6,/* 670 ms to 1.3 s */
+        PULS_1300MS     = 7,/* 1.3 s to 2.7 s */
+};
+
+#define PHY_M_LED_BLINK_RT(x)   (       ((x)<<8) & PHY_M_LEDC_BL_R_MSK)
+
+enum {
+        BLINK_42MS      = 0,/* 42 ms */
+        BLINK_84MS      = 1,/* 84 ms */
+        BLINK_170MS     = 2,/* 170 ms */
+        BLINK_340MS     = 3,/* 340 ms */
+        BLINK_670MS     = 4,/* 670 ms */
+};
+
+/*****  PHY_MARV_LED_OVER       16 bit r/w      Manual LED Override Reg *****/
+#define PHY_M_LED_MO_SGMII(x)   ((x)<<14) /* Bit 15..14:  SGMII AN Timer */
+                                                                                /* Bit 13..12:  reserved */
+#define PHY_M_LED_MO_DUP(x)     ((x)<<10) /* Bit 11..10:  Duplex */
+#define PHY_M_LED_MO_10(x)      ((x)<<8) /* Bit  9.. 8:  Link 10 */
+#define PHY_M_LED_MO_100(x)     ((x)<<6) /* Bit  7.. 6:  Link 100 */
+#define PHY_M_LED_MO_1000(x)    ((x)<<4) /* Bit  5.. 4:  Link 1000 */
+#define PHY_M_LED_MO_RX(x)      ((x)<<2) /* Bit  3.. 2:  Rx */
+#define PHY_M_LED_MO_TX(x)      ((x)<<0) /* Bit  1.. 0:  Tx */
+
+enum {
+        MO_LED_NORM     = 0,
+        MO_LED_BLINK    = 1,
+        MO_LED_OFF      = 2,
+        MO_LED_ON       = 3,
+};
+
+/*****  PHY_MARV_EXT_CTRL_2     16 bit r/w      Ext. PHY Specific Ctrl 2 *****/
+enum {
+        PHY_M_EC2_FI_IMPED      = 1<<6, /* Fiber Input  Impedance */
+        PHY_M_EC2_FO_IMPED      = 1<<5, /* Fiber Output Impedance */
+        PHY_M_EC2_FO_M_CLK      = 1<<4, /* Fiber Mode Clock Enable */
+        PHY_M_EC2_FO_BOOST      = 1<<3, /* Fiber Output Boost */
+        PHY_M_EC2_FO_AM_MSK     = 7,/* Bit  2.. 0:      Fiber Output Amplitude */
+};
+
+/*****  PHY_MARV_EXT_P_STAT 16 bit r/w  Ext. PHY Specific Status *****/
+enum {
+        PHY_M_FC_AUTO_SEL       = 1<<15, /* Fiber/Copper Auto Sel. Dis. */
+        PHY_M_FC_AN_REG_ACC     = 1<<14, /* Fiber/Copper AN Reg. Access */
+        PHY_M_FC_RESOLUTION     = 1<<13, /* Fiber/Copper Resolution */
+        PHY_M_SER_IF_AN_BP      = 1<<12, /* Ser. IF AN Bypass Enable */
+        PHY_M_SER_IF_BP_ST      = 1<<11, /* Ser. IF AN Bypass Status */
+        PHY_M_IRQ_POLARITY      = 1<<10, /* IRQ polarity */
+        PHY_M_DIS_AUT_MED       = 1<<9, /* Disable Aut. Medium Reg. Selection */
+                                                                        /* (88E1111 only) */
+                                                                /* Bit  9.. 4: reserved (88E1011 only) */
+        PHY_M_UNDOC1    = 1<<7, /* undocumented bit !! */
+        PHY_M_DTE_POW_STAT      = 1<<4, /* DTE Power Status (88E1111 only) */
+        PHY_M_MODE_MASK = 0xf, /* Bit  3.. 0: copy of HWCFG MODE[3:0] */
+};
+
+/*****  PHY_MARV_CABLE_DIAG     16 bit r/o      Cable Diagnostic Reg *****/
+enum {
+        PHY_M_CABD_ENA_TEST     = 1<<15, /* Enable Test (Page 0) */
+        PHY_M_CABD_DIS_WAIT     = 1<<15, /* Disable Waiting Period (Page 1) */
+                                        /* (88E1111 only) */
+        PHY_M_CABD_STAT_MSK     = 3<<13, /* Bit 14..13: Status Mask */
+        PHY_M_CABD_AMPL_MSK     = 0x1f<<8,/* Bit 12.. 8: Amplitude Mask */
+                                        /* (88E1111 only) */
+        PHY_M_CABD_DIST_MSK     = 0xff, /* Bit  7.. 0: Distance Mask */
+};
+
+/* values for Cable Diagnostic Status (11=fail; 00=OK; 10=open; 01=short) */
+enum {
+        CABD_STAT_NORMAL= 0,
+        CABD_STAT_SHORT = 1,
+        CABD_STAT_OPEN  = 2,
+        CABD_STAT_FAIL  = 3,
+};
+
+/* for 10/100 Fast Ethernet PHY (88E3082 only) */
+/*****  PHY_MARV_FE_LED_PAR             16 bit r/w      LED Parallel Select Reg. *****/
+                                                                        /* Bit 15..12: reserved (used internally) */
+enum {
+        PHY_M_FELP_LED2_MSK = 0xf<<8,   /* Bit 11.. 8: LED2 Mask (LINK) */
+        PHY_M_FELP_LED1_MSK = 0xf<<4,   /* Bit  7.. 4: LED1 Mask (ACT) */
+        PHY_M_FELP_LED0_MSK = 0xf, /* Bit  3.. 0: LED0 Mask (SPEED) */
+};
+
+#define PHY_M_FELP_LED2_CTRL(x) (       ((x)<<8) & PHY_M_FELP_LED2_MSK)
+#define PHY_M_FELP_LED1_CTRL(x) (       ((x)<<4) & PHY_M_FELP_LED1_MSK)
+#define PHY_M_FELP_LED0_CTRL(x) (       ((x)<<0) & PHY_M_FELP_LED0_MSK)
+
+enum {
+        LED_PAR_CTRL_COLX       = 0x00,
+        LED_PAR_CTRL_ERROR      = 0x01,
+        LED_PAR_CTRL_DUPLEX     = 0x02,
+        LED_PAR_CTRL_DP_COL     = 0x03,
+        LED_PAR_CTRL_SPEED      = 0x04,
+        LED_PAR_CTRL_LINK       = 0x05,
+        LED_PAR_CTRL_TX         = 0x06,
+        LED_PAR_CTRL_RX         = 0x07,
+        LED_PAR_CTRL_ACT        = 0x08,
+        LED_PAR_CTRL_LNK_RX     = 0x09,
+        LED_PAR_CTRL_LNK_AC     = 0x0a,
+        LED_PAR_CTRL_ACT_BL     = 0x0b,
+        LED_PAR_CTRL_TX_BL      = 0x0c,
+        LED_PAR_CTRL_RX_BL      = 0x0d,
+        LED_PAR_CTRL_COL_BL     = 0x0e,
+        LED_PAR_CTRL_INACT      = 0x0f
+};
+
+/*****,PHY_MARV_FE_SPEC_2               16 bit r/w      Specific Control Reg. 2 *****/
+enum {
+        PHY_M_FESC_DIS_WAIT     = 1<<2, /* Disable TDR Waiting Period */
+        PHY_M_FESC_ENA_MCLK     = 1<<1, /* Enable MAC Rx Clock in sleep mode */
+        PHY_M_FESC_SEL_CL_A     = 1<<0, /* Select Class A driver (100B-TX) */
+};
+
+/* for Yukon-2 Gigabit Ethernet PHY (88E1112 only) */
+/*****  PHY_MARV_PHY_CTRL (page 2)              16 bit r/w      MAC Specific Ctrl *****/
+enum {
+        PHY_M_MAC_MD_MSK        = 7<<7, /* Bit  9.. 7: Mode Select Mask */
+        PHY_M_MAC_MD_AUTO       = 3,/* Auto Copper/1000Base-X */
+        PHY_M_MAC_MD_COPPER     = 5,/* Copper only */
+        PHY_M_MAC_MD_1000BX     = 7,/* 1000Base-X only */
+};
+#define PHY_M_MAC_MODE_SEL(x)   (       ((x)<<7) & PHY_M_MAC_MD_MSK)
+
+/*****  PHY_MARV_PHY_CTRL (page 3)              16 bit r/w      LED Control Reg. *****/
+enum {
+        PHY_M_LEDC_LOS_MSK      = 0xf<<12,/* Bit 15..12: LOS LED Ctrl. Mask */
+        PHY_M_LEDC_INIT_MSK     = 0xf<<8, /* Bit 11.. 8: INIT LED Ctrl. Mask */
+        PHY_M_LEDC_STA1_MSK     = 0xf<<4,/* Bit  7.. 4: STAT1 LED Ctrl. Mask */
+        PHY_M_LEDC_STA0_MSK     = 0xf, /* Bit  3.. 0: STAT0 LED Ctrl. Mask */
+};
+
+#define PHY_M_LEDC_LOS_CTRL(x)  (       ((x)<<12) & PHY_M_LEDC_LOS_MSK)
+#define PHY_M_LEDC_INIT_CTRL(x) (       ((x)<<8) & PHY_M_LEDC_INIT_MSK)
+#define PHY_M_LEDC_STA1_CTRL(x) (       ((x)<<4) & PHY_M_LEDC_STA1_MSK)
+#define PHY_M_LEDC_STA0_CTRL(x) (       ((x)<<0) & PHY_M_LEDC_STA0_MSK)
+
+/* GMAC registers  */
+/* Port Registers */
+enum {
+        GM_GP_STAT      = 0x0000,       /* 16 bit r/o   General Purpose Status */
+        GM_GP_CTRL      = 0x0004,       /* 16 bit r/w   General Purpose Control */
+        GM_TX_CTRL      = 0x0008,       /* 16 bit r/w   Transmit Control Reg. */
+        GM_RX_CTRL      = 0x000c,       /* 16 bit r/w   Receive Control Reg. */
+        GM_TX_FLOW_CTRL = 0x0010,       /* 16 bit r/w   Transmit Flow-Control */
+        GM_TX_PARAM     = 0x0014,       /* 16 bit r/w   Transmit Parameter Reg. */
+        GM_SERIAL_MODE  = 0x0018,       /* 16 bit r/w   Serial Mode Register */
+/* Source Address Registers */
+        GM_SRC_ADDR_1L  = 0x001c,       /* 16 bit r/w   Source Address 1 (low) */
+        GM_SRC_ADDR_1M  = 0x0020,       /* 16 bit r/w   Source Address 1 (middle) */
+        GM_SRC_ADDR_1H  = 0x0024,       /* 16 bit r/w   Source Address 1 (high) */
+        GM_SRC_ADDR_2L  = 0x0028,       /* 16 bit r/w   Source Address 2 (low) */
+        GM_SRC_ADDR_2M  = 0x002c,       /* 16 bit r/w   Source Address 2 (middle) */
+        GM_SRC_ADDR_2H  = 0x0030,       /* 16 bit r/w   Source Address 2 (high) */
+
+/* Multicast Address Hash Registers */
+        GM_MC_ADDR_H1   = 0x0034,       /* 16 bit r/w   Multicast Address Hash 1 */
+        GM_MC_ADDR_H2   = 0x0038,       /* 16 bit r/w   Multicast Address Hash 2 */
+        GM_MC_ADDR_H3   = 0x003c,       /* 16 bit r/w   Multicast Address Hash 3 */
+        GM_MC_ADDR_H4   = 0x0040,       /* 16 bit r/w   Multicast Address Hash 4 */
+
+/* Interrupt Source Registers */
+        GM_TX_IRQ_SRC   = 0x0044,       /* 16 bit r/o   Tx Overflow IRQ Source */
+        GM_RX_IRQ_SRC   = 0x0048,       /* 16 bit r/o   Rx Overflow IRQ Source */
+        GM_TR_IRQ_SRC   = 0x004c,       /* 16 bit r/o   Tx/Rx Over. IRQ Source */
+
+/* Interrupt Mask Registers */
+        GM_TX_IRQ_MSK   = 0x0050,       /* 16 bit r/w   Tx Overflow IRQ Mask */
+        GM_RX_IRQ_MSK   = 0x0054,       /* 16 bit r/w   Rx Overflow IRQ Mask */
+        GM_TR_IRQ_MSK   = 0x0058,       /* 16 bit r/w   Tx/Rx Over. IRQ Mask */
+
+/* Serial Management Interface (SMI) Registers */
+        GM_SMI_CTRL     = 0x0080,       /* 16 bit r/w   SMI Control Register */
+        GM_SMI_DATA     = 0x0084,       /* 16 bit r/w   SMI Data Register */
+        GM_PHY_ADDR     = 0x0088,       /* 16 bit r/w   GPHY Address Register */
+};
+
+/* MIB Counters */
+#define GM_MIB_CNT_BASE 0x0100          /* Base Address of MIB Counters */
+#define GM_MIB_CNT_SIZE 44              /* Number of MIB Counters */
+
+/*
+ * MIB Counters base address definitions (low word) -
+ * use offset 4 for access to high word (32 bit r/o)
+ */
+enum {
+        GM_RXF_UC_OK  = GM_MIB_CNT_BASE + 0,    /* Unicast Frames Received OK */
+        GM_RXF_BC_OK    = GM_MIB_CNT_BASE + 8,  /* Broadcast Frames Received OK */
+        GM_RXF_MPAUSE   = GM_MIB_CNT_BASE + 16, /* Pause MAC Ctrl Frames Received */
+        GM_RXF_MC_OK    = GM_MIB_CNT_BASE + 24, /* Multicast Frames Received OK */
+        GM_RXF_FCS_ERR  = GM_MIB_CNT_BASE + 32, /* Rx Frame Check Seq. Error */
+        /* GM_MIB_CNT_BASE + 40:        reserved */
+        GM_RXO_OK_LO    = GM_MIB_CNT_BASE + 48, /* Octets Received OK Low */
+        GM_RXO_OK_HI    = GM_MIB_CNT_BASE + 56, /* Octets Received OK High */
+        GM_RXO_ERR_LO   = GM_MIB_CNT_BASE + 64, /* Octets Received Invalid Low */
+        GM_RXO_ERR_HI   = GM_MIB_CNT_BASE + 72, /* Octets Received Invalid High */
+        GM_RXF_SHT      = GM_MIB_CNT_BASE + 80, /* Frames <64 Byte Received OK */
+        GM_RXE_FRAG     = GM_MIB_CNT_BASE + 88, /* Frames <64 Byte Received with FCS Err */
+        GM_RXF_64B      = GM_MIB_CNT_BASE + 96, /* 64 Byte Rx Frame */
+        GM_RXF_127B     = GM_MIB_CNT_BASE + 104,        /* 65-127 Byte Rx Frame */
+        GM_RXF_255B     = GM_MIB_CNT_BASE + 112,        /* 128-255 Byte Rx Frame */
+        GM_RXF_511B     = GM_MIB_CNT_BASE + 120,        /* 256-511 Byte Rx Frame */
+        GM_RXF_1023B    = GM_MIB_CNT_BASE + 128,        /* 512-1023 Byte Rx Frame */
+        GM_RXF_1518B    = GM_MIB_CNT_BASE + 136,        /* 1024-1518 Byte Rx Frame */
+        GM_RXF_MAX_SZ   = GM_MIB_CNT_BASE + 144,        /* 1519-MaxSize Byte Rx Frame */
+        GM_RXF_LNG_ERR  = GM_MIB_CNT_BASE + 152,        /* Rx Frame too Long Error */
+        GM_RXF_JAB_PKT  = GM_MIB_CNT_BASE + 160,        /* Rx Jabber Packet Frame */
+        /* GM_MIB_CNT_BASE + 168:       reserved */
+        GM_RXE_FIFO_OV  = GM_MIB_CNT_BASE + 176,        /* Rx FIFO overflow Event */
+        /* GM_MIB_CNT_BASE + 184:       reserved */
+        GM_TXF_UC_OK    = GM_MIB_CNT_BASE + 192,        /* Unicast Frames Xmitted OK */
+        GM_TXF_BC_OK    = GM_MIB_CNT_BASE + 200,        /* Broadcast Frames Xmitted OK */
+        GM_TXF_MPAUSE   = GM_MIB_CNT_BASE + 208,        /* Pause MAC Ctrl Frames Xmitted */
+        GM_TXF_MC_OK    = GM_MIB_CNT_BASE + 216,        /* Multicast Frames Xmitted OK */
+        GM_TXO_OK_LO    = GM_MIB_CNT_BASE + 224,        /* Octets Transmitted OK Low */
+        GM_TXO_OK_HI    = GM_MIB_CNT_BASE + 232,        /* Octets Transmitted OK High */
+        GM_TXF_64B      = GM_MIB_CNT_BASE + 240,        /* 64 Byte Tx Frame */
+        GM_TXF_127B     = GM_MIB_CNT_BASE + 248,        /* 65-127 Byte Tx Frame */
+        GM_TXF_255B     = GM_MIB_CNT_BASE + 256,        /* 128-255 Byte Tx Frame */
+        GM_TXF_511B     = GM_MIB_CNT_BASE + 264,        /* 256-511 Byte Tx Frame */
+        GM_TXF_1023B    = GM_MIB_CNT_BASE + 272,        /* 512-1023 Byte Tx Frame */
+        GM_TXF_1518B    = GM_MIB_CNT_BASE + 280,        /* 1024-1518 Byte Tx Frame */
+        GM_TXF_MAX_SZ   = GM_MIB_CNT_BASE + 288,        /* 1519-MaxSize Byte Tx Frame */
+
+        GM_TXF_COL      = GM_MIB_CNT_BASE + 304,        /* Tx Collision */
+        GM_TXF_LAT_COL  = GM_MIB_CNT_BASE + 312,        /* Tx Late Collision */
+        GM_TXF_ABO_COL  = GM_MIB_CNT_BASE + 320,        /* Tx aborted due to Exces. Col. */
+        GM_TXF_MUL_COL  = GM_MIB_CNT_BASE + 328,        /* Tx Multiple Collision */
+        GM_TXF_SNG_COL  = GM_MIB_CNT_BASE + 336,        /* Tx Single Collision */
+        GM_TXE_FIFO_UR  = GM_MIB_CNT_BASE + 344,        /* Tx FIFO Underrun Event */
+};
+
+/* GMAC Bit Definitions */
+/*      GM_GP_STAT      16 bit r/o      General Purpose Status Register */
+enum {
+        GM_GPSR_SPEED           = 1<<15, /* Bit 15:     Port Speed (1 = 100 Mbps) */
+        GM_GPSR_DUPLEX          = 1<<14, /* Bit 14:     Duplex Mode (1 = Full) */
+        GM_GPSR_FC_TX_DIS       = 1<<13, /* Bit 13:     Tx Flow-Control Mode Disabled */
+        GM_GPSR_LINK_UP         = 1<<12, /* Bit 12:     Link Up Status */
+        GM_GPSR_PAUSE           = 1<<11, /* Bit 11:     Pause State */
+        GM_GPSR_TX_ACTIVE       = 1<<10, /* Bit 10:     Tx in Progress */
+        GM_GPSR_EXC_COL         = 1<<9, /* Bit  9:      Excessive Collisions Occured */
+        GM_GPSR_LAT_COL         = 1<<8, /* Bit  8:      Late Collisions Occured */
+
+        GM_GPSR_PHY_ST_CH       = 1<<5, /* Bit  5:      PHY Status Change */
+        GM_GPSR_GIG_SPEED       = 1<<4, /* Bit  4:      Gigabit Speed (1 = 1000 Mbps) */
+        GM_GPSR_PART_MODE       = 1<<3, /* Bit  3:      Partition mode */
+        GM_GPSR_FC_RX_DIS       = 1<<2, /* Bit  2:      Rx Flow-Control Mode Disabled */
+        GM_GPSR_PROM_EN         = 1<<1, /* Bit  1:      Promiscuous Mode Enabled */
+};
+        
+/*      GM_GP_CTRL      16 bit r/w      General Purpose Control Register */
+enum {
+        GM_GPCR_PROM_ENA        = 1<<14,        /* Bit 14:      Enable Promiscuous Mode */
+        GM_GPCR_FC_TX_DIS       = 1<<13, /* Bit 13:     Disable Tx Flow-Control Mode */
+        GM_GPCR_TX_ENA          = 1<<12, /* Bit 12:     Enable Transmit */
+        GM_GPCR_RX_ENA          = 1<<11, /* Bit 11:     Enable Receive */
+        GM_GPCR_BURST_ENA       = 1<<10, /* Bit 10:     Enable Burst Mode */
+        GM_GPCR_LOOP_ENA        = 1<<9, /* Bit  9:      Enable MAC Loopback Mode */
+        GM_GPCR_PART_ENA        = 1<<8, /* Bit  8:      Enable Partition Mode */
+        GM_GPCR_GIGS_ENA        = 1<<7, /* Bit  7:      Gigabit Speed (1000 Mbps) */
+        GM_GPCR_FL_PASS         = 1<<6, /* Bit  6:      Force Link Pass */
+        GM_GPCR_DUP_FULL        = 1<<5, /* Bit  5:      Full Duplex Mode */
+        GM_GPCR_FC_RX_DIS       = 1<<4, /* Bit  4:      Disable Rx Flow-Control Mode */
+        GM_GPCR_SPEED_100       = 1<<3,   /* Bit  3:    Port Speed 100 Mbps */
+        GM_GPCR_AU_DUP_DIS      = 1<<2, /* Bit  2:      Disable Auto-Update Duplex */
+        GM_GPCR_AU_FCT_DIS      = 1<<1, /* Bit  1:      Disable Auto-Update Flow-C. */
+        GM_GPCR_AU_SPD_DIS      = 1<<0, /* Bit  0:      Disable Auto-Update Speed */
+};
+
+#define GM_GPCR_SPEED_1000      (GM_GPCR_GIGS_ENA | GM_GPCR_SPEED_100)
+#define GM_GPCR_AU_ALL_DIS      (GM_GPCR_AU_DUP_DIS | GM_GPCR_AU_FCT_DIS|GM_GPCR_AU_SPD_DIS)
+        
+/*      GM_TX_CTRL                      16 bit r/w      Transmit Control Register */
+enum {
+        GM_TXCR_FORCE_JAM       = 1<<15, /* Bit 15:     Force Jam / Flow-Control */
+        GM_TXCR_CRC_DIS         = 1<<14, /* Bit 14:     Disable insertion of CRC */
+        GM_TXCR_PAD_DIS         = 1<<13, /* Bit 13:     Disable padding of packets */
+        GM_TXCR_COL_THR_MSK     = 1<<10, /* Bit 12..10: Collision Threshold */
+};
+
+#define TX_COL_THR(x)           (((x)<<10) & GM_TXCR_COL_THR_MSK)
+#define TX_COL_DEF              0x04
+        
+/*      GM_RX_CTRL                      16 bit r/w      Receive Control Register */
+enum {
+        GM_RXCR_UCF_ENA = 1<<15, /* Bit 15:     Enable Unicast filtering */
+        GM_RXCR_MCF_ENA = 1<<14, /* Bit 14:     Enable Multicast filtering */
+        GM_RXCR_CRC_DIS = 1<<13, /* Bit 13:     Remove 4-byte CRC */
+        GM_RXCR_PASS_FC = 1<<12, /* Bit 12:     Pass FC packets to FIFO */
+};
+        
+/*      GM_TX_PARAM             16 bit r/w      Transmit Parameter Register */
+enum {
+        GM_TXPA_JAMLEN_MSK      = 0x03<<14,     /* Bit 15..14:  Jam Length */
+        GM_TXPA_JAMIPG_MSK      = 0x1f<<9,      /* Bit 13..9:   Jam IPG */
+        GM_TXPA_JAMDAT_MSK      = 0x1f<<4,      /* Bit  8..4:   IPG Jam to Data */
+
+        TX_JAM_LEN_DEF          = 0x03,
+        TX_JAM_IPG_DEF          = 0x0b,
+        TX_IPG_JAM_DEF          = 0x1c,
+};
+
+#define TX_JAM_LEN_VAL(x)       (((x)<<14) & GM_TXPA_JAMLEN_MSK)
+#define TX_JAM_IPG_VAL(x)       (((x)<<9)  & GM_TXPA_JAMIPG_MSK)
+#define TX_IPG_JAM_DATA(x)      (((x)<<4)  & GM_TXPA_JAMDAT_MSK)
+
+
+/*      GM_SERIAL_MODE                  16 bit r/w      Serial Mode Register */
+enum {
+        GM_SMOD_DATABL_MSK      = 0x1f<<11, /* Bit 15..11:      Data Blinder (r/o) */
+        GM_SMOD_LIMIT_4         = 1<<10, /* Bit 10:     4 consecutive Tx trials */
+        GM_SMOD_VLAN_ENA        = 1<<9, /* Bit  9:      Enable VLAN  (Max. Frame Len) */
+        GM_SMOD_JUMBO_ENA       = 1<<8, /* Bit  8:      Enable Jumbo (Max. Frame Len) */
+         GM_SMOD_IPG_MSK        = 0x1f  /* Bit 4..0:    Inter-Packet Gap (IPG) */
+};
+        
+#define DATA_BLIND_VAL(x)       (((x)<<11) & GM_SMOD_DATABL_MSK)
+#define DATA_BLIND_DEF          0x04
+
+#define IPG_DATA_VAL(x)         (x & GM_SMOD_IPG_MSK)
+#define IPG_DATA_DEF            0x1e
+
+/*      GM_SMI_CTRL                     16 bit r/w      SMI Control Register */
+enum {
+        GM_SMI_CT_PHY_A_MSK     = 0x1f<<11,/* Bit 15..11:       PHY Device Address */
+        GM_SMI_CT_REG_A_MSK     = 0x1f<<6,/* Bit 10.. 6:        PHY Register Address */
+        GM_SMI_CT_OP_RD         = 1<<5, /* Bit  5:      OpCode Read (0=Write)*/
+        GM_SMI_CT_RD_VAL        = 1<<4, /* Bit  4:      Read Valid (Read completed) */
+        GM_SMI_CT_BUSY          = 1<<3, /* Bit  3:      Busy (Operation in progress) */
+};
+        
+#define GM_SMI_CT_PHY_AD(x)     (((x)<<11) & GM_SMI_CT_PHY_A_MSK)
+#define GM_SMI_CT_REG_AD(x)     (((x)<<6) & GM_SMI_CT_REG_A_MSK)
+
+/*      GM_PHY_ADDR                             16 bit r/w      GPHY Address Register */
+enum {
+        GM_PAR_MIB_CLR  = 1<<5, /* Bit  5:      Set MIB Clear Counter Mode */
+        GM_PAR_MIB_TST  = 1<<4, /* Bit  4:      MIB Load Counter (Test Mode) */
+};
+        
+/* Receive Frame Status Encoding */
+enum {
+        GMR_FS_LEN      = 0xffff<<16, /* Bit 31..16:    Rx Frame Length */
+        GMR_FS_VLAN     = 1<<13, /* Bit 13:     VLAN Packet */
+        GMR_FS_JABBER   = 1<<12, /* Bit 12:     Jabber Packet */
+        GMR_FS_UN_SIZE  = 1<<11, /* Bit 11:     Undersize Packet */
+        GMR_FS_MC       = 1<<10, /* Bit 10:     Multicast Packet */
+        GMR_FS_BC       = 1<<9, /* Bit  9:      Broadcast Packet */
+        GMR_FS_RX_OK    = 1<<8, /* Bit  8:      Receive OK (Good Packet) */
+        GMR_FS_GOOD_FC  = 1<<7, /* Bit  7:      Good Flow-Control Packet */
+        GMR_FS_BAD_FC   = 1<<6, /* Bit  6:      Bad  Flow-Control Packet */
+        GMR_FS_MII_ERR  = 1<<5, /* Bit  5:      MII Error */
+        GMR_FS_LONG_ERR = 1<<4, /* Bit  4:      Too Long Packet */
+        GMR_FS_FRAGMENT = 1<<3, /* Bit  3:      Fragment */
+
+        GMR_FS_CRC_ERR  = 1<<1, /* Bit  1:      CRC Error */
+        GMR_FS_RX_FF_OV = 1<<0, /* Bit  0:      Rx FIFO Overflow */
+
+/*
+ * GMR_FS_ANY_ERR (analogous to XMR_FS_ANY_ERR)
+ */
+        GMR_FS_ANY_ERR  = GMR_FS_CRC_ERR | GMR_FS_LONG_ERR | 
+                          GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC | 
+                          GMR_FS_JABBER,
+/* Rx GMAC FIFO Flush Mask (default) */
+        RX_FF_FL_DEF_MSK = GMR_FS_CRC_ERR | GMR_FS_RX_FF_OV |GMR_FS_MII_ERR |
+                           GMR_FS_BAD_FC | GMR_FS_GOOD_FC | GMR_FS_UN_SIZE | 
+                           GMR_FS_JABBER,
+};
+
+/*      RX_GMF_CTRL_T   32 bit  Rx GMAC FIFO Control/Test */
+enum {
+        GMF_WP_TST_ON   = 1<<14,        /* Write Pointer Test On */
+        GMF_WP_TST_OFF  = 1<<13,        /* Write Pointer Test Off */
+        GMF_WP_STEP     = 1<<12,        /* Write Pointer Step/Increment */
+
+        GMF_RP_TST_ON   = 1<<10,        /* Read Pointer Test On */
+        GMF_RP_TST_OFF  = 1<<9,         /* Read Pointer Test Off */
+        GMF_RP_STEP     = 1<<8,         /* Read Pointer Step/Increment */
+        GMF_RX_F_FL_ON  = 1<<7,         /* Rx FIFO Flush Mode On */
+        GMF_RX_F_FL_OFF = 1<<6,         /* Rx FIFO Flush Mode Off */
+        GMF_CLI_RX_FO   = 1<<5,         /* Clear IRQ Rx FIFO Overrun */
+        GMF_CLI_RX_FC   = 1<<4,         /* Clear IRQ Rx Frame Complete */
+        GMF_OPER_ON     = 1<<3,         /* Operational Mode On */
+        GMF_OPER_OFF    = 1<<2,         /* Operational Mode Off */
+        GMF_RST_CLR     = 1<<1,         /* Clear GMAC FIFO Reset */
+        GMF_RST_SET     = 1<<0,         /* Set   GMAC FIFO Reset */
+
+        RX_GMF_FL_THR_DEF = 0xa,        /* flush threshold (default) */
+};
+
+
+/*      TX_GMF_CTRL_T   32 bit  Tx GMAC FIFO Control/Test */
+enum {
+        GMF_WSP_TST_ON  = 1<<18,/* Write Shadow Pointer Test On */
+        GMF_WSP_TST_OFF = 1<<17,/* Write Shadow Pointer Test Off */
+        GMF_WSP_STEP    = 1<<16,/* Write Shadow Pointer Step/Increment */
+
+        GMF_CLI_TX_FU   = 1<<6, /* Clear IRQ Tx FIFO Underrun */
+        GMF_CLI_TX_FC   = 1<<5, /* Clear IRQ Tx Frame Complete */
+        GMF_CLI_TX_PE   = 1<<4, /* Clear IRQ Tx Parity Error */
+};
+
+/*      GMAC_TI_ST_CTRL  8 bit  Time Stamp Timer Ctrl Reg (YUKON only) */
+enum {
+        GMT_ST_START    = 1<<2, /* Start Time Stamp Timer */
+        GMT_ST_STOP     = 1<<1, /* Stop  Time Stamp Timer */
+        GMT_ST_CLR_IRQ  = 1<<0, /* Clear Time Stamp Timer IRQ */
+};
+
+/*      GMAC_CTRL               32 bit  GMAC Control Reg (YUKON only) */
+enum {
+        GMC_H_BURST_ON  = 1<<7, /* Half Duplex Burst Mode On */
+        GMC_H_BURST_OFF = 1<<6, /* Half Duplex Burst Mode Off */
+        GMC_F_LOOPB_ON  = 1<<5, /* FIFO Loopback On */
+        GMC_F_LOOPB_OFF = 1<<4, /* FIFO Loopback Off */
+        GMC_PAUSE_ON    = 1<<3, /* Pause On */
+        GMC_PAUSE_OFF   = 1<<2, /* Pause Off */
+        GMC_RST_CLR     = 1<<1, /* Clear GMAC Reset */
+        GMC_RST_SET     = 1<<0, /* Set   GMAC Reset */
+};
+
+/*      GPHY_CTRL               32 bit  GPHY Control Reg (YUKON only) */
+enum {
+        GPC_SEL_BDT     = 1<<28, /* Select Bi-Dir. Transfer for MDC/MDIO */
+        GPC_INT_POL_HI  = 1<<27, /* IRQ Polarity is Active HIGH */
+        GPC_75_OHM      = 1<<26, /* Use 75 Ohm Termination instead of 50 */
+        GPC_DIS_FC      = 1<<25, /* Disable Automatic Fiber/Copper Detection */
+        GPC_DIS_SLEEP   = 1<<24, /* Disable Energy Detect */
+        GPC_HWCFG_M_3   = 1<<23, /* HWCFG_MODE[3] */
+        GPC_HWCFG_M_2   = 1<<22, /* HWCFG_MODE[2] */
+        GPC_HWCFG_M_1   = 1<<21, /* HWCFG_MODE[1] */
+        GPC_HWCFG_M_0   = 1<<20, /* HWCFG_MODE[0] */
+        GPC_ANEG_0      = 1<<19, /* ANEG[0] */
+        GPC_ENA_XC      = 1<<18, /* Enable MDI crossover */
+        GPC_DIS_125     = 1<<17, /* Disable 125 MHz clock */
+        GPC_ANEG_3      = 1<<16, /* ANEG[3] */
+        GPC_ANEG_2      = 1<<15, /* ANEG[2] */
+        GPC_ANEG_1      = 1<<14, /* ANEG[1] */
+        GPC_ENA_PAUSE   = 1<<13, /* Enable Pause (SYM_OR_REM) */
+        GPC_PHYADDR_4   = 1<<12, /* Bit 4 of Phy Addr */
+        GPC_PHYADDR_3   = 1<<11, /* Bit 3 of Phy Addr */
+        GPC_PHYADDR_2   = 1<<10, /* Bit 2 of Phy Addr */
+        GPC_PHYADDR_1   = 1<<9,  /* Bit 1 of Phy Addr */
+        GPC_PHYADDR_0   = 1<<8,  /* Bit 0 of Phy Addr */
+                                                /* Bits  7..2:  reserved */
+        GPC_RST_CLR     = 1<<1, /* Clear GPHY Reset */
+        GPC_RST_SET     = 1<<0, /* Set   GPHY Reset */
+};
+
+#define GPC_HWCFG_GMII_COP (GPC_HWCFG_M_3|GPC_HWCFG_M_2 | GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
+#define GPC_HWCFG_GMII_FIB (GPC_HWCFG_M_2 | GPC_HWCFG_M_1 | GPC_HWCFG_M_0)
+#define GPC_ANEG_ADV_ALL_M  (GPC_ANEG_3 | GPC_ANEG_2 | GPC_ANEG_1 | GPC_ANEG_0)
+
+/* forced speed and duplex mode (don't mix with other ANEG bits) */
+#define GPC_FRC10MBIT_HALF      0
+#define GPC_FRC10MBIT_FULL      GPC_ANEG_0
+#define GPC_FRC100MBIT_HALF     GPC_ANEG_1
+#define GPC_FRC100MBIT_FULL     (GPC_ANEG_0 | GPC_ANEG_1)
+
+/* auto-negotiation with limited advertised speeds */
+/* mix only with master/slave settings (for copper) */
+#define GPC_ADV_1000_HALF       GPC_ANEG_2
+#define GPC_ADV_1000_FULL       GPC_ANEG_3
+#define GPC_ADV_ALL             (GPC_ANEG_2 | GPC_ANEG_3)
+
+/* master/slave settings */
+/* only for copper with 1000 Mbps */
+#define GPC_FORCE_MASTER        0
+#define GPC_FORCE_SLAVE         GPC_ANEG_0
+#define GPC_PREF_MASTER         GPC_ANEG_1
+#define GPC_PREF_SLAVE          (GPC_ANEG_1 | GPC_ANEG_0)
+
+/*      GMAC_IRQ_SRC     8 bit  GMAC Interrupt Source Reg (YUKON only) */
+/*      GMAC_IRQ_MSK     8 bit  GMAC Interrupt Mask   Reg (YUKON only) */
+enum {
+        GM_IS_TX_CO_OV  = 1<<5, /* Transmit Counter Overflow IRQ */
+        GM_IS_RX_CO_OV  = 1<<4, /* Receive Counter Overflow IRQ */
+        GM_IS_TX_FF_UR  = 1<<3, /* Transmit FIFO Underrun */
+        GM_IS_TX_COMPL  = 1<<2, /* Frame Transmission Complete */
+        GM_IS_RX_FF_OR  = 1<<1, /* Receive FIFO Overrun */
+        GM_IS_RX_COMPL  = 1<<0, /* Frame Reception Complete */
+
+#define GMAC_DEF_MSK    (GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | GM_IS_TX_FF_UR)
+
+/*      GMAC_LINK_CTRL  16 bit  GMAC Link Control Reg (YUKON only) */
+                                                /* Bits 15.. 2: reserved */
+        GMLC_RST_CLR    = 1<<1, /* Clear GMAC Link Reset */
+        GMLC_RST_SET    = 1<<0, /* Set   GMAC Link Reset */
+
+
+/*      WOL_CTRL_STAT   16 bit  WOL Control/Status Reg */
+        WOL_CTL_LINK_CHG_OCC            = 1<<15,
+        WOL_CTL_MAGIC_PKT_OCC           = 1<<14,
+        WOL_CTL_PATTERN_OCC             = 1<<13,
+        WOL_CTL_CLEAR_RESULT            = 1<<12,
+        WOL_CTL_ENA_PME_ON_LINK_CHG     = 1<<11,
+        WOL_CTL_DIS_PME_ON_LINK_CHG     = 1<<10,
+        WOL_CTL_ENA_PME_ON_MAGIC_PKT    = 1<<9,
+        WOL_CTL_DIS_PME_ON_MAGIC_PKT    = 1<<8,
+        WOL_CTL_ENA_PME_ON_PATTERN      = 1<<7,
+        WOL_CTL_DIS_PME_ON_PATTERN      = 1<<6,
+        WOL_CTL_ENA_LINK_CHG_UNIT       = 1<<5,
+        WOL_CTL_DIS_LINK_CHG_UNIT       = 1<<4,
+        WOL_CTL_ENA_MAGIC_PKT_UNIT      = 1<<3,
+        WOL_CTL_DIS_MAGIC_PKT_UNIT      = 1<<2,
+        WOL_CTL_ENA_PATTERN_UNIT        = 1<<1,
+        WOL_CTL_DIS_PATTERN_UNIT        = 1<<0,
+};
+
+#define WOL_CTL_DEFAULT                         \
+        (WOL_CTL_DIS_PME_ON_LINK_CHG |  \
+        WOL_CTL_DIS_PME_ON_PATTERN |    \
+        WOL_CTL_DIS_PME_ON_MAGIC_PKT |  \
+        WOL_CTL_DIS_LINK_CHG_UNIT |             \
+        WOL_CTL_DIS_PATTERN_UNIT |              \
+        WOL_CTL_DIS_MAGIC_PKT_UNIT)
+
+/*      WOL_MATCH_CTL    8 bit  WOL Match Control Reg */
+#define WOL_CTL_PATT_ENA(x)     (1 << (x))
+
+
+/* XMAC II registers                                  */
+enum {
+        XM_MMU_CMD      = 0x0000, /* 16 bit r/w MMU Command Register */
+        XM_POFF         = 0x0008, /* 32 bit r/w Packet Offset Register */
+        XM_BURST        = 0x000c, /* 32 bit r/w Burst Register for half duplex*/
+        XM_1L_VLAN_TAG  = 0x0010, /* 16 bit r/w One Level VLAN Tag ID */
+        XM_2L_VLAN_TAG  = 0x0014, /* 16 bit r/w Two Level VLAN Tag ID */
+        XM_TX_CMD       = 0x0020, /* 16 bit r/w Transmit Command Register */
+        XM_TX_RT_LIM    = 0x0024, /* 16 bit r/w Transmit Retry Limit Register */
+        XM_TX_STIME     = 0x0028, /* 16 bit r/w Transmit Slottime Register */
+        XM_TX_IPG       = 0x002c, /* 16 bit r/w Transmit Inter Packet Gap */
+        XM_RX_CMD       = 0x0030, /* 16 bit r/w Receive Command Register */
+        XM_PHY_ADDR     = 0x0034, /* 16 bit r/w PHY Address Register */
+        XM_PHY_DATA     = 0x0038, /* 16 bit r/w PHY Data Register */
+        XM_GP_PORT      = 0x0040, /* 32 bit r/w General Purpose Port Register */
+        XM_IMSK         = 0x0044, /* 16 bit r/w Interrupt Mask Register */
+        XM_ISRC         = 0x0048, /* 16 bit r/o Interrupt Status Register */
+        XM_HW_CFG       = 0x004c, /* 16 bit r/w Hardware Config Register */
+        XM_TX_LO_WM     = 0x0060, /* 16 bit r/w Tx FIFO Low Water Mark */
+        XM_TX_HI_WM     = 0x0062, /* 16 bit r/w Tx FIFO High Water Mark */
+        XM_TX_THR       = 0x0064, /* 16 bit r/w Tx Request Threshold */
+        XM_HT_THR       = 0x0066, /* 16 bit r/w Host Request Threshold */
+        XM_PAUSE_DA     = 0x0068, /* NA reg r/w Pause Destination Address */
+        XM_CTL_PARA     = 0x0070, /* 32 bit r/w Control Parameter Register */
+        XM_MAC_OPCODE   = 0x0074, /* 16 bit r/w Opcode for MAC control frames */
+        XM_MAC_PTIME    = 0x0076, /* 16 bit r/w Pause time for MAC ctrl frames*/
+        XM_TX_STAT      = 0x0078, /* 32 bit r/o Tx Status LIFO Register */
+
+        XM_EXM_START    = 0x0080, /* r/w        Start Address of the EXM Regs */
+#define XM_EXM(reg)     (XM_EXM_START + ((reg) << 3))
+};
+
+enum {
+        XM_SRC_CHK      = 0x0100, /* NA reg r/w Source Check Address Register */
+        XM_SA           = 0x0108, /* NA reg r/w Station Address Register */
+        XM_HSM          = 0x0110, /* 64 bit r/w Hash Match Address Registers */
+        XM_RX_LO_WM     = 0x0118, /* 16 bit r/w Receive Low Water Mark */
+        XM_RX_HI_WM     = 0x011a, /* 16 bit r/w Receive High Water Mark */
+        XM_RX_THR       = 0x011c, /* 32 bit r/w Receive Request Threshold */
+        XM_DEV_ID       = 0x0120, /* 32 bit r/o Device ID Register */
+        XM_MODE         = 0x0124, /* 32 bit r/w Mode Register */
+        XM_LSA          = 0x0128, /* NA reg r/o Last Source Register */
+        XM_TS_READ      = 0x0130, /* 32 bit r/o Time Stamp Read Register */
+        XM_TS_LOAD      = 0x0134, /* 32 bit r/o Time Stamp Load Value */
+        XM_STAT_CMD     = 0x0200, /* 16 bit r/w Statistics Command Register */
+        XM_RX_CNT_EV    = 0x0204, /* 32 bit r/o Rx Counter Event Register */
+        XM_TX_CNT_EV    = 0x0208, /* 32 bit r/o Tx Counter Event Register */
+        XM_RX_EV_MSK    = 0x020c, /* 32 bit r/w Rx Counter Event Mask */
+        XM_TX_EV_MSK    = 0x0210, /* 32 bit r/w Tx Counter Event Mask */
+        XM_TXF_OK       = 0x0280, /* 32 bit r/o Frames Transmitted OK Conuter */
+        XM_TXO_OK_HI    = 0x0284, /* 32 bit r/o Octets Transmitted OK High Cnt*/
+        XM_TXO_OK_LO    = 0x0288, /* 32 bit r/o Octets Transmitted OK Low Cnt */
+        XM_TXF_BC_OK    = 0x028c, /* 32 bit r/o Broadcast Frames Xmitted OK */
+        XM_TXF_MC_OK    = 0x0290, /* 32 bit r/o Multicast Frames Xmitted OK */
+        XM_TXF_UC_OK    = 0x0294, /* 32 bit r/o Unicast Frames Xmitted OK */
+        XM_TXF_LONG     = 0x0298, /* 32 bit r/o Tx Long Frame Counter */
+        XM_TXE_BURST    = 0x029c, /* 32 bit r/o Tx Burst Event Counter */
+        XM_TXF_MPAUSE   = 0x02a0, /* 32 bit r/o Tx Pause MAC Ctrl Frame Cnt */
+        XM_TXF_MCTRL    = 0x02a4, /* 32 bit r/o Tx MAC Ctrl Frame Counter */
+        XM_TXF_SNG_COL  = 0x02a8, /* 32 bit r/o Tx Single Collision Counter */
+        XM_TXF_MUL_COL  = 0x02ac, /* 32 bit r/o Tx Multiple Collision Counter */
+        XM_TXF_ABO_COL  = 0x02b0, /* 32 bit r/o Tx aborted due to Exces. Col. */
+        XM_TXF_LAT_COL  = 0x02b4, /* 32 bit r/o Tx Late Collision Counter */
+        XM_TXF_DEF      = 0x02b8, /* 32 bit r/o Tx Deferred Frame Counter */
+        XM_TXF_EX_DEF   = 0x02bc, /* 32 bit r/o Tx Excessive Deferall Counter */
+        XM_TXE_FIFO_UR  = 0x02c0, /* 32 bit r/o Tx FIFO Underrun Event Cnt */
+        XM_TXE_CS_ERR   = 0x02c4, /* 32 bit r/o Tx Carrier Sense Error Cnt */
+        XM_TXP_UTIL     = 0x02c8, /* 32 bit r/o Tx Utilization in % */
+        XM_TXF_64B      = 0x02d0, /* 32 bit r/o 64 Byte Tx Frame Counter */
+        XM_TXF_127B     = 0x02d4, /* 32 bit r/o 65-127 Byte Tx Frame Counter */
+        XM_TXF_255B     = 0x02d8, /* 32 bit r/o 128-255 Byte Tx Frame Counter */
+        XM_TXF_511B     = 0x02dc, /* 32 bit r/o 256-511 Byte Tx Frame Counter */
+        XM_TXF_1023B    = 0x02e0, /* 32 bit r/o 512-1023 Byte Tx Frame Counter*/
+        XM_TXF_MAX_SZ   = 0x02e4, /* 32 bit r/o 1024-MaxSize Byte Tx Frame Cnt*/
+        XM_RXF_OK       = 0x0300, /* 32 bit r/o Frames Received OK */
+        XM_RXO_OK_HI    = 0x0304, /* 32 bit r/o Octets Received OK High Cnt */
+        XM_RXO_OK_LO    = 0x0308, /* 32 bit r/o Octets Received OK Low Counter*/
+        XM_RXF_BC_OK    = 0x030c, /* 32 bit r/o Broadcast Frames Received OK */
+        XM_RXF_MC_OK    = 0x0310, /* 32 bit r/o Multicast Frames Received OK */
+        XM_RXF_UC_OK    = 0x0314, /* 32 bit r/o Unicast Frames Received OK */
+        XM_RXF_MPAUSE   = 0x0318, /* 32 bit r/o Rx Pause MAC Ctrl Frame Cnt */
+        XM_RXF_MCTRL    = 0x031c, /* 32 bit r/o Rx MAC Ctrl Frame Counter */
+        XM_RXF_INV_MP   = 0x0320, /* 32 bit r/o Rx invalid Pause Frame Cnt */
+        XM_RXF_INV_MOC  = 0x0324, /* 32 bit r/o Rx Frames with inv. MAC Opcode*/
+        XM_RXE_BURST    = 0x0328, /* 32 bit r/o Rx Burst Event Counter */
+        XM_RXE_FMISS    = 0x032c, /* 32 bit r/o Rx Missed Frames Event Cnt */
+        XM_RXF_FRA_ERR  = 0x0330, /* 32 bit r/o Rx Framing Error Counter */
+        XM_RXE_FIFO_OV  = 0x0334, /* 32 bit r/o Rx FIFO overflow Event Cnt */
+        XM_RXF_JAB_PKT  = 0x0338, /* 32 bit r/o Rx Jabber Packet Frame Cnt */
+        XM_RXE_CAR_ERR  = 0x033c, /* 32 bit r/o Rx Carrier Event Error Cnt */
+        XM_RXF_LEN_ERR  = 0x0340, /* 32 bit r/o Rx in Range Length Error */
+        XM_RXE_SYM_ERR  = 0x0344, /* 32 bit r/o Rx Symbol Error Counter */
+        XM_RXE_SHT_ERR  = 0x0348, /* 32 bit r/o Rx Short Event Error Cnt */
+        XM_RXE_RUNT     = 0x034c, /* 32 bit r/o Rx Runt Event Counter */
+        XM_RXF_LNG_ERR  = 0x0350, /* 32 bit r/o Rx Frame too Long Error Cnt */
+        XM_RXF_FCS_ERR  = 0x0354, /* 32 bit r/o Rx Frame Check Seq. Error Cnt */
+        XM_RXF_CEX_ERR  = 0x035c, /* 32 bit r/o Rx Carrier Ext Error Frame Cnt*/
+        XM_RXP_UTIL     = 0x0360, /* 32 bit r/o Rx Utilization in % */
+        XM_RXF_64B      = 0x0368, /* 32 bit r/o 64 Byte Rx Frame Counter */
+        XM_RXF_127B     = 0x036c, /* 32 bit r/o 65-127 Byte Rx Frame Counter */
+        XM_RXF_255B     = 0x0370, /* 32 bit r/o 128-255 Byte Rx Frame Counter */
+        XM_RXF_511B     = 0x0374, /* 32 bit r/o 256-511 Byte Rx Frame Counter */
+        XM_RXF_1023B    = 0x0378, /* 32 bit r/o 512-1023 Byte Rx Frame Counter*/
+        XM_RXF_MAX_SZ   = 0x037c, /* 32 bit r/o 1024-MaxSize Byte Rx Frame Cnt*/
+};
+
+/*      XM_MMU_CMD      16 bit r/w      MMU Command Register */
+enum {
+        XM_MMU_PHY_RDY  = 1<<12,/* Bit 12:      PHY Read Ready */
+        XM_MMU_PHY_BUSY = 1<<11,/* Bit 11:      PHY Busy */
+        XM_MMU_IGN_PF   = 1<<10,/* Bit 10:      Ignore Pause Frame */
+        XM_MMU_MAC_LB   = 1<<9, /* Bit  9:      Enable MAC Loopback */
+        XM_MMU_FRC_COL  = 1<<7, /* Bit  7:      Force Collision */
+        XM_MMU_SIM_COL  = 1<<6, /* Bit  6:      Simulate Collision */
+        XM_MMU_NO_PRE   = 1<<5, /* Bit  5:      No MDIO Preamble */
+        XM_MMU_GMII_FD  = 1<<4, /* Bit  4:      GMII uses Full Duplex */
+        XM_MMU_RAT_CTRL = 1<<3, /* Bit  3:      Enable Rate Control */
+        XM_MMU_GMII_LOOP= 1<<2, /* Bit  2:      PHY is in Loopback Mode */
+        XM_MMU_ENA_RX   = 1<<1, /* Bit  1:      Enable Receiver */
+        XM_MMU_ENA_TX   = 1<<0, /* Bit  0:      Enable Transmitter */
+};
+
+
+/*      XM_TX_CMD       16 bit r/w      Transmit Command Register */
+enum {
+        XM_TX_BK2BK     = 1<<6, /* Bit  6:      Ignor Carrier Sense (Tx Bk2Bk)*/
+        XM_TX_ENC_BYP   = 1<<5, /* Bit  5:      Set Encoder in Bypass Mode */
+        XM_TX_SAM_LINE  = 1<<4, /* Bit  4: (sc) Start utilization calculation */
+        XM_TX_NO_GIG_MD = 1<<3, /* Bit  3:      Disable Carrier Extension */
+        XM_TX_NO_PRE    = 1<<2, /* Bit  2:      Disable Preamble Generation */
+        XM_TX_NO_CRC    = 1<<1, /* Bit  1:      Disable CRC Generation */
+        XM_TX_AUTO_PAD  = 1<<0, /* Bit  0:      Enable Automatic Padding */
+};
+
+/*      XM_TX_RT_LIM    16 bit r/w      Transmit Retry Limit Register */
+#define XM_RT_LIM_MSK   0x1f    /* Bit  4..0:   Tx Retry Limit */
+
+
+/*      XM_TX_STIME     16 bit r/w      Transmit Slottime Register */
+#define XM_STIME_MSK    0x7f    /* Bit  6..0:   Tx Slottime bits */
+
+
+/*      XM_TX_IPG       16 bit r/w      Transmit Inter Packet Gap */
+#define XM_IPG_MSK              0xff    /* Bit  7..0:   IPG value bits */
+
+
+/*      XM_RX_CMD       16 bit r/w      Receive Command Register */
+enum {
+        XM_RX_LENERR_OK = 1<<8, /* Bit  8       don't set Rx Err bit for */
+                                /*              inrange error packets */
+        XM_RX_BIG_PK_OK = 1<<7, /* Bit  7       don't set Rx Err bit for */
+                                /*              jumbo packets */
+        XM_RX_IPG_CAP   = 1<<6, /* Bit  6       repl. type field with IPG */
+        XM_RX_TP_MD     = 1<<5, /* Bit  5:      Enable transparent Mode */
+        XM_RX_STRIP_FCS = 1<<4, /* Bit  4:      Enable FCS Stripping */
+        XM_RX_SELF_RX   = 1<<3, /* Bit  3:      Enable Rx of own packets */
+        XM_RX_SAM_LINE  = 1<<2, /* Bit  2: (sc) Start utilization calculation */
+        XM_RX_STRIP_PAD = 1<<1, /* Bit  1:      Strip pad bytes of Rx frames */
+        XM_RX_DIS_CEXT  = 1<<0, /* Bit  0:      Disable carrier ext. check */
+};
+
+
+/*      XM_PHY_ADDR     16 bit r/w      PHY Address Register */
+#define XM_PHY_ADDR_SZ  0x1f    /* Bit  4..0:   PHY Address bits */
+
+
+/*      XM_GP_PORT      32 bit r/w      General Purpose Port Register */
+enum {
+        XM_GP_ANIP      = 1<<6, /* Bit  6: (ro) Auto-Neg. in progress */
+        XM_GP_FRC_INT   = 1<<5, /* Bit  5: (sc) Force Interrupt */
+        XM_GP_RES_MAC   = 1<<3, /* Bit  3: (sc) Reset MAC and FIFOs */
+        XM_GP_RES_STAT  = 1<<2, /* Bit  2: (sc) Reset the statistics module */
+        XM_GP_INP_ASS   = 1<<0, /* Bit  0: (ro) GP Input Pin asserted */
+};
+
+
+/*      XM_IMSK         16 bit r/w      Interrupt Mask Register */
+/*      XM_ISRC         16 bit r/o      Interrupt Status Register */
+enum {
+        XM_IS_LNK_AE    = 1<<14, /* Bit 14:     Link Asynchronous Event */
+        XM_IS_TX_ABORT  = 1<<13, /* Bit 13:     Transmit Abort, late Col. etc */
+        XM_IS_FRC_INT   = 1<<12, /* Bit 12:     Force INT bit set in GP */
+        XM_IS_INP_ASS   = 1<<11,        /* Bit 11:      Input Asserted, GP bit 0 set */
+        XM_IS_LIPA_RC   = 1<<10,        /* Bit 10:      Link Partner requests config */
+        XM_IS_RX_PAGE   = 1<<9, /* Bit  9:      Page Received */
+        XM_IS_TX_PAGE   = 1<<8, /* Bit  8:      Next Page Loaded for Transmit */
+        XM_IS_AND       = 1<<7, /* Bit  7:      Auto-Negotiation Done */
+        XM_IS_TSC_OV    = 1<<6, /* Bit  6:      Time Stamp Counter Overflow */
+        XM_IS_RXC_OV    = 1<<5, /* Bit  5:      Rx Counter Event Overflow */
+        XM_IS_TXC_OV    = 1<<4, /* Bit  4:      Tx Counter Event Overflow */
+        XM_IS_RXF_OV    = 1<<3, /* Bit  3:      Receive FIFO Overflow */
+        XM_IS_TXF_UR    = 1<<2, /* Bit  2:      Transmit FIFO Underrun */
+        XM_IS_TX_COMP   = 1<<1, /* Bit  1:      Frame Tx Complete */
+        XM_IS_RX_COMP   = 1<<0, /* Bit  0:      Frame Rx Complete */
+};
+
+#define XM_DEF_MSK      (~(XM_IS_INP_ASS | XM_IS_LIPA_RC | XM_IS_RX_PAGE | \
+                           XM_IS_AND | XM_IS_RXC_OV | XM_IS_TXC_OV | \
+                           XM_IS_RXF_OV | XM_IS_TXF_UR))
+
+
+/*      XM_HW_CFG       16 bit r/w      Hardware Config Register */
+enum {
+        XM_HW_GEN_EOP   = 1<<3, /* Bit  3:      generate End of Packet pulse */
+        XM_HW_COM4SIG   = 1<<2, /* Bit  2:      use Comma Detect for Sig. Det.*/
+        XM_HW_GMII_MD   = 1<<0, /* Bit  0:      GMII Interface selected */
+};
+
+
+/*      XM_TX_LO_WM     16 bit r/w      Tx FIFO Low Water Mark */
+/*      XM_TX_HI_WM     16 bit r/w      Tx FIFO High Water Mark */
+#define XM_TX_WM_MSK    0x01ff  /* Bit  9.. 0   Tx FIFO Watermark bits */
+
+/*      XM_TX_THR       16 bit r/w      Tx Request Threshold */
+/*      XM_HT_THR       16 bit r/w      Host Request Threshold */
+/*      XM_RX_THR       16 bit r/w      Rx Request Threshold */
+#define XM_THR_MSK              0x03ff  /* Bit 10.. 0   Rx/Tx Request Threshold bits */
+
+
+/*      XM_TX_STAT      32 bit r/o      Tx Status LIFO Register */
+enum {
+        XM_ST_VALID     = (1UL<<31),    /* Bit 31:      Status Valid */
+        XM_ST_BYTE_CNT  = (0x3fffL<<17),        /* Bit 30..17:  Tx frame Length */
+        XM_ST_RETRY_CNT = (0x1fL<<12),  /* Bit 16..12:  Retry Count */
+        XM_ST_EX_COL    = 1<<11,        /* Bit 11:      Excessive Collisions */
+        XM_ST_EX_DEF    = 1<<10,        /* Bit 10:      Excessive Deferral */
+        XM_ST_BURST     = 1<<9,         /* Bit  9:      p. xmitted in burst md*/
+        XM_ST_DEFER     = 1<<8,         /* Bit  8:      packet was defered */
+        XM_ST_BC        = 1<<7,         /* Bit  7:      Broadcast packet */
+        XM_ST_MC        = 1<<6,         /* Bit  6:      Multicast packet */
+        XM_ST_UC        = 1<<5,         /* Bit  5:      Unicast packet */
+        XM_ST_TX_UR     = 1<<4,         /* Bit  4:      FIFO Underrun occured */
+        XM_ST_CS_ERR    = 1<<3,         /* Bit  3:      Carrier Sense Error */
+        XM_ST_LAT_COL   = 1<<2,         /* Bit  2:      Late Collision Error */
+        XM_ST_MUL_COL   = 1<<1,         /* Bit  1:      Multiple Collisions */
+        XM_ST_SGN_COL   = 1<<0,         /* Bit  0:      Single Collision */
+};
+
+/*      XM_RX_LO_WM     16 bit r/w      Receive Low Water Mark */
+/*      XM_RX_HI_WM     16 bit r/w      Receive High Water Mark */
+#define XM_RX_WM_MSK    0x03ff          /* Bit 11.. 0:  Rx FIFO Watermark bits */
+
+
+/*      XM_DEV_ID       32 bit r/o      Device ID Register */
+#define XM_DEV_OUI      (0x00ffffffUL<<8)       /* Bit 31..8:   Device OUI */
+#define XM_DEV_REV      (0x07L << 5)            /* Bit  7..5:   Chip Rev Num */
+
+
+/*      XM_MODE         32 bit r/w      Mode Register */
+enum {
+        XM_MD_ENA_REJ   = 1<<26, /* Bit 26:     Enable Frame Reject */
+        XM_MD_SPOE_E    = 1<<25, /* Bit 25:     Send Pause on Edge */
+                                                                        /*              extern generated */
+        XM_MD_TX_REP    = 1<<24, /* Bit 24:     Transmit Repeater Mode */
+        XM_MD_SPOFF_I   = 1<<23, /* Bit 23:     Send Pause on FIFO full */
+                                                                        /*              intern generated */
+        XM_MD_LE_STW    = 1<<22, /* Bit 22:     Rx Stat Word in Little Endian */
+        XM_MD_TX_CONT   = 1<<21, /* Bit 21:     Send Continuous */
+        XM_MD_TX_PAUSE  = 1<<20, /* Bit 20: (sc)        Send Pause Frame */
+        XM_MD_ATS       = 1<<19, /* Bit 19:     Append Time Stamp */
+        XM_MD_SPOL_I    = 1<<18, /* Bit 18:     Send Pause on Low */
+                                                                        /*              intern generated */
+        XM_MD_SPOH_I    = 1<<17, /* Bit 17:     Send Pause on High */
+                                                                        /*              intern generated */
+        XM_MD_CAP       = 1<<16, /* Bit 16:     Check Address Pair */
+        XM_MD_ENA_HASH  = 1<<15, /* Bit 15:     Enable Hashing */
+        XM_MD_CSA       = 1<<14, /* Bit 14:     Check Station Address */
+        XM_MD_CAA       = 1<<13, /* Bit 13:     Check Address Array */
+        XM_MD_RX_MCTRL  = 1<<12, /* Bit 12:     Rx MAC Control Frame */
+        XM_MD_RX_RUNT   = 1<<11, /* Bit 11:     Rx Runt Frames */
+        XM_MD_RX_IRLE   = 1<<10, /* Bit 10:     Rx in Range Len Err Frame */
+        XM_MD_RX_LONG   = 1<<9,  /* Bit  9:     Rx Long Frame */
+        XM_MD_RX_CRCE   = 1<<8,  /* Bit  8:     Rx CRC Error Frame */
+        XM_MD_RX_ERR    = 1<<7,  /* Bit  7:     Rx Error Frame */
+        XM_MD_DIS_UC    = 1<<6,  /* Bit  6:     Disable Rx Unicast */
+        XM_MD_DIS_MC    = 1<<5,  /* Bit  5:     Disable Rx Multicast */
+        XM_MD_DIS_BC    = 1<<4,  /* Bit  4:     Disable Rx Broadcast */
+        XM_MD_ENA_PROM  = 1<<3,  /* Bit  3:     Enable Promiscuous */
+        XM_MD_ENA_BE    = 1<<2,  /* Bit  2:     Enable Big Endian */
+        XM_MD_FTF       = 1<<1,  /* Bit  1: (sc)        Flush Tx FIFO */
+        XM_MD_FRF       = 1<<0,  /* Bit  0: (sc)        Flush Rx FIFO */
+};
+
+#define XM_PAUSE_MODE   (XM_MD_SPOE_E | XM_MD_SPOL_I | XM_MD_SPOH_I)
+#define XM_DEF_MODE             (XM_MD_RX_RUNT | XM_MD_RX_IRLE | XM_MD_RX_LONG |\
+                                XM_MD_RX_CRCE | XM_MD_RX_ERR | XM_MD_CSA | XM_MD_CAA)
+
+/*      XM_STAT_CMD     16 bit r/w      Statistics Command Register */
+enum {
+        XM_SC_SNP_RXC   = 1<<5, /* Bit  5: (sc) Snap Rx Counters */
+        XM_SC_SNP_TXC   = 1<<4, /* Bit  4: (sc) Snap Tx Counters */
+        XM_SC_CP_RXC    = 1<<3, /* Bit  3:      Copy Rx Counters Continuously */
+        XM_SC_CP_TXC    = 1<<2, /* Bit  2:      Copy Tx Counters Continuously */
+        XM_SC_CLR_RXC   = 1<<1, /* Bit  1: (sc) Clear Rx Counters */
+        XM_SC_CLR_TXC   = 1<<0, /* Bit  0: (sc) Clear Tx Counters */
+};
+
+
+/*      XM_RX_CNT_EV    32 bit r/o      Rx Counter Event Register */
+/*      XM_RX_EV_MSK    32 bit r/w      Rx Counter Event Mask */
+enum {
+        XMR_MAX_SZ_OV   = 1<<31, /* Bit 31:     1024-MaxSize Rx Cnt Ov*/
+        XMR_1023B_OV    = 1<<30, /* Bit 30:     512-1023Byte Rx Cnt Ov*/
+        XMR_511B_OV     = 1<<29, /* Bit 29:     256-511 Byte Rx Cnt Ov*/
+        XMR_255B_OV     = 1<<28, /* Bit 28:     128-255 Byte Rx Cnt Ov*/
+        XMR_127B_OV     = 1<<27, /* Bit 27:     65-127 Byte Rx Cnt Ov */
+        XMR_64B_OV      = 1<<26, /* Bit 26:     64 Byte Rx Cnt Ov */
+        XMR_UTIL_OV     = 1<<25, /* Bit 25:     Rx Util Cnt Overflow */
+        XMR_UTIL_UR     = 1<<24, /* Bit 24:     Rx Util Cnt Underrun */
+        XMR_CEX_ERR_OV  = 1<<23, /* Bit 23:     CEXT Err Cnt Ov */
+        XMR_FCS_ERR_OV  = 1<<21, /* Bit 21:     Rx FCS Error Cnt Ov */
+        XMR_LNG_ERR_OV  = 1<<20, /* Bit 20:     Rx too Long Err Cnt Ov*/
+        XMR_RUNT_OV     = 1<<19, /* Bit 19:     Runt Event Cnt Ov */
+        XMR_SHT_ERR_OV  = 1<<18, /* Bit 18:     Rx Short Ev Err Cnt Ov*/
+        XMR_SYM_ERR_OV  = 1<<17, /* Bit 17:     Rx Sym Err Cnt Ov */
+        XMR_CAR_ERR_OV  = 1<<15, /* Bit 15:     Rx Carr Ev Err Cnt Ov */
+        XMR_JAB_PKT_OV  = 1<<14, /* Bit 14:     Rx Jabb Packet Cnt Ov */
+        XMR_FIFO_OV     = 1<<13, /* Bit 13:     Rx FIFO Ov Ev Cnt Ov */
+        XMR_FRA_ERR_OV  = 1<<12, /* Bit 12:     Rx Framing Err Cnt Ov */
+        XMR_FMISS_OV    = 1<<11, /* Bit 11:     Rx Missed Ev Cnt Ov */
+        XMR_BURST       = 1<<10, /* Bit 10:     Rx Burst Event Cnt Ov */
+        XMR_INV_MOC     = 1<<9,  /* Bit  9:     Rx with inv. MAC OC Ov*/
+        XMR_INV_MP      = 1<<8,  /* Bit  8:     Rx inv Pause Frame Ov */
+        XMR_MCTRL_OV    = 1<<7,  /* Bit  7:     Rx MAC Ctrl-F Cnt Ov */
+        XMR_MPAUSE_OV   = 1<<6,  /* Bit  6:     Rx Pause MAC Ctrl-F Ov*/
+        XMR_UC_OK_OV    = 1<<5,  /* Bit  5:     Rx Unicast Frame CntOv*/
+        XMR_MC_OK_OV    = 1<<4,  /* Bit  4:     Rx Multicast Cnt Ov */
+        XMR_BC_OK_OV    = 1<<3,  /* Bit  3:     Rx Broadcast Cnt Ov */
+        XMR_OK_LO_OV    = 1<<2,  /* Bit  2:     Octets Rx OK Low CntOv*/
+        XMR_OK_HI_OV    = 1<<1,  /* Bit  1:     Octets Rx OK Hi Cnt Ov*/
+        XMR_OK_OV       = 1<<0,  /* Bit  0:     Frames Received Ok Ov */
+};
+
+#define XMR_DEF_MSK             (XMR_OK_LO_OV | XMR_OK_HI_OV)
+
+/*      XM_TX_CNT_EV    32 bit r/o      Tx Counter Event Register */
+/*      XM_TX_EV_MSK    32 bit r/w      Tx Counter Event Mask */
+enum {
+        XMT_MAX_SZ_OV   = 1<<25,        /* Bit 25:      1024-MaxSize Tx Cnt Ov*/
+        XMT_1023B_OV    = 1<<24,        /* Bit 24:      512-1023Byte Tx Cnt Ov*/
+        XMT_511B_OV     = 1<<23,        /* Bit 23:      256-511 Byte Tx Cnt Ov*/
+        XMT_255B_OV     = 1<<22,        /* Bit 22:      128-255 Byte Tx Cnt Ov*/
+        XMT_127B_OV     = 1<<21,        /* Bit 21:      65-127 Byte Tx Cnt Ov */
+        XMT_64B_OV      = 1<<20,        /* Bit 20:      64 Byte Tx Cnt Ov */
+        XMT_UTIL_OV     = 1<<19,        /* Bit 19:      Tx Util Cnt Overflow */
+        XMT_UTIL_UR     = 1<<18,        /* Bit 18:      Tx Util Cnt Underrun */
+        XMT_CS_ERR_OV   = 1<<17,        /* Bit 17:      Tx Carr Sen Err Cnt Ov*/
+        XMT_FIFO_UR_OV  = 1<<16,        /* Bit 16:      Tx FIFO Ur Ev Cnt Ov */
+        XMT_EX_DEF_OV   = 1<<15,        /* Bit 15:      Tx Ex Deferall Cnt Ov */
+        XMT_DEF = 1<<14,        /* Bit 14:      Tx Deferred Cnt Ov */
+        XMT_LAT_COL_OV  = 1<<13,        /* Bit 13:      Tx Late Col Cnt Ov */
+        XMT_ABO_COL_OV  = 1<<12,        /* Bit 12:      Tx abo dueto Ex Col Ov*/
+        XMT_MUL_COL_OV  = 1<<11,        /* Bit 11:      Tx Mult Col Cnt Ov */
+        XMT_SNG_COL     = 1<<10,        /* Bit 10:      Tx Single Col Cnt Ov */
+        XMT_MCTRL_OV    = 1<<9,         /* Bit  9:      Tx MAC Ctrl Counter Ov*/
+        XMT_MPAUSE      = 1<<8,         /* Bit  8:      Tx Pause MAC Ctrl-F Ov*/
+        XMT_BURST       = 1<<7,         /* Bit  7:      Tx Burst Event Cnt Ov */
+        XMT_LONG        = 1<<6,         /* Bit  6:      Tx Long Frame Cnt Ov */
+        XMT_UC_OK_OV    = 1<<5,         /* Bit  5:      Tx Unicast Cnt Ov */
+        XMT_MC_OK_OV    = 1<<4,         /* Bit  4:      Tx Multicast Cnt Ov */
+        XMT_BC_OK_OV    = 1<<3,         /* Bit  3:      Tx Broadcast Cnt Ov */
+        XMT_OK_LO_OV    = 1<<2,         /* Bit  2:      Octets Tx OK Low CntOv*/
+        XMT_OK_HI_OV    = 1<<1,         /* Bit  1:      Octets Tx OK Hi Cnt Ov*/
+        XMT_OK_OV       = 1<<0,         /* Bit  0:      Frames Tx Ok Ov */
+};
+
+#define XMT_DEF_MSK             (XMT_OK_LO_OV | XMT_OK_HI_OV)
+
+struct skge_rx_desc {
+        u32             control;
+        u32             next_offset;
+        u32             dma_lo;
+        u32             dma_hi;
+        u32             status;
+        u32             timestamp;
+        u16             csum2;
+        u16             csum1;
+        u16             csum2_start;
+        u16             csum1_start;
+};
+
+struct skge_tx_desc {
+        u32             control;
+        u32             next_offset;
+        u32             dma_lo;
+        u32             dma_hi;
+        u32             status;
+        u32             csum_offs;
+        u16             csum_write;
+        u16             csum_start;
+        u32             rsvd;
+};
+
+struct skge_element {
+        struct skge_element     *next;
+        void                    *desc;
+        struct sk_buff          *skb;
+        DECLARE_PCI_UNMAP_ADDR(mapaddr);
+        DECLARE_PCI_UNMAP_LEN(maplen);
+};
+
+struct skge_ring {
+        struct skge_element *to_clean;
+        struct skge_element *to_use;
+        struct skge_element *start;
+        unsigned long       count;
+};
+
+
+struct skge_hw {
+        void __iomem         *regs;
+        struct pci_dev       *pdev;
+        u32                  intr_mask;
+        struct net_device    *dev[2];
+
+        u8                   mac_cfg;
+        u8                   chip_id;
+        u8                   phy_type;
+        u8                   pmd_type;
+        u16                  phy_addr;
+
+        u32                  ram_size;
+        u32                  ram_offset;
+        
+        struct tasklet_struct ext_tasklet;
+        spinlock_t           phy_lock;
+};
+
+static inline int isdualport(const struct skge_hw *hw)
+{
+        return !(hw->mac_cfg & CFG_SNG_MAC);
+}
+
+static inline u8 chip_rev(const struct skge_hw *hw)
+{
+        return (hw->mac_cfg & CFG_CHIP_R_MSK) >> 4;
+}
+
+static inline int iscopper(const struct skge_hw *hw)
+{
+        return (hw->pmd_type == 'T');
+}
+
+enum {
+        FLOW_MODE_NONE          = 0, /* No Flow-Control */
+        FLOW_MODE_LOC_SEND      = 1, /* Local station sends PAUSE */
+        FLOW_MODE_REM_SEND      = 2, /* Symmetric or just remote */
+        FLOW_MODE_SYMMETRIC     = 3, /* Both stations may send PAUSE */
+};
+        
+struct skge_port {
+        u32                  msg_enable;
+        struct skge_hw       *hw;
+        struct net_device    *netdev;
+        int                  port;
+
+        spinlock_t           tx_lock;
+        u32                  tx_avail;
+        struct skge_ring     tx_ring;
+        struct skge_ring     rx_ring;
+
+        struct net_device_stats net_stats;
+
+        u8                   rx_csum;
+        u8                   blink_on;
+        u8                   flow_control;
+        u8                   wol;
+        u8                   autoneg;   /* AUTONEG_ENABLE, AUTONEG_DISABLE */
+        u8                   duplex;    /* DUPLEX_HALF, DUPLEX_FULL */
+        u16                  speed;     /* SPEED_1000, SPEED_100, ... */
+        u32                  advertising;
+
+        void                 *mem;      /* PCI memory for rings */
+        dma_addr_t           dma;
+        unsigned long        mem_size;
+
+        struct timer_list    link_check;
+        struct timer_list    led_blink;
+};
+
+
+/* Register accessor for memory mapped device */
+static inline u32 skge_read32(const struct skge_hw *hw, int reg)
+{
+        return readl(hw->regs + reg);
+
+}
+
+static inline u16 skge_read16(const struct skge_hw *hw, int reg)
+{
+        return readw(hw->regs + reg);
+}
+
+static inline u8 skge_read8(const struct skge_hw *hw, int reg)
+{
+        return readb(hw->regs + reg);
+}
+
+static inline void skge_write32(const struct skge_hw *hw, int reg, u32 val)
+{
+        writel(val, hw->regs + reg);
+}
+
+static inline void skge_write16(const struct skge_hw *hw, int reg, u16 val)
+{
+        writew(val, hw->regs + reg);
+}
+
+static inline void skge_write8(const struct skge_hw *hw, int reg, u8 val)
+{
+        writeb(val, hw->regs + reg);
+}
+
+/* MAC Related Registers inside the device. */
+#define SKGEMAC_REG(port,reg)   (((port)<<7)+(reg))
+
+/* PCI config space can be accessed via memory mapped space */
+#define SKGEPCI_REG(reg) ((reg)+ 0x380)
+
+#define SKGEXM_REG(port, reg) \
+        ((BASE_XMAC_1 + (port) * (BASE_XMAC_2 - BASE_XMAC_1)) | (reg) << 1)
+
+static inline u32 skge_xm_read32(const struct skge_hw *hw, int port, int reg)
+{
+        return skge_read32(hw, SKGEXM_REG(port,reg));
+}
+
+static inline u16 skge_xm_read16(const struct skge_hw *hw, int port, int reg)
+{
+        return skge_read16(hw, SKGEXM_REG(port,reg));
+}
+
+static inline u8 skge_xm_read8(const struct skge_hw *hw, int port, int reg)
+{
+        return skge_read8(hw, SKGEXM_REG(port,reg));
+}
+
+static inline void skge_xm_write32(const struct skge_hw *hw, int port, int r, u32 v)
+{
+        skge_write32(hw, SKGEXM_REG(port,r), v);
+}
+
+static inline void skge_xm_write16(const struct skge_hw *hw, int port, int r, u16 v)
+{
+        skge_write16(hw, SKGEXM_REG(port,r), v);
+}
+
+static inline void skge_xm_write8(const struct skge_hw *hw, int port, int r, u8 v)
+{
+        skge_write8(hw, SKGEXM_REG(port,r), v);
+}
+
+static inline void skge_xm_outhash(const struct skge_hw *hw, int port, int reg,
+                                   const u8 *hash)
+{
+        skge_xm_write16(hw, port, reg, 
+                        (u16)hash[0] | ((u16)hash[1] << 8));
+        skge_xm_write16(hw, port, reg+2, 
+                        (u16)hash[2] | ((u16)hash[3] << 8));
+        skge_xm_write16(hw, port, reg+4, 
+                        (u16)hash[4] | ((u16)hash[5] << 8));
+        skge_xm_write16(hw, port, reg+6, 
+                        (u16)hash[6] | ((u16)hash[7] << 8));
+}
+
+static inline void skge_xm_outaddr(const struct skge_hw *hw, int port, int reg,
+                                   const u8 *addr)
+{
+        skge_xm_write16(hw, port, reg, 
+                        (u16)addr[0] | ((u16)addr[1] << 8));
+        skge_xm_write16(hw, port, reg, 
+                        (u16)addr[2] | ((u16)addr[3] << 8));
+        skge_xm_write16(hw, port, reg, 
+                        (u16)addr[4] | ((u16)addr[5] << 8));
+}
+
+
+#define SKGEGMA_REG(port,reg) \
+        ((reg) + BASE_GMAC_1 + \
+         (port) * (BASE_GMAC_2-BASE_GMAC_1))
+
+static inline u16 skge_gma_read16(const struct skge_hw *hw, int port, int reg)
+{
+        return skge_read16(hw, SKGEGMA_REG(port,reg));
+}
+
+static inline u32 skge_gma_read32(const struct skge_hw *hw, int port, int reg)
+{
+        return (u32) skge_read16(hw, SKGEGMA_REG(port,reg))
+                | ((u32)skge_read16(hw, SKGEGMA_REG(port,reg+4)) << 16);
+}
+
+static inline u8 skge_gma_read8(const struct skge_hw *hw, int port, int reg)
+{
+        return skge_read8(hw, SKGEGMA_REG(port,reg));
+}
+
+static inline void skge_gma_write16(const struct skge_hw *hw, int port, int r, u16 v)
+{
+        skge_write16(hw, SKGEGMA_REG(port,r), v);
+}
+
+static inline void skge_gma_write32(const struct skge_hw *hw, int port, int r, u32 v)
+{
+        skge_write16(hw, SKGEGMA_REG(port, r), (u16) v);
+        skge_write32(hw, SKGEGMA_REG(port, r+4), (u16)(v >> 16));
+}
+
+static inline void skge_gma_write8(const struct skge_hw *hw, int port, int r, u8 v)
+{
+        skge_write8(hw, SKGEGMA_REG(port,r), v);
+}
+
+static inline void skge_gm_set_addr(struct skge_hw *hw, int port, int reg,
+                                    const u8 *addr)
+{
+        skge_gma_write16(hw, port, reg,
+                         (u16) addr[0] | ((u16) addr[1] << 8));
+        skge_gma_write16(hw, port, reg+4,
+                         (u16) addr[2] | ((u16) addr[3] << 8));
+        skge_gma_write16(hw, port, reg+8,
+                         (u16) addr[4] | ((u16) addr[5] << 8));
+}
+                
+#endif
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 5e561ba44333..fd80048f7f7a 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -129,7 +129,7 @@ MODULE_PARM_DESC(nowait, "set to 1 for no wait state");
 /*
  * Transmit timeout, default 5 seconds.
  */
-static int watchdog = 5000;
+static int watchdog = 1000;
 module_param(watchdog, int, 0400);
 MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");
 
@@ -660,15 +660,14 @@ static void smc_hardware_send_pkt(unsigned long data)
         SMC_outw(((len & 1) ? (0x2000 | buf[len-1]) : 0), ioaddr, DATA_REG);
 
         /*
-         * If THROTTLE_TX_PKTS is set, we look at the TX_EMPTY flag
-         * before queueing this packet for TX, and if it's clear then
-         * we stop the queue here.  This will have the effect of
-         * having at most 2 packets queued for TX in the chip's memory
-         * at all time. If THROTTLE_TX_PKTS is not set then the queue
-         * is stopped only when memory allocation (MC_ALLOC) does not
-         * succeed right away.
+         * If THROTTLE_TX_PKTS is set, we stop the queue here. This will
+         * have the effect of having at most one packet queued for TX
+         * in the chip's memory at all time.
+         *
+         * If THROTTLE_TX_PKTS is not set then the queue is stopped only
+         * when memory allocation (MC_ALLOC) does not succeed right away.
          */
-        if (THROTTLE_TX_PKTS && !(SMC_GET_INT() & IM_TX_EMPTY_INT))
+        if (THROTTLE_TX_PKTS)
                 netif_stop_queue(dev);
 
         /* queue the packet for TX */
@@ -792,17 +791,20 @@ static void smc_tx(struct net_device *dev)
         DBG(2, "%s: TX STATUS 0x%04x PNR 0x%02x\n",
                 dev->name, tx_status, packet_no);
 
-        if (!(tx_status & TS_SUCCESS))
+        if (!(tx_status & ES_TX_SUC))
                 lp->stats.tx_errors++;
-        if (tx_status & TS_LOSTCAR)
+
+        if (tx_status & ES_LOSTCARR)
                 lp->stats.tx_carrier_errors++;
 
-        if (tx_status & TS_LATCOL) {
-                PRINTK("%s: late collision occurred on last xmit\n", dev->name);
+        if (tx_status & (ES_LATCOL | ES_16COL)) {
+                PRINTK("%s: %s occurred on last xmit\n", dev->name,
+                       (tx_status & ES_LATCOL) ?
+                        "late collision" : "too many collisions");
                 lp->stats.tx_window_errors++;
                 if (!(lp->stats.tx_window_errors & 63) && net_ratelimit()) {
-                        printk(KERN_INFO "%s: unexpectedly large numbers of "
-                               "late collisions. Please check duplex "
+                        printk(KERN_INFO "%s: unexpectedly large number of "
+                               "bad collisions. Please check duplex "
                                "setting.\n", dev->name);
                 }
         }
@@ -1236,7 +1238,7 @@ static void smc_10bt_check_media(struct net_device *dev, int init)
         old_carrier = netif_carrier_ok(dev) ? 1 : 0;
 
         SMC_SELECT_BANK(0);
-        new_carrier = SMC_inw(ioaddr, EPH_STATUS_REG) & ES_LINK_OK ? 1 : 0;
+        new_carrier = (SMC_GET_EPH_STATUS() & ES_LINK_OK) ? 1 : 0;
         SMC_SELECT_BANK(2);
 
         if (init || (old_carrier != new_carrier)) {
@@ -1308,15 +1310,16 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 if (!status)
                         break;
 
-                if (status & IM_RCV_INT) {
-                        DBG(3, "%s: RX irq\n", dev->name);
-                        smc_rcv(dev);
-                } else if (status & IM_TX_INT) {
+                if (status & IM_TX_INT) {
+                        /* do this before RX as it will free memory quickly */
                         DBG(3, "%s: TX int\n", dev->name);
                         smc_tx(dev);
                         SMC_ACK_INT(IM_TX_INT);
                         if (THROTTLE_TX_PKTS)
                                 netif_wake_queue(dev);
+                } else if (status & IM_RCV_INT) {
+                        DBG(3, "%s: RX irq\n", dev->name);
+                        smc_rcv(dev);
                 } else if (status & IM_ALLOC_INT) {
                         DBG(3, "%s: Allocation irq\n", dev->name);
                         tasklet_hi_schedule(&lp->tx_task);
@@ -1337,7 +1340,10 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         /* multiple collisions */
                         lp->stats.collisions += card_stats & 0xF;
                 } else if (status & IM_RX_OVRN_INT) {
-                        DBG(1, "%s: RX overrun\n", dev->name);
+                        DBG(1, "%s: RX overrun (EPH_ST 0x%04x)\n", dev->name,
+                               ({ int eph_st; SMC_SELECT_BANK(0);
+                                  eph_st = SMC_GET_EPH_STATUS();
+                                  SMC_SELECT_BANK(2); eph_st; }) );
                         SMC_ACK_INT(IM_RX_OVRN_INT);
                         lp->stats.rx_errors++;
                         lp->stats.rx_fifo_errors++;
@@ -1389,7 +1395,7 @@ static void smc_timeout(struct net_device *dev)
 {
         struct smc_local *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
-        int status, mask, meminfo, fifo;
+        int status, mask, eph_st, meminfo, fifo;
 
         DBG(2, "%s: %s\n", dev->name, __FUNCTION__);
 
@@ -1398,11 +1404,13 @@ static void smc_timeout(struct net_device *dev)
         mask = SMC_GET_INT_MASK();
         fifo = SMC_GET_FIFO();
         SMC_SELECT_BANK(0);
+        eph_st = SMC_GET_EPH_STATUS();
         meminfo = SMC_GET_MIR();
         SMC_SELECT_BANK(2);
         spin_unlock_irq(&lp->lock);
-        PRINTK( "%s: INT 0x%02x MASK 0x%02x MEM 0x%04x FIFO 0x%04x\n",
-                dev->name, status, mask, meminfo, fifo );
+        PRINTK( "%s: TX timeout (INT 0x%02x INTMASK 0x%02x "
+                "MEM 0x%04x FIFO 0x%04x EPH_ST 0x%04x)\n",
+                dev->name, status, mask, meminfo, fifo, eph_st );
 
         smc_reset(dev);
         smc_enable(dev);
@@ -1863,7 +1871,7 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr)
         SMC_SELECT_BANK(1);
         val = SMC_GET_BASE();
         val = ((val & 0x1F00) >> 3) << SMC_IO_SHIFT;
-        if (((unsigned long)ioaddr & ((PAGE_SIZE-1)<<SMC_IO_SHIFT)) != val) { /*XXX: WTF? */
+        if (((unsigned int)ioaddr & (0x3e0 << SMC_IO_SHIFT)) != val) {
                 printk("%s: IOADDR %p doesn't match configuration (%x).\n",
                         CARDNAME, ioaddr, val);
         }
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index ddd2688e7d33..946528e6b742 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -151,7 +151,7 @@
 
 /* We actually can't write halfwords properly if not word aligned */
 static inline void
-SMC_outw(u16 val, unsigned long ioaddr, int reg)
+SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 {
         if (reg & 2) {
                 unsigned int v = val << 16;
@@ -317,7 +317,7 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l)
 #define SMC_insl(a, r, p, l) \
         smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
 static inline void
-smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
                  u_char *buf, int len)
 {
         dma_addr_t dmabuf;
@@ -355,7 +355,7 @@ smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
 #define SMC_insw(a, r, p, l) \
         smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
 static inline void
-smc_pxa_dma_insw(u_long ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
                  u_char *buf, int len)
 {
         dma_addr_t dmabuf;
@@ -681,14 +681,6 @@ static const char * chip_ids[ 16 ] =  {
 
 
 /*
- . Transmit status bits
-*/
-#define TS_SUCCESS 0x0001
-#define TS_LOSTCAR 0x0400
-#define TS_LATCOL  0x0200
-#define TS_16COL   0x0010
-
-/*
  . Receive status bits
 */
 #define RS_ALGNERR      0x8000
@@ -845,6 +837,7 @@ static const char * chip_ids[ 16 ] =  {
 #define SMC_GET_FIFO()          SMC_inw( ioaddr, FIFO_REG )
 #define SMC_GET_PTR()           SMC_inw( ioaddr, PTR_REG )
 #define SMC_SET_PTR(x)          SMC_outw( x, ioaddr, PTR_REG )
+#define SMC_GET_EPH_STATUS()    SMC_inw( ioaddr, EPH_STATUS_REG )
 #define SMC_GET_RCR()           SMC_inw( ioaddr, RCR_REG )
 #define SMC_SET_RCR(x)          SMC_outw( x, ioaddr, RCR_REG )
 #define SMC_GET_REV()           SMC_inw( ioaddr, REV_REG )
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 236bdd3f6ba0..12e2b6826fa3 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -2,7 +2,7 @@
 /*
         Written 1998-2000 by Donald Becker.
 
-        Current maintainer is Ion Badulescu <ionut@cs.columbia.edu>. Please
+        Current maintainer is Ion Badulescu <ionut ta badula tod org>. Please
         send all bug reports to me, and not to Donald Becker, as this code
         has been heavily modified from Donald's original version.
 
@@ -129,12 +129,18 @@
         - put the chip to a D3 slumber on driver unload
         - added config option to enable/disable NAPI
 
-TODO:   bugfixes (no bugs known as of right now)
+        LK1.4.2 (Ion Badulescu)
+        - finally added firmware (GPL'ed by Adaptec)
+        - removed compatibility code for 2.2.x
+
+TODO:   - fix forced speed/duplexing code (broken a long time ago, when
+        somebody converted the driver to use the generic MII code)
+        - fix VLAN support
 */
 
 #define DRV_NAME        "starfire"
-#define DRV_VERSION     "1.03+LK1.4.1"
-#define DRV_RELDATE     "February 10, 2002"
+#define DRV_VERSION     "1.03+LK1.4.2"
+#define DRV_RELDATE     "January 19, 2005"
 
 #include <linux/config.h>
 #include <linux/version.h>
@@ -145,25 +151,15 @@ TODO:	bugfixes (no bugs known as of right now)
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/crc32.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/if_vlan.h>
 #include <asm/processor.h>              /* Processor type for cache alignment. */
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-/*
- * Adaptec's license for their drivers (which is where I got the
- * firmware files) does not allow one to redistribute them. Thus, we can't
- * include the firmware with this driver.
- *
- * However, should a legal-to-distribute firmware become available,
- * the driver developer would need only to obtain the firmware in the
- * form of a C header file.
- * Once that's done, the #undef below must be changed into a #define
- * for this driver to really use the firmware. Note that Rx/Tx
- * hardware TCP checksumming is not possible without the firmware.
- *
- * WANTED: legal firmware to include with this GPL'd driver.
- */
-#undef HAS_FIRMWARE
+#include "starfire_firmware.h"
 /*
  * The current frame processor firmware fails to checksum a fragment
  * of length 1. If and when this is fixed, the #define below can be removed.
@@ -172,13 +168,7 @@ TODO:	bugfixes (no bugs known as of right now)
 /*
  * Define this if using the driver with the zero-copy patch
  */
-#if defined(HAS_FIRMWARE) && defined(MAX_SKB_FRAGS)
 #define ZEROCOPY
-#endif
-
-#ifdef HAS_FIRMWARE
-#include "starfire_firmware.h"
-#endif /* HAS_FIRMWARE */
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define VLAN_SUPPORT
@@ -202,11 +192,7 @@ static int mtu;
    The Starfire has a 512 element hash table based on the Ethernet CRC. */
 static int multicast_filter_limit = 512;
 /* Whether to do TCP/UDP checksums in hardware */
-#ifdef HAS_FIRMWARE
 static int enable_hw_cksum = 1;
-#else
-static int enable_hw_cksum = 0;
-#endif
 
 #define PKT_BUF_SZ      1536            /* Size of each temporary Rx buffer.*/
 /*
@@ -291,43 +277,15 @@ static int full_duplex[MAX_UNITS] = {0, };
 #define RX_DESC_ADDR_SIZE RxDescAddr32bit
 #endif
 
-#ifdef MAX_SKB_FRAGS
 #define skb_first_frag_len(skb) skb_headlen(skb)
 #define skb_num_frags(skb) (skb_shinfo(skb)->nr_frags + 1)
-#else  /* not MAX_SKB_FRAGS */
-#define skb_first_frag_len(skb) (skb->len)
-#define skb_num_frags(skb) 1
-#endif /* not MAX_SKB_FRAGS */
-
-/* 2.2.x compatibility code */
-#if LINUX_VERSION_CODE < 0x20300
-
-#include "starfire-kcomp22.h"
-
-#else  /* LINUX_VERSION_CODE > 0x20300 */
-
-#include <linux/crc32.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-
-#include <linux/if_vlan.h>
-
-#define init_tx_timer(dev, func, timeout) \
-        dev->tx_timeout = func; \
-        dev->watchdog_timeo = timeout;
-#define kick_tx_timer(dev, func, timeout)
-
-#define netif_start_if(dev)
-#define netif_stop_if(dev)
-
-#define PCI_SLOT_NAME(pci_dev)  pci_name(pci_dev)
-
-#endif /* LINUX_VERSION_CODE > 0x20300 */
 
 #ifdef HAVE_NETDEV_POLL
 #define init_poll(dev) \
+do { \
         dev->poll = &netdev_poll; \
-        dev->weight = max_interrupt_work;
+        dev->weight = max_interrupt_work; \
+} while (0)
 #define netdev_rx(dev, ioaddr) \
 do { \
         u32 intr_enable; \
@@ -341,7 +299,7 @@ do { \
                 /* Paranoia check */ \
                 intr_enable = readl(ioaddr + IntrEnable); \
                 if (intr_enable & (IntrRxDone | IntrRxEmpty)) { \
-                        printk("%s: interrupt while in polling mode!\n", dev->name); \
+                        printk(KERN_INFO "%s: interrupt while in polling mode!\n", dev->name); \
                         intr_enable &= ~(IntrRxDone | IntrRxEmpty); \
                         writel(intr_enable, ioaddr + IntrEnable); \
                 } \
@@ -371,6 +329,7 @@ KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELD
 MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
 MODULE_DESCRIPTION("Adaptec Starfire Ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
 
 module_param(max_interrupt_work, int, 0);
 module_param(mtu, int, 0);
@@ -425,7 +384,7 @@ on the 32/64 bitness of the architecture), and relies on automatic
 minimum-length padding.  It does not use the completion queue
 consumer index, but instead checks for non-zero status entries.
 
-For receive this driver uses type 0/1/2/3 receive descriptors.  The driver
+For receive this driver uses type 2/3 receive descriptors.  The driver
 allocates full frame size skbuffs for the Rx ring buffers, so all frames
 should fit in a single descriptor.  The driver does not use the completion
 queue consumer index, but instead checks for non-zero status entries.
@@ -476,7 +435,7 @@ IVc. Errata
 
 */
 
-
+
 
 enum chip_capability_flags {CanHaveMII=1, };
 
@@ -670,7 +629,6 @@ struct full_rx_done_desc {
         u32 timestamp;
 };
 /* XXX: this is ugly and I'm not sure it's worth the trouble -Ion */
-#ifdef HAS_FIRMWARE
 #ifdef VLAN_SUPPORT
 typedef struct full_rx_done_desc rx_done_desc;
 #define RxComplType RxComplType3
@@ -678,15 +636,6 @@ typedef struct full_rx_done_desc rx_done_desc;
 typedef struct csum_rx_done_desc rx_done_desc;
 #define RxComplType RxComplType2
 #endif /* not VLAN_SUPPORT */
-#else  /* not HAS_FIRMWARE */
-#ifdef VLAN_SUPPORT
-typedef struct basic_rx_done_desc rx_done_desc;
-#define RxComplType RxComplType1
-#else  /* not VLAN_SUPPORT */
-typedef struct short_rx_done_desc rx_done_desc;
-#define RxComplType RxComplType0
-#endif /* not VLAN_SUPPORT */
-#endif /* not HAS_FIRMWARE */
 
 enum rx_done_bits {
         RxOK=0x20000000, RxFIFOErr=0x10000000, RxBufQ2=0x08000000,
@@ -898,13 +847,10 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         /* enable MWI -- it vastly improves Rx performance on sparc64 */
         pci_set_mwi(pdev);
 
-#ifdef MAX_SKB_FRAGS
-        dev->features |= NETIF_F_SG;
-#endif /* MAX_SKB_FRAGS */
 #ifdef ZEROCOPY
         /* Starfire can do TCP/UDP checksumming */
         if (enable_hw_cksum)
-                dev->features |= NETIF_F_IP_CSUM;
+                dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 #endif /* ZEROCOPY */
 #ifdef VLAN_SUPPORT
         dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
@@ -1008,7 +954,8 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         /* The chip-specific entries in the device structure. */
         dev->open = &netdev_open;
         dev->hard_start_xmit = &start_tx;
-        init_tx_timer(dev, tx_timeout, TX_TIMEOUT);
+        dev->tx_timeout = tx_timeout;
+        dev->watchdog_timeo = TX_TIMEOUT;
         init_poll(dev);
         dev->stop = &netdev_close;
         dev->get_stats = &get_stats;
@@ -1039,7 +986,7 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
                                 if ((mdio_read(dev, phy, MII_BMCR) & BMCR_RESET) == 0)
                                         break;
                         if (boguscnt == 0) {
-                                printk("%s: PHY reset never completed!\n", dev->name);
+                                printk("%s: PHY#%d reset never completed!\n", dev->name, phy);
                                 continue;
                         }
                         mii_status = mdio_read(dev, phy, MII_BMSR);
@@ -1110,6 +1057,7 @@ static int netdev_open(struct net_device *dev)
         size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size;
 
         /* Do we ever need to reset the chip??? */
+
         retval = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
         if (retval)
                 return retval;
@@ -1211,7 +1159,6 @@ static int netdev_open(struct net_device *dev)
 
         writel(np->intr_timer_ctrl, ioaddr + IntrTimerCtrl);
 
-        netif_start_if(dev);
         netif_start_queue(dev);
 
         if (debug > 1)
@@ -1238,13 +1185,11 @@ static int netdev_open(struct net_device *dev)
         writel(ETH_P_8021Q, ioaddr + VlanType);
 #endif /* VLAN_SUPPORT */
 
-#ifdef HAS_FIRMWARE
         /* Load Rx/Tx firmware into the frame processors */
         for (i = 0; i < FIRMWARE_RX_SIZE * 2; i++)
                 writel(firmware_rx[i], ioaddr + RxGfpMem + i * 4);
         for (i = 0; i < FIRMWARE_TX_SIZE * 2; i++)
                 writel(firmware_tx[i], ioaddr + TxGfpMem + i * 4);
-#endif /* HAS_FIRMWARE */
         if (enable_hw_cksum)
                 /* Enable the Rx and Tx units, and the Rx/Tx frame processors. */
                 writel(TxEnable|TxGFPEnable|RxEnable|RxGFPEnable, ioaddr + GenCtrl);
@@ -1378,8 +1323,6 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
         u32 status;
         int i;
 
-        kick_tx_timer(dev, tx_timeout, TX_TIMEOUT);
-
         /*
          * be cautious here, wrapping the queue has weird semantics
          * and we may not have enough slots even when it seems we do.
@@ -1404,7 +1347,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
                 }
 
                 if (has_bad_length)
-                        skb_checksum_help(skb);
+                        skb_checksum_help(skb, 0);
         }
 #endif /* ZEROCOPY && HAS_BROKEN_FIRMWARE */
 
@@ -1433,12 +1376,10 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
                         np->tx_info[entry].mapping =
                                 pci_map_single(np->pci_dev, skb->data, skb_first_frag_len(skb), PCI_DMA_TODEVICE);
                 } else {
-#ifdef MAX_SKB_FRAGS
                         skb_frag_t *this_frag = &skb_shinfo(skb)->frags[i - 1];
                         status |= this_frag->size;
                         np->tx_info[entry].mapping =
                                 pci_map_single(np->pci_dev, page_address(this_frag->page) + this_frag->page_offset, this_frag->size, PCI_DMA_TODEVICE);
-#endif /* MAX_SKB_FRAGS */
                 }
 
                 np->tx_ring[entry].addr = cpu_to_dma(np->tx_info[entry].mapping);
@@ -1531,7 +1472,6 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                                 np->tx_info[entry].mapping = 0;
                                 np->dirty_tx += np->tx_info[entry].used_slots;
                                 entry = (entry + np->tx_info[entry].used_slots) % TX_RING_SIZE;
-#ifdef MAX_SKB_FRAGS
                                 {
                                         int i;
                                         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
@@ -1543,7 +1483,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                                                 entry++;
                                         }
                                 }
-#endif /* MAX_SKB_FRAGS */
+
                                 dev_kfree_skb_irq(skb);
                         }
                         np->tx_done_q[np->tx_done].status = 0;
@@ -1603,7 +1543,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                 if (debug > 4)
                         printk(KERN_DEBUG "  netdev_rx() status of %d was %#8.8x.\n", np->rx_done, desc_status);
                 if (!(desc_status & RxOK)) {
-                        /* There was a error. */
+                        /* There was an error. */
                         if (debug > 2)
                                 printk(KERN_DEBUG "  netdev_rx() Rx error was %#8.8x.\n", desc_status);
                         np->stats.rx_errors++;
@@ -1656,11 +1596,10 @@ static int __netdev_rx(struct net_device *dev, int *quota)
 #endif
 
                 skb->protocol = eth_type_trans(skb, dev);
-#if defined(HAS_FIRMWARE) || defined(VLAN_SUPPORT)
+#ifdef VLAN_SUPPORT
                 if (debug > 4)
                         printk(KERN_DEBUG "  netdev_rx() status2 of %d was %#4.4x.\n", np->rx_done, le16_to_cpu(desc->status2));
 #endif
-#ifdef HAS_FIRMWARE
                 if (le16_to_cpu(desc->status2) & 0x0100) {
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                         np->stats.rx_compressed++;
@@ -1679,7 +1618,6 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                         skb->csum = le16_to_cpu(desc->csum);
                         printk(KERN_DEBUG "%s: checksum_hw, status2 = %#x\n", dev->name, le16_to_cpu(desc->status2));
                 }
-#endif /* HAS_FIRMWARE */
 #ifdef VLAN_SUPPORT
                 if (np->vlgrp && le16_to_cpu(desc->status2) & 0x0200) {
                         if (debug > 4)
@@ -1900,9 +1838,6 @@ static struct net_device_stats *get_stats(struct net_device *dev)
 }
 
 
-/* Chips may use the upper or lower CRC bits, and may reverse and/or invert
-   them.  Select the endian-ness that results in minimal calculations.
-*/
 static void set_rx_mode(struct net_device *dev)
 {
         struct netdev_private *np = netdev_priv(dev);
@@ -1969,6 +1904,8 @@ static void set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0, sizeof(mc_filter));
                 for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
                      i++, mclist = mclist->next) {
+                        /* The chip uses the upper 9 CRC bits
+                           as index into the hash table */
                         int bit_nr = ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 23;
                         __u32 *fptr = (__u32 *) &mc_filter[(bit_nr >> 4) & ~1];
 
@@ -2001,7 +1938,7 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
         struct netdev_private *np = netdev_priv(dev);
         strcpy(info->driver, DRV_NAME);
         strcpy(info->version, DRV_VERSION);
-        strcpy(info->bus_info, PCI_SLOT_NAME(np->pci_dev));
+        strcpy(info->bus_info, pci_name(np->pci_dev));
 }
 
 static int get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
@@ -2083,7 +2020,6 @@ static int netdev_close(struct net_device *dev)
         int i;
 
         netif_stop_queue(dev);
-        netif_stop_if(dev);
 
         if (debug > 1) {
                 printk(KERN_DEBUG "%s: Shutting down ethercard, Intr status %#8.8x.\n",
@@ -2184,7 +2120,13 @@ static int __init starfire_init (void)
 /* when a module, this is printed whether or not devices are found in probe */
 #ifdef MODULE
         printk(version);
+#ifdef HAVE_NETDEV_POLL
+        printk(KERN_INFO DRV_NAME ": polling (NAPI) enabled\n");
+#else
+        printk(KERN_INFO DRV_NAME ": polling (NAPI) disabled\n");
 #endif
+#endif
+
 #ifndef ADDR_64BITS
         /* we can do this test only at run-time... sigh */
         if (sizeof(dma_addr_t) == sizeof(u64)) {
@@ -2192,10 +2134,6 @@ static int __init starfire_init (void)
                 return -ENODEV;
         }
 #endif /* not ADDR_64BITS */
-#ifndef HAS_FIRMWARE
-        /* unconditionally disable hw cksums if firmware is not present */
-        enable_hw_cksum = 0;
-#endif /* not HAS_FIRMWARE */
         return pci_module_init (&starfire_driver);
 }
 
diff --git a/drivers/net/starfire_firmware.h b/drivers/net/starfire_firmware.h
new file mode 100644
index 000000000000..0a668528955d
--- /dev/null
+++ b/drivers/net/starfire_firmware.h
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2003 Adaptec, Inc.
+ *
+ * Please read the following license before using the Adaptec Software
+ * ("Program"). If you do not agree to the license terms, do not use the
+ * Program:
+ *
+ * You agree to be bound by version 2 of the General Public License ("GPL")
+ * dated June 1991, which can be found at http://www.fsf.org/licenses/gpl.html.
+ * If the link is broken, write to Free Software Foundation, 59 Temple Place,
+ * Boston, Massachusetts 02111-1307.
+ *
+ * BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+ * THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+ * IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+ * OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+ * DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+ *
+ */
+
+static const u32 firmware_rx[] = {
+  0x010003dc, 0x00000000,
+  0x04000421, 0x00000086,
+  0x80000015, 0x0000180e,
+  0x81000015, 0x00006664,
+  0x1a0040ab, 0x00000b06,
+  0x14200011, 0x00000000,
+  0x14204022, 0x0000aaaa,
+  0x14204022, 0x00000300,
+  0x14204022, 0x00000000,
+  0x1a0040ab, 0x00000b14,
+  0x14200011, 0x00000000,
+  0x83000015, 0x00000002,
+  0x04000021, 0x00000000,
+  0x00000010, 0x00000000,
+  0x04000421, 0x00000087,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00008015, 0x00000000,
+  0x0000003e, 0x00000000,
+  0x00000010, 0x00000000,
+  0x82000015, 0x00004000,
+  0x009e8050, 0x00000000,
+  0x03008015, 0x00000000,
+  0x86008015, 0x00000000,
+  0x82000015, 0x00008000,
+  0x0100001c, 0x00000000,
+  0x000050a0, 0x0000010c,
+  0x4e20d011, 0x00006008,
+  0x1420d012, 0x00004008,
+  0x0000f090, 0x00007000,
+  0x0000c8b0, 0x00003000,
+  0x00004040, 0x00000000,
+  0x00108015, 0x00000000,
+  0x00a2c150, 0x00004000,
+  0x00a400b0, 0x00000014,
+  0x00000020, 0x00000000,
+  0x2500400d, 0x00002525,
+  0x00047220, 0x00003100,
+  0x00934070, 0x00000000,
+  0x00000020, 0x00000000,
+  0x00924460, 0x00000184,
+  0x2b20c011, 0x00000000,
+  0x0000c420, 0x00000540,
+  0x36014018, 0x0000422d,
+  0x14200011, 0x00000000,
+  0x00924460, 0x00000183,
+  0x3200001f, 0x00000034,
+  0x02ac0015, 0x00000002,
+  0x00a60110, 0x00000008,
+  0x42200011, 0x00000000,
+  0x00924060, 0x00000103,
+  0x0000001e, 0x00000000,
+  0x00000020, 0x00000100,
+  0x0000001e, 0x00000000,
+  0x00924460, 0x00000086,
+  0x00004080, 0x00000000,
+  0x0092c070, 0x00000000,
+  0x00924060, 0x00000100,
+  0x0000c890, 0x00005000,
+  0x00a6c110, 0x00000000,
+  0x00b0c090, 0x00000012,
+  0x021c0015, 0x00000000,
+  0x3200001f, 0x00000034,
+  0x00924460, 0x00000510,
+  0x44210011, 0x00000000,
+  0x42000011, 0x00000000,
+  0x83000015, 0x00000040,
+  0x00924460, 0x00000508,
+  0x45014018, 0x00004545,
+  0x00808050, 0x00000000,
+  0x62208012, 0x00000000,
+  0x82000015, 0x00000800,
+  0x15200011, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x80000015, 0x0000eea4,
+  0x81000015, 0x0000005f,
+  0x00000060, 0x00000000,
+  0x00004120, 0x00000000,
+  0x00004a00, 0x00004000,
+  0x00924460, 0x00000190,
+  0x5601401a, 0x00005956,
+  0x14000011, 0x00000000,
+  0x00934050, 0x00000018,
+  0x00930050, 0x00000018,
+  0x3601403a, 0x0000002d,
+  0x000643a9, 0x00000000,
+  0x0000c420, 0x00000140,
+  0x5601401a, 0x00005956,
+  0x14000011, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x000642a9, 0x00000000,
+  0x00024420, 0x00000183,
+  0x5601401a, 0x00005956,
+  0x82000015, 0x00002000,
+  0x15200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x15200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x15200011, 0x00000000,
+};      /* 104 Rx instructions */
+#define FIRMWARE_RX_SIZE 104
+
+static const u32 firmware_tx[] = {
+  0x010003dc, 0x00000000,
+  0x04000421, 0x00000086,
+  0x80000015, 0x0000180e,
+  0x81000015, 0x00006664,
+  0x1a0040ab, 0x00000b06,
+  0x14200011, 0x00000000,
+  0x14204022, 0x0000aaaa,
+  0x14204022, 0x00000300,
+  0x14204022, 0x00000000,
+  0x1a0040ab, 0x00000b14,
+  0x14200011, 0x00000000,
+  0x83000015, 0x00000002,
+  0x04000021, 0x00000000,
+  0x00000010, 0x00000000,
+  0x04000421, 0x00000087,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00008015, 0x00000000,
+  0x0000003e, 0x00000000,
+  0x00000010, 0x00000000,
+  0x82000015, 0x00004000,
+  0x009e8050, 0x00000000,
+  0x03008015, 0x00000000,
+  0x86008015, 0x00000000,
+  0x82000015, 0x00008000,
+  0x0100001c, 0x00000000,
+  0x000050a0, 0x0000010c,
+  0x4e20d011, 0x00006008,
+  0x1420d012, 0x00004008,
+  0x0000f090, 0x00007000,
+  0x0000c8b0, 0x00003000,
+  0x00004040, 0x00000000,
+  0x00108015, 0x00000000,
+  0x00a2c150, 0x00004000,
+  0x00a400b0, 0x00000014,
+  0x00000020, 0x00000000,
+  0x2500400d, 0x00002525,
+  0x00047220, 0x00003100,
+  0x00934070, 0x00000000,
+  0x00000020, 0x00000000,
+  0x00924460, 0x00000184,
+  0x2b20c011, 0x00000000,
+  0x0000c420, 0x00000540,
+  0x36014018, 0x0000422d,
+  0x14200011, 0x00000000,
+  0x00924460, 0x00000183,
+  0x3200001f, 0x00000034,
+  0x02ac0015, 0x00000002,
+  0x00a60110, 0x00000008,
+  0x42200011, 0x00000000,
+  0x00924060, 0x00000103,
+  0x0000001e, 0x00000000,
+  0x00000020, 0x00000100,
+  0x0000001e, 0x00000000,
+  0x00924460, 0x00000086,
+  0x00004080, 0x00000000,
+  0x0092c070, 0x00000000,
+  0x00924060, 0x00000100,
+  0x0000c890, 0x00005000,
+  0x00a6c110, 0x00000000,
+  0x00b0c090, 0x00000012,
+  0x021c0015, 0x00000000,
+  0x3200001f, 0x00000034,
+  0x00924460, 0x00000510,
+  0x44210011, 0x00000000,
+  0x42000011, 0x00000000,
+  0x83000015, 0x00000040,
+  0x00924460, 0x00000508,
+  0x45014018, 0x00004545,
+  0x00808050, 0x00000000,
+  0x62208012, 0x00000000,
+  0x82000015, 0x00000800,
+  0x15200011, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x80000015, 0x0000eea4,
+  0x81000015, 0x0000005f,
+  0x00000060, 0x00000000,
+  0x00004120, 0x00000000,
+  0x00004a00, 0x00004000,
+  0x00924460, 0x00000190,
+  0x5601401a, 0x00005956,
+  0x14000011, 0x00000000,
+  0x00934050, 0x00000018,
+  0x00930050, 0x00000018,
+  0x3601403a, 0x0000002d,
+  0x000643a9, 0x00000000,
+  0x0000c420, 0x00000140,
+  0x5601401a, 0x00005956,
+  0x14000011, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x000642a9, 0x00000000,
+  0x00024420, 0x00000183,
+  0x5601401a, 0x00005956,
+  0x82000015, 0x00002000,
+  0x15200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x15200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x15200011, 0x00000000,
+};      /* 104 Tx instructions */
+#define FIRMWARE_TX_SIZE 104
+#if 0
+static const u32 firmware_wol[] = {
+  0x010003dc, 0x00000000,
+  0x19000421, 0x00000087,
+  0x80000015, 0x00001a1a,
+  0x81000015, 0x00001a1a,
+  0x1a0040ab, 0x00000b06,
+  0x15200011, 0x00000000,
+  0x15204022, 0x0000aaaa,
+  0x15204022, 0x00000300,
+  0x15204022, 0x00000000,
+  0x1a0040ab, 0x00000b15,
+  0x15200011, 0x00000000,
+  0x83000015, 0x00000002,
+  0x04000021, 0x00000000,
+  0x00000010, 0x00000000,
+  0x04000421, 0x00000087,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00008015, 0x00000000,
+  0x0000003e, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x82000015, 0x00004000,
+  0x82000015, 0x00008000,
+  0x0000000c, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00004080, 0x00000100,
+  0x1f20c011, 0x00001122,
+  0x2720f011, 0x00003011,
+  0x19200071, 0x00000000,
+  0x1a200051, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x1d2040a4, 0x00003344,
+  0x1d2040a2, 0x00005566,
+  0x000040a0, 0x00000100,
+  0x00108050, 0x00000001,
+  0x1a208012, 0x00000006,
+  0x82000015, 0x00008080,
+  0x010003dc, 0x00000000,
+  0x1d2040a4, 0x00002233,
+  0x1d2040a4, 0x00004455,
+  0x2d208011, 0x00000005,
+  0x1d2040a4, 0x00006611,
+  0x00108050, 0x00000001,
+  0x27200011, 0x00000000,
+  0x1d2050a4, 0x00006600,
+  0x82000015, 0x00008080,
+  0x010003dc, 0x00000000,
+  0x00000050, 0x00000000,
+  0x1b200031, 0x00000000,
+  0x0000001e, 0x00000000,
+  0x0000001e, 0x00000000,
+  0x0000001e, 0x00000000,
+  0x0000001e, 0x00000000,
+  0x00924460, 0x00000086,
+  0x00004080, 0x00000000,
+  0x0092c070, 0x00000000,
+  0x00924060, 0x00000100,
+  0x0000c890, 0x00005000,
+  0x00a6c110, 0x00000000,
+  0x00b0c090, 0x00000012,
+  0x021c0015, 0x00000000,
+  0x3200001f, 0x00000034,
+  0x00924460, 0x00000510,
+  0x44210011, 0x00000000,
+  0x42000011, 0x00000000,
+  0x83000015, 0x00000040,
+  0x00924460, 0x00000508,
+  0x476a0012, 0x00000100,
+  0x83000015, 0x00000008,
+  0x16200011, 0x00000000,
+  0x001e8050, 0x00000000,
+  0x001e8050, 0x00000000,
+  0x00808050, 0x00000000,
+  0x03008015, 0x00000000,
+  0x62208012, 0x00000000,
+  0x82000015, 0x00000800,
+  0x16200011, 0x00000000,
+  0x80000015, 0x0000eea4,
+  0x81000015, 0x0000005f,
+  0x00000020, 0x00000000,
+  0x00004120, 0x00000000,
+  0x00004a00, 0x00004000,
+  0x00924460, 0x00000190,
+  0x5c01401a, 0x0000595c,
+  0x15000011, 0x00000000,
+  0x00934050, 0x00000018,
+  0x00930050, 0x00000018,
+  0x3601403a, 0x0000002d,
+  0x00064029, 0x00000000,
+  0x0000c420, 0x00000140,
+  0x5c01401a, 0x0000595c,
+  0x15000011, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00000010, 0x00000000,
+  0x00064029, 0x00000000,
+  0x00024420, 0x00000183,
+  0x5c01401a, 0x0000595c,
+  0x82000015, 0x00002000,
+  0x16200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x16200011, 0x00000000,
+  0x82000015, 0x00000010,
+  0x16200011, 0x00000000,
+};      /* 104 WoL instructions */
+#define FIRMWARE_WOL_SIZE 104
+#endif
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f10dd74988c4..a0b8848049c9 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7,7 +7,12 @@
  * Copyright (C) 2005 Broadcom Corporation.
  *
  * Firmware is:
- *      Copyright (C) 2000-2003 Broadcom Corporation.
+ *      Derived from proprietary unpublished source code,
+ *      Copyright (C) 2000-2003 Broadcom Corporation.
+ *
+ *      Permission is hereby granted for the distribution of this firmware
+ *      data in hexadecimal or equivalent format, provided this copyright
+ *      notice is accompanying it.
  */
 
 #include <linux/config.h>
@@ -61,8 +66,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.29"
-#define DRV_MODULE_RELDATE      "May 23, 2005"
+#define DRV_MODULE_VERSION      "3.31"
+#define DRV_MODULE_RELDATE      "June 8, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -133,6 +138,8 @@
 /* number of ETHTOOL_GSTATS u64's */
 #define TG3_NUM_STATS           (sizeof(struct tg3_ethtool_stats)/sizeof(u64))
 
+#define TG3_NUM_TEST            6
+
 static char version[] __devinitdata =
         DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
@@ -316,6 +323,17 @@ static struct {
         { "nic_tx_threshold_hit" }
 };
 
+static struct {
+        const char string[ETH_GSTRING_LEN];
+} ethtool_test_keys[TG3_NUM_TEST] = {
+        { "nvram test     (online) " },
+        { "link test      (online) " },
+        { "register test  (offline)" },
+        { "memory test    (offline)" },
+        { "loopback test  (offline)" },
+        { "interrupt test (offline)" },
+};
+
 static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val)
 {
         if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) != 0) {
@@ -3070,7 +3088,7 @@ static irqreturn_t tg3_test_isr(int irq, void *dev_id,
 }
 
 static int tg3_init_hw(struct tg3 *);
-static int tg3_halt(struct tg3 *, int);
+static int tg3_halt(struct tg3 *, int, int);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void tg3_poll_controller(struct net_device *dev)
@@ -3094,7 +3112,7 @@ static void tg3_reset_task(void *_data)
         restart_timer = tp->tg3_flags2 & TG3_FLG2_RESTART_TIMER;
         tp->tg3_flags2 &= ~TG3_FLG2_RESTART_TIMER;
 
-        tg3_halt(tp, 0);
+        tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);
         tg3_init_hw(tp);
 
         tg3_netif_start(tp);
@@ -3440,7 +3458,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
         spin_lock_irq(&tp->lock);
         spin_lock(&tp->tx_lock);
 
-        tg3_halt(tp, 1);
+        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
 
         tg3_set_mtu(dev, tp, new_mtu);
 
@@ -4131,19 +4149,19 @@ static void tg3_stop_fw(struct tg3 *tp)
 }
 
 /* tp->lock is held. */
-static int tg3_halt(struct tg3 *tp, int silent)
+static int tg3_halt(struct tg3 *tp, int kind, int silent)
 {
         int err;
 
         tg3_stop_fw(tp);
 
-        tg3_write_sig_pre_reset(tp, RESET_KIND_SHUTDOWN);
+        tg3_write_sig_pre_reset(tp, kind);
 
         tg3_abort_hw(tp, silent);
         err = tg3_chip_reset(tp);
 
-        tg3_write_sig_legacy(tp, RESET_KIND_SHUTDOWN);
-        tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
+        tg3_write_sig_legacy(tp, kind);
+        tg3_write_sig_post_reset(tp, kind);
 
         if (err)
                 return err;
@@ -4357,7 +4375,12 @@ static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base, u32 cpu_scratch_b
          */
         tp->tg3_flags |= TG3_FLAG_PCIX_TARGET_HWBUG;
 
+        /* It is possible that bootcode is still loading at this point.
+         * Get the nvram lock first before halting the cpu.
+         */
+        tg3_nvram_lock(tp);
         err = tg3_halt_cpu(tp, cpu_base);
+        tg3_nvram_unlock(tp);
         if (err)
                 goto out;
 
@@ -5881,6 +5904,9 @@ static int tg3_test_interrupt(struct tg3 *tp)
         int err, i;
         u32 int_mbox = 0;
 
+        if (!netif_running(dev))
+                return -ENODEV;
+
         tg3_disable_ints(tp);
 
         free_irq(tp->pdev->irq, dev);
@@ -5984,7 +6010,7 @@ static int tg3_test_msi(struct tg3 *tp)
         spin_lock_irq(&tp->lock);
         spin_lock(&tp->tx_lock);
 
-        tg3_halt(tp, 1);
+        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         err = tg3_init_hw(tp);
 
         spin_unlock(&tp->tx_lock);
@@ -6060,7 +6086,7 @@ static int tg3_open(struct net_device *dev)
 
         err = tg3_init_hw(tp);
         if (err) {
-                tg3_halt(tp, 1);
+                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                 tg3_free_rings(tp);
         } else {
                 if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
@@ -6104,7 +6130,7 @@ static int tg3_open(struct net_device *dev)
                                 pci_disable_msi(tp->pdev);
                                 tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
                         }
-                        tg3_halt(tp, 1);
+                        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                         tg3_free_rings(tp);
                         tg3_free_consistent(tp);
 
@@ -6377,7 +6403,7 @@ static int tg3_close(struct net_device *dev)
 
         tg3_disable_ints(tp);
 
-        tg3_halt(tp, 1);
+        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         tg3_free_rings(tp);
         tp->tg3_flags &=
                 ~(TG3_FLAG_INIT_COMPLETE |
@@ -7097,7 +7123,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
         tp->tx_pending = ering->tx_pending;
 
         if (netif_running(dev)) {
-                tg3_halt(tp, 1);
+                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                 tg3_init_hw(tp);
                 tg3_netif_start(tp);
         }
@@ -7140,7 +7166,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
                 tp->tg3_flags &= ~TG3_FLAG_TX_PAUSE;
 
         if (netif_running(dev)) {
-                tg3_halt(tp, 1);
+                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
                 tg3_init_hw(tp);
                 tg3_netif_start(tp);
         }
@@ -7199,12 +7225,20 @@ static int tg3_get_stats_count (struct net_device *dev)
         return TG3_NUM_STATS;
 }
 
+static int tg3_get_test_count (struct net_device *dev)
+{
+        return TG3_NUM_TEST;
+}
+
 static void tg3_get_strings (struct net_device *dev, u32 stringset, u8 *buf)
 {
         switch (stringset) {
         case ETH_SS_STATS:
                 memcpy(buf, &ethtool_stats_keys, sizeof(ethtool_stats_keys));
                 break;
+        case ETH_SS_TEST:
+                memcpy(buf, &ethtool_test_keys, sizeof(ethtool_test_keys));
+                break;
         default:
                 WARN_ON(1);     /* we need a WARN() */
                 break;
@@ -7218,6 +7252,516 @@ static void tg3_get_ethtool_stats (struct net_device *dev,
         memcpy(tmp_stats, tg3_get_estats(tp), sizeof(tp->estats));
 }
 
+#define NVRAM_TEST_SIZE 0x100
+
+static int tg3_test_nvram(struct tg3 *tp)
+{
+        u32 *buf, csum;
+        int i, j, err = 0;
+
+        buf = kmalloc(NVRAM_TEST_SIZE, GFP_KERNEL);
+        if (buf == NULL)
+                return -ENOMEM;
+
+        for (i = 0, j = 0; i < NVRAM_TEST_SIZE; i += 4, j++) {
+                u32 val;
+
+                if ((err = tg3_nvram_read(tp, i, &val)) != 0)
+                        break;
+                buf[j] = cpu_to_le32(val);
+        }
+        if (i < NVRAM_TEST_SIZE)
+                goto out;
+
+        err = -EIO;
+        if (cpu_to_be32(buf[0]) != TG3_EEPROM_MAGIC)
+                goto out;
+
+        /* Bootstrap checksum at offset 0x10 */
+        csum = calc_crc((unsigned char *) buf, 0x10);
+        if(csum != cpu_to_le32(buf[0x10/4]))
+                goto out;
+
+        /* Manufacturing block starts at offset 0x74, checksum at 0xfc */
+        csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
+        if (csum != cpu_to_le32(buf[0xfc/4]))
+                 goto out;
+
+        err = 0;
+
+out:
+        kfree(buf);
+        return err;
+}
+
+#define TG3_SERDES_TIMEOUT_SEC  2
+#define TG3_COPPER_TIMEOUT_SEC  6
+
+static int tg3_test_link(struct tg3 *tp)
+{
+        int i, max;
+
+        if (!netif_running(tp->dev))
+                return -ENODEV;
+
+        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+                max = TG3_SERDES_TIMEOUT_SEC;
+        else
+                max = TG3_COPPER_TIMEOUT_SEC;
+
+        for (i = 0; i < max; i++) {
+                if (netif_carrier_ok(tp->dev))
+                        return 0;
+
+                if (msleep_interruptible(1000))
+                        break;
+        }
+
+        return -EIO;
+}
+
+/* Only test the commonly used registers */
+static int tg3_test_registers(struct tg3 *tp)
+{
+        int i, is_5705;
+        u32 offset, read_mask, write_mask, val, save_val, read_val;
+        static struct {
+                u16 offset;
+                u16 flags;
+#define TG3_FL_5705     0x1
+#define TG3_FL_NOT_5705 0x2
+#define TG3_FL_NOT_5788 0x4
+                u32 read_mask;
+                u32 write_mask;
+        } reg_tbl[] = {
+                /* MAC Control Registers */
+                { MAC_MODE, TG3_FL_NOT_5705,
+                        0x00000000, 0x00ef6f8c },
+                { MAC_MODE, TG3_FL_5705,
+                        0x00000000, 0x01ef6b8c },
+                { MAC_STATUS, TG3_FL_NOT_5705,
+                        0x03800107, 0x00000000 },
+                { MAC_STATUS, TG3_FL_5705,
+                        0x03800100, 0x00000000 },
+                { MAC_ADDR_0_HIGH, 0x0000,
+                        0x00000000, 0x0000ffff },
+                { MAC_ADDR_0_LOW, 0x0000,
+                        0x00000000, 0xffffffff },
+                { MAC_RX_MTU_SIZE, 0x0000,
+                        0x00000000, 0x0000ffff },
+                { MAC_TX_MODE, 0x0000,
+                        0x00000000, 0x00000070 },
+                { MAC_TX_LENGTHS, 0x0000,
+                        0x00000000, 0x00003fff },
+                { MAC_RX_MODE, TG3_FL_NOT_5705,
+                        0x00000000, 0x000007fc },
+                { MAC_RX_MODE, TG3_FL_5705,
+                        0x00000000, 0x000007dc },
+                { MAC_HASH_REG_0, 0x0000,
+                        0x00000000, 0xffffffff },
+                { MAC_HASH_REG_1, 0x0000,
+                        0x00000000, 0xffffffff },
+                { MAC_HASH_REG_2, 0x0000,
+                        0x00000000, 0xffffffff },
+                { MAC_HASH_REG_3, 0x0000,
+                        0x00000000, 0xffffffff },
+
+                /* Receive Data and Receive BD Initiator Control Registers. */
+                { RCVDBDI_JUMBO_BD+0, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { RCVDBDI_JUMBO_BD+4, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { RCVDBDI_JUMBO_BD+8, TG3_FL_NOT_5705,
+                        0x00000000, 0x00000003 },
+                { RCVDBDI_JUMBO_BD+0xc, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { RCVDBDI_STD_BD+0, 0x0000,
+                        0x00000000, 0xffffffff },
+                { RCVDBDI_STD_BD+4, 0x0000,
+                        0x00000000, 0xffffffff },
+                { RCVDBDI_STD_BD+8, 0x0000,
+                        0x00000000, 0xffff0002 },
+                { RCVDBDI_STD_BD+0xc, 0x0000,
+                        0x00000000, 0xffffffff },
+        
+                /* Receive BD Initiator Control Registers. */
+                { RCVBDI_STD_THRESH, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { RCVBDI_STD_THRESH, TG3_FL_5705,
+                        0x00000000, 0x000003ff },
+                { RCVBDI_JUMBO_THRESH, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+        
+                /* Host Coalescing Control Registers. */
+                { HOSTCC_MODE, TG3_FL_NOT_5705,
+                        0x00000000, 0x00000004 },
+                { HOSTCC_MODE, TG3_FL_5705,
+                        0x00000000, 0x000000f6 },
+                { HOSTCC_RXCOL_TICKS, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_RXCOL_TICKS, TG3_FL_5705,
+                        0x00000000, 0x000003ff },
+                { HOSTCC_TXCOL_TICKS, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_TXCOL_TICKS, TG3_FL_5705,
+                        0x00000000, 0x000003ff },
+                { HOSTCC_RXMAX_FRAMES, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_RXMAX_FRAMES, TG3_FL_5705 | TG3_FL_NOT_5788,
+                        0x00000000, 0x000000ff },
+                { HOSTCC_TXMAX_FRAMES, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_TXMAX_FRAMES, TG3_FL_5705 | TG3_FL_NOT_5788,
+                        0x00000000, 0x000000ff },
+                { HOSTCC_RXCOAL_TICK_INT, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_TXCOAL_TICK_INT, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_RXCOAL_MAXF_INT, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_RXCOAL_MAXF_INT, TG3_FL_5705 | TG3_FL_NOT_5788,
+                        0x00000000, 0x000000ff },
+                { HOSTCC_TXCOAL_MAXF_INT, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_TXCOAL_MAXF_INT, TG3_FL_5705 | TG3_FL_NOT_5788,
+                        0x00000000, 0x000000ff },
+                { HOSTCC_STAT_COAL_TICKS, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_STATS_BLK_HOST_ADDR, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_STATS_BLK_HOST_ADDR+4, TG3_FL_NOT_5705,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_STATUS_BLK_HOST_ADDR, 0x0000,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_STATUS_BLK_HOST_ADDR+4, 0x0000,
+                        0x00000000, 0xffffffff },
+                { HOSTCC_STATS_BLK_NIC_ADDR, 0x0000,
+                        0xffffffff, 0x00000000 },
+                { HOSTCC_STATUS_BLK_NIC_ADDR, 0x0000,
+                        0xffffffff, 0x00000000 },
+
+                /* Buffer Manager Control Registers. */
+                { BUFMGR_MB_POOL_ADDR, 0x0000,
+                        0x00000000, 0x007fff80 },
+                { BUFMGR_MB_POOL_SIZE, 0x0000,
+                        0x00000000, 0x007fffff },
+                { BUFMGR_MB_RDMA_LOW_WATER, 0x0000,
+                        0x00000000, 0x0000003f },
+                { BUFMGR_MB_MACRX_LOW_WATER, 0x0000,
+                        0x00000000, 0x000001ff },
+                { BUFMGR_MB_HIGH_WATER, 0x0000,
+                        0x00000000, 0x000001ff },
+                { BUFMGR_DMA_DESC_POOL_ADDR, TG3_FL_NOT_5705,
+                        0xffffffff, 0x00000000 },
+                { BUFMGR_DMA_DESC_POOL_SIZE, TG3_FL_NOT_5705,
+                        0xffffffff, 0x00000000 },
+        
+                /* Mailbox Registers */
+                { GRCMBOX_RCVSTD_PROD_IDX+4, 0x0000,
+                        0x00000000, 0x000001ff },
+                { GRCMBOX_RCVJUMBO_PROD_IDX+4, TG3_FL_NOT_5705,
+                        0x00000000, 0x000001ff },
+                { GRCMBOX_RCVRET_CON_IDX_0+4, 0x0000,
+                        0x00000000, 0x000007ff },
+                { GRCMBOX_SNDHOST_PROD_IDX_0+4, 0x0000,
+                        0x00000000, 0x000001ff },
+
+                { 0xffff, 0x0000, 0x00000000, 0x00000000 },
+        };
+
+        if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
+                is_5705 = 1;
+        else
+                is_5705 = 0;
+
+        for (i = 0; reg_tbl[i].offset != 0xffff; i++) {
+                if (is_5705 && (reg_tbl[i].flags & TG3_FL_NOT_5705))
+                        continue;
+
+                if (!is_5705 && (reg_tbl[i].flags & TG3_FL_5705))
+                        continue;
+
+                if ((tp->tg3_flags2 & TG3_FLG2_IS_5788) &&
+                    (reg_tbl[i].flags & TG3_FL_NOT_5788))
+                        continue;
+
+                offset = (u32) reg_tbl[i].offset;
+                read_mask = reg_tbl[i].read_mask;
+                write_mask = reg_tbl[i].write_mask;
+
+                /* Save the original register content */
+                save_val = tr32(offset);
+
+                /* Determine the read-only value. */
+                read_val = save_val & read_mask;
+
+                /* Write zero to the register, then make sure the read-only bits
+                 * are not changed and the read/write bits are all zeros.
+                 */
+                tw32(offset, 0);
+
+                val = tr32(offset);
+
+                /* Test the read-only and read/write bits. */
+                if (((val & read_mask) != read_val) || (val & write_mask))
+                        goto out;
+
+                /* Write ones to all the bits defined by RdMask and WrMask, then
+                 * make sure the read-only bits are not changed and the
+                 * read/write bits are all ones.
+                 */
+                tw32(offset, read_mask | write_mask);
+
+                val = tr32(offset);
+
+                /* Test the read-only bits. */
+                if ((val & read_mask) != read_val)
+                        goto out;
+
+                /* Test the read/write bits. */
+                if ((val & write_mask) != write_mask)
+                        goto out;
+
+                tw32(offset, save_val);
+        }
+
+        return 0;
+
+out:
+        printk(KERN_ERR PFX "Register test failed at offset %x\n", offset);
+        tw32(offset, save_val);
+        return -EIO;
+}
+
+static int tg3_do_mem_test(struct tg3 *tp, u32 offset, u32 len)
+{
+        static u32 test_pattern[] = { 0x00000000, 0xffffffff, 0xaa55a55a };
+        int i;
+        u32 j;
+
+        for (i = 0; i < sizeof(test_pattern)/sizeof(u32); i++) {
+                for (j = 0; j < len; j += 4) {
+                        u32 val;
+
+                        tg3_write_mem(tp, offset + j, test_pattern[i]);
+                        tg3_read_mem(tp, offset + j, &val);
+                        if (val != test_pattern[i])
+                                return -EIO;
+                }
+        }
+        return 0;
+}
+
+static int tg3_test_memory(struct tg3 *tp)
+{
+        static struct mem_entry {
+                u32 offset;
+                u32 len;
+        } mem_tbl_570x[] = {
+                { 0x00000000, 0x01000},
+                { 0x00002000, 0x1c000},
+                { 0xffffffff, 0x00000}
+        }, mem_tbl_5705[] = {
+                { 0x00000100, 0x0000c},
+                { 0x00000200, 0x00008},
+                { 0x00000b50, 0x00400},
+                { 0x00004000, 0x00800},
+                { 0x00006000, 0x01000},
+                { 0x00008000, 0x02000},
+                { 0x00010000, 0x0e000},
+                { 0xffffffff, 0x00000}
+        };
+        struct mem_entry *mem_tbl;
+        int err = 0;
+        int i;
+
+        if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
+                mem_tbl = mem_tbl_5705;
+        else
+                mem_tbl = mem_tbl_570x;
+
+        for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) {
+                if ((err = tg3_do_mem_test(tp, mem_tbl[i].offset,
+                    mem_tbl[i].len)) != 0)
+                        break;
+        }
+        
+        return err;
+}
+
+static int tg3_test_loopback(struct tg3 *tp)
+{
+        u32 mac_mode, send_idx, rx_start_idx, rx_idx, tx_idx, opaque_key;
+        u32 desc_idx;
+        struct sk_buff *skb, *rx_skb;
+        u8 *tx_data;
+        dma_addr_t map;
+        int num_pkts, tx_len, rx_len, i, err;
+        struct tg3_rx_buffer_desc *desc;
+
+        if (!netif_running(tp->dev))
+                return -ENODEV;
+
+        err = -EIO;
+
+        tg3_abort_hw(tp, 1);
+
+        /* Clearing this flag to keep interrupts disabled */
+        tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
+        tg3_reset_hw(tp);
+
+        mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                   MAC_MODE_PORT_INT_LPBACK | MAC_MODE_LINK_POLARITY |
+                   MAC_MODE_PORT_MODE_GMII;
+        tw32(MAC_MODE, mac_mode);
+
+        tx_len = 1514;
+        skb = dev_alloc_skb(tx_len);
+        tx_data = skb_put(skb, tx_len);
+        memcpy(tx_data, tp->dev->dev_addr, 6);
+        memset(tx_data + 6, 0x0, 8);
+
+        tw32(MAC_RX_MTU_SIZE, tx_len + 4);
+
+        for (i = 14; i < tx_len; i++)
+                tx_data[i] = (u8) (i & 0xff);
+
+        map = pci_map_single(tp->pdev, skb->data, tx_len, PCI_DMA_TODEVICE);
+
+        tw32_f(HOSTCC_MODE, tp->coalesce_mode | HOSTCC_MODE_ENABLE |
+             HOSTCC_MODE_NOW);
+
+        udelay(10);
+
+        rx_start_idx = tp->hw_status->idx[0].rx_producer;
+
+        send_idx = 0;
+        num_pkts = 0;
+
+        tg3_set_txd(tp, send_idx, map, tx_len, 0, 1);
+
+        send_idx++;
+        num_pkts++;
+
+        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, send_idx);
+        tr32(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW);
+
+        udelay(10);
+
+        for (i = 0; i < 10; i++) {
+                tw32_f(HOSTCC_MODE, tp->coalesce_mode | HOSTCC_MODE_ENABLE |
+                       HOSTCC_MODE_NOW);
+
+                udelay(10);
+
+                tx_idx = tp->hw_status->idx[0].tx_consumer;
+                rx_idx = tp->hw_status->idx[0].rx_producer;
+                if ((tx_idx == send_idx) &&
+                    (rx_idx == (rx_start_idx + num_pkts)))
+                        break;
+        }
+
+        pci_unmap_single(tp->pdev, map, tx_len, PCI_DMA_TODEVICE);
+        dev_kfree_skb(skb);
+
+        if (tx_idx != send_idx)
+                goto out;
+
+        if (rx_idx != rx_start_idx + num_pkts)
+                goto out;
+
+        desc = &tp->rx_rcb[rx_start_idx];
+        desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
+        opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
+        if (opaque_key != RXD_OPAQUE_RING_STD)
+                goto out;
+
+        if ((desc->err_vlan & RXD_ERR_MASK) != 0 &&
+            (desc->err_vlan != RXD_ERR_ODD_NIBBLE_RCVD_MII))
+                goto out;
+
+        rx_len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - 4;
+        if (rx_len != tx_len)
+                goto out;
+
+        rx_skb = tp->rx_std_buffers[desc_idx].skb;
+
+        map = pci_unmap_addr(&tp->rx_std_buffers[desc_idx], mapping);
+        pci_dma_sync_single_for_cpu(tp->pdev, map, rx_len, PCI_DMA_FROMDEVICE);
+
+        for (i = 14; i < tx_len; i++) {
+                if (*(rx_skb->data + i) != (u8) (i & 0xff))
+                        goto out;
+        }
+        err = 0;
+        
+        /* tg3_free_rings will unmap and free the rx_skb */
+out:
+        return err;
+}
+
+static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
+                          u64 *data)
+{
+        struct tg3 *tp = netdev_priv(dev);
+
+        memset(data, 0, sizeof(u64) * TG3_NUM_TEST);
+
+        if (tg3_test_nvram(tp) != 0) {
+                etest->flags |= ETH_TEST_FL_FAILED;
+                data[0] = 1;
+        }
+        if (tg3_test_link(tp) != 0) {
+                etest->flags |= ETH_TEST_FL_FAILED;
+                data[1] = 1;
+        }
+        if (etest->flags & ETH_TEST_FL_OFFLINE) {
+                if (netif_running(dev))
+                        tg3_netif_stop(tp);
+
+                spin_lock_irq(&tp->lock);
+                spin_lock(&tp->tx_lock);
+
+                tg3_halt(tp, RESET_KIND_SUSPEND, 1);
+                tg3_nvram_lock(tp);
+                tg3_halt_cpu(tp, RX_CPU_BASE);
+                if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
+                        tg3_halt_cpu(tp, TX_CPU_BASE);
+                tg3_nvram_unlock(tp);
+
+                if (tg3_test_registers(tp) != 0) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        data[2] = 1;
+                }
+                if (tg3_test_memory(tp) != 0) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        data[3] = 1;
+                }
+                if (tg3_test_loopback(tp) != 0) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        data[4] = 1;
+                }
+
+                spin_unlock(&tp->tx_lock);
+                spin_unlock_irq(&tp->lock);
+                if (tg3_test_interrupt(tp) != 0) {
+                        etest->flags |= ETH_TEST_FL_FAILED;
+                        data[5] = 1;
+                }
+                spin_lock_irq(&tp->lock);
+                spin_lock(&tp->tx_lock);
+
+                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+                if (netif_running(dev)) {
+                        tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
+                        tg3_init_hw(tp);
+                        tg3_netif_start(tp);
+                }
+                spin_unlock(&tp->tx_lock);
+                spin_unlock_irq(&tp->lock);
+        }
+}
+
 static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct mii_ioctl_data *data = if_mii(ifr);
@@ -7331,6 +7875,8 @@ static struct ethtool_ops tg3_ethtool_ops = {
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = tg3_set_tso,
 #endif
+        .self_test_count        = tg3_get_test_count,
+        .self_test              = tg3_self_test,
         .get_strings            = tg3_get_strings,
         .get_stats_count        = tg3_get_stats_count,
         .get_ethtool_stats      = tg3_get_ethtool_stats,
@@ -8014,6 +8560,16 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 
                 case NIC_SRAM_DATA_CFG_LED_MODE_MAC:
                         tp->led_ctrl = LED_CTRL_MODE_MAC;
+
+                        /* Default to PHY_1_MODE if 0 (MAC_MODE) is
+                         * read on some older 5700/5701 bootcode.
+                         */
+                        if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
+                            ASIC_REV_5700 ||
+                            GET_ASIC_REV(tp->pci_chip_rev_id) ==
+                            ASIC_REV_5701)
+                                tp->led_ctrl = LED_CTRL_MODE_PHY_1;
+
                         break;
 
                 case SHASTA_EXT_LED_SHARED:
@@ -9139,10 +9695,24 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
         }
         if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) !=
             DMA_RWCTRL_WRITE_BNDRY_16) {
+                static struct pci_device_id dma_wait_state_chipsets[] = {
+                        { PCI_DEVICE(PCI_VENDOR_ID_APPLE,
+                                     PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },
+                        { },
+                };
+
                 /* DMA test passed without adjusting DMA boundary,
-                 * just restore the calculated DMA boundary
+                 * now look for chipsets that are known to expose the
+                 * DMA bug without failing the test.
                  */
-                tp->dma_rwctrl = saved_dma_rwctrl;
+                if (pci_dev_present(dma_wait_state_chipsets)) {
+                        tp->dma_rwctrl &= ~DMA_RWCTRL_WRITE_BNDRY_MASK;
+                        tp->dma_rwctrl |= DMA_RWCTRL_WRITE_BNDRY_16;
+                }
+                else
+                        /* Safe to use the calculated DMA boundary. */
+                        tp->dma_rwctrl = saved_dma_rwctrl;
+
                 tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
         }
 
@@ -9478,7 +10048,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
             (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
                 pci_save_state(tp->pdev);
                 tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
-                tg3_halt(tp, 1);
+                tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         }
 
         err = tg3_test_dma(tp);
@@ -9605,7 +10175,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
 
         spin_lock_irq(&tp->lock);
         spin_lock(&tp->tx_lock);
-        tg3_halt(tp, 1);
+        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
         spin_unlock(&tp->tx_lock);
         spin_unlock_irq(&tp->lock);
 
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index a7ffa64502dd..cf31c0629852 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -193,6 +193,12 @@ static  int aui[MAX_TLAN_BOARDS];
 static  int duplex[MAX_TLAN_BOARDS];
 static  int speed[MAX_TLAN_BOARDS];
 static  int boards_found;
+module_param_array(aui, int, NULL, 0);
+module_param_array(duplex, int, NULL, 0);
+module_param_array(speed, int, NULL, 0);
+MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
+MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
+MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
 
 MODULE_AUTHOR("Maintainer: Samuel Chessman <chessman@tux.org>");
 MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
@@ -204,8 +210,13 @@ MODULE_LICENSE("GPL");
 
 /* Turn on debugging. See Documentation/networking/tlan.txt for details */
 static  int             debug;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
 
 static  int             bbuf;
+module_param(bbuf, int, 0);
+MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
+
 static  u8              *TLanPadBuffer;
 static  dma_addr_t      TLanPadBufferDMA;
 static  char            TLanSignature[] = "TLAN";
@@ -2381,6 +2392,7 @@ TLan_FinishReset( struct net_device *dev )
                 TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
                 return;
         }
+        TLan_SetMulticastList(dev);
 
 } /* TLan_FinishReset */
 
@@ -2807,7 +2819,7 @@ void TLan_PhyMonitor( struct net_device *dev )
                if (priv->link) {
                       priv->link = 0;
                       printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
-                      dev->flags &= ~IFF_RUNNING;
+                      netif_carrier_off(dev);
                       TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
                       return;
                 }
@@ -2817,7 +2829,7 @@ void TLan_PhyMonitor( struct net_device *dev )
         if ((phy_status & MII_GS_LINK) && !priv->link) {
                 priv->link = 1;
                 printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
-                dev->flags |= IFF_RUNNING;
+                netif_carrier_on(dev);
         }
 
         /* Setup a new monitor */
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index c098863bdd9d..3873917a9c22 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -888,11 +888,6 @@ static int tok_open(struct net_device *dev)
         ti->sap_status   = CLOSED; /* CLOSED or OPEN      */
         ti->open_failure =     NO; /* NO     or YES       */
         ti->open_mode    = MANUAL; /* MANUAL or AUTOMATIC */
-        /* 12/2000 not typical Linux, but we can use RUNNING to let us know when
-        the network has crapped out or cables are disconnected. Useful because
-        the IFF_UP flag stays up the whole time, until ifconfig tr0 down.
-        */
-        dev->flags &= ~IFF_RUNNING;
 
         ti->sram_phys &= ~1; /* to reverse what we do in tok_close */
         /* init the spinlock */
@@ -1242,7 +1237,7 @@ irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 ti->open_status = CLOSED;
                 ti->sap_status  = CLOSED;
                 ti->open_mode   = AUTOMATIC;
-                dev->flags &= ~IFF_RUNNING;
+                netif_carrier_off(dev);
                 netif_stop_queue(dev);
                 ti->open_action = RESTART;
                 outb(0, dev->base_addr + ADAPTRESET);
@@ -1323,7 +1318,7 @@ irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                 break;
                         }
                         netif_wake_queue(dev);
-                        dev->flags |= IFF_RUNNING;/*BMS 12/2000*/
+                        netif_carrier_on(dev);
                         break;
                 case DIR_INTERRUPT:
                 case DIR_MOD_OPEN_PARAMS:
@@ -1427,7 +1422,7 @@ irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                                                 ring_status);
                         if(ring_status& (REMOVE_RECV|AUTO_REMOVAL|LOBE_FAULT)){
                                 netif_stop_queue(dev);
-                                dev->flags &= ~IFF_RUNNING;/*not typical Linux*/
+                                netif_carrier_off(dev);
                                 DPRINTK("Remove received, or Auto-removal error"
                                         ", or Lobe fault\n");
                                 DPRINTK("We'll try to reopen the closed adapter"
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 921a573372e9..7ff814fd65d0 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -235,7 +235,7 @@ static int dma[MAX_CARDS+1];
 static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, };
 
 /* for class stuff*/
-static struct class_simple *cosa_class;
+static struct class *cosa_class;
 
 #ifdef MODULE
 module_param_array(io, int, NULL, 0);
@@ -394,19 +394,19 @@ static int __init cosa_init(void)
                 goto out;
         }
         devfs_mk_dir("cosa");
-        cosa_class = class_simple_create(THIS_MODULE, "cosa");
+        cosa_class = class_create(THIS_MODULE, "cosa");
         if (IS_ERR(cosa_class)) {
                 err = PTR_ERR(cosa_class);
                 goto out_chrdev;
         }
         for (i=0; i<nr_cards; i++) {
-                class_simple_device_add(cosa_class, MKDEV(cosa_major, i),
+                class_device_create(cosa_class, MKDEV(cosa_major, i),
                                 NULL, "cosa%d", i);
                 err = devfs_mk_cdev(MKDEV(cosa_major, i),
                                 S_IFCHR|S_IRUSR|S_IWUSR,
                                 "cosa/%d", i);
                 if (err) {
-                        class_simple_device_remove(MKDEV(cosa_major, i));
+                        class_device_destroy(cosa_class, MKDEV(cosa_major, i));
                         goto out_chrdev;                
                 }
         }
@@ -427,10 +427,10 @@ static void __exit cosa_exit(void)
         printk(KERN_INFO "Unloading the cosa module\n");
 
         for (i=0; i<nr_cards; i++) {
-                class_simple_device_remove(MKDEV(cosa_major, i));
+                class_device_destroy(cosa_class, MKDEV(cosa_major, i));
                 devfs_remove("cosa/%d", i);
         }
-        class_simple_destroy(cosa_class);
+        class_destroy(cosa_class);
         devfs_remove("cosa");
         for (cosa=cosa_cards; nr_cards--; cosa++) {
                 /* Clean up the per-channel data */
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 7f450b51a6cb..a5d6891c9d4c 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -2,7 +2,7 @@
  * Generic HDLC support routines for Linux
  * Frame Relay support
  *
- * Copyright (C) 1999 - 2003 Krzysztof Halasa <khc@pm.waw.pl>
+ * Copyright (C) 1999 - 2005 Krzysztof Halasa <khc@pm.waw.pl>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -27,6 +27,10 @@
  active = open and "link reliable"
  exist = new = not used
 
+ CCITT LMI: ITU-T Q.933 Annex A
+ ANSI LMI: ANSI T1.617 Annex D
+ CISCO LMI: the original, aka "Gang of Four" LMI
+
 */
 
 #include <linux/module.h>
@@ -49,45 +53,41 @@
 #undef DEBUG_ECN
 #undef DEBUG_LINK
 
-#define MAXLEN_LMISTAT  20      /* max size of status enquiry frame */
-
-#define PVC_STATE_NEW    0x01
-#define PVC_STATE_ACTIVE 0x02
-#define PVC_STATE_FECN   0x08 /* FECN condition */
-#define PVC_STATE_BECN   0x10 /* BECN condition */
-
-
-#define FR_UI            0x03
-#define FR_PAD           0x00
-
-#define NLPID_IP         0xCC
-#define NLPID_IPV6       0x8E
-#define NLPID_SNAP       0x80
-#define NLPID_PAD        0x00
-#define NLPID_Q933       0x08
-
-
-#define LMI_DLCI                   0 /* LMI DLCI */
-#define LMI_PROTO               0x08
-#define LMI_CALLREF             0x00 /* Call Reference */
-#define LMI_ANSI_LOCKSHIFT      0x95 /* ANSI lockshift */
-#define LMI_REPTYPE                1 /* report type */
-#define LMI_CCITT_REPTYPE       0x51
-#define LMI_ALIVE                  3 /* keep alive */
-#define LMI_CCITT_ALIVE         0x53
-#define LMI_PVCSTAT                7 /* pvc status */
-#define LMI_CCITT_PVCSTAT       0x57
-#define LMI_FULLREP                0 /* full report  */
-#define LMI_INTEGRITY              1 /* link integrity report */
-#define LMI_SINGLE                 2 /* single pvc report */
+#define FR_UI                   0x03
+#define FR_PAD                  0x00
+
+#define NLPID_IP                0xCC
+#define NLPID_IPV6              0x8E
+#define NLPID_SNAP              0x80
+#define NLPID_PAD               0x00
+#define NLPID_CCITT_ANSI_LMI    0x08
+#define NLPID_CISCO_LMI         0x09
+
+
+#define LMI_CCITT_ANSI_DLCI        0 /* LMI DLCI */
+#define LMI_CISCO_DLCI          1023
+
+#define LMI_CALLREF             0x00 /* Call Reference */
+#define LMI_ANSI_LOCKSHIFT      0x95 /* ANSI locking shift */
+#define LMI_ANSI_CISCO_REPTYPE  0x01 /* report type */
+#define LMI_CCITT_REPTYPE       0x51
+#define LMI_ANSI_CISCO_ALIVE    0x03 /* keep alive */
+#define LMI_CCITT_ALIVE         0x53
+#define LMI_ANSI_CISCO_PVCSTAT  0x07 /* PVC status */
+#define LMI_CCITT_PVCSTAT       0x57
+
+#define LMI_FULLREP             0x00 /* full report  */
+#define LMI_INTEGRITY           0x01 /* link integrity report */
+#define LMI_SINGLE              0x02 /* single PVC report */
+
 #define LMI_STATUS_ENQUIRY      0x75
 #define LMI_STATUS              0x7D /* reply */
 
 #define LMI_REPT_LEN               1 /* report type element length */
 #define LMI_INTEG_LEN              2 /* link integrity element length */
 
-#define LMI_LENGTH                13 /* standard LMI frame length */
-#define LMI_ANSI_LENGTH           14
+#define LMI_CCITT_CISCO_LENGTH    13 /* LMI frame lengths */
+#define LMI_ANSI_LENGTH           14
 
 
 typedef struct {
@@ -223,51 +223,34 @@ static inline struct net_device** get_dev_p(pvc_device *pvc, int type)
 }
 
 
-static inline u16 status_to_dlci(u8 *status, int *active, int *new)
-{
-        *new = (status[2] & 0x08) ? 1 : 0;
-        *active = (status[2] & 0x02) ? 1 : 0;
-
-        return ((status[0] & 0x3F) << 4) | ((status[1] & 0x78) >> 3);
-}
-
-
-static inline void dlci_to_status(u16 dlci, u8 *status, int active, int new)
-{
-        status[0] = (dlci >> 4) & 0x3F;
-        status[1] = ((dlci << 3) & 0x78) | 0x80;
-        status[2] = 0x80;
-
-        if (new)
-                status[2] |= 0x08;
-        else if (active)
-                status[2] |= 0x02;
-}
-
-
-
 static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
 {
         u16 head_len;
         struct sk_buff *skb = *skb_p;
 
         switch (skb->protocol) {
-        case __constant_ntohs(ETH_P_IP):
+        case __constant_ntohs(NLPID_CCITT_ANSI_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
-                skb->data[3] = NLPID_IP;
+                skb->data[3] = NLPID_CCITT_ANSI_LMI;
                 break;
 
-        case __constant_ntohs(ETH_P_IPV6):
+        case __constant_ntohs(NLPID_CISCO_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
-                skb->data[3] = NLPID_IPV6;
+                skb->data[3] = NLPID_CISCO_LMI;
                 break;
 
-        case __constant_ntohs(LMI_PROTO):
+        case __constant_ntohs(ETH_P_IP):
+                head_len = 4;
+                skb_push(skb, head_len);
+                skb->data[3] = NLPID_IP;
+                break;
+
+        case __constant_ntohs(ETH_P_IPV6):
                 head_len = 4;
                 skb_push(skb, head_len);
-                skb->data[3] = LMI_PROTO;
+                skb->data[3] = NLPID_IPV6;
                 break;
 
         case __constant_ntohs(ETH_P_802_3):
@@ -461,13 +444,14 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
         hdlc_device *hdlc = dev_to_hdlc(dev);
         struct sk_buff *skb;
         pvc_device *pvc = hdlc->state.fr.first_pvc;
-        int len = (hdlc->state.fr.settings.lmi == LMI_ANSI) ? LMI_ANSI_LENGTH
-                : LMI_LENGTH;
-        int stat_len = 3;
+        int lmi = hdlc->state.fr.settings.lmi;
+        int dce = hdlc->state.fr.settings.dce;
+        int len = lmi == LMI_ANSI ? LMI_ANSI_LENGTH : LMI_CCITT_CISCO_LENGTH;
+        int stat_len = (lmi == LMI_CISCO) ? 6 : 3;
         u8 *data;
         int i = 0;
 
-        if (hdlc->state.fr.settings.dce && fullrep) {
+        if (dce && fullrep) {
                 len += hdlc->state.fr.dce_pvc_count * (2 + stat_len);
                 if (len > HDLC_MAX_MRU) {
                         printk(KERN_WARNING "%s: Too many PVCs while sending "
@@ -484,29 +468,31 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
         }
         memset(skb->data, 0, len);
         skb_reserve(skb, 4);
-        skb->protocol = __constant_htons(LMI_PROTO);
-        fr_hard_header(&skb, LMI_DLCI);
+        if (lmi == LMI_CISCO) {
+                skb->protocol = __constant_htons(NLPID_CISCO_LMI);
+                fr_hard_header(&skb, LMI_CISCO_DLCI);
+        } else {
+                skb->protocol = __constant_htons(NLPID_CCITT_ANSI_LMI);
+                fr_hard_header(&skb, LMI_CCITT_ANSI_DLCI);
+        }
         data = skb->tail;
         data[i++] = LMI_CALLREF;
-        data[i++] = hdlc->state.fr.settings.dce
-                ? LMI_STATUS : LMI_STATUS_ENQUIRY;
-        if (hdlc->state.fr.settings.lmi == LMI_ANSI)
+        data[i++] = dce ? LMI_STATUS : LMI_STATUS_ENQUIRY;
+        if (lmi == LMI_ANSI)
                 data[i++] = LMI_ANSI_LOCKSHIFT;
-        data[i++] = (hdlc->state.fr.settings.lmi == LMI_CCITT)
-                ? LMI_CCITT_REPTYPE : LMI_REPTYPE;
+        data[i++] = lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
+                LMI_ANSI_CISCO_REPTYPE;
         data[i++] = LMI_REPT_LEN;
         data[i++] = fullrep ? LMI_FULLREP : LMI_INTEGRITY;
-
-        data[i++] = (hdlc->state.fr.settings.lmi == LMI_CCITT)
-                ? LMI_CCITT_ALIVE : LMI_ALIVE;
+        data[i++] = lmi == LMI_CCITT ? LMI_CCITT_ALIVE : LMI_ANSI_CISCO_ALIVE;
         data[i++] = LMI_INTEG_LEN;
         data[i++] = hdlc->state.fr.txseq =fr_lmi_nextseq(hdlc->state.fr.txseq);
         data[i++] = hdlc->state.fr.rxseq;
 
-        if (hdlc->state.fr.settings.dce && fullrep) {
+        if (dce && fullrep) {
                 while (pvc) {
-                        data[i++] = (hdlc->state.fr.settings.lmi == LMI_CCITT)
-                                ? LMI_CCITT_PVCSTAT : LMI_PVCSTAT;
+                        data[i++] = lmi == LMI_CCITT ? LMI_CCITT_PVCSTAT :
+                                LMI_ANSI_CISCO_PVCSTAT;
                         data[i++] = stat_len;
 
                         /* LMI start/restart */
@@ -523,8 +509,20 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
                                 fr_log_dlci_active(pvc);
                         }
 
-                        dlci_to_status(pvc->dlci, data + i,
-                                       pvc->state.active, pvc->state.new);
+                        if (lmi == LMI_CISCO) {
+                                data[i] = pvc->dlci >> 8;
+                                data[i + 1] = pvc->dlci & 0xFF;
+                        } else {
+                                data[i] = (pvc->dlci >> 4) & 0x3F;
+                                data[i + 1] = ((pvc->dlci << 3) & 0x78) | 0x80;
+                                data[i + 2] = 0x80;
+                        }
+
+                        if (pvc->state.new)
+                                data[i + 2] |= 0x08;
+                        else if (pvc->state.active)
+                                data[i + 2] |= 0x02;
+
                         i += stat_len;
                         pvc = pvc->next;
                 }
@@ -569,6 +567,8 @@ static void fr_set_link_state(int reliable, struct net_device *dev)
                         pvc_carrier(0, pvc);
                         pvc->state.exist = pvc->state.active = 0;
                         pvc->state.new = 0;
+                        if (!hdlc->state.fr.settings.dce)
+                                pvc->state.bandwidth = 0;
                         pvc = pvc->next;
                 }
         }
@@ -583,11 +583,12 @@ static void fr_timer(unsigned long arg)
         int i, cnt = 0, reliable;
         u32 list;
 
-        if (hdlc->state.fr.settings.dce)
+        if (hdlc->state.fr.settings.dce) {
                 reliable = hdlc->state.fr.request &&
                         time_before(jiffies, hdlc->state.fr.last_poll +
                                     hdlc->state.fr.settings.t392 * HZ);
-        else {
+                hdlc->state.fr.request = 0;
+        } else {
                 hdlc->state.fr.last_errors <<= 1; /* Shift the list */
                 if (hdlc->state.fr.request) {
                         if (hdlc->state.fr.reliable)
@@ -634,65 +635,88 @@ static void fr_timer(unsigned long arg)
 static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
 {
         hdlc_device *hdlc = dev_to_hdlc(dev);
-        int stat_len;
         pvc_device *pvc;
-        int reptype = -1, error, no_ram;
         u8 rxseq, txseq;
-        int i;
+        int lmi = hdlc->state.fr.settings.lmi;
+        int dce = hdlc->state.fr.settings.dce;
+        int stat_len = (lmi == LMI_CISCO) ? 6 : 3, reptype, error, no_ram, i;
 
-        if (skb->len < ((hdlc->state.fr.settings.lmi == LMI_ANSI)
-                        ? LMI_ANSI_LENGTH : LMI_LENGTH)) {
+        if (skb->len < (lmi == LMI_ANSI ? LMI_ANSI_LENGTH :
+                        LMI_CCITT_CISCO_LENGTH)) {
                 printk(KERN_INFO "%s: Short LMI frame\n", dev->name);
                 return 1;
         }
 
-        if (skb->data[5] != (!hdlc->state.fr.settings.dce ?
-                             LMI_STATUS : LMI_STATUS_ENQUIRY)) {
-                printk(KERN_INFO "%s: LMI msgtype=%x, Not LMI status %s\n",
-                       dev->name, skb->data[2],
-                       hdlc->state.fr.settings.dce ? "enquiry" : "reply");
+        if (skb->data[3] != (lmi == LMI_CISCO ? NLPID_CISCO_LMI :
+                             NLPID_CCITT_ANSI_LMI)) {
+                printk(KERN_INFO "%s: Received non-LMI frame with LMI"
+                       " DLCI\n", dev->name);
+                return 1;
+        }
+
+        if (skb->data[4] != LMI_CALLREF) {
+                printk(KERN_INFO "%s: Invalid LMI Call reference (0x%02X)\n",
+                       dev->name, skb->data[4]);
+                return 1;
+        }
+
+        if (skb->data[5] != (dce ? LMI_STATUS_ENQUIRY : LMI_STATUS)) {
+                printk(KERN_INFO "%s: Invalid LMI Message type (0x%02X)\n",
+                       dev->name, skb->data[5]);
                 return 1;
         }
 
-        i = (hdlc->state.fr.settings.lmi == LMI_ANSI) ? 7 : 6;
+        if (lmi == LMI_ANSI) {
+                if (skb->data[6] != LMI_ANSI_LOCKSHIFT) {
+                        printk(KERN_INFO "%s: Not ANSI locking shift in LMI"
+                               " message (0x%02X)\n", dev->name, skb->data[6]);
+                        return 1;
+                }
+                i = 7;
+        } else
+                i = 6;
 
-        if (skb->data[i] !=
-            ((hdlc->state.fr.settings.lmi == LMI_CCITT)
-             ? LMI_CCITT_REPTYPE : LMI_REPTYPE)) {
-                printk(KERN_INFO "%s: Not a report type=%x\n",
+        if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
+                             LMI_ANSI_CISCO_REPTYPE)) {
+                printk(KERN_INFO "%s: Not an LMI Report type IE (0x%02X)\n",
                        dev->name, skb->data[i]);
                 return 1;
         }
-        i++;
 
-        i++;                            /* Skip length field */
+        if (skb->data[++i] != LMI_REPT_LEN) {
+                printk(KERN_INFO "%s: Invalid LMI Report type IE length"
+                       " (%u)\n", dev->name, skb->data[i]);
+                return 1;
+        }
 
-        reptype = skb->data[i++];
+        reptype = skb->data[++i];
+        if (reptype != LMI_INTEGRITY && reptype != LMI_FULLREP) {
+                printk(KERN_INFO "%s: Unsupported LMI Report type (0x%02X)\n",
+                       dev->name, reptype);
+                return 1;
+        }
 
-        if (skb->data[i]!=
-            ((hdlc->state.fr.settings.lmi == LMI_CCITT)
-             ? LMI_CCITT_ALIVE : LMI_ALIVE)) {
-                printk(KERN_INFO "%s: Unsupported status element=%x\n",
-                       dev->name, skb->data[i]);
+        if (skb->data[++i] != (lmi == LMI_CCITT ? LMI_CCITT_ALIVE :
+                               LMI_ANSI_CISCO_ALIVE)) {
+                printk(KERN_INFO "%s: Not an LMI Link integrity verification"
+                       " IE (0x%02X)\n", dev->name, skb->data[i]);
                 return 1;
         }
-        i++;
 
-        i++;                    /* Skip length field */
+        if (skb->data[++i] != LMI_INTEG_LEN) {
+                printk(KERN_INFO "%s: Invalid LMI Link integrity verification"
+                       " IE length (%u)\n", dev->name, skb->data[i]);
+                return 1;
+        }
+        i++;
 
         hdlc->state.fr.rxseq = skb->data[i++]; /* TX sequence from peer */
         rxseq = skb->data[i++]; /* Should confirm our sequence */
 
         txseq = hdlc->state.fr.txseq;
 
-        if (hdlc->state.fr.settings.dce) {
-                if (reptype != LMI_FULLREP && reptype != LMI_INTEGRITY) {
-                        printk(KERN_INFO "%s: Unsupported report type=%x\n",
-                               dev->name, reptype);
-                        return 1;
-                }
+        if (dce)
                 hdlc->state.fr.last_poll = jiffies;
-        }
 
         error = 0;
         if (!hdlc->state.fr.reliable)
@@ -703,7 +727,7 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
                 error = 1;
         }
 
-        if (hdlc->state.fr.settings.dce) {
+        if (dce) {
                 if (hdlc->state.fr.fullrep_sent && !error) {
 /* Stop sending full report - the last one has been confirmed by DTE */
                         hdlc->state.fr.fullrep_sent = 0;
@@ -725,6 +749,7 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
                         hdlc->state.fr.dce_changed = 0;
                 }
 
+                hdlc->state.fr.request = 1; /* got request */
                 fr_lmi_send(dev, reptype == LMI_FULLREP ? 1 : 0);
                 return 0;
         }
@@ -739,7 +764,6 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
         if (reptype != LMI_FULLREP)
                 return 0;
 
-        stat_len = 3;
         pvc = hdlc->state.fr.first_pvc;
 
         while (pvc) {
@@ -750,24 +774,35 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
         no_ram = 0;
         while (skb->len >= i + 2 + stat_len) {
                 u16 dlci;
+                u32 bw;
                 unsigned int active, new;
 
-                if (skb->data[i] != ((hdlc->state.fr.settings.lmi == LMI_CCITT)
-                                     ? LMI_CCITT_PVCSTAT : LMI_PVCSTAT)) {
-                        printk(KERN_WARNING "%s: Invalid PVCSTAT ID: %x\n",
-                               dev->name, skb->data[i]);
+                if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_PVCSTAT :
+                                       LMI_ANSI_CISCO_PVCSTAT)) {
+                        printk(KERN_INFO "%s: Not an LMI PVC status IE"
+                               " (0x%02X)\n", dev->name, skb->data[i]);
                         return 1;
                 }
-                i++;
 
-                if (skb->data[i] != stat_len) {
-                        printk(KERN_WARNING "%s: Invalid PVCSTAT length: %x\n",
-                               dev->name, skb->data[i]);
+                if (skb->data[++i] != stat_len) {
+                        printk(KERN_INFO "%s: Invalid LMI PVC status IE length"
+                               " (%u)\n", dev->name, skb->data[i]);
                         return 1;
                 }
                 i++;
 
-                dlci = status_to_dlci(skb->data + i, &active, &new);
+                new = !! (skb->data[i + 2] & 0x08);
+                active = !! (skb->data[i + 2] & 0x02);
+                if (lmi == LMI_CISCO) {
+                        dlci = (skb->data[i] << 8) | skb->data[i + 1];
+                        bw = (skb->data[i + 3] << 16) |
+                                (skb->data[i + 4] << 8) |
+                                (skb->data[i + 5]);
+                } else {
+                        dlci = ((skb->data[i] & 0x3F) << 4) |
+                                ((skb->data[i + 1] & 0x78) >> 3);
+                        bw = 0;
+                }
 
                 pvc = add_pvc(dev, dlci);
 
@@ -783,9 +818,11 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
                         pvc->state.deleted = 0;
                         if (active != pvc->state.active ||
                             new != pvc->state.new ||
+                            bw != pvc->state.bandwidth ||
                             !pvc->state.exist) {
                                 pvc->state.new = new;
                                 pvc->state.active = active;
+                                pvc->state.bandwidth = bw;
                                 pvc_carrier(active, pvc);
                                 fr_log_dlci_active(pvc);
                         }
@@ -801,6 +838,7 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
                         pvc_carrier(0, pvc);
                         pvc->state.active = pvc->state.new = 0;
                         pvc->state.exist = 0;
+                        pvc->state.bandwidth = 0;
                         fr_log_dlci_active(pvc);
                 }
                 pvc = pvc->next;
@@ -829,22 +867,15 @@ static int fr_rx(struct sk_buff *skb)
 
         dlci = q922_to_dlci(skb->data);
 
-        if (dlci == LMI_DLCI) {
-                if (hdlc->state.fr.settings.lmi == LMI_NONE)
-                        goto rx_error; /* LMI packet with no LMI? */
-
-                if (data[3] == LMI_PROTO) {
-                        if (fr_lmi_recv(ndev, skb))
-                                goto rx_error;
-                        else {
-                                dev_kfree_skb_any(skb);
-                                return NET_RX_SUCCESS;
-                        }
-                }
-
-                printk(KERN_INFO "%s: Received non-LMI frame with LMI DLCI\n",
-                       ndev->name);
-                goto rx_error;
+        if ((dlci == LMI_CCITT_ANSI_DLCI &&
+             (hdlc->state.fr.settings.lmi == LMI_ANSI ||
+              hdlc->state.fr.settings.lmi == LMI_CCITT)) ||
+            (dlci == LMI_CISCO_DLCI &&
+             hdlc->state.fr.settings.lmi == LMI_CISCO)) {
+                if (fr_lmi_recv(ndev, skb))
+                        goto rx_error;
+                dev_kfree_skb_any(skb);
+                return NET_RX_SUCCESS;
         }
 
         pvc = find_pvc(hdlc, dlci);
@@ -1170,7 +1201,8 @@ int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr)
 
                 if ((new_settings.lmi != LMI_NONE &&
                      new_settings.lmi != LMI_ANSI &&
-                     new_settings.lmi != LMI_CCITT) ||
+                     new_settings.lmi != LMI_CCITT &&
+                     new_settings.lmi != LMI_CISCO) ||
                     new_settings.t391 < 1 ||
                     new_settings.t392 < 2 ||
                     new_settings.n391 < 1 ||
diff --git a/drivers/net/wan/hdlc_generic.c b/drivers/net/wan/hdlc_generic.c
index 6ed064cb4469..a63f6a2cc4f7 100644
--- a/drivers/net/wan/hdlc_generic.c
+++ b/drivers/net/wan/hdlc_generic.c
@@ -1,7 +1,7 @@
 /*
  * Generic HDLC support routines for Linux
  *
- * Copyright (C) 1999 - 2003 Krzysztof Halasa <khc@pm.waw.pl>
+ * Copyright (C) 1999 - 2005 Krzysztof Halasa <khc@pm.waw.pl>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -38,7 +38,7 @@
 #include <linux/hdlc.h>
 
 
-static const char* version = "HDLC support module revision 1.17";
+static const char* version = "HDLC support module revision 1.18";
 
 #undef DEBUG_LINK
 
@@ -126,10 +126,13 @@ void hdlc_set_carrier(int on, struct net_device *dev)
         if (!hdlc->open)
                 goto carrier_exit;
 
-        if (hdlc->carrier)
+        if (hdlc->carrier) {
+                printk(KERN_INFO "%s: Carrier detected\n", dev->name);
                 __hdlc_set_carrier_on(dev);
-        else
+        } else {
+                printk(KERN_INFO "%s: Carrier lost\n", dev->name);
                 __hdlc_set_carrier_off(dev);
+        }
 
 carrier_exit:
         spin_unlock_irqrestore(&hdlc->state_lock, flags);
@@ -157,8 +160,11 @@ int hdlc_open(struct net_device *dev)
 
         spin_lock_irq(&hdlc->state_lock);
 
-        if (hdlc->carrier)
+        if (hdlc->carrier) {
+                printk(KERN_INFO "%s: Carrier detected\n", dev->name);
                 __hdlc_set_carrier_on(dev);
+        } else
+                printk(KERN_INFO "%s: No carrier\n", dev->name);
 
         hdlc->open = 1;
 
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 15e545f66cd7..2b948ea397d5 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -723,7 +723,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
         /* lmc_reset (sc); Why reset??? The link can go down ok */
 
         /* Inform the world that link has been lost */
-        dev->flags &= ~IFF_RUNNING;
+        netif_carrier_off(dev);
     }
 
     /*
@@ -736,7 +736,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
          /* lmc_reset (sc); Again why reset??? */
 
          /* Inform the world that link protocol is back up. */
-         dev->flags |= IFF_RUNNING;
+         netif_carrier_on(dev);
 
          /* Now we have to tell the syncppp that we had an outage
           * and that it should deal.  Calling sppp_reopen here
@@ -1168,8 +1168,6 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
     sc->lmc_media->set_link_status (sc, 1);
     sc->lmc_media->set_status (sc, NULL);
 
-    //dev->flags |= IFF_RUNNING;
-    
     netif_wake_queue(dev);
 
     sc->lmc_txfull = 0;
@@ -1233,8 +1231,6 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
     csr6 &= ~LMC_DEC_SR;                /* Turn off the Receive bit */
     LMC_CSR_WRITE (sc, csr_command, csr6);
 
-    dev->flags &= ~IFF_RUNNING;
-
     sc->stats.rx_missed_errors +=
         LMC_CSR_READ (sc, csr_missed_frames) & 0xffff;
 
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 463c789cdc77..fb10a2db63ad 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -754,7 +754,7 @@ typedef struct {
   u8 zero;
   u8 ssidLen;
   u8 ssid[32];
-  u16 rssi;
+  u16 dBm;
 #define CAP_ESS (1<<0)
 #define CAP_IBSS (1<<1)
 #define CAP_PRIVACY (1<<4)
@@ -1125,6 +1125,9 @@ static int micsetup(struct airo_info *ai);
 static int encapsulate(struct airo_info *ai, etherHead *pPacket, MICBuffer *buffer, int len);
 static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *pPacket, u16 payLen);
 
+static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid, u8 rssi);
+static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm);
+
 #include <linux/crypto.h>
 #endif
 
@@ -1713,6 +1716,7 @@ static int readBSSListRid(struct airo_info *ai, int first,
         list->fh.dwell = le16_to_cpu(list->fh.dwell);
         list->dsChannel = le16_to_cpu(list->dsChannel);
         list->atimWindow = le16_to_cpu(list->atimWindow);
+        list->dBm = le16_to_cpu(list->dBm);
         return rc;
 }
 
@@ -3245,7 +3249,10 @@ badrx:
                                         wstats.level = 0x100 - apriv->rssi[hdr.rssi[1]].rssidBm;
                                 else
                                         wstats.level = (hdr.rssi[1] + 321) / 2;
-                                wstats.updated = 3;     
+                                wstats.noise = apriv->wstats.qual.noise;
+                                wstats.updated = IW_QUAL_LEVEL_UPDATED
+                                        | IW_QUAL_QUAL_UPDATED
+                                        | IW_QUAL_NOISE_UPDATED;
                                 /* Update spy records */
                                 wireless_spy_update(dev, sa, &wstats);
                         }
@@ -3588,7 +3595,10 @@ void mpi_receive_802_11 (struct airo_info *ai)
                         wstats.level = 0x100 - ai->rssi[hdr.rssi[1]].rssidBm;
                 else
                         wstats.level = (hdr.rssi[1] + 321) / 2;
-                wstats.updated = 3;
+                wstats.noise = ai->wstats.qual.noise;
+                wstats.updated = IW_QUAL_QUAL_UPDATED
+                        | IW_QUAL_LEVEL_UPDATED
+                        | IW_QUAL_NOISE_UPDATED;
                 /* Update spy records */
                 wireless_spy_update(ai->dev, sa, &wstats);
         }
@@ -3679,7 +3689,7 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                 status = PC4500_readrid(ai,RID_RSSI,&rssi_rid,sizeof(rssi_rid),lock);
                 if ( status == SUCCESS ) {
                         if (ai->rssi || (ai->rssi = kmalloc(512, GFP_KERNEL)) != NULL)
-                                memcpy(ai->rssi, (u8*)&rssi_rid + 2, 512);
+                                memcpy(ai->rssi, (u8*)&rssi_rid + 2, 512); /* Skip RID length member */
                 }
                 else {
                         if (ai->rssi) {
@@ -5348,7 +5358,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
                                 (int)BSSList_rid.bssid[5],
                                 (int)BSSList_rid.ssidLen,
                                 BSSList_rid.ssid,
-                                (int)BSSList_rid.rssi);
+                                (int)BSSList_rid.dBm);
                 ptr += sprintf(ptr, " channel = %d %s %s %s %s\n",
                                 (int)BSSList_rid.dsChannel,
                                 BSSList_rid.cap & CAP_ESS ? "ESS" : "",
@@ -5593,6 +5603,29 @@ static void __exit airo_cleanup_module( void )
  * would not work at all... - Jean II
  */
 
+static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid, u8 rssi)
+{
+        if( !rssi_rid )
+                return 0;
+
+        return (0x100 - rssi_rid[rssi].rssidBm);
+}
+
+static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm)
+{
+        int i;
+
+        if( !rssi_rid )
+                return 0;
+
+        for( i = 0; i < 256; i++ )
+                if (rssi_rid[i].rssidBm == dbm)
+                        return rssi_rid[i].rssipct;
+
+        return 0;
+}
+
+
 static int airo_get_quality (StatusRid *status_rid, CapabilityRid *cap_rid)
 {
         int quality = 0;
@@ -6443,11 +6476,29 @@ static int airo_get_range(struct net_device *dev,
         }
         range->num_frequency = k;
 
+        range->sensitivity = 65535;
+
         /* Hum... Should put the right values there */
-        range->max_qual.qual = airo_get_max_quality(&cap_rid);
-        range->max_qual.level = 0x100 - 120;    /* -120 dBm */
+        if (local->rssi)
+                range->max_qual.qual = 100;     /* % */
+        else
+                range->max_qual.qual = airo_get_max_quality(&cap_rid);
+        range->max_qual.level = 0;      /* 0 means we use dBm  */
         range->max_qual.noise = 0;
-        range->sensitivity = 65535;
+        range->max_qual.updated = 0;
+
+        /* Experimental measurements - boundary 11/5.5 Mb/s */
+        /* Note : with or without the (local->rssi), results
+         * are somewhat different. - Jean II */
+        if (local->rssi) {
+                range->avg_qual.qual = 50;      /* % */
+                range->avg_qual.level = 186;    /* -70 dBm */
+        } else {
+                range->avg_qual.qual = airo_get_avg_quality(&cap_rid);
+                range->avg_qual.level = 176;    /* -80 dBm */
+        }
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = 0;
 
         for(i = 0 ; i < 8 ; i++) {
                 range->bitrate[i] = cap_rid.supportedRates[i] * 500000;
@@ -6508,15 +6559,6 @@ static int airo_get_range(struct net_device *dev,
         range->max_retry = 65535;
         range->min_r_time = 1024;
         range->max_r_time = 65535 * 1024;
-        /* Experimental measurements - boundary 11/5.5 Mb/s */
-        /* Note : with or without the (local->rssi), results
-         * are somewhat different. - Jean II */
-        range->avg_qual.qual = airo_get_avg_quality(&cap_rid);
-        if (local->rssi)
-                range->avg_qual.level = 186;    /* -70 dBm */
-        else
-                range->avg_qual.level = 176;    /* -80 dBm */
-        range->avg_qual.noise = 0;
 
         /* Event capability (kernel + driver) */
         range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
@@ -6676,12 +6718,18 @@ static int airo_get_aplist(struct net_device *dev,
                 loseSync = 0;
                 memcpy(address[i].sa_data, BSSList.bssid, ETH_ALEN);
                 address[i].sa_family = ARPHRD_ETHER;
-                if (local->rssi)
-                        qual[i].level = 0x100 - local->rssi[BSSList.rssi].rssidBm;
-                else
-                        qual[i].level = (BSSList.rssi + 321) / 2;
-                qual[i].qual = qual[i].noise = 0;
-                qual[i].updated = 2;
+                if (local->rssi) {
+                        qual[i].level = 0x100 - BSSList.dBm;
+                        qual[i].qual = airo_dbm_to_pct( local->rssi, BSSList.dBm );
+                        qual[i].updated = IW_QUAL_QUAL_UPDATED;
+                } else {
+                        qual[i].level = (BSSList.dBm + 321) / 2;
+                        qual[i].qual = 0;
+                        qual[i].updated = IW_QUAL_QUAL_INVALID;
+                }
+                qual[i].noise = local->wstats.qual.noise;
+                qual[i].updated = IW_QUAL_LEVEL_UPDATED
+                                | IW_QUAL_NOISE_UPDATED;
                 if (BSSList.index == 0xffff)
                         break;
         }
@@ -6760,7 +6808,7 @@ static int airo_set_scan(struct net_device *dev,
 static inline char *airo_translate_scan(struct net_device *dev,
                                         char *current_ev,
                                         char *end_buf,
-                                        BSSListRid *list)
+                                        BSSListRid *bss)
 {
         struct airo_info *ai = dev->priv;
         struct iw_event         iwe;            /* Temporary buffer */
@@ -6771,22 +6819,22 @@ static inline char *airo_translate_scan(struct net_device *dev,
         /* First entry *MUST* be the AP MAC address */
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-        memcpy(iwe.u.ap_addr.sa_data, list->bssid, ETH_ALEN);
+        memcpy(iwe.u.ap_addr.sa_data, bss->bssid, ETH_ALEN);
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
 
         /* Other entries will be displayed in the order we give them */
 
         /* Add the ESSID */
-        iwe.u.data.length = list->ssidLen;
+        iwe.u.data.length = bss->ssidLen;
         if(iwe.u.data.length > 32)
                 iwe.u.data.length = 32;
         iwe.cmd = SIOCGIWESSID;
         iwe.u.data.flags = 1;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, list->ssid);
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->ssid);
 
         /* Add mode */
         iwe.cmd = SIOCGIWMODE;
-        capabilities = le16_to_cpu(list->cap);
+        capabilities = le16_to_cpu(bss->cap);
         if(capabilities & (CAP_ESS | CAP_IBSS)) {
                 if(capabilities & CAP_ESS)
                         iwe.u.mode = IW_MODE_MASTER;
@@ -6797,19 +6845,25 @@ static inline char *airo_translate_scan(struct net_device *dev,
 
         /* Add frequency */
         iwe.cmd = SIOCGIWFREQ;
-        iwe.u.freq.m = le16_to_cpu(list->dsChannel);
+        iwe.u.freq.m = le16_to_cpu(bss->dsChannel);
         iwe.u.freq.m = frequency_list[iwe.u.freq.m] * 100000;
         iwe.u.freq.e = 1;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
 
         /* Add quality statistics */
         iwe.cmd = IWEVQUAL;
-        if (ai->rssi)
-                iwe.u.qual.level = 0x100 - ai->rssi[list->rssi].rssidBm;
-        else
-                iwe.u.qual.level = (list->rssi + 321) / 2;
-        iwe.u.qual.noise = 0;
-        iwe.u.qual.qual = 0;
+        if (ai->rssi) {
+                iwe.u.qual.level = 0x100 - bss->dBm;
+                iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm );
+                iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED;
+        } else {
+                iwe.u.qual.level = (bss->dBm + 321) / 2;
+                iwe.u.qual.qual = 0;
+                iwe.u.qual.updated = IW_QUAL_QUAL_INVALID;
+        }
+        iwe.u.qual.noise = ai->wstats.qual.noise;
+        iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED
+                        | IW_QUAL_NOISE_UPDATED;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
@@ -6819,7 +6873,7 @@ static inline char *airo_translate_scan(struct net_device *dev,
         else
                 iwe.u.data.flags = IW_ENCODE_DISABLED;
         iwe.u.data.length = 0;
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, list->ssid);
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, bss->ssid);
 
         /* Rate : stuffing multiple values in a single event require a bit
          * more of magic - Jean II */
@@ -6831,10 +6885,10 @@ static inline char *airo_translate_scan(struct net_device *dev,
         /* Max 8 values */
         for(i = 0 ; i < 8 ; i++) {
                 /* NULL terminated */
-                if(list->rates[i] == 0)
+                if(bss->rates[i] == 0)
                         break;
                 /* Bit rate given in 500 kb/s units (+ 0x80) */
-                iwe.u.bitrate.value = ((list->rates[i] & 0x7f) * 500000);
+                iwe.u.bitrate.value = ((bss->rates[i] & 0x7f) * 500000);
                 /* Add new value to event */
                 current_val = iwe_stream_add_value(current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN);
         }
@@ -7153,18 +7207,22 @@ static void airo_read_wireless_stats(struct airo_info *local)
         /* The status */
         local->wstats.status = status_rid.mode;
 
-        /* Signal quality and co. But where is the noise level ??? */
-        local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid);
-        if (local->rssi)
-                local->wstats.qual.level = 0x100 - local->rssi[status_rid.sigQuality].rssidBm;
-        else
+        /* Signal quality and co */
+        if (local->rssi) {
+                local->wstats.qual.level = airo_rssi_to_dbm( local->rssi, status_rid.sigQuality );
+                /* normalizedSignalStrength appears to be a percentage */
+                local->wstats.qual.qual = status_rid.normalizedSignalStrength;
+        } else {
                 local->wstats.qual.level = (status_rid.normalizedSignalStrength + 321) / 2;
+                local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid);
+        }
+        local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED;
         if (status_rid.len >= 124) {
-                local->wstats.qual.noise = 256 - status_rid.noisedBm;
-                local->wstats.qual.updated = 7;
+                local->wstats.qual.noise = 0x100 - status_rid.noisedBm;
+                local->wstats.qual.updated |= IW_QUAL_NOISE_UPDATED;
         } else {
                 local->wstats.qual.noise = 0;
-                local->wstats.qual.updated = 3;
+                local->wstats.qual.updated |= IW_QUAL_NOISE_INVALID;
         }
 
         /* Packets discarded in the wireless adapter due to wireless
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index a91b507e0a7a..a4ed28d9c783 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -321,6 +321,7 @@ static struct {
         { 0x01bf, 0x3302, NULL, ATMEL_FW_TYPE_502E, "Belkin F5D6020-V2" }, 
         { 0, 0, "BT/Voyager 1020 Laptop Adapter", ATMEL_FW_TYPE_502, "BT Voyager 1020" },
         { 0, 0, "IEEE 802.11b/Wireless LAN PC Card", ATMEL_FW_TYPE_502, "Siemens Gigaset PC Card II" },
+        { 0, 0, "IEEE 802.11b/Wireless LAN Card S", ATMEL_FW_TYPE_504_2958, "Siemens Gigaset PC Card II" },
         { 0, 0, "CNet/CNWLC 11Mbps Wireless PC Card V-5", ATMEL_FW_TYPE_502E, "CNet CNWLC-811ARL" },
         { 0, 0, "Wireless/PC_CARD", ATMEL_FW_TYPE_502D, "Planet WL-3552" },
         { 0, 0, "OEM/11Mbps Wireless LAN PC Card V-3", ATMEL_FW_TYPE_502, "OEM 11Mbps WLAN PCMCIA Card" },
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index a3a32430ae9d..b1078baa1d5e 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -492,6 +492,9 @@ EXPORT_SYMBOL(orinoco_debug);
 static int suppress_linkstatus; /* = 0 */
 module_param(suppress_linkstatus, bool, 0644);
 MODULE_PARM_DESC(suppress_linkstatus, "Don't log link status changes");
+static int ignore_disconnect; /* = 0 */
+module_param(ignore_disconnect, int, 0644);
+MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer");
 
 /********************************************************************/
 /* Compile time configuration and compatibility stuff               */
@@ -604,7 +607,6 @@ struct hermes_rx_descriptor {
 static int orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int __orinoco_program_rids(struct net_device *dev);
 static void __orinoco_set_multicast_list(struct net_device *dev);
-static int orinoco_debug_dump_recs(struct net_device *dev);
 
 /********************************************************************/
 /* Internal helper functions                                        */
@@ -655,7 +657,7 @@ static int orinoco_open(struct net_device *dev)
         return err;
 }
 
-int orinoco_stop(struct net_device *dev)
+static int orinoco_stop(struct net_device *dev)
 {
         struct orinoco_private *priv = netdev_priv(dev);
         int err = 0;
@@ -686,7 +688,7 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
         struct orinoco_private *priv = netdev_priv(dev);
         hermes_t *hw = &priv->hw;
         struct iw_statistics *wstats = &priv->wstats;
-        int err = 0;
+        int err;
         unsigned long flags;
 
         if (! netif_device_present(dev)) {
@@ -695,9 +697,21 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
                 return NULL; /* FIXME: Can we do better than this? */
         }
 
+        /* If busy, return the old stats.  Returning NULL may cause
+         * the interface to disappear from /proc/net/wireless */
         if (orinoco_lock(priv, &flags) != 0)
-                return NULL;  /* FIXME: Erg, we've been signalled, how
-                               * do we propagate this back up? */
+                return wstats;
+
+        /* We can't really wait for the tallies inquiry command to
+         * complete, so we just use the previous results and trigger
+         * a new tallies inquiry command for next time - Jean II */
+        /* FIXME: Really we should wait for the inquiry to come back -
+         * as it is the stats we give don't make a whole lot of sense.
+         * Unfortunately, it's not clear how to do that within the
+         * wireless extensions framework: I think we're in user
+         * context, but a lock seems to be held by the time we get in
+         * here so we're not safe to sleep here. */
+        hermes_inquire(hw, HERMES_INQ_TALLIES);
 
         if (priv->iw_mode == IW_MODE_ADHOC) {
                 memset(&wstats->qual, 0, sizeof(wstats->qual));
@@ -716,25 +730,16 @@ static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
 
                 err = HERMES_READ_RECORD(hw, USER_BAP,
                                          HERMES_RID_COMMSQUALITY, &cq);
-                
-                wstats->qual.qual = (int)le16_to_cpu(cq.qual);
-                wstats->qual.level = (int)le16_to_cpu(cq.signal) - 0x95;
-                wstats->qual.noise = (int)le16_to_cpu(cq.noise) - 0x95;
-                wstats->qual.updated = 7;
+
+                if (!err) {
+                        wstats->qual.qual = (int)le16_to_cpu(cq.qual);
+                        wstats->qual.level = (int)le16_to_cpu(cq.signal) - 0x95;
+                        wstats->qual.noise = (int)le16_to_cpu(cq.noise) - 0x95;
+                        wstats->qual.updated = 7;
+                }
         }
 
-        /* We can't really wait for the tallies inquiry command to
-         * complete, so we just use the previous results and trigger
-         * a new tallies inquiry command for next time - Jean II */
-        /* FIXME: We're in user context (I think?), so we should just
-           wait for the tallies to come through */
-        err = hermes_inquire(hw, HERMES_INQ_TALLIES);
-               
         orinoco_unlock(priv, &flags);
-
-        if (err)
-                return NULL;
-                
         return wstats;
 }
 
@@ -1275,9 +1280,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                         len = sizeof(tallies);
                 }
                 
-                /* Read directly the data (no seek) */
-                hermes_read_words(hw, HERMES_DATA1, (void *) &tallies,
-                                  len / 2); /* FIXME: blech! */
+                err = hermes_bap_pread(hw, IRQ_BAP, &tallies, len,
+                                       infofid, sizeof(info));
+                if (err)
+                        break;
                 
                 /* Increment our various counters */
                 /* wstats->discard.nwid - no wrong BSSID stuff */
@@ -1307,8 +1313,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                         break;
                 }
 
-                hermes_read_words(hw, HERMES_DATA1, (void *) &linkstatus,
-                                  len / 2);
+                err = hermes_bap_pread(hw, IRQ_BAP, &linkstatus, len,
+                                       infofid, sizeof(info));
+                if (err)
+                        break;
                 newstatus = le16_to_cpu(linkstatus.linkstatus);
 
                 connected = (newstatus == HERMES_LINKSTATUS_CONNECTED)
@@ -1317,7 +1325,7 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
 
                 if (connected)
                         netif_carrier_on(dev);
-                else
+                else if (!ignore_disconnect)
                         netif_carrier_off(dev);
 
                 if (newstatus != priv->last_linkstatus)
@@ -1350,6 +1358,8 @@ int __orinoco_up(struct net_device *dev)
         struct hermes *hw = &priv->hw;
         int err;
 
+        netif_carrier_off(dev); /* just to make sure */
+
         err = __orinoco_program_rids(dev);
         if (err) {
                 printk(KERN_ERR "%s: Error %d configuring card\n",
@@ -1413,7 +1423,7 @@ int orinoco_reinit_firmware(struct net_device *dev)
                 return err;
 
         err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-        if (err == -EIO) {
+        if (err == -EIO && priv->nicbuf_size > TX_NICBUF_SIZE_BUG) {
                 /* Try workaround for old Symbol firmware bug */
                 printk(KERN_WARNING "%s: firmware ALLOC bug detected "
                        "(old Symbol firmware?). Trying to work around... ",
@@ -1610,17 +1620,15 @@ static int __orinoco_program_rids(struct net_device *dev)
                 return err;
         }
         /* Set the channel/frequency */
-        if (priv->channel == 0) {
-                printk(KERN_DEBUG "%s: Channel is 0 in __orinoco_program_rids()\n", dev->name);
-                if (priv->createibss)
-                        priv->channel = 10;
-        }
-        err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFOWNCHANNEL,
-                                   priv->channel);
-        if (err) {
-                printk(KERN_ERR "%s: Error %d setting channel\n",
-                       dev->name, err);
-                return err;
+        if (priv->channel != 0 && priv->iw_mode != IW_MODE_INFRA) {
+                err = hermes_write_wordrec(hw, USER_BAP,
+                                           HERMES_RID_CNFOWNCHANNEL,
+                                           priv->channel);
+                if (err) {
+                        printk(KERN_ERR "%s: Error %d setting channel %d\n",
+                               dev->name, err, priv->channel);
+                        return err;
+                }
         }
 
         if (priv->has_ibss) {
@@ -1916,7 +1924,7 @@ static void orinoco_reset(struct net_device *dev)
 {
         struct orinoco_private *priv = netdev_priv(dev);
         struct hermes *hw = &priv->hw;
-        int err = 0;
+        int err;
         unsigned long flags;
 
         if (orinoco_lock(priv, &flags) != 0)
@@ -1938,20 +1946,20 @@ static void orinoco_reset(struct net_device *dev)
 
         orinoco_unlock(priv, &flags);
 
-        if (priv->hard_reset)
+        if (priv->hard_reset) {
                 err = (*priv->hard_reset)(priv);
-        if (err) {
-                printk(KERN_ERR "%s: orinoco_reset: Error %d "
-                       "performing  hard reset\n", dev->name, err);
-                /* FIXME: shutdown of some sort */
-                return;
+                if (err) {
+                        printk(KERN_ERR "%s: orinoco_reset: Error %d "
+                               "performing hard reset\n", dev->name, err);
+                        goto disable;
+                }
         }
 
         err = orinoco_reinit_firmware(dev);
         if (err) {
                 printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",
                        dev->name, err);
-                return;
+                goto disable;
         }
 
         spin_lock_irq(&priv->lock); /* This has to be called from user context */
@@ -1972,6 +1980,10 @@ static void orinoco_reset(struct net_device *dev)
         spin_unlock_irq(&priv->lock);
 
         return;
+ disable:
+        hermes_set_irqmask(hw, 0);
+        netif_device_detach(dev);
+        printk(KERN_ERR "%s: Device has been disabled!\n", dev->name);
 }
 
 /********************************************************************/
@@ -2056,7 +2068,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 if (events & HERMES_EV_ALLOC)
                         __orinoco_ev_alloc(dev, hw);
                 
-                hermes_write_regn(hw, EVACK, events);
+                hermes_write_regn(hw, EVACK, evstat);
 
                 evstat = hermes_read_regn(hw, EVSTAT);
                 events = evstat & hw->inten;
@@ -2215,6 +2227,8 @@ static int determine_firmware(struct net_device *dev)
                                firmver >= 0x31000;
                 priv->has_preamble = (firmver >= 0x20000);
                 priv->ibss_port = 4;
+                priv->broken_disableport = (firmver == 0x25013) ||
+                                           (firmver >= 0x30000 && firmver <= 0x31000);
                 /* Tested with Intel firmware : 0x20015 => Jean II */
                 /* Tested with 3Com firmware : 0x15012 & 0x22001 => Jean II */
                 break;
@@ -2267,7 +2281,7 @@ static int orinoco_init(struct net_device *dev)
         priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
 
         /* Initialize the firmware */
-        err = hermes_init(hw);
+        err = orinoco_reinit_firmware(dev);
         if (err != 0) {
                 printk(KERN_ERR "%s: failed to initialize firmware (err = %d)\n",
                        dev->name, err);
@@ -2400,31 +2414,12 @@ static int orinoco_init(struct net_device *dev)
         /* By default use IEEE/IBSS ad-hoc mode if we have it */
         priv->prefer_port3 = priv->has_port3 && (! priv->has_ibss);
         set_port_type(priv);
-        priv->channel = 10; /* default channel, more-or-less arbitrary */
+        priv->channel = 0; /* use firmware default */
 
         priv->promiscuous = 0;
         priv->wep_on = 0;
         priv->tx_key = 0;
 
-        err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-        if (err == -EIO) {
-                /* Try workaround for old Symbol firmware bug */
-                printk(KERN_WARNING "%s: firmware ALLOC bug detected "
-                       "(old Symbol firmware?). Trying to work around... ",
-                       dev->name);
-                
-                priv->nicbuf_size = TX_NICBUF_SIZE_BUG;
-                err = hermes_allocate(hw, priv->nicbuf_size, &priv->txfid);
-                if (err)
-                        printk("failed!\n");
-                else
-                        printk("ok.\n");
-        }
-        if (err) {
-                printk("%s: Error %d allocating Tx buffer\n", dev->name, err);
-                goto out;
-        }
-
         /* Make the hardware available, as long as it hasn't been
          * removed elsewhere (e.g. by PCMCIA hot unplug) */
         spin_lock_irq(&priv->lock);
@@ -2450,7 +2445,7 @@ struct net_device *alloc_orinocodev(int sizeof_card,
         priv = netdev_priv(dev);
         priv->ndev = dev;
         if (sizeof_card)
-                priv->card = (void *)((unsigned long)netdev_priv(dev)
+                priv->card = (void *)((unsigned long)priv
                                       + sizeof(struct orinoco_private));
         else
                 priv->card = NULL;
@@ -2555,6 +2550,7 @@ static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
         }
 
         len = le16_to_cpu(essidbuf.len);
+        BUG_ON(len > IW_ESSID_MAX_SIZE);
 
         memset(buf, 0, IW_ESSID_MAX_SIZE+1);
         memcpy(buf, p, len);
@@ -2923,13 +2919,14 @@ static int orinoco_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
         memset(&essidbuf, 0, sizeof(essidbuf));
 
         if (erq->flags) {
-                if (erq->length > IW_ESSID_MAX_SIZE)
+                /* iwconfig includes the NUL in the specified length */
+                if (erq->length > IW_ESSID_MAX_SIZE+1)
                         return -E2BIG;
                 
                 if (copy_from_user(&essidbuf, erq->pointer, erq->length))
                         return -EFAULT;
 
-                essidbuf[erq->length] = '\0';
+                essidbuf[IW_ESSID_MAX_SIZE] = '\0';
         }
 
         if (orinoco_lock(priv, &flags) != 0)
@@ -3855,7 +3852,6 @@ orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                 { SIOCIWFIRSTPRIV + 0x7, 0,
                                   IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
                                   "get_ibssport" },
-                                { SIOCIWLASTPRIV, 0, 0, "dump_recs" },
                         };
 
                         wrq->u.data.length = sizeof(privtab) / sizeof(privtab[0]);
@@ -3943,14 +3939,6 @@ orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 err = orinoco_ioctl_getibssport(dev, wrq);
                 break;
 
-        case SIOCIWLASTPRIV:
-                err = orinoco_debug_dump_recs(dev);
-                if (err)
-                        printk(KERN_ERR "%s: Unable to dump records (%d)\n",
-                               dev->name, err);
-                break;
-
-
         default:
                 err = -EOPNOTSUPP;
         }
@@ -3964,187 +3952,6 @@ orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         return err;
 }
 
-struct {
-        u16 rid;
-        char *name;
-        int displaytype;
-#define DISPLAY_WORDS   0
-#define DISPLAY_BYTES   1
-#define DISPLAY_STRING  2
-#define DISPLAY_XSTRING 3
-} record_table[] = {
-#define DEBUG_REC(name,type) { HERMES_RID_##name, #name, DISPLAY_##type }
-        DEBUG_REC(CNFPORTTYPE,WORDS),
-        DEBUG_REC(CNFOWNMACADDR,BYTES),
-        DEBUG_REC(CNFDESIREDSSID,STRING),
-        DEBUG_REC(CNFOWNCHANNEL,WORDS),
-        DEBUG_REC(CNFOWNSSID,STRING),
-        DEBUG_REC(CNFOWNATIMWINDOW,WORDS),
-        DEBUG_REC(CNFSYSTEMSCALE,WORDS),
-        DEBUG_REC(CNFMAXDATALEN,WORDS),
-        DEBUG_REC(CNFPMENABLED,WORDS),
-        DEBUG_REC(CNFPMEPS,WORDS),
-        DEBUG_REC(CNFMULTICASTRECEIVE,WORDS),
-        DEBUG_REC(CNFMAXSLEEPDURATION,WORDS),
-        DEBUG_REC(CNFPMHOLDOVERDURATION,WORDS),
-        DEBUG_REC(CNFOWNNAME,STRING),
-        DEBUG_REC(CNFOWNDTIMPERIOD,WORDS),
-        DEBUG_REC(CNFMULTICASTPMBUFFERING,WORDS),
-        DEBUG_REC(CNFWEPENABLED_AGERE,WORDS),
-        DEBUG_REC(CNFMANDATORYBSSID_SYMBOL,WORDS),
-        DEBUG_REC(CNFWEPDEFAULTKEYID,WORDS),
-        DEBUG_REC(CNFDEFAULTKEY0,BYTES),
-        DEBUG_REC(CNFDEFAULTKEY1,BYTES),
-        DEBUG_REC(CNFMWOROBUST_AGERE,WORDS),
-        DEBUG_REC(CNFDEFAULTKEY2,BYTES),
-        DEBUG_REC(CNFDEFAULTKEY3,BYTES),
-        DEBUG_REC(CNFWEPFLAGS_INTERSIL,WORDS),
-        DEBUG_REC(CNFWEPKEYMAPPINGTABLE,WORDS),
-        DEBUG_REC(CNFAUTHENTICATION,WORDS),
-        DEBUG_REC(CNFMAXASSOCSTA,WORDS),
-        DEBUG_REC(CNFKEYLENGTH_SYMBOL,WORDS),
-        DEBUG_REC(CNFTXCONTROL,WORDS),
-        DEBUG_REC(CNFROAMINGMODE,WORDS),
-        DEBUG_REC(CNFHOSTAUTHENTICATION,WORDS),
-        DEBUG_REC(CNFRCVCRCERROR,WORDS),
-        DEBUG_REC(CNFMMLIFE,WORDS),
-        DEBUG_REC(CNFALTRETRYCOUNT,WORDS),
-        DEBUG_REC(CNFBEACONINT,WORDS),
-        DEBUG_REC(CNFAPPCFINFO,WORDS),
-        DEBUG_REC(CNFSTAPCFINFO,WORDS),
-        DEBUG_REC(CNFPRIORITYQUSAGE,WORDS),
-        DEBUG_REC(CNFTIMCTRL,WORDS),
-        DEBUG_REC(CNFTHIRTY2TALLY,WORDS),
-        DEBUG_REC(CNFENHSECURITY,WORDS),
-        DEBUG_REC(CNFGROUPADDRESSES,BYTES),
-        DEBUG_REC(CNFCREATEIBSS,WORDS),
-        DEBUG_REC(CNFFRAGMENTATIONTHRESHOLD,WORDS),
-        DEBUG_REC(CNFRTSTHRESHOLD,WORDS),
-        DEBUG_REC(CNFTXRATECONTROL,WORDS),
-        DEBUG_REC(CNFPROMISCUOUSMODE,WORDS),
-        DEBUG_REC(CNFBASICRATES_SYMBOL,WORDS),
-        DEBUG_REC(CNFPREAMBLE_SYMBOL,WORDS),
-        DEBUG_REC(CNFSHORTPREAMBLE,WORDS),
-        DEBUG_REC(CNFWEPKEYS_AGERE,BYTES),
-        DEBUG_REC(CNFEXCLUDELONGPREAMBLE,WORDS),
-        DEBUG_REC(CNFTXKEY_AGERE,WORDS),
-        DEBUG_REC(CNFAUTHENTICATIONRSPTO,WORDS),
-        DEBUG_REC(CNFBASICRATES,WORDS),
-        DEBUG_REC(CNFSUPPORTEDRATES,WORDS),
-        DEBUG_REC(CNFTICKTIME,WORDS),
-        DEBUG_REC(CNFSCANREQUEST,WORDS),
-        DEBUG_REC(CNFJOINREQUEST,WORDS),
-        DEBUG_REC(CNFAUTHENTICATESTATION,WORDS),
-        DEBUG_REC(CNFCHANNELINFOREQUEST,WORDS),
-        DEBUG_REC(MAXLOADTIME,WORDS),
-        DEBUG_REC(DOWNLOADBUFFER,WORDS),
-        DEBUG_REC(PRIID,WORDS),
-        DEBUG_REC(PRISUPRANGE,WORDS),
-        DEBUG_REC(CFIACTRANGES,WORDS),
-        DEBUG_REC(NICSERNUM,XSTRING),
-        DEBUG_REC(NICID,WORDS),
-        DEBUG_REC(MFISUPRANGE,WORDS),
-        DEBUG_REC(CFISUPRANGE,WORDS),
-        DEBUG_REC(CHANNELLIST,WORDS),
-        DEBUG_REC(REGULATORYDOMAINS,WORDS),
-        DEBUG_REC(TEMPTYPE,WORDS),
-/*      DEBUG_REC(CIS,BYTES), */
-        DEBUG_REC(STAID,WORDS),
-        DEBUG_REC(CURRENTSSID,STRING),
-        DEBUG_REC(CURRENTBSSID,BYTES),
-        DEBUG_REC(COMMSQUALITY,WORDS),
-        DEBUG_REC(CURRENTTXRATE,WORDS),
-        DEBUG_REC(CURRENTBEACONINTERVAL,WORDS),
-        DEBUG_REC(CURRENTSCALETHRESHOLDS,WORDS),
-        DEBUG_REC(PROTOCOLRSPTIME,WORDS),
-        DEBUG_REC(SHORTRETRYLIMIT,WORDS),
-        DEBUG_REC(LONGRETRYLIMIT,WORDS),
-        DEBUG_REC(MAXTRANSMITLIFETIME,WORDS),
-        DEBUG_REC(MAXRECEIVELIFETIME,WORDS),
-        DEBUG_REC(CFPOLLABLE,WORDS),
-        DEBUG_REC(AUTHENTICATIONALGORITHMS,WORDS),
-        DEBUG_REC(PRIVACYOPTIONIMPLEMENTED,WORDS),
-        DEBUG_REC(OWNMACADDR,BYTES),
-        DEBUG_REC(SCANRESULTSTABLE,WORDS),
-        DEBUG_REC(PHYTYPE,WORDS),
-        DEBUG_REC(CURRENTCHANNEL,WORDS),
-        DEBUG_REC(CURRENTPOWERSTATE,WORDS),
-        DEBUG_REC(CCAMODE,WORDS),
-        DEBUG_REC(SUPPORTEDDATARATES,WORDS),
-        DEBUG_REC(BUILDSEQ,BYTES),
-        DEBUG_REC(FWID,XSTRING)
-#undef DEBUG_REC
-};
-
-#define DEBUG_LTV_SIZE          128
-
-static int orinoco_debug_dump_recs(struct net_device *dev)
-{
-        struct orinoco_private *priv = netdev_priv(dev);
-        hermes_t *hw = &priv->hw;
-        u8 *val8;
-        u16 *val16;
-        int i,j;
-        u16 length;
-        int err;
-
-        /* I'm not sure: we might have a lock here, so we'd better go
-           atomic, just in case. */
-        val8 = kmalloc(DEBUG_LTV_SIZE + 2, GFP_ATOMIC);
-        if (! val8)
-                return -ENOMEM;
-        val16 = (u16 *)val8;
-
-        for (i = 0; i < ARRAY_SIZE(record_table); i++) {
-                u16 rid = record_table[i].rid;
-                int len;
-
-                memset(val8, 0, DEBUG_LTV_SIZE + 2);
-
-                err = hermes_read_ltv(hw, USER_BAP, rid, DEBUG_LTV_SIZE,
-                                      &length, val8);
-                if (err) {
-                        DEBUG(0, "Error %d reading RID 0x%04x\n", err, rid);
-                        continue;
-                }
-                val16 = (u16 *)val8;
-                if (length == 0)
-                        continue;
-
-                printk(KERN_DEBUG "%-15s (0x%04x): length=%d (%d bytes)\tvalue=",
-                       record_table[i].name,
-                       rid, length, (length-1)*2);
-                len = min(((int)length-1)*2, DEBUG_LTV_SIZE);
-
-                switch (record_table[i].displaytype) {
-                case DISPLAY_WORDS:
-                        for (j = 0; j < len / 2; j++)
-                                printk("%04X-", le16_to_cpu(val16[j]));
-                        break;
-
-                case DISPLAY_BYTES:
-                default:
-                        for (j = 0; j < len; j++)
-                                printk("%02X:", val8[j]);
-                        break;
-
-                case DISPLAY_STRING:
-                        len = min(len, le16_to_cpu(val16[0])+2);
-                        val8[len] = '\0';
-                        printk("\"%s\"", (char *)&val16[1]);
-                        break;
-
-                case DISPLAY_XSTRING:
-                        printk("'%s'", (char *)val8);
-                }
-
-                printk("\n");
-        }
-
-        kfree(val8);
-
-        return 0;
-}
 
 /********************************************************************/
 /* Debugging                                                        */
@@ -4218,7 +4025,6 @@ EXPORT_SYMBOL(free_orinocodev);
 
 EXPORT_SYMBOL(__orinoco_up);
 EXPORT_SYMBOL(__orinoco_down);
-EXPORT_SYMBOL(orinoco_stop);
 EXPORT_SYMBOL(orinoco_reinit_firmware);
 
 EXPORT_SYMBOL(orinoco_interrupt);
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h
index 13e42c2afb27..f749b50d1088 100644
--- a/drivers/net/wireless/orinoco.h
+++ b/drivers/net/wireless/orinoco.h
@@ -119,7 +119,6 @@ extern struct net_device *alloc_orinocodev(int sizeof_card,
 extern void free_orinocodev(struct net_device *dev);
 extern int __orinoco_up(struct net_device *dev);
 extern int __orinoco_down(struct net_device *dev);
-extern int orinoco_stop(struct net_device *dev);
 extern int orinoco_reinit_firmware(struct net_device *dev);
 extern irqreturn_t orinoco_interrupt(int irq, void * dev_id, struct pt_regs *regs);
 
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 55720dc6ec43..745a14183634 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -62,7 +62,7 @@ static int task_exit_notify(struct notifier_block * self, unsigned long val, voi
         /* To avoid latency problems, we only process the current CPU,
          * hoping that most samples for the task are on this CPU
          */
-        sync_buffer(_smp_processor_id());
+        sync_buffer(raw_smp_processor_id());
         return 0;
 }
 
@@ -86,7 +86,7 @@ static int munmap_notify(struct notifier_block * self, unsigned long val, void *
                 /* To avoid latency problems, we only process the current CPU,
                  * hoping that most samples for the task are on this CPU
                  */
-                sync_buffer(_smp_processor_id());
+                sync_buffer(raw_smp_processor_id());
                 return 0;
         }
 
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index 9e9dab7fe86a..30af105271a2 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -1,7 +1,7 @@
 /*
  * CompactPCI Hot Plug Driver
  *
- * Copyright (C) 2002 SOMA Networks, Inc.
+ * Copyright (C) 2002,2005 SOMA Networks, Inc.
  * Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
  * Copyright (C) 2001 IBM Corp.
  *
@@ -45,10 +45,10 @@
 
 #define dbg(format, arg...)                                     \
         do {                                                    \
-                if(cpci_debug)                                  \
+                if (cpci_debug)                                 \
                         printk (KERN_DEBUG "%s: " format "\n",  \
                                 MY_NAME , ## arg);              \
-        } while(0)
+        } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
 #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
@@ -111,10 +111,8 @@ enable_slot(struct hotplug_slot *hotplug_slot)
 
         dbg("%s - physical_slot = %s", __FUNCTION__, hotplug_slot->name);
 
-        if(controller->ops->set_power) {
+        if (controller->ops->set_power)
                 retval = controller->ops->set_power(slot, 1);
-        }
-
         return retval;
 }
 
@@ -126,37 +124,41 @@ disable_slot(struct hotplug_slot *hotplug_slot)
 
         dbg("%s - physical_slot = %s", __FUNCTION__, hotplug_slot->name);
 
+        down_write(&list_rwsem);
+
         /* Unconfigure device */
         dbg("%s - unconfiguring slot %s",
             __FUNCTION__, slot->hotplug_slot->name);
-        if((retval = cpci_unconfigure_slot(slot))) {
+        if ((retval = cpci_unconfigure_slot(slot))) {
                 err("%s - could not unconfigure slot %s",
                     __FUNCTION__, slot->hotplug_slot->name);
-                return retval;
+                goto disable_error;
         }
         dbg("%s - finished unconfiguring slot %s",
             __FUNCTION__, slot->hotplug_slot->name);
 
         /* Clear EXT (by setting it) */
-        if(cpci_clear_ext(slot)) {
+        if (cpci_clear_ext(slot)) {
                 err("%s - could not clear EXT for slot %s",
                     __FUNCTION__, slot->hotplug_slot->name);
                 retval = -ENODEV;
+                goto disable_error;
         }
         cpci_led_on(slot);
 
-        if(controller->ops->set_power) {
-                retval = controller->ops->set_power(slot, 0);
-        }
+        if (controller->ops->set_power)
+                if ((retval = controller->ops->set_power(slot, 0)))
+                        goto disable_error;
 
-        if(update_adapter_status(slot->hotplug_slot, 0)) {
+        if (update_adapter_status(slot->hotplug_slot, 0))
                 warn("failure to update adapter file");
-        }
 
-        if(slot->extracting) {
+        if (slot->extracting) {
                 slot->extracting = 0;
                 atomic_dec(&extracting);
         }
+disable_error:
+        up_write(&list_rwsem);
         return retval;
 }
 
@@ -165,9 +167,8 @@ cpci_get_power_status(struct slot *slot)
 {
         u8 power = 1;
 
-        if(controller->ops->get_power) {
+        if (controller->ops->get_power)
                 power = controller->ops->get_power(slot);
-        }
         return power;
 }
 
@@ -216,6 +217,8 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
         kfree(slot->hotplug_slot->info);
         kfree(slot->hotplug_slot->name);
         kfree(slot->hotplug_slot);
+        if (slot->dev)
+                pci_dev_put(slot->dev);
         kfree(slot);
 }
 
@@ -237,9 +240,8 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
         int status = -ENOMEM;
         int i;
 
-        if(!(controller && bus)) {
+        if (!(controller && bus))
                 return -ENODEV;
-        }
 
         /*
          * Create a structure for each slot, and register that slot
@@ -316,32 +318,30 @@ int
 cpci_hp_unregister_bus(struct pci_bus *bus)
 {
         struct slot *slot;
-        struct list_head *tmp;
-        struct list_head *next;
-        int status;
+        struct slot *tmp;
+        int status = 0;
 
         down_write(&list_rwsem);
-        if(!slots) {
+        if (!slots) {
                 up_write(&list_rwsem);
                 return -1;
         }
-        list_for_each_safe(tmp, next, &slot_list) {
-                slot = list_entry(tmp, struct slot, slot_list);
-                if(slot->bus == bus) {
+        list_for_each_entry_safe(slot, tmp, &slot_list, slot_list) {
+                if (slot->bus == bus) {
+                        list_del(&slot->slot_list);
+                        slots--;
+
                         dbg("deregistering slot %s", slot->hotplug_slot->name);
                         status = pci_hp_deregister(slot->hotplug_slot);
-                        if(status) {
+                        if (status) {
                                 err("pci_hp_deregister failed with error %d",
                                     status);
-                                return status;
+                                break;
                         }
-
-                        list_del(&slot->slot_list);
-                        slots--;
                 }
         }
         up_write(&list_rwsem);
-        return 0;
+        return status;
 }
 
 /* This is the interrupt mode interrupt handler */
@@ -351,7 +351,7 @@ cpci_hp_intr(int irq, void *data, struct pt_regs *regs)
         dbg("entered cpci_hp_intr");
 
         /* Check to see if it was our interrupt */
-        if((controller->irq_flags & SA_SHIRQ) &&
+        if ((controller->irq_flags & SA_SHIRQ) &&
             !controller->ops->check_irq(controller->dev_id)) {
                 dbg("exited cpci_hp_intr, not our interrupt");
                 return IRQ_NONE;
@@ -373,38 +373,30 @@ cpci_hp_intr(int irq, void *data, struct pt_regs *regs)
  * INS bits of the cold-inserted devices.
  */
 static int
-init_slots(void)
+init_slots(int clear_ins)
 {
         struct slot *slot;
-        struct list_head *tmp;
         struct pci_dev* dev;
 
         dbg("%s - enter", __FUNCTION__);
         down_read(&list_rwsem);
-        if(!slots) {
+        if (!slots) {
                 up_read(&list_rwsem);
                 return -1;
         }
-        list_for_each(tmp, &slot_list) {
-                slot = list_entry(tmp, struct slot, slot_list);
+        list_for_each_entry(slot, &slot_list, slot_list) {
                 dbg("%s - looking at slot %s",
                     __FUNCTION__, slot->hotplug_slot->name);
-                if(cpci_check_and_clear_ins(slot)) {
+                if (clear_ins && cpci_check_and_clear_ins(slot))
                         dbg("%s - cleared INS for slot %s",
                             __FUNCTION__, slot->hotplug_slot->name);
-                        dev = pci_find_slot(slot->bus->number, PCI_DEVFN(slot->number, 0));
-                        if(dev) {
-                                if(update_adapter_status(slot->hotplug_slot, 1)) {
-                                        warn("failure to update adapter file");
-                                }
-                                if(update_latch_status(slot->hotplug_slot, 1)) {
-                                        warn("failure to update latch file");
-                                }
-                                slot->dev = dev;
-                        } else {
-                                err("%s - no driver attached to device in slot %s",
-                                    __FUNCTION__, slot->hotplug_slot->name);
-                        }
+                dev = pci_get_slot(slot->bus, PCI_DEVFN(slot->number, 0));
+                if (dev) {
+                        if (update_adapter_status(slot->hotplug_slot, 1))
+                                warn("failure to update adapter file");
+                        if (update_latch_status(slot->hotplug_slot, 1))
+                                warn("failure to update latch file");
+                        slot->dev = dev;
                 }
         }
         up_read(&list_rwsem);
@@ -416,26 +408,28 @@ static int
 check_slots(void)
 {
         struct slot *slot;
-        struct list_head *tmp;
         int extracted;
         int inserted;
         u16 hs_csr;
 
         down_read(&list_rwsem);
-        if(!slots) {
+        if (!slots) {
                 up_read(&list_rwsem);
                 err("no slots registered, shutting down");
                 return -1;
         }
         extracted = inserted = 0;
-        list_for_each(tmp, &slot_list) {
-                slot = list_entry(tmp, struct slot, slot_list);
+        list_for_each_entry(slot, &slot_list, slot_list) {
                 dbg("%s - looking at slot %s",
                     __FUNCTION__, slot->hotplug_slot->name);
-                if(cpci_check_and_clear_ins(slot)) {
-                        /* Some broken hardware (e.g. PLX 9054AB) asserts ENUM# twice... */
-                        if(slot->dev) {
-                                warn("slot %s already inserted", slot->hotplug_slot->name);
+                if (cpci_check_and_clear_ins(slot)) {
+                        /*
+                         * Some broken hardware (e.g. PLX 9054AB) asserts
+                         * ENUM# twice...
+                         */
+                        if (slot->dev) {
+                                warn("slot %s already inserted",
+                                     slot->hotplug_slot->name);
                                 inserted++;
                                 continue;
                         }
@@ -452,7 +446,7 @@ check_slots(void)
                         /* Configure device */
                         dbg("%s - configuring slot %s",
                             __FUNCTION__, slot->hotplug_slot->name);
-                        if(cpci_configure_slot(slot)) {
+                        if (cpci_configure_slot(slot)) {
                                 err("%s - could not configure slot %s",
                                     __FUNCTION__, slot->hotplug_slot->name);
                                 continue;
@@ -465,13 +459,11 @@ check_slots(void)
                         dbg("%s - slot %s HS_CSR (2) = %04x",
                             __FUNCTION__, slot->hotplug_slot->name, hs_csr);
 
-                        if(update_latch_status(slot->hotplug_slot, 1)) {
+                        if (update_latch_status(slot->hotplug_slot, 1))
                                 warn("failure to update latch file");
-                        }
 
-                        if(update_adapter_status(slot->hotplug_slot, 1)) {
+                        if (update_adapter_status(slot->hotplug_slot, 1))
                                 warn("failure to update adapter file");
-                        }
 
                         cpci_led_off(slot);
 
@@ -481,7 +473,7 @@ check_slots(void)
                             __FUNCTION__, slot->hotplug_slot->name, hs_csr);
 
                         inserted++;
-                } else if(cpci_check_ext(slot)) {
+                } else if (cpci_check_ext(slot)) {
                         /* Process extraction request */
                         dbg("%s - slot %s extracted",
                             __FUNCTION__, slot->hotplug_slot->name);
@@ -491,27 +483,25 @@ check_slots(void)
                         dbg("%s - slot %s HS_CSR = %04x",
                             __FUNCTION__, slot->hotplug_slot->name, hs_csr);
 
-                        if(!slot->extracting) {
-                                if(update_latch_status(slot->hotplug_slot, 0)) {
+                        if (!slot->extracting) {
+                                if (update_latch_status(slot->hotplug_slot, 0)) {
                                         warn("failure to update latch file");
-
                                 }
-                                atomic_inc(&extracting);
                                 slot->extracting = 1;
+                                atomic_inc(&extracting);
                         }
                         extracted++;
-                } else if(slot->extracting) {
+                } else if (slot->extracting) {
                         hs_csr = cpci_get_hs_csr(slot);
-                        if(hs_csr == 0xffff) {
+                        if (hs_csr == 0xffff) {
                                 /*
                                  * Hmmm, we're likely hosed at this point, should we
                                  * bother trying to tell the driver or not?
                                  */
                                 err("card in slot %s was improperly removed",
                                     slot->hotplug_slot->name);
-                                if(update_adapter_status(slot->hotplug_slot, 0)) {
+                                if (update_adapter_status(slot->hotplug_slot, 0))
                                         warn("failure to update adapter file");
-                                }
                                 slot->extracting = 0;
                                 atomic_dec(&extracting);
                         }
@@ -520,10 +510,9 @@ check_slots(void)
         up_read(&list_rwsem);
         dbg("inserted=%d, extracted=%d, extracting=%d",
             inserted, extracted, atomic_read(&extracting));
-        if(inserted || extracted) {
+        if (inserted || extracted)
                 return extracted;
-        }
-        else if(!atomic_read(&extracting)) {
+        else if (!atomic_read(&extracting)) {
                 err("cannot find ENUM# source, shutting down");
                 return -1;
         }
@@ -541,12 +530,12 @@ event_thread(void *data)
         unlock_kernel();
 
         dbg("%s - event thread started", __FUNCTION__);
-        while(1) {
+        while (1) {
                 dbg("event thread sleeping");
                 down_interruptible(&event_semaphore);
                 dbg("event thread woken, thread_finished = %d",
                     thread_finished);
-                if(thread_finished || signal_pending(current))
+                if (thread_finished || signal_pending(current))
                         break;
                 do {
                         rc = check_slots();
@@ -558,7 +547,9 @@ event_thread(void *data)
                                 thread_finished = 1;
                                 break;
                         }
-                } while(atomic_read(&extracting) != 0);
+                } while (atomic_read(&extracting) && !thread_finished);
+                if (thread_finished)
+                        break;
 
                 /* Re-enable ENUM# interrupt */
                 dbg("%s - re-enabling irq", __FUNCTION__);
@@ -579,21 +570,21 @@ poll_thread(void *data)
         daemonize("cpci_hp_polld");
         unlock_kernel();
 
-        while(1) {
-                if(thread_finished || signal_pending(current))
+        while (1) {
+                if (thread_finished || signal_pending(current))
                         break;
-                if(controller->ops->query_enum()) {
+                if (controller->ops->query_enum()) {
                         do {
                                 rc = check_slots();
-                                if(rc > 0) {
+                                if (rc > 0) {
                                         /* Give userspace a chance to handle extraction */
                                         msleep(500);
-                                } else if(rc < 0) {
+                                } else if (rc < 0) {
                                         dbg("%s - error checking slots", __FUNCTION__);
                                         thread_finished = 1;
                                         break;
                                 }
-                        } while(atomic_read(&extracting) != 0);
+                        } while (atomic_read(&extracting) && !thread_finished);
                 }
                 msleep(100);
         }
@@ -612,12 +603,11 @@ cpci_start_thread(void)
         init_MUTEX_LOCKED(&thread_exit);
         thread_finished = 0;
 
-        if(controller->irq) {
+        if (controller->irq)
                 pid = kernel_thread(event_thread, NULL, 0);
-        } else {
+        else
                 pid = kernel_thread(poll_thread, NULL, 0);
-        }
-        if(pid < 0) {
+        if (pid < 0) {
                 err("Can't start up our thread");
                 return -1;
         }
@@ -630,9 +620,8 @@ cpci_stop_thread(void)
 {
         thread_finished = 1;
         dbg("thread finish command given");
-        if(controller->irq) {
+        if (controller->irq)
                 up(&event_semaphore);
-        }
         dbg("wait for thread to exit");
         down(&thread_exit);
 }
@@ -642,45 +631,67 @@ cpci_hp_register_controller(struct cpci_hp_controller *new_controller)
 {
         int status = 0;
 
-        if(!controller) {
-                controller = new_controller;
-                if(controller->irq) {
-                        if(request_irq(controller->irq,
-                                        cpci_hp_intr,
-                                        controller->irq_flags,
-                                        MY_NAME, controller->dev_id)) {
-                                err("Can't get irq %d for the hotplug cPCI controller", controller->irq);
-                                status = -ENODEV;
-                        }
-                        dbg("%s - acquired controller irq %d", __FUNCTION__,
-                            controller->irq);
+        if (controller)
+                return -1;
+        if (!(new_controller && new_controller->ops))
+                return -EINVAL;
+        if (new_controller->irq) {
+                if (!(new_controller->ops->enable_irq &&
+                     new_controller->ops->disable_irq))
+                        status = -EINVAL;
+                if (request_irq(new_controller->irq,
+                               cpci_hp_intr,
+                               new_controller->irq_flags,
+                               MY_NAME,
+                               new_controller->dev_id)) {
+                        err("Can't get irq %d for the hotplug cPCI controller",
+                            new_controller->irq);
+                        status = -ENODEV;
                 }
-        } else {
-                err("cPCI hotplug controller already registered");
-                status = -1;
+                dbg("%s - acquired controller irq %d",
+                    __FUNCTION__, new_controller->irq);
         }
+        if (!status)
+                controller = new_controller;
         return status;
 }
 
+static void
+cleanup_slots(void)
+{
+        struct slot *slot;
+        struct slot *tmp;
+
+        /*
+         * Unregister all of our slots with the pci_hotplug subsystem,
+         * and free up all memory that we had allocated.
+         */
+        down_write(&list_rwsem);
+        if (!slots)
+                goto cleanup_null;
+        list_for_each_entry_safe(slot, tmp, &slot_list, slot_list) {
+                list_del(&slot->slot_list);
+                pci_hp_deregister(slot->hotplug_slot);
+        }
+cleanup_null:
+        up_write(&list_rwsem);
+        return;
+}
+
 int
 cpci_hp_unregister_controller(struct cpci_hp_controller *old_controller)
 {
         int status = 0;
 
-        if(controller) {
-                if(atomic_read(&extracting) != 0) {
-                        return -EBUSY;
-                }
-                if(!thread_finished) {
+        if (controller) {
+                if (!thread_finished)
                         cpci_stop_thread();
-                }
-                if(controller->irq) {
+                if (controller->irq)
                         free_irq(controller->irq, controller->dev_id);
-                }
                 controller = NULL;
-        } else {
+                cleanup_slots();
+        } else
                 status = -ENODEV;
-        }
         return status;
 }
 
@@ -691,32 +702,28 @@ cpci_hp_start(void)
         int status;
 
         dbg("%s - enter", __FUNCTION__);
-        if(!controller) {
+        if (!controller)
                 return -ENODEV;
-        }
 
         down_read(&list_rwsem);
-        if(list_empty(&slot_list)) {
+        if (list_empty(&slot_list)) {
                 up_read(&list_rwsem);
                 return -ENODEV;
         }
         up_read(&list_rwsem);
 
-        if(first) {
-                status = init_slots();
-                if(status) {
-                        return status;
-                }
+        status = init_slots(first);
+        if (first)
                 first = 0;
-        }
+        if (status)
+                return status;
 
         status = cpci_start_thread();
-        if(status) {
+        if (status)
                 return status;
-        }
         dbg("%s - thread started", __FUNCTION__);
 
-        if(controller->irq) {
+        if (controller->irq) {
                 /* Start enum interrupt processing */
                 dbg("%s - enabling irq", __FUNCTION__);
                 controller->ops->enable_irq();
@@ -728,13 +735,9 @@ cpci_hp_start(void)
 int
 cpci_hp_stop(void)
 {
-        if(!controller) {
+        if (!controller)
                 return -ENODEV;
-        }
-        if(atomic_read(&extracting) != 0) {
-                return -EBUSY;
-        }
-        if(controller->irq) {
+        if (controller->irq) {
                 /* Stop enum interrupt processing */
                 dbg("%s - disabling irq", __FUNCTION__);
                 controller->ops->disable_irq();
@@ -743,34 +746,6 @@ cpci_hp_stop(void)
         return 0;
 }
 
-static void __exit
-cleanup_slots(void)
-{
-        struct list_head *tmp;
-        struct slot *slot;
-
-        /*
-         * Unregister all of our slots with the pci_hotplug subsystem,
-         * and free up all memory that we had allocated.
-         */
-        down_write(&list_rwsem);
-        if(!slots) {
-                goto null_cleanup;
-        }
-        list_for_each(tmp, &slot_list) {
-                slot = list_entry(tmp, struct slot, slot_list);
-                list_del(&slot->slot_list);
-                pci_hp_deregister(slot->hotplug_slot);
-                kfree(slot->hotplug_slot->info);
-                kfree(slot->hotplug_slot->name);
-                kfree(slot->hotplug_slot);
-                kfree(slot);
-        }
-      null_cleanup:
-        up_write(&list_rwsem);
-        return;
-}
-
 int __init
 cpci_hotplug_init(int debug)
 {
@@ -784,7 +759,8 @@ cpci_hotplug_exit(void)
         /*
          * Clean everything up.
          */
-        cleanup_slots();
+        cpci_hp_stop();
+        cpci_hp_unregister_controller(controller);
 }
 
 EXPORT_SYMBOL_GPL(cpci_hp_register_controller);
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 69eb4fc54f2f..225b5e551dd6 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -1,7 +1,7 @@
 /*
  * CompactPCI Hot Plug Driver PCI functions
  *
- * Copyright (C) 2002 by SOMA Networks, Inc.
+ * Copyright (C) 2002,2005 by SOMA Networks, Inc.
  *
  * All rights reserved.
  *
@@ -38,10 +38,10 @@ extern int cpci_debug;
 
 #define dbg(format, arg...)                                     \
         do {                                                    \
-                if(cpci_debug)                                  \
+                if (cpci_debug)                                 \
                         printk (KERN_DEBUG "%s: " format "\n",  \
                                 MY_NAME , ## arg);              \
-        } while(0)
+        } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
 #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
@@ -57,16 +57,15 @@ u8 cpci_get_attention_status(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return 0;
-        }
 
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return 0;
-        }
+
         return hs_csr & 0x0008 ? 1 : 0;
 }
 
@@ -78,27 +77,22 @@ int cpci_set_attention_status(struct slot* slot, int status)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return 0;
-        }
-
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return 0;
-        }
-        if(status) {
+        if (status)
                 hs_csr |= HS_CSR_LOO;
-        } else {
+        else
                 hs_csr &= ~HS_CSR_LOO;
-        }
-        if(pci_bus_write_config_word(slot->bus,
+        if (pci_bus_write_config_word(slot->bus,
                                       slot->devfn,
                                       hs_cap + 2,
-                                      hs_csr)) {
+                                      hs_csr))
                 return 0;
-        }
         return 1;
 }
 
@@ -110,16 +104,13 @@ u16 cpci_get_hs_csr(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return 0xFFFF;
-        }
-
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return 0xFFFF;
-        }
         return hs_csr;
 }
 
@@ -132,24 +123,22 @@ int cpci_check_and_clear_ins(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return 0;
-        }
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return 0;
-        }
-        if(hs_csr & HS_CSR_INS) {
+        if (hs_csr & HS_CSR_INS) {
                 /* Clear INS (by setting it) */
-                if(pci_bus_write_config_word(slot->bus,
+                if (pci_bus_write_config_word(slot->bus,
                                               slot->devfn,
                                               hs_cap + 2,
-                                              hs_csr)) {
+                                              hs_csr))
                         ins = 0;
-                }
-                ins = 1;
+                else
+                        ins = 1;
         }
         return ins;
 }
@@ -163,18 +152,15 @@ int cpci_check_ext(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return 0;
-        }
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return 0;
-        }
-        if(hs_csr & HS_CSR_EXT) {
+        if (hs_csr & HS_CSR_EXT)
                 ext = 1;
-        }
         return ext;
 }
 
@@ -186,23 +172,20 @@ int cpci_clear_ext(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return -ENODEV;
-        }
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return -ENODEV;
-        }
-        if(hs_csr & HS_CSR_EXT) {
+        if (hs_csr & HS_CSR_EXT) {
                 /* Clear EXT (by setting it) */
-                if(pci_bus_write_config_word(slot->bus,
+                if (pci_bus_write_config_word(slot->bus,
                                               slot->devfn,
                                               hs_cap + 2,
-                                              hs_csr)) {
+                                              hs_csr))
                         return -ENODEV;
-                }
         }
         return 0;
 }
@@ -215,18 +198,16 @@ int cpci_led_on(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return -ENODEV;
-        }
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return -ENODEV;
-        }
-        if((hs_csr & HS_CSR_LOO) != HS_CSR_LOO) {
+        if ((hs_csr & HS_CSR_LOO) != HS_CSR_LOO) {
                 hs_csr |= HS_CSR_LOO;
-                if(pci_bus_write_config_word(slot->bus,
+                if (pci_bus_write_config_word(slot->bus,
                                               slot->devfn,
                                               hs_cap + 2,
                                               hs_csr)) {
@@ -246,18 +227,16 @@ int cpci_led_off(struct slot* slot)
         hs_cap = pci_bus_find_capability(slot->bus,
                                          slot->devfn,
                                          PCI_CAP_ID_CHSWP);
-        if(!hs_cap) {
+        if (!hs_cap)
                 return -ENODEV;
-        }
-        if(pci_bus_read_config_word(slot->bus,
+        if (pci_bus_read_config_word(slot->bus,
                                      slot->devfn,
                                      hs_cap + 2,
-                                     &hs_csr)) {
+                                     &hs_csr))
                 return -ENODEV;
-        }
-        if(hs_csr & HS_CSR_LOO) {
+        if (hs_csr & HS_CSR_LOO) {
                 hs_csr &= ~HS_CSR_LOO;
-                if(pci_bus_write_config_word(slot->bus,
+                if (pci_bus_write_config_word(slot->bus,
                                               slot->devfn,
                                               hs_cap + 2,
                                               hs_csr)) {
@@ -274,19 +253,6 @@ int cpci_led_off(struct slot* slot)
  * Device configuration functions
  */
 
-static void cpci_enable_device(struct pci_dev *dev)
-{
-        struct pci_bus *bus;
-
-        pci_enable_device(dev);
-        if(dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                bus = dev->subordinate;
-                list_for_each_entry(dev, &bus->devices, bus_list) {
-                        cpci_enable_device(dev);
-                }
-        }
-}
-
 int cpci_configure_slot(struct slot* slot)
 {
         unsigned char busnr;
@@ -294,14 +260,14 @@ int cpci_configure_slot(struct slot* slot)
 
         dbg("%s - enter", __FUNCTION__);
 
-        if(slot->dev == NULL) {
+        if (slot->dev == NULL) {
                 dbg("pci_dev null, finding %02x:%02x:%x",
                     slot->bus->number, PCI_SLOT(slot->devfn), PCI_FUNC(slot->devfn));
-                slot->dev = pci_find_slot(slot->bus->number, slot->devfn);
+                slot->dev = pci_get_slot(slot->bus, slot->devfn);
         }
 
         /* Still NULL? Well then scan for it! */
-        if(slot->dev == NULL) {
+        if (slot->dev == NULL) {
                 int n;
                 dbg("pci_dev still null");
 
@@ -311,10 +277,10 @@ int cpci_configure_slot(struct slot* slot)
                  */
                 n = pci_scan_slot(slot->bus, slot->devfn);
                 dbg("%s: pci_scan_slot returned %d", __FUNCTION__, n);
-                if(n > 0)
+                if (n > 0)
                         pci_bus_add_devices(slot->bus);
-                slot->dev = pci_find_slot(slot->bus->number, slot->devfn);
-                if(slot->dev == NULL) {
+                slot->dev = pci_get_slot(slot->bus, slot->devfn);
+                if (slot->dev == NULL) {
                         err("Could not find PCI device for slot %02x", slot->number);
                         return 1;
                 }
@@ -329,8 +295,6 @@ int cpci_configure_slot(struct slot* slot)
 
         pci_bus_assign_resources(slot->dev->bus);
 
-        cpci_enable_device(slot->dev);
-
         dbg("%s - exit", __FUNCTION__);
         return 0;
 }
@@ -341,19 +305,22 @@ int cpci_unconfigure_slot(struct slot* slot)
         struct pci_dev *dev;
 
         dbg("%s - enter", __FUNCTION__);
-        if(!slot->dev) {
+        if (!slot->dev) {
                 err("No device for slot %02x\n", slot->number);
                 return -ENODEV;
         }
 
         for (i = 0; i < 8; i++) {
-                dev = pci_find_slot(slot->bus->number,
+                dev = pci_get_slot(slot->bus,
                                     PCI_DEVFN(PCI_SLOT(slot->devfn), i));
-                if(dev) {
+                if (dev) {
                         pci_remove_bus_device(dev);
-                        slot->dev = NULL;
+                        pci_dev_put(dev);
                 }
         }
+        pci_dev_put(slot->dev);
+        slot->dev = NULL;
+
         dbg("%s - exit", __FUNCTION__);
         return 0;
 }
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c
index 41c7971d06c5..4c11048ad51b 100644
--- a/drivers/pci/hotplug/cpqphp_sysfs.c
+++ b/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -38,7 +38,7 @@
 
 /* A few routines that create sysfs entries for the hot plug controller */
 
-static ssize_t show_ctrl (struct device *dev, char *buf)
+static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pci_dev;
         struct controller *ctrl;
@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf)
 }
 static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
 
-static ssize_t show_dev (struct device *dev, char *buf)
+static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pci_dev;
         struct controller *ctrl;
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index c802f6270b89..c4282902cb52 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -73,7 +73,7 @@ static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
 {
         struct hotplug_slot *slot = to_hotplug_slot(kobj);
         struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
-        return attribute->show ? attribute->show(slot, buf) : 0;
+        return attribute->show ? attribute->show(slot, buf) : -EIO;
 }
 
 static ssize_t hotplug_slot_attr_store(struct kobject *kobj,
@@ -81,7 +81,7 @@ static ssize_t hotplug_slot_attr_store(struct kobject *kobj,
 {
         struct hotplug_slot *slot = to_hotplug_slot(kobj);
         struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
-        return attribute->store ? attribute->store(slot, buf, len) : 0;
+        return attribute->store ? attribute->store(slot, buf, len) : -EIO;
 }
 
 static struct sysfs_ops hotplug_slot_sysfs_ops = {
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index 3285b822478d..752e6513c447 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -48,7 +48,7 @@ dlpar_attr_store(struct kobject * kobj, struct attribute * attr,
         struct dlpar_io_attr *dlpar_attr = container_of(attr,
                                                 struct dlpar_io_attr, attr);
         return dlpar_attr->store ?
-                dlpar_attr->store(dlpar_attr, buf, nbytes) : 0;
+                dlpar_attr->store(dlpar_attr, buf, nbytes) : -EIO;
 }
 
 static struct sysfs_ops dlpar_attr_sysfs_ops = {
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index 9a1ee132d12c..c9445ebda5c7 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -38,7 +38,7 @@
 
 /* A few routines that create sysfs entries for the hot plug controller */
 
-static ssize_t show_ctrl (struct device *dev, char *buf)
+static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pci_dev;
         struct controller *ctrl;
@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf)
 }
 static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
 
-static ssize_t show_dev (struct device *dev, char *buf)
+static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pci_dev;
         struct controller *ctrl;
diff --git a/drivers/pci/hotplug/shpchprm_acpi.c b/drivers/pci/hotplug/shpchprm_acpi.c
index 243a51d88b86..7957cdc72cd0 100644
--- a/drivers/pci/hotplug/shpchprm_acpi.c
+++ b/drivers/pci/hotplug/shpchprm_acpi.c
@@ -1626,7 +1626,7 @@ int shpchprm_set_hpp(
         pci_bus->number = func->bus;
         devfn = PCI_DEVFN(func->device, func->function);
 
-        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
+        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->slot_bus);
 
         if (ab) {
                 if (ab->_hpp) {
@@ -1681,7 +1681,7 @@ void shpchprm_enable_card(
                 | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
         bcmd = bcommand  = bcommand | PCI_BRIDGE_CTL_NO_ISA;
 
-        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
+        ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->slot_bus);
         if (ab) {
                 if (ab->_hpp) {
                         if (ab->_hpp->enable_perr) {
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index fe98553c978f..e65bf2b395aa 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -335,13 +335,14 @@ pci_driver_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
 {
         struct device_driver *driver = kobj_to_pci_driver(kobj);
         struct driver_attribute *dattr = attr_to_driver_attribute(attr);
-        ssize_t ret = 0;
+        ssize_t ret;
 
-        if (get_driver(driver)) {
-                if (dattr->show)
-                        ret = dattr->show(driver, buf);
-                put_driver(driver);
-        }
+        if (!get_driver(driver))
+                return -ENODEV;
+
+        ret = dattr->show ? dattr->show(driver, buf) : -EIO;
+
+        put_driver(driver);
         return ret;
 }
 
@@ -351,13 +352,14 @@ pci_driver_attr_store(struct kobject * kobj, struct attribute *attr,
 {
         struct device_driver *driver = kobj_to_pci_driver(kobj);
         struct driver_attribute *dattr = attr_to_driver_attribute(attr);
-        ssize_t ret = 0;
+        ssize_t ret;
 
-        if (get_driver(driver)) {
-                if (dattr->store)
-                        ret = dattr->store(driver, buf, count);
-                put_driver(driver);
-        }
+        if (!get_driver(driver))
+                return -ENODEV;
+
+        ret = dattr->store ? dattr->store(driver, buf, count) : -EIO;
+
+        put_driver(driver);
         return ret;
 }
 
@@ -393,7 +395,10 @@ int pci_register_driver(struct pci_driver *drv)
         drv->driver.bus = &pci_bus_type;
         drv->driver.probe = pci_device_probe;
         drv->driver.remove = pci_device_remove;
-        drv->driver.shutdown = pci_device_shutdown,
+        /* FIXME, once all of the existing PCI drivers have been fixed to set
+         * the pci shutdown function, this test can go away. */
+        if (!drv->driver.shutdown)
+                drv->driver.shutdown = pci_device_shutdown;
         drv->driver.owner = drv->owner;
         drv->driver.kobj.ktype = &pci_driver_kobj_type;
         pci_init_dynids(&drv->dynids);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 6ca0061137a6..a15f94072a6f 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -29,7 +29,7 @@ static int sysfs_initialized;	/* = 0 */
 /* show configuration fields */
 #define pci_config_attr(field, format_string)                           \
 static ssize_t                                                          \
-field##_show(struct device *dev, char *buf)                             \
+field##_show(struct device *dev, struct device_attribute *attr, char *buf)                              \
 {                                                                       \
         struct pci_dev *pdev;                                           \
                                                                         \
@@ -44,7 +44,7 @@ pci_config_attr(subsystem_device, "0x%04x\n");
 pci_config_attr(class, "0x%06x\n");
 pci_config_attr(irq, "%u\n");
 
-static ssize_t local_cpus_show(struct device *dev, char *buf)
+static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf)
 {               
         cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
         int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
@@ -54,7 +54,7 @@ static ssize_t local_cpus_show(struct device *dev, char *buf)
 
 /* show resources */
 static ssize_t
-resource_show(struct device * dev, char * buf)
+resource_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
         struct pci_dev * pci_dev = to_pci_dev(dev);
         char * str = buf;
@@ -73,7 +73,7 @@ resource_show(struct device * dev, char * buf)
         return (str - buf);
 }
 
-static ssize_t modalias_show(struct device *dev, char *buf)
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
 
@@ -339,16 +339,17 @@ pci_create_resource_files(struct pci_dev *pdev)
                 if (!pci_resource_len(pdev, i))
                         continue;
 
-                res_attr = kmalloc(sizeof(*res_attr) + 10, GFP_ATOMIC);
+                /* allocate attribute structure, piggyback attribute name */
+                res_attr = kcalloc(1, sizeof(*res_attr) + 10, GFP_ATOMIC);
                 if (res_attr) {
-                        memset(res_attr, 0, sizeof(*res_attr) + 10);
+                        char *res_attr_name = (char *)(res_attr + 1);
+
                         pdev->res_attr[i] = res_attr;
-                        /* Allocated above after the res_attr struct */
-                        res_attr->attr.name = (char *)(res_attr + 1);
-                        sprintf(res_attr->attr.name, "resource%d", i);
-                        res_attr->size = pci_resource_len(pdev, i);
+                        sprintf(res_attr_name, "resource%d", i);
+                        res_attr->attr.name = res_attr_name;
                         res_attr->attr.mode = S_IRUSR | S_IWUSR;
                         res_attr->attr.owner = THIS_MODULE;
+                        res_attr->size = pci_resource_len(pdev, i);
                         res_attr->mmap = pci_mmap_resource;
                         res_attr->private = &pdev->resource[i];
                         sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index 93481b41b613..1d2ef1e2ffc6 100644
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -7173,6 +7173,7 @@
         080f  Sentry5 DDR/SDR RAM Controller
         0811  Sentry5 External Interface Core
         0816  BCM3302 Sentry5 MIPS32 CPU
+        1600  NetXtreme BCM5752 Gigabit Ethernet PCI Express
         1644  NetXtreme BCM5700 Gigabit Ethernet
                 1014 0277  Broadcom Vigil B5700 1000Base-T
                 1028 00d1  Broadcom BCM5700
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 576285765e98..f5c5f10a3d2f 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -232,19 +232,16 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev,
         /* Initialize generic device interface */
         device = &dev->device;
         memset(device, 0, sizeof(struct device));
-        INIT_LIST_HEAD(&device->node);
-        INIT_LIST_HEAD(&device->children);
-        INIT_LIST_HEAD(&device->bus_list);
         device->bus = &pcie_port_bus_type;
         device->driver = NULL;
-        device->driver_data = NULL; 
+        device->driver_data = NULL;
         device->release = release_pcie_device;  /* callback to free pcie dev */
-        sprintf(&device->bus_id[0], "pcie%02x", 
+        sprintf(&device->bus_id[0], "pcie%02x",
                 get_descriptor_id(port_type, service_type));
         device->parent = &parent->dev;
 }
 
-static struct pcie_device* alloc_pcie_device(struct pci_dev *parent, 
+static struct pcie_device* alloc_pcie_device(struct pci_dev *parent,
         int port_type, int service_type, int irq, int irq_mode)
 {
         struct pcie_device *device;
@@ -270,9 +267,9 @@ int pcie_port_device_probe(struct pci_dev *dev)
         pci_read_config_word(dev, pos + PCIE_CAPABILITIES_REG, &reg);
         type = (reg >> 4) & PORT_TYPE_MASK;
         if (    type == PCIE_RC_PORT || type == PCIE_SW_UPSTREAM_PORT ||
-                type == PCIE_SW_DOWNSTREAM_PORT )  
+                type == PCIE_SW_DOWNSTREAM_PORT )
                 return 0;
- 
+
         return -ENODEV;
 }
 
@@ -283,8 +280,8 @@ int pcie_port_device_register(struct pci_dev *dev)
         u16 reg16;
 
         /* Get port type */
-        pci_read_config_word(dev, 
-                pci_find_capability(dev, PCI_CAP_ID_EXP) + 
+        pci_read_config_word(dev,
+                pci_find_capability(dev, PCI_CAP_ID_EXP) +
                 PCIE_CAPABILITIES_REG, &reg16);
         type = (reg16 >> 4) & PORT_TYPE_MASK;
 
@@ -299,11 +296,11 @@ int pcie_port_device_register(struct pci_dev *dev)
                 if (capabilities & (1 << i)) {
                         child = alloc_pcie_device(
                                 dev,            /* parent */
-                                type,           /* port type */ 
+                                type,           /* port type */
                                 i,              /* service type */
                                 vectors[i],     /* irq */
                                 irq_mode        /* interrupt mode */);
-                        if (child) { 
+                        if (child) {
                                 status = device_register(&child->device);
                                 if (status) {
                                         kfree(child);
@@ -317,84 +314,78 @@ int pcie_port_device_register(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
-int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)
+static int suspend_iter(struct device *dev, void *data)
 {
-        struct list_head                *head, *tmp;
-        struct device                   *parent, *child;
-        struct device_driver            *driver;
         struct pcie_port_service_driver *service_driver;
+        u32 state = (u32)data;
+
+        if ((dev->bus == &pcie_port_bus_type) &&
+            (dev->driver)) {
+                service_driver = to_service_driver(dev->driver);
+                if (service_driver->suspend)
+                        service_driver->suspend(to_pcie_device(dev), state);
+        }
+        return 0;
+}
 
-        parent = &dev->dev;
-        head = &parent->children;
-        tmp = head->next;
-        while (head != tmp) {
-                child = container_of(tmp, struct device, node);
-                tmp = tmp->next;
-                if (child->bus != &pcie_port_bus_type)
-                        continue;
-                driver = child->driver;
-                if (!driver)
-                        continue;
-                service_driver = to_service_driver(driver);
-                if (service_driver->suspend)  
-                        service_driver->suspend(to_pcie_device(child), state);
-        }
-        return 0; 
+int pcie_port_device_suspend(struct pci_dev *dev, u32 state)
+{
+        device_for_each_child(&dev->dev, (void *)state, suspend_iter);
+        return 0;
 }
 
-int pcie_port_device_resume(struct pci_dev *dev) 
-{ 
-        struct list_head                *head, *tmp;
-        struct device                   *parent, *child;
-        struct device_driver            *driver;
+static int resume_iter(struct device *dev, void *data)
+{
         struct pcie_port_service_driver *service_driver;
 
-        parent = &dev->dev;
-        head = &parent->children;
-        tmp = head->next;
-        while (head != tmp) {
-                child = container_of(tmp, struct device, node);
-                tmp = tmp->next;
-                if (child->bus != &pcie_port_bus_type)
-                        continue;
-                driver = child->driver;
-                if (!driver)
-                        continue;
-                service_driver = to_service_driver(driver);
-                if (service_driver->resume)  
-                        service_driver->resume(to_pcie_device(child));
+        if ((dev->bus == &pcie_port_bus_type) &&
+            (dev->driver)) {
+                service_driver = to_service_driver(dev->driver);
+                if (service_driver->resume)
+                        service_driver->resume(to_pcie_device(dev));
         }
-        return 0; 
+        return 0;
+}
 
+int pcie_port_device_resume(struct pci_dev *dev)
+{
+        device_for_each_child(&dev->dev, NULL, resume_iter);
+        return 0;
 }
 #endif
 
-void pcie_port_device_remove(struct pci_dev *dev)
+static int remove_iter(struct device *dev, void *data)
 {
-        struct list_head                *head, *tmp;
-        struct device                   *parent, *child;
-        struct device_driver            *driver;
         struct pcie_port_service_driver *service_driver;
-        int interrupt_mode = PCIE_PORT_INTx_MODE;
 
-        parent = &dev->dev;
-        head = &parent->children;
-        tmp = head->next;
-        while (head != tmp) {
-                child = container_of(tmp, struct device, node);
-                tmp = tmp->next;
-                if (child->bus != &pcie_port_bus_type)
-                        continue;
-                driver = child->driver;
-                if (driver) { 
-                        service_driver = to_service_driver(driver);
-                        if (service_driver->remove)  
-                                service_driver->remove(to_pcie_device(child));
+        if (dev->bus == &pcie_port_bus_type) {
+                if (dev->driver) {
+                        service_driver = to_service_driver(dev->driver);
+                        if (service_driver->remove)
+                                service_driver->remove(to_pcie_device(dev));
                 }
-                interrupt_mode = (to_pcie_device(child))->interrupt_mode;
-                put_device(child);
-                device_unregister(child);
+                *(unsigned long*)data = (unsigned long)dev;
+                return 1;
         }
+        return 0;
+}
+
+void pcie_port_device_remove(struct pci_dev *dev)
+{
+        struct device *device;
+        unsigned long device_addr;
+        int interrupt_mode = PCIE_PORT_INTx_MODE;
+        int status;
+
+        do {
+                status = device_for_each_child(&dev->dev, &device_addr, remove_iter);
+                if (status) {
+                        device = (struct device*)device_addr;
+                        interrupt_mode = (to_pcie_device(device))->interrupt_mode;
+                        put_device(device);
+                        device_unregister(device);
+                }
+        } while (status);
         /* Switch to INTx by default if MSI enabled */
         if (interrupt_mode == PCIE_PORT_MSIX_MODE)
                 pci_disable_msix(dev);
@@ -423,7 +414,7 @@ int pcie_port_service_register(struct pcie_port_service_driver *new)
         new->driver.resume = pcie_port_resume_service;
 
         return driver_register(&new->driver);
-} 
+}
 
 void pcie_port_service_unregister(struct pcie_port_service_driver *new)
 {
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b7ae87823c69..fd48b201eb53 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -125,7 +125,7 @@ static inline unsigned int pci_calc_resource_flags(unsigned int flags)
 /*
  * Find the extent of a PCI decode..
  */
-static u32 pci_size(u32 base, u32 maxbase, unsigned long mask)
+static u32 pci_size(u32 base, u32 maxbase, u32 mask)
 {
         u32 size = mask & maxbase;      /* Find the significant bits */
         if (!size)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 026aa04669a2..968033fd29f0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/acpi.h>
 #include "pci.h"
 
 /* Deal with broken BIOS'es that neglect to enable passive release,
@@ -455,24 +456,16 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
 } 
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,         quirk_amd_8131_ioapic ); 
 
+static void __init quirk_svw_msi(struct pci_dev *dev)
+{
+        pci_msi_quirk = 1;
+        printk(KERN_WARNING "PCI: MSI quirk detected. pci_msi_quirk set.\n");
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_svw_msi );
 #endif /* CONFIG_X86_IO_APIC */
 
 
 /*
- * Via 686A/B:  The PCI_INTERRUPT_LINE register for the on-chip
- * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
- * when written, it makes an internal connection to the PIC.
- * For these devices, this register is defined to be 4 bits wide.
- * Normally this is fine.  However for IO-APIC motherboards, or
- * non-x86 architectures (yes Via exists on PPC among other places),
- * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
- * interrupts delivered properly.
- *
- * TODO: When we have device-specific interrupt routers,
- * quirk_via_irqpic will go away from quirks.
- */
-
-/*
  * FIXME: it is questionable that quirk_via_acpi
  * is needed.  It shows up as an ISA bridge, and does not
  * support the PCI_INTERRUPT_LINE register at all.  Therefore
@@ -495,6 +488,31 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C586_3,	quirk_vi
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686_4,     quirk_via_acpi );
 
 /*
+ * Via 686A/B:  The PCI_INTERRUPT_LINE register for the on-chip
+ * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
+ * when written, it makes an internal connection to the PIC.
+ * For these devices, this register is defined to be 4 bits wide.
+ * Normally this is fine.  However for IO-APIC motherboards, or
+ * non-x86 architectures (yes Via exists on PPC among other places),
+ * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
+ * interrupts delivered properly.
+ */
+static void quirk_via_irq(struct pci_dev *dev)
+{
+        u8 irq, new_irq;
+
+        new_irq = dev->irq & 0xf;
+        pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
+        if (new_irq != irq) {
+                printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n",
+                        pci_name(dev), irq, new_irq);
+                udelay(15);     /* unknown if delay really needed */
+                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
+        }
+}
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
+
+/*
  * PIIX3 USB: We have to disable USB interrupts that are
  * hardwired to PIRQD# and may be shared with an
  * external device.
@@ -683,19 +701,6 @@ static void __init quirk_disable_pxb(struct pci_dev *pdev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb );
 
-/*
- *      VIA northbridges care about PCI_INTERRUPT_LINE
- */
-int via_interrupt_line_quirk;
-
-static void __devinit quirk_via_bridge(struct pci_dev *pdev)
-{
-        if(pdev->devfn == 0) {
-                printk(KERN_INFO "PCI: Via IRQ fixup\n");
-                via_interrupt_line_quirk = 1;
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_ANY_ID,                     quirk_via_bridge );
 
 /*
  *      Serverworks CSB5 IDE does not fully support native mode
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 6375ebc85020..14e4124e1523 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -171,19 +171,21 @@ config PCMCIA_PROBE
 config M32R_PCC
         bool "M32R PCMCIA I/F"
         depends on M32R && CHIP_M32700 && PCMCIA
+        select PCCARD_NONSTATIC
         help
           Say Y here to use the M32R PCMCIA controller.
 
 config M32R_CFC
         bool "M32R CF I/F Controller"
-        depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT)
+        depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
+        select PCCARD_NONSTATIC
         help
           Say Y here to use the M32R CompactFlash controller.
 
 config M32R_CFC_NUM
         int "M32R CF I/F number"
         depends on M32R_CFC
-        default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT
+        default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT
         help
           Set the number of M32R CF slots.
 
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index c4ade288c5da..569e55feecfd 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
 /************************ per-device sysfs output ***************************/
 
 #define pcmcia_device_attr(field, test, format)                         \
-static ssize_t field##_show (struct device *dev, char *buf)             \
+static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                       \
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
         return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \
 }
 
 #define pcmcia_device_stringattr(name, field)                                   \
-static ssize_t name##_show (struct device *dev, char *buf)              \
+static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
         return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index 581bfa95429e..b1111c6bf062 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -24,9 +24,9 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 
 #include <pcmcia/version.h>
@@ -444,7 +444,7 @@ static int _pcc_get_status(u_short sock, u_int *value)
                 debug(3, "m32r_cfc: _pcc_get_status: "
                          "power off (CPCR=0x%08x)\n", status);
         }
-#elif defined(CONFIG_PLAT_MAPPI2)
+#elif defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
         if ( status ) {
                 status = pcc_get(sock, (unsigned int)PLD_CPCR);
                 if (status == 0) { /* power off */
@@ -452,18 +452,23 @@ static int _pcc_get_status(u_short sock, u_int *value)
                         pcc_set(sock, (unsigned int)PLD_CFBUFCR,0); /* force buffer off for ZA-36 */
                         udelay(50);
                 }
-                status = pcc_get(sock, (unsigned int)PLD_CFBUFCR);
-                if (status != 0) { /* buffer off */
-                        pcc_set(sock, (unsigned int)PLD_CFBUFCR,0);
-                        udelay(50);
-                        pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0101);
-                        udelay(25); /* for IDE reset */
-                        pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0100);
-                        mdelay(2);  /* for IDE reset */
-                } else {
-                        *value |= SS_POWERON;
-                        *value |= SS_READY;
-                }
+                *value |= SS_POWERON;
+
+                pcc_set(sock, (unsigned int)PLD_CFBUFCR,0);
+                udelay(50);
+                pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0101);
+                udelay(25); /* for IDE reset */
+                pcc_set(sock, (unsigned int)PLD_CFRSTCR, 0x0100);
+                mdelay(2);  /* for IDE reset */
+
+                *value |= SS_READY;
+                *value |= SS_3VCARD;
+        } else {
+                /* disable CF power */
+                pcc_set(sock, (unsigned int)PLD_CPCR, 0);
+                udelay(100);
+                debug(3, "m32r_cfc: _pcc_get_status: "
+                         "power off (CPCR=0x%08x)\n", status);
         }
 #else
 #error no platform configuration
@@ -479,14 +484,13 @@ static int _pcc_get_socket(u_short sock, socket_state_t *state)
 {
 //      pcc_socket_t *t = &socket[sock];
 
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)
         state->flags = 0;
         state->csc_mask = SS_DETECT;
         state->csc_mask |= SS_READY;
         state->io_irq = 0;
         state->Vcc = 33;        /* 3.3V fixed */
         state->Vpp = 33;
-#endif
+
         debug(3, "m32r_cfc: GetSocket(%d) = flags %#3.3x, Vcc %d, Vpp %d, "
                   "io_irq %d, csc_mask %#2.2x\n", sock, state->flags,
                   state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
@@ -497,32 +501,17 @@ static int _pcc_get_socket(u_short sock, socket_state_t *state)
 
 static int _pcc_set_socket(u_short sock, socket_state_t *state)
 {
-#if defined(CONFIG_PLAT_MAPPI2)
-        u_long reg = 0;
-#endif
         debug(3, "m32r_cfc: SetSocket(%d, flags %#3.3x, Vcc %d, Vpp %d, "
                   "io_irq %d, csc_mask %#2.2x)\n", sock, state->flags,
                   state->Vcc, state->Vpp, state->io_irq, state->csc_mask);
 
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_USRV) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
         if (state->Vcc) {
                 if ((state->Vcc != 50) && (state->Vcc != 33))
                         return -EINVAL;
                 /* accept 5V and 3.3V */
         }
-#elif defined(CONFIG_PLAT_MAPPI2)
-        if (state->Vcc) {
-                /*
-                 * 5V only
-                 */
-                if (state->Vcc == 50) {
-                        reg |= PCCSIGCR_VEN;
-                } else {
-                        return -EINVAL;
-                }
-        }
 #endif
-
         if (state->flags & SS_RESET) {
                 debug(3, ":RESET\n");
                 pcc_set(sock,(unsigned int)PLD_CFRSTCR,0x101);
@@ -788,7 +777,7 @@ static int __init init_m32r_pcc(void)
                 return ret;
         }
 
-#if defined(CONFIG_PLAT_MAPPI2)
+#if defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3)
         pcc_set(0, (unsigned int)PLD_CFCR0, 0x0f0f);
         pcc_set(0, (unsigned int)PLD_CFCR1, 0x0200);
 #endif
@@ -825,7 +814,7 @@ static int __init init_m32r_pcc(void)
         for (i = 0 ; i < pcc_sockets ; i++) {
                 socket[i].socket.dev.dev = &pcc_device.dev;
                 socket[i].socket.ops = &pcc_operations;
-                socket[i].socket.resource_ops = &pccard_static_ops;
+                socket[i].socket.resource_ops = &pccard_nonstatic_ops;
                 socket[i].socket.owner = THIS_MODULE;
                 socket[i].number = i;
                 ret = pcmcia_register_socket(&socket[i].socket);
diff --git a/drivers/pcmcia/m32r_cfc.h b/drivers/pcmcia/m32r_cfc.h
index 17c1db7ae155..8146e3bee2e8 100644
--- a/drivers/pcmcia/m32r_cfc.h
+++ b/drivers/pcmcia/m32r_cfc.h
@@ -71,11 +71,15 @@
 
 #define CFC_IOPORT_BASE         0x1000
 
-#if !defined(CONFIG_PLAT_USRV)
+#if defined(CONFIG_PLAT_MAPPI3)
+#define CFC_ATTR_MAPBASE        0x14014000
+#define CFC_IO_MAPBASE_BYTE     0xb4012000
+#define CFC_IO_MAPBASE_WORD     0xb4002000
+#elif !defined(CONFIG_PLAT_USRV)
 #define CFC_ATTR_MAPBASE        0x0c014000
 #define CFC_IO_MAPBASE_BYTE     0xac012000
 #define CFC_IO_MAPBASE_WORD     0xac002000
-#else   /* CONFIG_PLAT_USRV */
+#else
 #define CFC_ATTR_MAPBASE        0x04014000
 #define CFC_IO_MAPBASE_BYTE     0xa4012000
 #define CFC_IO_MAPBASE_WORD     0xa4002000
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 97eeecfaef1b..3252662958d3 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -140,7 +140,7 @@ static void pnp_release_card(struct device *dmdev)
 }
 
 
-static ssize_t pnp_show_card_name(struct device *dmdev, char *buf)
+static ssize_t pnp_show_card_name(struct device *dmdev, struct device_attribute *attr, char *buf)
 {
         char *str = buf;
         struct pnp_card *card = to_pnp_card(dmdev);
@@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, char *buf)
 
 static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL);
 
-static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf)
+static ssize_t pnp_show_card_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
 {
         char *str = buf;
         struct pnp_card *card = to_pnp_card(dmdev);
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d64c1ca4fa76..1d037c2a82ac 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -160,10 +160,16 @@ struct bus_type pnp_bus_type = {
 };
 
 
+static int count_devices(struct device * dev, void * c)
+{
+        int * count = c;
+        (*count)++;
+        return 0;
+}
+
 int pnp_register_driver(struct pnp_driver *drv)
 {
         int count;
-        struct list_head *pos;
 
         pnp_dbg("the driver '%s' has been registered", drv->name);
 
@@ -177,9 +183,7 @@ int pnp_register_driver(struct pnp_driver *drv)
         /* get the number of initial matches */
         if (count >= 0){
                 count = 0;
-                list_for_each(pos,&drv->driver.devices){
-                        count++;
-                }
+                driver_for_each_device(&drv->driver, NULL, &count, count_devices);
         }
         return count;
 }
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 53fac8ba5d5c..a2d8ce7fef9c 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_buffer_t *buffer, char *space,
 }
 
 
-static ssize_t pnp_show_options(struct device *dmdev, char *buf)
+static ssize_t pnp_show_options(struct device *dmdev, struct device_attribute *attr, char *buf)
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
         struct pnp_option * independent = dev->independent;
@@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct device *dmdev, char *buf)
 static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL);
 
 
-static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf)
+static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_attribute *attr, char *buf)
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
         int i, ret;
@@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf)
 extern struct semaphore pnp_res_mutex;
 
 static ssize_t
-pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count)
+pnp_set_current_resources(struct device * dmdev, struct device_attribute *attr, const char * ubuf, size_t count)
 {
         struct pnp_dev *dev = to_pnp_dev(dmdev);
         char    *buf = (void *)ubuf;
@@ -444,7 +444,7 @@ pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count
 static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR,
                    pnp_show_current_resources,pnp_set_current_resources);
 
-static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf)
+static ssize_t pnp_show_current_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
 {
         char *str = buf;
         struct pnp_dev *dev = to_pnp_dev(dmdev);
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 1aedc48e5f85..d948566bb24a 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -615,7 +615,7 @@ dasd_device_from_cdev(struct ccw_device *cdev)
  * readonly controls the readonly status of a dasd
  */
 static ssize_t
-dasd_ro_show(struct device *dev, char *buf)
+dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dasd_devmap *devmap;
         int ro_flag;
@@ -629,7 +629,7 @@ dasd_ro_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-dasd_ro_store(struct device *dev, const char *buf, size_t count)
+dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct dasd_devmap *devmap;
         int ro_flag;
@@ -656,7 +656,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ro_show, dasd_ro_store);
  * to talk to the device
  */
 static ssize_t 
-dasd_use_diag_show(struct device *dev, char *buf)
+dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dasd_devmap *devmap;
         int use_diag;
@@ -670,7 +670,7 @@ dasd_use_diag_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-dasd_use_diag_store(struct device *dev, const char *buf, size_t count)
+dasd_use_diag_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct dasd_devmap *devmap;
         ssize_t rc;
@@ -698,7 +698,7 @@ static
 DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store);
 
 static ssize_t
-dasd_discipline_show(struct device *dev, char *buf)
+dasd_discipline_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dasd_devmap *devmap;
         char *dname;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index a66b17b65296..16ab8d363ac6 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -45,16 +45,16 @@ static struct block_device_operations dcssblk_devops = {
         .release = dcssblk_release,
 };
 
-static ssize_t dcssblk_add_store(struct device * dev, const char * buf,
+static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
-static ssize_t dcssblk_remove_store(struct device * dev, const char * buf,
+static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
-static ssize_t dcssblk_save_store(struct device * dev, const char * buf,
+static ssize_t dcssblk_save_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
-static ssize_t dcssblk_save_show(struct device *dev, char *buf);
-static ssize_t dcssblk_shared_store(struct device * dev, const char * buf,
+static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t dcssblk_shared_store(struct device * dev, struct device_attribute *attr, const char * buf,
                                   size_t count);
-static ssize_t dcssblk_shared_show(struct device *dev, char *buf);
+static ssize_t dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf);
 
 static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store);
 static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store);
@@ -195,7 +195,7 @@ dcssblk_segment_warn(int rc, char* seg_name)
  * operation (show + store)
  */
 static ssize_t
-dcssblk_shared_show(struct device *dev, char *buf)
+dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dcssblk_dev_info *dev_info;
 
@@ -204,7 +204,7 @@ dcssblk_shared_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count)
+dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
         int rc;
@@ -288,7 +288,7 @@ out:
  * (show + store)
  */
 static ssize_t
-dcssblk_save_show(struct device *dev, char *buf)
+dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dcssblk_dev_info *dev_info;
 
@@ -297,7 +297,7 @@ dcssblk_save_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-dcssblk_save_store(struct device *dev, const char *inbuf, size_t count)
+dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
 
@@ -343,7 +343,7 @@ dcssblk_save_store(struct device *dev, const char *inbuf, size_t count)
  * device attribute for adding devices
  */
 static ssize_t
-dcssblk_add_store(struct device *dev, const char *buf, size_t count)
+dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         int rc, i;
         struct dcssblk_dev_info *dev_info;
@@ -517,7 +517,7 @@ out_nobuf:
  * device attribute for removing devices
  */
 static ssize_t
-dcssblk_remove_store(struct device *dev, const char *buf, size_t count)
+dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct dcssblk_dev_info *dev_info;
         int rc, i;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 8e16a9716686..d5eefeaba50c 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1084,7 +1084,7 @@ raw3270_probe (struct ccw_device *cdev)
  * Additional attributes for a 3270 device
  */
 static ssize_t
-raw3270_model_show(struct device *dev, char *buf)
+raw3270_model_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, PAGE_SIZE, "%i\n",
                         ((struct raw3270 *) dev->driver_data)->model);
@@ -1092,7 +1092,7 @@ raw3270_model_show(struct device *dev, char *buf)
 static DEVICE_ATTR(model, 0444, raw3270_model_show, 0);
 
 static ssize_t
-raw3270_rows_show(struct device *dev, char *buf)
+raw3270_rows_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, PAGE_SIZE, "%i\n",
                         ((struct raw3270 *) dev->driver_data)->rows);
@@ -1100,7 +1100,7 @@ raw3270_rows_show(struct device *dev, char *buf)
 static DEVICE_ATTR(rows, 0444, raw3270_rows_show, 0);
 
 static ssize_t
-raw3270_columns_show(struct device *dev, char *buf)
+raw3270_columns_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, PAGE_SIZE, "%i\n",
                         ((struct raw3270 *) dev->driver_data)->cols);
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index 0f8ffd4167ca..ed0cb1f15b4c 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -16,7 +16,7 @@ MODULE_DESCRIPTION(
 );
 MODULE_LICENSE("GPL");
 
-struct class_simple *tape_class;
+static struct class *tape_class;
 
 /*
  * Register a tape device and return a pointer to the cdev structure.
@@ -70,7 +70,7 @@ struct tape_class_device *register_tape_dev(
         if (rc)
                 goto fail_with_cdev;
 
-        tcd->class_device = class_simple_device_add(
+        tcd->class_device = class_device_create(
                                 tape_class,
                                 tcd->char_device->dev,
                                 device,
@@ -101,7 +101,7 @@ void unregister_tape_dev(struct tape_class_device *tcd)
                         &tcd->class_device->dev->kobj,
                         tcd->mode_name
                 );
-                class_simple_device_remove(tcd->char_device->dev);
+                class_device_destroy(tape_class, tcd->char_device->dev);
                 cdev_del(tcd->char_device);
                 kfree(tcd);
         }
@@ -111,14 +111,14 @@ EXPORT_SYMBOL(unregister_tape_dev);
 
 static int __init tape_init(void)
 {
-        tape_class = class_simple_create(THIS_MODULE, "tape390");
+        tape_class = class_create(THIS_MODULE, "tape390");
 
         return 0;
 }
 
 static void __exit tape_exit(void)
 {
-        class_simple_destroy(tape_class);
+        class_destroy(tape_class);
         tape_class = NULL;
 }
 
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index e51046ab8adc..b4df4a515b12 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -107,7 +107,7 @@ busid_to_int(char *bus_id)
  *        replaced by a link to the cdev tree.
  */
 static ssize_t
-tape_medium_state_show(struct device *dev, char *buf)
+tape_medium_state_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct tape_device *tdev;
 
@@ -119,7 +119,7 @@ static
 DEVICE_ATTR(medium_state, 0444, tape_medium_state_show, NULL);
 
 static ssize_t
-tape_first_minor_show(struct device *dev, char *buf)
+tape_first_minor_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct tape_device *tdev;
 
@@ -131,7 +131,7 @@ static
 DEVICE_ATTR(first_minor, 0444, tape_first_minor_show, NULL);
 
 static ssize_t
-tape_state_show(struct device *dev, char *buf)
+tape_state_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct tape_device *tdev;
 
@@ -144,7 +144,7 @@ static
 DEVICE_ATTR(state, 0444, tape_state_show, NULL);
 
 static ssize_t
-tape_operation_show(struct device *dev, char *buf)
+tape_operation_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct tape_device *tdev;
         ssize_t rc;
@@ -171,7 +171,7 @@ static
 DEVICE_ATTR(operation, 0444, tape_operation_show, NULL);
 
 static ssize_t
-tape_blocksize_show(struct device *dev, char *buf)
+tape_blocksize_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct tape_device *tdev;
 
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index edf50d2bd10b..f7717327d15e 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -548,7 +548,7 @@ vmlogrdr_read (struct file *filp, char *data, size_t count, loff_t * ppos)
 }
 
 static ssize_t
-vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count) {
+vmlogrdr_autopurge_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {
         struct vmlogrdr_priv_t *priv = dev->driver_data;
         ssize_t ret = count;
 
@@ -567,7 +567,7 @@ vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count) {
 
 
 static ssize_t
-vmlogrdr_autopurge_show(struct device *dev, char *buf) {
+vmlogrdr_autopurge_show(struct device *dev, struct device_attribute *attr, char *buf) {
         struct vmlogrdr_priv_t *priv = dev->driver_data;
         return sprintf(buf, "%u\n", priv->autopurge);
 }
@@ -578,7 +578,7 @@ static DEVICE_ATTR(autopurge, 0644, vmlogrdr_autopurge_show,
 
 
 static ssize_t
-vmlogrdr_purge_store(struct device * dev, const char * buf, size_t count) {
+vmlogrdr_purge_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {
 
         char cp_command[80];
         char cp_response[80];
@@ -619,7 +619,7 @@ static DEVICE_ATTR(purge, 0200, NULL, vmlogrdr_purge_store);
 
 
 static ssize_t
-vmlogrdr_autorecording_store(struct device *dev, const char *buf,
+vmlogrdr_autorecording_store(struct device *dev, struct device_attribute *attr, const char *buf,
                              size_t count) {
         struct vmlogrdr_priv_t *priv = dev->driver_data;
         ssize_t ret = count;
@@ -639,7 +639,7 @@ vmlogrdr_autorecording_store(struct device *dev, const char *buf,
 
 
 static ssize_t
-vmlogrdr_autorecording_show(struct device *dev, char *buf) {
+vmlogrdr_autorecording_show(struct device *dev, struct device_attribute *attr, char *buf) {
         struct vmlogrdr_priv_t *priv = dev->driver_data;
         return sprintf(buf, "%u\n", priv->autorecording);
 }
@@ -650,7 +650,7 @@ static DEVICE_ATTR(autorecording, 0644, vmlogrdr_autorecording_show,
 
 
 static ssize_t
-vmlogrdr_recording_store(struct device * dev, const char * buf, size_t count) {
+vmlogrdr_recording_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {
 
         struct vmlogrdr_priv_t *priv = dev->driver_data;
         ssize_t ret;
@@ -703,7 +703,7 @@ static struct attribute_group vmlogrdr_attr_group = {
         .attrs = vmlogrdr_attrs,
 };
 
-static struct class_simple *vmlogrdr_class;
+static struct class *vmlogrdr_class;
 static struct device_driver vmlogrdr_driver = {
         .name = "vmlogrdr",
         .bus  = &iucv_bus,
@@ -727,7 +727,7 @@ vmlogrdr_register_driver(void) {
                 goto unregdriver;
         }
 
-        vmlogrdr_class = class_simple_create(THIS_MODULE, "vmlogrdr");
+        vmlogrdr_class = class_create(THIS_MODULE, "vmlogrdr");
         if (IS_ERR(vmlogrdr_class)) {
                 printk(KERN_ERR "vmlogrdr: failed to create class.\n");
                 ret=PTR_ERR(vmlogrdr_class);
@@ -746,7 +746,7 @@ unregdriver:
 
 static void
 vmlogrdr_unregister_driver(void) {
-        class_simple_destroy(vmlogrdr_class);
+        class_destroy(vmlogrdr_class);
         vmlogrdr_class = NULL;
         driver_remove_file(&vmlogrdr_driver, &driver_attr_recording_status);
         driver_unregister(&vmlogrdr_driver);
@@ -786,7 +786,7 @@ vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) {
                 device_unregister(dev);
                 return ret;
         }
-        priv->class_device = class_simple_device_add(
+        priv->class_device = class_device_create(
                                 vmlogrdr_class,
                                 MKDEV(vmlogrdr_major, priv->minor_num),
                                 dev,
@@ -806,7 +806,7 @@ vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) {
 
 static int
 vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv ) {
-        class_simple_device_remove(MKDEV(vmlogrdr_major, priv->minor_num));
+        class_device_destroy(vmlogrdr_class, MKDEV(vmlogrdr_major, priv->minor_num));
         if (priv->device != NULL) {
                 sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group);
                 device_unregister(priv->device);
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 4a06c7d0e5e4..aac83ce6469c 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/blacklist.c
  *   S/390 common I/O routines -- blacklisting of specific devices
- *   $Revision: 1.33 $
+ *   $Revision: 1.34 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -289,7 +289,7 @@ static int cio_ignore_read (char *page, char **start, off_t off,
         len = 0;
         for (devno = off; /* abuse the page variable
                            * as counter, see fs/proc/generic.c */
-             devno <= __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
+             devno < __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
                 if (!test_bit(devno, bl_dev))
                         continue;
                 len += sprintf(page + len, "0.0.%04lx", devno);
@@ -302,7 +302,7 @@ static int cio_ignore_read (char *page, char **start, off_t off,
                 len += sprintf(page + len, "\n");
         }
 
-        if (devno <= __MAX_SUBCHANNELS)
+        if (devno < __MAX_SUBCHANNELS)
                 *eof = 1;
         *start = (char *) (devno - off); /* number of checked entries */
         return len;
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 21a75ee28b80..306525acb9f8 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -77,7 +77,7 @@ __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
  * longer needed or accidentially created. Saves memory :)
  */
 static ssize_t
-ccwgroup_ungroup_store(struct device *dev, const char *buf, size_t count)
+ccwgroup_ungroup_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ccwgroup_device *gdev;
 
@@ -310,7 +310,7 @@ ccwgroup_set_offline(struct ccwgroup_device *gdev)
 }
 
 static ssize_t
-ccwgroup_online_store (struct device *dev, const char *buf, size_t count)
+ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ccwgroup_device *gdev;
         struct ccwgroup_driver *gdrv;
@@ -338,7 +338,7 @@ ccwgroup_online_store (struct device *dev, const char *buf, size_t count)
 }
 
 static ssize_t
-ccwgroup_online_show (struct device *dev, char *buf)
+ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         int online;
 
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index b35fe12e6bfc..b86f94ecd874 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -852,7 +852,7 @@ out:
  * Files for the channel path entries.
  */
 static ssize_t
-chp_status_show(struct device *dev, char *buf)
+chp_status_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct channel_path *chp = container_of(dev, struct channel_path, dev);
 
@@ -863,7 +863,7 @@ chp_status_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-chp_status_write(struct device *dev, const char *buf, size_t count)
+chp_status_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct channel_path *cp = container_of(dev, struct channel_path, dev);
         char cmd[10];
@@ -888,7 +888,7 @@ chp_status_write(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(status, 0644, chp_status_show, chp_status_write);
 
 static ssize_t
-chp_type_show(struct device *dev, char *buf)
+chp_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct channel_path *chp = container_of(dev, struct channel_path, dev);
 
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 49def26ba383..8cc4f1a940dc 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -796,7 +796,7 @@ cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx)
 }
 
 static ssize_t
-cmb_show_avg_sample_interval(struct device *dev, char *buf)
+cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccw_device *cdev;
         long interval;
@@ -813,7 +813,7 @@ cmb_show_avg_sample_interval(struct device *dev, char *buf)
 }
 
 static ssize_t
-cmb_show_avg_utilization(struct device *dev, char *buf)
+cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct cmbdata data;
         u64 utilization;
@@ -842,12 +842,12 @@ cmb_show_avg_utilization(struct device *dev, char *buf)
 }
 
 #define cmf_attr(name) \
-static ssize_t show_ ## name (struct device * dev, char * buf) \
+static ssize_t show_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \
 { return cmb_show_attr((dev), buf, cmb_ ## name); } \
 static DEVICE_ATTR(name, 0444, show_ ## name, NULL);
 
 #define cmf_attr_avg(name) \
-static ssize_t show_avg_ ## name (struct device * dev, char * buf) \
+static ssize_t show_avg_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \
 { return cmb_show_attr((dev), buf, cmb_ ## name); } \
 static DEVICE_ATTR(avg_ ## name, 0444, show_avg_ ## name, NULL);
 
@@ -902,12 +902,12 @@ static struct attribute_group cmf_attr_group_ext = {
         .attrs = cmf_attributes_ext,
 };
 
-static ssize_t cmb_enable_show(struct device *dev, char *buf)
+static ssize_t cmb_enable_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return sprintf(buf, "%d\n", to_ccwdev(dev)->private->cmb ? 1 : 0);
 }
 
-static ssize_t cmb_enable_store(struct device *dev, const char *buf, size_t c)
+static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t c)
 {
         struct ccw_device *cdev;
         int ret;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index df0325505e4e..809e1108a06e 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -204,7 +204,7 @@ module_exit(cleanup_ccw_bus_type);
  * TODO: Split chpids and pimpampom up? Where is "in use" in the tree?
  */
 static ssize_t
-chpids_show (struct device * dev, char * buf)
+chpids_show (struct device * dev, struct device_attribute *attr, char * buf)
 {
         struct subchannel *sch = to_subchannel(dev);
         struct ssd_info *ssd = &sch->ssd_info;
@@ -219,7 +219,7 @@ chpids_show (struct device * dev, char * buf)
 }
 
 static ssize_t
-pimpampom_show (struct device * dev, char * buf)
+pimpampom_show (struct device * dev, struct device_attribute *attr, char * buf)
 {
         struct subchannel *sch = to_subchannel(dev);
         struct pmcw *pmcw = &sch->schib.pmcw;
@@ -229,7 +229,7 @@ pimpampom_show (struct device * dev, char * buf)
 }
 
 static ssize_t
-devtype_show (struct device *dev, char *buf)
+devtype_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
         struct ccw_device_id *id = &(cdev->id);
@@ -242,7 +242,7 @@ devtype_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-cutype_show (struct device *dev, char *buf)
+cutype_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
         struct ccw_device_id *id = &(cdev->id);
@@ -252,7 +252,7 @@ cutype_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-online_show (struct device *dev, char *buf)
+online_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
 
@@ -350,7 +350,7 @@ ccw_device_set_online(struct ccw_device *cdev)
 }
 
 static ssize_t
-online_store (struct device *dev, const char *buf, size_t count)
+online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
         int i, force, ret;
@@ -422,7 +422,7 @@ online_store (struct device *dev, const char *buf, size_t count)
 }
 
 static ssize_t
-available_show (struct device *dev, char *buf)
+available_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccw_device *cdev = to_ccwdev(dev);
         struct subchannel *sch;
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 7cabb80a2e41..90d4d0ef3dd4 100644
--- a/drivers/s390/net/Makefile
+++ b/drivers/s390/net/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o
 obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
 obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o
 obj-$(CONFIG_LCS) += lcs.o cu3088.o
-qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o
+obj-$(CONFIG_CLAW) += claw.o cu3088.o
+qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o 
 qeth-$(CONFIG_PROC_FS) += qeth_proc.o
 obj-$(CONFIG_QETH) += qeth.o
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 06804d39a9c6..a99927d54ebb 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -241,20 +241,20 @@ static struct sk_buff *claw_pack_skb(struct claw_privbk *privptr);
 static void dumpit (char *buf, int len);
 #endif
 /* sysfs Functions */
-static ssize_t claw_hname_show(struct device *dev, char *buf);
-static ssize_t claw_hname_write(struct device *dev,
+static ssize_t claw_hname_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t claw_hname_write(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count);
-static ssize_t claw_adname_show(struct device *dev, char *buf);
-static ssize_t claw_adname_write(struct device *dev,
+static ssize_t claw_adname_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t claw_adname_write(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count);
-static ssize_t claw_apname_show(struct device *dev, char *buf);
-static ssize_t claw_apname_write(struct device *dev,
+static ssize_t claw_apname_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t claw_apname_write(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count);
-static ssize_t claw_wbuff_show(struct device *dev, char *buf);
-static ssize_t claw_wbuff_write(struct device *dev,
+static ssize_t claw_wbuff_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t claw_wbuff_write(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count);
-static ssize_t claw_rbuff_show(struct device *dev, char *buf);
-static ssize_t claw_rbuff_write(struct device *dev,
+static ssize_t claw_rbuff_show(struct device *dev, struct device_attribute *attr, char *buf);
+static ssize_t claw_rbuff_write(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count);
 static int claw_add_files(struct device *dev);
 static void claw_remove_files(struct device *dev);
@@ -4149,7 +4149,7 @@ claw_remove_device(struct ccwgroup_device *cgdev)
  * sysfs attributes
  */
 static ssize_t
-claw_hname_show(struct device *dev, char *buf)
+claw_hname_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4162,7 +4162,7 @@ claw_hname_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-claw_hname_write(struct device *dev, const char *buf, size_t count)
+claw_hname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4186,7 +4186,7 @@ claw_hname_write(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(host_name, 0644, claw_hname_show, claw_hname_write);
 
 static ssize_t
-claw_adname_show(struct device *dev, char *buf)
+claw_adname_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4199,7 +4199,7 @@ claw_adname_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-claw_adname_write(struct device *dev, const char *buf, size_t count)
+claw_adname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4223,7 +4223,7 @@ claw_adname_write(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(adapter_name, 0644, claw_adname_show, claw_adname_write);
 
 static ssize_t
-claw_apname_show(struct device *dev, char *buf)
+claw_apname_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4237,7 +4237,7 @@ claw_apname_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-claw_apname_write(struct device *dev, const char *buf, size_t count)
+claw_apname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4271,7 +4271,7 @@ claw_apname_write(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(api_type, 0644, claw_apname_show, claw_apname_write);
 
 static ssize_t
-claw_wbuff_show(struct device *dev, char *buf)
+claw_wbuff_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct claw_privbk *priv;
         struct claw_env * p_env;
@@ -4284,7 +4284,7 @@ claw_wbuff_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-claw_wbuff_write(struct device *dev, const char *buf, size_t count)
+claw_wbuff_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4312,7 +4312,7 @@ claw_wbuff_write(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(write_buffer, 0644, claw_wbuff_show, claw_wbuff_write);
 
 static ssize_t
-claw_rbuff_show(struct device *dev, char *buf)
+claw_rbuff_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct claw_privbk *priv;
         struct claw_env *  p_env;
@@ -4325,7 +4325,7 @@ claw_rbuff_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-claw_rbuff_write(struct device *dev, const char *buf, size_t count)
+claw_rbuff_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct claw_privbk *priv;
         struct claw_env *p_env;
diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
index ef8883951720..7fe2ebd1792d 100644
--- a/drivers/s390/net/ctcdbug.h
+++ b/drivers/s390/net/ctcdbug.h
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.4 $)
+ * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.5 $)
  *
  * CTC / ESCON network driver - s390 dbf exploit.
  *
@@ -9,7 +9,7 @@
  *    Author(s): Original Code written by
  *                        Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.4 $   $Date: 2004/10/15 09:26:58 $
+ *    $Revision: 1.5 $   $Date: 2005/02/27 19:46:44 $
  *
  * 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
@@ -25,9 +25,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+#ifndef _CTCDBUG_H_
+#define _CTCDBUG_H_
 
 #include <asm/debug.h>
+#include "ctcmain.h"
 /**
  * Debug Facility stuff
  */
@@ -41,7 +43,7 @@
 #define CTC_DBF_DATA_LEN 128
 #define CTC_DBF_DATA_INDEX 3
 #define CTC_DBF_DATA_NR_AREAS 1
-#define CTC_DBF_DATA_LEVEL 2
+#define CTC_DBF_DATA_LEVEL 3
 
 #define CTC_DBF_TRACE_NAME "ctc_trace"
 #define CTC_DBF_TRACE_LEN 16
@@ -121,3 +123,5 @@ hex_dump(unsigned char *buf, size_t len)
         printk("\n");
 }
 
+
+#endif
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 7266bf5ea659..96ca863eaff2 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctcmain.c,v 1.72 2005/03/17 10:51:52 ptiedem Exp $
+ * $Id: ctcmain.c,v 1.74 2005/03/24 09:04:17 mschwide Exp $
  *
  * CTC / ESCON network driver
  *
@@ -37,12 +37,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.72 $
+ * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.74 $
  *
  */
 
 #undef DEBUG
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -74,288 +73,13 @@
 #include "ctctty.h"
 #include "fsm.h"
 #include "cu3088.h"
+
 #include "ctcdbug.h"
+#include "ctcmain.h"
 
 MODULE_AUTHOR("(C) 2000 IBM Corp. by Fritz Elfert (felfert@millenux.com)");
 MODULE_DESCRIPTION("Linux for S/390 CTC/Escon Driver");
 MODULE_LICENSE("GPL");
-
-/**
- * CCW commands, used in this driver.
- */
-#define CCW_CMD_WRITE           0x01
-#define CCW_CMD_READ            0x02
-#define CCW_CMD_SET_EXTENDED    0xc3
-#define CCW_CMD_PREPARE         0xe3
-
-#define CTC_PROTO_S390          0
-#define CTC_PROTO_LINUX         1
-#define CTC_PROTO_LINUX_TTY     2
-#define CTC_PROTO_OS390         3
-#define CTC_PROTO_MAX           3
-
-#define CTC_BUFSIZE_LIMIT       65535
-#define CTC_BUFSIZE_DEFAULT     32768
-
-#define CTC_TIMEOUT_5SEC        5000
-
-#define CTC_INITIAL_BLOCKLEN    2
-
-#define READ                    0
-#define WRITE                   1
-
-#define CTC_ID_SIZE             BUS_ID_SIZE+3
-
-
-struct ctc_profile {
-        unsigned long maxmulti;
-        unsigned long maxcqueue;
-        unsigned long doios_single;
-        unsigned long doios_multi;
-        unsigned long txlen;
-        unsigned long tx_time;
-        struct timespec send_stamp;
-};
-
-/**
- * Definition of one channel
- */
-struct channel {
-
-        /**
-         * Pointer to next channel in list.
-         */
-        struct channel *next;
-        char id[CTC_ID_SIZE];
-        struct ccw_device *cdev;
-
-        /**
-         * Type of this channel.
-         * CTC/A or Escon for valid channels.
-         */
-        enum channel_types type;
-
-        /**
-         * Misc. flags. See CHANNEL_FLAGS_... below
-         */
-        __u32 flags;
-
-        /**
-         * The protocol of this channel
-         */
-        __u16 protocol;
-
-        /**
-         * I/O and irq related stuff
-         */
-        struct ccw1 *ccw;
-        struct irb *irb;
-
-        /**
-         * RX/TX buffer size
-         */
-        int max_bufsize;
-
-        /**
-         * Transmit/Receive buffer.
-         */
-        struct sk_buff *trans_skb;
-
-        /**
-         * Universal I/O queue.
-         */
-        struct sk_buff_head io_queue;
-
-        /**
-         * TX queue for collecting skb's during busy.
-         */
-        struct sk_buff_head collect_queue;
-
-        /**
-         * Amount of data in collect_queue.
-         */
-        int collect_len;
-
-        /**
-         * spinlock for collect_queue and collect_len
-         */
-        spinlock_t collect_lock;
-
-        /**
-         * Timer for detecting unresposive
-         * I/O operations.
-         */
-        fsm_timer timer;
-
-        /**
-         * Retry counter for misc. operations.
-         */
-        int retry;
-
-        /**
-         * The finite state machine of this channel
-         */
-        fsm_instance *fsm;
-
-        /**
-         * The corresponding net_device this channel
-         * belongs to.
-         */
-        struct net_device *netdev;
-
-        struct ctc_profile prof;
-
-        unsigned char *trans_skb_data;
-
-        __u16 logflags;
-};
-
-#define CHANNEL_FLAGS_READ            0
-#define CHANNEL_FLAGS_WRITE           1
-#define CHANNEL_FLAGS_INUSE           2
-#define CHANNEL_FLAGS_BUFSIZE_CHANGED 4
-#define CHANNEL_FLAGS_FAILED          8
-#define CHANNEL_FLAGS_WAITIRQ        16
-#define CHANNEL_FLAGS_RWMASK 1
-#define CHANNEL_DIRECTION(f) (f & CHANNEL_FLAGS_RWMASK)
-
-#define LOG_FLAG_ILLEGALPKT  1
-#define LOG_FLAG_ILLEGALSIZE 2
-#define LOG_FLAG_OVERRUN     4
-#define LOG_FLAG_NOMEM       8
-
-#define CTC_LOGLEVEL_INFO     1
-#define CTC_LOGLEVEL_NOTICE   2
-#define CTC_LOGLEVEL_WARN     4
-#define CTC_LOGLEVEL_EMERG    8
-#define CTC_LOGLEVEL_ERR     16
-#define CTC_LOGLEVEL_DEBUG   32
-#define CTC_LOGLEVEL_CRIT    64
-
-#define CTC_LOGLEVEL_DEFAULT \
-(CTC_LOGLEVEL_INFO | CTC_LOGLEVEL_NOTICE | CTC_LOGLEVEL_WARN | CTC_LOGLEVEL_CRIT)
-
-#define CTC_LOGLEVEL_MAX     ((CTC_LOGLEVEL_CRIT<<1)-1)
-
-static int loglevel = CTC_LOGLEVEL_DEFAULT;
-
-#define ctc_pr_debug(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_DEBUG) printk(KERN_DEBUG fmt,##arg); } while (0)
-
-#define ctc_pr_info(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_INFO) printk(KERN_INFO fmt,##arg); } while (0)
-
-#define ctc_pr_notice(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_NOTICE) printk(KERN_NOTICE fmt,##arg); } while (0)
-
-#define ctc_pr_warn(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_WARN) printk(KERN_WARNING fmt,##arg); } while (0)
-
-#define ctc_pr_emerg(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_EMERG) printk(KERN_EMERG fmt,##arg); } while (0)
-
-#define ctc_pr_err(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_ERR) printk(KERN_ERR fmt,##arg); } while (0)
-
-#define ctc_pr_crit(fmt, arg...) \
-do { if (loglevel & CTC_LOGLEVEL_CRIT) printk(KERN_CRIT fmt,##arg); } while (0)
-
-/**
- * Linked list of all detected channels.
- */
-static struct channel *channels = NULL;
-
-struct ctc_priv {
-        struct net_device_stats stats;
-        unsigned long tbusy;
-        /**
-         * The finite state machine of this interface.
-         */
-        fsm_instance *fsm;
-        /**
-         * The protocol of this device
-         */
-        __u16 protocol;
-        /**
-         * Timer for restarting after I/O Errors
-         */
-        fsm_timer               restart_timer;
-
-        int buffer_size;
-
-        struct channel *channel[2];
-};
-
-/**
- * Definition of our link level header.
- */
-struct ll_header {
-        __u16 length;
-        __u16 type;
-        __u16 unused;
-};
-#define LL_HEADER_LENGTH (sizeof(struct ll_header))
-
-/**
- * Compatibility macros for busy handling
- * of network devices.
- */
-static __inline__ void
-ctc_clear_busy(struct net_device * dev)
-{
-        clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy));
-        if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
-                netif_wake_queue(dev);
-}
-
-static __inline__ int
-ctc_test_and_set_busy(struct net_device * dev)
-{
-        if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
-                netif_stop_queue(dev);
-        return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy);
-}
-
-/**
- * Print Banner.
- */
-static void
-print_banner(void)
-{
-        static int printed = 0;
-        char vbuf[] = "$Revision: 1.72 $";
-        char *version = vbuf;
-
-        if (printed)
-                return;
-        if ((version = strchr(version, ':'))) {
-                char *p = strchr(version + 1, '$');
-                if (p)
-                        *p = '\0';
-        } else
-                version = " ??? ";
-        printk(KERN_INFO "CTC driver Version%s"
-#ifdef DEBUG
-                    " (DEBUG-VERSION, " __DATE__ __TIME__ ")"
-#endif
-                    " initialized\n", version);
-        printed = 1;
-}
-
-/**
- * Return type of a detected device.
- */
-static enum channel_types
-get_channel_type(struct ccw_device_id *id)
-{
-        enum channel_types type = (enum channel_types) id->driver_info;
-
-        if (type == channel_type_ficon)
-                type = channel_type_escon;
-
-        return type;
-}
-
 /**
  * States of the interface statemachine.
  */
@@ -371,7 +95,7 @@ enum dev_states {
         /**
          * MUST be always the last element!!
          */
-        NR_DEV_STATES
+        CTC_NR_DEV_STATES
 };
 
 static const char *dev_state_names[] = {
@@ -399,7 +123,7 @@ enum dev_events {
         /**
          * MUST be always the last element!!
          */
-        NR_DEV_EVENTS
+        CTC_NR_DEV_EVENTS
 };
 
 static const char *dev_event_names[] = {
@@ -476,40 +200,6 @@ enum ch_events {
         NR_CH_EVENTS,
 };
 
-static const char *ch_event_names[] = {
-        "ccw_device success",
-        "ccw_device busy",
-        "ccw_device enodev",
-        "ccw_device ioerr",
-        "ccw_device unknown",
-
-        "Status ATTN & BUSY",
-        "Status ATTN",
-        "Status BUSY",
-
-        "Unit check remote reset",
-        "Unit check remote system reset",
-        "Unit check TX timeout",
-        "Unit check TX parity",
-        "Unit check Hardware failure",
-        "Unit check RX parity",
-        "Unit check ZERO",
-        "Unit check Unknown",
-
-        "SubChannel check Unknown",
-
-        "Machine check failure",
-        "Machine check operational",
-
-        "IRQ normal",
-        "IRQ final",
-
-        "Timer",
-
-        "Start",
-        "Stop",
-};
-
 /**
  * States of the channel statemachine.
  */
@@ -545,6 +235,87 @@ enum ch_states {
         NR_CH_STATES,
 };
 
+static int loglevel = CTC_LOGLEVEL_DEFAULT;
+
+/**
+ * Linked list of all detected channels.
+ */
+static struct channel *channels = NULL;
+
+/**
+ * Print Banner.
+ */
+static void
+print_banner(void)
+{
+        static int printed = 0;
+        char vbuf[] = "$Revision: 1.74 $";
+        char *version = vbuf;
+
+        if (printed)
+                return;
+        if ((version = strchr(version, ':'))) {
+                char *p = strchr(version + 1, '$');
+                if (p)
+                        *p = '\0';
+        } else
+                version = " ??? ";
+        printk(KERN_INFO "CTC driver Version%s"
+#ifdef DEBUG
+                    " (DEBUG-VERSION, " __DATE__ __TIME__ ")"
+#endif
+                    " initialized\n", version);
+        printed = 1;
+}
+
+/**
+ * Return type of a detected device.
+ */
+static enum channel_types
+get_channel_type(struct ccw_device_id *id)
+{
+        enum channel_types type = (enum channel_types) id->driver_info;
+
+        if (type == channel_type_ficon)
+                type = channel_type_escon;
+
+        return type;
+}
+
+static const char *ch_event_names[] = {
+        "ccw_device success",
+        "ccw_device busy",
+        "ccw_device enodev",
+        "ccw_device ioerr",
+        "ccw_device unknown",
+
+        "Status ATTN & BUSY",
+        "Status ATTN",
+        "Status BUSY",
+
+        "Unit check remote reset",
+        "Unit check remote system reset",
+        "Unit check TX timeout",
+        "Unit check TX parity",
+        "Unit check Hardware failure",
+        "Unit check RX parity",
+        "Unit check ZERO",
+        "Unit check Unknown",
+
+        "SubChannel check Unknown",
+
+        "Machine check failure",
+        "Machine check operational",
+
+        "IRQ normal",
+        "IRQ final",
+
+        "Timer",
+
+        "Start",
+        "Stop",
+};
+
 static const char *ch_state_names[] = {
         "Idle",
         "Stopped",
@@ -1934,7 +1705,6 @@ add_channel(struct ccw_device *cdev, enum channel_types type)
         ch->cdev = cdev;
         snprintf(ch->id, CTC_ID_SIZE, "ch-%s", cdev->dev.bus_id);
         ch->type = type;
-        loglevel = CTC_LOGLEVEL_DEFAULT;
         ch->fsm = init_fsm(ch->id, ch_state_names,
                            ch_event_names, NR_CH_STATES, NR_CH_EVENTS,
                            ch_fsm, CH_FSM_LEN, GFP_KERNEL);
@@ -2697,8 +2467,9 @@ ctc_stats(struct net_device * dev)
 /*
  * sysfs attributes
  */
+
 static ssize_t
-buffer_show(struct device *dev, char *buf)
+buffer_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ctc_priv *priv;
 
@@ -2710,62 +2481,66 @@ buffer_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-buffer_write(struct device *dev, const char *buf, size_t count)
+buffer_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ctc_priv *priv;
         struct net_device *ndev;
         int bs1;
+        char buffer[16];
 
         DBF_TEXT(trace, 3, __FUNCTION__);
+        DBF_TEXT(trace, 3, buf);
         priv = dev->driver_data;
-        if (!priv)
+        if (!priv) {
+                DBF_TEXT(trace, 3, "bfnopriv");
                 return -ENODEV;
+        }
+
+        sscanf(buf, "%u", &bs1);
+        if (bs1 > CTC_BUFSIZE_LIMIT)
+                goto einval;
+        if (bs1 < (576 + LL_HEADER_LENGTH + 2))
+                goto einval;
+        priv->buffer_size = bs1;        // just to overwrite the default
+
         ndev = priv->channel[READ]->netdev;
-        if (!ndev)
+        if (!ndev) {
+                DBF_TEXT(trace, 3, "bfnondev");
                 return -ENODEV;
-        sscanf(buf, "%u", &bs1);
+        }
 
-        if (bs1 > CTC_BUFSIZE_LIMIT)
-                return -EINVAL;
         if ((ndev->flags & IFF_RUNNING) &&
             (bs1 < (ndev->mtu + LL_HEADER_LENGTH + 2)))
-                return -EINVAL;
-        if (bs1 < (576 + LL_HEADER_LENGTH + 2))
-                return -EINVAL;
+                goto einval;
 
-        priv->buffer_size = bs1;
-        priv->channel[READ]->max_bufsize =
-            priv->channel[WRITE]->max_bufsize = bs1;
+        priv->channel[READ]->max_bufsize = bs1;
+        priv->channel[WRITE]->max_bufsize = bs1;
         if (!(ndev->flags & IFF_RUNNING))
                 ndev->mtu = bs1 - LL_HEADER_LENGTH - 2;
         priv->channel[READ]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED;
         priv->channel[WRITE]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED;
 
+        sprintf(buffer, "%d",priv->buffer_size);
+        DBF_TEXT(trace, 3, buffer);
         return count;
 
+einval:
+        DBF_TEXT(trace, 3, "buff_err");
+        return -EINVAL;
 }
 
 static ssize_t
-loglevel_show(struct device *dev, char *buf)
+loglevel_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct ctc_priv *priv;
-
-        priv = dev->driver_data;
-        if (!priv)
-                return -ENODEV;
         return sprintf(buf, "%d\n", loglevel);
 }
 
 static ssize_t
-loglevel_write(struct device *dev, const char *buf, size_t count)
+loglevel_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        struct ctc_priv *priv;
         int ll1;
 
         DBF_TEXT(trace, 5, __FUNCTION__);
-        priv = dev->driver_data;
-        if (!priv)
-                return -ENODEV;
         sscanf(buf, "%i", &ll1);
 
         if ((ll1 > CTC_LOGLEVEL_MAX) || (ll1 < 0))
@@ -2814,7 +2589,7 @@ ctc_print_statistics(struct ctc_priv *priv)
 }
 
 static ssize_t
-stats_show(struct device *dev, char *buf)
+stats_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ctc_priv *priv = dev->driver_data;
         if (!priv)
@@ -2824,7 +2599,7 @@ stats_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-stats_write(struct device *dev, const char *buf, size_t count)
+stats_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ctc_priv *priv = dev->driver_data;
         if (!priv)
@@ -2835,27 +2610,6 @@ stats_write(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static DEVICE_ATTR(buffer, 0644, buffer_show, buffer_write);
-static DEVICE_ATTR(loglevel, 0644, loglevel_show, loglevel_write);
-static DEVICE_ATTR(stats, 0644, stats_show, stats_write);
-
-static int
-ctc_add_attributes(struct device *dev)
-{
-//      device_create_file(dev, &dev_attr_buffer);
-        device_create_file(dev, &dev_attr_loglevel);
-        device_create_file(dev, &dev_attr_stats);
-        return 0;
-}
-
-static void
-ctc_remove_attributes(struct device *dev)
-{
-        device_remove_file(dev, &dev_attr_stats);
-        device_remove_file(dev, &dev_attr_loglevel);
-//      device_remove_file(dev, &dev_attr_buffer);
-}
-
 
 static void
 ctc_netdev_unregister(struct net_device * dev)
@@ -2899,54 +2653,8 @@ ctc_free_netdevice(struct net_device * dev, int free_dev)
 #endif
 }
 
-/**
- * Initialize everything of the net device except the name and the
- * channel structs.
- */
-static struct net_device *
-ctc_init_netdevice(struct net_device * dev, int alloc_device, 
-                   struct ctc_priv *privptr)
-{
-        if (!privptr)
-                return NULL;
-
-        DBF_TEXT(setup, 3, __FUNCTION__);
-        if (alloc_device) {
-                dev = kmalloc(sizeof (struct net_device), GFP_KERNEL);
-                if (!dev)
-                        return NULL;
-                memset(dev, 0, sizeof (struct net_device));
-        }
-
-        dev->priv = privptr;
-        privptr->fsm = init_fsm("ctcdev", dev_state_names,
-                                dev_event_names, NR_DEV_STATES, NR_DEV_EVENTS,
-                                dev_fsm, DEV_FSM_LEN, GFP_KERNEL);
-        if (privptr->fsm == NULL) {
-                if (alloc_device)
-                        kfree(dev);
-                return NULL;
-        }
-        fsm_newstate(privptr->fsm, DEV_STATE_STOPPED);
-        fsm_settimer(privptr->fsm, &privptr->restart_timer);
-        if (dev->mtu == 0)
-                dev->mtu = CTC_BUFSIZE_DEFAULT - LL_HEADER_LENGTH - 2;
-        dev->hard_start_xmit = ctc_tx;
-        dev->open = ctc_open;
-        dev->stop = ctc_close;
-        dev->get_stats = ctc_stats;
-        dev->change_mtu = ctc_change_mtu;
-        dev->hard_header_len = LL_HEADER_LENGTH + 2;
-        dev->addr_len = 0;
-        dev->type = ARPHRD_SLIP;
-        dev->tx_queue_len = 100;
-        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-        SET_MODULE_OWNER(dev);
-        return dev;
-}
-
 static ssize_t
-ctc_proto_show(struct device *dev, char *buf)
+ctc_proto_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ctc_priv *priv;
 
@@ -2958,7 +2666,7 @@ ctc_proto_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-ctc_proto_store(struct device *dev, const char *buf, size_t count)
+ctc_proto_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct ctc_priv *priv;
         int value;
@@ -2977,10 +2685,9 @@ ctc_proto_store(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static DEVICE_ATTR(protocol, 0644, ctc_proto_show, ctc_proto_store);
 
 static ssize_t
-ctc_type_show(struct device *dev, char *buf)
+ctc_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccwgroup_device *cgdev;
 
@@ -2991,8 +2698,13 @@ ctc_type_show(struct device *dev, char *buf)
         return sprintf(buf, "%s\n", cu3088_type[cgdev->cdev[0]->id.driver_info]);
 }
 
+static DEVICE_ATTR(buffer, 0644, buffer_show, buffer_write);
+static DEVICE_ATTR(protocol, 0644, ctc_proto_show, ctc_proto_store);
 static DEVICE_ATTR(type, 0444, ctc_type_show, NULL);
 
+static DEVICE_ATTR(loglevel, 0644, loglevel_show, loglevel_write);
+static DEVICE_ATTR(stats, 0644, stats_show, stats_write);
+
 static struct attribute *ctc_attr[] = {
         &dev_attr_protocol.attr,
         &dev_attr_type.attr,
@@ -3005,6 +2717,21 @@ static struct attribute_group ctc_attr_group = {
 };
 
 static int
+ctc_add_attributes(struct device *dev)
+{
+        device_create_file(dev, &dev_attr_loglevel);
+        device_create_file(dev, &dev_attr_stats);
+        return 0;
+}
+
+static void
+ctc_remove_attributes(struct device *dev)
+{
+        device_remove_file(dev, &dev_attr_stats);
+        device_remove_file(dev, &dev_attr_loglevel);
+}
+
+static int
 ctc_add_files(struct device *dev)
 {
         pr_debug("%s() called\n", __FUNCTION__);
@@ -3028,15 +2755,15 @@ ctc_remove_files(struct device *dev)
  *
  * @returns 0 on success, !0 on failure.
  */
-
 static int
 ctc_probe_device(struct ccwgroup_device *cgdev)
 {
         struct ctc_priv *priv;
         int rc;
+        char buffer[16];
 
         pr_debug("%s() called\n", __FUNCTION__);
-        DBF_TEXT(trace, 3, __FUNCTION__);
+        DBF_TEXT(setup, 3, __FUNCTION__);
 
         if (!get_device(&cgdev->dev))
                 return -ENODEV;
@@ -3060,10 +2787,70 @@ ctc_probe_device(struct ccwgroup_device *cgdev)
         cgdev->cdev[1]->handler = ctc_irq_handler;
         cgdev->dev.driver_data = priv;
 
+        sprintf(buffer, "%p", priv);
+        DBF_TEXT(data, 3, buffer);
+
+        sprintf(buffer, "%u", (unsigned int)sizeof(struct ctc_priv));
+        DBF_TEXT(data, 3, buffer);
+
+        sprintf(buffer, "%p", &channels);
+        DBF_TEXT(data, 3, buffer);
+
+        sprintf(buffer, "%u", (unsigned int)sizeof(struct channel));
+        DBF_TEXT(data, 3, buffer);
+
         return 0;
 }
 
 /**
+ * Initialize everything of the net device except the name and the
+ * channel structs.
+ */
+static struct net_device *
+ctc_init_netdevice(struct net_device * dev, int alloc_device,
+                   struct ctc_priv *privptr)
+{
+        if (!privptr)
+                return NULL;
+
+        DBF_TEXT(setup, 3, __FUNCTION__);
+
+        if (alloc_device) {
+                dev = kmalloc(sizeof (struct net_device), GFP_KERNEL);
+                if (!dev)
+                        return NULL;
+                memset(dev, 0, sizeof (struct net_device));
+        }
+
+        dev->priv = privptr;
+        privptr->fsm = init_fsm("ctcdev", dev_state_names,
+                                dev_event_names, CTC_NR_DEV_STATES, CTC_NR_DEV_EVENTS,
+                                dev_fsm, DEV_FSM_LEN, GFP_KERNEL);
+        if (privptr->fsm == NULL) {
+                if (alloc_device)
+                        kfree(dev);
+                return NULL;
+        }
+        fsm_newstate(privptr->fsm, DEV_STATE_STOPPED);
+        fsm_settimer(privptr->fsm, &privptr->restart_timer);
+        if (dev->mtu == 0)
+                dev->mtu = CTC_BUFSIZE_DEFAULT - LL_HEADER_LENGTH - 2;
+        dev->hard_start_xmit = ctc_tx;
+        dev->open = ctc_open;
+        dev->stop = ctc_close;
+        dev->get_stats = ctc_stats;
+        dev->change_mtu = ctc_change_mtu;
+        dev->hard_header_len = LL_HEADER_LENGTH + 2;
+        dev->addr_len = 0;
+        dev->type = ARPHRD_SLIP;
+        dev->tx_queue_len = 100;
+        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
+        SET_MODULE_OWNER(dev);
+        return dev;
+}
+
+
+/**
  *
  * Setup an interface.
  *
@@ -3081,6 +2868,7 @@ ctc_new_device(struct ccwgroup_device *cgdev)
         struct ctc_priv *privptr;
         struct net_device *dev;
         int ret;
+        char buffer[16];
 
         pr_debug("%s() called\n", __FUNCTION__);
         DBF_TEXT(setup, 3, __FUNCTION__);
@@ -3089,6 +2877,9 @@ ctc_new_device(struct ccwgroup_device *cgdev)
         if (!privptr)
                 return -ENODEV;
 
+        sprintf(buffer, "%d", privptr->buffer_size);
+        DBF_TEXT(setup, 3, buffer);
+
         type = get_channel_type(&cgdev->cdev[0]->id);
         
         snprintf(read_id, CTC_ID_SIZE, "ch-%s", cgdev->cdev[0]->dev.bus_id);
@@ -3177,9 +2968,10 @@ ctc_shutdown_device(struct ccwgroup_device *cgdev)
         struct ctc_priv *priv;
         struct net_device *ndev;
                 
-        DBF_TEXT(trace, 3, __FUNCTION__);
+        DBF_TEXT(setup, 3, __FUNCTION__);
         pr_debug("%s() called\n", __FUNCTION__);
 
+
         priv = cgdev->dev.driver_data;
         ndev = NULL;
         if (!priv)
@@ -3215,7 +3007,6 @@ ctc_shutdown_device(struct ccwgroup_device *cgdev)
                 channel_remove(priv->channel[READ]);
         if (priv->channel[WRITE])
                 channel_remove(priv->channel[WRITE]);
-        
         priv->channel[READ] = priv->channel[WRITE] = NULL;
 
         return 0;
@@ -3228,7 +3019,7 @@ ctc_remove_device(struct ccwgroup_device *cgdev)
         struct ctc_priv *priv;
 
         pr_debug("%s() called\n", __FUNCTION__);
-        DBF_TEXT(trace, 3, __FUNCTION__);
+        DBF_TEXT(setup, 3, __FUNCTION__);
 
         priv = cgdev->dev.driver_data;
         if (!priv)
@@ -3265,6 +3056,7 @@ static struct ccwgroup_driver ctc_group_driver = {
 static void __exit
 ctc_exit(void)
 {
+        DBF_TEXT(setup, 3, __FUNCTION__);
         unregister_cu3088_discipline(&ctc_group_driver);
         ctc_tty_cleanup();
         ctc_unregister_dbf_views();
@@ -3282,6 +3074,10 @@ ctc_init(void)
 {
         int ret = 0;
 
+        loglevel = CTC_LOGLEVEL_DEFAULT;
+
+        DBF_TEXT(setup, 3, __FUNCTION__);
+
         print_banner();
 
         ret = ctc_register_dbf_views();
diff --git a/drivers/s390/net/ctcmain.h b/drivers/s390/net/ctcmain.h
new file mode 100644
index 000000000000..ba3605f16335
--- /dev/null
+++ b/drivers/s390/net/ctcmain.h
@@ -0,0 +1,276 @@
+/*
+ * $Id: ctcmain.h,v 1.4 2005/03/24 09:04:17 mschwide Exp $
+ *
+ * CTC / ESCON network driver
+ *
+ * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)
+              Peter Tiedemann (ptiedem@de.ibm.com)
+ *
+ *
+ * Documentation used:
+ *  - Principles of Operation (IBM doc#: SA22-7201-06)
+ *  - Common IO/-Device Commands and Self Description (IBM doc#: SA22-7204-02)
+ *  - Common IO/-Device Commands and Self Description (IBM doc#: SN22-5535)
+ *  - ESCON Channel-to-Channel Adapter (IBM doc#: SA22-7203-00)
+ *  - ESCON I/O Interface (IBM doc#: SA22-7202-029
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *
+ * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.4 $
+ *
+ */
+
+#ifndef _CTCMAIN_H_
+#define _CTCMAIN_H_
+
+#include <asm/ccwdev.h>
+#include <asm/ccwgroup.h>
+
+#include "ctctty.h"
+#include "fsm.h"
+#include "cu3088.h"
+
+
+/**
+ * CCW commands, used in this driver.
+ */
+#define CCW_CMD_WRITE           0x01
+#define CCW_CMD_READ            0x02
+#define CCW_CMD_SET_EXTENDED    0xc3
+#define CCW_CMD_PREPARE         0xe3
+
+#define CTC_PROTO_S390          0
+#define CTC_PROTO_LINUX         1
+#define CTC_PROTO_LINUX_TTY     2
+#define CTC_PROTO_OS390         3
+#define CTC_PROTO_MAX           3
+
+#define CTC_BUFSIZE_LIMIT       65535
+#define CTC_BUFSIZE_DEFAULT     32768
+
+#define CTC_TIMEOUT_5SEC        5000
+
+#define CTC_INITIAL_BLOCKLEN    2
+
+#define READ                    0
+#define WRITE                   1
+
+#define CTC_ID_SIZE             BUS_ID_SIZE+3
+
+
+struct ctc_profile {
+        unsigned long maxmulti;
+        unsigned long maxcqueue;
+        unsigned long doios_single;
+        unsigned long doios_multi;
+        unsigned long txlen;
+        unsigned long tx_time;
+        struct timespec send_stamp;
+};
+
+/**
+ * Definition of one channel
+ */
+struct channel {
+
+        /**
+         * Pointer to next channel in list.
+         */
+        struct channel *next;
+        char id[CTC_ID_SIZE];
+        struct ccw_device *cdev;
+
+        /**
+         * Type of this channel.
+         * CTC/A or Escon for valid channels.
+         */
+        enum channel_types type;
+
+        /**
+         * Misc. flags. See CHANNEL_FLAGS_... below
+         */
+        __u32 flags;
+
+        /**
+         * The protocol of this channel
+         */
+        __u16 protocol;
+
+        /**
+         * I/O and irq related stuff
+         */
+        struct ccw1 *ccw;
+        struct irb *irb;
+
+        /**
+         * RX/TX buffer size
+         */
+        int max_bufsize;
+
+        /**
+         * Transmit/Receive buffer.
+         */
+        struct sk_buff *trans_skb;
+
+        /**
+         * Universal I/O queue.
+         */
+        struct sk_buff_head io_queue;
+
+        /**
+         * TX queue for collecting skb's during busy.
+         */
+        struct sk_buff_head collect_queue;
+
+        /**
+         * Amount of data in collect_queue.
+         */
+        int collect_len;
+
+        /**
+         * spinlock for collect_queue and collect_len
+         */
+        spinlock_t collect_lock;
+
+        /**
+         * Timer for detecting unresposive
+         * I/O operations.
+         */
+        fsm_timer timer;
+
+        /**
+         * Retry counter for misc. operations.
+         */
+        int retry;
+
+        /**
+         * The finite state machine of this channel
+         */
+        fsm_instance *fsm;
+
+        /**
+         * The corresponding net_device this channel
+         * belongs to.
+         */
+        struct net_device *netdev;
+
+        struct ctc_profile prof;
+
+        unsigned char *trans_skb_data;
+
+        __u16 logflags;
+};
+
+#define CHANNEL_FLAGS_READ            0
+#define CHANNEL_FLAGS_WRITE           1
+#define CHANNEL_FLAGS_INUSE           2
+#define CHANNEL_FLAGS_BUFSIZE_CHANGED 4
+#define CHANNEL_FLAGS_FAILED          8
+#define CHANNEL_FLAGS_WAITIRQ        16
+#define CHANNEL_FLAGS_RWMASK 1
+#define CHANNEL_DIRECTION(f) (f & CHANNEL_FLAGS_RWMASK)
+
+#define LOG_FLAG_ILLEGALPKT  1
+#define LOG_FLAG_ILLEGALSIZE 2
+#define LOG_FLAG_OVERRUN     4
+#define LOG_FLAG_NOMEM       8
+
+#define CTC_LOGLEVEL_INFO     1
+#define CTC_LOGLEVEL_NOTICE   2
+#define CTC_LOGLEVEL_WARN     4
+#define CTC_LOGLEVEL_EMERG    8
+#define CTC_LOGLEVEL_ERR     16
+#define CTC_LOGLEVEL_DEBUG   32
+#define CTC_LOGLEVEL_CRIT    64
+
+#define CTC_LOGLEVEL_DEFAULT \
+(CTC_LOGLEVEL_INFO | CTC_LOGLEVEL_NOTICE | CTC_LOGLEVEL_WARN | CTC_LOGLEVEL_CRIT)
+
+#define CTC_LOGLEVEL_MAX     ((CTC_LOGLEVEL_CRIT<<1)-1)
+
+#define ctc_pr_debug(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_DEBUG) printk(KERN_DEBUG fmt,##arg); } while (0)
+
+#define ctc_pr_info(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_INFO) printk(KERN_INFO fmt,##arg); } while (0)
+
+#define ctc_pr_notice(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_NOTICE) printk(KERN_NOTICE fmt,##arg); } while (0)
+
+#define ctc_pr_warn(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_WARN) printk(KERN_WARNING fmt,##arg); } while (0)
+
+#define ctc_pr_emerg(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_EMERG) printk(KERN_EMERG fmt,##arg); } while (0)
+
+#define ctc_pr_err(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_ERR) printk(KERN_ERR fmt,##arg); } while (0)
+
+#define ctc_pr_crit(fmt, arg...) \
+do { if (loglevel & CTC_LOGLEVEL_CRIT) printk(KERN_CRIT fmt,##arg); } while (0)
+
+struct ctc_priv {
+        struct net_device_stats stats;
+        unsigned long tbusy;
+        /**
+         * The finite state machine of this interface.
+         */
+        fsm_instance *fsm;
+        /**
+         * The protocol of this device
+         */
+        __u16 protocol;
+        /**
+         * Timer for restarting after I/O Errors
+         */
+        fsm_timer               restart_timer;
+
+        int buffer_size;
+
+        struct channel *channel[2];
+};
+
+/**
+ * Definition of our link level header.
+ */
+struct ll_header {
+        __u16 length;
+        __u16 type;
+        __u16 unused;
+};
+#define LL_HEADER_LENGTH (sizeof(struct ll_header))
+
+/**
+ * Compatibility macros for busy handling
+ * of network devices.
+ */
+static __inline__ void
+ctc_clear_busy(struct net_device * dev)
+{
+        clear_bit(0, &(((struct ctc_priv *) dev->priv)->tbusy));
+        if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
+                netif_wake_queue(dev);
+}
+
+static __inline__ int
+ctc_test_and_set_busy(struct net_device * dev)
+{
+        if (((struct ctc_priv *)dev->priv)->protocol != CTC_PROTO_LINUX_TTY)
+                netif_stop_queue(dev);
+        return test_and_set_bit(0, &((struct ctc_priv *) dev->priv)->tbusy);
+}
+
+#endif
diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index 9257d60c7833..3080393e823d 100644
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctctty.c,v 1.26 2004/08/04 11:06:55 mschwide Exp $
+ * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $
  *
  * CTC / ESCON network driver, tty interface.
  *
@@ -1056,8 +1056,7 @@ ctc_tty_close(struct tty_struct *tty, struct file *filp)
         info->tty = 0;
         tty->closing = 0;
         if (info->blocked_open) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(HZ/2);
+                msleep_interruptible(500);
                 wake_up_interruptible(&info->open_wait);
         }
         info->flags &= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING);
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index 1b0a9f16024c..0075894c71db 100644
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cu3088.c,v 1.34 2004/06/15 13:16:27 pavlic Exp $
+ * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $
  *
  * CTC / LCS ccw_device driver
  *
@@ -39,6 +39,7 @@ const char *cu3088_type[] = {
         "FICON channel",
         "P390 LCS card",
         "OSA LCS card",
+        "CLAW channel device",
         "unknown channel type",
         "unsupported channel type",
 };
@@ -51,6 +52,7 @@ static struct ccw_device_id cu3088_ids[] = {
         { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },
         { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },
         { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },
+        { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },
         { /* end of list */ }
 };
 
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h
index 0ec49a8b3adc..1753661f702a 100644
--- a/drivers/s390/net/cu3088.h
+++ b/drivers/s390/net/cu3088.h
@@ -23,6 +23,9 @@ enum channel_types {
         /* Device is a OSA2 card */
         channel_type_osa2,
 
+        /* Device is a CLAW channel device */
+        channel_type_claw,
+
         /* Device is a channel, but we don't know
          * anything about it */
         channel_type_unknown,
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index 1ac6563ee3e0..e08e74e16124 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: iucv.c,v 1.43 2005/02/09 14:47:43 braunu Exp $
+ * $Id: iucv.c,v 1.45 2005/04/26 22:59:06 braunu Exp $
  *
  * IUCV network driver
  *
@@ -29,7 +29,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.43 $
+ * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.45 $
  *
  */
 
@@ -355,7 +355,7 @@ do { \
 static void
 iucv_banner(void)
 {
-        char vbuf[] = "$Revision: 1.43 $";
+        char vbuf[] = "$Revision: 1.45 $";
         char *version = vbuf;
 
         if ((version = strchr(version, ':'))) {
@@ -2553,12 +2553,12 @@ EXPORT_SYMBOL (iucv_resume);
 #endif
 EXPORT_SYMBOL (iucv_reply_prmmsg);
 EXPORT_SYMBOL (iucv_send);
-#if 0
 EXPORT_SYMBOL (iucv_send2way);
 EXPORT_SYMBOL (iucv_send2way_array);
-EXPORT_SYMBOL (iucv_send_array);
 EXPORT_SYMBOL (iucv_send2way_prmmsg);
 EXPORT_SYMBOL (iucv_send2way_prmmsg_array);
+#if 0
+EXPORT_SYMBOL (iucv_send_array);
 EXPORT_SYMBOL (iucv_send_prmmsg);
 EXPORT_SYMBOL (iucv_setmask);
 #endif
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0f76e945b984..ab086242d305 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,7 +11,7 @@
  *                        Frank Pavlic (pavlic@de.ibm.com) and
  *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
- *    $Revision: 1.96 $  $Date: 2004/11/11 13:42:33 $
+ *    $Revision: 1.98 $  $Date: 2005/04/18 13:41:29 $
  *
  * 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
@@ -59,7 +59,7 @@
 /**
  * initialization string for output
  */
-#define VERSION_LCS_C  "$Revision: 1.96 $"
+#define VERSION_LCS_C  "$Revision: 1.98 $"
 
 static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
 static char debug_buffer[255];
@@ -1098,14 +1098,6 @@ lcs_check_multicast_support(struct lcs_card *card)
                 PRINT_ERR("Query IPAssist failed. Assuming unsupported!\n");
                 return -EOPNOTSUPP;
         }
-        /* Print out supported assists: IPv6 */
-        PRINT_INFO("LCS device %s %s IPv6 support\n", card->dev->name,
-                   (card->ip_assists_supported & LCS_IPASS_IPV6_SUPPORT) ?
-                   "with" : "without");
-        /* Print out supported assist: Multicast */
-        PRINT_INFO("LCS device %s %s Multicast support\n", card->dev->name,
-                   (card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT) ?
-                   "with" : "without");
         if (card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT)
                 return 0;
         return -EOPNOTSUPP;
@@ -1160,7 +1152,7 @@ list_modified:
                 }
         }
         /* re-insert all entries from the failed_list into ipm_list */
-        list_for_each_entry(ipm, &failed_list, list) {
+        list_for_each_entry_safe(ipm, tmp, &failed_list, list) {
                 list_del_init(&ipm->list);
                 list_add_tail(&ipm->list, &card->ipm_list);
         }
@@ -1992,7 +1984,7 @@ lcs_open_device(struct net_device *dev)
  * show function for portno called by cat or similar things
  */
 static ssize_t
-lcs_portno_show (struct device *dev, char *buf)
+lcs_portno_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lcs_card *card;
 
@@ -2008,7 +2000,7 @@ lcs_portno_show (struct device *dev, char *buf)
  * store the value which is piped to file portno
  */
 static ssize_t
-lcs_portno_store (struct device *dev, const char *buf, size_t count)
+lcs_portno_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct lcs_card *card;
         int value;
@@ -2029,7 +2021,7 @@ lcs_portno_store (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
 
 static ssize_t
-lcs_type_show(struct device *dev, char *buf)
+lcs_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ccwgroup_device *cgdev;
 
@@ -2043,7 +2035,7 @@ lcs_type_show(struct device *dev, char *buf)
 static DEVICE_ATTR(type, 0444, lcs_type_show, NULL);
 
 static ssize_t
-lcs_timeout_show(struct device *dev, char *buf)
+lcs_timeout_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lcs_card *card;
 
@@ -2053,7 +2045,7 @@ lcs_timeout_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-lcs_timeout_store (struct device *dev, const char *buf, size_t count)
+lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct lcs_card *card;
         int value;
@@ -2198,30 +2190,39 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
         if (!dev)
                 goto out;
         card->dev = dev;
-netdev_out:
         card->dev->priv = card;
         card->dev->open = lcs_open_device;
         card->dev->stop = lcs_stop_device;
         card->dev->hard_start_xmit = lcs_start_xmit;
         card->dev->get_stats = lcs_getstats;
         SET_MODULE_OWNER(dev);
-        if (lcs_register_netdev(ccwgdev) != 0)
-                goto out;
         memcpy(card->dev->dev_addr, card->mac, LCS_MAC_LENGTH);
 #ifdef CONFIG_IP_MULTICAST
         if (!lcs_check_multicast_support(card))
                 card->dev->set_multicast_list = lcs_set_multicast_list;
 #endif
-        netif_stop_queue(card->dev);
+netdev_out:
         lcs_set_allowed_threads(card,0xffffffff);
         if (recover_state == DEV_STATE_RECOVER) {
                 lcs_set_multicast_list(card->dev);
                 card->dev->flags |= IFF_UP;
                 netif_wake_queue(card->dev);
                 card->state = DEV_STATE_UP;
-        } else
+        } else {
                 lcs_stopcard(card);
+        }
 
+        if (lcs_register_netdev(ccwgdev) != 0)
+                goto out;
+
+        /* Print out supported assists: IPv6 */
+        PRINT_INFO("LCS device %s %s IPv6 support\n", card->dev->name,
+                   (card->ip_assists_supported & LCS_IPASS_IPV6_SUPPORT) ?
+                   "with" : "without");
+        /* Print out supported assist: Multicast */
+        PRINT_INFO("LCS device %s %s Multicast support\n", card->dev->name,
+                   (card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT) ?
+                   "with" : "without");
         return 0;
 out:
 
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 16e8e69afb10..3fd4fb754b2d 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1356,7 +1356,7 @@ netiucv_change_mtu (struct net_device * dev, int new_mtu)
  *****************************************************************************/
 
 static ssize_t
-user_show (struct device *dev, char *buf)
+user_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1365,7 +1365,7 @@ user_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-user_write (struct device *dev, const char *buf, size_t count)
+user_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         struct net_device *ndev = priv->conn->netdev;
@@ -1422,7 +1422,7 @@ user_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(user, 0644, user_show, user_write);
 
 static ssize_t
-buffer_show (struct device *dev, char *buf)
+buffer_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1431,7 +1431,7 @@ buffer_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-buffer_write (struct device *dev, const char *buf, size_t count)
+buffer_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         struct net_device *ndev = priv->conn->netdev;
@@ -1486,7 +1486,7 @@ buffer_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(buffer, 0644, buffer_show, buffer_write);
 
 static ssize_t
-dev_fsm_show (struct device *dev, char *buf)
+dev_fsm_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1497,7 +1497,7 @@ dev_fsm_show (struct device *dev, char *buf)
 static DEVICE_ATTR(device_fsm_state, 0444, dev_fsm_show, NULL);
 
 static ssize_t
-conn_fsm_show (struct device *dev, char *buf)
+conn_fsm_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1508,7 +1508,7 @@ conn_fsm_show (struct device *dev, char *buf)
 static DEVICE_ATTR(connection_fsm_state, 0444, conn_fsm_show, NULL);
 
 static ssize_t
-maxmulti_show (struct device *dev, char *buf)
+maxmulti_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1517,7 +1517,7 @@ maxmulti_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-maxmulti_write (struct device *dev, const char *buf, size_t count)
+maxmulti_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1529,7 +1529,7 @@ maxmulti_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(max_tx_buffer_used, 0644, maxmulti_show, maxmulti_write);
 
 static ssize_t
-maxcq_show (struct device *dev, char *buf)
+maxcq_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1538,7 +1538,7 @@ maxcq_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-maxcq_write (struct device *dev, const char *buf, size_t count)
+maxcq_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         
@@ -1550,7 +1550,7 @@ maxcq_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(max_chained_skbs, 0644, maxcq_show, maxcq_write);
 
 static ssize_t
-sdoio_show (struct device *dev, char *buf)
+sdoio_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1559,7 +1559,7 @@ sdoio_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-sdoio_write (struct device *dev, const char *buf, size_t count)
+sdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         
@@ -1571,7 +1571,7 @@ sdoio_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(tx_single_write_ops, 0644, sdoio_show, sdoio_write);
 
 static ssize_t
-mdoio_show (struct device *dev, char *buf)
+mdoio_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1580,7 +1580,7 @@ mdoio_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-mdoio_write (struct device *dev, const char *buf, size_t count)
+mdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         
@@ -1592,7 +1592,7 @@ mdoio_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(tx_multi_write_ops, 0644, mdoio_show, mdoio_write);
 
 static ssize_t
-txlen_show (struct device *dev, char *buf)
+txlen_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1601,7 +1601,7 @@ txlen_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-txlen_write (struct device *dev, const char *buf, size_t count)
+txlen_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         
@@ -1613,7 +1613,7 @@ txlen_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(netto_bytes, 0644, txlen_show, txlen_write);
 
 static ssize_t
-txtime_show (struct device *dev, char *buf)
+txtime_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1622,7 +1622,7 @@ txtime_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-txtime_write (struct device *dev, const char *buf, size_t count)
+txtime_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
         
@@ -1634,7 +1634,7 @@ txtime_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(max_tx_io_time, 0644, txtime_show, txtime_write);
 
 static ssize_t
-txpend_show (struct device *dev, char *buf)
+txpend_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1643,7 +1643,7 @@ txpend_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-txpend_write (struct device *dev, const char *buf, size_t count)
+txpend_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1655,7 +1655,7 @@ txpend_write (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(tx_pending, 0644, txpend_show, txpend_write);
 
 static ssize_t
-txmpnd_show (struct device *dev, char *buf)
+txmpnd_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
@@ -1664,7 +1664,7 @@ txmpnd_show (struct device *dev, char *buf)
 }
 
 static ssize_t
-txmpnd_write (struct device *dev, const char *buf, size_t count)
+txmpnd_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct netiucv_priv *priv = dev->driver_data;
 
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index a341041a6cf7..a755b57db46b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -24,7 +24,7 @@
 
 #include "qeth_mpc.h"
 
-#define VERSION_QETH_H          "$Revision: 1.135 $"
+#define VERSION_QETH_H          "$Revision: 1.139 $"
 
 #ifdef CONFIG_QETH_IPV6
 #define QETH_VERSION_IPV6       ":IPv6"
@@ -288,7 +288,8 @@ qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, enum qeth_ipa_funcs func)
 #define QETH_TX_TIMEOUT         100 * HZ
 #define QETH_HEADER_SIZE        32
 #define MAX_PORTNO              15
-#define QETH_FAKE_LL_LEN        ETH_HLEN
+#define QETH_FAKE_LL_LEN_ETH    ETH_HLEN
+#define QETH_FAKE_LL_LEN_TR     (sizeof(struct trh_hdr)-TR_MAXRIFLEN+sizeof(struct trllc))
 #define QETH_FAKE_LL_V6_ADDR_POS 24
 
 /*IPv6 address autoconfiguration stuff*/
@@ -369,6 +370,25 @@ struct qeth_hdr {
         } hdr;
 } __attribute__ ((packed));
 
+/*TCP Segmentation Offload header*/
+struct qeth_hdr_ext_tso {
+        __u16 hdr_tot_len;
+        __u8  imb_hdr_no;
+        __u8  reserved;
+        __u8  hdr_type;
+        __u8  hdr_version;
+        __u16 hdr_len;
+        __u32 payload_len;
+        __u16 mss;
+        __u16 dg_hdr_len;
+        __u8  padding[16];
+} __attribute__ ((packed));
+
+struct qeth_hdr_tso {
+        struct qeth_hdr hdr;    /*hdr->hdr.l3.xxx*/
+        struct qeth_hdr_ext_tso ext;
+} __attribute__ ((packed));
+
 
 /* flags for qeth_hdr.flags */
 #define QETH_HDR_PASSTHRU 0x10
@@ -866,6 +886,7 @@ qeth_push_skb(struct qeth_card *card, struct sk_buff **skb, int size)
         return hdr;
 }
 
+
 inline static int
 qeth_get_hlen(__u8 link_type)
 {
@@ -873,19 +894,19 @@ qeth_get_hlen(__u8 link_type)
         switch (link_type) {
         case QETH_LINK_TYPE_HSTR:
         case QETH_LINK_TYPE_LANE_TR:
-                return sizeof(struct qeth_hdr) + TR_HLEN;
+                return sizeof(struct qeth_hdr_tso) + TR_HLEN;
         default:
 #ifdef CONFIG_QETH_VLAN
-                return sizeof(struct qeth_hdr) + VLAN_ETH_HLEN;
+                return sizeof(struct qeth_hdr_tso) + VLAN_ETH_HLEN;
 #else
-                return sizeof(struct qeth_hdr) + ETH_HLEN;
+                return sizeof(struct qeth_hdr_tso) + ETH_HLEN;
 #endif
         }
 #else  /* CONFIG_QETH_IPV6 */
 #ifdef CONFIG_QETH_VLAN
-        return sizeof(struct qeth_hdr) + VLAN_HLEN;
+        return sizeof(struct qeth_hdr_tso) + VLAN_HLEN;
 #else
-        return sizeof(struct qeth_hdr);
+        return sizeof(struct qeth_hdr_tso);
 #endif
 #endif /* CONFIG_QETH_IPV6 */
 }
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 7ee1c06ed68a..f94f1f25eec6 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.11 $)
+ * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.13 $)
  *
  * Enhanced Device Driver Packing (EDDP) support for the qeth driver.
  *
@@ -8,7 +8,7 @@
  *
  *    Author(s): Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.11 $  $Date: 2005/03/24 09:04:18 $
+ *    $Revision: 1.13 $  $Date: 2005/05/04 20:19:18 $
  *
  */
 #include <linux/config.h>
@@ -85,7 +85,7 @@ void
 qeth_eddp_buf_release_contexts(struct qeth_qdio_out_buffer *buf)
 {
         struct qeth_eddp_context_reference *ref;
-
+        
         QETH_DBF_TEXT(trace, 6, "eddprctx");
         while (!list_empty(&buf->ctx_list)){
                 ref = list_entry(buf->ctx_list.next,
@@ -139,7 +139,7 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue,
                                            "buffer!\n");
                                 goto out;
                         }
-                }
+                }               
                 /* check if the whole next skb fits into current buffer */
                 if ((QETH_MAX_BUFFER_ELEMENTS(queue->card) -
                                         buf->next_element_to_fill)
@@ -152,7 +152,7 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue,
                          * and increment ctx's refcnt */
                         must_refcnt = 1;
                         continue;
-                }
+                }       
                 if (must_refcnt){
                         must_refcnt = 0;
                         if (qeth_eddp_buf_ref_context(buf, ctx)){
@@ -202,40 +202,29 @@ out:
         return flush_cnt;
 }
 
-static inline int
-qeth_get_skb_data_len(struct sk_buff *skb)
-{
-        int len = skb->len;
-        int i;
-
-        for (i = 0; i < skb_shinfo(skb)->nr_frags; ++i)
-                len -= skb_shinfo(skb)->frags[i].size;
-        return len;
-}
-
 static inline void
 qeth_eddp_create_segment_hdrs(struct qeth_eddp_context *ctx,
-                              struct qeth_eddp_data *eddp)
+                              struct qeth_eddp_data *eddp, int data_len)
 {
         u8 *page;
         int page_remainder;
         int page_offset;
-        int hdr_len;
+        int pkt_len;
         struct qeth_eddp_element *element;
 
         QETH_DBF_TEXT(trace, 5, "eddpcrsh");
         page = ctx->pages[ctx->offset >> PAGE_SHIFT];
         page_offset = ctx->offset % PAGE_SIZE;
         element = &ctx->elements[ctx->num_elements];
-        hdr_len = eddp->nhl + eddp->thl;
+        pkt_len = eddp->nhl + eddp->thl + data_len;
         /* FIXME: layer2 and VLAN !!! */
         if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2)
-                hdr_len += ETH_HLEN;
+                pkt_len += ETH_HLEN;
         if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q))
-                hdr_len += VLAN_HLEN;
-        /* does complete header fit in current page ? */
+                pkt_len += VLAN_HLEN;
+        /* does complete packet fit in current page ? */
         page_remainder = PAGE_SIZE - page_offset;
-        if (page_remainder < (sizeof(struct qeth_hdr) + hdr_len)){
+        if (page_remainder < (sizeof(struct qeth_hdr) + pkt_len)){
                 /* no -> go to start of next page */
                 ctx->offset += page_remainder;
                 page = ctx->pages[ctx->offset >> PAGE_SHIFT];
@@ -281,7 +270,7 @@ qeth_eddp_copy_data_tcp(char *dst, struct qeth_eddp_data *eddp, int len,
         int left_in_frag;
         int copy_len;
         u8 *src;
-
+        
         QETH_DBF_TEXT(trace, 5, "eddpcdtc");
         if (skb_shinfo(eddp->skb)->nr_frags == 0) {
                 memcpy(dst, eddp->skb->data + eddp->skb_offset, len);
@@ -292,7 +281,7 @@ qeth_eddp_copy_data_tcp(char *dst, struct qeth_eddp_data *eddp, int len,
                 while (len > 0) {
                         if (eddp->frag < 0) {
                                 /* we're in skb->data */
-                                left_in_frag = qeth_get_skb_data_len(eddp->skb)
+                                left_in_frag = (eddp->skb->len - eddp->skb->data_len)
                                                 - eddp->skb_offset;
                                 src = eddp->skb->data + eddp->skb_offset;
                         } else {
@@ -424,7 +413,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
         struct tcphdr *tcph;
         int data_len;
         u32 hcsum;
-
+        
         QETH_DBF_TEXT(trace, 5, "eddpftcp");
         eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl;
         tcph = eddp->skb->h.th;
@@ -464,7 +453,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                 else
                         hcsum = qeth_eddp_check_tcp6_hdr(eddp, data_len);
                 /* fill the next segment into the context */
-                qeth_eddp_create_segment_hdrs(ctx, eddp);
+                qeth_eddp_create_segment_hdrs(ctx, eddp, data_len);
                 qeth_eddp_create_segment_data_tcp(ctx, eddp, data_len, hcsum);
                 if (eddp->skb_offset >= eddp->skb->len)
                         break;
@@ -474,13 +463,13 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                 eddp->th.tcp.h.seq += data_len;
         }
 }
-
+                           
 static inline int
 qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                            struct sk_buff *skb, struct qeth_hdr *qhdr)
 {
         struct qeth_eddp_data *eddp = NULL;
-
+        
         QETH_DBF_TEXT(trace, 5, "eddpficx");
         /* create our segmentation headers and copy original headers */
         if (skb->protocol == ETH_P_IP)
@@ -520,7 +509,7 @@ qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, struct sk_buff *skb,
                          int hdr_len)
 {
         int skbs_per_page;
-
+        
         QETH_DBF_TEXT(trace, 5, "eddpcanp");
         /* can we put multiple skbs in one page? */
         skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len);
@@ -600,7 +589,7 @@ qeth_eddp_create_context_tcp(struct qeth_card *card, struct sk_buff *skb,
                              struct qeth_hdr *qhdr)
 {
         struct qeth_eddp_context *ctx = NULL;
-
+        
         QETH_DBF_TEXT(trace, 5, "creddpct");
         if (skb->protocol == ETH_P_IP)
                 ctx = qeth_eddp_create_context_generic(card, skb,
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 607b92542df6..208127a5033a 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.206 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.214 $)
  *
  * Linux on zSeries OSA Express and HiperSockets support
  *
@@ -12,7 +12,7 @@
  *                        Frank Pavlic (pavlic@de.ibm.com) and
  *                        Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.206 $         $Date: 2005/03/24 09:04:18 $
+ *    $Revision: 1.214 $         $Date: 2005/05/04 20:19:18 $
  *
  * 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
@@ -80,7 +80,7 @@ qeth_eyecatcher(void)
 #include "qeth_eddp.h"
 #include "qeth_tso.h"
 
-#define VERSION_QETH_C "$Revision: 1.206 $"
+#define VERSION_QETH_C "$Revision: 1.214 $"
 static const char *version = "qeth S/390 OSA-Express driver";
 
 /**
@@ -158,6 +158,9 @@ qeth_irq_tasklet(unsigned long);
 static int
 qeth_set_online(struct ccwgroup_device *);
 
+static int
+__qeth_set_online(struct ccwgroup_device *gdev, int recovery_mode);
+
 static struct qeth_ipaddr *
 qeth_get_addr_buffer(enum qeth_prot_versions);
 
@@ -510,10 +513,10 @@ qeth_irq_tasklet(unsigned long data)
         wake_up(&card->wait_q);
 }
 
-static int qeth_stop_card(struct qeth_card *);
+static int qeth_stop_card(struct qeth_card *, int);
 
 static int
-qeth_set_offline(struct ccwgroup_device *cgdev)
+__qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
 {
         struct qeth_card *card = (struct qeth_card *) cgdev->dev.driver_data;
         int rc = 0;
@@ -523,7 +526,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev)
         QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
 
         recover_flag = card->state;
-        if (qeth_stop_card(card) == -ERESTARTSYS){
+        if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){
                 PRINT_WARN("Stopping card %s interrupted by user!\n",
                            CARD_BUS_ID(card));
                 return -ERESTARTSYS;
@@ -540,6 +543,12 @@ qeth_set_offline(struct ccwgroup_device *cgdev)
 }
 
 static int
+qeth_set_offline(struct ccwgroup_device *cgdev)
+{
+        return  __qeth_set_offline(cgdev, 0);
+}
+
+static int
 qeth_wait_for_threads(struct qeth_card *card, unsigned long threads);
 
 
@@ -953,8 +962,8 @@ qeth_recover(void *ptr)
         PRINT_WARN("Recovery of device %s started ...\n",
                    CARD_BUS_ID(card));
         card->use_hard_stop = 1;
-        qeth_set_offline(card->gdev);
-        rc = qeth_set_online(card->gdev);
+        __qeth_set_offline(card->gdev,1);
+        rc = __qeth_set_online(card->gdev,1);
         if (!rc)
                 PRINT_INFO("Device %s successfully recovered!\n",
                            CARD_BUS_ID(card));
@@ -2152,9 +2161,15 @@ qeth_get_next_skb(struct qeth_card *card, struct qdio_buffer *buffer,
         if (!skb_len)
                 return NULL;
         if (card->options.fake_ll){
-                if (!(skb = qeth_get_skb(skb_len + QETH_FAKE_LL_LEN)))
-                        goto no_mem;
-                skb_pull(skb, QETH_FAKE_LL_LEN);
+                if(card->dev->type == ARPHRD_IEEE802_TR){
+                        if (!(skb = qeth_get_skb(skb_len+QETH_FAKE_LL_LEN_TR)))
+                                goto no_mem;
+                        skb_reserve(skb,QETH_FAKE_LL_LEN_TR);
+                } else {
+                        if (!(skb = qeth_get_skb(skb_len+QETH_FAKE_LL_LEN_ETH)))
+                                goto no_mem;
+                        skb_reserve(skb,QETH_FAKE_LL_LEN_ETH);
+                }
         } else if (!(skb = qeth_get_skb(skb_len)))
                 goto no_mem;
         data_ptr = element->addr + offset;
@@ -2229,14 +2244,68 @@ qeth_type_trans(struct sk_buff *skb, struct net_device *dev)
 }
 
 static inline void
-qeth_rebuild_skb_fake_ll(struct qeth_card *card, struct sk_buff *skb,
+qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb,
+                         struct qeth_hdr *hdr)
+{
+        struct trh_hdr *fake_hdr;
+        struct trllc *fake_llc;
+        struct iphdr *ip_hdr;
+
+        QETH_DBF_TEXT(trace,5,"skbfktr");
+        skb->mac.raw = skb->data - QETH_FAKE_LL_LEN_TR;
+        /* this is a fake ethernet header */
+        fake_hdr = (struct trh_hdr *) skb->mac.raw;
+
+        /* the destination MAC address */
+        switch (skb->pkt_type){
+        case PACKET_MULTICAST:
+                switch (skb->protocol){
+#ifdef CONFIG_QETH_IPV6
+                case __constant_htons(ETH_P_IPV6):
+                        ndisc_mc_map((struct in6_addr *)
+                                     skb->data + QETH_FAKE_LL_V6_ADDR_POS,
+                                     fake_hdr->daddr, card->dev, 0);
+                        break;
+#endif /* CONFIG_QETH_IPV6 */
+                case __constant_htons(ETH_P_IP):
+                        ip_hdr = (struct iphdr *)skb->data;
+                        ip_tr_mc_map(ip_hdr->daddr, fake_hdr->daddr);
+                        break;
+                default:
+                        memcpy(fake_hdr->daddr, card->dev->dev_addr, TR_ALEN);
+                }
+                break;
+        case PACKET_BROADCAST:
+                memset(fake_hdr->daddr, 0xff, TR_ALEN);
+                break;
+        default:
+                memcpy(fake_hdr->daddr, card->dev->dev_addr, TR_ALEN);
+        }
+        /* the source MAC address */
+        if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
+                memcpy(fake_hdr->saddr, &hdr->hdr.l3.dest_addr[2], TR_ALEN);
+        else
+                memset(fake_hdr->saddr, 0, TR_ALEN);
+        fake_hdr->rcf=0;
+        fake_llc = (struct trllc*)&(fake_hdr->rcf);
+        fake_llc->dsap = EXTENDED_SAP;
+        fake_llc->ssap = EXTENDED_SAP;
+        fake_llc->llc  = UI_CMD;
+        fake_llc->protid[0] = 0;
+        fake_llc->protid[1] = 0;
+        fake_llc->protid[2] = 0;
+        fake_llc->ethertype = ETH_P_IP;
+}
+
+static inline void
+qeth_rebuild_skb_fake_ll_eth(struct qeth_card *card, struct sk_buff *skb,
                          struct qeth_hdr *hdr)
 {
         struct ethhdr *fake_hdr;
         struct iphdr *ip_hdr;
 
-        QETH_DBF_TEXT(trace,5,"skbfake");
-        skb->mac.raw = skb->data - QETH_FAKE_LL_LEN;
+        QETH_DBF_TEXT(trace,5,"skbfketh");
+        skb->mac.raw = skb->data - QETH_FAKE_LL_LEN_ETH;
         /* this is a fake ethernet header */
         fake_hdr = (struct ethhdr *) skb->mac.raw;
 
@@ -2253,10 +2322,7 @@ qeth_rebuild_skb_fake_ll(struct qeth_card *card, struct sk_buff *skb,
 #endif /* CONFIG_QETH_IPV6 */
                 case __constant_htons(ETH_P_IP):
                         ip_hdr = (struct iphdr *)skb->data;
-                        if (card->dev->type == ARPHRD_IEEE802_TR)
-                                ip_tr_mc_map(ip_hdr->daddr, fake_hdr->h_dest);
-                        else
-                                ip_eth_mc_map(ip_hdr->daddr, fake_hdr->h_dest);
+                        ip_eth_mc_map(ip_hdr->daddr, fake_hdr->h_dest);
                         break;
                 default:
                         memcpy(fake_hdr->h_dest, card->dev->dev_addr, ETH_ALEN);
@@ -2278,6 +2344,16 @@ qeth_rebuild_skb_fake_ll(struct qeth_card *card, struct sk_buff *skb,
 }
 
 static inline void
+qeth_rebuild_skb_fake_ll(struct qeth_card *card, struct sk_buff *skb,
+                        struct qeth_hdr *hdr)
+{
+        if (card->dev->type == ARPHRD_IEEE802_TR)
+                qeth_rebuild_skb_fake_ll_tr(card, skb, hdr);
+        else
+                qeth_rebuild_skb_fake_ll_eth(card, skb, hdr);
+}
+
+static inline void
 qeth_rebuild_skb_vlan(struct qeth_card *card, struct sk_buff *skb,
                       struct qeth_hdr *hdr)
 {
@@ -3440,16 +3516,25 @@ qeth_fake_header(struct sk_buff *skb, struct net_device *dev,
                      unsigned short type, void *daddr, void *saddr,
                      unsigned len)
 {
-        struct ethhdr *hdr;
+        if(dev->type == ARPHRD_IEEE802_TR){
+                struct trh_hdr *hdr;
+                hdr = (struct trh_hdr *)skb_push(skb, QETH_FAKE_LL_LEN_TR);
+                memcpy(hdr->saddr, dev->dev_addr, TR_ALEN);
+                memcpy(hdr->daddr, "FAKELL", TR_ALEN);
+                return QETH_FAKE_LL_LEN_TR;
+
+        } else {
+                struct ethhdr *hdr;
+                hdr = (struct ethhdr *)skb_push(skb, QETH_FAKE_LL_LEN_ETH);
+                memcpy(hdr->h_source, dev->dev_addr, ETH_ALEN);
+                memcpy(hdr->h_dest, "FAKELL", ETH_ALEN);
+                if (type != ETH_P_802_3)
+                        hdr->h_proto = htons(type);
+                else
+                        hdr->h_proto = htons(len);
+                return QETH_FAKE_LL_LEN_ETH;
 
-        hdr = (struct ethhdr *)skb_push(skb, QETH_FAKE_LL_LEN);
-        memcpy(hdr->h_source, dev->dev_addr, ETH_ALEN);
-        memcpy(hdr->h_dest, "FAKELL", ETH_ALEN);
-        if (type != ETH_P_802_3)
-                hdr->h_proto = htons(type);
-        else
-                hdr->h_proto = htons(len);
-        return QETH_FAKE_LL_LEN;
+        }
 }
 
 static inline int
@@ -3710,16 +3795,12 @@ static inline int
 qeth_prepare_skb(struct qeth_card *card, struct sk_buff **skb,
                  struct qeth_hdr **hdr, int ipv)
 {
-        int rc = 0;
 #ifdef CONFIG_QETH_VLAN
         u16 *tag;
 #endif
 
         QETH_DBF_TEXT(trace, 6, "prepskb");
 
-        rc = qeth_realloc_headroom(card, skb, sizeof(struct qeth_hdr));
-        if (rc)
-                return rc;
 #ifdef CONFIG_QETH_VLAN
         if (card->vlangrp && vlan_tx_tag_present(*skb) &&
             ((ipv == 6) || card->options.layer2) ) {
@@ -3882,9 +3963,15 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
                         memcpy(hdr->hdr.l3.dest_addr, &skb->nh.ipv6h->daddr, 16);
                 }
         } else { /* passthrough */
-                if (!memcmp(skb->data + sizeof(struct qeth_hdr),
+                if((skb->dev->type == ARPHRD_IEEE802_TR) &&
+                    !memcmp(skb->data + sizeof(struct qeth_hdr) + 
+                    sizeof(__u16), skb->dev->broadcast, 6)) {
+                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
+                                                QETH_HDR_PASSTHRU;
+                } else if (!memcmp(skb->data + sizeof(struct qeth_hdr),
                             skb->dev->broadcast, 6)) {   /* broadcast? */
-                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST | QETH_HDR_PASSTHRU;
+                        hdr->hdr.l3.flags = QETH_CAST_BROADCAST |
+                                                QETH_HDR_PASSTHRU;
                 } else {
                         hdr->hdr.l3.flags = (cast_type == RTN_MULTICAST) ?
                                 QETH_CAST_MULTICAST | QETH_HDR_PASSTHRU :
@@ -3894,67 +3981,29 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
 }
 
 static inline void
-__qeth_fill_buffer_frag(struct sk_buff *skb, struct qdio_buffer *buffer,
-                        int *next_element_to_fill)
-{
-        int length = skb->len;
-        struct skb_frag_struct *frag;
-        int fragno;
-        unsigned long addr;
-        int element;
-        int first_lap = 1;
-
-        fragno = skb_shinfo(skb)->nr_frags; /* start with last frag */
-        element = *next_element_to_fill + fragno;
-        while (length > 0) {
-                if (fragno > 0) {
-                        frag = &skb_shinfo(skb)->frags[fragno - 1];
-                        addr = (page_to_pfn(frag->page) << PAGE_SHIFT) +
-                                frag->page_offset;
-                        buffer->element[element].addr = (char *)addr;
-                        buffer->element[element].length = frag->size;
-                        length -= frag->size;
-                        if (first_lap)
-                                buffer->element[element].flags =
-                                    SBAL_FLAGS_LAST_FRAG;
-                        else
-                                buffer->element[element].flags =
-                                    SBAL_FLAGS_MIDDLE_FRAG;
-                } else {
-                        buffer->element[element].addr = skb->data;
-                        buffer->element[element].length = length;
-                        length = 0;
-                        buffer->element[element].flags =
-                                SBAL_FLAGS_FIRST_FRAG;
-                }
-                element--;
-                fragno--;
-                first_lap = 0;
-        }
-        *next_element_to_fill += skb_shinfo(skb)->nr_frags + 1;
-}
-
-static inline void
 __qeth_fill_buffer(struct sk_buff *skb, struct qdio_buffer *buffer,
-                   int *next_element_to_fill)
+                   int is_tso, int *next_element_to_fill)
 {
         int length = skb->len;
         int length_here;
         int element;
         char *data;
-        int first_lap = 1;
+        int first_lap ;
 
         element = *next_element_to_fill;
         data = skb->data;
+        first_lap = (is_tso == 0 ? 1 : 0);
+
         while (length > 0) {
                 /* length_here is the remaining amount of data in this page */
                 length_here = PAGE_SIZE - ((unsigned long) data % PAGE_SIZE);
                 if (length < length_here)
                         length_here = length;
+
                 buffer->element[element].addr = data;
                 buffer->element[element].length = length_here;
                 length -= length_here;
-                if (!length){
+                if (!length) {
                         if (first_lap)
                                 buffer->element[element].flags = 0;
                         else
@@ -3981,17 +4030,35 @@ qeth_fill_buffer(struct qeth_qdio_out_q *queue,
                  struct sk_buff *skb)
 {
         struct qdio_buffer *buffer;
-        int flush_cnt = 0;
+        struct qeth_hdr_tso *hdr;
+        int flush_cnt = 0, hdr_len, large_send = 0;
 
         QETH_DBF_TEXT(trace, 6, "qdfillbf");
+
         buffer = buf->buffer;
         atomic_inc(&skb->users);
         skb_queue_tail(&buf->skb_list, skb);
+
+        hdr  = (struct qeth_hdr_tso *) skb->data;
+        /*check first on TSO ....*/
+        if (hdr->hdr.hdr.l3.id == QETH_HEADER_TYPE_TSO) {
+                int element = buf->next_element_to_fill;
+
+                hdr_len = sizeof(struct qeth_hdr_tso) + hdr->ext.dg_hdr_len;
+                /*fill first buffer entry only with header information */
+                buffer->element[element].addr = skb->data;
+                buffer->element[element].length = hdr_len;
+                buffer->element[element].flags = SBAL_FLAGS_FIRST_FRAG;
+                buf->next_element_to_fill++;
+                skb->data += hdr_len;
+                skb->len  -= hdr_len;
+                large_send = 1;
+        }
         if (skb_shinfo(skb)->nr_frags == 0)
-                __qeth_fill_buffer(skb, buffer,
+                __qeth_fill_buffer(skb, buffer, large_send,
                                    (int *)&buf->next_element_to_fill);
         else
-                __qeth_fill_buffer_frag(skb, buffer,
+                __qeth_fill_buffer_frag(skb, buffer, large_send,
                                         (int *)&buf->next_element_to_fill);
 
         if (!queue->do_pack) {
@@ -4184,6 +4251,25 @@ out:
 }
 
 static inline int
+qeth_get_elements_no(struct qeth_card *card, void *hdr, struct sk_buff *skb)
+{
+        int elements_needed = 0;
+
+        if (skb_shinfo(skb)->nr_frags > 0) {
+                elements_needed = (skb_shinfo(skb)->nr_frags + 1);
+        }
+        if (elements_needed == 0 )
+                elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE)
+                                        + skb->len) >> PAGE_SHIFT);
+        if (elements_needed > QETH_MAX_BUFFER_ELEMENTS(card)){
+                PRINT_ERR("qeth_do_send_packet: invalid size of "
+                          "IP packet. Discarded.");
+                return 0;
+        }
+        return elements_needed;
+}
+
+static inline int
 qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
 {
         int ipv = 0;
@@ -4205,7 +4291,11 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                                 dev_kfree_skb_irq(skb);
                                 return 0;
                         }
-                        skb_pull(skb, QETH_FAKE_LL_LEN);
+                        if(card->dev->type == ARPHRD_IEEE802_TR){
+                                skb_pull(skb, QETH_FAKE_LL_LEN_TR);
+                        } else {
+                                skb_pull(skb, QETH_FAKE_LL_LEN_ETH);
+                        }
                 }
         }
         cast_type = qeth_get_cast_type(card, skb);
@@ -4221,19 +4311,25 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         if (skb_shinfo(skb)->tso_size)
                 large_send = card->options.large_send;
 
-        if ((rc = qeth_prepare_skb(card, &skb, &hdr, ipv))){
-                QETH_DBF_TEXT_(trace, 4, "pskbe%d", rc);
-                return rc;
-        }
         /*are we able to do TSO ? If so ,prepare and send it from here */
         if ((large_send == QETH_LARGE_SEND_TSO) &&
             (cast_type == RTN_UNSPEC)) {
-                rc = qeth_tso_send_packet(card, skb, queue,
-                                          ipv, cast_type);
-                goto do_statistics;
+                rc = qeth_tso_prepare_packet(card, skb, ipv, cast_type);
+                if (rc) {
+                        card->stats.tx_dropped++;
+                        card->stats.tx_errors++;
+                        dev_kfree_skb_any(skb);
+                        return NETDEV_TX_OK;
+                } 
+                elements_needed++;
+        } else {
+                if ((rc = qeth_prepare_skb(card, &skb, &hdr, ipv))) {
+                        QETH_DBF_TEXT_(trace, 4, "pskbe%d", rc);
+                        return rc;
+                }
+                qeth_fill_header(card, hdr, skb, ipv, cast_type);
         }
 
-        qeth_fill_header(card, hdr, skb, ipv, cast_type);
         if (large_send == QETH_LARGE_SEND_EDDP) {
                 ctx = qeth_eddp_create_context(card, skb, hdr);
                 if (ctx == NULL) {
@@ -4241,7 +4337,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                         return -EINVAL;
                 }
         } else {
-                elements_needed = qeth_get_elements_no(card,(void*) hdr, skb);
+                elements_needed += qeth_get_elements_no(card,(void*) hdr, skb);
                 if (!elements_needed)
                         return -EINVAL;
         }
@@ -4252,12 +4348,12 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
         else
                 rc = qeth_do_send_packet_fast(card, queue, skb, hdr,
                                               elements_needed, ctx);
-do_statistics:
         if (!rc){
                 card->stats.tx_packets++;
                 card->stats.tx_bytes += skb->len;
 #ifdef CONFIG_QETH_PERF_STATS
-                if (skb_shinfo(skb)->tso_size) {
+                if (skb_shinfo(skb)->tso_size &&
+                   !(large_send == QETH_LARGE_SEND_NO)) {
                         card->perf_stats.large_send_bytes += skb->len;
                         card->perf_stats.large_send_cnt++;
                 }
@@ -7154,7 +7250,7 @@ qeth_wait_for_threads(struct qeth_card *card, unsigned long threads)
 }
 
 static int
-qeth_stop_card(struct qeth_card *card)
+qeth_stop_card(struct qeth_card *card, int recovery_mode)
 {
         int rc = 0;
 
@@ -7167,9 +7263,13 @@ qeth_stop_card(struct qeth_card *card)
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
-                rtnl_lock();
-                dev_close(card->dev);
-                rtnl_unlock();
+                if(recovery_mode) {
+                        qeth_stop(card->dev);
+                } else {
+                        rtnl_lock();
+                        dev_close(card->dev);
+                        rtnl_unlock();
+                }
                 if (!card->use_hard_stop) {
                         __u8 *mac = &card->dev->dev_addr[0];
                         rc = qeth_layer2_send_delmac(card, mac);
@@ -7341,13 +7441,17 @@ qeth_register_netdev(struct qeth_card *card)
 }
 
 static void
-qeth_start_again(struct qeth_card *card)
+qeth_start_again(struct qeth_card *card, int recovery_mode)
 {
         QETH_DBF_TEXT(setup ,2, "startag");
 
-        rtnl_lock();
-        dev_open(card->dev);
-        rtnl_unlock();
+        if(recovery_mode) {
+                qeth_open(card->dev);
+        } else {
+                rtnl_lock();
+                dev_open(card->dev);
+                rtnl_unlock();
+        }
         /* this also sets saved unicast addresses */
         qeth_set_multicast_list(card->dev);
 }
@@ -7404,7 +7508,7 @@ static void qeth_make_parameters_consistent(struct qeth_card *card)
 
 
 static int
-qeth_set_online(struct ccwgroup_device *gdev)
+__qeth_set_online(struct ccwgroup_device *gdev, int recovery_mode)
 {
         struct qeth_card *card = gdev->dev.driver_data;
         int rc = 0;
@@ -7464,12 +7568,12 @@ qeth_set_online(struct ccwgroup_device *gdev)
  * we can also use this state for recovery purposes*/
         qeth_set_allowed_threads(card, 0xffffffff, 0);
         if (recover_flag == CARD_STATE_RECOVER)
-                qeth_start_again(card);
+                qeth_start_again(card, recovery_mode);
         qeth_notify_processes();
         return 0;
 out_remove:
         card->use_hard_stop = 1;
-        qeth_stop_card(card);
+        qeth_stop_card(card, 0);
         ccw_device_set_offline(CARD_DDEV(card));
         ccw_device_set_offline(CARD_WDEV(card));
         ccw_device_set_offline(CARD_RDEV(card));
@@ -7480,6 +7584,12 @@ out_remove:
         return -ENODEV;
 }
 
+static int
+qeth_set_online(struct ccwgroup_device *gdev)
+{
+        return __qeth_set_online(gdev, 0);
+}
+
 static struct ccw_device_id qeth_ids[] = {
         {CCW_DEVICE(0x1731, 0x01), driver_info:QETH_CARD_TYPE_OSAE},
         {CCW_DEVICE(0x1731, 0x05), driver_info:QETH_CARD_TYPE_IQD},
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index 240348398211..98bedb0cb387 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -30,7 +30,7 @@ const char *VERSION_QETH_SYS_C = "$Revision: 1.51 $";
 //low/high watermark
 
 static ssize_t
-qeth_dev_state_show(struct device *dev, char *buf)
+qeth_dev_state_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         if (!card)
@@ -58,7 +58,7 @@ qeth_dev_state_show(struct device *dev, char *buf)
 static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL);
 
 static ssize_t
-qeth_dev_chpid_show(struct device *dev, char *buf)
+qeth_dev_chpid_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         if (!card)
@@ -70,7 +70,7 @@ qeth_dev_chpid_show(struct device *dev, char *buf)
 static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL);
 
 static ssize_t
-qeth_dev_if_name_show(struct device *dev, char *buf)
+qeth_dev_if_name_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         if (!card)
@@ -81,7 +81,7 @@ qeth_dev_if_name_show(struct device *dev, char *buf)
 static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);
 
 static ssize_t
-qeth_dev_card_type_show(struct device *dev, char *buf)
+qeth_dev_card_type_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         if (!card)
@@ -93,7 +93,7 @@ qeth_dev_card_type_show(struct device *dev, char *buf)
 static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);
 
 static ssize_t
-qeth_dev_portno_show(struct device *dev, char *buf)
+qeth_dev_portno_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         if (!card)
@@ -103,7 +103,7 @@ qeth_dev_portno_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_portno_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_portno_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -129,7 +129,7 @@ qeth_dev_portno_store(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);
 
 static ssize_t
-qeth_dev_portname_show(struct device *dev, char *buf)
+qeth_dev_portname_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
         char portname[9] = {0, };
@@ -146,7 +146,7 @@ qeth_dev_portname_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_portname_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_portname_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -177,7 +177,7 @@ static DEVICE_ATTR(portname, 0644, qeth_dev_portname_show,
                 qeth_dev_portname_store);
 
 static ssize_t
-qeth_dev_checksum_show(struct device *dev, char *buf)
+qeth_dev_checksum_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -188,7 +188,7 @@ qeth_dev_checksum_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_checksum_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_checksum_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -218,7 +218,7 @@ static DEVICE_ATTR(checksumming, 0644, qeth_dev_checksum_show,
                 qeth_dev_checksum_store);
 
 static ssize_t
-qeth_dev_prioqing_show(struct device *dev, char *buf)
+qeth_dev_prioqing_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -237,7 +237,7 @@ qeth_dev_prioqing_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_prioqing_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_prioqing_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -290,7 +290,7 @@ static DEVICE_ATTR(priority_queueing, 0644, qeth_dev_prioqing_show,
                 qeth_dev_prioqing_store);
 
 static ssize_t
-qeth_dev_bufcnt_show(struct device *dev, char *buf)
+qeth_dev_bufcnt_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -301,7 +301,7 @@ qeth_dev_bufcnt_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_bufcnt_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_bufcnt_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -360,7 +360,7 @@ qeth_dev_route_show(struct qeth_card *card, struct qeth_routing_info *route,
 }
 
 static ssize_t
-qeth_dev_route4_show(struct device *dev, char *buf)
+qeth_dev_route4_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -410,7 +410,7 @@ qeth_dev_route_store(struct qeth_card *card, struct qeth_routing_info *route,
 }
 
 static ssize_t
-qeth_dev_route4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_route4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -425,7 +425,7 @@ static DEVICE_ATTR(route4, 0644, qeth_dev_route4_show, qeth_dev_route4_store);
 
 #ifdef CONFIG_QETH_IPV6
 static ssize_t
-qeth_dev_route6_show(struct device *dev, char *buf)
+qeth_dev_route6_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -439,7 +439,7 @@ qeth_dev_route6_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_route6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_route6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -461,7 +461,7 @@ static DEVICE_ATTR(route6, 0644, qeth_dev_route6_show, qeth_dev_route6_store);
 #endif
 
 static ssize_t
-qeth_dev_add_hhlen_show(struct device *dev, char *buf)
+qeth_dev_add_hhlen_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -472,7 +472,7 @@ qeth_dev_add_hhlen_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_add_hhlen_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_add_hhlen_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -499,7 +499,7 @@ static DEVICE_ATTR(add_hhlen, 0644, qeth_dev_add_hhlen_show,
                    qeth_dev_add_hhlen_store);
 
 static ssize_t
-qeth_dev_fake_ll_show(struct device *dev, char *buf)
+qeth_dev_fake_ll_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -510,7 +510,7 @@ qeth_dev_fake_ll_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_fake_ll_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_fake_ll_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -536,7 +536,7 @@ static DEVICE_ATTR(fake_ll, 0644, qeth_dev_fake_ll_show,
                    qeth_dev_fake_ll_store);
 
 static ssize_t
-qeth_dev_fake_broadcast_show(struct device *dev, char *buf)
+qeth_dev_fake_broadcast_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -547,7 +547,7 @@ qeth_dev_fake_broadcast_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_fake_broadcast_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_fake_broadcast_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -574,7 +574,7 @@ static DEVICE_ATTR(fake_broadcast, 0644, qeth_dev_fake_broadcast_show,
                    qeth_dev_fake_broadcast_store);
 
 static ssize_t
-qeth_dev_recover_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_recover_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -596,7 +596,7 @@ qeth_dev_recover_store(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);
 
 static ssize_t
-qeth_dev_broadcast_mode_show(struct device *dev, char *buf)
+qeth_dev_broadcast_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -613,7 +613,7 @@ qeth_dev_broadcast_mode_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_broadcast_mode_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_broadcast_mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -651,7 +651,7 @@ static DEVICE_ATTR(broadcast_mode, 0644, qeth_dev_broadcast_mode_show,
                    qeth_dev_broadcast_mode_store);
 
 static ssize_t
-qeth_dev_canonical_macaddr_show(struct device *dev, char *buf)
+qeth_dev_canonical_macaddr_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -667,7 +667,7 @@ qeth_dev_canonical_macaddr_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_canonical_macaddr_store(struct device *dev, const char *buf,
+qeth_dev_canonical_macaddr_store(struct device *dev, struct device_attribute *attr, const char *buf,
                                   size_t count)
 {
         struct qeth_card *card = dev->driver_data;
@@ -703,7 +703,7 @@ static DEVICE_ATTR(canonical_macaddr, 0644, qeth_dev_canonical_macaddr_show,
                    qeth_dev_canonical_macaddr_store);
 
 static ssize_t
-qeth_dev_layer2_show(struct device *dev, char *buf)
+qeth_dev_layer2_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -714,7 +714,7 @@ qeth_dev_layer2_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_layer2_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_layer2_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -742,7 +742,7 @@ static DEVICE_ATTR(layer2, 0644, qeth_dev_layer2_show,
                    qeth_dev_layer2_store);
 
 static ssize_t
-qeth_dev_large_send_show(struct device *dev, char *buf)
+qeth_dev_large_send_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -762,7 +762,7 @@ qeth_dev_large_send_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_large_send_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_large_send_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         enum qeth_large_send_types type;
@@ -832,7 +832,7 @@ qeth_dev_blkt_store(struct qeth_card *card, const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_blkt_total_show(struct device *dev, char *buf)
+qeth_dev_blkt_total_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -841,7 +841,7 @@ qeth_dev_blkt_total_show(struct device *dev, char *buf)
 
 
 static ssize_t
-qeth_dev_blkt_total_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_blkt_total_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -855,7 +855,7 @@ static DEVICE_ATTR(total, 0644, qeth_dev_blkt_total_show,
                    qeth_dev_blkt_total_store);
 
 static ssize_t
-qeth_dev_blkt_inter_show(struct device *dev, char *buf)
+qeth_dev_blkt_inter_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -864,7 +864,7 @@ qeth_dev_blkt_inter_show(struct device *dev, char *buf)
 
 
 static ssize_t
-qeth_dev_blkt_inter_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_blkt_inter_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -876,7 +876,7 @@ static DEVICE_ATTR(inter, 0644, qeth_dev_blkt_inter_show,
                    qeth_dev_blkt_inter_store);
 
 static ssize_t
-qeth_dev_blkt_inter_jumbo_show(struct device *dev, char *buf)
+qeth_dev_blkt_inter_jumbo_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -886,7 +886,7 @@ qeth_dev_blkt_inter_jumbo_show(struct device *dev, char *buf)
 
 
 static ssize_t
-qeth_dev_blkt_inter_jumbo_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_blkt_inter_jumbo_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -956,7 +956,7 @@ qeth_check_layer2(struct qeth_card *card)
 
 
 static ssize_t
-qeth_dev_ipato_enable_show(struct device *dev, char *buf)
+qeth_dev_ipato_enable_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -969,7 +969,7 @@ qeth_dev_ipato_enable_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_ipato_enable_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -1004,7 +1004,7 @@ static QETH_DEVICE_ATTR(ipato_enable, enable, 0644,
                         qeth_dev_ipato_enable_store);
 
 static ssize_t
-qeth_dev_ipato_invert4_show(struct device *dev, char *buf)
+qeth_dev_ipato_invert4_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1018,7 +1018,7 @@ qeth_dev_ipato_invert4_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_ipato_invert4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_invert4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -1084,7 +1084,7 @@ qeth_dev_ipato_add_show(char *buf, struct qeth_card *card,
 }
 
 static ssize_t
-qeth_dev_ipato_add4_show(struct device *dev, char *buf)
+qeth_dev_ipato_add4_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1153,7 +1153,7 @@ qeth_dev_ipato_add_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_ipato_add4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1186,7 +1186,7 @@ qeth_dev_ipato_del_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_ipato_del4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1201,7 +1201,7 @@ static QETH_DEVICE_ATTR(ipato_del4, del4, 0200, NULL,
 
 #ifdef CONFIG_QETH_IPV6
 static ssize_t
-qeth_dev_ipato_invert6_show(struct device *dev, char *buf)
+qeth_dev_ipato_invert6_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1215,7 +1215,7 @@ qeth_dev_ipato_invert6_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_ipato_invert6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_invert6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
         char *tmp;
@@ -1247,7 +1247,7 @@ static QETH_DEVICE_ATTR(ipato_invert6, invert6, 0644,
 
 
 static ssize_t
-qeth_dev_ipato_add6_show(struct device *dev, char *buf)
+qeth_dev_ipato_add6_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1258,7 +1258,7 @@ qeth_dev_ipato_add6_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_ipato_add6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1273,7 +1273,7 @@ static QETH_DEVICE_ATTR(ipato_add6, add6, 0644,
                         qeth_dev_ipato_add6_store);
 
 static ssize_t
-qeth_dev_ipato_del6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_ipato_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1341,7 +1341,7 @@ qeth_dev_vipa_add_show(char *buf, struct qeth_card *card,
 }
 
 static ssize_t
-qeth_dev_vipa_add4_show(struct device *dev, char *buf)
+qeth_dev_vipa_add4_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1381,7 +1381,7 @@ qeth_dev_vipa_add_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_vipa_add4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_vipa_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1413,7 +1413,7 @@ qeth_dev_vipa_del_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_vipa_del4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_vipa_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1428,7 +1428,7 @@ static QETH_DEVICE_ATTR(vipa_del4, del4, 0200, NULL,
 
 #ifdef CONFIG_QETH_IPV6
 static ssize_t
-qeth_dev_vipa_add6_show(struct device *dev, char *buf)
+qeth_dev_vipa_add6_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1439,7 +1439,7 @@ qeth_dev_vipa_add6_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_vipa_add6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_vipa_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1454,7 +1454,7 @@ static QETH_DEVICE_ATTR(vipa_add6, add6, 0644,
                         qeth_dev_vipa_add6_store);
 
 static ssize_t
-qeth_dev_vipa_del6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_vipa_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1522,7 +1522,7 @@ qeth_dev_rxip_add_show(char *buf, struct qeth_card *card,
 }
 
 static ssize_t
-qeth_dev_rxip_add4_show(struct device *dev, char *buf)
+qeth_dev_rxip_add4_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1562,7 +1562,7 @@ qeth_dev_rxip_add_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_rxip_add4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_rxip_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1594,7 +1594,7 @@ qeth_dev_rxip_del_store(const char *buf, size_t count,
 }
 
 static ssize_t
-qeth_dev_rxip_del4_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_rxip_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1609,7 +1609,7 @@ static QETH_DEVICE_ATTR(rxip_del4, del4, 0200, NULL,
 
 #ifdef CONFIG_QETH_IPV6
 static ssize_t
-qeth_dev_rxip_add6_show(struct device *dev, char *buf)
+qeth_dev_rxip_add6_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1620,7 +1620,7 @@ qeth_dev_rxip_add6_show(struct device *dev, char *buf)
 }
 
 static ssize_t
-qeth_dev_rxip_add6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_rxip_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
@@ -1635,7 +1635,7 @@ static QETH_DEVICE_ATTR(rxip_add6, add6, 0644,
                         qeth_dev_rxip_add6_store);
 
 static ssize_t
-qeth_dev_rxip_del6_store(struct device *dev, const char *buf, size_t count)
+qeth_dev_rxip_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct qeth_card *card = dev->driver_data;
 
diff --git a/drivers/s390/net/qeth_tso.c b/drivers/s390/net/qeth_tso.c
deleted file mode 100644
index c91976274e7b..000000000000
--- a/drivers/s390/net/qeth_tso.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * linux/drivers/s390/net/qeth_tso.c ($Revision: 1.6 $)
- *
- * Header file for qeth TCP Segmentation Offload support.
- *
- * Copyright 2004 IBM Corporation
- *
- *    Author(s): Frank Pavlic <pavlic@de.ibm.com>
- *
- *    $Revision: 1.6 $   $Date: 2005/03/24 09:04:18 $
- *
- */
-
-#include <linux/skbuff.h>
-#include <linux/tcp.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <net/ip6_checksum.h>
-#include "qeth.h"
-#include "qeth_mpc.h"
-#include "qeth_tso.h"
-
-/**
- * skb already partially prepared
- * classic qdio header in skb->data
- * */
-static inline struct qeth_hdr_tso *
-qeth_tso_prepare_skb(struct qeth_card *card, struct sk_buff **skb)
-{
-        int rc = 0;
-
-        QETH_DBF_TEXT(trace, 5, "tsoprsk");
-        rc = qeth_realloc_headroom(card, skb,sizeof(struct qeth_hdr_ext_tso));
-        if (rc)
-                return NULL;
-
-        return qeth_push_skb(card, skb, sizeof(struct qeth_hdr_ext_tso));
-}
-
-/**
- * fill header for a TSO packet
- */
-static inline void
-qeth_tso_fill_header(struct qeth_card *card, struct sk_buff *skb)
-{
-        struct qeth_hdr_tso *hdr;
-        struct tcphdr *tcph;
-        struct iphdr *iph;
-
-        QETH_DBF_TEXT(trace, 5, "tsofhdr");
-
-        hdr  = (struct qeth_hdr_tso *) skb->data;
-        iph  = skb->nh.iph;
-        tcph = skb->h.th;
-        /*fix header to TSO values ...*/
-        hdr->hdr.hdr.l3.id = QETH_HEADER_TYPE_TSO;
-        /*set values which are fix for the first approach ...*/
-        hdr->ext.hdr_tot_len = (__u16) sizeof(struct qeth_hdr_ext_tso);
-        hdr->ext.imb_hdr_no  = 1;
-        hdr->ext.hdr_type    = 1;
-        hdr->ext.hdr_version = 1;
-        hdr->ext.hdr_len     = 28;
-        /*insert non-fix values */
-        hdr->ext.mss = skb_shinfo(skb)->tso_size;
-        hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
-        hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
-                                       sizeof(struct qeth_hdr_tso));
-}
-
-/**
- * change some header values as requested by hardware
- */
-static inline void
-qeth_tso_set_tcpip_header(struct qeth_card *card, struct sk_buff *skb)
-{
-        struct iphdr *iph;
-        struct ipv6hdr *ip6h;
-        struct tcphdr *tcph;
-
-        iph  = skb->nh.iph;
-        ip6h = skb->nh.ipv6h;
-        tcph = skb->h.th;
-
-        tcph->check = 0;
-        if (skb->protocol == ETH_P_IPV6) {
-                ip6h->payload_len = 0;
-                tcph->check = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
-                                               0, IPPROTO_TCP, 0);
-                return;
-        }
-        /*OSA want us to set these values ...*/
-        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
-                                         0, IPPROTO_TCP, 0);
-        iph->tot_len = 0;
-        iph->check = 0;
-}
-
-static inline struct qeth_hdr_tso *
-qeth_tso_prepare_packet(struct qeth_card *card, struct sk_buff *skb,
-                        int ipv, int cast_type)
-{
-        struct qeth_hdr_tso *hdr;
-        int rc = 0;
-
-        QETH_DBF_TEXT(trace, 5, "tsoprep");
-
-        /*get headroom for tso qdio header */
-        hdr = (struct qeth_hdr_tso *) qeth_tso_prepare_skb(card, &skb);
-        if (hdr == NULL) {
-                QETH_DBF_TEXT_(trace, 4, "2err%d", rc);
-                return NULL;
-        }
-        memset(hdr, 0, sizeof(struct qeth_hdr_tso));
-        /*fill first 32 bytes of  qdio header as used
-         *FIXME: TSO has two struct members
-         * with different names but same size
-         * */
-        qeth_fill_header(card, &hdr->hdr, skb, ipv, cast_type);
-        qeth_tso_fill_header(card, skb);
-        qeth_tso_set_tcpip_header(card, skb);
-        return hdr;
-}
-
-static inline int
-qeth_tso_get_queue_buffer(struct qeth_qdio_out_q *queue)
-{
-        struct qeth_qdio_out_buffer *buffer;
-        int flush_cnt = 0;
-
-        QETH_DBF_TEXT(trace, 5, "tsobuf");
-
-        /* force to non-packing*/
-        if (queue->do_pack)
-                queue->do_pack = 0;
-        buffer = &queue->bufs[queue->next_buf_to_fill];
-        /* get a new buffer if current is already in use*/
-        if ((atomic_read(&buffer->state) == QETH_QDIO_BUF_EMPTY) &&
-            (buffer->next_element_to_fill > 0)) {
-                atomic_set(&buffer->state, QETH_QDIO_BUF_PRIMED);
-                queue->next_buf_to_fill = (queue->next_buf_to_fill + 1) %
-                                          QDIO_MAX_BUFFERS_PER_Q;
-                flush_cnt++;
-        }
-        return flush_cnt;
-}
-
-static inline void
-__qeth_tso_fill_buffer_frag(struct qeth_qdio_out_buffer *buf,
-                          struct sk_buff *skb)
-{
-        struct skb_frag_struct *frag;
-        struct qdio_buffer *buffer;
-        int fragno, cnt, element;
-        unsigned long addr;
-
-        QETH_DBF_TEXT(trace, 6, "tsfilfrg");
-
-        /*initialize variables ...*/
-        fragno = skb_shinfo(skb)->nr_frags;
-        buffer = buf->buffer;
-        element = buf->next_element_to_fill;
-        /*fill buffer elements .....*/
-        for (cnt = 0; cnt < fragno; cnt++) {
-                frag = &skb_shinfo(skb)->frags[cnt];
-                addr = (page_to_pfn(frag->page) << PAGE_SHIFT) +
-                        frag->page_offset;
-                buffer->element[element].addr = (char *)addr;
-                buffer->element[element].length = frag->size;
-                if (cnt < (fragno - 1))
-                        buffer->element[element].flags =
-                                SBAL_FLAGS_MIDDLE_FRAG;
-                else
-                        buffer->element[element].flags =
-                                SBAL_FLAGS_LAST_FRAG;
-                element++;
-        }
-        buf->next_element_to_fill = element;
-}
-
-static inline int
-qeth_tso_fill_buffer(struct qeth_qdio_out_buffer *buf,
-                     struct sk_buff *skb)
-{
-        int length, length_here, element;
-        int hdr_len;
-        struct qdio_buffer *buffer;
-        struct qeth_hdr_tso *hdr;
-        char *data;
-
-        QETH_DBF_TEXT(trace, 3, "tsfilbuf");
-
-        /*increment user count and queue skb ...*/
-        atomic_inc(&skb->users);
-        skb_queue_tail(&buf->skb_list, skb);
-
-        /*initialize all variables...*/
-        buffer = buf->buffer;
-        hdr = (struct qeth_hdr_tso *)skb->data;
-        hdr_len = sizeof(struct qeth_hdr_tso) + hdr->ext.dg_hdr_len;
-        data = skb->data + hdr_len;
-        length = skb->len - hdr_len;
-        element = buf->next_element_to_fill;
-        /*fill first buffer entry only with header information */
-        buffer->element[element].addr = skb->data;
-        buffer->element[element].length = hdr_len;
-        buffer->element[element].flags = SBAL_FLAGS_FIRST_FRAG;
-        buf->next_element_to_fill++;
-
-        if (skb_shinfo(skb)->nr_frags > 0) {
-                 __qeth_tso_fill_buffer_frag(buf, skb);
-                 goto out;
-        }
-
-       /*start filling buffer entries ...*/
-        element++;
-        while (length > 0) {
-                /* length_here is the remaining amount of data in this page */
-                length_here = PAGE_SIZE - ((unsigned long) data % PAGE_SIZE);
-                if (length < length_here)
-                        length_here = length;
-                buffer->element[element].addr = data;
-                buffer->element[element].length = length_here;
-                length -= length_here;
-                if (!length)
-                        buffer->element[element].flags =
-                                SBAL_FLAGS_LAST_FRAG;
-                 else
-                         buffer->element[element].flags =
-                                 SBAL_FLAGS_MIDDLE_FRAG;
-                data += length_here;
-                element++;
-        }
-        /*set the buffer to primed  ...*/
-        buf->next_element_to_fill = element;
-out:
-        atomic_set(&buf->state, QETH_QDIO_BUF_PRIMED);
-        return 1;
-}
-
-int
-qeth_tso_send_packet(struct qeth_card *card, struct sk_buff *skb,
-                     struct qeth_qdio_out_q *queue, int ipv, int cast_type)
-{
-        int flush_cnt = 0;
-        struct qeth_hdr_tso *hdr;
-        struct qeth_qdio_out_buffer *buffer;
-        int start_index;
-
-        QETH_DBF_TEXT(trace, 3, "tsosend");
-
-        if (!(hdr = qeth_tso_prepare_packet(card, skb, ipv, cast_type)))
-                return -ENOMEM;
-        /*check if skb fits in one SBAL ...*/
-        if (!(qeth_get_elements_no(card, (void*)hdr, skb)))
-                return -EINVAL;
-        /*lock queue, force switching to non-packing and send it ...*/
-        while (atomic_compare_and_swap(QETH_OUT_Q_UNLOCKED,
-                                       QETH_OUT_Q_LOCKED,
-                                       &queue->state));
-        start_index = queue->next_buf_to_fill;
-        buffer = &queue->bufs[queue->next_buf_to_fill];
-        /*check if card is too busy ...*/
-        if (atomic_read(&buffer->state) != QETH_QDIO_BUF_EMPTY){
-                card->stats.tx_dropped++;
-                goto out;
-        }
-        /*let's force to non-packing and get a new SBAL*/
-        flush_cnt += qeth_tso_get_queue_buffer(queue);
-        buffer = &queue->bufs[queue->next_buf_to_fill];
-        if (atomic_read(&buffer->state) != QETH_QDIO_BUF_EMPTY) {
-                card->stats.tx_dropped++;
-                goto out;
-        }
-        flush_cnt += qeth_tso_fill_buffer(buffer, skb);
-        queue->next_buf_to_fill = (queue->next_buf_to_fill + 1) %
-                                   QDIO_MAX_BUFFERS_PER_Q;
-out:
-        atomic_set(&queue->state, QETH_OUT_Q_UNLOCKED);
-        if (flush_cnt)
-                qeth_flush_buffers(queue, 0, start_index, flush_cnt);
-        /*do some statistics */
-        card->stats.tx_packets++;
-        card->stats.tx_bytes += skb->len;
-        return 0;
-}
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index 83504dee3f57..ad33e6f466f1 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.4 $)
+ * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.7 $)
  *
  * Header file for qeth TCP Segmentation Offload support.
  *
@@ -7,52 +7,148 @@
  *
  *    Author(s): Frank Pavlic <pavlic@de.ibm.com>
  *
- *    $Revision: 1.4 $   $Date: 2005/03/24 09:04:18 $
+ *    $Revision: 1.7 $   $Date: 2005/05/04 20:19:18 $
  *
  */
 #ifndef __QETH_TSO_H__
 #define __QETH_TSO_H__
 
+#include <linux/skbuff.h>
+#include <linux/tcp.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <net/ip6_checksum.h>
+#include "qeth.h"
+#include "qeth_mpc.h"
 
-extern int
-qeth_tso_send_packet(struct qeth_card *, struct sk_buff *,
-                     struct qeth_qdio_out_q *, int , int);
 
-struct qeth_hdr_ext_tso {
-        __u16 hdr_tot_len;
-        __u8  imb_hdr_no;
-        __u8  reserved;
-        __u8  hdr_type;
-        __u8  hdr_version;
-        __u16 hdr_len;
-        __u32 payload_len;
-        __u16 mss;
-        __u16 dg_hdr_len;
-        __u8  padding[16];
-} __attribute__ ((packed));
+static inline struct qeth_hdr_tso *
+qeth_tso_prepare_skb(struct qeth_card *card, struct sk_buff **skb)
+{
+        QETH_DBF_TEXT(trace, 5, "tsoprsk");
+        return qeth_push_skb(card, skb, sizeof(struct qeth_hdr_tso));
+}
+
+/**
+ * fill header for a TSO packet
+ */
+static inline void
+qeth_tso_fill_header(struct qeth_card *card, struct sk_buff *skb)
+{
+        struct qeth_hdr_tso *hdr;
+        struct tcphdr *tcph;
+        struct iphdr *iph;
+
+        QETH_DBF_TEXT(trace, 5, "tsofhdr");
+
+        hdr  = (struct qeth_hdr_tso *) skb->data;
+        iph  = skb->nh.iph;
+        tcph = skb->h.th;
+        /*fix header to TSO values ...*/
+        hdr->hdr.hdr.l3.id = QETH_HEADER_TYPE_TSO;
+        /*set values which are fix for the first approach ...*/
+        hdr->ext.hdr_tot_len = (__u16) sizeof(struct qeth_hdr_ext_tso);
+        hdr->ext.imb_hdr_no  = 1;
+        hdr->ext.hdr_type    = 1;
+        hdr->ext.hdr_version = 1;
+        hdr->ext.hdr_len     = 28;
+        /*insert non-fix values */
+        hdr->ext.mss = skb_shinfo(skb)->tso_size;
+        hdr->ext.dg_hdr_len = (__u16)(iph->ihl*4 + tcph->doff*4);
+        hdr->ext.payload_len = (__u16)(skb->len - hdr->ext.dg_hdr_len -
+                                       sizeof(struct qeth_hdr_tso));
+}
+
+/**
+ * change some header values as requested by hardware
+ */
+static inline void
+qeth_tso_set_tcpip_header(struct qeth_card *card, struct sk_buff *skb)
+{
+        struct iphdr *iph;
+        struct ipv6hdr *ip6h;
+        struct tcphdr *tcph;
 
-struct qeth_hdr_tso {
-        struct qeth_hdr hdr;    /*hdr->hdr.l3.xxx*/
-        struct qeth_hdr_ext_tso ext;
-} __attribute__ ((packed));
+        iph  = skb->nh.iph;
+        ip6h = skb->nh.ipv6h;
+        tcph = skb->h.th;
 
-/*some helper functions*/
+        tcph->check = 0;
+        if (skb->protocol == ETH_P_IPV6) {
+                ip6h->payload_len = 0;
+                tcph->check = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
+                                               0, IPPROTO_TCP, 0);
+                return;
+        }
+        /*OSA want us to set these values ...*/
+        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                         0, IPPROTO_TCP, 0);
+        iph->tot_len = 0;
+        iph->check = 0;
+}
 
 static inline int
-qeth_get_elements_no(struct qeth_card *card, void *hdr, struct sk_buff *skb)
+qeth_tso_prepare_packet(struct qeth_card *card, struct sk_buff *skb,
+                        int ipv, int cast_type)
+{
+        struct qeth_hdr_tso *hdr;
+
+        QETH_DBF_TEXT(trace, 5, "tsoprep");
+
+        hdr = (struct qeth_hdr_tso *) qeth_tso_prepare_skb(card, &skb);
+        if (hdr == NULL) {
+                QETH_DBF_TEXT(trace, 4, "tsoperr");
+                return -ENOMEM;
+        }
+        memset(hdr, 0, sizeof(struct qeth_hdr_tso));
+        /*fill first 32 bytes of  qdio header as used
+         *FIXME: TSO has two struct members
+         * with different names but same size
+         * */
+        qeth_fill_header(card, &hdr->hdr, skb, ipv, cast_type);
+        qeth_tso_fill_header(card, skb);
+        qeth_tso_set_tcpip_header(card, skb);
+        return 0;
+}
+
+static inline void
+__qeth_fill_buffer_frag(struct sk_buff *skb, struct qdio_buffer *buffer,
+                        int is_tso, int *next_element_to_fill)
 {
-        int elements_needed = 0;
-
-        if (skb_shinfo(skb)->nr_frags > 0)
-                elements_needed = (skb_shinfo(skb)->nr_frags + 1);
-        if (elements_needed == 0 )
-                elements_needed = 1 + (((((unsigned long) hdr) % PAGE_SIZE)
-                                        + skb->len) >> PAGE_SHIFT);
-        if (elements_needed > QETH_MAX_BUFFER_ELEMENTS(card)){
-                PRINT_ERR("qeth_do_send_packet: invalid size of "
-                          "IP packet. Discarded.");
-                return 0;
+        struct skb_frag_struct *frag;
+        int fragno;
+        unsigned long addr;
+        int element, cnt, dlen;
+        
+        fragno = skb_shinfo(skb)->nr_frags;
+        element = *next_element_to_fill;
+        dlen = 0;
+        
+        if (is_tso)
+                buffer->element[element].flags =
+                        SBAL_FLAGS_MIDDLE_FRAG;
+        else
+                buffer->element[element].flags =
+                        SBAL_FLAGS_FIRST_FRAG;
+        if ( (dlen = (skb->len - skb->data_len)) ) {
+                buffer->element[element].addr = skb->data;
+                buffer->element[element].length = dlen;
+                element++;
+        }
+        for (cnt = 0; cnt < fragno; cnt++) {
+                frag = &skb_shinfo(skb)->frags[cnt];
+                addr = (page_to_pfn(frag->page) << PAGE_SHIFT) +
+                        frag->page_offset;
+                buffer->element[element].addr = (char *)addr;
+                buffer->element[element].length = frag->size;
+                if (cnt < (fragno - 1))
+                        buffer->element[element].flags =
+                                SBAL_FLAGS_MIDDLE_FRAG;
+                else
+                        buffer->element[element].flags =
+                                SBAL_FLAGS_LAST_FRAG;
+                element++;
         }
-        return elements_needed;
+        *next_element_to_fill = element;
 }
 #endif /* __QETH_TSO_H__ */
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 68d151aaa474..e17b4d58a9f6 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -97,11 +97,6 @@ MODULE_PARM_DESC(loglevel,
                  "FC ERP QDIO CIO Config FSF SCSI Other, "
                  "levels: 0=none 1=normal 2=devel 3=trace");
 
-#ifdef ZFCP_PRINT_FLAGS
-u32 flags_dump = 0;
-module_param(flags_dump, uint, 0);
-#endif
-
 /****************************************************************/
 /************** Functions without logging ***********************/
 /****************************************************************/
@@ -223,13 +218,20 @@ zfcp_in_els_dbf_event(struct zfcp_adapter *adapter, const char *text,
  * Parse "device=..." parameter string.
  */
 static int __init
-zfcp_device_setup(char *str)
+zfcp_device_setup(char *devstr)
 {
-        char *tmp;
+        char *tmp, *str;
+        size_t len;
 
-        if (!str)
+        if (!devstr)
                 return 0;
 
+        len = strlen(devstr) + 1;
+        str = (char *) kmalloc(len, GFP_KERNEL);
+        if (!str)
+                goto err_out;
+        memcpy(str, devstr, len);
+
         tmp = strchr(str, ',');
         if (!tmp)
                 goto err_out;
@@ -246,10 +248,12 @@ zfcp_device_setup(char *str)
         zfcp_data.init_fcp_lun = simple_strtoull(tmp, &tmp, 0);
         if (*tmp != '\0')
                 goto err_out;
+        kfree(str);
         return 1;
 
  err_out:
         ZFCP_LOG_NORMAL("Parse error for device parameter string %s\n", str);
+        kfree(str);
         return 0;
 }
 
@@ -525,7 +529,7 @@ zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
 
  out:
         if (fsf_req != NULL)
-                zfcp_fsf_req_cleanup(fsf_req);
+                zfcp_fsf_req_free(fsf_req);
 
         if ((adapter != NULL) && (retval != -ENXIO))
                 zfcp_adapter_put(adapter);
@@ -1154,7 +1158,7 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device)
         INIT_LIST_HEAD(&adapter->port_remove_lh);
 
         /* initialize list of fsf requests */
-        rwlock_init(&adapter->fsf_req_list_lock);
+        spin_lock_init(&adapter->fsf_req_list_lock);
         INIT_LIST_HEAD(&adapter->fsf_req_list_head);
 
         /* initialize abort lock */
@@ -1239,9 +1243,9 @@ zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
         zfcp_sysfs_adapter_remove_files(&adapter->ccw_device->dev);
         dev_set_drvdata(&adapter->ccw_device->dev, NULL);
         /* sanity check: no pending FSF requests */
-        read_lock_irqsave(&adapter->fsf_req_list_lock, flags);
+        spin_lock_irqsave(&adapter->fsf_req_list_lock, flags);
         retval = !list_empty(&adapter->fsf_req_list_head);
-        read_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
+        spin_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
         if (retval) {
                 ZFCP_LOG_NORMAL("bug: adapter %s (%p) still in use, "
                                 "%i requests outstanding\n",
@@ -1483,19 +1487,15 @@ zfcp_fsf_incoming_els_rscn(struct zfcp_adapter *adapter,
                 fcp_rscn_element++;
                 switch (fcp_rscn_element->addr_format) {
                 case ZFCP_PORT_ADDRESS:
-                        ZFCP_LOG_FLAGS(1, "ZFCP_PORT_ADDRESS\n");
                         range_mask = ZFCP_PORTS_RANGE_PORT;
                         break;
                 case ZFCP_AREA_ADDRESS:
-                        ZFCP_LOG_FLAGS(1, "ZFCP_AREA_ADDRESS\n");
                         range_mask = ZFCP_PORTS_RANGE_AREA;
                         break;
                 case ZFCP_DOMAIN_ADDRESS:
-                        ZFCP_LOG_FLAGS(1, "ZFCP_DOMAIN_ADDRESS\n");
                         range_mask = ZFCP_PORTS_RANGE_DOMAIN;
                         break;
                 case ZFCP_FABRIC_ADDRESS:
-                        ZFCP_LOG_FLAGS(1, "ZFCP_FABRIC_ADDRESS\n");
                         range_mask = ZFCP_PORTS_RANGE_FABRIC;
                         break;
                 default:
@@ -1762,7 +1762,10 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)
         ct_iu_req = zfcp_sg_to_address(ct->req);
         ct_iu_resp = zfcp_sg_to_address(ct->resp);
 
-        if ((ct->status != 0) || zfcp_check_ct_response(&ct_iu_resp->header)) {
+        if (ct->status != 0)
+                goto failed;
+
+        if (zfcp_check_ct_response(&ct_iu_resp->header)) {
                 /* FIXME: do we need some specific erp entry points */
                 atomic_set_mask(ZFCP_STATUS_PORT_INVALID_WWPN, &port->status);
                 goto failed;
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index c5daf372f853..4103b5be7683 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -62,9 +62,6 @@
 #include <linux/syscalls.h>
 #include <linux/ioctl.h>
 
-/************************ DEBUG FLAGS *****************************************/
-
-#define ZFCP_PRINT_FLAGS
 
 /********************* GENERAL DEFINES *********************************/
 
@@ -152,8 +149,10 @@ typedef u32 scsi_lun_t;
 #define FSF_QTCB_UNSOLICITED_STATUS             0x6305
 #define ZFCP_STATUS_READ_FAILED_THRESHOLD       3
 #define ZFCP_STATUS_READS_RECOM                 FSF_STATUS_READS_RECOM
-#define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES       6
-#define ZFCP_EXCHANGE_CONFIG_DATA_SLEEP         50
+
+/* Do 1st retry in 1 second, then double the timeout for each following retry */
+#define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP   100
+#define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES       7
 
 /* timeout value for "default timer" for fsf requests */
 #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ);
@@ -472,17 +471,6 @@ do { \
         ZFCP_LOG(ZFCP_LOG_LEVEL_TRACE, fmt , ##args)
 #endif
 
-#ifndef ZFCP_PRINT_FLAGS
-# define ZFCP_LOG_FLAGS(level, fmt, args...)
-#else
-extern u32 flags_dump;
-# define ZFCP_LOG_FLAGS(level, fmt, args...) \
-do { \
-        if (level <= flags_dump) \
-                _ZFCP_LOG(fmt, ##args); \
-} while (0)
-#endif
-
 /*************** ADAPTER/PORT/UNIT AND FSF_REQ STATUS FLAGS ******************/
 
 /* 
@@ -502,6 +490,7 @@ do { \
 #define ZFCP_STATUS_COMMON_CLOSING              0x02000000
 #define ZFCP_STATUS_COMMON_ERP_INUSE            0x01000000
 #define ZFCP_STATUS_COMMON_ACCESS_DENIED        0x00800000
+#define ZFCP_STATUS_COMMON_ACCESS_BOXED         0x00400000
 
 /* adapter status */
 #define ZFCP_STATUS_ADAPTER_QDIOUP              0x00000002
@@ -763,6 +752,7 @@ typedef void (*zfcp_send_els_handler_t)(unsigned long);
 /**
  * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els
  * @adapter: adapter where request is sent from
+ * @port: port where ELS is destinated (port reference count has to be increased)
  * @d_id: destiniation id of port where request is sent to
  * @req: scatter-gather list for request
  * @resp: scatter-gather list for response
@@ -777,6 +767,7 @@ typedef void (*zfcp_send_els_handler_t)(unsigned long);
  */
 struct zfcp_send_els {
         struct zfcp_adapter *adapter;
+        struct zfcp_port *port;
         fc_id_t d_id;
         struct scatterlist *req;
         struct scatterlist *resp;
@@ -871,7 +862,7 @@ struct zfcp_adapter {
         u32                     ports;             /* number of remote ports */
         struct timer_list       scsi_er_timer;     /* SCSI err recovery watch */
         struct list_head        fsf_req_list_head; /* head of FSF req list */
-        rwlock_t                fsf_req_list_lock; /* lock for ops on list of
+        spinlock_t              fsf_req_list_lock; /* lock for ops on list of
                                                       FSF requests */
         atomic_t                fsf_reqs_active;   /* # active FSF reqs */
         struct zfcp_qdio_queue  request_queue;     /* request queue */
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 53ebc1cdfe2d..0cf31f7d1c0f 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -35,7 +35,7 @@
 
 #include "zfcp_ext.h"
 
-static int zfcp_erp_adisc(struct zfcp_adapter *, fc_id_t);
+static int zfcp_erp_adisc(struct zfcp_port *);
 static void zfcp_erp_adisc_handler(unsigned long);
 
 static int zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *, int);
@@ -295,12 +295,12 @@ zfcp_erp_unit_shutdown(struct zfcp_unit *unit, int clear_mask)
 
 /**
  * zfcp_erp_adisc - send ADISC ELS command
- * @adapter: adapter structure
- * @d_id: d_id of port where ADISC is sent to
+ * @port: port structure
  */
 int
-zfcp_erp_adisc(struct zfcp_adapter *adapter, fc_id_t d_id)
+zfcp_erp_adisc(struct zfcp_port *port)
 {
+        struct zfcp_adapter *adapter = port->adapter;
         struct zfcp_send_els *send_els;
         struct zfcp_ls_adisc *adisc;
         void *address = NULL;
@@ -332,7 +332,8 @@ zfcp_erp_adisc(struct zfcp_adapter *adapter, fc_id_t d_id)
         send_els->req_count = send_els->resp_count = 1;
 
         send_els->adapter = adapter;
-        send_els->d_id = d_id;
+        send_els->port = port;
+        send_els->d_id = port->d_id;
         send_els->handler = zfcp_erp_adisc_handler;
         send_els->handler_data = (unsigned long) send_els;
 
@@ -350,7 +351,7 @@ zfcp_erp_adisc(struct zfcp_adapter *adapter, fc_id_t d_id)
         ZFCP_LOG_INFO("ADISC request from s_id 0x%08x to d_id 0x%08x "
                       "(wwpn=0x%016Lx, wwnn=0x%016Lx, "
                       "hard_nport_id=0x%08x, nport_id=0x%08x)\n",
-                      adapter->s_id, d_id, (wwn_t) adisc->wwpn,
+                      adapter->s_id, send_els->d_id, (wwn_t) adisc->wwpn,
                       (wwn_t) adisc->wwnn, adisc->hard_nport_id,
                       adisc->nport_id);
 
@@ -367,7 +368,7 @@ zfcp_erp_adisc(struct zfcp_adapter *adapter, fc_id_t d_id)
         retval = zfcp_fsf_send_els(send_els);
         if (retval != 0) {
                 ZFCP_LOG_NORMAL("error: initiation of Send ELS failed for port "
-                                "0x%08x on adapter %s\n", d_id,
+                                "0x%08x on adapter %s\n", send_els->d_id,
                                 zfcp_get_busid_by_adapter(adapter));
                 del_timer(send_els->timer);
                 goto freemem;
@@ -411,14 +412,9 @@ zfcp_erp_adisc_handler(unsigned long data)
         del_timer(send_els->timer);
 
         adapter = send_els->adapter;
+        port = send_els->port;
         d_id = send_els->d_id;
 
-        read_lock(&zfcp_data.config_lock);
-        port = zfcp_get_port_by_did(send_els->adapter, send_els->d_id);
-        read_unlock(&zfcp_data.config_lock);
-
-        BUG_ON(port == NULL);
-
         /* request rejected or timed out */
         if (send_els->status != 0) {
                 ZFCP_LOG_NORMAL("ELS request rejected/timed out, "
@@ -482,7 +478,7 @@ zfcp_test_link(struct zfcp_port *port)
         int retval;
 
         zfcp_port_get(port);
-        retval = zfcp_erp_adisc(port->adapter, port->d_id);
+        retval = zfcp_erp_adisc(port);
         if (retval != 0) {
                 zfcp_port_put(port);
                 ZFCP_LOG_NORMAL("reopen needed for port 0x%016Lx "
@@ -895,7 +891,7 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
 
         if (erp_action->fsf_req) {
                 /* take lock to ensure that request is not being deleted meanwhile */
-                write_lock(&adapter->fsf_req_list_lock);
+                spin_lock(&adapter->fsf_req_list_lock);
                 /* check whether fsf req does still exist */
                 list_for_each_entry(fsf_req, &adapter->fsf_req_list_head, list)
                     if (fsf_req == erp_action->fsf_req)
@@ -938,7 +934,7 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
                          */
                         erp_action->fsf_req = NULL;
                 }
-                write_unlock(&adapter->fsf_req_list_lock);
+                spin_unlock(&adapter->fsf_req_list_lock);
         } else
                 debug_text_event(adapter->erp_dbf, 3, "a_ca_noreq");
 
@@ -2286,12 +2282,12 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
 {
         int retval = ZFCP_ERP_SUCCEEDED;
         int retries;
+        int sleep = ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP;
         struct zfcp_adapter *adapter = erp_action->adapter;
 
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK, &adapter->status);
-        retries = ZFCP_EXCHANGE_CONFIG_DATA_RETRIES;
 
-        do {
+        for (retries = ZFCP_EXCHANGE_CONFIG_DATA_RETRIES; retries; retries--) {
                 atomic_clear_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
                                   &adapter->status);
                 ZFCP_LOG_DEBUG("Doing exchange config data\n");
@@ -2329,16 +2325,17 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
                                       zfcp_get_busid_by_adapter(adapter));
                         break;
                 }
-                if (atomic_test_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
-                                     &adapter->status)) {
-                        ZFCP_LOG_DEBUG("host connection still initialising... "
-                                       "waiting and retrying...\n");
-                        /* sleep a little bit before retry */
-                        msleep(jiffies_to_msecs(ZFCP_EXCHANGE_CONFIG_DATA_SLEEP));
-                }
-        } while ((retries--) &&
-                 atomic_test_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
-                                  &adapter->status));
+
+                if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
+                                     &adapter->status))
+                        break;
+
+                ZFCP_LOG_DEBUG("host connection still initialising... "
+                               "waiting and retrying...\n");
+                /* sleep a little bit before retry */
+                msleep(jiffies_to_msecs(sleep));
+                sleep *= 2;
+        }
 
         if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
                               &adapter->status)) {
@@ -3485,6 +3482,45 @@ zfcp_erp_action_to_ready(struct zfcp_erp_action *erp_action)
 }
 
 /*
+ * function:    zfcp_erp_port_boxed
+ *
+ * purpose:
+ */
+void
+zfcp_erp_port_boxed(struct zfcp_port *port)
+{
+        struct zfcp_adapter *adapter = port->adapter;
+        unsigned long flags;
+
+        debug_text_event(adapter->erp_dbf, 3, "p_access_boxed");
+        debug_event(adapter->erp_dbf, 3, &port->wwpn, sizeof(wwn_t));
+        read_lock_irqsave(&zfcp_data.config_lock, flags);
+        zfcp_erp_modify_port_status(port,
+                        ZFCP_STATUS_COMMON_ACCESS_BOXED,
+                        ZFCP_SET);
+        read_unlock_irqrestore(&zfcp_data.config_lock, flags);
+        zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED);
+}
+
+/*
+ * function:    zfcp_erp_unit_boxed
+ *
+ * purpose:
+ */
+void
+zfcp_erp_unit_boxed(struct zfcp_unit *unit)
+{
+        struct zfcp_adapter *adapter = unit->port->adapter;
+
+        debug_text_event(adapter->erp_dbf, 3, "u_access_boxed");
+        debug_event(adapter->erp_dbf, 3, &unit->fcp_lun, sizeof(fcp_lun_t));
+        zfcp_erp_modify_unit_status(unit,
+                        ZFCP_STATUS_COMMON_ACCESS_BOXED,
+                        ZFCP_SET);
+        zfcp_erp_unit_reopen(unit, ZFCP_STATUS_COMMON_ERP_FAILED);
+}
+
+/*
  * function:    zfcp_erp_port_access_denied
  *
  * purpose:
@@ -3495,11 +3531,13 @@ zfcp_erp_port_access_denied(struct zfcp_port *port)
         struct zfcp_adapter *adapter = port->adapter;
         unsigned long flags;
 
-        debug_text_event(adapter->erp_dbf, 3, "p_access_block");
+        debug_text_event(adapter->erp_dbf, 3, "p_access_denied");
         debug_event(adapter->erp_dbf, 3, &port->wwpn, sizeof(wwn_t));
         read_lock_irqsave(&zfcp_data.config_lock, flags);
-        zfcp_erp_modify_port_status(port, ZFCP_STATUS_COMMON_ERP_FAILED |
-                                    ZFCP_STATUS_COMMON_ACCESS_DENIED, ZFCP_SET);
+        zfcp_erp_modify_port_status(port,
+                        ZFCP_STATUS_COMMON_ERP_FAILED |
+                        ZFCP_STATUS_COMMON_ACCESS_DENIED,
+                        ZFCP_SET);
         read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 }
 
@@ -3513,10 +3551,12 @@ zfcp_erp_unit_access_denied(struct zfcp_unit *unit)
 {
         struct zfcp_adapter *adapter = unit->port->adapter;
 
-        debug_text_event(adapter->erp_dbf, 3, "u_access_block");
+        debug_text_event(adapter->erp_dbf, 3, "u_access_denied");
         debug_event(adapter->erp_dbf, 3, &unit->fcp_lun, sizeof(fcp_lun_t));
-        zfcp_erp_modify_unit_status(unit, ZFCP_STATUS_COMMON_ERP_FAILED |
-                                    ZFCP_STATUS_COMMON_ACCESS_DENIED, ZFCP_SET);
+        zfcp_erp_modify_unit_status(unit,
+                        ZFCP_STATUS_COMMON_ERP_FAILED |
+                        ZFCP_STATUS_COMMON_ACCESS_DENIED,
+                        ZFCP_SET);
 }
 
 /*
@@ -3530,7 +3570,7 @@ zfcp_erp_adapter_access_changed(struct zfcp_adapter *adapter)
         struct zfcp_port *port;
         unsigned long flags;
 
-        debug_text_event(adapter->erp_dbf, 3, "a_access_unblock");
+        debug_text_event(adapter->erp_dbf, 3, "a_access_recover");
         debug_event(adapter->erp_dbf, 3, &adapter->name, 8);
 
         read_lock_irqsave(&zfcp_data.config_lock, flags);
@@ -3553,10 +3593,12 @@ zfcp_erp_port_access_changed(struct zfcp_port *port)
         struct zfcp_adapter *adapter = port->adapter;
         struct zfcp_unit *unit;
 
-        debug_text_event(adapter->erp_dbf, 3, "p_access_unblock");
+        debug_text_event(adapter->erp_dbf, 3, "p_access_recover");
         debug_event(adapter->erp_dbf, 3, &port->wwpn, sizeof(wwn_t));
 
         if (!atomic_test_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED,
+                              &port->status) &&
+            !atomic_test_mask(ZFCP_STATUS_COMMON_ACCESS_BOXED,
                               &port->status)) {
                 if (!atomic_test_mask(ZFCP_STATUS_PORT_WKA, &port->status))
                         list_for_each_entry(unit, &port->unit_list_head, list)
@@ -3583,10 +3625,13 @@ zfcp_erp_unit_access_changed(struct zfcp_unit *unit)
 {
         struct zfcp_adapter *adapter = unit->port->adapter;
 
-        debug_text_event(adapter->erp_dbf, 3, "u_access_unblock");
+        debug_text_event(adapter->erp_dbf, 3, "u_access_recover");
         debug_event(adapter->erp_dbf, 3, &unit->fcp_lun, sizeof(fcp_lun_t));
 
-        if (!atomic_test_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED, &unit->status))
+        if (!atomic_test_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED,
+                              &unit->status) &&
+            !atomic_test_mask(ZFCP_STATUS_COMMON_ACCESS_BOXED,
+                              &unit->status))
                 return;
 
         ZFCP_LOG_NORMAL("reopen of unit 0x%016Lx on port 0x%016Lx "
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index d5fd43352071..42df7e57eeae 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -116,7 +116,7 @@ extern int  zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *,
                                            struct timer_list*, int);
 extern int  zfcp_fsf_req_complete(struct zfcp_fsf_req *);
 extern void zfcp_fsf_incoming_els(struct zfcp_fsf_req *);
-extern void zfcp_fsf_req_cleanup(struct zfcp_fsf_req *);
+extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);
 extern struct zfcp_fsf_req *zfcp_fsf_send_fcp_command_task_management(
         struct zfcp_adapter *, struct zfcp_unit *, u8, int);
 extern struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(
@@ -171,6 +171,8 @@ extern int  zfcp_erp_async_handler(struct zfcp_erp_action *, unsigned long);
 
 extern int  zfcp_test_link(struct zfcp_port *);
 
+extern void zfcp_erp_port_boxed(struct zfcp_port *);
+extern void zfcp_erp_unit_boxed(struct zfcp_unit *);
 extern void zfcp_erp_port_access_denied(struct zfcp_port *);
 extern void zfcp_erp_unit_access_denied(struct zfcp_unit *);
 extern void zfcp_erp_adapter_access_changed(struct zfcp_adapter *);
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 148b11c822bf..0d9f20edc490 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -61,7 +61,6 @@ static int zfcp_fsf_fsfstatus_eval(struct zfcp_fsf_req *);
 static int zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *);
 static int zfcp_fsf_req_dispatch(struct zfcp_fsf_req *);
 static void zfcp_fsf_req_dismiss(struct zfcp_fsf_req *);
-static void zfcp_fsf_req_free(struct zfcp_fsf_req *);
 
 /* association between FSF command and FSF QTCB type */
 static u32 fsf_qtcb_type[] = {
@@ -149,13 +148,13 @@ zfcp_fsf_req_alloc(mempool_t *pool, int req_flags)
  *
  * locks:       none
  */
-static void
+void
 zfcp_fsf_req_free(struct zfcp_fsf_req *fsf_req)
 {
         if (likely(fsf_req->pool != NULL))
                 mempool_free(fsf_req, fsf_req->pool);
-                else
-                        kfree(fsf_req);
+        else
+                kfree(fsf_req);
 }
 
 /*
@@ -170,30 +169,21 @@ zfcp_fsf_req_free(struct zfcp_fsf_req *fsf_req)
 int
 zfcp_fsf_req_dismiss_all(struct zfcp_adapter *adapter)
 {
-        int retval = 0;
         struct zfcp_fsf_req *fsf_req, *tmp;
+        unsigned long flags;
+        LIST_HEAD(remove_queue);
 
-        list_for_each_entry_safe(fsf_req, tmp, &adapter->fsf_req_list_head,
-                                 list)
-            zfcp_fsf_req_dismiss(fsf_req);
-        /* wait_event_timeout? */
-        while (!list_empty(&adapter->fsf_req_list_head)) {
-                ZFCP_LOG_DEBUG("fsf req list of adapter %s not yet empty\n",
-                               zfcp_get_busid_by_adapter(adapter));
-                /* wait for woken intiators to clean up their requests */
-                msleep(jiffies_to_msecs(ZFCP_FSFREQ_CLEANUP_TIMEOUT));
-        }
+        spin_lock_irqsave(&adapter->fsf_req_list_lock, flags);
+        list_splice_init(&adapter->fsf_req_list_head, &remove_queue);
+        atomic_set(&adapter->fsf_reqs_active, 0);
+        spin_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
 
-        /* consistency check */
-        if (atomic_read(&adapter->fsf_reqs_active)) {
-                ZFCP_LOG_NORMAL("bug: There are still %d FSF requests pending "
-                                "on adapter %s after cleanup.\n",
-                                atomic_read(&adapter->fsf_reqs_active),
-                                zfcp_get_busid_by_adapter(adapter));
-                atomic_set(&adapter->fsf_reqs_active, 0);
+        list_for_each_entry_safe(fsf_req, tmp, &remove_queue, list) {
+                list_del(&fsf_req->list);
+                zfcp_fsf_req_dismiss(fsf_req);
         }
 
-        return retval;
+        return 0;
 }
 
 /*
@@ -226,10 +216,6 @@ zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req)
 {
         int retval = 0;
         int cleanup;
-        struct zfcp_adapter *adapter = fsf_req->adapter;
-
-        /* do some statistics */
-        atomic_dec(&adapter->fsf_reqs_active);
 
         if (unlikely(fsf_req->fsf_command == FSF_QTCB_UNSOLICITED_STATUS)) {
                 ZFCP_LOG_DEBUG("Status read response received\n");
@@ -260,7 +246,7 @@ zfcp_fsf_req_complete(struct zfcp_fsf_req *fsf_req)
                  * lock must not be held here since it will be
                  * grabed by the called routine, too
                  */
-                zfcp_fsf_req_cleanup(fsf_req);
+                zfcp_fsf_req_free(fsf_req);
         } else {
                 /* notify initiator waiting for the requests completion */
                 ZFCP_LOG_TRACE("waking initiator of FSF request %p\n",fsf_req);
@@ -346,15 +332,10 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
         switch (fsf_req->qtcb->prefix.prot_status) {
 
         case FSF_PROT_GOOD:
-                ZFCP_LOG_TRACE("FSF_PROT_GOOD\n");
-                break;
-
         case FSF_PROT_FSF_STATUS_PRESENTED:
-                ZFCP_LOG_TRACE("FSF_PROT_FSF_STATUS_PRESENTED\n");
                 break;
 
         case FSF_PROT_QTCB_VERSION_ERROR:
-                ZFCP_LOG_FLAGS(0, "FSF_PROT_QTCB_VERSION_ERROR\n");
                 ZFCP_LOG_NORMAL("error: The adapter %s contains "
                                 "microcode of version 0x%x, the device driver "
                                 "only supports 0x%x. Aborting.\n",
@@ -371,7 +352,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_SEQ_NUMB_ERROR:
-                ZFCP_LOG_FLAGS(0, "FSF_PROT_SEQ_NUMB_ERROR\n");
                 ZFCP_LOG_NORMAL("bug: Sequence number mismatch between "
                                 "driver (0x%x) and adapter %s (0x%x). "
                                 "Restarting all operations on this adapter.\n",
@@ -390,7 +370,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_UNSUPP_QTCB_TYPE:
-                ZFCP_LOG_FLAGS(0, "FSF_PROT_UNSUP_QTCB_TYPE\n");
                 ZFCP_LOG_NORMAL("error: Packet header type used by the "
                                 "device driver is incompatible with "
                                 "that used on adapter %s. "
@@ -405,7 +384,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_HOST_CONNECTION_INITIALIZING:
-                ZFCP_LOG_FLAGS(1, "FSF_PROT_HOST_CONNECTION_INITIALIZING\n");
                 zfcp_cmd_dbf_event_fsf("hconinit", fsf_req,
                                        &fsf_req->qtcb->prefix.prot_status_qual,
                                        sizeof (union fsf_prot_status_qual));
@@ -416,7 +394,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_DUPLICATE_REQUEST_ID:
-                ZFCP_LOG_FLAGS(0, "FSF_PROT_DUPLICATE_REQUEST_IDS\n");
                 if (fsf_req->qtcb) {
                         ZFCP_LOG_NORMAL("bug: The request identifier 0x%Lx "
                                         "to the adapter %s is ambiguous. "
@@ -445,7 +422,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_LINK_DOWN:
-                ZFCP_LOG_FLAGS(1, "FSF_PROT_LINK_DOWN\n");
                 /*
                  * 'test and set' is not atomic here -
                  * it's ok as long as calls to our response queue handler
@@ -502,13 +478,11 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                                         ZFCP_STATUS_COMMON_ERP_FAILED,
                                         &adapter->status);
                         zfcp_erp_adapter_reopen(adapter, 0);
-                        debug_text_event(adapter->erp_dbf, 1, "prot_link_down");
                 }
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
 
         case FSF_PROT_REEST_QUEUE:
-                ZFCP_LOG_FLAGS(1, "FSF_PROT_REEST_QUEUE\n");
                 debug_text_event(adapter->erp_dbf, 1, "prot_reest_queue");
                 ZFCP_LOG_INFO("The local link to adapter with "
                               "%s was re-plugged. "
@@ -528,7 +502,6 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PROT_ERROR_STATE:
-                ZFCP_LOG_FLAGS(0, "FSF_PROT_ERROR_STATE\n");
                 ZFCP_LOG_NORMAL("error: The adapter %s "
                                 "has entered the error state. "
                                 "Restarting all operations on this "
@@ -589,7 +562,6 @@ zfcp_fsf_fsfstatus_eval(struct zfcp_fsf_req *fsf_req)
         /* evaluate FSF Status */
         switch (fsf_req->qtcb->header.fsf_status) {
         case FSF_UNKNOWN_COMMAND:
-                ZFCP_LOG_FLAGS(0, "FSF_UNKNOWN_COMMAND\n");
                 ZFCP_LOG_NORMAL("bug: Command issued by the device driver is "
                                 "not known by the adapter %s "
                                 "Stopping all operations on this adapter. "
@@ -606,14 +578,12 @@ zfcp_fsf_fsfstatus_eval(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_FCP_RSP_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_FCP_RSP_AVAILABLE\n");
                 ZFCP_LOG_DEBUG("FCP Sense data will be presented to the "
                                "SCSI stack.\n");
                 debug_text_event(fsf_req->adapter->erp_dbf, 3, "fsf_s_rsp");
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 debug_text_event(fsf_req->adapter->erp_dbf, 2, "fsf_s_astatus");
                 zfcp_fsf_fsfstatus_qual_eval(fsf_req);
                 break;
@@ -647,11 +617,9 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req)
 
         switch (fsf_req->qtcb->header.fsf_status_qual.word[0]) {
         case FSF_SQ_FCP_RSP_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_SQ_FCP_RSP_AVAILABLE\n");
                 debug_text_event(fsf_req->adapter->erp_dbf, 4, "fsf_sq_rsp");
                 break;
         case FSF_SQ_RETRY_IF_POSSIBLE:
-                ZFCP_LOG_FLAGS(2, "FSF_SQ_RETRY_IF_POSSIBLE\n");
                 /* The SCSI-stack may now issue retries or escalate */
                 debug_text_event(fsf_req->adapter->erp_dbf, 2, "fsf_sq_retry");
                 zfcp_cmd_dbf_event_fsf("sqretry", fsf_req,
@@ -660,7 +628,6 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_SQ_COMMAND_ABORTED:
-                ZFCP_LOG_FLAGS(2, "FSF_SQ_COMMAND_ABORTED\n");
                 /* Carry the aborted state on to upper layer */
                 debug_text_event(fsf_req->adapter->erp_dbf, 2, "fsf_sq_abort");
                 zfcp_cmd_dbf_event_fsf("sqabort", fsf_req,
@@ -670,7 +637,6 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_SQ_NO_RECOM:
-                ZFCP_LOG_FLAGS(0, "FSF_SQ_NO_RECOM\n");
                 debug_text_exception(fsf_req->adapter->erp_dbf, 0,
                                      "fsf_sq_no_rec");
                 ZFCP_LOG_NORMAL("bug: No recommendation could be given for a"
@@ -684,7 +650,6 @@ zfcp_fsf_fsfstatus_qual_eval(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_SQ_ULP_PROGRAMMING_ERROR:
-                ZFCP_LOG_FLAGS(0, "FSF_SQ_ULP_PROGRAMMING_ERROR\n");
                 ZFCP_LOG_NORMAL("error: not enough SBALs for data transfer "
                                 "(adapter %s)\n",
                                 zfcp_get_busid_by_adapter(fsf_req->adapter));
@@ -740,72 +705,58 @@ zfcp_fsf_req_dispatch(struct zfcp_fsf_req *fsf_req)
         switch (fsf_req->fsf_command) {
 
         case FSF_QTCB_FCP_CMND:
-                ZFCP_LOG_FLAGS(3, "FSF_QTCB_FCP_CMND\n");
                 zfcp_fsf_send_fcp_command_handler(fsf_req);
                 break;
 
         case FSF_QTCB_ABORT_FCP_CMND:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_ABORT_FCP_CMND\n");
                 zfcp_fsf_abort_fcp_command_handler(fsf_req);
                 break;
 
         case FSF_QTCB_SEND_GENERIC:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_SEND_GENERIC\n");
                 zfcp_fsf_send_ct_handler(fsf_req);
                 break;
 
         case FSF_QTCB_OPEN_PORT_WITH_DID:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_OPEN_PORT_WITH_DID\n");
                 zfcp_fsf_open_port_handler(fsf_req);
                 break;
 
         case FSF_QTCB_OPEN_LUN:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_OPEN_LUN\n");
                 zfcp_fsf_open_unit_handler(fsf_req);
                 break;
 
         case FSF_QTCB_CLOSE_LUN:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_CLOSE_LUN\n");
                 zfcp_fsf_close_unit_handler(fsf_req);
                 break;
 
         case FSF_QTCB_CLOSE_PORT:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_CLOSE_PORT\n");
                 zfcp_fsf_close_port_handler(fsf_req);
                 break;
 
         case FSF_QTCB_CLOSE_PHYSICAL_PORT:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_CLOSE_PHYSICAL_PORT\n");
                 zfcp_fsf_close_physical_port_handler(fsf_req);
                 break;
 
         case FSF_QTCB_EXCHANGE_CONFIG_DATA:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_EXCHANGE_CONFIG_DATA\n");
                 zfcp_fsf_exchange_config_data_handler(fsf_req);
                 break;
 
         case FSF_QTCB_EXCHANGE_PORT_DATA:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_EXCHANGE_PORT_DATA\n");
                 zfcp_fsf_exchange_port_data_handler(fsf_req);
                 break;
 
         case FSF_QTCB_SEND_ELS:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_SEND_ELS\n");
                 zfcp_fsf_send_els_handler(fsf_req);
                 break;
 
         case FSF_QTCB_DOWNLOAD_CONTROL_FILE:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_DOWNLOAD_CONTROL_FILE\n");
                 zfcp_fsf_control_file_handler(fsf_req);
                 break;
 
         case FSF_QTCB_UPLOAD_CONTROL_FILE:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_UPLOAD_CONTROL_FILE\n");
                 zfcp_fsf_control_file_handler(fsf_req);
                 break;
 
         default:
-                ZFCP_LOG_FLAGS(2, "FSF_QTCB_UNKNOWN\n");
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 ZFCP_LOG_NORMAL("bug: Command issued by the device driver is "
                                 "not supported by the adapter %s\n",
@@ -929,13 +880,11 @@ zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *fsf_req)
         switch (status_buffer->status_subtype) {
 
         case FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT:
-                ZFCP_LOG_FLAGS(2, "FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT\n");
                 debug_text_event(adapter->erp_dbf, 3, "unsol_pc_phys:");
                 zfcp_erp_port_reopen(port, 0);
                 break;
 
         case FSF_STATUS_READ_SUB_ERROR_PORT:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_SUB_ERROR_PORT\n");
                 debug_text_event(adapter->erp_dbf, 1, "unsol_pc_err:");
                 zfcp_erp_port_shutdown(port, 0);
                 break;
@@ -973,14 +922,13 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
 
         if (fsf_req->status & ZFCP_STATUS_FSFREQ_DISMISSED) {
                 mempool_free(status_buffer, adapter->pool.data_status_read);
-                zfcp_fsf_req_cleanup(fsf_req);
+                zfcp_fsf_req_free(fsf_req);
                 goto out;
         }
 
         switch (status_buffer->status_type) {
 
         case FSF_STATUS_READ_PORT_CLOSED:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_PORT_CLOSED\n");
                 debug_text_event(adapter->erp_dbf, 3, "unsol_pclosed:");
                 debug_event(adapter->erp_dbf, 3,
                             &status_buffer->d_id, sizeof (u32));
@@ -988,13 +936,11 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_INCOMING_ELS:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_INCOMING_ELS\n");
                 debug_text_event(adapter->erp_dbf, 3, "unsol_els:");
                 zfcp_fsf_incoming_els(fsf_req);
                 break;
 
         case FSF_STATUS_READ_SENSE_DATA_AVAIL:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_SENSE_DATA_AVAIL\n");
                 debug_text_event(adapter->erp_dbf, 3, "unsol_sense:");
                 ZFCP_LOG_INFO("unsolicited sense data received (adapter %s)\n",
                               zfcp_get_busid_by_adapter(adapter));
@@ -1003,7 +949,6 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_BIT_ERROR_THRESHOLD:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_BIT_ERROR_THRESHOLD\n");
                 debug_text_event(adapter->erp_dbf, 3, "unsol_bit_err:");
                 ZFCP_LOG_NORMAL("Bit error threshold data received:\n");
                 ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_NORMAL,
@@ -1012,7 +957,6 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_LINK_DOWN:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_LINK_DOWN\n");
                 debug_text_event(adapter->erp_dbf, 0, "unsol_link_down:");
                 ZFCP_LOG_INFO("Local link to adapter %s is down\n",
                               zfcp_get_busid_by_adapter(adapter));
@@ -1022,7 +966,6 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_LINK_UP:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_LINK_UP\n");
                 debug_text_event(adapter->erp_dbf, 2, "unsol_link_up:");
                 ZFCP_LOG_INFO("Local link to adapter %s was replugged. "
                               "Restarting operations on this adapter\n",
@@ -1037,7 +980,6 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_CFDC_UPDATED:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_CFDC_UPDATED\n");
                 debug_text_event(adapter->erp_dbf, 2, "unsol_cfdc_update:");
                 ZFCP_LOG_INFO("CFDC has been updated on the adapter %s\n",
                               zfcp_get_busid_by_adapter(adapter));
@@ -1045,7 +987,6 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_STATUS_READ_CFDC_HARDENED:
-                ZFCP_LOG_FLAGS(1, "FSF_STATUS_READ_CFDC_HARDENED\n");
                 debug_text_event(adapter->erp_dbf, 2, "unsol_cfdc_harden:");
                 switch (status_buffer->status_subtype) {
                 case FSF_STATUS_READ_SUB_CFDC_HARDENED_ON_SE:
@@ -1078,7 +1019,7 @@ zfcp_fsf_status_read_handler(struct zfcp_fsf_req *fsf_req)
                 break;
         }
         mempool_free(status_buffer, adapter->pool.data_status_read);
-        zfcp_fsf_req_cleanup(fsf_req);
+        zfcp_fsf_req_free(fsf_req);
         /*
          * recycle buffer and start new request repeat until outbound
          * queue is empty or adapter shutdown is requested
@@ -1214,7 +1155,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
 
         case FSF_PORT_HANDLE_NOT_VALID:
                 if (status_qual >> 4 != status_qual % 0xf) {
-                        ZFCP_LOG_FLAGS(2, "FSF_PORT_HANDLE_NOT_VALID\n");
                         debug_text_event(new_fsf_req->adapter->erp_dbf, 3,
                                          "fsf_s_phand_nv0");
                         /*
@@ -1223,7 +1163,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
                          * fine.
                          */
                 } else {
-                        ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                         ZFCP_LOG_INFO("Temporary port identifier 0x%x for "
                                       "port 0x%016Lx on adapter %s invalid. "
                                       "This may happen occasionally.\n",
@@ -1246,7 +1185,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
         case FSF_LUN_HANDLE_NOT_VALID:
                 if (status_qual >> 4 != status_qual % 0xf) {
                         /* 2 */
-                        ZFCP_LOG_FLAGS(0, "FSF_LUN_HANDLE_NOT_VALID\n");
                         debug_text_event(new_fsf_req->adapter->erp_dbf, 3,
                                          "fsf_s_lhand_nv0");
                         /*
@@ -1255,7 +1193,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
                          * This is fine.
                          */
                 } else {
-                        ZFCP_LOG_FLAGS(1, "FSF_LUN_HANDLE_NOT_VALID\n");
                         ZFCP_LOG_INFO
                             ("Warning: Temporary LUN identifier 0x%x of LUN "
                              "0x%016Lx on port 0x%016Lx on adapter %s is "
@@ -1279,7 +1216,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
                 break;
 
         case FSF_FCP_COMMAND_DOES_NOT_EXIST:
-                ZFCP_LOG_FLAGS(2, "FSF_FCP_COMMAND_DOES_NOT_EXIST\n");
                 retval = 0;
                 debug_text_event(new_fsf_req->adapter->erp_dbf, 3,
                                  "fsf_s_no_exist");
@@ -1287,50 +1223,37 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                /* 2 */
-                ZFCP_LOG_FLAGS(0, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_INFO("Remote port 0x%016Lx on adapter %s needs to "
                               "be reopened\n", unit->port->wwpn,
                               zfcp_get_busid_by_unit(unit));
                 debug_text_event(new_fsf_req->adapter->erp_dbf, 2,
                                  "fsf_s_pboxed");
-                zfcp_erp_port_reopen(unit->port, 0);
+                zfcp_erp_port_boxed(unit->port);
                 new_fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR
                     | ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_LUN_BOXED:
-                ZFCP_LOG_FLAGS(0, "FSF_LUN_BOXED\n");
                 ZFCP_LOG_INFO(
                         "unit 0x%016Lx on port 0x%016Lx on adapter %s needs "
                         "to be reopened\n",
                         unit->fcp_lun, unit->port->wwpn,
                         zfcp_get_busid_by_unit(unit));
                 debug_text_event(new_fsf_req->adapter->erp_dbf, 1, "fsf_s_lboxed");
-                zfcp_erp_unit_reopen(unit, 0);
-                zfcp_cmd_dbf_event_fsf("unitbox", new_fsf_req,
-                        &new_fsf_req->qtcb->header.fsf_status_qual,
-                        sizeof(union fsf_status_qual));
+                zfcp_erp_unit_boxed(unit);
                 new_fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR
                         | ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                /* 2 */
-                ZFCP_LOG_FLAGS(0, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (new_fsf_req->qtcb->header.fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         debug_text_event(new_fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
-                        /* reopening link to port */
-                        zfcp_erp_port_reopen(unit->port, 0);
+                        zfcp_test_link(unit->port);
                         new_fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* SCSI stack will escalate */
                         debug_text_event(new_fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ulp");
@@ -1350,8 +1273,6 @@ zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *new_fsf_req)
                 break;
 
         case FSF_GOOD:
-                /* 3 */
-                ZFCP_LOG_FLAGS(0, "FSF_GOOD\n");
                 retval = 0;
                 new_fsf_req->status |= ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED;
                 break;
@@ -1553,12 +1474,10 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(2,"FSF_GOOD\n");
                 retval = 0;
                 break;
 
         case FSF_SERVICE_CLASS_NOT_SUPPORTED:
-                ZFCP_LOG_FLAGS(2, "FSF_SERVICE_CLASS_NOT_SUPPORTED\n");
                 if (adapter->fc_service_class <= 3) {
                         ZFCP_LOG_INFO("error: adapter %s does not support fc "
                                       "class %d.\n",
@@ -1578,17 +1497,14 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]){
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,"FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         /* reopening link to port */
                         debug_text_event(adapter->erp_dbf, 1, "fsf_sq_ltest");
                         zfcp_test_link(port);
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,"FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* ERP strategy will escalate */
                         debug_text_event(adapter->erp_dbf, 1, "fsf_sq_ulp");
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
@@ -1602,7 +1518,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("access denied, cannot send generic service "
                                 "command (adapter %s, port d_id=0x%08x)\n",
                                 zfcp_get_busid_by_port(port), port->d_id);
@@ -1625,7 +1540,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GENERIC_COMMAND_REJECTED:
-                ZFCP_LOG_FLAGS(2, "FSF_GENERIC_COMMAND_REJECTED\n");
                 ZFCP_LOG_INFO("generic service command rejected "
                               "(adapter %s, port d_id=0x%08x)\n",
                               zfcp_get_busid_by_port(port), port->d_id);
@@ -1638,7 +1552,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_DEBUG("Temporary port identifier 0x%x for port "
                                "0x%016Lx on adapter %s invalid. This may "
                                "happen occasionally.\n", port->handle,
@@ -1653,12 +1566,11 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_INFO("port needs to be reopened "
                               "(adapter %s, port d_id=0x%08x)\n",
                               zfcp_get_busid_by_port(port), port->d_id);
                 debug_text_event(adapter->erp_dbf, 2, "fsf_s_pboxed");
-                zfcp_erp_port_reopen(port, 0);
+                zfcp_erp_port_boxed(port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR
                     | ZFCP_STATUS_FSFREQ_RETRY;
                 break;
@@ -1666,7 +1578,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
         /* following states should never occure, all cases avoided
            in zfcp_fsf_send_ct - but who knows ... */
         case FSF_PAYLOAD_SIZE_MISMATCH:
-                ZFCP_LOG_FLAGS(2, "FSF_PAYLOAD_SIZE_MISMATCH\n");
                 ZFCP_LOG_INFO("payload size mismatch (adapter: %s, "
                               "req_buf_length=%d, resp_buf_length=%d)\n",
                               zfcp_get_busid_by_adapter(adapter),
@@ -1674,7 +1585,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_REQUEST_SIZE_TOO_LARGE:
-                ZFCP_LOG_FLAGS(2, "FSF_REQUEST_SIZE_TOO_LARGE\n");
                 ZFCP_LOG_INFO("request size too large (adapter: %s, "
                               "req_buf_length=%d)\n",
                               zfcp_get_busid_by_adapter(adapter),
@@ -1682,7 +1592,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_RESPONSE_SIZE_TOO_LARGE:
-                ZFCP_LOG_FLAGS(2, "FSF_RESPONSE_SIZE_TOO_LARGE\n");
                 ZFCP_LOG_INFO("response size too large (adapter: %s, "
                               "resp_buf_length=%d)\n",
                               zfcp_get_busid_by_adapter(adapter),
@@ -1690,7 +1599,6 @@ zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
         case FSF_SBAL_MISMATCH:
-                ZFCP_LOG_FLAGS(2, "FSF_SBAL_MISMATCH\n");
                 ZFCP_LOG_INFO("SBAL mismatch (adapter: %s, req_buf_length=%d, "
                               "resp_buf_length=%d)\n",
                               zfcp_get_busid_by_adapter(adapter),
@@ -1846,8 +1754,8 @@ zfcp_fsf_send_els(struct zfcp_send_els *els)
 static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
 {
         struct zfcp_adapter *adapter;
-        fc_id_t d_id;
         struct zfcp_port *port;
+        fc_id_t d_id;
         struct fsf_qtcb_header *header;
         struct fsf_qtcb_bottom_support *bottom;
         struct zfcp_send_els *send_els;
@@ -1856,6 +1764,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
 
         send_els = fsf_req->data.send_els;
         adapter = send_els->adapter;
+        port = send_els->port;
         d_id = send_els->d_id;
         header = &fsf_req->qtcb->header;
         bottom = &fsf_req->qtcb->bottom.support;
@@ -1866,12 +1775,10 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(2, "FSF_GOOD\n");
                 retval = 0;
                 break;
 
         case FSF_SERVICE_CLASS_NOT_SUPPORTED:
-                ZFCP_LOG_FLAGS(2, "FSF_SERVICE_CLASS_NOT_SUPPORTED\n");
                 if (adapter->fc_service_class <= 3) {
                         ZFCP_LOG_INFO("error: adapter %s does "
                                       "not support fibrechannel class %d.\n",
@@ -1891,22 +1798,14 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]){
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,"FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         debug_text_event(adapter->erp_dbf, 1, "fsf_sq_ltest");
-                        if (send_els->ls_code != ZFCP_LS_ADISC) {
-                                read_lock(&zfcp_data.config_lock);
-                                port = zfcp_get_port_by_did(adapter, d_id);
-                                if (port)
-                                        zfcp_test_link(port);
-                                read_unlock(&zfcp_data.config_lock);
-                        }
+                        if (port && (send_els->ls_code != ZFCP_LS_ADISC))
+                                zfcp_test_link(port);
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,"FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         debug_text_event(adapter->erp_dbf, 1, "fsf_sq_ulp");
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         retval =
@@ -1915,7 +1814,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                                               &header->fsf_status_qual.word[2]);
                         break;
                 case FSF_SQ_RETRY_IF_POSSIBLE:
-                        ZFCP_LOG_FLAGS(2, "FSF_SQ_RETRY_IF_POSSIBLE\n");
                         debug_text_event(adapter->erp_dbf, 1, "fsf_sq_retry");
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
@@ -1928,7 +1826,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ELS_COMMAND_REJECTED:
-                ZFCP_LOG_FLAGS(2, "FSF_ELS_COMMAND_REJECTED\n");
                 ZFCP_LOG_INFO("ELS has been rejected because command filter "
                               "prohibited sending "
                               "(adapter: %s, port d_id: 0x%08x)\n",
@@ -1937,7 +1834,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PAYLOAD_SIZE_MISMATCH:
-                ZFCP_LOG_FLAGS(2, "FSF_PAYLOAD_SIZE_MISMATCH\n");
                 ZFCP_LOG_INFO(
                         "ELS request size and ELS response size must be either "
                         "both 0, or both greater than 0 "
@@ -1948,7 +1844,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_REQUEST_SIZE_TOO_LARGE:
-                ZFCP_LOG_FLAGS(2, "FSF_REQUEST_SIZE_TOO_LARGE\n");
                 ZFCP_LOG_INFO(
                         "Length of the ELS request buffer, "
                         "specified in QTCB bottom, "
@@ -1960,7 +1855,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_RESPONSE_SIZE_TOO_LARGE:
-                ZFCP_LOG_FLAGS(2, "FSF_RESPONSE_SIZE_TOO_LARGE\n");
                 ZFCP_LOG_INFO(
                         "Length of the ELS response buffer, "
                         "specified in QTCB bottom, "
@@ -1973,7 +1867,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_SBAL_MISMATCH:
                 /* should never occure, avoided in zfcp_fsf_send_els */
-                ZFCP_LOG_FLAGS(2, "FSF_SBAL_MISMATCH\n");
                 ZFCP_LOG_INFO("SBAL mismatch (adapter: %s, req_buf_length=%d, "
                               "resp_buf_length=%d)\n",
                               zfcp_get_busid_by_adapter(adapter),
@@ -1982,7 +1875,6 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("access denied, cannot send ELS command "
                                 "(adapter %s, port d_id=0x%08x)\n",
                                 zfcp_get_busid_by_adapter(adapter), d_id);
@@ -2000,11 +1892,8 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
                         }
                 }
                 debug_text_event(adapter->erp_dbf, 1, "fsf_s_access");
-                read_lock(&zfcp_data.config_lock);
-                port = zfcp_get_port_by_did(adapter, d_id);
                 if (port != NULL)
                         zfcp_erp_port_access_denied(port);
-                read_unlock(&zfcp_data.config_lock);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
 
@@ -2195,14 +2084,11 @@ zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *fsf_req)
         switch (fsf_req->qtcb->header.fsf_status) {
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(2, "FSF_GOOD\n");
-
                 if (zfcp_fsf_exchange_config_evaluate(fsf_req, 1))
                         return -EIO;
 
                 switch (adapter->fc_topology) {
                 case FSF_TOPO_P2P:
-                        ZFCP_LOG_FLAGS(1, "FSF_TOPO_P2P\n");
                         ZFCP_LOG_NORMAL("Point-to-Point fibrechannel "
                                         "configuration detected at adapter %s\n"
                                         "Peer WWNN 0x%016llx, "
@@ -2216,7 +2102,6 @@ zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *fsf_req)
                                          "top-p-to-p");
                         break;
                 case FSF_TOPO_AL:
-                        ZFCP_LOG_FLAGS(1, "FSF_TOPO_AL\n");
                         ZFCP_LOG_NORMAL("error: Arbitrated loop fibrechannel "
                                         "topology detected at adapter %s "
                                         "unsupported, shutting down adapter\n",
@@ -2226,7 +2111,6 @@ zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *fsf_req)
                         zfcp_erp_adapter_shutdown(adapter, 0);
                         return -EIO;
                 case FSF_TOPO_FABRIC:
-                        ZFCP_LOG_FLAGS(1, "FSF_TOPO_FABRIC\n");
                         ZFCP_LOG_INFO("Switched fabric fibrechannel "
                                       "network detected at adapter %s.\n",
                                       zfcp_get_busid_by_adapter(adapter));
@@ -2357,7 +2241,7 @@ zfcp_fsf_exchange_port_data(struct zfcp_adapter *adapter,
         wait_event(fsf_req->completion_wq,
                    fsf_req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
         del_timer_sync(timer);
-        zfcp_fsf_req_cleanup(fsf_req);
+        zfcp_fsf_req_free(fsf_req);
  out:
         kfree(timer);
         return retval;
@@ -2379,7 +2263,6 @@ zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *fsf_req)
 
         switch (fsf_req->qtcb->header.fsf_status) {
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(2,"FSF_GOOD\n");
                 bottom = &fsf_req->qtcb->bottom.port;
                 memcpy(data, bottom, sizeof(*data));
                 break;
@@ -2481,7 +2364,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_PORT_ALREADY_OPEN:
-                ZFCP_LOG_FLAGS(0, "FSF_PORT_ALREADY_OPEN\n");
                 ZFCP_LOG_NORMAL("bug: remote port 0x%016Lx on adapter %s "
                                 "is already open.\n",
                                 port->wwpn, zfcp_get_busid_by_port(port));
@@ -2494,7 +2376,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("Access denied, cannot open port 0x%016Lx "
                                 "on adapter %s\n",
                                 port->wwpn, zfcp_get_busid_by_port(port));
@@ -2517,7 +2398,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:
-                ZFCP_LOG_FLAGS(1, "FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED\n");
                 ZFCP_LOG_INFO("error: The FSF adapter is out of resources. "
                               "The remote port 0x%016Lx on adapter %s "
                               "could not be opened. Disabling it.\n",
@@ -2529,11 +2409,8 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
                         /* ERP strategy will escalate */
@@ -2546,7 +2423,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_NO_RETRY_POSSIBLE:
-                        ZFCP_LOG_FLAGS(0, "FSF_SQ_NO_RETRY_POSSIBLE\n");
                         ZFCP_LOG_NORMAL("The remote port 0x%016Lx on "
                                         "adapter %s could not be opened. "
                                         "Disabling it.\n",
@@ -2572,7 +2448,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 /* save port handle assigned by FSF */
                 port->handle = header->port_handle;
                 ZFCP_LOG_INFO("The remote port 0x%016Lx via adapter %s "
@@ -2582,6 +2457,9 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 /* mark port as open */
                 atomic_set_mask(ZFCP_STATUS_COMMON_OPEN |
                                 ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
+                atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
+                                  ZFCP_STATUS_COMMON_ACCESS_BOXED,
+                                  &port->status);
                 retval = 0;
                 /* check whether D_ID has changed during open */
                 /*
@@ -2630,7 +2508,6 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
 
         case FSF_UNKNOWN_OP_SUBTYPE:
                 /* should never occure, subtype not set in zfcp_fsf_open_port */
-                ZFCP_LOG_FLAGS(2, "FSF_UNKNOWN_OP_SUBTYPE\n");
                 ZFCP_LOG_INFO("unknown operation subtype (adapter: %s, "
                               "op_subtype=0x%x)\n",
                               zfcp_get_busid_by_port(port),
@@ -2739,7 +2616,6 @@ zfcp_fsf_close_port_handler(struct zfcp_fsf_req *fsf_req)
         switch (fsf_req->qtcb->header.fsf_status) {
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary port identifier 0x%x for port "
                               "0x%016Lx on adapter %s invalid. This may happen "
                               "occasionally.\n", port->handle,
@@ -2755,7 +2631,6 @@ zfcp_fsf_close_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 /* Note: FSF has actually closed the port in this case.
                  * The status code is just daft. Fingers crossed for a change
                  */
@@ -2763,7 +2638,6 @@ zfcp_fsf_close_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 ZFCP_LOG_TRACE("remote port 0x016%Lx on adapter %s closed, "
                                "port handle 0x%x\n", port->wwpn,
                                zfcp_get_busid_by_port(port), port->handle);
@@ -2884,7 +2758,6 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary port identifier 0x%x invalid"
                               "(adapter %s, port 0x%016Lx). "
                               "This may happen occasionally.\n",
@@ -2902,7 +2775,6 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("Access denied, cannot close "
                                 "physical port 0x%016Lx on adapter %s\n",
                                 port->wwpn, zfcp_get_busid_by_port(port));
@@ -2925,32 +2797,26 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_DEBUG("The remote port 0x%016Lx on adapter "
                                "%s needs to be reopened but it was attempted "
                                "to close it physically.\n",
                                port->wwpn,
                                zfcp_get_busid_by_port(port));
                 debug_text_event(fsf_req->adapter->erp_dbf, 1, "fsf_s_pboxed");
-                zfcp_erp_port_reopen(port, 0);
+                zfcp_erp_port_boxed(port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                         ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
                         /* This will now be escalated by ERP */
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* ERP strategy will escalate */
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ulp");
@@ -2970,7 +2836,6 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 ZFCP_LOG_DEBUG("Remote port 0x%016Lx via adapter %s "
                                "physically closed, port handle 0x%x\n",
                                port->wwpn,
@@ -3116,7 +2981,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary port identifier 0x%x "
                               "for port 0x%016Lx on adapter %s invalid "
                               "This may happen occasionally\n",
@@ -3132,7 +2996,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_LUN_ALREADY_OPEN:
-                ZFCP_LOG_FLAGS(0, "FSF_LUN_ALREADY_OPEN\n");
                 ZFCP_LOG_NORMAL("bug: Attempted to open unit 0x%016Lx on "
                                 "remote port 0x%016Lx on adapter %s twice.\n",
                                 unit->fcp_lun,
@@ -3143,7 +3006,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("Access denied, cannot open unit 0x%016Lx on "
                                 "remote port 0x%016Lx on adapter %s\n",
                                 unit->fcp_lun, unit->port->wwpn,
@@ -3169,18 +3031,16 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_DEBUG("The remote port 0x%016Lx on adapter %s "
                                "needs to be reopened\n",
                                unit->port->wwpn, zfcp_get_busid_by_unit(unit));
                 debug_text_event(adapter->erp_dbf, 2, "fsf_s_pboxed");
-                zfcp_erp_port_reopen(unit->port, 0);
+                zfcp_erp_port_boxed(unit->port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                         ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_LUN_SHARING_VIOLATION:
-                ZFCP_LOG_FLAGS(2, "FSF_LUN_SHARING_VIOLATION\n");
                 if (header->fsf_status_qual.word[0] != 0) {
                         ZFCP_LOG_NORMAL("FCP-LUN 0x%Lx at the remote port "
                                         "with WWPN 0x%Lx "
@@ -3224,7 +3084,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED:
-                ZFCP_LOG_FLAGS(1, "FSF_MAXIMUM_NUMBER_OF_LUNS_EXCEEDED\n");
                 ZFCP_LOG_INFO("error: The adapter ran out of resources. "
                               "There is no handle (temporary port identifier) "
                               "available for unit 0x%016Lx on port 0x%016Lx "
@@ -3239,20 +3098,15 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         /* Re-establish link to port */
                         debug_text_event(adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
-                        zfcp_erp_port_reopen(unit->port, 0);
+                        zfcp_test_link(unit->port);
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* ERP strategy will escalate */
                         debug_text_event(adapter->erp_dbf, 1,
                                          "fsf_sq_ulp");
@@ -3271,7 +3125,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_INVALID_COMMAND_OPTION:
-                ZFCP_LOG_FLAGS(2, "FSF_INVALID_COMMAND_OPTION\n");
                 ZFCP_LOG_NORMAL(
                         "Invalid option 0x%x has been specified "
                         "in QTCB bottom sent to the adapter %s\n",
@@ -3282,7 +3135,6 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 /* save LUN handle assigned by FSF */
                 unit->handle = header->lun_handle;
                 ZFCP_LOG_TRACE("unit 0x%016Lx on remote port 0x%016Lx on "
@@ -3293,7 +3145,9 @@ zfcp_fsf_open_unit_handler(struct zfcp_fsf_req *fsf_req)
                                unit->handle);
                 /* mark unit as open */
                 atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &unit->status);
-
+                atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
+                                  ZFCP_STATUS_COMMON_ACCESS_BOXED,
+                                  &unit->status);
                 if (adapter->supported_features & FSF_FEATURE_LUN_SHARING){
                         if (!exclusive)
                                 atomic_set_mask(ZFCP_STATUS_UNIT_SHARED,
@@ -3437,7 +3291,6 @@ zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *fsf_req)
         switch (fsf_req->qtcb->header.fsf_status) {
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary port identifier 0x%x for port "
                               "0x%016Lx on adapter %s invalid. This may "
                               "happen in rare circumstances\n",
@@ -3458,7 +3311,6 @@ zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_LUN_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_LUN_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary LUN identifier 0x%x of unit "
                               "0x%016Lx on port 0x%016Lx on adapter %s is "
                               "invalid. This may happen occasionally.\n",
@@ -3480,32 +3332,26 @@ zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_DEBUG("The remote port 0x%016Lx on adapter %s "
                                "needs to be reopened\n",
                                unit->port->wwpn,
                                zfcp_get_busid_by_unit(unit));
                 debug_text_event(fsf_req->adapter->erp_dbf, 2, "fsf_s_pboxed");
-                zfcp_erp_port_reopen(unit->port, 0);
+                zfcp_erp_port_boxed(unit->port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                         ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (fsf_req->qtcb->header.fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         /* re-establish link to port */
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
-                        zfcp_erp_port_reopen(unit->port, 0);
+                        zfcp_test_link(unit->port);
                         fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* ERP strategy will escalate */
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ulp");
@@ -3526,7 +3372,6 @@ zfcp_fsf_close_unit_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 ZFCP_LOG_TRACE("unit 0x%016Lx on port 0x%016Lx on adapter %s "
                                "closed, port handle 0x%x\n",
                                unit->fcp_lun,
@@ -3622,7 +3467,6 @@ zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
          */
         switch (scsi_cmnd->sc_data_direction) {
         case DMA_NONE:
-                ZFCP_LOG_FLAGS(3, "DMA_NONE\n");
                 fsf_req->qtcb->bottom.io.data_direction = FSF_DATADIR_CMND;
                 /*
                  * FIXME(qdio):
@@ -3632,19 +3476,16 @@ zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
                 sbtype = SBAL_FLAGS0_TYPE_READ;
                 break;
         case DMA_FROM_DEVICE:
-                ZFCP_LOG_FLAGS(3, "DMA_FROM_DEVICE\n");
                 fsf_req->qtcb->bottom.io.data_direction = FSF_DATADIR_READ;
                 sbtype = SBAL_FLAGS0_TYPE_READ;
                 fcp_cmnd_iu->rddata = 1;
                 break;
         case DMA_TO_DEVICE:
-                ZFCP_LOG_FLAGS(3, "DMA_TO_DEVICE\n");
                 fsf_req->qtcb->bottom.io.data_direction = FSF_DATADIR_WRITE;
                 sbtype = SBAL_FLAGS0_TYPE_WRITE;
                 fcp_cmnd_iu->wddata = 1;
                 break;
         case DMA_BIDIRECTIONAL:
-                ZFCP_LOG_FLAGS(0, "DMA_BIDIRECTIONAL not supported\n");
         default:
                 /*
                  * dummy, catch this condition earlier
@@ -3877,7 +3718,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_PORT_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_PORT_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary port identifier 0x%x for port "
                               "0x%016Lx on adapter %s invalid\n",
                               unit->port->handle,
@@ -3892,7 +3732,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_LUN_HANDLE_NOT_VALID:
-                ZFCP_LOG_FLAGS(1, "FSF_LUN_HANDLE_NOT_VALID\n");
                 ZFCP_LOG_INFO("Temporary LUN identifier 0x%x for unit "
                               "0x%016Lx on port 0x%016Lx on adapter %s is "
                               "invalid. This may happen occasionally.\n",
@@ -3911,7 +3750,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_HANDLE_MISMATCH:
-                ZFCP_LOG_FLAGS(0, "FSF_HANDLE_MISMATCH\n");
                 ZFCP_LOG_NORMAL("bug: The port handle 0x%x has changed "
                                 "unexpectedly. (adapter %s, port 0x%016Lx, "
                                 "unit 0x%016Lx)\n",
@@ -3934,7 +3772,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_SERVICE_CLASS_NOT_SUPPORTED:
-                ZFCP_LOG_FLAGS(0, "FSF_SERVICE_CLASS_NOT_SUPPORTED\n");
                 if (fsf_req->adapter->fc_service_class <= 3) {
                         ZFCP_LOG_NORMAL("error: The adapter %s does "
                                         "not support fibrechannel class %d.\n",
@@ -3959,7 +3796,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_FCPLUN_NOT_VALID:
-                ZFCP_LOG_FLAGS(0, "FSF_FCPLUN_NOT_VALID\n");
                 ZFCP_LOG_NORMAL("bug: unit 0x%016Lx on port 0x%016Lx on "
                                 "adapter %s does not have correct unit "
                                 "handle 0x%x\n",
@@ -3982,7 +3818,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_DENIED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_DENIED\n");
                 ZFCP_LOG_NORMAL("Access denied, cannot send FCP command to "
                                 "unit 0x%016Lx on port 0x%016Lx on "
                                 "adapter %s\n", unit->fcp_lun, unit->port->wwpn,
@@ -4006,7 +3841,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_DIRECTION_INDICATOR_NOT_VALID:
-                ZFCP_LOG_FLAGS(0, "FSF_DIRECTION_INDICATOR_NOT_VALID\n");
                 ZFCP_LOG_INFO("bug: Invalid data direction given for unit "
                               "0x%016Lx on port 0x%016Lx on adapter %s "
                               "(debug info %d)\n",
@@ -4026,7 +3860,6 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_CMND_LENGTH_NOT_VALID:
-                ZFCP_LOG_FLAGS(0, "FSF_CMND_LENGTH_NOT_VALID\n");
                 ZFCP_LOG_NORMAL
                     ("bug: An invalid control-data-block length field "
                      "was found in a command for unit 0x%016Lx on port "
@@ -4046,69 +3879,43 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_PORT_BOXED:
-                ZFCP_LOG_FLAGS(2, "FSF_PORT_BOXED\n");
                 ZFCP_LOG_DEBUG("The remote port 0x%016Lx on adapter %s "
                                "needs to be reopened\n",
                                unit->port->wwpn, zfcp_get_busid_by_unit(unit));
                 debug_text_event(fsf_req->adapter->erp_dbf, 2, "fsf_s_pboxed");
-                zfcp_erp_port_reopen(unit->port, 0);
-                zfcp_cmd_dbf_event_fsf("portbox", fsf_req,
-                                       &header->fsf_status_qual,
-                                       sizeof (union fsf_status_qual));
+                zfcp_erp_port_boxed(unit->port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                         ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_LUN_BOXED:
-                ZFCP_LOG_FLAGS(0, "FSF_LUN_BOXED\n");
                 ZFCP_LOG_NORMAL("unit needs to be reopened (adapter %s, "
                                 "wwpn=0x%016Lx, fcp_lun=0x%016Lx)\n",
                                 zfcp_get_busid_by_unit(unit),
                                 unit->port->wwpn, unit->fcp_lun);
                 debug_text_event(fsf_req->adapter->erp_dbf, 1, "fsf_s_lboxed");
-                zfcp_erp_unit_reopen(unit, 0);
-                zfcp_cmd_dbf_event_fsf("unitbox", fsf_req,
-                                       &header->fsf_status_qual,
-                                       sizeof(union fsf_status_qual));
+                zfcp_erp_unit_boxed(unit);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR
                         | ZFCP_STATUS_FSFREQ_RETRY;
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_ADAPTER_STATUS_AVAILABLE\n");
                 switch (header->fsf_status_qual.word[0]) {
                 case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
-                        ZFCP_LOG_FLAGS(2,
-                                       "FSF_SQ_INVOKE_LINK_TEST_PROCEDURE\n");
                         /* re-establish link to port */
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ltest");
-                        zfcp_erp_port_reopen(unit->port, 0);
-                        zfcp_cmd_dbf_event_fsf(
-                                "sqltest",
-                                fsf_req,
-                                &header->fsf_status_qual,
-                                sizeof (union fsf_status_qual));
-                        fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
+                        zfcp_test_link(unit->port);
                         break;
                 case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                        ZFCP_LOG_FLAGS(3,
-                                       "FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED\n");
                         /* FIXME(hw) need proper specs for proper action */
                         /* let scsi stack deal with retries and escalation */
                         debug_text_event(fsf_req->adapter->erp_dbf, 1,
                                          "fsf_sq_ulp");
-                        zfcp_cmd_dbf_event_fsf(
-                                "sqdeperp",
-                                fsf_req,
-                                &header->fsf_status_qual,
-                                sizeof (union fsf_status_qual));
-                        fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                         break;
                 default:
-                        /* FIXME: shall we consider this a successful transfer? */
                         ZFCP_LOG_NORMAL
-                            ("bug: Wrong status qualifier 0x%x arrived.\n",
+                            ("Unknown status qualifier 0x%x arrived.\n",
                              header->fsf_status_qual.word[0]);
                         debug_text_event(fsf_req->adapter->erp_dbf, 0,
                                          "fsf_sq_inval:");
@@ -4117,14 +3924,13 @@ zfcp_fsf_send_fcp_command_handler(struct zfcp_fsf_req *fsf_req)
                                         sizeof(u32));
                         break;
                 }
+                fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(3, "FSF_GOOD\n");
                 break;
 
         case FSF_FCP_RSP_AVAILABLE:
-                ZFCP_LOG_FLAGS(2, "FSF_FCP_RSP_AVAILABLE\n");
                 break;
 
         default:
@@ -4217,14 +4023,12 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
                 ZFCP_LOG_DEBUG("rsp_len is valid\n");
                 switch (fcp_rsp_info[3]) {
                 case RSP_CODE_GOOD:
-                        ZFCP_LOG_FLAGS(3, "RSP_CODE_GOOD\n");
                         /* ok, continue */
                         ZFCP_LOG_TRACE("no failure or Task Management "
                                        "Function complete\n");
                         set_host_byte(&scpnt->result, DID_OK);
                         break;
                 case RSP_CODE_LENGTH_MISMATCH:
-                        ZFCP_LOG_FLAGS(0, "RSP_CODE_LENGTH_MISMATCH\n");
                         /* hardware bug */
                         ZFCP_LOG_NORMAL("bug: FCP response code indictates "
                                         "that the fibrechannel protocol data "
@@ -4242,7 +4046,6 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
                         set_host_byte(&scpnt->result, DID_ERROR);
                         goto skip_fsfstatus;
                 case RSP_CODE_FIELD_INVALID:
-                        ZFCP_LOG_FLAGS(0, "RSP_CODE_FIELD_INVALID\n");
                         /* driver or hardware bug */
                         ZFCP_LOG_NORMAL("bug: FCP response code indictates "
                                         "that the fibrechannel protocol data "
@@ -4261,7 +4064,6 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
                         zfcp_cmd_dbf_event_fsf("codeinv", fsf_req, NULL, 0);
                         goto skip_fsfstatus;
                 case RSP_CODE_RO_MISMATCH:
-                        ZFCP_LOG_FLAGS(0, "RSP_CODE_RO_MISMATCH\n");
                         /* hardware bug */
                         ZFCP_LOG_NORMAL("bug: The FCP response code indicates "
                                         "that conflicting  values for the "
@@ -4407,13 +4209,11 @@ zfcp_fsf_send_fcp_command_task_management_handler(struct zfcp_fsf_req *fsf_req)
         /* check FCP_RSP_INFO */
         switch (fcp_rsp_info[3]) {
         case RSP_CODE_GOOD:
-                ZFCP_LOG_FLAGS(3, "RSP_CODE_GOOD\n");
                 /* ok, continue */
                 ZFCP_LOG_DEBUG("no failure or Task Management "
                                "Function complete\n");
                 break;
         case RSP_CODE_TASKMAN_UNSUPP:
-                ZFCP_LOG_FLAGS(0, "RSP_CODE_TASKMAN_UNSUPP\n");
                 ZFCP_LOG_NORMAL("bug: A reuested task management function "
                                 "is not supported on the target device "
                                 "unit 0x%016Lx, port 0x%016Lx, adapter %s\n ",
@@ -4423,7 +4223,6 @@ zfcp_fsf_send_fcp_command_task_management_handler(struct zfcp_fsf_req *fsf_req)
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP;
                 break;
         case RSP_CODE_TASKMAN_FAILED:
-                ZFCP_LOG_FLAGS(0, "RSP_CODE_TASKMAN_FAILED\n");
                 ZFCP_LOG_NORMAL("bug: A reuested task management function "
                                 "failed to complete successfully. "
                                 "unit 0x%016Lx, port 0x%016Lx, adapter %s.\n",
@@ -4610,7 +4409,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
         switch (header->fsf_status) {
 
         case FSF_GOOD:
-                ZFCP_LOG_FLAGS(2, "FSF_GOOD\n");
                 ZFCP_LOG_NORMAL(
                         "The FSF request has been successfully completed "
                         "on the adapter %s\n",
@@ -4618,7 +4416,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_OPERATION_PARTIALLY_SUCCESSFUL:
-                ZFCP_LOG_FLAGS(2, "FSF_OPERATION_PARTIALLY_SUCCESSFUL\n");
                 if (bottom->operation_subtype == FSF_CFDC_OPERATION_SUBTYPE) {
                         switch (header->fsf_status_qual.word[0]) {
 
@@ -4655,7 +4452,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_AUTHORIZATION_FAILURE:
-                ZFCP_LOG_FLAGS(2, "FSF_AUTHORIZATION_FAILURE\n");
                 ZFCP_LOG_NORMAL(
                         "Adapter %s does not accept privileged commands\n",
                         zfcp_get_busid_by_adapter(adapter));
@@ -4664,7 +4460,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_CFDC_ERROR_DETECTED:
-                ZFCP_LOG_FLAGS(2, "FSF_CFDC_ERROR_DETECTED\n");
                 ZFCP_LOG_NORMAL(
                         "Error at position %d in the CFDC, "
                         "CFDC is discarded by the adapter %s\n",
@@ -4675,7 +4470,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_CONTROL_FILE_UPDATE_ERROR:
-                ZFCP_LOG_FLAGS(2, "FSF_CONTROL_FILE_UPDATE_ERROR\n");
                 ZFCP_LOG_NORMAL(
                         "Adapter %s cannot harden the control file, "
                         "file is discarded\n",
@@ -4685,7 +4479,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_CONTROL_FILE_TOO_LARGE:
-                ZFCP_LOG_FLAGS(2, "FSF_CONTROL_FILE_TOO_LARGE\n");
                 ZFCP_LOG_NORMAL(
                         "Control file is too large, file is discarded "
                         "by the adapter %s\n",
@@ -4695,7 +4488,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_ACCESS_CONFLICT_DETECTED:
-                ZFCP_LOG_FLAGS(2, "FSF_ACCESS_CONFLICT_DETECTED\n");
                 if (bottom->operation_subtype == FSF_CFDC_OPERATION_SUBTYPE)
                         ZFCP_LOG_NORMAL(
                                 "CFDC has been discarded by the adapter %s, "
@@ -4708,7 +4500,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_CONFLICTS_OVERRULED:
-                ZFCP_LOG_FLAGS(2, "FSF_CONFLICTS_OVERRULED\n");
                 if (bottom->operation_subtype == FSF_CFDC_OPERATION_SUBTYPE)
                         ZFCP_LOG_NORMAL(
                                 "CFDC has been activated on the adapter %s, "
@@ -4721,7 +4512,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_UNKNOWN_OP_SUBTYPE:
-                ZFCP_LOG_FLAGS(2, "FSF_UNKNOWN_OP_SUBTYPE\n");
                 ZFCP_LOG_NORMAL("unknown operation subtype (adapter: %s, "
                                 "op_subtype=0x%x)\n",
                                 zfcp_get_busid_by_adapter(adapter),
@@ -4731,7 +4521,6 @@ zfcp_fsf_control_file_handler(struct zfcp_fsf_req *fsf_req)
                 break;
 
         case FSF_INVALID_COMMAND_OPTION:
-                ZFCP_LOG_FLAGS(2, "FSF_INVALID_COMMAND_OPTION\n");
                 ZFCP_LOG_NORMAL(
                         "Invalid option 0x%x has been specified "
                         "in QTCB bottom sent to the adapter %s\n",
@@ -4800,7 +4589,7 @@ zfcp_fsf_req_wait_and_cleanup(struct zfcp_fsf_req *fsf_req,
         *status = fsf_req->status;
 
         /* cleanup request */
-        zfcp_fsf_req_cleanup(fsf_req);
+        zfcp_fsf_req_free(fsf_req);
  out:
         return retval;
 }
@@ -4999,9 +4788,9 @@ zfcp_fsf_req_send(struct zfcp_fsf_req *fsf_req, struct timer_list *timer)
                 inc_seq_no = 0;
 
         /* put allocated FSF request at list tail */
-        write_lock_irqsave(&adapter->fsf_req_list_lock, flags);
+        spin_lock_irqsave(&adapter->fsf_req_list_lock, flags);
         list_add_tail(&fsf_req->list, &adapter->fsf_req_list_head);
-        write_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
+        spin_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
 
         /* figure out expiration time of timeout and start timeout */
         if (unlikely(timer)) {
@@ -5045,9 +4834,9 @@ zfcp_fsf_req_send(struct zfcp_fsf_req *fsf_req, struct timer_list *timer)
                  */
                 if (timer)
                         del_timer(timer);
-                write_lock_irqsave(&adapter->fsf_req_list_lock, flags);
+                spin_lock_irqsave(&adapter->fsf_req_list_lock, flags);
                 list_del(&fsf_req->list);
-                write_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
+                spin_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
                 /*
                  * adjust the number of free SBALs in request queue as well as
                  * position of first one
@@ -5085,25 +4874,4 @@ zfcp_fsf_req_send(struct zfcp_fsf_req *fsf_req, struct timer_list *timer)
         return retval;
 }
 
-/*
- * function:    zfcp_fsf_req_cleanup
- *
- * purpose:     cleans up an FSF request and removes it from the specified list
- *
- * returns:
- *
- * assumption:  no pending SB in SBALEs other than QTCB
- */
-void
-zfcp_fsf_req_cleanup(struct zfcp_fsf_req *fsf_req)
-{
-        struct zfcp_adapter *adapter = fsf_req->adapter;
-        unsigned long flags;
-
-        write_lock_irqsave(&adapter->fsf_req_list_lock, flags);
-        list_del(&fsf_req->list);
-        write_unlock_irqrestore(&adapter->fsf_req_list_lock, flags);
-        zfcp_fsf_req_free(fsf_req);
-}
-
 #undef ZFCP_LOG_AREA
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 06e862d7bc90..24e16ec331d9 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -229,52 +229,14 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter,
                         ZFCP_LOG_TRACE("status is"
                                        " QDIO_STATUS_OUTBOUND_INT \n");
                 }
-        }                       // if (ZFCP_LOG_CHECK(ZFCP_LOG_LEVEL_TRACE))
+        }
         if (unlikely(status & QDIO_STATUS_LOOK_FOR_ERROR)) {
                 retval = -EIO;
 
-                ZFCP_LOG_FLAGS(1, "QDIO_STATUS_LOOK_FOR_ERROR \n");
-
                 ZFCP_LOG_INFO("QDIO problem occurred (status=0x%x, "
                               "qdio_error=0x%x, siga_error=0x%x)\n",
                               status, qdio_error, siga_error);
 
-                if (status & QDIO_STATUS_ACTIVATE_CHECK_CONDITION) {
-                        ZFCP_LOG_FLAGS(2,
-                                       "QDIO_STATUS_ACTIVATE_CHECK_CONDITION\n");
-                }
-                if (status & QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR) {
-                        ZFCP_LOG_FLAGS(2,
-                                       "QDIO_STATUS_MORE_THAN_ONE_QDIO_ERROR\n");
-                }
-                if (status & QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR) {
-                        ZFCP_LOG_FLAGS(2,
-                                       "QDIO_STATUS_MORE_THAN_ONE_SIGA_ERROR\n");
-                }
-
-                if (siga_error & QDIO_SIGA_ERROR_ACCESS_EXCEPTION) {
-                        ZFCP_LOG_FLAGS(2, "QDIO_SIGA_ERROR_ACCESS_EXCEPTION\n");
-                }
-
-                if (siga_error & QDIO_SIGA_ERROR_B_BIT_SET) {
-                        ZFCP_LOG_FLAGS(2, "QDIO_SIGA_ERROR_B_BIT_SET\n");
-                }
-
-                switch (qdio_error) {
-                case 0:
-                        ZFCP_LOG_FLAGS(3, "QDIO_OK");
-                        break;
-                case SLSB_P_INPUT_ERROR:
-                        ZFCP_LOG_FLAGS(1, "SLSB_P_INPUT_ERROR\n");
-                        break;
-                case SLSB_P_OUTPUT_ERROR:
-                        ZFCP_LOG_FLAGS(1, "SLSB_P_OUTPUT_ERROR\n");
-                        break;
-                default:
-                        ZFCP_LOG_NORMAL("bug: unknown QDIO error 0x%x\n",
-                                        qdio_error);
-                        break;
-                }
                 /* Restarting IO on the failed adapter from scratch */
                 debug_text_event(adapter->erp_dbf, 1, "qdio_err");
                /*
@@ -484,37 +446,37 @@ int
 zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, void *sbale_addr)
 {
         struct zfcp_fsf_req *fsf_req;
-        int retval = 0;
 
         /* invalid (per convention used in this driver) */
         if (unlikely(!sbale_addr)) {
                 ZFCP_LOG_NORMAL("bug: invalid reqid\n");
-                retval = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
         /* valid request id and thus (hopefully :) valid fsf_req address */
         fsf_req = (struct zfcp_fsf_req *) sbale_addr;
 
+        /* serialize with zfcp_fsf_req_dismiss_all */
+        spin_lock(&adapter->fsf_req_list_lock);
+        if (list_empty(&adapter->fsf_req_list_head)) {
+                spin_unlock(&adapter->fsf_req_list_lock);
+                return 0;
+        }
+        list_del(&fsf_req->list);
+        atomic_dec(&adapter->fsf_reqs_active);
+        spin_unlock(&adapter->fsf_req_list_lock);
+        
         if (unlikely(adapter != fsf_req->adapter)) {
                 ZFCP_LOG_NORMAL("bug: invalid reqid (fsf_req=%p, "
                                 "fsf_req->adapter=%p, adapter=%p)\n",
                                 fsf_req, fsf_req->adapter, adapter);
-                retval = -EINVAL;
-                goto out;
-        }
-
-        ZFCP_LOG_TRACE("fsf_req at %p, QTCB at %p\n", fsf_req, fsf_req->qtcb);
-        if (likely(fsf_req->qtcb)) {
-                ZFCP_LOG_TRACE("hex dump of QTCB:\n");
-                ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_TRACE, (char *) fsf_req->qtcb,
-                              sizeof(struct fsf_qtcb));
+                return -EINVAL;
         }
 
         /* finish the FSF request */
         zfcp_fsf_req_complete(fsf_req);
- out:
-        return retval;
+
+        return 0;
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index e21b547fd427..b61d309352c3 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -433,7 +433,7 @@ zfcp_port_lookup(struct zfcp_adapter *adapter, int channel, scsi_id_t id)
  *              FAILED  - otherwise
  */
 int
-zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
+__zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
 {
         int retval = SUCCESS;
         struct zfcp_fsf_req *new_fsf_req, *old_fsf_req;
@@ -575,7 +575,7 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
             *(u64 *) & new_fsf_req->qtcb->header.fsf_status_qual.word[0];
         dbf_fsf_qual[1] =
             *(u64 *) & new_fsf_req->qtcb->header.fsf_status_qual.word[2];
-        zfcp_fsf_req_cleanup(new_fsf_req);
+        zfcp_fsf_req_free(new_fsf_req);
 #else
         retval = zfcp_fsf_req_wait_and_cleanup(new_fsf_req,
                                                ZFCP_UNINTERRUPTIBLE, &status);
@@ -611,6 +611,17 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
         return retval;
 }
 
+int
+zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
+{
+        int rc;
+        struct Scsi_Host *scsi_host = scpnt->device->host;
+        spin_lock_irq(scsi_host->host_lock);
+        rc = __zfcp_scsi_eh_abort_handler(scpnt);
+        spin_unlock_irq(scsi_host->host_lock);
+        return rc;
+}
+
 /*
  * function:    zfcp_scsi_eh_device_reset_handler
  *
@@ -625,8 +636,6 @@ zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)
         struct zfcp_unit *unit = (struct zfcp_unit *) scpnt->device->hostdata;
         struct Scsi_Host *scsi_host = scpnt->device->host;
 
-        spin_unlock_irq(scsi_host->host_lock);
-
         if (!unit) {
                 ZFCP_LOG_NORMAL("bug: Tried reset for nonexistent unit\n");
                 retval = SUCCESS;
@@ -669,7 +678,6 @@ zfcp_scsi_eh_device_reset_handler(struct scsi_cmnd *scpnt)
                 retval = SUCCESS;
         }
  out:
-        spin_lock_irq(scsi_host->host_lock);
         return retval;
 }
 
@@ -723,8 +731,6 @@ zfcp_scsi_eh_bus_reset_handler(struct scsi_cmnd *scpnt)
         struct zfcp_unit *unit;
         struct Scsi_Host *scsi_host = scpnt->device->host;
 
-        spin_unlock_irq(scsi_host->host_lock);
-
         unit = (struct zfcp_unit *) scpnt->device->hostdata;
         ZFCP_LOG_NORMAL("bus reset because of problems with "
                         "unit 0x%016Lx\n", unit->fcp_lun);
@@ -732,7 +738,6 @@ zfcp_scsi_eh_bus_reset_handler(struct scsi_cmnd *scpnt)
         zfcp_erp_wait(unit->port->adapter);
         retval = SUCCESS;
 
-        spin_lock_irq(scsi_host->host_lock);
         return retval;
 }
 
@@ -750,8 +755,6 @@ zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
         struct zfcp_unit *unit;
         struct Scsi_Host *scsi_host = scpnt->device->host;
 
-        spin_unlock_irq(scsi_host->host_lock);
-
         unit = (struct zfcp_unit *) scpnt->device->hostdata;
         ZFCP_LOG_NORMAL("host reset because of problems with "
                         "unit 0x%016Lx\n", unit->fcp_lun);
@@ -759,7 +762,6 @@ zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
         zfcp_erp_wait(unit->port->adapter);
         retval = SUCCESS;
 
-        spin_lock_irq(scsi_host->host_lock);
         return retval;
 }
 
@@ -922,7 +924,7 @@ struct fc_function_template zfcp_transport_functions = {
  * Generates attribute for a unit.
  */
 #define ZFCP_DEFINE_SCSI_ATTR(_name, _format, _value)                    \
-static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,        \
+static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, struct device_attribute *attr,        \
                                               char *buf)                 \
 {                                                                        \
         struct scsi_device *sdev;                                        \
diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c
index 23e2dca55bb8..e7345a74800a 100644
--- a/drivers/s390/scsi/zfcp_sysfs_adapter.c
+++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c
@@ -50,7 +50,7 @@ static const char fc_topologies[5][25] = {
  * Generates attributes for an adapter.
  */
 #define ZFCP_DEFINE_ADAPTER_ATTR(_name, _format, _value)                      \
-static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev,          \
+static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, struct device_attribute *attr,          \
                                                  char *buf)                   \
 {                                                                             \
         struct zfcp_adapter *adapter;                                         \
@@ -90,7 +90,7 @@ ZFCP_DEFINE_ADAPTER_ATTR(in_recovery, "%d\n", atomic_test_mask
  * Store function of the "port_add" attribute of an adapter.
  */
 static ssize_t
-zfcp_sysfs_port_add_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_port_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         wwn_t wwpn;
         char *endp;
@@ -135,7 +135,7 @@ static DEVICE_ATTR(port_add, S_IWUSR, NULL, zfcp_sysfs_port_add_store);
  * Store function of the "port_remove" attribute of an adapter.
  */
 static ssize_t
-zfcp_sysfs_port_remove_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_port_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct zfcp_adapter *adapter;
         struct zfcp_port *port;
@@ -196,7 +196,7 @@ static DEVICE_ATTR(port_remove, S_IWUSR, NULL, zfcp_sysfs_port_remove_store);
  * started for the belonging adapter.
  */
 static ssize_t
-zfcp_sysfs_adapter_failed_store(struct device *dev,
+zfcp_sysfs_adapter_failed_store(struct device *dev, struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
         struct zfcp_adapter *adapter;
@@ -236,7 +236,7 @@ zfcp_sysfs_adapter_failed_store(struct device *dev,
  * "0" if adapter is working, otherwise "1".
  */
 static ssize_t
-zfcp_sysfs_adapter_failed_show(struct device *dev, char *buf)
+zfcp_sysfs_adapter_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct zfcp_adapter *adapter;
 
diff --git a/drivers/s390/scsi/zfcp_sysfs_port.c b/drivers/s390/scsi/zfcp_sysfs_port.c
index 6aafb2abb4b5..7a84c7d474d9 100644
--- a/drivers/s390/scsi/zfcp_sysfs_port.c
+++ b/drivers/s390/scsi/zfcp_sysfs_port.c
@@ -53,7 +53,7 @@ zfcp_sysfs_port_release(struct device *dev)
  * Generates attributes for a port.
  */
 #define ZFCP_DEFINE_PORT_ATTR(_name, _format, _value)                    \
-static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev,        \
+static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev, struct device_attribute *attr,        \
                                               char *buf)                 \
 {                                                                        \
         struct zfcp_port *port;                                          \
@@ -82,7 +82,7 @@ ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask
  * Store function of the "unit_add" attribute of a port.
  */
 static ssize_t
-zfcp_sysfs_unit_add_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_unit_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         fcp_lun_t fcp_lun;
         char *endp;
@@ -125,7 +125,7 @@ static DEVICE_ATTR(unit_add, S_IWUSR, NULL, zfcp_sysfs_unit_add_store);
  * @count: number of bytes in buffer
  */
 static ssize_t
-zfcp_sysfs_unit_remove_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_unit_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct zfcp_port *port;
         struct zfcp_unit *unit;
@@ -186,7 +186,7 @@ static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);
  * started for the belonging port.
  */
 static ssize_t
-zfcp_sysfs_port_failed_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_port_failed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct zfcp_port *port;
         unsigned int val;
@@ -224,7 +224,7 @@ zfcp_sysfs_port_failed_store(struct device *dev, const char *buf, size_t count)
  * "0" if port is working, otherwise "1".
  */
 static ssize_t
-zfcp_sysfs_port_failed_show(struct device *dev, char *buf)
+zfcp_sysfs_port_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct zfcp_port *port;
 
diff --git a/drivers/s390/scsi/zfcp_sysfs_unit.c b/drivers/s390/scsi/zfcp_sysfs_unit.c
index 87c0b461831f..0556642c9e1d 100644
--- a/drivers/s390/scsi/zfcp_sysfs_unit.c
+++ b/drivers/s390/scsi/zfcp_sysfs_unit.c
@@ -53,7 +53,7 @@ zfcp_sysfs_unit_release(struct device *dev)
  * Generates attribute for a unit.
  */
 #define ZFCP_DEFINE_UNIT_ATTR(_name, _format, _value)                    \
-static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev,        \
+static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, struct device_attribute *attr,        \
                                               char *buf)                 \
 {                                                                        \
         struct zfcp_unit *unit;                                          \
@@ -86,7 +86,7 @@ ZFCP_DEFINE_UNIT_ATTR(access_readonly, "%d\n", atomic_test_mask
  * started for the belonging unit.
  */
 static ssize_t
-zfcp_sysfs_unit_failed_store(struct device *dev, const char *buf, size_t count)
+zfcp_sysfs_unit_failed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct zfcp_unit *unit;
         unsigned int val;
@@ -123,7 +123,7 @@ zfcp_sysfs_unit_failed_store(struct device *dev, const char *buf, size_t count)
  * "0" if unit is working, otherwise "1".
  */
 static ssize_t
-zfcp_sysfs_unit_failed_show(struct device *dev, char *buf)
+zfcp_sysfs_unit_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct zfcp_unit *unit;
 
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index a2b18f5a4f93..34dbc37a79d4 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1695,8 +1695,6 @@ static int twa_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
 
-        spin_unlock_irq(tw_dev->host->host_lock);
-
         tw_dev->num_resets++;
 
         printk(KERN_WARNING "3w-9xxx: scsi%d: WARNING: (0x%02X:0x%04X): Unit #%d: Command (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, TW_DRIVER, 0x2c, SCpnt->device->id, SCpnt->cmnd[0]);
@@ -1709,7 +1707,6 @@ static int twa_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         retval = SUCCESS;
 out:
-        spin_lock_irq(tw_dev->host->host_lock);
         return retval;
 } /* End twa_scsi_eh_reset() */
 
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 48f9ece1cbd0..b6dc576da430 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1430,8 +1430,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
 
-        spin_unlock_irq(tw_dev->host->host_lock);
-
         tw_dev->num_resets++;
 
         printk(KERN_WARNING "3w-xxxx: scsi%d: WARNING: Unit #%d: Command (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, SCpnt->device->id, SCpnt->cmnd[0]);
@@ -1444,7 +1442,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         retval = SUCCESS;
 out:
-        spin_lock_irq(tw_dev->host->host_lock);
         return retval;
 } /* End tw_scsi_eh_reset() */
 
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 4b1bb529f676..a7620fc368e7 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -170,7 +170,6 @@ MODULE_LICENSE("GPL");
 STATIC int NCR_700_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *));
 STATIC int NCR_700_abort(struct scsi_cmnd * SCpnt);
 STATIC int NCR_700_bus_reset(struct scsi_cmnd * SCpnt);
-STATIC int NCR_700_dev_reset(struct scsi_cmnd * SCpnt);
 STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt);
 STATIC void NCR_700_chip_setup(struct Scsi_Host *host);
 STATIC void NCR_700_chip_reset(struct Scsi_Host *host);
@@ -330,7 +329,6 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         /* Fill in the missing routines from the host template */
         tpnt->queuecommand = NCR_700_queuecommand;
         tpnt->eh_abort_handler = NCR_700_abort;
-        tpnt->eh_device_reset_handler = NCR_700_dev_reset;
         tpnt->eh_bus_reset_handler = NCR_700_bus_reset;
         tpnt->eh_host_reset_handler = NCR_700_host_reset;
         tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST;
@@ -1959,34 +1957,31 @@ NCR_700_bus_reset(struct scsi_cmnd * SCp)
         printk(KERN_INFO "scsi%d (%d:%d) New error handler wants BUS reset, cmd %p\n\t",
                SCp->device->host->host_no, SCp->device->id, SCp->device->lun, SCp);
         scsi_print_command(SCp);
+
         /* In theory, eh_complete should always be null because the
          * eh is single threaded, but just in case we're handling a
          * reset via sg or something */
-        while(hostdata->eh_complete != NULL) {
+        spin_lock_irq(SCp->device->host->host_lock);
+        while (hostdata->eh_complete != NULL) {
                 spin_unlock_irq(SCp->device->host->host_lock);
                 msleep_interruptible(100);
                 spin_lock_irq(SCp->device->host->host_lock);
         }
+
         hostdata->eh_complete = &complete;
         NCR_700_internal_bus_reset(SCp->device->host);
+
         spin_unlock_irq(SCp->device->host->host_lock);
         wait_for_completion(&complete);
         spin_lock_irq(SCp->device->host->host_lock);
+
         hostdata->eh_complete = NULL;
         /* Revalidate the transport parameters of the failing device */
         if(hostdata->fast)
                 spi_schedule_dv_device(SCp->device);
-        return SUCCESS;
-}
 
-STATIC int
-NCR_700_dev_reset(struct scsi_cmnd * SCp)
-{
-        printk(KERN_INFO "scsi%d (%d:%d) New error handler wants device reset\n\t",
-               SCp->device->host->host_no, SCp->device->id, SCp->device->lun);
-        scsi_print_command(SCp);
-        
-        return FAILED;
+        spin_unlock_irq(SCp->device->host->host_lock);
+        return SUCCESS;
 }
 
 STATIC int
@@ -1996,8 +1991,13 @@ NCR_700_host_reset(struct scsi_cmnd * SCp)
                SCp->device->host->host_no, SCp->device->id, SCp->device->lun);
         scsi_print_command(SCp);
 
+        spin_lock_irq(SCp->device->host->host_lock);
+
         NCR_700_internal_bus_reset(SCp->device->host);
         NCR_700_chip_reset(SCp->device->host);
+
+        spin_unlock_irq(SCp->device->host->host_lock);
+
         return SUCCESS;
 }
 
@@ -2125,7 +2125,7 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
 }
 
 static ssize_t
-NCR_700_show_active_tags(struct device *dev, char *buf)
+NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *SDp = to_scsi_device(dev);
 
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 15e4b122d56e..9d6040bfa064 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2746,9 +2746,15 @@ static int BusLogic_host_reset(struct scsi_cmnd * SCpnt)
 
         unsigned int id = SCpnt->device->id;
         struct BusLogic_TargetStatistics *stats = &HostAdapter->TargetStatistics[id];
+        int rc;
+
+        spin_lock_irq(SCpnt->device->host->host_lock);
+
         BusLogic_IncrementErrorCounter(&stats->HostAdapterResetsRequested);
 
-        return BusLogic_ResetHostAdapter(HostAdapter, false);
+        rc = BusLogic_ResetHostAdapter(HostAdapter, false);
+        spin_unlock_irq(SCpnt->device->host->host_lock);
+        return rc;
 }
 
 /*
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index 56a695c6ab52..5beed4f6d985 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -22,8 +22,6 @@
 #ifndef CONFIG_SCSI_OMIT_FLASHPOINT
 
 
-#define UNIX
-#define FW_TYPE         _SCCB_MGR_
 #define MAX_CARDS       8
 #undef BUSTYPE_PCI
 
@@ -34,8 +32,6 @@
 #define OS_OutPortByte(port, value)     outb(value, port)
 #define OS_OutPortWord(port, value)     outw(value, port)
 #define OS_OutPortLong(port, value)     outl(value, port)
-#define OS_Lock(x)
-#define OS_UnLock(x)
 
 
 /*
@@ -51,164 +47,17 @@
 #define SccbMgr_isr                     FlashPoint_HandleInterrupt
 
 
-/*
-  Define name replacements to avoid kernel namespace pollution.
-*/
-
-#define BL_Card                         FPT_BL_Card
-#define BusMasterInit                   FPT_BusMasterInit
-#define CalcCrc16                       FPT_CalcCrc16
-#define CalcLrc                         FPT_CalcLrc
-#define ChkIfChipInitialized            FPT_ChkIfChipInitialized
-#define DiagBusMaster                   FPT_DiagBusMaster
-#define DiagEEPROM                      FPT_DiagEEPROM
-#define DiagXbow                        FPT_DiagXbow
-#define GetTarLun                       FPT_GetTarLun
-#define RNVRamData                      FPT_RNVRamData
-#define RdStack                         FPT_RdStack
-#define SccbMgrTableInitAll             FPT_SccbMgrTableInitAll
-#define SccbMgrTableInitCard            FPT_SccbMgrTableInitCard
-#define SccbMgrTableInitTarget          FPT_SccbMgrTableInitTarget
-#define SccbMgr_bad_isr                 FPT_SccbMgr_bad_isr
-#define SccbMgr_scsi_reset              FPT_SccbMgr_scsi_reset
-#define SccbMgr_timer_expired           FPT_SccbMgr_timer_expired
-#define SendMsg                         FPT_SendMsg
-#define Wait                            FPT_Wait
-#define Wait1Second                     FPT_Wait1Second
-#define WrStack                         FPT_WrStack
-#define XbowInit                        FPT_XbowInit
-#define autoCmdCmplt                    FPT_autoCmdCmplt
-#define autoLoadDefaultMap              FPT_autoLoadDefaultMap
-#define busMstrDataXferStart            FPT_busMstrDataXferStart
-#define busMstrSGDataXferStart          FPT_busMstrSGDataXferStart
-#define busMstrTimeOut                  FPT_busMstrTimeOut
-#define dataXferProcessor               FPT_dataXferProcessor
-#define default_intena                  FPT_default_intena
-#define hostDataXferAbort               FPT_hostDataXferAbort
-#define hostDataXferRestart             FPT_hostDataXferRestart
-#define inisci                          FPT_inisci
-#define mbCards                         FPT_mbCards
-#define nvRamInfo                       FPT_nvRamInfo
-#define phaseBusFree                    FPT_phaseBusFree
-#define phaseChkFifo                    FPT_phaseChkFifo
-#define phaseCommand                    FPT_phaseCommand
-#define phaseDataIn                     FPT_phaseDataIn
-#define phaseDataOut                    FPT_phaseDataOut
-#define phaseDecode                     FPT_phaseDecode
-#define phaseIllegal                    FPT_phaseIllegal
-#define phaseMsgIn                      FPT_phaseMsgIn
-#define phaseMsgOut                     FPT_phaseMsgOut
-#define phaseStatus                     FPT_phaseStatus
-#define queueAddSccb                    FPT_queueAddSccb
-#define queueCmdComplete                FPT_queueCmdComplete
-#define queueDisconnect                 FPT_queueDisconnect
-#define queueFindSccb                   FPT_queueFindSccb
-#define queueFlushSccb                  FPT_queueFlushSccb
-#define queueFlushTargSccb              FPT_queueFlushTargSccb
-#define queueSearchSelect               FPT_queueSearchSelect
-#define queueSelectFail                 FPT_queueSelectFail
-#define s_PhaseTbl                      FPT_s_PhaseTbl
-#define scamHAString                    FPT_scamHAString
-#define scamInfo                        FPT_scamInfo
-#define scarb                           FPT_scarb
-#define scasid                          FPT_scasid
-#define scbusf                          FPT_scbusf
-#define sccbMgrTbl                      FPT_sccbMgrTbl
-#define schkdd                          FPT_schkdd
-#define scini                           FPT_scini
-#define sciso                           FPT_sciso
-#define scmachid                        FPT_scmachid
-#define scsavdi                         FPT_scsavdi
-#define scsel                           FPT_scsel
-#define scsell                          FPT_scsell
-#define scsendi                         FPT_scsendi
-#define scvalq                          FPT_scvalq
-#define scwirod                         FPT_scwirod
-#define scwiros                         FPT_scwiros
-#define scwtsel                         FPT_scwtsel
-#define scxferc                         FPT_scxferc
-#define sdecm                           FPT_sdecm
-#define sfm                             FPT_sfm
-#define shandem                         FPT_shandem
-#define sinits                          FPT_sinits
-#define sisyncn                         FPT_sisyncn
-#define sisyncr                         FPT_sisyncr
-#define siwidn                          FPT_siwidn
-#define siwidr                          FPT_siwidr
-#define sres                            FPT_sres
-#define sresb                           FPT_sresb
-#define ssel                            FPT_ssel
-#define ssenss                          FPT_ssenss
-#define sssyncv                         FPT_sssyncv
-#define stsyncn                         FPT_stsyncn
-#define stwidn                          FPT_stwidn
-#define sxfrp                           FPT_sxfrp
-#define utilEERead                      FPT_utilEERead
-#define utilEEReadOrg                   FPT_utilEEReadOrg
-#define utilEESendCmdAddr               FPT_utilEESendCmdAddr
-#define utilEEWrite                     FPT_utilEEWrite
-#define utilEEWriteOnOff                FPT_utilEEWriteOnOff
-#define utilUpdateResidual              FPT_utilUpdateResidual
-
-
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   globals.h  $
- *
- *   Description:  Common shared global defines.
- *
- *   $Date: 1996/09/04 01:26:13 $
- *
- *   $Revision: 1.11 $
- *
- *----------------------------------------------------------------------*/
-#ifndef __GLOBALS_H__
-#define __GLOBALS_H__
-
-#define _UCB_MGR_  1
-#define _SCCB_MGR_ 2
-
-/*#include <osflags.h>*/
-
 #define MAX_CDBLEN  12
 
 #define SCAM_LEV_2      1
 
 #define CRCMASK 0xA001
 
-/*  In your osflags.h file, please ENSURE that only ONE OS FLAG 
-    is on at a time !!! Also, please make sure you turn set the 
-         variable FW_TYPE to either _UCB_MGR_ or _SCCB_MGR_  !!! */
-
-#if defined(DOS) || defined(WIN95_16) || defined(OS2) || defined(OTHER_16)
-   #define       COMPILER_16_BIT 1
-#elif defined(NETWARE) || defined(NT) || defined(WIN95_32) || defined(UNIX) || defined(OTHER_32) || defined(SOLARIS_REAL_MODE)
-   #define       COMPILER_32_BIT 1
-#endif
-
-
 #define     BL_VENDOR_ID      0x104B
 #define     FP_DEVICE_ID      0x8130
 #define     MM_DEVICE_ID      0x1040
 
 
-#ifndef FALSE
-#define FALSE           0
-#endif
-#ifndef TRUE
-#define TRUE            (!(FALSE))
-#endif
-
-#ifndef NULL
-#define NULL            0
-#endif
-
 #define FAILURE         0xFFFFFFFFL
 
 
@@ -222,27 +71,11 @@ typedef unsigned long * PULONG;
 typedef void *          PVOID;
 
 
-#if defined(COMPILER_16_BIT)
-typedef unsigned char far       * uchar_ptr;
-typedef unsigned short far      * ushort_ptr;
-typedef unsigned long far       * ulong_ptr;
-#endif  /* 16_BIT_COMPILER */
-
-#if defined(COMPILER_32_BIT)
 typedef unsigned char           * uchar_ptr;
 typedef unsigned short          * ushort_ptr;
 typedef unsigned long           * ulong_ptr;
-#endif  /* 32_BIT_COMPILER */
 
 
-/*                              NEW TYPE DEFINITIONS (shared with Mylex North)
-
-**  Use following type defines to avoid confusion in 16 and 32-bit
-**  environments.  Avoid using 'int' as it denotes 16 bits in 16-bit
-**  environment and 32 in 32-bit environments.
-
-*/
-
 #define s08bits char
 #define s16bits         short
 #define s32bits long
@@ -251,195 +84,19 @@ typedef unsigned long           * ulong_ptr;
 #define u16bits unsigned s16bits
 #define u32bits unsigned s32bits
 
-#if defined(COMPILER_16_BIT)
-
-typedef u08bits far     * pu08bits;
-typedef u16bits far     * pu16bits;
-typedef u32bits far     * pu32bits;
-
-#endif  /* COMPILER_16_BIT */
-
-#if defined(COMPILER_32_BIT)
-
 typedef u08bits         * pu08bits;
 typedef u16bits         * pu16bits;
 typedef u32bits         * pu32bits;
 
-#endif  /* COMPILER_32_BIT */
-
 
 #define BIT(x)          ((UCHAR)(1<<(x)))    /* single-bit mask in bit position x */
 #define BITW(x)          ((USHORT)(1<<(x)))  /* single-bit mask in bit position x */
 
 
 
-#if defined(DOS)
-/*#include <dos.h>*/
-        #undef inportb          /* undefine for Borland Lib */
-        #undef inport           /* they may have define I/O function in LIB */
-        #undef outportb
-        #undef outport
-
-        #define OS_InPortByte(ioport)           inportb(ioport)
-        #define OS_InPortWord(ioport)           inport(ioport)
-        #define OS_InPortLong(ioport)                   inportq(ioport, val)
-        #define OS_OutPortByte(ioport, val) outportb(ioport, val)
-        #define OS_OutPortWord(ioport, val)     outport(ioport, val)
-        #define OS_OutPortLong(ioport)          outportq(ioport, val)
-#endif  /* DOS */
-
-#if defined(NETWARE) || defined(OTHER_32) ||  defined(OTHER_16)
-        extern u08bits  OS_InPortByte(u32bits ioport);
-        extern u16bits  OS_InPortWord(u32bits ioport);
-        extern u32bits  OS_InPortLong(u32bits ioport);
-
-        extern OS_InPortByteBuffer(u32bits ioport, pu08bits buffer, u32bits count);
-        extern OS_InPortWordBuffer(u32bits ioport, pu16bits buffer, u32bits count);
-        extern OS_OutPortByte(u32bits ioport, u08bits val);
-        extern OS_OutPortWord(u32bits ioport, u16bits val);
-        extern OS_OutPortLong(u32bits ioport, u32bits val);
-        extern OS_OutPortByteBuffer(u32bits ioport, pu08bits buffer, u32bits count);
-        extern OS_OutPortWordBuffer(u32bits ioport, pu16bits buffer, u32bits count);
-#endif  /* NETWARE || OTHER_32 || OTHER_16 */
-
-#if defined (NT) || defined(WIN95_32) || defined(WIN95_16)
-        #if defined(NT)
-
-                extern __declspec(dllimport) u08bits ScsiPortReadPortUchar(pu08bits ioport);
-                extern __declspec(dllimport) u16bits ScsiPortReadPortUshort(pu16bits ioport);
-                extern __declspec(dllimport) u32bits ScsiPortReadPortUlong(pu32bits ioport);
-                extern __declspec(dllimport) void ScsiPortWritePortUchar(pu08bits ioport, u08bits val);
-                extern __declspec(dllimport) void ScsiPortWritePortUshort(pu16bits port, u16bits val);
-                extern __declspec(dllimport) void ScsiPortWritePortUlong(pu32bits port, u32bits val);
-
-        #else
-
-                extern u08bits ScsiPortReadPortUchar(pu08bits ioport);
-                extern u16bits ScsiPortReadPortUshort(pu16bits ioport);
-                extern u32bits ScsiPortReadPortUlong(pu32bits ioport);
-                extern void ScsiPortWritePortUchar(pu08bits ioport, u08bits val);
-                extern void ScsiPortWritePortUshort(pu16bits port, u16bits val);
-                extern void ScsiPortWritePortUlong(pu32bits port, u32bits val);
-        #endif
 
-
-        #define OS_InPortByte(ioport) ScsiPortReadPortUchar((pu08bits) ioport)
-        #define OS_InPortWord(ioport) ScsiPortReadPortUshort((pu16bits) ioport)
-        #define OS_InPortLong(ioport) ScsiPortReadPortUlong((pu32bits) ioport)
-
-        #define OS_OutPortByte(ioport, val) ScsiPortWritePortUchar((pu08bits) ioport, (u08bits) val)
-        #define OS_OutPortWord(ioport, val) ScsiPortWritePortUshort((pu16bits) ioport, (u16bits) val)
-        #define OS_OutPortLong(ioport, val) ScsiPortWritePortUlong((pu32bits) ioport, (u32bits) val)
-        #define OS_OutPortByteBuffer(ioport, buffer, count) \
-                ScsiPortWritePortBufferUchar((pu08bits)&port, (pu08bits) buffer, (u32bits) count)
-        #define OS_OutPortWordBuffer(ioport, buffer, count) \
-                ScsiPortWritePortBufferUshort((pu16bits)&port, (pu16bits) buffer, (u32bits) count)
-
-        #define OS_Lock(x)
-        #define OS_UnLock(x)
-#endif /* NT || WIN95_32 || WIN95_16 */
-
-#if defined (UNIX) && !defined(OS_InPortByte)
-        #define OS_InPortByte(ioport)    inb((u16bits)ioport)
-        #define OS_InPortWord(ioport)    inw((u16bits)ioport)
-        #define OS_InPortLong(ioport)    inl((u16bits)ioport)
-        #define OS_OutPortByte(ioport,val)  outb((u16bits)ioport, (u08bits)val)
-        #define OS_OutPortWord(ioport,val)  outw((u16bits)ioport, (u16bits)val)
-        #define OS_OutPortLong(ioport,val)  outl((u16bits)ioport, (u32bits)val)
-
-        #define OS_Lock(x)
-        #define OS_UnLock(x)
-#endif /* UNIX */
-
-
-#if defined(OS2)
-        extern u08bits  inb(u32bits ioport);
-        extern u16bits  inw(u32bits ioport);
-        extern void     outb(u32bits ioport, u08bits val);
-        extern void     outw(u32bits ioport, u16bits val);
-
-        #define OS_InPortByte(ioport)                   inb(ioport)
-        #define OS_InPortWord(ioport)                   inw(ioport)
-        #define OS_OutPortByte(ioport, val)     outb(ioport, val)
-        #define OS_OutPortWord(ioport, val)     outw(ioport, val)
-        extern u32bits  OS_InPortLong(u32bits ioport);
-        extern void     OS_OutPortLong(u32bits ioport, u32bits val);
-
-        #define OS_Lock(x)
-        #define OS_UnLock(x)
-#endif /* OS2 */
-
-#if defined(SOLARIS_REAL_MODE)
-
-extern unsigned char    inb(unsigned long ioport);
-extern unsigned short   inw(unsigned long ioport);
-
-#define OS_InPortByte(ioport)    inb(ioport)
-#define OS_InPortWord(ioport)    inw(ioport)
-
-extern void OS_OutPortByte(unsigned long ioport, unsigned char val);
-extern void OS_OutPortWord(unsigned long ioport, unsigned short val);
-extern unsigned long  OS_InPortLong(unsigned long ioport);
-extern void     OS_OutPortLong(unsigned long ioport, unsigned long val);
-
-#define OS_Lock(x)
-#define OS_UnLock(x)
-
-#endif  /* SOLARIS_REAL_MODE */
-
-#endif  /* __GLOBALS_H__ */
-
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   sccbmgr.h  $
- *
- *   Description:  Common shared SCCB Interface defines and SCCB 
- *                                               Manager specifics defines.
- *
- *   $Date: 1996/10/24 23:09:33 $
- *
- *   $Revision: 1.14 $
- *
- *----------------------------------------------------------------------*/
-
-#ifndef __SCCB_H__
-#define __SCCB_H__
-
-/*#include <osflags.h>*/
-/*#include <globals.h>*/
-
-#if defined(BUGBUG)
-#define debug_size 32
-#endif
-
-#if defined(DOS)
-
-   typedef struct _SCCB near *PSCCB;
-        #if (FW_TYPE == _SCCB_MGR_)
-        typedef void (*CALL_BK_FN)(PSCCB);
-        #endif
-
-#elif defined(OS2)
-
-   typedef struct _SCCB far *PSCCB;
-        #if (FW_TYPE == _SCCB_MGR_)
-        typedef void (far *CALL_BK_FN)(PSCCB);
-        #endif
-
-#else
-
-   typedef struct _SCCB *PSCCB;
-        #if (FW_TYPE == _SCCB_MGR_)
-        typedef void (*CALL_BK_FN)(PSCCB);
-        #endif
-
-#endif
+typedef struct _SCCB *PSCCB;
+typedef void (*CALL_BK_FN)(PSCCB);
 
 
 typedef struct SCCBMgr_info {
@@ -466,25 +123,13 @@ typedef struct SCCBMgr_info {
    ULONG    si_secondary_range;
 } SCCBMGR_INFO;
 
-#if defined(DOS)
-   typedef SCCBMGR_INFO *      PSCCBMGR_INFO;
-#else
-   #if defined (COMPILER_16_BIT)
-   typedef SCCBMGR_INFO far *  PSCCBMGR_INFO;
-   #else
-   typedef SCCBMGR_INFO *      PSCCBMGR_INFO;
-   #endif
-#endif // defined(DOS)
+typedef SCCBMGR_INFO *      PSCCBMGR_INFO;
 
 
-
-
-#if (FW_TYPE==_SCCB_MGR_)
-        #define SCSI_PARITY_ENA           0x0001
-        #define LOW_BYTE_TERM             0x0010
-        #define HIGH_BYTE_TERM            0x0020
-        #define BUSTYPE_PCI       0x3
-#endif
+#define SCSI_PARITY_ENA           0x0001
+#define LOW_BYTE_TERM             0x0010
+#define HIGH_BYTE_TERM            0x0020
+#define BUSTYPE_PCI       0x3
 
 #define SUPPORT_16TAR_32LUN       0x0002
 #define SOFT_RESET                0x0004
@@ -553,9 +198,6 @@ typedef struct _SCCB {
    UCHAR   Save_CdbLen;
    UCHAR   Sccb_XferState;
    ULONG   Sccb_SGoffset;
-#if (FW_TYPE == _UCB_MGR_)
-   PUCB    Sccb_ucb_ptr;
-#endif
    } SCCB;
 
 #define SCCB_SIZE sizeof(SCCB)
@@ -626,25 +268,9 @@ typedef struct _SCCB {
 
 
 
-#if (FW_TYPE==_UCB_MGR_)  
-   #define  HBA_AUTO_SENSE_FAIL        0x1B  
-   #define  HBA_TQ_REJECTED            0x1C  
-   #define  HBA_UNSUPPORTED_MSG         0x1D  
-   #define  HBA_HW_ERROR               0x20  
-   #define  HBA_ATN_NOT_RESPONDED      0x21  
-   #define  HBA_SCSI_RESET_BY_ADAPTER  0x22
-   #define  HBA_SCSI_RESET_BY_TARGET   0x23
-   #define  HBA_WRONG_CONNECTION       0x24
-   #define  HBA_BUS_DEVICE_RESET       0x25
-   #define  HBA_ABORT_QUEUE            0x26
-
-#else // these are not defined in BUDI/UCB
-
-   #define SCCB_INVALID_DIRECTION      0x18  /* Invalid target direction */
-   #define SCCB_DUPLICATE_SCCB         0x19  /* Duplicate SCCB */
-   #define SCCB_SCSI_RST               0x35  /* SCSI RESET detected. */
-
-#endif // (FW_TYPE==_UCB_MGR_)  
+#define SCCB_INVALID_DIRECTION      0x18  /* Invalid target direction */
+#define SCCB_DUPLICATE_SCCB         0x19  /* Duplicate SCCB */
+#define SCCB_SCSI_RST               0x35  /* SCSI RESET detected. */
 
 
 #define SCCB_IN_PROCESS            0x00
@@ -657,115 +283,20 @@ typedef struct _SCCB {
 #define SCCB_SIZE sizeof(SCCB)
 
 
-
-
-#if (FW_TYPE == _UCB_MGR_)
-        void SccbMgr_start_sccb(CARD_HANDLE pCurrCard, PUCB p_ucb);
-        s32bits SccbMgr_abort_sccb(CARD_HANDLE pCurrCard, PUCB p_ucb);
-        u08bits SccbMgr_my_int(CARD_HANDLE pCurrCard);
-        s32bits SccbMgr_isr(CARD_HANDLE pCurrCard);
-        void SccbMgr_scsi_reset(CARD_HANDLE pCurrCard);
-        void SccbMgr_timer_expired(CARD_HANDLE pCurrCard);
-        void SccbMgr_unload_card(CARD_HANDLE pCurrCard);
-        void SccbMgr_restore_foreign_state(CARD_HANDLE pCurrCard);
-        void SccbMgr_restore_native_state(CARD_HANDLE pCurrCard);
-        void SccbMgr_save_foreign_state(PADAPTER_INFO pAdapterInfo);
-
-#endif
-
-
-#if (FW_TYPE == _SCCB_MGR_)
-
- #if defined (DOS)
-        int    SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo);
-        USHORT SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo);
-        void  SccbMgr_start_sccb(USHORT pCurrCard, PSCCB p_SCCB);
-        int   SccbMgr_abort_sccb(USHORT pCurrCard, PSCCB p_SCCB);
-        UCHAR SccbMgr_my_int(USHORT pCurrCard);
-        int   SccbMgr_isr(USHORT pCurrCard);
-        void  SccbMgr_scsi_reset(USHORT pCurrCard);
-        void  SccbMgr_timer_expired(USHORT pCurrCard);
-        USHORT SccbMgr_status(USHORT pCurrCard);
-        void SccbMgr_unload_card(USHORT pCurrCard);
-
- #else    //non-DOS
-
-        int   SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo);
-        ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo);
-        void  SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_SCCB);
-        int   SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_SCCB);
-        UCHAR SccbMgr_my_int(ULONG pCurrCard);
-        int   SccbMgr_isr(ULONG pCurrCard);
-        void  SccbMgr_scsi_reset(ULONG pCurrCard);
-        void  SccbMgr_enable_int(ULONG pCurrCard);
-        void  SccbMgr_disable_int(ULONG pCurrCard);
-        void  SccbMgr_timer_expired(ULONG pCurrCard);
-        void SccbMgr_unload_card(ULONG pCurrCard);
-
-  #endif
-#endif  // (FW_TYPE == _SCCB_MGR_)
-
-#endif  /* __SCCB_H__ */
-
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   blx30.h  $
- *
- *   Description: This module contains SCCB/UCB Manager implementation
- *                specific stuff.
- *
- *   $Date: 1996/11/13 18:34:22 $
- *
- *   $Revision: 1.10 $
- *
- *----------------------------------------------------------------------*/
-
-
-#ifndef __blx30_H__
-#define __blx30_H__
-
-/*#include <globals.h>*/
-
 #define  ORION_FW_REV      3110
 
-
-
-
 #define HARP_REVD    1
 
 
-#if defined(DOS)
-#define QUEUE_DEPTH     8+1            /*1 for Normal disconnect 0 for Q'ing. */
-#else
 #define QUEUE_DEPTH     254+1            /*1 for Normal disconnect 32 for Q'ing. */
-#endif   // defined(DOS)
 
 #define MAX_MB_CARDS    4                                       /* Max. no of cards suppoerted on Mother Board */
 
 #define WIDE_SCSI       1
 
-#if defined(WIDE_SCSI)
-   #if defined(DOS)
-      #define MAX_SCSI_TAR    16
-      #define MAX_LUN         8
-                #define LUN_MASK                        0x07
-   #else
-      #define MAX_SCSI_TAR    16
-      #define MAX_LUN         32
-                #define LUN_MASK                        0x1f
-        
-   #endif
-#else
-   #define MAX_SCSI_TAR    8
-   #define MAX_LUN         8
-        #define LUN_MASK                        0x07
-#endif 
+#define MAX_SCSI_TAR    16
+#define MAX_LUN         32
+#define LUN_MASK                        0x1f
 
 #if defined(HARP_REVA)
 #define SG_BUF_CNT      15             /*Number of prefetched elements. */
@@ -778,116 +309,12 @@ typedef struct _SCCB {
 #define SG_ELEMENT_MASK 0xFFFFFFFFL
 
 
-#if (FW_TYPE == _UCB_MGR_)
-        #define OPC_DECODE_NORMAL       0x0f7f
-#endif   // _UCB_MGR_
-
-
-
-#if defined(DOS)
-
-/*#include <dos.h>*/
-        #define RD_HARPOON(ioport)          (OS_InPortByte(ioport))
-        #define RDW_HARPOON(ioport)         (OS_InPortWord(ioport))
-        #define WR_HARPOON(ioport,val)      (OS_OutPortByte(ioport,val))
-        #define WRW_HARPOON(ioport,val)     (OS_OutPortWord(ioport,val))
-
-        #define RD_HARP32(port,offset,data)  asm{db 66h;         \
-                                       push ax;             \
-                                       mov dx,port;         \
-                                       add dx, offset;      \
-                                       db 66h;              \
-                                       in ax,dx;            \
-                                       db 66h;              \
-                                       mov word ptr data,ax;\
-                                       db 66h;              \
-                                       pop ax}
-
-        #define WR_HARP32(port,offset,data) asm{db 66h;          \
-                                       push ax;             \
-                                       mov dx,port;         \
-                                       add dx, offset;      \
-                                       db 66h;              \
-                                       mov ax,word ptr data;\
-                                       db 66h;              \
-                                       out dx,ax;           \
-                                       db 66h;              \
-                                       pop ax}
-#endif  /* DOS */
-
-#if defined(NETWARE) || defined(OTHER_32) ||  defined(OTHER_16)
-        #define RD_HARPOON(ioport)     OS_InPortByte((unsigned long)ioport)
-        #define RDW_HARPOON(ioport)    OS_InPortWord((unsigned long)ioport)
-        #define RD_HARP32(ioport,offset,data) (data = OS_InPortLong(ioport + offset))
-        #define WR_HARPOON(ioport,val) OS_OutPortByte((ULONG)ioport,(UCHAR) val)
-        #define WRW_HARPOON(ioport,val)  OS_OutPortWord((ULONG)ioport,(USHORT)val)
-        #define WR_HARP32(ioport,offset,data)  OS_OutPortLong((ioport + offset), data)
-#endif  /* NETWARE || OTHER_32 || OTHER_16 */
-
-#if defined(NT) || defined(WIN95_32) || defined(WIN95_16)
-        #define RD_HARPOON(ioport)          OS_InPortByte((ULONG)ioport)
-        #define RDW_HARPOON(ioport)         OS_InPortWord((ULONG)ioport)
-        #define RD_HARP32(ioport,offset,data) (data = OS_InPortLong((ULONG)(ioport + offset)))
-        #define WR_HARPOON(ioport,val)      OS_OutPortByte((ULONG)ioport,(UCHAR) val)
-        #define WRW_HARPOON(ioport,val)     OS_OutPortWord((ULONG)ioport,(USHORT)val)
-        #define WR_HARP32(ioport,offset,data)  OS_OutPortLong((ULONG)(ioport + offset), data)
-#endif /* NT || WIN95_32 || WIN95_16 */
-
-#if defined (UNIX)
-        #define RD_HARPOON(ioport)          OS_InPortByte((u32bits)ioport)
-        #define RDW_HARPOON(ioport)         OS_InPortWord((u32bits)ioport)
-        #define RD_HARP32(ioport,offset,data) (data = OS_InPortLong((u32bits)(ioport + offset)))
-        #define WR_HARPOON(ioport,val)      OS_OutPortByte((u32bits)ioport,(u08bits) val)
-        #define WRW_HARPOON(ioport,val)       OS_OutPortWord((u32bits)ioport,(u16bits)val)
-        #define WR_HARP32(ioport,offset,data)  OS_OutPortLong((u32bits)(ioport + offset), data)
-#endif /* UNIX */
-
-#if defined(OS2)
-        #define RD_HARPOON(ioport)          OS_InPortByte((unsigned long)ioport)
-        #define RDW_HARPOON(ioport)         OS_InPortWord((unsigned long)ioport)
-        #define RD_HARP32(ioport,offset,data) (data = OS_InPortLong((ULONG)(ioport + offset)))
-        #define WR_HARPOON(ioport,val)      OS_OutPortByte((ULONG)ioport,(UCHAR) val)
-        #define WRW_HARPOON(ioport,val)       OS_OutPortWord((ULONG)ioport,(USHORT)val)
-        #define WR_HARP32(ioport,offset,data)  OS_OutPortLong(((ULONG)(ioport + offset)), data)
-#endif /* OS2 */
-
-#if defined(SOLARIS_REAL_MODE)
-
-        #define RD_HARPOON(ioport)          OS_InPortByte((unsigned long)ioport)
-        #define RDW_HARPOON(ioport)         OS_InPortWord((unsigned long)ioport)
-        #define RD_HARP32(ioport,offset,data) (data = OS_InPortLong((ULONG)(ioport + offset)))
-        #define WR_HARPOON(ioport,val)      OS_OutPortByte((ULONG)ioport,(UCHAR) val)
-        #define WRW_HARPOON(ioport,val)       OS_OutPortWord((ULONG)ioport,(USHORT)val)
-        #define WR_HARP32(ioport,offset,data)  OS_OutPortLong((ULONG)(ioport + offset), (ULONG)data)
-
-#endif  /* SOLARIS_REAL_MODE */
-
-#endif  /* __BLX30_H__ */
-
-
-/*----------------------------------------------------------------------
- * 
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   target.h  $
- *
- *   Description:  Definitions for Target related structures
- *
- *   $Date: 1996/12/11 22:06:20 $
- *
- *   $Revision: 1.9 $
- *
- *----------------------------------------------------------------------*/
-
-#ifndef __TARGET__
-#define __TARGET__
-
-/*#include <globals.h>*/
-/*#include <blx30.h>*/
+#define RD_HARPOON(ioport)          OS_InPortByte((u32bits)ioport)
+#define RDW_HARPOON(ioport)         OS_InPortWord((u32bits)ioport)
+#define RD_HARP32(ioport,offset,data) (data = OS_InPortLong((u32bits)(ioport + offset)))
+#define WR_HARPOON(ioport,val)      OS_OutPortByte((u32bits)ioport,(u08bits) val)
+#define WRW_HARPOON(ioport,val)       OS_OutPortWord((u32bits)ioport,(u16bits)val)
+#define WR_HARP32(ioport,offset,data)  OS_OutPortLong((u32bits)(ioport + offset), data)
 
 
 #define  TAR_SYNC_MASK     (BIT(7)+BIT(6))
@@ -919,16 +346,7 @@ typedef struct _SCCB {
 #define  EE_WIDE_SCSI      BIT(7)
 
 
-#if defined(DOS)
-   typedef struct SCCBMgr_tar_info near *PSCCBMgr_tar_info;
-
-#elif defined(OS2)
-   typedef struct SCCBMgr_tar_info far *PSCCBMgr_tar_info;
-
-#else
-   typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
-
-#endif
+typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
 
 
 typedef struct SCCBMgr_tar_info {
@@ -949,11 +367,7 @@ typedef struct SCCBMgr_tar_info {
 typedef struct NVRAMInfo {
         UCHAR           niModel;                                                                /* Model No. of card */
         UCHAR           niCardNo;                                                       /* Card no. */
-#if defined(DOS)
-        USHORT  niBaseAddr;                                                     /* Port Address of card */
-#else
         ULONG           niBaseAddr;                                                     /* Port Address of card */
-#endif
         UCHAR           niSysConf;                                                      /* Adapter Configuration byte - Byte 16 of eeprom map */
         UCHAR           niScsiConf;                                                     /* SCSI Configuration byte - Byte 17 of eeprom map */
         UCHAR           niScamConf;                                                     /* SCAM Configuration byte - Byte 20 of eeprom map */
@@ -962,13 +376,7 @@ typedef struct NVRAMInfo {
         UCHAR           niScamTbl[MAX_SCSI_TAR][4];     /* Compressed Scam name string of Targets */
 }NVRAMINFO;
 
-#if defined(DOS)
-typedef NVRAMINFO near *PNVRamInfo;
-#elif defined (OS2)
-typedef NVRAMINFO far *PNVRamInfo;
-#else
 typedef NVRAMINFO *PNVRamInfo;
-#endif
 
 #define MODEL_LT                1
 #define MODEL_DL                2
@@ -978,17 +386,9 @@ typedef NVRAMINFO *PNVRamInfo;
 
 typedef struct SCCBcard {
    PSCCB currentSCCB;
-#if (FW_TYPE==_SCCB_MGR_)
    PSCCBMGR_INFO cardInfo;
-#else
-   PADAPTER_INFO cardInfo;
-#endif
 
-#if defined(DOS)
-   USHORT ioPort;
-#else
    ULONG ioPort;
-#endif
 
    USHORT cmdCounter;
    UCHAR  discQCount;
@@ -1002,13 +402,7 @@ typedef struct SCCBcard {
       
 }SCCBCARD;
 
-#if defined(DOS)
-typedef struct SCCBcard near *PSCCBcard;
-#elif defined (OS2)
-typedef struct SCCBcard far *PSCCBcard;
-#else
 typedef struct SCCBcard *PSCCBcard;
-#endif
 
 
 #define F_TAG_STARTED           0x01
@@ -1063,29 +457,6 @@ typedef struct SCCBscam_info {
     
 } SCCBSCAM_INFO, *PSCCBSCAM_INFO;
 
-#endif
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   scsi2.h  $
- *
- *   Description:  Register definitions for HARPOON ASIC.
- *
- *   $Date: 1996/11/13 18:32:57 $
- *
- *   $Revision: 1.4 $
- *
- *----------------------------------------------------------------------*/
-
-#ifndef __SCSI_H__
-#define __SCSI_H__
-
-
 
 #define  SCSI_TEST_UNIT_READY    0x00
 #define  SCSI_REZERO_UNIT        0x01
@@ -1195,29 +566,6 @@ typedef struct SCCBscam_info {
 #define  SYNC5MBS                0x32
 #define  MAX_OFFSET              0x0F  /* Maxbyteoffset for Sync Xfers */
 
-#endif
-/*----------------------------------------------------------------------
- *  
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   eeprom.h  $
- *
- *   Description:  Definitions for EEPROM related structures
- *
- *   $Date: 1996/11/13 18:28:39 $
- *
- *   $Revision: 1.4 $
- *
- *----------------------------------------------------------------------*/
-
-#ifndef __EEPROM__
-#define __EEPROM__
-
-/*#include <globals.h>*/
 
 #define  EEPROM_WD_CNT     256
 
@@ -1280,31 +628,6 @@ typedef struct SCCBscam_info {
    #define  DISC_ENABLE_BIT   BIT(6)
 
 
-#endif
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   harpoon.h  $
- *
- *   Description:  Register definitions for HARPOON ASIC.
- *
- *   $Date: 1997/07/09 21:44:36 $
- *
- *   $Revision: 1.9 $
- *
- *----------------------------------------------------------------------*/
-
-
-/*#include <globals.h>*/
-
-#ifndef __HARPOON__
-#define __HARPOON__
-
 
    #define  hp_vendor_id_0       0x00           /* LSB */
       #define  ORION_VEND_0   0x4B
@@ -1578,8 +901,6 @@ typedef struct SCCBscam_info {
 
 
 
-   extern USHORT default_intena;
-
    #define  hp_intena            0x40
 
       #define  RESET             BITW(7)
@@ -1972,15 +1293,6 @@ typedef struct SCCBscam_info {
                                  xfercnt <<= 16,\
                                  xfercnt |= RDW_HARPOON((USHORT)(port+hp_xfercnt_0)))
  */
-#if defined(DOS)
-#define HP_SETUP_ADDR_CNT(port,addr,count) (WRW_HARPOON((USHORT)(port+hp_host_addr_lo), (USHORT)(addr & 0x0000FFFFL)),\
-         addr >>= 16,\
-         WRW_HARPOON((USHORT)(port+hp_host_addr_hmi), (USHORT)(addr & 0x0000FFFFL)),\
-         WR_HARP32(port,hp_xfercnt_0,count),\
-         WRW_HARPOON((USHORT)(port+hp_xfer_cnt_lo), (USHORT)(count & 0x0000FFFFL)),\
-         count >>= 16,\
-         WR_HARPOON(port+hp_xfer_cnt_hi, (count & 0xFF)))
-#else
 #define HP_SETUP_ADDR_CNT(port,addr,count) (WRW_HARPOON((port+hp_host_addr_lo), (USHORT)(addr & 0x0000FFFFL)),\
          addr >>= 16,\
          WRW_HARPOON((port+hp_host_addr_hmi), (USHORT)(addr & 0x0000FFFFL)),\
@@ -1988,7 +1300,6 @@ typedef struct SCCBscam_info {
          WRW_HARPOON((port+hp_xfer_cnt_lo), (USHORT)(count & 0x0000FFFFL)),\
          count >>= 16,\
          WR_HARPOON(port+hp_xfer_cnt_hi, (count & 0xFF)))
-#endif
 
 #define ACCEPT_MSG(port) {while(RD_HARPOON(port+hp_scsisig) & SCSI_REQ){}\
                           WR_HARPOON(port+hp_scsisig, S_ILL_PH);}
@@ -2020,383 +1331,145 @@ typedef struct SCCBscam_info {
 
 
 
-#endif
-
 
-#if (FW_TYPE==_UCB_MGR_)
-void ReadNVRam(PSCCBcard pCurrCard,PUCB p_ucb);
-void WriteNVRam(PSCCBcard pCurrCard,PUCB p_ucb);
-void UpdateCheckSum(u32bits baseport);
-#endif // (FW_TYPE==_UCB_MGR_)
-
-#if defined(DOS)
-UCHAR sfm(USHORT port, PSCCB pcurrSCCB);
-void  scsiStartAuto(USHORT port);
-UCHAR sisyncn(USHORT port, UCHAR p_card, UCHAR syncFlag);
-void  ssel(USHORT port, UCHAR p_card);
-void  sres(USHORT port, UCHAR p_card, PSCCBcard pCurrCard);
-void  sdecm(UCHAR message, USHORT port, UCHAR p_card);
-void  shandem(USHORT port, UCHAR p_card,PSCCB pCurrSCCB);
-void  stsyncn(USHORT port, UCHAR p_card);
-void  sisyncr(USHORT port,UCHAR sync_pulse, UCHAR offset);
-void  sssyncv(USHORT p_port, UCHAR p_id, UCHAR p_sync_value, PSCCBMgr_tar_info currTar_Info);
-void  sresb(USHORT port, UCHAR p_card);
-void  sxfrp(USHORT p_port, UCHAR p_card);
-void  schkdd(USHORT port, UCHAR p_card);
-UCHAR RdStack(USHORT port, UCHAR index);
-void  WrStack(USHORT portBase, UCHAR index, UCHAR data);
-UCHAR ChkIfChipInitialized(USHORT ioPort);
-
-#if defined(V302)
-UCHAR GetTarLun(USHORT port, UCHAR p_card, UCHAR our_target, PSCCBcard pCurrCard, PUCHAR tag, PUCHAR lun);
-#endif
-
-void SendMsg(USHORT port, UCHAR message);
-void  queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg, UCHAR error_code);
-UCHAR scsellDOS(USHORT p_port, UCHAR targ_id);
-#else
-UCHAR sfm(ULONG port, PSCCB pcurrSCCB);
 void  scsiStartAuto(ULONG port);
-UCHAR sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag);
-void  ssel(ULONG port, UCHAR p_card);
-void  sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard);
-void  sdecm(UCHAR message, ULONG port, UCHAR p_card);
-void  shandem(ULONG port, UCHAR p_card,PSCCB pCurrSCCB);
-void  stsyncn(ULONG port, UCHAR p_card);
-void  sisyncr(ULONG port,UCHAR sync_pulse, UCHAR offset);
-void  sssyncv(ULONG p_port, UCHAR p_id, UCHAR p_sync_value, PSCCBMgr_tar_info currTar_Info);
-void  sresb(ULONG port, UCHAR p_card);
-void  sxfrp(ULONG p_port, UCHAR p_card);
-void  schkdd(ULONG port, UCHAR p_card);
-UCHAR RdStack(ULONG port, UCHAR index);
-void  WrStack(ULONG portBase, UCHAR index, UCHAR data);
-UCHAR ChkIfChipInitialized(ULONG ioPort);
-
-#if defined(V302)
-UCHAR GetTarLun(ULONG port, UCHAR p_card, UCHAR our_target, PSCCBcard pCurrCard, PUCHAR tar, PUCHAR lun);
-#endif
+static UCHAR FPT_sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag);
+static void  FPT_ssel(ULONG port, UCHAR p_card);
+static void  FPT_sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard);
+static void  FPT_shandem(ULONG port, UCHAR p_card,PSCCB pCurrSCCB);
+static void  FPT_stsyncn(ULONG port, UCHAR p_card);
+static void  FPT_sisyncr(ULONG port,UCHAR sync_pulse, UCHAR offset);
+static void  FPT_sssyncv(ULONG p_port, UCHAR p_id, UCHAR p_sync_value,
+                         PSCCBMgr_tar_info currTar_Info);
+static void  FPT_sresb(ULONG port, UCHAR p_card);
+static void  FPT_sxfrp(ULONG p_port, UCHAR p_card);
+static void  FPT_schkdd(ULONG port, UCHAR p_card);
+static UCHAR FPT_RdStack(ULONG port, UCHAR index);
+static void  FPT_WrStack(ULONG portBase, UCHAR index, UCHAR data);
+static UCHAR FPT_ChkIfChipInitialized(ULONG ioPort);
 
-void SendMsg(ULONG port, UCHAR message);
-void  queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg, UCHAR error_code);
-#endif
+static void FPT_SendMsg(ULONG port, UCHAR message);
+static void  FPT_queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg,
+                                    UCHAR error_code);
 
-void  ssenss(PSCCBcard pCurrCard);
-void  sinits(PSCCB p_sccb, UCHAR p_card);
-void  RNVRamData(PNVRamInfo pNvRamInfo);
-
-#if defined(WIDE_SCSI)
-   #if defined(DOS)
-   UCHAR siwidn(USHORT port, UCHAR p_card);
-   void  stwidn(USHORT port, UCHAR p_card);
-   void  siwidr(USHORT port, UCHAR width);
-   #else
-   UCHAR siwidn(ULONG port, UCHAR p_card);
-   void  stwidn(ULONG port, UCHAR p_card);
-   void  siwidr(ULONG port, UCHAR width);
-   #endif
-#endif
+static void  FPT_sinits(PSCCB p_sccb, UCHAR p_card);
+static void  FPT_RNVRamData(PNVRamInfo pNvRamInfo);
 
+static UCHAR FPT_siwidn(ULONG port, UCHAR p_card);
+static void  FPT_stwidn(ULONG port, UCHAR p_card);
+static void  FPT_siwidr(ULONG port, UCHAR width);
 
-void  queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card);
-void  queueDisconnect(PSCCB p_SCCB, UCHAR p_card);
-void  queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_SCCB, UCHAR p_card);
-void  queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card);
-void  queueFlushSccb(UCHAR p_card, UCHAR error_code);
-void  queueAddSccb(PSCCB p_SCCB, UCHAR card);
-UCHAR queueFindSccb(PSCCB p_SCCB, UCHAR p_card);
-void  utilUpdateResidual(PSCCB p_SCCB);
-USHORT CalcCrc16(UCHAR buffer[]);
-UCHAR  CalcLrc(UCHAR buffer[]);
-
-
-#if defined(DOS)
-void  Wait1Second(USHORT p_port);
-void  Wait(USHORT p_port, UCHAR p_delay);
-void  utilEEWriteOnOff(USHORT p_port,UCHAR p_mode);
-void  utilEEWrite(USHORT p_port, USHORT ee_data, USHORT ee_addr);
-USHORT utilEERead(USHORT p_port, USHORT ee_addr);
-USHORT utilEEReadOrg(USHORT p_port, USHORT ee_addr);
-void  utilEESendCmdAddr(USHORT p_port, UCHAR ee_cmd, USHORT ee_addr);
-#else
-void  Wait1Second(ULONG p_port);
-void  Wait(ULONG p_port, UCHAR p_delay);
-void  utilEEWriteOnOff(ULONG p_port,UCHAR p_mode);
-void  utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr);
-USHORT utilEERead(ULONG p_port, USHORT ee_addr);
-USHORT utilEEReadOrg(ULONG p_port, USHORT ee_addr);
-void  utilEESendCmdAddr(ULONG p_port, UCHAR ee_cmd, USHORT ee_addr);
-#endif
 
+static void  FPT_queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card);
+static void  FPT_queueDisconnect(PSCCB p_SCCB, UCHAR p_card);
+static void  FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_SCCB,
+                                  UCHAR p_card);
+static void  FPT_queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card);
+static void  FPT_queueFlushSccb(UCHAR p_card, UCHAR error_code);
+static void  FPT_queueAddSccb(PSCCB p_SCCB, UCHAR card);
+static UCHAR FPT_queueFindSccb(PSCCB p_SCCB, UCHAR p_card);
+static void  FPT_utilUpdateResidual(PSCCB p_SCCB);
+static USHORT FPT_CalcCrc16(UCHAR buffer[]);
+static UCHAR  FPT_CalcLrc(UCHAR buffer[]);
 
 
-#if defined(OS2)
-   void  far phaseDataOut(ULONG port, UCHAR p_card);
-   void  far phaseDataIn(ULONG port, UCHAR p_card);
-   void  far phaseCommand(ULONG port, UCHAR p_card);
-   void  far phaseStatus(ULONG port, UCHAR p_card);
-   void  far phaseMsgOut(ULONG port, UCHAR p_card);
-   void  far phaseMsgIn(ULONG port, UCHAR p_card);
-   void  far phaseIllegal(ULONG port, UCHAR p_card);
-#else
-   #if defined(DOS)
-      void  phaseDataOut(USHORT port, UCHAR p_card);
-      void  phaseDataIn(USHORT port, UCHAR p_card);
-      void  phaseCommand(USHORT port, UCHAR p_card);
-      void  phaseStatus(USHORT port, UCHAR p_card);
-      void  phaseMsgOut(USHORT port, UCHAR p_card);
-      void  phaseMsgIn(USHORT port, UCHAR p_card);
-      void  phaseIllegal(USHORT port, UCHAR p_card);
-   #else
-      void  phaseDataOut(ULONG port, UCHAR p_card);
-      void  phaseDataIn(ULONG port, UCHAR p_card);
-      void  phaseCommand(ULONG port, UCHAR p_card);
-      void  phaseStatus(ULONG port, UCHAR p_card);
-      void  phaseMsgOut(ULONG port, UCHAR p_card);
-      void  phaseMsgIn(ULONG port, UCHAR p_card);
-      void  phaseIllegal(ULONG port, UCHAR p_card);
-   #endif
-#endif
+static void  FPT_Wait1Second(ULONG p_port);
+static void  FPT_Wait(ULONG p_port, UCHAR p_delay);
+static void  FPT_utilEEWriteOnOff(ULONG p_port,UCHAR p_mode);
+static void  FPT_utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr);
+static USHORT FPT_utilEERead(ULONG p_port, USHORT ee_addr);
+static USHORT FPT_utilEEReadOrg(ULONG p_port, USHORT ee_addr);
+static void  FPT_utilEESendCmdAddr(ULONG p_port, UCHAR ee_cmd, USHORT ee_addr);
 
-#if defined(DOS)
-void  phaseDecode(USHORT port, UCHAR p_card);
-void  phaseChkFifo(USHORT port, UCHAR p_card);
-void  phaseBusFree(USHORT p_port, UCHAR p_card);
-#else
-void  phaseDecode(ULONG port, UCHAR p_card);
-void  phaseChkFifo(ULONG port, UCHAR p_card);
-void  phaseBusFree(ULONG p_port, UCHAR p_card);
-#endif
-
-
-
-
-#if defined(DOS)
-void  XbowInit(USHORT port, UCHAR scamFlg);
-void  BusMasterInit(USHORT p_port);
-int   DiagXbow(USHORT port);
-int   DiagBusMaster(USHORT port);
-void  DiagEEPROM(USHORT p_port);
-#else
-void  XbowInit(ULONG port, UCHAR scamFlg);
-void  BusMasterInit(ULONG p_port);
-int   DiagXbow(ULONG port);
-int   DiagBusMaster(ULONG port);
-void  DiagEEPROM(ULONG p_port);
-#endif
 
 
+static void  FPT_phaseDataOut(ULONG port, UCHAR p_card);
+static void  FPT_phaseDataIn(ULONG port, UCHAR p_card);
+static void  FPT_phaseCommand(ULONG port, UCHAR p_card);
+static void  FPT_phaseStatus(ULONG port, UCHAR p_card);
+static void  FPT_phaseMsgOut(ULONG port, UCHAR p_card);
+static void  FPT_phaseMsgIn(ULONG port, UCHAR p_card);
+static void  FPT_phaseIllegal(ULONG port, UCHAR p_card);
 
+static void  FPT_phaseDecode(ULONG port, UCHAR p_card);
+static void  FPT_phaseChkFifo(ULONG port, UCHAR p_card);
+static void  FPT_phaseBusFree(ULONG p_port, UCHAR p_card);
 
-#if defined(DOS)
-void  busMstrAbort(USHORT port);
-UCHAR busMstrTimeOut(USHORT port);
-void  dataXferProcessor(USHORT port, PSCCBcard pCurrCard);
-void  busMstrSGDataXferStart(USHORT port, PSCCB pCurrSCCB);
-void  busMstrDataXferStart(USHORT port, PSCCB pCurrSCCB);
-void  hostDataXferAbort(USHORT port, UCHAR p_card, PSCCB pCurrSCCB);
-#else
-void  busMstrAbort(ULONG port);
-UCHAR busMstrTimeOut(ULONG port);
-void  dataXferProcessor(ULONG port, PSCCBcard pCurrCard);
-void  busMstrSGDataXferStart(ULONG port, PSCCB pCurrSCCB);
-void  busMstrDataXferStart(ULONG port, PSCCB pCurrSCCB);
-void  hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB);
-#endif
-void  hostDataXferRestart(PSCCB currSCCB);
 
 
-#if defined (DOS)
-UCHAR SccbMgr_bad_isr(USHORT p_port, UCHAR p_card, PSCCBcard pCurrCard, USHORT p_int);
-#else
-UCHAR SccbMgr_bad_isr(ULONG p_port, UCHAR p_card, PSCCBcard pCurrCard, USHORT p_int);
 
-#endif
+static void  FPT_XbowInit(ULONG port, UCHAR scamFlg);
+static void  FPT_BusMasterInit(ULONG p_port);
+static void  FPT_DiagEEPROM(ULONG p_port);
 
-void  SccbMgrTableInitAll(void);
-void  SccbMgrTableInitCard(PSCCBcard pCurrCard, UCHAR p_card);
-void  SccbMgrTableInitTarget(UCHAR p_card, UCHAR target);
-
-
-
-void  scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up);
-
-#if defined(DOS)
-int   scarb(USHORT p_port, UCHAR p_sel_type);
-void  scbusf(USHORT p_port);
-void  scsel(USHORT p_port);
-void  scasid(UCHAR p_card, USHORT p_port);
-UCHAR scxferc(USHORT p_port, UCHAR p_data);
-UCHAR scsendi(USHORT p_port, UCHAR p_id_string[]);
-UCHAR sciso(USHORT p_port, UCHAR p_id_string[]);
-void  scwirod(USHORT p_port, UCHAR p_data_bit);
-void  scwiros(USHORT p_port, UCHAR p_data_bit);
-UCHAR scvalq(UCHAR p_quintet);
-UCHAR scsell(USHORT p_port, UCHAR targ_id);
-void  scwtsel(USHORT p_port);
-void  inisci(UCHAR p_card, USHORT p_port, UCHAR p_our_id);
-void  scsavdi(UCHAR p_card, USHORT p_port);
-#else
-int   scarb(ULONG p_port, UCHAR p_sel_type);
-void  scbusf(ULONG p_port);
-void  scsel(ULONG p_port);
-void  scasid(UCHAR p_card, ULONG p_port);
-UCHAR scxferc(ULONG p_port, UCHAR p_data);
-UCHAR scsendi(ULONG p_port, UCHAR p_id_string[]);
-UCHAR sciso(ULONG p_port, UCHAR p_id_string[]);
-void  scwirod(ULONG p_port, UCHAR p_data_bit);
-void  scwiros(ULONG p_port, UCHAR p_data_bit);
-UCHAR scvalq(UCHAR p_quintet);
-UCHAR scsell(ULONG p_port, UCHAR targ_id);
-void  scwtsel(ULONG p_port);
-void  inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id);
-void  scsavdi(UCHAR p_card, ULONG p_port);
-#endif
-UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[]);
-
-
-#if defined(DOS)
-void  autoCmdCmplt(USHORT p_port, UCHAR p_card);
-void  autoLoadDefaultMap(USHORT p_port);
-#else
-void  autoCmdCmplt(ULONG p_port, UCHAR p_card);
-void  autoLoadDefaultMap(ULONG p_port);
-#endif
-
-
-
-#if (FW_TYPE==_SCCB_MGR_)
-        void  OS_start_timer(unsigned long ioport, unsigned long timeout);
-        void  OS_stop_timer(unsigned long ioport, unsigned long timeout);
-        void  OS_disable_int(unsigned char intvec);
-        void  OS_enable_int(unsigned char intvec);
-        void  OS_delay(unsigned long count);
-        int   OS_VirtToPhys(u32bits CardHandle, u32bits *physaddr, u32bits *virtaddr);
-        #if !(defined(UNIX) || defined(OS2) || defined(SOLARIS_REAL_MODE)) 
-        void  OS_Lock(PSCCBMGR_INFO pCardInfo);
-        void  OS_UnLock(PSCCBMGR_INFO pCardInfo);
-#endif // if FW_TYPE == ...
-
-#endif
-
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-
-
-#if defined(OS2)
-   extern void (far *s_PhaseTbl[8]) (ULONG, UCHAR);
-#else
-   #if defined(DOS)
-      extern void (*s_PhaseTbl[8]) (USHORT, UCHAR);
-   #else
-      extern void (*s_PhaseTbl[8]) (ULONG, UCHAR);
-   #endif
-#endif
 
-extern SCCBSCAM_INFO scamInfo[MAX_SCSI_TAR];
-extern NVRAMINFO nvRamInfo[MAX_MB_CARDS];
-#if defined(DOS) || defined(OS2)
-extern UCHAR temp_id_string[ID_STRING_LENGTH];
-#endif
-extern UCHAR scamHAString[];
 
 
-extern UCHAR mbCards;
-#if defined(BUGBUG)
-extern UCHAR debug_int[MAX_CARDS][debug_size];
-extern UCHAR debug_index[MAX_CARDS];
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
-#endif
+void  busMstrAbort(ULONG port);
+static void  FPT_dataXferProcessor(ULONG port, PSCCBcard pCurrCard);
+static void  FPT_busMstrSGDataXferStart(ULONG port, PSCCB pCurrSCCB);
+static void  FPT_busMstrDataXferStart(ULONG port, PSCCB pCurrSCCB);
+static void  FPT_hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB);
+static void  FPT_hostDataXferRestart(PSCCB currSCCB);
 
-#if (FW_TYPE==_SCCB_MGR_)
-#if defined(DOS)
-   extern UCHAR first_time;
-#endif
-#endif /* (FW_TYPE==_SCCB_MGR_) */
 
-#if (FW_TYPE==_UCB_MGR_)
-#if defined(DOS)
-   extern u08bits first_time;
-#endif
-#endif /* (FW_TYPE==_UCB_MGR_) */
+static UCHAR FPT_SccbMgr_bad_isr(ULONG p_port, UCHAR p_card,
+                                 PSCCBcard pCurrCard, USHORT p_int);
 
-#if defined(BUGBUG)
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
-#endif
+static void  FPT_SccbMgrTableInitAll(void);
+static void  FPT_SccbMgrTableInitCard(PSCCBcard pCurrCard, UCHAR p_card);
+static void  FPT_SccbMgrTableInitTarget(UCHAR p_card, UCHAR target);
 
-extern unsigned int SccbGlobalFlags;
 
 
-#ident "$Id: sccb.c 1.18 1997/06/10 16:47:04 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   sccb.c  $
- *
- *   Description:  Functions relating to handling of the SCCB interface
- *                 between the device driver and the HARPOON.
- *
- *   $Date: 1997/06/10 16:47:04 $
- *
- *   $Revision: 1.18 $
- *
- *----------------------------------------------------------------------*/
+static void  FPT_scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up);
 
-/*#include <globals.h>*/
+static int   FPT_scarb(ULONG p_port, UCHAR p_sel_type);
+static void  FPT_scbusf(ULONG p_port);
+static void  FPT_scsel(ULONG p_port);
+static void  FPT_scasid(UCHAR p_card, ULONG p_port);
+static UCHAR FPT_scxferc(ULONG p_port, UCHAR p_data);
+static UCHAR FPT_scsendi(ULONG p_port, UCHAR p_id_string[]);
+static UCHAR FPT_sciso(ULONG p_port, UCHAR p_id_string[]);
+static void  FPT_scwirod(ULONG p_port, UCHAR p_data_bit);
+static void  FPT_scwiros(ULONG p_port, UCHAR p_data_bit);
+static UCHAR FPT_scvalq(UCHAR p_quintet);
+static UCHAR FPT_scsell(ULONG p_port, UCHAR targ_id);
+static void  FPT_scwtsel(ULONG p_port);
+static void  FPT_inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id);
+static void  FPT_scsavdi(UCHAR p_card, ULONG p_port);
+static UCHAR FPT_scmachid(UCHAR p_card, UCHAR p_id_string[]);
 
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-        /*#include <budioctl.h>*/
-#endif
 
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <eeprom.h>*/
-/*#include <scsi2.h>*/
-/*#include <harpoon.h>*/
+static void  FPT_autoCmdCmplt(ULONG p_port, UCHAR p_card);
+static void  FPT_autoLoadDefaultMap(ULONG p_port);
 
 
 
-#if (FW_TYPE==_SCCB_MGR_)
-#define mOS_Lock(card)    OS_Lock((PSCCBMGR_INFO)(((PSCCBcard)card)->cardInfo))
-#define mOS_UnLock(card)  OS_UnLock((PSCCBMGR_INFO)(((PSCCBcard)card)->cardInfo))
-#else /* FW_TYPE==_UCB_MGR_ */
-#define mOS_Lock(card)    OS_Lock((u32bits)(((PSCCBcard)card)->ioPort))
-#define mOS_UnLock(card)  OS_UnLock((u32bits)(((PSCCBcard)card)->ioPort))
-#endif
+void  OS_start_timer(unsigned long ioport, unsigned long timeout);
+void  OS_stop_timer(unsigned long ioport, unsigned long timeout);
+void  OS_disable_int(unsigned char intvec);
+void  OS_enable_int(unsigned char intvec);
+void  OS_delay(unsigned long count);
+int   OS_VirtToPhys(u32bits CardHandle, u32bits *physaddr, u32bits *virtaddr);
 
+static SCCBMGR_TAR_INFO FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
+static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };
+static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
+static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };
 
-/*
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-extern SCCBCARD BL_Card[MAX_CARDS];
 
-extern NVRAMINFO nvRamInfo[MAX_MB_CARDS];
-extern UCHAR mbCards;
+static UCHAR FPT_mbCards = 0;
+static UCHAR FPT_scamHAString[] = {0x63, 0x07, 'B', 'U', 'S', 'L', 'O', 'G', 'I', 'C', \
+                                   ' ', 'B', 'T', '-', '9', '3', '0', \
+                                   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, \
+                                   0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
 
-#if defined (OS2)
-   extern void (far *s_PhaseTbl[8]) (ULONG, UCHAR);
-#else
-   #if defined(DOS)
-      extern void (*s_PhaseTbl[8]) (USHORT, UCHAR);
-   #else
-      extern void (*s_PhaseTbl[8]) (ULONG, UCHAR);
-   #endif
-#endif
+static USHORT FPT_default_intena = 0;
 
 
-#if defined(BUGBUG)
-extern UCHAR debug_int[MAX_CARDS][debug_size];
-extern UCHAR debug_index[MAX_CARDS];
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
-#endif
-*/
+static void (*FPT_s_PhaseTbl[8]) (ULONG, UCHAR)= { 0 };
 
-#if (FW_TYPE==_SCCB_MGR_)
 
 /*---------------------------------------------------------------------
  *
@@ -2406,27 +1479,16 @@ void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
  *
  *---------------------------------------------------------------------*/
 
-int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
+static int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
 {
-#if defined(DOS)
-#else
    static UCHAR first_time = 1;
-#endif
 
    UCHAR i,j,id,ScamFlg;
    USHORT temp,temp2,temp3,temp4,temp5,temp6;
-#if defined(DOS)
-   USHORT ioport;
-#else
    ULONG ioport;
-#endif
         PNVRamInfo pCurrNvRam;
 
-#if defined(DOS)
-   ioport = (USHORT)pCardInfo->si_baseaddr;
-#else
    ioport = pCardInfo->si_baseaddr;
-#endif
 
 
    if (RD_HARPOON(ioport+hp_vendor_id_0) != ORION_VEND_0)
@@ -2455,36 +1517,31 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
 
    if (first_time)
       {
-      SccbMgrTableInitAll();
+      FPT_SccbMgrTableInitAll();
       first_time = 0;
-                mbCards = 0;
+                FPT_mbCards = 0;
       }
 
-        if(RdStack(ioport, 0) != 0x00) {
-                if(ChkIfChipInitialized(ioport) == FALSE)
+        if(FPT_RdStack(ioport, 0) != 0x00) {
+                if(FPT_ChkIfChipInitialized(ioport) == 0)
                 {
                         pCurrNvRam = NULL;
                    WR_HARPOON(ioport+hp_semaphore, 0x00);
-                        XbowInit(ioport, 0);             /*Must Init the SCSI before attempting */
-                        DiagEEPROM(ioport);
+                        FPT_XbowInit(ioport, 0);             /*Must Init the SCSI before attempting */
+                        FPT_DiagEEPROM(ioport);
                 }
                 else
                 {
-                        if(mbCards < MAX_MB_CARDS) {
-                                pCurrNvRam = &nvRamInfo[mbCards];
-                                mbCards++;
+                        if(FPT_mbCards < MAX_MB_CARDS) {
+                                pCurrNvRam = &FPT_nvRamInfo[FPT_mbCards];
+                                FPT_mbCards++;
                                 pCurrNvRam->niBaseAddr = ioport;
-                                RNVRamData(pCurrNvRam);
+                                FPT_RNVRamData(pCurrNvRam);
                         }else
                                 return((int) FAILURE);
                 }
         }else
                 pCurrNvRam = NULL;
-#if defined (NO_BIOS_OPTION)
-        pCurrNvRam = NULL;
-   XbowInit(ioport, 0);                /*Must Init the SCSI before attempting */
-   DiagEEPROM(ioport);
-#endif  /* No BIOS Option */
 
    WR_HARPOON(ioport+hp_clkctrl_0, CLKCTRL_DEFAULT);
    WR_HARPOON(ioport+hp_sys_ctrl, 0x00);
@@ -2492,7 +1549,7 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
         if(pCurrNvRam)
                 pCardInfo->si_id = pCurrNvRam->niAdapId;
         else
-           pCardInfo->si_id = (UCHAR)(utilEERead(ioport, (ADAPTER_SCSI_ID/2)) &
+           pCardInfo->si_id = (UCHAR)(FPT_utilEERead(ioport, (ADAPTER_SCSI_ID/2)) &
            (UCHAR)0x0FF);
 
    pCardInfo->si_lun = 0x00;
@@ -2510,7 +1567,7 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
                         temp = ((temp & 0x03) + ((temp << 4) & 0xc0)) +
                                          (((temp << 4) & 0x0300) + ((temp << 8) & 0xc000));
                 }else
-              temp = utilEERead(ioport, (USHORT)((SYNC_RATE_TBL/2)+id));
+              temp = FPT_utilEERead(ioport, (USHORT)((SYNC_RATE_TBL/2)+id));
 
       for (i = 0; i < 2; temp >>=8,i++) {
 
@@ -2549,12 +1606,12 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
         if(pCurrNvRam)
                 i = pCurrNvRam->niSysConf;
         else
-           i = (UCHAR)(utilEERead(ioport, (SYSTEM_CONFIG/2)));
+           i = (UCHAR)(FPT_utilEERead(ioport, (SYSTEM_CONFIG/2)));
 
         if(pCurrNvRam)
                 ScamFlg = pCurrNvRam->niScamConf;
         else
-           ScamFlg = (UCHAR) utilEERead(ioport, SCAM_CONFIG/2);
+           ScamFlg = (UCHAR) FPT_utilEERead(ioport, SCAM_CONFIG/2);
 
    pCardInfo->si_flags = 0x0000;
 
@@ -2613,9 +1670,9 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
                                 break;
                 }
         }else{
-           temp = utilEERead(ioport, (MODEL_NUMB_0/2));
+           temp = FPT_utilEERead(ioport, (MODEL_NUMB_0/2));
         pCardInfo->si_card_model[0] = (UCHAR)(temp >> 8);
-           temp = utilEERead(ioport, (MODEL_NUMB_2/2));
+           temp = FPT_utilEERead(ioport, (MODEL_NUMB_2/2));
 
         pCardInfo->si_card_model[1] = (UCHAR)(temp & 0x00FF);
            pCardInfo->si_card_model[2] = (UCHAR)(temp >> 8);
@@ -2677,29 +1734,17 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
 
    SGRAM_ACCESS(ioport);
 
-   s_PhaseTbl[0] = phaseDataOut;
-   s_PhaseTbl[1] = phaseDataIn;
-   s_PhaseTbl[2] = phaseIllegal;
-   s_PhaseTbl[3] = phaseIllegal;
-   s_PhaseTbl[4] = phaseCommand;
-   s_PhaseTbl[5] = phaseStatus;
-   s_PhaseTbl[6] = phaseMsgOut;
-   s_PhaseTbl[7] = phaseMsgIn;
+   FPT_s_PhaseTbl[0] = FPT_phaseDataOut;
+   FPT_s_PhaseTbl[1] = FPT_phaseDataIn;
+   FPT_s_PhaseTbl[2] = FPT_phaseIllegal;
+   FPT_s_PhaseTbl[3] = FPT_phaseIllegal;
+   FPT_s_PhaseTbl[4] = FPT_phaseCommand;
+   FPT_s_PhaseTbl[5] = FPT_phaseStatus;
+   FPT_s_PhaseTbl[6] = FPT_phaseMsgOut;
+   FPT_s_PhaseTbl[7] = FPT_phaseMsgIn;
 
    pCardInfo->si_present = 0x01;
 
-#if defined(BUGBUG)
-
-
-   for (i = 0; i < MAX_CARDS; i++) {
-
-      for (id=0; id<debug_size; id++)
-         debug_int[i][id] =  (UCHAR)0x00;
-      debug_index[i] = 0;
-      }
-
-#endif
-
    return(0);
 }
 
@@ -2712,27 +1757,15 @@ int SccbMgr_sense_adapter(PSCCBMGR_INFO pCardInfo)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-USHORT SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
-#else
-ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
-#endif
+static ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
 {
    PSCCBcard CurrCard = NULL;
         PNVRamInfo pCurrNvRam;
    UCHAR i,j,thisCard, ScamFlg;
    USHORT temp,sync_bit_map,id;
-#if defined(DOS)
-   USHORT ioport;
-#else
    ULONG ioport;
-#endif
 
-#if defined(DOS)
-   ioport = (USHORT)pCardInfo->si_baseaddr;
-#else
    ioport = pCardInfo->si_baseaddr;
-#endif
 
    for(thisCard =0; thisCard <= MAX_CARDS; thisCard++) {
 
@@ -2741,24 +1774,24 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
          return(FAILURE);
          }
 
-      if (BL_Card[thisCard].ioPort == ioport) {
+      if (FPT_BL_Card[thisCard].ioPort == ioport) {
 
-         CurrCard = &BL_Card[thisCard];
-         SccbMgrTableInitCard(CurrCard,thisCard);
+         CurrCard = &FPT_BL_Card[thisCard];
+         FPT_SccbMgrTableInitCard(CurrCard,thisCard);
          break;
          }
 
-      else if (BL_Card[thisCard].ioPort == 0x00) {
+      else if (FPT_BL_Card[thisCard].ioPort == 0x00) {
 
-         BL_Card[thisCard].ioPort = ioport;
-         CurrCard = &BL_Card[thisCard];
+         FPT_BL_Card[thisCard].ioPort = ioport;
+         CurrCard = &FPT_BL_Card[thisCard];
 
-                        if(mbCards)
-                                for(i = 0; i < mbCards; i++){
-                                        if(CurrCard->ioPort == nvRamInfo[i].niBaseAddr)
-                                                CurrCard->pNvRamInfo = &nvRamInfo[i];
+                        if(FPT_mbCards)
+                                for(i = 0; i < FPT_mbCards; i++){
+                                        if(CurrCard->ioPort == FPT_nvRamInfo[i].niBaseAddr)
+                                                CurrCard->pNvRamInfo = &FPT_nvRamInfo[i];
                                 }
-         SccbMgrTableInitCard(CurrCard,thisCard);
+         FPT_SccbMgrTableInitCard(CurrCard,thisCard);
          CurrCard->cardIndex = thisCard;
          CurrCard->cardInfo = pCardInfo;
 
@@ -2772,22 +1805,14 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
                 ScamFlg = pCurrNvRam->niScamConf;
         }
         else{
-           ScamFlg = (UCHAR) utilEERead(ioport, SCAM_CONFIG/2);
+           ScamFlg = (UCHAR) FPT_utilEERead(ioport, SCAM_CONFIG/2);
         }
 
 
-   BusMasterInit(ioport);
-   XbowInit(ioport, ScamFlg);
-
-#if defined (NO_BIOS_OPTION)
+   FPT_BusMasterInit(ioport);
+   FPT_XbowInit(ioport, ScamFlg);
 
-
-   if (DiagXbow(ioport)) return(FAILURE);
-   if (DiagBusMaster(ioport)) return(FAILURE);
-
-#endif  /* No BIOS Option */
-
-   autoLoadDefaultMap(ioport);
+   FPT_autoLoadDefaultMap(ioport);
 
 
    for (i = 0,id = 0x01; i != pCardInfo->si_id; i++,id <<= 1){}
@@ -2814,9 +1839,9 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
 
    if (!(pCardInfo->si_flags & SOFT_RESET)) {
 
-      sresb(ioport,thisCard);
+      FPT_sresb(ioport,thisCard);
 
-         scini(thisCard, pCardInfo->si_id, 0);
+         FPT_scini(thisCard, pCardInfo->si_id, 0);
       }
 
 
@@ -2829,7 +1854,7 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
                         CurrCard->globalFlags |= F_GREEN_PC;
         }
         else{
-           if (utilEERead(ioport, (SYSTEM_CONFIG/2)) & GREEN_PC_ENA)
+           if (FPT_utilEERead(ioport, (SYSTEM_CONFIG/2)) & GREEN_PC_ENA)
            CurrCard->globalFlags |= F_GREEN_PC;
         }
 
@@ -2840,7 +1865,7 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
                         CurrCard->globalFlags |= F_DO_RENEGO;
         }
         else{
-           if (utilEERead(ioport, (SCSI_CONFIG/2)) & RENEGO_ENA)
+           if (FPT_utilEERead(ioport, (SCSI_CONFIG/2)) & RENEGO_ENA)
            CurrCard->globalFlags |= F_DO_RENEGO;
         }
 
@@ -2849,7 +1874,7 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
                         CurrCard->globalFlags |= F_CONLUN_IO;
         }
         else{
-           if (utilEERead(ioport, (SCSI_CONFIG/2)) & CONNIO_ENA)
+           if (FPT_utilEERead(ioport, (SCSI_CONFIG/2)) & CONNIO_ENA)
            CurrCard->globalFlags |= F_CONLUN_IO;
         }
 
@@ -2859,7 +1884,7 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
    for (i = 0,id = 1; i < MAX_SCSI_TAR; i++, id <<= 1) {
 
       if (temp & id)
-         sccbMgrTbl[thisCard][i].TarStatus |= TAR_ALLOW_DISC;
+         FPT_sccbMgrTbl[thisCard][i].TarStatus |= TAR_ALLOW_DISC;
       }
 
    sync_bit_map = 0x0001;
@@ -2871,39 +1896,34 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
                         temp = ((temp & 0x03) + ((temp << 4) & 0xc0)) +
                                          (((temp << 4) & 0x0300) + ((temp << 8) & 0xc000));
                 }else
-              temp = utilEERead(ioport, (USHORT)((SYNC_RATE_TBL/2)+id));
+              temp = FPT_utilEERead(ioport, (USHORT)((SYNC_RATE_TBL/2)+id));
 
       for (i = 0; i < 2; temp >>=8,i++) {
 
          if (pCardInfo->si_per_targ_init_sync & sync_bit_map) {
 
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue = (UCHAR)temp;
+            FPT_sccbMgrTbl[thisCard][id*2+i].TarEEValue = (UCHAR)temp;
             }
 
          else {
-            sccbMgrTbl[thisCard][id*2+i].TarStatus |= SYNC_SUPPORTED;
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue =
+            FPT_sccbMgrTbl[thisCard][id*2+i].TarStatus |= SYNC_SUPPORTED;
+            FPT_sccbMgrTbl[thisCard][id*2+i].TarEEValue =
                (UCHAR)(temp & ~EE_SYNC_MASK);
             }
 
-#if defined(WIDE_SCSI)
 /*         if ((pCardInfo->si_per_targ_wide_nego & sync_bit_map) ||
             (id*2+i >= 8)){
 */
          if (pCardInfo->si_per_targ_wide_nego & sync_bit_map){
 
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue |= EE_WIDE_SCSI;
+            FPT_sccbMgrTbl[thisCard][id*2+i].TarEEValue |= EE_WIDE_SCSI;
 
             }
 
          else { /* NARROW SCSI */
-            sccbMgrTbl[thisCard][id*2+i].TarStatus |= WIDE_NEGOCIATED;
+            FPT_sccbMgrTbl[thisCard][id*2+i].TarStatus |= WIDE_NEGOCIATED;
             }
 
-#else
-         sccbMgrTbl[thisCard][id*2+i].TarStatus |= WIDE_NEGOCIATED;
-#endif
-
 
          sync_bit_map <<= 1;
 
@@ -2915,1285 +1935,97 @@ ULONG SccbMgr_config_adapter(PSCCBMGR_INFO pCardInfo)
    WR_HARPOON((ioport+hp_semaphore),
       (UCHAR)(RD_HARPOON((ioport+hp_semaphore)) | SCCB_MGR_PRESENT));
 
-#if defined(DOS)
-   return((USHORT)CurrCard);
-#else
    return((ULONG)CurrCard);
-#endif
 }
 
-#else                   /* end (FW_TYPE==_SCCB_MGR_)  */
-
-
-
-STATIC s16bits FP_PresenceCheck(PMGR_INFO pMgrInfo)
-{
-        PMGR_ENTRYPNTS  pMgr_EntryPnts = &pMgrInfo->mi_Functions;
-
-      pMgr_EntryPnts->UCBMgr_probe_adapter = probe_adapter;
-      pMgr_EntryPnts->UCBMgr_init_adapter = init_adapter;
-      pMgr_EntryPnts->UCBMgr_start_UCB = SccbMgr_start_sccb;
-      pMgr_EntryPnts->UCBMgr_build_UCB = build_UCB;
-      pMgr_EntryPnts->UCBMgr_abort_UCB = SccbMgr_abort_sccb;
-      pMgr_EntryPnts->UCBMgr_my_int = SccbMgr_my_int;
-      pMgr_EntryPnts->UCBMgr_isr = SccbMgr_isr;
-      pMgr_EntryPnts->UCBMgr_scsi_reset = SccbMgr_scsi_reset;
-      pMgr_EntryPnts->UCBMgr_timer_expired = SccbMgr_timer_expired;
-#ifndef NO_IOCTLS
-          pMgr_EntryPnts->UCBMgr_unload_card = SccbMgr_unload_card;
-          pMgr_EntryPnts->UCBMgr_save_foreign_state =
-                                                                                SccbMgr_save_foreign_state;
-          pMgr_EntryPnts->UCBMgr_restore_foreign_state =
-                                                                                SccbMgr_restore_foreign_state;
-          pMgr_EntryPnts->UCBMgr_restore_native_state =
-                                                                                SccbMgr_restore_native_state;
-#endif /*NO_IOCTLS*/
-
-      pMgrInfo->mi_SGListFormat=0x01;
-      pMgrInfo->mi_DataPtrFormat=0x01;
-      pMgrInfo->mi_MaxSGElements= (u16bits) 0xffffffff;
-      pMgrInfo->mi_MgrPrivateLen=sizeof(SCCB);
-      pMgrInfo->mi_PCIVendorID=BL_VENDOR_ID;
-      pMgrInfo->mi_PCIDeviceID=FP_DEVICE_ID;
-      pMgrInfo->mi_MgrAttributes= ATTR_IO_MAPPED +
-                                                                                         ATTR_PHYSICAL_ADDRESS +
-                                                                                         ATTR_VIRTUAL_ADDRESS +
-                                                                                         ATTR_OVERLAPPED_IO_IOCTLS_OK;
-      pMgrInfo->mi_IoRangeLen = 256;
-      return(0);
-}
-
-
-
-/*---------------------------------------------------------------------
- *
- * Function: probe_adapter
- *
- * Description: Setup and/or Search for cards and return info to caller.
- *
- *---------------------------------------------------------------------*/
-STATIC s32bits probe_adapter(PADAPTER_INFO pAdapterInfo)
-{
-   u16bits temp,temp2,temp3,temp4;
-   u08bits i,j,id;
-
-#if defined(DOS)
-#else
-   static u08bits first_time = 1;
-#endif
-   BASE_PORT ioport;
-        PNVRamInfo pCurrNvRam;
-
-   ioport = (BASE_PORT)pAdapterInfo->ai_baseaddr;
-
-
-
-   if (RD_HARPOON(ioport+hp_vendor_id_0) != ORION_VEND_0)
-      return(1);
-
-   if ((RD_HARPOON(ioport+hp_vendor_id_1) != ORION_VEND_1))
-      return(2);
-
-   if ((RD_HARPOON(ioport+hp_device_id_0) != ORION_DEV_0))
-      return(3);
-
-   if ((RD_HARPOON(ioport+hp_device_id_1) != ORION_DEV_1))
-      return(4);
-
-
-   if (RD_HARPOON(ioport+hp_rev_num) != 0x0f){
-
-
-/* For new Harpoon then check for sub_device ID LSB
-   the bits(0-3) must be all ZERO for compatible with
-   current version of SCCBMgr, else skip this Harpoon
-        device. */
-
-           if (RD_HARPOON(ioport+hp_sub_device_id_0) & 0x0f)
-              return(5);
-        }
-
-   if (first_time) {
-
-      SccbMgrTableInitAll();
-      first_time = 0;
-                mbCards = 0;
-      }
-
-        if(RdStack(ioport, 0) != 0x00) {
-                if(ChkIfChipInitialized(ioport) == FALSE)
-                {
-                        pCurrNvRam = NULL;
-                   WR_HARPOON(ioport+hp_semaphore, 0x00);
-                        XbowInit(ioport, 0);                /*Must Init the SCSI before attempting */
-                        DiagEEPROM(ioport);
-                }
-                else
-                {
-                        if(mbCards < MAX_MB_CARDS) {
-                                pCurrNvRam = &nvRamInfo[mbCards];
-                                mbCards++;
-                                pCurrNvRam->niBaseAddr = ioport;
-                                RNVRamData(pCurrNvRam);
-                        }else
-                                return((int) FAILURE);
-                }
-        }else
-                pCurrNvRam = NULL;
-
-#if defined (NO_BIOS_OPTION)
-        pCurrNvRam = NULL;
-   XbowInit(ioport, 0);                /*Must Init the SCSI before attempting */
-   DiagEEPROM(ioport);
-#endif  /* No BIOS Option */
-
-   WR_HARPOON(ioport+hp_clkctrl_0, CLKCTRL_DEFAULT);
-   WR_HARPOON(ioport+hp_sys_ctrl, 0x00);
-
-        if(pCurrNvRam)
-                pAdapterInfo->ai_id = pCurrNvRam->niAdapId;
-        else
-        pAdapterInfo->ai_id = (u08bits)(utilEERead(ioport, (ADAPTER_SCSI_ID/2)) &
-        (u08bits)0x0FF);
-
-   pAdapterInfo->ai_lun = 0x00;
-   pAdapterInfo->ai_fw_revision[0] = '3';
-   pAdapterInfo->ai_fw_revision[1] = '1';
-   pAdapterInfo->ai_fw_revision[2] = '1';
-   pAdapterInfo->ai_fw_revision[3] = ' ';
-   pAdapterInfo->ai_NumChannels = 1;
-
-   temp2 = 0x0000;
-   temp3 = 0x0000;
-   temp4 = 0x0000;
-
-   for (id = 0; id < (16/2); id++) {
-
-                if(pCurrNvRam){
-                        temp = (USHORT) pCurrNvRam->niSyncTbl[id];
-                        temp = ((temp & 0x03) + ((temp << 4) & 0xc0)) +
-                                         (((temp << 4) & 0x0300) + ((temp << 8) & 0xc000));
-                }else
-              temp = utilEERead(ioport, (u16bits)((SYNC_RATE_TBL/2)+id));
-
-      for (i = 0; i < 2; temp >>=8,i++) {
-
-         if ((temp & 0x03) != AUTO_RATE_00) {
-
-            temp2 >>= 0x01;
-            temp2 |= 0x8000;
-            }
-
-         else {
-            temp2 >>= 0x01;
-            }
-
-         if (temp & DISC_ENABLE_BIT) {
-
-            temp3 >>= 0x01;
-            temp3 |= 0x8000;
-            }
-
-         else {
-            temp3 >>= 0x01;
-            }
-
-         if (temp & WIDE_NEGO_BIT) {
-
-            temp4 >>= 0x01;
-            temp4 |= 0x8000;
-            }
-
-         else {
-            temp4 >>= 0x01;
-            }
-
-         }
-      }
-
-   pAdapterInfo->ai_per_targ_init_sync = temp2;
-   pAdapterInfo->ai_per_targ_no_disc = temp3;
-   pAdapterInfo->ai_per_targ_wide_nego = temp4;
-        if(pCurrNvRam)
-                i = pCurrNvRam->niSysConf;
-        else
-        i = (u08bits)(utilEERead(ioport, (SYSTEM_CONFIG/2)));
-
-   /*
-   ** interrupts always level-triggered for FlashPoint
-   */
-   pAdapterInfo->ai_stateinfo |= LEVEL_TRIG;
-
-   if (i & 0x01)
-      pAdapterInfo->ai_stateinfo |= SCSI_PARITY_ENA;
-
-        if (i & 0x02)   /* SCSI Bus reset in AutoSCSI Set ? */
-        {
-                if(pCurrNvRam)
-                {
-                        j = pCurrNvRam->niScamConf;
-                }
-                else
-                {
-                j = (u08bits) utilEERead(ioport, SCAM_CONFIG/2);
-                }
-                if(j & SCAM_ENABLED)
-                {
-                        if(j & SCAM_LEVEL2)
-                        {
-                                pAdapterInfo->ai_stateinfo |= SCAM2_ENA;
-                        }
-                        else
-                        {
-                                pAdapterInfo->ai_stateinfo |= SCAM1_ENA;
-                        }
-                }
-        }
-   j = (RD_HARPOON(ioport+hp_bm_ctrl) & ~SCSI_TERM_ENA_L);
-   if (i & 0x04) {
-      j |= SCSI_TERM_ENA_L;
-      pAdapterInfo->ai_stateinfo |= LOW_BYTE_TERM_ENA;
-      }
-   WR_HARPOON(ioport+hp_bm_ctrl, j );
-
-   j = (RD_HARPOON(ioport+hp_ee_ctrl) & ~SCSI_TERM_ENA_H);
-   if (i & 0x08) {
-      j |= SCSI_TERM_ENA_H;
-      pAdapterInfo->ai_stateinfo |= HIGH_BYTE_TERM_ENA;
-      }
-   WR_HARPOON(ioport+hp_ee_ctrl, j );
-
-        if(RD_HARPOON(ioport + hp_page_ctrl) & BIOS_SHADOW)
-        {
-                pAdapterInfo->ai_FlashRomSize = 64 * 1024;      /* 64k ROM */
-        }
-        else
-        {
-                pAdapterInfo->ai_FlashRomSize = 32 * 1024;      /* 32k ROM */
-        }
-
-   pAdapterInfo->ai_stateinfo |= (FAST20_ENA | TAG_QUEUE_ENA);
-   if (!(RD_HARPOON(ioport+hp_page_ctrl) & NARROW_SCSI_CARD))
-        {
-      pAdapterInfo->ai_attributes |= (WIDE_CAPABLE | FAST20_CAPABLE
-                                                                                                        | SCAM2_CAPABLE
-                                                                                                        | TAG_QUEUE_CAPABLE
-                                                                                                        | SUPRESS_UNDERRRUNS_CAPABLE
-                                                                                                        | SCSI_PARITY_CAPABLE);
-                pAdapterInfo->ai_MaxTarg = 16;
-                pAdapterInfo->ai_MaxLun  = 32;
-        }
-        else
-        {
-      pAdapterInfo->ai_attributes |= (FAST20_CAPABLE | SCAM2_CAPABLE
-                                                                                                        | TAG_QUEUE_CAPABLE
-                                                                                                        | SUPRESS_UNDERRRUNS_CAPABLE
-                                                                                                        | SCSI_PARITY_CAPABLE);
-                pAdapterInfo->ai_MaxTarg = 8;
-                pAdapterInfo->ai_MaxLun  = 8;
-        }
-
-   pAdapterInfo->ai_product_family = HARPOON_FAMILY;
-   pAdapterInfo->ai_HBAbustype = BUSTYPE_PCI;
-
-   for (i=0;i<CARD_MODEL_NAMELEN;i++)
-   {
-      pAdapterInfo->ai_card_model[i]=' '; /* initialize the ai_card_model */
-   }
-
-        if(pCurrNvRam){
-        pAdapterInfo->ai_card_model[0] = '9';
-                switch(pCurrNvRam->niModel & 0x0f){
-                        case MODEL_LT:
-                        pAdapterInfo->ai_card_model[1] = '3';
-                        pAdapterInfo->ai_card_model[2] = '0';
-                                break;
-                        case MODEL_LW:
-                        pAdapterInfo->ai_card_model[1] = '5';
-                        pAdapterInfo->ai_card_model[2] = '0';
-                                break;
-                        case MODEL_DL:
-                        pAdapterInfo->ai_card_model[1] = '3';
-                        pAdapterInfo->ai_card_model[2] = '2';
-                                break;
-                        case MODEL_DW:
-                        pAdapterInfo->ai_card_model[1] = '5';
-                        pAdapterInfo->ai_card_model[2] = '2';
-                                break;
-                }
-        }else{
-           temp = utilEERead(ioport, (MODEL_NUMB_0/2));
-                pAdapterInfo->ai_card_model[0] = (u08bits)(temp >> 8);
-           temp = utilEERead(ioport, (MODEL_NUMB_2/2));
-
-                pAdapterInfo->ai_card_model[1] = (u08bits)(temp & 0x00FF);
-           pAdapterInfo->ai_card_model[2] = (u08bits)(temp >> 8);
-        }
-
-
-
-   pAdapterInfo->ai_FiberProductType = 0;
-
-   pAdapterInfo->ai_secondary_range = 0;
-
-   for (i=0;i<WORLD_WIDE_NAMELEN;i++)
-   {
-      pAdapterInfo->ai_worldwidename[i]='\0';
-   }
-
-   for (i=0;i<VENDOR_NAMELEN;i++)
-   {
-      pAdapterInfo->ai_vendorstring[i]='\0';
-   }
-        pAdapterInfo->ai_vendorstring[0]='B';
-        pAdapterInfo->ai_vendorstring[1]='U';
-        pAdapterInfo->ai_vendorstring[2]='S';
-        pAdapterInfo->ai_vendorstring[3]='L';
-        pAdapterInfo->ai_vendorstring[4]='O';
-        pAdapterInfo->ai_vendorstring[5]='G';
-        pAdapterInfo->ai_vendorstring[6]='I';
-        pAdapterInfo->ai_vendorstring[7]='C';
-
-        for (i=0;i<FAMILY_NAMELEN;i++)
-        {
-           pAdapterInfo->ai_AdapterFamilyString[i]='\0';
-        }
-        pAdapterInfo->ai_AdapterFamilyString[0]='F';
-        pAdapterInfo->ai_AdapterFamilyString[1]='L';
-        pAdapterInfo->ai_AdapterFamilyString[2]='A';
-        pAdapterInfo->ai_AdapterFamilyString[3]='S';
-        pAdapterInfo->ai_AdapterFamilyString[4]='H';
-        pAdapterInfo->ai_AdapterFamilyString[5]='P';
-        pAdapterInfo->ai_AdapterFamilyString[6]='O';
-        pAdapterInfo->ai_AdapterFamilyString[7]='I';
-        pAdapterInfo->ai_AdapterFamilyString[8]='N';
-        pAdapterInfo->ai_AdapterFamilyString[9]='T';
-
-   ARAM_ACCESS(ioport);
-
-   for ( i = 0; i < 4; i++ ) {
-
-      pAdapterInfo->ai_XlatInfo[i] =
-         RD_HARPOON(ioport+hp_aramBase+BIOS_DATA_OFFSET+i);
-      }
-
-        /* return with -1 if no sort, else return with
-           logical card number sorted by BIOS (zero-based) */
-
-
-        pAdapterInfo->ai_relative_cardnum = 
-      (u08bits)(RD_HARPOON(ioport+hp_aramBase+BIOS_RELATIVE_CARD)-1); 
-
-   SGRAM_ACCESS(ioport);
-
-   s_PhaseTbl[0] = phaseDataOut;
-   s_PhaseTbl[1] = phaseDataIn;
-   s_PhaseTbl[2] = phaseIllegal;
-   s_PhaseTbl[3] = phaseIllegal;
-   s_PhaseTbl[4] = phaseCommand;
-   s_PhaseTbl[5] = phaseStatus;
-   s_PhaseTbl[6] = phaseMsgOut;
-   s_PhaseTbl[7] = phaseMsgIn;
-
-   pAdapterInfo->ai_present = 0x01;
-
-#if defined(BUGBUG)
-
-
-   for (i = 0; i < MAX_CARDS; i++) {
-
-      for (id=0; id<debug_size; id++)
-         debug_int[i][id] =  (u08bits)0x00;
-      debug_index[i] = 0;
-      }
-
-#endif
-
-   return(0);
-}
-
-
-
-
-
-/*---------------------------------------------------------------------
- *
- * Function: init_adapter, exported to BUDI via UCBMgr_init_adapter entry
- *
- *
- * Description: Setup adapter for normal operation (hard reset).
- *
- *---------------------------------------------------------------------*/
-STATIC CARD_HANDLE init_adapter(PADAPTER_INFO pCardInfo)
-{
-   PSCCBcard CurrCard;
-        PNVRamInfo pCurrNvRam;
-   u08bits i,j,thisCard, ScamFlg;
-   u16bits temp,sync_bit_map,id;
-   BASE_PORT ioport;
-
-   ioport = (BASE_PORT)pCardInfo->ai_baseaddr;
-
-   for(thisCard =0; thisCard <= MAX_CARDS; thisCard++) {
-
-      if (thisCard == MAX_CARDS) {
-
-         return(FAILURE);
-         }
-
-      if (BL_Card[thisCard].ioPort == ioport) {
-
-         CurrCard = &BL_Card[thisCard];
-         SccbMgrTableInitCard(CurrCard,thisCard);
-         break;
-         }
-
-      else if (BL_Card[thisCard].ioPort == 0x00) {
-
-         BL_Card[thisCard].ioPort = ioport;
-         CurrCard = &BL_Card[thisCard];
-
-                        if(mbCards)
-                                for(i = 0; i < mbCards; i++){
-                                        if(CurrCard->ioPort == nvRamInfo[i].niBaseAddr)
-                                                CurrCard->pNvRamInfo = &nvRamInfo[i];
-                                }
-         SccbMgrTableInitCard(CurrCard,thisCard);
-         CurrCard->cardIndex = thisCard;
-         CurrCard->cardInfo = pCardInfo;
-
-         break;
-         }
-      }
-
-        pCurrNvRam = CurrCard->pNvRamInfo;
-
-   
-        if(pCurrNvRam){
-                ScamFlg = pCurrNvRam->niScamConf;
-        }
-        else{
-           ScamFlg = (UCHAR) utilEERead(ioport, SCAM_CONFIG/2);
-        }
-        
-
-   BusMasterInit(ioport);
-   XbowInit(ioport, ScamFlg);
-
-#if defined (NO_BIOS_OPTION)
-
-
-   if (DiagXbow(ioport)) return(FAILURE);
-   if (DiagBusMaster(ioport)) return(FAILURE);
-
-#endif  /* No BIOS Option */
-
-   autoLoadDefaultMap(ioport);
-
-
-   for (i = 0,id = 0x01; i != pCardInfo->ai_id; i++,id <<= 1){}
-
-   WR_HARPOON(ioport+hp_selfid_0, id);
-   WR_HARPOON(ioport+hp_selfid_1, 0x00);
-   WR_HARPOON(ioport+hp_arb_id, pCardInfo->ai_id);
-   CurrCard->ourId = (unsigned char) pCardInfo->ai_id;
-
-   i = (u08bits) pCardInfo->ai_stateinfo;
-   if (i & SCSI_PARITY_ENA)
-       WR_HARPOON(ioport+hp_portctrl_1,(HOST_MODE8 | CHK_SCSI_P));
-
-   j = (RD_HARPOON(ioport+hp_bm_ctrl) & ~SCSI_TERM_ENA_L);
-   if (i & LOW_BYTE_TERM_ENA)
-      j |= SCSI_TERM_ENA_L;
-   WR_HARPOON(ioport+hp_bm_ctrl, j);
-
-   j = (RD_HARPOON(ioport+hp_ee_ctrl) & ~SCSI_TERM_ENA_H);
-   if (i & HIGH_BYTE_TERM_ENA)
-      j |= SCSI_TERM_ENA_H;
-   WR_HARPOON(ioport+hp_ee_ctrl, j );
-
-
-   if (!(pCardInfo->ai_stateinfo & NO_RESET_IN_INIT)) {
-
-      sresb(ioport,thisCard);
-
-         scini(thisCard, (u08bits) pCardInfo->ai_id, 0);
-      }
-
-
-
-   if (pCardInfo->ai_stateinfo & SUPRESS_UNDERRRUNS_ENA)
-      CurrCard->globalFlags |= F_NO_FILTER;
-
-        if(pCurrNvRam){
-                if(pCurrNvRam->niSysConf & 0x10)
-                        CurrCard->globalFlags |= F_GREEN_PC;
-        }
-        else{
-           if (utilEERead(ioport, (SYSTEM_CONFIG/2)) & GREEN_PC_ENA)
-           CurrCard->globalFlags |= F_GREEN_PC;
-        }
-
-        /* Set global flag to indicate Re-Negotiation to be done on all
-                ckeck condition */
-        if(pCurrNvRam){
-                if(pCurrNvRam->niScsiConf & 0x04)
-                        CurrCard->globalFlags |= F_DO_RENEGO;
-        }
-        else{
-           if (utilEERead(ioport, (SCSI_CONFIG/2)) & RENEGO_ENA)
-           CurrCard->globalFlags |= F_DO_RENEGO;
-        }
-
-        if(pCurrNvRam){
-                if(pCurrNvRam->niScsiConf & 0x08)
-                        CurrCard->globalFlags |= F_CONLUN_IO;
-        }
-        else{
-           if (utilEERead(ioport, (SCSI_CONFIG/2)) & CONNIO_ENA)
-           CurrCard->globalFlags |= F_CONLUN_IO;
-        }
-
-   temp = pCardInfo->ai_per_targ_no_disc;
-
-   for (i = 0,id = 1; i < MAX_SCSI_TAR; i++, id <<= 1) {
-
-      if (temp & id)
-         sccbMgrTbl[thisCard][i].TarStatus |= TAR_ALLOW_DISC;
-      }
-
-   sync_bit_map = 0x0001;
-
-   for (id = 0; id < (MAX_SCSI_TAR/2); id++){
-
-                if(pCurrNvRam){
-                        temp = (USHORT) pCurrNvRam->niSyncTbl[id];
-                        temp = ((temp & 0x03) + ((temp << 4) & 0xc0)) +
-                                         (((temp << 4) & 0x0300) + ((temp << 8) & 0xc000));
-                }else
-              temp = utilEERead(ioport, (u16bits)((SYNC_RATE_TBL/2)+id));
-
-      for (i = 0; i < 2; temp >>=8,i++){
-
-         if (pCardInfo->ai_per_targ_init_sync & sync_bit_map){
-
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue = (u08bits)temp;
-            }
-
-         else {
-            sccbMgrTbl[thisCard][id*2+i].TarStatus |= SYNC_SUPPORTED;
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue =
-               (u08bits)(temp & ~EE_SYNC_MASK);
-            }
-
-#if defined(WIDE_SCSI)
-/*         if ((pCardInfo->ai_per_targ_wide_nego & sync_bit_map) ||
-            (id*2+i >= 8)){
-*/
-         if (pCardInfo->ai_per_targ_wide_nego & sync_bit_map){
-
-            sccbMgrTbl[thisCard][id*2+i].TarEEValue |= EE_WIDE_SCSI;
-
-            }
-
-         else { /* NARROW SCSI */
-            sccbMgrTbl[thisCard][id*2+i].TarStatus |= WIDE_NEGOCIATED;
-            }
-
-#else
-         sccbMgrTbl[thisCard][id*2+i].TarStatus |= WIDE_NEGOCIATED;
-#endif
-
-
-         sync_bit_map <<= 1;
-         }
-      }
-
-
-   pCardInfo->ai_SGListFormat=0x01;
-   pCardInfo->ai_DataPtrFormat=0x01;
-   pCardInfo->ai_AEN_mask &= SCSI_RESET_COMPLETE;
-
-   WR_HARPOON((ioport+hp_semaphore),
-      (u08bits)(RD_HARPOON((ioport+hp_semaphore)) | SCCB_MGR_PRESENT));
-
-   return((u32bits)CurrCard);
-
-}
-
-
-/*---------------------------------------------------------------------
- *
- * Function: build_ucb, exported to BUDI via UCBMgr_build_ucb entry
- *
- * Description: prepare fw portion of ucb. do not start, resource not guaranteed
- *             so don't manipulate anything that's derived from states which
- *             may change
- *
- *---------------------------------------------------------------------*/
-void build_UCB(CARD_HANDLE pCurrCard, PUCB p_ucb)
-{
-
-   u08bits thisCard;
-   u08bits i,j;
-
-   PSCCB p_sccb;
-
-
-   thisCard = ((PSCCBcard) pCurrCard)->cardIndex;
-
-
-   p_sccb=(PSCCB)p_ucb->UCB_MgrPrivatePtr;
-
-
-   p_sccb->Sccb_ucb_ptr=p_ucb;
-
-   switch (p_ucb->UCB_opcode & (OPC_DEVICE_RESET+OPC_XFER_SG+OPC_CHK_RESIDUAL))
-   {
-      case OPC_DEVICE_RESET:
-         p_sccb->OperationCode=RESET_COMMAND;
-         break;
-      case OPC_XFER_SG:
-         p_sccb->OperationCode=SCATTER_GATHER_COMMAND;
-         break;
-      case OPC_XFER_SG+OPC_CHK_RESIDUAL:
-         p_sccb->OperationCode=RESIDUAL_SG_COMMAND;
-         break;
-      case OPC_CHK_RESIDUAL:
-
-              p_sccb->OperationCode=RESIDUAL_COMMAND;
-              break;
-      default:
-              p_sccb->OperationCode=SCSI_INITIATOR_COMMAND;
-              break;
-   }
-
-   if (p_ucb->UCB_opcode & OPC_TQ_ENABLE)
-   {
-      p_sccb->ControlByte = (u08bits)((p_ucb->UCB_opcode & OPC_TQ_MASK)>>2) | F_USE_CMD_Q;
-   }
-   else
-   {
-      p_sccb->ControlByte = 0;
-   }
-
-
-   p_sccb->CdbLength = (u08bits)p_ucb->UCB_cdblen;
-
-   if (p_ucb->UCB_opcode & OPC_NO_AUTO_SENSE)
-   {
-      p_sccb->RequestSenseLength = 0;
-   }
-   else
-   {
-      p_sccb->RequestSenseLength = (unsigned char) p_ucb->UCB_senselen;
-   }
-
-
-   if (p_ucb->UCB_opcode & OPC_XFER_SG)
-   {
-      p_sccb->DataPointer=p_ucb->UCB_virt_dataptr;
-      p_sccb->DataLength = (((u32bits)p_ucb->UCB_NumSgElements)<<3);
-   }
-   else
-   {
-      p_sccb->DataPointer=p_ucb->UCB_phys_dataptr;
-      p_sccb->DataLength=p_ucb->UCB_datalen;
-   };
-
-   p_sccb->HostStatus=0;
-   p_sccb->TargetStatus=0;
-   p_sccb->TargID=(unsigned char)p_ucb->UCB_targid;
-   p_sccb->Lun=(unsigned char) p_ucb->UCB_lun;
-   p_sccb->SccbIOPort=((PSCCBcard)pCurrCard)->ioPort;
-
-   j=p_ucb->UCB_cdblen;
-   for (i=0;i<j;i++)
-   {
-      p_sccb->Cdb[i] = p_ucb->UCB_cdb[i];
-   }
-
-   p_sccb->SensePointer=p_ucb->UCB_phys_senseptr;
-
-   sinits(p_sccb,thisCard);
-
-}
-#ifndef NO_IOCTLS
-
-/*---------------------------------------------------------------------
- *
- * Function: GetDevSyncRate
- *
- *---------------------------------------------------------------------*/
-STATIC  int GetDevSyncRate(PSCCBcard pCurrCard,PUCB p_ucb)
-{
-        struct _SYNC_RATE_INFO * pSyncStr;
-   PSCCBMgr_tar_info currTar_Info;
-        BASE_PORT ioport;
-        u08bits scsiID, j;
-
-#if (FW_TYPE != _SCCB_MGR_)
-        if( p_ucb->UCB_targid >= pCurrCard->cardInfo->ai_MaxTarg )
-        {
-                return(1);
-        }
-#endif
-
-        ioport  = pCurrCard->ioPort;
-        pSyncStr        = (struct _SYNC_RATE_INFO *) p_ucb->UCB_virt_dataptr;
-        scsiID = (u08bits) p_ucb->UCB_targid;
-   currTar_Info = &sccbMgrTbl[pCurrCard->cardIndex][scsiID];
-        j = currTar_Info->TarSyncCtrl;
-
-        switch (currTar_Info->TarEEValue & EE_SYNC_MASK)
-        {
-                case EE_SYNC_ASYNC:
-                        pSyncStr->RequestMegaXferRate = 0x00;
-                        break;
-                case EE_SYNC_5MB:
-                        pSyncStr->RequestMegaXferRate = (j & NARROW_SCSI) ? 50 : 100;
-                        break;
-                case EE_SYNC_10MB:
-                        pSyncStr->RequestMegaXferRate = (j & NARROW_SCSI) ? 100 : 200;
-                        break;
-                case EE_SYNC_20MB:
-                        pSyncStr->RequestMegaXferRate = (j & NARROW_SCSI) ? 200 : 400;
-                        break;
-        }
-
-        switch ((j >> 5) & 0x07)
-        {
-                case 0x00:
-                        if((j & 0x07) == 0x00)
-                        {
-                                pSyncStr->ActualMegaXferRate = 0x00;    /* Async Mode */
-                        }
-                        else
-                        {
-                                pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 200 : 400;
-                        }
-                        break;
-                case 0x01:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 100 : 200;
-                        break;
-                case 0x02:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 66 : 122;
-                        break;
-                case 0x03:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 50 : 100;
-                        break;
-                case 0x04:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 40 : 80;
-                        break;
-                case 0x05:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 33 : 66;
-                        break;
-                case 0x06:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 28 : 56;
-                        break;
-                case 0x07:
-                        pSyncStr->ActualMegaXferRate = (j & NARROW_SCSI) ? 25 : 50;
-                        break;
-        }
-        pSyncStr->NegotiatedOffset = j & 0x0f;
-
-        return(0);
-}
-
-/*---------------------------------------------------------------------
- *
- * Function: SetDevSyncRate
- *
- *---------------------------------------------------------------------*/
-STATIC int SetDevSyncRate(PSCCBcard pCurrCard, PUCB p_ucb)
-{
-        struct _SYNC_RATE_INFO * pSyncStr;
-   PSCCBMgr_tar_info currTar_Info;
-        BASE_PORT ioPort;
-        u08bits scsiID, i, j, syncVal;
-        u16bits syncOffset, actualXferRate;
-        union {
-                u08bits tempb[2];
-                u16bits tempw;
-        }temp2;
-
-#if (FW_TYPE != _SCCB_MGR_)
-        if( p_ucb->UCB_targid >= pCurrCard->cardInfo->ai_MaxTarg )
-        {
-                return(1);
-        }
-#endif
-
-        ioPort  = pCurrCard->ioPort;
-        pSyncStr        = (struct _SYNC_RATE_INFO *) p_ucb->UCB_virt_dataptr;
-        scsiID = (u08bits) p_ucb->UCB_targid;
-   currTar_Info = &sccbMgrTbl[pCurrCard->cardIndex][scsiID];
-        i = RD_HARPOON(ioPort+hp_xfer_pad);             /* Save current value */
-        WR_HARPOON(ioPort+hp_xfer_pad, (i | ID_UNLOCK));
-        WR_HARPOON(ioPort+hp_select_id, ((scsiID << 4) | scsiID));
-        j = RD_HARPOON(ioPort+hp_synctarg_0);
-        WR_HARPOON(ioPort+hp_xfer_pad, i);              /* restore value */
-
-        actualXferRate = pSyncStr->ActualMegaXferRate;
-        if(!(j & NARROW_SCSI))
-        {
-                actualXferRate <<= 1;
-        }
-        if(actualXferRate == 0x00)
-        {
-                syncVal = EE_SYNC_ASYNC;                        /* Async Mode */
-        }
-        if(actualXferRate == 0x0200)
-        {
-                syncVal = EE_SYNC_20MB;                         /* 20/40 MB Mode */
-        }
-        if(actualXferRate > 0x0050 && actualXferRate < 0x0200 )
-        {
-                syncVal = EE_SYNC_10MB;                         /* 10/20 MB Mode */
-        }
-        else
-        {
-                syncVal = EE_SYNC_5MB;                          /* 5/10 MB Mode */
-        }
-        if(currTar_Info->TarEEValue && EE_SYNC_MASK == syncVal)
-                return(0);
-        currTar_Info->TarEEValue = (currTar_Info->TarEEValue & !EE_SYNC_MASK)
-                                                                                        | syncVal;
-        syncOffset = (SYNC_RATE_TBL + scsiID) / 2;
-        temp2.tempw = utilEERead(ioPort, syncOffset);
-        if(scsiID & 0x01)
-        {
-                temp2.tempb[0] = (temp2.tempb[0] & !EE_SYNC_MASK) | syncVal;
-        }
-        else
-        {
-                temp2.tempb[1] = (temp2.tempb[1] & !EE_SYNC_MASK) | syncVal;
-        }
-        utilEEWriteOnOff(ioPort, 1);
-        utilEEWrite(ioPort, temp2.tempw, syncOffset);
-        utilEEWriteOnOff(ioPort, 0);
-        UpdateCheckSum(ioPort);
-
-        return(0);
-}
-/*---------------------------------------------------------------------
- *
- * Function: GetDevWideMode
- *
- *---------------------------------------------------------------------*/
-int GetDevWideMode(PSCCBcard pCurrCard,PUCB p_ucb)
-{
-        u08bits *pData;
-
-        pData = (u08bits *)p_ucb->UCB_virt_dataptr;
-        if(sccbMgrTbl[pCurrCard->cardIndex][p_ucb->UCB_targid].TarEEValue
-                                & EE_WIDE_SCSI)
-        {
-                *pData = 1;
-        }
-        else
-        {
-                *pData = 0;
-        }
-
-        return(0);
-}
-
-/*---------------------------------------------------------------------
- *
- * Function: SetDevWideMode
- *
- *---------------------------------------------------------------------*/
-int SetDevWideMode(PSCCBcard pCurrCard,PUCB p_ucb)
-{
-        u08bits *pData;
-   PSCCBMgr_tar_info currTar_Info;
-        BASE_PORT ioPort;
-        u08bits scsiID, scsiWideMode;
-        u16bits syncOffset;
-        union {
-                u08bits tempb[2];
-                u16bits tempw;
-        }temp2;
-
-#if (FW_TYPE != _SCCB_MGR_)
-        if( !(pCurrCard->cardInfo->ai_attributes & WIDE_CAPABLE) )
-        {
-                return(1);
-        }
-
-        if( p_ucb->UCB_targid >= pCurrCard->cardInfo->ai_MaxTarg )
-        {
-                return(1);
-        }
-#endif
-
-        ioPort  = pCurrCard->ioPort;
-        pData = (u08bits *)p_ucb->UCB_virt_dataptr;
-        scsiID = (u08bits) p_ucb->UCB_targid;
-        currTar_Info = &sccbMgrTbl[pCurrCard->cardIndex][scsiID];
-
-        if(*pData)
-        {
-                if(currTar_Info->TarEEValue & EE_WIDE_SCSI)
-                {
-                        return(0);
-                }
-                else
-                {
-                        scsiWideMode = EE_WIDE_SCSI;
-                }
-        }
-        else
-        {
-                if(!(currTar_Info->TarEEValue & EE_WIDE_SCSI))
-                {
-                        return(0);
-                }
-                else
-                {
-                        scsiWideMode = 0;
-                }
-        }
-        currTar_Info->TarEEValue = (currTar_Info->TarEEValue & !EE_WIDE_SCSI)
-                                                                                        | scsiWideMode;
-
-        syncOffset = (SYNC_RATE_TBL + scsiID) / 2;
-        temp2.tempw = utilEERead(ioPort, syncOffset);
-        if(scsiID & 0x01)
-        {
-                temp2.tempb[0] = (temp2.tempb[0] & !EE_WIDE_SCSI) | scsiWideMode;
-        }
-        else
-        {
-                temp2.tempb[1] = (temp2.tempb[1] & !EE_WIDE_SCSI) | scsiWideMode;
-        }
-        utilEEWriteOnOff(ioPort, 1);
-        utilEEWrite(ioPort, temp2.tempw, syncOffset);
-        utilEEWriteOnOff(ioPort, 0);
-        UpdateCheckSum(ioPort);
-
-        return(0);
-}
-
-/*---------------------------------------------------------------------
- *
- * Function: ReadNVRam
- *
- *---------------------------------------------------------------------*/
-void ReadNVRam(PSCCBcard pCurrCard,PUCB p_ucb)
-{
-        u08bits *pdata;
-        u16bits i,numwrds,numbytes,offset,temp;
-        u08bits OneMore = FALSE;
-#if defined(DOS)
-        u16bits ioport;
-#else
-        u32bits ioport;
-#endif
-
-        numbytes = (u16bits) p_ucb->UCB_datalen;
-        ioport  = pCurrCard->ioPort;
-   pdata   = (u08bits *) p_ucb->UCB_virt_dataptr;
-        offset  = (u16bits) (p_ucb->UCB_IOCTLParams[0]);
-
-
-
-   if (offset & 0x1)
-        {
-            *((u16bits*) pdata) = utilEERead(ioport,(u16bits)((offset - 1) / 2)); /* 16 bit read */
-                 *pdata = *(pdata + 1);
-                 ++offset;
-         ++pdata;
-                 --numbytes;
-        }
-
-        numwrds = numbytes / 2;
-        if (numbytes & 1)
-                OneMore = TRUE;
-
-        for (i = 0; i < numwrds; i++)
-        {
-        *((u16bits*) pdata) = utilEERead(ioport,(u16bits)(offset / 2));
-                pdata += 2;
-                offset += 2;
-   }
-        if (OneMore)
-        {
-                --pdata;
-                -- offset;
-        temp = utilEERead(ioport,(u16bits)(offset / 2));
-                *pdata = (u08bits) (temp);
-        }
-
-} /* end proc ReadNVRam */
-
-
-/*---------------------------------------------------------------------
- *
- * Function: WriteNVRam
- *
- *---------------------------------------------------------------------*/
-void WriteNVRam(PSCCBcard pCurrCard,PUCB p_ucb)
-{
-        u08bits *pdata;
-        u16bits i,numwrds,numbytes,offset, eeprom_end;
-        u08bits OneMore = FALSE;
-        union {
-                u08bits  tempb[2];
-                u16bits  tempw;
-        } temp2;
-
-#if defined(DOS)
-        u16bits ioport;
-#else
-        u32bits ioport;
-#endif
-
-        numbytes = (u16bits) p_ucb->UCB_datalen;
-        ioport  = pCurrCard->ioPort;
-   pdata   = (u08bits *) p_ucb->UCB_virt_dataptr;
-        offset  = (u16bits) (p_ucb->UCB_IOCTLParams[0]);
-
-   if (RD_HARPOON(ioport+hp_page_ctrl) & NARROW_SCSI_CARD)
-      eeprom_end = 512;
-   else
-      eeprom_end = 768;
-        
-        if(offset > eeprom_end)
-                return;
-
-        if((offset + numbytes) > eeprom_end)
-                numbytes = eeprom_end - offset;
-
-    utilEEWriteOnOff(ioport,1);   /* Enable write access to the EEPROM */
-
-
-
-   if (offset & 0x1)
-        {
-            temp2.tempw = utilEERead(ioport,(u16bits)((offset - 1) / 2)); /* 16 bit read */
-                 temp2.tempb[1] = *pdata;
-            utilEEWrite(ioport, temp2.tempw, (u16bits)((offset -1) / 2));
-                 *pdata = *(pdata + 1);
-                 ++offset;
-         ++pdata;
-                 --numbytes;
-        }
-
-        numwrds = numbytes / 2;
-        if (numbytes & 1)
-                OneMore = TRUE;
-
-        for (i = 0; i < numwrds; i++)
-        {
-        utilEEWrite(ioport, *((pu16bits)pdata),(u16bits)(offset / 2));
-                pdata += 2;
-                offset += 2;
-   }
-        if (OneMore)
-        {
-
-        temp2.tempw = utilEERead(ioport,(u16bits)(offset / 2));
-                temp2.tempb[0] = *pdata;
-        utilEEWrite(ioport, temp2.tempw, (u16bits)(offset / 2));
-        }
-   utilEEWriteOnOff(ioport,0);   /* Turn off write access */
-   UpdateCheckSum((u32bits)ioport);
-
-} /* end proc WriteNVRam */
-
-
-
-/*---------------------------------------------------------------------
- *
- * Function: UpdateCheckSum
- *
- * Description: Update Check Sum in EEPROM
- *
- *---------------------------------------------------------------------*/
-
-
-void UpdateCheckSum(u32bits baseport)
-{
-        USHORT i,sum_data, eeprom_end;
-
-        sum_data = 0x0000;
-
-
-   if (RD_HARPOON(baseport+hp_page_ctrl) & NARROW_SCSI_CARD)
-      eeprom_end = 512;
-   else
-      eeprom_end = 768;
-
-        for (i = 1; i < eeprom_end/2; i++)
-        {
-                sum_data += utilEERead(baseport, i);
-        }
-
-   utilEEWriteOnOff(baseport,1);   /* Enable write access to the EEPROM */
-
-   utilEEWrite(baseport, sum_data, EEPROM_CHECK_SUM/2);
-   utilEEWriteOnOff(baseport,0);   /* Turn off write access */
-}
-
-void SccbMgr_save_foreign_state(PADAPTER_INFO pAdapterInfo)
-{
-}
-
-
-void SccbMgr_restore_foreign_state(CARD_HANDLE pCurrCard)
-{
-}
-
-void SccbMgr_restore_native_state(CARD_HANDLE pCurrCard)
-{
-}
-
-#endif /* NO_IOCTLS */
-
-#endif /* (FW_TYPE==_UCB_MGR_)   */
-
-#ifndef NO_IOCTLS
-#if (FW_TYPE==_UCB_MGR_)
-void SccbMgr_unload_card(CARD_HANDLE pCurrCard)
-#else
-#if defined(DOS)
-void SccbMgr_unload_card(USHORT pCurrCard)
-#else
-void SccbMgr_unload_card(ULONG pCurrCard)
-#endif
-#endif
+static void SccbMgr_unload_card(ULONG pCurrCard)
 {
         UCHAR i;
-#if defined(DOS)
-        USHORT portBase;
-        USHORT regOffset;
-#else
         ULONG portBase;
         ULONG regOffset;
-#endif
         ULONG scamData;
-#if defined(OS2)
-        ULONG far *pScamTbl;
-#else
         ULONG *pScamTbl;
-#endif
         PNVRamInfo pCurrNvRam;
 
         pCurrNvRam = ((PSCCBcard)pCurrCard)->pNvRamInfo;
 
         if(pCurrNvRam){
-                WrStack(pCurrNvRam->niBaseAddr, 0, pCurrNvRam->niModel);
-                WrStack(pCurrNvRam->niBaseAddr, 1, pCurrNvRam->niSysConf);
-                WrStack(pCurrNvRam->niBaseAddr, 2, pCurrNvRam->niScsiConf);
-                WrStack(pCurrNvRam->niBaseAddr, 3, pCurrNvRam->niScamConf);
-                WrStack(pCurrNvRam->niBaseAddr, 4, pCurrNvRam->niAdapId);
+                FPT_WrStack(pCurrNvRam->niBaseAddr, 0, pCurrNvRam->niModel);
+                FPT_WrStack(pCurrNvRam->niBaseAddr, 1, pCurrNvRam->niSysConf);
+                FPT_WrStack(pCurrNvRam->niBaseAddr, 2, pCurrNvRam->niScsiConf);
+                FPT_WrStack(pCurrNvRam->niBaseAddr, 3, pCurrNvRam->niScamConf);
+                FPT_WrStack(pCurrNvRam->niBaseAddr, 4, pCurrNvRam->niAdapId);
 
                 for(i = 0; i < MAX_SCSI_TAR / 2; i++)
-                        WrStack(pCurrNvRam->niBaseAddr, (UCHAR)(i+5), pCurrNvRam->niSyncTbl[i]);
+                        FPT_WrStack(pCurrNvRam->niBaseAddr, (UCHAR)(i+5), pCurrNvRam->niSyncTbl[i]);
 
                 portBase = pCurrNvRam->niBaseAddr;
 
                 for(i = 0; i < MAX_SCSI_TAR; i++){
                         regOffset = hp_aramBase + 64 + i*4;
-#if defined(OS2)
-                        pScamTbl = (ULONG far *) &pCurrNvRam->niScamTbl[i];
-#else
                         pScamTbl = (ULONG *) &pCurrNvRam->niScamTbl[i];
-#endif
                         scamData = *pScamTbl;
                         WR_HARP32(portBase, regOffset, scamData);
                 }
 
         }else{
-                WrStack(((PSCCBcard)pCurrCard)->ioPort, 0, 0);
+                FPT_WrStack(((PSCCBcard)pCurrCard)->ioPort, 0, 0);
         }
 }
-#endif /* NO_IOCTLS */
 
 
-void RNVRamData(PNVRamInfo pNvRamInfo)
+static void FPT_RNVRamData(PNVRamInfo pNvRamInfo)
 {
         UCHAR i;
-#if defined(DOS)
-        USHORT portBase;
-        USHORT regOffset;
-#else
         ULONG portBase;
         ULONG regOffset;
-#endif
         ULONG scamData;
-#if defined (OS2)
-        ULONG far *pScamTbl;
-#else
         ULONG *pScamTbl;
-#endif
 
-        pNvRamInfo->niModel    = RdStack(pNvRamInfo->niBaseAddr, 0);
-        pNvRamInfo->niSysConf  = RdStack(pNvRamInfo->niBaseAddr, 1);
-        pNvRamInfo->niScsiConf = RdStack(pNvRamInfo->niBaseAddr, 2);
-        pNvRamInfo->niScamConf = RdStack(pNvRamInfo->niBaseAddr, 3);
-        pNvRamInfo->niAdapId   = RdStack(pNvRamInfo->niBaseAddr, 4);
+        pNvRamInfo->niModel    = FPT_RdStack(pNvRamInfo->niBaseAddr, 0);
+        pNvRamInfo->niSysConf  = FPT_RdStack(pNvRamInfo->niBaseAddr, 1);
+        pNvRamInfo->niScsiConf = FPT_RdStack(pNvRamInfo->niBaseAddr, 2);
+        pNvRamInfo->niScamConf = FPT_RdStack(pNvRamInfo->niBaseAddr, 3);
+        pNvRamInfo->niAdapId   = FPT_RdStack(pNvRamInfo->niBaseAddr, 4);
 
         for(i = 0; i < MAX_SCSI_TAR / 2; i++)
-                pNvRamInfo->niSyncTbl[i] = RdStack(pNvRamInfo->niBaseAddr, (UCHAR)(i+5));
+                pNvRamInfo->niSyncTbl[i] = FPT_RdStack(pNvRamInfo->niBaseAddr, (UCHAR)(i+5));
 
         portBase = pNvRamInfo->niBaseAddr;
 
         for(i = 0; i < MAX_SCSI_TAR; i++){
                 regOffset = hp_aramBase + 64 + i*4;
                 RD_HARP32(portBase, regOffset, scamData);
-#if defined(OS2)
-                pScamTbl = (ULONG far *) &pNvRamInfo->niScamTbl[i];
-#else
                 pScamTbl = (ULONG *) &pNvRamInfo->niScamTbl[i];
-#endif
                 *pScamTbl = scamData;
         }
 
 }
 
-#if defined(DOS)
-UCHAR RdStack(USHORT portBase, UCHAR index)
-#else
-UCHAR RdStack(ULONG portBase, UCHAR index)
-#endif
+static UCHAR FPT_RdStack(ULONG portBase, UCHAR index)
 {
         WR_HARPOON(portBase + hp_stack_addr, index);
         return(RD_HARPOON(portBase + hp_stack_data));
 }
 
-#if defined(DOS)
-void WrStack(USHORT portBase, UCHAR index, UCHAR data)
-#else
-void WrStack(ULONG portBase, UCHAR index, UCHAR data)
-#endif
+static void FPT_WrStack(ULONG portBase, UCHAR index, UCHAR data)
 {
         WR_HARPOON(portBase + hp_stack_addr, index);
         WR_HARPOON(portBase + hp_stack_data, data);
 }
 
 
-#if (FW_TYPE==_UCB_MGR_)
-u08bits ChkIfChipInitialized(BASE_PORT ioPort)
-#else
-#if defined(DOS)
-UCHAR ChkIfChipInitialized(USHORT ioPort)
-#else
-UCHAR ChkIfChipInitialized(ULONG ioPort)
-#endif
-#endif
+static UCHAR FPT_ChkIfChipInitialized(ULONG ioPort)
 {
-        if((RD_HARPOON(ioPort + hp_arb_id) & 0x0f) != RdStack(ioPort, 4))
-                return(FALSE);
+        if((RD_HARPOON(ioPort + hp_arb_id) & 0x0f) != FPT_RdStack(ioPort, 4))
+                return(0);
         if((RD_HARPOON(ioPort + hp_clkctrl_0) & CLKCTRL_DEFAULT)
                                                                 != CLKCTRL_DEFAULT)
-                return(FALSE);
+                return(0);
         if((RD_HARPOON(ioPort + hp_seltimeout) == TO_250ms) ||
                 (RD_HARPOON(ioPort + hp_seltimeout) == TO_290ms))
-                return(TRUE);
-        return(FALSE);
+                return(1);
+        return(0);
 
 }
 /*---------------------------------------------------------------------
@@ -4205,185 +2037,29 @@ UCHAR ChkIfChipInitialized(ULONG ioPort)
  *              callback function.
  *
  *---------------------------------------------------------------------*/
-#if (FW_TYPE==_UCB_MGR_)
-void SccbMgr_start_sccb(CARD_HANDLE pCurrCard, PUCB p_ucb)
-#else
-#if defined(DOS)
-void SccbMgr_start_sccb(USHORT pCurrCard, PSCCB p_Sccb)
-#else
-void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
-#endif
-#endif
+static void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
 {
-#if defined(DOS)
-   USHORT ioport;
-#else
    ULONG ioport;
-#endif
    UCHAR thisCard, lun;
         PSCCB pSaveSccb;
    CALL_BK_FN callback;
 
-#if (FW_TYPE==_UCB_MGR_)
-   PSCCB p_Sccb;
-#endif
-
-   mOS_Lock((PSCCBcard)pCurrCard);
    thisCard = ((PSCCBcard) pCurrCard)->cardIndex;
    ioport = ((PSCCBcard) pCurrCard)->ioPort;
 
-#if (FW_TYPE==_UCB_MGR_)
-   p_Sccb = (PSCCB)p_ucb->UCB_MgrPrivatePtr;
-#endif
-
         if((p_Sccb->TargID > MAX_SCSI_TAR) || (p_Sccb->Lun > MAX_LUN))
         {
 
-#if (FW_TYPE==_UCB_MGR_)
-                p_ucb->UCB_hbastat = SCCB_COMPLETE;
-                p_ucb->UCB_status=SCCB_ERROR;
-                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                if (callback)
-                        callback(p_ucb);
-#endif
-
-#if (FW_TYPE==_SCCB_MGR_)
                 p_Sccb->HostStatus = SCCB_COMPLETE;
                 p_Sccb->SccbStatus = SCCB_ERROR;
                 callback = (CALL_BK_FN)p_Sccb->SccbCallback;
                 if (callback)
                         callback(p_Sccb);
-#endif
 
-                mOS_UnLock((PSCCBcard)pCurrCard);
                 return;
         }
 
-#if (FW_TYPE==_SCCB_MGR_)
-   sinits(p_Sccb,thisCard);
-#endif
-
-
-#if (FW_TYPE==_UCB_MGR_)
-#ifndef NO_IOCTLS
-
-   if (p_ucb->UCB_opcode & OPC_IOCTL)
-        {
-
-                switch (p_ucb->UCB_IOCTLCommand) 
-                {
-                        case READ_NVRAM:
-                                ReadNVRam((PSCCBcard)pCurrCard,p_ucb);
-                                p_ucb->UCB_status=UCB_SUCCESS;
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-
-                        case WRITE_NVRAM:
-                                WriteNVRam((PSCCBcard)pCurrCard,p_ucb);
-                                p_ucb->UCB_status=UCB_SUCCESS;
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-
-                        case SEND_SCSI_PASSTHRU:
-#if (FW_TYPE != _SCCB_MGR_)
-                                if( p_ucb->UCB_targid >=
-                                    ((PSCCBcard)pCurrCard)->cardInfo->ai_MaxTarg )
-                                {
-                                        p_ucb->UCB_status = UCB_ERROR;
-                                        p_ucb->UCB_hbastat = HASTAT_HW_ERROR;
-                                        callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                        if (callback)
-                                                callback(p_ucb);
-                                        mOS_UnLock((PSCCBcard)pCurrCard);
-                                        return;
-                                }
-#endif
-                                break;
-
-                        case HARD_RESET:
-                                p_ucb->UCB_status = UCB_INVALID;
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                        case GET_DEVICE_SYNCRATE:
-                                if( !GetDevSyncRate((PSCCBcard)pCurrCard,p_ucb) )
-                                {
-                                        p_ucb->UCB_status = UCB_SUCCESS;
-                                }
-                                else
-                                {
-                                        p_ucb->UCB_status = UCB_ERROR;
-                                        p_ucb->UCB_hbastat = HASTAT_HW_ERROR;
-                                }
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                        case SET_DEVICE_SYNCRATE:
-                                if( !SetDevSyncRate((PSCCBcard)pCurrCard,p_ucb) )
-                                {
-                                        p_ucb->UCB_status = UCB_SUCCESS;
-                                }
-                                else
-                                {
-                                        p_ucb->UCB_status = UCB_ERROR;
-                                        p_ucb->UCB_hbastat = HASTAT_HW_ERROR;
-                                }
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                        case GET_WIDE_MODE:
-                                if( !GetDevWideMode((PSCCBcard)pCurrCard,p_ucb) )
-                                {
-                                        p_ucb->UCB_status = UCB_SUCCESS;
-                                }
-                                else
-                                {
-                                        p_ucb->UCB_status = UCB_ERROR;
-                                        p_ucb->UCB_hbastat = HASTAT_HW_ERROR;
-                                }
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                        case SET_WIDE_MODE:
-                                if( !SetDevWideMode((PSCCBcard)pCurrCard,p_ucb) )
-                                {
-                                        p_ucb->UCB_status = UCB_SUCCESS;
-                                }
-                                else
-                                {
-                                        p_ucb->UCB_status = UCB_ERROR;
-                                        p_ucb->UCB_hbastat = HASTAT_HW_ERROR;
-                                }
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                        default:
-                                p_ucb->UCB_status=UCB_INVALID;
-                                callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                                if (callback)
-                                        callback(p_ucb);
-                                mOS_UnLock((PSCCBcard)pCurrCard);
-                                return;
-                }
-        }
-#endif /* NO_IOCTLS */
-#endif /* (FW_TYPE==_UCB_MGR_) */
+   FPT_sinits(p_Sccb,thisCard);
 
 
    if (!((PSCCBcard) pCurrCard)->cmdCounter)
@@ -4408,12 +2084,12 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
                         {
                                 pSaveSccb = ((PSCCBcard) pCurrCard)->currentSCCB;
                                 ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                                queueSelectFail(&BL_Card[thisCard], thisCard);
+                                FPT_queueSelectFail(&FPT_BL_Card[thisCard], thisCard);
                                 ((PSCCBcard) pCurrCard)->currentSCCB = pSaveSccb;
                         }
                 else
                         {
-              queueAddSccb(p_Sccb,thisCard);
+              FPT_queueAddSccb(p_Sccb,thisCard);
                         }
       }
 
@@ -4423,12 +2099,12 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
                                 {
                                         pSaveSccb = ((PSCCBcard) pCurrCard)->currentSCCB;
                                         ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                                        queueSelectFail(&BL_Card[thisCard], thisCard);
+                                        FPT_queueSelectFail(&FPT_BL_Card[thisCard], thisCard);
                                         ((PSCCBcard) pCurrCard)->currentSCCB = pSaveSccb;
                                 }
                         else
                                 {
-                      queueAddSccb(p_Sccb,thisCard);
+                      FPT_queueAddSccb(p_Sccb,thisCard);
                                 }
       }
 
@@ -4437,23 +2113,17 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
       MDISABLE_INT(ioport);
 
                 if((((PSCCBcard) pCurrCard)->globalFlags & F_CONLUN_IO) && 
-                        ((sccbMgrTbl[thisCard][p_Sccb->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
+                        ((FPT_sccbMgrTbl[thisCard][p_Sccb->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
                         lun = p_Sccb->Lun;
                 else
                         lun = 0;
       if ((((PSCCBcard) pCurrCard)->currentSCCB == NULL) &&
-         (sccbMgrTbl[thisCard][p_Sccb->TargID].TarSelQ_Cnt == 0) &&
-         (sccbMgrTbl[thisCard][p_Sccb->TargID].TarLUNBusy[lun]
-         == FALSE)) {
+         (FPT_sccbMgrTbl[thisCard][p_Sccb->TargID].TarSelQ_Cnt == 0) &&
+         (FPT_sccbMgrTbl[thisCard][p_Sccb->TargID].TarLUNBusy[lun]
+         == 0)) {
 
             ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                           mOS_UnLock((PSCCBcard)pCurrCard);
-#if defined(DOS)
-            ssel((USHORT)p_Sccb->SccbIOPort,thisCard);
-#else
-            ssel(p_Sccb->SccbIOPort,thisCard);
-#endif
-                           mOS_Lock((PSCCBcard)pCurrCard);
+            FPT_ssel(p_Sccb->SccbIOPort,thisCard);
          }
 
       else {
@@ -4462,12 +2132,12 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
                                 {
                                         pSaveSccb = ((PSCCBcard) pCurrCard)->currentSCCB;
                                         ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                                        queueSelectFail(&BL_Card[thisCard], thisCard);
+                                        FPT_queueSelectFail(&FPT_BL_Card[thisCard], thisCard);
                                         ((PSCCBcard) pCurrCard)->currentSCCB = pSaveSccb;
                                 }
                         else
                                 {
-                        queueAddSccb(p_Sccb,thisCard);
+                        FPT_queueAddSccb(p_Sccb,thisCard);
                                 }
          }
 
@@ -4475,7 +2145,6 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
       MENABLE_INT(ioport);
       }
 
-   mOS_UnLock((PSCCBcard)pCurrCard);
 }
 
 
@@ -4488,22 +2157,9 @@ void SccbMgr_start_sccb(ULONG pCurrCard, PSCCB p_Sccb)
  *              callback function.
  *
  *---------------------------------------------------------------------*/
-#if (FW_TYPE==_UCB_MGR_)
-s32bits SccbMgr_abort_sccb(CARD_HANDLE pCurrCard, PUCB p_ucb)
-#else
-#if defined(DOS)
-int SccbMgr_abort_sccb(USHORT pCurrCard, PSCCB p_Sccb)
-#else
-int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
-#endif
-#endif
-
+static int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
 {
-#if defined(DOS)
-        USHORT ioport;
-#else
         ULONG ioport;
-#endif
 
         UCHAR thisCard;
         CALL_BK_FN callback;
@@ -4512,53 +2168,31 @@ int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
         PSCCBMgr_tar_info currTar_Info;
 
 
-#if (FW_TYPE==_UCB_MGR_)
-        PSCCB    p_Sccb;
-        p_Sccb=(PSCCB)p_ucb->UCB_MgrPrivatePtr;
-#endif
-
         ioport = ((PSCCBcard) pCurrCard)->ioPort;
 
         thisCard = ((PSCCBcard)pCurrCard)->cardIndex;
 
-        mOS_Lock((PSCCBcard)pCurrCard);
-
-        if (RD_HARPOON(ioport+hp_page_ctrl) & G_INT_DISABLE)
+        if (!(RD_HARPOON(ioport+hp_page_ctrl) & G_INT_DISABLE))
         {
-                mOS_UnLock((PSCCBcard)pCurrCard);
-        }
 
-        else
-        {
-
-                if (queueFindSccb(p_Sccb,thisCard))
+                if (FPT_queueFindSccb(p_Sccb,thisCard))
                 {
 
-                        mOS_UnLock((PSCCBcard)pCurrCard);
-
                         ((PSCCBcard)pCurrCard)->cmdCounter--;
 
                         if (!((PSCCBcard)pCurrCard)->cmdCounter)
                                 WR_HARPOON(ioport+hp_semaphore,(RD_HARPOON(ioport+hp_semaphore)
                                         & (UCHAR)(~(SCCB_MGR_ACTIVE | TICKLE_ME)) ));
 
-#if (FW_TYPE==_SCCB_MGR_)
                         p_Sccb->SccbStatus = SCCB_ABORT;
                         callback = p_Sccb->SccbCallback;
                         callback(p_Sccb);
-#else
-                        p_ucb->UCB_status=SCCB_ABORT;
-                        callback = (CALL_BK_FN)p_ucb->UCB_callback;
-                        callback(p_ucb);
-#endif
 
                         return(0);
                 }
 
                 else
                 {
-                        mOS_UnLock((PSCCBcard)pCurrCard);
-
                         if (((PSCCBcard)pCurrCard)->currentSCCB == p_Sccb)
                         {
                                 p_Sccb->SccbStatus = SCCB_ABORT;
@@ -4579,21 +2213,18 @@ int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
                                         {
                                                 p_Sccb->SccbStatus = SCCB_ABORT;
                                                 p_Sccb->Sccb_scsistat = ABORT_ST;
-#if (FW_TYPE==_UCB_MGR_)
-                                                p_ucb->UCB_status=SCCB_ABORT;
-#endif
                                                 p_Sccb->Sccb_scsimsg = SMABORT_TAG;
 
                                                 if(((PSCCBcard) pCurrCard)->currentSCCB == NULL)
                                                 {
                                                         ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                                                        ssel(ioport, thisCard);
+                                                        FPT_ssel(ioport, thisCard);
                                                 }
                                                 else
                                                 {
                                                         pSaveSCCB = ((PSCCBcard) pCurrCard)->currentSCCB;
                                                         ((PSCCBcard) pCurrCard)->currentSCCB = p_Sccb;
-                                                        queueSelectFail((PSCCBcard) pCurrCard, thisCard);
+                                                        FPT_queueSelectFail((PSCCBcard) pCurrCard, thisCard);
                                                         ((PSCCBcard) pCurrCard)->currentSCCB = pSaveSCCB;
                                                 }
                                         }
@@ -4602,9 +2233,9 @@ int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
                                 }
                                 else
                                 {
-                                        currTar_Info = &sccbMgrTbl[thisCard][p_Sccb->TargID];
+                                        currTar_Info = &FPT_sccbMgrTbl[thisCard][p_Sccb->TargID];
 
-                                        if(BL_Card[thisCard].discQ_Tbl[currTar_Info->LunDiscQ_Idx[p_Sccb->Lun]] 
+                                        if(FPT_BL_Card[thisCard].discQ_Tbl[currTar_Info->LunDiscQ_Idx[p_Sccb->Lun]] 
                                                         == p_Sccb)
                                         {
                                                 p_Sccb->SccbStatus = SCCB_ABORT;
@@ -4626,37 +2257,20 @@ int SccbMgr_abort_sccb(ULONG pCurrCard, PSCCB p_Sccb)
  *              interrupt for this card and disable the IRQ Pin if so.
  *
  *---------------------------------------------------------------------*/
-#if (FW_TYPE==_UCB_MGR_)
-u08bits SccbMgr_my_int(CARD_HANDLE pCurrCard)
-#else
-#if defined(DOS)
-UCHAR SccbMgr_my_int(USHORT pCurrCard)
-#else
-UCHAR SccbMgr_my_int(ULONG pCurrCard)
-#endif
-#endif
+static UCHAR SccbMgr_my_int(ULONG pCurrCard)
 {
-#if defined(DOS)
-   USHORT ioport;
-#else
    ULONG ioport;
-#endif
 
    ioport = ((PSCCBcard)pCurrCard)->ioPort;
 
    if (RD_HARPOON(ioport+hp_int_status) & INT_ASSERTED)
    {
-
-#if defined(DOS)
-      MDISABLE_INT(ioport);
-#endif
-
-      return(TRUE);
+      return(1);
    }
 
    else
 
-      return(FALSE);
+      return(0);
 }
 
 
@@ -4670,37 +2284,19 @@ UCHAR SccbMgr_my_int(ULONG pCurrCard)
  *              us.
  *
  *---------------------------------------------------------------------*/
-#if (FW_TYPE==_UCB_MGR_)
-s32bits SccbMgr_isr(CARD_HANDLE pCurrCard)
-#else
-#if defined(DOS)
-int SccbMgr_isr(USHORT pCurrCard)
-#else
-int SccbMgr_isr(ULONG pCurrCard)
-#endif
-#endif
+static int SccbMgr_isr(ULONG pCurrCard)
 {
    PSCCB currSCCB;
    UCHAR thisCard,result,bm_status, bm_int_st;
    USHORT hp_int;
    UCHAR i, target;
-#if defined(DOS)
-   USHORT ioport;
-#else
    ULONG ioport;
-#endif
-
-   mOS_Lock((PSCCBcard)pCurrCard);
 
    thisCard = ((PSCCBcard)pCurrCard)->cardIndex;
    ioport = ((PSCCBcard)pCurrCard)->ioPort;
 
    MDISABLE_INT(ioport);
 
-#if defined(BUGBUG)
-   WR_HARPOON(ioport+hp_user_defined_D, RD_HARPOON(ioport+hp_int_status));
-#endif
-
    if ((bm_int_st=RD_HARPOON(ioport+hp_int_status)) & EXT_STATUS_ON)
                 bm_status = RD_HARPOON(ioport+hp_ext_status) & (UCHAR)BAD_EXT_STATUS;
    else
@@ -4708,33 +2304,20 @@ int SccbMgr_isr(ULONG pCurrCard)
 
    WR_HARPOON(ioport+hp_int_mask, (INT_CMD_COMPL | SCSI_INTERRUPT));
 
-   mOS_UnLock((PSCCBcard)pCurrCard);
-
-   while ((hp_int = RDW_HARPOON((ioport+hp_intstat)) & default_intena) |
+   while ((hp_int = RDW_HARPOON((ioport+hp_intstat)) & FPT_default_intena) |
           bm_status)
      {
 
        currSCCB = ((PSCCBcard)pCurrCard)->currentSCCB;
 
-#if defined(BUGBUG)
-   Debug_Load(thisCard,(UCHAR) 0XFF);
-   Debug_Load(thisCard,bm_int_st);
-
-   Debug_Load(thisCard,hp_int_0);
-   Debug_Load(thisCard,hp_int_1);
-#endif
-
-
       if (hp_int & (FIFO | TIMEOUT | RESET | SCAM_SEL) || bm_status) {
-         result = SccbMgr_bad_isr(ioport,thisCard,((PSCCBcard)pCurrCard),hp_int);
+         result = FPT_SccbMgr_bad_isr(ioport,thisCard,((PSCCBcard)pCurrCard),hp_int);
          WRW_HARPOON((ioport+hp_intstat), (FIFO | TIMEOUT | RESET | SCAM_SEL));
          bm_status = 0;
 
          if (result) {
 
-                           mOS_Lock((PSCCBcard)pCurrCard);
             MENABLE_INT(ioport);
-                           mOS_UnLock((PSCCBcard)pCurrCard);
             return(result);
             }
          }
@@ -4753,7 +2336,7 @@ int SccbMgr_isr(ULONG pCurrCard)
 
          if (((PSCCBcard)pCurrCard)->globalFlags & F_HOST_XFER_ACT)
 
-            phaseChkFifo(ioport, thisCard);
+            FPT_phaseChkFifo(ioport, thisCard);
 
 /*         WRW_HARPOON((ioport+hp_intstat),
             (BUS_FREE | ICMD_COMP | ITAR_DISC | XFER_CNT_0));
@@ -4761,7 +2344,7 @@ int SccbMgr_isr(ULONG pCurrCard)
 
                  WRW_HARPOON((ioport+hp_intstat), CLR_ALL_INT_1);
 
-         autoCmdCmplt(ioport,thisCard);
+         FPT_autoCmdCmplt(ioport,thisCard);
 
          }
 
@@ -4771,7 +2354,7 @@ int SccbMgr_isr(ULONG pCurrCard)
 
          if (((PSCCBcard)pCurrCard)->globalFlags & F_HOST_XFER_ACT) {
 
-            phaseChkFifo(ioport, thisCard);
+            FPT_phaseChkFifo(ioport, thisCard);
 
             }
 
@@ -4784,7 +2367,7 @@ int SccbMgr_isr(ULONG pCurrCard)
             }
 
          currSCCB->Sccb_scsistat = DISCONNECT_ST;
-         queueDisconnect(currSCCB,thisCard);
+         FPT_queueDisconnect(currSCCB,thisCard);
 
             /* Wait for the BusFree before starting a new command.  We
                must also check for being reselected since the BusFree
@@ -4803,9 +2386,7 @@ int SccbMgr_isr(ULONG pCurrCard)
            */
            if (!(RDW_HARPOON((ioport+hp_intstat)) & (BUS_FREE | RSEL)))
              {
-               mOS_Lock((PSCCBcard)pCurrCard);
                MENABLE_INT(ioport);
-               mOS_UnLock((PSCCBcard)pCurrCard);
                return 0xFE;
              }
 
@@ -4825,7 +2406,7 @@ int SccbMgr_isr(ULONG pCurrCard)
                       {
             if (((PSCCBcard)pCurrCard)->globalFlags & F_HOST_XFER_ACT)
                               {
-               phaseChkFifo(ioport, thisCard);
+               FPT_phaseChkFifo(ioport, thisCard);
                }
 
             if (RD_HARPOON(ioport+hp_gp_reg_1) == SMSAVE_DATA_PTR)
@@ -4837,11 +2418,11 @@ int SccbMgr_isr(ULONG pCurrCard)
 
             WRW_HARPOON((ioport+hp_intstat), (BUS_FREE | ITAR_DISC));
             currSCCB->Sccb_scsistat = DISCONNECT_ST;
-            queueDisconnect(currSCCB,thisCard);
+            FPT_queueDisconnect(currSCCB,thisCard);
             }
 
-         sres(ioport,thisCard,((PSCCBcard)pCurrCard));
-         phaseDecode(ioport,thisCard);
+         FPT_sres(ioport,thisCard,((PSCCBcard)pCurrCard));
+         FPT_phaseDecode(ioport,thisCard);
 
          }
 
@@ -4850,7 +2431,7 @@ int SccbMgr_isr(ULONG pCurrCard)
          {
 
             WRW_HARPOON((ioport+hp_intstat), (IDO_STRT | XFER_CNT_0));
-            phaseDecode(ioport,thisCard);
+            FPT_phaseDecode(ioport,thisCard);
 
          }
 
@@ -4860,7 +2441,7 @@ int SccbMgr_isr(ULONG pCurrCard)
                    WRW_HARPOON((ioport+hp_intstat), (PHASE | IUNKWN | PROG_HLT));
                    if ((RD_HARPOON(ioport+hp_prgmcnt_0) & (UCHAR)0x3f)< (UCHAR)SELCHK)
                         {
-                        phaseDecode(ioport,thisCard);
+                        FPT_phaseDecode(ioport,thisCard);
                         }
                    else
                         {
@@ -4885,7 +2466,7 @@ int SccbMgr_isr(ULONG pCurrCard)
 
          WRW_HARPOON((ioport+hp_intstat), XFER_CNT_0);
 
-         schkdd(ioport,thisCard);
+         FPT_schkdd(ioport,thisCard);
 
          }
 
@@ -4896,10 +2477,10 @@ int SccbMgr_isr(ULONG pCurrCard)
 
                 if (((PSCCBcard)pCurrCard)->globalFlags & F_HOST_XFER_ACT) {
 
-                hostDataXferAbort(ioport,thisCard,currSCCB);
+                FPT_hostDataXferAbort(ioport,thisCard,currSCCB);
                                 }
 
-         phaseBusFree(ioport,thisCard);
+         FPT_phaseBusFree(ioport,thisCard);
                         }
 
 
@@ -4919,12 +2500,12 @@ int SccbMgr_isr(ULONG pCurrCard)
 
          if (((PSCCBcard)pCurrCard)->currentSCCB == NULL) {
 
-            queueSearchSelect(((PSCCBcard)pCurrCard),thisCard);
+            FPT_queueSearchSelect(((PSCCBcard)pCurrCard),thisCard);
             }
 
          if (((PSCCBcard)pCurrCard)->currentSCCB != NULL) {
             ((PSCCBcard)pCurrCard)->globalFlags &= ~F_NEW_SCCB_CMD;
-            ssel(ioport,thisCard);
+            FPT_ssel(ioport,thisCard);
             }
 
          break;
@@ -4933,9 +2514,7 @@ int SccbMgr_isr(ULONG pCurrCard)
 
       }  /*end while */
 
-   mOS_Lock((PSCCBcard)pCurrCard);
    MENABLE_INT(ioport);
-   mOS_UnLock((PSCCBcard)pCurrCard);
 
    return(0);
 }
@@ -4950,18 +2529,12 @@ int SccbMgr_isr(ULONG pCurrCard)
  *              processing time.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-UCHAR SccbMgr_bad_isr(USHORT p_port, UCHAR p_card, PSCCBcard pCurrCard, USHORT p_int)
-#else
-UCHAR SccbMgr_bad_isr(ULONG p_port, UCHAR p_card, PSCCBcard pCurrCard, USHORT p_int)
-#endif
+static UCHAR FPT_SccbMgr_bad_isr(ULONG p_port, UCHAR p_card,
+                                 PSCCBcard pCurrCard, USHORT p_int)
 {
-#if defined(HARP_REVX)
-   ULONG timer;
-#endif
-UCHAR temp, ScamFlg;
-PSCCBMgr_tar_info currTar_Info;
-PNVRamInfo pCurrNvRam;
+   UCHAR temp, ScamFlg;
+   PSCCBMgr_tar_info currTar_Info;
+   PNVRamInfo pCurrNvRam;
 
 
    if (RD_HARPOON(p_port+hp_ext_status) &
@@ -4971,7 +2544,7 @@ PNVRamInfo pCurrNvRam;
       if (pCurrCard->globalFlags & F_HOST_XFER_ACT)
          {
 
-         hostDataXferAbort(p_port,p_card, pCurrCard->currentSCCB);
+         FPT_hostDataXferAbort(p_port,p_card, pCurrCard->currentSCCB);
          }
 
       if (RD_HARPOON(p_port+hp_pci_stat_cfg) & REC_MASTER_ABORT)
@@ -4990,7 +2563,7 @@ PNVRamInfo pCurrNvRam;
          if (!pCurrCard->currentSCCB->HostStatus)
             pCurrCard->currentSCCB->HostStatus = SCCB_BM_ERR;
 
-         sxfrp(p_port,p_card);
+         FPT_sxfrp(p_port,p_card);
 
              temp = (UCHAR)(RD_HARPOON(p_port+hp_ee_ctrl) &
                                                         (EXT_ARB_ACK | SCSI_TERM_ENA_H));
@@ -4999,7 +2572,7 @@ PNVRamInfo pCurrNvRam;
 
          if (!(RDW_HARPOON((p_port+hp_intstat)) & (BUS_FREE | RESET)))
             {
-            phaseDecode(p_port,p_card);
+            FPT_phaseDecode(p_port,p_card);
             }
          }
       }
@@ -5014,13 +2587,13 @@ PNVRamInfo pCurrNvRam;
 
                if (pCurrCard->globalFlags & F_HOST_XFER_ACT)
 
-               hostDataXferAbort(p_port,p_card, pCurrCard->currentSCCB);
+               FPT_hostDataXferAbort(p_port,p_card, pCurrCard->currentSCCB);
                }
 
 
            DISABLE_AUTO(p_port);
 
-           sresb(p_port,p_card);
+           FPT_sresb(p_port,p_card);
 
            while(RD_HARPOON(p_port+hp_scsictrl_0) & SCSI_RST) {}
 
@@ -5029,12 +2602,12 @@ PNVRamInfo pCurrNvRam;
                                         ScamFlg = pCurrNvRam->niScamConf;
                                 }
                                 else{
-                                   ScamFlg = (UCHAR) utilEERead(p_port, SCAM_CONFIG/2);
+                                   ScamFlg = (UCHAR) FPT_utilEERead(p_port, SCAM_CONFIG/2);
                                 }
 
-           XbowInit(p_port, ScamFlg);
+           FPT_XbowInit(p_port, ScamFlg);
 
-               scini(p_card, pCurrCard->ourId, 0);
+               FPT_scini(p_card, pCurrCard->ourId, 0);
 
            return(0xFF);
          }
@@ -5044,34 +2617,8 @@ PNVRamInfo pCurrNvRam;
 
       WRW_HARPOON((p_port+hp_intstat), FIFO);
 
-#if defined(HARP_REVX)
-
-      for (timer=0x00FFFFFFL; timer != 0x00000000L; timer--) {
-
-         if (RD_HARPOON(p_port+hp_xferstat) & FIFO_EMPTY)
-            break;
-
-         if (RDW_HARPOON((p_port+hp_intstat)) & BUS_FREE)
-            break;
-         }
-
-
-      if ( (RD_HARPOON(p_port+hp_xferstat) & FIFO_EMPTY) &&
-           (RD_HARPOON(p_port+hp_fiforead) !=
-            RD_HARPOON(p_port+hp_fifowrite)) &&
-           (RD_HARPOON(p_port+hp_xfercnt_0))
-         )
-
-            WR_HARPOON((p_port+hp_xferstat), 0x01);
-
-/*      else
- */
-/*         sxfrp(p_port,p_card);
- */
-#else
       if (pCurrCard->currentSCCB != NULL)
-         sxfrp(p_port,p_card);
-#endif
+         FPT_sxfrp(p_port,p_card);
       }
 
    else if (p_int & TIMEOUT)
@@ -5085,12 +2632,12 @@ PNVRamInfo pCurrNvRam;
       pCurrCard->currentSCCB->HostStatus = SCCB_SELECTION_TIMEOUT;
 
 
-                currTar_Info = &sccbMgrTbl[p_card][pCurrCard->currentSCCB->TargID];
+                currTar_Info = &FPT_sccbMgrTbl[p_card][pCurrCard->currentSCCB->TargID];
                 if((pCurrCard->globalFlags & F_CONLUN_IO) &&
                         ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-              currTar_Info->TarLUNBusy[pCurrCard->currentSCCB->Lun] = FALSE;
+              currTar_Info->TarLUNBusy[pCurrCard->currentSCCB->Lun] = 0;
                 else
-              currTar_Info->TarLUNBusy[0] = FALSE;
+              currTar_Info->TarLUNBusy[0] = 0;
 
 
       if (currTar_Info->TarEEValue & EE_SYNC_MASK)
@@ -5104,26 +2651,23 @@ PNVRamInfo pCurrNvRam;
          currTar_Info->TarStatus &= ~TAR_WIDE_MASK;
          }
 
-      sssyncv(p_port, pCurrCard->currentSCCB->TargID, NARROW_SCSI,currTar_Info);
+      FPT_sssyncv(p_port, pCurrCard->currentSCCB->TargID, NARROW_SCSI,currTar_Info);
 
-      queueCmdComplete(pCurrCard, pCurrCard->currentSCCB, p_card);
+      FPT_queueCmdComplete(pCurrCard, pCurrCard->currentSCCB, p_card);
 
       }
 
-#if defined(SCAM_LEV_2)
-
    else if (p_int & SCAM_SEL)
       {
 
-      scarb(p_port,LEVEL2_TAR);
-      scsel(p_port);
-      scasid(p_card, p_port);
+      FPT_scarb(p_port,LEVEL2_TAR);
+      FPT_scsel(p_port);
+      FPT_scasid(p_card, p_port);
 
-      scbusf(p_port);
+      FPT_scbusf(p_port);
 
       WRW_HARPOON((p_port+hp_intstat), SCAM_SEL);
       }
-#endif
 
    return(0x00);
 }
@@ -5131,126 +2675,25 @@ PNVRamInfo pCurrNvRam;
 
 /*---------------------------------------------------------------------
  *
- * Function: SccbMgr_scsi_reset
- *
- * Description: A SCSI bus reset will be generated and all outstanding
- *              Sccbs will be returned via the callback.
- *
- *---------------------------------------------------------------------*/
-#if (FW_TYPE==_UCB_MGR_)
-void SccbMgr_scsi_reset(CARD_HANDLE pCurrCard)
-#else
-#if defined(DOS)
-void SccbMgr_scsi_reset(USHORT pCurrCard)
-#else
-void SccbMgr_scsi_reset(ULONG pCurrCard)
-#endif
-#endif
-{
-   UCHAR thisCard;
-
-   thisCard = ((PSCCBcard)pCurrCard)->cardIndex;
-
-   mOS_Lock((PSCCBcard)pCurrCard);
-
-   if (((PSCCBcard) pCurrCard)->globalFlags & F_GREEN_PC)
-      {
-      WR_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_clkctrl_0, CLKCTRL_DEFAULT);
-      WR_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_sys_ctrl, 0x00);
-      }
-
-   sresb(((PSCCBcard)pCurrCard)->ioPort,thisCard);
-
-   if (RD_HARPOON(((PSCCBcard)pCurrCard)->ioPort+hp_ext_status) & BM_CMD_BUSY)
-      {
-      WR_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_page_ctrl,
-         (RD_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_page_ctrl)
-         & ~SCATTER_EN));
-
-      WR_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_sg_addr,0x00);
-
-      ((PSCCBcard) pCurrCard)->globalFlags &= ~F_HOST_XFER_ACT;
-      busMstrTimeOut(((PSCCBcard) pCurrCard)->ioPort);
-
-      WR_HARPOON(((PSCCBcard) pCurrCard)->ioPort+hp_int_mask,
-         (INT_CMD_COMPL | SCSI_INTERRUPT));
-      }
-
-/*
-      if (utilEERead(((PSCCBcard)pCurrCard)->ioPort, (SCAM_CONFIG/2))
-            & SCAM_ENABLED)
-*/
-         scini(thisCard, ((PSCCBcard)pCurrCard)->ourId, 0);
-
-#if (FW_TYPE==_UCB_MGR_)
-   ((PSCCBcard)pCurrCard)->cardInfo->ai_AEN_routine(0x01,pCurrCard,0,0,0,0);
-#endif
-
-   mOS_UnLock((PSCCBcard)pCurrCard);
-}
-
-
-/*---------------------------------------------------------------------
- *
- * Function: SccbMgr_timer_expired
- *
- * Description: This function allow me to kill my own job that has not
- *              yet completed, and has cause a timeout to occur.  This
- *              timeout has caused the upper level driver to call this
- *              function.
- *
- *---------------------------------------------------------------------*/
-
-#if (FW_TYPE==_UCB_MGR_)
-void SccbMgr_timer_expired(CARD_HANDLE pCurrCard)
-#else
-#if defined(DOS)
-void SccbMgr_timer_expired(USHORT pCurrCard)
-#else
-void SccbMgr_timer_expired(ULONG pCurrCard)
-#endif
-#endif
-{
-}
-
-#if defined(DOS)
-/*---------------------------------------------------------------------
- *
- * Function: SccbMgr_status
- *
- * Description: This function returns the number of outstanding SCCB's.
- *              This is specific to the DOS enviroment, which needs this
- *              to help them keep protected and real mode commands staight.
- *
- *---------------------------------------------------------------------*/
-
-USHORT SccbMgr_status(USHORT pCurrCard)
-{
-   return(BL_Card[pCurrCard].cmdCounter);
-}
-#endif
-
-/*---------------------------------------------------------------------
- *
  * Function: SccbMgrTableInit
  *
  * Description: Initialize all Sccb manager data structures.
  *
  *---------------------------------------------------------------------*/
 
-void SccbMgrTableInitAll()
+static void FPT_SccbMgrTableInitAll()
 {
    UCHAR thisCard;
 
    for (thisCard = 0; thisCard < MAX_CARDS; thisCard++)
       {
-      SccbMgrTableInitCard(&BL_Card[thisCard],thisCard);
+      FPT_SccbMgrTableInitCard(&FPT_BL_Card[thisCard],thisCard);
 
-      BL_Card[thisCard].ioPort      = 0x00;
-      BL_Card[thisCard].cardInfo    = NULL;
-      BL_Card[thisCard].cardIndex   = 0xFF;
-      BL_Card[thisCard].ourId       = 0x00;
-                BL_Card[thisCard].pNvRamInfo    = NULL;
+      FPT_BL_Card[thisCard].ioPort      = 0x00;
+      FPT_BL_Card[thisCard].cardInfo    = NULL;
+      FPT_BL_Card[thisCard].cardIndex   = 0xFF;
+      FPT_BL_Card[thisCard].ourId       = 0x00;
+                FPT_BL_Card[thisCard].pNvRamInfo        = NULL;
       }
 }
 
@@ -5263,20 +2706,20 @@ void SccbMgrTableInitAll()
  *
  *---------------------------------------------------------------------*/
 
-void SccbMgrTableInitCard(PSCCBcard pCurrCard, UCHAR p_card)
+static void FPT_SccbMgrTableInitCard(PSCCBcard pCurrCard, UCHAR p_card)
 {
    UCHAR scsiID, qtag;
 
         for (qtag = 0; qtag < QUEUE_DEPTH; qtag++)
         {
-                BL_Card[p_card].discQ_Tbl[qtag] = NULL;
+                FPT_BL_Card[p_card].discQ_Tbl[qtag] = NULL;
         }
 
    for (scsiID = 0; scsiID < MAX_SCSI_TAR; scsiID++)
       {
-      sccbMgrTbl[p_card][scsiID].TarStatus = 0;
-      sccbMgrTbl[p_card][scsiID].TarEEValue = 0;
-      SccbMgrTableInitTarget(p_card, scsiID);
+      FPT_sccbMgrTbl[p_card][scsiID].TarStatus = 0;
+      FPT_sccbMgrTbl[p_card][scsiID].TarEEValue = 0;
+      FPT_SccbMgrTableInitTarget(p_card, scsiID);
       }
 
    pCurrCard->scanIndex = 0x00;
@@ -5298,13 +2741,13 @@ void SccbMgrTableInitCard(PSCCBcard pCurrCard, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-void SccbMgrTableInitTarget(UCHAR p_card, UCHAR target)
+static void FPT_SccbMgrTableInitTarget(UCHAR p_card, UCHAR target)
 {
 
         UCHAR lun, qtag;
         PSCCBMgr_tar_info currTar_Info;
 
-        currTar_Info = &sccbMgrTbl[p_card][target];
+        currTar_Info = &FPT_sccbMgrTbl[p_card][target];
 
         currTar_Info->TarSelQ_Cnt = 0;
         currTar_Info->TarSyncCtrl = 0;
@@ -5312,160 +2755,28 @@ void SccbMgrTableInitTarget(UCHAR p_card, UCHAR target)
         currTar_Info->TarSelQ_Head = NULL;
         currTar_Info->TarSelQ_Tail = NULL;
         currTar_Info->TarTagQ_Cnt = 0;
-        currTar_Info->TarLUN_CA = FALSE;
+        currTar_Info->TarLUN_CA = 0;
 
 
         for (lun = 0; lun < MAX_LUN; lun++)
         {
-                currTar_Info->TarLUNBusy[lun] = FALSE;
+                currTar_Info->TarLUNBusy[lun] = 0;
                 currTar_Info->LunDiscQ_Idx[lun] = 0;
         }
 
         for (qtag = 0; qtag < QUEUE_DEPTH; qtag++)
         {
-                if(BL_Card[p_card].discQ_Tbl[qtag] != NULL)
+                if(FPT_BL_Card[p_card].discQ_Tbl[qtag] != NULL)
                 {
-                        if(BL_Card[p_card].discQ_Tbl[qtag]->TargID == target)
+                        if(FPT_BL_Card[p_card].discQ_Tbl[qtag]->TargID == target)
                         {
-                                BL_Card[p_card].discQ_Tbl[qtag] = NULL;
-                                BL_Card[p_card].discQCount--;
+                                FPT_BL_Card[p_card].discQ_Tbl[qtag] = NULL;
+                                FPT_BL_Card[p_card].discQCount--;
                         }
                 }
         }
 }
 
-#if defined(BUGBUG)
-
-/*****************************************************************
- * Save the current byte in the debug array
- *****************************************************************/
-
-
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data)
-{
-   debug_int[p_card][debug_index[p_card]] = p_bug_data;
-   debug_index[p_card]++;
-
-   if (debug_index[p_card] == debug_size)
-
-      debug_index[p_card] = 0;
-}
-
-#endif
-#ident "$Id: sccb_dat.c 1.10 1997/02/22 03:16:02 awin Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   sccb_dat.c  $
- *
- *   Description:  Functions relating to handling of the SCCB interface 
- *                 between the device driver and the HARPOON.
- *
- *   $Date: 1997/02/22 03:16:02 $
- *
- *   $Revision: 1.10 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <harpoon.h>*/
-
-/*
-**  IMPORTANT NOTE!!!
-**
-**  You MUST preassign all data to a valid value or zero.  This is
-**  required due to the MS compiler bug under OS/2 and Solaris Real-Mode
-**  driver environment.
-*/
-
-
-SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
-SCCBCARD BL_Card[MAX_CARDS] = { { 0 } };
-SCCBSCAM_INFO scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
-NVRAMINFO nvRamInfo[MAX_MB_CARDS] = { { 0 } };
-
-
-#if defined(OS2)
-void (far *s_PhaseTbl[8]) (ULONG, UCHAR) = { 0 };
-UCHAR temp_id_string[ID_STRING_LENGTH] = { 0 };
-#elif defined(SOLARIS_REAL_MODE) || defined(__STDC__)
-void (*s_PhaseTbl[8]) (ULONG, UCHAR) = { 0 };
-#else
-void (*s_PhaseTbl[8]) ();
-#endif
-
-#if defined(DOS)
-UCHAR first_time = 0;
-#endif
-
-UCHAR mbCards = 0;
-UCHAR scamHAString[] = {0x63, 0x07, 'B', 'U', 'S', 'L', 'O', 'G', 'I', 'C', \
-                                                                ' ', 'B', 'T', '-', '9', '3', '0', \
-                                                                0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, \
-                                                                0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};
-
-USHORT default_intena = 0;
-
-#if defined(BUGBUG)
-UCHAR    debug_int[MAX_CARDS][debug_size] = { 0 };
-UCHAR    debug_index[MAX_CARDS] = { 0 };
-UCHAR    reserved_1[3] = { 0 };
-#endif
-#ident "$Id: scsi.c 1.23 1997/07/09 21:42:54 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   scsi.c  $
- *
- *   Description:  Functions for handling SCSI bus functions such as
- *                 selection/reselection, sync negotiation, message-in
- *                 decoding.
- *
- *   $Date: 1997/07/09 21:42:54 $
- *
- *   $Revision: 1.23 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <eeprom.h>*/
-/*#include <harpoon.h>*/
-
-
-/*
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-#if defined(BUGBUG)
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
-#endif
-*/
 
 /*---------------------------------------------------------------------
  *
@@ -5476,11 +2787,7 @@ void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR sfm(USHORT port, PSCCB pCurrSCCB)
-#else
-UCHAR sfm(ULONG port, PSCCB pCurrSCCB)
-#endif
+static UCHAR FPT_sfm(ULONG port, PSCCB pCurrSCCB)
 {
         UCHAR message;
         USHORT TimeOutLoop;
@@ -5547,42 +2854,27 @@ UCHAR sfm(ULONG port, PSCCB pCurrSCCB)
 
 /*---------------------------------------------------------------------
  *
- * Function: ssel
+ * Function: FPT_ssel
  *
  * Description: Load up automation and select target device.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void ssel(USHORT port, UCHAR p_card)
-#else
-void ssel(ULONG port, UCHAR p_card)
-#endif
+static void FPT_ssel(ULONG port, UCHAR p_card)
 {
 
-#if defined(DOS)
    UCHAR auto_loaded, i, target, *theCCB;
-#elif defined(OS2)
-   UCHAR auto_loaded, i, target;
-   UCHAR far *theCCB;
-#else
-   UCHAR auto_loaded, i, target, *theCCB;
-#endif
 
-#if defined(DOS)
-   USHORT cdb_reg;
-#else
    ULONG cdb_reg;
-#endif
    PSCCBcard CurrCard;
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
    UCHAR lastTag, lun;
 
-   CurrCard = &BL_Card[p_card];
+   CurrCard = &FPT_BL_Card[p_card];
    currSCCB = CurrCard->currentSCCB;
    target = currSCCB->TargID;
-   currTar_Info = &sccbMgrTbl[p_card][target];
+   currTar_Info = &FPT_sccbMgrTbl[p_card][target];
    lastTag = CurrCard->tagQ_Lst;
 
    ARAM_ACCESS(port);
@@ -5599,60 +2891,53 @@ void ssel(ULONG port, UCHAR p_card)
                 lun = 0;
 
 
-#if defined(DOS)
-   currTar_Info->TarLUNBusy[lun] = TRUE;
-
-#else
-
    if (CurrCard->globalFlags & F_TAG_STARTED)
       {
       if (!(currSCCB->ControlByte & F_USE_CMD_Q))
          {
-        if ((currTar_Info->TarLUN_CA == FALSE)
+        if ((currTar_Info->TarLUN_CA == 0)
             && ((currTar_Info->TarStatus & TAR_TAG_Q_MASK)
             == TAG_Q_TRYING))
             {
 
                  if (currTar_Info->TarTagQ_Cnt !=0)
                   {
-                           currTar_Info->TarLUNBusy[lun] = TRUE;
-                        queueSelectFail(CurrCard,p_card);
+                           currTar_Info->TarLUNBusy[lun] = 1;
+                        FPT_queueSelectFail(CurrCard,p_card);
                                            SGRAM_ACCESS(port);
                            return;
                            }
 
             else {
-                          currTar_Info->TarLUNBusy[lun] = TRUE;
+                          currTar_Info->TarLUNBusy[lun] = 1;
                           }
 
               }  /*End non-tagged */
 
               else {
-                 currTar_Info->TarLUNBusy[lun] = TRUE;
+                 currTar_Info->TarLUNBusy[lun] = 1;
                  }
 
               }  /*!Use cmd Q Tagged */
 
            else {
-             if (currTar_Info->TarLUN_CA == TRUE)
+             if (currTar_Info->TarLUN_CA == 1)
                {
-              queueSelectFail(CurrCard,p_card);
+              FPT_queueSelectFail(CurrCard,p_card);
                                    SGRAM_ACCESS(port);
               return;
                     }
 
-                currTar_Info->TarLUNBusy[lun] = TRUE;
+                currTar_Info->TarLUNBusy[lun] = 1;
 
              }  /*else use cmd Q tagged */
 
       }  /*if glob tagged started */
 
    else {
-        currTar_Info->TarLUNBusy[lun] = TRUE;
+        currTar_Info->TarLUNBusy[lun] = 1;
         }
 
-#endif /* DOS */
-
 
 
         if((((CurrCard->globalFlags & F_CONLUN_IO) && 
@@ -5661,8 +2946,8 @@ void ssel(ULONG port, UCHAR p_card)
         {
                 if(CurrCard->discQCount >= QUEUE_DEPTH)
                 {
-                        currTar_Info->TarLUNBusy[lun] = TRUE;
-                        queueSelectFail(CurrCard,p_card);
+                        currTar_Info->TarLUNBusy[lun] = 1;
+                        FPT_queueSelectFail(CurrCard,p_card);
                         SGRAM_ACCESS(port);
                         return;
                 }
@@ -5680,8 +2965,8 @@ void ssel(ULONG port, UCHAR p_card)
                 }
                 if(i == QUEUE_DEPTH)
                 {
-                        currTar_Info->TarLUNBusy[lun] = TRUE;
-                        queueSelectFail(CurrCard,p_card);
+                        currTar_Info->TarLUNBusy[lun] = 1;
+                        FPT_queueSelectFail(CurrCard,p_card);
                         SGRAM_ACCESS(port);
                         return;
                 }
@@ -5689,7 +2974,7 @@ void ssel(ULONG port, UCHAR p_card)
 
 
 
-   auto_loaded = FALSE;
+   auto_loaded = 0;
 
    WR_HARPOON(port+hp_select_id, target);
    WR_HARPOON(port+hp_gp_reg_3, target);  /* Use by new automation logic */
@@ -5703,7 +2988,7 @@ void ssel(ULONG port, UCHAR p_card)
       currSCCB->Sccb_scsimsg = SMDEV_RESET;
 
       WR_HARPOON(port+hp_autostart_3, (SELECT+SELCHK_STRT));
-      auto_loaded = TRUE;
+      auto_loaded = 1;
       currSCCB->Sccb_scsistat = SELECT_BDR_ST;
 
       if (currTar_Info->TarEEValue & EE_SYNC_MASK)
@@ -5712,16 +2997,13 @@ void ssel(ULONG port, UCHAR p_card)
               currTar_Info->TarStatus &= ~TAR_SYNC_MASK;
               }
 
-#if defined(WIDE_SCSI)
-
       if (currTar_Info->TarEEValue & EE_WIDE_SCSI)
          {
         currTar_Info->TarStatus &= ~TAR_WIDE_MASK;
         }
-#endif
 
-      sssyncv(port, target, NARROW_SCSI,currTar_Info);
-      SccbMgrTableInitTarget(p_card, target);
+      FPT_sssyncv(port, target, NARROW_SCSI,currTar_Info);
+      FPT_SccbMgrTableInitTarget(p_card, target);
 
       }
 
@@ -5740,24 +3022,18 @@ void ssel(ULONG port, UCHAR p_card)
                         WRW_HARPOON((port+SYNC_MSGS+4), (BRH_OP+ALWAYS+NP ));
 
                         WR_HARPOON(port+hp_autostart_3, (SELECT+SELCHK_STRT));
-                        auto_loaded = TRUE;
+                        auto_loaded = 1;
                 
                 }
 
-#if defined(WIDE_SCSI)
-
-
    else if (!(currTar_Info->TarStatus & WIDE_NEGOCIATED))  {
-      auto_loaded = siwidn(port,p_card);
+      auto_loaded = FPT_siwidn(port,p_card);
       currSCCB->Sccb_scsistat = SELECT_WN_ST;
       }
 
-#endif
-
-
    else if (!((currTar_Info->TarStatus & TAR_SYNC_MASK)
       == SYNC_SUPPORTED))  {
-      auto_loaded = sisyncn(port,p_card, FALSE);
+      auto_loaded = FPT_sisyncn(port,p_card, 0);
       currSCCB->Sccb_scsistat = SELECT_SN_ST;
       }
 
@@ -5765,7 +3041,6 @@ void ssel(ULONG port, UCHAR p_card)
    if (!auto_loaded)
       {
 
-#if !defined(DOS)
       if (currSCCB->ControlByte & F_USE_CMD_Q)
          {
 
@@ -5789,7 +3064,7 @@ void ssel(ULONG port, UCHAR p_card)
                the wheels fall off. */
             currSCCB->Sccb_scsistat = SELECT_ST;
 
-                 currTar_Info->TarLUNBusy[lun] = TRUE;
+                 currTar_Info->TarLUNBusy[lun] = 1;
             }
 
          else
@@ -5818,8 +3093,8 @@ void ssel(ULONG port, UCHAR p_card)
 
             if ( i == QUEUE_DEPTH )
                {
-                 currTar_Info->TarLUNBusy[lun] = TRUE;
-               queueSelectFail(CurrCard,p_card);
+                 currTar_Info->TarLUNBusy[lun] = 1;
+               FPT_queueSelectFail(CurrCard,p_card);
                                    SGRAM_ACCESS(port);
                  return;
                  }
@@ -5832,7 +3107,6 @@ void ssel(ULONG port, UCHAR p_card)
 
       else
          {
-#endif   /* !DOS */
 
          WRW_HARPOON((port+ID_MSG_STRT),BRH_OP+ALWAYS+NTCMD);
 
@@ -5842,16 +3116,10 @@ void ssel(ULONG port, UCHAR p_card)
          currSCCB->Sccb_scsistat = SELECT_ST;
 
          WR_HARPOON(port+hp_autostart_3, (SELECT+SELCHK_STRT));
-#if !defined(DOS)
          }
-#endif
 
 
-#if defined(OS2)
-      theCCB = (UCHAR far *)&currSCCB->Cdb[0];
-#else
       theCCB = (UCHAR *)&currSCCB->Cdb[0];
-#endif
 
       cdb_reg = port + CMD_STRT;
 
@@ -5867,10 +3135,8 @@ void ssel(ULONG port, UCHAR p_card)
 
       }  /* auto_loaded */
 
-#if defined(WIDE_SCSI)
    WRW_HARPOON((port+hp_fiforead), (USHORT) 0x00);
    WR_HARPOON(port+hp_xferstat, 0x00);
-#endif
 
    WRW_HARPOON((port+hp_intstat), (PROG_HLT | TIMEOUT | SEL | BUS_FREE));
 
@@ -5899,30 +3165,16 @@ void ssel(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: sres
+ * Function: FPT_sres
  *
  * Description: Hookup the correct CCB and handle the incoming messages.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void sres(USHORT port, UCHAR p_card, PSCCBcard pCurrCard)
-#else
-void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
-#endif
+static void FPT_sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
 {
 
-#if defined(V302)
-#ifdef DOS
-   UCHAR our_target,message, msgRetryCount;
-   extern UCHAR lun, tag;
-#else
-   UCHAR our_target,message,lun,tag, msgRetryCount;
-#endif
-
-#else  /* V302 */
    UCHAR our_target, message, lun = 0, tag, msgRetryCount;
-#endif /* V302 */
 
 
    PSCCBMgr_tar_info currTar_Info;
@@ -5933,7 +3185,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
 
         if(pCurrCard->currentSCCB != NULL)
         {
-                currTar_Info = &sccbMgrTbl[p_card][pCurrCard->currentSCCB->TargID];
+                currTar_Info = &FPT_sccbMgrTbl[p_card][pCurrCard->currentSCCB->TargID];
                 DISABLE_AUTO(port);
 
 
@@ -5954,7 +3206,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                 if(((pCurrCard->globalFlags & F_CONLUN_IO) &&
                         ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                 {
-        currTar_Info->TarLUNBusy[currSCCB->Lun] = FALSE;
+        currTar_Info->TarLUNBusy[currSCCB->Lun] = 0;
                         if(currSCCB->Sccb_scsistat != ABORT_ST)
                         {
                                 pCurrCard->discQCount--;
@@ -5964,7 +3216,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                 }
                 else
                 {
-              currTar_Info->TarLUNBusy[0] = FALSE;
+              currTar_Info->TarLUNBusy[0] = 0;
                         if(currSCCB->Sccb_tag)
                         {
                                 if(currSCCB->Sccb_scsistat != ABORT_ST)
@@ -5982,29 +3234,21 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                         }
                 }
 
-      queueSelectFail(&BL_Card[p_card],p_card);
+      FPT_queueSelectFail(&FPT_BL_Card[p_card],p_card);
         }
 
-#if defined(WIDE_SCSI)
         WRW_HARPOON((port+hp_fiforead), (USHORT) 0x00);
-#endif
 
 
         our_target = (UCHAR)(RD_HARPOON(port+hp_select_id) >> 4);
-        currTar_Info = &sccbMgrTbl[p_card][our_target];
+        currTar_Info = &FPT_sccbMgrTbl[p_card][our_target];
 
 
         msgRetryCount = 0;
         do
         {
 
-#if defined(V302)
-
-                message = GetTarLun(port, p_card, our_target, pCurrCard, &tag, &lun);
-
-#else /* V302 */
-
-                currTar_Info = &sccbMgrTbl[p_card][our_target];
+                currTar_Info = &FPT_sccbMgrTbl[p_card][our_target];
                 tag = 0;
 
 
@@ -6022,7 +3266,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                 if ((RD_HARPOON(port+hp_scsisig) & S_SCSI_PHZ) == S_MSGI_PH)
                 {
 
-                        message = sfm(port,pCurrCard->currentSCCB);
+                        message = FPT_sfm(port,pCurrCard->currentSCCB);
                         if (message)
                         {
 
@@ -6030,7 +3274,6 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                                 {
                                         lun = message & (UCHAR)LUN_MASK;
 
-#if !defined(DOS)
                                         if ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) == TAG_Q_TRYING)
                                         {
                                                 if (currTar_Info->TarTagQ_Cnt != 0)
@@ -6041,21 +3284,21 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                                                                 ACCEPT_MSG(port);    /*Release the ACK for ID msg. */
 
 
-                                                                message = sfm(port,pCurrCard->currentSCCB);
+                                                                message = FPT_sfm(port,pCurrCard->currentSCCB);
                                                                 if (message)
                                                                 {
                                                                         ACCEPT_MSG(port);
                                                                 }
 
                                                                 else
-                                                                message = FALSE;
+                                                                message = 0;
 
-                                                                if(message != FALSE)
+                                                                if(message != 0)
                                                                 {
-                                                                        tag = sfm(port,pCurrCard->currentSCCB);
+                                                                        tag = FPT_sfm(port,pCurrCard->currentSCCB);
 
                                                                         if (!(tag)) 
-                                                                                message = FALSE;
+                                                                                message = 0;
                                                                 }
 
                                                         } /*C.A. exists! */
@@ -6063,7 +3306,6 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                                                 } /*End Q cnt != 0 */
 
                                         } /*End Tag cmds supported! */
-#endif /* !DOS */
 
                                 } /*End valid ID message.  */
 
@@ -6078,7 +3320,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                         else
                         {
 
-                                message = FALSE;
+                                message = 0;
                         }
                 }
                 else
@@ -6091,49 +3333,47 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
 
                         return;
                 }
-        
-#endif /* V302 */
 
-                if(message == FALSE)
+                if(message == 0)
                 {
                         msgRetryCount++;
                         if(msgRetryCount == 1)
                         {
-                                SendMsg(port, SMPARITY);
+                                FPT_SendMsg(port, SMPARITY);
                         }
                         else
                         {
-                                SendMsg(port, SMDEV_RESET);
+                                FPT_SendMsg(port, SMDEV_RESET);
 
-                                sssyncv(port, our_target, NARROW_SCSI,currTar_Info);
+                                FPT_sssyncv(port, our_target, NARROW_SCSI,currTar_Info);
 
-                                if (sccbMgrTbl[p_card][our_target].TarEEValue & EE_SYNC_MASK) 
+                                if (FPT_sccbMgrTbl[p_card][our_target].TarEEValue & EE_SYNC_MASK) 
                                 {
                         
-                                        sccbMgrTbl[p_card][our_target].TarStatus &= ~TAR_SYNC_MASK;
+                                        FPT_sccbMgrTbl[p_card][our_target].TarStatus &= ~TAR_SYNC_MASK;
 
                                 }
 
-                                if (sccbMgrTbl[p_card][our_target].TarEEValue & EE_WIDE_SCSI) 
+                                if (FPT_sccbMgrTbl[p_card][our_target].TarEEValue & EE_WIDE_SCSI) 
                                 {
 
-                                        sccbMgrTbl[p_card][our_target].TarStatus &= ~TAR_WIDE_MASK;
+                                        FPT_sccbMgrTbl[p_card][our_target].TarStatus &= ~TAR_WIDE_MASK;
                                 }
 
 
-                                queueFlushTargSccb(p_card, our_target, SCCB_COMPLETE);
-                                SccbMgrTableInitTarget(p_card,our_target);
+                                FPT_queueFlushTargSccb(p_card, our_target, SCCB_COMPLETE);
+                                FPT_SccbMgrTableInitTarget(p_card,our_target);
                                 return;
                         }
                 }
-        }while(message == FALSE);
+        }while(message == 0);
 
 
 
         if(((pCurrCard->globalFlags & F_CONLUN_IO) &&
                 ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
         {
-                currTar_Info->TarLUNBusy[lun] = TRUE;
+                currTar_Info->TarLUNBusy[lun] = 1;
                 pCurrCard->currentSCCB = pCurrCard->discQ_Tbl[currTar_Info->LunDiscQ_Idx[lun]];
                 if(pCurrCard->currentSCCB != NULL)
                 {
@@ -6146,7 +3386,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
         }
         else
         {
-                currTar_Info->TarLUNBusy[0] = TRUE;
+                currTar_Info->TarLUNBusy[0] = 1;
 
 
                 if (tag)
@@ -6182,7 +3422,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
                 /* During Abort Tag command, the target could have got re-selected
                         and completed the command. Check the select Q and remove the CCB
                         if it is in the Select Q */
-                        queueFindSccb(pCurrCard->currentSCCB, p_card);
+                        FPT_queueFindSccb(pCurrCard->currentSCCB, p_card);
                 }
         }
 
@@ -6192,106 +3432,7 @@ void sres(ULONG port, UCHAR p_card, PSCCBcard pCurrCard)
           (RD_HARPOON(port+hp_scsisig) & SCSI_BSY)) ;
 }
 
-#if defined(V302)
-
-#if defined(DOS)
-UCHAR GetTarLun(USHORT port, UCHAR p_card, UCHAR our_target, PSCCBcard pCurrCard, PUCHAR tag, PUCHAR lun)
-#else
-UCHAR GetTarLun(ULONG port, UCHAR p_card, UCHAR our_target, PSCCBcard pCurrCard, PUCHAR tag, PUCHAR lun)
-#endif
-{
-   UCHAR message;
-   PSCCBMgr_tar_info currTar_Info;
-
-
-        currTar_Info = &sccbMgrTbl[p_card][our_target];
-        *tag = 0;
-
-
-        while(!(RD_HARPOON(port+hp_scsisig) & SCSI_REQ))
-        {
-                if (! (RD_HARPOON(port+hp_scsisig) & SCSI_BSY))
-                {
-
-                        WRW_HARPOON((port+hp_intstat), PHASE);
-                        return(TRUE);
-                }
-        }
-
-        WRW_HARPOON((port+hp_intstat), PHASE);
-        if ((RD_HARPOON(port+hp_scsisig) & S_SCSI_PHZ) == S_MSGI_PH)
-        {
-
-                message = sfm(port,pCurrCard->currentSCCB);
-                if (message)
-                {
-
-                        if (message <= (0x80 | LUN_MASK))
-                        {
-                                *lun = message & (UCHAR)LUN_MASK;
-
-#if !defined(DOS)
-                                if ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) == TAG_Q_TRYING)
-                                {
-                                        if (currTar_Info->TarTagQ_Cnt != 0)
-                                        {
-
-                                                if (!(currTar_Info->TarLUN_CA))
-                                                {
-                                                        ACCEPT_MSG(port);    /*Release the ACK for ID msg. */
-
-
-                                                        message = sfm(port,pCurrCard->currentSCCB);
-                                                        if (message)
-                                                        {
-                                                                ACCEPT_MSG(port);
-                                                        }
-
-                                                        else
-                                                        return(FALSE);
-
-                                                        *tag = sfm(port,pCurrCard->currentSCCB);
-
-                                                        if (!(*tag)) return(FALSE);
-
-                                                } /*C.A. exists! */
-
-                                        } /*End Q cnt != 0 */
-
-                                } /*End Tag cmds supported! */
-#endif /* !DOS */
-
-                        } /*End valid ID message.  */
-
-                        else
-                        {
-
-                                ACCEPT_MSG_ATN(port);
-                        }
-
-                } /* End good id message. */
-
-                else
-                {
-
-                        return(FALSE);
-                }
-        }
-        else
-        {
-                ACCEPT_MSG_ATN(port);
-                return(TRUE);
-        }
-        return(TRUE);
-}
-
-#endif /* V302 */
-
-#if defined(DOS)
-void SendMsg(USHORT port, UCHAR message)
-#else
-void SendMsg(ULONG port, UCHAR message)
-#endif
+static void FPT_SendMsg(ULONG port, UCHAR message)
 {
         while(!(RD_HARPOON(port+hp_scsisig) & SCSI_REQ))
         {
@@ -6334,26 +3475,22 @@ void SendMsg(ULONG port, UCHAR message)
 
 /*---------------------------------------------------------------------
  *
- * Function: sdecm
+ * Function: FPT_sdecm
  *
  * Description: Determine the proper responce to the message from the
  *              target device.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void sdecm(UCHAR message, USHORT port, UCHAR p_card)
-#else
-void sdecm(UCHAR message, ULONG port, UCHAR p_card)
-#endif
+static void FPT_sdecm(UCHAR message, ULONG port, UCHAR p_card)
 {
         PSCCB currSCCB;
         PSCCBcard CurrCard;
         PSCCBMgr_tar_info currTar_Info;
 
-        CurrCard = &BL_Card[p_card];
+        CurrCard = &FPT_BL_Card[p_card];
         currSCCB = CurrCard->currentSCCB;
 
-        currTar_Info = &sccbMgrTbl[p_card][currSCCB->TargID];
+        currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
 
         if (message == SMREST_DATA_PTR)
         {
@@ -6361,7 +3498,7 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
                 {
                         currSCCB->Sccb_ATC = currSCCB->Sccb_savedATC;
 
-                        hostDataXferRestart(currSCCB);
+                        FPT_hostDataXferRestart(currSCCB);
                 }
 
                 ACCEPT_MSG(port);
@@ -6417,7 +3554,6 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
                                         currTar_Info->TarEEValue &= ~EE_SYNC_MASK;
                                 }
 
-#if defined(WIDE_SCSI)
                                 else if ((currSCCB->Sccb_scsistat == SELECT_WN_ST))
                                 {
 
@@ -6428,7 +3564,6 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
                                         currTar_Info->TarEEValue &= ~EE_WIDE_SCSI;
 
                                 }
-#endif
 
                                 else if ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) == TAG_Q_TRYING )
                                 {
@@ -6460,9 +3595,9 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
 
                                 if((CurrCard->globalFlags & F_CONLUN_IO) &&
                                         ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-                                        currTar_Info->TarLUNBusy[currSCCB->Lun] = TRUE;
+                                        currTar_Info->TarLUNBusy[currSCCB->Lun] = 1;
                                 else
-                                        currTar_Info->TarLUNBusy[0] = TRUE;
+                                        currTar_Info->TarLUNBusy[0] = 1;
 
 
                                 currSCCB->ControlByte &= ~(UCHAR)F_USE_CMD_Q;
@@ -6490,7 +3625,7 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
         {
 
                 ACCEPT_MSG(port);
-                shandem(port,p_card,currSCCB);
+                FPT_shandem(port,p_card,currSCCB);
         }
 
         else if (message == SMIGNORWR)
@@ -6498,7 +3633,7 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
 
                 ACCEPT_MSG(port);          /* ACK the RESIDUE MSG */
 
-                message = sfm(port,currSCCB);
+                message = FPT_sfm(port,currSCCB);
 
                 if(currSCCB->Sccb_scsimsg != SMPARITY)
                         ACCEPT_MSG(port);
@@ -6520,25 +3655,21 @@ void sdecm(UCHAR message, ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: shandem
+ * Function: FPT_shandem
  *
  * Description: Decide what to do with the extended message.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void shandem(USHORT port, UCHAR p_card, PSCCB pCurrSCCB)
-#else
-void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
-#endif
+static void FPT_shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 {
         UCHAR length,message;
 
-        length = sfm(port,pCurrSCCB);
+        length = FPT_sfm(port,pCurrSCCB);
         if (length) 
         {
 
                 ACCEPT_MSG(port);
-                message = sfm(port,pCurrSCCB);
+                message = FPT_sfm(port,pCurrSCCB);
                 if (message) 
                 {
 
@@ -6549,7 +3680,7 @@ void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                                 {
 
                                         ACCEPT_MSG(port);
-                                        stsyncn(port,p_card);
+                                        FPT_stsyncn(port,p_card);
                                 }
                                 else 
                                 {
@@ -6558,7 +3689,6 @@ void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                                         ACCEPT_MSG_ATN(port);
                                 }
                         }
-#if defined(WIDE_SCSI)
                         else if (message == SMWDTR) 
                         {
 
@@ -6566,7 +3696,7 @@ void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                                 {
 
                                         ACCEPT_MSG(port);
-                                        stwidn(port,p_card);
+                                        FPT_stwidn(port,p_card);
                                 }
                                 else 
                                 {
@@ -6577,7 +3707,6 @@ void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                                         WR_HARPOON(port+hp_autostart_1, (AUTO_IMMED+DISCONNECT_START));
                                 }
                         }
-#endif
                         else 
                         {
 
@@ -6603,24 +3732,20 @@ void shandem(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 
 /*---------------------------------------------------------------------
  *
- * Function: sisyncn
+ * Function: FPT_sisyncn
  *
  * Description: Read in a message byte from the SCSI bus, and check
  *              for a parity error.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR sisyncn(USHORT port, UCHAR p_card, UCHAR syncFlag)
-#else
-UCHAR sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag)
-#endif
+static UCHAR FPT_sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag)
 {
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
-   currTar_Info = &sccbMgrTbl[p_card][currSCCB->TargID];
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
+   currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
 
    if (!((currTar_Info->TarStatus & TAR_SYNC_MASK) == SYNC_TRYING)) {
 
@@ -6656,7 +3781,7 @@ UCHAR sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag)
       WRW_HARPOON((port+SYNC_MSGS+12),(BRH_OP+ALWAYS+NP      ));
 
 
-                if(syncFlag == FALSE)
+                if(syncFlag == 0)
                 {
                    WR_HARPOON(port+hp_autostart_3, (SELECT+SELCHK_STRT));
               currTar_Info->TarStatus = ((currTar_Info->TarStatus &
@@ -6668,14 +3793,14 @@ UCHAR sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag)
                 }
 
 
-      return(TRUE);
+      return(1);
       }
 
    else {
 
       currTar_Info->TarStatus |=         (UCHAR)SYNC_SUPPORTED;
       currTar_Info->TarEEValue &= ~EE_SYNC_MASK;
-      return(FALSE);
+      return(0);
       }
 }
 
@@ -6683,26 +3808,22 @@ UCHAR sisyncn(ULONG port, UCHAR p_card, UCHAR syncFlag)
 
 /*---------------------------------------------------------------------
  *
- * Function: stsyncn
+ * Function: FPT_stsyncn
  *
  * Description: The has sent us a Sync Nego message so handle it as
  *              necessary.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void stsyncn(USHORT port, UCHAR p_card)
-#else
-void stsyncn(ULONG port, UCHAR p_card)
-#endif
+static void FPT_stsyncn(ULONG port, UCHAR p_card)
 {
    UCHAR sync_msg,offset,sync_reg,our_sync_msg;
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
-   currTar_Info = &sccbMgrTbl[p_card][currSCCB->TargID];
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
+   currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
 
-   sync_msg = sfm(port,currSCCB);
+   sync_msg = FPT_sfm(port,currSCCB);
 
         if((sync_msg == 0x00) && (currSCCB->Sccb_scsimsg == SMPARITY))
         {
@@ -6713,7 +3834,7 @@ void stsyncn(ULONG port, UCHAR p_card)
    ACCEPT_MSG(port);
 
 
-   offset = sfm(port,currSCCB);
+   offset = FPT_sfm(port,currSCCB);
 
         if((offset == 0x00) && (currSCCB->Sccb_scsimsg == SMPARITY))
         {
@@ -6783,7 +3904,6 @@ void stsyncn(ULONG port, UCHAR p_card)
       }
 
 
-#if defined(WIDE_SCSI)
    if (currTar_Info->TarStatus & WIDE_ENABLED)
 
       sync_reg |= offset;
@@ -6792,11 +3912,7 @@ void stsyncn(ULONG port, UCHAR p_card)
 
       sync_reg |= (offset | NARROW_SCSI);
 
-#else
-   sync_reg |= (offset | NARROW_SCSI);
-#endif
-
-   sssyncv(port,currSCCB->TargID,sync_reg,currTar_Info);
+   FPT_sssyncv(port,currSCCB->TargID,sync_reg,currTar_Info);
 
 
    if (currSCCB->Sccb_scsistat == SELECT_SN_ST) {
@@ -6815,7 +3931,7 @@ void stsyncn(ULONG port, UCHAR p_card)
 
       ACCEPT_MSG_ATN(port);
 
-      sisyncr(port,sync_msg,offset);
+      FPT_sisyncr(port,sync_msg,offset);
 
       currTar_Info->TarStatus = ((currTar_Info->TarStatus &
          ~(UCHAR)TAR_SYNC_MASK) | (UCHAR)SYNC_SUPPORTED);
@@ -6825,16 +3941,12 @@ void stsyncn(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: sisyncr
+ * Function: FPT_sisyncr
  *
  * Description: Answer the targets sync message.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void sisyncr(USHORT port,UCHAR sync_pulse, UCHAR offset)
-#else
-void sisyncr(ULONG port,UCHAR sync_pulse, UCHAR offset)
-#endif
+static void FPT_sisyncr(ULONG port,UCHAR sync_pulse, UCHAR offset)
 {
    ARAM_ACCESS(port);
    WRW_HARPOON((port+SYNC_MSGS+0), (MPM_OP+AMSG_OUT+SMEXT ));
@@ -6856,28 +3968,22 @@ void sisyncr(ULONG port,UCHAR sync_pulse, UCHAR offset)
 
 
 
-#if defined(WIDE_SCSI)
-
 /*---------------------------------------------------------------------
  *
- * Function: siwidn
+ * Function: FPT_siwidn
  *
  * Description: Read in a message byte from the SCSI bus, and check
  *              for a parity error.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR siwidn(USHORT port, UCHAR p_card)
-#else
-UCHAR siwidn(ULONG port, UCHAR p_card)
-#endif
+static UCHAR FPT_siwidn(ULONG port, UCHAR p_card)
 {
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
-   currTar_Info = &sccbMgrTbl[p_card][currSCCB->TargID];
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
+   currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
 
    if (!((currTar_Info->TarStatus & TAR_WIDE_MASK) == WIDE_NEGOCIATED)) {
 
@@ -6900,7 +4006,7 @@ UCHAR siwidn(ULONG port, UCHAR p_card)
       currTar_Info->TarStatus = ((currTar_Info->TarStatus &
          ~(UCHAR)TAR_WIDE_MASK) | (UCHAR)WIDE_ENABLED);
 
-      return(TRUE);
+      return(1);
       }
 
    else {
@@ -6909,7 +4015,7 @@ UCHAR siwidn(ULONG port, UCHAR p_card)
                ~(UCHAR)TAR_WIDE_MASK) | WIDE_NEGOCIATED);
 
       currTar_Info->TarEEValue &= ~EE_WIDE_SCSI;
-      return(FALSE);
+      return(0);
       }
 }
 
@@ -6917,26 +4023,22 @@ UCHAR siwidn(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: stwidn
+ * Function: FPT_stwidn
  *
  * Description: The has sent us a Wide Nego message so handle it as
  *              necessary.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void stwidn(USHORT port, UCHAR p_card)
-#else
-void stwidn(ULONG port, UCHAR p_card)
-#endif
+static void FPT_stwidn(ULONG port, UCHAR p_card)
 {
    UCHAR width;
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
-   currTar_Info = &sccbMgrTbl[p_card][currSCCB->TargID];
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
+   currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
 
-   width = sfm(port,currSCCB);
+   width = FPT_sfm(port,currSCCB);
 
         if((width == 0x00) && (currSCCB->Sccb_scsimsg == SMPARITY))
         {
@@ -6958,7 +4060,7 @@ void stwidn(ULONG port, UCHAR p_card)
       }
 
 
-   sssyncv(port,currSCCB->TargID,width,currTar_Info);
+   FPT_sssyncv(port,currSCCB->TargID,width,currTar_Info);
 
 
    if (currSCCB->Sccb_scsistat == SELECT_WN_ST)
@@ -6972,7 +4074,7 @@ void stwidn(ULONG port, UCHAR p_card)
                 {
               ACCEPT_MSG_ATN(port);
                    ARAM_ACCESS(port);
-                sisyncn(port,p_card, TRUE);
+                FPT_sisyncn(port,p_card, 1);
               currSCCB->Sccb_scsistat = SELECT_SN_ST;
                    SGRAM_ACCESS(port);
                 }
@@ -6993,7 +4095,7 @@ void stwidn(ULONG port, UCHAR p_card)
       else
          width = SM8BIT;
 
-      siwidr(port,width);
+      FPT_siwidr(port,width);
 
       currTar_Info->TarStatus |= (WIDE_NEGOCIATED | WIDE_ENABLED);
       }
@@ -7002,16 +4104,12 @@ void stwidn(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: siwidr
+ * Function: FPT_siwidr
  *
  * Description: Answer the targets Wide nego message.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void siwidr(USHORT port, UCHAR width)
-#else
-void siwidr(ULONG port, UCHAR width)
-#endif
+static void FPT_siwidr(ULONG port, UCHAR width)
 {
    ARAM_ACCESS(port);
    WRW_HARPOON((port+SYNC_MSGS+0), (MPM_OP+AMSG_OUT+SMEXT ));
@@ -7030,23 +4128,18 @@ void siwidr(ULONG port, UCHAR width)
    while (!(RDW_HARPOON((port+hp_intstat)) & (BUS_FREE | AUTO_INT))) {}
 }
 
-#endif
-
 
 
 /*---------------------------------------------------------------------
  *
- * Function: sssyncv
+ * Function: FPT_sssyncv
  *
  * Description: Write the desired value to the Sync Register for the
  *              ID specified.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void sssyncv(USHORT p_port, UCHAR p_id, UCHAR p_sync_value,PSCCBMgr_tar_info currTar_Info)
-#else
-void sssyncv(ULONG p_port, UCHAR p_id, UCHAR p_sync_value,PSCCBMgr_tar_info currTar_Info)
-#endif
+static void FPT_sssyncv(ULONG p_port, UCHAR p_id, UCHAR p_sync_value,
+                        PSCCBMgr_tar_info currTar_Info)
 {
    UCHAR index;
 
@@ -7112,16 +4205,12 @@ void sssyncv(ULONG p_port, UCHAR p_id, UCHAR p_sync_value,PSCCBMgr_tar_info curr
 
 /*---------------------------------------------------------------------
  *
- * Function: sresb
+ * Function: FPT_sresb
  *
  * Description: Reset the desired card's SCSI bus.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void sresb(USHORT port, UCHAR p_card)
-#else
-void sresb(ULONG port, UCHAR p_card)
-#endif
+static void FPT_sresb(ULONG port, UCHAR p_card)
 {
    UCHAR scsiID, i;
 
@@ -7145,7 +4234,7 @@ void sresb(ULONG port, UCHAR p_card)
 
    WR_HARPOON(port+hp_scsictrl_0, ENA_SCAM_SEL);
 
-   Wait(port, TO_5ms);
+   FPT_Wait(port, TO_5ms);
 
    WRW_HARPOON((port+hp_intstat), CLR_ALL_INT);
 
@@ -7153,7 +4242,7 @@ void sresb(ULONG port, UCHAR p_card)
 
    for (scsiID = 0; scsiID < MAX_SCSI_TAR; scsiID++)
       {
-      currTar_Info = &sccbMgrTbl[p_card][scsiID];
+      currTar_Info = &FPT_sccbMgrTbl[p_card][scsiID];
 
       if (currTar_Info->TarEEValue & EE_SYNC_MASK)
          {
@@ -7166,21 +4255,21 @@ void sresb(ULONG port, UCHAR p_card)
         currTar_Info->TarStatus &= ~TAR_WIDE_MASK;
         }
 
-      sssyncv(port, scsiID, NARROW_SCSI,currTar_Info);
+      FPT_sssyncv(port, scsiID, NARROW_SCSI,currTar_Info);
 
-      SccbMgrTableInitTarget(p_card, scsiID);
+      FPT_SccbMgrTableInitTarget(p_card, scsiID);
       }
 
-   BL_Card[p_card].scanIndex = 0x00;
-   BL_Card[p_card].currentSCCB = NULL;
-   BL_Card[p_card].globalFlags &= ~(F_TAG_STARTED | F_HOST_XFER_ACT 
+   FPT_BL_Card[p_card].scanIndex = 0x00;
+   FPT_BL_Card[p_card].currentSCCB = NULL;
+   FPT_BL_Card[p_card].globalFlags &= ~(F_TAG_STARTED | F_HOST_XFER_ACT 
                                                                                                         | F_NEW_SCCB_CMD);
-   BL_Card[p_card].cmdCounter  = 0x00;
-        BL_Card[p_card].discQCount = 0x00;
-   BL_Card[p_card].tagQ_Lst = 0x01; 
+   FPT_BL_Card[p_card].cmdCounter  = 0x00;
+        FPT_BL_Card[p_card].discQCount = 0x00;
+   FPT_BL_Card[p_card].tagQ_Lst = 0x01; 
 
         for(i = 0; i < QUEUE_DEPTH; i++)
-                BL_Card[p_card].discQ_Tbl[i] = NULL;
+                FPT_BL_Card[p_card].discQ_Tbl[i] = NULL;
 
    WR_HARPOON(port+hp_page_ctrl,
       (RD_HARPOON(port+hp_page_ctrl) & ~G_INT_DISABLE));
@@ -7189,12 +4278,12 @@ void sresb(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: ssenss
+ * Function: FPT_ssenss
  *
  * Description: Setup for the Auto Sense command.
  *
  *---------------------------------------------------------------------*/
-void ssenss(PSCCBcard pCurrCard)
+static void FPT_ssenss(PSCCBcard pCurrCard)
 {
    UCHAR i;
    PSCCB currSCCB;
@@ -7236,27 +4325,23 @@ void ssenss(PSCCBcard pCurrCard)
 
 /*---------------------------------------------------------------------
  *
- * Function: sxfrp
+ * Function: FPT_sxfrp
  *
  * Description: Transfer data into the bit bucket until the device
  *              decides to switch phase.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void sxfrp(USHORT p_port, UCHAR p_card)
-#else
-void sxfrp(ULONG p_port, UCHAR p_card)
-#endif
+static void FPT_sxfrp(ULONG p_port, UCHAR p_card)
 {
    UCHAR curr_phz;
 
 
    DISABLE_AUTO(p_port);
 
-   if (BL_Card[p_card].globalFlags & F_HOST_XFER_ACT) {
+   if (FPT_BL_Card[p_card].globalFlags & F_HOST_XFER_ACT) {
 
-      hostDataXferAbort(p_port,p_card,BL_Card[p_card].currentSCCB);
+      FPT_hostDataXferAbort(p_port,p_card,FPT_BL_Card[p_card].currentSCCB);
 
       }
 
@@ -7322,25 +4407,21 @@ void sxfrp(ULONG p_port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: schkdd
+ * Function: FPT_schkdd
  *
  * Description: Make sure data has been flushed from both FIFOs and abort
  *              the operations if necessary.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void schkdd(USHORT port, UCHAR p_card)
-#else
-void schkdd(ULONG port, UCHAR p_card)
-#endif
+static void FPT_schkdd(ULONG port, UCHAR p_card)
 {
    USHORT TimeOutLoop;
         UCHAR sPhase;
 
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
 
    if ((currSCCB->Sccb_scsistat != DATA_OUT_ST) &&
@@ -7378,7 +4459,7 @@ void schkdd(ULONG port, UCHAR p_card)
       }
 
 
-   hostDataXferAbort(port,p_card,currSCCB);
+   FPT_hostDataXferAbort(port,p_card,currSCCB);
 
 
    while (RD_HARPOON(port+hp_scsisig) & SCSI_ACK) {}
@@ -7412,21 +4493,21 @@ void schkdd(ULONG port, UCHAR p_card)
            if (!(currSCCB->Sccb_XferState & F_ALL_XFERRED))
          {
               if (currSCCB->Sccb_XferState & F_HOST_XFER_DIR) {
-                 phaseDataIn(port,p_card);
+                 FPT_phaseDataIn(port,p_card);
                 }
 
                 else {
-               phaseDataOut(port,p_card);
+               FPT_phaseDataOut(port,p_card);
                 }
                 }
                 else
         {
-                sxfrp(port,p_card);
+                FPT_sxfrp(port,p_card);
                 if (!(RDW_HARPOON((port+hp_intstat)) &
                       (BUS_FREE | ICMD_COMP | ITAR_DISC | RESET)))
          {
                 WRW_HARPOON((port+hp_intstat), AUTO_INT);
-                   phaseDecode(port,p_card);
+                   FPT_phaseDecode(port,p_card);
                    }
            }
 
@@ -7440,13 +4521,13 @@ void schkdd(ULONG port, UCHAR p_card)
 
 /*---------------------------------------------------------------------
  *
- * Function: sinits
+ * Function: FPT_sinits
  *
  * Description: Setup SCCB manager fields in this SCCB.
  *
  *---------------------------------------------------------------------*/
 
-void sinits(PSCCB p_sccb, UCHAR p_card)
+static void FPT_sinits(PSCCB p_sccb, UCHAR p_card)
 {
    PSCCBMgr_tar_info currTar_Info;
 
@@ -7454,7 +4535,7 @@ void sinits(PSCCB p_sccb, UCHAR p_card)
         {
                 return;
         }
-   currTar_Info = &sccbMgrTbl[p_card][p_sccb->TargID];
+   currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];
 
    p_sccb->Sccb_XferState     = 0x00;
    p_sccb->Sccb_XferCnt       = p_sccb->DataLength;
@@ -7485,7 +4566,7 @@ void sinits(PSCCB p_sccb, UCHAR p_card)
         else send Cmd with Disconnect Disable */
 
 /*
-   if (((!(BL_Card[p_card].globalFlags & F_SINGLE_DEVICE)) &&
+   if (((!(FPT_BL_Card[p_card].globalFlags & F_SINGLE_DEVICE)) &&
       (currTar_Info->TarStatus & TAR_ALLOW_DISC)) ||
       (currTar_Info->TarStatus & TAG_Q_TRYING)) {
 */
@@ -7518,55 +4599,6 @@ void sinits(PSCCB p_sccb, UCHAR p_card)
 }
 
 
-#ident "$Id: phase.c 1.11 1997/01/31 02:08:49 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   phase.c  $
- *
- *   Description:  Functions to initially handle the SCSI bus phase when
- *                 the target asserts request (and the automation is not
- *                 enabled to handle the situation).
- *
- *   $Date: 1997/01/31 02:08:49 $
- *
- *   $Revision: 1.11 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <harpoon.h>*/
-
-
-/*
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-
-#if defined(OS2)
-   extern void (far *s_PhaseTbl[8]) (ULONG, UCHAR);
-#else
-   #if defined(DOS)
-      extern void (*s_PhaseTbl[8]) (USHORT, UCHAR);
-   #else
-      extern void (*s_PhaseTbl[8]) (ULONG, UCHAR);
-   #endif
-#endif
-*/
-
 /*---------------------------------------------------------------------
  *
  * Function: Phase Decode
@@ -7575,29 +4607,17 @@ extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void phaseDecode(USHORT p_port, UCHAR p_card)
-#else
-void phaseDecode(ULONG p_port, UCHAR p_card)
-#endif
+static void FPT_phaseDecode(ULONG p_port, UCHAR p_card)
 {
    unsigned char phase_ref;
-#if defined(OS2)
-   void (far *phase) (ULONG, UCHAR);
-#else
-   #if defined(DOS)
-      void (*phase) (USHORT, UCHAR);
-   #else
-      void (*phase) (ULONG, UCHAR);
-   #endif
-#endif
+   void (*phase) (ULONG, UCHAR);
 
 
    DISABLE_AUTO(p_port);
 
    phase_ref = (UCHAR) (RD_HARPOON(p_port+hp_scsisig) & S_SCSI_PHZ);
 
-   phase = s_PhaseTbl[phase_ref];
+   phase = FPT_s_PhaseTbl[phase_ref];
 
    (*phase)(p_port, p_card);           /* Call the correct phase func */
 }
@@ -7612,20 +4632,12 @@ void phaseDecode(ULONG p_port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseDataOut(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseDataOut(USHORT port, UCHAR p_card)
-#else
-void phaseDataOut(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseDataOut(ULONG port, UCHAR p_card)
 {
 
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
    if (currSCCB == NULL)
       {
       return;  /* Exit if No SCCB record */
@@ -7640,14 +4652,7 @@ void phaseDataOut(ULONG port, UCHAR p_card)
 
    WR_HARPOON(port+hp_autostart_0, (END_DATA+END_DATA_START));
 
-   dataXferProcessor(port, &BL_Card[p_card]);
-
-#if defined(NOBUGBUG)
-   if (RDW_HARPOON((port+hp_intstat)) & XFER_CNT_0)
-      WRW_HARPOON((port+hp_intstat), XFER_CNT_0);
-
-#endif
-
+   FPT_dataXferProcessor(port, &FPT_BL_Card[p_card]);
 
    if (currSCCB->Sccb_XferCnt == 0) {
 
@@ -7656,9 +4661,9 @@ void phaseDataOut(ULONG port, UCHAR p_card)
          (currSCCB->HostStatus == SCCB_COMPLETE))
          currSCCB->HostStatus = SCCB_DATA_OVER_RUN;
 
-      sxfrp(port,p_card);
+      FPT_sxfrp(port,p_card);
       if (!(RDW_HARPOON((port+hp_intstat)) & (BUS_FREE | RESET)))
-            phaseDecode(port,p_card);
+            FPT_phaseDecode(port,p_card);
       }
 }
 
@@ -7671,20 +4676,12 @@ void phaseDataOut(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseDataIn(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseDataIn(USHORT port, UCHAR p_card)
-#else
-void phaseDataIn(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseDataIn(ULONG port, UCHAR p_card)
 {
 
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    if (currSCCB == NULL)
       {
@@ -7702,7 +4699,7 @@ void phaseDataIn(ULONG port, UCHAR p_card)
 
    WR_HARPOON(port+hp_autostart_0, (END_DATA+END_DATA_START));
 
-   dataXferProcessor(port, &BL_Card[p_card]);
+   FPT_dataXferProcessor(port, &FPT_BL_Card[p_card]);
 
    if (currSCCB->Sccb_XferCnt == 0) {
 
@@ -7711,9 +4708,9 @@ void phaseDataIn(ULONG port, UCHAR p_card)
          (currSCCB->HostStatus == SCCB_COMPLETE))
          currSCCB->HostStatus = SCCB_DATA_OVER_RUN;
 
-      sxfrp(port,p_card);
+      FPT_sxfrp(port,p_card);
       if (!(RDW_HARPOON((port+hp_intstat)) & (BUS_FREE | RESET)))
-            phaseDecode(port,p_card);
+            FPT_phaseDecode(port,p_card);
 
       }
 }
@@ -7726,25 +4723,13 @@ void phaseDataIn(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseCommand(ULONG p_port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseCommand(USHORT p_port, UCHAR p_card)
-#else
-void phaseCommand(ULONG p_port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseCommand(ULONG p_port, UCHAR p_card)
 {
    PSCCB currSCCB;
-#if defined(DOS)
-   USHORT cdb_reg;
-#else
    ULONG cdb_reg;
-#endif
    UCHAR i;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    if (currSCCB->OperationCode == RESET_COMMAND) {
 
@@ -7790,15 +4775,7 @@ void phaseCommand(ULONG p_port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseStatus(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseStatus(USHORT port, UCHAR p_card)
-#else
-void phaseStatus(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseStatus(ULONG port, UCHAR p_card)
 {
    /* Start-up the automation to finish off this command and let the
       isr handle the interrupt for command complete when it comes in.
@@ -7820,21 +4797,13 @@ void phaseStatus(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseMsgOut(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseMsgOut(USHORT port, UCHAR p_card)
-#else
-void phaseMsgOut(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseMsgOut(ULONG port, UCHAR p_card)
 {
         UCHAR message,scsiID;
         PSCCB currSCCB;
         PSCCBMgr_tar_info currTar_Info;
 
-        currSCCB = BL_Card[p_card].currentSCCB;
+        currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
         if (currSCCB != NULL) {
 
@@ -7845,34 +4814,34 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
                 {
 
 
-                        currTar_Info = &sccbMgrTbl[p_card][scsiID];
+                        currTar_Info = &FPT_sccbMgrTbl[p_card][scsiID];
                         currTar_Info->TarSyncCtrl = 0;
-                        sssyncv(port, scsiID, NARROW_SCSI,currTar_Info);
+                        FPT_sssyncv(port, scsiID, NARROW_SCSI,currTar_Info);
 
-                        if (sccbMgrTbl[p_card][scsiID].TarEEValue & EE_SYNC_MASK) 
+                        if (FPT_sccbMgrTbl[p_card][scsiID].TarEEValue & EE_SYNC_MASK) 
                         {
 
-                                sccbMgrTbl[p_card][scsiID].TarStatus &= ~TAR_SYNC_MASK;
+                                FPT_sccbMgrTbl[p_card][scsiID].TarStatus &= ~TAR_SYNC_MASK;
 
                         }
 
-                        if (sccbMgrTbl[p_card][scsiID].TarEEValue & EE_WIDE_SCSI) 
+                        if (FPT_sccbMgrTbl[p_card][scsiID].TarEEValue & EE_WIDE_SCSI) 
                         {
 
-                                sccbMgrTbl[p_card][scsiID].TarStatus &= ~TAR_WIDE_MASK;
+                                FPT_sccbMgrTbl[p_card][scsiID].TarStatus &= ~TAR_WIDE_MASK;
                         }
 
 
-                        queueFlushSccb(p_card,SCCB_COMPLETE);
-                        SccbMgrTableInitTarget(p_card,scsiID);
+                        FPT_queueFlushSccb(p_card,SCCB_COMPLETE);
+                        FPT_SccbMgrTableInitTarget(p_card,scsiID);
                 }
                 else if (currSCCB->Sccb_scsistat == ABORT_ST)
                 {
                         currSCCB->HostStatus = SCCB_COMPLETE;
-                        if(BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] != NULL)
+                        if(FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] != NULL)
                         {
-                                BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
-                                sccbMgrTbl[p_card][scsiID].TarTagQ_Cnt--;
+                                FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
+                                FPT_sccbMgrTbl[p_card][scsiID].TarTagQ_Cnt--;
                         }
                                         
                 }
@@ -7885,7 +4854,7 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
                         {
                                 currSCCB->Sccb_MGRFlags |= F_DEV_SELECTED;
                 
-                                ssel(port,p_card);
+                                FPT_ssel(port,p_card);
                                 return;
                         }
                 }
@@ -7895,7 +4864,7 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
 
                         if (message == SMABORT)
 
-                                queueFlushSccb(p_card,SCCB_COMPLETE);
+                                FPT_queueFlushSccb(p_card,SCCB_COMPLETE);
                 }
 
         }
@@ -7930,25 +4899,25 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
                         if (currSCCB != NULL) 
                         {
 
-                                if((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                        ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-                                        sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = FALSE;
+                                if((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                        ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
+                                        FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 0;
                                 else
-                                        sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = FALSE;
+                                        FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 0;
 
-                                queueCmdComplete(&BL_Card[p_card],currSCCB, p_card);
+                                FPT_queueCmdComplete(&FPT_BL_Card[p_card],currSCCB, p_card);
                         }
 
                         else 
                         {
-                                BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
+                                FPT_BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
                         }
                 }
 
                 else 
                 {
 
-                        sxfrp(port,p_card);
+                        FPT_sxfrp(port,p_card);
                 }
         }
 
@@ -7962,7 +4931,7 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
                 }
                 else
                 {
-                        sxfrp(port,p_card);
+                        FPT_sxfrp(port,p_card);
                 }
         }
 }
@@ -7976,25 +4945,17 @@ void phaseMsgOut(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseMsgIn(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseMsgIn(USHORT port, UCHAR p_card)
-#else
-void phaseMsgIn(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseMsgIn(ULONG port, UCHAR p_card)
 {
         UCHAR message;
         PSCCB currSCCB;
 
-        currSCCB = BL_Card[p_card].currentSCCB;
+        currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
-        if (BL_Card[p_card].globalFlags & F_HOST_XFER_ACT) 
+        if (FPT_BL_Card[p_card].globalFlags & F_HOST_XFER_ACT) 
         {
 
-                phaseChkFifo(port, p_card);
+                FPT_phaseChkFifo(port, p_card);
         }
 
         message = RD_HARPOON(port+hp_scsidata_0);
@@ -8008,12 +4969,12 @@ void phaseMsgIn(ULONG port, UCHAR p_card)
         else 
         {
 
-                message = sfm(port,currSCCB);
+                message = FPT_sfm(port,currSCCB);
                 if (message) 
                 {
 
 
-                        sdecm(message,port,p_card);
+                        FPT_sdecm(message,port,p_card);
 
                 }
                 else
@@ -8037,19 +4998,11 @@ void phaseMsgIn(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(OS2)
-void far phaseIllegal(ULONG port, UCHAR p_card)
-#else
-#if defined(DOS)
-void phaseIllegal(USHORT port, UCHAR p_card)
-#else
-void phaseIllegal(ULONG port, UCHAR p_card)
-#endif
-#endif
+static void FPT_phaseIllegal(ULONG port, UCHAR p_card)
 {
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    WR_HARPOON(port+hp_scsisig, RD_HARPOON(port+hp_scsisig));
    if (currSCCB != NULL) {
@@ -8073,16 +5026,12 @@ void phaseIllegal(ULONG port, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void phaseChkFifo(USHORT port, UCHAR p_card)
-#else
-void phaseChkFifo(ULONG port, UCHAR p_card)
-#endif
+static void FPT_phaseChkFifo(ULONG port, UCHAR p_card)
 {
    ULONG xfercnt;
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    if (currSCCB->Sccb_scsistat == DATA_IN_ST)
       {
@@ -8104,9 +5053,9 @@ void phaseChkFifo(ULONG port, UCHAR p_card)
                  WRW_HARPOON((port+hp_intstat), PARITY);
                  }
 
-              hostDataXferAbort(port,p_card,currSCCB);
+              FPT_hostDataXferAbort(port,p_card,currSCCB);
 
-              dataXferProcessor(port, &BL_Card[p_card]);
+              FPT_dataXferProcessor(port, &FPT_BL_Card[p_card]);
 
               while((!(RD_HARPOON(port+hp_xferstat) & FIFO_EMPTY)) &&
                  (RD_HARPOON(port+hp_ext_status) & BM_CMD_BUSY)) {}
@@ -8116,22 +5065,7 @@ void phaseChkFifo(ULONG port, UCHAR p_card)
 
 
 
-#if defined(DOS)
-   asm { mov dx,port;
-      add dx,hp_xfercnt_2;
-      in  al,dx;
-      dec dx;
-      xor ah,ah;
-      mov word ptr xfercnt+2,ax;
-      in  al,dx;
-      dec dx;
-      mov ah,al;
-      in  al,dx;
-      mov word ptr xfercnt,ax;
-      }
-#else
    GET_XFER_CNT(port,xfercnt);
-#endif
 
 
    WR_HARPOON(port+hp_xfercnt_0, 0x00);
@@ -8151,7 +5085,7 @@ void phaseChkFifo(ULONG port, UCHAR p_card)
       }
 
 
-   hostDataXferAbort(port,p_card,currSCCB);
+   FPT_hostDataXferAbort(port,p_card,currSCCB);
 
 
    WR_HARPOON(port+hp_fifowrite, 0x00);
@@ -8170,15 +5104,11 @@ void phaseChkFifo(ULONG port, UCHAR p_card)
  *              because of command complete or from a disconnect.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void phaseBusFree(USHORT port, UCHAR p_card)
-#else
-void phaseBusFree(ULONG port, UCHAR p_card)
-#endif
+static void FPT_phaseBusFree(ULONG port, UCHAR p_card)
 {
    PSCCB currSCCB;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    if (currSCCB != NULL)
       {
@@ -8189,35 +5119,34 @@ void phaseBusFree(ULONG port, UCHAR p_card)
       if (currSCCB->OperationCode == RESET_COMMAND)
          {
 
-                        if((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-                         sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = FALSE;
+                        if((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
+                         FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 0;
                         else
-                         sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = FALSE;
+                         FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 0;
 
-              queueCmdComplete(&BL_Card[p_card], currSCCB, p_card);
+              FPT_queueCmdComplete(&FPT_BL_Card[p_card], currSCCB, p_card);
 
-              queueSearchSelect(&BL_Card[p_card],p_card);
+              FPT_queueSearchSelect(&FPT_BL_Card[p_card],p_card);
 
               }
 
       else if(currSCCB->Sccb_scsistat == SELECT_SN_ST)
               {
-              sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |=
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |=
                                  (UCHAR)SYNC_SUPPORTED;
-              sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_SYNC_MASK;
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_SYNC_MASK;
               }
 
       else if(currSCCB->Sccb_scsistat == SELECT_WN_ST)
               {
-              sccbMgrTbl[p_card][currSCCB->TargID].TarStatus =
-                            (sccbMgrTbl[p_card][currSCCB->TargID].
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus =
+                            (FPT_sccbMgrTbl[p_card][currSCCB->TargID].
                    TarStatus & ~WIDE_ENABLED) | WIDE_NEGOCIATED;
 
-              sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_WIDE_SCSI;
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_WIDE_SCSI;
               }
 
-#if !defined(DOS)
       else if(currSCCB->Sccb_scsistat == SELECT_Q_ST)
               {
               /* Make sure this is not a phony BUS_FREE.  If we were
@@ -8227,8 +5156,8 @@ void phaseBusFree(ULONG port, UCHAR p_card)
               if ((!(RD_HARPOON(port+hp_scsisig) & SCSI_BSY)) ||
                  (RDW_HARPOON((port+hp_intstat)) & RSEL))
                  {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_TAG_Q_MASK;
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |= TAG_Q_REJECT;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_TAG_Q_MASK;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |= TAG_Q_REJECT;
                  }
 
               else
@@ -8236,7 +5165,6 @@ void phaseBusFree(ULONG port, UCHAR p_card)
                  return;
                  }
          }
-#endif
 
       else
               {
@@ -8248,18 +5176,18 @@ void phaseBusFree(ULONG port, UCHAR p_card)
                  currSCCB->HostStatus = SCCB_PHASE_SEQUENCE_FAIL;
                  }
 
-                        if((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-                         sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = FALSE;
+                        if((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
+                         FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 0;
                         else
-                         sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = FALSE;
+                         FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 0;
 
-              queueCmdComplete(&BL_Card[p_card], currSCCB, p_card);
+              FPT_queueCmdComplete(&FPT_BL_Card[p_card], currSCCB, p_card);
               return;
               }
 
 
-      BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
+      FPT_BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
 
       } /*end if !=null */
 }
@@ -8267,44 +5195,6 @@ void phaseBusFree(ULONG port, UCHAR p_card)
 
 
 
-#ident "$Id: automate.c 1.14 1997/01/31 02:11:46 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   automate.c  $
- *
- *   Description:  Functions relating to programming the automation of
- *                 the HARPOON.
- *
- *   $Date: 1997/01/31 02:11:46 $
- *
- *   $Revision: 1.14 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <harpoon.h>*/
-
-/*
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-extern SCCBCARD BL_Card[MAX_CARDS];
-*/
-
 /*---------------------------------------------------------------------
  *
  * Function: Auto Load Default Map
@@ -8312,17 +5202,9 @@ extern SCCBCARD BL_Card[MAX_CARDS];
  * Description: Load the Automation RAM with the defualt map values.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void autoLoadDefaultMap(USHORT p_port)
-#else
-void autoLoadDefaultMap(ULONG p_port)
-#endif
+static void FPT_autoLoadDefaultMap(ULONG p_port)
 {
-#if defined(DOS)
-   USHORT map_addr;
-#else
    ULONG map_addr;
-#endif
 
    ARAM_ACCESS(p_port);
    map_addr = p_port + hp_aramBase;
@@ -8428,86 +5310,82 @@ void autoLoadDefaultMap(ULONG p_port)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void autoCmdCmplt(USHORT p_port, UCHAR p_card)
-#else
-void autoCmdCmplt(ULONG p_port, UCHAR p_card)
-#endif
+static void FPT_autoCmdCmplt(ULONG p_port, UCHAR p_card)
 {
    PSCCB currSCCB;
    UCHAR status_byte;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
 
    status_byte = RD_HARPOON(p_port+hp_gp_reg_0);
 
-   sccbMgrTbl[p_card][currSCCB->TargID].TarLUN_CA = FALSE;
+   FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUN_CA = 0;
 
    if (status_byte != SSGOOD) {
 
       if (status_byte == SSQ_FULL) {
 
 
-                        if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
+                        if(((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = TRUE;
-                                if(BL_Card[p_card].discQCount != 0)
-                                        BL_Card[p_card].discQCount--;
-                                BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 1;
+                                if(FPT_BL_Card[p_card].discQCount != 0)
+                                        FPT_BL_Card[p_card].discQCount--;
+                                FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
                         }
                         else
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = TRUE;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 1;
                                 if(currSCCB->Sccb_tag)
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
                                 }else
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
                                 }
                         }
 
          currSCCB->Sccb_MGRFlags |= F_STATUSLOADED;
 
-         queueSelectFail(&BL_Card[p_card],p_card);
+         FPT_queueSelectFail(&FPT_BL_Card[p_card],p_card);
 
          return;
          }
 
       if(currSCCB->Sccb_scsistat == SELECT_SN_ST)
          {
-         sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |=
+         FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus |=
             (UCHAR)SYNC_SUPPORTED;
 
-              sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_SYNC_MASK;
-         BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_SYNC_MASK;
+         FPT_BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
 
-                        if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
+                        if(((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = TRUE;
-                                if(BL_Card[p_card].discQCount != 0)
-                                        BL_Card[p_card].discQCount--;
-                                BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 1;
+                                if(FPT_BL_Card[p_card].discQCount != 0)
+                                        FPT_BL_Card[p_card].discQCount--;
+                                FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
                         }
                         else
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = TRUE;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 1;
                                 if(currSCCB->Sccb_tag)
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
                                 }else
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
                                 }
                         }
          return;
@@ -8517,34 +5395,34 @@ void autoCmdCmplt(ULONG p_port, UCHAR p_card)
       if(currSCCB->Sccb_scsistat == SELECT_WN_ST)
          {
 
-              sccbMgrTbl[p_card][currSCCB->TargID].TarStatus =
-                 (sccbMgrTbl[p_card][currSCCB->TargID].
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus =
+                 (FPT_sccbMgrTbl[p_card][currSCCB->TargID].
                  TarStatus & ~WIDE_ENABLED) | WIDE_NEGOCIATED;
 
-              sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_WIDE_SCSI;
-         BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
+              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue &= ~EE_WIDE_SCSI;
+         FPT_BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
 
-                        if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
+                        if(((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = TRUE;
-                                if(BL_Card[p_card].discQCount != 0)
-                                        BL_Card[p_card].discQCount--;
-                                BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 1;
+                                if(FPT_BL_Card[p_card].discQCount != 0)
+                                        FPT_BL_Card[p_card].discQCount--;
+                                FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
                         }
                         else
                         {
-                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = TRUE;
+                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 1;
                                 if(currSCCB->Sccb_tag)
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
                                 }else
                                 {
-                                        if(BL_Card[p_card].discQCount != 0)
-                                                BL_Card[p_card].discQCount--;
-                                        BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
+                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                FPT_BL_Card[p_card].discQCount--;
+                                        FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
                                 }
                         }
          return;
@@ -8553,15 +5431,15 @@ void autoCmdCmplt(ULONG p_port, UCHAR p_card)
      
            if (status_byte == SSCHECK) 
                 {
-                        if(BL_Card[p_card].globalFlags & F_DO_RENEGO)
+                        if(FPT_BL_Card[p_card].globalFlags & F_DO_RENEGO)
                         {
-                                if (sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue & EE_SYNC_MASK)
+                                if (FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue & EE_SYNC_MASK)
                                 {
-                                        sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_SYNC_MASK;
+                                        FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_SYNC_MASK;
                                 }
-                                if (sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue & EE_WIDE_SCSI)
+                                if (FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarEEValue & EE_WIDE_SCSI)
                                 {
-                                        sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_WIDE_MASK;
+                                        FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus &= ~TAR_WIDE_MASK;
                                 }
                         }
                 }
@@ -8573,135 +5451,61 @@ void autoCmdCmplt(ULONG p_port, UCHAR p_card)
 
          if (status_byte == SSCHECK) {
 
-            sccbMgrTbl[p_card][currSCCB->TargID].TarLUN_CA
-               = TRUE;
+            FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUN_CA
+               = 1;
      
 
-#if (FW_TYPE==_SCCB_MGR_)
             if (currSCCB->RequestSenseLength != NO_AUTO_REQUEST_SENSE) {
 
                if (currSCCB->RequestSenseLength == 0)
                   currSCCB->RequestSenseLength = 14;
 
-               ssenss(&BL_Card[p_card]);
-               BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
+               FPT_ssenss(&FPT_BL_Card[p_card]);
+               FPT_BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
 
-                                        if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
+                                        if(((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                                                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                                         {
-                                 sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = TRUE;
-                                                if(BL_Card[p_card].discQCount != 0)
-                                                        BL_Card[p_card].discQCount--;
-                                                BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
+                                 FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 1;
+                                                if(FPT_BL_Card[p_card].discQCount != 0)
+                                                        FPT_BL_Card[p_card].discQCount--;
+                                                FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
                                         }
                                         else
                                         {
-                              sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = TRUE;
+                              FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 1;
                                                 if(currSCCB->Sccb_tag)
                                                 {
-                                                        if(BL_Card[p_card].discQCount != 0)
-                                                                BL_Card[p_card].discQCount--;
-                                                        BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
+                                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                                FPT_BL_Card[p_card].discQCount--;
+                                                        FPT_BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
                                                 }else
                                                 {
-                                                        if(BL_Card[p_card].discQCount != 0)
-                                                                BL_Card[p_card].discQCount--;
-                                                        BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
+                                                        if(FPT_BL_Card[p_card].discQCount != 0)
+                                                                FPT_BL_Card[p_card].discQCount--;
+                                                        FPT_BL_Card[p_card].discQ_Tbl[FPT_sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
                                                 }
                                         }
                return;
                }
-#else
-                                   if ((!(currSCCB->Sccb_ucb_ptr->UCB_opcode & OPC_NO_AUTO_SENSE)) &&
-                                        (currSCCB->RequestSenseLength))
-                                   {
-                                        ssenss(&BL_Card[p_card]);
-                                      BL_Card[p_card].globalFlags |= F_NEW_SCCB_CMD;
-
-                                                if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                                                        ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
-                                                {
-                                   sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = TRUE;
-                                                        if(BL_Card[p_card].discQCount != 0)
-                                                                BL_Card[p_card].discQCount--;
-                                                        BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[currSCCB->Lun]] = NULL;
-                                                }
-                                                else
-                                                {
-                                   sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = TRUE;
-                                                        if(currSCCB->Sccb_tag)
-                                                        {
-                                                                if(BL_Card[p_card].discQCount != 0)
-                                                                        BL_Card[p_card].discQCount--;
-                                                                BL_Card[p_card].discQ_Tbl[currSCCB->Sccb_tag] = NULL;
-                                                        }else
-                                                        {
-                                                                if(BL_Card[p_card].discQCount != 0)
-                                                                        BL_Card[p_card].discQCount--;
-                                                                BL_Card[p_card].discQ_Tbl[sccbMgrTbl[p_card][currSCCB->TargID].LunDiscQ_Idx[0]] = NULL;
-                                                        }
-                                                }
-                                      return;
-                                   }
-
-#endif
             }
          }
       }
 
 
-        if((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
-                ((sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
-           sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = FALSE;
+        if((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+                ((FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
+           FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[currSCCB->Lun] = 0;
         else
-           sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = FALSE;
+           FPT_sccbMgrTbl[p_card][currSCCB->TargID].TarLUNBusy[0] = 0;
 
 
-   queueCmdComplete(&BL_Card[p_card], currSCCB, p_card);
+   FPT_queueCmdComplete(&FPT_BL_Card[p_card], currSCCB, p_card);
 }
-#ident "$Id: busmstr.c 1.8 1997/01/31 02:10:27 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   busmstr.c  $
- *
- *   Description:  Functions to start, stop, and abort BusMaster operations.
- *
- *   $Date: 1997/01/31 02:10:27 $
- *
- *   $Revision: 1.8 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <harpoon.h>*/
-
-
-/*
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-*/
 
 #define SHORT_WAIT   0x0000000F
 #define LONG_WAIT    0x0000FFFFL
 
-#if defined(BUGBUG)
-void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
-#endif
 
 /*---------------------------------------------------------------------
  *
@@ -8721,11 +5525,7 @@ void Debug_Load(UCHAR p_card, UCHAR p_bug_data);
  *              
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void dataXferProcessor(USHORT port, PSCCBcard pCurrCard)
-#else
-void dataXferProcessor(ULONG port, PSCCBcard pCurrCard)
-#endif
+static void FPT_dataXferProcessor(ULONG port, PSCCBcard pCurrCard)
 {
    PSCCB currSCCB;
 
@@ -8741,7 +5541,7 @@ void dataXferProcessor(ULONG port, PSCCBcard pCurrCard)
                                 }
                         pCurrCard->globalFlags |= F_HOST_XFER_ACT;
          
-         busMstrSGDataXferStart(port, currSCCB);
+         FPT_busMstrSGDataXferStart(port, currSCCB);
                         }
 
       else
@@ -8750,7 +5550,7 @@ void dataXferProcessor(ULONG port, PSCCBcard pCurrCard)
                                 {
                                 pCurrCard->globalFlags |= F_HOST_XFER_ACT;
          
-                busMstrDataXferStart(port, currSCCB);
+                FPT_busMstrDataXferStart(port, currSCCB);
                 }
                         }
 }
@@ -8763,20 +5563,12 @@ void dataXferProcessor(ULONG port, PSCCBcard pCurrCard)
  * Description:
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void busMstrSGDataXferStart(USHORT p_port, PSCCB pcurrSCCB)
-#else
-void busMstrSGDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
-#endif
+static void FPT_busMstrSGDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
 {
    ULONG count,addr,tmpSGCnt;
    UINT sg_index;
    UCHAR sg_count, i;
-#if defined(DOS)
-   USHORT reg_offset;
-#else
    ULONG reg_offset;
-#endif
 
 
    if (pcurrSCCB->Sccb_XferState & F_HOST_XFER_DIR) {
@@ -8802,17 +5594,6 @@ void busMstrSGDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
    while ((sg_count < (UCHAR)SG_BUF_CNT) &&
       ((ULONG)(sg_index * (UINT)SG_ELEMENT_SIZE) < pcurrSCCB->DataLength) ) {
 
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-      tmpSGCnt += *(((ULONG far *)pcurrSCCB->DataPointer)+
-         (sg_index * 2));
-
-      count |= *(((ULONG far *)pcurrSCCB->DataPointer)+
-         (sg_index * 2));
-
-      addr = *(((ULONG far *)pcurrSCCB->DataPointer)+
-         ((sg_index * 2) + 1));
-
-#else
       tmpSGCnt += *(((ULONG *)pcurrSCCB->DataPointer)+
          (sg_index * 2));
 
@@ -8821,7 +5602,6 @@ void busMstrSGDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
 
       addr = *(((ULONG *)pcurrSCCB->DataPointer)+
          ((sg_index * 2) + 1));
-#endif
 
 
       if ((!sg_count) && (pcurrSCCB->Sccb_SGoffset)) {
@@ -8888,11 +5668,7 @@ void busMstrSGDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
  * Description: 
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void busMstrDataXferStart(USHORT p_port, PSCCB pcurrSCCB)
-#else
-void busMstrDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
-#endif
+static void FPT_busMstrDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
 {
    ULONG addr,count;
 
@@ -8909,37 +5685,7 @@ void busMstrDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
 
       }
 
-#if defined(DOS)
-   asm { mov dx,p_port;
-         mov ax,word ptr count;
-         add dx,hp_xfer_cnt_lo;
-         out dx,al;
-         inc dx;
-         xchg ah,al
-         out dx,al;
-         inc dx;
-         mov ax,word ptr count+2;
-         out dx,al;
-         inc dx;
-         inc dx;
-         mov ax,word ptr addr;
-         out dx,al;
-         inc dx;
-         xchg ah,al
-         out dx,al;
-         inc dx;
-         mov ax,word ptr addr+2;
-         out dx,al;
-         inc dx;
-         xchg ah,al
-         out dx,al;
-         }
-
-   WR_HARP32(p_port,hp_xfercnt_0,count);
-
-#else
    HP_SETUP_ADDR_CNT(p_port,addr,count);
-#endif
 
 
    if (pcurrSCCB->Sccb_XferState & F_HOST_XFER_DIR) {
@@ -8975,11 +5721,7 @@ void busMstrDataXferStart(ULONG p_port, PSCCB pcurrSCCB)
  *               command busy is also time out, it'll just give up.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-UCHAR busMstrTimeOut(USHORT p_port)
-#else
-UCHAR busMstrTimeOut(ULONG p_port)
-#endif
+static UCHAR FPT_busMstrTimeOut(ULONG p_port)
 {
    ULONG timeout;
 
@@ -9001,11 +5743,11 @@ UCHAR busMstrTimeOut(ULONG p_port)
    RD_HARPOON(p_port+hp_int_status);           /*Clear command complete */
 
    if (RD_HARPOON(p_port+hp_ext_status) & BM_CMD_BUSY) {
-      return(TRUE);
+      return(1);
       }
 
    else {
-      return(FALSE);
+      return(0);
       }
 }
 
@@ -9017,18 +5759,14 @@ UCHAR busMstrTimeOut(ULONG p_port)
  * Description: Abort any in progress transfer.
  *
  *---------------------------------------------------------------------*/
-#if defined(DOS)
-void hostDataXferAbort(USHORT port, UCHAR p_card, PSCCB pCurrSCCB)
-#else
-void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
-#endif
+static void FPT_hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 {
 
    ULONG timeout;
    ULONG remain_cnt;
    UINT sg_ptr;
 
-   BL_Card[p_card].globalFlags &= ~F_HOST_XFER_ACT;
+   FPT_BL_Card[p_card].globalFlags &= ~F_HOST_XFER_ACT;
 
    if (pCurrSCCB->Sccb_XferState & F_AUTO_SENSE) {
 
@@ -9044,7 +5782,7 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 
          if (RD_HARPOON(port+hp_ext_status) & BM_CMD_BUSY) {
 
-            if (busMstrTimeOut(port)) {
+            if (FPT_busMstrTimeOut(port)) {
 
                if (pCurrSCCB->HostStatus == 0x00)
 
@@ -9060,10 +5798,6 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 
                      {
                      pCurrSCCB->HostStatus = SCCB_BM_ERR;
-#if defined(BUGBUG)
-                     WR_HARPOON(port+hp_dual_addr_lo,
-                        RD_HARPOON(port+hp_ext_status));
-#endif
                      }
             }
          }
@@ -9092,22 +5826,12 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 
             sg_ptr--;
 
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-            if (remain_cnt > (ULONG)(*(((ULONG far *)pCurrSCCB->
-               DataPointer) + (sg_ptr * 2)))) {
-
-               remain_cnt -= (ULONG)(*(((ULONG far *)pCurrSCCB->
-                  DataPointer) + (sg_ptr * 2)));
-               }
-
-#else
             if (remain_cnt > (ULONG)(*(((ULONG *)pCurrSCCB->
                DataPointer) + (sg_ptr * 2)))) {
 
                remain_cnt -= (ULONG)(*(((ULONG *)pCurrSCCB->
                   DataPointer) + (sg_ptr * 2)));
                }
-#endif
 
             else {
 
@@ -9147,7 +5871,7 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
 
          if (RD_HARPOON(port+hp_ext_status) & BM_CMD_BUSY) {
 
-            busMstrTimeOut(port);
+            FPT_busMstrTimeOut(port);
             }
 
          else {
@@ -9159,10 +5883,6 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                   if (pCurrSCCB->HostStatus == 0x00) {
 
                      pCurrSCCB->HostStatus = SCCB_BM_ERR;
-#if defined(BUGBUG)
-                     WR_HARPOON(port+hp_dual_addr_lo,
-                        RD_HARPOON(port+hp_ext_status));
-#endif
                      }
                   }
                }
@@ -9203,7 +5923,7 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                   pCurrSCCB->HostStatus = SCCB_BM_ERR;
                   }
 
-               busMstrTimeOut(port);
+               FPT_busMstrTimeOut(port);
                }
             }
 
@@ -9214,10 +5934,6 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                if (pCurrSCCB->HostStatus == 0x00) {
 
                   pCurrSCCB->HostStatus = SCCB_BM_ERR;
-#if defined(BUGBUG)
-                  WR_HARPOON(port+hp_dual_addr_lo,
-                     RD_HARPOON(port+hp_ext_status));
-#endif
                   }
                }
             }
@@ -9241,7 +5957,7 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
                pCurrSCCB->HostStatus = SCCB_BM_ERR;
                }
 
-            busMstrTimeOut(port);
+            FPT_busMstrTimeOut(port);
             }
          }
 
@@ -9253,10 +5969,6 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
             if (pCurrSCCB->HostStatus == 0x00) {
 
                pCurrSCCB->HostStatus = SCCB_BM_ERR;
-#if defined(BUGBUG)
-               WR_HARPOON(port+hp_dual_addr_lo,
-                  RD_HARPOON(port+hp_ext_status));
-#endif
                }
             }
 
@@ -9305,15 +6017,11 @@ void hostDataXferAbort(ULONG port, UCHAR p_card, PSCCB pCurrSCCB)
  *              pointers message.
  *
  *---------------------------------------------------------------------*/
-void hostDataXferRestart(PSCCB currSCCB)
+static void FPT_hostDataXferRestart(PSCCB currSCCB)
 {
    ULONG data_count;
    UINT  sg_index;
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-   ULONG far *sg_ptr;
-#else
    ULONG *sg_ptr;
-#endif
 
    if (currSCCB->Sccb_XferState & F_SG_XFER) {
 
@@ -9322,11 +6030,7 @@ void hostDataXferRestart(PSCCB currSCCB)
       sg_index = 0xffff;         /*Index by long words into sg list. */
       data_count = 0;            /*Running count of SG xfer counts. */
 
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-      sg_ptr = (ULONG far *)currSCCB->DataPointer;
-#else
       sg_ptr = (ULONG *)currSCCB->DataPointer;
-#endif
 
       while (data_count < currSCCB->Sccb_ATC) {
 
@@ -9351,78 +6055,28 @@ void hostDataXferRestart(PSCCB currSCCB)
       currSCCB->Sccb_XferCnt = currSCCB->DataLength - currSCCB->Sccb_ATC;
       }
 }
-#ident "$Id: scam.c 1.17 1997/03/20 23:49:37 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   scam.c  $
- *
- *   Description:  Functions relating to handling of the SCAM selection
- *                 and the determination of the SCSI IDs to be assigned
- *                 to all perspective SCSI targets.
- *
- *   $Date: 1997/03/20 23:49:37 $
- *
- *   $Revision: 1.17 $
- *
- *----------------------------------------------------------------------*/
 
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
 
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <eeprom.h>*/
-/*#include <harpoon.h>*/
 
-
-
-/*
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBSCAM_INFO scamInfo[MAX_SCSI_TAR];
-extern NVRAMINFO nvRamInfo[MAX_MB_CARDS];
-#if defined(DOS) || defined(OS2)
-extern UCHAR temp_id_string[ID_STRING_LENGTH];
-#endif
-extern UCHAR scamHAString[];
-*/
 /*---------------------------------------------------------------------
  *
- * Function: scini
+ * Function: FPT_scini
  *
  * Description: Setup all data structures necessary for SCAM selection.
  *
  *---------------------------------------------------------------------*/
 
-void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
+static void FPT_scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
 {
 
-#if defined(SCAM_LEV_2)
    UCHAR loser,assigned_id;
-#endif
-#if defined(DOS)
-
-   USHORT p_port;
-#else
    ULONG p_port;
-#endif
 
    UCHAR i,k,ScamFlg ;
    PSCCBcard currCard;
         PNVRamInfo pCurrNvRam;
 
-   currCard = &BL_Card[p_card];
+   currCard = &FPT_BL_Card[p_card];
    p_port = currCard->ioPort;
         pCurrNvRam = currCard->pNvRamInfo;
 
@@ -9432,72 +6086,68 @@ void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
                 i = pCurrNvRam->niSysConf;
         }
         else{
-           ScamFlg = (UCHAR) utilEERead(p_port, SCAM_CONFIG/2);
-           i = (UCHAR)(utilEERead(p_port, (SYSTEM_CONFIG/2)));
+           ScamFlg = (UCHAR) FPT_utilEERead(p_port, SCAM_CONFIG/2);
+           i = (UCHAR)(FPT_utilEERead(p_port, (SYSTEM_CONFIG/2)));
         }
         if(!(i & 0x02)) /* check if reset bus in AutoSCSI parameter set */
                 return;
 
-   inisci(p_card,p_port, p_our_id);
+   FPT_inisci(p_card,p_port, p_our_id);
 
    /* Force to wait 1 sec after SCSI bus reset. Some SCAM device FW
       too slow to return to SCAM selection */
 
    /* if (p_power_up)
-         Wait1Second(p_port);
+         FPT_Wait1Second(p_port);
       else
-         Wait(p_port, TO_250ms); */
-
-   Wait1Second(p_port);
+         FPT_Wait(p_port, TO_250ms); */
 
-#if defined(SCAM_LEV_2)
+   FPT_Wait1Second(p_port);
 
    if ((ScamFlg & SCAM_ENABLED) && (ScamFlg & SCAM_LEVEL2))
       {
-      while (!(scarb(p_port,INIT_SELTD))) {}
+      while (!(FPT_scarb(p_port,INIT_SELTD))) {}
 
-      scsel(p_port);
+      FPT_scsel(p_port);
 
       do {
-         scxferc(p_port,SYNC_PTRN);
-         scxferc(p_port,DOM_MSTR);
-         loser = scsendi(p_port,&scamInfo[p_our_id].id_string[0]);
+         FPT_scxferc(p_port,SYNC_PTRN);
+         FPT_scxferc(p_port,DOM_MSTR);
+         loser = FPT_scsendi(p_port,&FPT_scamInfo[p_our_id].id_string[0]);
          } while ( loser == 0xFF );
 
-      scbusf(p_port);
+      FPT_scbusf(p_port);
 
       if ((p_power_up) && (!loser))
          {
-         sresb(p_port,p_card);
-         Wait(p_port, TO_250ms);
+         FPT_sresb(p_port,p_card);
+         FPT_Wait(p_port, TO_250ms);
 
-         while (!(scarb(p_port,INIT_SELTD))) {}
+         while (!(FPT_scarb(p_port,INIT_SELTD))) {}
 
-         scsel(p_port);
+         FPT_scsel(p_port);
 
          do {
-            scxferc(p_port, SYNC_PTRN);
-            scxferc(p_port, DOM_MSTR);
-            loser = scsendi(p_port,&scamInfo[p_our_id].
+            FPT_scxferc(p_port, SYNC_PTRN);
+            FPT_scxferc(p_port, DOM_MSTR);
+            loser = FPT_scsendi(p_port,&FPT_scamInfo[p_our_id].
                id_string[0]);
             } while ( loser == 0xFF );
 
-         scbusf(p_port);
+         FPT_scbusf(p_port);
          }
       }
 
    else
       {
-      loser = FALSE;
+      loser = 0;
       }
 
 
    if (!loser)
       {
 
-#endif  /* SCAM_LEV_2 */
-
-      scamInfo[p_our_id].state = ID_ASSIGNED;
+      FPT_scamInfo[p_our_id].state = ID_ASSIGNED;
 
 
                 if (ScamFlg & SCAM_ENABLED)
@@ -9505,18 +6155,18 @@ void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
 
               for (i=0; i < MAX_SCSI_TAR; i++)
                    {
-           if ((scamInfo[i].state == ID_UNASSIGNED) ||
-                   (scamInfo[i].state == ID_UNUSED))
+           if ((FPT_scamInfo[i].state == ID_UNASSIGNED) ||
+                   (FPT_scamInfo[i].state == ID_UNUSED))
                       {
-                   if (scsell(p_port,i))
+                   if (FPT_scsell(p_port,i))
                    {
-                   scamInfo[i].state = LEGACY;
-                        if ((scamInfo[i].id_string[0] != 0xFF) ||
-                        (scamInfo[i].id_string[1] != 0xFA))
+                   FPT_scamInfo[i].state = LEGACY;
+                        if ((FPT_scamInfo[i].id_string[0] != 0xFF) ||
+                        (FPT_scamInfo[i].id_string[1] != 0xFA))
                          {
 
-                              scamInfo[i].id_string[0] = 0xFF;
-                           scamInfo[i].id_string[1] = 0xFA;
+                              FPT_scamInfo[i].id_string[0] = 0xFF;
+                           FPT_scamInfo[i].id_string[1] = 0xFA;
                                                         if(pCurrNvRam == NULL)
                                  currCard->globalFlags |= F_UPDATE_EEPROM;
                 }
@@ -9524,45 +6174,43 @@ void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
                    }
         }
 
-              sresb(p_port,p_card);
-        Wait1Second(p_port);
-         while (!(scarb(p_port,INIT_SELTD))) {}
-         scsel(p_port);
-         scasid(p_card, p_port);
+              FPT_sresb(p_port,p_card);
+        FPT_Wait1Second(p_port);
+         while (!(FPT_scarb(p_port,INIT_SELTD))) {}
+         FPT_scsel(p_port);
+         FPT_scasid(p_card, p_port);
          }
 
-#if defined(SCAM_LEV_2)
-
       }
 
    else if ((loser) && (ScamFlg & SCAM_ENABLED))
       {
-      scamInfo[p_our_id].id_string[0] = SLV_TYPE_CODE0;
-      assigned_id = FALSE;
-      scwtsel(p_port);
+      FPT_scamInfo[p_our_id].id_string[0] = SLV_TYPE_CODE0;
+      assigned_id = 0;
+      FPT_scwtsel(p_port);
 
       do {
-         while (scxferc(p_port,0x00) != SYNC_PTRN) {}
+         while (FPT_scxferc(p_port,0x00) != SYNC_PTRN) {}
 
-         i = scxferc(p_port,0x00);
+         i = FPT_scxferc(p_port,0x00);
          if (i == ASSIGN_ID)
             {
-            if (!(scsendi(p_port,&scamInfo[p_our_id].id_string[0])))
+            if (!(FPT_scsendi(p_port,&FPT_scamInfo[p_our_id].id_string[0])))
                   {
-                  i = scxferc(p_port,0x00);
-                  if (scvalq(i))
+                  i = FPT_scxferc(p_port,0x00);
+                  if (FPT_scvalq(i))
                      {
-                     k = scxferc(p_port,0x00);
+                     k = FPT_scxferc(p_port,0x00);
 
-                     if (scvalq(k))
+                     if (FPT_scvalq(k))
                         {
                         currCard->ourId =
                            ((UCHAR)(i<<3)+(k & (UCHAR)7)) & (UCHAR) 0x3F;
-                        inisci(p_card, p_port, p_our_id);
-                        scamInfo[currCard->ourId].state = ID_ASSIGNED;
-                        scamInfo[currCard->ourId].id_string[0]
+                        FPT_inisci(p_card, p_port, p_our_id);
+                        FPT_scamInfo[currCard->ourId].state = ID_ASSIGNED;
+                        FPT_scamInfo[currCard->ourId].id_string[0]
                            = SLV_TYPE_CODE0;
-                        assigned_id = TRUE;
+                        assigned_id = 1;
                         }
                      }
                   }
@@ -9570,43 +6218,31 @@ void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
 
          else if (i == SET_P_FLAG)
             {
-               if (!(scsendi(p_port,
-                        &scamInfo[p_our_id].id_string[0])))
-                        scamInfo[p_our_id].id_string[0] |= 0x80;
+               if (!(FPT_scsendi(p_port,
+                        &FPT_scamInfo[p_our_id].id_string[0])))
+                        FPT_scamInfo[p_our_id].id_string[0] |= 0x80;
             }
          }while (!assigned_id);
 
-      while (scxferc(p_port,0x00) != CFG_CMPLT) {}
+      while (FPT_scxferc(p_port,0x00) != CFG_CMPLT) {}
       }
 
-#endif   /* SCAM_LEV_2 */
    if (ScamFlg & SCAM_ENABLED)
       {
-      scbusf(p_port);
+      FPT_scbusf(p_port);
       if (currCard->globalFlags & F_UPDATE_EEPROM)
          {
-         scsavdi(p_card, p_port);
+         FPT_scsavdi(p_card, p_port);
          currCard->globalFlags &= ~F_UPDATE_EEPROM;
          }
       }
 
 
-#if defined(DOS)
-   for (i=0; i < MAX_SCSI_TAR; i++)
-   {
-        if (((ScamFlg & SCAM_ENABLED) && (scamInfo[i].state == LEGACY))
-                        || (i != p_our_id))
-                {
-         scsellDOS(p_port,i);
-              }
-        }
-#endif
-
 /*
    for (i=0,k=0; i < MAX_SCSI_TAR; i++)
       {
-      if ((scamInfo[i].state == ID_ASSIGNED) ||
-         (scamInfo[i].state == LEGACY))
+      if ((FPT_scamInfo[i].state == ID_ASSIGNED) ||
+         (FPT_scamInfo[i].state == LEGACY))
          k++;
       }
 
@@ -9620,17 +6256,13 @@ void scini(UCHAR p_card, UCHAR p_our_id, UCHAR p_power_up)
 
 /*---------------------------------------------------------------------
  *
- * Function: scarb
+ * Function: FPT_scarb
  *
  * Description: Gain control of the bus and wait SCAM select time (250ms)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-int scarb(USHORT p_port, UCHAR p_sel_type)
-#else
-int scarb(ULONG p_port, UCHAR p_sel_type)
-#endif
+static int FPT_scarb(ULONG p_port, UCHAR p_sel_type)
 {
    if (p_sel_type == INIT_SELTD)
       {
@@ -9639,10 +6271,10 @@ int scarb(ULONG p_port, UCHAR p_sel_type)
 
 
       if (RD_HARPOON(p_port+hp_scsisig) & SCSI_SEL)
-         return(FALSE);
+         return(0);
 
       if (RD_HARPOON(p_port+hp_scsidata_0) != 00)
-         return(FALSE);
+         return(0);
 
       WR_HARPOON(p_port+hp_scsisig, (RD_HARPOON(p_port+hp_scsisig) | SCSI_BSY));
 
@@ -9650,7 +6282,7 @@ int scarb(ULONG p_port, UCHAR p_sel_type)
 
          WR_HARPOON(p_port+hp_scsisig, (RD_HARPOON(p_port+hp_scsisig) &
             ~SCSI_BSY));
-         return(FALSE);
+         return(0);
          }
 
 
@@ -9660,7 +6292,7 @@ int scarb(ULONG p_port, UCHAR p_sel_type)
 
          WR_HARPOON(p_port+hp_scsisig, (RD_HARPOON(p_port+hp_scsisig) &
             ~(SCSI_BSY | SCSI_SEL)));
-         return(FALSE);
+         return(0);
          }
       }
 
@@ -9669,9 +6301,7 @@ int scarb(ULONG p_port, UCHAR p_sel_type)
       & ~ACTdeassert));
    WR_HARPOON(p_port+hp_scsireset, SCAM_EN);
    WR_HARPOON(p_port+hp_scsidata_0, 0x00);
-#if defined(WIDE_SCSI)
    WR_HARPOON(p_port+hp_scsidata_1, 0x00);
-#endif
    WR_HARPOON(p_port+hp_portctrl_0, SCSI_BUS_EN);
 
    WR_HARPOON(p_port+hp_scsisig, (RD_HARPOON(p_port+hp_scsisig) | SCSI_MSG));
@@ -9679,25 +6309,21 @@ int scarb(ULONG p_port, UCHAR p_sel_type)
    WR_HARPOON(p_port+hp_scsisig, (RD_HARPOON(p_port+hp_scsisig)
       & ~SCSI_BSY));
 
-   Wait(p_port,TO_250ms);
+   FPT_Wait(p_port,TO_250ms);
 
-   return(TRUE);
+   return(1);
 }
 
 
 /*---------------------------------------------------------------------
  *
- * Function: scbusf
+ * Function: FPT_scbusf
  *
  * Description: Release the SCSI bus and disable SCAM selection.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scbusf(USHORT p_port)
-#else
-void scbusf(ULONG p_port)
-#endif
+static void FPT_scbusf(ULONG p_port)
 {
    WR_HARPOON(p_port+hp_page_ctrl,
       (RD_HARPOON(p_port+hp_page_ctrl) | G_INT_DISABLE));
@@ -9717,11 +6343,7 @@ void scbusf(ULONG p_port)
    WR_HARPOON(p_port+hp_clkctrl_0, (RD_HARPOON(p_port+hp_clkctrl_0)
       | ACTdeassert));
 
-#if defined(SCAM_LEV_2)
    WRW_HARPOON((p_port+hp_intstat), (BUS_FREE | AUTO_INT | SCAM_SEL));
-#else
-   WRW_HARPOON((p_port+hp_intstat), (BUS_FREE | AUTO_INT));
-#endif
 
    WR_HARPOON(p_port+hp_page_ctrl,
       (RD_HARPOON(p_port+hp_page_ctrl) & ~G_INT_DISABLE));
@@ -9731,35 +6353,24 @@ void scbusf(ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: scasid
+ * Function: FPT_scasid
  *
  * Description: Assign an ID to all the SCAM devices.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scasid(UCHAR p_card, USHORT p_port)
-#else
-void scasid(UCHAR p_card, ULONG p_port)
-#endif
+static void FPT_scasid(UCHAR p_card, ULONG p_port)
 {
-#if defined(DOS) || defined(OS2)
-   /* Use external defined in global space area, instead of Stack
-      space. WIN/95 DOS doesnot work TINY mode. The OS doesnot intialize
-      SS equal to DS. Thus the array allocated on stack doesnot get
-      access correctly */
-#else
    UCHAR temp_id_string[ID_STRING_LENGTH];
-#endif
 
    UCHAR i,k,scam_id;
         UCHAR crcBytes[3];
         PNVRamInfo pCurrNvRam;
         ushort_ptr pCrcBytes;
 
-        pCurrNvRam = BL_Card[p_card].pNvRamInfo;
+        pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
 
-   i=FALSE;
+   i=0;
 
    while (!i)
       {
@@ -9769,36 +6380,36 @@ void scasid(UCHAR p_card, ULONG p_port)
          temp_id_string[k] = (UCHAR) 0x00;
          }
 
-      scxferc(p_port,SYNC_PTRN);
-      scxferc(p_port,ASSIGN_ID);
+      FPT_scxferc(p_port,SYNC_PTRN);
+      FPT_scxferc(p_port,ASSIGN_ID);
 
-      if (!(sciso(p_port,&temp_id_string[0])))
+      if (!(FPT_sciso(p_port,&temp_id_string[0])))
          {
                         if(pCurrNvRam){
                                 pCrcBytes = (ushort_ptr)&crcBytes[0];
-                                *pCrcBytes = CalcCrc16(&temp_id_string[0]);
-                                crcBytes[2] = CalcLrc(&temp_id_string[0]);
+                                *pCrcBytes = FPT_CalcCrc16(&temp_id_string[0]);
+                                crcBytes[2] = FPT_CalcLrc(&temp_id_string[0]);
                                 temp_id_string[1] = crcBytes[2];
                                 temp_id_string[2] = crcBytes[0];
                                 temp_id_string[3] = crcBytes[1];
                                 for(k = 4; k < ID_STRING_LENGTH; k++)
                                         temp_id_string[k] = (UCHAR) 0x00;
                         }
-         i = scmachid(p_card,temp_id_string);
+         i = FPT_scmachid(p_card,temp_id_string);
 
          if (i == CLR_PRIORITY)
             {
-            scxferc(p_port,MISC_CODE);
-            scxferc(p_port,CLR_P_FLAG);
-            i = FALSE;  /*Not the last ID yet. */
+            FPT_scxferc(p_port,MISC_CODE);
+            FPT_scxferc(p_port,CLR_P_FLAG);
+            i = 0;  /*Not the last ID yet. */
             }
 
          else if (i != NO_ID_AVAIL)
             {
             if (i < 8 )
-               scxferc(p_port,ID_0_7);
+               FPT_scxferc(p_port,ID_0_7);
             else
-               scxferc(p_port,ID_8_F);
+               FPT_scxferc(p_port,ID_8_F);
 
             scam_id = (i & (UCHAR) 0x07);
 
@@ -9807,21 +6418,21 @@ void scasid(UCHAR p_card, ULONG p_port)
                if (!( k & i ))
                   scam_id += 0x08;        /*Count number of zeros in DB0-3. */
 
-            scxferc(p_port,scam_id);
+            FPT_scxferc(p_port,scam_id);
 
-            i = FALSE;  /*Not the last ID yet. */
+            i = 0;  /*Not the last ID yet. */
             }
          }
 
       else
          {
-         i = TRUE;
+         i = 1;
          }
 
       }  /*End while */
 
-   scxferc(p_port,SYNC_PTRN);
-   scxferc(p_port,CFG_CMPLT);
+   FPT_scxferc(p_port,SYNC_PTRN);
+   FPT_scxferc(p_port,CFG_CMPLT);
 }
 
 
@@ -9830,21 +6441,17 @@ void scasid(UCHAR p_card, ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: scsel
+ * Function: FPT_scsel
  *
  * Description: Select all the SCAM devices.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scsel(USHORT p_port)
-#else
-void scsel(ULONG p_port)
-#endif
+static void FPT_scsel(ULONG p_port)
 {
 
    WR_HARPOON(p_port+hp_scsisig, SCSI_SEL);
-   scwiros(p_port, SCSI_MSG);
+   FPT_scwiros(p_port, SCSI_MSG);
 
    WR_HARPOON(p_port+hp_scsisig, (SCSI_SEL | SCSI_BSY));
 
@@ -9855,11 +6462,11 @@ void scsel(ULONG p_port)
 
 
    WR_HARPOON(p_port+hp_scsisig, (SCSI_BSY | SCSI_IOBIT | SCSI_CD));
-   scwiros(p_port, SCSI_SEL);
+   FPT_scwiros(p_port, SCSI_SEL);
 
    WR_HARPOON(p_port+hp_scsidata_0, (UCHAR)(RD_HARPOON(p_port+hp_scsidata_0) &
       ~(UCHAR)BIT(6)));
-   scwirod(p_port, BIT(6));
+   FPT_scwirod(p_port, BIT(6));
 
    WR_HARPOON(p_port+hp_scsisig, (SCSI_SEL | SCSI_BSY | SCSI_IOBIT | SCSI_CD));
 }
@@ -9868,17 +6475,13 @@ void scsel(ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: scxferc
+ * Function: FPT_scxferc
  *
  * Description: Handshake the p_data (DB4-0) across the bus.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR scxferc(USHORT p_port, UCHAR p_data)
-#else
-UCHAR scxferc(ULONG p_port, UCHAR p_data)
-#endif
+static UCHAR FPT_scxferc(ULONG p_port, UCHAR p_data)
 {
    UCHAR curr_data, ret_data;
 
@@ -9890,7 +6493,7 @@ UCHAR scxferc(ULONG p_port, UCHAR p_data)
 
    WR_HARPOON(p_port+hp_scsidata_0, curr_data);
 
-   scwirod(p_port,BIT(7));              /*Wait for DB7 to be released. */
+   FPT_scwirod(p_port,BIT(7));              /*Wait for DB7 to be released. */
         while (!(RD_HARPOON(p_port+hp_scsidata_0) & BIT(5)));
 
    ret_data = (RD_HARPOON(p_port+hp_scsidata_0) & (UCHAR) 0x1F);
@@ -9903,7 +6506,7 @@ UCHAR scxferc(ULONG p_port, UCHAR p_data)
 
    WR_HARPOON(p_port+hp_scsidata_0, curr_data);
 
-   scwirod(p_port,BIT(5));              /*Wait for DB5 to be released. */
+   FPT_scwirod(p_port,BIT(5));              /*Wait for DB5 to be released. */
 
    curr_data &= ~(BIT(4)|BIT(3)|BIT(2)|BIT(1)|BIT(0)); /*Release data bits */
    curr_data |= BIT(7);
@@ -9914,7 +6517,7 @@ UCHAR scxferc(ULONG p_port, UCHAR p_data)
 
    WR_HARPOON(p_port+hp_scsidata_0, curr_data);
 
-   scwirod(p_port,BIT(6));              /*Wait for DB6 to be released. */
+   FPT_scwirod(p_port,BIT(6));              /*Wait for DB6 to be released. */
 
    return(ret_data);
 }
@@ -9922,39 +6525,35 @@ UCHAR scxferc(ULONG p_port, UCHAR p_data)
 
 /*---------------------------------------------------------------------
  *
- * Function: scsendi
+ * Function: FPT_scsendi
  *
  * Description: Transfer our Identification string to determine if we
  *              will be the dominant master.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR scsendi(USHORT p_port, UCHAR p_id_string[])
-#else
-UCHAR scsendi(ULONG p_port, UCHAR p_id_string[])
-#endif
+static UCHAR FPT_scsendi(ULONG p_port, UCHAR p_id_string[])
 {
    UCHAR ret_data,byte_cnt,bit_cnt,defer;
 
-   defer = FALSE;
+   defer = 0;
 
    for (byte_cnt = 0; byte_cnt < ID_STRING_LENGTH; byte_cnt++) {
 
       for (bit_cnt = 0x80; bit_cnt != 0 ; bit_cnt >>= 1) {
 
          if (defer)
-            ret_data = scxferc(p_port,00);
+            ret_data = FPT_scxferc(p_port,00);
 
          else if (p_id_string[byte_cnt] & bit_cnt)
 
-               ret_data = scxferc(p_port,02);
+               ret_data = FPT_scxferc(p_port,02);
 
             else {
 
-               ret_data = scxferc(p_port,01);
+               ret_data = FPT_scxferc(p_port,01);
                if (ret_data & 02)
-                  defer = TRUE;
+                  defer = 1;
                }
 
          if ((ret_data & 0x1C) == 0x10)
@@ -9980,17 +6579,13 @@ UCHAR scsendi(ULONG p_port, UCHAR p_id_string[])
 
 /*---------------------------------------------------------------------
  *
- * Function: sciso
+ * Function: FPT_sciso
  *
  * Description: Transfer the Identification string.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR sciso(USHORT p_port, UCHAR p_id_string[])
-#else
-UCHAR sciso(ULONG p_port, UCHAR p_id_string[])
-#endif
+static UCHAR FPT_sciso(ULONG p_port, UCHAR p_id_string[])
 {
    UCHAR ret_data,the_data,byte_cnt,bit_cnt;
 
@@ -10000,7 +6595,7 @@ UCHAR sciso(ULONG p_port, UCHAR p_id_string[])
 
       for (bit_cnt = 0; bit_cnt < 8; bit_cnt++) {
 
-         ret_data = scxferc(p_port,0);
+         ret_data = FPT_scxferc(p_port,0);
 
          if (ret_data & 0xFC)
             return(0xFF);
@@ -10020,8 +6615,8 @@ UCHAR sciso(ULONG p_port, UCHAR p_id_string[])
                                 {
                                         byte_cnt = 0;
                                         bit_cnt = 0;
-                                        scxferc(p_port, SYNC_PTRN);
-                                        scxferc(p_port, ASSIGN_ID);
+                                        FPT_scxferc(p_port, SYNC_PTRN);
+                                        FPT_scxferc(p_port, ASSIGN_ID);
                                         continue;
                                 }
 */
@@ -10044,18 +6639,14 @@ UCHAR sciso(ULONG p_port, UCHAR p_id_string[])
 
 /*---------------------------------------------------------------------
  *
- * Function: scwirod
+ * Function: FPT_scwirod
  *
  * Description: Sample the SCSI data bus making sure the signal has been
  *              deasserted for the correct number of consecutive samples.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scwirod(USHORT p_port, UCHAR p_data_bit)
-#else
-void scwirod(ULONG p_port, UCHAR p_data_bit)
-#endif
+static void FPT_scwirod(ULONG p_port, UCHAR p_data_bit)
 {
    UCHAR i;
 
@@ -10077,18 +6668,14 @@ void scwirod(ULONG p_port, UCHAR p_data_bit)
 
 /*---------------------------------------------------------------------
  *
- * Function: scwiros
+ * Function: FPT_scwiros
  *
  * Description: Sample the SCSI Signal lines making sure the signal has been
  *              deasserted for the correct number of consecutive samples.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scwiros(USHORT p_port, UCHAR p_data_bit)
-#else
-void scwiros(ULONG p_port, UCHAR p_data_bit)
-#endif
+static void FPT_scwiros(ULONG p_port, UCHAR p_data_bit)
 {
    UCHAR i;
 
@@ -10109,13 +6696,13 @@ void scwiros(ULONG p_port, UCHAR p_data_bit)
 
 /*---------------------------------------------------------------------
  *
- * Function: scvalq
+ * Function: FPT_scvalq
  *
  * Description: Make sure we received a valid data byte.
  *
  *---------------------------------------------------------------------*/
 
-UCHAR scvalq(UCHAR p_quintet)
+static UCHAR FPT_scvalq(UCHAR p_quintet)
 {
    UCHAR count;
 
@@ -10125,16 +6712,16 @@ UCHAR scvalq(UCHAR p_quintet)
       }
 
    if (p_quintet & 0x18)
-      return(FALSE);
+      return(0);
 
    else
-      return(TRUE);
+      return(1);
 }
 
 
 /*---------------------------------------------------------------------
  *
- * Function: scsell
+ * Function: FPT_scsell
  *
  * Description: Select the specified device ID using a selection timeout
  *              less than 4ms.  If somebody responds then it is a legacy
@@ -10142,17 +6729,9 @@ UCHAR scvalq(UCHAR p_quintet)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-UCHAR scsell(USHORT p_port, UCHAR targ_id)
-#else
-UCHAR scsell(ULONG p_port, UCHAR targ_id)
-#endif
+static UCHAR FPT_scsell(ULONG p_port, UCHAR targ_id)
 {
-#if defined(DOS)
-   USHORT i;
-#else
    ULONG i;
-#endif
 
    WR_HARPOON(p_port+hp_page_ctrl,
       (RD_HARPOON(p_port+hp_page_ctrl) | G_INT_DISABLE));
@@ -10182,7 +6761,7 @@ UCHAR scsell(ULONG p_port, UCHAR targ_id)
             (RESET | PROG_HLT | TIMEOUT | AUTO_INT))) {}
 
    if (RDW_HARPOON((p_port+hp_intstat)) & RESET)
-         Wait(p_port, TO_250ms);
+         FPT_Wait(p_port, TO_250ms);
 
    DISABLE_AUTO(p_port);
 
@@ -10199,7 +6778,7 @@ UCHAR scsell(ULONG p_port, UCHAR targ_id)
       WR_HARPOON(p_port+hp_page_ctrl,
          (RD_HARPOON(p_port+hp_page_ctrl) & ~G_INT_DISABLE));
 
-      return(FALSE);  /*No legacy device */
+      return(0);  /*No legacy device */
       }
 
    else {
@@ -10217,108 +6796,19 @@ UCHAR scsell(ULONG p_port, UCHAR targ_id)
       WR_HARPOON(p_port+hp_page_ctrl,
          (RD_HARPOON(p_port+hp_page_ctrl) & ~G_INT_DISABLE));
 
-      return(TRUE);  /*Found one of them oldies! */
+      return(1);  /*Found one of them oldies! */
       }
 }
 
-#if defined(DOS)
 /*---------------------------------------------------------------------
  *
- * Function: scsell for DOS
- *
- * Description: Select the specified device ID using a selection timeout
- *              less than 2ms.  This was specially required to solve
- *              the problem with Plextor 12X CD-ROM drive. This drive
- *                                       was responding the Selection at the end of 4ms and 
- *                                       hanging the system.
- *
- *---------------------------------------------------------------------*/
-
-UCHAR scsellDOS(USHORT p_port, UCHAR targ_id)
-{
-   USHORT i;
-
-   WR_HARPOON(p_port+hp_page_ctrl,
-      (RD_HARPOON(p_port+hp_page_ctrl) | G_INT_DISABLE));
-
-   ARAM_ACCESS(p_port);
-
-   WR_HARPOON(p_port+hp_addstat,(RD_HARPOON(p_port+hp_addstat) | SCAM_TIMER));
-   WR_HARPOON(p_port+hp_seltimeout,TO_2ms);
-
-
-   for (i = p_port+CMD_STRT; i < p_port+CMD_STRT+12; i+=2) {
-      WRW_HARPOON(i, (MPM_OP+ACOMMAND));
-      }
-   WRW_HARPOON(i, (BRH_OP+ALWAYS+    NP));
-
-   WRW_HARPOON((p_port+hp_intstat),
-               (RESET | TIMEOUT | SEL | BUS_FREE | AUTO_INT));
-
-   WR_HARPOON(p_port+hp_select_id, targ_id);
-
-   WR_HARPOON(p_port+hp_portctrl_0, SCSI_PORT);
-   WR_HARPOON(p_port+hp_autostart_3, (SELECT | CMD_ONLY_STRT));
-   WR_HARPOON(p_port+hp_scsictrl_0, (SEL_TAR | ENA_RESEL));
-
-
-   while (!(RDW_HARPOON((p_port+hp_intstat)) &
-            (RESET | PROG_HLT | TIMEOUT | AUTO_INT))) {}
-
-   if (RDW_HARPOON((p_port+hp_intstat)) & RESET)
-         Wait(p_port, TO_250ms);
-
-   DISABLE_AUTO(p_port);
-
-   WR_HARPOON(p_port+hp_addstat,(RD_HARPOON(p_port+hp_addstat) & ~SCAM_TIMER));
-   WR_HARPOON(p_port+hp_seltimeout,TO_290ms);
-
-   SGRAM_ACCESS(p_port);
-
-   if (RDW_HARPOON((p_port+hp_intstat)) & (RESET | TIMEOUT) ) {
-
-      WRW_HARPOON((p_port+hp_intstat),
-                  (RESET | TIMEOUT | SEL | BUS_FREE | PHASE));
-
-      WR_HARPOON(p_port+hp_page_ctrl,
-         (RD_HARPOON(p_port+hp_page_ctrl) & ~G_INT_DISABLE));
-
-      return(FALSE);  /*No legacy device */
-      }
-
-   else {
-
-      while(!(RDW_HARPOON((p_port+hp_intstat)) & BUS_FREE)) {
-                                if (RD_HARPOON(p_port+hp_scsisig) & SCSI_REQ)
-                                        {
-                                        WR_HARPOON(p_port+hp_scsisig, (SCSI_ACK + S_ILL_PH));
-                        ACCEPT_MSG(p_port);
-                                        }
-                }
-
-      WRW_HARPOON((p_port+hp_intstat), CLR_ALL_INT_1);
-
-      WR_HARPOON(p_port+hp_page_ctrl,
-         (RD_HARPOON(p_port+hp_page_ctrl) & ~G_INT_DISABLE));
-
-      return(TRUE);  /*Found one of them oldies! */
-      }
-}
-#endif  /* DOS */
-
-/*---------------------------------------------------------------------
- *
- * Function: scwtsel
+ * Function: FPT_scwtsel
  *
  * Description: Wait to be selected by another SCAM initiator.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scwtsel(USHORT p_port)
-#else
-void scwtsel(ULONG p_port)
-#endif
+static void FPT_scwtsel(ULONG p_port)
 {
    while(!(RDW_HARPOON((p_port+hp_intstat)) & SCAM_SEL)) {}
 }
@@ -10326,23 +6816,19 @@ void scwtsel(ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: inisci
+ * Function: FPT_inisci
  *
  * Description: Setup the data Structure with the info from the EEPROM.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void inisci(UCHAR p_card, USHORT p_port, UCHAR p_our_id)
-#else
-void inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id)
-#endif
+static void FPT_inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id)
 {
    UCHAR i,k,max_id;
    USHORT ee_data;
         PNVRamInfo pCurrNvRam;
 
-        pCurrNvRam = BL_Card[p_card].pNvRamInfo;
+        pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
 
    if (RD_HARPOON(p_port+hp_page_ctrl) & NARROW_SCSI_CARD)
       max_id = 0x08;
@@ -10354,14 +6840,14 @@ void inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id)
                 for(i = 0; i < max_id; i++){
 
                         for(k = 0; k < 4; k++)
-                                scamInfo[i].id_string[k] = pCurrNvRam->niScamTbl[i][k];
+                                FPT_scamInfo[i].id_string[k] = pCurrNvRam->niScamTbl[i][k];
                         for(k = 4; k < ID_STRING_LENGTH; k++)
-                                scamInfo[i].id_string[k] = (UCHAR) 0x00;
+                                FPT_scamInfo[i].id_string[k] = (UCHAR) 0x00;
 
-              if(scamInfo[i].id_string[0] == 0x00)
-           scamInfo[i].state = ID_UNUSED;  /*Default to unused ID. */
+              if(FPT_scamInfo[i].id_string[0] == 0x00)
+           FPT_scamInfo[i].state = ID_UNUSED;  /*Default to unused ID. */
               else
-              scamInfo[i].state = ID_UNASSIGNED;  /*Default to unassigned ID. */
+              FPT_scamInfo[i].state = ID_UNASSIGNED;  /*Default to unassigned ID. */
 
                 }
         }else {
@@ -10369,38 +6855,38 @@ void inisci(UCHAR p_card, ULONG p_port, UCHAR p_our_id)
            {
         for (k=0; k < ID_STRING_LENGTH; k+=2)
                  {
-              ee_data = utilEERead(p_port, (USHORT)((EE_SCAMBASE/2) +
+              ee_data = FPT_utilEERead(p_port, (USHORT)((EE_SCAMBASE/2) +
              (USHORT) (i*((USHORT)ID_STRING_LENGTH/2)) + (USHORT)(k/2)));
-                scamInfo[i].id_string[k] = (UCHAR) ee_data;
+                FPT_scamInfo[i].id_string[k] = (UCHAR) ee_data;
                  ee_data >>= 8;
-              scamInfo[i].id_string[k+1] = (UCHAR) ee_data;
+              FPT_scamInfo[i].id_string[k+1] = (UCHAR) ee_data;
            }
 
-              if ((scamInfo[i].id_string[0] == 0x00) ||
-               (scamInfo[i].id_string[0] == 0xFF))
+              if ((FPT_scamInfo[i].id_string[0] == 0x00) ||
+               (FPT_scamInfo[i].id_string[0] == 0xFF))
 
-           scamInfo[i].state = ID_UNUSED;  /*Default to unused ID. */
+           FPT_scamInfo[i].state = ID_UNUSED;  /*Default to unused ID. */
 
               else
-              scamInfo[i].state = ID_UNASSIGNED;  /*Default to unassigned ID. */
+              FPT_scamInfo[i].state = ID_UNASSIGNED;  /*Default to unassigned ID. */
 
         }
         }
         for(k = 0; k < ID_STRING_LENGTH; k++)
-                scamInfo[p_our_id].id_string[k] = scamHAString[k];
+                FPT_scamInfo[p_our_id].id_string[k] = FPT_scamHAString[k];
 
 }
 
 /*---------------------------------------------------------------------
  *
- * Function: scmachid
+ * Function: FPT_scmachid
  *
  * Description: Match the Device ID string with our values stored in
  *              the EEPROM.
  *
  *---------------------------------------------------------------------*/
 
-UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[])
+static UCHAR FPT_scmachid(UCHAR p_card, UCHAR p_id_string[])
 {
 
    UCHAR i,k,match;
@@ -10408,28 +6894,20 @@ UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[])
 
    for (i=0; i < MAX_SCSI_TAR; i++) {
 
-#if !defined(SCAM_LEV_2)
-      if (scamInfo[i].state == ID_UNASSIGNED)
-         {
-#endif
-         match = TRUE;
+         match = 1;
 
          for (k=0; k < ID_STRING_LENGTH; k++)
             {
-            if (p_id_string[k] != scamInfo[i].id_string[k])
-               match = FALSE;
+            if (p_id_string[k] != FPT_scamInfo[i].id_string[k])
+               match = 0;
             }
 
          if (match)
             {
-            scamInfo[i].state = ID_ASSIGNED;
+            FPT_scamInfo[i].state = ID_ASSIGNED;
             return(i);
             }
 
-#if !defined(SCAM_LEV_2)
-         }
-#endif
-
       }
 
 
@@ -10448,17 +6926,17 @@ UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[])
       {
       i--;
 
-      if (scamInfo[match].state == ID_UNUSED)
+      if (FPT_scamInfo[match].state == ID_UNUSED)
          {
          for (k=0; k < ID_STRING_LENGTH; k++)
             {
-            scamInfo[match].id_string[k] = p_id_string[k];
+            FPT_scamInfo[match].id_string[k] = p_id_string[k];
             }
 
-         scamInfo[match].state = ID_ASSIGNED;
+         FPT_scamInfo[match].state = ID_ASSIGNED;
 
-                        if(BL_Card[p_card].pNvRamInfo == NULL)
-                 BL_Card[p_card].globalFlags |= F_UPDATE_EEPROM;
+                        if(FPT_BL_Card[p_card].pNvRamInfo == NULL)
+                 FPT_BL_Card[p_card].globalFlags |= F_UPDATE_EEPROM;
          return(match);
 
          }
@@ -10498,17 +6976,17 @@ UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[])
 
       i--;
 
-      if (scamInfo[match].state == ID_UNASSIGNED)
+      if (FPT_scamInfo[match].state == ID_UNASSIGNED)
          {
          for (k=0; k < ID_STRING_LENGTH; k++)
             {
-            scamInfo[match].id_string[k] = p_id_string[k];
+            FPT_scamInfo[match].id_string[k] = p_id_string[k];
             }
 
-         scamInfo[match].id_string[0] |= BIT(7);
-         scamInfo[match].state = ID_ASSIGNED;
-                        if(BL_Card[p_card].pNvRamInfo == NULL)
-                 BL_Card[p_card].globalFlags |= F_UPDATE_EEPROM;
+         FPT_scamInfo[match].id_string[0] |= BIT(7);
+         FPT_scamInfo[match].state = ID_ASSIGNED;
+                        if(FPT_BL_Card[p_card].pNvRamInfo == NULL)
+                 FPT_BL_Card[p_card].globalFlags |= F_UPDATE_EEPROM;
          return(match);
 
          }
@@ -10531,17 +7009,13 @@ UCHAR scmachid(UCHAR p_card, UCHAR p_id_string[])
 
 /*---------------------------------------------------------------------
  *
- * Function: scsavdi
+ * Function: FPT_scsavdi
  *
  * Description: Save off the device SCAM ID strings.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void scsavdi(UCHAR p_card, USHORT p_port)
-#else
-void scsavdi(UCHAR p_card, ULONG p_port)
-#endif
+static void FPT_scsavdi(UCHAR p_card, ULONG p_port)
 {
    UCHAR i,k,max_id;
    USHORT ee_data,sum_data;
@@ -10551,11 +7025,11 @@ void scsavdi(UCHAR p_card, ULONG p_port)
 
    for (i = 1; i < EE_SCAMBASE/2; i++)
       {
-      sum_data += utilEERead(p_port, i);
+      sum_data += FPT_utilEERead(p_port, i);
       }
 
 
-   utilEEWriteOnOff(p_port,1);   /* Enable write access to the EEPROM */
+   FPT_utilEEWriteOnOff(p_port,1);   /* Enable write access to the EEPROM */
 
    if (RD_HARPOON(p_port+hp_page_ctrl) & NARROW_SCSI_CARD)
       max_id = 0x08;
@@ -10568,64 +7042,29 @@ void scsavdi(UCHAR p_card, ULONG p_port)
 
       for (k=0; k < ID_STRING_LENGTH; k+=2)
          {
-         ee_data = scamInfo[i].id_string[k+1];
+         ee_data = FPT_scamInfo[i].id_string[k+1];
          ee_data <<= 8;
-         ee_data |= scamInfo[i].id_string[k];
+         ee_data |= FPT_scamInfo[i].id_string[k];
          sum_data += ee_data;
-         utilEEWrite(p_port, ee_data, (USHORT)((EE_SCAMBASE/2) +
+         FPT_utilEEWrite(p_port, ee_data, (USHORT)((EE_SCAMBASE/2) +
             (USHORT)(i*((USHORT)ID_STRING_LENGTH/2)) + (USHORT)(k/2)));
          }
       }
 
 
-   utilEEWrite(p_port, sum_data, EEPROM_CHECK_SUM/2);
-   utilEEWriteOnOff(p_port,0);   /* Turn off write access */
+   FPT_utilEEWrite(p_port, sum_data, EEPROM_CHECK_SUM/2);
+   FPT_utilEEWriteOnOff(p_port,0);   /* Turn off write access */
 }
-#ident "$Id: diagnose.c 1.10 1997/06/10 16:51:47 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   diagnose.c  $
- *
- *   Description:  Diagnostic funtions for testing the integrity of
- *                 the HARPOON.
- *
- *   $Date: 1997/06/10 16:51:47 $
- *
- *   $Revision: 1.10 $
- *
- *----------------------------------------------------------------------*/
-
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <eeprom.h>*/
-/*#include <harpoon.h>*/
 
 /*---------------------------------------------------------------------
  *
- * Function: XbowInit
+ * Function: FPT_XbowInit
  *
  * Description: Setup the Xbow for normal operation.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void XbowInit(USHORT port, UCHAR ScamFlg)
-#else
-void XbowInit(ULONG port, UCHAR ScamFlg)
-#endif
+static void FPT_XbowInit(ULONG port, UCHAR ScamFlg)
 {
 UCHAR i;
 
@@ -10647,18 +7086,13 @@ UCHAR i;
 
    WRW_HARPOON((port+hp_intstat), CLR_ALL_INT);
 
-#if defined(SCAM_LEV_2)
-   default_intena = RESET | RSEL | PROG_HLT | TIMEOUT |
+   FPT_default_intena = RESET | RSEL | PROG_HLT | TIMEOUT |
                     BUS_FREE | XFER_CNT_0 | AUTO_INT;
 
    if ((ScamFlg & SCAM_ENABLED) && (ScamFlg & SCAM_LEVEL2))
-                default_intena |= SCAM_SEL;
+                FPT_default_intena |= SCAM_SEL;
 
-#else
-   default_intena = RESET | RSEL | PROG_HLT | TIMEOUT |
-                    BUS_FREE | XFER_CNT_0 | AUTO_INT;
-#endif
-   WRW_HARPOON((port+hp_intena), default_intena);
+   WRW_HARPOON((port+hp_intena), FPT_default_intena);
 
    WR_HARPOON(port+hp_seltimeout,TO_290ms);
 
@@ -10667,26 +7101,6 @@ UCHAR i;
    if (RD_HARPOON(port+hp_page_ctrl) & NARROW_SCSI_CARD)
       WR_HARPOON(port+hp_addstat,SCSI_MODE8);
 
-#if defined(NO_BIOS_OPTION)
-
-   WR_HARPOON(port+hp_synctarg_0,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_1,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_2,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_3,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_4,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_5,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_6,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_7,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_8,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_9,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_10,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_11,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_12,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_13,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_14,NARROW_SCSI);
-   WR_HARPOON(port+hp_synctarg_15,NARROW_SCSI);
-
-#endif
         WR_HARPOON(port+hp_page_ctrl, i);
 
 }
@@ -10694,17 +7108,13 @@ UCHAR i;
 
 /*---------------------------------------------------------------------
  *
- * Function: BusMasterInit
+ * Function: FPT_BusMasterInit
  *
  * Description: Initialize the BusMaster for normal operations.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void BusMasterInit(USHORT p_port)
-#else
-void BusMasterInit(ULONG p_port)
-#endif
+static void FPT_BusMasterInit(ULONG p_port)
 {
 
 
@@ -10719,13 +7129,6 @@ void BusMasterInit(ULONG p_port)
    WR_HARPOON(p_port+hp_ee_ctrl, (SCSI_TERM_ENA_H));
 
 
-#if defined(NT)
-
-   WR_HARPOON(p_port+hp_pci_cmd_cfg, (RD_HARPOON(p_port+hp_pci_cmd_cfg)
-      & ~MEM_SPACE_ENA));
-
-#endif
-
    RD_HARPOON(p_port+hp_int_status);        /*Clear interrupts. */
    WR_HARPOON(p_port+hp_int_mask, (INT_CMD_COMPL | SCSI_INTERRUPT));
    WR_HARPOON(p_port+hp_page_ctrl, (RD_HARPOON(p_port+hp_page_ctrl) &
@@ -10735,147 +7138,14 @@ void BusMasterInit(ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: DiagXbow
- *
- * Description: Test Xbow integrity.  Non-zero return indicates an error.
- *
- *---------------------------------------------------------------------*/
-
-#if defined(DOS)
-int DiagXbow(USHORT port)
-#else
-int DiagXbow(ULONG port)
-#endif
-{
-   unsigned char fifo_cnt,loop_cnt;
-
-   unsigned char fifodata[5];
-   fifodata[0] = 0x00;
-   fifodata[1] = 0xFF;
-   fifodata[2] = 0x55;
-   fifodata[3] = 0xAA;
-   fifodata[4] = 0x00;
-
-
-   WRW_HARPOON((port+hp_intstat), CLR_ALL_INT);
-   WRW_HARPOON((port+hp_intena), 0x0000);
-
-   WR_HARPOON(port+hp_seltimeout,TO_5ms);
-
-   WR_HARPOON(port+hp_portctrl_0,START_TO);
-
-
-   for(fifodata[4] = 0x01; fifodata[4] != (UCHAR) 0; fifodata[4] = fifodata[4] << 1) {
-
-      WR_HARPOON(port+hp_selfid_0,fifodata[4]);
-      WR_HARPOON(port+hp_selfid_1,fifodata[4]);
-
-      if ((RD_HARPOON(port+hp_selfid_0) != fifodata[4]) ||
-          (RD_HARPOON(port+hp_selfid_1) != fifodata[4]))
-         return(1);
-      }
-
-
-   for(loop_cnt = 0; loop_cnt < 4; loop_cnt++) {
-
-      WR_HARPOON(port+hp_portctrl_0,(HOST_PORT | HOST_WRT | START_TO));
-
-
-      for (fifo_cnt = 0; fifo_cnt < FIFO_LEN; fifo_cnt++) {
-
-         WR_HARPOON(port+hp_fifodata_0, fifodata[loop_cnt]);
-         }
-
-
-      if (!(RD_HARPOON(port+hp_xferstat) & FIFO_FULL))
-         return(1);
-
-
-      WR_HARPOON(port+hp_portctrl_0,(HOST_PORT | START_TO));
-
-      for (fifo_cnt = 0; fifo_cnt < FIFO_LEN; fifo_cnt++) {
-
-         if (RD_HARPOON(port+hp_fifodata_0) != fifodata[loop_cnt])
-            return(1);
-         }
-
-
-      if (!(RD_HARPOON(port+hp_xferstat) & FIFO_EMPTY))
-         return(1);
-      }
-
-
-   while(!(RDW_HARPOON((port+hp_intstat)) & TIMEOUT)) {}
-
-
-   WR_HARPOON(port+hp_seltimeout,TO_290ms);
-
-   WRW_HARPOON((port+hp_intstat), CLR_ALL_INT);
-
-   WRW_HARPOON((port+hp_intena), default_intena);
-
-   return(0);
-}
-
-
-/*---------------------------------------------------------------------
- *
- * Function: DiagBusMaster
- *
- * Description: Test BusMaster integrity.  Non-zero return indicates an
- *              error.
- *
- *---------------------------------------------------------------------*/
-
-#if defined(DOS)
-int DiagBusMaster(USHORT port)
-#else
-int DiagBusMaster(ULONG port)
-#endif
-{
-   UCHAR testdata;
-
-   for(testdata = (UCHAR) 1; testdata != (UCHAR)0; testdata = testdata << 1) {
-
-      WR_HARPOON(port+hp_xfer_cnt_lo,testdata);
-      WR_HARPOON(port+hp_xfer_cnt_mi,testdata);
-      WR_HARPOON(port+hp_xfer_cnt_hi,testdata);
-      WR_HARPOON(port+hp_host_addr_lo,testdata);
-      WR_HARPOON(port+hp_host_addr_lmi,testdata);
-      WR_HARPOON(port+hp_host_addr_hmi,testdata);
-      WR_HARPOON(port+hp_host_addr_hi,testdata);
-
-      if ((RD_HARPOON(port+hp_xfer_cnt_lo) != testdata)   ||
-          (RD_HARPOON(port+hp_xfer_cnt_mi) != testdata)   ||
-          (RD_HARPOON(port+hp_xfer_cnt_hi) != testdata)   ||
-          (RD_HARPOON(port+hp_host_addr_lo) != testdata)  ||
-          (RD_HARPOON(port+hp_host_addr_lmi) != testdata) ||
-          (RD_HARPOON(port+hp_host_addr_hmi) != testdata) ||
-          (RD_HARPOON(port+hp_host_addr_hi) != testdata))
-
-         return(1);
-      }
-   RD_HARPOON(port+hp_int_status);        /*Clear interrupts. */
-   return(0);
-}
-
-
-
-/*---------------------------------------------------------------------
- *
- * Function: DiagEEPROM
+ * Function: FPT_DiagEEPROM
  *
  * Description: Verfiy checksum and 'Key' and initialize the EEPROM if
  *              necessary.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void DiagEEPROM(USHORT p_port)
-#else
-void DiagEEPROM(ULONG p_port)
-#endif
-
+static void FPT_DiagEEPROM(ULONG p_port)
 {
    USHORT index,temp,max_wd_cnt;
 
@@ -10884,185 +7154,148 @@ void DiagEEPROM(ULONG p_port)
    else
       max_wd_cnt = EEPROM_WD_CNT * 2;
 
-   temp = utilEERead(p_port, FW_SIGNATURE/2);
+   temp = FPT_utilEERead(p_port, FW_SIGNATURE/2);
 
    if (temp == 0x4641) {
 
       for (index = 2; index < max_wd_cnt; index++) {
 
-         temp += utilEERead(p_port, index);
+         temp += FPT_utilEERead(p_port, index);
 
          }
 
-      if (temp == utilEERead(p_port, EEPROM_CHECK_SUM/2)) {
+      if (temp == FPT_utilEERead(p_port, EEPROM_CHECK_SUM/2)) {
 
          return;          /*EEPROM is Okay so return now! */
          }
       }
 
 
-   utilEEWriteOnOff(p_port,(UCHAR)1);
+   FPT_utilEEWriteOnOff(p_port,(UCHAR)1);
 
    for (index = 0; index < max_wd_cnt; index++) {
 
-      utilEEWrite(p_port, 0x0000, index);
+      FPT_utilEEWrite(p_port, 0x0000, index);
       }
 
    temp = 0;
 
-   utilEEWrite(p_port, 0x4641, FW_SIGNATURE/2);
+   FPT_utilEEWrite(p_port, 0x4641, FW_SIGNATURE/2);
    temp += 0x4641;
-   utilEEWrite(p_port, 0x3920, MODEL_NUMB_0/2);
+   FPT_utilEEWrite(p_port, 0x3920, MODEL_NUMB_0/2);
    temp += 0x3920;
-   utilEEWrite(p_port, 0x3033, MODEL_NUMB_2/2);
+   FPT_utilEEWrite(p_port, 0x3033, MODEL_NUMB_2/2);
    temp += 0x3033;
-   utilEEWrite(p_port, 0x2020, MODEL_NUMB_4/2);
+   FPT_utilEEWrite(p_port, 0x2020, MODEL_NUMB_4/2);
    temp += 0x2020;
-   utilEEWrite(p_port, 0x70D3, SYSTEM_CONFIG/2);
+   FPT_utilEEWrite(p_port, 0x70D3, SYSTEM_CONFIG/2);
    temp += 0x70D3;
-   utilEEWrite(p_port, 0x0010, BIOS_CONFIG/2);
+   FPT_utilEEWrite(p_port, 0x0010, BIOS_CONFIG/2);
    temp += 0x0010;
-   utilEEWrite(p_port, 0x0003, SCAM_CONFIG/2);
+   FPT_utilEEWrite(p_port, 0x0003, SCAM_CONFIG/2);
    temp += 0x0003;
-   utilEEWrite(p_port, 0x0007, ADAPTER_SCSI_ID/2);
+   FPT_utilEEWrite(p_port, 0x0007, ADAPTER_SCSI_ID/2);
    temp += 0x0007;
 
-   utilEEWrite(p_port, 0x0000, IGNORE_B_SCAN/2);
+   FPT_utilEEWrite(p_port, 0x0000, IGNORE_B_SCAN/2);
    temp += 0x0000;
-   utilEEWrite(p_port, 0x0000, SEND_START_ENA/2);
+   FPT_utilEEWrite(p_port, 0x0000, SEND_START_ENA/2);
    temp += 0x0000;
-   utilEEWrite(p_port, 0x0000, DEVICE_ENABLE/2);
+   FPT_utilEEWrite(p_port, 0x0000, DEVICE_ENABLE/2);
    temp += 0x0000;
 
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL01/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL01/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL23/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL23/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL45/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL45/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL67/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL67/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL89/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBL89/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLab/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLab/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLcd/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLcd/2);
    temp += 0x4242;
-   utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLef/2);
+   FPT_utilEEWrite(p_port, 0x4242, SYNC_RATE_TBLef/2);
    temp += 0x4242;
 
 
-   utilEEWrite(p_port, 0x6C46, 64/2);  /*PRODUCT ID */
+   FPT_utilEEWrite(p_port, 0x6C46, 64/2);  /*PRODUCT ID */
    temp += 0x6C46;
-   utilEEWrite(p_port, 0x7361, 66/2);  /* FlashPoint LT   */
+   FPT_utilEEWrite(p_port, 0x7361, 66/2);  /* FlashPoint LT   */
    temp += 0x7361;
-   utilEEWrite(p_port, 0x5068, 68/2);
+   FPT_utilEEWrite(p_port, 0x5068, 68/2);
    temp += 0x5068;
-   utilEEWrite(p_port, 0x696F, 70/2);
+   FPT_utilEEWrite(p_port, 0x696F, 70/2);
    temp += 0x696F;
-   utilEEWrite(p_port, 0x746E, 72/2);
+   FPT_utilEEWrite(p_port, 0x746E, 72/2);
    temp += 0x746E;
-   utilEEWrite(p_port, 0x4C20, 74/2);
+   FPT_utilEEWrite(p_port, 0x4C20, 74/2);
    temp += 0x4C20;
-   utilEEWrite(p_port, 0x2054, 76/2);
+   FPT_utilEEWrite(p_port, 0x2054, 76/2);
    temp += 0x2054;
-   utilEEWrite(p_port, 0x2020, 78/2);
+   FPT_utilEEWrite(p_port, 0x2020, 78/2);
    temp += 0x2020;
 
    index = ((EE_SCAMBASE/2)+(7*16));
-   utilEEWrite(p_port, (0x0700+TYPE_CODE0), index);
+   FPT_utilEEWrite(p_port, (0x0700+TYPE_CODE0), index);
    temp += (0x0700+TYPE_CODE0);
    index++;
-   utilEEWrite(p_port, 0x5542, index);            /*Vendor ID code */
+   FPT_utilEEWrite(p_port, 0x5542, index);            /*Vendor ID code */
    temp += 0x5542;                                /* BUSLOGIC      */
    index++;
-   utilEEWrite(p_port, 0x4C53, index);
+   FPT_utilEEWrite(p_port, 0x4C53, index);
    temp += 0x4C53;
    index++;
-   utilEEWrite(p_port, 0x474F, index);
+   FPT_utilEEWrite(p_port, 0x474F, index);
    temp += 0x474F;
    index++;
-   utilEEWrite(p_port, 0x4349, index);
+   FPT_utilEEWrite(p_port, 0x4349, index);
    temp += 0x4349;
    index++;
-   utilEEWrite(p_port, 0x5442, index);            /*Vendor unique code */
+   FPT_utilEEWrite(p_port, 0x5442, index);            /*Vendor unique code */
    temp += 0x5442;                         /* BT- 930           */
    index++;
-   utilEEWrite(p_port, 0x202D, index);
+   FPT_utilEEWrite(p_port, 0x202D, index);
    temp += 0x202D;
    index++;
-   utilEEWrite(p_port, 0x3339, index);
+   FPT_utilEEWrite(p_port, 0x3339, index);
    temp += 0x3339;
    index++;                                 /*Serial #          */
-   utilEEWrite(p_port, 0x2030, index);             /* 01234567         */
+   FPT_utilEEWrite(p_port, 0x2030, index);             /* 01234567         */
    temp += 0x2030;
    index++;
-   utilEEWrite(p_port, 0x5453, index);
+   FPT_utilEEWrite(p_port, 0x5453, index);
    temp += 0x5453;
    index++;
-   utilEEWrite(p_port, 0x5645, index);
+   FPT_utilEEWrite(p_port, 0x5645, index);
    temp += 0x5645;
    index++;
-   utilEEWrite(p_port, 0x2045, index);
+   FPT_utilEEWrite(p_port, 0x2045, index);
    temp += 0x2045;
    index++;
-   utilEEWrite(p_port, 0x202F, index);
+   FPT_utilEEWrite(p_port, 0x202F, index);
    temp += 0x202F;
    index++;
-   utilEEWrite(p_port, 0x4F4A, index);
+   FPT_utilEEWrite(p_port, 0x4F4A, index);
    temp += 0x4F4A;
    index++;
-   utilEEWrite(p_port, 0x204E, index);
+   FPT_utilEEWrite(p_port, 0x204E, index);
    temp += 0x204E;
    index++;
-   utilEEWrite(p_port, 0x3539, index);
+   FPT_utilEEWrite(p_port, 0x3539, index);
    temp += 0x3539;
 
 
 
-   utilEEWrite(p_port, temp, EEPROM_CHECK_SUM/2);
+   FPT_utilEEWrite(p_port, temp, EEPROM_CHECK_SUM/2);
 
-   utilEEWriteOnOff(p_port,(UCHAR)0);
+   FPT_utilEEWriteOnOff(p_port,(UCHAR)0);
 
 }
 
-#ident "$Id: utility.c 1.23 1997/06/10 16:55:06 mohan Exp $"
-/*----------------------------------------------------------------------
- *
- *
- *   Copyright 1995-1996 by Mylex Corporation.  All Rights Reserved
- *
- *   This file is available under both the GNU General Public License
- *   and a BSD-style copyright; see LICENSE.FlashPoint for details.
- *
- *   $Workfile:   utility.c  $
- *
- *   Description:  Utility functions relating to queueing and EEPROM
- *                 manipulation and any other garbage functions.
- *
- *   $Date: 1997/06/10 16:55:06 $
- *
- *   $Revision: 1.23 $
- *
- *----------------------------------------------------------------------*/
-/*#include <globals.h>*/
-
-#if (FW_TYPE==_UCB_MGR_)
-        /*#include <budi.h>*/
-#endif
-
-/*#include <sccbmgr.h>*/
-/*#include <blx30.h>*/
-/*#include <target.h>*/
-/*#include <scsi2.h>*/
-/*#include <harpoon.h>*/
-
-
-/*
-extern SCCBCARD BL_Card[MAX_CARDS];
-extern SCCBMGR_TAR_INFO sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR];
-extern unsigned int SccbGlobalFlags;
-*/
 
 /*---------------------------------------------------------------------
  *
@@ -11072,7 +7305,7 @@ extern unsigned int SccbGlobalFlags;
  *
  *---------------------------------------------------------------------*/
 
-void queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
+static void FPT_queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
 {
    UCHAR scan_ptr, lun;
    PSCCBMgr_tar_info currTar_Info;
@@ -11081,7 +7314,7 @@ void queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
    scan_ptr = pCurrCard->scanIndex;
         do 
         {
-                currTar_Info = &sccbMgrTbl[p_card][scan_ptr];
+                currTar_Info = &FPT_sccbMgrTbl[p_card][scan_ptr];
                 if((pCurrCard->globalFlags & F_CONLUN_IO) && 
                         ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING))
                 {
@@ -11094,7 +7327,7 @@ void queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
                                 
                                 for(lun=0; lun < MAX_LUN; lun++)
                                 {
-                                        if(currTar_Info->TarLUNBusy[lun] == FALSE)
+                                        if(currTar_Info->TarLUNBusy[lun] == 0)
                                         {
 
                                                 pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head;
@@ -11153,7 +7386,7 @@ void queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
                 else
                 {
                         if ((currTar_Info->TarSelQ_Cnt != 0) &&
-                                (currTar_Info->TarLUNBusy[0] == FALSE))
+                                (currTar_Info->TarLUNBusy[0] == 0))
                         {
 
                                 pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head;
@@ -11203,7 +7436,7 @@ void queueSearchSelect(PSCCBcard pCurrCard, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-void queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card)
+static void FPT_queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card)
 {
    UCHAR thisTarg;
    PSCCBMgr_tar_info currTar_Info;
@@ -11211,7 +7444,7 @@ void queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card)
    if (pCurrCard->currentSCCB != NULL)
           {
           thisTarg = (UCHAR)(((PSCCB)(pCurrCard->currentSCCB))->TargID);
-      currTar_Info = &sccbMgrTbl[p_card][thisTarg];
+      currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
 
       pCurrCard->currentSCCB->Sccb_backlink = (PSCCB)NULL;
 
@@ -11242,103 +7475,10 @@ void queueSelectFail(PSCCBcard pCurrCard, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-void queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, UCHAR p_card)
+static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb,
+                                 UCHAR p_card)
 {
 
-#if (FW_TYPE==_UCB_MGR_)
-
-   u08bits SCSIcmd;
-   CALL_BK_FN callback;
-   PSCCBMgr_tar_info currTar_Info;
-
-   PUCB p_ucb;
-   p_ucb=p_sccb->Sccb_ucb_ptr;
-
-   SCSIcmd = p_sccb->Cdb[0];
-
-
-   if (!(p_sccb->Sccb_XferState & F_ALL_XFERRED))
-   {
-
-      if ((p_ucb->UCB_opcode & OPC_CHK_UNDER_OVER_RUN)                     &&
-         (p_sccb->HostStatus == SCCB_COMPLETE)                             &&
-         (p_sccb->TargetStatus != SSCHECK))
-
-         if ((SCSIcmd == SCSI_READ)             ||
-             (SCSIcmd == SCSI_WRITE)            ||
-             (SCSIcmd == SCSI_READ_EXTENDED)    ||
-             (SCSIcmd == SCSI_WRITE_EXTENDED)   ||
-             (SCSIcmd == SCSI_WRITE_AND_VERIFY) ||
-             (SCSIcmd == SCSI_START_STOP_UNIT)  ||
-             (pCurrCard->globalFlags & F_NO_FILTER)
-            )
-               p_sccb->HostStatus = SCCB_DATA_UNDER_RUN;
-   }
-
-   p_ucb->UCB_status=SCCB_SUCCESS;
-
-   if ((p_ucb->UCB_hbastat=p_sccb->HostStatus) || (p_ucb->UCB_scsistat=p_sccb->TargetStatus))
-   {
-      p_ucb->UCB_status=SCCB_ERROR;
-   }
-
-   if ((p_sccb->OperationCode == RESIDUAL_SG_COMMAND) ||
-      (p_sccb->OperationCode == RESIDUAL_COMMAND))
-   {
-
-         utilUpdateResidual(p_sccb);
-
-         p_ucb->UCB_datalen=p_sccb->DataLength;
-   }
-
-   pCurrCard->cmdCounter--;
-   if (!pCurrCard->cmdCounter)
-   {
-
-      if (pCurrCard->globalFlags & F_GREEN_PC)
-      {
-         WR_HARPOON(pCurrCard->ioPort+hp_clkctrl_0,(PWR_DWN | CLKCTRL_DEFAULT));
-         WR_HARPOON(pCurrCard->ioPort+hp_sys_ctrl, STOP_CLK);
-      }
-
-      WR_HARPOON(pCurrCard->ioPort+hp_semaphore,
-      (RD_HARPOON(pCurrCard->ioPort+hp_semaphore) & ~SCCB_MGR_ACTIVE));
-   }
-
-        if(pCurrCard->discQCount != 0)
-        {
-      currTar_Info = &sccbMgrTbl[p_card][p_sccb->TargID];
-                if(((pCurrCard->globalFlags & F_CONLUN_IO) &&
-                        ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
-                {
-                        pCurrCard->discQCount--;
-                        pCurrCard->discQ_Tbl[currTar_Info->LunDiscQ_Idx[p_sccb->Lun]] = NULL;
-                }
-                else
-                {
-                        if(p_sccb->Sccb_tag)
-                        {
-                                pCurrCard->discQCount--;
-                                pCurrCard->discQ_Tbl[p_sccb->Sccb_tag] = NULL;
-                        }else
-                        {
-                                pCurrCard->discQCount--;
-                                pCurrCard->discQ_Tbl[currTar_Info->LunDiscQ_Idx[0]] = NULL;
-                        }
-                }
-
-        }
-   callback = (CALL_BK_FN)p_ucb->UCB_callback;
-   callback(p_ucb);
-   pCurrCard->globalFlags |= F_NEW_SCCB_CMD;
-   pCurrCard->currentSCCB = NULL;
-}
-
-
-
-
-#else
-
    UCHAR i, SCSIcmd;
    CALL_BK_FN callback;
    PSCCBMgr_tar_info currTar_Info;
@@ -11383,7 +7523,7 @@ void queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, UCHAR p_card)
    if ((p_sccb->OperationCode == RESIDUAL_SG_COMMAND) ||
           (p_sccb->OperationCode == RESIDUAL_COMMAND)) {
 
-                 utilUpdateResidual(p_sccb);
+                 FPT_utilUpdateResidual(p_sccb);
                  }
 
    pCurrCard->cmdCounter--;
@@ -11401,7 +7541,7 @@ void queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, UCHAR p_card)
 
         if(pCurrCard->discQCount != 0)
         {
-      currTar_Info = &sccbMgrTbl[p_card][p_sccb->TargID];
+      currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];
                 if(((pCurrCard->globalFlags & F_CONLUN_IO) &&
                         ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
                 {
@@ -11428,7 +7568,6 @@ void queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, UCHAR p_card)
    pCurrCard->globalFlags |= F_NEW_SCCB_CMD;
    pCurrCard->currentSCCB = NULL;
 }
-#endif /* ( if FW_TYPE==...) */
 
 
 /*---------------------------------------------------------------------
@@ -11438,30 +7577,30 @@ void queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, UCHAR p_card)
  * Description: Add SCCB to our disconnect array.
  *
  *---------------------------------------------------------------------*/
-void queueDisconnect(PSCCB p_sccb, UCHAR p_card)
+static void FPT_queueDisconnect(PSCCB p_sccb, UCHAR p_card)
 {
    PSCCBMgr_tar_info currTar_Info;
 
-        currTar_Info = &sccbMgrTbl[p_card][p_sccb->TargID];
+        currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];
 
-        if(((BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
+        if(((FPT_BL_Card[p_card].globalFlags & F_CONLUN_IO) &&
                 ((currTar_Info->TarStatus & TAR_TAG_Q_MASK) != TAG_Q_TRYING)))
         {
-                BL_Card[p_card].discQ_Tbl[currTar_Info->LunDiscQ_Idx[p_sccb->Lun]] = p_sccb;
+                FPT_BL_Card[p_card].discQ_Tbl[currTar_Info->LunDiscQ_Idx[p_sccb->Lun]] = p_sccb;
         }
         else
         {
                 if (p_sccb->Sccb_tag)
                 {
-                        BL_Card[p_card].discQ_Tbl[p_sccb->Sccb_tag] = p_sccb;
-                        sccbMgrTbl[p_card][p_sccb->TargID].TarLUNBusy[0] = FALSE;
-                        sccbMgrTbl[p_card][p_sccb->TargID].TarTagQ_Cnt++;
+                        FPT_BL_Card[p_card].discQ_Tbl[p_sccb->Sccb_tag] = p_sccb;
+                        FPT_sccbMgrTbl[p_card][p_sccb->TargID].TarLUNBusy[0] = 0;
+                        FPT_sccbMgrTbl[p_card][p_sccb->TargID].TarTagQ_Cnt++;
                 }else
                 {
-                        BL_Card[p_card].discQ_Tbl[currTar_Info->LunDiscQ_Idx[0]] = p_sccb;
+                        FPT_BL_Card[p_card].discQ_Tbl[currTar_Info->LunDiscQ_Idx[0]] = p_sccb;
                 }
         }
-        BL_Card[p_card].currentSCCB = NULL;
+        FPT_BL_Card[p_card].currentSCCB = NULL;
 }
 
 
@@ -11473,29 +7612,29 @@ void queueDisconnect(PSCCB p_sccb, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-void  queueFlushSccb(UCHAR p_card, UCHAR error_code)
+static void  FPT_queueFlushSccb(UCHAR p_card, UCHAR error_code)
 {
    UCHAR qtag,thisTarg;
    PSCCB currSCCB;
    PSCCBMgr_tar_info currTar_Info;
 
-   currSCCB = BL_Card[p_card].currentSCCB;
+   currSCCB = FPT_BL_Card[p_card].currentSCCB;
         if(currSCCB != NULL)
         {
            thisTarg = (UCHAR)currSCCB->TargID;
-        currTar_Info = &sccbMgrTbl[p_card][thisTarg];
+        currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
 
            for (qtag=0; qtag<QUEUE_DEPTH; qtag++) {
 
-                  if (BL_Card[p_card].discQ_Tbl[qtag] && 
-                                        (BL_Card[p_card].discQ_Tbl[qtag]->TargID == thisTarg))
+                  if (FPT_BL_Card[p_card].discQ_Tbl[qtag] && 
+                                        (FPT_BL_Card[p_card].discQ_Tbl[qtag]->TargID == thisTarg))
                          {
 
-                         BL_Card[p_card].discQ_Tbl[qtag]->HostStatus = (UCHAR)error_code;
+                         FPT_BL_Card[p_card].discQ_Tbl[qtag]->HostStatus = (UCHAR)error_code;
                         
-                         queueCmdComplete(&BL_Card[p_card],BL_Card[p_card].discQ_Tbl[qtag], p_card);
+                         FPT_queueCmdComplete(&FPT_BL_Card[p_card],FPT_BL_Card[p_card].discQ_Tbl[qtag], p_card);
 
-                         BL_Card[p_card].discQ_Tbl[qtag] = NULL;
+                         FPT_BL_Card[p_card].discQ_Tbl[qtag] = NULL;
                          currTar_Info->TarTagQ_Cnt--;
 
                          }
@@ -11512,24 +7651,25 @@ void  queueFlushSccb(UCHAR p_card, UCHAR error_code)
  *
  *---------------------------------------------------------------------*/
 
-void  queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg, UCHAR error_code)
+static void  FPT_queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg,
+                                    UCHAR error_code)
 {
    UCHAR qtag;
    PSCCBMgr_tar_info currTar_Info;
 
-   currTar_Info = &sccbMgrTbl[p_card][thisTarg];
+   currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
 
    for (qtag=0; qtag<QUEUE_DEPTH; qtag++) {
 
-          if (BL_Card[p_card].discQ_Tbl[qtag] && 
-                                (BL_Card[p_card].discQ_Tbl[qtag]->TargID == thisTarg))
+          if (FPT_BL_Card[p_card].discQ_Tbl[qtag] && 
+                                (FPT_BL_Card[p_card].discQ_Tbl[qtag]->TargID == thisTarg))
                  {
 
-                 BL_Card[p_card].discQ_Tbl[qtag]->HostStatus = (UCHAR)error_code;
+                 FPT_BL_Card[p_card].discQ_Tbl[qtag]->HostStatus = (UCHAR)error_code;
 
-                 queueCmdComplete(&BL_Card[p_card],BL_Card[p_card].discQ_Tbl[qtag], p_card);
+                 FPT_queueCmdComplete(&FPT_BL_Card[p_card],FPT_BL_Card[p_card].discQ_Tbl[qtag], p_card);
 
-                 BL_Card[p_card].discQ_Tbl[qtag] = NULL;
+                 FPT_BL_Card[p_card].discQ_Tbl[qtag] = NULL;
                  currTar_Info->TarTagQ_Cnt--;
 
                  }
@@ -11541,10 +7681,10 @@ void  queueFlushTargSccb(UCHAR p_card, UCHAR thisTarg, UCHAR error_code)
 
 
 
-void queueAddSccb(PSCCB p_SCCB, UCHAR p_card)
+static void FPT_queueAddSccb(PSCCB p_SCCB, UCHAR p_card)
 {
    PSCCBMgr_tar_info currTar_Info;
-   currTar_Info = &sccbMgrTbl[p_card][p_SCCB->TargID];
+   currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
 
    p_SCCB->Sccb_forwardlink = NULL;
 
@@ -11575,12 +7715,12 @@ void queueAddSccb(PSCCB p_SCCB, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-UCHAR queueFindSccb(PSCCB p_SCCB, UCHAR p_card)
+static UCHAR FPT_queueFindSccb(PSCCB p_SCCB, UCHAR p_card)
 {
    PSCCB q_ptr;
    PSCCBMgr_tar_info currTar_Info;
 
-   currTar_Info = &sccbMgrTbl[p_card][p_SCCB->TargID];
+   currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
 
    q_ptr = currTar_Info->TarSelQ_Head;
 
@@ -11609,7 +7749,7 @@ UCHAR queueFindSccb(PSCCB p_SCCB, UCHAR p_card)
 
                  currTar_Info->TarSelQ_Cnt--;
 
-                 return(TRUE);
+                 return(1);
                  }
 
           else {
@@ -11618,7 +7758,7 @@ UCHAR queueFindSccb(PSCCB p_SCCB, UCHAR p_card)
           }
 
 
-   return(FALSE);
+   return(0);
 
 }
 
@@ -11636,15 +7776,11 @@ UCHAR queueFindSccb(PSCCB p_SCCB, UCHAR p_card)
  *
  *---------------------------------------------------------------------*/
 
-void  utilUpdateResidual(PSCCB p_SCCB)
+static void  FPT_utilUpdateResidual(PSCCB p_SCCB)
 {
    ULONG partial_cnt;
    UINT  sg_index;
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-   ULONG far *sg_ptr;
-#else
    ULONG *sg_ptr;
-#endif
 
    if (p_SCCB->Sccb_XferState & F_ALL_XFERRED) {
 
@@ -11657,11 +7793,7 @@ void  utilUpdateResidual(PSCCB p_SCCB)
 
                  sg_index = p_SCCB->Sccb_sgseg;
 
-#if defined(COMPILER_16_BIT) && !defined(DOS)
-                 sg_ptr = (ULONG far *)p_SCCB->DataPointer;
-#else
                  sg_ptr = (ULONG *)p_SCCB->DataPointer;
-#endif
 
                  if (p_SCCB->Sccb_SGoffset) {
 
@@ -11694,17 +7826,13 @@ void  utilUpdateResidual(PSCCB p_SCCB)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void Wait1Second(USHORT p_port)
-#else
-void Wait1Second(ULONG p_port)
-#endif
+static void FPT_Wait1Second(ULONG p_port)
 {
    UCHAR i;
 
    for(i=0; i < 4; i++) {
 
-          Wait(p_port, TO_250ms);
+          FPT_Wait(p_port, TO_250ms);
 
           if ((RD_HARPOON(p_port+hp_scsictrl_0) & SCSI_RST))
                  break;
@@ -11717,17 +7845,13 @@ void Wait1Second(ULONG p_port)
 
 /*---------------------------------------------------------------------
  *
- * Function: Wait
+ * Function: FPT_Wait
  *
  * Description: Wait the desired delay.
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void Wait(USHORT p_port, UCHAR p_delay)
-#else
-void Wait(ULONG p_port, UCHAR p_delay)
-#endif
+static void FPT_Wait(ULONG p_port, UCHAR p_delay)
 {
    UCHAR old_timer;
    UCHAR green_flag;
@@ -11739,7 +7863,7 @@ void Wait(ULONG p_port, UCHAR p_delay)
 
    WR_HARPOON(p_port+hp_seltimeout,p_delay);
    WRW_HARPOON((p_port+hp_intstat), TIMEOUT);
-   WRW_HARPOON((p_port+hp_intena), (default_intena & ~TIMEOUT));
+   WRW_HARPOON((p_port+hp_intena), (FPT_default_intena & ~TIMEOUT));
 
 
    WR_HARPOON(p_port+hp_portctrl_0,
@@ -11758,7 +7882,7 @@ void Wait(ULONG p_port, UCHAR p_delay)
           (RD_HARPOON(p_port+hp_portctrl_0) & ~START_TO));
 
    WRW_HARPOON((p_port+hp_intstat), TIMEOUT);
-   WRW_HARPOON((p_port+hp_intena), default_intena);
+   WRW_HARPOON((p_port+hp_intena), FPT_default_intena);
 
    WR_HARPOON(p_port+hp_clkctrl_0,green_flag);
 
@@ -11775,11 +7899,7 @@ void Wait(ULONG p_port, UCHAR p_delay)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void utilEEWriteOnOff(USHORT p_port,UCHAR p_mode)
-#else
-void utilEEWriteOnOff(ULONG p_port,UCHAR p_mode)
-#endif
+static void FPT_utilEEWriteOnOff(ULONG p_port,UCHAR p_mode)
 {
    UCHAR ee_value;
 
@@ -11787,12 +7907,12 @@ void utilEEWriteOnOff(ULONG p_port,UCHAR p_mode)
 
    if (p_mode)
 
-          utilEESendCmdAddr(p_port, EWEN, EWEN_ADDR);
+          FPT_utilEESendCmdAddr(p_port, EWEN, EWEN_ADDR);
 
    else
 
 
-          utilEESendCmdAddr(p_port, EWDS, EWDS_ADDR);
+          FPT_utilEESendCmdAddr(p_port, EWDS, EWDS_ADDR);
 
    WR_HARPOON(p_port+hp_ee_ctrl, (ee_value | SEE_MS)); /*Turn off CS */
    WR_HARPOON(p_port+hp_ee_ctrl, ee_value);       /*Turn off Master Select */
@@ -11808,11 +7928,7 @@ void utilEEWriteOnOff(ULONG p_port,UCHAR p_mode)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void utilEEWrite(USHORT p_port, USHORT ee_data, USHORT ee_addr)
-#else
-void utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr)
-#endif
+static void FPT_utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr)
 {
 
    UCHAR ee_value;
@@ -11823,7 +7939,7 @@ void utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr)
 
 
 
-   utilEESendCmdAddr(p_port, EE_WRITE, ee_addr);
+   FPT_utilEESendCmdAddr(p_port, EE_WRITE, ee_addr);
 
 
    ee_value |= (SEE_MS + SEE_CS);
@@ -11847,7 +7963,7 @@ void utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr)
    ee_value &= (EXT_ARB_ACK | SCSI_TERM_ENA_H);
    WR_HARPOON(p_port+hp_ee_ctrl, (ee_value | SEE_MS));
 
-   Wait(p_port, TO_10ms);
+   FPT_Wait(p_port, TO_10ms);
 
    WR_HARPOON(p_port+hp_ee_ctrl, (ee_value | SEE_MS | SEE_CS)); /* Set CS to EEPROM */
    WR_HARPOON(p_port+hp_ee_ctrl, (ee_value | SEE_MS));       /* Turn off CS */
@@ -11863,19 +7979,15 @@ void utilEEWrite(ULONG p_port, USHORT ee_data, USHORT ee_addr)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-USHORT utilEERead(USHORT p_port, USHORT ee_addr)
-#else
-USHORT utilEERead(ULONG p_port, USHORT ee_addr)
-#endif
+static USHORT FPT_utilEERead(ULONG p_port, USHORT ee_addr)
 {
    USHORT i, ee_data1, ee_data2;
 
         i = 0;
-        ee_data1 = utilEEReadOrg(p_port, ee_addr);
+        ee_data1 = FPT_utilEEReadOrg(p_port, ee_addr);
         do
         {
-                ee_data2 = utilEEReadOrg(p_port, ee_addr);
+                ee_data2 = FPT_utilEEReadOrg(p_port, ee_addr);
 
                 if(ee_data1 == ee_data2)
                         return(ee_data1);
@@ -11897,11 +8009,7 @@ USHORT utilEERead(ULONG p_port, USHORT ee_addr)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-USHORT utilEEReadOrg(USHORT p_port, USHORT ee_addr)
-#else
-USHORT utilEEReadOrg(ULONG p_port, USHORT ee_addr)
-#endif
+static USHORT FPT_utilEEReadOrg(ULONG p_port, USHORT ee_addr)
 {
 
    UCHAR ee_value;
@@ -11911,7 +8019,7 @@ USHORT utilEEReadOrg(ULONG p_port, USHORT ee_addr)
                    (SEE_MS | SEE_CS));
 
 
-   utilEESendCmdAddr(p_port, EE_READ, ee_addr);
+   FPT_utilEESendCmdAddr(p_port, EE_READ, ee_addr);
 
 
    ee_value |= (SEE_MS + SEE_CS);
@@ -11949,11 +8057,7 @@ USHORT utilEEReadOrg(ULONG p_port, USHORT ee_addr)
  *
  *---------------------------------------------------------------------*/
 
-#if defined(DOS)
-void utilEESendCmdAddr(USHORT p_port, UCHAR ee_cmd, USHORT ee_addr)
-#else
-void utilEESendCmdAddr(ULONG p_port, UCHAR ee_cmd, USHORT ee_addr)
-#endif
+static void FPT_utilEESendCmdAddr(ULONG p_port, UCHAR ee_cmd, USHORT ee_addr)
 {
    UCHAR ee_value;
    UCHAR narrow_flg;
@@ -12016,7 +8120,7 @@ void utilEESendCmdAddr(ULONG p_port, UCHAR ee_cmd, USHORT ee_addr)
           }
 }
 
-USHORT CalcCrc16(UCHAR buffer[])
+static USHORT FPT_CalcCrc16(UCHAR buffer[])
 {
    USHORT crc=0;
         int i,j;
@@ -12036,7 +8140,7 @@ USHORT CalcCrc16(UCHAR buffer[])
         return(crc);
 }
 
-UCHAR CalcLrc(UCHAR buffer[])
+static UCHAR FPT_CalcLrc(UCHAR buffer[])
 {
         int i;
         UCHAR lrc;
@@ -12109,33 +8213,6 @@ FlashPoint__HandleInterrupt(FlashPoint_CardHandle_T CardHandle)
 #define FlashPoint_HandleInterrupt          FlashPoint__HandleInterrupt
 
 
-/*
-  FlashPoint_InquireTargetInfo returns the Synchronous Period, Synchronous
-  Offset, and Wide Transfers Active information for TargetID on CardHandle.
-*/
-
-void FlashPoint_InquireTargetInfo(FlashPoint_CardHandle_T CardHandle,
-                                  int TargetID,
-                                  unsigned char *SynchronousPeriod,
-                                  unsigned char *SynchronousOffset,
-                                  unsigned char *WideTransfersActive)
-{
-  SCCBMGR_TAR_INFO *TargetInfo =
-    &sccbMgrTbl[((SCCBCARD *)CardHandle)->cardIndex][TargetID];
-  if ((TargetInfo->TarSyncCtrl & SYNC_OFFSET) > 0)
-    {
-      *SynchronousPeriod = 5 * ((TargetInfo->TarSyncCtrl >> 5) + 1);
-      *SynchronousOffset = TargetInfo->TarSyncCtrl & SYNC_OFFSET;
-    }
-  else
-    {
-      *SynchronousPeriod = 0;
-      *SynchronousOffset = 0;
-    }
-  *WideTransfersActive = (TargetInfo->TarSyncCtrl & NARROW_SCSI ? 0 : 1);
-}
-
-
 #else  /* CONFIG_SCSI_OMIT_FLASHPOINT */
 
 
@@ -12151,9 +8228,6 @@ extern int FlashPoint_AbortCCB(FlashPoint_CardHandle_T, struct BusLogic_CCB *);
 extern boolean FlashPoint_InterruptPending(FlashPoint_CardHandle_T);
 extern int FlashPoint_HandleInterrupt(FlashPoint_CardHandle_T);
 extern void FlashPoint_ReleaseHostAdapter(FlashPoint_CardHandle_T);
-extern void FlashPoint_InquireTargetInfo(FlashPoint_CardHandle_T,
-                                         int, unsigned char *,
-                                         unsigned char *, unsigned char *);
 
 
 #endif /* CONFIG_SCSI_OMIT_FLASHPOINT */
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1811cb240315..96df148ed969 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -137,6 +137,24 @@ config CHR_DEV_SG
 
           If unsure, say N.
 
+config CHR_DEV_SCH
+        tristate "SCSI media changer support"
+        depends on SCSI
+        ---help---
+          This is a driver for SCSI media changers.  Most common devices are
+          tape libraries and MOD/CDROM jukeboxes.  *Real* jukeboxes, you
+          don't need this for those tiny 6-slot cdrom changers.  Media
+          changers are listed as "Type: Medium Changer" in /proc/scsi/scsi.
+          If you have such hardware and want to use it with linux, say Y
+          here.  Check <file:Documentation/scsi-changer.txt> for details.
+        
+          If you want to compile this as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt> and
+          <file:Documentation/scsi.txt>. The module will be called ch.o.
+          If unsure, say N.
+        
+
 comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs"
         depends on SCSI
 
@@ -1192,28 +1210,6 @@ config SCSI_PAS16
           To compile this driver as a module, choose M here: the
           module will be called pas16.
 
-config SCSI_PCI2000
-        tristate "PCI2000 support"
-        depends on PCI && SCSI && BROKEN
-        help
-          This is support for the PCI2000I EIDE interface card which acts as a
-          SCSI host adapter.  Please read the SCSI-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called pci2000.
-
-config SCSI_PCI2220I
-        tristate "PCI2220i support"
-        depends on PCI && SCSI && BROKEN
-        help
-          This is support for the PCI2220i EIDE interface card which acts as a
-          SCSI host adapter.  Please read the SCSI-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called pci2220i.
-
 config SCSI_PSI240I
         tristate "PSI240i support"
         depends on ISA && SCSI
@@ -1752,7 +1748,7 @@ config SCSI_NCR53C7xx_FAST
 
 config SUN3_SCSI
         tristate "Sun3 NCR5380 SCSI"
-        depends on SUN3 && SCSI
+        depends on SUN3 && SCSI && BROKEN
         help
           This option will enable support for the OBIO (onboard io) NCR5380
           SCSI controller found in the Sun 3/50 and 3/60, as well as for
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 9cb9fe7d623a..3746fb9fa2f5 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -50,8 +50,6 @@ obj-$(CONFIG_MVME16x_SCSI)	+= mvme16x.o	53c7xx.o
 obj-$(CONFIG_BVME6000_SCSI)     += bvme6000.o   53c7xx.o
 obj-$(CONFIG_SCSI_SIM710)       += 53c700.o     sim710.o
 obj-$(CONFIG_SCSI_ADVANSYS)     += advansys.o
-obj-$(CONFIG_SCSI_PCI2000)      += pci2000.o
-obj-$(CONFIG_SCSI_PCI2220I)     += pci2220i.o
 obj-$(CONFIG_SCSI_PSI240I)      += psi240i.o
 obj-$(CONFIG_SCSI_BUSLOGIC)     += BusLogic.o
 obj-$(CONFIG_SCSI_DPT_I2O)      += dpt_i2o.o
@@ -142,6 +140,7 @@ obj-$(CONFIG_CHR_DEV_OSST)	+= osst.o
 obj-$(CONFIG_BLK_DEV_SD)        += sd_mod.o
 obj-$(CONFIG_BLK_DEV_SR)        += sr_mod.o
 obj-$(CONFIG_CHR_DEV_SG)        += sg.o
+obj-$(CONFIG_CHR_DEV_SCH)       += ch.o
 
 scsi_mod-y                      += scsi.o hosts.o scsi_ioctl.o constants.o \
                                    scsicam.o scsi_error.o scsi_lib.o \
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 770fa841e389..f8ec6fe7d858 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2825,39 +2825,17 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
  * Locks: host lock taken by caller
  */
 
-static int NCR5380_bus_reset(Scsi_Cmnd * cmd) {
-        NCR5380_local_declare();
-        NCR5380_setup(cmd->device->host);
-
-        NCR5380_print_status(cmd->device->host);
-        do_reset(cmd->device->host);
-        return SUCCESS;
-}
-
-/* 
- * Function : int NCR5380_device_reset (Scsi_Cmnd *cmd)
- * 
- * Purpose : reset a SCSI device
- *
- * Returns : FAILED
- *
- * Locks: io_request_lock held by caller
- */
+static int NCR5380_bus_reset(Scsi_Cmnd * cmd)
+{
+        struct Scsi_Host *instance = cmd->device->host;
 
-static int NCR5380_device_reset(Scsi_Cmnd * cmd) {
-        return FAILED;
-}
+        NCR5380_local_declare();
+        NCR5380_setup(instance);
+        NCR5380_print_status(instance);
 
-/* 
- * Function : int NCR5380_host_reset (Scsi_Cmnd *cmd)
- * 
- * Purpose : reset a SCSI device
- *
- * Returns : FAILED
- *
- * Locks: io_request_lock held by caller
- */
+        spin_lock_irq(instance->host_lock);
+        do_reset(instance);
+        spin_unlock_irq(instance->host_lock);
 
-static int NCR5380_host_reset(Scsi_Cmnd * cmd) {
-        return FAILED;
+        return SUCCESS;
 }
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index b5103f94d627..c3462e358d1c 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -306,8 +306,6 @@ static void NCR5380_print(struct Scsi_Host *instance);
 #endif
 static int NCR5380_abort(Scsi_Cmnd * cmd);
 static int NCR5380_bus_reset(Scsi_Cmnd * cmd);
-static int NCR5380_host_reset(Scsi_Cmnd * cmd);
-static int NCR5380_device_reset(Scsi_Cmnd * cmd);
 static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
 static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
 off_t offset, int length, int inout);
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 74b93564a258..6ceabbd42a3d 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -94,7 +94,7 @@ enum {
 };
 
 /* The master ring of all esp hosts we are managing in this driver. */
-struct NCR_ESP *espchain;
+static struct NCR_ESP *espchain;
 int nesps = 0, esps_in_use = 0, esps_running = 0;
 
 irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
@@ -1467,14 +1467,12 @@ int esp_reset(Scsi_Cmnd *SCptr)
 {
         struct NCR_ESP *esp = (struct NCR_ESP *) SCptr->device->host->hostdata;
 
+        spin_lock_irq(esp->ehost->host_lock);
         (void) esp_do_resetbus(esp, esp->eregs);
-
         spin_unlock_irq(esp->ehost->host_lock);
 
         wait_event(esp->reset_queue, (esp->resetting_bus == 0));
 
-        spin_lock_irq(esp->ehost->host_lock);
-
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index c685d546f838..b2002ba6e2aa 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -722,15 +722,12 @@ static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
         return 0;
 }
 
-static int NCR53c406a_abort(Scsi_Cmnd * SCpnt)
-{
-        DEB(printk("NCR53c406a_abort called\n"));
-        return FAILED;          /* Don't know how to abort */
-}
-
 static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt)
 {
         DEB(printk("NCR53c406a_reset called\n"));
+
+        spin_lock_irq(SCpnt->device->host->host_lock);
+
         outb(C4_IMG, CONFIG4);  /* Select reg set 0 */
         outb(CHIP_RESET, CMD_REG);
         outb(SCSI_NOP, CMD_REG);        /* required after reset */
@@ -738,17 +735,10 @@ static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt)
         chip_init();
 
         rtrc(2);
-        return SUCCESS;
-}
 
-static int NCR53c406a_device_reset(Scsi_Cmnd * SCpnt)
-{
-        return FAILED;
-}
+        spin_unlock_irq(SCpnt->device->host->host_lock);
 
-static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt)
-{
-        return FAILED;
+        return SUCCESS;
 }
 
 static int NCR53c406a_biosparm(struct scsi_device *disk,
@@ -1075,9 +1065,6 @@ static Scsi_Host_Template driver_template =
      .release                   = NCR53c406a_release,
      .info                      = NCR53c406a_info               /* info */,             
      .queuecommand              = NCR53c406a_queue      /* queuecommand */,     
-     .eh_abort_handler          = NCR53c406a_abort      /* abort */,            
-     .eh_bus_reset_handler      = NCR53c406a_bus_reset  /* reset */,            
-     .eh_device_reset_handler   = NCR53c406a_device_reset       /* reset */,            
      .eh_host_reset_handler     = NCR53c406a_host_reset /* reset */,            
      .bios_param                = NCR53c406a_biosparm   /* biosparm */,         
      .can_queue                 = 1                     /* can_queue */,        
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 9928a2fbce0c..f7a1751e892d 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -221,7 +221,14 @@ int __init a2091_detect(Scsi_Host_Template *tpnt)
 static int a2091_bus_reset(Scsi_Cmnd *cmd)
 {
         /* FIXME perform bus-specific reset */
+
+        /* FIXME 2: kill this function, and let midlayer fall back
+           to the same action, calling wd33c93_host_reset() */
+
+        spin_lock_irq(cmd->device->host->host_lock);
         wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index f8a89ec25042..306caf56f3d9 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -208,7 +208,14 @@ fail_register:
 static int a3000_bus_reset(Scsi_Cmnd *cmd)
 {
         /* FIXME perform bus-specific reset */
+        
+        /* FIXME 2: kill this entire function, which should
+           cause mid-layer to call wd33c93_host_reset anyway? */
+
+        spin_lock_irq(cmd->device->host->host_lock);
         wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index f3fc35386060..f02c99641467 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -53,10 +53,6 @@
 #define INQD_PDT_DMASK  0x1F    /* Peripheral Device Type Mask */
 #define INQD_PDT_QMASK  0xE0    /* Peripheral Device Qualifer Mask */
 
-#define MAX_FIB_DATA (sizeof(struct hw_fib) - sizeof(FIB_HEADER))
-
-#define MAX_DRIVER_SG_SEGMENT_COUNT 17
-
 /*
  *      Sense codes
  */
@@ -158,6 +154,13 @@ MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0
 module_param(commit, int, 0);
 MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on");
 
+int numacb = -1;
+module_param(numacb, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control blocks (FIB) allocated. Valid\nvalues are 512 and down. Default is to use suggestion from Firmware.");
+
+int acbsize = -1;
+module_param(acbsize, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size. Valid values are 512,\n2048, 4096 and 8192. Default is to use suggestion from Firmware.");
 /**
  *      aac_get_config_status   -       check the adapter configuration
  *      @common: adapter to query
@@ -462,7 +465,7 @@ static int probe_container(struct aac_dev *dev, int cid)
                             1, 1,
                             NULL, NULL);
         if (status < 0) {
-                printk(KERN_WARNING "aacraid: probe_containers query failed.\n");
+                printk(KERN_WARNING "aacraid: probe_container query failed.\n");
                 goto error;
         }
 
@@ -562,10 +565,10 @@ static void setinqstr(int devtype, void *data, int tindex)
         inqstrcpy ("V1.0", str->prl);
 }
 
-void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code,
-                    u8 a_sense_code, u8 incorrect_length,
-                    u8 bit_pointer, u16 field_pointer,
-                    u32 residue)
+static void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code,
+                      u8 a_sense_code, u8 incorrect_length,
+                      u8 bit_pointer, u16 field_pointer,
+                      u32 residue)
 {
         sense_buf[0] = 0xF0;    /* Sense data valid, err code 70h (current error) */
         sense_buf[1] = 0;       /* Segment number, always zero */
@@ -605,35 +608,63 @@ void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code,
 int aac_get_adapter_info(struct aac_dev* dev)
 {
         struct fib* fibptr;
-        struct aac_adapter_info* info;
         int rcode;
         u32 tmp;
+        struct aac_adapter_info * info;
+
         if (!(fibptr = fib_alloc(dev)))
                 return -ENOMEM;
 
         fib_init(fibptr);
-        info = (struct aac_adapter_info*) fib_data(fibptr);
-
-        memset(info,0,sizeof(struct aac_adapter_info));
+        info = (struct aac_adapter_info *) fib_data(fibptr);
+        memset(info,0,sizeof(*info));
 
         rcode = fib_send(RequestAdapterInfo,
-                        fibptr, 
-                        sizeof(struct aac_adapter_info),
-                        FsaNormal, 
-                        1, 1, 
-                        NULL, 
-                        NULL);
+                         fibptr, 
+                         sizeof(*info),
+                         FsaNormal, 
+                         1, 1, 
+                         NULL, 
+                         NULL);
+
+        if (rcode < 0) {
+                fib_complete(fibptr);
+                fib_free(fibptr);
+                return rcode;
+        }
+        memcpy(&dev->adapter_info, info, sizeof(*info));
+
+        if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
+                struct aac_supplement_adapter_info * info;
 
-        memcpy(&dev->adapter_info, info, sizeof(struct aac_adapter_info));
+                fib_init(fibptr);
+
+                info = (struct aac_supplement_adapter_info *) fib_data(fibptr);
+
+                memset(info,0,sizeof(*info));
+
+                rcode = fib_send(RequestSupplementAdapterInfo,
+                                 fibptr,
+                                 sizeof(*info),
+                                 FsaNormal,
+                                 1, 1,
+                                 NULL,
+                                 NULL);
+
+                if (rcode >= 0)
+                        memcpy(&dev->supplement_adapter_info, info, sizeof(*info));
+        }
 
         tmp = le32_to_cpu(dev->adapter_info.kernelrev);
-        printk(KERN_INFO "%s%d: kernel %d.%d-%d[%d]\n", 
+        printk(KERN_INFO "%s%d: kernel %d.%d-%d[%d] %.*s\n", 
                         dev->name, 
                         dev->id,
                         tmp>>24,
                         (tmp>>16)&0xff,
                         tmp&0xff,
-                        le32_to_cpu(dev->adapter_info.kernelbuild));
+                        le32_to_cpu(dev->adapter_info.kernelbuild),
+                        (int)sizeof(dev->supplement_adapter_info.BuildDate),
+                        dev->supplement_adapter_info.BuildDate);
         tmp = le32_to_cpu(dev->adapter_info.monitorrev);
         printk(KERN_INFO "%s%d: monitor %d.%d-%d[%d]\n", 
                         dev->name, dev->id,
@@ -707,6 +738,38 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         rcode = -ENOMEM;
                 }
         }
+        /* 
+         * 57 scatter gather elements 
+         */
+        dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
+                sizeof(struct aac_fibhdr) -
+                sizeof(struct aac_write) + sizeof(struct sgmap)) /
+                        sizeof(struct sgmap);
+        if (dev->dac_support) {
+                /* 
+                 * 38 scatter gather elements 
+                 */
+                dev->scsi_host_ptr->sg_tablesize =
+                        (dev->max_fib_size -
+                        sizeof(struct aac_fibhdr) -
+                        sizeof(struct aac_write64) +
+                        sizeof(struct sgmap64)) /
+                                sizeof(struct sgmap64);
+        }
+        dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
+        if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
+                /*
+                 * Worst case size that could cause sg overflow when
+                 * we break up SG elements that are larger than 64KB.
+                 * Would be nice if we could tell the SCSI layer what
+                 * the maximum SG element size can be. Worst case is
+                 * (sg_tablesize-1) 4KB elements with one 64KB
+                 * element.
+                 *      32bit -> 468 or 238KB   64bit -> 424 or 212KB
+                 */
+                dev->scsi_host_ptr->max_sectors =
+                  (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
+        }
 
         fib_complete(fibptr);
         fib_free(fibptr);
@@ -747,8 +810,10 @@ static void read_callback(void *context, struct fib * fibptr)
         if (le32_to_cpu(readreply->status) == ST_OK)
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
         else {
-                printk(KERN_WARNING "read_callback: read failed, status = %d\n",
-                                le32_to_cpu(readreply->status));
+#ifdef AAC_DETAILED_STATUS_INFO
+                printk(KERN_WARNING "read_callback: io failed, status = %d\n",
+                  le32_to_cpu(readreply->status));
+#endif
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
                 set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
                                     HARDWARE_ERROR,
@@ -813,7 +878,7 @@ static void write_callback(void *context, struct fib * fibptr)
         aac_io_done(scsicmd);
 }
 
-int aac_read(struct scsi_cmnd * scsicmd, int cid)
+static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 {
         u32 lba;
         u32 count;
@@ -842,7 +907,8 @@ int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 lba = (scsicmd->cmnd[2] << 24) | (scsicmd->cmnd[3] << 16) | (scsicmd->cmnd[4] << 8) | scsicmd->cmnd[5];
                 count = (scsicmd->cmnd[7] << 8) | scsicmd->cmnd[8];
         }
-        dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), lba, jiffies));
+        dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %u, t = %ld.\n",
+          smp_processor_id(), (unsigned long long)lba, jiffies));
         /*
          *      Alocate and initialize a Fib
          */
@@ -852,7 +918,7 @@ int aac_read(struct scsi_cmnd * scsicmd, int cid)
 
         fib_init(cmd_fibcontext);
 
-        if(dev->dac_support == 1) {
+        if (dev->dac_support == 1) {
                 struct aac_read64 *readcmd;
                 readcmd = (struct aac_read64 *) fib_data(cmd_fibcontext);
                 readcmd->command = cpu_to_le32(VM_CtHostRead64);
@@ -886,14 +952,11 @@ int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 readcmd->block = cpu_to_le32(lba);
                 readcmd->count = cpu_to_le32(count * 512);
 
-                if (count * 512 > (64 * 1024))
-                        BUG();
-
                 aac_build_sg(scsicmd, &readcmd->sg);
                 fibsize = sizeof(struct aac_read) + 
                         ((le32_to_cpu(readcmd->sg.count) - 1) * 
                          sizeof (struct sgentry));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size -
                                         sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
@@ -976,7 +1039,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 fibsize = sizeof(struct aac_write64) + 
                         ((le32_to_cpu(writecmd->sg.count) - 1) * 
                          sizeof (struct sgentry64));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size -
                                         sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
@@ -998,15 +1061,11 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 writecmd->sg.count = cpu_to_le32(1);
                 /* ->stable is not used - it did mean which type of write */
 
-                if (count * 512 > (64 * 1024)) {
-                        BUG();
-                }
-
                 aac_build_sg(scsicmd, &writecmd->sg);
                 fibsize = sizeof(struct aac_write) + 
                         ((le32_to_cpu(writecmd->sg.count) - 1) * 
                          sizeof (struct sgentry));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size -
                                         sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
@@ -1025,7 +1084,6 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
          */
         if (status == -EINPROGRESS)
         {
-                dprintk("write queued.\n");
                 return 0;
         }
 
@@ -1111,7 +1169,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
                 return SCSI_MLQUEUE_DEVICE_BUSY;
 
         /*
-         *      Alocate and initialize a Fib
+         *      Allocate and initialize a Fib
          */
         if (!(cmd_fibcontext = 
             fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata))) 
@@ -1403,7 +1461,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                         /*
                          *      Unhandled commands
                          */
-                        printk(KERN_WARNING "Unhandled SCSI Command: 0x%x.\n", scsicmd->cmnd[0]);
+                        dprintk((KERN_WARNING "Unhandled SCSI Command: 0x%x.\n", scsicmd->cmnd[0]));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
                         set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
                                 ILLEGAL_REQUEST, SENCODE_INVALID_COMMAND,
@@ -1818,7 +1876,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
                 fibsize = sizeof (struct aac_srb) - sizeof (struct sgentry) +
                         ((le32_to_cpu(srbcmd->sg.count) & 0xff) * 
                          sizeof (struct sgentry64));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size -
                                         sizeof(struct aac_fibhdr)));
 
                 /*
@@ -1840,7 +1898,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
                 fibsize = sizeof (struct aac_srb) + 
                         (((le32_to_cpu(srbcmd->sg.count) & 0xff) - 1) * 
                          sizeof (struct sgentry));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size -
                                         sizeof(struct aac_fibhdr)));
 
                 /*
@@ -1893,7 +1951,9 @@ static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* psg)
                 }
                 /* hba wants the size to be exact */
                 if(byte_count > scsicmd->request_bufflen){
-                        psg->sg[i-1].count -= (byte_count - scsicmd->request_bufflen);
+                        u32 temp = le32_to_cpu(psg->sg[i-1].count) - 
+                                (byte_count - scsicmd->request_bufflen);
+                        psg->sg[i-1].count = cpu_to_le32(temp);
                         byte_count = scsicmd->request_bufflen;
                 }
                 /* Check for command underflow */
@@ -1922,7 +1982,7 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
 {
         struct aac_dev *dev;
         unsigned long byte_count = 0;
-        u64 le_addr;
+        u64 addr;
 
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
         // Get rid of old data
@@ -1943,16 +2003,18 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
                 byte_count = 0;
 
                 for (i = 0; i < sg_count; i++) {
-                        le_addr = cpu_to_le64(sg_dma_address(sg));
-                        psg->sg[i].addr[1] = (u32)(le_addr>>32);
-                        psg->sg[i].addr[0] = (u32)(le_addr & 0xffffffff);
+                        addr = sg_dma_address(sg);
+                        psg->sg[i].addr[0] = cpu_to_le32(addr & 0xffffffff);
+                        psg->sg[i].addr[1] = cpu_to_le32(addr>>32);
                         psg->sg[i].count = cpu_to_le32(sg_dma_len(sg));
                         byte_count += sg_dma_len(sg);
                         sg++;
                 }
                 /* hba wants the size to be exact */
                 if(byte_count > scsicmd->request_bufflen){
-                        psg->sg[i-1].count -= (byte_count - scsicmd->request_bufflen);
+                        u32 temp = le32_to_cpu(psg->sg[i-1].count) - 
+                                (byte_count - scsicmd->request_bufflen);
+                        psg->sg[i-1].count = cpu_to_le32(temp);
                         byte_count = scsicmd->request_bufflen;
                 }
                 /* Check for command underflow */
@@ -1962,15 +2024,14 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
                 }
         }
         else if(scsicmd->request_bufflen) {
-                dma_addr_t addr; 
+                u64 addr; 
                 addr = pci_map_single(dev->pdev,
                                 scsicmd->request_buffer,
                                 scsicmd->request_bufflen,
                                 scsicmd->sc_data_direction);
                 psg->count = cpu_to_le32(1);
-                le_addr = cpu_to_le64(addr);
-                psg->sg[0].addr[1] = (u32)(le_addr>>32);
-                psg->sg[0].addr[0] = (u32)(le_addr & 0xffffffff);
+                psg->sg[0].addr[0] = cpu_to_le32(addr & 0xffffffff);
+                psg->sg[0].addr[1] = cpu_to_le32(addr >> 32);
                 psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);  
                 scsicmd->SCp.dma_handle = addr;
                 byte_count = scsicmd->request_bufflen;
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 700d90331c1c..42484417cef7 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -8,12 +8,18 @@
 
 #define MAXIMUM_NUM_CONTAINERS  32
 
-#define AAC_NUM_FIB             (256 + 64)
-#define AAC_NUM_IO_FIB          100
+#define AAC_NUM_MGT_FIB         8
+#define AAC_NUM_IO_FIB          (512 - AAC_NUM_MGT_FIB)
+#define AAC_NUM_FIB             (AAC_NUM_IO_FIB + AAC_NUM_MGT_FIB)
 
 #define AAC_MAX_LUN             (8)
 
 #define AAC_MAX_HOSTPHYSMEMPAGES (0xfffff)
+/*
+ *  max_sectors is an unsigned short, otherwise limit is 0x100000000 / 512
+ * Linux has starvation problems if we permit larger than 4MB I/O ...
+ */
+#define AAC_MAX_32BIT_SGBCOUNT  ((unsigned short)8192)
 
 /*
  * These macros convert from physical channels to virtual channels
@@ -89,11 +95,21 @@ struct diskparm
  *      on 64 bit systems not all cards support the 64 bit version
  */
 struct sgentry {
+        __le32  addr;   /* 32-bit address. */
+        __le32  count;  /* Length. */
+};
+
+struct user_sgentry {
         u32     addr;   /* 32-bit address. */
         u32     count;  /* Length. */
 };
 
 struct sgentry64 {
+        __le32  addr[2];        /* 64-bit addr. 2 pieces for data alignment */
+        __le32  count;  /* Length. */
+};
+
+struct user_sgentry64 {
         u32     addr[2];        /* 64-bit addr. 2 pieces for data alignment */
         u32     count;  /* Length. */
 };
@@ -106,15 +122,25 @@ struct sgentry64 {
  */
 
 struct sgmap {
-        u32             count;
+        __le32          count;
         struct sgentry  sg[1]; 
 };
 
-struct sgmap64 {
+struct user_sgmap {
         u32             count;
+        struct user_sgentry     sg[1]; 
+};
+
+struct sgmap64 {
+        __le32          count;
         struct sgentry64 sg[1];
 };
 
+struct user_sgmap64 {
+        u32             count;
+        struct user_sgentry64 sg[1];
+};
+
 struct creation_info
 {
         u8              buildnum;               /* e.g., 588 */
@@ -123,14 +149,14 @@ struct creation_info
                                                  *       2 = API
                                                  */
         u8              year;                   /* e.g., 1997 = 97 */
-        u32             date;                   /*
+        __le32          date;                   /*
                                                  * unsigned     Month           :4;     // 1 - 12
                                                  * unsigned     Day             :6;     // 1 - 32
                                                  * unsigned     Hour            :6;     // 0 - 23
                                                  * unsigned     Minute          :6;     // 0 - 60
                                                  * unsigned     Second          :6;     // 0 - 60
                                                  */
-        u32             serial[2];                      /* e.g., 0x1DEADB0BFAFAF001 */
+        __le32          serial[2];                      /* e.g., 0x1DEADB0BFAFAF001 */
 };
 
 
@@ -175,8 +201,8 @@ struct creation_info
  */
 
 struct aac_entry {
-        u32 size;          /* Size in bytes of Fib which this QE points to */
-        u32 addr; /* Receiver address of the FIB */
+        __le32 size; /* Size in bytes of Fib which this QE points to */
+        __le32 addr; /* Receiver address of the FIB */
 };
 
 /*
@@ -185,9 +211,10 @@ struct aac_entry {
  */
  
 struct aac_qhdr {
-        u64 header_addr;                /* Address to hand the adapter to access to this queue head */
-        u32 *producer;                  /* The producer index for this queue (host address) */
-        u32 *consumer;                  /* The consumer index for this queue (host address) */
+        __le64 header_addr;/* Address to hand the adapter to access 
+                              to this queue head */
+        __le32 *producer; /* The producer index for this queue (host address) */
+        __le32 *consumer; /* The consumer index for this queue (host address) */
 };
 
 /*
@@ -261,29 +288,30 @@ enum aac_queue_types {
  */
 
 struct aac_fibhdr {
-        u32 XferState;                  // Current transfer state for this CCB
-        u16 Command;                    // Routing information for the destination
-        u8 StructType;                  // Type FIB
-        u8 Flags;                       // Flags for FIB
-        u16 Size;                       // Size of this FIB in bytes
-        u16 SenderSize;                 // Size of the FIB in the sender (for response sizing)
-        u32 SenderFibAddress;           // Host defined data in the FIB
-        u32 ReceiverFibAddress;         // Logical address of this FIB for the adapter
-        u32 SenderData;                 // Place holder for the sender to store data
+        __le32 XferState;       /* Current transfer state for this CCB */
+        __le16 Command;         /* Routing information for the destination */
+        u8 StructType;          /* Type FIB */
+        u8 Flags;               /* Flags for FIB */
+        __le16 Size;            /* Size of this FIB in bytes */
+        __le16 SenderSize;      /* Size of the FIB in the sender 
+                                   (for response sizing) */
+        __le32 SenderFibAddress;  /* Host defined data in the FIB */
+        __le32 ReceiverFibAddress;/* Logical address of this FIB for 
+                                     the adapter */
+        u32 SenderData;         /* Place holder for the sender to store data */
         union {
                 struct {
-                    u32 _ReceiverTimeStart;     // Timestamp for receipt of fib
-                    u32 _ReceiverTimeDone;      // Timestamp for completion of fib
+                    __le32 _ReceiverTimeStart;  /* Timestamp for 
+                                                   receipt of fib */
+                    __le32 _ReceiverTimeDone;   /* Timestamp for 
+                                                   completion of fib */
                 } _s;
         } _u;
 };
 
-#define FIB_DATA_SIZE_IN_BYTES (512 - sizeof(struct aac_fibhdr))
-
-
 struct hw_fib {
         struct aac_fibhdr header;
-        u8 data[FIB_DATA_SIZE_IN_BYTES];                // Command specific data
+        u8 data[512-sizeof(struct aac_fibhdr)]; // Command specific data
 };
 
 /*
@@ -345,11 +373,12 @@ struct hw_fib {
 #define         RequestAdapterInfo              703
 #define         IsAdapterPaused                 704
 #define         SendHostTime                    705
-#define         LastMiscCommand                 706
+#define         RequestSupplementAdapterInfo    706
+#define         LastMiscCommand                 707
 
-//
-// Commands that will target the failover level on the FSA adapter
-//
+/*
+ * Commands that will target the failover level on the FSA adapter
+ */
 
 enum fib_xfer_state {
         HostOwned                       = (1<<0),
@@ -382,22 +411,32 @@ enum fib_xfer_state {
  */
 
 #define ADAPTER_INIT_STRUCT_REVISION            3
+#define ADAPTER_INIT_STRUCT_REVISION_4          4 // rocket science
 
 struct aac_init
 {
-        u32     InitStructRevision;
-        u32     MiniPortRevision;
-        u32     fsrev;
-        u32     CommHeaderAddress;
-        u32     FastIoCommAreaAddress;
-        u32     AdapterFibsPhysicalAddress;
-        u32     AdapterFibsVirtualAddress;
-        u32     AdapterFibsSize;
-        u32     AdapterFibAlign;
-        u32     printfbuf;
-        u32     printfbufsiz;
-        u32     HostPhysMemPages;               // number of 4k pages of host physical memory
-        u32     HostElapsedSeconds;             // number of seconds since 1970.
+        __le32  InitStructRevision;
+        __le32  MiniPortRevision;
+        __le32  fsrev;
+        __le32  CommHeaderAddress;
+        __le32  FastIoCommAreaAddress;
+        __le32  AdapterFibsPhysicalAddress;
+        __le32  AdapterFibsVirtualAddress;
+        __le32  AdapterFibsSize;
+        __le32  AdapterFibAlign;
+        __le32  printfbuf;
+        __le32  printfbufsiz;
+        __le32  HostPhysMemPages;   /* number of 4k pages of host 
+                                       physical memory */
+        __le32  HostElapsedSeconds; /* number of seconds since 1970. */
+        /*
+         * ADAPTER_INIT_STRUCT_REVISION_4 begins here
+         */
+        __le32  InitFlags;      /* flags for supported features */
+#define INITFLAGS_NEW_COMM_SUPPORTED    0x00000001
+        __le32  MaxIoCommands;  /* max outstanding commands */
+        __le32  MaxIoSize;      /* largest I/O command */
+        __le32  MaxFibSize;     /* largest FIB to adapter */
 };
 
 enum aac_log_level {
@@ -421,7 +460,7 @@ struct adapter_ops
 {
         void (*adapter_interrupt)(struct aac_dev *dev);
         void (*adapter_notify)(struct aac_dev *dev, u32 event);
-        int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 *status);
+        int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);
         int  (*adapter_check_health)(struct aac_dev *dev);
 };
 
@@ -541,6 +580,7 @@ struct sa_drawbridge_CSR {
 #define Mailbox3        SaDbCSR.MAILBOX3
 #define Mailbox4        SaDbCSR.MAILBOX4
 #define Mailbox5        SaDbCSR.MAILBOX5
+#define Mailbox6        SaDbCSR.MAILBOX6
 #define Mailbox7        SaDbCSR.MAILBOX7
         
 #define DoorbellReg_p SaDbCSR.PRISETIRQ
@@ -763,29 +803,48 @@ struct fib {
  
 struct aac_adapter_info
 {
-        u32     platform;
-        u32     cpu;
-        u32     subcpu;
-        u32     clock;
-        u32     execmem;
-        u32     buffermem;
-        u32     totalmem;
-        u32     kernelrev;
-        u32     kernelbuild;
-        u32     monitorrev;
-        u32     monitorbuild;
-        u32     hwrev;
-        u32     hwbuild;
-        u32     biosrev;
-        u32     biosbuild;
-        u32     cluster;
-        u32     clusterchannelmask; 
-        u32     serial[2];
-        u32     battery;
-        u32     options;
-        u32     OEM;
+        __le32  platform;
+        __le32  cpu;
+        __le32  subcpu;
+        __le32  clock;
+        __le32  execmem;
+        __le32  buffermem;
+        __le32  totalmem;
+        __le32  kernelrev;
+        __le32  kernelbuild;
+        __le32  monitorrev;
+        __le32  monitorbuild;
+        __le32  hwrev;
+        __le32  hwbuild;
+        __le32  biosrev;
+        __le32  biosbuild;
+        __le32  cluster;
+        __le32  clusterchannelmask; 
+        __le32  serial[2];
+        __le32  battery;
+        __le32  options;
+        __le32  OEM;
 };
 
+struct aac_supplement_adapter_info
+{
+        u8      AdapterTypeText[17+1];
+        u8      Pad[2];
+        __le32  FlashMemoryByteSize;
+        __le32  FlashImageId;
+        __le32  MaxNumberPorts;
+        __le32  Version;
+        __le32  FeatureBits;
+        u8      SlotNumber;
+        u8      ReservedPad0[0];
+        u8      BuildDate[12];
+        __le32  CurrentNumberPorts;
+        __le32  ReservedGrowth[24];
+};
+#define AAC_FEATURE_FALCON      0x00000010
+#define AAC_SIS_VERSION_V3      3
+#define AAC_SIS_SLOT_UNKNOWN    0xFF
+
 /*
  * Battery platforms
  */
@@ -831,6 +890,12 @@ struct aac_dev
 
         u16                     irq_mask;
         /*
+         *      negotiated FIB settings
+         */
+        unsigned                max_fib_size;
+        unsigned                sg_tablesize;
+
+        /*
          *      Map for 128 fib objects (64k)
          */     
         dma_addr_t              hw_fib_pa;
@@ -889,12 +954,14 @@ struct aac_dev
         u32                     aif_thread;
         struct completion       aif_completion;
         struct aac_adapter_info adapter_info;
+        struct aac_supplement_adapter_info supplement_adapter_info;
         /* These are in adapter info but they are in the io flow so
          * lets break them out so we don't have to do an AND to check them
          */
         u8                      nondasd_support; 
         u8                      dac_support;
         u8                      raid_scsi_mode;
+        u8                      printf_enabled;
 };
 
 #define aac_adapter_interrupt(dev) \
@@ -903,6 +970,8 @@ struct aac_dev
 #define aac_adapter_notify(dev, event) \
         (dev)->a_ops.adapter_notify(dev, event)
 
+#define aac_adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4) \
+        (dev)->a_ops.adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4)
 
 #define aac_adapter_check_health(dev) \
         (dev)->a_ops.adapter_check_health(dev)
@@ -1016,83 +1085,102 @@ struct aac_dev
 
 struct aac_read
 {
-        u32             command;
-        u32             cid;
-        u32             block;
-        u32             count;
+        __le32          command;
+        __le32          cid;
+        __le32          block;
+        __le32          count;
         struct sgmap    sg;     // Must be last in struct because it is variable
 };
 
 struct aac_read64
 {
-        u32             command;
-        u16             cid;
-        u16             sector_count;
-        u32             block;
-        u16             pad;
-        u16             flags;
+        __le32          command;
+        __le16          cid;
+        __le16          sector_count;
+        __le32          block;
+        __le16          pad;
+        __le16          flags;
         struct sgmap64  sg;     // Must be last in struct because it is variable
 };
 
 struct aac_read_reply
 {
-        u32             status;
-        u32             count;
+        __le32          status;
+        __le32          count;
 };
 
 struct aac_write
 {
-        u32             command;
-        u32             cid;
-        u32             block;
-        u32             count;
-        u32             stable; // Not used
+        __le32          command;
+        __le32          cid;
+        __le32          block;
+        __le32          count;
+        __le32          stable; // Not used
         struct sgmap    sg;     // Must be last in struct because it is variable
 };
 
 struct aac_write64
 {
-        u32             command;
-        u16             cid;
-        u16             sector_count;
-        u32             block;
-        u16             pad;
-        u16             flags;
+        __le32          command;
+        __le16          cid;
+        __le16          sector_count;
+        __le32          block;
+        __le16          pad;
+        __le16          flags;
         struct sgmap64  sg;     // Must be last in struct because it is variable
 };
 struct aac_write_reply
 {
-        u32             status;
-        u32             count;
-        u32             committed;
+        __le32          status;
+        __le32          count;
+        __le32          committed;
 };
 
 #define CT_FLUSH_CACHE 129
 struct aac_synchronize {
-        u32             command;        /* VM_ContainerConfig */
-        u32             type;           /* CT_FLUSH_CACHE */
-        u32             cid;
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             count;  /* sizeof(((struct aac_synchronize_reply *)NULL)->data) */
+        __le32          command;        /* VM_ContainerConfig */
+        __le32          type;           /* CT_FLUSH_CACHE */
+        __le32          cid;
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          count;  /* sizeof(((struct aac_synchronize_reply *)NULL)->data) */
 };
 
 struct aac_synchronize_reply {
-        u32             dummy0;
-        u32             dummy1;
-        u32             status; /* CT_OK */
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             parm5;
+        __le32          dummy0;
+        __le32          dummy1;
+        __le32          status; /* CT_OK */
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          parm5;
         u8              data[16];
 };
 
 struct aac_srb
 {
+        __le32          function;
+        __le32          channel;
+        __le32          id;
+        __le32          lun;
+        __le32          timeout;
+        __le32          flags;
+        __le32          count;          // Data xfer size
+        __le32          retry_limit;
+        __le32          cdb_size;
+        u8              cdb[16];
+        struct  sgmap   sg;
+};
+
+/*
+ * This and assocated data structs are used by the 
+ * ioctl caller and are in cpu order.
+ */
+struct user_aac_srb
+{
         u32             function;
         u32             channel;
         u32             id;
@@ -1103,20 +1191,18 @@ struct aac_srb
         u32             retry_limit;
         u32             cdb_size;
         u8              cdb[16];
-        struct  sgmap   sg;
+        struct  user_sgmap      sg;
 };
 
-
-
 #define         AAC_SENSE_BUFFERSIZE     30
 
 struct aac_srb_reply
 {
-        u32             status;
-        u32             srb_status;
-        u32             scsi_status;
-        u32             data_xfer_length;
-        u32             sense_data_size;
+        __le32          status;
+        __le32          srb_status;
+        __le32          scsi_status;
+        __le32          data_xfer_length;
+        __le32          sense_data_size;
         u8              sense_data[AAC_SENSE_BUFFERSIZE]; // Can this be SCSI_SENSE_BUFFERSIZE
 };
 /*
@@ -1223,14 +1309,14 @@ struct aac_srb_reply
  */
 
 struct aac_fsinfo {
-        u32  fsTotalSize;       /* Consumed by fs, incl. metadata */
-        u32  fsBlockSize;
-        u32  fsFragSize;
-        u32  fsMaxExtendSize;
-        u32  fsSpaceUnits;
-        u32  fsMaxNumFiles;
-        u32  fsNumFreeFiles;
-        u32  fsInodeDensity;
+        __le32  fsTotalSize;    /* Consumed by fs, incl. metadata */
+        __le32  fsBlockSize;
+        __le32  fsFragSize;
+        __le32  fsMaxExtendSize;
+        __le32  fsSpaceUnits;
+        __le32  fsMaxNumFiles;
+        __le32  fsNumFreeFiles;
+        __le32  fsInodeDensity;
 };      /* valid iff ObjType == FT_FILESYS && !(ContentState & FSCS_NOTCLEAN) */
 
 union aac_contentinfo {
@@ -1243,32 +1329,32 @@ union aac_contentinfo {
 
 #define CT_GET_CONFIG_STATUS 147
 struct aac_get_config_status {
-        u32             command;        /* VM_ContainerConfig */
-        u32             type;           /* CT_GET_CONFIG_STATUS */
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             parm5;
-        u32             count;  /* sizeof(((struct aac_get_config_status_resp *)NULL)->data) */
+        __le32          command;        /* VM_ContainerConfig */
+        __le32          type;           /* CT_GET_CONFIG_STATUS */
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          parm5;
+        __le32          count;  /* sizeof(((struct aac_get_config_status_resp *)NULL)->data) */
 };
 
 #define CFACT_CONTINUE 0
 #define CFACT_PAUSE    1
 #define CFACT_ABORT    2
 struct aac_get_config_status_resp {
-        u32             response; /* ST_OK */
-        u32             dummy0;
-        u32             status; /* CT_OK */
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             parm5;
+        __le32          response; /* ST_OK */
+        __le32          dummy0;
+        __le32          status; /* CT_OK */
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          parm5;
         struct {
-                u32     action; /* CFACT_CONTINUE, CFACT_PAUSE or CFACT_ABORT */
-                u16     flags;
-                s16     count;
+                __le32  action; /* CFACT_CONTINUE, CFACT_PAUSE or CFACT_ABORT */
+                __le16  flags;
+                __le16  count;
         }               data;
 };
 
@@ -1279,26 +1365,26 @@ struct aac_get_config_status_resp {
 #define CT_COMMIT_CONFIG 152
 
 struct aac_commit_config {
-        u32             command;        /* VM_ContainerConfig */
-        u32             type;           /* CT_COMMIT_CONFIG */
+        __le32          command;        /* VM_ContainerConfig */
+        __le32          type;           /* CT_COMMIT_CONFIG */
 };
 
 /*
- *      Query for Container Configuration Count
+ *      Query for Container Configuration Status
  */
 
 #define CT_GET_CONTAINER_COUNT 4
 struct aac_get_container_count {
-        u32             command;        /* VM_ContainerConfig */
-        u32             type;           /* CT_GET_CONTAINER_COUNT */
+        __le32          command;        /* VM_ContainerConfig */
+        __le32          type;           /* CT_GET_CONTAINER_COUNT */
 };
 
 struct aac_get_container_count_resp {
-        u32             response; /* ST_OK */
-        u32             dummy0;
-        u32             MaxContainers;
-        u32             ContainerSwitchEntries;
-        u32             MaxPartitions;
+        __le32          response; /* ST_OK */
+        __le32          dummy0;
+        __le32          MaxContainers;
+        __le32          ContainerSwitchEntries;
+        __le32          MaxPartitions;
 };
 
 
@@ -1308,15 +1394,19 @@ struct aac_get_container_count_resp {
  */
 
 struct aac_mntent {
-        u32                     oid;
-        u8                      name[16];       // if applicable
-        struct creation_info    create_info;    // if applicable
-        u32                     capacity;
-        u32                     vol;            // substrate structure
-        u32                     obj;            // FT_FILESYS, FT_DATABASE, etc.
-        u32                     state;          // unready for mounting, readonly, etc.
-        union aac_contentinfo   fileinfo;       // Info specific to content manager (eg, filesystem)
-        u32                     altoid;         // != oid <==> snapshot or broken mirror exists
+        __le32                  oid;
+        u8                      name[16];       /* if applicable */
+        struct creation_info    create_info;    /* if applicable */
+        __le32                  capacity;
+        __le32                  vol;            /* substrate structure */
+        __le32                  obj;            /* FT_FILESYS, 
+                                                   FT_DATABASE, etc. */
+        __le32                  state;          /* unready for mounting, 
+                                                   readonly, etc. */
+        union aac_contentinfo   fileinfo;       /* Info specific to content 
+                                                   manager (eg, filesystem) */
+        __le32                  altoid;         /* != oid <==> snapshot or 
+                                                   broken mirror exists */
 };
 
 #define FSCS_NOTCLEAN   0x0001  /* fsck is neccessary before mounting */
@@ -1324,40 +1414,40 @@ struct aac_mntent {
 #define FSCS_HIDDEN     0x0004  /* should be ignored - set during a clear */
 
 struct aac_query_mount {
-        u32             command;
-        u32             type;
-        u32             count;
+        __le32          command;
+        __le32          type;
+        __le32          count;
 };
 
 struct aac_mount {
-        u32             status;
-        u32             type;           /* should be same as that requested */
-        u32             count;
+        __le32          status;
+        __le32          type;           /* should be same as that requested */
+        __le32          count;
         struct aac_mntent mnt[1];
 };
 
 #define CT_READ_NAME 130
 struct aac_get_name {
-        u32             command;        /* VM_ContainerConfig */
-        u32             type;           /* CT_READ_NAME */
-        u32             cid;
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             count;  /* sizeof(((struct aac_get_name_resp *)NULL)->data) */
+        __le32          command;        /* VM_ContainerConfig */
+        __le32          type;           /* CT_READ_NAME */
+        __le32          cid;
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          count;  /* sizeof(((struct aac_get_name_resp *)NULL)->data) */
 };
 
 #define CT_OK        218
 struct aac_get_name_resp {
-        u32             dummy0;
-        u32             dummy1;
-        u32             status; /* CT_OK */
-        u32             parm1;
-        u32             parm2;
-        u32             parm3;
-        u32             parm4;
-        u32             parm5;
+        __le32          dummy0;
+        __le32          dummy1;
+        __le32          status; /* CT_OK */
+        __le32          parm1;
+        __le32          parm2;
+        __le32          parm3;
+        __le32          parm4;
+        __le32          parm5;
         u8              data[16];
 };
 
@@ -1366,8 +1456,8 @@ struct aac_get_name_resp {
  */
 
 struct aac_close {
-        u32     command;
-        u32     cid;
+        __le32  command;
+        __le32  cid;
 };
 
 struct aac_query_disk
@@ -1434,6 +1524,7 @@ struct revision
 #define FSACTL_GET_PCI_INFO                     CTL_CODE(2119, METHOD_BUFFERED)
 #define FSACTL_FORCE_DELETE_DISK                CTL_CODE(2120, METHOD_NEITHER)
 #define FSACTL_GET_CONTAINERS                   2131
+#define FSACTL_SEND_LARGE_FIB                   CTL_CODE(2138, METHOD_BUFFERED)
 
 
 struct aac_common
@@ -1573,8 +1664,8 @@ extern struct aac_common aac_config;
  */
 
 struct aac_aifcmd {
-        u32 command;            /* Tell host what type of notify this is */
-        u32 seqnum;             /* To allow ordering of reports (if necessary) */
+        __le32 command;         /* Tell host what type of notify this is */
+        __le32 seqnum;          /* To allow ordering of reports (if necessary) */
         u8 data[1];             /* Undefined length (from kernel viewpoint) */
 };
 
@@ -1597,7 +1688,6 @@ int fib_setup(struct aac_dev *dev);
 void fib_map_free(struct aac_dev *dev);
 void fib_free(struct fib * context);
 void fib_init(struct fib * context);
-void fib_dealloc(struct fib * context);
 void aac_printf(struct aac_dev *dev, u32 val);
 int fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt);
 int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry);
@@ -1621,3 +1711,5 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size);
 struct aac_driver_ident* aac_get_driver_ident(int devtype);
 int aac_get_adapter_info(struct aac_dev* dev);
 int aac_send_shutdown(struct aac_dev *dev);
+extern int numacb;
+extern int acbsize;
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 30dd1f7120f4..1fef92d55dee 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -51,15 +51,22 @@
  *      This routine sends a fib to the adapter on behalf of a user level
  *      program.
  */
+# define AAC_DEBUG_PREAMBLE     KERN_INFO
+# define AAC_DEBUG_POSTAMBLE
  
 static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
 {
         struct hw_fib * kfib;
         struct fib *fibptr;
+        struct hw_fib * hw_fib = (struct hw_fib *)0;
+        dma_addr_t hw_fib_pa = (dma_addr_t)0LL;
+        unsigned size;
+        int retval;
 
         fibptr = fib_alloc(dev);
-        if(fibptr == NULL)
+        if(fibptr == NULL) {
                 return -ENOMEM;
+        }
                 
         kfib = fibptr->hw_fib;
         /*
@@ -74,19 +81,24 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
          *      will not overrun the buffer when we copy the memory. Return
          *      an error if we would.
          */
-        if (le16_to_cpu(kfib->header.Size) > 
-                        sizeof(struct hw_fib) - sizeof(struct aac_fibhdr)) {
-                fib_free(fibptr);
-                return -EINVAL;
+        size = le16_to_cpu(kfib->header.Size) + sizeof(struct aac_fibhdr);
+        if (size < le16_to_cpu(kfib->header.SenderSize))
+                size = le16_to_cpu(kfib->header.SenderSize);
+        if (size > dev->max_fib_size) {
+                /* Highjack the hw_fib */
+                hw_fib = fibptr->hw_fib;
+                hw_fib_pa = fibptr->hw_fib_pa;
+                fibptr->hw_fib = kfib = pci_alloc_consistent(dev->pdev, size, &fibptr->hw_fib_pa);
+                memset(((char *)kfib) + dev->max_fib_size, 0, size - dev->max_fib_size);
+                memcpy(kfib, hw_fib, dev->max_fib_size);
         }
 
-        if (copy_from_user(kfib, arg, le16_to_cpu(kfib->header.Size) +
-                                sizeof(struct aac_fibhdr))) {
-                fib_free(fibptr);
-                return -EFAULT;
+        if (copy_from_user(kfib, arg, size)) {
+                retval = -EFAULT;
+                goto cleanup;
         }
 
-        if (kfib->header.Command == cpu_to_le32(TakeABreakPt)) {
+        if (kfib->header.Command == cpu_to_le16(TakeABreakPt)) {
                 aac_adapter_interrupt(dev);
                 /*
                  * Since we didn't really send a fib, zero out the state to allow 
@@ -94,16 +106,15 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
                  */
                 kfib->header.XferState = 0;
         } else {
-                int retval = fib_send(kfib->header.Command, fibptr,
+                retval = fib_send(le16_to_cpu(kfib->header.Command), fibptr,
                                 le16_to_cpu(kfib->header.Size) , FsaNormal,
                                 1, 1, NULL, NULL);
                 if (retval) {
-                        fib_free(fibptr);
-                        return retval;
+                        goto cleanup;
                 }
                 if (fib_complete(fibptr) != 0) {
-                        fib_free(fibptr);
-                        return -EINVAL;
+                        retval = -EINVAL;
+                        goto cleanup;
                 }
         }
         /*
@@ -114,12 +125,17 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
          *      was already included by the adapter.)
          */
 
-        if (copy_to_user(arg, (void *)kfib, kfib->header.Size)) {
-                fib_free(fibptr);
-                return -EFAULT;
+        retval = 0;
+        if (copy_to_user(arg, (void *)kfib, size))
+                retval = -EFAULT;
+cleanup:
+        if (hw_fib) {
+                pci_free_consistent(dev->pdev, size, kfib, fibptr->hw_fib_pa);
+                fibptr->hw_fib_pa = hw_fib_pa;
+                fibptr->hw_fib = hw_fib;
         }
         fib_free(fibptr);
-        return 0;
+        return retval;
 }
 
 /**
@@ -391,26 +407,28 @@ static int check_revision(struct aac_dev *dev, void __user *arg)
         struct revision response;
 
         response.compat = 1;
-        response.version = dev->adapter_info.kernelrev;
-        response.build = dev->adapter_info.kernelbuild;
+        response.version = le32_to_cpu(dev->adapter_info.kernelrev);
+        response.build = le32_to_cpu(dev->adapter_info.kernelbuild);
 
         if (copy_to_user(arg, &response, sizeof(response)))
                 return -EFAULT;
         return 0;
 }
 
+
 /**
  *
  * aac_send_raw_scb
  *
  */
 
-int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
+static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
 {
         struct fib* srbfib;
         int status;
-        struct aac_srb *srbcmd;
-        struct aac_srb __user *user_srb = arg;
+        struct aac_srb *srbcmd = NULL;
+        struct user_aac_srb *user_srbcmd = NULL;
+        struct user_aac_srb __user *user_srb = arg;
         struct aac_srb_reply __user *user_reply;
         struct aac_srb_reply* reply;
         u32 fibsize = 0;
@@ -426,50 +444,59 @@ int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
 
 
         if (!capable(CAP_SYS_ADMIN)){
-                printk(KERN_DEBUG"aacraid: No permission to send raw srb\n"); 
+                dprintk((KERN_DEBUG"aacraid: No permission to send raw srb\n")); 
                 return -EPERM;
         }
         /*
          *      Allocate and initialize a Fib then setup a BlockWrite command
          */
         if (!(srbfib = fib_alloc(dev))) {
-                return -1;
+                return -ENOMEM;
         }
         fib_init(srbfib);
 
         srbcmd = (struct aac_srb*) fib_data(srbfib);
 
+        memset(sg_list, 0, sizeof(sg_list)); /* cleanup may take issue */
         if(copy_from_user(&fibsize, &user_srb->count,sizeof(u32))){
-                printk(KERN_DEBUG"aacraid: Could not copy data size from user\n"); 
+                dprintk((KERN_DEBUG"aacraid: Could not copy data size from user\n")); 
                 rcode = -EFAULT;
                 goto cleanup;
         }
 
-        if (fibsize > FIB_DATA_SIZE_IN_BYTES) {
+        if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr))) {
                 rcode = -EINVAL;
                 goto cleanup;
         }
 
-        if(copy_from_user(srbcmd, user_srb,fibsize)){
-                printk(KERN_DEBUG"aacraid: Could not copy srb from user\n"); 
+        user_srbcmd = kmalloc(GFP_KERNEL, fibsize);
+        if (!user_srbcmd) {
+                dprintk((KERN_DEBUG"aacraid: Could not make a copy of the srb\n"));
+                rcode = -ENOMEM;
+                goto cleanup;
+        }
+        if(copy_from_user(user_srbcmd, user_srb,fibsize)){
+                dprintk((KERN_DEBUG"aacraid: Could not copy srb from user\n")); 
                 rcode = -EFAULT;
                 goto cleanup;
         }
 
         user_reply = arg+fibsize;
 
-        flags = srbcmd->flags;
+        flags = user_srbcmd->flags; /* from user in cpu order */
         // Fix up srb for endian and force some values
+
         srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi);       // Force this
-        srbcmd->channel  = cpu_to_le32(srbcmd->channel);
-        srbcmd->id       = cpu_to_le32(srbcmd->id);
-        srbcmd->lun      = cpu_to_le32(srbcmd->lun);
-        srbcmd->flags    = cpu_to_le32(srbcmd->flags);
-        srbcmd->timeout  = cpu_to_le32(srbcmd->timeout);
-        srbcmd->retry_limit =cpu_to_le32(0); // Obsolete parameter
-        srbcmd->cdb_size = cpu_to_le32(srbcmd->cdb_size);
+        srbcmd->channel  = cpu_to_le32(user_srbcmd->channel);
+        srbcmd->id       = cpu_to_le32(user_srbcmd->id);
+        srbcmd->lun      = cpu_to_le32(user_srbcmd->lun);
+        srbcmd->timeout  = cpu_to_le32(user_srbcmd->timeout);
+        srbcmd->flags    = cpu_to_le32(flags);
+        srbcmd->retry_limit = 0; // Obsolete parameter
+        srbcmd->cdb_size = cpu_to_le32(user_srbcmd->cdb_size);
+        memcpy(srbcmd->cdb, user_srbcmd->cdb, sizeof(srbcmd->cdb));
         
-        switch (srbcmd->flags & (SRB_DataIn | SRB_DataOut)) {
+        switch (flags & (SRB_DataIn | SRB_DataOut)) {
         case SRB_DataOut:
                 data_dir = DMA_TO_DEVICE;
                 break;
@@ -482,118 +509,148 @@ int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         default:
                 data_dir = DMA_NONE;
         }
+        if (user_srbcmd->sg.count > (sizeof(sg_list)/sizeof(sg_list[0]))) {
+                dprintk((KERN_DEBUG"aacraid: too many sg entries %d\n",
+                  le32_to_cpu(srbcmd->sg.count)));
+                rcode = -EINVAL;
+                goto cleanup;
+        }
         if (dev->dac_support == 1) {
-                struct sgmap64* psg = (struct sgmap64*)&srbcmd->sg;
+                struct user_sgmap64* upsg = (struct user_sgmap64*)&user_srbcmd->sg;
+                struct sgmap64* psg = (struct sgmap64*)&user_srbcmd->sg;
+                struct user_sgmap* usg;
                 byte_count = 0;
 
                 /*
                  * This should also catch if user used the 32 bit sgmap
                  */
                 actual_fibsize = sizeof(struct aac_srb) - 
-                        sizeof(struct sgentry) + ((srbcmd->sg.count & 0xff) * 
-                                sizeof(struct sgentry64));
+                        sizeof(struct sgentry) +
+                        ((upsg->count & 0xff) * 
+                        sizeof(struct sgentry));
                 if(actual_fibsize != fibsize){ // User made a mistake - should not continue
-                        printk(KERN_DEBUG"aacraid: Bad Size specified in Raw SRB command\n");
+                        dprintk((KERN_DEBUG"aacraid: Bad Size specified in Raw SRB command\n"));
                         rcode = -EINVAL;
                         goto cleanup;
                 }
-                if ((data_dir == DMA_NONE) && psg->count) { 
-                        printk(KERN_DEBUG"aacraid: SG with no direction specified in Raw SRB command\n");
+                usg = kmalloc(actual_fibsize - sizeof(struct aac_srb)
+                  + sizeof(struct sgmap), GFP_KERNEL);
+                if (!usg) {
+                        dprintk((KERN_DEBUG"aacraid: Allocation error in Raw SRB command\n"));
+                        rcode = -ENOMEM;
+                        goto cleanup;
+                }
+                memcpy (usg, upsg, actual_fibsize - sizeof(struct aac_srb)
+                  + sizeof(struct sgmap));
+                actual_fibsize = sizeof(struct aac_srb) - 
+                        sizeof(struct sgentry) + ((usg->count & 0xff) * 
+                                sizeof(struct sgentry64));
+                if ((data_dir == DMA_NONE) && upsg->count) {
+                        kfree (usg);
+                        dprintk((KERN_DEBUG"aacraid: SG with no direction specified in Raw SRB command\n"));
                         rcode = -EINVAL;
                         goto cleanup;
                 }
 
-                for (i = 0; i < psg->count; i++) {
-                        dma_addr_t addr; 
-                        u64 le_addr;
+                for (i = 0; i < usg->count; i++) {
+                        u64 addr;
                         void* p;
-                        p = kmalloc(psg->sg[i].count,GFP_KERNEL|__GFP_DMA);
+                        /* Does this really need to be GFP_DMA? */
+                        p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
                         if(p == 0) {
-                                printk(KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
-                                psg->sg[i].count,i,psg->count);
+                                kfree (usg);
+                                dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
+                                  usg->sg[i].count,i,usg->count));
                                 rcode = -ENOMEM;
                                 goto cleanup;
                         }
-                        sg_user[i] = (void __user *)psg->sg[i].addr;
+                        sg_user[i] = (void __user *)usg->sg[i].addr;
                         sg_list[i] = p; // save so we can clean up later
                         sg_indx = i;
 
                         if( flags & SRB_DataOut ){
-                                if(copy_from_user(p,sg_user[i],psg->sg[i].count)){
-                                        printk(KERN_DEBUG"aacraid: Could not copy sg data from user\n"); 
+                                if(copy_from_user(p,sg_user[i],upsg->sg[i].count)){
+                                        kfree (usg);
+                                        dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); 
                                         rcode = -EFAULT;
                                         goto cleanup;
                                 }
                         }
-                        addr = pci_map_single(dev->pdev, p, psg->sg[i].count, data_dir);
+                        addr = pci_map_single(dev->pdev, p, usg->sg[i].count, data_dir);
 
-                        le_addr = cpu_to_le64(addr);
-                        psg->sg[i].addr[1] = (u32)(le_addr>>32);
-                        psg->sg[i].addr[0] = (u32)(le_addr & 0xffffffff);
-                        psg->sg[i].count = cpu_to_le32(psg->sg[i].count);  
-                        byte_count += psg->sg[i].count;
+                        psg->sg[i].addr[0] = cpu_to_le32(addr & 0xffffffff);
+                        psg->sg[i].addr[1] = cpu_to_le32(addr>>32);
+                        psg->sg[i].count = cpu_to_le32(usg->sg[i].count);  
+                        byte_count += usg->sg[i].count;
                 }
+                kfree (usg);
 
                 srbcmd->count = cpu_to_le32(byte_count);
+                psg->count = cpu_to_le32(sg_indx+1);
                 status = fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL);
         } else {
+                struct user_sgmap* upsg = &user_srbcmd->sg;
                 struct sgmap* psg = &srbcmd->sg;
                 byte_count = 0;
 
-                actual_fibsize = sizeof (struct aac_srb) + 
-                        (((le32_to_cpu(srbcmd->sg.count) & 0xff) - 1) * 
-                         sizeof (struct sgentry));
+                actual_fibsize = sizeof (struct aac_srb) + (((user_srbcmd->sg.count & 0xff) - 1) * sizeof (struct sgentry));
                 if(actual_fibsize != fibsize){ // User made a mistake - should not continue
-                        printk(KERN_DEBUG"aacraid: Bad Size specified in Raw SRB command\n");
+                        dprintk((KERN_DEBUG"aacraid: Bad Size specified in Raw SRB command\n"));
                         rcode = -EINVAL;
                         goto cleanup;
                 }
-                if ((data_dir == DMA_NONE) && psg->count) {
-                        printk(KERN_DEBUG"aacraid: SG with no direction specified in Raw SRB command\n");
+                if ((data_dir == DMA_NONE) && upsg->count) {
+                        dprintk((KERN_DEBUG"aacraid: SG with no direction specified in Raw SRB command\n"));
                         rcode = -EINVAL;
                         goto cleanup;
                 }
-                for (i = 0; i < psg->count; i++) {
+                for (i = 0; i < upsg->count; i++) {
                         dma_addr_t addr; 
                         void* p;
-                        p = kmalloc(psg->sg[i].count,GFP_KERNEL);
+                        p = kmalloc(upsg->sg[i].count, GFP_KERNEL);
                         if(p == 0) {
-                                printk(KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
-                                psg->sg[i].count,i,psg->count);
+                                dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",
+                                  upsg->sg[i].count, i, upsg->count));
                                 rcode = -ENOMEM;
                                 goto cleanup;
                         }
-                        sg_user[i] = (void __user *)(psg->sg[i].addr);
+                        sg_user[i] = (void __user *)upsg->sg[i].addr;
                         sg_list[i] = p; // save so we can clean up later
                         sg_indx = i;
 
                         if( flags & SRB_DataOut ){
-                                if(copy_from_user(p,sg_user[i],psg->sg[i].count)){
-                                        printk(KERN_DEBUG"aacraid: Could not copy sg data from user\n"); 
+                                if(copy_from_user(p, sg_user[i],
+                                                upsg->sg[i].count)) {
+                                        dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); 
                                         rcode = -EFAULT;
                                         goto cleanup;
                                 }
                         }
-                        addr = pci_map_single(dev->pdev, p, psg->sg[i].count, data_dir);
+                        addr = pci_map_single(dev->pdev, p,
+                                upsg->sg[i].count, data_dir);
 
                         psg->sg[i].addr = cpu_to_le32(addr);
-                        psg->sg[i].count = cpu_to_le32(psg->sg[i].count);  
-                        byte_count += psg->sg[i].count;
+                        psg->sg[i].count = cpu_to_le32(upsg->sg[i].count);  
+                        byte_count += upsg->sg[i].count;
                 }
                 srbcmd->count = cpu_to_le32(byte_count);
+                psg->count = cpu_to_le32(sg_indx+1);
                 status = fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL);
         }
 
         if (status != 0){
-                printk(KERN_DEBUG"aacraid: Could not send raw srb fib to hba\n"); 
-                rcode = -1;
+                dprintk((KERN_DEBUG"aacraid: Could not send raw srb fib to hba\n")); 
+                rcode = -ENXIO;
                 goto cleanup;
         }
 
         if( flags & SRB_DataIn ) {
                 for(i = 0 ; i <= sg_indx; i++){
-                        if(copy_to_user(sg_user[i],sg_list[i],le32_to_cpu(srbcmd->sg.sg[i].count))){
-                                printk(KERN_DEBUG"aacraid: Could not copy sg data to user\n"); 
+                        byte_count = le32_to_cpu((dev->dac_support == 1)
+                              ? ((struct sgmap64*)&srbcmd->sg)->sg[i].count
+                              : srbcmd->sg.sg[i].count);
+                        if(copy_to_user(sg_user[i], sg_list[i], byte_count)){
+                                dprintk((KERN_DEBUG"aacraid: Could not copy sg data to user\n")); 
                                 rcode = -EFAULT;
                                 goto cleanup;
 
@@ -603,12 +660,13 @@ int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
 
         reply = (struct aac_srb_reply *) fib_data(srbfib);
         if(copy_to_user(user_reply,reply,sizeof(struct aac_srb_reply))){
-                printk(KERN_DEBUG"aacraid: Could not copy reply to user\n"); 
+                dprintk((KERN_DEBUG"aacraid: Could not copy reply to user\n")); 
                 rcode = -EFAULT;
                 goto cleanup;
         }
 
 cleanup:
+        kfree(user_srbcmd);
         for(i=0; i <= sg_indx; i++){
                 kfree(sg_list[i]);
         }
@@ -618,14 +676,13 @@ cleanup:
         return rcode;
 }
 
-
 struct aac_pci_info {
         u32 bus;
         u32 slot;
 };
 
 
-int aac_get_pci_info(struct aac_dev* dev, void __user *arg)
+static int aac_get_pci_info(struct aac_dev* dev, void __user *arg)
 {
         struct aac_pci_info pci_info;
 
@@ -633,11 +690,11 @@ int aac_get_pci_info(struct aac_dev* dev, void __user *arg)
         pci_info.slot = PCI_SLOT(dev->pdev->devfn);
 
        if (copy_to_user(arg, &pci_info, sizeof(struct aac_pci_info))) {
-                printk(KERN_DEBUG "aacraid: Could not copy pci info\n");
+               dprintk((KERN_DEBUG "aacraid: Could not copy pci info\n"));
                return -EFAULT;
         }
         return 0;
- }
+}
  
 
 int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg)
@@ -656,6 +713,7 @@ int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg)
         case FSACTL_MINIPORT_REV_CHECK:
                 status = check_revision(dev, arg);
                 break;
+        case FSACTL_SEND_LARGE_FIB:
         case FSACTL_SENDFIB:
                 status = ioctl_send_fib(dev, arg);
                 break;
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 6832a55ca907..43557bf661f6 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -39,6 +39,7 @@
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/mm.h>
+#include <scsi/scsi_host.h>
 #include <asm/semaphore.h>
 
 #include "aacraid.h"
@@ -49,8 +50,8 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
 {
         unsigned char *base;
         unsigned long size, align;
-        unsigned long fibsize = 4096;
-        unsigned long printfbufsiz = 256;
+        const unsigned long fibsize = 4096;
+        const unsigned long printfbufsiz = 256;
         struct aac_init *init;
         dma_addr_t phys;
 
@@ -74,6 +75,8 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         init = dev->init;
 
         init->InitStructRevision = cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION);
+        if (dev->max_fib_size != sizeof(struct hw_fib))
+                init->InitStructRevision = cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4);
         init->MiniPortRevision = cpu_to_le32(Sa_MINIPORT_REVISION);
         init->fsrev = cpu_to_le32(dev->fsrev);
 
@@ -110,6 +113,10 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
                 init->HostPhysMemPages = cpu_to_le32(AAC_MAX_HOSTPHYSMEMPAGES);
         }
 
+        init->InitFlags = 0;
+        init->MaxIoCommands = cpu_to_le32(dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB);
+        init->MaxIoSize = cpu_to_le32(dev->scsi_host_ptr->max_sectors << 9);
+        init->MaxFibSize = cpu_to_le32(dev->max_fib_size);
 
         /*
          * Increment the base address by the amount already used
@@ -152,8 +159,8 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
         init_waitqueue_head(&q->qfull);
         spin_lock_init(&q->lockdata);
         q->lock = &q->lockdata;
-        q->headers.producer = mem;
-        q->headers.consumer = mem+1;
+        q->headers.producer = (__le32 *)mem;
+        q->headers.consumer = (__le32 *)(mem+1);
         *(q->headers.producer) = cpu_to_le32(qsize);
         *(q->headers.consumer) = cpu_to_le32(qsize);
         q->entries = qsize;
@@ -173,6 +180,8 @@ int aac_send_shutdown(struct aac_dev * dev)
         int status;
 
         fibctx = fib_alloc(dev);
+        if (!fibctx)
+                return -ENOMEM;
         fib_init(fibctx);
 
         cmd = (struct aac_close *) fib_data(fibctx);
@@ -204,7 +213,7 @@ int aac_send_shutdown(struct aac_dev * dev)
  *              0 - If there were errors initing. This is a fatal error.
  */
  
-int aac_comm_init(struct aac_dev * dev)
+static int aac_comm_init(struct aac_dev * dev)
 {
         unsigned long hdrsize = (sizeof(u32) * NUMBER_OF_COMM_QUEUES) * 2;
         unsigned long queuesize = sizeof(struct aac_entry) * TOTAL_QUEUE_ENTRIES;
@@ -293,6 +302,79 @@ int aac_comm_init(struct aac_dev * dev)
 
 struct aac_dev *aac_init_adapter(struct aac_dev *dev)
 {
+        u32 status[5];
+        struct Scsi_Host * host = dev->scsi_host_ptr;
+
+        /*
+         *      Check the preferred comm settings, defaults from template.
+         */
+        dev->max_fib_size = sizeof(struct hw_fib);
+        dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size
+                - sizeof(struct aac_fibhdr)
+                - sizeof(struct aac_write) + sizeof(struct sgmap))
+                        / sizeof(struct sgmap);
+        if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
+          0, 0, 0, 0, 0, 0,
+          status+0, status+1, status+2, status+3, status+4))
+         && (status[0] == 0x00000001)) {
+                /*
+                 *      status[1] >> 16         maximum command size in KB
+                 *      status[1] & 0xFFFF      maximum FIB size
+                 *      status[2] >> 16         maximum SG elements to driver
+                 *      status[2] & 0xFFFF      maximum SG elements from driver
+                 *      status[3] & 0xFFFF      maximum number FIBs outstanding
+                 */
+                host->max_sectors = (status[1] >> 16) << 1;
+                dev->max_fib_size = status[1] & 0xFFFF;
+                host->sg_tablesize = status[2] >> 16;
+                dev->sg_tablesize = status[2] & 0xFFFF;
+                host->can_queue = (status[3] & 0xFFFF) - AAC_NUM_MGT_FIB;
+                /*
+                 *      NOTE:
+                 *      All these overrides are based on a fixed internal
+                 *      knowledge and understanding of existing adapters,
+                 *      acbsize should be set with caution.
+                 */
+                if (acbsize == 512) {
+                        host->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
+                        dev->max_fib_size = 512;
+                        dev->sg_tablesize = host->sg_tablesize
+                          = (512 - sizeof(struct aac_fibhdr)
+                            - sizeof(struct aac_write) + sizeof(struct sgmap))
+                             / sizeof(struct sgmap);
+                        host->can_queue = AAC_NUM_IO_FIB;
+                } else if (acbsize == 2048) {
+                        host->max_sectors = 512;
+                        dev->max_fib_size = 2048;
+                        host->sg_tablesize = 65;
+                        dev->sg_tablesize = 81;
+                        host->can_queue = 512 - AAC_NUM_MGT_FIB;
+                } else if (acbsize == 4096) {
+                        host->max_sectors = 1024;
+                        dev->max_fib_size = 4096;
+                        host->sg_tablesize = 129;
+                        dev->sg_tablesize = 166;
+                        host->can_queue = 256 - AAC_NUM_MGT_FIB;
+                } else if (acbsize == 8192) {
+                        host->max_sectors = 2048;
+                        dev->max_fib_size = 8192;
+                        host->sg_tablesize = 257;
+                        dev->sg_tablesize = 337;
+                        host->can_queue = 128 - AAC_NUM_MGT_FIB;
+                } else if (acbsize > 0) {
+                        printk("Illegal acbsize=%d ignored\n", acbsize);
+                }
+        }
+        {
+
+                if (numacb > 0) {
+                        if (numacb < host->can_queue)
+                                host->can_queue = numacb;
+                        else
+                                printk("numacb=%d ignored\n", numacb);
+                }
+        }
+
         /*
          *      Ok now init the communication subsystem
          */
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 3f36dbaa2bb3..5322865942e2 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -25,7 +25,7 @@
  *  commsup.c
  *
  * Abstract: Contain all routines that are required for FSA host/adapter
- *    commuication.
+ *    communication.
  *
  */
 
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
+#include <scsi/scsi_host.h>
 #include <asm/semaphore.h>
 
 #include "aacraid.h"
@@ -52,7 +53,13 @@
  
 static int fib_map_alloc(struct aac_dev *dev)
 {
-        if((dev->hw_fib_va = pci_alloc_consistent(dev->pdev, sizeof(struct hw_fib) * AAC_NUM_FIB, &dev->hw_fib_pa))==NULL)
+        dprintk((KERN_INFO
+          "allocate hardware fibs pci_alloc_consistent(%p, %d * (%d + %d), %p)\n",
+          dev->pdev, dev->max_fib_size, dev->scsi_host_ptr->can_queue,
+          AAC_NUM_MGT_FIB, &dev->hw_fib_pa));
+        if((dev->hw_fib_va = pci_alloc_consistent(dev->pdev, dev->max_fib_size
+          * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB),
+          &dev->hw_fib_pa))==NULL)
                 return -ENOMEM;
         return 0;
 }
@@ -67,7 +74,7 @@ static int fib_map_alloc(struct aac_dev *dev)
 
 void fib_map_free(struct aac_dev *dev)
 {
-        pci_free_consistent(dev->pdev, sizeof(struct hw_fib) * AAC_NUM_FIB, dev->hw_fib_va, dev->hw_fib_pa);
+        pci_free_consistent(dev->pdev, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB), dev->hw_fib_va, dev->hw_fib_pa);
 }
 
 /**
@@ -84,17 +91,22 @@ int fib_setup(struct aac_dev * dev)
         struct hw_fib *hw_fib_va;
         dma_addr_t hw_fib_pa;
         int i;
-        
-        if(fib_map_alloc(dev)<0)
+
+        while (((i = fib_map_alloc(dev)) == -ENOMEM)
+         && (dev->scsi_host_ptr->can_queue > (64 - AAC_NUM_MGT_FIB))) {
+                dev->init->MaxIoCommands = cpu_to_le32((dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB) >> 1);
+                dev->scsi_host_ptr->can_queue = le32_to_cpu(dev->init->MaxIoCommands) - AAC_NUM_MGT_FIB;
+        }
+        if (i<0)
                 return -ENOMEM;
                 
         hw_fib_va = dev->hw_fib_va;
         hw_fib_pa = dev->hw_fib_pa;
-        memset(hw_fib_va, 0, sizeof(struct hw_fib) * AAC_NUM_FIB);
+        memset(hw_fib_va, 0, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB));
         /*
          *      Initialise the fibs
          */
-        for (i = 0, fibptr = &dev->fibs[i]; i < AAC_NUM_FIB; i++, fibptr++) 
+        for (i = 0, fibptr = &dev->fibs[i]; i < (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); i++, fibptr++) 
         {
                 fibptr->dev = dev;
                 fibptr->hw_fib = hw_fib_va;
@@ -102,16 +114,16 @@ int fib_setup(struct aac_dev * dev)
                 fibptr->next = fibptr+1;        /* Forward chain the fibs */
                 init_MUTEX_LOCKED(&fibptr->event_wait);
                 spin_lock_init(&fibptr->event_lock);
-                hw_fib_va->header.XferState = 0xffffffff;
-                hw_fib_va->header.SenderSize = cpu_to_le16(sizeof(struct hw_fib));
+                hw_fib_va->header.XferState = cpu_to_le32(0xffffffff);
+                hw_fib_va->header.SenderSize = cpu_to_le16(dev->max_fib_size);
                 fibptr->hw_fib_pa = hw_fib_pa;
-                hw_fib_va = (struct hw_fib *)((unsigned char *)hw_fib_va + sizeof(struct hw_fib));
-                hw_fib_pa = hw_fib_pa + sizeof(struct hw_fib); 
+                hw_fib_va = (struct hw_fib *)((unsigned char *)hw_fib_va + dev->max_fib_size);
+                hw_fib_pa = hw_fib_pa + dev->max_fib_size;
         }
         /*
          *      Add the fib chain to the free list
          */
-        dev->fibs[AAC_NUM_FIB-1].next = NULL;
+        dev->fibs[dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB - 1].next = NULL;
         /*
          *      Enable this to debug out of queue space
          */
@@ -124,7 +136,7 @@ int fib_setup(struct aac_dev * dev)
  *      @dev: Adapter to allocate the fib for
  *
  *      Allocate a fib from the adapter fib pool. If the pool is empty we
- *      wait for fibs to become free.
+ *      return NULL.
  */
  
 struct fib * fib_alloc(struct aac_dev *dev)
@@ -133,10 +145,10 @@ struct fib * fib_alloc(struct aac_dev *dev)
         unsigned long flags;
         spin_lock_irqsave(&dev->fib_lock, flags);
         fibptr = dev->free_fib; 
-        /* Cannot sleep here or you get hangs. Instead we did the
-           maths at compile time. */
-        if(!fibptr)
-                BUG();
+        if(!fibptr){
+                spin_unlock_irqrestore(&dev->fib_lock, flags);
+                return fibptr;
+        }
         dev->free_fib = fibptr->next;
         spin_unlock_irqrestore(&dev->fib_lock, flags);
         /*
@@ -196,11 +208,11 @@ void fib_init(struct fib *fibptr)
         struct hw_fib *hw_fib = fibptr->hw_fib;
 
         hw_fib->header.StructType = FIB_MAGIC;
-        hw_fib->header.Size = cpu_to_le16(sizeof(struct hw_fib));
-        hw_fib->header.XferState = cpu_to_le32(HostOwned | FibInitialized | FibEmpty | FastResponseCapable);
+        hw_fib->header.Size = cpu_to_le16(fibptr->dev->max_fib_size);
+        hw_fib->header.XferState = cpu_to_le32(HostOwned | FibInitialized | FibEmpty | FastResponseCapable);
         hw_fib->header.SenderFibAddress = cpu_to_le32(fibptr->hw_fib_pa);
         hw_fib->header.ReceiverFibAddress = cpu_to_le32(fibptr->hw_fib_pa);
-        hw_fib->header.SenderSize = cpu_to_le16(sizeof(struct hw_fib));
+        hw_fib->header.SenderSize = cpu_to_le16(fibptr->dev->max_fib_size);
 }
 
 /**
@@ -211,7 +223,7 @@ void fib_init(struct fib *fibptr)
  *      caller.
  */
  
-void fib_dealloc(struct fib * fibptr)
+static void fib_dealloc(struct fib * fibptr)
 {
         struct hw_fib *hw_fib = fibptr->hw_fib;
         if(hw_fib->header.StructType != FIB_MAGIC) 
@@ -279,7 +291,7 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
         }
 
         if ((*index + 1) == le32_to_cpu(*(q->headers.consumer))) { /* Queue is full */
-                printk(KERN_WARNING "Queue %d full, %d outstanding.\n",
+                printk(KERN_WARNING "Queue %d full, %u outstanding.\n",
                                 qid, q->numpending);
                 return 0;
         } else {
@@ -658,9 +670,8 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size)
                         }
                         if (aac_insert_entry(dev, index, AdapHighRespQueue,  (nointr & (int)aac_config.irq_mod)) != 0) {
                         }
-                }
-                else if (hw_fib->header.XferState & NormalPriority) 
-                {
+                } else if (hw_fib->header.XferState & 
+                                cpu_to_le32(NormalPriority)) {
                         u32 index;
 
                         if (size) {
@@ -744,22 +755,25 @@ int fib_complete(struct fib * fibptr)
 
 void aac_printf(struct aac_dev *dev, u32 val)
 {
-        int length = val & 0xffff;
-        int level = (val >> 16) & 0xffff;
         char *cp = dev->printfbuf;
-        
-        /*
-         *      The size of the printfbuf is set in port.c
-         *      There is no variable or define for it
-         */
-        if (length > 255)
-                length = 255;
-        if (cp[length] != 0)
-                cp[length] = 0;
-        if (level == LOG_AAC_HIGH_ERROR)
-                printk(KERN_WARNING "aacraid:%s", cp);
-        else
-                printk(KERN_INFO "aacraid:%s", cp);
+        if (dev->printf_enabled)
+        {
+                int length = val & 0xffff;
+                int level = (val >> 16) & 0xffff;
+                
+                /*
+                 *      The size of the printfbuf is set in port.c
+                 *      There is no variable or define for it
+                 */
+                if (length > 255)
+                        length = 255;
+                if (cp[length] != 0)
+                        cp[length] = 0;
+                if (level == LOG_AAC_HIGH_ERROR)
+                        printk(KERN_WARNING "aacraid:%s", cp);
+                else
+                        printk(KERN_INFO "aacraid:%s", cp);
+        }
         memset(cp, 0,  256);
 }
 
@@ -832,8 +846,8 @@ int aac_command_thread(struct aac_dev * dev)
                         aifcmd = (struct aac_aifcmd *) hw_fib->data;
                         if (aifcmd->command == cpu_to_le32(AifCmdDriverNotify)) {
                                 /* Handle Driver Notify Events */
-                                *(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
-                                fib_adapter_complete(fib, sizeof(u32));
+                                *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
+                                fib_adapter_complete(fib, (u16)sizeof(u32));
                         } else {
                                 struct list_head *entry;
                                 /* The u32 here is important and intended. We are using
@@ -916,7 +930,7 @@ int aac_command_thread(struct aac_dev * dev)
                                 /*
                                  *      Set the status of this FIB
                                  */
-                                *(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
+                                *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
                                 fib_adapter_complete(fib, sizeof(u32));
                                 spin_unlock_irqrestore(&dev->fib_lock, flagv);
                         }
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 8480b427a6d9..be2e98de9fab 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -99,7 +99,7 @@ unsigned int aac_response_normal(struct aac_queue * q)
                         /*
                          *      Doctor the fib
                          */
-                        *(u32 *)hwfib->data = cpu_to_le32(ST_OK);
+                        *(__le32 *)hwfib->data = cpu_to_le32(ST_OK);
                         hwfib->header.XferState |= cpu_to_le32(AdapterProcessed);
                 }
 
@@ -107,7 +107,7 @@ unsigned int aac_response_normal(struct aac_queue * q)
 
                 if (hwfib->header.Command == cpu_to_le16(NuFileSystem))
                 {
-                        u32 *pstatus = (u32 *)hwfib->data;
+                        __le32 *pstatus = (__le32 *)hwfib->data;
                         if (*pstatus & cpu_to_le32(0xffff0000))
                                 *pstatus = cpu_to_le32(ST_OK);
                 }
@@ -205,7 +205,7 @@ unsigned int aac_command_normal(struct aac_queue *q)
                         /*
                          *      Set the status of this FIB
                          */
-                        *(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
+                        *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
                         fib_adapter_complete(fib, sizeof(u32));
                         spin_lock_irqsave(q->lock, flags);
                 }               
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 242fa77513f5..f7e9c89c4915 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -215,7 +215,7 @@ static int aac_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd
  *      Returns a static string describing the device in question
  */
 
-const char *aac_info(struct Scsi_Host *shost)
+static const char *aac_info(struct Scsi_Host *shost)
 {
         struct aac_dev *dev = (struct aac_dev *)shost->hostdata;
         return aac_drivers[dev->cardtype].name;
@@ -288,7 +288,7 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
          *      translations ( 64/32, 128/32, 255/63 ).
          */
         buf = scsi_bios_ptable(bdev);
-        if(*(unsigned short *)(buf + 0x40) == cpu_to_le16(0xaa55)) {
+        if(*(__le16 *)(buf + 0x40) == cpu_to_le16(0xaa55)) {
                 struct partition *first = (struct partition * )buf;
                 struct partition *entry = first;
                 int saved_cylinders = param->cylinders;
@@ -347,10 +347,16 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
 
 static int aac_slave_configure(struct scsi_device *sdev)
 {
+        struct Scsi_Host *host = sdev->host;
+
         if (sdev->tagged_supported)
                 scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, 128);
         else
                 scsi_adjust_queue_depth(sdev, 0, 1);
+
+        if (host->max_sectors < AAC_MAX_32BIT_SGBCOUNT)
+                blk_queue_max_segment_size(sdev->request_queue, 65536);
+
         return 0;
 }
 
@@ -361,14 +367,6 @@ static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg)
 }
 
 /*
- * XXX: does aac really need no error handling??
- */
-static int aac_eh_abort(struct scsi_cmnd *cmd)
-{
-        return FAILED;
-}
-
-/*
  *      aac_eh_reset    - Reset command handling
  *      @scsi_cmd:      SCSI command block causing the reset
  *
@@ -386,10 +384,13 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                                         AAC_DRIVERNAME);
 
 
+        spin_lock_irq(host->host_lock);
+
         aac = (struct aac_dev *)host->hostdata;
         if (aac_adapter_check_health(aac)) {
                 printk(KERN_ERR "%s: Host adapter appears dead\n", 
                                 AAC_DRIVERNAME);
+                spin_unlock_irq(host->host_lock);
                 return -ENODEV;
         }
         /*
@@ -420,6 +421,7 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 ssleep(1);
                 spin_lock_irq(host->host_lock);
         }
+        spin_unlock_irq(host->host_lock);
         printk(KERN_ERR "%s: SCSI bus appears hung\n", AAC_DRIVERNAME);
         return -ETIMEDOUT;
 }
@@ -439,11 +441,11 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
 static int aac_cfg_open(struct inode *inode, struct file *file)
 {
         struct aac_dev *aac;
-        unsigned minor = iminor(inode);
+        unsigned minor_number = iminor(inode);
         int err = -ENODEV;
 
         list_for_each_entry(aac, &aac_devices, entry) {
-                if (aac->id == minor) {
+                if (aac->id == minor_number) {
                         file->private_data = aac;
                         err = 0;
                         break;
@@ -489,6 +491,7 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long
         case FSACTL_DELETE_DISK:
         case FSACTL_FORCE_DELETE_DISK:
         case FSACTL_GET_CONTAINERS: 
+        case FSACTL_SEND_LARGE_FIB:
                 ret = aac_do_ioctl(dev, cmd, (void __user *)arg);
                 break;
 
@@ -526,6 +529,134 @@ static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long
 }
 #endif
 
+static ssize_t aac_show_model(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len;
+
+        len = snprintf(buf, PAGE_SIZE, "%s\n",
+                  aac_drivers[dev->cardtype].model);
+        return len;
+}
+
+static ssize_t aac_show_vendor(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len;
+
+        len = snprintf(buf, PAGE_SIZE, "%s\n",
+                  aac_drivers[dev->cardtype].vname);
+        return len;
+}
+
+static ssize_t aac_show_kernel_version(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len, tmp;
+
+        tmp = le32_to_cpu(dev->adapter_info.kernelrev);
+        len = snprintf(buf, PAGE_SIZE, "%d.%d-%d[%d]\n", 
+          tmp >> 24, (tmp >> 16) & 0xff, tmp & 0xff,
+          le32_to_cpu(dev->adapter_info.kernelbuild));
+        return len;
+}
+
+static ssize_t aac_show_monitor_version(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len, tmp;
+
+        tmp = le32_to_cpu(dev->adapter_info.monitorrev);
+        len = snprintf(buf, PAGE_SIZE, "%d.%d-%d[%d]\n", 
+          tmp >> 24, (tmp >> 16) & 0xff, tmp & 0xff,
+          le32_to_cpu(dev->adapter_info.monitorbuild));
+        return len;
+}
+
+static ssize_t aac_show_bios_version(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len, tmp;
+
+        tmp = le32_to_cpu(dev->adapter_info.biosrev);
+        len = snprintf(buf, PAGE_SIZE, "%d.%d-%d[%d]\n", 
+          tmp >> 24, (tmp >> 16) & 0xff, tmp & 0xff,
+          le32_to_cpu(dev->adapter_info.biosbuild));
+        return len;
+}
+
+static ssize_t aac_show_serial_number(struct class_device *class_dev,
+                char *buf)
+{
+        struct aac_dev *dev = (struct aac_dev*)class_to_shost(class_dev)->hostdata;
+        int len = 0;
+
+        if (le32_to_cpu(dev->adapter_info.serial[0]) != 0xBAD0)
+                len = snprintf(buf, PAGE_SIZE, "%x\n",
+                  le32_to_cpu(dev->adapter_info.serial[0]));
+        return len;
+}
+
+
+static struct class_device_attribute aac_model = {
+        .attr = {
+                .name = "model",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_model,
+};
+static struct class_device_attribute aac_vendor = {
+        .attr = {
+                .name = "vendor",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_vendor,
+};
+static struct class_device_attribute aac_kernel_version = {
+        .attr = {
+                .name = "hba_kernel_version",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_kernel_version,
+};
+static struct class_device_attribute aac_monitor_version = {
+        .attr = {
+                .name = "hba_monitor_version",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_monitor_version,
+};
+static struct class_device_attribute aac_bios_version = {
+        .attr = {
+                .name = "hba_bios_version",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_bios_version,
+};
+static struct class_device_attribute aac_serial_number = {
+        .attr = {
+                .name = "serial_number",
+                .mode = S_IRUGO,
+        },
+        .show = aac_show_serial_number,
+};
+
+static struct class_device_attribute *aac_attrs[] = {
+        &aac_model,
+        &aac_vendor,
+        &aac_kernel_version,
+        &aac_monitor_version,
+        &aac_bios_version,
+        &aac_serial_number,
+        NULL
+};
+
+
 static struct file_operations aac_cfg_fops = {
         .owner          = THIS_MODULE,
         .ioctl          = aac_cfg_ioctl,
@@ -538,7 +669,7 @@ static struct file_operations aac_cfg_fops = {
 static struct scsi_host_template aac_driver_template = {
         .module                         = THIS_MODULE,
         .name                           = "AAC",
-        .proc_name                      = "aacraid",
+        .proc_name                      = AAC_DRIVERNAME,
         .info                           = aac_info,
         .ioctl                          = aac_ioctl,
 #ifdef CONFIG_COMPAT
@@ -546,8 +677,8 @@ static struct scsi_host_template aac_driver_template = {
 #endif
         .queuecommand                   = aac_queuecommand,
         .bios_param                     = aac_biosparm, 
+        .shost_attrs                    = aac_attrs,
         .slave_configure                = aac_slave_configure,
-        .eh_abort_handler               = aac_eh_abort,
         .eh_host_reset_handler          = aac_eh_reset,
         .can_queue                      = AAC_NUM_IO_FIB,       
         .this_id                        = 16,
@@ -612,7 +743,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         aac->cardtype =  index;
         INIT_LIST_HEAD(&aac->entry);
 
-        aac->fibs = kmalloc(sizeof(struct fib) * AAC_NUM_FIB, GFP_KERNEL);
+        aac->fibs = kmalloc(sizeof(struct fib) * (shost->can_queue + AAC_NUM_MGT_FIB), GFP_KERNEL);
         if (!aac->fibs)
                 goto out_free_host;
         spin_lock_init(&aac->fib_lock);
@@ -632,6 +763,24 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         aac_get_adapter_info(aac);
 
         /*
+         * Lets override negotiations and drop the maximum SG limit to 34
+         */
+        if ((aac_drivers[index].quirks & AAC_QUIRK_34SG) && 
+                        (aac->scsi_host_ptr->sg_tablesize > 34)) {
+                aac->scsi_host_ptr->sg_tablesize = 34;
+                aac->scsi_host_ptr->max_sectors
+                  = (aac->scsi_host_ptr->sg_tablesize * 8) + 112;
+        }
+
+        /*
+         * Firware printf works only with older firmware.
+         */
+        if (aac_drivers[index].quirks & AAC_QUIRK_34SG) 
+                aac->printf_enabled = 1;
+        else
+                aac->printf_enabled = 0;
+ 
+        /*
          * max channel will be the physical channels plus 1 virtual channel
          * all containers are on the virtual channel 0
          * physical channels are address by their actual physical number+1
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 1b8ed47cfe30..7d68b7825137 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -98,7 +98,9 @@ static irqreturn_t aac_rkt_intr(int irq, void *dev_id, struct pt_regs *regs)
  *      for its completion.
  */
 
-static int rkt_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
+static int rkt_sync_cmd(struct aac_dev *dev, u32 command,
+        u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
+        u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4)
 {
         unsigned long start;
         int ok;
@@ -107,12 +109,12 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
          */
         rkt_writel(dev, InboundMailbox0, command);
         /*
-         *      Write the parameters into Mailboxes 1 - 4
+         *      Write the parameters into Mailboxes 1 - 6
          */
         rkt_writel(dev, InboundMailbox1, p1);
-        rkt_writel(dev, InboundMailbox2, 0);
-        rkt_writel(dev, InboundMailbox3, 0);
-        rkt_writel(dev, InboundMailbox4, 0);
+        rkt_writel(dev, InboundMailbox2, p2);
+        rkt_writel(dev, InboundMailbox3, p3);
+        rkt_writel(dev, InboundMailbox4, p4);
         /*
          *      Clear the synch command doorbell to start on a clean slate.
          */
@@ -169,6 +171,14 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
          */
         if (status)
                 *status = rkt_readl(dev, IndexRegs.Mailbox[0]);
+        if (r1)
+                *r1 = rkt_readl(dev, IndexRegs.Mailbox[1]);
+        if (r2)
+                *r2 = rkt_readl(dev, IndexRegs.Mailbox[2]);
+        if (r3)
+                *r3 = rkt_readl(dev, IndexRegs.Mailbox[3]);
+        if (r4)
+                *r4 = rkt_readl(dev, IndexRegs.Mailbox[4]);
         /*
          *      Clear the synch command doorbell.
          */
@@ -190,8 +200,8 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
 
 static void aac_rkt_interrupt_adapter(struct aac_dev *dev)
 {
-        u32 ret;
-        rkt_sync_cmd(dev, BREAKPOINT_REQUEST, 0, &ret);
+        rkt_sync_cmd(dev, BREAKPOINT_REQUEST, 0, 0, 0, 0, 0, 0,
+          NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -220,7 +230,8 @@ static void aac_rkt_notify_adapter(struct aac_dev *dev, u32 event)
                 rkt_writel(dev, MUnit.IDR,INBOUNDDOORBELL_3);
                 break;
         case HostShutdown:
-//              rkt_sync_cmd(dev, HOST_CRASHING, 0, 0, 0, 0, &ret);
+//              rkt_sync_cmd(dev, HOST_CRASHING, 0, 0, 0, 0, 0, 0,
+//                NULL, NULL, NULL, NULL, NULL);
                 break;
         case FastIo:
                 rkt_writel(dev, MUnit.IDR,INBOUNDDOORBELL_6);
@@ -243,17 +254,11 @@ static void aac_rkt_notify_adapter(struct aac_dev *dev, u32 event)
 
 static void aac_rkt_start_adapter(struct aac_dev *dev)
 {
-        u32 status;
         struct aac_init *init;
 
         init = dev->init;
         init->HostElapsedSeconds = cpu_to_le32(get_seconds());
         /*
-         *      Tell the adapter we are back and up and running so it will scan
-         *      its command queues and enable our interrupts
-         */
-        dev->irq_mask = (DoorBellPrintfReady | OUTBOUNDDOORBELL_1 | OUTBOUNDDOORBELL_2 | OUTBOUNDDOORBELL_3 | OUTBOUNDDOORBELL_4);
-        /*
          *      First clear out all interrupts.  Then enable the one's that we
          *      can handle.
          */
@@ -263,7 +268,8 @@ static void aac_rkt_start_adapter(struct aac_dev *dev)
         rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
 
         // We can only use a 32 bit address here
-        rkt_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa, &status);
+        rkt_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa,
+          0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -288,8 +294,8 @@ static int aac_rkt_check_health(struct aac_dev *dev)
         if (status & KERNEL_PANIC) {
                 char * buffer;
                 struct POSTSTATUS {
-                        u32 Post_Command;
-                        u32 Post_Address;
+                        __le32 Post_Command;
+                        __le32 Post_Address;
                 } * post;
                 dma_addr_t paddr, baddr;
                 int ret;
@@ -310,7 +316,8 @@ static int aac_rkt_check_health(struct aac_dev *dev)
                 post->Post_Command = cpu_to_le32(COMMAND_POST_RESULTS);
                 post->Post_Address = cpu_to_le32(baddr);
                 rkt_writel(dev, MUnit.IMRx[0], paddr);
-                rkt_sync_cmd(dev, COMMAND_POST_RESULTS, baddr, &status);
+                rkt_sync_cmd(dev, COMMAND_POST_RESULTS, baddr, 0, 0, 0, 0, 0,
+                  NULL, NULL, NULL, NULL, NULL);
                 pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                   post, paddr);
                 if ((buffer[0] == '0') && (buffer[1] == 'x')) {
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 630b99e1fe83..1ff25f49fada 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -63,7 +63,7 @@ static irqreturn_t aac_rx_intr(int irq, void *dev_id, struct pt_regs *regs)
         {
                 bellbits = rx_readl(dev, OutboundDoorbellReg);
                 if (bellbits & DoorBellPrintfReady) {
-                        aac_printf(dev, le32_to_cpu(rx_readl (dev, IndexRegs.Mailbox[5])));
+                        aac_printf(dev, rx_readl(dev, IndexRegs.Mailbox[5]));
                         rx_writel(dev, MUnit.ODR,DoorBellPrintfReady);
                         rx_writel(dev, InboundDoorbellReg,DoorBellPrintfDone);
                 }
@@ -98,7 +98,9 @@ static irqreturn_t aac_rx_intr(int irq, void *dev_id, struct pt_regs *regs)
  *      for its completion.
  */
 
-static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
+static int rx_sync_cmd(struct aac_dev *dev, u32 command,
+        u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
+        u32 *status, u32 * r1, u32 * r2, u32 * r3, u32 * r4)
 {
         unsigned long start;
         int ok;
@@ -107,12 +109,12 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
          */
         rx_writel(dev, InboundMailbox0, command);
         /*
-         *      Write the parameters into Mailboxes 1 - 4
+         *      Write the parameters into Mailboxes 1 - 6
          */
         rx_writel(dev, InboundMailbox1, p1);
-        rx_writel(dev, InboundMailbox2, 0);
-        rx_writel(dev, InboundMailbox3, 0);
-        rx_writel(dev, InboundMailbox4, 0);
+        rx_writel(dev, InboundMailbox2, p2);
+        rx_writel(dev, InboundMailbox3, p3);
+        rx_writel(dev, InboundMailbox4, p4);
         /*
          *      Clear the synch command doorbell to start on a clean slate.
          */
@@ -120,7 +122,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
         /*
          *      Disable doorbell interrupts
          */
-        rx_writeb(dev, MUnit.OIMR, dev->OIMR |= 0x04);
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
         /*
          *      Force the completion of the mask register write before issuing
          *      the interrupt.
@@ -169,6 +171,14 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
          */
         if (status)
                 *status = rx_readl(dev, IndexRegs.Mailbox[0]);
+        if (r1)
+                *r1 = rx_readl(dev, IndexRegs.Mailbox[1]);
+        if (r2)
+                *r2 = rx_readl(dev, IndexRegs.Mailbox[2]);
+        if (r3)
+                *r3 = rx_readl(dev, IndexRegs.Mailbox[3]);
+        if (r4)
+                *r4 = rx_readl(dev, IndexRegs.Mailbox[4]);
         /*
          *      Clear the synch command doorbell.
          */
@@ -190,8 +200,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
 
 static void aac_rx_interrupt_adapter(struct aac_dev *dev)
 {
-        u32 ret;
-        rx_sync_cmd(dev, BREAKPOINT_REQUEST, 0, &ret);
+        rx_sync_cmd(dev, BREAKPOINT_REQUEST, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -220,7 +229,8 @@ static void aac_rx_notify_adapter(struct aac_dev *dev, u32 event)
                 rx_writel(dev, MUnit.IDR,INBOUNDDOORBELL_3);
                 break;
         case HostShutdown:
-//              rx_sync_cmd(dev, HOST_CRASHING, 0, 0, 0, 0, &ret);
+//              rx_sync_cmd(dev, HOST_CRASHING, 0, 0, 0, 0, 0, 0,
+//                NULL, NULL, NULL, NULL, NULL);
                 break;
         case FastIo:
                 rx_writel(dev, MUnit.IDR,INBOUNDDOORBELL_6);
@@ -243,17 +253,11 @@ static void aac_rx_notify_adapter(struct aac_dev *dev, u32 event)
 
 static void aac_rx_start_adapter(struct aac_dev *dev)
 {
-        u32 status;
         struct aac_init *init;
 
         init = dev->init;
         init->HostElapsedSeconds = cpu_to_le32(get_seconds());
         /*
-         *      Tell the adapter we are back and up and running so it will scan
-         *      its command queues and enable our interrupts
-         */
-        dev->irq_mask = (DoorBellPrintfReady | OUTBOUNDDOORBELL_1 | OUTBOUNDDOORBELL_2 | OUTBOUNDDOORBELL_3 | OUTBOUNDDOORBELL_4);
-        /*
          *      First clear out all interrupts.  Then enable the one's that we
          *      can handle.
          */
@@ -263,7 +267,8 @@ static void aac_rx_start_adapter(struct aac_dev *dev)
         rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
 
         // We can only use a 32 bit address here
-        rx_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa, &status);
+        rx_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa,
+          0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -288,8 +293,8 @@ static int aac_rx_check_health(struct aac_dev *dev)
         if (status & KERNEL_PANIC) {
                 char * buffer;
                 struct POSTSTATUS {
-                        u32 Post_Command;
-                        u32 Post_Address;
+                        __le32 Post_Command;
+                        __le32 Post_Address;
                 } * post;
                 dma_addr_t paddr, baddr;
                 int ret;
@@ -310,7 +315,8 @@ static int aac_rx_check_health(struct aac_dev *dev)
                 post->Post_Command = cpu_to_le32(COMMAND_POST_RESULTS);
                 post->Post_Address = cpu_to_le32(baddr);
                 rx_writel(dev, MUnit.IMRx[0], paddr);
-                rx_sync_cmd(dev, COMMAND_POST_RESULTS, baddr, &status);
+                rx_sync_cmd(dev, COMMAND_POST_RESULTS, baddr, 0, 0, 0, 0, 0,
+                  NULL, NULL, NULL, NULL, NULL);
                 pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                   post, paddr);
                 if ((buffer[0] == '0') && (buffer[1] == 'x')) {
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index bd6c30723fba..0680249ab861 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -89,7 +89,7 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
  *      Notify the adapter of an event
  */
  
-void aac_sa_notify_adapter(struct aac_dev *dev, u32 event)
+static void aac_sa_notify_adapter(struct aac_dev *dev, u32 event)
 {
         switch (event) {
 
@@ -106,7 +106,10 @@ void aac_sa_notify_adapter(struct aac_dev *dev, u32 event)
                 sa_writew(dev, DoorbellReg_s,DOORBELL_3);
                 break;
         case HostShutdown:
-                //sa_sync_cmd(dev, HOST_CRASHING, 0, &ret);
+                /*
+                sa_sync_cmd(dev, HOST_CRASHING, 0, 0, 0, 0, 0, 0,
+                NULL, NULL, NULL, NULL, NULL);
+                */
                 break;
         case FastIo:
                 sa_writew(dev, DoorbellReg_s,DOORBELL_6);
@@ -132,7 +135,9 @@ void aac_sa_notify_adapter(struct aac_dev *dev, u32 event)
  *      for its completion.
  */
 
-static int sa_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *ret)
+static int sa_sync_cmd(struct aac_dev *dev, u32 command, 
+                u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
+                u32 *ret, u32 *r1, u32 *r2, u32 *r3, u32 *r4)
 {
         unsigned long start;
         int ok;
@@ -144,9 +149,10 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *ret)
          *      Write the parameters into Mailboxes 1 - 4
          */
         sa_writel(dev, Mailbox1, p1);
-        sa_writel(dev, Mailbox2, 0);
-        sa_writel(dev, Mailbox3, 0);
-        sa_writel(dev, Mailbox4, 0);
+        sa_writel(dev, Mailbox2, p2);
+        sa_writel(dev, Mailbox3, p3);
+        sa_writel(dev, Mailbox4, p4);
+
         /*
          *      Clear the synch command doorbell to start on a clean slate.
          */
@@ -188,6 +194,14 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *ret)
          */
         if (ret)
                 *ret = sa_readl(dev, Mailbox0);
+        if (r1)
+                *r1 = sa_readl(dev, Mailbox1);
+        if (r2)
+                *r2 = sa_readl(dev, Mailbox2);
+        if (r3)
+                *r3 = sa_readl(dev, Mailbox3);
+        if (r4)
+                *r4 = sa_readl(dev, Mailbox4);
         return 0;
 }
 
@@ -201,7 +215,8 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *ret)
 static void aac_sa_interrupt_adapter (struct aac_dev *dev)
 {
         u32 ret;
-        sa_sync_cmd(dev, BREAKPOINT_REQUEST, 0, &ret);
+        sa_sync_cmd(dev, BREAKPOINT_REQUEST, 0, 0, 0, 0, 0, 0,
+                        &ret, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -230,10 +245,12 @@ static void aac_sa_start_adapter(struct aac_dev *dev)
          *      First clear out all interrupts.  Then enable the one's that 
          *      we can handle.
          */
-        sa_writew(dev, SaDbCSR.PRISETIRQMASK, cpu_to_le16(0xffff));
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
         sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, (PrintfReady | DOORBELL_1 | DOORBELL_2 | DOORBELL_3 | DOORBELL_4));
         /* We can only use a 32 bit address here */
-        sa_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa, &ret);
+        sa_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, 
+                        (u32)(ulong)dev->init_pa, 0, 0, 0, 0, 0,
+                        &ret, NULL, NULL, NULL, NULL);
 }
 
 /**
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 88d119f4b970..630b11575230 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1225,8 +1225,6 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt)
         }
 
         DO_UNLOCK(flags);
-
-        spin_lock_irq(shpnt->host_lock);
         return ret;
 }
 
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index e9920a009593..9ec4641a6348 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1348,20 +1348,6 @@ static int aha1542_restart(struct Scsi_Host *shost)
         return 0;
 }
 
-static int aha1542_abort(Scsi_Cmnd * SCpnt)
-{
-
-        /*
-         * The abort command does not leave the device in a clean state where
-         *  it is available to be used again.  Until this gets worked out, we
-         * will leave it commented out.  
-         */
-
-        printk(KERN_ERR "aha1542.c: Unable to abort command for target %d\n",
-               SCpnt->device->id);
-        return FAILED;
-}
-
 /*
  * This is a device reset.  This is handled by sending a special command
  * to the device.
@@ -1478,8 +1464,8 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
          * check for timeout, and if we are doing something like this
          * we are pretty desperate anyways.
          */
-        spin_unlock_irq(SCpnt->device->host->host_lock);
         ssleep(4);
+
         spin_lock_irq(SCpnt->device->host->host_lock);
 
         WAIT(STATUS(SCpnt->device->host->io_port),
@@ -1517,9 +1503,11 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
                 }
         }
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 
 fail:
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return FAILED;
 }
 
@@ -1542,7 +1530,6 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
          * check for timeout, and if we are doing something like this
          * we are pretty desperate anyways.
          */
-        spin_unlock_irq(SCpnt->device->host->host_lock);
         ssleep(4);
         spin_lock_irq(SCpnt->device->host->host_lock);
 
@@ -1586,9 +1573,11 @@ static int aha1542_host_reset(Scsi_Cmnd * SCpnt)
                 }
         }
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 
 fail:
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return FAILED;
 }
 
@@ -1817,7 +1806,6 @@ static Scsi_Host_Template driver_template = {
         .detect                 = aha1542_detect,
         .release                = aha1542_release,
         .queuecommand           = aha1542_queuecommand,
-        .eh_abort_handler       = aha1542_abort,
         .eh_device_reset_handler= aha1542_dev_reset,
         .eh_bus_reset_handler   = aha1542_bus_reset,
         .eh_host_reset_handler  = aha1542_host_reset,
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index c402351dc79a..3821ee17f471 100644
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -133,7 +133,6 @@ struct ccb {			/* Command Control Block 5.3 */
 
 static int aha1542_detect(Scsi_Host_Template *);
 static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-static int aha1542_abort(Scsi_Cmnd * SCpnt);
 static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
 static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
 static int aha1542_host_reset(Scsi_Cmnd * SCpnt);
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index da5bd33d982d..9a547ca9c864 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -32,13 +32,14 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/dma-mapping.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 
 #define DRV_NAME        "ahci"
-#define DRV_VERSION     "1.00"
+#define DRV_VERSION     "1.01"
 
 
 enum {
@@ -49,6 +50,7 @@ enum {
         AHCI_CMD_SLOT_SZ        = 32 * 32,
         AHCI_RX_FIS_SZ          = 256,
         AHCI_CMD_TBL_HDR        = 0x80,
+        AHCI_CMD_TBL_CDB        = 0x40,
         AHCI_CMD_TBL_SZ         = AHCI_CMD_TBL_HDR + (AHCI_MAX_SG * 16),
         AHCI_PORT_PRIV_DMA_SZ   = AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_SZ +
                                   AHCI_RX_FIS_SZ,
@@ -133,6 +135,9 @@ enum {
         PORT_CMD_ICC_ACTIVE     = (0x1 << 28), /* Put i/f in active state */
         PORT_CMD_ICC_PARTIAL    = (0x2 << 28), /* Put i/f in partial state */
         PORT_CMD_ICC_SLUMBER    = (0x6 << 28), /* Put i/f in slumber state */
+
+        /* hpriv->flags bits */
+        AHCI_FLAG_MSI           = (1 << 0),
 };
 
 struct ahci_cmd_hdr {
@@ -182,6 +187,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
 static u8 ahci_check_err(struct ata_port *ap);
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
+static void ahci_remove_one (struct pci_dev *pdev);
 
 static Scsi_Host_Template ahci_sht = {
         .module                 = THIS_MODULE,
@@ -271,7 +277,7 @@ static struct pci_driver ahci_pci_driver = {
         .name                   = DRV_NAME,
         .id_table               = ahci_pci_tbl,
         .probe                  = ahci_init_one,
-        .remove                 = ata_pci_remove_one,
+        .remove                 = ahci_remove_one,
 };
 
 
@@ -289,6 +295,8 @@ static void ahci_host_stop(struct ata_host_set *host_set)
 {
         struct ahci_host_priv *hpriv = host_set->private_data;
         kfree(hpriv);
+
+        ata_host_stop(host_set);
 }
 
 static int ahci_port_start(struct ata_port *ap)
@@ -503,7 +511,8 @@ static void ahci_fill_sg(struct ata_queued_cmd *qc)
 
 static void ahci_qc_prep(struct ata_queued_cmd *qc)
 {
-        struct ahci_port_priv *pp = qc->ap->private_data;
+        struct ata_port *ap = qc->ap;
+        struct ahci_port_priv *pp = ap->private_data;
         u32 opts;
         const u32 cmd_fis_len = 5; /* five dwords */
 
@@ -515,18 +524,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
         opts = (qc->n_elem << 16) | cmd_fis_len;
         if (qc->tf.flags & ATA_TFLAG_WRITE)
                 opts |= AHCI_CMD_WRITE;
-
-        switch (qc->tf.protocol) {
-        case ATA_PROT_ATAPI:
-        case ATA_PROT_ATAPI_NODATA:
-        case ATA_PROT_ATAPI_DMA:
+        if (is_atapi_taskfile(&qc->tf))
                 opts |= AHCI_CMD_ATAPI;
-                break;
-
-        default:
-                /* do nothing */
-                break;
-        }
 
         pp->cmd_slot[0].opts = cpu_to_le32(opts);
         pp->cmd_slot[0].status = 0;
@@ -538,6 +537,10 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
          * a SATA Register - Host to Device command FIS.
          */
         ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
+        if (opts & AHCI_CMD_ATAPI) {
+                memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
+                memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
+        }
 
         if (!(qc->flags & ATA_QCFLAG_DMAMAP))
                 return;
@@ -792,8 +795,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
                                 return rc;
                         }
                 }
-
-                hpriv->flags |= HOST_CAP_64;
         } else {
                 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
@@ -876,15 +877,19 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
 }
 
 /* move to PCI layer, integrate w/ MSI stuff */
-static void pci_enable_intx(struct pci_dev *pdev)
+static void pci_intx(struct pci_dev *pdev, int enable)
 {
-        u16 pci_command;
+        u16 pci_command, new;
 
         pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-        if (pci_command & PCI_COMMAND_INTX_DISABLE) {
-                pci_command &= ~PCI_COMMAND_INTX_DISABLE;
+
+        if (enable)
+                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
+        else
+                new = pci_command | PCI_COMMAND_INTX_DISABLE;
+
+        if (new != pci_command)
                 pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-        }
 }
 
 static void ahci_print_info(struct ata_probe_ent *probe_ent)
@@ -966,7 +971,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         unsigned long base;
         void *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
-        int pci_dev_busy = 0;
+        int have_msi, pci_dev_busy = 0;
         int rc;
 
         VPRINTK("ENTER\n");
@@ -984,12 +989,17 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out;
         }
 
-        pci_enable_intx(pdev);
+        if (pci_enable_msi(pdev) == 0)
+                have_msi = 1;
+        else {
+                pci_intx(pdev, 1);
+                have_msi = 0;
+        }
 
         probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
         if (probe_ent == NULL) {
                 rc = -ENOMEM;
-                goto err_out_regions;
+                goto err_out_msi;
         }
 
         memset(probe_ent, 0, sizeof(*probe_ent));
@@ -1022,6 +1032,9 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->mmio_base = mmio_base;
         probe_ent->private_data = hpriv;
 
+        if (have_msi)
+                hpriv->flags |= AHCI_FLAG_MSI;
+
         /* initialize adapter */
         rc = ahci_host_init(probe_ent);
         if (rc)
@@ -1041,7 +1054,11 @@ err_out_iounmap:
         iounmap(mmio_base);
 err_out_free_ent:
         kfree(probe_ent);
-err_out_regions:
+err_out_msi:
+        if (have_msi)
+                pci_disable_msi(pdev);
+        else
+                pci_intx(pdev, 0);
         pci_release_regions(pdev);
 err_out:
         if (!pci_dev_busy)
@@ -1049,6 +1066,42 @@ err_out:
         return rc;
 }
 
+static void ahci_remove_one (struct pci_dev *pdev)
+{
+        struct device *dev = pci_dev_to_dev(pdev);
+        struct ata_host_set *host_set = dev_get_drvdata(dev);
+        struct ahci_host_priv *hpriv = host_set->private_data;
+        struct ata_port *ap;
+        unsigned int i;
+        int have_msi;
+
+        for (i = 0; i < host_set->n_ports; i++) {
+                ap = host_set->ports[i];
+
+                scsi_remove_host(ap->host);
+        }
+
+        have_msi = hpriv->flags & AHCI_FLAG_MSI;
+        free_irq(host_set->irq, host_set);
+
+        for (i = 0; i < host_set->n_ports; i++) {
+                ap = host_set->ports[i];
+
+                ata_scsi_release(ap->host);
+                scsi_host_put(ap->host);
+        }
+
+        host_set->ops->host_stop(host_set);
+        kfree(host_set);
+
+        if (have_msi)
+                pci_disable_msi(pdev);
+        else
+                pci_intx(pdev, 0);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        dev_set_drvdata(dev, NULL);
+}
 
 static int __init ahci_init(void)
 {
diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c
index 682ca0b32b44..d4ed5e9f830a 100644
--- a/drivers/scsi/aic7xxx/aic7770_osm.c
+++ b/drivers/scsi/aic7xxx/aic7770_osm.c
@@ -44,88 +44,46 @@
 #include <linux/device.h>
 #include <linux/eisa.h>
 
-#define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@')  /* Bits 26-30 */
-#define EISA_MFCTR_CHAR1(ID) (char)(((ID>>21) & 0x1F) | '@')  /* Bits 21-25 */
-#define EISA_MFCTR_CHAR2(ID) (char)(((ID>>16) & 0x1F) | '@')  /* Bits 16-20 */
-#define EISA_PRODUCT_ID(ID)  (short)((ID>>4)  & 0xFFF)        /* Bits  4-15 */
-#define EISA_REVISION_ID(ID) (uint8_t)(ID & 0x0F)             /* Bits  0-3  */
-
-static int aic7770_eisa_dev_probe(struct device *dev);
-static int aic7770_eisa_dev_remove(struct device *dev);
-static struct eisa_driver aic7770_driver = {
-        .driver = {
-                .name   = "aic7xxx",
-                .probe  = aic7770_eisa_dev_probe,
-                .remove = aic7770_eisa_dev_remove,
-        }
-};
-
-typedef  struct device *aic7770_dev_t;
-
-static int aic7770_linux_config(struct aic7770_identity *entry,
-                                aic7770_dev_t dev, u_int eisaBase);
-
 int
-ahc_linux_eisa_init(void)
+aic7770_map_registers(struct ahc_softc *ahc, u_int port)
 {
-        struct eisa_device_id *eid;
-        struct aic7770_identity *id;
-        int i;
-
-        if (aic7xxx_probe_eisa_vl == 0)
-                return -ENODEV;
-
         /*
-         * Linux requires the EISA IDs to be specified in
-         * the EISA ID string format.  Perform the conversion
-         * and setup a table with a NUL terminal entry.
+         * Lock out other contenders for our i/o space.
          */
-        aic7770_driver.id_table = malloc(sizeof(struct eisa_device_id) *
-                                         (ahc_num_aic7770_devs + 1),
-                                         M_DEVBUF, M_NOWAIT);
-        if (aic7770_driver.id_table == NULL)
-                return -ENOMEM;
-
-        for (eid = (struct eisa_device_id *)aic7770_driver.id_table,
-             id = aic7770_ident_table, i = 0;
-             i < ahc_num_aic7770_devs; eid++, id++, i++) {
-
-                sprintf(eid->sig, "%c%c%c%03X%01X",
-                        EISA_MFCTR_CHAR0(id->full_id),
-                        EISA_MFCTR_CHAR1(id->full_id),
-                        EISA_MFCTR_CHAR2(id->full_id),
-                        EISA_PRODUCT_ID(id->full_id),
-                        EISA_REVISION_ID(id->full_id));
-                eid->driver_data = i;
-        }
-        eid->sig[0] = 0;
-
-        return eisa_driver_register(&aic7770_driver);
+        if (request_region(port, AHC_EISA_IOSIZE, "aic7xxx") == 0)
+                return (ENOMEM);
+        ahc->tag = BUS_SPACE_PIO;
+        ahc->bsh.ioport = port;
+        return (0);
 }
 
-void
-ahc_linux_eisa_exit(void)
+int
+aic7770_map_int(struct ahc_softc *ahc, u_int irq)
 {
-        if(aic7xxx_probe_eisa_vl != 0 && aic7770_driver.id_table != NULL) {
-                eisa_driver_unregister(&aic7770_driver);
-                free(aic7770_driver.id_table, M_DEVBUF);
-        }
+        int error;
+        int shared;
+
+        shared = 0;
+        if ((ahc->flags & AHC_EDGE_INTERRUPT) == 0)
+                shared = SA_SHIRQ;
+
+        error = request_irq(irq, ahc_linux_isr, shared, "aic7xxx", ahc);
+        if (error == 0)
+                ahc->platform_data->irq = irq;
+        
+        return (-error);
 }
 
 static int
-aic7770_linux_config(struct aic7770_identity *entry, aic7770_dev_t dev,
-                     u_int eisaBase)
+aic7770_probe(struct device *dev)
 {
+        struct eisa_device *edev = to_eisa_device(dev);
+        u_int eisaBase = edev->base_addr+AHC_EISA_SLOT_OFFSET;
         struct  ahc_softc *ahc;
         char    buf[80];
         char   *name;
         int     error;
 
-        /*
-         * Allocate a softc for this card and
-         * set it up for attachment by our
-         * common detect routine.
-         */
         sprintf(buf, "ahc_eisa:%d", eisaBase >> 12);
         name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
         if (name == NULL)
@@ -134,81 +92,62 @@ aic7770_linux_config(struct aic7770_identity *entry, aic7770_dev_t dev,
         ahc = ahc_alloc(&aic7xxx_driver_template, name);
         if (ahc == NULL)
                 return (ENOMEM);
-        error = aic7770_config(ahc, entry, eisaBase);
+        error = aic7770_config(ahc, aic7770_ident_table + edev->id.driver_data,
+                               eisaBase);
         if (error != 0) {
                 ahc->bsh.ioport = 0;
                 ahc_free(ahc);
                 return (error);
         }
 
-        dev->driver_data = (void *)ahc;
+        dev_set_drvdata(dev, ahc);
+
         if (aic7xxx_detect_complete)
                 error = ahc_linux_register_host(ahc, &aic7xxx_driver_template);
         return (error);
 }
 
-int
-aic7770_map_registers(struct ahc_softc *ahc, u_int port)
-{
-        /*
-         * Lock out other contenders for our i/o space.
-         */
-        if (request_region(port, AHC_EISA_IOSIZE, "aic7xxx") == 0)
-                return (ENOMEM);
-        ahc->tag = BUS_SPACE_PIO;
-        ahc->bsh.ioport = port;
-        return (0);
-}
-
-int
-aic7770_map_int(struct ahc_softc *ahc, u_int irq)
+static int
+aic7770_remove(struct device *dev)
 {
-        int error;
-        int shared;
+        struct ahc_softc *ahc = dev_get_drvdata(dev);
+        u_long s;
 
-        shared = 0;
-        if ((ahc->flags & AHC_EDGE_INTERRUPT) == 0)
-                shared = SA_SHIRQ;
+        ahc_lock(ahc, &s);
+        ahc_intr_enable(ahc, FALSE);
+        ahc_unlock(ahc, &s);
 
-        error = request_irq(irq, ahc_linux_isr, shared, "aic7xxx", ahc);
-        if (error == 0)
-                ahc->platform_data->irq = irq;
-        
-        return (-error);
+        ahc_free(ahc);
+        return 0;
 }
-
-static int
-aic7770_eisa_dev_probe(struct device *dev)
+ 
+static struct eisa_device_id aic7770_ids[] = {
+        { "ADP7771", 0 }, /* AHA 274x */
+        { "ADP7756", 1 }, /* AHA 284x BIOS enabled */
+        { "ADP7757", 2 }, /* AHA 284x BIOS disabled */
+        { "ADP7782", 3 }, /* AHA 274x Olivetti OEM */
+        { "ADP7783", 4 }, /* AHA 274x Olivetti OEM (Differential) */
+        { "ADP7770", 5 }, /* AIC7770 generic */
+        { "" }
+};
+  
+static struct eisa_driver aic7770_driver = {
+        .id_table       = aic7770_ids,
+        .driver = {
+                .name   = "aic7xxx",
+                .probe  = aic7770_probe,
+                .remove = aic7770_remove,
+        }
+};
+  
+int
+ahc_linux_eisa_init(void)
 {
-        struct eisa_device *edev;
-
-        edev = to_eisa_device(dev);
-        return (aic7770_linux_config(aic7770_ident_table + edev->id.driver_data,
-                                    dev, edev->base_addr+AHC_EISA_SLOT_OFFSET));
+        return eisa_driver_register(&aic7770_driver);
 }
-
-static int
-aic7770_eisa_dev_remove(struct device *dev)
+  
+void
+ahc_linux_eisa_exit(void)
 {
-        struct ahc_softc *ahc;
-        u_long l;
-
-        /*
-         * We should be able to just perform
-         * the free directly, but check our
-         * list for extra sanity.
-         */
-        ahc_list_lock(&l);
-        ahc = ahc_find_softc((struct ahc_softc *)dev->driver_data);
-        if (ahc != NULL) {
-                u_long s;
-
-                ahc_lock(ahc, &s);
-                ahc_intr_enable(ahc, FALSE);
-                ahc_unlock(ahc, &s);
-                ahc_free(ahc);
-        }
-        ahc_list_unlock(&l);
-
-        return (0);
+        eisa_driver_unregister(&aic7770_driver);
 }
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 550c9921691a..5f526dd0aaa1 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1511,17 +1511,17 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
                        ahd_name(ahd), cmd->device->channel, cmd->device->id,
                        cmd->device->lun, cmd);
 #endif
-        ahd_midlayer_entrypoint_lock(ahd, &s);
+        ahd_lock(ahd, &s);
 
         dev = ahd_linux_get_device(ahd, cmd->device->channel, cmd->device->id,
                                    cmd->device->lun, /*alloc*/FALSE);
         if (dev == NULL) {
-                ahd_midlayer_entrypoint_unlock(ahd, &s);
+                ahd_unlock(ahd, &s);
                 kfree(recovery_cmd);
                 return (FAILED);
         }
         if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) {
-                ahd_midlayer_entrypoint_unlock(ahd, &s);
+                ahd_unlock(ahd, &s);
                 kfree(recovery_cmd);
                 return (FAILED);
         }
@@ -1570,7 +1570,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
         spin_lock_irq(&ahd->platform_data->spin_lock);
         ahd_schedule_runq(ahd);
         ahd_linux_run_complete_queue(ahd);
-        ahd_midlayer_entrypoint_unlock(ahd, &s);
+        ahd_unlock(ahd, &s);
         printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval);
         return (retval);
 }
@@ -1591,11 +1591,11 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
                 printf("%s: Bus reset called for cmd %p\n",
                        ahd_name(ahd), cmd);
 #endif
-        ahd_midlayer_entrypoint_lock(ahd, &s);
+        ahd_lock(ahd, &s);
         found = ahd_reset_channel(ahd, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
         ahd_linux_run_complete_queue(ahd);
-        ahd_midlayer_entrypoint_unlock(ahd, &s);
+        ahd_unlock(ahd, &s);
 
         if (bootverbose)
                 printf("%s: SCSI bus reset delivered. "
@@ -2488,7 +2488,7 @@ ahd_linux_dv_thread(void *data)
         sprintf(current->comm, "ahd_dv_%d", ahd->unit);
 #else
         daemonize("ahd_dv_%d", ahd->unit);
-        current->flags |= PF_FREEZE;
+        current->flags |= PF_NOFREEZE;
 #endif
         unlock_kernel();
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 605f92b6c5ca..7823e52e99ab 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -112,23 +112,6 @@ typedef Scsi_Cmnd      *ahd_io_ctx_t;
 #define ahd_le32toh(x)  le32_to_cpu(x)
 #define ahd_le64toh(x)  le64_to_cpu(x)
 
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN 1234
-#endif
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN 4321
-#endif
-
-#ifndef BYTE_ORDER
-#if defined(__BIG_ENDIAN)
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#if defined(__LITTLE_ENDIAN)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#endif /* BYTE_ORDER */
-
 /************************* Configuration Data *********************************/
 extern uint32_t aic79xx_allow_memio;
 extern int aic79xx_detect_complete;
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 8ff16fd8ed49..0948d50ae75c 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -346,7 +346,6 @@ typedef enum {
                                           * controller.
                                           */
         AHC_NEWEEPROM_FMT     = 0x4000,
-        AHC_RESOURCE_SHORTAGE = 0x8000,
         AHC_TQINFIFO_BLOCKED  = 0x10000,  /* Blocked waiting for ATIOs */
         AHC_INT50_SPEEDFLEX   = 0x20000,  /*
                                            * Internal 50pin connector
@@ -1200,7 +1199,6 @@ void			 ahc_pause_and_flushwork(struct ahc_softc *ahc);
 int                      ahc_suspend(struct ahc_softc *ahc); 
 int                      ahc_resume(struct ahc_softc *ahc);
 void                     ahc_softc_insert(struct ahc_softc *);
-struct ahc_softc        *ahc_find_softc(struct ahc_softc *ahc);
 void                     ahc_set_unit(struct ahc_softc *, int);
 void                     ahc_set_name(struct ahc_softc *, char *);
 void                     ahc_alloc_scbs(struct ahc_softc *ahc);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 9a6b4a570aa7..8a2bb6f8d77b 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -3934,22 +3934,6 @@ ahc_softc_insert(struct ahc_softc *ahc)
         ahc->init_level++;
 }
 
-/*
- * Verify that the passed in softc pointer is for a
- * controller that is still configured.
- */
-struct ahc_softc *
-ahc_find_softc(struct ahc_softc *ahc)
-{
-        struct ahc_softc *list_ahc;
-
-        TAILQ_FOREACH(list_ahc, &ahc_tailq, links) {
-                if (list_ahc == ahc)
-                        return (ahc);
-        }
-        return (NULL);
-}
-
 void
 ahc_set_unit(struct ahc_softc *ahc, int unit)
 {
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index c13e56320010..b89094db14c1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -122,8 +122,6 @@
 #include "aic7xxx_osm.h"
 #include "aic7xxx_inline.h"
 #include <scsi/scsicam.h>
-#include <scsi/scsi_transport.h>
-#include <scsi/scsi_transport_spi.h>
 
 static struct scsi_transport_template *ahc_linux_transport_template = NULL;
 
@@ -332,22 +330,6 @@ static uint32_t aic7xxx_extended;
 static uint32_t aic7xxx_pci_parity = ~0;
 
 /*
- * Certain newer motherboards have put new PCI based devices into the
- * IO spaces that used to typically be occupied by VLB or EISA cards.
- * This overlap can cause these newer motherboards to lock up when scanned
- * for older EISA and VLB devices.  Setting this option to non-0 will
- * cause the driver to skip scanning for any VLB or EISA controllers and
- * only support the PCI controllers.  NOTE: this means that if the kernel
- * os compiled with PCI support disabled, then setting this to non-0
- * would result in never finding any devices :)
- */
-#ifndef CONFIG_AIC7XXX_PROBE_EISA_VL
-uint32_t aic7xxx_probe_eisa_vl;
-#else
-uint32_t aic7xxx_probe_eisa_vl = ~0;
-#endif
-
-/*
  * There are lots of broken chipsets in the world.  Some of them will
  * violate the PCI spec when we issue byte sized memory writes to our
  * controller.  I/O mapped register access, if allowed by the given
@@ -423,7 +405,7 @@ MODULE_PARM_DESC(aic7xxx,
 );
 
 static void ahc_linux_handle_scsi_status(struct ahc_softc *,
-                                         struct ahc_linux_device *,
+                                         struct scsi_device *,
                                          struct scb *);
 static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc,
                                          struct scsi_cmnd *cmd);
@@ -434,17 +416,7 @@ static int  ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
 static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
 static u_int ahc_linux_user_tagdepth(struct ahc_softc *ahc,
                                      struct ahc_devinfo *devinfo);
-static void ahc_linux_device_queue_depth(struct ahc_softc *ahc,
-                                         struct ahc_linux_device *dev);
-static struct ahc_linux_target* ahc_linux_alloc_target(struct ahc_softc*,
-                                                       u_int, u_int);
-static void                     ahc_linux_free_target(struct ahc_softc*,
-                                                      struct ahc_linux_target*);
-static struct ahc_linux_device* ahc_linux_alloc_device(struct ahc_softc*,
-                                                       struct ahc_linux_target*,
-                                                       u_int);
-static void                     ahc_linux_free_device(struct ahc_softc*,
-                                                      struct ahc_linux_device*);
+static void ahc_linux_device_queue_depth(struct scsi_device *);
 static int ahc_linux_run_command(struct ahc_softc*,
                                  struct ahc_linux_device *,
                                  struct scsi_cmnd *);
@@ -454,32 +426,12 @@ static int  aic7xxx_setup(char *s);
 static int  ahc_linux_next_unit(void);
 
 /********************************* Inlines ************************************/
-static __inline struct ahc_linux_device*
-                     ahc_linux_get_device(struct ahc_softc *ahc, u_int channel,
-                                          u_int target, u_int lun);
 static __inline void ahc_linux_unmap_scb(struct ahc_softc*, struct scb*);
 
 static __inline int ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
                                       struct ahc_dma_seg *sg,
                                       dma_addr_t addr, bus_size_t len);
 
-static __inline struct ahc_linux_device*
-ahc_linux_get_device(struct ahc_softc *ahc, u_int channel, u_int target,
-                     u_int lun)
-{
-        struct ahc_linux_target *targ;
-        struct ahc_linux_device *dev;
-        u_int target_offset;
-
-        target_offset = target;
-        if (channel != 0)
-                target_offset += 8;
-        targ = ahc->platform_data->targets[target_offset];
-        BUG_ON(targ == NULL);
-        dev = targ->devices[lun];
-        return dev;
-}
-
 static __inline void
 ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb)
 {
@@ -533,17 +485,6 @@ ahc_linux_detect(struct scsi_host_template *template)
         int     found = 0;
 
         /*
-         * Sanity checking of Linux SCSI data structures so
-         * that some of our hacks^H^H^H^H^Hassumptions aren't
-         * violated.
-         */
-        if (offsetof(struct ahc_cmd_internal, end)
-          > offsetof(struct scsi_cmnd, host_scribble)) {
-                printf("ahc_linux_detect: SCSI data structures changed.\n");
-                printf("ahc_linux_detect: Unable to attach\n");
-                return (0);
-        }
-        /*
          * If we've been passed any parameters, process them now.
          */
         if (aic7xxx)
@@ -611,7 +552,7 @@ static int
 ahc_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
 {
         struct   ahc_softc *ahc;
-        struct   ahc_linux_device *dev;
+        struct   ahc_linux_device *dev = scsi_transport_device_data(cmd->device);
 
         ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
 
@@ -629,132 +570,177 @@ ahc_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
         if (ahc->platform_data->qfrozen != 0)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        dev = ahc_linux_get_device(ahc, cmd->device->channel, cmd->device->id,
-                                   cmd->device->lun);
-        BUG_ON(dev == NULL);
-
         cmd->result = CAM_REQ_INPROG << 16;
 
         return ahc_linux_run_command(ahc, dev, cmd);
 }
 
-static int
-ahc_linux_slave_alloc(struct scsi_device *device)
+static inline struct scsi_target **
+ahc_linux_target_in_softc(struct scsi_target *starget)
 {
-        struct  ahc_softc *ahc;
-        struct ahc_linux_target *targ;
-        struct scsi_target *starget = device->sdev_target;
-        struct ahc_linux_device *dev;
+        struct  ahc_softc *ahc =
+                *((struct ahc_softc **)dev_to_shost(&starget->dev)->hostdata);
         unsigned int target_offset;
+
+        target_offset = starget->id;
+        if (starget->channel != 0)
+                target_offset += 8;
+
+        return &ahc->platform_data->starget[target_offset];
+}
+
+static int
+ahc_linux_target_alloc(struct scsi_target *starget)
+{
+        struct  ahc_softc *ahc =
+                *((struct ahc_softc **)dev_to_shost(&starget->dev)->hostdata);
+        struct seeprom_config *sc = ahc->seep_config;
         unsigned long flags;
-        int retval = -ENOMEM;
+        struct scsi_target **ahc_targp = ahc_linux_target_in_softc(starget);
+        struct ahc_linux_target *targ = scsi_transport_target_data(starget);
+        unsigned short scsirate;
+        struct ahc_devinfo devinfo;
+        struct ahc_initiator_tinfo *tinfo;
+        struct ahc_tmode_tstate *tstate;
+        char channel = starget->channel + 'A';
+        unsigned int our_id = ahc->our_id;
+        unsigned int target_offset;
 
         target_offset = starget->id;
         if (starget->channel != 0)
                 target_offset += 8;
+          
+        if (starget->channel)
+                our_id = ahc->our_id_b;
 
-        ahc = *((struct ahc_softc **)device->host->hostdata);
-        if (bootverbose)
-                printf("%s: Slave Alloc %d\n", ahc_name(ahc), device->id);
         ahc_lock(ahc, &flags);
-        targ = ahc->platform_data->targets[target_offset];
-        if (targ == NULL) {
-                struct seeprom_config *sc;
 
-                targ = ahc_linux_alloc_target(ahc, starget->channel,
-                                                starget->id);
-                sc = ahc->seep_config;
-                if (targ == NULL)
-                        goto out;
+        BUG_ON(*ahc_targp != NULL);
 
-                if (sc) {
-                        unsigned short scsirate;
-                        struct ahc_devinfo devinfo;
-                        struct ahc_initiator_tinfo *tinfo;
-                        struct ahc_tmode_tstate *tstate;
-                        char channel = starget->channel + 'A';
-                        unsigned int our_id = ahc->our_id;
-
-                        if (starget->channel)
-                                our_id = ahc->our_id_b;
+        *ahc_targp = starget;
+        memset(targ, 0, sizeof(*targ));
 
-                        if ((ahc->features & AHC_ULTRA2) != 0) {
-                                scsirate = sc->device_flags[target_offset] & CFXFER;
-                        } else {
-                                scsirate = (sc->device_flags[target_offset] & CFXFER) << 4;
-                                if (sc->device_flags[target_offset] & CFSYNCH)
-                                        scsirate |= SOFS;
-                        }
-                        if (sc->device_flags[target_offset] & CFWIDEB) {
-                                scsirate |= WIDEXFER;
-                                spi_max_width(starget) = 1;
-                        } else
-                                spi_max_width(starget) = 0;
-                        spi_min_period(starget) = 
-                                ahc_find_period(ahc, scsirate, AHC_SYNCRATE_DT);
-                        tinfo = ahc_fetch_transinfo(ahc, channel, ahc->our_id,
-                                                    targ->target, &tstate);
-                        ahc_compile_devinfo(&devinfo, our_id, targ->target,
-                                            CAM_LUN_WILDCARD, channel,
-                                            ROLE_INITIATOR);
-                        ahc_set_syncrate(ahc, &devinfo, NULL, 0, 0, 0,
-                                         AHC_TRANS_GOAL, /*paused*/FALSE);
-                        ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                                      AHC_TRANS_GOAL, /*paused*/FALSE);
+        if (sc) {
+                int maxsync = AHC_SYNCRATE_DT;
+                int ultra = 0;
+                int flags = sc->device_flags[target_offset];
+
+                if (ahc->flags & AHC_NEWEEPROM_FMT) {
+                    if (flags & CFSYNCHISULTRA)
+                        ultra = 1;
+                } else if (flags & CFULTRAEN)
+                        ultra = 1;
+                /* AIC nutcase; 10MHz appears as ultra = 1, CFXFER = 0x04
+                 * change it to ultra=0, CFXFER = 0 */
+                if(ultra && (flags & CFXFER) == 0x04) {
+                        ultra = 0;
+                        flags &= ~CFXFER;
                 }
-                        
-        }
-        dev = targ->devices[device->lun];
-        if (dev == NULL) {
-                dev = ahc_linux_alloc_device(ahc, targ, device->lun);
-                if (dev == NULL)
-                        goto out;
+            
+                if ((ahc->features & AHC_ULTRA2) != 0) {
+                        scsirate = (flags & CFXFER) | (ultra ? 0x8 : 0);
+                } else {
+                        scsirate = (flags & CFXFER) << 4;
+                        maxsync = ultra ? AHC_SYNCRATE_ULTRA : 
+                                AHC_SYNCRATE_FAST;
+                }
+                spi_max_width(starget) = (flags & CFWIDEB) ? 1 : 0;
+                if (!(flags & CFSYNCH))
+                        spi_max_offset(starget) = 0;
+                spi_min_period(starget) = 
+                        ahc_find_period(ahc, scsirate, maxsync);
+
+                tinfo = ahc_fetch_transinfo(ahc, channel, ahc->our_id,
+                                            starget->id, &tstate);
         }
-        retval = 0;
-
- out:
+        ahc_compile_devinfo(&devinfo, our_id, starget->id,
+                            CAM_LUN_WILDCARD, channel,
+                            ROLE_INITIATOR);
+        ahc_set_syncrate(ahc, &devinfo, NULL, 0, 0, 0,
+                         AHC_TRANS_GOAL, /*paused*/FALSE);
+        ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
+                      AHC_TRANS_GOAL, /*paused*/FALSE);
         ahc_unlock(ahc, &flags);
-        return retval;
+
+        return 0;
+}
+
+static void
+ahc_linux_target_destroy(struct scsi_target *starget)
+{
+        struct scsi_target **ahc_targp = ahc_linux_target_in_softc(starget);
+
+        *ahc_targp = NULL;
 }
 
 static int
-ahc_linux_slave_configure(struct scsi_device *device)
+ahc_linux_slave_alloc(struct scsi_device *sdev)
+{
+        struct  ahc_softc *ahc =
+                *((struct ahc_softc **)sdev->host->hostdata);
+        struct scsi_target *starget = sdev->sdev_target;
+        struct ahc_linux_target *targ = scsi_transport_target_data(starget);
+        struct ahc_linux_device *dev;
+
+        if (bootverbose)
+                printf("%s: Slave Alloc %d\n", ahc_name(ahc), sdev->id);
+
+        BUG_ON(targ->sdev[sdev->lun] != NULL);
+
+        dev = scsi_transport_device_data(sdev);
+        memset(dev, 0, sizeof(*dev));
+
+        /*
+         * We start out life using untagged
+         * transactions of which we allow one.
+         */
+        dev->openings = 1;
+
+        /*
+         * Set maxtags to 0.  This will be changed if we
+         * later determine that we are dealing with
+         * a tagged queuing capable device.
+         */
+        dev->maxtags = 0;
+        
+        targ->sdev[sdev->lun] = sdev;
+
+        return 0;
+}
+
+static int
+ahc_linux_slave_configure(struct scsi_device *sdev)
 {
         struct  ahc_softc *ahc;
-        struct  ahc_linux_device *dev;
 
-        ahc = *((struct ahc_softc **)device->host->hostdata);
+        ahc = *((struct ahc_softc **)sdev->host->hostdata);
 
         if (bootverbose)
-                printf("%s: Slave Configure %d\n", ahc_name(ahc), device->id);
+                printf("%s: Slave Configure %d\n", ahc_name(ahc), sdev->id);
 
-        dev = ahc_linux_get_device(ahc, device->channel, device->id,
-                                   device->lun);
-        dev->scsi_device = device;
-        ahc_linux_device_queue_depth(ahc, dev);
+        ahc_linux_device_queue_depth(sdev);
 
         /* Initial Domain Validation */
-        if (!spi_initial_dv(device->sdev_target))
-                spi_dv_device(device);
+        if (!spi_initial_dv(sdev->sdev_target))
+                spi_dv_device(sdev);
 
         return 0;
 }
 
 static void
-ahc_linux_slave_destroy(struct scsi_device *device)
+ahc_linux_slave_destroy(struct scsi_device *sdev)
 {
         struct  ahc_softc *ahc;
-        struct  ahc_linux_device *dev;
+        struct  ahc_linux_device *dev = scsi_transport_device_data(sdev);
+        struct  ahc_linux_target *targ = scsi_transport_target_data(sdev->sdev_target);
 
-        ahc = *((struct ahc_softc **)device->host->hostdata);
+        ahc = *((struct ahc_softc **)sdev->host->hostdata);
         if (bootverbose)
-                printf("%s: Slave Destroy %d\n", ahc_name(ahc), device->id);
-        dev = ahc_linux_get_device(ahc, device->channel,
-                                   device->id, device->lun);
+                printf("%s: Slave Destroy %d\n", ahc_name(ahc), sdev->id);
 
         BUG_ON(dev->active);
 
-        ahc_linux_free_device(ahc, dev);
+        targ->sdev[sdev->lun] = NULL;
 }
 
 #if defined(__i386__)
@@ -843,10 +829,14 @@ ahc_linux_bus_reset(struct scsi_cmnd *cmd)
 {
         struct ahc_softc *ahc;
         int    found;
+        unsigned long flags;
 
         ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
+
+        ahc_lock(ahc, &flags);
         found = ahc_reset_channel(ahc, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
+        ahc_unlock(ahc, &flags);
 
         if (bootverbose)
                 printf("%s: SCSI bus reset delivered. "
@@ -874,6 +864,8 @@ struct scsi_host_template aic7xxx_driver_template = {
         .slave_alloc            = ahc_linux_slave_alloc,
         .slave_configure        = ahc_linux_slave_configure,
         .slave_destroy          = ahc_linux_slave_destroy,
+        .target_alloc           = ahc_linux_target_alloc,
+        .target_destroy         = ahc_linux_target_destroy,
 };
 
 /**************************** Tasklet Handler *********************************/
@@ -1112,8 +1104,6 @@ aic7xxx_setup(char *s)
                 { "debug", &ahc_debug },
 #endif
                 { "reverse_scan", &aic7xxx_reverse_scan },
-                { "no_probe", &aic7xxx_probe_eisa_vl },
-                { "probe_eisa_vl", &aic7xxx_probe_eisa_vl },
                 { "periodic_otag", &aic7xxx_periodic_otag },
                 { "pci_parity", &aic7xxx_pci_parity },
                 { "seltime", &aic7xxx_seltime },
@@ -1335,8 +1325,7 @@ ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg)
 void
 ahc_platform_free(struct ahc_softc *ahc)
 {
-        struct ahc_linux_target *targ;
-        struct ahc_linux_device *dev;
+        struct scsi_target *starget;
         int i, j;
 
         if (ahc->platform_data != NULL) {
@@ -1347,22 +1336,17 @@ ahc_platform_free(struct ahc_softc *ahc)
 
                 /* destroy all of the device and target objects */
                 for (i = 0; i < AHC_NUM_TARGETS; i++) {
-                        targ = ahc->platform_data->targets[i];
-                        if (targ != NULL) {
-                                /* Keep target around through the loop. */
-                                targ->refcount++;
+                        starget = ahc->platform_data->starget[i];
+                        if (starget != NULL) {
                                 for (j = 0; j < AHC_NUM_LUNS; j++) {
+                                        struct ahc_linux_target *targ =
+                                                scsi_transport_target_data(starget);
 
-                                        if (targ->devices[j] == NULL)
+                                        if (targ->sdev[j] == NULL)
                                                 continue;
-                                        dev = targ->devices[j];
-                                        ahc_linux_free_device(ahc, dev);
+                                        targ->sdev[j] = NULL;
                                 }
-                                /*
-                                 * Forcibly free the target now that
-                                 * all devices are gone.
-                                 */
-                                ahc_linux_free_target(ahc, targ);
+                                ahc->platform_data->starget[i] = NULL;
                         }
                 }
 
@@ -1395,15 +1379,25 @@ void
 ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
                       ahc_queue_alg alg)
 {
+        struct scsi_target *starget;
+        struct ahc_linux_target *targ;
         struct ahc_linux_device *dev;
+        struct scsi_device *sdev;
+        u_int target_offset;
         int was_queuing;
         int now_queuing;
 
-        dev = ahc_linux_get_device(ahc, devinfo->channel - 'A',
-                                   devinfo->target,
-                                   devinfo->lun);
-        if (dev == NULL)
+        target_offset = devinfo->target;
+        if (devinfo->channel != 'A')
+                target_offset += 8;
+        starget = ahc->platform_data->starget[target_offset];
+        targ = scsi_transport_target_data(starget);
+        BUG_ON(targ == NULL);
+        sdev = targ->sdev[devinfo->lun];
+        if (sdev == NULL)
                 return;
+        dev = scsi_transport_device_data(sdev);
+
         was_queuing = dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED);
         switch (alg) {
         default:
@@ -1454,30 +1448,28 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
                 dev->maxtags = 0;
                 dev->openings =  1 - dev->active;
         }
-        if (dev->scsi_device != NULL) {
-                switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
-                case AHC_DEV_Q_BASIC:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_SIMPLE_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                case AHC_DEV_Q_TAGGED:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_ORDERED_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                default:
-                        /*
-                         * We allow the OS to queue 2 untagged transactions to
-                         * us at any time even though we can only execute them
-                         * serially on the controller/device.  This should
-                         * remove some latency.
-                         */
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                /*NON-TAGGED*/0,
-                                                /*queue depth*/2);
-                        break;
-                }
+        switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
+        case AHC_DEV_Q_BASIC:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_SIMPLE_TASK,
+                                        dev->openings + dev->active);
+                break;
+        case AHC_DEV_Q_TAGGED:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_ORDERED_TASK,
+                                        dev->openings + dev->active);
+                break;
+        default:
+                /*
+                 * We allow the OS to queue 2 untagged transactions to
+                 * us at any time even though we can only execute them
+                 * serially on the controller/device.  This should
+                 * remove some latency.
+                 */
+                scsi_adjust_queue_depth(sdev,
+                                        /*NON-TAGGED*/0,
+                                        /*queue depth*/2);
+                break;
         }
 }
 
@@ -1523,22 +1515,20 @@ ahc_linux_user_tagdepth(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
  * Determines the queue depth for a given device.
  */
 static void
-ahc_linux_device_queue_depth(struct ahc_softc *ahc,
-                             struct ahc_linux_device *dev)
+ahc_linux_device_queue_depth(struct scsi_device *sdev)
 {
         struct  ahc_devinfo devinfo;
         u_int   tags;
+        struct ahc_softc *ahc = *((struct ahc_softc **)sdev->host->hostdata);
 
         ahc_compile_devinfo(&devinfo,
-                            dev->target->channel == 0
+                            sdev->sdev_target->channel == 0
                           ? ahc->our_id : ahc->our_id_b,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         tags = ahc_linux_user_tagdepth(ahc, &devinfo);
-        if (tags != 0
-         && dev->scsi_device != NULL
-         && dev->scsi_device->tagged_supported != 0) {
+        if (tags != 0 && sdev->tagged_supported != 0) {
 
                 ahc_set_tags(ahc, &devinfo, AHC_QUEUE_TAGGED);
                 ahc_print_devinfo(ahc, &devinfo);
@@ -1587,10 +1577,9 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
         /*
          * Get an scb to use.
          */
-        if ((scb = ahc_get_scb(ahc)) == NULL) {
-                        ahc->flags |= AHC_RESOURCE_SHORTAGE;
-                        return SCSI_MLQUEUE_HOST_BUSY;
-        }
+        scb = ahc_get_scb(ahc);
+        if (!scb)
+                return SCSI_MLQUEUE_HOST_BUSY;
 
         scb->io_ctx = cmd;
         scb->platform_data->dev = dev;
@@ -1767,106 +1756,6 @@ ahc_platform_flushwork(struct ahc_softc *ahc)
 
 }
 
-static struct ahc_linux_target*
-ahc_linux_alloc_target(struct ahc_softc *ahc, u_int channel, u_int target)
-{
-        struct ahc_linux_target *targ;
-        u_int target_offset;
-
-        target_offset = target;
-        if (channel != 0)
-                target_offset += 8;
-
-        targ = malloc(sizeof(*targ), M_DEVBUG, M_NOWAIT);
-        if (targ == NULL)
-                return (NULL);
-        memset(targ, 0, sizeof(*targ));
-        targ->channel = channel;
-        targ->target = target;
-        targ->ahc = ahc;
-        ahc->platform_data->targets[target_offset] = targ;
-        return (targ);
-}
-
-static void
-ahc_linux_free_target(struct ahc_softc *ahc, struct ahc_linux_target *targ)
-{
-        struct ahc_devinfo devinfo;
-        struct ahc_initiator_tinfo *tinfo;
-        struct ahc_tmode_tstate *tstate;
-        u_int our_id;
-        u_int target_offset;
-        char channel;
-
-        /*
-         * Force a negotiation to async/narrow on any
-         * future command to this device unless a bus
-         * reset occurs between now and that command.
-         */
-        channel = 'A' + targ->channel;
-        our_id = ahc->our_id;
-        target_offset = targ->target;
-        if (targ->channel != 0) {
-                target_offset += 8;
-                our_id = ahc->our_id_b;
-        }
-        tinfo = ahc_fetch_transinfo(ahc, channel, our_id,
-                                    targ->target, &tstate);
-        ahc_compile_devinfo(&devinfo, our_id, targ->target, CAM_LUN_WILDCARD,
-                            channel, ROLE_INITIATOR);
-        ahc_set_syncrate(ahc, &devinfo, NULL, 0, 0, 0,
-                         AHC_TRANS_GOAL, /*paused*/FALSE);
-        ahc_set_width(ahc, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                      AHC_TRANS_GOAL, /*paused*/FALSE);
-        ahc_update_neg_request(ahc, &devinfo, tstate, tinfo, AHC_NEG_ALWAYS);
-        ahc->platform_data->targets[target_offset] = NULL;
-        free(targ, M_DEVBUF);
-}
-
-static struct ahc_linux_device*
-ahc_linux_alloc_device(struct ahc_softc *ahc,
-                 struct ahc_linux_target *targ, u_int lun)
-{
-        struct ahc_linux_device *dev;
-
-        dev = malloc(sizeof(*dev), M_DEVBUG, M_NOWAIT);
-        if (dev == NULL)
-                return (NULL);
-        memset(dev, 0, sizeof(*dev));
-        dev->lun = lun;
-        dev->target = targ;
-
-        /*
-         * We start out life using untagged
-         * transactions of which we allow one.
-         */
-        dev->openings = 1;
-
-        /*
-         * Set maxtags to 0.  This will be changed if we
-         * later determine that we are dealing with
-         * a tagged queuing capable device.
-         */
-        dev->maxtags = 0;
-        
-        targ->refcount++;
-        targ->devices[lun] = dev;
-        return (dev);
-}
-
-static void
-ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
-{
-        struct ahc_linux_target *targ;
-
-        targ = dev->target;
-        targ->devices[dev->lun] = NULL;
-        free(dev, M_DEVBUF);
-        targ->refcount--;
-        if (targ->refcount == 0)
-                ahc_linux_free_target(ahc, targ);
-}
-
 void
 ahc_send_async(struct ahc_softc *ahc, char channel,
                u_int target, u_int lun, ac_code code, void *arg)
@@ -1875,11 +1764,15 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
         case AC_TRANSFER_NEG:
         {
                 char    buf[80];
+                struct  scsi_target *starget;
                 struct  ahc_linux_target *targ;
                 struct  info_str info;
                 struct  ahc_initiator_tinfo *tinfo;
                 struct  ahc_tmode_tstate *tstate;
                 int     target_offset;
+                unsigned int target_ppr_options;
+
+                BUG_ON(target == CAM_TARGET_WILDCARD);
 
                 info.buffer = buf;
                 info.length = sizeof(buf);
@@ -1908,32 +1801,30 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
                 target_offset = target;
                 if (channel == 'B')
                         target_offset += 8;
-                targ = ahc->platform_data->targets[target_offset];
+                starget = ahc->platform_data->starget[target_offset];
+                targ = scsi_transport_target_data(starget);
                 if (targ == NULL)
                         break;
-                if (tinfo->curr.period == targ->last_tinfo.period
-                 && tinfo->curr.width == targ->last_tinfo.width
-                 && tinfo->curr.offset == targ->last_tinfo.offset
-                 && tinfo->curr.ppr_options == targ->last_tinfo.ppr_options)
+
+                target_ppr_options =
+                        (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
+                        + (spi_qas(starget) ? MSG_EXT_PPR_QAS_REQ : 0)
+                        + (spi_iu(starget) ?  MSG_EXT_PPR_IU_REQ : 0);
+
+                if (tinfo->curr.period == spi_period(starget)
+                    && tinfo->curr.width == spi_width(starget)
+                    && tinfo->curr.offset == spi_offset(starget)
+                 && tinfo->curr.ppr_options == target_ppr_options)
                         if (bootverbose == 0)
                                 break;
 
-                targ->last_tinfo.period = tinfo->curr.period;
-                targ->last_tinfo.width = tinfo->curr.width;
-                targ->last_tinfo.offset = tinfo->curr.offset;
-                targ->last_tinfo.ppr_options = tinfo->curr.ppr_options;
-
-                printf("(%s:%c:", ahc_name(ahc), channel);
-                if (target == CAM_TARGET_WILDCARD)
-                        printf("*): ");
-                else
-                        printf("%d): ", target);
-                ahc_format_transinfo(&info, &tinfo->curr);
-                if (info.pos < info.length)
-                        *info.buffer = '\0';
-                else
-                        buf[info.length - 1] = '\0';
-                printf("%s", buf);
+                spi_period(starget) = tinfo->curr.period;
+                spi_width(starget) = tinfo->curr.width;
+                spi_offset(starget) = tinfo->curr.offset;
+                spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ;
+                spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ;
+                spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ;
+                spi_display_xfer_agreement(starget);
                 break;
         }
         case AC_SENT_BDR:
@@ -2038,7 +1929,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb)
                         ahc_set_transaction_status(scb, CAM_REQ_CMP);
                 }
         } else if (ahc_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
-                ahc_linux_handle_scsi_status(ahc, dev, scb);
+                ahc_linux_handle_scsi_status(ahc, cmd->device, scb);
         }
 
         if (dev->openings == 1
@@ -2077,14 +1968,15 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb)
 
 static void
 ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
-                             struct ahc_linux_device *dev, struct scb *scb)
+                             struct scsi_device *sdev, struct scb *scb)
 {
         struct  ahc_devinfo devinfo;
+        struct ahc_linux_device *dev = scsi_transport_device_data(sdev);
 
         ahc_compile_devinfo(&devinfo,
                             ahc->our_id,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         
         /*
@@ -2361,6 +2253,8 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                 printf(" 0x%x", cmd->cmnd[cdb_byte]);
         printf("\n");
 
+        spin_lock_irq(&ahc->platform_data->spin_lock);
+
         /*
          * First determine if we currently own this command.
          * Start by searching the device queue.  If not found
@@ -2368,8 +2262,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
          * at all, and the system wanted us to just abort the
          * command, return success.
          */
-        dev = ahc_linux_get_device(ahc, cmd->device->channel, cmd->device->id,
-                                   cmd->device->lun);
+        dev = scsi_transport_device_data(cmd->device);
 
         if (dev == NULL) {
                 /*
@@ -2616,6 +2509,8 @@ done:
                 }
                 spin_lock_irq(&ahc->platform_data->spin_lock);
         }
+
+        spin_unlock_irq(&ahc->platform_data->spin_lock);
         return (retval);
 }
 
@@ -2626,18 +2521,6 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc)
 
 static void ahc_linux_exit(void);
 
-static void ahc_linux_get_width(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_width(starget) = tinfo->curr.width;
-}
-
 static void ahc_linux_set_width(struct scsi_target *starget, int width)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2652,18 +2535,6 @@ static void ahc_linux_set_width(struct scsi_target *starget, int width)
         ahc_unlock(ahc, &flags);
 }
 
-static void ahc_linux_get_period(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_period(starget) = tinfo->curr.period;
-}
-
 static void ahc_linux_set_period(struct scsi_target *starget, int period)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2674,9 +2545,9 @@ static void ahc_linux_set_period(struct scsi_target *starget, int period)
                                       starget->channel + 'A',
                                       shost->this_id, starget->id, &tstate);
         struct ahc_devinfo devinfo;
-        unsigned int ppr_options = tinfo->curr.ppr_options;
+        unsigned int ppr_options = tinfo->goal.ppr_options;
         unsigned long flags;
-        unsigned long offset = tinfo->curr.offset;
+        unsigned long offset = tinfo->goal.offset;
         struct ahc_syncrate *syncrate;
 
         if (offset == 0)
@@ -2692,7 +2563,6 @@ static void ahc_linux_set_period(struct scsi_target *starget, int period)
 
         /* all PPR requests apart from QAS require wide transfers */
         if (ppr_options & ~MSG_EXT_PPR_QAS_REQ) {
-                ahc_linux_get_width(starget);
                 if (spi_width(starget) == 0)
                         ppr_options &= MSG_EXT_PPR_QAS_REQ;
         }
@@ -2704,18 +2574,6 @@ static void ahc_linux_set_period(struct scsi_target *starget, int period)
         ahc_unlock(ahc, &flags);
 }
 
-static void ahc_linux_get_offset(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_offset(starget) = tinfo->curr.offset;
-}
-
 static void ahc_linux_set_offset(struct scsi_target *starget, int offset)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2735,8 +2593,8 @@ static void ahc_linux_set_offset(struct scsi_target *starget, int offset)
                             starget->channel + 'A', ROLE_INITIATOR);
         if (offset != 0) {
                 syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
-                period = tinfo->curr.period;
-                ppr_options = tinfo->curr.ppr_options;
+                period = tinfo->goal.period;
+                ppr_options = tinfo->goal.ppr_options;
         }
         ahc_lock(ahc, &flags);
         ahc_set_syncrate(ahc, &devinfo, syncrate, period, offset,
@@ -2744,18 +2602,6 @@ static void ahc_linux_set_offset(struct scsi_target *starget, int offset)
         ahc_unlock(ahc, &flags);
 }
 
-static void ahc_linux_get_dt(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ;
-}
-
 static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2766,9 +2612,9 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
                                       starget->channel + 'A',
                                       shost->this_id, starget->id, &tstate);
         struct ahc_devinfo devinfo;
-        unsigned int ppr_options = tinfo->curr.ppr_options
+        unsigned int ppr_options = tinfo->goal.ppr_options
                 & ~MSG_EXT_PPR_DT_REQ;
-        unsigned int period = tinfo->curr.period;
+        unsigned int period = tinfo->goal.period;
         unsigned long flags;
         struct ahc_syncrate *syncrate;
 
@@ -2782,23 +2628,11 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
                             starget->channel + 'A', ROLE_INITIATOR);
         syncrate = ahc_find_syncrate(ahc, &period, &ppr_options,AHC_SYNCRATE_DT);
         ahc_lock(ahc, &flags);
-        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->curr.offset,
+        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
                          ppr_options, AHC_TRANS_GOAL, FALSE);
         ahc_unlock(ahc, &flags);
 }
 
-static void ahc_linux_get_qas(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ;
-}
-
 static void ahc_linux_set_qas(struct scsi_target *starget, int qas)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2809,9 +2643,9 @@ static void ahc_linux_set_qas(struct scsi_target *starget, int qas)
                                       starget->channel + 'A',
                                       shost->this_id, starget->id, &tstate);
         struct ahc_devinfo devinfo;
-        unsigned int ppr_options = tinfo->curr.ppr_options
+        unsigned int ppr_options = tinfo->goal.ppr_options
                 & ~MSG_EXT_PPR_QAS_REQ;
-        unsigned int period = tinfo->curr.period;
+        unsigned int period = tinfo->goal.period;
         unsigned long flags;
         struct ahc_syncrate *syncrate;
 
@@ -2822,23 +2656,11 @@ static void ahc_linux_set_qas(struct scsi_target *starget, int qas)
                             starget->channel + 'A', ROLE_INITIATOR);
         syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
         ahc_lock(ahc, &flags);
-        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->curr.offset,
+        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
                          ppr_options, AHC_TRANS_GOAL, FALSE);
         ahc_unlock(ahc, &flags);
 }
 
-static void ahc_linux_get_iu(struct scsi_target *starget)
-{
-        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
-        struct ahc_softc *ahc = *((struct ahc_softc **)shost->hostdata);
-        struct ahc_tmode_tstate *tstate;
-        struct ahc_initiator_tinfo *tinfo 
-                = ahc_fetch_transinfo(ahc,
-                                      starget->channel + 'A',
-                                      shost->this_id, starget->id, &tstate);
-        spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ;
-}
-
 static void ahc_linux_set_iu(struct scsi_target *starget, int iu)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
@@ -2849,9 +2671,9 @@ static void ahc_linux_set_iu(struct scsi_target *starget, int iu)
                                       starget->channel + 'A',
                                       shost->this_id, starget->id, &tstate);
         struct ahc_devinfo devinfo;
-        unsigned int ppr_options = tinfo->curr.ppr_options
+        unsigned int ppr_options = tinfo->goal.ppr_options
                 & ~MSG_EXT_PPR_IU_REQ;
-        unsigned int period = tinfo->curr.period;
+        unsigned int period = tinfo->goal.period;
         unsigned long flags;
         struct ahc_syncrate *syncrate;
 
@@ -2862,28 +2684,22 @@ static void ahc_linux_set_iu(struct scsi_target *starget, int iu)
                             starget->channel + 'A', ROLE_INITIATOR);
         syncrate = ahc_find_syncrate(ahc, &period, &ppr_options, AHC_SYNCRATE_DT);
         ahc_lock(ahc, &flags);
-        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->curr.offset,
+        ahc_set_syncrate(ahc, &devinfo, syncrate, period, tinfo->goal.offset,
                          ppr_options, AHC_TRANS_GOAL, FALSE);
         ahc_unlock(ahc, &flags);
 }
 
 static struct spi_function_template ahc_linux_transport_functions = {
-        .get_offset     = ahc_linux_get_offset,
         .set_offset     = ahc_linux_set_offset,
         .show_offset    = 1,
-        .get_period     = ahc_linux_get_period,
         .set_period     = ahc_linux_set_period,
         .show_period    = 1,
-        .get_width      = ahc_linux_get_width,
         .set_width      = ahc_linux_set_width,
         .show_width     = 1,
-        .get_dt         = ahc_linux_get_dt,
         .set_dt         = ahc_linux_set_dt,
         .show_dt        = 1,
-        .get_iu         = ahc_linux_get_iu,
         .set_iu         = ahc_linux_set_iu,
         .show_iu        = 1,
-        .get_qas        = ahc_linux_get_qas,
         .set_qas        = ahc_linux_set_qas,
         .show_qas       = 1,
 };
@@ -2896,6 +2712,10 @@ ahc_linux_init(void)
         ahc_linux_transport_template = spi_attach_transport(&ahc_linux_transport_functions);
         if (!ahc_linux_transport_template)
                 return -ENODEV;
+        scsi_transport_reserve_target(ahc_linux_transport_template,
+                                      sizeof(struct ahc_linux_target));
+        scsi_transport_reserve_device(ahc_linux_transport_template,
+                                      sizeof(struct ahc_linux_device));
         if (ahc_linux_detect(&aic7xxx_driver_template))
                 return 0;
         spi_release_transport(ahc_linux_transport_template);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 30c200d5bcd5..8ffe2d3e1d95 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -79,6 +79,8 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
 
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
@@ -127,23 +129,6 @@ typedef struct scsi_cmnd      *ahc_io_ctx_t;
 #define ahc_le32toh(x)  le32_to_cpu(x)
 #define ahc_le64toh(x)  le64_to_cpu(x)
 
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN 1234
-#endif
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN 4321
-#endif
-
-#ifndef BYTE_ORDER
-#if defined(__BIG_ENDIAN)
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#if defined(__LITTLE_ENDIAN)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#endif /* BYTE_ORDER */
-
 /************************* Configuration Data *********************************/
 extern u_int aic7xxx_no_probe;
 extern u_int aic7xxx_allow_memio;
@@ -283,35 +268,6 @@ ahc_scb_timer_reset(struct scb *scb, u_int usec)
 
 #define AIC7XXX_DRIVER_VERSION "6.2.36"
 
-/**************************** Front End Queues ********************************/
-/*
- * Data structure used to cast the Linux struct scsi_cmnd to something
- * that allows us to use the queue macros.  The linux structure has
- * plenty of space to hold the links fields as required by the queue
- * macros, but the queue macors require them to have the correct type.
- */
-struct ahc_cmd_internal {
-        /* Area owned by the Linux scsi layer. */
-        uint8_t private[offsetof(struct scsi_cmnd, SCp.Status)];
-        union {
-                STAILQ_ENTRY(ahc_cmd)   ste;
-                LIST_ENTRY(ahc_cmd)     le;
-                TAILQ_ENTRY(ahc_cmd)    tqe;
-        } links;
-        uint32_t                        end;
-};
-
-struct ahc_cmd {
-        union {
-                struct ahc_cmd_internal icmd;
-                struct scsi_cmnd        scsi_cmd;
-        } un;
-};
-
-#define acmd_icmd(cmd) ((cmd)->un.icmd)
-#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
-#define acmd_links un.icmd.links
-
 /*************************** Device Data Structures ***************************/
 /*
  * A per probed device structure used to deal with some error recovery
@@ -320,7 +276,6 @@ struct ahc_cmd {
  * after a successfully completed inquiry command to the target when
  * that inquiry data indicates a lun is present.
  */
-TAILQ_HEAD(ahc_busyq, ahc_cmd);
 typedef enum {
         AHC_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
         AHC_DEV_Q_BASIC          = 0x10, /* Allow basic device queuing */
@@ -330,8 +285,6 @@ typedef enum {
 
 struct ahc_linux_target;
 struct ahc_linux_device {
-        TAILQ_ENTRY(ahc_linux_device) links;
-
         /*
          * The number of transactions currently
          * queued to the device.
@@ -401,17 +354,10 @@ struct ahc_linux_device {
          */
         u_int                   commands_since_idle_or_otag;
 #define AHC_OTAG_THRESH 500
-
-        int                     lun;
-        struct scsi_device       *scsi_device;
-        struct                  ahc_linux_target *target;
 };
 
 struct ahc_linux_target {
-        struct ahc_linux_device  *devices[AHC_NUM_LUNS];
-        int                       channel;
-        int                       target;
-        int                       refcount;
+        struct scsi_device       *sdev[AHC_NUM_LUNS];
         struct ahc_transinfo      last_tinfo;
         struct ahc_softc         *ahc;
 };
@@ -445,7 +391,7 @@ struct ahc_platform_data {
         /*
          * Fields accessed from interrupt context.
          */
-        struct ahc_linux_target *targets[AHC_NUM_TARGETS]; 
+        struct scsi_target *starget[AHC_NUM_TARGETS]; 
 
         spinlock_t               spin_lock;
         u_int                    qfrozen;
@@ -659,7 +605,6 @@ typedef enum
 
 /**************************** VL/EISA Routines ********************************/
 #ifdef CONFIG_EISA
-extern uint32_t aic7xxx_probe_eisa_vl;
 int                      ahc_linux_eisa_init(void);
 void                     ahc_linux_eisa_exit(void);
 int                      aic7770_map_registers(struct ahc_softc *ahc,
@@ -924,7 +869,6 @@ ahc_notify_xfer_settings_change(struct ahc_softc *ahc,
 static __inline void
 ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb)
 {
-        ahc->flags &= ~AHC_RESOURCE_SHORTAGE;
 }
 
 int     ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 2a0ebce83e7a..89d737ee551a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -140,27 +140,17 @@ struct pci_driver aic7xxx_pci_driver = {
 static void
 ahc_linux_pci_dev_remove(struct pci_dev *pdev)
 {
-        struct ahc_softc *ahc;
-        u_long l;
+        struct ahc_softc *ahc = pci_get_drvdata(pdev);
+        u_long s;
 
-        /*
-         * We should be able to just perform
-         * the free directly, but check our
-         * list for extra sanity.
-         */
-        ahc_list_lock(&l);
-        ahc = ahc_find_softc((struct ahc_softc *)pci_get_drvdata(pdev));
-        if (ahc != NULL) {
-                u_long s;
+        ahc_list_lock(&s);
+        TAILQ_REMOVE(&ahc_tailq, ahc, links);
+        ahc_list_unlock(&s);
 
-                TAILQ_REMOVE(&ahc_tailq, ahc, links);
-                ahc_list_unlock(&l);
-                ahc_lock(ahc, &s);
-                ahc_intr_enable(ahc, FALSE);
-                ahc_unlock(ahc, &s);
-                ahc_free(ahc);
-        } else
-                ahc_list_unlock(&l);
+        ahc_lock(ahc, &s);
+        ahc_intr_enable(ahc, FALSE);
+        ahc_unlock(ahc, &s);
+        ahc_free(ahc);
 }
 
 static int
@@ -174,22 +164,6 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         char            *name;
         int              error;
 
-        /*
-         * Some BIOSen report the same device multiple times.
-         */
-        TAILQ_FOREACH(ahc, &ahc_tailq, links) {
-                struct pci_dev *probed_pdev;
-
-                probed_pdev = ahc->dev_softc;
-                if (probed_pdev->bus->number == pdev->bus->number
-                 && probed_pdev->devfn == pdev->devfn)
-                        break;
-        }
-        if (ahc != NULL) {
-                /* Skip duplicate. */
-                return (-ENODEV);
-        }
-
         pci = pdev;
         entry = ahc_find_pci_device(pci);
         if (entry == NULL)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c
index 5fece859fbd9..ab4469d83fb1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_proc.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c
@@ -50,7 +50,7 @@ static void	ahc_dump_target_state(struct ahc_softc *ahc,
                                       u_int our_id, char channel,
                                       u_int target_id, u_int target_offset);
 static void     ahc_dump_device_state(struct info_str *info,
-                                      struct ahc_linux_device *dev);
+                                      struct scsi_device *dev);
 static int      ahc_proc_write_seeprom(struct ahc_softc *ahc,
                                        char *buffer, int length);
 
@@ -142,6 +142,7 @@ ahc_dump_target_state(struct ahc_softc *ahc, struct info_str *info,
                       u_int target_offset)
 {
         struct  ahc_linux_target *targ;
+        struct  scsi_target *starget;
         struct  ahc_initiator_tinfo *tinfo;
         struct  ahc_tmode_tstate *tstate;
         int     lun;
@@ -153,7 +154,8 @@ ahc_dump_target_state(struct ahc_softc *ahc, struct info_str *info,
         copy_info(info, "Target %d Negotiation Settings\n", target_id);
         copy_info(info, "\tUser: ");
         ahc_format_transinfo(info, &tinfo->user);
-        targ = ahc->platform_data->targets[target_offset];
+        starget = ahc->platform_data->starget[target_offset];
+        targ = scsi_transport_target_data(starget);
         if (targ == NULL)
                 return;
 
@@ -163,22 +165,25 @@ ahc_dump_target_state(struct ahc_softc *ahc, struct info_str *info,
         ahc_format_transinfo(info, &tinfo->curr);
 
         for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
-                struct ahc_linux_device *dev;
+                struct scsi_device *sdev;
 
-                dev = targ->devices[lun];
+                sdev = targ->sdev[lun];
 
-                if (dev == NULL)
+                if (sdev == NULL)
                         continue;
 
-                ahc_dump_device_state(info, dev);
+                ahc_dump_device_state(info, sdev);
         }
 }
 
 static void
-ahc_dump_device_state(struct info_str *info, struct ahc_linux_device *dev)
+ahc_dump_device_state(struct info_str *info, struct scsi_device *sdev)
 {
+        struct ahc_linux_device *dev = scsi_transport_device_data(sdev);
+
         copy_info(info, "\tChannel %c Target %d Lun %d Settings\n",
-                  dev->target->channel + 'A', dev->target->target, dev->lun);
+                  sdev->sdev_target->channel + 'A',
+                  sdev->sdev_target->id, sdev->lun);
 
         copy_info(info, "\t\tCommands Queued %ld\n", dev->commands_issued);
         copy_info(info, "\t\tCommands Active %d\n", dev->active);
@@ -292,20 +297,13 @@ int
 ahc_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
                     off_t offset, int length, int inout)
 {
-        struct  ahc_softc *ahc;
+        struct  ahc_softc *ahc = *(struct ahc_softc **)shost->hostdata;
         struct  info_str info;
         char    ahc_info[256];
-        u_long  s;
         u_int   max_targ;
         u_int   i;
         int     retval;
 
-        retval = -EINVAL;
-        ahc_list_lock(&s);
-        ahc = ahc_find_softc(*(struct ahc_softc **)shost->hostdata);
-        if (ahc == NULL)
-                goto done;
-
          /* Has data been written to the file? */ 
         if (inout == TRUE) {
                 retval = ahc_proc_write_seeprom(ahc, buffer, length);
@@ -367,6 +365,5 @@ ahc_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
         }
         retval = info.pos > info.offset ? info.pos - info.offset : 0;
 done:
-        ahc_list_unlock(&s);
         return (retval);
 }
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 9e9d0c40187e..fac091e7093c 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -10358,7 +10358,7 @@ aic7xxx_queue(Scsi_Cmnd *cmd, void (*fn)(Scsi_Cmnd *))
  *   Returns an enumerated type that indicates the status of the operation.
  *-F*************************************************************************/
 static int
-aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
+__aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
 {
   struct aic7xxx_host  *p;
   struct aic7xxx_scb   *scb;
@@ -10551,6 +10551,18 @@ aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
     return SUCCESS;
 }
 
+static int
+aic7xxx_bus_device_reset(Scsi_Cmnd *cmd)
+{
+      int rc;
+
+      spin_lock_irq(cmd->device->host->host_lock);
+      rc = __aic7xxx_bus_device_reset(cmd);
+      spin_unlock_irq(cmd->device->host->host_lock);
+
+      return rc;
+}
+
 
 /*+F*************************************************************************
  * Function:
@@ -10585,7 +10597,7 @@ aic7xxx_panic_abort(struct aic7xxx_host *p, Scsi_Cmnd *cmd)
  *   Abort the current SCSI command(s).
  *-F*************************************************************************/
 static int
-aic7xxx_abort(Scsi_Cmnd *cmd)
+__aic7xxx_abort(Scsi_Cmnd *cmd)
 {
   struct aic7xxx_scb  *scb = NULL;
   struct aic7xxx_host *p;
@@ -10802,6 +10814,19 @@ success:
   return SUCCESS;
 }
 
+static int
+aic7xxx_abort(Scsi_Cmnd *cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __aic7xxx_abort(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
+
 /*+F*************************************************************************
  * Function:
  *   aic7xxx_reset
@@ -10820,6 +10845,8 @@ aic7xxx_reset(Scsi_Cmnd *cmd)
   struct aic_dev_data *aic_dev;
 
   p = (struct aic7xxx_host *) cmd->device->host->hostdata;
+  spin_lock_irq(p->host->host_lock);
+
   aic_dev = AIC_DEV(cmd);
   if(aic7xxx_position(cmd) < p->scb_data->numscbs)
   {
@@ -10859,6 +10886,7 @@ aic7xxx_reset(Scsi_Cmnd *cmd)
      * longer have it.
      */
     unpause_sequencer(p, FALSE);
+    spin_unlock_irq(p->host->host_lock);
     return SUCCESS;
   }
     
@@ -10882,7 +10910,6 @@ aic7xxx_reset(Scsi_Cmnd *cmd)
   unpause_sequencer(p, FALSE);
   spin_unlock_irq(p->host->host_lock);
   ssleep(2);
-  spin_lock_irq(p->host->host_lock);
   return SUCCESS;
 }
 
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 27271bfc01d7..26498553a7cc 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -244,9 +244,7 @@ static Scsi_Host_Template cumanascsi_template = {
         .info                   = cumanascsi_info,
         .queuecommand           = cumanascsi_queue_command,
         .eh_abort_handler       = NCR5380_abort,
-        .eh_device_reset_handler= NCR5380_device_reset,
         .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .eh_host_reset_handler  = NCR5380_host_reset,
         .can_queue              = 16,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
index 303648a84709..f8a7fdd3c465 100644
--- a/drivers/scsi/arm/ecoscsi.c
+++ b/drivers/scsi/arm/ecoscsi.c
@@ -162,9 +162,7 @@ static Scsi_Host_Template ecoscsi_template =  {
         .info           = ecoscsi_info,
         .queuecommand   = ecoscsi_queue_command,
         .eh_abort_handler       = NCR5380_abort,
-        .eh_device_reset_handler= NCR5380_device_reset,
         .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .eh_host_reset_handler  = NCR5380_host_reset,
         .can_queue      = 16,
         .this_id        = 7,
         .sg_tablesize   = SG_ALL,
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 78b7e543471b..ce711f166cfb 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -466,7 +466,7 @@ int eesoxscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_
         return pos;
 }
 
-static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
+static ssize_t eesoxscsi_show_term(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct expansion_card *ec = ECARD_DEV(dev);
         struct Scsi_Host *host = ecard_get_drvdata(ec);
@@ -475,7 +475,7 @@ static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
         return sprintf(buf, "%d\n", info->control & EESOX_TERM_ENABLE ? 1 : 0);
 }
 
-static ssize_t eesoxscsi_store_term(struct device *dev, const char *buf, size_t len)
+static ssize_t eesoxscsi_store_term(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)
 {
         struct expansion_card *ec = ECARD_DEV(dev);
         struct Scsi_Host *host = ecard_get_drvdata(ec);
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 3838f88e1fe0..4772fb317f3e 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2659,6 +2659,8 @@ int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
 {
         FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
 
+        spin_lock_irq(info->host->host_lock);
+
         fas216_checkmagic(info);
 
         printk("scsi%d.%c: %s: resetting host\n",
@@ -2686,6 +2688,7 @@ int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
 
         fas216_init_chip(info);
 
+        spin_unlock_irq(info->host->host_lock);
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index ff2554f4cb80..de24bb991f1d 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -118,9 +118,7 @@ static Scsi_Host_Template oakscsi_template = {
         .info                   = oakscsi_info,
         .queuecommand           = oakscsi_queue_command,
         .eh_abort_handler       = NCR5380_abort,
-        .eh_device_reset_handler= NCR5380_device_reset,
         .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .eh_host_reset_handler  = NCR5380_host_reset,
         .can_queue              = 16,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 54f23be6460f..abda216113f1 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -269,7 +269,7 @@ int powertecscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, o
         return pos;
 }
 
-static ssize_t powertecscsi_show_term(struct device *dev, char *buf)
+static ssize_t powertecscsi_show_term(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct expansion_card *ec = ECARD_DEV(dev);
         struct Scsi_Host *host = ecard_get_drvdata(ec);
@@ -279,7 +279,7 @@ static ssize_t powertecscsi_show_term(struct device *dev, char *buf)
 }
 
 static ssize_t
-powertecscsi_store_term(struct device *dev, const char *buf, size_t len)
+powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)
 {
         struct expansion_card *ec = ECARD_DEV(dev);
         struct Scsi_Host *host = ecard_get_drvdata(ec);
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 3867f91ef8c7..3be546439252 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -153,6 +153,7 @@ static struct ata_port_operations piix_pata_ops = {
 
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_operations piix_sata_ops = {
@@ -180,6 +181,7 @@ static struct ata_port_operations piix_sata_ops = {
 
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info piix_port_info[] = {
@@ -663,15 +665,6 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         return ata_pci_init_one(pdev, port_info, n_ports);
 }
 
-/**
- *      piix_init -
- *
- *      LOCKING:
- *
- *      RETURNS:
- *
- */
-
 static int __init piix_init(void)
 {
         int rc;
@@ -687,13 +680,6 @@ static int __init piix_init(void)
         return 0;
 }
 
-/**
- *      piix_exit -
- *
- *      LOCKING:
- *
- */
-
 static void __exit piix_exit(void)
 {
         pci_unregister_driver(&piix_pci_driver);
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 45b75ddacaab..e6153fe5842a 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -3146,8 +3146,8 @@ static const char *atp870u_info(struct Scsi_Host *notused)
 }
 
 #define BLS buffer + len + size
-int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, 
-                      char **start, off_t offset, int length, int inout)
+static int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, 
+                             char **start, off_t offset, int length, int inout)
 {
         static u8 buff[512];
         int size = 0;
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
new file mode 100644
index 000000000000..3900e28ac7d6
--- /dev/null
+++ b/drivers/scsi/ch.c
@@ -0,0 +1,1026 @@
+/*
+ * SCSI Media Changer device driver for Linux 2.6
+ *
+ *     (c) 1996-2003 Gerd Knorr <kraxel@bytesex.org>
+ *
+ */
+
+#define VERSION "0.25"
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/major.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/blkdev.h>
+#include <linux/completion.h>
+#include <linux/devfs_fs_kernel.h>
+#include <linux/ioctl32.h>
+#include <linux/compat.h>
+#include <linux/chio.h>                 /* here are all the ioctls */
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_driver.h>
+#include <scsi/scsi_ioctl.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_request.h>
+#include <scsi/scsi_dbg.h>
+
+#define CH_DT_MAX       16
+#define CH_TYPES        8
+
+MODULE_DESCRIPTION("device driver for scsi media changer devices");
+MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org>");
+MODULE_LICENSE("GPL");
+
+static int init = 1;
+module_param(init, int, 0444);
+MODULE_PARM_DESC(init, \
+    "initialize element status on driver load (default: on)");
+
+static int timeout_move = 300;
+module_param(timeout_move, int, 0644);
+MODULE_PARM_DESC(timeout_move,"timeout for move commands "
+                 "(default: 300 seconds)");
+
+static int timeout_init = 3600;
+module_param(timeout_init, int, 0644);
+MODULE_PARM_DESC(timeout_init,"timeout for INITIALIZE ELEMENT STATUS "
+                 "(default: 3600 seconds)");
+
+static int verbose = 1;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose,"be verbose (default: on)");
+
+static int debug = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,"enable/disable debug messages, also prints more "
+                 "detailed sense codes on scsi errors (default: off)");
+
+static int dt_id[CH_DT_MAX] = { [ 0 ... (CH_DT_MAX-1) ] = -1 };
+static int dt_lun[CH_DT_MAX];
+module_param_array(dt_id,  int, NULL, 0444);
+module_param_array(dt_lun, int, NULL, 0444);
+
+/* tell the driver about vendor-specific slots */
+static int vendor_firsts[CH_TYPES-4];
+static int vendor_counts[CH_TYPES-4];
+module_param_array(vendor_firsts, int, NULL, 0444);
+module_param_array(vendor_counts, int, NULL, 0444);
+
+static char *vendor_labels[CH_TYPES-4] = {
+        "v0", "v1", "v2", "v3"
+};
+// module_param_string_array(vendor_labels, NULL, 0444);
+
+#define dprintk(fmt, arg...)    if (debug) \
+        printk(KERN_DEBUG "%s: " fmt, ch->name , ## arg)
+#define vprintk(fmt, arg...)    if (verbose) \
+        printk(KERN_INFO "%s: " fmt, ch->name , ## arg)
+
+/* ------------------------------------------------------------------- */
+
+#define MAX_RETRIES   1
+
+static int  ch_probe(struct device *);
+static int  ch_remove(struct device *);
+static int  ch_open(struct inode * inode, struct file * filp);
+static int  ch_release(struct inode * inode, struct file * filp);
+static int  ch_ioctl(struct inode * inode, struct file * filp,
+                     unsigned int cmd, unsigned long arg);
+#ifdef CONFIG_COMPAT
+static long ch_ioctl_compat(struct file * filp,
+                            unsigned int cmd, unsigned long arg);
+#endif
+
+static struct class * ch_sysfs_class;
+
+typedef struct {
+        struct list_head    list;
+        int                 minor;
+        char                name[8];
+        struct scsi_device  *device;
+        struct scsi_device  **dt;        /* ptrs to data transfer elements */
+        u_int               firsts[CH_TYPES];
+        u_int               counts[CH_TYPES];
+        u_int               unit_attention;
+        u_int               voltags;
+        struct semaphore    lock;
+} scsi_changer;
+
+static LIST_HEAD(ch_devlist);
+static spinlock_t ch_devlist_lock = SPIN_LOCK_UNLOCKED;
+static int ch_devcount;
+
+static struct scsi_driver ch_template =
+{
+        .owner          = THIS_MODULE,
+        .gendrv         = {
+                .name   = "ch",
+                .probe  = ch_probe,
+                .remove = ch_remove,
+        },
+};
+
+static struct file_operations changer_fops =
+{
+        .owner        = THIS_MODULE,
+        .open         = ch_open,
+        .release      = ch_release,
+        .ioctl        = ch_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = ch_ioctl_compat,
+#endif
+};
+
+static struct {
+        unsigned char  sense;
+        unsigned char  asc;
+        unsigned char  ascq;
+        int            errno;
+} err[] = {
+/* Just filled in what looks right. Hav'nt checked any standard paper for
+   these errno assignments, so they may be wrong... */
+        {
+                .sense  = ILLEGAL_REQUEST,
+                .asc    = 0x21,
+                .ascq   = 0x01,
+                .errno  = EBADSLT, /* Invalid element address */
+        },{
+                .sense  = ILLEGAL_REQUEST,
+                .asc    = 0x28,
+                .ascq   = 0x01,
+                .errno  = EBADE,   /* Import or export element accessed */
+        },{
+                .sense  = ILLEGAL_REQUEST,
+                .asc    = 0x3B,
+                .ascq   = 0x0D,
+                .errno  = EXFULL,  /* Medium destination element full */
+        },{
+                .sense  = ILLEGAL_REQUEST,
+                .asc    = 0x3B,
+                .ascq   = 0x0E,
+                .errno  = EBADE,   /* Medium source element empty */
+        },{
+                .sense  = ILLEGAL_REQUEST,
+                .asc    = 0x20,
+                .ascq   = 0x00,
+                .errno  = EBADRQC, /* Invalid command operation code */
+        },{
+                /* end of list */
+        }
+};
+
+/* ------------------------------------------------------------------- */
+
+static int ch_find_errno(unsigned char *sense_buffer)
+{
+        int i,errno = 0;
+
+        /* Check to see if additional sense information is available */
+        if (sense_buffer[7]  > 5 &&
+            sense_buffer[12] != 0) {
+                for (i = 0; err[i].errno != 0; i++) {
+                        if (err[i].sense == sense_buffer[ 2] &&
+                            err[i].asc   == sense_buffer[12] &&
+                            err[i].ascq  == sense_buffer[13]) {
+                                errno = -err[i].errno;
+                                break;
+                        }
+                }
+        }
+        if (errno == 0)
+                errno = -EIO;
+        return errno;
+}
+
+static int
+ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
+           void *buffer, unsigned buflength,
+           enum dma_data_direction direction)
+{
+        int errno, retries = 0, timeout;
+        struct scsi_request *sr;
+        
+        sr = scsi_allocate_request(ch->device, GFP_KERNEL);
+        if (NULL == sr)
+                return -ENOMEM;
+
+        timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
+                ? timeout_init : timeout_move;
+
+ retry:
+        errno = 0;
+        if (debug) {
+                dprintk("command: ");
+                __scsi_print_command(cmd);
+        }
+
+        scsi_wait_req(sr, cmd, buffer, buflength,
+                      timeout * HZ, MAX_RETRIES);
+
+        dprintk("result: 0x%x\n",sr->sr_result);
+        if (driver_byte(sr->sr_result) & DRIVER_SENSE) {
+                if (debug)
+                        scsi_print_req_sense(ch->name, sr);
+                errno = ch_find_errno(sr->sr_sense_buffer);
+
+                switch(sr->sr_sense_buffer[2] & 0xf) {
+                case UNIT_ATTENTION:
+                        ch->unit_attention = 1;
+                        if (retries++ < 3)
+                                goto retry;
+                        break;
+                }
+        }
+        scsi_release_request(sr);
+        return errno;
+}
+
+/* ------------------------------------------------------------------------ */
+
+static int
+ch_elem_to_typecode(scsi_changer *ch, u_int elem)
+{
+        int i;
+        
+        for (i = 0; i < CH_TYPES; i++) {
+                if (elem >= ch->firsts[i]  &&
+                    elem <  ch->firsts[i] +
+                    ch->counts[i])
+                        return i+1;
+        }
+        return 0;
+}
+
+static int
+ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
+{
+        u_char  cmd[12];
+        u_char  *buffer;
+        int     result;
+        
+        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+        if(!buffer)
+                return -ENOMEM;
+        
+ retry:
+        memset(cmd,0,sizeof(cmd));
+        cmd[0] = READ_ELEMENT_STATUS;
+        cmd[1] = (ch->device->lun << 5) | 
+                (ch->voltags ? 0x10 : 0) |
+                ch_elem_to_typecode(ch,elem);
+        cmd[2] = (elem >> 8) & 0xff;
+        cmd[3] = elem        & 0xff;
+        cmd[5] = 1;
+        cmd[9] = 255;
+        if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) {
+                if (((buffer[16] << 8) | buffer[17]) != elem) {
+                        dprintk("asked for element 0x%02x, got 0x%02x\n",
+                                elem,(buffer[16] << 8) | buffer[17]);
+                        kfree(buffer);
+                        return -EIO;
+                }
+                memcpy(data,buffer+16,16);
+        } else {
+                if (ch->voltags) {
+                        ch->voltags = 0;
+                        vprintk("device has no volume tag support\n");
+                        goto retry;
+                }
+                dprintk("READ ELEMENT STATUS for element 0x%x failed\n",elem);
+        }
+        kfree(buffer);
+        return result;
+}
+
+static int 
+ch_init_elem(scsi_changer *ch)
+{
+        int err;
+        u_char cmd[6];
+
+        vprintk("INITIALIZE ELEMENT STATUS, may take some time ...\n");
+        memset(cmd,0,sizeof(cmd));
+        cmd[0] = INITIALIZE_ELEMENT_STATUS;
+        cmd[1] = ch->device->lun << 5;
+        err = ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE);
+        vprintk("... finished\n");
+        return err;
+}
+
+static int
+ch_readconfig(scsi_changer *ch)
+{
+        u_char  cmd[10], data[16];
+        u_char  *buffer;
+        int     result,id,lun,i;
+        u_int   elem;
+
+        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+        if (!buffer)
+                return -ENOMEM;
+        memset(buffer,0,512);
+        
+        memset(cmd,0,sizeof(cmd));
+        cmd[0] = MODE_SENSE;
+        cmd[1] = ch->device->lun << 5;
+        cmd[2] = 0x1d;
+        cmd[4] = 255;
+        result = ch_do_scsi(ch, cmd, buffer, 255, DMA_FROM_DEVICE);
+        if (0 != result) {
+                cmd[1] |= (1<<3);
+                result  = ch_do_scsi(ch, cmd, buffer, 255, DMA_FROM_DEVICE);
+        }
+        if (0 == result) {
+                ch->firsts[CHET_MT] =
+                        (buffer[buffer[3]+ 6] << 8) | buffer[buffer[3]+ 7];
+                ch->counts[CHET_MT] =
+                        (buffer[buffer[3]+ 8] << 8) | buffer[buffer[3]+ 9];
+                ch->firsts[CHET_ST] =
+                        (buffer[buffer[3]+10] << 8) | buffer[buffer[3]+11];
+                ch->counts[CHET_ST] =
+                        (buffer[buffer[3]+12] << 8) | buffer[buffer[3]+13];
+                ch->firsts[CHET_IE] =
+                        (buffer[buffer[3]+14] << 8) | buffer[buffer[3]+15];
+                ch->counts[CHET_IE] =
+                        (buffer[buffer[3]+16] << 8) | buffer[buffer[3]+17];
+                ch->firsts[CHET_DT] =
+                        (buffer[buffer[3]+18] << 8) | buffer[buffer[3]+19];
+                ch->counts[CHET_DT] =
+                        (buffer[buffer[3]+20] << 8) | buffer[buffer[3]+21];
+                vprintk("type #1 (mt): 0x%x+%d [medium transport]\n",
+                        ch->firsts[CHET_MT],
+                        ch->counts[CHET_MT]);
+                vprintk("type #2 (st): 0x%x+%d [storage]\n",
+                        ch->firsts[CHET_ST],
+                        ch->counts[CHET_ST]);
+                vprintk("type #3 (ie): 0x%x+%d [import/export]\n",
+                        ch->firsts[CHET_IE],
+                        ch->counts[CHET_IE]);
+                vprintk("type #4 (dt): 0x%x+%d [data transfer]\n",
+                        ch->firsts[CHET_DT],
+                        ch->counts[CHET_DT]);
+        } else {
+                vprintk("reading element address assigment page failed!\n");
+        }
+        
+        /* vendor specific element types */
+        for (i = 0; i < 4; i++) {
+                if (0 == vendor_counts[i])
+                        continue;
+                if (NULL == vendor_labels[i])
+                        continue;
+                ch->firsts[CHET_V1+i] = vendor_firsts[i];
+                ch->counts[CHET_V1+i] = vendor_counts[i];
+                vprintk("type #%d (v%d): 0x%x+%d [%s, vendor specific]\n",
+                        i+5,i+1,vendor_firsts[i],vendor_counts[i],
+                        vendor_labels[i]);
+        }
+
+        /* look up the devices of the data transfer elements */
+        ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device),
+                         GFP_KERNEL);
+        for (elem = 0; elem < ch->counts[CHET_DT]; elem++) {
+                id  = -1;
+                lun = 0;
+                if (elem < CH_DT_MAX  &&  -1 != dt_id[elem]) {
+                        id  = dt_id[elem];
+                        lun = dt_lun[elem];
+                        vprintk("dt 0x%x: [insmod option] ",
+                                elem+ch->firsts[CHET_DT]);
+                } else if (0 != ch_read_element_status
+                           (ch,elem+ch->firsts[CHET_DT],data)) {
+                        vprintk("dt 0x%x: READ ELEMENT STATUS failed\n",
+                                elem+ch->firsts[CHET_DT]);
+                } else {
+                        vprintk("dt 0x%x: ",elem+ch->firsts[CHET_DT]);
+                        if (data[6] & 0x80) {
+                                if (verbose)
+                                        printk("not this SCSI bus\n");
+                                ch->dt[elem] = NULL;
+                        } else if (0 == (data[6] & 0x30)) {
+                                if (verbose)
+                                        printk("ID/LUN unknown\n");
+                                ch->dt[elem] = NULL;
+                        } else {
+                                id  = ch->device->id;
+                                lun = 0;
+                                if (data[6] & 0x20) id  = data[7];
+                                if (data[6] & 0x10) lun = data[6] & 7;
+                        }
+                }
+                if (-1 != id) {
+                        if (verbose)
+                                printk("ID %i, LUN %i, ",id,lun);
+                        ch->dt[elem] =
+                                scsi_device_lookup(ch->device->host,
+                                                   ch->device->channel,
+                                                   id,lun);
+                        if (!ch->dt[elem]) {
+                                /* should not happen */
+                                if (verbose)
+                                        printk("Huh? device not found!\n");
+                        } else {
+                                if (verbose)
+                                        printk("name: %8.8s %16.16s %4.4s\n",
+                                               ch->dt[elem]->vendor,
+                                               ch->dt[elem]->model,
+                                               ch->dt[elem]->rev);
+                        }
+                }
+        }
+        ch->voltags = 1;
+        kfree(buffer);
+
+        return 0;
+}
+
+/* ------------------------------------------------------------------------ */
+
+static int
+ch_position(scsi_changer *ch, u_int trans, u_int elem, int rotate)
+{
+        u_char  cmd[10];
+        
+        dprintk("position: 0x%x\n",elem);
+        if (0 == trans)
+                trans = ch->firsts[CHET_MT];
+        memset(cmd,0,sizeof(cmd));
+        cmd[0]  = POSITION_TO_ELEMENT;
+        cmd[1]  = ch->device->lun << 5;
+        cmd[2]  = (trans >> 8) & 0xff;
+        cmd[3]  =  trans       & 0xff;
+        cmd[4]  = (elem  >> 8) & 0xff;
+        cmd[5]  =  elem        & 0xff;
+        cmd[8]  = rotate ? 1 : 0;
+        return ch_do_scsi(ch, cmd, NULL, 0, DMA_NONE);
+}
+
+static int
+ch_move(scsi_changer *ch, u_int trans, u_int src, u_int dest, int rotate)
+{
+        u_char  cmd[12];
+        
+        dprintk("move: 0x%x => 0x%x\n",src,dest);
+        if (0 == trans)
+                trans = ch->firsts[CHET_MT];
+        memset(cmd,0,sizeof(cmd));
+        cmd[0]  = MOVE_MEDIUM;
+        cmd[1]  = ch->device->lun << 5;
+        cmd[2]  = (trans >> 8) & 0xff;
+        cmd[3]  =  trans       & 0xff;
+        cmd[4]  = (src   >> 8) & 0xff;
+        cmd[5]  =  src         & 0xff;
+        cmd[6]  = (dest  >> 8) & 0xff;
+        cmd[7]  =  dest        & 0xff;
+        cmd[10] = rotate ? 1 : 0;
+        return ch_do_scsi(ch, cmd, NULL,0, DMA_NONE);
+}
+
+static int
+ch_exchange(scsi_changer *ch, u_int trans, u_int src,
+            u_int dest1, u_int dest2, int rotate1, int rotate2)
+{
+        u_char  cmd[12];
+        
+        dprintk("exchange: 0x%x => 0x%x => 0x%x\n",
+                src,dest1,dest2);
+        if (0 == trans)
+                trans = ch->firsts[CHET_MT];
+        memset(cmd,0,sizeof(cmd));
+        cmd[0]  = EXCHANGE_MEDIUM;
+        cmd[1]  = ch->device->lun << 5;
+        cmd[2]  = (trans >> 8) & 0xff;
+        cmd[3]  =  trans       & 0xff;
+        cmd[4]  = (src   >> 8) & 0xff;
+        cmd[5]  =  src         & 0xff;
+        cmd[6]  = (dest1 >> 8) & 0xff;
+        cmd[7]  =  dest1       & 0xff;
+        cmd[8]  = (dest2 >> 8) & 0xff;
+        cmd[9]  =  dest2       & 0xff;
+        cmd[10] = (rotate1 ? 1 : 0) | (rotate2 ? 2 : 0);
+        
+        return ch_do_scsi(ch, cmd, NULL,0, DMA_NONE);
+}
+
+static void
+ch_check_voltag(char *tag)
+{
+        int i;
+
+        for (i = 0; i < 32; i++) {
+                /* restrict to ascii */
+                if (tag[i] >= 0x7f || tag[i] < 0x20)
+                        tag[i] = ' ';
+                /* don't allow search wildcards */
+                if (tag[i] == '?' ||
+                    tag[i] == '*')
+                        tag[i] = ' ';
+        }
+}
+
+static int
+ch_set_voltag(scsi_changer *ch, u_int elem,
+              int alternate, int clear, u_char *tag)
+{
+        u_char  cmd[12];
+        u_char  *buffer;
+        int result;
+
+        buffer = kmalloc(512, GFP_KERNEL);
+        if (!buffer)
+                return -ENOMEM;
+        memset(buffer,0,512);
+
+        dprintk("%s %s voltag: 0x%x => \"%s\"\n",
+                clear     ? "clear"     : "set",
+                alternate ? "alternate" : "primary",
+                elem, tag);
+        memset(cmd,0,sizeof(cmd));
+        cmd[0]  = SEND_VOLUME_TAG;
+        cmd[1] = (ch->device->lun << 5) | 
+                ch_elem_to_typecode(ch,elem);
+        cmd[2] = (elem >> 8) & 0xff;
+        cmd[3] = elem        & 0xff;
+        cmd[5] = clear
+                ? (alternate ? 0x0d : 0x0c)
+                : (alternate ? 0x0b : 0x0a);
+        
+        cmd[9] = 255;
+
+        memcpy(buffer,tag,32);
+        ch_check_voltag(buffer);
+
+        result = ch_do_scsi(ch, cmd, buffer, 256, DMA_TO_DEVICE);
+        kfree(buffer);
+        return result;
+}
+
+static int ch_gstatus(scsi_changer *ch, int type, unsigned char *dest)
+{
+        int retval = 0;
+        u_char data[16];
+        unsigned int i;
+        
+        down(&ch->lock);
+        for (i = 0; i < ch->counts[type]; i++) {
+                if (0 != ch_read_element_status
+                    (ch, ch->firsts[type]+i,data)) {
+                        retval = -EIO;
+                        break;
+                }
+                put_user(data[2], dest+i);
+                if (data[2] & CESTATUS_EXCEPT)
+                        vprintk("element 0x%x: asc=0x%x, ascq=0x%x\n",
+                                ch->firsts[type]+i,
+                                (int)data[4],(int)data[5]);
+                retval = ch_read_element_status
+                        (ch, ch->firsts[type]+i,data);
+                if (0 != retval)
+                        break;
+        }
+        up(&ch->lock);
+        return retval;
+}
+
+/* ------------------------------------------------------------------------ */
+
+static int
+ch_release(struct inode *inode, struct file *file)
+{
+        scsi_changer *ch = file->private_data;
+
+        scsi_device_put(ch->device);
+        file->private_data = NULL;
+        return 0;
+}
+
+static int
+ch_open(struct inode *inode, struct file *file)
+{
+        scsi_changer *tmp, *ch;
+        int minor = iminor(inode);
+
+        spin_lock(&ch_devlist_lock);
+        ch = NULL;
+        list_for_each_entry(tmp,&ch_devlist,list) {
+                if (tmp->minor == minor)
+                        ch = tmp;
+        }
+        if (NULL == ch || scsi_device_get(ch->device)) {
+                spin_unlock(&ch_devlist_lock);
+                return -ENXIO;
+        }
+        spin_unlock(&ch_devlist_lock);
+
+        file->private_data = ch;
+        return 0;
+}
+
+static int
+ch_checkrange(scsi_changer *ch, unsigned int type, unsigned int unit)
+{
+        if (type >= CH_TYPES  ||  unit >= ch->counts[type])
+                return -1;
+        return 0;
+}
+
+static int ch_ioctl(struct inode * inode, struct file * file,
+                    unsigned int cmd, unsigned long arg)
+{
+        scsi_changer *ch = file->private_data;
+        int retval;
+        
+        switch (cmd) {
+        case CHIOGPARAMS:
+        {
+                struct changer_params params;
+                
+                params.cp_curpicker = 0;
+                params.cp_npickers  = ch->counts[CHET_MT];
+                params.cp_nslots    = ch->counts[CHET_ST];
+                params.cp_nportals  = ch->counts[CHET_IE];
+                params.cp_ndrives   = ch->counts[CHET_DT];
+                
+                if (copy_to_user((void *) arg, &params, sizeof(params)))
+                        return -EFAULT;
+                return 0;
+        }
+        case CHIOGVPARAMS:
+        {
+                struct changer_vendor_params vparams;
+
+                memset(&vparams,0,sizeof(vparams));
+                if (ch->counts[CHET_V1]) {
+                        vparams.cvp_n1  = ch->counts[CHET_V1];
+                        strncpy(vparams.cvp_label1,vendor_labels[0],16);
+                }
+                if (ch->counts[CHET_V2]) {
+                        vparams.cvp_n2  = ch->counts[CHET_V2];
+                        strncpy(vparams.cvp_label2,vendor_labels[1],16);
+                }
+                if (ch->counts[CHET_V3]) {
+                        vparams.cvp_n3  = ch->counts[CHET_V3];
+                        strncpy(vparams.cvp_label3,vendor_labels[2],16);
+                }
+                if (ch->counts[CHET_V4]) {
+                        vparams.cvp_n4  = ch->counts[CHET_V4];
+                        strncpy(vparams.cvp_label4,vendor_labels[3],16);
+                }
+                if (copy_to_user((void *) arg, &vparams, sizeof(vparams)))
+                        return -EFAULT;
+                return 0;
+        }
+        
+        case CHIOPOSITION:
+        {
+                struct changer_position pos;
+                
+                if (copy_from_user(&pos, (void*)arg, sizeof (pos)))
+                        return -EFAULT;
+
+                if (0 != ch_checkrange(ch, pos.cp_type, pos.cp_unit)) {
+                        dprintk("CHIOPOSITION: invalid parameter\n");
+                        return -EBADSLT;
+                }
+                down(&ch->lock);
+                retval = ch_position(ch,0,
+                                     ch->firsts[pos.cp_type] + pos.cp_unit,
+                                     pos.cp_flags & CP_INVERT);
+                up(&ch->lock);
+                return retval;
+        }
+        
+        case CHIOMOVE:
+        {
+                struct changer_move mv;
+
+                if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
+                        return -EFAULT;
+
+                if (0 != ch_checkrange(ch, mv.cm_fromtype, mv.cm_fromunit) ||
+                    0 != ch_checkrange(ch, mv.cm_totype,   mv.cm_tounit  )) {
+                        dprintk("CHIOMOVE: invalid parameter\n");
+                        return -EBADSLT;
+                }
+                
+                down(&ch->lock);
+                retval = ch_move(ch,0,
+                                 ch->firsts[mv.cm_fromtype] + mv.cm_fromunit,
+                                 ch->firsts[mv.cm_totype]   + mv.cm_tounit,
+                                 mv.cm_flags & CM_INVERT);
+                up(&ch->lock);
+                return retval;
+        }
+
+        case CHIOEXCHANGE:
+        {
+                struct changer_exchange mv;
+                
+                if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
+                        return -EFAULT;
+
+                if (0 != ch_checkrange(ch, mv.ce_srctype,  mv.ce_srcunit ) ||
+                    0 != ch_checkrange(ch, mv.ce_fdsttype, mv.ce_fdstunit) ||
+                    0 != ch_checkrange(ch, mv.ce_sdsttype, mv.ce_sdstunit)) {
+                        dprintk("CHIOEXCHANGE: invalid parameter\n");
+                        return -EBADSLT;
+                }
+                
+                down(&ch->lock);
+                retval = ch_exchange
+                        (ch,0,
+                         ch->firsts[mv.ce_srctype]  + mv.ce_srcunit,
+                         ch->firsts[mv.ce_fdsttype] + mv.ce_fdstunit,
+                         ch->firsts[mv.ce_sdsttype] + mv.ce_sdstunit,
+                         mv.ce_flags & CE_INVERT1, mv.ce_flags & CE_INVERT2);
+                up(&ch->lock);
+                return retval;
+        }
+
+        case CHIOGSTATUS:
+        {
+                struct changer_element_status ces;
+                
+                if (copy_from_user(&ces, (void*)arg, sizeof (ces)))
+                        return -EFAULT;
+                if (ces.ces_type < 0 || ces.ces_type >= CH_TYPES)
+                        return -EINVAL;
+
+                return ch_gstatus(ch, ces.ces_type, ces.ces_data);
+        }
+
+        case CHIOGELEM:
+        {
+                struct changer_get_element cge;
+                u_char  cmd[12];
+                u_char  *buffer;
+                unsigned int elem;
+                int     result,i;
+                
+                if (copy_from_user(&cge, (void*)arg, sizeof (cge)))
+                        return -EFAULT;
+
+                if (0 != ch_checkrange(ch, cge.cge_type, cge.cge_unit))
+                        return -EINVAL;
+                elem = ch->firsts[cge.cge_type] + cge.cge_unit;
+                
+                buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+                if (!buffer)
+                        return -ENOMEM;
+                down(&ch->lock);
+                
+        voltag_retry:
+                memset(cmd,0,sizeof(cmd));
+                cmd[0] = READ_ELEMENT_STATUS;
+                cmd[1] = (ch->device->lun << 5) |
+                        (ch->voltags ? 0x10 : 0) |
+                        ch_elem_to_typecode(ch,elem);
+                cmd[2] = (elem >> 8) & 0xff;
+                cmd[3] = elem        & 0xff;
+                cmd[5] = 1;
+                cmd[9] = 255;
+                
+                if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) {
+                        cge.cge_status = buffer[18];
+                        cge.cge_flags = 0;
+                        if (buffer[18] & CESTATUS_EXCEPT) {
+                                cge.cge_errno = EIO;
+                        }
+                        if (buffer[25] & 0x80) {
+                                cge.cge_flags |= CGE_SRC;
+                                if (buffer[25] & 0x40)
+                                        cge.cge_flags |= CGE_INVERT;
+                                elem = (buffer[26]<<8) | buffer[27];
+                                for (i = 0; i < 4; i++) {
+                                        if (elem >= ch->firsts[i] &&
+                                            elem <  ch->firsts[i] + ch->counts[i]) {
+                                                cge.cge_srctype = i;
+                                                cge.cge_srcunit = elem-ch->firsts[i];
+                                        }
+                                }
+                        }
+                        if ((buffer[22] & 0x30) == 0x30) {
+                                cge.cge_flags |= CGE_IDLUN;
+                                cge.cge_id  = buffer[23];
+                                cge.cge_lun = buffer[22] & 7;
+                        }
+                        if (buffer[9] & 0x80) {
+                                cge.cge_flags |= CGE_PVOLTAG;
+                                memcpy(cge.cge_pvoltag,buffer+28,36);
+                        }
+                        if (buffer[9] & 0x40) {
+                                cge.cge_flags |= CGE_AVOLTAG;
+                                memcpy(cge.cge_avoltag,buffer+64,36);
+                        }
+                } else if (ch->voltags) {
+                        ch->voltags = 0;
+                        vprintk("device has no volume tag support\n");
+                        goto voltag_retry;
+                }
+                kfree(buffer);
+                up(&ch->lock);
+                
+                if (copy_to_user((void*)arg, &cge, sizeof (cge)))
+                        return -EFAULT;
+                return result;
+        }
+
+        case CHIOINITELEM:
+        {
+                down(&ch->lock);
+                retval = ch_init_elem(ch);
+                up(&ch->lock);
+                return retval;
+        }
+                
+        case CHIOSVOLTAG:
+        {
+                struct changer_set_voltag csv;
+                int elem;
+
+                if (copy_from_user(&csv, (void*)arg, sizeof(csv)))
+                        return -EFAULT;
+
+                if (0 != ch_checkrange(ch, csv.csv_type, csv.csv_unit)) {
+                        dprintk("CHIOSVOLTAG: invalid parameter\n");
+                        return -EBADSLT;
+                }
+                elem = ch->firsts[csv.csv_type] + csv.csv_unit;
+                down(&ch->lock);
+                retval = ch_set_voltag(ch, elem,
+                                       csv.csv_flags & CSV_AVOLTAG,
+                                       csv.csv_flags & CSV_CLEARTAG,
+                                       csv.csv_voltag);
+                up(&ch->lock);
+                return retval;
+        }
+
+        default:
+                return scsi_ioctl(ch->device, cmd, (void*)arg);
+
+        }
+}
+
+#ifdef CONFIG_COMPAT
+
+struct changer_element_status32 {
+        int             ces_type;
+        compat_uptr_t   ces_data;
+};
+#define CHIOGSTATUS32  _IOW('c', 8,struct changer_element_status32)
+
+static long ch_ioctl_compat(struct file * file,
+                            unsigned int cmd, unsigned long arg)
+{
+        scsi_changer *ch = file->private_data;
+        
+        switch (cmd) {
+        case CHIOGPARAMS:
+        case CHIOGVPARAMS:
+        case CHIOPOSITION:
+        case CHIOMOVE:
+        case CHIOEXCHANGE:
+        case CHIOGELEM:
+        case CHIOINITELEM:
+        case CHIOSVOLTAG:
+                /* compatible */
+                return ch_ioctl(NULL /* inode, unused */,
+                                file, cmd, arg);
+        case CHIOGSTATUS32:
+        {
+                struct changer_element_status32 ces32;
+                unsigned char *data;
+                
+                if (copy_from_user(&ces32, (void*)arg, sizeof (ces32)))
+                        return -EFAULT;
+                if (ces32.ces_type < 0 || ces32.ces_type >= CH_TYPES)
+                        return -EINVAL;
+
+                data = compat_ptr(ces32.ces_data);
+                return ch_gstatus(ch, ces32.ces_type, data);
+        }
+        default:
+                // return scsi_ioctl_compat(ch->device, cmd, (void*)arg);
+                return -ENOIOCTLCMD;
+
+        }
+}
+#endif
+
+/* ------------------------------------------------------------------------ */
+
+static int ch_probe(struct device *dev)
+{
+        struct scsi_device *sd = to_scsi_device(dev);
+        scsi_changer *ch;
+        
+        if (sd->type != TYPE_MEDIUM_CHANGER)
+                return -ENODEV;
+    
+        ch = kmalloc(sizeof(*ch), GFP_KERNEL);
+        if (NULL == ch)
+                return -ENOMEM;
+
+        memset(ch,0,sizeof(*ch));
+        ch->minor = ch_devcount;
+        sprintf(ch->name,"ch%d",ch->minor);
+        init_MUTEX(&ch->lock);
+        ch->device = sd;
+        ch_readconfig(ch);
+        if (init)
+                ch_init_elem(ch);
+
+        devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
+                      S_IFCHR | S_IRUGO | S_IWUGO, ch->name);
+        class_device_create(ch_sysfs_class,
+                            MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
+                            dev, "s%s", ch->name);
+
+        printk(KERN_INFO "Attached scsi changer %s "
+               "at scsi%d, channel %d, id %d, lun %d\n", 
+               ch->name, sd->host->host_no, sd->channel, sd->id, sd->lun);
+        
+        spin_lock(&ch_devlist_lock);
+        list_add_tail(&ch->list,&ch_devlist);
+        ch_devcount++;
+        spin_unlock(&ch_devlist_lock);
+        return 0;
+}
+
+static int ch_remove(struct device *dev)
+{
+        struct scsi_device *sd = to_scsi_device(dev);
+        scsi_changer *tmp, *ch;
+
+        spin_lock(&ch_devlist_lock);
+        ch = NULL;
+        list_for_each_entry(tmp,&ch_devlist,list) {
+                if (tmp->device == sd)
+                        ch = tmp;
+        }
+        BUG_ON(NULL == ch);
+        list_del(&ch->list);
+        spin_unlock(&ch_devlist_lock);
+
+        class_device_destroy(ch_sysfs_class,
+                             MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
+        devfs_remove(ch->name);
+        kfree(ch->dt);
+        kfree(ch);
+        ch_devcount--;
+        return 0;
+}
+
+static int __init init_ch_module(void)
+{
+        int rc;
+        
+        printk(KERN_INFO "SCSI Media Changer driver v" VERSION " \n");
+        ch_sysfs_class = class_create(THIS_MODULE, "scsi_changer");
+        if (IS_ERR(ch_sysfs_class)) {
+                rc = PTR_ERR(ch_sysfs_class);
+                return rc;
+        }
+        rc = register_chrdev(SCSI_CHANGER_MAJOR,"ch",&changer_fops);
+        if (rc < 0) {
+                printk("Unable to get major %d for SCSI-Changer\n",
+                       SCSI_CHANGER_MAJOR);
+                goto fail1;
+        }
+        rc = scsi_register_driver(&ch_template.gendrv);
+        if (rc < 0)
+                goto fail2;
+        return 0;
+
+ fail2:
+        unregister_chrdev(SCSI_CHANGER_MAJOR, "ch");
+ fail1:
+        class_destroy(ch_sysfs_class);
+        return rc;
+}
+
+static void __exit exit_ch_module(void) 
+{
+        scsi_unregister_driver(&ch_template.gendrv);
+        unregister_chrdev(SCSI_CHANGER_MAJOR, "ch");
+        class_destroy(ch_sysfs_class);
+}
+
+module_init(init_ch_module);
+module_exit(exit_ch_module);
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index cca41cf8d3e7..ae13c002f60d 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -1310,7 +1310,7 @@ static void reset_dev_param(struct AdapterCtlBlk *acb)
  * @cmd - some command for this host (for fetching hooks)
  * Returns: SUCCESS (0x2002) on success, else FAILED (0x2003).
  */
-static int dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
+static int __dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
 {
         struct AdapterCtlBlk *acb =
                 (struct AdapterCtlBlk *)cmd->device->host->hostdata;
@@ -1356,6 +1356,16 @@ static int dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
         return SUCCESS;
 }
 
+static int dc395x_eh_bus_reset(struct scsi_cmnd *cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __dc395x_eh_bus_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
 
 /*
  * abort an errant SCSI command
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 1d2242403db8..7905b904e01d 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -61,8 +61,6 @@ static struct scsi_host_template dmx3191d_driver_template = {
         .queuecommand           = NCR5380_queue_command,
         .eh_abort_handler       = NCR5380_abort,
         .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .eh_device_reset_handler= NCR5380_device_reset,
-        .eh_host_reset_handler  = NCR5380_host_reset,
         .can_queue              = 32,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 53c9b93013f1..9cc0015b717d 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NULL;
 static int sys_tbl_ind = 0;
 static int sys_tbl_len = 0;
 
-static adpt_hba* hbas[DPTI_MAX_HBA];
 static adpt_hba* hba_chain = NULL;
 static int hba_count = 0;
 
@@ -691,7 +690,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
         u32 msg[4];
         u32 rcode;
         int old_state;
-        struct adpt_device* d = (void*) cmd->device->hostdata;
+        struct adpt_device* d = cmd->device->hostdata;
 
         pHba = (void*) cmd->device->host->hostdata[0];
         printk(KERN_INFO"%s: Trying to reset device\n",pHba->name);
@@ -707,7 +706,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
 
         old_state = d->state;
         d->state |= DPTI_DEV_RESET;
-        if( (rcode = adpt_i2o_post_wait(pHba, (void*)msg,sizeof(msg), FOREVER)) ){
+        if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){
                 d->state = old_state;
                 if(rcode == -EOPNOTSUPP ){
                         printk(KERN_INFO"%s: Device reset not supported\n",pHba->name);
@@ -737,7 +736,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
         msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid);
         msg[2] = 0;
         msg[3] = 0;
-        if(adpt_i2o_post_wait(pHba, (void*)msg,sizeof(msg), FOREVER) ){
+        if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){
                 printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name);
                 return FAILED;
         } else {
@@ -747,7 +746,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
 }
 
 // This version of reset is called by the eh_error_handler
-static int adpt_reset(struct scsi_cmnd* cmd)
+static int __adpt_reset(struct scsi_cmnd* cmd)
 {
         adpt_hba* pHba;
         int rcode;
@@ -763,6 +762,17 @@ static int adpt_reset(struct scsi_cmnd* cmd)
         }
 }
 
+static int adpt_reset(struct scsi_cmnd* cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __adpt_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
 // This version of reset is called by the ioctls and indirectly from eh_error_handler via adpt_reset
 static int adpt_hba_reset(adpt_hba* pHba)
 {
@@ -875,7 +885,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
         void __iomem *msg_addr_virt = NULL;
 
         int raptorFlag = FALSE;
-        int i;
 
         if(pci_enable_device(pDev)) {
                 return -EINVAL;
@@ -935,12 +944,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
         memset(pHba, 0, sizeof(adpt_hba));
 
         down(&adpt_configuration_lock);
-        for(i=0;i<DPTI_MAX_HBA;i++) {
-                if(hbas[i]==NULL) {
-                        hbas[i]=pHba;
-                        break;
-                }
-        }
 
         if(hba_chain != NULL){
                 for(p = hba_chain; p->next; p = p->next);
@@ -950,7 +953,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
         }
         pHba->next = NULL;
         pHba->unit = hba_count;
-        sprintf(pHba->name, "dpti%d", i);
+        sprintf(pHba->name, "dpti%d", hba_count);
         hba_count++;
         
         up(&adpt_configuration_lock);
@@ -1015,11 +1018,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
         if(pHba->host){
                 free_irq(pHba->host->irq, pHba);
         }
-        for(i=0;i<DPTI_MAX_HBA;i++) {
-                if(hbas[i]==pHba) {
-                        hbas[i] = NULL;
-                }
-        }
         p2 = NULL;
         for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){
                 if(p1 == pHba) {
@@ -1076,12 +1074,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 
 static int adpt_init(void)
 {
-        int i;
-
         printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
-        for (i = 0; i < DPTI_MAX_HBA; i++) {
-                hbas[i] = NULL;
-        }
 #ifdef REBOOT_NOTIFIER
         register_reboot_notifier(&adpt_reboot_notifier);
 #endif
@@ -1454,7 +1447,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                         return -ENOMEM;
                 }
                 
-                d->controller = (void*)pHba;
+                d->controller = pHba;
                 d->next = NULL;
 
                 memcpy(&d->lct_data, &lct->lct_entry[i], sizeof(i2o_lct_entry));
@@ -2000,7 +1993,7 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
         struct scsi_cmnd* cmd;
         adpt_hba* pHba = dev_id;
         u32 m;
-        ulong reply;
+        void __iomem *reply;
         u32 status=0;
         u32 context;
         ulong flags = 0;
@@ -2025,11 +2018,11 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
                                 goto out;
                         }
                 }
-                reply = (ulong)bus_to_virt(m);
+                reply = bus_to_virt(m);
 
                 if (readl(reply) & MSG_FAIL) {
                         u32 old_m = readl(reply+28); 
-                        ulong msg;
+                        void __iomem *msg;
                         u32 old_context;
                         PDEBUG("%s: Failed message\n",pHba->name);
                         if(old_m >= 0x100000){
@@ -2038,16 +2031,16 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
                                 continue;
                         }
                         // Transaction context is 0 in failed reply frame
-                        msg = (ulong)(pHba->msg_addr_virt + old_m);
+                        msg = pHba->msg_addr_virt + old_m;
                         old_context = readl(msg+12);
                         writel(old_context, reply+12);
                         adpt_send_nop(pHba, old_m);
                 } 
                 context = readl(reply+8);
                 if(context & 0x40000000){ // IOCTL
-                        ulong p = (ulong)(readl(reply+12));
-                        if( p != 0) {
-                                memcpy((void*)p, (void*)reply, REPLY_FRAME_SIZE * 4);
+                        void *p = (void *)readl(reply+12);
+                        if( p != NULL) {
+                                memcpy_fromio(p, reply, REPLY_FRAME_SIZE * 4);
                         }
                         // All IOCTLs will also be post wait
                 }
@@ -2231,7 +2224,7 @@ static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht)
 }
 
 
-static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd)
+static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
 {
         adpt_hba* pHba;
         u32 hba_status;
@@ -2323,7 +2316,7 @@ static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd)
                         u32 len = sizeof(cmd->sense_buffer);
                         len = (len > 40) ?  40 : len;
                         // Copy over the sense data
-                        memcpy(cmd->sense_buffer, (void*)(reply+28) , len);
+                        memcpy_fromio(cmd->sense_buffer, (reply+28) , len);
                         if(cmd->sense_buffer[0] == 0x70 /* class 7 */ && 
                            cmd->sense_buffer[2] == DATA_PROTECT ){
                                 /* This is to handle an array failed */
@@ -2438,7 +2431,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                         return -ENOMEM;
                                 }
                                 
-                                d->controller = (void*)pHba;
+                                d->controller = pHba;
                                 d->next = NULL;
 
                                 memcpy(&d->lct_data, &lct->lct_entry[i], sizeof(i2o_lct_entry));
@@ -2985,8 +2978,8 @@ static int adpt_i2o_build_sys_table(void)
                 sys_tbl->iops[count].frame_size = pHba->status_block->inbound_frame_size;
                 sys_tbl->iops[count].last_changed = sys_tbl_ind - 1; // ??
                 sys_tbl->iops[count].iop_capabilities = pHba->status_block->iop_capabilities;
-                sys_tbl->iops[count].inbound_low = (u32)virt_to_bus((void*)pHba->post_port);
-                sys_tbl->iops[count].inbound_high = (u32)((u64)virt_to_bus((void*)pHba->post_port)>>32);
+                sys_tbl->iops[count].inbound_low = (u32)virt_to_bus(pHba->post_port);
+                sys_tbl->iops[count].inbound_high = (u32)((u64)virt_to_bus(pHba->post_port)>>32);
 
                 count++;
         }
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h
index 426e15dd490e..9821783c0164 100644
--- a/drivers/scsi/dpti.h
+++ b/drivers/scsi/dpti.h
@@ -296,7 +296,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba);
 static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba);
 static s32 adpt_i2o_hrt_get(adpt_hba* pHba);
 static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_device* dptdevice);
-static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd);
+static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd);
 static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht);
 static s32 adpt_hba_reset(adpt_hba* pHba);
 static s32 adpt_i2o_reset_hba(adpt_hba* pHba);
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index da1aaa413fed..ab9de39bb50b 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -482,8 +482,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand                   = dtc_queue_command,
         .eh_abort_handler               = dtc_abort,
         .eh_bus_reset_handler           = dtc_bus_reset,
-        .eh_device_reset_handler        = dtc_device_reset,
-        .eh_host_reset_handler          = dtc_host_reset,
         .bios_param                     = dtc_biosparam,
         .can_queue                      = CAN_QUEUE,
         .this_id                        = 7,
diff --git a/drivers/scsi/dtc.h b/drivers/scsi/dtc.h
index c4bcdbf338a2..ed73629eb2f9 100644
--- a/drivers/scsi/dtc.h
+++ b/drivers/scsi/dtc.h
@@ -34,8 +34,6 @@ static int dtc_biosparam(struct scsi_device *, struct block_device *,
 static int dtc_detect(Scsi_Host_Template *);
 static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int dtc_bus_reset(Scsi_Cmnd *);
-static int dtc_device_reset(Scsi_Cmnd *);
-static int dtc_host_reset(Scsi_Cmnd *);
 
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN 2
@@ -86,8 +84,6 @@ static int dtc_host_reset(Scsi_Cmnd *);
 #define NCR5380_queue_command           dtc_queue_command
 #define NCR5380_abort                   dtc_abort
 #define NCR5380_bus_reset               dtc_bus_reset
-#define NCR5380_device_reset            dtc_device_reset
-#define NCR5380_host_reset              dtc_host_reset
 #define NCR5380_proc_info               dtc_proc_info 
 
 /* 15 12 11 10
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 81d16cfbe69e..1bb8727eea3e 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -518,8 +518,6 @@ static struct scsi_host_template driver_template = {
         .release = eata2x_release,
         .queuecommand = eata2x_queuecommand,
         .eh_abort_handler = eata2x_eh_abort,
-        .eh_device_reset_handler = NULL,
-        .eh_bus_reset_handler = NULL,
         .eh_host_reset_handler = eata2x_eh_host_reset,
         .bios_param = eata2x_bios_param,
         .slave_configure = eata2x_slave_configure,
@@ -1950,16 +1948,20 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
                ha->board_name, SCarg->device->channel, SCarg->device->id,
                SCarg->device->lun, SCarg->pid);
 
+        spin_lock_irq(shost->host_lock);
+
         if (SCarg->host_scribble == NULL)
                 printk("%s: reset, pid %ld inactive.\n", ha->board_name, SCarg->pid);
 
         if (ha->in_reset) {
                 printk("%s: reset, exit, already in reset.\n", ha->board_name);
+                spin_unlock_irq(shost->host_lock);
                 return FAILED;
         }
 
         if (wait_on_busy(shost->io_port, MAXLOOP)) {
                 printk("%s: reset, exit, timeout error.\n", ha->board_name);
+                spin_unlock_irq(shost->host_lock);
                 return FAILED;
         }
 
@@ -2014,6 +2016,7 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
 
         if (do_dma(shost->io_port, 0, RESET_PIO)) {
                 printk("%s: reset, cannot reset, timeout error.\n", ha->board_name);
+                spin_unlock_irq(shost->host_lock);
                 return FAILED;
         }
 
@@ -2026,9 +2029,12 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
         ha->in_reset = 1;
 
         spin_unlock_irq(shost->host_lock);
+
+        /* FIXME: use a sleep instead */
         time = jiffies;
         while ((jiffies - time) < (10 * HZ) && limit++ < 200000)
                 udelay(100L);
+
         spin_lock_irq(shost->host_lock);
 
         printk("%s: reset, interrupts disabled, loops %d.\n", ha->board_name, limit);
@@ -2078,6 +2084,7 @@ static int eata2x_eh_host_reset(struct scsi_cmnd *SCarg)
         else
                 printk("%s: reset, exit.\n", ha->board_name);
 
+        spin_unlock_irq(shost->host_lock);
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 0ee49dc50b85..04a06b71a5e2 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -486,8 +486,11 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
 
         DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason));
 
+        spin_lock_irq(host->host_lock);
+
         if (HD(cmd)->state == RESET) {
                 printk(KERN_WARNING "eata_pio_reset: exit, already in reset.\n");
+                spin_unlock_irq(host->host_lock);
                 return FAILED;
         }
 
@@ -536,6 +539,8 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
 
         HD(cmd)->state = 0;
 
+        spin_unlock_irq(host->host_lock);
+
         if (success) {          /* hmmm... */
                 DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset: exit, success.\n"));
                 return SUCCESS;
diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index 0dad89d4cb3e..a6f120dcdfc3 100644
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -311,7 +311,6 @@ static Scsi_Host_Template driver_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .eh_abort_handler       = fcp_scsi_abort,
         .eh_device_reset_handler = fcp_scsi_dev_reset,
-        .eh_bus_reset_handler   = fcp_scsi_bus_reset,
         .eh_host_reset_handler  = fcp_scsi_host_reset,
 };
 #include "scsi_module.c"
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index 770930e2aec3..fa652f8aa643 100644
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -1241,18 +1241,9 @@ static int fd_mcs_abort(Scsi_Cmnd * SCpnt)
         return SUCCESS;
 }
 
-static int fd_mcs_host_reset(Scsi_Cmnd * SCpnt)
-{
-        return FAILED;
-}
-
-static int fd_mcs_device_reset(Scsi_Cmnd * SCpnt) 
-{
-        return FAILED;
-}
-
 static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) {
         struct Scsi_Host *shpnt = SCpnt->device->host;
+        unsigned long flags;
 
 #if DEBUG_RESET
         static int called_once = 0;
@@ -1269,6 +1260,8 @@ static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) {
         called_once = 1;
 #endif
 
+        spin_lock_irqsave(shpnt->host_lock, flags);
+
         outb(1, SCSI_Cntl_port);
         do_pause(2);
         outb(0, SCSI_Cntl_port);
@@ -1276,6 +1269,8 @@ static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) {
         outb(0, SCSI_Mode_Cntl_port);
         outb(PARITY_MASK, TMC_Cntl_port);
 
+        spin_unlock_irqrestore(shpnt->host_lock, flags);
+
         /* Unless this is the very first call (i.e., SCPnt == NULL), everything
            is probably hosed at this point.  We will, however, try to keep
            things going by informing the high-level code that we need help. */
@@ -1357,8 +1352,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand                   = fd_mcs_queue, 
         .eh_abort_handler               = fd_mcs_abort,
         .eh_bus_reset_handler           = fd_mcs_bus_reset,
-        .eh_host_reset_handler          = fd_mcs_host_reset,
-        .eh_device_reset_handler        = fd_mcs_device_reset,
         .bios_param                     = fd_mcs_biosparam,
         .can_queue                      = 1,
         .this_id                        = 7,
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index a843c080c1d8..4ba6a15cf43d 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -1543,12 +1543,18 @@ static int fdomain_16x0_abort(struct scsi_cmnd *SCpnt)
 
 int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt)
 {
+   unsigned long flags;
+
+   local_irq_save(flags);
+
    outb(1, port_base + SCSI_Cntl);
    do_pause( 2 );
    outb(0, port_base + SCSI_Cntl);
    do_pause( 115 );
    outb(0, port_base + SCSI_Mode_Cntl);
    outb(PARITY_MASK, port_base + TMC_Cntl);
+
+   local_irq_restore(flags);
    return SUCCESS;
 }
 
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index ca9d5bd26ca3..a3aa729b9d3c 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -908,8 +908,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand           = generic_NCR5380_queue_command,
         .eh_abort_handler       = generic_NCR5380_abort,
         .eh_bus_reset_handler   = generic_NCR5380_bus_reset,
-        .eh_device_reset_handler = generic_NCR5380_device_reset,
-        .eh_host_reset_handler  = generic_NCR5380_host_reset,
         .bios_param             = NCR5380_BIOSPARAM,
         .can_queue              = CAN_QUEUE,
         .this_id                = 7,
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index 0c04cefb2a88..c8adc5a94884 100644
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -49,8 +49,6 @@ static int generic_NCR5380_detect(Scsi_Host_Template *);
 static int generic_NCR5380_release_resources(struct Scsi_Host *);
 static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int generic_NCR5380_bus_reset(Scsi_Cmnd *);
-static int generic_NCR5380_host_reset(Scsi_Cmnd *);
-static int generic_NCR5380_device_reset(Scsi_Cmnd *);
 static const char* generic_NCR5380_info(struct Scsi_Host *);
 
 #ifndef CMD_PER_LUN
@@ -114,8 +112,6 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
 #define NCR5380_queue_command generic_NCR5380_queue_command
 #define NCR5380_abort generic_NCR5380_abort
 #define NCR5380_bus_reset generic_NCR5380_bus_reset
-#define NCR5380_device_reset generic_NCR5380_device_reset
-#define NCR5380_host_reset generic_NCR5380_host_reset
 #define NCR5380_pread generic_NCR5380_pread
 #define NCR5380_pwrite generic_NCR5380_pwrite
 #define NCR5380_proc_info notyet_generic_proc_info
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index a9eaab9fbd5e..4552cccd2834 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -4703,19 +4703,6 @@ static const char *gdth_info(struct Scsi_Host *shp)
     return ((const char *)ha->binfo.type_string);
 }
 
-/* new error handling */
-static int gdth_eh_abort(Scsi_Cmnd *scp)
-{
-    TRACE2(("gdth_eh_abort()\n"));
-    return FAILED;
-}
-
-static int gdth_eh_device_reset(Scsi_Cmnd *scp)
-{
-    TRACE2(("gdth_eh_device_reset()\n"));
-    return FAILED;
-}
-
 static int gdth_eh_bus_reset(Scsi_Cmnd *scp)
 {
     int i, hanum;
@@ -4770,13 +4757,6 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)
     return SUCCESS;
 }
 
-static int gdth_eh_host_reset(Scsi_Cmnd *scp)
-{
-    TRACE2(("gdth_eh_host_reset()\n"));
-    return FAILED;
-}
-
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip)
 #else
@@ -5713,10 +5693,7 @@ static Scsi_Host_Template driver_template = {
         .release                = gdth_release,
         .info                   = gdth_info, 
         .queuecommand           = gdth_queuecommand,
-        .eh_abort_handler       = gdth_eh_abort, 
-        .eh_device_reset_handler = gdth_eh_device_reset,
         .eh_bus_reset_handler   = gdth_eh_bus_reset,
-        .eh_host_reset_handler  = gdth_eh_host_reset,
         .bios_param             = gdth_bios_param,
         .can_queue              = GDTH_MAXCMDS,
         .this_id                = -1,
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 30cbf73c7433..d12342fa8199 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -345,7 +345,15 @@ release:
 static int gvp11_bus_reset(Scsi_Cmnd *cmd)
 {
         /* FIXME perform bus-specific reset */
+
+        /* FIXME 2: shouldn't we no-op this function (return
+           FAILED), and fall back to host reset function,
+           wd33c93_host_reset ? */
+
+        spin_lock_irq(cmd->device->host->host_lock);
         wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index a3fdead9bce9..b5dc35355570 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -2118,7 +2118,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
         return 0;
 }
 
-static int ibmmca_abort(Scsi_Cmnd * cmd)
+static int __ibmmca_abort(Scsi_Cmnd * cmd)
 {
         /* Abort does not work, as the adapter never generates an interrupt on
          * whatever situation is simulated, even when really pending commands
@@ -2225,7 +2225,19 @@ static int ibmmca_abort(Scsi_Cmnd * cmd)
         }
 }
 
-static int ibmmca_host_reset(Scsi_Cmnd * cmd)
+static int ibmmca_abort(Scsi_Cmnd * cmd)
+{
+        struct Scsi_Host *shpnt = cmd->device->host;
+        int rc;
+
+        spin_lock_irq(shpnt->host_lock);
+        rc = __ibmmca_abort(cmd);
+        spin_unlock_irq(shpnt->host_lock);
+
+        return rc;
+}
+
+static int __ibmmca_host_reset(Scsi_Cmnd * cmd)
 {
         struct Scsi_Host *shpnt;
         Scsi_Cmnd *cmd_aid;
@@ -2312,6 +2324,18 @@ static int ibmmca_host_reset(Scsi_Cmnd * cmd)
         return SUCCESS;
 }
 
+static int ibmmca_host_reset(Scsi_Cmnd * cmd)
+{
+        struct Scsi_Host *shpnt = cmd->device->host;
+        int rc;
+
+        spin_lock_irq(shpnt->host_lock);
+        rc = __ibmmca_host_reset(cmd);
+        spin_unlock_irq(shpnt->host_lock);
+
+        return rc;
+}
+
 static int ibmmca_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int *info)
 {
         int size = capacity;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index e89f76e5dd53..d89b8eb3cdf3 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -874,9 +874,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
-        spin_unlock_irq(hostdata->host->host_lock);
         wait_for_completion(&evt->comp);
-        spin_lock_irq(hostdata->host->host_lock);
 
         /* make sure we got a good response */
         if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) {
@@ -978,9 +976,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
-        spin_unlock_irq(hostdata->host->host_lock);
         wait_for_completion(&evt->comp);
-        spin_lock_irq(hostdata->host->host_lock);
 
         /* make sure we got a good response */
         if (unlikely(srp_rsp.srp.generic.type != SRP_RSP_TYPE)) {
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 2e2486b035dd..3d62c9bcbff7 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -46,6 +46,7 @@
 #include <linux/slab.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/bitops.h>
@@ -179,8 +180,18 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsigne
                         return;
                 }
                 count = min(pc->sg->length - pc->b_count, bcount);
-                buf = page_address(pc->sg->page) + pc->sg->offset;
-                drive->hwif->atapi_input_bytes(drive, buf + pc->b_count, count);
+                if (PageHighMem(pc->sg->page)) {
+                        unsigned long flags;
+
+                        local_irq_save(flags);
+                        buf = kmap_atomic(pc->sg->page, KM_IRQ0) + pc->sg->offset;
+                        drive->hwif->atapi_input_bytes(drive, buf + pc->b_count, count);
+                        kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
+                        local_irq_restore(flags);
+                } else {
+                        buf = page_address(pc->sg->page) + pc->sg->offset;
+                        drive->hwif->atapi_input_bytes(drive, buf + pc->b_count, count);
+                }
                 bcount -= count; pc->b_count += count;
                 if (pc->b_count == pc->sg->length) {
                         pc->sg++;
@@ -201,8 +212,18 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsign
                         return;
                 }
                 count = min(pc->sg->length - pc->b_count, bcount);
-                buf = page_address(pc->sg->page) + pc->sg->offset;
-                drive->hwif->atapi_output_bytes(drive, buf + pc->b_count, count);
+                if (PageHighMem(pc->sg->page)) {
+                        unsigned long flags;
+
+                        local_irq_save(flags);
+                        buf = kmap_atomic(pc->sg->page, KM_IRQ0) + pc->sg->offset;
+                        drive->hwif->atapi_output_bytes(drive, buf + pc->b_count, count);
+                        kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
+                        local_irq_restore(flags);
+                } else {
+                        buf = page_address(pc->sg->page) + pc->sg->offset;
+                        drive->hwif->atapi_output_bytes(drive, buf + pc->b_count, count);
+                }
                 bcount -= count; pc->b_count += count;
                 if (pc->b_count == pc->sg->length) {
                         pc->sg++;
@@ -713,7 +734,6 @@ static void idescsi_add_settings(ide_drive_t *drive)
  */
 static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
 {
-        DRIVER(drive)->busy++;
         if (drive->id && (drive->id->config & 0x0060) == 0x20)
                 set_bit (IDESCSI_DRQ_INTERRUPT, &scsi->flags);
         set_bit(IDESCSI_TRANSFORM, &scsi->transform);
@@ -722,17 +742,16 @@ static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
         set_bit(IDESCSI_LOG_CMD, &scsi->log);
 #endif /* IDESCSI_DEBUG_LOG */
         idescsi_add_settings(drive);
-        DRIVER(drive)->busy--;
 }
 
-static int idescsi_cleanup (ide_drive_t *drive)
+static int ide_scsi_remove(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         struct Scsi_Host *scsihost = drive->driver_data;
         struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost);
         struct gendisk *g = scsi->disk;
 
-        if (ide_unregister_subdriver(drive))
-                return 1;
+        ide_unregister_subdriver(drive, scsi->driver);
 
         ide_unregister_region(g);
 
@@ -746,7 +765,7 @@ static int idescsi_cleanup (ide_drive_t *drive)
         return 0;
 }
 
-static int idescsi_attach(ide_drive_t *drive);
+static int ide_scsi_probe(struct device *);
 
 #ifdef CONFIG_PROC_FS
 static ide_proc_entry_t idescsi_proc[] = {
@@ -757,24 +776,22 @@ static ide_proc_entry_t idescsi_proc[] = {
 # define idescsi_proc   NULL
 #endif
 
-/*
- *      IDE subdriver functions, registered with ide.c
- */
 static ide_driver_t idescsi_driver = {
         .owner                  = THIS_MODULE,
-        .name                   = "ide-scsi",
+        .gen_driver = {
+                .name           = "ide-scsi",
+                .bus            = &ide_bus_type,
+                .probe          = ide_scsi_probe,
+                .remove         = ide_scsi_remove,
+        },
         .version                = IDESCSI_VERSION,
         .media                  = ide_scsi,
-        .busy                   = 0,
         .supports_dsc_overlap   = 0,
         .proc                   = idescsi_proc,
-        .attach                 = idescsi_attach,
-        .cleanup                = idescsi_cleanup,
         .do_request             = idescsi_do_request,
         .end_request            = idescsi_end_request,
         .error                  = idescsi_atapi_error,
         .abort                  = idescsi_atapi_abort,
-        .drives                 = LIST_HEAD_INIT(idescsi_driver.drives),
 };
 
 static int idescsi_ide_open(struct inode *inode, struct file *filp)
@@ -821,8 +838,6 @@ static struct block_device_operations idescsi_ops = {
         .ioctl          = idescsi_ide_ioctl,
 };
 
-static int idescsi_attach(ide_drive_t *drive);
-
 static int idescsi_slave_configure(struct scsi_device * sdp)
 {
         /* Configure detected device */
@@ -1012,11 +1027,13 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
-        spin_lock_irq(&ide_lock);
+        spin_lock_irq(cmd->device->host->host_lock);
+        spin_lock(&ide_lock);
 
         if (!scsi->pc || (req = scsi->pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) {
                 printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n");
                 spin_unlock(&ide_lock);
+                spin_unlock_irq(cmd->device->host->host_lock);
                 return FAILED;
         }
 
@@ -1038,16 +1055,15 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         HWGROUP(drive)->rq = NULL;
         HWGROUP(drive)->handler = NULL;
         HWGROUP(drive)->busy = 1;               /* will set this to zero when ide reset finished */
-        spin_unlock_irq(&ide_lock);
+        spin_unlock(&ide_lock);
 
         ide_do_reset(drive);
 
         /* ide_do_reset starts a polling handler which restarts itself every 50ms until the reset finishes */
 
         do {
-                set_current_state(TASK_UNINTERRUPTIBLE);
                 spin_unlock_irq(cmd->device->host->host_lock);
-                schedule_timeout(HZ/20);
+                msleep(50);
                 spin_lock_irq(cmd->device->host->host_lock);
         } while ( HWGROUP(drive)->handler );
 
@@ -1058,6 +1074,7 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
                 ret = FAILED;
         }
 
+        spin_unlock_irq(cmd->device->host->host_lock);
         return ret;
 }
 
@@ -1095,8 +1112,9 @@ static struct scsi_host_template idescsi_template = {
         .proc_name              = "ide-scsi",
 };
 
-static int idescsi_attach(ide_drive_t *drive)
+static int ide_scsi_probe(struct device *dev)
 {
+        ide_drive_t *drive = to_ide_device(dev);
         idescsi_scsi_t *idescsi;
         struct Scsi_Host *host;
         struct gendisk *g;
@@ -1112,7 +1130,7 @@ static int idescsi_attach(ide_drive_t *drive)
             !drive->present ||
             drive->media == ide_disk ||
             !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
-                return 1;
+                return -ENODEV;
 
         g = alloc_disk(1 << PARTN_BITS);
         if (!g)
@@ -1138,20 +1156,19 @@ static int idescsi_attach(ide_drive_t *drive)
         idescsi->host = host;
         idescsi->disk = g;
         g->private_data = &idescsi->driver;
-        err = ide_register_subdriver(drive, &idescsi_driver);
+        ide_register_subdriver(drive, &idescsi_driver);
+        err = 0;
+        idescsi_setup(drive, idescsi);
+        g->fops = &idescsi_ops;
+        ide_register_region(g);
+        err = scsi_add_host(host, &drive->gendev);
         if (!err) {
-                idescsi_setup (drive, idescsi);
-                g->fops = &idescsi_ops;
-                ide_register_region(g);
-                err = scsi_add_host(host, &drive->gendev);
-                if (!err) {
-                        scsi_scan_host(host);
-                        return 0;
-                }
-                /* fall through on error */
-                ide_unregister_region(g);
-                ide_unregister_subdriver(drive);
+                scsi_scan_host(host);
+                return 0;
         }
+        /* fall through on error */
+        ide_unregister_region(g);
+        ide_unregister_subdriver(drive, &idescsi_driver);
 
         put_disk(g);
 out_host_put:
@@ -1161,12 +1178,12 @@ out_host_put:
 
 static int __init init_idescsi_module(void)
 {
-        return ide_register_driver(&idescsi_driver);
+        return driver_register(&idescsi_driver.gen_driver);
 }
 
 static void __exit exit_idescsi_module(void)
 {
-        ide_unregister_driver(&idescsi_driver);
+        driver_unregister(&idescsi_driver.gen_driver);
 }
 
 module_init(init_idescsi_module);
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index be7f2ca0183f..65e845665b85 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -18,6 +18,7 @@
 #include <linux/blkdev.h>
 #include <linux/parport.h>
 #include <linux/workqueue.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -610,9 +611,9 @@ static int imm_init(imm_struct *dev)
         if (imm_connect(dev, 0) != 1)
                 return -EIO;
         imm_reset_pulse(dev->base);
-        udelay(1000);   /* Delay to allow devices to settle */
+        mdelay(1);      /* Delay to allow devices to settle */
         imm_disconnect(dev);
-        udelay(1000);   /* Another delay to allow devices to settle */
+        mdelay(1);      /* Another delay to allow devices to settle */
         return device_check(dev);
 }
 
@@ -1026,9 +1027,9 @@ static int imm_reset(struct scsi_cmnd *cmd)
 
         imm_connect(dev, CONNECT_NORMAL);
         imm_reset_pulse(dev->base);
-        udelay(1000);           /* device settle delay */
+        mdelay(1);              /* device settle delay */
         imm_disconnect(dev);
-        udelay(1000);           /* device settle delay */
+        mdelay(1);              /* device settle delay */
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 0bb0369efb2d..aed7e64865fa 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -1644,14 +1644,16 @@ static int in2000_bus_reset(Scsi_Cmnd * cmd)
         struct Scsi_Host *instance;
         struct IN2000_hostdata *hostdata;
         int x;
+        unsigned long flags;
 
         instance = cmd->device->host;
         hostdata = (struct IN2000_hostdata *) instance->hostdata;
 
         printk(KERN_WARNING "scsi%d: Reset. ", instance->host_no);
 
-        /* do scsi-reset here */
+        spin_lock_irqsave(instance->host_lock, flags);
 
+        /* do scsi-reset here */
         reset_hardware(instance, RESET_CARD_AND_BUS);
         for (x = 0; x < 8; x++) {
                 hostdata->busy[x] = 0;
@@ -1668,21 +1670,12 @@ static int in2000_bus_reset(Scsi_Cmnd * cmd)
         hostdata->outgoing_len = 0;
 
         cmd->result = DID_RESET << 16;
-        return SUCCESS;
-}
 
-static int in2000_host_reset(Scsi_Cmnd * cmd)
-{
-        return FAILED;
-}
-
-static int in2000_device_reset(Scsi_Cmnd * cmd)
-{
-        return FAILED;
+        spin_unlock_irqrestore(instance->host_lock, flags);
+        return SUCCESS;
 }
 
-
-static int in2000_abort(Scsi_Cmnd * cmd)
+static int __in2000_abort(Scsi_Cmnd * cmd)
 {
         struct Scsi_Host *instance;
         struct IN2000_hostdata *hostdata;
@@ -1803,6 +1796,16 @@ static int in2000_abort(Scsi_Cmnd * cmd)
         return SUCCESS;
 }
 
+static int in2000_abort(Scsi_Cmnd * cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __in2000_abort(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
 
 
 #define MAX_IN2000_HOSTS 3
@@ -2311,8 +2314,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand                   = in2000_queuecommand,
         .eh_abort_handler               = in2000_abort,
         .eh_bus_reset_handler           = in2000_bus_reset,
-        .eh_device_reset_handler        = in2000_device_reset,
-        .eh_host_reset_handler  = in2000_host_reset, 
         .bios_param                     = in2000_biosparam, 
         .can_queue                      = IN2000_CAN_Q,
         .this_id                        = IN2000_HOST_ID,
diff --git a/drivers/scsi/in2000.h b/drivers/scsi/in2000.h
index 019e45df3016..a240b52554d8 100644
--- a/drivers/scsi/in2000.h
+++ b/drivers/scsi/in2000.h
@@ -401,9 +401,7 @@ static int in2000_abort(Scsi_Cmnd *);
 static void in2000_setup(char *, int *) in2000__INIT;
 static int in2000_biosparam(struct scsi_device *, struct block_device *,
                 sector_t, int *);
-static int in2000_host_reset(Scsi_Cmnd *);
 static int in2000_bus_reset(Scsi_Cmnd *);
-static int in2000_device_reset(Scsi_Cmnd *);
 
 
 #define IN2000_CAN_Q    16
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index a7b74d8c53b9..f7ddc9f1ba41 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -3014,7 +3014,11 @@ static int i91u_bus_reset(struct scsi_cmnd * SCpnt)
         HCS *pHCB;
 
         pHCB = (HCS *) SCpnt->device->host->base;
+
+        spin_lock_irq(SCpnt->device->host->host_lock);
         tul_reset_scsi(pHCB, 0);
+        spin_unlock_irq(SCpnt->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 5441531c0d8e..80d022625c82 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1053,7 +1053,7 @@ static void ipr_log_array_error(struct ipr_ioa_cfg *ioa_cfg,
                                 array_entry->dev_res_addr.lun);
                 }
 
-                if (array_entry->dev_res_addr.bus >= IPR_MAX_NUM_BUSES) {
+                if (array_entry->expected_dev_res_addr.bus >= IPR_MAX_NUM_BUSES) {
                         ipr_err("Expected Location: unknown\n");
                 } else {
                         ipr_err("Expected Location: %d:%d:%d:%d\n",
@@ -2716,7 +2716,7 @@ static int ipr_change_queue_type(struct scsi_device *sdev, int tag_type)
  * Return value:
  *      number of bytes printed to buffer
  **/
-static ssize_t ipr_show_adapter_handle(struct device *dev, char *buf)
+static ssize_t ipr_show_adapter_handle(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
@@ -2885,7 +2885,7 @@ static int ipr_slave_alloc(struct scsi_device *sdev)
  * Return value:
  *      SUCCESS / FAILED
  **/
-static int ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
+static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
 {
         struct ipr_ioa_cfg *ioa_cfg;
         int rc;
@@ -2905,6 +2905,17 @@ static int ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
         return rc;
 }
 
+static int ipr_eh_host_reset(struct scsi_cmnd * cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __ipr_eh_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
 /**
  * ipr_eh_dev_reset - Reset the device
  * @scsi_cmd:   scsi command struct
@@ -2916,7 +2927,7 @@ static int ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
  * Return value:
  *      SUCCESS / FAILED
  **/
-static int ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
+static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
 {
         struct ipr_cmnd *ipr_cmd;
         struct ipr_ioa_cfg *ioa_cfg;
@@ -2970,6 +2981,17 @@ static int ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
         return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS);
 }
 
+static int ipr_eh_dev_reset(struct scsi_cmnd * cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __ipr_eh_dev_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
 /**
  * ipr_bus_reset_done - Op done function for bus reset.
  * @ipr_cmd:    ipr command struct
@@ -3068,6 +3090,12 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
         ioa_cfg = (struct ipr_ioa_cfg *)scsi_cmd->device->host->hostdata;
         res = scsi_cmd->device->hostdata;
 
+        /* If we are currently going through reset/reload, return failed.
+         * This will force the mid-layer to call ipr_eh_host_reset,
+         * which will then go to sleep and wait for the reset to complete
+         */
+        if (ioa_cfg->in_reset_reload || ioa_cfg->ioa_is_dead)
+                return FAILED;
         if (!res || (!ipr_is_gscsi(res) && !ipr_is_vset_device(res)))
                 return FAILED;
 
@@ -3118,23 +3146,17 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
  **/
 static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd)
 {
-        struct ipr_ioa_cfg *ioa_cfg;
+        unsigned long flags;
+        int rc;
 
         ENTER;
-        ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
 
-        /* If we are currently going through reset/reload, return failed. This will force the
-           mid-layer to call ipr_eh_host_reset, which will then go to sleep and wait for the
-           reset to complete */
-        if (ioa_cfg->in_reset_reload)
-                return FAILED;
-        if (ioa_cfg->ioa_is_dead)
-                return FAILED;
-        if (!scsi_cmd->device->hostdata)
-                return FAILED;
+        spin_lock_irqsave(scsi_cmd->device->host->host_lock, flags);
+        rc = ipr_cancel_op(scsi_cmd);
+        spin_unlock_irqrestore(scsi_cmd->device->host->host_lock, flags);
 
         LEAVE;
-        return ipr_cancel_op(scsi_cmd);
+        return rc;
 }
 
 /**
@@ -5886,6 +5908,7 @@ static void __ipr_remove(struct pci_dev *pdev)
 
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
         wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
+        flush_scheduled_work();
         spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
 
         spin_lock(&ipr_driver_lock);
@@ -5916,8 +5939,6 @@ static void ipr_remove(struct pci_dev *pdev)
 
         ENTER;
 
-        ioa_cfg->allow_cmds = 0;
-        flush_scheduled_work();
         ipr_remove_trace_file(&ioa_cfg->host->shost_classdev.kobj,
                               &ipr_trace_attr);
         ipr_remove_dump_file(&ioa_cfg->host->shost_classdev.kobj,
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 446f4259285b..cbff3ea3cd89 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -36,8 +36,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.0.13"
-#define IPR_DRIVER_DATE "(February 21, 2005)"
+#define IPR_DRIVER_VERSION "2.0.14"
+#define IPR_DRIVER_DATE "(May 2, 2005)"
 
 /*
  * IPR_DBG_TRACE: Setting this to 1 will turn on some general function tracing
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index fbc2cb6667a1..6dfcb4fbccdd 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -819,12 +819,15 @@ ips_eh_abort(Scsi_Cmnd * SC)
         ips_ha_t *ha;
         ips_copp_wait_item_t *item;
         int ret;
+        unsigned long cpu_flags;
+        struct Scsi_Host *host;
 
         METHOD_TRACE("ips_eh_abort", 1);
 
         if (!SC)
                 return (FAILED);
 
+        host = SC->device->host;
         ha = (ips_ha_t *) SC->device->host->hostdata;
 
         if (!ha)
@@ -833,6 +836,8 @@ ips_eh_abort(Scsi_Cmnd * SC)
         if (!ha->active)
                 return (FAILED);
 
+        IPS_LOCK_SAVE(host->host_lock, cpu_flags);
+
         /* See if the command is on the copp queue */
         item = ha->copp_waitlist.head;
         while ((item) && (item->scsi_cmd != SC))
@@ -851,6 +856,8 @@ ips_eh_abort(Scsi_Cmnd * SC)
                 /* command must have already been sent */
                 ret = (FAILED);
         }
+
+        IPS_UNLOCK_RESTORE(host->host_lock, cpu_flags);
         return ret;
 }
 
@@ -866,7 +873,7 @@ ips_eh_abort(Scsi_Cmnd * SC)
 /*                                                                          */
 /****************************************************************************/
 static int
-ips_eh_reset(Scsi_Cmnd * SC)
+__ips_eh_reset(Scsi_Cmnd * SC)
 {
         int ret;
         int i;
@@ -1053,6 +1060,18 @@ ips_eh_reset(Scsi_Cmnd * SC)
 
 }
 
+static int
+ips_eh_reset(Scsi_Cmnd * SC)
+{
+        int rc;
+
+        spin_lock_irq(SC->device->host->host_lock);
+        rc = __ips_eh_reset(SC);
+        spin_unlock_irq(SC->device->host->host_lock);
+
+        return rc;
+}
+
 /****************************************************************************/
 /*                                                                          */
 /* Routine Name: ips_queue                                                  */
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index ee9b96da841e..36b401fee1f1 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -186,6 +186,28 @@ static void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf)
         ata_wait_idle(ap);
 }
 
+
+/**
+ *      ata_tf_load - send taskfile registers to host controller
+ *      @ap: Port to which output is sent
+ *      @tf: ATA taskfile register set
+ *
+ *      Outputs ATA taskfile to standard ATA host controller using MMIO
+ *      or PIO as indicated by the ATA_FLAG_MMIO flag.
+ *      Writes the control, feature, nsect, lbal, lbam, and lbah registers.
+ *      Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect,
+ *      hob_lbal, hob_lbam, and hob_lbah.
+ *
+ *      This function waits for idle (!BUSY and !DRQ) after writing
+ *      registers.  If the control register has a new value, this
+ *      function also waits for idle after writing control and before
+ *      writing the remaining registers.
+ *
+ *      May be used as the tf_load() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 void ata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
 {
         if (ap->flags & ATA_FLAG_MMIO)
@@ -195,11 +217,11 @@ void ata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
 }
 
 /**
- *      ata_exec_command - issue ATA command to host controller
+ *      ata_exec_command_pio - issue ATA command to host controller
  *      @ap: port to which command is being issued
  *      @tf: ATA taskfile register set
  *
- *      Issues PIO/MMIO write to ATA command register, with proper
+ *      Issues PIO write to ATA command register, with proper
  *      synchronization with interrupt handler / other threads.
  *
  *      LOCKING:
@@ -235,6 +257,18 @@ static void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf)
         ata_pause(ap);
 }
 
+
+/**
+ *      ata_exec_command - issue ATA command to host controller
+ *      @ap: port to which command is being issued
+ *      @tf: ATA taskfile register set
+ *
+ *      Issues PIO/MMIO write to ATA command register, with proper
+ *      synchronization with interrupt handler / other threads.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_exec_command(struct ata_port *ap, struct ata_taskfile *tf)
 {
         if (ap->flags & ATA_FLAG_MMIO)
@@ -305,7 +339,7 @@ void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf)
 }
 
 /**
- *      ata_tf_read - input device's ATA taskfile shadow registers
+ *      ata_tf_read_pio - input device's ATA taskfile shadow registers
  *      @ap: Port from which input is read
  *      @tf: ATA taskfile register set for storing input
  *
@@ -368,6 +402,23 @@ static void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf)
         }
 }
 
+
+/**
+ *      ata_tf_read - input device's ATA taskfile shadow registers
+ *      @ap: Port from which input is read
+ *      @tf: ATA taskfile register set for storing input
+ *
+ *      Reads ATA taskfile registers for currently-selected device
+ *      into @tf.
+ *
+ *      Reads nsect, lbal, lbam, lbah, and device.  If ATA_TFLAG_LBA48
+ *      is set, also reads the hob registers.
+ *
+ *      May be used as the tf_read() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
         if (ap->flags & ATA_FLAG_MMIO)
@@ -381,7 +432,7 @@ void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
  *      @ap: port where the device is
  *
  *      Reads ATA taskfile status register for currently-selected device
- *      and return it's value. This also clears pending interrupts
+ *      and return its value. This also clears pending interrupts
  *      from this device
  *
  *      LOCKING:
@@ -397,7 +448,7 @@ static u8 ata_check_status_pio(struct ata_port *ap)
  *      @ap: port where the device is
  *
  *      Reads ATA taskfile status register for currently-selected device
- *      via MMIO and return it's value. This also clears pending interrupts
+ *      via MMIO and return its value. This also clears pending interrupts
  *      from this device
  *
  *      LOCKING:
@@ -408,6 +459,20 @@ static u8 ata_check_status_mmio(struct ata_port *ap)
         return readb((void __iomem *) ap->ioaddr.status_addr);
 }
 
+
+/**
+ *      ata_check_status - Read device status reg & clear interrupt
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile status register for currently-selected device
+ *      and return its value. This also clears pending interrupts
+ *      from this device
+ *
+ *      May be used as the check_status() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_check_status(struct ata_port *ap)
 {
         if (ap->flags & ATA_FLAG_MMIO)
@@ -415,6 +480,20 @@ u8 ata_check_status(struct ata_port *ap)
         return ata_check_status_pio(ap);
 }
 
+
+/**
+ *      ata_altstatus - Read device alternate status reg
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile alternate status register for
+ *      currently-selected device and return its value.
+ *
+ *      Note: may NOT be used as the check_altstatus() entry in
+ *      ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_altstatus(struct ata_port *ap)
 {
         if (ap->ops->check_altstatus)
@@ -425,6 +504,20 @@ u8 ata_altstatus(struct ata_port *ap)
         return inb(ap->ioaddr.altstatus_addr);
 }
 
+
+/**
+ *      ata_chk_err - Read device error reg
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile error register for
+ *      currently-selected device and return its value.
+ *
+ *      Note: may NOT be used as the check_err() entry in
+ *      ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_chk_err(struct ata_port *ap)
 {
         if (ap->ops->check_err)
@@ -873,10 +966,24 @@ void ata_dev_id_string(u16 *id, unsigned char *s,
         }
 }
 
+
+/**
+ *      ata_noop_dev_select - Select device 0/1 on ATA bus
+ *      @ap: ATA channel to manipulate
+ *      @device: ATA device (numbered from zero) to select
+ *
+ *      This function performs no actual function.
+ *
+ *      May be used as the dev_select() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      caller.
+ */
 void ata_noop_dev_select (struct ata_port *ap, unsigned int device)
 {
 }
 
+
 /**
  *      ata_std_dev_select - Select device 0/1 on ATA bus
  *      @ap: ATA channel to manipulate
@@ -884,7 +991,9 @@ void ata_noop_dev_select (struct ata_port *ap, unsigned int device)
  *
  *      Use the method defined in the ATA specification to
  *      make either device 0, or device 1, active on the
- *      ATA channel.
+ *      ATA channel.  Works with both PIO and MMIO.
+ *
+ *      May be used as the dev_select() entry in ata_port_operations.
  *
  *      LOCKING:
  *      caller.
@@ -1186,11 +1295,47 @@ err_out:
         DPRINTK("EXIT, err\n");
 }
 
+
+static inline u8 ata_dev_knobble(struct ata_port *ap)
+{
+        return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(ap->device->id)));
+}
+
+/**
+ *      ata_dev_config - Run device specific handlers and check for
+ *                       SATA->PATA bridges
+ *      @ap: Bus 
+ *      @i:  Device
+ *
+ *      LOCKING:
+ */
+ 
+void ata_dev_config(struct ata_port *ap, unsigned int i)
+{
+        /* limit bridge transfers to udma5, 200 sectors */
+        if (ata_dev_knobble(ap)) {
+                printk(KERN_INFO "ata%u(%u): applying bridge limits\n",
+                        ap->id, ap->device->devno);
+                ap->udma_mask &= ATA_UDMA5;
+                ap->host->max_sectors = ATA_MAX_SECTORS;
+                ap->host->hostt->max_sectors = ATA_MAX_SECTORS;
+                ap->device->flags |= ATA_DFLAG_LOCK_SECTORS;
+        }
+
+        if (ap->ops->dev_config)
+                ap->ops->dev_config(ap, &ap->device[i]);
+}
+
 /**
  *      ata_bus_probe - Reset and probe ATA bus
  *      @ap: Bus to probe
  *
+ *      Master ATA bus probing function.  Initiates a hardware-dependent
+ *      bus reset, then attempts to identify any devices found on
+ *      the bus.
+ *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  *      RETURNS:
  *      Zero on success, non-zero on error.
@@ -1208,8 +1353,7 @@ static int ata_bus_probe(struct ata_port *ap)
                 ata_dev_identify(ap, i);
                 if (ata_dev_present(&ap->device[i])) {
                         found = 1;
-                        if (ap->ops->dev_config)
-                                ap->ops->dev_config(ap, &ap->device[i]);
+                        ata_dev_config(ap,i);
                 }
         }
 
@@ -1229,10 +1373,14 @@ err_out:
 }
 
 /**
- *      ata_port_probe -
- *      @ap:
+ *      ata_port_probe - Mark port as enabled
+ *      @ap: Port for which we indicate enablement
  *
- *      LOCKING:
+ *      Modify @ap data structure such that the system
+ *      thinks that the entire port is enabled.
+ *
+ *      LOCKING: host_set lock, or some other form of
+ *      serialization.
  */
 
 void ata_port_probe(struct ata_port *ap)
@@ -1241,10 +1389,15 @@ void ata_port_probe(struct ata_port *ap)
 }
 
 /**
- *      __sata_phy_reset -
- *      @ap:
+ *      __sata_phy_reset - Wake/reset a low-level SATA PHY
+ *      @ap: SATA port associated with target SATA PHY.
+ *
+ *      This function issues commands to standard SATA Sxxx
+ *      PHY registers, to wake up the phy (and device), and
+ *      clear any reset condition.
  *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  */
 void __sata_phy_reset(struct ata_port *ap)
@@ -1289,10 +1442,14 @@ void __sata_phy_reset(struct ata_port *ap)
 }
 
 /**
- *      __sata_phy_reset -
- *      @ap:
+ *      sata_phy_reset - Reset SATA bus.
+ *      @ap: SATA port associated with target SATA PHY.
+ *
+ *      This function resets the SATA bus, and then probes
+ *      the bus for devices.
  *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  */
 void sata_phy_reset(struct ata_port *ap)
@@ -1304,10 +1461,16 @@ void sata_phy_reset(struct ata_port *ap)
 }
 
 /**
- *      ata_port_disable -
- *      @ap:
+ *      ata_port_disable - Disable port.
+ *      @ap: Port to be disabled.
  *
- *      LOCKING:
+ *      Modify @ap data structure such that the system
+ *      thinks that the entire port is disabled, and should
+ *      never attempt to probe or communicate with devices
+ *      on this port.
+ *
+ *      LOCKING: host_set lock, or some other form of
+ *      serialization.
  */
 
 void ata_port_disable(struct ata_port *ap)
@@ -1416,7 +1579,10 @@ static void ata_host_set_dma(struct ata_port *ap, u8 xfer_mode,
  *      ata_set_mode - Program timings and issue SET FEATURES - XFER
  *      @ap: port on which timings will be programmed
  *
+ *      Set ATA device disk transfer mode (PIO3, UDMA6, etc.).
+ *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  */
 static void ata_set_mode(struct ata_port *ap)
@@ -1467,7 +1633,10 @@ err_out:
  *      @tmout_pat: impatience timeout
  *      @tmout: overall timeout
  *
- *      LOCKING:
+ *      Sleep until ATA Status register bit BSY clears,
+ *      or a timeout occurs.
+ *
+ *      LOCKING: None.
  *
  */
 
@@ -1553,10 +1722,14 @@ static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask)
 }
 
 /**
- *      ata_bus_edd -
- *      @ap:
+ *      ata_bus_edd - Issue EXECUTE DEVICE DIAGNOSTIC command.
+ *      @ap: Port to reset and probe
+ *
+ *      Use the EXECUTE DEVICE DIAGNOSTIC command to reset and
+ *      probe the bus.  Not often used these days.
  *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  */
 
@@ -1633,8 +1806,8 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
  *      the device is ATA or ATAPI.
  *
  *      LOCKING:
- *      Inherited from caller.  Some functions called by this function
- *      obtain the host_set lock.
+ *      PCI/etc. bus probe sem.
+ *      Obtains host_set lock.
  *
  *      SIDE EFFECTS:
  *      Sets ATA_FLAG_PORT_DISABLED if bus reset fails.
@@ -1876,7 +2049,11 @@ static int fgb(u32 bitmap)
  *      @xfer_mode_out: (output) SET FEATURES - XFER MODE code
  *      @xfer_shift_out: (output) bit shift that selects this mode
  *
+ *      Based on host and device capabilities, determine the
+ *      maximum transfer mode that is amenable to all.
+ *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  *      RETURNS:
  *      Zero on success, negative on error.
@@ -1909,7 +2086,11 @@ static int ata_choose_xfer_mode(struct ata_port *ap,
  *      @ap: Port associated with device @dev
  *      @dev: Device to which command will be sent
  *
+ *      Issue SET FEATURES - XFER MODE command to device @dev
+ *      on port @ap.
+ *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  */
 
 static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
@@ -1947,10 +2128,13 @@ static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
 }
 
 /**
- *      ata_sg_clean -
- *      @qc:
+ *      ata_sg_clean - Unmap DMA memory associated with command
+ *      @qc: Command containing DMA memory to be released
+ *
+ *      Unmap all mapped DMA memory associated with this command.
  *
  *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
  */
 
 static void ata_sg_clean(struct ata_queued_cmd *qc)
@@ -1981,7 +2165,11 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
  *      ata_fill_sg - Fill PCI IDE PRD table
  *      @qc: Metadata associated with taskfile to be transferred
  *
+ *      Fill PCI IDE PRD (scatter-gather) table with segments
+ *      associated with the current disk command.
+ *
  *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
  *
  */
 static void ata_fill_sg(struct ata_queued_cmd *qc)
@@ -2028,7 +2216,13 @@ static void ata_fill_sg(struct ata_queued_cmd *qc)
  *      ata_check_atapi_dma - Check whether ATAPI DMA can be supported
  *      @qc: Metadata associated with taskfile to check
  *
+ *      Allow low-level driver to filter ATA PACKET commands, returning
+ *      a status indicating whether or not it is OK to use DMA for the
+ *      supplied PACKET command.
+ *
  *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ *
  *      RETURNS: 0 when ATAPI DMA can be used
  *               nonzero otherwise
  */
@@ -2046,6 +2240,8 @@ int ata_check_atapi_dma(struct ata_queued_cmd *qc)
  *      ata_qc_prep - Prepare taskfile for submission
  *      @qc: Metadata associated with taskfile to be prepared
  *
+ *      Prepare ATA taskfile for submission.
+ *
  *      LOCKING:
  *      spin_lock_irqsave(host_set lock)
  */
@@ -2057,6 +2253,32 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
         ata_fill_sg(qc);
 }
 
+/**
+ *      ata_sg_init_one - Associate command with memory buffer
+ *      @qc: Command to be associated
+ *      @buf: Memory buffer
+ *      @buflen: Length of memory buffer, in bytes.
+ *
+ *      Initialize the data-related elements of queued_cmd @qc
+ *      to point to a single memory buffer, @buf of byte length @buflen.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+
+
+
+/**
+ *      ata_sg_init_one - Prepare a one-entry scatter-gather list.
+ *      @qc:  Queued command
+ *      @buf:  transfer buffer
+ *      @buflen:  length of buf
+ *
+ *      Builds a single-entry scatter-gather list to initiate a
+ *      transfer utilizing the specified buffer.
+ *
+ *      LOCKING:
+ */
 void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
 {
         struct scatterlist *sg;
@@ -2071,9 +2293,35 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
         sg = qc->sg;
         sg->page = virt_to_page(buf);
         sg->offset = (unsigned long) buf & ~PAGE_MASK;
-        sg_dma_len(sg) = buflen;
+        sg->length = buflen;
 }
 
+/**
+ *      ata_sg_init - Associate command with scatter-gather table.
+ *      @qc: Command to be associated
+ *      @sg: Scatter-gather table.
+ *      @n_elem: Number of elements in s/g table.
+ *
+ *      Initialize the data-related elements of queued_cmd @qc
+ *      to point to a scatter-gather table @sg, containing @n_elem
+ *      elements.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+
+
+/**
+ *      ata_sg_init - Assign a scatter gather list to a queued command
+ *      @qc:  Queued command
+ *      @sg:  Scatter-gather list
+ *      @n_elem:  length of sg list
+ *
+ *      Attaches a scatter-gather list to a queued command.
+ *
+ *      LOCKING:
+ */
+
 void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
                  unsigned int n_elem)
 {
@@ -2083,14 +2331,16 @@ void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
 }
 
 /**
- *      ata_sg_setup_one -
- *      @qc:
+ *      ata_sg_setup_one - DMA-map the memory buffer associated with a command.
+ *      @qc: Command with memory buffer to be mapped.
+ *
+ *      DMA-map the memory buffer associated with queued_cmd @qc.
  *
  *      LOCKING:
  *      spin_lock_irqsave(host_set lock)
  *
  *      RETURNS:
- *
+ *      Zero on success, negative on error.
  */
 
 static int ata_sg_setup_one(struct ata_queued_cmd *qc)
@@ -2101,11 +2351,12 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
         dma_addr_t dma_address;
 
         dma_address = dma_map_single(ap->host_set->dev, qc->buf_virt,
-                                     sg_dma_len(sg), dir);
+                                     sg->length, dir);
         if (dma_mapping_error(dma_address))
                 return -1;
 
         sg_dma_address(sg) = dma_address;
+        sg_dma_len(sg) = sg->length;
 
         DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg),
                 qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
@@ -2114,13 +2365,16 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
 }
 
 /**
- *      ata_sg_setup -
- *      @qc:
+ *      ata_sg_setup - DMA-map the scatter-gather table associated with a command.
+ *      @qc: Command with scatter-gather table to be mapped.
+ *
+ *      DMA-map the scatter-gather table associated with queued_cmd @qc.
  *
  *      LOCKING:
  *      spin_lock_irqsave(host_set lock)
  *
  *      RETURNS:
+ *      Zero on success, negative on error.
  *
  */
 
@@ -2150,6 +2404,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
  *      @ap:
  *
  *      LOCKING:
+ *      None.  (executing in kernel thread context)
  *
  *      RETURNS:
  *
@@ -2197,6 +2452,7 @@ static unsigned long ata_pio_poll(struct ata_port *ap)
  *      @ap:
  *
  *      LOCKING:
+ *      None.  (executing in kernel thread context)
  */
 
 static void ata_pio_complete (struct ata_port *ap)
@@ -2239,6 +2495,18 @@ static void ata_pio_complete (struct ata_port *ap)
         ata_qc_complete(qc, drv_stat);
 }
 
+
+/**
+ *      swap_buf_le16 -
+ *      @buf:  Buffer to swap
+ *      @buf_words:  Number of 16-bit words in buffer.
+ *
+ *      Swap halves of 16-bit words if needed to convert from
+ *      little-endian byte order to native cpu byte order, or
+ *      vice-versa.
+ *
+ *      LOCKING:
+ */
 void swap_buf_le16(u16 *buf, unsigned int buf_words)
 {
 #ifdef __BIG_ENDIAN
@@ -2310,7 +2578,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
         qc->cursect++;
         qc->cursg_ofs++;
 
-        if ((qc->cursg_ofs * ATA_SECT_SIZE) == sg_dma_len(&sg[qc->cursg])) {
+        if ((qc->cursg_ofs * ATA_SECT_SIZE) == (&sg[qc->cursg])->length) {
                 qc->cursg++;
                 qc->cursg_ofs = 0;
         }
@@ -2339,7 +2607,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 next_sg:
         sg = &qc->sg[qc->cursg];
 
-next_page:
         page = sg->page;
         offset = sg->offset + qc->cursg_ofs;
 
@@ -2347,7 +2614,8 @@ next_page:
         page = nth_page(page, (offset >> PAGE_SHIFT));
         offset %= PAGE_SIZE;
 
-        count = min(sg_dma_len(sg) - qc->cursg_ofs, bytes);
+        /* don't overrun current sg */
+        count = min(sg->length - qc->cursg_ofs, bytes);
 
         /* don't cross page boundaries */
         count = min(count, (unsigned int)PAGE_SIZE - offset);
@@ -2358,7 +2626,7 @@ next_page:
         qc->curbytes += count;
         qc->cursg_ofs += count;
 
-        if (qc->cursg_ofs == sg_dma_len(sg)) {
+        if (qc->cursg_ofs == sg->length) {
                 qc->cursg++;
                 qc->cursg_ofs = 0;
         }
@@ -2371,8 +2639,6 @@ next_page:
         kunmap(page);
 
         if (bytes) {
-                if (qc->cursg_ofs < sg_dma_len(sg))
-                        goto next_page;
                 goto next_sg;
         }
 }
@@ -2414,6 +2680,7 @@ err_out:
  *      @ap:
  *
  *      LOCKING:
+ *      None.  (executing in kernel thread context)
  */
 
 static void ata_pio_block(struct ata_port *ap)
@@ -2582,6 +2849,7 @@ static void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,
  *      transaction completed successfully.
  *
  *      LOCKING:
+ *      Inherited from SCSI layer (none, can sleep)
  */
 
 static void ata_qc_timeout(struct ata_queued_cmd *qc)
@@ -2691,6 +2959,7 @@ out:
  *      @dev: Device from whom we request an available command structure
  *
  *      LOCKING:
+ *      None.
  */
 
 static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
@@ -2716,6 +2985,7 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
  *      @dev: Device from whom we request an available command structure
  *
  *      LOCKING:
+ *      None.
  */
 
 struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
@@ -2780,6 +3050,7 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
  *      in case something prevents using it.
  *
  *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
  *
  */
 void ata_qc_free(struct ata_queued_cmd *qc)
@@ -2793,9 +3064,13 @@ void ata_qc_free(struct ata_queued_cmd *qc)
 /**
  *      ata_qc_complete - Complete an active ATA command
  *      @qc: Command to complete
- *      @drv_stat: ATA status register contents
+ *      @drv_stat: ATA Status register contents
+ *
+ *      Indicate to the mid and upper layers that an ATA
+ *      command has completed, with either an ok or not-ok status.
  *
  *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
  *
  */
 
@@ -2891,6 +3166,7 @@ err_out:
         return -1;
 }
 
+
 /**
  *      ata_qc_issue_prot - issue taskfile to device in proto-dependent manner
  *      @qc: command to issue to device
@@ -2900,6 +3176,8 @@ err_out:
  *      classes called "protocols", and issuing each type of protocol
  *      is slightly different.
  *
+ *      May be used as the qc_issue() entry in ata_port_operations.
+ *
  *      LOCKING:
  *      spin_lock_irqsave(host_set lock)
  *
@@ -2957,7 +3235,7 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc)
 }
 
 /**
- *      ata_bmdma_setup - Set up PCI IDE BMDMA transaction
+ *      ata_bmdma_setup_mmio - Set up PCI IDE BMDMA transaction
  *      @qc: Info associated with this ATA transaction.
  *
  *      LOCKING:
@@ -3064,6 +3342,18 @@ static void ata_bmdma_start_pio (struct ata_queued_cmd *qc)
              ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
 }
 
+
+/**
+ *      ata_bmdma_start - Start a PCI IDE BMDMA transaction
+ *      @qc: Info associated with this ATA transaction.
+ *
+ *      Writes the ATA_DMA_START flag to the DMA command register.
+ *
+ *      May be used as the bmdma_start() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_start(struct ata_queued_cmd *qc)
 {
         if (qc->ap->flags & ATA_FLAG_MMIO)
@@ -3072,6 +3362,20 @@ void ata_bmdma_start(struct ata_queued_cmd *qc)
                 ata_bmdma_start_pio(qc);
 }
 
+
+/**
+ *      ata_bmdma_setup - Set up PCI IDE BMDMA transaction
+ *      @qc: Info associated with this ATA transaction.
+ *
+ *      Writes address of PRD table to device's PRD Table Address
+ *      register, sets the DMA control register, and calls
+ *      ops->exec_command() to start the transfer.
+ *
+ *      May be used as the bmdma_setup() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_setup(struct ata_queued_cmd *qc)
 {
         if (qc->ap->flags & ATA_FLAG_MMIO)
@@ -3080,6 +3384,19 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc)
                 ata_bmdma_setup_pio(qc);
 }
 
+
+/**
+ *      ata_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt.
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Clear interrupt and error flags in DMA status register.
+ *
+ *      May be used as the irq_clear() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+
 void ata_bmdma_irq_clear(struct ata_port *ap)
 {
     if (ap->flags & ATA_FLAG_MMIO) {
@@ -3092,6 +3409,19 @@ void ata_bmdma_irq_clear(struct ata_port *ap)
 
 }
 
+
+/**
+ *      ata_bmdma_status - Read PCI IDE BMDMA status
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Read and return BMDMA status register.
+ *
+ *      May be used as the bmdma_status() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+
 u8 ata_bmdma_status(struct ata_port *ap)
 {
         u8 host_stat;
@@ -3103,6 +3433,19 @@ u8 ata_bmdma_status(struct ata_port *ap)
         return host_stat;
 }
 
+
+/**
+ *      ata_bmdma_stop - Stop PCI IDE BMDMA transfer
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Clears the ATA_DMA_START flag in the dma control register
+ *
+ *      May be used as the bmdma_stop() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+
 void ata_bmdma_stop(struct ata_port *ap)
 {
         if (ap->flags & ATA_FLAG_MMIO) {
@@ -3202,13 +3545,18 @@ idle_irq:
 
 /**
  *      ata_interrupt - Default ATA host interrupt handler
- *      @irq: irq line
- *      @dev_instance: pointer to our host information structure
+ *      @irq: irq line (unused)
+ *      @dev_instance: pointer to our ata_host_set information structure
  *      @regs: unused
  *
+ *      Default interrupt handler for PCI IDE devices.  Calls
+ *      ata_host_intr() for each port that is not disabled.
+ *
  *      LOCKING:
+ *      Obtains host_set lock during operation.
  *
  *      RETURNS:
+ *      IRQ_NONE or IRQ_HANDLED.
  *
  */
 
@@ -3301,6 +3649,19 @@ err_out:
         ata_qc_complete(qc, ATA_ERR);
 }
 
+
+/**
+ *      ata_port_start - Set port up for dma.
+ *      @ap: Port to initialize
+ *
+ *      Called just after data structures for each port are
+ *      initialized.  Allocates space for PRD table.
+ *
+ *      May be used as the port_start() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ */
+
 int ata_port_start (struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
@@ -3314,6 +3675,18 @@ int ata_port_start (struct ata_port *ap)
         return 0;
 }
 
+
+/**
+ *      ata_port_stop - Undo ata_port_start()
+ *      @ap: Port to shut down
+ *
+ *      Frees the PRD table.
+ *
+ *      May be used as the port_stop() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ */
+
 void ata_port_stop (struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
@@ -3321,6 +3694,13 @@ void ata_port_stop (struct ata_port *ap)
         dma_free_coherent(dev, ATA_PRD_TBL_SZ, ap->prd, ap->prd_dma);
 }
 
+void ata_host_stop (struct ata_host_set *host_set)
+{
+        if (host_set->mmio_base)
+                iounmap(host_set->mmio_base);
+}
+
+
 /**
  *      ata_host_remove - Unregister SCSI host structure with upper layers
  *      @ap: Port to unregister
@@ -3349,7 +3729,11 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)
  *      @ent: Probe information provided by low-level driver
  *      @port_no: Port number associated with this ata_port
  *
+ *      Initialize a new ata_port structure, and its associated
+ *      scsi_host.
+ *
  *      LOCKING:
+ *      Inherited from caller.
  *
  */
 
@@ -3404,9 +3788,13 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
  *      @host_set: Collections of ports to which we add
  *      @port_no: Port number associated with this host
  *
+ *      Attach low-level ATA driver to system.
+ *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  *      RETURNS:
+ *      New ata_port on success, for NULL on error.
  *
  */
 
@@ -3439,12 +3827,22 @@ err_out:
 }
 
 /**
- *      ata_device_add -
- *      @ent:
+ *      ata_device_add - Register hardware device with ATA and SCSI layers
+ *      @ent: Probe information describing hardware device to be registered
+ *
+ *      This function processes the information provided in the probe
+ *      information struct @ent, allocates the necessary ATA and SCSI
+ *      host information structures, initializes them, and registers
+ *      everything with requisite kernel subsystems.
+ *
+ *      This function requests irqs, probes the ATA bus, and probes
+ *      the SCSI bus.
  *
  *      LOCKING:
+ *      PCI/etc. bus probe sem.
  *
  *      RETURNS:
+ *      Number of ports registered.  Zero on error (no ports registered).
  *
  */
 
@@ -3596,7 +3994,15 @@ int ata_scsi_release(struct Scsi_Host *host)
 /**
  *      ata_std_ports - initialize ioaddr with standard port offsets.
  *      @ioaddr: IO address structure to be initialized
+ *
+ *      Utility function which initializes data_addr, error_addr,
+ *      feature_addr, nsect_addr, lbal_addr, lbam_addr, lbah_addr,
+ *      device_addr, status_addr, and command_addr to standard offsets
+ *      relative to cmd_addr.
+ *
+ *      Does not set ctl_addr, altstatus_addr, bmdma_addr, or scr_addr.
  */
+
 void ata_std_ports(struct ata_ioports *ioaddr)
 {
         ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA;
@@ -3638,6 +4044,20 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
         return probe_ent;
 }
 
+
+
+/**
+ *      ata_pci_init_native_mode - Initialize native-mode driver
+ *      @pdev:  pci device to be initialized
+ *      @port:  array[2] of pointers to port info structures.
+ *
+ *      Utility function which allocates and initializes an
+ *      ata_probe_ent structure for a standard dual-port
+ *      PIO-based IDE controller.  The returned ata_probe_ent
+ *      structure can be passed to ata_device_add().  The returned
+ *      ata_probe_ent structure should then be freed with kfree().
+ */
+
 #ifdef CONFIG_PCI
 struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port)
@@ -3719,10 +4139,19 @@ ata_pci_init_legacy_mode(struct pci_dev *pdev, struct ata_port_info **port,
  *      @port_info: Information from low-level host driver
  *      @n_ports: Number of ports attached to host controller
  *
+ *      This is a helper function which can be called from a driver's
+ *      xxx_init_one() probe function if the hardware uses traditional
+ *      IDE taskfile registers.
+ *
+ *      This function calls pci_enable_device(), reserves its register
+ *      regions, sets the dma mask, enables bus master mode, and calls
+ *      ata_device_add()
+ *
  *      LOCKING:
  *      Inherited from PCI layer (may sleep).
  *
  *      RETURNS:
+ *      Zero on success, negative on errno-based value on error.
  *
  */
 
@@ -3877,10 +4306,6 @@ void ata_pci_remove_one (struct pci_dev *pdev)
         }
 
         free_irq(host_set->irq, host_set);
-        if (host_set->ops->host_stop)
-                host_set->ops->host_stop(host_set);
-        if (host_set->mmio_base)
-                iounmap(host_set->mmio_base);
 
         for (i = 0; i < host_set->n_ports; i++) {
                 ap = host_set->ports[i];
@@ -3899,6 +4324,9 @@ void ata_pci_remove_one (struct pci_dev *pdev)
                 scsi_host_put(ap->host);
         }
 
+        if (host_set->ops->host_stop)
+                host_set->ops->host_stop(host_set);
+
         kfree(host_set);
 
         pci_release_regions(pdev);
@@ -3942,15 +4370,6 @@ int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits)
 #endif /* CONFIG_PCI */
 
 
-/**
- *      ata_init -
- *
- *      LOCKING:
- *
- *      RETURNS:
- *
- */
-
 static int __init ata_init(void)
 {
         ata_wq = create_workqueue("ata");
@@ -3996,6 +4415,7 @@ EXPORT_SYMBOL_GPL(ata_chk_err);
 EXPORT_SYMBOL_GPL(ata_exec_command);
 EXPORT_SYMBOL_GPL(ata_port_start);
 EXPORT_SYMBOL_GPL(ata_port_stop);
+EXPORT_SYMBOL_GPL(ata_host_stop);
 EXPORT_SYMBOL_GPL(ata_interrupt);
 EXPORT_SYMBOL_GPL(ata_qc_prep);
 EXPORT_SYMBOL_GPL(ata_bmdma_setup);
@@ -4016,6 +4436,7 @@ EXPORT_SYMBOL_GPL(ata_scsi_release);
 EXPORT_SYMBOL_GPL(ata_host_intr);
 EXPORT_SYMBOL_GPL(ata_dev_classify);
 EXPORT_SYMBOL_GPL(ata_dev_id_string);
+EXPORT_SYMBOL_GPL(ata_dev_config);
 EXPORT_SYMBOL_GPL(ata_scsi_simulate);
 
 #ifdef CONFIG_PCI
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 072b6e5b139e..cdc0a10a606c 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1249,7 +1249,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
 }
 
 /**
- *      ata_scsiop_noop -
+ *      ata_scsiop_noop - Command handler that simply returns success.
  *      @args: device IDENTIFY data / SCSI command of interest.
  *      @rbuf: Response buffer, to which simulated SCSI cmd output is sent.
  *      @buflen: Response buffer length.
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index c595f5f58c16..2ae37ee12fc0 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -26,7 +26,7 @@
 #define __LIBATA_H__
 
 #define DRV_NAME        "libata"
-#define DRV_VERSION     "1.10"  /* must be exactly four chars */
+#define DRV_VERSION     "1.11"  /* must be exactly four chars */
 
 struct ata_scsi_args {
         u16                     *id;
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 42fab03ad2ba..f2aff3f4042b 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -798,7 +798,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
 }
 
 static int
-lpfc_abort_handler(struct scsi_cmnd *cmnd)
+__lpfc_abort_handler(struct scsi_cmnd *cmnd)
 {
         struct lpfc_hba *phba =
                         (struct lpfc_hba *)cmnd->device->host->hostdata[0];
@@ -918,7 +918,17 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
 }
 
 static int
-lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
+lpfc_abort_handler(struct scsi_cmnd *cmnd)
+{
+        int rc;
+        spin_lock_irq(cmnd->device->host->host_lock);
+        rc = __lpfc_abort_handler(cmnd);
+        spin_unlock_irq(cmnd->device->host->host_lock);
+        return rc;
+}
+
+static int
+__lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
 {
         struct Scsi_Host *shost = cmnd->device->host;
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
@@ -1030,11 +1040,21 @@ out:
         return ret;
 }
 
+static int
+lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
+{
+        int rc;
+        spin_lock_irq(cmnd->device->host->host_lock);
+        rc = __lpfc_reset_lun_handler(cmnd);
+        spin_unlock_irq(cmnd->device->host->host_lock);
+        return rc;
+}
+
 /*
  * Note: midlayer calls this function with the host_lock held
  */
 static int
-lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
+__lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
 {
         struct Scsi_Host *shost = cmnd->device->host;
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
@@ -1124,6 +1144,16 @@ out:
 }
 
 static int
+lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
+{
+        int rc;
+        spin_lock_irq(cmnd->device->host->host_lock);
+        rc = __lpfc_reset_bus_handler(cmnd);
+        spin_unlock_irq(cmnd->device->host->host_lock);
+        return rc;
+}
+
+static int
 lpfc_slave_alloc(struct scsi_device *sdev)
 {
         struct lpfc_hba *phba = (struct lpfc_hba *)sdev->host->hostdata[0];
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 3ef2a1443996..edd47d1f0b17 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -98,16 +98,14 @@ static int mac53c94_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *
         return 0;
 }
 
-static int mac53c94_abort(struct scsi_cmnd *cmd)
-{
-        return FAILED;
-}
-
 static int mac53c94_host_reset(struct scsi_cmnd *cmd)
 {
         struct fsc_state *state = (struct fsc_state *) cmd->device->host->hostdata;
         struct mac53c94_regs __iomem *regs = state->regs;
         struct dbdma_regs __iomem *dma = state->dma;
+        unsigned long flags;
+
+        spin_lock_irqsave(cmd->device->host->host_lock, flags);
 
         writel((RUN|PAUSE|FLUSH|WAKE) << 16, &dma->control);
         writeb(CMD_SCSI_RESET, &regs->command); /* assert RST */
@@ -116,6 +114,8 @@ static int mac53c94_host_reset(struct scsi_cmnd *cmd)
         udelay(20);
         mac53c94_init(state);
         writeb(CMD_NOP, &regs->command);
+
+        spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
         return SUCCESS;
 }
 
@@ -416,7 +416,6 @@ static struct scsi_host_template mac53c94_template = {
         .proc_name      = "53c94",
         .name           = "53C94",
         .queuecommand   = mac53c94_queue,
-        .eh_abort_handler = mac53c94_abort,
         .eh_host_reset_handler = mac53c94_host_reset,
         .can_queue      = 1,
         .this_id        = 7,
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index d5fd17ef74db..92d2c8379abf 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -591,8 +591,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand                   = macscsi_queue_command,
         .eh_abort_handler               = macscsi_abort,
         .eh_bus_reset_handler           = macscsi_bus_reset,
-        .eh_device_reset_handler        = macscsi_device_reset,
-        .eh_host_reset_handler          = macscsi_host_reset,
         .can_queue                      = CAN_QUEUE,
         .this_id                        = 7,
         .sg_tablesize                   = SG_ALL,
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h
index 23ab2c18a016..d26e331c6c12 100644
--- a/drivers/scsi/mac_scsi.h
+++ b/drivers/scsi/mac_scsi.h
@@ -72,8 +72,6 @@
 #define NCR5380_queue_command macscsi_queue_command
 #define NCR5380_abort macscsi_abort
 #define NCR5380_bus_reset macscsi_bus_reset
-#define NCR5380_device_reset macscsi_device_reset
-#define NCR5380_host_reset macscsi_host_reset
 #define NCR5380_proc_info macscsi_proc_info
 
 #define BOARD_NORMAL    0
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 8d707b29027d..ec81532eb845 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1938,7 +1938,7 @@ megaraid_abort(Scsi_Cmnd *cmd)
 
 
 static int
-megaraid_reset(Scsi_Cmnd *cmd)
+__megaraid_reset(Scsi_Cmnd *cmd)
 {
         adapter_t       *adapter;
         megacmd_t       mc;
@@ -1972,6 +1972,18 @@ megaraid_reset(Scsi_Cmnd *cmd)
         return rval;
 }
 
+static int
+megaraid_reset(Scsi_Cmnd *cmd)
+{
+        adapter_t *adapter = (adapter_t *)cmd->device->host->hostdata;
+        int rc;
+
+        spin_lock_irq(&adapter->lock);
+        rc = __megaraid_reset(cmd);
+        spin_unlock_irq(&adapter->lock);
+
+        return rc;
+}
 
 
 /**
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 18969a4946b7..69df1a9b935d 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -27,6 +27,7 @@
 #include <linux/list.h>
 #include <linux/version.h>
 #include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 138fa4815833..cbe430246276 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_mbox.c
- * Version      : v2.20.4.5 (Feb 03 2005)
+ * Version      : v2.20.4.6 (Mar 07 2005)
  *
  * Authors:
  *      Atul Mukker             <Atul.Mukker@lsil.com>
@@ -124,7 +124,7 @@ static irqreturn_t megaraid_isr(int, void *, struct pt_regs *);
 static void megaraid_mbox_dpc(unsigned long);
 
 static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *);
-static ssize_t megaraid_sysfs_show_ldnum(struct device *, char *);
+static ssize_t megaraid_sysfs_show_ldnum(struct device *, struct device_attribute *attr, char *);
 
 static int megaraid_cmm_register(adapter_t *);
 static int megaraid_cmm_unregister(adapter_t *);
@@ -202,7 +202,7 @@ MODULE_PARM_DESC(debug_level, "Debug level for driver (default=0)");
  * ### global data ###
  */
 static uint8_t megaraid_mbox_version[8] =
-        { 0x02, 0x20, 0x04, 0x05, 2, 3, 20, 5 };
+        { 0x02, 0x20, 0x04, 0x06, 3, 7, 20, 5 };
 
 
 /*
@@ -229,9 +229,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4_QC,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4_QC,
+                PCI_DEVICE_ID_VERDE,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_DELL,
@@ -271,15 +271,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4E_DC_320_2E,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4E_DC_320_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_PERC4E_SC_320_1E,
-                PCI_VENDOR_ID_DELL,
-                PCI_SUBSYS_ID_PERC4E_SC_320_1E,
+                PCI_DEVICE_ID_DOBSON,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_AMI,
@@ -331,36 +325,6 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_0x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_2x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_4x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_1E,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SCSI_320_2E,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_DEVICE_ID_MEGARAID_I4_133_RAID,
                 PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_SUBSYS_ID_MEGARAID_I4_133_RAID,
@@ -379,21 +343,9 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SATA_300_4x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SATA_300_4x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_SATA_300_8x,
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_SUBSYS_ID_MEGARAID_SATA_300_8x,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCU42X,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCU42X,
+                PCI_DEVICE_ID_LINDSAY,
+                PCI_ANY_ID,
+                PCI_ANY_ID,
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
@@ -403,58 +355,10 @@ static struct pci_device_id pci_id_table_g[] =  {
         },
         {
                 PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCU42E,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCU42E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCZCRX,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SRCS28X,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SRCS28X,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH,
-                PCI_VENDOR_ID_INTEL,
-                PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
                 PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,
                 PCI_VENDOR_ID_INTEL,
                 PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK,
         },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB,
-                PCI_SUBSYS_ID_FSC,
-                PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E,
-                PCI_VENDOR_ID_AI,
-                PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E,
-        },
-        {
-                PCI_VENDOR_ID_LSI_LOGIC,
-                PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E,
-                PCI_VENDOR_ID_NEC,
-                PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E,
-        },
         {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, pci_id_table_g);
@@ -539,7 +443,8 @@ megaraid_init(void)
 
 
         // register as a PCI hot-plug driver module
-        if ((rval = pci_module_init(&megaraid_pci_driver_g))) {
+        rval = pci_register_driver(&megaraid_pci_driver_g);
+        if (rval < 0) {
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: could not register hotplug support.\n"));
         }
@@ -619,7 +524,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         // Setup the default DMA mask. This would be changed later on
         // depending on hardware capabilities
-        if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFF) != 0) {
+        if (pci_set_dma_mask(adapter->pdev, DMA_32BIT_MASK) != 0) {
 
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: pci_set_dma_mask failed:%d\n", __LINE__));
@@ -1031,7 +936,7 @@ megaraid_init_mbox(adapter_t *adapter)
 
         // Set the DMA mask to 64-bit. All supported controllers as capable of
         // DMA in this range
-        if (pci_set_dma_mask(adapter->pdev, 0xFFFFFFFFFFFFFFFFULL) != 0) {
+        if (pci_set_dma_mask(adapter->pdev, DMA_64BIT_MASK) != 0) {
 
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: could not set DMA mask for 64-bit.\n"));
@@ -2661,7 +2566,7 @@ megaraid_mbox_dpc(unsigned long devp)
  * aborted. All the commands issued to the F/W must complete.
  **/
 static int
-megaraid_abort_handler(struct scsi_cmnd *scp)
+__megaraid_abort_handler(struct scsi_cmnd *scp)
 {
         adapter_t               *adapter;
         mraid_device_t          *raid_dev;
@@ -2794,6 +2699,21 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
         return FAILED;
 }
 
+static int
+megaraid_abort_handler(struct scsi_cmnd *scp)
+{
+        adapter_t       *adapter;
+        int rc;
+
+        adapter         = SCP2ADAPTER(scp);
+
+        spin_lock_irq(adapter->host_lock);
+        rc = __megaraid_abort_handler(scp);
+        spin_unlock_irq(adapter->host_lock);
+
+        return rc;
+}
+
 
 /**
  * megaraid_reset_handler - device reset hadler for mailbox based driver
@@ -2806,7 +2726,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
  * host
  **/
 static int
-megaraid_reset_handler(struct scsi_cmnd *scp)
+__megaraid_reset_handler(struct scsi_cmnd *scp)
 {
         adapter_t       *adapter;
         scb_t           *scb;
@@ -2927,6 +2847,18 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
         return rval;
 }
 
+static int
+megaraid_reset_handler(struct scsi_cmnd *cmd)
+{
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = __megaraid_reset_handler(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
+}
+
 
 /*
  * START: internal commands library
@@ -4213,7 +4145,7 @@ megaraid_sysfs_show_app_hndl(struct class_device *cdev, char *buf)
  * @param buf   : buffer to send data to
  */
 static ssize_t
-megaraid_sysfs_show_ldnum(struct device *dev, char *buf)
+megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         adapter_t       *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index 07510009d110..644b91bdb028 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -21,8 +21,8 @@
 #include "megaraid_ioctl.h"
 
 
-#define MEGARAID_VERSION        "2.20.4.5"
-#define MEGARAID_EXT_VERSION    "(Release Date: Thu Feb 03 12:27:22 EST 2005)"
+#define MEGARAID_VERSION        "2.20.4.6"
+#define MEGARAID_EXT_VERSION    "(Release Date: Mon Mar 07 12:27:22 EST 2005)"
 
 
 /*
@@ -37,8 +37,7 @@
 #define PCI_DEVICE_ID_PERC4_DC                          0x1960
 #define PCI_SUBSYS_ID_PERC4_DC                          0x0518
 
-#define PCI_DEVICE_ID_PERC4_QC                          0x0407
-#define PCI_SUBSYS_ID_PERC4_QC                          0x0531
+#define PCI_DEVICE_ID_VERDE                             0x0407
 
 #define PCI_DEVICE_ID_PERC4_DI_EVERGLADES               0x000F
 #define PCI_SUBSYS_ID_PERC4_DI_EVERGLADES               0x014A
@@ -58,11 +57,7 @@
 #define PCI_DEVICE_ID_PERC4E_DI_GUADALUPE               0x0013
 #define PCI_SUBSYS_ID_PERC4E_DI_GUADALUPE               0x0170
 
-#define PCI_DEVICE_ID_PERC4E_DC_320_2E                  0x0408
-#define PCI_SUBSYS_ID_PERC4E_DC_320_2E                  0x0002
-
-#define PCI_DEVICE_ID_PERC4E_SC_320_1E                  0x0408
-#define PCI_SUBSYS_ID_PERC4E_SC_320_1E                  0x0001
+#define PCI_DEVICE_ID_DOBSON                            0x0408
 
 #define PCI_DEVICE_ID_MEGARAID_SCSI_320_0               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0               0xA520
@@ -73,21 +68,6 @@
 #define PCI_DEVICE_ID_MEGARAID_SCSI_320_2               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2               0x0518
 
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_0x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_0x              0x0530
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_2x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2x              0x0532
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_4x              0x0407
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_4x              0x0531
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_1E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_1E              0x0001
-
-#define PCI_DEVICE_ID_MEGARAID_SCSI_320_2E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_SCSI_320_2E              0x0002
-
 #define PCI_DEVICE_ID_MEGARAID_I4_133_RAID              0x1960
 #define PCI_SUBSYS_ID_MEGARAID_I4_133_RAID              0x0522
 
@@ -97,52 +77,18 @@
 #define PCI_DEVICE_ID_MEGARAID_SATA_150_6               0x1960
 #define PCI_SUBSYS_ID_MEGARAID_SATA_150_6               0x0523
 
-#define PCI_DEVICE_ID_MEGARAID_SATA_300_4x              0x0409
-#define PCI_SUBSYS_ID_MEGARAID_SATA_300_4x              0x3004
-
-#define PCI_DEVICE_ID_MEGARAID_SATA_300_8x              0x0409
-#define PCI_SUBSYS_ID_MEGARAID_SATA_300_8x              0x3008
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCU42X                0x0407
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCU42X                0x0532
+#define PCI_DEVICE_ID_LINDSAY                           0x0409
 
 #define PCI_DEVICE_ID_INTEL_RAID_SRCS16                 0x1960
 #define PCI_SUBSYS_ID_INTEL_RAID_SRCS16                 0x0523
 
-#define PCI_DEVICE_ID_INTEL_RAID_SRCU42E                0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCU42E                0x0002
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCZCRX                0x0407
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCZCRX                0x0530
-
-#define PCI_DEVICE_ID_INTEL_RAID_SRCS28X                0x0409
-#define PCI_SUBSYS_ID_INTEL_RAID_SRCS28X                0x3008
-
-#define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_ALIEF        0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_ALIEF        0x3431
-
-#define PCI_DEVICE_ID_INTEL_RAID_SROMBU42E_HARWICH      0x0408
-#define PCI_SUBSYS_ID_INTEL_RAID_SROMBU42E_HARWICH      0x3499
-
 #define PCI_DEVICE_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK    0x1960
 #define PCI_SUBSYS_ID_INTEL_RAID_SRCU41L_LAKE_SHETEK    0x0520
 
-#define PCI_DEVICE_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB     0x0408
-#define PCI_SUBSYS_ID_FSC_MEGARAID_PCI_EXPRESS_ROMB     0x1065
-
-#define PCI_DEVICE_ID_MEGARAID_ACER_ROMB_2E             0x0408
-#define PCI_SUBSYS_ID_MEGARAID_ACER_ROMB_2E             0x004D
-
 #define PCI_SUBSYS_ID_PERC3_QC                          0x0471
 #define PCI_SUBSYS_ID_PERC3_DC                          0x0493
 #define PCI_SUBSYS_ID_PERC3_SC                          0x0475
 
-#define PCI_DEVICE_ID_MEGARAID_NEC_ROMB_2E              0x0408
-#define PCI_SUBSYS_ID_MEGARAID_NEC_ROMB_2E              0x8287
-
-#ifndef PCI_SUBSYS_ID_FSC
-#define PCI_SUBSYS_ID_FSC                               0x1734
-#endif
 
 #define MBOX_MAX_SCSI_CMDS      128     // number of cmds reserved for kernel
 #define MBOX_MAX_USER_CMDS      32      // number of cmds for applications
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 9f1b550713ec..37d110e864c4 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -10,13 +10,12 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_mm.c
- * Version      : v2.20.2.5 (Jan 21 2005)
+ * Version      : v2.20.2.6 (Mar 7 2005)
  *
  * Common management module
  */
 
 #include "megaraid_mm.h"
-#include <linux/smp_lock.h>
 
 
 // Entry points for char node driver
@@ -61,7 +60,7 @@ EXPORT_SYMBOL(mraid_mm_unregister_adp);
 EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
 
 static int majorno;
-static uint32_t drvr_ver        = 0x02200201;
+static uint32_t drvr_ver        = 0x02200206;
 
 static int adapters_count_g;
 static struct list_head adapters_list_g;
@@ -1231,9 +1230,9 @@ mraid_mm_compat_ioctl(struct file *filep, unsigned int cmd,
                       unsigned long arg)
 {
         int err;
-        lock_kernel();
+
         err = mraid_mm_ioctl(NULL, filep, cmd, arg);
-        unlock_kernel();
+
         return err;
 }
 #endif
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h
index 948a0012ab8c..7e36c46e7c43 100644
--- a/drivers/scsi/megaraid/megaraid_mm.h
+++ b/drivers/scsi/megaraid/megaraid_mm.h
@@ -29,9 +29,9 @@
 #include "megaraid_ioctl.h"
 
 
-#define LSI_COMMON_MOD_VERSION  "2.20.2.5"
+#define LSI_COMMON_MOD_VERSION  "2.20.2.6"
 #define LSI_COMMON_MOD_EXT_VERSION      \
-                "(Release Date: Fri Jan 21 00:01:03 EST 2005)"
+                "(Release Date: Mon Mar 7 00:01:03 EST 2005)"
 
 
 #define LSI_DBGLVL                      dbglevel
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index f6da46d672f1..b05737ae5eff 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1715,9 +1715,12 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
         struct mesh_state *ms = (struct mesh_state *) cmd->device->host->hostdata;
         volatile struct mesh_regs __iomem *mr = ms->mesh;
         volatile struct dbdma_regs __iomem *md = ms->dma;
+        unsigned long flags;
 
         printk(KERN_DEBUG "mesh_host_reset\n");
 
+        spin_lock_irqsave(ms->host->host_lock, flags);
+
         /* Reset the controller & dbdma channel */
         out_le32(&md->control, (RUN|PAUSE|FLUSH|WAKE) << 16);   /* stop dma */
         out_8(&mr->exception, 0xff);    /* clear all exception bits */
@@ -1739,6 +1742,7 @@ static int mesh_host_reset(struct scsi_cmnd *cmd)
         /* Complete pending commands */
         handle_reset(ms);
         
+        spin_unlock_irqrestore(ms->host->host_lock, flags);
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index e73b33f293a0..2fb31ee6d9f5 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -116,7 +116,14 @@ int mvme147_detect(Scsi_Host_Template *tpnt)
 static int mvme147_bus_reset(Scsi_Cmnd *cmd)
 {
         /* FIXME perform bus-specific reset */
+
+        /* FIXME 2: kill this function, and let midlayer fallback to 
+           the same result, calling wd33c93_host_reset() */
+
+        spin_lock_irq(cmd->device->host->host_lock);
         wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index d28c0d99c344..5159ceea319e 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -294,7 +294,6 @@ static struct scsi_host_template nsp32_template = {
         .this_id                        = NSP32_HOST_SCSIID,
         .use_clustering                 = DISABLE_CLUSTERING,
         .eh_abort_handler               = nsp32_eh_abort,
-/*      .eh_device_reset_handler        = NULL, */
         .eh_bus_reset_handler           = nsp32_eh_bus_reset,
         .eh_host_reset_handler          = nsp32_eh_host_reset,
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74))
@@ -2988,6 +2987,8 @@ static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt)
         nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
         unsigned int   base = SCpnt->device->host->io_port;
 
+        spin_lock_irq(SCpnt->device->host->host_lock);
+
         nsp32_msg(KERN_INFO, "Bus Reset");      
         nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt);
 
@@ -2995,6 +2996,7 @@ static int nsp32_eh_bus_reset(struct scsi_cmnd *SCpnt)
         nsp32_do_bus_reset(data);
         nsp32_write2(base, IRQ_CONTROL, 0);
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS; /* SCSI bus reset is succeeded at any time. */
 }
 
@@ -3049,11 +3051,14 @@ static int nsp32_eh_host_reset(struct scsi_cmnd *SCpnt)
         nsp32_msg(KERN_INFO, "Host Reset");     
         nsp32_dbg(NSP32_DEBUG_BUSRESET, "SCpnt=0x%x", SCpnt);
 
+        spin_lock_irq(SCpnt->device->host->host_lock);
+
         nsp32hw_init(data);
         nsp32_write2(base, IRQ_CONTROL, IRQ_CONTROL_ALL_IRQ_MASK);
         nsp32_do_bus_reset(data);
         nsp32_write2(base, IRQ_CONTROL, 0);
 
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS; /* Host reset is succeeded at any time. */
 }
 
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index c585c7bef247..89a4a0615c22 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5608,13 +5608,13 @@ static ssize_t osst_filemark_cnt_show(struct class_device *class_dev, char *buf)
 
 CLASS_DEVICE_ATTR(file_count, S_IRUGO, osst_filemark_cnt_show, NULL);
 
-static struct class_simple * osst_sysfs_class;
+static struct class *osst_sysfs_class;
 
 static int osst_sysfs_valid = 0;
 
 static void osst_sysfs_init(void)
 {
-        osst_sysfs_class = class_simple_create(THIS_MODULE, "onstream_tape");
+        osst_sysfs_class = class_create(THIS_MODULE, "onstream_tape");
         if ( IS_ERR(osst_sysfs_class) )
                 printk(KERN_WARNING "osst :W: Unable to register sysfs class\n");
         else
@@ -5627,7 +5627,7 @@ static void osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape *
 
         if (!osst_sysfs_valid) return;
 
-        osst_class_member = class_simple_device_add(osst_sysfs_class, dev, device, "%s", name);
+        osst_class_member = class_device_create(osst_sysfs_class, dev, device, "%s", name);
         if (IS_ERR(osst_class_member)) {
                 printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);
                 return;
@@ -5645,13 +5645,13 @@ static void osst_sysfs_destroy(dev_t dev)
 {
         if (!osst_sysfs_valid) return; 
 
-        class_simple_device_remove(dev);
+        class_device_destroy(osst_sysfs_class, dev);
 }
 
 static void osst_sysfs_cleanup(void)
 {
         if (osst_sysfs_valid) {
-                class_simple_destroy(osst_sysfs_class);
+                class_destroy(osst_sysfs_class);
                 osst_sysfs_valid = 0;
         }
 }
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 7976947c0322..363e0ebd4a39 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -621,8 +621,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand   = pas16_queue_command,
         .eh_abort_handler = pas16_abort,
         .eh_bus_reset_handler = pas16_bus_reset,
-        .eh_device_reset_handler = pas16_device_reset,
-        .eh_host_reset_handler = pas16_host_reset,
         .bios_param     = pas16_biosparam, 
         .can_queue      = CAN_QUEUE,
         .this_id        = 7,
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index 58d4d67aed24..65ce1cc40d9a 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -120,8 +120,6 @@ static int pas16_biosparam(struct scsi_device *, struct block_device *,
 static int pas16_detect(Scsi_Host_Template *);
 static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int pas16_bus_reset(Scsi_Cmnd *);
-static int pas16_host_reset(Scsi_Cmnd *);
-static int pas16_device_reset(Scsi_Cmnd *);
 
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN 2
@@ -164,9 +162,7 @@ static int pas16_device_reset(Scsi_Cmnd *);
 #define do_NCR5380_intr do_pas16_intr
 #define NCR5380_queue_command pas16_queue_command
 #define NCR5380_abort pas16_abort
-#define NCR5380_device_reset pas16_device_reset
 #define NCR5380_bus_reset pas16_bus_reset
-#define NCR5380_host_reset pas16_host_reset
 #define NCR5380_proc_info pas16_proc_info
 
 /* 15 14 12 10 7 5 3 
diff --git a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
deleted file mode 100644
index 377a4666b568..000000000000
--- a/drivers/scsi/pci2000.c
+++ /dev/null
@@ -1,836 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2000 device driver for Linux.
- *
- * pci2000.c - Linux Host Driver for PCI-2000 IntelliCache SCSI Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- *
- *      Revisions       1.10    Jan-21-1999
- *              - Fixed sign on message to reflect proper controller name.
- *              - Added support for RAID status monitoring and control.
- *
- *  Revisions   1.11    Mar-22-1999
- *              - Fixed control timeout to not lock up the entire system if
- *                controller goes offline completely.
- *
- *      Revisions 1.12          Mar-26-1999
- *              - Fixed spinlock and PCI configuration.
- *
- *      Revisions 1.20          Mar-27-2000
- *              - Added support for dynamic DMA
- *
- ****************************************************************************/
-#define PCI2000_VERSION         "1.20"
-
-#include <linux/blkdev.h>
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <linux/spinlock.h>
-
-#include <asm/dma.h>
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "pci2000.h"
-#include "psi_roy.h"
-
-
-//#define DEBUG 1
-
-#ifdef DEBUG
-#define DEB(x) x
-#define STOP_HERE       {int st;for(st=0;st<100;st++){st=1;}}
-#else
-#define DEB(x)
-#define STOP_HERE
-#endif
-
-typedef struct
-        {
-        unsigned int    address;
-        unsigned int    length;
-        }       SCATGATH, *PSCATGATH;
-
-typedef struct
-        {
-        Scsi_Cmnd               *SCpnt;
-        PSCATGATH                scatGath;
-        dma_addr_t               scatGathDma;
-        UCHAR                   *cdb;
-        dma_addr_t               cdbDma; 
-        UCHAR                    tag;
-        }       DEV2000, *PDEV2000;
-
-typedef struct
-        {
-        ULONG                    basePort;
-        ULONG                    mb0;
-        ULONG                    mb1;
-        ULONG                    mb2;
-        ULONG                    mb3;
-        ULONG                    mb4;
-        ULONG                    cmd;
-        ULONG                    tag;
-        ULONG                    irqOwned;
-        struct pci_dev  *pdev;
-        DEV2000                  dev[MAX_BUS][MAX_UNITS];
-        }       ADAPTER2000, *PADAPTER2000;
-
-#define HOSTDATA(host) ((PADAPTER2000)&host->hostdata)
-#define consistentLen (MAX_BUS * MAX_UNITS * (16 * sizeof (SCATGATH) + MAX_COMMAND_SIZE))
-
-
-static struct   Scsi_Host          *PsiHost[MAXADAPTER] = {NULL,};  // One for each adapter
-static                  int                             NumAdapters = 0;
-/****************************************************************
- *      Name:                   WaitReady       :LOCAL
- *
- *      Description:    Wait for controller ready.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE on not ready.
- *
- ****************************************************************/
-static int WaitReady (PADAPTER2000 padapter)
-        {
-        ULONG   z;
-
-        for ( z = 0;  z < (TIMEOUT_COMMAND * 4);  z++ )
-                {
-                if ( !inb_p (padapter->cmd) )
-                        return FALSE;
-                udelay (250);
-                };                                                              
-        return TRUE;
-        }
-/****************************************************************
- *      Name:                   WaitReadyLong   :LOCAL
- *
- *      Description:    Wait for controller ready.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE on not ready.
- *
- ****************************************************************/
-static int WaitReadyLong (PADAPTER2000 padapter)
-        {
-        ULONG   z;
-
-        for ( z = 0;  z < (5000 * 4);  z++ )
-                {
-                if ( !inb_p (padapter->cmd) )
-                        return FALSE;
-                udelay (250);
-                };                                                              
-        return TRUE;
-        }
-/****************************************************************
- *      Name:   OpDone  :LOCAL
- *
- *      Description:    Clean up operation and issue done to caller.
- *
- *      Parameters:             SCpnt   - Pointer to SCSI command structure.
- *                                      status  - Caller status.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void OpDone (Scsi_Cmnd *SCpnt, ULONG status)
-        {
-        SCpnt->result = status;
-        SCpnt->scsi_done (SCpnt);
-        }
-/****************************************************************
- *      Name:   Command         :LOCAL
- *
- *      Description:    Issue queued command to the PCI-2000.
- *
- *      Parameters:             padapter - Pointer to adapter information structure.
- *                                      cmd              - PCI-2000 command byte.
- *
- *      Returns:                Non-zero command tag if operation is accepted.
- *
- ****************************************************************/
-static UCHAR Command (PADAPTER2000 padapter, UCHAR cmd)
-        {
-        outb_p (cmd, padapter->cmd);
-        if ( WaitReady (padapter) )
-                return 0;
-
-        if ( inw_p (padapter->mb0) )
-                return 0;
-
-        return inb_p (padapter->mb1);
-        }
-/****************************************************************
- *      Name:   BuildSgList             :LOCAL
- *
- *      Description:    Build the scatter gather list for controller.
- *
- *      Parameters:             SCpnt    - Pointer to SCSI command structure.
- *                                      padapter - Pointer to adapter information structure.
- *                                      pdev     - Pointer to adapter device structure.
- *
- *      Returns:                Non-zero in not scatter gather.
- *
- ****************************************************************/
-static int BuildSgList (Scsi_Cmnd *SCpnt, PADAPTER2000 padapter, PDEV2000 pdev)
-        {
-        int                                      z;
-        int                                      zc;
-        struct scatterlist      *sg;
-
-        if ( SCpnt->use_sg )
-                {
-                sg = (struct scatterlist *)SCpnt->request_buffer;
-                zc = pci_map_sg (padapter->pdev, sg, SCpnt->use_sg, SCpnt->sc_data_direction);
-                for ( z = 0;  z < zc;  z++ )
-                        {
-                        pdev->scatGath[z].address = cpu_to_le32 (sg_dma_address (sg));
-                        pdev->scatGath[z].length = cpu_to_le32 (sg_dma_len (sg++));
-                        }
-                outl (pdev->scatGathDma, padapter->mb2);
-                outl ((zc << 24) | SCpnt->request_bufflen, padapter->mb3);
-                return FALSE;
-                }
-        if ( !SCpnt->request_bufflen)
-                {
-                outl (0, padapter->mb2);
-                outl (0, padapter->mb3);
-                return TRUE;
-                }
-        SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev,
-                        SCpnt->request_buffer, SCpnt->request_bufflen,
-                        SCpnt->sc_data_direction);
-        outl (SCpnt->SCp.have_data_in, padapter->mb2);
-        outl (SCpnt->request_bufflen, padapter->mb3);
-        return TRUE;
-        }
-/*********************************************************************
- *      Name:   PsiRaidCmd
- *
- *      Description:    Execute a simple command.
- *
- *      Parameters:             padapter - Pointer to adapter control structure.
- *                                      cmd              - Roy command byte.
- *
- *      Returns:                Return error status.
- *
- ********************************************************************/
-static int PsiRaidCmd (PADAPTER2000 padapter, char cmd)
-        {
-        if ( WaitReady (padapter) )                                             // test for command register ready
-                return DID_TIME_OUT;
-        outb_p (cmd, padapter->cmd);                                    // issue command
-        if ( WaitReadyLong (padapter) )                                 // wait for adapter ready
-                return DID_TIME_OUT;
-        return DID_OK;
-        }
-/****************************************************************
- *      Name:   Irq_Handler     :LOCAL
- *
- *      Description:    Interrupt handler.
- *
- *      Parameters:             irq             - Hardware IRQ number.
- *                                      dev_id  -
- *                                      regs    -
- *
- *      Returns:                TRUE if drive is not ready in time.
- *
- ****************************************************************/
-static irqreturn_t Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
-        {
-        struct Scsi_Host   *shost = NULL;       // Pointer to host data block
-        PADAPTER2000            padapter;               // Pointer to adapter control structure
-        PDEV2000                        pdev;
-        Scsi_Cmnd                  *SCpnt;
-        UCHAR                           tag = 0;
-        UCHAR                           tag0;
-        ULONG                           error;
-        int                                     pun;
-        int                                     bus;
-        int                                     z;
-    unsigned long               flags;
-    int handled = 0;
-
-        DEB(printk ("\npci2000 received interrupt "));
-        for ( z = 0; z < NumAdapters;  z++ )                                                                            // scan for interrupt to process
-                {
-                if ( PsiHost[z]->irq == (UCHAR)(irq & 0xFF) )
-                        {
-                        tag = inb_p (HOSTDATA(PsiHost[z])->tag);
-                        if (  tag )
-                                {
-                                shost = PsiHost[z];
-                                break;
-                                }
-                        }
-                }
-
-        if ( !shost )
-                {
-                DEB (printk ("\npci2000: not my interrupt"));
-                goto out;
-                }
-
-    handled = 1;
-        spin_lock_irqsave(shost->host_lock, flags);
-        padapter = HOSTDATA(shost);
-
-        tag0 = tag & 0x7F;                                                                                                                      // mask off the error bit
-        for ( bus = 0;  bus < MAX_BUS;  bus++ )                                                                         // scan the busses
-        {
-                for ( pun = 0;  pun < MAX_UNITS;  pun++ )                                                               // scan the targets
-                {
-                        pdev = &padapter->dev[bus][pun];
-                        if ( !pdev->tag )
-                        continue;
-                        if ( pdev->tag == tag0 )                                                                                        // is this it?
-                                {
-                                pdev->tag = 0;
-                                SCpnt = pdev->SCpnt;
-                                goto unmapProceed;
-                        }
-                        }
-        }
-
-        outb_p (0xFF, padapter->tag);                                                                                           // clear the op interrupt
-        outb_p (CMD_DONE, padapter->cmd);                                                                                       // complete the op
-        goto irq_return;                                                                                                                        // done, but, with what?
-
-unmapProceed:;
-        if ( !bus )
-                {
-                switch ( SCpnt->cmnd[0] )
-                        {
-                        case SCSIOP_TEST_UNIT_READY:
-                                pci_unmap_single (padapter->pdev, SCpnt->SCp.have_data_in, sizeof (SCpnt->sense_buffer), PCI_DMA_FROMDEVICE);
-                                goto irqProceed;
-                        case SCSIOP_READ_CAPACITY:
-                                pci_unmap_single (padapter->pdev, SCpnt->SCp.have_data_in, 8, PCI_DMA_FROMDEVICE);
-                                goto irqProceed;
-                        case SCSIOP_VERIFY:
-                        case SCSIOP_START_STOP_UNIT:
-                        case SCSIOP_MEDIUM_REMOVAL:
-                                goto irqProceed;
-                        }
-                }
-        if ( SCpnt->SCp.have_data_in )
-                pci_unmap_single (padapter->pdev, SCpnt->SCp.have_data_in, SCpnt->request_bufflen, SCpnt->sc_data_direction);
-        else 
-                {
-                if ( SCpnt->use_sg )
-                        pci_unmap_sg (padapter->pdev, (struct scatterlist *)SCpnt->request_buffer, SCpnt->use_sg, SCpnt->sc_data_direction);
-                }
-
-irqProceed:;
-        if ( tag & ERR08_TAGGED )                                                                                               // is there an error here?
-                {
-                if ( WaitReady (padapter) )
-                        {
-                        OpDone (SCpnt, DID_TIME_OUT << 16);
-                        goto irq_return;
-                        }
-
-                outb_p (tag0, padapter->mb0);                                                                           // get real error code
-                outb_p (CMD_ERROR, padapter->cmd);
-                if ( WaitReady (padapter) )                                                                                     // wait for controller to suck up the op
-                        {
-                        OpDone (SCpnt, DID_TIME_OUT << 16);
-                        goto irq_return;
-                        }
-
-                error = inl (padapter->mb0);                                                                            // get error data
-                outb_p (0xFF, padapter->tag);                                                                           // clear the op interrupt
-                outb_p (CMD_DONE, padapter->cmd);                                                                       // complete the op
-
-                DEB (printk ("status: %lX ", error));
-                if ( error == 0x00020002 )                                                                                      // is this error a check condition?
-                        {
-                        if ( bus )                                                                                                              // are we doint SCSI commands?
-                                {
-                                OpDone (SCpnt, (DID_OK << 16) | 2);
-                                goto irq_return;
-                                }
-                        if ( *SCpnt->cmnd == SCSIOP_TEST_UNIT_READY )
-                                OpDone (SCpnt, (DRIVER_SENSE << 24) | (DID_OK << 16) | 2);      // test caller we have sense data too
-                        else
-                                OpDone (SCpnt, DID_ERROR << 16);
-                        goto irq_return;
-                        }
-                OpDone (SCpnt, DID_ERROR << 16);
-                goto irq_return;
-                }
-
-        outb_p (0xFF, padapter->tag);                                                                                   // clear the op interrupt
-        outb_p (CMD_DONE, padapter->cmd);                                                                               // complete the op
-        OpDone (SCpnt, DID_OK << 16);
-
-irq_return:
-    spin_unlock_irqrestore(shost->host_lock, flags);
-out:
-    return IRQ_RETVAL(handled);
-}
-/****************************************************************
- *      Name:   Pci2000_QueueCommand
- *
- *      Description:    Process a queued command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *                                      done  - Pointer to done function to call.
- *
- *      Returns:                Status code.
- *
- ****************************************************************/
-int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
-        {
-        UCHAR              *cdb = (UCHAR *)SCpnt->cmnd;                                 // Pointer to SCSI CDB
-        PADAPTER2000    padapter = HOSTDATA(SCpnt->device->host);                       // Pointer to adapter control structure
-        int                             rc               = -1;                                                          // command return code
-        UCHAR                   bus              = SCpnt->device->channel;
-        UCHAR                   pun              = SCpnt->device->id;
-        UCHAR                   lun              = SCpnt->device->lun;
-        UCHAR                   cmd;
-        PDEV2000                pdev     = &padapter->dev[bus][pun];
-
-        if ( !done )
-                {
-                printk("pci2000_queuecommand: %02X: done can't be NULL\n", *cdb);
-                return 0;
-                }
-
-        SCpnt->scsi_done = done;
-        SCpnt->SCp.have_data_in = 0;
-        pdev->SCpnt = SCpnt;                                                                    // Save this command data
-
-        if ( WaitReady (padapter) )
-                {
-                rc = DID_ERROR;
-                goto finished;
-                }
-
-        outw_p (pun | (lun << 8), padapter->mb0);
-
-        if ( bus )
-                {
-                DEB (if(*cdb) printk ("\nCDB: %X-  %X %X %X %X %X %X %X %X %X %X ", SCpnt->cmd_len, cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], cdb[9]));
-                DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d", SCpnt->timeout_per_command,
-                                                          SCpnt->timeout_total, SCpnt->timeout));
-                outl (SCpnt->timeout_per_command, padapter->mb1);
-                outb_p (CMD_SCSI_TIMEOUT, padapter->cmd);
-                if ( WaitReady (padapter) )
-                        {
-                        rc = DID_ERROR;
-                        goto finished;
-                        }
-
-                outw_p (pun | (lun << 8), padapter->mb0);
-                outw_p (SCpnt->cmd_len << 8, padapter->mb0 + 2);
-                memcpy (pdev->cdb, cdb, MAX_COMMAND_SIZE);
-
-                outl (pdev->cdbDma, padapter->mb1);
-                if ( BuildSgList (SCpnt, padapter, pdev) )
-                        cmd = CMD_SCSI_THRU;
-                else
-                        cmd = CMD_SCSI_THRU_SG;
-                if ( (pdev->tag = Command (padapter, cmd)) == 0 )
-                        rc = DID_TIME_OUT;
-                goto finished;
-                }
-        else
-                {
-                if ( lun )
-                        {
-                        rc = DID_BAD_TARGET;
-                        goto finished;
-                        }
-                }
-
-        switch ( *cdb )
-                {
-                case SCSIOP_INQUIRY:                                    // inquiry CDB
-                        if ( cdb[2] == SC_MY_RAID )
-                                {
-                                switch ( cdb[3] ) 
-                                        {
-                                        case MY_SCSI_REBUILD:
-                                                OpDone (SCpnt, PsiRaidCmd (padapter, CMD_RAID_REBUILD) << 16);
-                                                return 0;
-                                        case MY_SCSI_ALARMMUTE:
-                                                OpDone (SCpnt, PsiRaidCmd (padapter, CMD_RAID_MUTE) << 16);
-                                                return 0;
-                                        case MY_SCSI_DEMOFAIL:
-                                                OpDone (SCpnt, PsiRaidCmd (padapter, CMD_RAID_FAIL) << 16);
-                                                return 0;
-                                        default:
-                                                if ( SCpnt->use_sg )
-                                                        {
-                                                        rc = DID_ERROR;
-                                                        goto finished;
-                                                        }
-                                                else
-                                                        {
-                                                        SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev, SCpnt->request_buffer, SCpnt->request_bufflen,
-                                                                                                          SCpnt->sc_data_direction);
-                                                        outl (SCpnt->SCp.have_data_in, padapter->mb2);
-                                                        }
-                                                outl (cdb[5], padapter->mb0);
-                                                outl (cdb[3], padapter->mb3);
-                                                cmd = CMD_DASD_RAID_RQ;
-                                                break;
-                                        }
-                                break;
-                                }
-                        
-                        if ( SCpnt->use_sg )
-                                {
-                                SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev,
-                                                                          ((struct scatterlist *)SCpnt->request_buffer)->address,
-                                                                          SCpnt->request_bufflen,
-                                                                          SCpnt->sc_data_direction);
-                                }
-                        else
-                                {
-                                SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev, SCpnt->request_buffer,
-                                                                          SCpnt->request_bufflen,
-                                                                          SCpnt->sc_data_direction);
-                                }
-                        outl (SCpnt->SCp.have_data_in, padapter->mb2);
-                        outl (SCpnt->request_bufflen, padapter->mb3);
-                        cmd = CMD_DASD_SCSI_INQ;
-                        break;
-
-                case SCSIOP_TEST_UNIT_READY:                    // test unit ready CDB
-                        SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev, SCpnt->sense_buffer, sizeof (SCpnt->sense_buffer), PCI_DMA_FROMDEVICE);
-                        outl (SCpnt->SCp.have_data_in, padapter->mb2);
-                        outl (sizeof (SCpnt->sense_buffer), padapter->mb3);
-                        cmd = CMD_TEST_READY;
-                        break;
-
-                case SCSIOP_READ_CAPACITY:                              // read capacity CDB
-                        if ( SCpnt->use_sg )
-                                {
-                                SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev, ((struct scatterlist *)(SCpnt->request_buffer))->address,
-                                                                                  8, PCI_DMA_FROMDEVICE);
-                                }
-                        else
-                                SCpnt->SCp.have_data_in = pci_map_single (padapter->pdev, SCpnt->request_buffer, 8, PCI_DMA_FROMDEVICE);
-                        outl (SCpnt->SCp.have_data_in, padapter->mb2);
-                        outl (8, padapter->mb3);
-                        cmd = CMD_DASD_CAP;
-                        break;
-                case SCSIOP_VERIFY:                                             // verify CDB
-                        outw_p ((USHORT)cdb[8] | ((USHORT)cdb[7] << 8), padapter->mb0 + 2);
-                        outl (XSCSI2LONG (&cdb[2]), padapter->mb1);
-                        cmd = CMD_READ_SG;
-                        break;
-                case SCSIOP_READ:                                               // read10 CDB
-                        outw_p ((USHORT)cdb[8] | ((USHORT)cdb[7] << 8), padapter->mb0 + 2);
-                        outl (XSCSI2LONG (&cdb[2]), padapter->mb1);
-                        if ( BuildSgList (SCpnt, padapter, pdev) )
-                                cmd = CMD_READ;
-                        else
-                                cmd = CMD_READ_SG;
-                        break;
-                case SCSIOP_READ6:                                              // read6  CDB
-                        outw_p (cdb[4], padapter->mb0 + 2);
-                        outl ((SCSI2LONG (&cdb[1])) & 0x001FFFFF, padapter->mb1);
-                        if ( BuildSgList (SCpnt, padapter, pdev) )
-                                cmd = CMD_READ;
-                        else
-                                cmd = CMD_READ_SG;
-                        break;
-                case SCSIOP_WRITE:                                              // write10 CDB
-                        outw_p ((USHORT)cdb[8] | ((USHORT)cdb[7] << 8), padapter->mb0 + 2);
-                        outl (XSCSI2LONG (&cdb[2]), padapter->mb1);
-                        if ( BuildSgList (SCpnt, padapter, pdev) )
-                                cmd = CMD_WRITE;
-                        else
-                                cmd = CMD_WRITE_SG;
-                        break;
-                case SCSIOP_WRITE6:                                             // write6  CDB
-                        outw_p (cdb[4], padapter->mb0 + 2);
-                        outl ((SCSI2LONG (&cdb[1])) & 0x001FFFFF, padapter->mb1);
-                        if ( BuildSgList (SCpnt, padapter, pdev) )
-                                cmd = CMD_WRITE;
-                        else
-                                cmd = CMD_WRITE_SG;
-                        break;
-                case SCSIOP_START_STOP_UNIT:
-                        cmd = CMD_EJECT_MEDIA;
-                        break;
-                case SCSIOP_MEDIUM_REMOVAL:
-                        switch ( cdb[4] )
-                                {
-                                case 0:
-                                        cmd = CMD_UNLOCK_DOOR;
-                                        break;
-                                case 1:
-                                        cmd = CMD_LOCK_DOOR;
-                                        break;
-                                default:
-                                        cmd = 0;
-                                        break;
-                                }
-                        if ( cmd )
-                                break;
-                default:
-                        DEB (printk ("pci2000_queuecommand: Unsupported command %02X\n", *cdb));
-                        OpDone (SCpnt, DID_ERROR << 16);
-                        return 0;
-                }
-
-        if ( (pdev->tag = Command (padapter, cmd)) == 0 )
-                rc = DID_TIME_OUT;
-finished:;
-        if ( rc != -1 )
-                OpDone (SCpnt, rc << 16);
-        return 0;
-        }
-/****************************************************************
- *      Name:   Pci2000_Detect
- *
- *      Description:    Detect and initialize our boards.
- *
- *      Parameters:             tpnt - Pointer to SCSI host template structure.
- *
- *      Returns:                Number of adapters installed.
- *
- ****************************************************************/
-int Pci2000_Detect (Scsi_Host_Template *tpnt)
-        {
-        int                                     found = 0;
-        int                                     installed = 0;
-        struct Scsi_Host   *pshost;
-        PADAPTER2000        padapter;
-        int                                     z, zz;
-        int                                     setirq;
-        struct pci_dev     *pdev = NULL;
-        UCHAR                      *consistent;
-        dma_addr_t                      consistentDma;
-
-        while ( (pdev = pci_find_device (VENDOR_PSI, DEVICE_ROY_1, pdev)) != NULL )
-                {
-                if (pci_enable_device(pdev))
-                        continue;
-                pshost = scsi_register (tpnt, sizeof(ADAPTER2000));
-                if(pshost == NULL)
-                        continue;
-                padapter = HOSTDATA(pshost);
-
-                padapter->basePort = pci_resource_start (pdev, 1);
-                DEB (printk ("\nBase Regs = %#04X", padapter->basePort));                       // get the base I/O port address
-                padapter->mb0   = padapter->basePort + RTR_MAILBOX;                                     // get the 32 bit mail boxes
-                padapter->mb1   = padapter->basePort + RTR_MAILBOX + 4;
-                padapter->mb2   = padapter->basePort + RTR_MAILBOX + 8;
-                padapter->mb3   = padapter->basePort + RTR_MAILBOX + 12;
-                padapter->mb4   = padapter->basePort + RTR_MAILBOX + 16;
-                padapter->cmd   = padapter->basePort + RTR_LOCAL_DOORBELL;                      // command register
-                padapter->tag   = padapter->basePort + RTR_PCI_DOORBELL;                        // tag/response register
-                padapter->pdev = pdev;
-
-                if ( WaitReady (padapter) )
-                        goto unregister;
-                outb_p (0x84, padapter->mb0);
-                outb_p (CMD_SPECIFY, padapter->cmd);
-                if ( WaitReady (padapter) )
-                        goto unregister;
-
-                consistent = pci_alloc_consistent (pdev, consistentLen, &consistentDma);
-                if ( !consistent )
-                        {
-                        printk ("Unable to allocate DMA memory for PCI-2000 controller.\n");
-                        goto unregister;
-                        }
-                
-                scsi_set_device(pshost, &pdev->dev);
-                pshost->irq = pdev->irq;
-                setirq = 1;
-                padapter->irqOwned = 0;
-                for ( z = 0;  z < installed;  z++ )                                                                     // scan for shared interrupts
-                        {
-                        if ( PsiHost[z]->irq == pshost->irq )                                                   // if shared then, don't posses
-                                setirq = 0;
-                        }
-                if ( setirq )                                                                                           // if not shared, posses
-                        {
-                        if ( request_irq (pshost->irq, Irq_Handler, SA_SHIRQ, "pci2000", padapter) < 0 )
-                                {
-                                if ( request_irq (pshost->irq, Irq_Handler, SA_INTERRUPT | SA_SHIRQ, "pci2000", padapter) < 0 )
-                                        {
-                                        printk ("Unable to allocate IRQ for PCI-2000 controller.\n");
-                                        pci_free_consistent (pdev, consistentLen, consistent, consistentDma);
-                                        goto unregister;
-                                        }
-                                }
-                        padapter->irqOwned = pshost->irq;                                               // set IRQ as owned
-                        }
-                PsiHost[installed]      = pshost;                                                                               // save SCSI_HOST pointer
-
-                pshost->io_port         = padapter->basePort;
-                pshost->n_io_port       = 0xFF;
-                pshost->unique_id       = padapter->basePort;
-                pshost->max_id          = 16;
-                pshost->max_channel     = 1;
-
-                for ( zz = 0;  zz < MAX_BUS;  zz++ )
-                        for ( z = 0; z < MAX_UNITS;  z++ )
-                                {
-                                padapter->dev[zz][z].tag = 0;
-                                padapter->dev[zz][z].scatGath = (PSCATGATH)consistent;
-                                padapter->dev[zz][z].scatGathDma = consistentDma;
-                                consistent += 16 * sizeof (SCATGATH);
-                                consistentDma += 16 * sizeof (SCATGATH);
-                                padapter->dev[zz][z].cdb = (UCHAR *)consistent;
-                                padapter->dev[zz][z].cdbDma = consistentDma;
-                                consistent += MAX_COMMAND_SIZE;
-                                consistentDma += MAX_COMMAND_SIZE;
-                                }
-                        
-                printk("\nPSI-2000 Intelligent Storage SCSI CONTROLLER: at I/O = %lX  IRQ = %d\n", padapter->basePort, pshost->irq);
-                printk("Version %s, Compiled %s %s\n\n", PCI2000_VERSION,  __DATE__, __TIME__);
-                found++;
-                if ( ++installed < MAXADAPTER )
-                        continue;
-                break;
-unregister:;
-                scsi_unregister (pshost);
-                found++;
-                }
-        NumAdapters = installed;
-        return installed;
-        }
-/****************************************************************
- *      Name:   Pci2000_Abort
- *
- *      Description:    Process the Abort command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *
- *      Returns:                Allways snooze.
- *
- ****************************************************************/
-int Pci2000_Abort (Scsi_Cmnd *SCpnt)
-        {
-        DEB (printk ("pci2000_abort\n"));
-        return SCSI_ABORT_SNOOZE;
-        }
-/****************************************************************
- *      Name:   Pci2000_Reset
- *
- *      Description:    Process the Reset command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *                                      flags - Flags about the reset command
- *
- *      Returns:                No active command at this time, so this means
- *                                      that each time we got some kind of response the
- *                                      last time through.  Tell the mid-level code to
- *                                      request sense information in order to decide what
- *                                      to do next.
- *
- ****************************************************************/
-int Pci2000_Reset (Scsi_Cmnd *SCpnt, unsigned int reset_flags)
-        {
-        return SCSI_RESET_PUNT;
-        }
-/****************************************************************
- *      Name:   Pci2000_Release
- *
- *      Description:    Release resources allocated for a single each adapter.
- *
- *      Parameters:             pshost - Pointer to SCSI command structure.
- *
- *      Returns:                zero.
- *
- ****************************************************************/
-int Pci2000_Release (struct Scsi_Host *pshost)
-        {
-    PADAPTER2000        padapter = HOSTDATA (pshost);
-
-        if ( padapter->irqOwned )
-                free_irq (pshost->irq, padapter);
-        pci_free_consistent (padapter->pdev, consistentLen, padapter->dev[0][0].scatGath, padapter->dev[0][0].scatGathDma);
-        release_region (pshost->io_port, pshost->n_io_port);
-    scsi_unregister(pshost);
-    return 0;
-        }
-
-/****************************************************************
- *      Name:   Pci2000_BiosParam
- *
- *      Description:    Process the biosparam request from the SCSI manager to
- *                                      return C/H/S data.
- *
- *      Parameters:             disk - Pointer to SCSI disk structure.
- *                                      dev      - Major/minor number from kernel.
- *                                      geom - Pointer to integer array to place geometry data.
- *
- *      Returns:                zero.
- *
- ****************************************************************/
-int Pci2000_BiosParam (struct scsi_device *sdev, struct block_device *dev,
-                sector_t capacity, int geom[])
-        {
-        PADAPTER2000        padapter;
-
-        padapter = HOSTDATA(sdev->host);
-
-        if ( WaitReady (padapter) )
-                return 0;
-        outb_p (sdev->id, padapter->mb0);
-        outb_p (CMD_GET_PARMS, padapter->cmd);
-        if ( WaitReady (padapter) )
-                return 0;
-
-        geom[0] = inb_p (padapter->mb2 + 3);
-        geom[1] = inb_p (padapter->mb2 + 2);
-        geom[2] = inw_p (padapter->mb2);
-        return 0;
-        }
-
-
-MODULE_LICENSE("Dual BSD/GPL");
-
-static Scsi_Host_Template driver_template = {
-        .proc_name      = "pci2000",
-        .name           = "PCI-2000 SCSI Intelligent Disk Controller",
-        .detect         = Pci2000_Detect,
-        .release        = Pci2000_Release,
-        .queuecommand   = Pci2000_QueueCommand,
-        .abort          = Pci2000_Abort,
-        .reset          = Pci2000_Reset,
-        .bios_param     = Pci2000_BiosParam,
-        .can_queue      = 16,
-        .this_id        = -1,
-        .sg_tablesize   = 16,
-        .cmd_per_lun    = 1,
-        .use_clustering = DISABLE_CLUSTERING,
-};
-#include "scsi_module.c"
diff --git a/drivers/scsi/pci2220i.c b/drivers/scsi/pci2220i.c
deleted file mode 100644
index e395e4203154..000000000000
--- a/drivers/scsi/pci2220i.c
+++ /dev/null
@@ -1,2915 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2220I device driver for Linux.
- *
- * pci2220i.c - Linux Host Driver for PCI-2220I EIDE RAID Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- *
- *      Revisions 1.10          Mar-26-1999
- *              - Updated driver for RAID and hot reconstruct support.
- *
- *      Revisions 1.11          Mar-26-1999
- *              - Fixed spinlock and PCI configuration.
- *
- *      Revision 2.00           December-1-1999
- *              - Added code for the PCI-2240I controller
- *              - Added code for ATAPI devices.
- *              - Double buffer for scatter/gather support
- *
- *      Revision 2.10           March-27-2000
- *              - Added support for dynamic DMA
- *
- ****************************************************************************/
-
-#error Convert me to understand page+offset based scatterlists
-
-//#define DEBUG 1
-
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <linux/blkdev.h>
-#include <linux/timer.h>
-#include <linux/spinlock.h>
-
-#include <asm/dma.h>
-#include <asm/system.h>
-#include <asm/io.h>
-
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "pci2220i.h"
-#include "psi_dale.h"
-
-
-#define PCI2220I_VERSION                "2.10"
-#define READ_CMD                                IDE_CMD_READ_MULTIPLE
-#define WRITE_CMD                               IDE_CMD_WRITE_MULTIPLE
-#define MAX_BUS_MASTER_BLOCKS   SECTORSXFER             // This is the maximum we can bus master
-
-#ifdef DEBUG
-#define DEB(x) x
-#define STOP_HERE()     {int st;for(st=0;st<100;st++){st=1;}}
-#else
-#define DEB(x)
-#define STOP_HERE()
-#endif
-
-#define MAXADAPTER 4                                    // Increase this and the sizes of the arrays below, if you need more.
-
-
-typedef struct
-        {
-        UCHAR                   byte6;                          // device select register image
-        UCHAR                   spigot;                         // spigot number
-        UCHAR                   spigots[2];                     // RAID spigots
-        UCHAR                   deviceID[2];            // device ID codes
-        USHORT                  sectors;                        // number of sectors per track
-        USHORT                  heads;                          // number of heads
-        USHORT                  cylinders;                      // number of cylinders for this device
-        USHORT                  spareword;                      // placeholder
-        ULONG                   blocks;                         // number of blocks on device
-        DISK_MIRROR             DiskMirror[2];          // RAID status and control
-        ULONG                   lastsectorlba[2];       // last addressable sector on the drive
-        USHORT                  raid;                           // RAID active flag
-        USHORT                  mirrorRecon;
-        UCHAR                   reconOn;
-        USHORT                  reconCount;
-        USHORT                  reconIsStarting;        // indicate hot reconstruct is starting
-        UCHAR                   cmdDrqInt;                      // flag for command interrupt
-        UCHAR                   packet;                         // command packet size in bytes
-        }       OUR_DEVICE, *POUR_DEVICE;       
-
-typedef struct
-        {
-        USHORT           bigD;                                  // identity is a PCI-2240I if true, otherwise a PCI-2220I
-        USHORT           atapi;                                 // this interface is for ATAPI devices only
-        ULONG            regDmaDesc;                    // address of the DMA discriptor register for direction of transfer
-        ULONG            regDmaCmdStat;                 // Byte #1 of DMA command status register
-        ULONG            regDmaAddrPci;                 // 32 bit register for PCI address of DMA
-        ULONG            regDmaAddrLoc;                 // 32 bit register for local bus address of DMA
-        ULONG            regDmaCount;                   // 32 bit register for DMA transfer count
-        ULONG            regDmaMode;                    // 32 bit register for DMA mode control
-        ULONG            regRemap;                              // 32 bit local space remap
-        ULONG            regDesc;                               // 32 bit local region descriptor
-        ULONG            regRange;                              // 32 bit local range
-        ULONG            regIrqControl;                 // 16 bit Interrupt enable/disable and status
-        ULONG            regScratchPad;                 // scratch pad I/O base address
-        ULONG            regBase;                               // Base I/O register for data space
-        ULONG            regData;                               // data register I/O address
-        ULONG            regError;                              // error register I/O address
-        ULONG            regSectCount;                  // sector count register I/O address
-        ULONG            regLba0;                               // least significant byte of LBA
-        ULONG            regLba8;                               // next least significant byte of LBA
-        ULONG            regLba16;                              // next most significan byte of LBA
-        ULONG            regLba24;                              // head and most 4 significant bits of LBA
-        ULONG            regStatCmd;                    // status on read and command on write register
-        ULONG            regStatSel;                    // board status on read and spigot select on write register
-        ULONG            regFail;                               // fail bits control register
-        ULONG            regAltStat;                    // alternate status and drive control register
-        ULONG            basePort;                              // PLX base I/O port
-        USHORT           timingMode;                    // timing mode currently set for adapter
-        USHORT           timingPIO;                             // TRUE if PIO timing is active
-        struct pci_dev  *pcidev;
-        ULONG            timingAddress;                 // address to use on adapter for current timing mode
-        ULONG            irqOwned;                              // owned IRQ or zero if shared
-        UCHAR            numberOfDrives;                // saved number of drives on this controller
-        UCHAR            failRegister;                  // current inverted data in fail register
-        OUR_DEVICE       device[BIGD_MAXDRIVES];
-        DISK_MIRROR     *raidData[BIGD_MAXDRIVES];
-        ULONG            startSector;
-        USHORT           sectorCount;
-        ULONG            readCount;
-        UCHAR           *currentSgBuffer;
-        ULONG            currentSgCount;
-        USHORT           nextSg;
-        UCHAR            cmd;
-        Scsi_Cmnd       *SCpnt;
-        POUR_DEVICE      pdev;                                  // current device opearating on
-        USHORT           devInReconIndex;
-        USHORT           expectingIRQ;
-        USHORT           reconOn;                               // Hot reconstruct is to be done.
-        USHORT           reconPhase;                    // Hot reconstruct operation is in progress.
-        ULONG            reconSize;
-        USHORT           demoFail;                              // flag for RAID failure demonstration
-        USHORT           survivor;
-        USHORT           failinprog;
-        struct timer_list       reconTimer;     
-        struct timer_list       timer;
-        UCHAR           *kBuffer;
-        dma_addr_t       kBufferDma;
-        UCHAR            reqSense;
-        UCHAR            atapiCdb[16];
-        UCHAR            atapiSpecial;
-        }       ADAPTER2220I, *PADAPTER2220I;
-
-#define HOSTDATA(host) ((PADAPTER2220I)&host->hostdata)
-
-#define RECON_PHASE_READY               0x01
-#define RECON_PHASE_COPY                0x02
-#define RECON_PHASE_UPDATE              0x03
-#define RECON_PHASE_LAST                0x04
-#define RECON_PHASE_END                 0x07    
-#define RECON_PHASE_MARKING             0x80
-#define RECON_PHASE_FAILOVER    0xFF
-
-static struct   Scsi_Host          *PsiHost[MAXADAPTER] = {NULL,};  // One for each adapter
-static                  int                             NumAdapters = 0;
-static                  int                             Installed = 0;
-static                  SETUP                   DaleSetup;
-static                  DISK_MIRROR             DiskMirror[BIGD_MAXDRIVES];
-static                  ULONG                   ModeArray[] = {DALE_DATA_MODE2, DALE_DATA_MODE3, DALE_DATA_MODE4, DALE_DATA_MODE5};
-static                  ULONG                   ModeArray2[] = {BIGD_DATA_MODE2, BIGD_DATA_MODE3, BIGD_DATA_MODE4, BIGD_DATA_MODE5};
-
-static void ReconTimerExpiry (unsigned long data);
-
-/*******************************************************************************************************
- *      Name:                   Alarm
- *
- *      Description:    Sound the for the given device
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      device   - Device number.
- *      
- *      Returns:                Nothing.
- *
- ******************************************************************************************************/
-static void Alarm (PADAPTER2220I padapter, UCHAR device)
-        {
-        UCHAR   zc;
-
-        if ( padapter->bigD )
-                {
-                zc = device | (FAIL_ANY | FAIL_AUDIBLE);
-                if ( padapter->failRegister & FAIL_ANY ) 
-                        zc |= FAIL_MULTIPLE;
-                
-                padapter->failRegister = zc;
-                outb_p (~zc, padapter->regFail);
-                }
-        else
-                outb_p (0x3C | (1 << device), padapter->regFail);                       // sound alarm and set fail light               
-        }
-/****************************************************************
- *      Name:   MuteAlarm       :LOCAL
- *
- *      Description:    Mute the audible alarm.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static void MuteAlarm (PADAPTER2220I padapter)
-        {
-        UCHAR   old;
-
-        if ( padapter->bigD )
-                {
-                padapter->failRegister &= ~FAIL_AUDIBLE;
-                outb_p (~padapter->failRegister, padapter->regFail);
-                }
-        else
-                {
-                old = (inb_p (padapter->regStatSel) >> 3) | (inb_p (padapter->regStatSel) & 0x83);
-                outb_p (old | 0x40, padapter->regFail);
-                }
-        }
-/****************************************************************
- *      Name:   WaitReady       :LOCAL
- *
- *      Description:    Wait for device ready.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int WaitReady (PADAPTER2220I padapter)
-        {
-        ULONG   z;
-        UCHAR   status;
-
-        for ( z = 0;  z < (TIMEOUT_READY * 4);  z++ )
-                {
-                status = inb_p (padapter->regStatCmd);
-                if ( (status & (IDE_STATUS_DRDY | IDE_STATUS_BUSY)) == IDE_STATUS_DRDY )
-                        return 0;
-                udelay (250);
-                }
-        return status;
-        }
-/****************************************************************
- *      Name:   WaitReadyReset  :LOCAL
- *
- *      Description:    Wait for device ready.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int WaitReadyReset (PADAPTER2220I padapter)
-        {
-        ULONG   z;
-        UCHAR   status;
-
-        for ( z = 0;  z < (125 * 16);  z++ )                            // wait up to 1/4 second
-                {
-                status = inb_p (padapter->regStatCmd);
-                if ( (status & (IDE_STATUS_DRDY | IDE_STATUS_BUSY)) == IDE_STATUS_DRDY )
-                        {
-                        DEB (printk ("\nPCI2220I:  Reset took %ld mSec to be ready", z / 8));
-                        return 0;
-                        }
-                udelay (125);
-                }
-        DEB (printk ("\nPCI2220I:  Reset took more than 2 Seconds to come ready, Disk Failure"));
-        return status;
-        }
-/****************************************************************
- *      Name:   WaitDrq :LOCAL
- *
- *      Description:    Wait for device ready for data transfer.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int WaitDrq (PADAPTER2220I padapter)
-        {
-        ULONG   z;
-        UCHAR   status;
-
-        for ( z = 0;  z < (TIMEOUT_DRQ * 4);  z++ )
-                {
-                status = inb_p (padapter->regStatCmd);
-                if ( status & IDE_STATUS_DRQ )
-                        return 0;
-                udelay (250);
-                }
-        return status;
-        }
-/****************************************************************
- *      Name:   AtapiWaitReady  :LOCAL
- *
- *      Description:    Wait for device busy and DRQ to be cleared.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      msec     - Number of milliseconds to wait.
- *
- *      Returns:                TRUE if drive does not clear busy in time.
- *
- ****************************************************************/
-static int AtapiWaitReady (PADAPTER2220I padapter, int msec)
-        {
-        int z;
-
-        for ( z = 0;  z < (msec * 16);  z++ )
-                {
-                if ( !(inb_p (padapter->regStatCmd) & (IDE_STATUS_BUSY | IDE_STATUS_DRQ)) )
-                        return FALSE;
-                udelay (125);
-                }
-        return TRUE;
-        }
-/****************************************************************
- *      Name:   AtapiWaitDrq    :LOCAL
- *
- *      Description:    Wait for device ready for data transfer.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      msec     - Number of milliseconds to wait.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int AtapiWaitDrq (PADAPTER2220I padapter, int msec)
-        {
-        ULONG   z;
-
-        for ( z = 0;  z < (msec * 16);  z++ )
-                {
-                if ( inb_p (padapter->regStatCmd) & IDE_STATUS_DRQ )
-                        return 0;
-                udelay (128);
-                }
-        return TRUE;
-        }
-/****************************************************************
- *      Name:   HardReset       :LOCAL
- *
- *      Description:    Wait for device ready for data transfer.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *                                      spigot   - Spigot number.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int HardReset (PADAPTER2220I padapter, POUR_DEVICE pdev, UCHAR spigot)
-        {
-        DEB (printk ("\npci2220i:RESET  spigot = %X  devices = %d, %d", spigot, pdev->deviceID[0], pdev->deviceID[1]));
-        mdelay (100);                                                                           // just wait 100 mSec to let drives flush       
-        SelectSpigot (padapter, spigot | SEL_IRQ_OFF);
-        
-        outb_p (0x0E, padapter->regAltStat);                                    // reset the suvivor
-        udelay (100);                                                                                   // wait a little        
-        outb_p (0x08, padapter->regAltStat);                                    // clear the reset
-        udelay (100);
-
-        outb_p (0xA0, padapter->regLba24);                                              // select the master drive
-        if ( WaitReadyReset (padapter) )
-                {
-                DEB (printk ("\npci2220i: master not ready after reset"));
-                return TRUE;
-                }
-        outb_p (0xB0, padapter->regLba24);                                              // try the slave drive
-        if ( (inb_p (padapter->regStatCmd) & (IDE_STATUS_DRDY | IDE_STATUS_BUSY)) == IDE_STATUS_DRDY ) 
-                {
-                DEB (printk ("\nPCI2220I: initializing slave drive on spigot %X", spigot));
-                outb_p (SECTORSXFER, padapter->regSectCount);
-                WriteCommand (padapter, IDE_CMD_SET_MULTIPLE);  
-                if ( WaitReady (padapter) )
-                        {
-                        DEB (printk ("\npci2220i: slave not ready after set multiple"));
-                        return TRUE;
-                        }
-                }
-        
-        outb_p (0xA0, padapter->regLba24);                              // select the drive
-        outb_p (SECTORSXFER, padapter->regSectCount);
-        WriteCommand (padapter, IDE_CMD_SET_MULTIPLE);  
-        if ( WaitReady (padapter) )
-                {
-                DEB (printk ("\npci2220i: master not ready after set multiple"));
-                return TRUE;
-                }
-        return FALSE;
-        }
-/****************************************************************
- *      Name:   AtapiReset      :LOCAL
- *
- *      Description:    Wait for device ready for data transfer.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *
- *      Returns:                TRUE if drive does not come ready.
- *
- ****************************************************************/
-static int AtapiReset (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        SelectSpigot (padapter, pdev->spigot);
-        AtapiDevice (padapter, pdev->byte6);
-        AtapiCountLo (padapter, 0);
-        AtapiCountHi (padapter, 0);
-        WriteCommand (padapter, IDE_COMMAND_ATAPI_RESET);
-        udelay (125);
-        if ( AtapiWaitReady (padapter, 1000) )
-                return TRUE;
-        if ( inb_p (padapter->regStatCmd) || (inb_p (padapter->regLba8) != 0x14) || (inb_p (padapter->regLba16) != 0xEB) )
-                return TRUE;
-        return FALSE;
-        }
-/****************************************************************
- *      Name:   WalkScatGath    :LOCAL
- *
- *      Description:    Transfer data to/from scatter/gather buffers.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      datain   - TRUE if data read.
- *                                      length   - Number of bytes to transfer.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void WalkScatGath (PADAPTER2220I padapter, UCHAR datain, ULONG length)
-        {
-        ULONG    count;
-        UCHAR   *buffer = padapter->kBuffer;
-
-        while ( length )
-                {
-                count = ( length > padapter->currentSgCount ) ? padapter->currentSgCount : length; 
-                
-                if ( datain )
-                        memcpy (padapter->currentSgBuffer, buffer, count);
-                else
-                        memcpy (buffer, padapter->currentSgBuffer, count);
-
-                padapter->currentSgCount -= count;
-                if ( !padapter->currentSgCount )
-                        {
-                        if ( padapter->nextSg < padapter->SCpnt->use_sg )
-                                {
-                                padapter->currentSgBuffer = ((struct scatterlist *)padapter->SCpnt->request_buffer)[padapter->nextSg].address;
-                                padapter->currentSgCount = ((struct scatterlist *)padapter->SCpnt->request_buffer)[padapter->nextSg].length;
-                                padapter->nextSg++;
-                                }
-                        }
-                else
-                        padapter->currentSgBuffer += count;
-
-                length -= count;
-                buffer += count;
-                }
-        }
-/****************************************************************
- *      Name:   BusMaster       :LOCAL
- *
- *      Description:    Do a bus master I/O.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      datain   - TRUE if data read.
- *                                      irq              - TRUE if bus master interrupt expected.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void BusMaster (PADAPTER2220I padapter, UCHAR datain, UCHAR irq)
-        {
-        ULONG zl;
-        
-        zl = ( padapter->sectorCount > MAX_BUS_MASTER_BLOCKS ) ? MAX_BUS_MASTER_BLOCKS : padapter->sectorCount;
-        padapter->sectorCount -= zl;
-        zl *= (ULONG)BYTES_PER_SECTOR;
-
-        if ( datain )
-                {
-                padapter->readCount = zl;
-                outb_p (8, padapter->regDmaDesc);                                                       // read operation
-                if ( padapter->bigD )
-                        {
-                        if ( irq && !padapter->sectorCount )
-                                outb_p (0x0C, padapter->regDmaMode);                            // interrupt on
-                        else
-                                outb_p (0x08, padapter->regDmaMode);                            // no interrupt
-                        }
-                else 
-                        {
-                        if ( irq && !padapter->sectorCount )
-                                outb_p (0x05, padapter->regDmaMode);                            // interrupt on
-                        else
-                                outb_p (0x01, padapter->regDmaMode);                            // no interrupt
-                        }
-                }
-        else
-                {
-                outb_p (0x00, padapter->regDmaDesc);                                            // write operation
-                if ( padapter->bigD )
-                        outb_p (0x08, padapter->regDmaMode);                                    // no interrupt                                         
-                else
-                        outb_p (0x01, padapter->regDmaMode);                                    // no interrupt
-                WalkScatGath (padapter, FALSE, zl);     
-                }
-        
-        outl (padapter->timingAddress, padapter->regDmaAddrLoc);
-        outl (padapter->kBufferDma, padapter->regDmaAddrPci);
-        outl (zl, padapter->regDmaCount);
-        outb_p (0x03, padapter->regDmaCmdStat);                                                 // kick the DMA engine in gear
-        }
-/****************************************************************
- *      Name:   AtapiBusMaster  :LOCAL
- *
- *      Description:    Do a bus master I/O.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      datain   - TRUE if data read.
- *                                      length   - Number of bytes to transfer.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void AtapiBusMaster (PADAPTER2220I padapter, UCHAR datain, ULONG length)
-        {
-        outl (padapter->timingAddress, padapter->regDmaAddrLoc);
-        outl (padapter->kBufferDma, padapter->regDmaAddrPci);
-        outl (length, padapter->regDmaCount);
-        if ( datain )
-                {
-                if ( padapter->readCount )
-                                WalkScatGath (padapter, TRUE, padapter->readCount);
-                outb_p (0x08, padapter->regDmaDesc);                                            // read operation
-                outb_p (0x08, padapter->regDmaMode);                                            // no interrupt
-                padapter->readCount = length;
-                }
-        else
-                {
-                outb_p (0x00, padapter->regDmaDesc);                                            // write operation
-                outb_p (0x08, padapter->regDmaMode);                                            // no interrupt                                         
-                if ( !padapter->atapiSpecial )
-                        WalkScatGath (padapter, FALSE, length); 
-                }
-        outb_p (0x03, padapter->regDmaCmdStat);                                                 // kick the DMA engine in gear
-        }
-/****************************************************************
- *      Name:   WriteData       :LOCAL
- *
- *      Description:    Write data to device.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *
- *      Returns:                TRUE if drive does not assert DRQ in time.
- *
- ****************************************************************/
-static int WriteData (PADAPTER2220I padapter)
-        {
-        ULONG   zl;
-        
-        if ( !WaitDrq (padapter) )
-                {
-                if ( padapter->timingPIO )
-                        {
-                        zl = (padapter->sectorCount > MAX_BUS_MASTER_BLOCKS) ? MAX_BUS_MASTER_BLOCKS : padapter->sectorCount;
-                        WalkScatGath (padapter, FALSE, zl * BYTES_PER_SECTOR);
-                        outsw (padapter->regData, padapter->kBuffer, zl * (BYTES_PER_SECTOR / 2));
-                        padapter->sectorCount -= zl;
-                        }
-                else
-                        BusMaster (padapter, 0, 0);
-                return 0;
-                }
-        padapter->cmd = 0;                                                                                              // null out the command byte
-        return 1;
-        }
-/****************************************************************
- *      Name:   WriteDataBoth   :LOCAL
- *
- *      Description:    Write data to device.
- *
- *      Parameters:             padapter - Pointer to adapter structure.
- *                                      pdev     - Pointer to device structure
- *
- *      Returns:                Index + 1 of drive not failed or zero for OK.
- *
- ****************************************************************/
-static int WriteDataBoth (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        ULONG   zl;
-        UCHAR   status0, status1;
-
-        SelectSpigot (padapter, pdev->spigots[0]);
-        status0 = WaitDrq (padapter);
-        if ( !status0 )
-                {
-                SelectSpigot (padapter, pdev->spigots[1]);
-                status1 = WaitDrq (padapter);
-                if ( !status1 )
-                        {
-                        SelectSpigot (padapter, pdev->spigots[0] | pdev->spigots[1] | padapter->bigD);
-                        if ( padapter->timingPIO )
-                                {
-                                zl = (padapter->sectorCount > MAX_BUS_MASTER_BLOCKS) ? MAX_BUS_MASTER_BLOCKS : padapter->sectorCount;
-                                WalkScatGath (padapter, FALSE, zl * BYTES_PER_SECTOR);
-                                outsw (padapter->regData, padapter->kBuffer, zl * (BYTES_PER_SECTOR / 2));
-                                padapter->sectorCount -= zl;
-                                }
-                        else
-                                BusMaster (padapter, 0, 0);
-                        return 0;
-                        }
-                }
-        padapter->cmd = 0;                                                                                              // null out the command byte
-        if ( status0 )
-                return 2;
-        return 1;
-        }
-/****************************************************************
- *      Name:   IdeCmd  :LOCAL
- *
- *      Description:    Process an IDE command.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *
- *      Returns:                Zero if no error or status register contents on error.
- *
- ****************************************************************/
-static UCHAR IdeCmd (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        UCHAR   status;
-
-        SelectSpigot (padapter, pdev->spigot | padapter->bigD);                                                 // select the spigot
-        outb_p (pdev->byte6 | ((UCHAR *)(&padapter->startSector))[3], padapter->regLba24);                      // select the drive
-        status = WaitReady (padapter);
-        if ( !status )
-                {
-                outb_p (padapter->sectorCount, padapter->regSectCount);
-                outb_p (((UCHAR *)(&padapter->startSector))[0], padapter->regLba0);
-                outb_p (((UCHAR *)(&padapter->startSector))[1], padapter->regLba8);
-                outb_p (((UCHAR *)(&padapter->startSector))[2], padapter->regLba16);
-                padapter->expectingIRQ = TRUE;
-                WriteCommand (padapter, padapter->cmd);
-                return 0;
-                }
-
-        padapter->cmd = 0;                                                                      // null out the command byte
-        return status;
-        }
-/****************************************************************
- *      Name:   IdeCmdBoth      :LOCAL
- *
- *      Description:    Process an IDE command to both drivers.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device structure
- *
- *      Returns:                Index + 1 of drive not failed or zero for OK.
- *
- ****************************************************************/
-static UCHAR IdeCmdBoth (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        UCHAR   status0;
-        UCHAR   status1;
-
-        SelectSpigot (padapter, pdev->spigots[0] | pdev->spigots[1]);                                                           // select the spigots
-        outb_p (padapter->pdev->byte6 | ((UCHAR *)(&padapter->startSector))[3], padapter->regLba24);// select the drive
-        SelectSpigot (padapter, pdev->spigots[0]);
-        status0 = WaitReady (padapter);
-        if ( !status0 )
-                {
-                SelectSpigot (padapter, pdev->spigots[1]);
-                status1 = WaitReady (padapter);
-                if ( !status1 )
-                        {
-                        SelectSpigot (padapter, pdev->spigots[0] | pdev->spigots[1] | padapter->bigD);
-                        outb_p (padapter->sectorCount, padapter->regSectCount);
-                        outb_p (((UCHAR *)(&padapter->startSector))[0], padapter->regLba0);
-                        outb_p (((UCHAR *)(&padapter->startSector))[1], padapter->regLba8);
-                        outb_p (((UCHAR *)(&padapter->startSector))[2], padapter->regLba16);
-                        padapter->expectingIRQ = TRUE;
-                        WriteCommand (padapter, padapter->cmd);
-                        return 0;
-                        }
-                }
-        padapter->cmd = 0;                                                                      // null out the command byte
-        if ( status0 )
-                return 2;
-        return 1;
-        }
-/****************************************************************
- *      Name:   OpDone  :LOCAL
- *
- *      Description:    Complete an operatoin done sequence.
- *
- *      Parameters:             padapter - Pointer to host data block.
- *                                      spigot   - Spigot select code.
- *                                      device   - Device byte code.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void OpDone (PADAPTER2220I padapter, ULONG result)
-        {
-        Scsi_Cmnd          *SCpnt = padapter->SCpnt;
-        
-        if ( padapter->reconPhase )
-                {
-                padapter->reconPhase = 0;
-                if ( padapter->SCpnt )
-                        {
-                        Pci2220i_QueueCommand (SCpnt, SCpnt->scsi_done);
-                        }
-                else
-                        {
-                        if ( padapter->reconOn )
-                                {
-                                ReconTimerExpiry ((unsigned long)padapter);
-                                }
-                        }
-                }
-        else
-                {
-                padapter->cmd = 0;
-                padapter->SCpnt = NULL; 
-                padapter->pdev = NULL;
-                SCpnt->result = result;
-                SCpnt->scsi_done (SCpnt);
-                if ( padapter->reconOn && !padapter->reconTimer.data )
-                        {
-                        padapter->reconTimer.expires = jiffies + (HZ / 4);      // start in 1/4 second
-                        padapter->reconTimer.data = (unsigned long)padapter;
-                        add_timer (&padapter->reconTimer);
-                        }
-                }
-        }
-/****************************************************************
- *      Name:   InlineIdentify  :LOCAL
- *
- *      Description:    Do an intline inquiry on a drive.
- *
- *      Parameters:             padapter - Pointer to host data block.
- *                                      spigot   - Spigot select code.
- *                                      device   - Device byte code.
- *
- *      Returns:                Last addressable sector or zero if none.
- *
- ****************************************************************/
-static ULONG InlineIdentify (PADAPTER2220I padapter, UCHAR spigot, UCHAR device)
-        {
-        PIDENTIFY_DATA  pid = (PIDENTIFY_DATA)padapter->kBuffer;
-
-        SelectSpigot (padapter, spigot | SEL_IRQ_OFF);                                  // select the spigot
-        outb_p ((device << 4) | 0xA0, padapter->regLba24);                              // select the drive
-        if ( WaitReady (padapter) )
-                return 0;
-        WriteCommand (padapter, IDE_COMMAND_IDENTIFY);  
-        if ( WaitDrq (padapter) )
-                return 0;
-        insw (padapter->regData, padapter->kBuffer, sizeof (IDENTIFY_DATA) >> 1);
-        return (pid->LBATotalSectors - 1);
-        }
-/****************************************************************
- *      Name:   AtapiIdentify   :LOCAL
- *
- *      Description:    Do an intline inquiry on a drive.
- *
- *      Parameters:             padapter - Pointer to host data block.
- *                                      pdev     - Pointer to device table.
- *
- *      Returns:                TRUE on error.
- *
- ****************************************************************/
-static ULONG AtapiIdentify (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        ATAPI_GENERAL_0         ag0;
-        USHORT                          zs;
-        int                                     z;
-
-        AtapiDevice (padapter, pdev->byte6);    
-        WriteCommand (padapter, IDE_COMMAND_ATAPI_IDENTIFY);    
-        if ( AtapiWaitDrq (padapter, 3000) )
-                return TRUE;
-
-        *(USHORT *)&ag0 = inw_p (padapter->regData);
-        for ( z = 0;  z < 255;  z++ )
-                zs = inw_p (padapter->regData);
-
-        if ( ag0.ProtocolType == 2 )
-                {
-                if ( ag0.CmdDrqType == 1 )
-                        pdev->cmdDrqInt = TRUE;
-                switch ( ag0.CmdPacketSize )
-                        {
-                        case 0:
-                                pdev->packet = 6;
-                                break;
-                        case 1:
-                                pdev->packet = 8;
-                                break;
-                        default:
-                                pdev->packet = 6;
-                                break;
-                        }
-                return FALSE;
-                }
-        return TRUE;
-        }
-/****************************************************************
- *      Name:   Atapi2Scsi
- *
- *      Description:    Convert ATAPI data to SCSI data.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      SCpnt    - Pointer to SCSI command structure.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-void Atapi2Scsi (PADAPTER2220I padapter, Scsi_Cmnd *SCpnt)
-        {
-        UCHAR   *buff = padapter->currentSgBuffer;
- 
-        switch ( SCpnt->cmnd[0] )
-                {
-                case SCSIOP_MODE_SENSE:
-                        buff[0] = padapter->kBuffer[1];
-                        buff[1] = padapter->kBuffer[2];
-                        buff[2] = padapter->kBuffer[3];
-                        buff[3] = padapter->kBuffer[7];
-                        memcpy (&buff[4], &padapter->kBuffer[8], padapter->atapiCdb[8] - 8);
-                        break;
-                case SCSIOP_INQUIRY:
-                        padapter->kBuffer[2] = 2;
-                        memcpy (buff, padapter->kBuffer, padapter->currentSgCount);
-                        break;          
-                default:
-                        if ( padapter->readCount )
-                                WalkScatGath (padapter, TRUE, padapter->readCount);
-                        break;
-                }
-        }
-/****************************************************************
- *      Name:   Scsi2Atapi
- *
- *      Description:    Convert SCSI packet command to Atapi packet command.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      SCpnt    - Pointer to SCSI command structure.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void Scsi2Atapi (PADAPTER2220I padapter, Scsi_Cmnd *SCpnt)
-        {
-        UCHAR   *cdb = SCpnt->cmnd;
-        UCHAR   *buff = padapter->currentSgBuffer;
-
-        switch (cdb[0]) 
-                {
-                case SCSIOP_READ6:
-            padapter->atapiCdb[0] = SCSIOP_READ;
-                        padapter->atapiCdb[1] = cdb[1] & 0xE0;
-            padapter->atapiCdb[3] = cdb[1] & 0x1F;
-                        padapter->atapiCdb[4] = cdb[2];
-                        padapter->atapiCdb[5] = cdb[3];
-                        padapter->atapiCdb[8] = cdb[4];
-                        padapter->atapiCdb[9] = cdb[5];
-                        break;
-                case SCSIOP_WRITE6:
-            padapter->atapiCdb[0] = SCSIOP_WRITE;
-                        padapter->atapiCdb[1] = cdb[1] & 0xE0;
-            padapter->atapiCdb[3] = cdb[1] & 0x1F;
-                        padapter->atapiCdb[4] = cdb[2];
-                        padapter->atapiCdb[5] = cdb[3];
-                        padapter->atapiCdb[8] = cdb[4];
-                        padapter->atapiCdb[9] = cdb[5];
-                        break;
-        case SCSIOP_MODE_SENSE: 
-            padapter->atapiCdb[0] = SCSIOP_MODE_SENSE10;
-                        padapter->atapiCdb[2] = cdb[2];
-                        padapter->atapiCdb[8] = cdb[4] + 4;
-            break;
-
-        case SCSIOP_MODE_SELECT: 
-                        padapter->atapiSpecial = TRUE;
-                        padapter->atapiCdb[0] = SCSIOP_MODE_SELECT10;
-                        padapter->atapiCdb[1] = cdb[1] | 0x10;
-                        memcpy (padapter->kBuffer, buff, 4);
-                        padapter->kBuffer[4] = padapter->kBuffer[5] = 0;
-                        padapter->kBuffer[6] = padapter->kBuffer[7] = 0;
-                        memcpy (&padapter->kBuffer[8], &buff[4], cdb[4] - 4);
-                        padapter->atapiCdb[8] = cdb[4] + 4;
-                        break;
-            }
-        }
-/****************************************************************
- *      Name:   AtapiSendCdb
- *
- *      Description:    Send the CDB packet to the device.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *                                      cdb              - Pointer to 16 byte SCSI cdb.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void AtapiSendCdb (PADAPTER2220I padapter, POUR_DEVICE pdev, CHAR *cdb)
-        {
-        DEB (printk ("\nPCI2242I: CDB: %X %X %X %X %X %X %X %X %X %X %X %X", cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], cdb[9], cdb[10], cdb[11]));
-        outsw (padapter->regData, cdb, pdev->packet);
-        }
-/****************************************************************
- *      Name:   AtapiRequestSense
- *
- *      Description:    Send the CDB packet to the device.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *                                      SCpnt    - Pointer to SCSI command structure.
- *                                      pass     - If true then this is the second pass to send cdb.
- *
- *      Returns:                TRUE on error.
- *
- ****************************************************************/
-static int AtapiRequestSense (PADAPTER2220I padapter, POUR_DEVICE pdev, Scsi_Cmnd *SCpnt, UCHAR pass)
-        {
-        UCHAR   cdb[16] = {SCSIOP_REQUEST_SENSE,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0};                
-        
-        DEB (printk ("\nPCI2242I: AUTO REQUEST SENSE"));
-        cdb[4] = (UCHAR)(sizeof (SCpnt->sense_buffer));
-        if ( !pass )
-                {
-                padapter->reqSense = TRUE;
-                AtapiCountLo (padapter, cdb[4]);                                                
-                AtapiCountHi (padapter, 0);                                             
-                outb_p (0, padapter->regError);                                         
-                WriteCommand (padapter, IDE_COMMAND_ATAPI_PACKET);
-                if ( pdev->cmdDrqInt )
-                        return FALSE;
-
-                if ( AtapiWaitDrq (padapter, 500) )
-                        return TRUE;
-                }
-        AtapiSendCdb (padapter, pdev, cdb);     
-        return FALSE;
-        }
-/****************************************************************
- *      Name:   InlineReadSignature     :LOCAL
- *
- *      Description:    Do an inline read RAID sigature.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to device.
- *                                      index    - index of data to read.
- *
- *      Returns:                Zero if no error or status register contents on error.
- *
- ****************************************************************/
-static UCHAR InlineReadSignature (PADAPTER2220I padapter, POUR_DEVICE pdev, int index)
-        {
-        UCHAR   status;
-        ULONG   zl = pdev->lastsectorlba[index];
-
-        SelectSpigot (padapter, pdev->spigots[index] | SEL_IRQ_OFF);    // select the spigot without interrupts
-        outb_p (pdev->byte6 | ((UCHAR *)&zl)[3], padapter->regLba24);           
-        status = WaitReady (padapter);
-        if ( !status )
-                {
-                outb_p (((UCHAR *)&zl)[2], padapter->regLba16);
-                outb_p (((UCHAR *)&zl)[1], padapter->regLba8); 
-                outb_p (((UCHAR *)&zl)[0], padapter->regLba0);
-                outb_p (1, padapter->regSectCount);
-                WriteCommand (padapter, IDE_COMMAND_READ);
-                status = WaitDrq (padapter);
-                if ( !status )
-                        {
-                        insw (padapter->regData, padapter->kBuffer, BYTES_PER_SECTOR / 2);
-                        ((ULONG *)(&pdev->DiskMirror[index]))[0] = ((ULONG *)(&padapter->kBuffer[DISK_MIRROR_POSITION]))[0];
-                        ((ULONG *)(&pdev->DiskMirror[index]))[1] = ((ULONG *)(&padapter->kBuffer[DISK_MIRROR_POSITION]))[1];
-                        // some drives assert DRQ before IRQ so let's make sure we clear the IRQ
-                        WaitReady (padapter);
-                        return 0;                       
-                        }
-                }
-        return status;
-        }
-/****************************************************************
- *      Name:   DecodeError     :LOCAL
- *
- *      Description:    Decode and process device errors.
- *
- *      Parameters:             padapter - Pointer to adapter data.
- *                                      status - Status register code.
- *
- *      Returns:                The driver status code.
- *
- ****************************************************************/
-static ULONG DecodeError (PADAPTER2220I padapter, UCHAR status)
-        {
-        UCHAR                   error;
-
-        padapter->expectingIRQ = 0;
-        if ( status & IDE_STATUS_WRITE_FAULT )
-                {
-                return DID_PARITY << 16;
-                }
-        if ( status & IDE_STATUS_BUSY )
-                return DID_BUS_BUSY << 16;
-
-        error = inb_p (padapter->regError);
-        DEB(printk ("\npci2220i error register: %x", error));
-        switch ( error )
-                {
-                case IDE_ERROR_AMNF:
-                case IDE_ERROR_TKONF:
-                case IDE_ERROR_ABRT:
-                case IDE_ERROR_IDFN:
-                case IDE_ERROR_UNC:
-                case IDE_ERROR_BBK:
-                default:
-                        return DID_ERROR << 16;
-                }
-        return DID_ERROR << 16;
-        }
-/****************************************************************
- *      Name:   StartTimer      :LOCAL
- *
- *      Description:    Start the timer.
- *
- *      Parameters:             ipadapter - Pointer adapter data structure.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void StartTimer (PADAPTER2220I padapter)
-        {
-        padapter->timer.expires = jiffies + TIMEOUT_DATA;
-        add_timer (&padapter->timer);
-        }
-/****************************************************************
- *      Name:   WriteSignature  :LOCAL
- *
- *      Description:    Start the timer.
- *
- *      Parameters:             padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to our device.
- *                                      spigot   - Selected spigot.
- *                                      index    - index of mirror signature on device.
- *
- *      Returns:                TRUE on any error.
- *
- ****************************************************************/
-static int WriteSignature (PADAPTER2220I padapter, POUR_DEVICE pdev, UCHAR spigot, int index)
-        {
-        ULONG   zl;
-
-        SelectSpigot (padapter, spigot);
-        zl = pdev->lastsectorlba[index];
-        outb_p (pdev->byte6 | ((UCHAR *)&zl)[3], padapter->regLba24);           
-        outb_p (((UCHAR *)&zl)[2], padapter->regLba16);
-        outb_p (((UCHAR *)&zl)[1], padapter->regLba8);
-        outb_p (((UCHAR *)&zl)[0], padapter->regLba0);
-        outb_p (1, padapter->regSectCount);
-
-        WriteCommand (padapter, IDE_COMMAND_WRITE);     
-        if ( WaitDrq (padapter) )
-                return TRUE;
-        StartTimer (padapter);  
-        padapter->expectingIRQ = TRUE;
-        
-        ((ULONG *)(&padapter->kBuffer[DISK_MIRROR_POSITION]))[0] = ((ULONG *)(&pdev->DiskMirror[index]))[0];
-        ((ULONG *)(&padapter->kBuffer[DISK_MIRROR_POSITION]))[1] = ((ULONG *)(&pdev->DiskMirror[index]))[1];
-        outsw (padapter->regData, padapter->kBuffer, BYTES_PER_SECTOR / 2);
-        return FALSE;
-        }
-/*******************************************************************************************************
- *      Name:                   InitFailover
- *
- *      Description:    This is the beginning of the failover routine
- *
- *      Parameters:             SCpnt    - Pointer to SCSI command structure.
- *                                      padapter - Pointer adapter data structure.
- *                                      pdev     - Pointer to our device.
- *      
- *      Returns:                TRUE on error.
- *
- ******************************************************************************************************/
-static int InitFailover (PADAPTER2220I padapter, POUR_DEVICE pdev)
-        {
-        UCHAR   spigot;
-        
-        DEB (printk ("\npci2220i:  Initialize failover process - survivor = %d", pdev->deviceID[padapter->survivor]));
-        pdev->raid = FALSE;                                                                     //initializes system for non raid mode
-        pdev->reconOn = FALSE;
-        spigot = pdev->spigots[padapter->survivor];     
-
-        if ( pdev->DiskMirror[padapter->survivor].status & UCBF_REBUILD )
-                {
-                DEB (printk ("\n         failed, is survivor"));
-                return (TRUE); 
-                }
-
-        if ( HardReset (padapter, pdev, spigot) )
-                {
-                DEB (printk ("\n         failed, reset"));
-                return TRUE;
-                }
-
-        Alarm (padapter, pdev->deviceID[padapter->survivor ^ 1]);
-        pdev->DiskMirror[padapter->survivor].status = UCBF_MIRRORED | UCBF_SURVIVOR;    //clear present status
-        
-        if ( WriteSignature (padapter, pdev, spigot, padapter->survivor) )
-                {
-                DEB (printk ("\n         failed, write signature"));
-                return TRUE;
-                }
-        padapter->failinprog = TRUE;
-        return FALSE;
-        }
-/****************************************************************
- *      Name:   TimerExpiry     :LOCAL
- *
- *      Description:    Timer expiry routine.
- *
- *      Parameters:             data - Pointer adapter data structure.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void TimerExpiry (unsigned long data)
-        {
-        PADAPTER2220I   padapter = (PADAPTER2220I)data;
-        struct Scsi_Host *host = padapter->SCpnt->device->host;
-        POUR_DEVICE             pdev = padapter->pdev;
-        UCHAR                   status = IDE_STATUS_BUSY;
-        UCHAR                   temp, temp1;
-    unsigned long               flags;
-
-    /*
-     * Disable interrupts, if they aren't already disabled and acquire
-     * the I/O spinlock.
-     */
-    spin_lock_irqsave (host->host_lock, flags);
-        DEB (printk ("\nPCI2220I: Timeout expired "));
-
-        if ( padapter->failinprog )
-                {
-                DEB (printk ("in failover process"));
-                OpDone (padapter, DecodeError (padapter, inb_p (padapter->regStatCmd)));
-                goto timerExpiryDone;
-                }
-        
-        while ( padapter->reconPhase )
-                {
-                DEB (printk ("in recon phase %X", padapter->reconPhase));
-                switch ( padapter->reconPhase )
-                        {
-                        case RECON_PHASE_MARKING:
-                        case RECON_PHASE_LAST:
-                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 1 : 0;
-                                DEB (printk ("\npci2220i: FAILURE 1"));
-                                if ( InitFailover (padapter, pdev) )
-                                        OpDone (padapter, DID_ERROR << 16);
-                                goto timerExpiryDone;
-                        
-                        case RECON_PHASE_READY:
-                                OpDone (padapter, DID_ERROR << 16);
-                                goto timerExpiryDone;
-
-                        case RECON_PHASE_COPY:
-                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                DEB (printk ("\npci2220i: FAILURE 2"));
-                                DEB (printk ("\n       spig/stat = %X", inb_p (padapter->regStatSel));
-                                if ( InitFailover (padapter, pdev) )
-                                        OpDone (padapter, DID_ERROR << 16);
-                                goto timerExpiryDone;
-
-                        case RECON_PHASE_UPDATE:
-                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                DEB (printk ("\npci2220i: FAILURE 3")));
-                                if ( InitFailover (padapter, pdev) )
-                                        OpDone (padapter, DID_ERROR << 16);
-                                goto timerExpiryDone;
-
-                        case RECON_PHASE_END:
-                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                DEB (printk ("\npci2220i: FAILURE 4"));
-                                if ( InitFailover (padapter, pdev) )
-                                        OpDone (padapter, DID_ERROR << 16);
-                                goto timerExpiryDone;
-                        
-                        default:
-                                goto timerExpiryDone;
-                        }
-                }
-        
-        while ( padapter->cmd )
-                {
-                outb_p (0x08, padapter->regDmaCmdStat);                                 // cancel interrupt from DMA engine
-                if ( pdev->raid )
-                        {
-                        if ( padapter->cmd == WRITE_CMD )
-                                {
-                                DEB (printk ("in RAID write operation"));
-                                temp = ( pdev->spigot & (SEL_1 | SEL_2) ) ? SEL_1 : SEL_3;
-                                if ( inb_p (padapter->regStatSel) & temp )
-                                        {
-                                        DEB (printk ("\npci2220i: Determined A OK"));
-                                        SelectSpigot (padapter, temp | SEL_IRQ_OFF); // Masking the interrupt during spigot select
-                                        temp = inb_p (padapter->regStatCmd);
-                                        }
-                                else
-                                        temp = IDE_STATUS_BUSY;
-
-                                temp1 = ( pdev->spigot & (SEL_1 | SEL_2) ) ? SEL_2 : SEL_4;
-                                if ( inb (padapter->regStatSel) & temp1 )
-                                        {
-                                        DEB (printk ("\npci2220i: Determined B OK"));
-                                        SelectSpigot (padapter, temp1 | SEL_IRQ_OFF); // Masking the interrupt during spigot select
-                                        temp1 = inb_p (padapter->regStatCmd);
-                                        }
-                                else
-                                        temp1 = IDE_STATUS_BUSY;
-                        
-                                if ( (temp & IDE_STATUS_BUSY) || (temp1 & IDE_STATUS_BUSY) )
-                                        {
-                                        DEB (printk ("\npci2220i: Status A: %X   B: %X", temp & 0xFF, temp1 & 0xFF));
-                                        if ( (temp & IDE_STATUS_BUSY) && (temp1 & IDE_STATUS_BUSY) ) 
-                                                {
-                                                status = temp;
-                                                break;
-                                                }               
-                                        else    
-                                                {
-                                                if ( temp & IDE_STATUS_BUSY )
-                                                        padapter->survivor = 1;
-                                                else
-                                                        padapter->survivor = 0;
-                                                if ( InitFailover (padapter, pdev) )
-                                                        {
-                                                        status = inb_p (padapter->regStatCmd);
-                                                        break;
-                                                        }
-                                                goto timerExpiryDone;
-                                                }
-                                        }
-                                }
-                        else
-                                {
-                                DEB (printk ("in RAID read operation"));
-                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                DEB (printk ("\npci2220i: FAILURE 6"));
-                                if ( InitFailover (padapter, pdev) )
-                                        {
-                                        status = inb_p (padapter->regStatCmd);
-                                        break;
-                                        }
-                                goto timerExpiryDone;
-                                }
-                        }
-                else
-                        {
-                        DEB (printk ("in I/O operation"));
-                        status = inb_p (padapter->regStatCmd);
-                        }
-                break;
-                }
-        
-        OpDone (padapter, DecodeError (padapter, status));
-
-timerExpiryDone:;
-    /*
-     * Release the I/O spinlock and restore the original flags
-     * which will enable interrupts if and only if they were
-     * enabled on entry.
-     */
-    spin_unlock_irqrestore (host->host_lock, flags);
-        }
-/****************************************************************
- *      Name:                   SetReconstruct  :LOCAL
- *
- *      Description:    Set the reconstruct up.
- *
- *      Parameters:             pdev    - Pointer to device structure.
- *                                      index   - Mirror index number.
- *
- *      Returns:                Number of sectors on new disk required.
- *
- ****************************************************************/
-static LONG SetReconstruct (POUR_DEVICE pdev, int index)
-        {
-        pdev->DiskMirror[index].status = UCBF_MIRRORED;                                                 // setup the flags
-        pdev->DiskMirror[index ^ 1].status = UCBF_MIRRORED | UCBF_REBUILD;
-        pdev->DiskMirror[index ^ 1].reconstructPoint = 0;                                               // start the reconstruct
-        pdev->reconCount = 1990;                                                                                                // mark target drive early
-        return pdev->DiskMirror[index].reconstructPoint;
-        }
-/****************************************************************
- *      Name:   ReconTimerExpiry        :LOCAL
- *
- *      Description:    Reconstruct timer expiry routine.
- *
- *      Parameters:             data - Pointer adapter data structure.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static void ReconTimerExpiry (unsigned long data)
-        {
-        PADAPTER2220I   padapter = (PADAPTER2220I)data;
-        struct Scsi_Host *host = padapter->SCpnt->device->host;
-        POUR_DEVICE             pdev;
-        ULONG                   testsize = 0;
-        PIDENTIFY_DATA  pid;
-        USHORT                  minmode;
-        ULONG                   zl;
-        UCHAR                   zc;
-        USHORT                  z;
-    unsigned long       flags;
-
-    /*
-     * Disable interrupts, if they aren't already disabled and acquire
-     * the I/O spinlock.
-     */
-    spin_lock_irqsave(host->host_lock, flags);
-
-        if ( padapter->SCpnt )
-                goto reconTimerExpiry;
-
-        padapter->reconTimer.data = 0;
-        for ( z = padapter->devInReconIndex + 1;  z < BIGD_MAXDRIVES;  z++ )
-                {
-                if ( padapter->device[z].reconOn )
-                        break;
-                }
-        if ( z < BIGD_MAXDRIVES )
-                pdev = &padapter->device[z];
-        else
-                {
-                for ( z = 0;  z < BIGD_MAXDRIVES;  z++ )
-                        {
-                        if ( padapter->device[z].reconOn )
-                                break;
-                        }
-                if ( z < BIGD_MAXDRIVES )
-                        pdev = &padapter->device[z];
-                else
-                        {
-                        padapter->reconOn = FALSE;
-                        goto reconTimerExpiry;
-                        }
-                }
-
-        padapter->devInReconIndex = z;
-        pid = (PIDENTIFY_DATA)padapter->kBuffer;
-        padapter->pdev = pdev;
-        if ( pdev->reconIsStarting )
-                {
-                pdev->reconIsStarting = FALSE;
-                pdev->reconOn = FALSE;
-
-                while ( (pdev->DiskMirror[0].signature == SIGNATURE) && (pdev->DiskMirror[1].signature == SIGNATURE) &&
-                         (pdev->DiskMirror[0].pairIdentifier == (pdev->DiskMirror[1].pairIdentifier ^ 1)) )
-                        {
-                        if ( (pdev->DiskMirror[0].status & UCBF_MATCHED) && (pdev->DiskMirror[1].status & UCBF_MATCHED) )
-                                break;
-
-                        if ( pdev->DiskMirror[0].status & UCBF_SURVIVOR )                               // is first drive survivor?
-                                testsize = SetReconstruct (pdev, 0);
-                        else
-                                if ( pdev->DiskMirror[1].status & UCBF_SURVIVOR )                       // is second drive survivor?
-                                        testsize = SetReconstruct (pdev, 1);
-
-                        if ( (pdev->DiskMirror[0].status & UCBF_REBUILD) || (pdev->DiskMirror[1].status & UCBF_REBUILD) )
-                                {
-                                if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                                        pdev->mirrorRecon = 0;
-                                else
-                                        pdev->mirrorRecon = 1;
-                                pdev->reconOn = TRUE;
-                                }
-                        break;
-                        }
-
-                if ( !pdev->reconOn )
-                        goto reconTimerExpiry;
-
-                if ( padapter->bigD )
-                        {
-                        padapter->failRegister = 0;
-                        outb_p (~padapter->failRegister, padapter->regFail);
-                        }
-                else
-                        {
-                        zc = ((inb_p (padapter->regStatSel) >> 3) | inb_p (padapter->regStatSel)) & 0x83;               // mute the alarm
-                        outb_p (0xFF, padapter->regFail);
-                        }
-
-                while ( 1 )
-                        {
-                        DEB (printk ("\npci2220i: hard reset issue"));
-                        if ( HardReset (padapter, pdev, pdev->spigots[pdev->mirrorRecon]) )
-                                {
-                                DEB (printk ("\npci2220i: sub 1"));
-                                break;
-                                }
-
-                        pdev->lastsectorlba[pdev->mirrorRecon] = InlineIdentify (padapter, pdev->spigots[pdev->mirrorRecon], pdev->deviceID[pdev->mirrorRecon] & 1);
-
-                        if ( pdev->lastsectorlba[pdev->mirrorRecon] < testsize )
-                                {
-                                DEB (printk ("\npci2220i: sub 2 %ld %ld", pdev->lastsectorlba[pdev->mirrorRecon], testsize));
-                                break;
-                                }
-
-                // test LBA and multiper sector transfer compatibility
-                        if (!pid->SupportLBA || (pid->NumSectorsPerInt < SECTORSXFER) || !pid->Valid_64_70 )
-                                {
-                                DEB (printk ("\npci2220i: sub 3"));
-                                break;
-                                }
-
-                // test PIO/bus matering mode compatibility
-                        if ( (pid->MinPIOCycleWithoutFlow > 240) && !pid->SupportIORDYDisable && !padapter->timingPIO )
-                                {
-                                DEB (printk ("\npci2220i: sub 4"));
-                                break;
-                                }
-
-                        if ( pid->MinPIOCycleWithoutFlow <= 120 )       // setup timing mode of drive
-                                minmode = 5;
-                        else
-                                {
-                                if ( pid->MinPIOCylceWithFlow <= 150 )
-                                        minmode = 4;
-                                else
-                                        {
-                                        if ( pid->MinPIOCylceWithFlow <= 180 )
-                                                minmode = 3;
-                                        else
-                                                {
-                                                if ( pid->MinPIOCylceWithFlow <= 240 )
-                                                        minmode = 2;
-                                                else
-                                                        {
-                                                        DEB (printk ("\npci2220i: sub 5"));
-                                                        break;
-                                                        }
-                                                }
-                                        }
-                                }
-
-                        if ( padapter->timingMode > minmode )                                                                   // set minimum timing mode
-                                padapter->timingMode = minmode;
-                        if ( padapter->timingMode >= 2 )
-                                padapter->timingAddress = ModeArray[padapter->timingMode - 2];
-                        else
-                                padapter->timingPIO = TRUE;
-
-                        padapter->reconOn = TRUE;
-                        break;
-                        }
-
-                if ( !pdev->reconOn )
-                        {               
-                        padapter->survivor = pdev->mirrorRecon ^ 1;
-                        padapter->reconPhase = RECON_PHASE_FAILOVER;
-                        DEB (printk ("\npci2220i: FAILURE 7"));
-                        InitFailover (padapter, pdev);
-                        goto reconTimerExpiry;
-                        }
-
-                pdev->raid = TRUE;
-        
-                if ( WriteSignature (padapter, pdev, pdev->spigot, pdev->mirrorRecon ^ 1) )
-                        goto reconTimerExpiry;
-                padapter->reconPhase = RECON_PHASE_MARKING;
-                goto reconTimerExpiry;
-                }
-
-        //**********************************
-        // reconstruct copy starts here 
-        //**********************************
-        if ( pdev->reconCount++ > 2000 )
-                {
-                pdev->reconCount = 0;
-                if ( WriteSignature (padapter, pdev, pdev->spigots[pdev->mirrorRecon], pdev->mirrorRecon) )
-                        {
-                        padapter->survivor = pdev->mirrorRecon ^ 1;
-                        padapter->reconPhase = RECON_PHASE_FAILOVER;
-                        DEB (printk ("\npci2220i: FAILURE 8"));
-                        InitFailover (padapter, pdev);
-                        goto reconTimerExpiry;
-                        }
-                padapter->reconPhase = RECON_PHASE_UPDATE;
-                goto reconTimerExpiry;
-                }
-
-        zl = pdev->DiskMirror[pdev->mirrorRecon].reconstructPoint;      
-        padapter->reconSize = pdev->DiskMirror[pdev->mirrorRecon ^ 1].reconstructPoint - zl;
-        if ( padapter->reconSize > MAX_BUS_MASTER_BLOCKS )
-                padapter->reconSize = MAX_BUS_MASTER_BLOCKS;
-
-        if ( padapter->reconSize )
-                {
-                SelectSpigot (padapter, pdev->spigots[0] | pdev->spigots[1]);   // select the spigots
-                outb_p (pdev->byte6 | ((UCHAR *)(&zl))[3], padapter->regLba24); // select the drive
-                SelectSpigot (padapter, pdev->spigot);
-                if ( WaitReady (padapter) )
-                        goto reconTimerExpiry;
-
-                SelectSpigot (padapter, pdev->spigots[pdev->mirrorRecon]);
-                if ( WaitReady (padapter) )
-                        {
-                        padapter->survivor = pdev->mirrorRecon ^ 1;
-                        padapter->reconPhase = RECON_PHASE_FAILOVER;
-                        DEB (printk ("\npci2220i: FAILURE 9"));
-                        InitFailover (padapter, pdev);
-                        goto reconTimerExpiry;
-                        }
-        
-                SelectSpigot (padapter, pdev->spigots[0] | pdev->spigots[1]);
-                outb_p (padapter->reconSize & 0xFF, padapter->regSectCount);
-                outb_p (((UCHAR *)(&zl))[0], padapter->regLba0);
-                outb_p (((UCHAR *)(&zl))[1], padapter->regLba8);
-                outb_p (((UCHAR *)(&zl))[2], padapter->regLba16);
-                padapter->expectingIRQ = TRUE;
-                padapter->reconPhase = RECON_PHASE_READY;
-                SelectSpigot (padapter, pdev->spigots[pdev->mirrorRecon]);
-                WriteCommand (padapter, WRITE_CMD);
-                StartTimer (padapter);
-                SelectSpigot (padapter, pdev->spigot);
-                WriteCommand (padapter, READ_CMD);
-                goto reconTimerExpiry;
-                }
-
-        pdev->DiskMirror[pdev->mirrorRecon].status = UCBF_MIRRORED | UCBF_MATCHED;
-        pdev->DiskMirror[pdev->mirrorRecon ^ 1].status = UCBF_MIRRORED | UCBF_MATCHED;
-        if ( WriteSignature (padapter, pdev, pdev->spigot, pdev->mirrorRecon ^ 1) )
-                goto reconTimerExpiry;
-        padapter->reconPhase = RECON_PHASE_LAST;
-
-reconTimerExpiry:;
-    /*
-     * Release the I/O spinlock and restore the original flags
-     * which will enable interrupts if and only if they were
-     * enabled on entry.
-     */
-    spin_unlock_irqrestore(host->host_lock, flags);
-        }
-/****************************************************************
- *      Name:   Irq_Handler     :LOCAL
- *
- *      Description:    Interrupt handler.
- *
- *      Parameters:             irq             - Hardware IRQ number.
- *                                      dev_id  -
- *                                      regs    -
- *
- *      Returns:                TRUE if drive is not ready in time.
- *
- ****************************************************************/
-static irqreturn_t Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
-        {
-        struct Scsi_Host   *shost = NULL;       // Pointer to host data block
-        PADAPTER2220I           padapter;               // Pointer to adapter control structure
-        POUR_DEVICE                     pdev;
-        Scsi_Cmnd                  *SCpnt;
-        UCHAR                           status;
-        UCHAR                           status1;
-        ATAPI_STATUS            statusa;
-        ATAPI_REASON            reasona;
-        ATAPI_ERROR                     errora;
-        int                                     z;
-        ULONG                           zl;
-    unsigned long               flags;
-    int handled = 0;
-
-//      DEB (printk ("\npci2220i received interrupt\n"));
-
-        for ( z = 0; z < NumAdapters;  z++ )                                                            // scan for interrupt to process
-                {
-                if ( PsiHost[z]->irq == (UCHAR)(irq & 0xFF) )
-                        {
-                        if ( inw_p (HOSTDATA(PsiHost[z])->regIrqControl) & 0x8000 )
-                                {
-                                shost = PsiHost[z];
-                                break;
-                                }
-                        }
-                }
-
-        if ( !shost )
-                {
-                DEB (printk ("\npci2220i: not my interrupt"));
-                goto out;
-                }
-
-        handled = 1;
-        spin_lock_irqsave(shost->host_lock, flags);
-        padapter = HOSTDATA(shost);
-        pdev = padapter->pdev;
-        SCpnt = padapter->SCpnt;
-        outb_p (0x08, padapter->regDmaCmdStat);                                                                 // cancel interrupt from DMA engine
-
-        if ( padapter->atapi && SCpnt )
-                {
-                *(char *)&statusa = inb_p (padapter->regStatCmd);                                               // read the device status
-                *(char *)&reasona = inb_p (padapter->regSectCount);                                             // read the device interrupt reason
-        
-                if ( !statusa.bsy )
-                        {
-                        if ( statusa.drq )                                                                                                      // test for transfer phase
-                                {
-                                if ( !reasona.cod )                                                                                             // test for data phase
-                                        {
-                                        z = (ULONG)inb_p (padapter->regLba8) | (ULONG)(inb_p (padapter->regLba16) << 8);
-                                        if ( padapter->reqSense )
-                                                insw (padapter->regData, SCpnt->sense_buffer, z / 2);
-                                        else
-                                                AtapiBusMaster (padapter, reasona.io, z);
-                                        goto irq_return;
-                                        }
-                                if ( reasona.cod && !reasona.io )                                                               // test for command packet phase
-                                        {
-                                        if ( padapter->reqSense )
-                                                AtapiRequestSense (padapter, pdev, SCpnt, TRUE);
-                                        else
-                                                AtapiSendCdb (padapter, pdev, padapter->atapiCdb);
-                                        goto irq_return;
-                                        }
-                                }
-                        else
-                                {
-                                if ( reasona.io && statusa.drdy )                                                               // test for status phase
-                                        {
-                                        Atapi2Scsi (padapter, SCpnt);
-                                        if ( statusa.check )
-                                                {
-                                                *(UCHAR *)&errora = inb_p (padapter->regError);                 // read the device error
-                                                if ( errora.senseKey )
-                                                        {
-                                                        if ( padapter->reqSense || AtapiRequestSense (padapter, pdev, SCpnt, FALSE) )
-                                                                OpDone (padapter, DID_ERROR << 16);
-                                                        }
-                                                else
-                                                        {
-                                                        if ( errora.ili || errora.abort )
-                                                                OpDone (padapter, DID_ERROR << 16);
-                                                        else
-                                                                OpDone (padapter, DID_OK << 16);        
-                                                        }
-                                                }
-                                        else
-                                                if ( padapter->reqSense )
-                                                        {
-                                                        DEB (printk ("PCI2242I: Sense codes - %X %X %X ", ((UCHAR *)SCpnt->sense_buffer)[0], ((UCHAR *)SCpnt->sense_buffer)[12], ((UCHAR *)SCpnt->sense_buffer)[13]));
-                                                        OpDone (padapter, (DRIVER_SENSE << 24) | (DID_OK << 16) | 2);
-                                                        }
-                                                else
-                                                        OpDone (padapter, DID_OK << 16);        
-                                        }
-                                }
-                        }               
-                goto irq_return;
-                }
-        
-        if ( !padapter->expectingIRQ || !(SCpnt || padapter->reconPhase) )
-                {
-                DEB(printk ("\npci2220i Unsolicited interrupt\n"));
-                STOP_HERE ();
-                goto irq_return;
-                }
-        padapter->expectingIRQ = 0;
-
-        if ( padapter->failinprog )
-                {
-                DEB (printk ("\npci2220i interrupt failover complete"));
-                padapter->failinprog = FALSE;
-                status = inb_p (padapter->regStatCmd);                                                          // read the device status
-                if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                        {
-                        DEB (printk ("\npci2220i: interrupt failover error from drive %X", status));
-                        padapter->cmd = 0;
-                        }
-                else
-                        {
-                        DEB (printk ("\npci2220i: restarting failed opertation."));
-                        pdev->spigot = (padapter->survivor) ? pdev->spigots[1] : pdev->spigots[0];
-                        del_timer (&padapter->timer);
-                        if ( padapter->reconPhase )
-                                OpDone (padapter, DID_OK << 16);
-                        else
-                                Pci2220i_QueueCommand (SCpnt, SCpnt->scsi_done);
-                        goto irq_return;                
-                        }
-                }
-
-        if ( padapter->reconPhase )
-                {
-                switch ( padapter->reconPhase )
-                        {
-                        case RECON_PHASE_MARKING:
-                        case RECON_PHASE_LAST:
-                                status = inb_p (padapter->regStatCmd);                                          // read the device status
-                                del_timer (&padapter->timer);
-                                if ( padapter->reconPhase == RECON_PHASE_LAST )
-                                        {
-                                        if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                                {
-                                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 1 : 0;
-                                                DEB (printk ("\npci2220i: FAILURE 10"));
-                                                if ( InitFailover (padapter, pdev) )
-                                                        OpDone (padapter, DecodeError (padapter, status));
-                                                goto irq_return;
-                                                }
-                                        if ( WriteSignature (padapter, pdev, pdev->spigots[pdev->mirrorRecon], pdev->mirrorRecon) )
-                                                {
-                                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                                DEB (printk ("\npci2220i: FAILURE 11"));
-                                                if ( InitFailover (padapter, pdev) )
-                                                        OpDone (padapter, DecodeError (padapter, status));
-                                                goto irq_return;
-                                                }
-                                        padapter->reconPhase = RECON_PHASE_END; 
-                                        goto irq_return;
-                                        }
-                                OpDone (padapter, DID_OK << 16);
-                                goto irq_return;
-
-                        case RECON_PHASE_READY:
-                                status = inb_p (padapter->regStatCmd);                                          // read the device status
-                                if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                        {
-                                        del_timer (&padapter->timer);
-                                        OpDone (padapter, DecodeError (padapter, status));
-                                        goto irq_return;
-                                        }
-                                SelectSpigot (padapter, pdev->spigots[pdev->mirrorRecon]);
-                                if ( WaitDrq (padapter) )
-                                        {
-                                        del_timer (&padapter->timer);
-                                        padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                        DEB (printk ("\npci2220i: FAILURE 12"));
-                                        if ( InitFailover (padapter, pdev) )
-                                                OpDone (padapter, DecodeError (padapter, status));
-                                        goto irq_return;
-                                        }
-                                SelectSpigot (padapter, pdev->spigot | SEL_COPY | padapter->bigD);
-                                padapter->reconPhase = RECON_PHASE_COPY;
-                                padapter->expectingIRQ = TRUE;
-                                if ( padapter->timingPIO )
-                                        {
-                                        insw (padapter->regData, padapter->kBuffer, padapter->reconSize * (BYTES_PER_SECTOR / 2));
-                                        }
-                                else
-                                        {
-                                        if ( (padapter->timingMode > 3) )
-                                                {
-                                                if ( padapter->bigD )
-                                                        outl (BIGD_DATA_MODE3, padapter->regDmaAddrLoc);
-                                                else
-                                                        outl (DALE_DATA_MODE3, padapter->regDmaAddrLoc);
-                                                }
-                                        else
-                                                outl (padapter->timingAddress, padapter->regDmaAddrLoc);
-                                        outl (padapter->kBufferDma, padapter->regDmaAddrPci);
-                                        outl (padapter->reconSize * BYTES_PER_SECTOR, padapter->regDmaCount);
-                                        outb_p (8, padapter->regDmaDesc);                                               // read operation
-                                        if ( padapter->bigD )
-                                                outb_p (8, padapter->regDmaMode);                                       // no interrupt
-                                        else
-                                                outb_p (1, padapter->regDmaMode);                                       // no interrupt
-                                        outb_p (0x03, padapter->regDmaCmdStat);                                 // kick the DMA engine in gear
-                                        }
-                                goto irq_return;
-
-                        case RECON_PHASE_COPY:
-                                pdev->DiskMirror[pdev->mirrorRecon].reconstructPoint += padapter->reconSize;
-
-                        case RECON_PHASE_UPDATE:
-                                SelectSpigot (padapter, pdev->spigots[pdev->mirrorRecon] | SEL_IRQ_OFF);
-                                status = inb_p (padapter->regStatCmd);                                          // read the device status
-                                del_timer (&padapter->timer);
-                                if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                        {
-                                        padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                        DEB (printk ("\npci2220i: FAILURE 13"));
-                                        DEB (printk ("\n  status register = %X   error = %X", status, inb_p (padapter->regError)));
-                                        if ( InitFailover (padapter, pdev) )
-                                                OpDone (padapter, DecodeError (padapter, status));
-                                        goto irq_return;
-                                        }
-                                OpDone (padapter, DID_OK << 16);
-                                goto irq_return;
-
-                        case RECON_PHASE_END:
-                                status = inb_p (padapter->regStatCmd);                                          // read the device status
-                                del_timer (&padapter->timer);
-                                if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                        {
-                                        padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 0 : 1;
-                                        DEB (printk ("\npci2220i: FAILURE 14"));
-                                        if ( InitFailover (padapter, pdev) )
-                                                OpDone (padapter, DecodeError (padapter, status));
-                                        goto irq_return;
-                                        }
-                                pdev->reconOn = 0;
-                                if ( padapter->bigD )
-                                        {
-                                        for ( z = 0;  z < padapter->numberOfDrives;  z++ )
-                                                {
-                                                if ( padapter->device[z].DiskMirror[0].status & UCBF_SURVIVOR )
-                                                        {
-                                                        Alarm (padapter, padapter->device[z].deviceID[0] ^ 2);
-                                                        MuteAlarm (padapter);
-                                                        }
-                                                if ( padapter->device[z].DiskMirror[1].status & UCBF_SURVIVOR )
-                                                        {
-                                                        Alarm (padapter, padapter->device[z].deviceID[1] ^ 2);
-                                                        MuteAlarm (padapter);
-                                                        }
-                                                }
-                                        }
-                                OpDone (padapter, DID_OK << 16);
-                                goto irq_return;
-
-                        default:
-                                goto irq_return;
-                        }
-                }
-                
-        switch ( padapter->cmd )                                                                                                // decide how to handle the interrupt
-                {
-                case READ_CMD:
-                        if ( padapter->sectorCount )
-                                {
-                                status = inb_p (padapter->regStatCmd);                                          // read the device status
-                                if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                        {
-                                        if ( pdev->raid )
-                                                {
-                                                padapter->survivor = ( pdev->spigot == pdev->spigots[0] ) ? 1 : 0;
-                                                del_timer (&padapter->timer);
-                                                DEB (printk ("\npci2220i: FAILURE 15"));
-                                                if ( !InitFailover (padapter, pdev) )
-                                                        goto irq_return;
-                                                }
-                                        break;  
-                                        }
-                                if ( padapter->timingPIO )
-                                        {
-                                        insw (padapter->regData, padapter->kBuffer, padapter->readCount / 2);
-                                        padapter->sectorCount -= padapter->readCount / BYTES_PER_SECTOR;
-                                        WalkScatGath (padapter, TRUE, padapter->readCount);
-                                        if ( !padapter->sectorCount )
-                                                {
-                                                status = 0;
-                                                break;
-                                                }
-                                        }
-                                else
-                                        {
-                                        if ( padapter->readCount )
-                                                WalkScatGath (padapter, TRUE, padapter->readCount);
-                                        BusMaster (padapter, 1, 1);
-                                        }
-                                padapter->expectingIRQ = TRUE;
-                                goto irq_return;
-                                }
-                        if ( padapter->readCount && !padapter->timingPIO )
-                                WalkScatGath (padapter, TRUE, padapter->readCount);
-                        status = 0;
-                        break;
-
-                case WRITE_CMD:
-                        if ( pdev->raid )
-                                {
-                                SelectSpigot (padapter, pdev->spigots[0] | SEL_IRQ_OFF);                                
-                                status = inb_p (padapter->regStatCmd);                                                          // read the device status
-                                SelectSpigot (padapter, pdev->spigots[1] | SEL_IRQ_OFF);                                
-                                status1 = inb_p (padapter->regStatCmd);                                                         // read the device status
-                                }
-                        else
-                                SelectSpigot (padapter, pdev->spigot | SEL_IRQ_OFF);                            
-                                status = inb_p (padapter->regStatCmd);                                                          // read the device status
-                                status1 = 0;
-                
-                        if ( status & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                {       
-                                if ( pdev->raid && !(status1 & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT)) )
-                                        {
-                                        padapter->survivor = 1;
-                                        del_timer (&padapter->timer);
-                                        SelectSpigot (padapter, pdev->spigot | SEL_IRQ_OFF);
-                                        DEB (printk ("\npci2220i: FAILURE 16  status = %X  error = %X", status, inb_p (padapter->regError)));
-                                        if ( !InitFailover (padapter, pdev) )
-                                                goto irq_return;
-                                        }
-                                break;
-                                }
-                        if ( pdev->raid )
-                                {
-                                if ( status1 & (IDE_STATUS_ERROR | IDE_STATUS_WRITE_FAULT) )
-                                        {       
-                                        padapter->survivor = 0;
-                                        del_timer (&padapter->timer);
-                                        DEB (printk ("\npci2220i: FAILURE 17  status = %X  error = %X", status1, inb_p (padapter->regError)));
-                                        if ( !InitFailover (padapter, pdev) )
-                                                goto irq_return;
-                                        status = status1;
-                                        break;
-                                        }
-                                if ( padapter->sectorCount )
-                                        {
-                                        status = WriteDataBoth (padapter, pdev);
-                                        if ( status )
-                                                {
-                                                padapter->survivor = status >> 1;
-                                                del_timer (&padapter->timer);
-                                                DEB (printk ("\npci2220i: FAILURE 18"));
-                                                if ( !InitFailover (padapter, pdev) )
-                                                        goto irq_return;
-                                                SelectSpigot (padapter, pdev->spigots[status] | SEL_IRQ_OFF);                           
-                                                status = inb_p (padapter->regStatCmd);                                                          // read the device status
-                                                break;
-                                                }
-                                        padapter->expectingIRQ = TRUE;
-                                        goto irq_return;
-                                        }
-                                status = 0;
-                                break;
-                                }
-                        if ( padapter->sectorCount )    
-                                {       
-                                SelectSpigot (padapter, pdev->spigot | padapter->bigD);
-                                status = WriteData (padapter);
-                                if ( status )
-                                        break;
-                                padapter->expectingIRQ = TRUE;
-                                goto irq_return;
-                                }
-                        status = 0;
-                        break;
-
-                case IDE_COMMAND_IDENTIFY:
-                        {
-                        PINQUIRYDATA    pinquiryData  = SCpnt->request_buffer;
-                        PIDENTIFY_DATA  pid = (PIDENTIFY_DATA)padapter->kBuffer;
-
-                        status = inb_p (padapter->regStatCmd);
-                        if ( status & IDE_STATUS_DRQ )
-                                {
-                                insw (padapter->regData, pid, sizeof (IDENTIFY_DATA) >> 1);
-
-                                memset (pinquiryData, 0, SCpnt->request_bufflen);               // Zero INQUIRY data structure.
-                                pinquiryData->DeviceType = 0;
-                                pinquiryData->Versions = 2;
-                                pinquiryData->AdditionalLength = 35 - 4;
-
-                                // Fill in vendor identification fields.
-                                for ( z = 0;  z < 20;  z += 2 )
-                                        {
-                                        pinquiryData->VendorId[z]         = ((UCHAR *)pid->ModelNumber)[z + 1];
-                                        pinquiryData->VendorId[z + 1] = ((UCHAR *)pid->ModelNumber)[z];
-                                        }
-
-                                // Initialize unused portion of product id.
-                                for ( z = 0;  z < 4;  z++ )
-                                        pinquiryData->ProductId[12 + z] = ' ';
-
-                                // Move firmware revision from IDENTIFY data to
-                                // product revision in INQUIRY data.
-                                for ( z = 0;  z < 4;  z += 2 )
-                                        {
-                                        pinquiryData->ProductRevisionLevel[z]    = ((UCHAR *)pid->FirmwareRevision)[z + 1];
-                                        pinquiryData->ProductRevisionLevel[z + 1] = ((UCHAR *)pid->FirmwareRevision)[z];
-                                        }
-                                if ( pdev == padapter->device )
-                                        *((USHORT *)(&pinquiryData->VendorSpecific)) = DEVICE_DALE_1;
-                                
-                                status = 0;
-                                }
-                        break;
-                        }
-
-                default:
-                        status = 0;
-                        break;
-                }
-
-        del_timer (&padapter->timer);
-        if ( status )
-                {
-                DEB (printk ("\npci2220i Interrupt handler return error"));
-                zl = DecodeError (padapter, status);
-                }
-        else
-                zl = DID_OK << 16;
-
-        OpDone (padapter, zl);
-irq_return:
-    spin_unlock_irqrestore(shost->host_lock, flags);
-out:
-        return IRQ_RETVAL(handled);
-}
-
-/****************************************************************
- *      Name:   Pci2220i_QueueCommand
- *
- *      Description:    Process a queued command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *                                      done  - Pointer to done function to call.
- *
- *      Returns:                Status code.
- *
- ****************************************************************/
-int Pci2220i_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
-        {
-        UCHAR              *cdb = (UCHAR *)SCpnt->cmnd;                                 // Pointer to SCSI CDB
-        PADAPTER2220I   padapter = HOSTDATA(SCpnt->device->host);                       // Pointer to adapter control structure
-        POUR_DEVICE             pdev     = &padapter->device[SCpnt->device->id];// Pointer to device information
-        UCHAR                   rc;                                                                                     // command return code
-        int                             z; 
-        PDEVICE_RAID1   pdr;
-
-        SCpnt->scsi_done = done;
-        padapter->SCpnt = SCpnt;                                                                        // Save this command data
-        padapter->readCount = 0;
-
-        if ( SCpnt->use_sg )
-                {
-                padapter->currentSgBuffer = ((struct scatterlist *)SCpnt->request_buffer)[0].address;
-                padapter->currentSgCount = ((struct scatterlist *)SCpnt->request_buffer)[0].length;
-                }
-        else
-                {
-                padapter->currentSgBuffer = SCpnt->request_buffer;
-                padapter->currentSgCount = SCpnt->request_bufflen;
-                }
-        padapter->nextSg = 1;
-
-        if ( !done )
-                {
-                printk("pci2220i_queuecommand: %02X: done can't be NULL\n", *cdb);
-                return 0;
-                }
-        
-        if ( padapter->atapi )
-                {
-                UCHAR                   zlo, zhi;
-
-                DEB (printk ("\nPCI2242I: ID %d, LUN %d opcode %X ", SCpnt->device->id, SCpnt->device->lun, *cdb));
-                padapter->pdev = pdev;
-                if ( !pdev->byte6 || SCpnt->device->lun )
-                        {
-                        OpDone (padapter, DID_BAD_TARGET << 16);
-                        return 0;
-                        }
-        
-                padapter->atapiSpecial = FALSE;
-                padapter->reqSense = FALSE;
-                memset (padapter->atapiCdb, 0, 16);
-                SelectSpigot (padapter, pdev->spigot);                                                                  // select the spigot
-                AtapiDevice (padapter, pdev->byte6);                                                                    // select the drive
-                if ( AtapiWaitReady (padapter, 100) )
-                        {
-                        OpDone (padapter, DID_NO_CONNECT << 16);
-                        return 0;
-                        }
-
-                switch ( cdb[0] ) 
-                        {
-                        case SCSIOP_MODE_SENSE:
-                        case SCSIOP_MODE_SELECT:
-                                Scsi2Atapi (padapter, SCpnt);
-                                z = SCpnt->request_bufflen + 4;
-                                break;
-                        case SCSIOP_READ6:
-                        case SCSIOP_WRITE6:
-                                Scsi2Atapi (padapter, SCpnt);
-                                z = SCpnt->request_bufflen;
-                                break;
-                        default:
-                                memcpy (padapter->atapiCdb, cdb, SCpnt->cmd_len);
-                                z = SCpnt->request_bufflen;
-                                break;
-                        }
-                if ( z > ATAPI_TRANSFER )
-                        z = ATAPI_TRANSFER;
-            zlo = (UCHAR)(z & 0xFF);
-            zhi = (UCHAR)(z >> 8);
-
-                AtapiCountLo (padapter, zlo);                                           
-                AtapiCountHi (padapter, zhi);                                           
-                outb_p (0, padapter->regError);                                         
-                WriteCommand (padapter, IDE_COMMAND_ATAPI_PACKET);
-                if ( pdev->cmdDrqInt )
-                        return 0;
-
-                if ( AtapiWaitDrq (padapter, 500) )
-                        {
-                        OpDone (padapter, DID_ERROR << 16);
-                        return 0;
-                        }
-                AtapiSendCdb (padapter, pdev, padapter->atapiCdb);      
-                return 0;
-                }
-        
-        if ( padapter->reconPhase )
-                return 0;
-        if ( padapter->reconTimer.data )
-                {
-                del_timer (&padapter->reconTimer);
-                padapter->reconTimer.data = 0;
-                }
-                
-        if ( (SCpnt->device->id >= padapter->numberOfDrives) || SCpnt->device->lun )
-                {
-                OpDone (padapter, DID_BAD_TARGET << 16);
-                return 0;
-                }
-        
-        switch ( *cdb )
-                {
-                case SCSIOP_INQUIRY:                                    // inquiry CDB
-                        {
-                        if ( cdb[2] == SC_MY_RAID )
-                                {
-                                switch ( cdb[3] ) 
-                                        {
-                                        case MY_SCSI_REBUILD:
-                                                for ( z = 0;  z < padapter->numberOfDrives;  z++ )
-                                                        {
-                                                        pdev = &padapter->device[z];
-                                                        if ( ((pdev->DiskMirror[0].status & UCBF_SURVIVOR) && (pdev->DiskMirror[1].status & UCBF_MIRRORED)) ||
-                                                                 ((pdev->DiskMirror[1].status & UCBF_SURVIVOR) && (pdev->DiskMirror[0].status & UCBF_MIRRORED)) )
-                                                                {
-                                                                padapter->reconOn = pdev->reconOn = pdev->reconIsStarting = TRUE;
-                                                                }
-                                                        }
-                                                OpDone (padapter, DID_OK << 16);
-                                                break;
-                                        case MY_SCSI_ALARMMUTE:
-                                                MuteAlarm (padapter);
-                                                OpDone (padapter, DID_OK << 16);
-                                                break;
-                                        case MY_SCSI_DEMOFAIL:
-                                                padapter->demoFail = TRUE;                              
-                                                OpDone (padapter, DID_OK << 16);
-                                                break;
-                                        default:
-                                                z = cdb[5];                             // get index
-                                                pdr = (PDEVICE_RAID1)SCpnt->request_buffer;
-                                                if ( padapter->raidData[z] )
-                                                        {
-                                                        memcpy (&pdr->DiskRaid1, padapter->raidData[z], sizeof (DISK_MIRROR));
-                                                        if ( padapter->raidData[z]->reconstructPoint > padapter->raidData[z ^ 2]->reconstructPoint )
-                                                                pdr->TotalSectors = padapter->raidData[z]->reconstructPoint;
-                                                        else
-                                                                pdr->TotalSectors = padapter->raidData[z ^ 2]->reconstructPoint;
-                                                        }
-                                                else
-                                                        memset (pdr, 0, sizeof (DEVICE_RAID1));
-                                                OpDone (padapter, DID_OK << 16);
-                                                break;
-                                        }       
-                                return 0;
-                                }
-                        padapter->cmd = IDE_COMMAND_IDENTIFY;
-                        break;
-                        }
-
-                case SCSIOP_TEST_UNIT_READY:                    // test unit ready CDB
-                        OpDone (padapter, DID_OK << 16);
-                        return 0;
-                case SCSIOP_READ_CAPACITY:                              // read capctiy CDB
-                        {
-                        PREAD_CAPACITY_DATA     pdata = (PREAD_CAPACITY_DATA)SCpnt->request_buffer;
-
-                        pdata->blksiz = 0x20000;
-                        XANY2SCSI ((UCHAR *)&pdata->blks, pdev->blocks);
-                        OpDone (padapter, DID_OK << 16);
-                        return 0;
-                        }
-                case SCSIOP_VERIFY:                                             // verify CDB
-                        padapter->startSector = XSCSI2LONG (&cdb[2]);
-                        padapter->sectorCount = (UCHAR)((USHORT)cdb[8] | ((USHORT)cdb[7] << 8));
-                        padapter->cmd = IDE_COMMAND_VERIFY;
-                        break;
-                case SCSIOP_READ:                                               // read10 CDB
-                        padapter->startSector = XSCSI2LONG (&cdb[2]);
-                        padapter->sectorCount = (USHORT)cdb[8] | ((USHORT)cdb[7] << 8);
-                        padapter->cmd = READ_CMD;
-                        break;
-                case SCSIOP_READ6:                                              // read6  CDB
-                        padapter->startSector = SCSI2LONG (&cdb[1]);
-                        padapter->sectorCount = cdb[4];
-                        padapter->cmd = READ_CMD;
-                        break;
-                case SCSIOP_WRITE:                                              // write10 CDB
-                        padapter->startSector = XSCSI2LONG (&cdb[2]);
-                        padapter->sectorCount = (USHORT)cdb[8] | ((USHORT)cdb[7] << 8);
-                        padapter->cmd = WRITE_CMD;
-                        break;
-                case SCSIOP_WRITE6:                                             // write6  CDB
-                        padapter->startSector = SCSI2LONG (&cdb[1]);
-                        padapter->sectorCount = cdb[4];
-                        padapter->cmd = WRITE_CMD;
-                        break;
-                default:
-                        DEB (printk ("pci2220i_queuecommand: Unsupported command %02X\n", *cdb));
-                        OpDone (padapter, DID_ERROR << 16);
-                        return 0;
-                }
-
-        if ( padapter->reconPhase )
-                return 0;
-        
-        padapter->pdev = pdev;
-
-        while ( padapter->demoFail )
-                {
-                pdev = padapter->pdev = &padapter->device[0];
-                padapter->demoFail = FALSE;
-                if ( !pdev->raid || 
-                         (pdev->DiskMirror[0].status & UCBF_SURVIVOR) || 
-                         (pdev->DiskMirror[1].status & UCBF_SURVIVOR) )
-                        {
-                        break;
-                        }
-                if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                        padapter->survivor = 1;
-                else
-                        padapter->survivor = 0;
-                                DEB (printk ("\npci2220i: FAILURE 19"));
-                if ( InitFailover (padapter, pdev) )
-                        break;
-                return 0;
-                }
-
-        StartTimer (padapter);
-        if ( pdev->raid && (padapter->cmd == WRITE_CMD) )
-                {
-                rc = IdeCmdBoth (padapter, pdev);
-                if ( !rc )
-                        rc = WriteDataBoth (padapter, pdev);
-                if ( rc )
-                        {
-                        del_timer (&padapter->timer);
-                        padapter->expectingIRQ = 0;
-                        padapter->survivor = rc >> 1;
-                                DEB (printk ("\npci2220i: FAILURE 20"));
-                        if ( InitFailover (padapter, pdev) )
-                                {
-                                OpDone (padapter, DID_ERROR << 16);
-                                return 0;
-                                }
-                        }
-                }
-        else
-                {
-                rc = IdeCmd (padapter, pdev);
-                if ( (padapter->cmd == WRITE_CMD) && !rc )
-                        rc = WriteData (padapter);
-                if ( rc )
-                        {
-                        del_timer (&padapter->timer);
-                        padapter->expectingIRQ = 0;
-                        if ( pdev->raid )
-                                {
-                                padapter->survivor = (pdev->spigot ^ 3) >> 1;
-                                DEB (printk ("\npci2220i: FAILURE 21"));
-                                if ( !InitFailover (padapter, pdev) )
-                                        return 0;
-                                }
-                        OpDone (padapter, DID_ERROR << 16);
-                        return 0;
-                        }
-                }
-        return 0;
-        }
-/****************************************************************
- *      Name:                   ReadFlash
- *
- *      Description:    Read information from controller Flash memory.
- *
- *      Parameters:             padapter - Pointer to host interface data structure.
- *                                      pdata    - Pointer to data structures.
- *                                      base     - base address in Flash.
- *                                      length   - lenght of data space in bytes.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-static VOID ReadFlash (PADAPTER2220I padapter, VOID *pdata, ULONG base, ULONG length)
-        {
-        ULONG    oldremap;
-        UCHAR    olddesc;
-        ULONG    z;
-        UCHAR   *pd = (UCHAR *)pdata;
-
-        oldremap = inl (padapter->regRemap);                                                    // save values to restore later
-        olddesc  = inb_p (padapter->regDesc);
-
-        outl (base | 1, padapter->regRemap);                                                    // remap to Flash space as specified
-        outb_p (0x40, padapter->regDesc);                                                               // describe remap region as 8 bit
-        for ( z = 0;  z < length;  z++)                                                                 // get "length" data count
-                *pd++ = inb_p (padapter->regBase + z);                                          // read in the data
-
-        outl (oldremap, padapter->regRemap);                                                    // restore remap register values
-        outb_p (olddesc, padapter->regDesc);
-        }
-/****************************************************************
- *      Name:                   GetRegs
- *
- *      Description:    Initialize the regester information.
- *
- *      Parameters:             pshost            - Pointer to SCSI host data structure.
- *                                      bigd              - PCI-2240I identifier
- *                                      pcidev            - Pointer to device data structure.
- *
- *      Returns:                TRUE if failure to install.
- *
- ****************************************************************/
-static USHORT GetRegs (struct Scsi_Host *pshost, BOOL bigd, struct pci_dev *pcidev)
-        {
-        PADAPTER2220I   padapter;
-        int                             setirq;
-        int                             z;
-        USHORT                  zr, zl;
-        UCHAR              *consistent;
-        dma_addr_t              consistentDma;
-
-        padapter = HOSTDATA(pshost);
-        memset (padapter, 0, sizeof (ADAPTER2220I));
-        memset (&DaleSetup, 0, sizeof (DaleSetup));
-        memset (DiskMirror, 0, sizeof (DiskMirror));
-
-        zr = pci_resource_start (pcidev, 1);
-        zl = pci_resource_start (pcidev, 2);
-
-        padapter->basePort = zr;
-        padapter->regRemap              = zr + RTR_LOCAL_REMAP;                                 // 32 bit local space remap
-        padapter->regDesc               = zr + RTR_REGIONS;                                             // 32 bit local region descriptor
-        padapter->regRange              = zr + RTR_LOCAL_RANGE;                                 // 32 bit local range
-        padapter->regIrqControl = zr + RTR_INT_CONTROL_STATUS;                  // 16 bit interrupt control and status
-        padapter->regScratchPad = zr + RTR_MAILBOX;                                             // 16 byte scratchpad I/O base address
-
-        padapter->regBase               = zl;
-        padapter->regData               = zl + REG_DATA;                                                // data register I/O address
-        padapter->regError              = zl + REG_ERROR;                                               // error register I/O address
-        padapter->regSectCount  = zl + REG_SECTOR_COUNT;                                // sector count register I/O address
-        padapter->regLba0               = zl + REG_LBA_0;                                               // least significant byte of LBA
-        padapter->regLba8               = zl + REG_LBA_8;                                               // next least significant byte of LBA
-        padapter->regLba16              = zl + REG_LBA_16;                                              // next most significan byte of LBA
-        padapter->regLba24              = zl + REG_LBA_24;                                              // head and most 4 significant bits of LBA
-        padapter->regStatCmd    = zl + REG_STAT_CMD;                                    // status on read and command on write register
-        padapter->regStatSel    = zl + REG_STAT_SEL;                                    // board status on read and spigot select on write register
-        padapter->regFail               = zl + REG_FAIL;
-        padapter->regAltStat    = zl + REG_ALT_STAT;
-        padapter->pcidev                = pcidev;
-
-        if ( bigd )
-                {
-                padapter->regDmaDesc    = zr + RTR_DMA0_DESC_PTR;                       // address of the DMA discriptor register for direction of transfer
-                padapter->regDmaCmdStat = zr + RTR_DMA_COMMAND_STATUS;          // Byte #0 of DMA command status register
-                padapter->regDmaAddrPci = zr + RTR_DMA0_PCI_ADDR;                       // 32 bit register for PCI address of DMA
-                padapter->regDmaAddrLoc = zr + RTR_DMA0_LOCAL_ADDR;                     // 32 bit register for local bus address of DMA
-                padapter->regDmaCount   = zr + RTR_DMA0_COUNT;                          // 32 bit register for DMA transfer count
-                padapter->regDmaMode    = zr + RTR_DMA0_MODE + 1;                       // 32 bit register for DMA mode control
-                padapter->bigD                  = SEL_NEW_SPEED_1;                                      // set spigot speed control bit
-                }
-        else
-                {
-                padapter->regDmaDesc    = zl + RTL_DMA1_DESC_PTR;                       // address of the DMA discriptor register for direction of transfer
-                padapter->regDmaCmdStat = zl + RTL_DMA_COMMAND_STATUS + 1;      // Byte #1 of DMA command status register
-                padapter->regDmaAddrPci = zl + RTL_DMA1_PCI_ADDR;                       // 32 bit register for PCI address of DMA
-                padapter->regDmaAddrLoc = zl + RTL_DMA1_LOCAL_ADDR;                     // 32 bit register for local bus address of DMA
-                padapter->regDmaCount   = zl + RTL_DMA1_COUNT;                          // 32 bit register for DMA transfer count
-                padapter->regDmaMode    = zl + RTL_DMA1_MODE + 1;                       // 32 bit register for DMA mode control
-                }
-
-        padapter->numberOfDrives = inb_p (padapter->regScratchPad + BIGD_NUM_DRIVES);
-        if ( !bigd && !padapter->numberOfDrives )                                               // if no devices on this board
-                return TRUE;
-
-        pshost->irq = pcidev->irq;
-        setirq = 1;
-        for ( z = 0;  z < Installed;  z++ )                                                             // scan for shared interrupts
-                {
-                if ( PsiHost[z]->irq == pshost->irq )                                           // if shared then, don't posses
-                        setirq = 0;
-                }
-        if ( setirq )                                                                                                   // if not shared, posses
-                {
-                if ( request_irq (pshost->irq, Irq_Handler, SA_SHIRQ, "pci2220i", padapter) < 0 )
-                        {
-                        if ( request_irq (pshost->irq, Irq_Handler, SA_INTERRUPT | SA_SHIRQ, "pci2220i", padapter) < 0 )
-                                {
-                                printk ("Unable to allocate IRQ for PCI-2220I controller.\n");
-                                return TRUE;
-                                }
-                        }
-                padapter->irqOwned = pshost->irq;                                                       // set IRQ as owned
-                }
-
-        if ( padapter->numberOfDrives )
-                consistent = pci_alloc_consistent (pcidev, SECTORSXFER * BYTES_PER_SECTOR, &consistentDma);
-        else
-                consistent = pci_alloc_consistent (pcidev, ATAPI_TRANSFER, &consistentDma);
-        if ( !consistent )
-                {
-                printk ("Unable to allocate DMA buffer for PCI-2220I controller.\n");
-                free_irq (pshost->irq, padapter);
-                return TRUE;
-                }
-        padapter->kBuffer = consistent;
-        padapter->kBufferDma = consistentDma;
-
-        PsiHost[Installed]      = pshost;                                                                       // save SCSI_HOST pointer
-        pshost->io_port         = padapter->basePort;
-        pshost->n_io_port       = 0xFF;
-        pshost->unique_id       = padapter->regBase;
-
-        outb_p (0x01, padapter->regRange);                                                              // fix our range register because other drivers want to tromp on it
-
-        padapter->timingMode = inb_p (padapter->regScratchPad + DALE_TIMING_MODE);
-        if ( padapter->timingMode >= 2 )
-                {
-                if ( bigd )
-                        padapter->timingAddress = ModeArray2[padapter->timingMode - 2];
-                else
-                        padapter->timingAddress = ModeArray[padapter->timingMode - 2];
-                }
-        else
-                padapter->timingPIO = TRUE;
-
-        ReadFlash (padapter, &DaleSetup, DALE_FLASH_SETUP, sizeof (SETUP));
-        ReadFlash (padapter, &DiskMirror, DALE_FLASH_RAID, sizeof (DiskMirror));
-
-        return FALSE;
-        }
-/****************************************************************
- *      Name:                   SetupFinish
- *
- *      Description:    Complete the driver initialization process for a card
- *
- *      Parameters:             padapter  - Pointer to SCSI host data structure.
- *                                      str               - Pointer to board type string.
- *
- *      Returns:                Nothing.
- *
- ****************************************************************/
-VOID SetupFinish (PADAPTER2220I padapter, char *str, int irq)
-        {
-        init_timer (&padapter->timer);
-        padapter->timer.function = TimerExpiry;
-        padapter->timer.data = (unsigned long)padapter;
-        init_timer (&padapter->reconTimer);
-        padapter->reconTimer.function = ReconTimerExpiry;
-        padapter->reconTimer.data = (unsigned long)padapter;
-        printk("\nPCI-%sI EIDE CONTROLLER: at I/O = %lX/%lX  IRQ = %d\n", str, padapter->basePort, padapter->regBase, irq);
-        printk("Version %s, Compiled %s %s\n\n", PCI2220I_VERSION, __DATE__, __TIME__);
-        }       
-/****************************************************************
- *      Name:   Pci2220i_Detect
- *
- *      Description:    Detect and initialize our boards.
- *
- *      Parameters:             tpnt - Pointer to SCSI host template structure.
- *
- *      Returns:                Number of adapters installed.
- *
- ****************************************************************/
-int Pci2220i_Detect (Scsi_Host_Template *tpnt)
-        {
-        struct Scsi_Host   *pshost;
-        PADAPTER2220I       padapter;
-        POUR_DEVICE                     pdev;
-        int                                     unit;
-        int                                     z;
-        USHORT                          raidon;
-        UCHAR                           spigot1, spigot2;
-        UCHAR                           device;
-        struct pci_dev     *pcidev = NULL;
-
-        while ( (pcidev = pci_find_device (VENDOR_PSI, DEVICE_DALE_1, pcidev)) != NULL )
-                {
-                if (pci_enable_device(pcidev))
-                        continue;
-                pshost = scsi_register (tpnt, sizeof(ADAPTER2220I));
-                if(pshost==NULL)
-                        continue;
-                        
-                padapter = HOSTDATA(pshost);
-
-                if ( GetRegs (pshost, FALSE, pcidev) )
-                        goto unregister;
-
-                scsi_set_device(pshost, &pcidev->dev);
-                pshost->max_id = padapter->numberOfDrives;
-                for ( z = 0;  z < padapter->numberOfDrives;  z++ )
-                        {
-                        unit = inb_p (padapter->regScratchPad + DALE_CHANNEL_DEVICE_0 + z) & 0x0F;
-                        pdev = &padapter->device[z];
-                        pdev->byte6             = (UCHAR)(((unit & 1) << 4) | 0xE0);
-                        pdev->spigot    = (UCHAR)(1 << (unit >> 1));
-                        pdev->sectors   = DaleSetup.setupDevice[unit].sectors;
-                        pdev->heads             = DaleSetup.setupDevice[unit].heads;
-                        pdev->cylinders = DaleSetup.setupDevice[unit].cylinders;
-                        pdev->blocks    = DaleSetup.setupDevice[unit].blocks;
-
-                        if ( !z )
-                                {
-                                DiskMirror[0].status = inb_p (padapter->regScratchPad + DALE_RAID_0_STATUS);            
-                                DiskMirror[1].status = inb_p (padapter->regScratchPad + DALE_RAID_1_STATUS);            
-                                if ( (DiskMirror[0].signature == SIGNATURE) && (DiskMirror[1].signature == SIGNATURE) &&
-                                     (DiskMirror[0].pairIdentifier == (DiskMirror[1].pairIdentifier ^ 1)) )
-                                        {                        
-                                        raidon = TRUE;
-                                        if ( unit > (unit ^ 2) )
-                                                unit = unit ^ 2;
-                                        }       
-                                else
-                                        raidon = FALSE;
-
-                                memcpy (pdev->DiskMirror, DiskMirror, sizeof (DiskMirror));
-                                padapter->raidData[0] = &pdev->DiskMirror[0];
-                                padapter->raidData[2] = &pdev->DiskMirror[1];
-                                
-                                spigot1 = spigot2 = FALSE;
-                                pdev->spigots[0] = 1;
-                                pdev->spigots[1] = 2;
-                                pdev->lastsectorlba[0] = InlineIdentify (padapter, 1, 0);
-                                pdev->lastsectorlba[1] = InlineIdentify (padapter, 2, 0);
-                                                
-                                if ( !(pdev->DiskMirror[1].status & UCBF_SURVIVOR) && pdev->lastsectorlba[0] )
-                                        spigot1 = TRUE;
-                                if ( !(pdev->DiskMirror[0].status & UCBF_SURVIVOR) && pdev->lastsectorlba[1] )
-                                        spigot2 = TRUE;
-                                if ( pdev->DiskMirror[0].status & DiskMirror[1].status & UCBF_SURVIVOR )
-                                        spigot1 = TRUE;
-
-                                if ( spigot1 && (pdev->DiskMirror[0].status & UCBF_REBUILD) )
-                                        InlineReadSignature (padapter, pdev, 0);
-                                if ( spigot2 && (pdev->DiskMirror[1].status & UCBF_REBUILD) )
-                                        InlineReadSignature (padapter, pdev, 1);
-
-                                if ( spigot1 && spigot2 && raidon )
-                                        {
-                                        pdev->raid = 1;
-                                        if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                                                pdev->spigot = 2;
-                                        else
-                                                pdev->spigot = 1;
-                                        if ( (pdev->DiskMirror[0].status & UCBF_REBUILD) || (pdev->DiskMirror[1].status & UCBF_REBUILD) )
-                                                padapter->reconOn = pdev->reconOn = pdev->reconIsStarting = TRUE;
-                                        }
-                                else
-                                        {
-                                        if ( spigot1 )
-                                                {
-                                                if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                                                        goto unregister;
-                                                pdev->DiskMirror[0].status = UCBF_MIRRORED | UCBF_SURVIVOR;
-                                                pdev->spigot = 1;
-                                                }
-                                        else
-                                                {
-                                                if ( pdev->DiskMirror[1].status & UCBF_REBUILD )
-                                                        goto unregister;
-                                                pdev->DiskMirror[1].status = UCBF_MIRRORED | UCBF_SURVIVOR;
-                                                pdev->spigot = 2;
-                                                }
-                                        if ( DaleSetup.rebootRebuild && raidon )
-                                                padapter->reconOn = pdev->reconOn = pdev->reconIsStarting = TRUE;
-                                        }
-                        
-                                if ( raidon )
-                                        break;
-                                }
-                        }
-
-                SetupFinish (padapter, "2220", pshost->irq);
-        
-                if ( ++Installed < MAXADAPTER )
-                        continue;
-                break;
-unregister:;
-                scsi_unregister (pshost);
-                }
-
-        while ( (pcidev = pci_find_device (VENDOR_PSI, DEVICE_BIGD_1, pcidev)) != NULL )
-                {
-                pshost = scsi_register (tpnt, sizeof(ADAPTER2220I));
-                padapter = HOSTDATA(pshost);
-
-                if ( GetRegs (pshost, TRUE, pcidev) )
-                        goto unregister1;
-
-                for ( z = 0;  z < BIGD_MAXDRIVES;  z++ )
-                        DiskMirror[z].status = inb_p (padapter->regScratchPad + BIGD_RAID_0_STATUS + z);                
-
-                scsi_set_pci_device(pshost, pcidev);
-                pshost->max_id = padapter->numberOfDrives;
-                padapter->failRegister = inb_p (padapter->regScratchPad + BIGD_ALARM_IMAGE);
-                for ( z = 0;  z < padapter->numberOfDrives;  z++ )
-                        {
-                        unit = inb_p (padapter->regScratchPad + BIGD_DEVICE_0 + z);
-                        pdev = &padapter->device[z];
-                        pdev->byte6             = (UCHAR)(((unit & 1) << 4) | 0xE0);
-                        pdev->spigot    = (UCHAR)(1 << (unit >> 1));
-                        pdev->sectors   = DaleSetup.setupDevice[unit].sectors;
-                        pdev->heads             = DaleSetup.setupDevice[unit].heads;
-                        pdev->cylinders = DaleSetup.setupDevice[unit].cylinders;
-                        pdev->blocks    = DaleSetup.setupDevice[unit].blocks;
-                        
-                        if ( (DiskMirror[unit].signature == SIGNATURE) && (DiskMirror[unit ^ 2].signature == SIGNATURE) &&
-                             (DiskMirror[unit].pairIdentifier == (DiskMirror[unit ^ 2].pairIdentifier ^ 1)) )
-                                {                        
-                                raidon = TRUE;
-                                if ( unit > (unit ^ 2) )
-                                        unit = unit ^ 2;
-                                }       
-                        else
-                                raidon = FALSE;
-                                
-                        spigot1 = spigot2 = FALSE;
-                        memcpy (&pdev->DiskMirror[0], &DiskMirror[unit], sizeof (DISK_MIRROR));
-                        memcpy (&pdev->DiskMirror[1], &DiskMirror[unit ^ 2], sizeof (DISK_MIRROR));
-                        padapter->raidData[unit]         = &pdev->DiskMirror[0];
-                        padapter->raidData[unit ^ 2] = &pdev->DiskMirror[1];
-                        pdev->spigots[0] = 1 << (unit >> 1);
-                        pdev->spigots[1] = 1 << ((unit ^ 2) >> 1);
-                        pdev->deviceID[0] = unit;
-                        pdev->deviceID[1] = unit ^ 2;
-                        pdev->lastsectorlba[0] = InlineIdentify (padapter, pdev->spigots[0], unit & 1);
-                        pdev->lastsectorlba[1] = InlineIdentify (padapter, pdev->spigots[1], unit & 1);
-
-                        if ( !(pdev->DiskMirror[1].status & UCBF_SURVIVOR) && pdev->lastsectorlba[0] )
-                                spigot1 = TRUE;
-                        if ( !(pdev->DiskMirror[0].status & UCBF_SURVIVOR) && pdev->lastsectorlba[1] )
-                                spigot2 = TRUE;
-                        if ( pdev->DiskMirror[0].status & pdev->DiskMirror[1].status & UCBF_SURVIVOR )
-                                spigot1 = TRUE;
-
-                        if ( spigot1 && (pdev->DiskMirror[0].status & UCBF_REBUILD) )
-                                InlineReadSignature (padapter, pdev, 0);
-                        if ( spigot2 && (pdev->DiskMirror[1].status & UCBF_REBUILD) )
-                                InlineReadSignature (padapter, pdev, 1);
-
-                        if ( spigot1 && spigot2 && raidon )
-                                {
-                                pdev->raid = 1;
-                                if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                                        pdev->spigot = pdev->spigots[1];
-                                else
-                                        pdev->spigot = pdev->spigots[0];
-                                if ( (pdev->DiskMirror[0].status & UCBF_REBUILD) || (pdev->DiskMirror[1].status & UCBF_REBUILD) )
-                                        padapter->reconOn = pdev->reconOn = pdev->reconIsStarting = TRUE;
-                                }
-                        else
-                                {
-                                if ( spigot1 )
-                                        {
-                                        if ( pdev->DiskMirror[0].status & UCBF_REBUILD )
-                                                goto unregister1;
-                                        pdev->DiskMirror[0].status = UCBF_MIRRORED | UCBF_SURVIVOR;
-                                        pdev->spigot = pdev->spigots[0];
-                                        }
-                                else
-                                        {
-                                        if ( pdev->DiskMirror[1].status & UCBF_REBUILD )
-                                                goto unregister;
-                                        pdev->DiskMirror[1].status = UCBF_MIRRORED | UCBF_SURVIVOR;
-                                        pdev->spigot = pdev->spigots[1];
-                                        }
-                                if ( DaleSetup.rebootRebuild && raidon )
-                                        padapter->reconOn = pdev->reconOn = pdev->reconIsStarting = TRUE;
-                                }
-                        }
-                
-                if ( !padapter->numberOfDrives )                                                                        // If no ATA devices then scan ATAPI
-                        {
-                        unit = 0;
-                        for ( spigot1 = 0;  spigot1 < 4;  spigot1++ )
-                                {
-                                for ( device = 0;  device < 2;  device++ )
-                                        {
-                                        DEB (printk ("\nPCI2242I: scanning for ID %d ", (spigot1 * 2) + device));
-                                        pdev = &(padapter->device[(spigot1 * 2) + device]);
-                                        pdev->byte6 = 0x0A | (device << 4);
-                                        pdev->spigot = 1 << spigot1;
-                                        if ( !AtapiReset (padapter, pdev) )
-                                                {
-                                                DEB (printk (" Device found "));
-                                                if ( !AtapiIdentify (padapter, pdev) )
-                                                        {
-                                                        DEB (printk (" Device verified"));
-                                                        unit++;
-                                                        continue;
-                                                        }
-                                                }
-                                        pdev->spigot = pdev->byte6 = 0;
-                                        }
-                                }
-
-                        if ( unit )
-                                {
-                                padapter->atapi = TRUE;
-                                padapter->timingAddress = DALE_DATA_MODE3;
-                                outw_p (0x0900, padapter->regIrqControl);                                       // Turn our interrupts on
-                                outw_p (0x0C41, padapter->regDmaMode - 1);                                      // setup for 16 bits, ready enabled, done IRQ enabled, no incriment
-                                outb_p (0xFF, padapter->regFail);                                                       // all fail lights and alarm off
-                                pshost->max_id = 8;
-                                }
-                        }
-                SetupFinish (padapter, "2240", pshost->irq);
-                
-                if ( ++Installed < MAXADAPTER )
-                        continue;
-                break;
-unregister1:;
-                scsi_unregister (pshost);
-                }
-
-        NumAdapters = Installed;
-        return Installed;
-        }
-/****************************************************************
- *      Name:   Pci2220i_Abort
- *
- *      Description:    Process the Abort command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *
- *      Returns:                Allways snooze.
- *
- ****************************************************************/
-int Pci2220i_Abort (Scsi_Cmnd *SCpnt)
-        {
-        PADAPTER2220I   padapter = HOSTDATA(SCpnt->device->host);                       // Pointer to adapter control structure
-        POUR_DEVICE             pdev     = &padapter->device[SCpnt->device->id];// Pointer to device information
-
-        if ( !padapter->SCpnt )
-                return SCSI_ABORT_NOT_RUNNING;
-        
-        if ( padapter->atapi )
-                {
-                if ( AtapiReset (padapter, pdev) )
-                        return SCSI_ABORT_ERROR;
-                OpDone (padapter, DID_ABORT << 16);
-                return SCSI_ABORT_SUCCESS;
-                }
-        return SCSI_ABORT_SNOOZE;
-        }
-/****************************************************************
- *      Name:   Pci2220i_Reset
- *
- *      Description:    Process the Reset command from the SCSI manager.
- *
- *      Parameters:             SCpnt - Pointer to SCSI command structure.
- *                                      flags - Flags about the reset command
- *
- *      Returns:                No active command at this time, so this means
- *                                      that each time we got some kind of response the
- *                                      last time through.  Tell the mid-level code to
- *                                      request sense information in order to decide what
- *                                      to do next.
- *
- ****************************************************************/
-int Pci2220i_Reset (Scsi_Cmnd *SCpnt, unsigned int reset_flags)
-        {
-        PADAPTER2220I   padapter = HOSTDATA(SCpnt->device->host);                       // Pointer to adapter control structure
-        POUR_DEVICE             pdev     = &padapter->device[SCpnt->device->id];// Pointer to device information
-
-        if ( padapter->atapi )
-                {
-                if ( AtapiReset (padapter, pdev) )
-                        return SCSI_RESET_ERROR;
-                return SCSI_RESET_SUCCESS;
-                }
-        return SCSI_RESET_PUNT;
-        }
-/****************************************************************
- *      Name:   Pci2220i_Release
- *
- *      Description:    Release resources allocated for a single each adapter.
- *
- *      Parameters:             pshost - Pointer to SCSI command structure.
- *
- *      Returns:                zero.
- *
- ****************************************************************/
-int Pci2220i_Release (struct Scsi_Host *pshost)
-        {
-    PADAPTER2220I       padapter = HOSTDATA (pshost);
-        USHORT                  z;
-
-        if ( padapter->reconOn )
-                {
-                padapter->reconOn = FALSE;                                              // shut down the hot reconstruct
-                if ( padapter->reconPhase )
-                        mdelay (300);
-                if ( padapter->reconTimer.data )                                // is the timer running?
-                        {
-                        del_timer (&padapter->reconTimer);
-                        padapter->reconTimer.data = 0;
-                        }
-                }
-
-        // save RAID status on the board
-        if ( padapter->bigD )
-                {
-                outb_p (padapter->failRegister, padapter->regScratchPad + BIGD_ALARM_IMAGE);
-                for ( z = 0;  z < BIGD_MAXDRIVES;  z++ )
-                        {
-                        if ( padapter->raidData )
-                                outb_p (padapter->raidData[z]->status, padapter->regScratchPad + BIGD_RAID_0_STATUS + z);       
-                        else
-                                outb_p (0, padapter->regScratchPad + BIGD_RAID_0_STATUS);       
-                        }
-                }
-        else
-                {
-                outb_p (padapter->device[0].DiskMirror[0].status, padapter->regScratchPad + DALE_RAID_0_STATUS);                
-                outb_p (padapter->device[0].DiskMirror[1].status, padapter->regScratchPad + DALE_RAID_1_STATUS);                
-                }
-
-        if ( padapter->irqOwned )
-                free_irq (pshost->irq, padapter);
-    release_region (pshost->io_port, pshost->n_io_port);
-        if ( padapter->numberOfDrives )
-                pci_free_consistent (padapter->pcidev, SECTORSXFER * BYTES_PER_SECTOR, padapter->kBuffer, padapter->kBufferDma);
-        else    
-                pci_free_consistent (padapter->pcidev, ATAPI_TRANSFER, padapter->kBuffer, padapter->kBufferDma);
-    scsi_unregister(pshost);
-    return 0;
-        }
-
-/****************************************************************
- *      Name:   Pci2220i_BiosParam
- *
- *      Description:    Process the biosparam request from the SCSI manager to
- *                                      return C/H/S data.
- *
- *      Parameters:             disk - Pointer to SCSI disk structure.
- *                                      dev      - Major/minor number from kernel.
- *                                      geom - Pointer to integer array to place geometry data.
- *
- *      Returns:                zero.
- *
- ****************************************************************/
-int Pci2220i_BiosParam (struct scsi_device *sdev, struct block_device *dev,
-                sector_t capacity, int geom[])
-        {
-        POUR_DEVICE     pdev;
-
-        if ( !(HOSTDATA(sdev->host))->atapi )
-                {
-                pdev = &(HOSTDATA(sdev->host)->device[sdev->id]);
-
-                geom[0] = pdev->heads;
-                geom[1] = pdev->sectors;
-                geom[2] = pdev->cylinders;
-                }
-        return 0;
-        }
-
-MODULE_LICENSE("Dual BSD/GPL");
-
-static Scsi_Host_Template driver_template = {
-        .proc_name              = "pci2220i",
-        .name                   = "PCI-2220I/PCI-2240I",
-        .detect                 = Pci2220i_Detect,
-        .release                = Pci2220i_Release,
-        .queuecommand           = Pci2220i_QueueCommand,
-        .abort                  = Pci2220i_Abort,
-        .reset                  = Pci2220i_Reset,
-        .bios_param             = Pci2220i_BiosParam,
-        .can_queue              = 1,
-        .this_id                = -1,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 1,
-        .use_clustering         = DISABLE_CLUSTERING,
-};
-#include "scsi_module.c"
diff --git a/drivers/scsi/pci2220i.h b/drivers/scsi/pci2220i.h
deleted file mode 100644
index 6926056c2aee..000000000000
--- a/drivers/scsi/pci2220i.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2220I device driver for Linux.
- *
- * pci2220i.h - Linux Host Driver for PCI-2220i EIDE Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- ****************************************************************************/
-#ifndef _PCI2220I_H
-#define _PCI2220I_H
-
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif 
-#define LINUXVERSION(v,p,s)    (((v)<<16) + ((p)<<8) + (s))
-
-// function prototypes
-int Pci2220i_Detect                     (Scsi_Host_Template *tpnt);
-int Pci2220i_Command            (Scsi_Cmnd *SCpnt);
-int Pci2220i_QueueCommand       (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));
-int Pci2220i_Abort                      (Scsi_Cmnd *SCpnt);
-int Pci2220i_Reset                      (Scsi_Cmnd *SCpnt, unsigned int flags);
-int Pci2220i_Release            (struct Scsi_Host *pshost);
-int Pci2220i_BiosParam          (struct scsi_device *sdev,
-                                        struct block_device *dev,
-                                        sector_t capacity, int geom[]);
-#endif
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 496c412c8854..3dddb323e718 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -92,9 +92,7 @@ static Scsi_Host_Template nsp_driver_template = {
 #endif
         .info                    = nsp_info,
         .queuecommand            = nsp_queuecommand,
-/*      .eh_strategy_handler     = nsp_eh_strategy,*/
 /*      .eh_abort_handler        = nsp_eh_abort,*/
-/*      .eh_device_reset_handler = nsp_eh_device_reset,*/
         .eh_bus_reset_handler    = nsp_eh_bus_reset,
         .eh_host_reset_handler   = nsp_eh_host_reset,
         .can_queue               = 1,
@@ -1536,11 +1534,6 @@ nsp_proc_info(
 /* error handler                                                 */
 /*---------------------------------------------------------------*/
 
-/*static int nsp_eh_strategy(struct Scsi_Host *Shost)
-{
-        return FAILED;
-}*/
-
 /*
 static int nsp_eh_abort(Scsi_Cmnd *SCpnt)
 {
@@ -1549,14 +1542,6 @@ static int nsp_eh_abort(Scsi_Cmnd *SCpnt)
         return nsp_eh_bus_reset(SCpnt);
 }*/
 
-/*
-static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt)
-{
-        nsp_dbg(NSP_DEBUG_BUSRESET, "%s: SCpnt=0x%p", SCpnt);
-
-        return FAILED;
-}*/
-
 static int nsp_bus_reset(nsp_hw_data *data)
 {
         unsigned int base = data->BaseAddress;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 4766bcd63692..a0175f5d11cd 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -81,8 +81,6 @@ static Scsi_Host_Template qlogicfas_driver_template = {
         .queuecommand           = qlogicfas408_queuecommand,
         .eh_abort_handler       = qlogicfas408_abort,
         .eh_bus_reset_handler   = qlogicfas408_bus_reset,
-        .eh_device_reset_handler= qlogicfas408_device_reset,
-        .eh_host_reset_handler  = qlogicfas408_host_reset,
         .bios_param             = qlogicfas408_biosparam,
         .can_queue              = 1,
         .this_id                = -1,
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 8457d0d7748a..1667da9508b4 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -627,7 +627,9 @@ SYM53C500_host_reset(struct scsi_cmnd *SCpnt)
         int port_base = SCpnt->device->host->io_port;
 
         DEB(printk("SYM53C500_host_reset called\n"));
+        spin_lock_irq(SCpnt->device->host->host_lock);
         SYM53C500_int_host_reset(port_base);
+        spin_unlock_irq(SCpnt->device->host->host_lock);
 
         return SUCCESS;
 }
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index c01b7191fcf5..623082d3a83f 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -354,7 +354,6 @@ static Scsi_Host_Template driver_template = {
         .use_clustering         = ENABLE_CLUSTERING,
         .eh_abort_handler       = fcp_scsi_abort,
         .eh_device_reset_handler = fcp_scsi_dev_reset,
-        .eh_bus_reset_handler   = fcp_scsi_bus_reset,
         .eh_host_reset_handler  = fcp_scsi_host_reset,
 };
 
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 96b4522523d9..fafcf5d185e7 100644
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -17,6 +17,7 @@
 #include <linux/blkdev.h>
 #include <linux/parport.h>
 #include <linux/workqueue.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 
 #include <scsi/scsi.h>
@@ -891,9 +892,9 @@ static int ppa_reset(struct scsi_cmnd *cmd)
 
         ppa_connect(dev, CONNECT_NORMAL);
         ppa_reset_pulse(dev->base);
-        udelay(1000);           /* device settle delay */
+        mdelay(1);              /* device settle delay */
         ppa_disconnect(dev);
-        udelay(1000);           /* device settle delay */
+        mdelay(1);              /* device settle delay */
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/psi_dale.h b/drivers/scsi/psi_dale.h
deleted file mode 100644
index d672e3b01982..000000000000
--- a/drivers/scsi/psi_dale.h
+++ /dev/null
@@ -1,564 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2220I device driver for Linux.
- *
- * psi_dalei.h - Linux Host Driver for PCI-2220i EIDE Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- ****************************************************************************/
-
-/************************************************/
-/*              Some defines that we like                               */
-/************************************************/
-#define CHAR            char
-#define UCHAR           unsigned char
-#define SHORT           short
-#define USHORT          unsigned short
-#define BOOL            unsigned short
-#define LONG            long
-#define ULONG           unsigned long
-#define VOID            void
-
-/************************************************/
-/*              Dale PCI setup                                                  */
-/************************************************/
-#define VENDOR_PSI                      0x1256
-#define DEVICE_DALE_1           0x4401          /* 'D1' */
-#define DEVICE_BIGD_1           0x4201          /* 'B1' */
-#define DEVICE_BIGD_2           0x4202          /* 'B2' */
-
-/************************************************/
-/*              Misc konstants                                                  */
-/************************************************/
-#define DALE_MAXDRIVES                  4
-#define BIGD_MAXDRIVES                  8
-#define SECTORSXFER                             8
-#define ATAPI_TRANSFER                  8192
-#define BYTES_PER_SECTOR                512
-#define DEFAULT_TIMING_MODE             5
-
-/************************************************/
-/*              EEPROM locations                                                */
-/************************************************/
-#define DALE_FLASH_PAGE_SIZE    128                             // number of bytes per page
-#define DALE_FLASH_SIZE                 65536L
-
-#define DALE_FLASH_BIOS                 0x00080000L             // BIOS base address
-#define DALE_FLASH_SETUP                0x00088000L             // SETUP PROGRAM base address offset from BIOS
-#define DALE_FLASH_RAID                 0x00088400L             // RAID signature storage
-#define DALE_FLASH_FACTORY              0x00089000L             // FACTORY data base address offset from BIOS
-
-#define DALE_FLASH_BIOS_SIZE    32768U                  // size of FLASH BIOS REGION
-
-/************************************************/
-/*              DALE Register address offsets                   */
-/************************************************/
-#define REG_DATA                                        0x80
-#define REG_ERROR                                       0x84
-#define REG_SECTOR_COUNT                        0x88
-#define REG_LBA_0                                       0x8C
-#define REG_LBA_8                                       0x90
-#define REG_LBA_16                                      0x94
-#define REG_LBA_24                                      0x98
-#define REG_STAT_CMD                            0x9C
-#define REG_STAT_SEL                            0xA0
-#define REG_FAIL                                        0xB0
-#define REG_ALT_STAT                            0xB8
-#define REG_DRIVE_ADRS                          0xBC
-
-#define DALE_DATA_SLOW                          0x00040000L
-#define DALE_DATA_MODE2                         0x00040000L
-#define DALE_DATA_MODE3                         0x00050000L
-#define DALE_DATA_MODE4                         0x00060000L
-#define DALE_DATA_MODE5                         0x00070000L
-
-#define BIGD_DATA_SLOW                          0x00000000L
-#define BIGD_DATA_MODE0                         0x00000000L
-#define BIGD_DATA_MODE2                         0x00000000L
-#define BIGD_DATA_MODE3                         0x00000008L
-#define BIGD_DATA_MODE4                         0x00000010L
-#define BIGD_DATA_MODE5                         0x00000020L
-
-#define RTR_LOCAL_RANGE                         0x000
-#define RTR_LOCAL_REMAP                         0x004
-#define RTR_EXP_RANGE                           0x010
-#define RTR_EXP_REMAP                           0x014
-#define RTR_REGIONS                                     0x018
-#define RTR_DM_MASK                                     0x01C
-#define RTR_DM_LOCAL_BASE                       0x020
-#define RTR_DM_IO_BASE                          0x024
-#define RTR_DM_PCI_REMAP                        0x028
-#define RTR_DM_IO_CONFIG                        0x02C
-#define RTR_MAILBOX                                     0x040
-#define RTR_LOCAL_DOORBELL                      0x060
-#define RTR_PCI_DOORBELL                        0x064
-#define RTR_INT_CONTROL_STATUS          0x068
-#define RTR_EEPROM_CONTROL_STATUS       0x06C
-
-#define RTR_DMA0_MODE                           0x0080
-#define RTR_DMA0_PCI_ADDR                       0x0084
-#define RTR_DMA0_LOCAL_ADDR                     0x0088
-#define RTR_DMA0_COUNT                          0x008C
-#define RTR_DMA0_DESC_PTR                       0x0090
-#define RTR_DMA1_MODE                           0x0094
-#define RTR_DMA1_PCI_ADDR                       0x0098
-#define RTR_DMA1_LOCAL_ADDR                     0x009C
-#define RTR_DMA1_COUNT                          0x00A0
-#define RTR_DMA1_DESC_PTR                       0x00A4
-#define RTR_DMA_COMMAND_STATUS          0x00A8
-#define RTR_DMA_ARB0                            0x00AC
-#define RTR_DMA_ARB1                            0x00B0
-
-#define RTL_DMA0_MODE                           0x00
-#define RTL_DMA0_PCI_ADDR                       0x04
-#define RTL_DMA0_LOCAL_ADDR                     0x08
-#define RTL_DMA0_COUNT                          0x0C
-#define RTL_DMA0_DESC_PTR                       0x10
-#define RTL_DMA1_MODE                           0x14
-#define RTL_DMA1_PCI_ADDR                       0x18
-#define RTL_DMA1_LOCAL_ADDR                     0x1C
-#define RTL_DMA1_COUNT                          0x20
-#define RTL_DMA1_DESC_PTR                       0x24
-#define RTL_DMA_COMMAND_STATUS          0x28
-#define RTL_DMA_ARB0                            0x2C
-#define RTL_DMA_ARB1                            0x30
-
-/************************************************/
-/*              Dale Scratchpad locations                               */
-/************************************************/
-#define DALE_CHANNEL_DEVICE_0           0               // device channel locations
-#define DALE_CHANNEL_DEVICE_1           1
-#define DALE_CHANNEL_DEVICE_2           2
-#define DALE_CHANNEL_DEVICE_3           3
-
-#define DALE_SCRATCH_DEVICE_0           4               // device type codes
-#define DALE_SCRATCH_DEVICE_1           5
-#define DALE_SCRATCH_DEVICE_2           6
-#define DALE_SCRATCH_DEVICE_3           7
-
-#define DALE_RAID_0_STATUS                      8
-#define DALE_RAID_1_STATUS                      9
-
-#define DALE_TIMING_MODE                        12              // bus master timing mode (2, 3, 4, 5)
-#define DALE_NUM_DRIVES                         13              // number of addressable drives on this board
-#define DALE_RAID_ON                            14              // RAID status On
-#define DALE_LAST_ERROR                         15              // Last error code from BIOS
-
-/************************************************/
-/*              BigD Scratchpad locations                               */
-/************************************************/
-#define BIGD_DEVICE_0                   0               // device channel locations
-#define BIGD_DEVICE_1                   1
-#define BIGD_DEVICE_2                   2
-#define BIGD_DEVICE_3                   3
-
-#define BIGD_DEVICE_4                   4               // device type codes
-#define BIGD_DEVICE_5                   5
-#define BIGD_DEVICE_6                   6
-#define BIGD_DEVICE_7                   7
-
-#define BIGD_ALARM_IMAGE                11              // ~image of alarm fail register                
-#define BIGD_TIMING_MODE                12              // bus master timing mode (2, 3, 4, 5)
-#define BIGD_NUM_DRIVES                 13              // number of addressable drives on this board
-#define BIGD_RAID_ON                    14              // RAID status is on for the whole board
-#define BIGD_LAST_ERROR                 15              // Last error code from BIOS
-
-#define BIGD_RAID_0_STATUS              16
-#define BIGD_RAID_1_STATUS              17
-#define BIGD_RAID_2_STATUS              18
-#define BIGD_RAID_3_STATUS              19
-#define BIGD_RAID_4_STATUS              20
-#define BIGD_RAID_5_STATUS              21
-#define BIGD_RAID_6_STATUS              22
-#define BIGD_RAID_7_STATUS              23
-
-/************************************************/
-/*              Dale cable select bits                                  */
-/************************************************/
-#define SEL_NONE                                        0x00
-#define SEL_1                                           0x01
-#define SEL_2                                           0x02
-#define SEL_3                                           0x04
-#define SEL_4                                           0x08
-#define SEL_NEW_SPEED_1                         0x20
-#define SEL_COPY                                        0x40
-#define SEL_IRQ_OFF                                     0x80
-
-/************************************************/
-/*              Device/Geometry controls                                */
-/************************************************/
-#define GEOMETRY_NONE                           0x0                             // No device
-#define GEOMETRY_SET                            0x1                             // Geometry set
-#define GEOMETRY_LBA                            0x2                             // Geometry set in default LBA mode
-#define GEOMETRY_PHOENIX                        0x3                             // Geometry set in Pheonix BIOS compatibility mode
-
-#define DEVICE_NONE                                     0x0                             // No device present
-#define DEVICE_INACTIVE                         0x1                             // device present but not registered active
-#define DEVICE_ATAPI                            0x2                             // ATAPI device (CD_ROM, Tape, Etc...)
-#define DEVICE_DASD_NONLBA                      0x3                             // Non LBA incompatible device
-#define DEVICE_DASD_LBA                         0x4                             // LBA compatible device
-
-/************************************************/
-/*              BigD fail register bits                                 */
-/************************************************/
-#define FAIL_NONE                               0x00
-#define FAIL_0                                  0x01
-#define FAIL_1                                  0x02
-#define FAIL_2                                  0x04
-#define FAIL_MULTIPLE                   0x08
-#define FAIL_GOOD                               0x20
-#define FAIL_AUDIBLE                    0x40
-#define FAIL_ANY                                0x80
-
-/************************************************/
-/*              Setup Structure Definitions                             */
-/************************************************/
-typedef struct          // device setup parameters
-        {
-        UCHAR   geometryControl;        // geometry control flags
-        UCHAR   device;                         // device code
-        USHORT  sectors;                        // number of sectors per track
-        USHORT  heads;                          // number of heads
-        USHORT  cylinders;                      // number of cylinders for this device
-        ULONG   blocks;                         // number of blocks on device
-        ULONG   realCapacity;           // number of real blocks on this device for drive changed testing
-        } SETUP_DEVICE, *PSETUP_DEVICE;
-
-typedef struct          // master setup structure
-        {
-        USHORT                  startupDelay;
-        BOOL                    promptBIOS;
-        BOOL                    fastFormat;
-        BOOL                    shareInterrupt;
-        BOOL                    rebootRebuild;
-        USHORT                  timingMode;
-        USHORT                  spare5;
-        USHORT                  spare6;
-        SETUP_DEVICE    setupDevice[BIGD_MAXDRIVES];
-        }       SETUP, *PSETUP;
-
-/************************************************/
-/*              RAID Structure Definitions                              */
-/************************************************/
-typedef struct
-        {
-        UCHAR   signature;                      // 0x55 our mirror signature
-        UCHAR   status;                         // current status bits
-        UCHAR   pairIdentifier;         // unique identifier for pair
-        ULONG   reconstructPoint;       // recontruction point for hot reconstruct
-        }       DISK_MIRROR;
-
-typedef struct  DEVICE_RAID1
-        {
-        long            TotalSectors;
-        DISK_MIRROR DiskRaid1;
-        }       DEVICE_RAID1, *PDEVICE_RAID1;
-
-#define DISK_MIRROR_POSITION    0x01A8
-#define SIGNATURE                               0x55
-
-#define MASK_SERIAL_NUMBER      0x0FFE                  // mask for serial number matching
-#define MASK_SERIAL_UNIT        0x0001                  // mask for unit portion of serial number
-
-// Status bits
-#define UCBF_MIRRORED           0x0010                                                          // drive has a pair
-#define UCBF_MATCHED            0x0020                                                          // drive pair is matched
-#define UCBF_SURVIVOR           0x0040                                                          // this unit is a survivor of a pair
-#define UCBF_REBUILD            0x0080                                                          // rebuild in progress on this device
-
-// SCSI controls for RAID
-#define SC_MY_RAID                      0xBF                    // our special CDB command byte for Win95... interface
-#define MY_SCSI_QUERY1          0x32                    // byte 1 subcommand to query driver for RAID 1 informatation
-#define MY_SCSI_REBUILD         0x40                    // byte 1 subcommand to reconstruct a mirrored pair
-#define MY_SCSI_DEMOFAIL        0x54                    // byte 1 subcommand for RAID failure demonstration
-#define MY_SCSI_ALARMMUTE       0x60                    // byte 1 subcommand to mute any alarm currently on
-
-/************************************************/
-/*              Timeout konstants                                               */
-/************************************************/
-#define TIMEOUT_READY                           100                     // 100 mSec
-#define TIMEOUT_DRQ                                     300                     // 300 mSec
-#define TIMEOUT_DATA                            (3 * HZ)        // 3 seconds
-
-/************************************************/
-/*              Misc. macros                                                    */
-/************************************************/
-#define ANY2SCSI(up, p)                                 \
-((UCHAR *)up)[0] = (((ULONG)(p)) >> 8); \
-((UCHAR *)up)[1] = ((ULONG)(p));
-
-#define SCSI2LONG(up)                                   \
-( (((long)*(((UCHAR *)up))) << 16)              \
-+ (((long)(((UCHAR *)up)[1])) << 8)             \
-+ ((long)(((UCHAR *)up)[2])) )
-
-#define XANY2SCSI(up, p)                                \
-((UCHAR *)up)[0] = ((long)(p)) >> 24;   \
-((UCHAR *)up)[1] = ((long)(p)) >> 16;   \
-((UCHAR *)up)[2] = ((long)(p)) >> 8;    \
-((UCHAR *)up)[3] = ((long)(p));
-
-#define XSCSI2LONG(up)                                  \
-( (((long)(((UCHAR *)up)[0])) << 24)    \
-+ (((long)(((UCHAR *)up)[1])) << 16)    \
-+ (((long)(((UCHAR *)up)[2])) <<  8)    \
-+ ((long)(((UCHAR *)up)[3])) )
-
-#define SelectSpigot(padapter,spigot)   outb_p (spigot, padapter->regStatSel)
-#define WriteCommand(padapter,cmd)              outb_p (cmd, padapter->regStatCmd)
-#define AtapiDevice(padapter,b)                 outb_p (b, padapter->regLba24);
-#define AtapiCountLo(padapter,b)                outb_p (b, padapter->regLba8)
-#define AtapiCountHi(padapter,b)                outb_p (b, padapter->regLba16)
-
-/************************************************/
-/*              SCSI CDB operation codes                                */
-/************************************************/
-#define SCSIOP_TEST_UNIT_READY          0x00
-#define SCSIOP_REZERO_UNIT                      0x01
-#define SCSIOP_REWIND                           0x01
-#define SCSIOP_REQUEST_BLOCK_ADDR       0x02
-#define SCSIOP_REQUEST_SENSE            0x03
-#define SCSIOP_FORMAT_UNIT                      0x04
-#define SCSIOP_READ_BLOCK_LIMITS        0x05
-#define SCSIOP_REASSIGN_BLOCKS          0x07
-#define SCSIOP_READ6                            0x08
-#define SCSIOP_RECEIVE                          0x08
-#define SCSIOP_WRITE6                           0x0A
-#define SCSIOP_PRINT                            0x0A
-#define SCSIOP_SEND                                     0x0A
-#define SCSIOP_SEEK6                            0x0B
-#define SCSIOP_TRACK_SELECT                     0x0B
-#define SCSIOP_SLEW_PRINT                       0x0B
-#define SCSIOP_SEEK_BLOCK                       0x0C
-#define SCSIOP_PARTITION                        0x0D
-#define SCSIOP_READ_REVERSE                     0x0F
-#define SCSIOP_WRITE_FILEMARKS          0x10
-#define SCSIOP_FLUSH_BUFFER                     0x10
-#define SCSIOP_SPACE                            0x11
-#define SCSIOP_INQUIRY                          0x12
-#define SCSIOP_VERIFY6                          0x13
-#define SCSIOP_RECOVER_BUF_DATA         0x14
-#define SCSIOP_MODE_SELECT                      0x15
-#define SCSIOP_RESERVE_UNIT                     0x16
-#define SCSIOP_RELEASE_UNIT                     0x17
-#define SCSIOP_COPY                                     0x18
-#define SCSIOP_ERASE                            0x19
-#define SCSIOP_MODE_SENSE                       0x1A
-#define SCSIOP_START_STOP_UNIT          0x1B
-#define SCSIOP_STOP_PRINT                       0x1B
-#define SCSIOP_LOAD_UNLOAD                      0x1B
-#define SCSIOP_RECEIVE_DIAGNOSTIC       0x1C
-#define SCSIOP_SEND_DIAGNOSTIC          0x1D
-#define SCSIOP_MEDIUM_REMOVAL           0x1E
-#define SCSIOP_READ_CAPACITY            0x25
-#define SCSIOP_READ                                     0x28
-#define SCSIOP_WRITE                            0x2A
-#define SCSIOP_SEEK                                     0x2B
-#define SCSIOP_LOCATE                           0x2B
-#define SCSIOP_WRITE_VERIFY                     0x2E
-#define SCSIOP_VERIFY                           0x2F
-#define SCSIOP_SEARCH_DATA_HIGH         0x30
-#define SCSIOP_SEARCH_DATA_EQUAL        0x31
-#define SCSIOP_SEARCH_DATA_LOW          0x32
-#define SCSIOP_SET_LIMITS                       0x33
-#define SCSIOP_READ_POSITION            0x34
-#define SCSIOP_SYNCHRONIZE_CACHE        0x35
-#define SCSIOP_COMPARE                          0x39
-#define SCSIOP_COPY_COMPARE                     0x3A
-#define SCSIOP_WRITE_DATA_BUFF          0x3B
-#define SCSIOP_READ_DATA_BUFF           0x3C
-#define SCSIOP_CHANGE_DEFINITION        0x40
-#define SCSIOP_READ_SUB_CHANNEL         0x42
-#define SCSIOP_READ_TOC                         0x43
-#define SCSIOP_READ_HEADER                      0x44
-#define SCSIOP_PLAY_AUDIO                       0x45
-#define SCSIOP_PLAY_AUDIO_MSF           0x47
-#define SCSIOP_PLAY_TRACK_INDEX         0x48
-#define SCSIOP_PLAY_TRACK_RELATIVE      0x49
-#define SCSIOP_PAUSE_RESUME                     0x4B
-#define SCSIOP_LOG_SELECT                       0x4C
-#define SCSIOP_LOG_SENSE                        0x4D
-#define SCSIOP_MODE_SELECT10            0x55
-#define SCSIOP_MODE_SENSE10                     0x5A
-#define SCSIOP_LOAD_UNLOAD_SLOT         0xA6
-#define SCSIOP_MECHANISM_STATUS         0xBD
-#define SCSIOP_READ_CD                          0xBE
-
-// IDE command definitions
-#define IDE_COMMAND_ATAPI_RESET         0x08
-#define IDE_COMMAND_READ                        0x20
-#define IDE_COMMAND_WRITE                       0x30
-#define IDE_COMMAND_RECALIBRATE         0x10
-#define IDE_COMMAND_SEEK                        0x70
-#define IDE_COMMAND_SET_PARAMETERS      0x91
-#define IDE_COMMAND_VERIFY                      0x40
-#define IDE_COMMAND_ATAPI_PACKET        0xA0
-#define IDE_COMMAND_ATAPI_IDENTIFY      0xA1
-#define IDE_CMD_READ_MULTIPLE           0xC4
-#define IDE_CMD_WRITE_MULTIPLE          0xC5
-#define IDE_CMD_SET_MULTIPLE            0xC6
-#define IDE_COMMAND_IDENTIFY            0xEC
-
-// IDE status definitions
-#define IDE_STATUS_ERROR                        0x01
-#define IDE_STATUS_INDEX                        0x02
-#define IDE_STATUS_CORRECTED_ERROR      0x04
-#define IDE_STATUS_DRQ                          0x08
-#define IDE_STATUS_DSC                          0x10
-#define IDE_STATUS_WRITE_FAULT          0x20
-#define IDE_STATUS_DRDY                         0x40
-#define IDE_STATUS_BUSY                         0x80
-
-typedef struct _ATAPI_STATUS
-        {
-        CHAR    check           :1;
-        CHAR    reserved1       :1;
-        CHAR    corr            :1;
-        CHAR    drq                     :1;
-        CHAR    dsc                     :1;
-        CHAR    reserved2       :1;
-        CHAR    drdy            :1;
-        CHAR    bsy                     :1;
-        }       ATAPI_STATUS;
-
-typedef struct _ATAPI_REASON
-        {
-        CHAR    cod                     :1;
-        CHAR    io                      :1;
-        CHAR    reserved1       :6;
-        }       ATAPI_REASON;
-
-typedef struct _ATAPI_ERROR
-        {
-        CHAR    ili                     :1;
-        CHAR    eom                     :1;
-        CHAR    abort           :1;
-        CHAR    mcr                     :1;
-        CHAR    senseKey        :4;
-        }       ATAPI_ERROR;
-
-// IDE error definitions
-#define IDE_ERROR_AMNF                          0x01
-#define IDE_ERROR_TKONF                         0x02
-#define IDE_ERROR_ABRT                          0x04
-#define IDE_ERROR_MCR                           0x08
-#define IDE_ERROR_IDFN                          0x10
-#define IDE_ERROR_MC                            0x20
-#define IDE_ERROR_UNC                           0x40
-#define IDE_ERROR_BBK                           0x80
-
-// SCSI read capacity structure
-typedef struct _READ_CAPACITY_DATA
-        {
-        ULONG blks;                             /* total blocks (converted to little endian) */
-        ULONG blksiz;                   /* size of each (converted to little endian) */
-        }       READ_CAPACITY_DATA, *PREAD_CAPACITY_DATA;
-
-// SCSI inquiry data
-typedef struct _INQUIRYDATA
-        {
-        UCHAR DeviceType                        :5;
-        UCHAR DeviceTypeQualifier       :3;
-        UCHAR DeviceTypeModifier        :7;
-        UCHAR RemovableMedia            :1;
-    UCHAR Versions;
-    UCHAR ResponseDataFormat;
-    UCHAR AdditionalLength;
-    UCHAR Reserved[2];
-        UCHAR SoftReset                         :1;
-        UCHAR CommandQueue                      :1;
-        UCHAR Reserved2                         :1;
-        UCHAR LinkedCommands            :1;
-        UCHAR Synchronous                       :1;
-        UCHAR Wide16Bit                         :1;
-        UCHAR Wide32Bit                         :1;
-        UCHAR RelativeAddressing        :1;
-    UCHAR VendorId[8];
-    UCHAR ProductId[16];
-    UCHAR ProductRevisionLevel[4];
-    UCHAR VendorSpecific[20];
-    UCHAR Reserved3[40];
-        }       INQUIRYDATA, *PINQUIRYDATA;
-
-// IDE IDENTIFY data
-#pragma pack (1)
-typedef struct _IDENTIFY_DATA
-        {
-    USHORT      GeneralConfiguration;           //  0
-    USHORT      NumberOfCylinders;                      //  1
-    USHORT      Reserved1;                                      //  2
-    USHORT      NumberOfHeads;                          //  3
-    USHORT      UnformattedBytesPerTrack;       //  4
-    USHORT      UnformattedBytesPerSector;      //  5
-    USHORT      SectorsPerTrack;                        //  6
-        USHORT  NumBytesISG;                            //  7 Byte Len - inter-sector gap
-        USHORT  NumBytesSync;                           //  8          - sync field
-        USHORT  NumWordsVUS;                            //  9 Len - Vendor Unique Info
-    USHORT      SerialNumber[10];                       // 10
-    USHORT      BufferType;                                     // 20
-    USHORT      BufferSectorSize;                       // 21
-    USHORT      NumberOfEccBytes;                       // 22
-    USHORT      FirmwareRevision[4];            // 23
-    USHORT      ModelNumber[20];                        // 27
-        USHORT  NumSectorsPerInt        :8;             // 47 Multiple Mode - Sec/Blk
-        USHORT  Reserved2                       :8;             // 47
-        USHORT  DoubleWordMode;                         // 48 flag for double word mode capable
-        USHORT  VendorUnique1           :8;             // 49
-        USHORT  SupportDMA                      :1;             // 49 DMA supported
-        USHORT  SupportLBA                      :1;             // 49 LBA supported
-        USHORT  SupportIORDYDisable     :1;             // 49 IORDY can be disabled
-        USHORT  SupportIORDY            :1;             // 49 IORDY supported
-        USHORT  ReservedPsuedoDMA       :1;             // 49 reserved for pseudo DMA mode support
-        USHORT  Reserved3                       :3;             // 49
-        USHORT  Reserved4;                                      // 50
-        USHORT  Reserved5                       :8;             // 51 Transfer Cycle Timing - PIO
-        USHORT  PIOCycleTime            :8;             // 51 Transfer Cycle Timing - PIO
-        USHORT  Reserved6                       :8;             // 52                       - DMA
-        USHORT  DMACycleTime            :8;             // 52                       - DMA
-        USHORT  Valid_54_58                     :1;             // 53 words 54 - 58 are valid
-        USHORT  Valid_64_70                     :1;             // 53 words 64 - 70 are valid
-        USHORT  Reserved7                       :14;    // 53
-        USHORT  LogNumCyl;                                      // 54 Current Translation - Num Cyl
-        USHORT  LogNumHeads;                            // 55                       Num Heads
-        USHORT  LogSectorsPerTrack;                     // 56                       Sec/Trk
-        ULONG   LogTotalSectors;                        // 57                       Total Sec
-        USHORT  CurrentNumSecPerInt     :8;             // 59 current setting for number of sectors per interrupt
-        USHORT  ValidNumSecPerInt       :1;             // 59 Current setting is valid for number of sectors per interrupt
-        USHORT  Reserved8                       :7;             // 59
-        ULONG   LBATotalSectors;                        // 60 LBA Mode - Sectors
-        USHORT  DMASWordFlags;                          // 62
-        USHORT  DMAMWordFlags;                          // 63
-        USHORT  AdvancedPIOSupport  :8;         // 64 Flow control PIO transfer modes supported
-        USHORT  Reserved9                       :8;             // 64
-        USHORT  MinMultiDMACycle;                       // 65 minimum multiword DMA transfer cycle time per word
-        USHORT  RecomendDMACycle;                       // 66 Manufacturer's recommende multiword DMA transfer cycle time
-        USHORT  MinPIOCycleWithoutFlow;         // 67 Minimum PIO transfer cycle time without flow control
-        USHORT  MinPIOCylceWithFlow;            // 68 Minimum PIO transfer cycle time with IORDY flow control
-        USHORT  ReservedSpace[256-69];          // 69
-        }       IDENTIFY_DATA, *PIDENTIFY_DATA;
-
-// ATAPI configuration bits
-typedef struct _ATAPI_GENERAL_0
-        {
-        USHORT  CmdPacketSize           :2;             // Command packet size
-        USHORT  Reserved1                       :3;
-        USHORT  CmdDrqType                      :2;
-        USHORT  Removable                       :1;
-        USHORT  DeviceType                      :5;
-        USHORT  Reserved2                       :1;
-        USHORT  ProtocolType            :2;
-        }       ATAPI_GENERAL_0;
-
-#pragma pack ()
diff --git a/drivers/scsi/psi_roy.h b/drivers/scsi/psi_roy.h
deleted file mode 100644
index c55b9c04c32a..000000000000
--- a/drivers/scsi/psi_roy.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/****************************************************************************
- * Perceptive Solutions, Inc. PCI-2000 device driver for Linux.
- *
- * psi_roy.h - Linux Host Driver for PCI-2000 IntelliCache SCSI Adapters
- *
- * Copyright (c) 1997-1999 Perceptive Solutions, Inc.
- * All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that redistributions of source
- * code retain the above copyright notice and this comment without
- * modification.
- *
- * Technical updates and product information at:
- *  http://www.psidisk.com
- *
- * Please send questions, comments, bug reports to:
- *  tech@psidisk.com Technical Support
- *
- ****************************************************************************/
-
-#ifndef ROY_HOST
-#define ROY_HOST
-
-/************************************************/
-/*              PCI setup                                                               */
-/************************************************/
-#define VENDOR_PSI                      0x1256
-#define DEVICE_ROY_1            0x5201          /* 'R1' */
-
-/************************************************/
-/*              controller constants                                    */
-/************************************************/
-#define MAXADAPTER                      4                       // Increase this and the sizes of the arrays below, if you need more.
-#define MAX_BUS                         2
-#define MAX_UNITS                       16
-#define TIMEOUT_COMMAND         400                     // number of milliSecondos for command busy timeout
-
-/************************************************/
-/*              I/O address offsets                                             */
-/************************************************/
-#define RTR_MAILBOX                                             0x040
-#define RTR_LOCAL_DOORBELL                              0x060
-#define RTR_PCI_DOORBELL                                0x064
-
-/************************************************/
-/*                                                                                              */
-/*                      Host command codes                                      */
-/*                                                                                              */
-/************************************************/
-#define CMD_READ_CHS            0x01            /* read sectors as specified (CHS mode) */
-#define CMD_READ                        0x02            /* read sectors as specified (RBA mode) */
-#define CMD_READ_SG                     0x03            /* read sectors using scatter/gather list */
-#define CMD_WRITE_CHS           0x04            /* write sectors as specified (CHS mode) */
-#define CMD_WRITE                       0x05            /* write sectors as specified (RBA mode) */
-#define CMD_WRITE_SG            0x06            /* write sectors using scatter/gather list (LBA mode) */
-#define CMD_READ_CHS_SG         0x07            /* read sectors using scatter/gather list (CHS mode) */
-#define CMD_WRITE_CHS_SG        0x08            /* write sectors using scatter/gather list (CHS mode) */
-#define CMD_VERIFY_CHS          0x09            /* verify data on sectors as specified (CHS mode) */
-#define CMD_VERIFY                      0x0A            /* verify data on sectors as specified (RBA mode) */
-#define CMD_DASD_CDB            0x0B            /* process CDB for a DASD device */
-#define CMD_DASD_CDB_SG         0x0C            /* process CDB for a DASD device with scatter/gather */
-
-#define CMD_READ_ABS            0x10            /* read absolute disk */
-#define CMD_WRITE_ABS           0x11            /* write absolute disk */
-#define CMD_VERIFY_ABS          0x12            /* verify absolute disk */
-#define CMD_TEST_READY          0x13            /* test unit ready and return status code */
-#define CMD_LOCK_DOOR           0x14            /* lock device door */
-#define CMD_UNLOCK_DOOR         0x15            /* unlock device door */
-#define CMD_EJECT_MEDIA         0x16            /* eject the media */
-#define CMD_UPDATE_CAP          0x17            /* update capacity information */
-#define CMD_TEST_PRIV           0x18            /* test and setup private format media */
-
-
-#define CMD_SCSI_THRU           0x30            /* SCSI pass through CDB */
-#define CMD_SCSI_THRU_SG        0x31            /* SCSI pass through CDB with scatter/gather */
-#define CMD_SCSI_REQ_SENSE      0x32            /* SCSI pass through request sense after check condition */
-
-#define CMD_DASD_RAID_RQ        0x35            /* request DASD RAID drive data */
-#define CMD_DASD_RAID_RQ0       0x31                    /* byte 1 subcommand to query for RAID 0 informatation */
-#define CMD_DASD_RAID_RQ1       0x32                    /* byte 1 subcommand to query for RAID 1 informatation */
-#define CMD_DASD_RAID_RQ5       0x33                    /* byte 1 subcommand to query for RAID 5 informatation */
-
-#define CMD_DASD_SCSI_INQ       0x36            /* do DASD inquire and return in SCSI format */
-#define CMD_DASD_CAP            0x37            /* read DASD capacity */
-#define CMD_DASD_INQ            0x38            /* do DASD inquire for type data and return SCSI/EIDE inquiry */
-#define CMD_SCSI_INQ            0x39            /* do SCSI inquire */
-#define CMD_READ_SETUP          0x3A            /* Get setup structures from controller */
-#define CMD_WRITE_SETUP         0x3B            /* Put setup structures in controller and burn in flash */
-#define CMD_READ_CONFIG         0x3C            /* Get the entire configuration and setup structures */
-#define CMD_WRITE_CONFIG        0x3D            /* Put the entire configuration and setup structures in flash */
-
-#define CMD_TEXT_DEVICE         0x3E            /* obtain device text */
-#define CMD_TEXT_SIGNON         0x3F            /* get sign on banner */
-
-#define CMD_QUEUE                       0x40            /* any command below this generates a queue tag interrupt to host*/
-
-#define CMD_PREFETCH            0x40            /* prefetch sectors as specified */
-#define CMD_TEST_WRITE          0x41            /* Test a device for write protect */
-#define CMD_LAST_STATUS         0x42            /* get last command status and error data*/
-#define CMD_ABORT                       0x43            /* abort command as specified */
-#define CMD_ERROR                       0x44            /* fetch error code from a tagged op */
-#define CMD_DONE                        0x45            /* done with operation */
-#define CMD_DIAGNOSTICS         0x46            /* execute controller diagnostics and wait for results */
-#define CMD_FEATURE_MODE        0x47            /* feature mode control word */
-#define CMD_DASD_INQUIRE        0x48            /* inquire as to DASD SCSI device (32 possible) */
-#define CMD_FEATURE_QUERY       0x49            /* query the feature control word */
-#define CMD_DASD_EJECT          0x4A            /* Eject removable media for DASD type */
-#define CMD_DASD_LOCK           0x4B            /* Lock removable media for DASD type */
-#define CMD_DASD_TYPE           0x4C            /* obtain DASD device type */
-#define CMD_NUM_DEV                     0x4D            /* obtain the number of devices connected to the controller */
-#define CMD_GET_PARMS           0x4E            /* obtain device parameters */
-#define CMD_SPECIFY                     0x4F            /* specify operating system for scatter/gather operations */
-
-#define CMD_RAID_GET_DEV        0x50            /* read RAID device geometry */
-#define CMD_RAID_READ           0x51            /* read RAID 1 parameter block */
-#define CMD_RAID_WRITE          0x52            /* write RAID 1 parameter block */
-#define CMD_RAID_LITEUP         0x53            /* Light up the drive light for identification */
-#define CMD_RAID_REBUILD        0x54            /* issue a RAID 1 pair rebuild */
-#define CMD_RAID_MUTE           0x55            /* mute RAID failure alarm */
-#define CMD_RAID_FAIL           0x56            /* induce a RAID failure */
-#define CMD_RAID_STATUS         0x57            /* get status of RAID pair */
-#define CMD_RAID_STOP           0x58            /* stop any reconstruct in progress */
-#define CMD_RAID_START          0x59            /* start reconstruct */
-#define CMD_RAID0_READ          0x5A            /* read RAID 0 parameter block */
-#define CMD_RAID0_WRITE         0x5B            /* write RAID 0 parameter block */
-#define CMD_RAID5_READ          0x5C            /* read RAID 5 parameter block */
-#define CMD_RAID5_WRITE         0x5D            /* write RAID 5 parameter block */
-
-#define CMD_ERASE_TABLES        0x5F            /* erase partition table and RAID signatutures */
-
-#define CMD_SCSI_GET            0x60            /* get SCSI pass through devices */
-#define CMD_SCSI_TIMEOUT        0x61            /* set SCSI pass through timeout */
-#define CMD_SCSI_ERROR          0x62            /* get SCSI pass through request sense length and residual data count */
-#define CMD_GET_SPARMS          0x63            /* get SCSI bus and user parms */
-#define CMD_SCSI_ABORT          0x64            /* abort by setting time-out to zero */
-
-#define CMD_CHIRP_CHIRP         0x77            /* make a chirp chirp sound */
-#define CMD_GET_LAST_DONE       0x78            /* get tag of last done in progress */
-#define CMD_GET_FEATURES        0x79            /* get feature code and ESN */
-#define CMD_CLEAR_CACHE         0x7A            /* Clear cache on specified device */
-#define CMD_BIOS_TEST           0x7B            /* Test whether or not to load BIOS */
-#define CMD_WAIT_FLUSH          0x7C            /* wait for cache flushed and invalidate read cache */
-#define CMD_RESET_BUS           0x7D            /* reset the SCSI bus */
-#define CMD_STARTUP_QRY         0x7E            /* startup in progress query */
-#define CMD_RESET                       0x7F            /* reset the controller */
-
-#define CMD_RESTART_RESET       0x80            /* reload and restart the controller at any reset issued */
-#define CMD_SOFT_RESET          0x81            /* do a soft reset NOW! */
-
-/************************************************/
-/*                                                                                              */
-/*                              Host return errors                              */
-/*                                                                                              */
-/************************************************/
-#define ERR08_TAGGED            0x80            /* doorbell error ored with tag */
-
-#define ERR16_NONE                      0x0000          /* no errors */
-#define ERR16_SC_COND_MET       0x0004          /* SCSI status - Condition Met */
-#define ERR16_CMD                       0x0101          /* command error */
-#define ERR16_SC_CHECK_COND     0x0002          /* SCSI status - Check Condition */
-#define ERR16_CMD_NOT           0x0201          /* command not supported */
-#define ERR16_NO_DEVICE     0x0301              /* invalid device selection */
-#define ERR16_SECTOR            0x0202          /* bad sector */
-#define ERR16_PROTECT           0x0303          /* write protected */
-#define ERR16_NOSECTOR          0x0404          /* sector not found */
-#define ERR16_MEDIA                     0x0C0C          /* invalid media */
-#define ERR16_CONTROL           0x2020          /* controller error */
-#define ERR16_CONTROL_DMA       0x2120          /* controller DMA engine error */
-#define ERR16_NO_ALARM          0x2220          /* alarm is not active */
-#define ERR16_OP_BUSY           0x2320          /* operation busy */
-#define ERR16_SEEK                      0x4040          /* seek failure */
-#define ERR16_DEVICE_FAIL       0x4140          /* device has failed */
-#define ERR16_TIMEOUT           0x8080          /* timeout error */
-#define ERR16_DEV_NOT_READY     0xAAAA          /* drive not ready */
-#define ERR16_UNDEFINED         0xBBBB          /* undefined error */
-#define ERR16_WRITE_FAULT       0xCCCC          /* write fault */
-#define ERR16_INVALID_DEV       0x4001          /* invalid device access */
-#define ERR16_DEVICE_BUSY       0x4002          /* device is busy */
-#define ERR16_MEMORY            0x4003          /* device pass thru requires too much memory */
-#define ERR16_NO_FEATURE        0x40FA          /* feature no implemented */
-#define ERR16_NOTAG                     0x40FD          /* no tag space available */
-#define ERR16_NOT_READY         0x40FE          /* controller not ready error */
-#define ERR16_SETUP_FLASH       0x5050          /* error when writing setup to flash memory */
-#define ERR16_SETUP_SIZE        0x5051          /* setup block size error */
-#define ERR16_SENSE                     0xFFFF          /* sense opereration failed */
-#define ERR16_SC_BUSY           0x0008          /* SCSI status - Busy */
-#define ERR16_SC_RES_CONFL      0x0018          /* SCSI status - Reservation Conflict */
-#define ERR16_SC_CMD_TERM       0x0022          /* SCSI status - Command Terminated */
-#define ERR16_SC_OTHER          0x00FF          /* SCSI status - not recognized (any value masked) */
-#define ERR16_MEDIA_CHANGED     0x8001          /* devices media has been changed */
-
-#define ERR32_NONE                      0x00000000      /* no errors */
-#define ERR32_SC_COND_MET       0x00000004      /* SCSI status - Condition Met */
-#define ERR32_CMD                       0x00010101      /* command error */
-#define ERR32_SC_CHECK_COND     0x00020002      /* SCSI status - Check Condition */
-#define ERR32_CMD_NOT           0x00030201      /* command not supported */
-#define ERR32_NO_DEVICE     0x00040301  /* invalid device selection */
-#define ERR32_SECTOR            0x00050202      /* bad sector */
-#define ERR32_PROTECT           0x00060303      /* write protected */
-#define ERR32_NOSECTOR          0x00070404      /* sector not found */
-#define ERR32_MEDIA                     0x00080C0C      /* invalid media */
-#define ERR32_CONTROL           0x00092020      /* controller error */
-#define ERR32_CONTROL_DMA       0x000A2120      /* Controller DMA error */
-#define ERR32_NO_ALARM          0x000B2220      /* alarm is not active */
-#define ERR32_OP_BUSY           0x000C2320      /* operation busy */
-#define ERR32_SEEK                      0x000D4040      /* seek failure */
-#define ERR32_DEVICE_FAIL       0x000E4140      /* device has failed */
-#define ERR32_TIMEOUT           0x000F8080      /* timeout error */
-#define ERR32_DEV_NOT_READY     0x0010AAAA      /* drive not ready */
-#define ERR32_UNDEFINED         0x0011BBBB      /* undefined error */
-#define ERR32_WRITE_FAULT       0x0012CCCC      /* write fault */
-#define ERR32_INVALID_DEV       0x00134001      /* invalid device access */
-#define ERR32_DEVICE_BUSY       0x00144002      /* device is busy */
-#define ERR32_MEMORY            0x00154003      /* device pass thru requires too much memory */
-#define ERR32_NO_FEATURE        0x001640FA      /* feature no implemented */
-#define ERR32_NOTAG                     0x001740FD      /* no tag space available */
-#define ERR32_NOT_READY         0x001840FE      /* controller not ready error */
-#define ERR32_SETUP_FLASH       0x00195050      /* error when writing setup to flash memory */
-#define ERR32_SETUP_SIZE        0x001A5051      /* setup block size error */
-#define ERR32_SENSE                     0x001BFFFF      /* sense opereration failed */
-#define ERR32_SC_BUSY           0x001C0008      /* SCSI status - Busy */
-#define ERR32_SC_RES_CONFL      0x001D0018      /* SCSI status - Reservation Conflict */
-#define ERR32_SC_CMD_TERM       0x001E0022      /* SCSI status - Command Terminated */
-#define ERR32_SC_OTHER          0x001F00FF      /* SCSI status - not recognized (any value masked) */
-#define ERR32_MEDIA_CHANGED     0x00208001      /* devices media has been changed */
-
-/************************************************/
-/*                                                                                              */
-/*      Host Operating System specification codes       */
-/*                                                                                              */
-/************************************************/
-#define SPEC_INTERRUPT          0x80            /* specification requires host interrupt */
-#define SPEC_BACKWARD_SG        0x40            /* specification requires scatter/gather items reversed */
-#define SPEC_DOS_BLOCK          0x01            /* DOS DASD blocking on pass through */
-#define SPEC_OS2_V3                     0x02            /* OS/2 Warp */
-#define SPCE_SCO_3242           0x04            /* SCO 3.4.2.2 */
-#define SPEC_QNX_4X                     0x05            /* QNX 4.XX */
-#define SPEC_NOVELL_NWPA        0x08            /* Novell NWPA scatter/gather support */
-
-/************************************************/
-/*                                                                                              */
-/*      Inquire structures                                                      */
-/*                                                                                              */
-/************************************************/
-typedef struct  _CNT_SCSI_INQ
-        {
-        UCHAR   devt;                                           /* 00: device type */
-        UCHAR   devtm;                                          /* 01: device type modifier */
-        UCHAR   svers;                                          /* 02: SCSI version */
-        UCHAR   rfmt;                                           /* 03: response data format */
-        UCHAR   adlen;                                          /* 04: additional length of data */
-        UCHAR   res1;                                           /* 05: */
-        UCHAR   res2;                                           /* 06: */
-        UCHAR   fncs;                                           /* 07: functional capabilities */
-        UCHAR   vid[8];                                         /* 08: vendor ID */
-        UCHAR   pid[16];                                        /* 10: product ID */
-        UCHAR   rev[4];                                         /* 20: product revision */
-        }       CNT_SCSI_INQ;
-
-typedef struct  _CNT_IDE_INQ
-        {
-        USHORT  GeneralConfiguration;           /* 00 */
-        USHORT  NumberOfCylinders;                      /* 02 */
-        USHORT  Reserved1;                                      /* 04 */
-        USHORT  NumberOfHeads;                          /* 06 */
-        USHORT  UnformattedBytesPerTrack;       /* 08 */
-        USHORT  UnformattedBytesPerSector;      /* 0A */
-        USHORT  SectorsPerTrack;                        /* 0C */
-        USHORT  VendorUnique1[3];                       /* 0E */
-        USHORT  SerialNumber[10];                       /* 14 */
-        USHORT  BufferType;                                     /* 28 */
-        USHORT  BufferSectorSize;                       /* 2A */
-        USHORT  NumberOfEccBytes;                       /* 2C */
-        USHORT  FirmwareRevision[4];            /* 2E */
-        USHORT  ModelNumber[20];                        /* 36 */
-        UCHAR   MaximumBlockTransfer;           /* 5E */
-        UCHAR   VendorUnique2;                          /* 5F */
-        USHORT  DoubleWordIo;                           /* 60 */
-        USHORT  Capabilities;                           /* 62 */
-        USHORT  Reserved2;                                      /* 64 */
-        UCHAR   VendorUnique3;                          /* 66 */
-        UCHAR   PioCycleTimingMode;                     /* 67 */
-        UCHAR   VendorUnique4;                          /* 68 */
-        UCHAR   DmaCycleTimingMode;                     /* 69 */
-        USHORT  TranslationFieldsValid;         /* 6A */
-        USHORT  NumberOfCurrentCylinders;       /* 6C */
-        USHORT  NumberOfCurrentHeads;           /* 6E */
-        USHORT  CurrentSectorsPerTrack;         /* 70 */
-        ULONG   CurrentSectorCapacity;          /* 72 */
-        }       CNT_IDE_INQ;
-
-typedef struct  _DASD_INQUIRE
-        {
-        ULONG   type;                                           /* 0 = SCSI, 1 = IDE */
-        union
-                {
-                CNT_SCSI_INQ    scsi;                   /* SCSI inquire data */
-                CNT_IDE_INQ             ide;                    /* IDE inquire data */
-                }       inq;
-        }       DASD_INQUIRE;
-
-/************************************************/
-/*                                                                                              */
-/*      Device Codes                                                            */
-/*                                                                                              */
-/************************************************/
-#define DEVC_DASD                       0x00            /* Direct-access Storage Device */
-#define DEVC_SEQACESS           0x01            /* Sequential-access device */
-#define DEVC_PRINTER            0x02            /* Printer device */
-#define DEVC_PROCESSOR          0x03            /* Processor device */
-#define DEVC_WRITEONCE          0x04            /* Write-once device */
-#define DEVC_CDROM                      0x05            /* CD-ROM device */
-#define DEVC_SCANNER            0x06            /* Scanner device */
-#define DEVC_OPTICAL            0x07            /* Optical memory device */
-#define DEVC_MEDCHGR            0x08            /* Medium changer device */
-#define DEVC_DASD_REMOVABLE     0x80            /* Direct-access storage device, Removable */
-#define DEVC_NONE                       0xFF            /* no device */
-
-// SCSI controls for RAID
-#define SC_MY_RAID                      0xBF                    // our special CDB command byte for Win95... interface
-#define MY_SCSI_QUERY0          0x31                    // byte 1 subcommand to query driver for RAID 0 informatation
-#define MY_SCSI_QUERY1          0x32                    // byte 1 subcommand to query driver for RAID 1 informatation
-#define MY_SCSI_QUERY5          0x33                    // byte 1 subcommand to query driver for RAID 5 informatation
-#define MY_SCSI_REBUILD         0x40                    // byte 1 subcommand to reconstruct a mirrored pair
-#define MY_SCSI_DEMOFAIL        0x54                    // byte 1 subcommand for RAID failure demonstration
-#define MY_SCSI_ALARMMUTE       0x60                    // byte 1 subcommand to mute any alarm currently on
-
-
-#endif
-
diff --git a/drivers/scsi/ql1040_fw.h b/drivers/scsi/ql1040_fw.h
index 89d8e09ec387..aaf9284a8b7d 100644
--- a/drivers/scsi/ql1040_fw.h
+++ b/drivers/scsi/ql1040_fw.h
@@ -25,17 +25,17 @@
  */
 
 /*
- *      Firmware Version 7.65.00 (14:17 Jul 20, 1999)
+ *      Firmware Version 7.65.06 (14:38 Jan 07, 2002)
  */
 
-static unsigned char firmware_version[] = {7,65,0};
+static unsigned char firmware_version[] = {7,65,6};
 
-#define FW_VERSION_STRING "7.65.0"
+#define FW_VERSION_STRING "7.65.06"
 
 static unsigned short risc_code_addr01 = 0x1000 ;
 
 static unsigned short risc_code01[] = { 
-        0x0078, 0x103a, 0x0000, 0x4057, 0x0000, 0x2043, 0x4f50, 0x5952,
+        0x0078, 0x103a, 0x0000, 0x4158, 0x0000, 0x2043, 0x4f50, 0x5952,
         0x4947, 0x4854, 0x2031, 0x3939, 0x3520, 0x514c, 0x4f47, 0x4943,
         0x2043, 0x4f52, 0x504f, 0x5241, 0x5449, 0x4f4e, 0x2049, 0x5350,
         0x3130, 0x3230, 0x2049, 0x2f54, 0x2046, 0x6972, 0x6d77, 0x6172,
@@ -45,7 +45,7 @@ static unsigned short risc_code01[] = {
         0x3031, 0x2024, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x0048,
         0x1045, 0x0038, 0x104b, 0x0078, 0x1047, 0x0028, 0x104b, 0x20b9,
         0x1212, 0x0078, 0x104d, 0x20b9, 0x2222, 0x20c1, 0x0008, 0x2071,
-        0x0010, 0x70c3, 0x0004, 0x20c9, 0x77ff, 0x2089, 0x1186, 0x70c7,
+        0x0010, 0x70c3, 0x0004, 0x20c9, 0x78ff, 0x2089, 0x1186, 0x70c7,
         0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3, 0x0007, 0x3f00,
         0x70d6, 0x20c1, 0x0008, 0x2019, 0x0000, 0x2009, 0xfeff, 0x2100,
         0x200b, 0xa5a5, 0xa1ec, 0x7fff, 0x2d64, 0x206b, 0x0a0a, 0xaddc,
@@ -59,62 +59,62 @@ static unsigned short risc_code01[] = {
         0x118e, 0x284a, 0x263a, 0x98c0, 0xa188, 0x1000, 0x212c, 0x200b,
         0xa5a5, 0x2114, 0xa286, 0xa5a5, 0x0040, 0x10bc, 0x250a, 0xa18a,
         0x1000, 0x98c1, 0x0078, 0x10c1, 0x250a, 0x0078, 0x10c1, 0x2c6a,
-        0x2a5a, 0x2130, 0xa18a, 0x0040, 0x2128, 0xa1a2, 0x5100, 0x8424,
-        0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0xa192, 0x7800, 0x2009,
-        0x0000, 0x2001, 0x0031, 0x1078, 0x1cba, 0x2218, 0x2079, 0x5100,
+        0x2a5a, 0x2130, 0xa18a, 0x0040, 0x2128, 0xa1a2, 0x5200, 0x8424,
+        0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0xa192, 0x7900, 0x2009,
+        0x0000, 0x2001, 0x0031, 0x1078, 0x1d26, 0x2218, 0x2079, 0x5200,
         0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9, 0x0040, 0x42a4, 0x8109,
         0x00c0, 0x10dc, 0x7ef2, 0x8528, 0x7de6, 0x7cea, 0x7bee, 0x7883,
         0x0000, 0x2031, 0x0030, 0x78cf, 0x0101, 0x780b, 0x0002, 0x780f,
-        0x0002, 0x784f, 0x0003, 0x2069, 0x5140, 0x2001, 0x04fd, 0x2004,
+        0x0002, 0x784f, 0x0003, 0x2069, 0x5240, 0x2001, 0x04fd, 0x2004,
         0xa082, 0x0005, 0x0048, 0x1104, 0x0038, 0x1100, 0x0078, 0x1108,
         0x681b, 0x003c, 0x0078, 0x110a, 0x00a8, 0x1108, 0x681b, 0x003c,
         0x681b, 0x0028, 0x6807, 0x0007, 0x680b, 0x00fa, 0x680f, 0x0008,
         0x6813, 0x0005, 0x6823, 0x0000, 0x6827, 0x0006, 0x6817, 0x0008,
-        0x682b, 0x0000, 0x681f, 0x0019, 0x2069, 0x5380, 0x2011, 0x0020,
+        0x682b, 0x0000, 0x681f, 0x0019, 0x2069, 0x5480, 0x2011, 0x0020,
         0x2009, 0x0010, 0x680b, 0x080c, 0x680f, 0x0019, 0x6803, 0xfd00,
         0x6807, 0x0018, 0x6a1a, 0x2d00, 0xa0e8, 0x0008, 0xa290, 0x0004,
-        0x8109, 0x00c0, 0x1122, 0x2069, 0x5400, 0x2009, 0x0002, 0x20a9,
+        0x8109, 0x00c0, 0x1122, 0x2069, 0x5500, 0x2009, 0x0002, 0x20a9,
         0x0100, 0x6837, 0x0000, 0x680b, 0x0040, 0x7bf0, 0xa386, 0xfeff,
         0x00c0, 0x1148, 0x6817, 0x0100, 0x681f, 0x0064, 0x0078, 0x114c,
         0x6817, 0x0064, 0x681f, 0x0002, 0xade8, 0x0010, 0x0070, 0x1152,
-        0x0078, 0x1139, 0x8109, 0x00c0, 0x1137, 0x1078, 0x220a, 0x1078,
-        0x482c, 0x1078, 0x1963, 0x1078, 0x4d22, 0x3200, 0xa085, 0x000d,
+        0x0078, 0x1139, 0x8109, 0x00c0, 0x1137, 0x1078, 0x22a7, 0x1078,
+        0x493d, 0x1078, 0x19b5, 0x1078, 0x4e33, 0x3200, 0xa085, 0x000d,
         0x2090, 0x70c3, 0x0000, 0x0090, 0x116c, 0x70c0, 0xa086, 0x0002,
         0x00c0, 0x116c, 0x1078, 0x1284, 0x1078, 0x1196, 0x78cc, 0xa005,
-        0x00c0, 0x117a, 0x1078, 0x1ce3, 0x0010, 0x1180, 0x0068, 0x1180,
-        0x1078, 0x20e9, 0x0010, 0x1180, 0x0068, 0x1180, 0x1078, 0x1a48,
-        0x00e0, 0x116c, 0x1078, 0x4ba9, 0x0078, 0x116c, 0x118e, 0x1190,
-        0x240b, 0x240b, 0x48ad, 0x48ad, 0x240b, 0x240b, 0x0078, 0x118e,
+        0x00c0, 0x117a, 0x1078, 0x1d4f, 0x0010, 0x1180, 0x0068, 0x1180,
+        0x1078, 0x2186, 0x0010, 0x1180, 0x0068, 0x1180, 0x1078, 0x1ab9,
+        0x00e0, 0x116c, 0x1078, 0x4cba, 0x0078, 0x116c, 0x118e, 0x1190,
+        0x24ac, 0x24ac, 0x49be, 0x49be, 0x24ac, 0x24ac, 0x0078, 0x118e,
         0x0078, 0x1190, 0x0078, 0x1192, 0x0078, 0x1194, 0x0068, 0x1201,
         0x2061, 0x0000, 0x6018, 0xa084, 0x0001, 0x00c0, 0x1201, 0x7814,
         0xa005, 0x00c0, 0x11a7, 0x0010, 0x1202, 0x0078, 0x1201, 0x2009,
-        0x515b, 0x2104, 0xa005, 0x00c0, 0x1201, 0x2009, 0x5164, 0x200b,
+        0x525b, 0x2104, 0xa005, 0x00c0, 0x1201, 0x2009, 0x5264, 0x200b,
         0x0000, 0x7914, 0xa186, 0x0042, 0x00c0, 0x11cc, 0x7816, 0x2009,
-        0x5162, 0x2164, 0x200b, 0x0000, 0x6018, 0x70c6, 0x6014, 0x70ca,
+        0x5262, 0x2164, 0x200b, 0x0000, 0x6018, 0x70c6, 0x6014, 0x70ca,
         0x611c, 0xa18c, 0xff00, 0x6020, 0xa084, 0x00ff, 0xa105, 0x70ce,
-        0x1078, 0x1948, 0x0078, 0x11ff, 0x7814, 0xa086, 0x0018, 0x00c0,
-        0x11d3, 0x1078, 0x165a, 0x7817, 0x0000, 0x2009, 0x5162, 0x2104,
-        0xa065, 0x0040, 0x11ef, 0x0c7e, 0x609c, 0x2060, 0x1078, 0x19b3,
-        0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009, 0x000c, 0x6007,
-        0x0103, 0x1078, 0x1924, 0x00c0, 0x11fb, 0x1078, 0x1948, 0x2009,
-        0x5162, 0x200b, 0x0000, 0x2009, 0x515c, 0x2104, 0x200b, 0x0000,
+        0x1078, 0x199a, 0x0078, 0x11ff, 0x7814, 0xa086, 0x0018, 0x00c0,
+        0x11d3, 0x1078, 0x1678, 0x7817, 0x0000, 0x2009, 0x5262, 0x2104,
+        0xa065, 0x0040, 0x11ef, 0x0c7e, 0x609c, 0x2060, 0x1078, 0x1a17,
+        0x0c7f, 0x609f, 0x0000, 0x1078, 0x174e, 0x2009, 0x000c, 0x6007,
+        0x0103, 0x1078, 0x1976, 0x00c0, 0x11fb, 0x1078, 0x199a, 0x2009,
+        0x5262, 0x200b, 0x0000, 0x2009, 0x525c, 0x2104, 0x200b, 0x0000,
         0xa005, 0x0040, 0x11ff, 0x2001, 0x4005, 0x0078, 0x1286, 0x0078,
         0x1284, 0x007c, 0x70c3, 0x0000, 0x70c7, 0x0000, 0x70cb, 0x0000,
         0x70cf, 0x0000, 0x70c0, 0xa0bc, 0xffc0, 0x00c0, 0x1252, 0x2038,
         0x0079, 0x1212, 0x1284, 0x12e5, 0x12a9, 0x12fe, 0x130d, 0x1313,
-        0x12a0, 0x1748, 0x1317, 0x1298, 0x12ad, 0x12af, 0x12b1, 0x12b3,
-        0x174d, 0x1298, 0x1329, 0x1360, 0x1672, 0x1742, 0x12b5, 0x1591,
-        0x15ad, 0x15c9, 0x15f4, 0x154a, 0x1558, 0x156c, 0x1580, 0x13df,
-        0x1298, 0x138d, 0x1393, 0x1398, 0x139d, 0x13a3, 0x13a8, 0x13ad,
-        0x13b2, 0x13b7, 0x13bb, 0x13d0, 0x13dc, 0x1298, 0x1298, 0x1298,
-        0x1298, 0x13eb, 0x13f4, 0x1403, 0x1429, 0x1433, 0x143a, 0x1480,
-        0x148f, 0x149e, 0x14b0, 0x152a, 0x153a, 0x1298, 0x1298, 0x1298,
-        0x1298, 0x153f, 0xa0bc, 0xffa0, 0x00c0, 0x1298, 0x2038, 0xa084,
-        0x001f, 0x0079, 0x125b, 0x1786, 0x1789, 0x1799, 0x1298, 0x1298,
-        0x18df, 0x18fc, 0x1298, 0x1298, 0x1298, 0x1900, 0x1908, 0x1298,
-        0x1298, 0x1298, 0x1298, 0x12db, 0x12f4, 0x131f, 0x1356, 0x1668,
-        0x1764, 0x1778, 0x1298, 0x1829, 0x190e, 0x18bb, 0x18c5, 0x18c9,
-        0x18d7, 0x1298, 0x1298, 0x72ca, 0x71c6, 0x2001, 0x4006, 0x0078,
+        0x12a0, 0x1766, 0x1317, 0x1298, 0x12ad, 0x12af, 0x12b1, 0x12b3,
+        0x176b, 0x1298, 0x1329, 0x1365, 0x1690, 0x1760, 0x12b5, 0x15af,
+        0x15cb, 0x15e7, 0x1612, 0x1568, 0x1576, 0x158a, 0x159e, 0x13e9,
+        0x1298, 0x1397, 0x139d, 0x13a2, 0x13a7, 0x13ad, 0x13b2, 0x13b7,
+        0x13bc, 0x13c1, 0x13c5, 0x13da, 0x13e6, 0x1298, 0x1298, 0x1298,
+        0x1298, 0x13f5, 0x13fe, 0x140d, 0x1451, 0x145b, 0x1462, 0x14a8,
+        0x14b7, 0x14c6, 0x14d8, 0x1548, 0x1558, 0x1298, 0x1298, 0x1298,
+        0x1298, 0x155d, 0xa0bc, 0xffa0, 0x00c0, 0x1298, 0x2038, 0xa084,
+        0x001f, 0x0079, 0x125b, 0x17a4, 0x17a7, 0x17b7, 0x1298, 0x1298,
+        0x1931, 0x194e, 0x1298, 0x1298, 0x1298, 0x1952, 0x195a, 0x1298,
+        0x1298, 0x1298, 0x1298, 0x12db, 0x12f4, 0x131f, 0x135b, 0x1686,
+        0x1782, 0x1796, 0x1298, 0x1847, 0x1960, 0x190d, 0x1917, 0x191b,
+        0x1929, 0x1298, 0x1298, 0x72ca, 0x71c6, 0x2001, 0x4006, 0x0078,
         0x1286, 0x73ce, 0x72ca, 0x71c6, 0x2001, 0x4000, 0x70c2, 0x0068,
         0x1287, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x5000, 0x00e0,
         0x128f, 0x00e0, 0x1291, 0x0068, 0x1291, 0x2091, 0x4080, 0x007c,
@@ -126,1974 +126,2005 @@ static unsigned short risc_code01[] = {
         0x0007, 0x3f00, 0x70d6, 0x2079, 0x0000, 0x781b, 0x0001, 0x2031,
         0x0030, 0x2059, 0x1000, 0x2029, 0x0457, 0x2051, 0x0470, 0x2061,
         0x0472, 0x20b9, 0xffff, 0x20c1, 0x0000, 0x2091, 0x5000, 0x2091,
-        0x4080, 0x0078, 0x0455, 0x1078, 0x1b53, 0x00c0, 0x129c, 0x75d8,
+        0x4080, 0x0078, 0x0455, 0x1078, 0x1bc4, 0x00c0, 0x129c, 0x75d8,
         0x74dc, 0x75da, 0x74de, 0x0078, 0x12e8, 0x2029, 0x0000, 0x2520,
-        0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1a8d, 0x0040, 0x1284,
-        0x70c3, 0x4002, 0x0078, 0x1284, 0x1078, 0x1b53, 0x00c0, 0x129c,
+        0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1afe, 0x0040, 0x1284,
+        0x70c3, 0x4002, 0x0078, 0x1284, 0x1078, 0x1bc4, 0x00c0, 0x129c,
         0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x1301, 0x2029, 0x0000,
-        0x2520, 0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1aed, 0x0040,
+        0x2520, 0x71d0, 0x73c8, 0x72cc, 0x70c4, 0x1078, 0x1b5e, 0x0040,
         0x1284, 0x70c3, 0x4002, 0x0078, 0x1284, 0x71c4, 0x70c8, 0x2114,
         0x200a, 0x0078, 0x1282, 0x71c4, 0x2114, 0x0078, 0x1282, 0x70c7,
-        0x0007, 0x70cb, 0x0041, 0x70cf, 0x0000, 0x0078, 0x1284, 0x1078,
-        0x1b53, 0x00c0, 0x129c, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078,
+        0x0007, 0x70cb, 0x0041, 0x70cf, 0x0006, 0x0078, 0x1284, 0x1078,
+        0x1bc4, 0x00c0, 0x129c, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078,
         0x132c, 0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d0,
-        0x70c6, 0x72ca, 0x73ce, 0x74d2, 0xa005, 0x0040, 0x1350, 0x8001,
-        0x7892, 0xa084, 0xfc00, 0x0040, 0x1345, 0x78cc, 0xa085, 0x0001,
-        0x78ce, 0x2001, 0x4005, 0x0078, 0x1286, 0x7a9a, 0x7b9e, 0x7da2,
-        0x7ea6, 0x7c96, 0x78cc, 0xa084, 0xfffc, 0x78ce, 0x0078, 0x1354,
-        0x78cc, 0xa085, 0x0001, 0x78ce, 0x0078, 0x1284, 0x1078, 0x1b53,
-        0x00c0, 0x129c, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078, 0x1363,
-        0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d4, 0x70c6,
-        0x72ca, 0x73ce, 0x74d6, 0xa005, 0x0040, 0x1387, 0x8001, 0x78ae,
-        0xa084, 0xfc00, 0x0040, 0x137c, 0x78cc, 0xa085, 0x0100, 0x78ce,
-        0x2001, 0x4005, 0x0078, 0x1286, 0x7ab6, 0x7bba, 0x7dbe, 0x7ec2,
-        0x7cb2, 0x78cc, 0xa084, 0xfcff, 0x78ce, 0x0078, 0x138b, 0x78cc,
-        0xa085, 0x0100, 0x78ce, 0x0078, 0x1284, 0x2009, 0x5161, 0x210c,
-        0x7aec, 0x0078, 0x1282, 0x2009, 0x5141, 0x210c, 0x0078, 0x1283,
-        0x2009, 0x5142, 0x210c, 0x0078, 0x1283, 0x2061, 0x5140, 0x610c,
-        0x6210, 0x0078, 0x1282, 0x2009, 0x5145, 0x210c, 0x0078, 0x1283,
-        0x2009, 0x5146, 0x210c, 0x0078, 0x1283, 0x2009, 0x5148, 0x210c,
-        0x0078, 0x1283, 0x2009, 0x5149, 0x210c, 0x0078, 0x1283, 0x7908,
-        0x7a0c, 0x0078, 0x1282, 0x71c4, 0x8107, 0xa084, 0x000f, 0x8003,
-        0x8003, 0x8003, 0xa0e8, 0x5380, 0x6a00, 0x6804, 0xa084, 0x0008,
-        0x0040, 0x13cd, 0x6b08, 0x0078, 0x13ce, 0x6b0c, 0x0078, 0x1281,
-        0x77c4, 0x1078, 0x1973, 0x2091, 0x8000, 0x6b1c, 0x6a14, 0x2091,
-        0x8001, 0x2708, 0x0078, 0x1281, 0x794c, 0x0078, 0x1283, 0x77c4,
-        0x1078, 0x1973, 0x2091, 0x8000, 0x6908, 0x6a18, 0x6b10, 0x2091,
-        0x8001, 0x0078, 0x1281, 0x71c4, 0xa182, 0x0010, 0x00c8, 0x127c,
-        0x1078, 0x22e2, 0x0078, 0x1281, 0x71c4, 0xa182, 0x0010, 0x00c8,
-        0x127c, 0x2011, 0x5141, 0x2204, 0x007e, 0x2112, 0x1078, 0x229b,
-        0x017f, 0x0078, 0x1283, 0x71c4, 0x2011, 0x1421, 0x20a9, 0x0008,
-        0x2204, 0xa106, 0x0040, 0x1413, 0x8210, 0x0070, 0x1411, 0x0078,
-        0x1408, 0x0078, 0x127c, 0xa292, 0x1421, 0x027e, 0x2011, 0x5142,
-        0x2204, 0x2112, 0x017f, 0x007e, 0x1078, 0x22a7, 0x017f, 0x0078,
+        0x70c6, 0x72ca, 0x73ce, 0x74d2, 0xa005, 0x0040, 0x1355, 0xa40a,
+        0x0040, 0x133c, 0x00c8, 0x1346, 0x8001, 0x7892, 0xa084, 0xfc00,
+        0x0040, 0x134a, 0x78cc, 0xa085, 0x0001, 0x78ce, 0x2001, 0x4005,
+        0x0078, 0x1286, 0x7a9a, 0x7b9e, 0x7da2, 0x7ea6, 0x7c96, 0x78cc,
+        0xa084, 0xfffc, 0x78ce, 0x0078, 0x1359, 0x78cc, 0xa085, 0x0001,
+        0x78ce, 0x0078, 0x1284, 0x1078, 0x1bc4, 0x00c0, 0x129c, 0x75d8,
+        0x76dc, 0x75da, 0x76de, 0x0078, 0x1368, 0x2029, 0x0000, 0x2530,
+        0x70c4, 0x72c8, 0x73cc, 0x74d4, 0x70c6, 0x72ca, 0x73ce, 0x74d6,
+        0xa005, 0x0040, 0x1391, 0xa40a, 0x0040, 0x1378, 0x00c8, 0x1382,
+        0x8001, 0x78ae, 0xa084, 0xfc00, 0x0040, 0x1386, 0x78cc, 0xa085,
+        0x0100, 0x78ce, 0x2001, 0x4005, 0x0078, 0x1286, 0x7ab6, 0x7bba,
+        0x7dbe, 0x7ec2, 0x7cb2, 0x78cc, 0xa084, 0xfcff, 0x78ce, 0x0078,
+        0x1395, 0x78cc, 0xa085, 0x0100, 0x78ce, 0x0078, 0x1284, 0x2009,
+        0x5261, 0x210c, 0x7aec, 0x0078, 0x1282, 0x2009, 0x5241, 0x210c,
+        0x0078, 0x1283, 0x2009, 0x5242, 0x210c, 0x0078, 0x1283, 0x2061,
+        0x5240, 0x610c, 0x6210, 0x0078, 0x1282, 0x2009, 0x5245, 0x210c,
+        0x0078, 0x1283, 0x2009, 0x5246, 0x210c, 0x0078, 0x1283, 0x2009,
+        0x5248, 0x210c, 0x0078, 0x1283, 0x2009, 0x5249, 0x210c, 0x0078,
+        0x1283, 0x7908, 0x7a0c, 0x0078, 0x1282, 0x71c4, 0x8107, 0xa084,
+        0x000f, 0x8003, 0x8003, 0x8003, 0xa0e8, 0x5480, 0x6a00, 0x6804,
+        0xa084, 0x0008, 0x0040, 0x13d7, 0x6b08, 0x0078, 0x13d8, 0x6b0c,
+        0x0078, 0x1281, 0x77c4, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6b1c,
+        0x6a14, 0x2091, 0x8001, 0x2708, 0x0078, 0x1281, 0x794c, 0x0078,
+        0x1283, 0x77c4, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6908, 0x6a18,
+        0x6b10, 0x2091, 0x8001, 0x0078, 0x1281, 0x71c4, 0xa182, 0x0010,
+        0x00c8, 0x127c, 0x1078, 0x237f, 0x0078, 0x1281, 0x71c4, 0xa182,
+        0x0010, 0x00c8, 0x127c, 0x2011, 0x5241, 0x2204, 0x007e, 0x2112,
+        0x1078, 0x2338, 0x017f, 0x0078, 0x1283, 0x71c4, 0x2019, 0x0100,
+        0x2304, 0xa082, 0x0006, 0x0048, 0x141b, 0x2011, 0x1449, 0x20a9,
+        0x0008, 0x0078, 0x141f, 0x2011, 0x1441, 0x20a9, 0x0008, 0x2204,
+        0xa106, 0x0040, 0x142a, 0x8210, 0x0070, 0x1428, 0x0078, 0x141f,
+        0x0078, 0x127c, 0x2304, 0xa082, 0x0006, 0x0048, 0x1433, 0xa292,
+        0x1449, 0x0078, 0x1435, 0xa292, 0x1441, 0x027e, 0x2011, 0x5242,
+        0x2204, 0x2112, 0x017f, 0x007e, 0x1078, 0x2344, 0x017f, 0x0078,
         0x1283, 0x03e8, 0x00fa, 0x01f4, 0x02ee, 0x0064, 0x0019, 0x0032,
-        0x004b, 0x2061, 0x5140, 0x610c, 0x6210, 0x70c4, 0x600e, 0x70c8,
-        0x6012, 0x0078, 0x1282, 0x2061, 0x5140, 0x6114, 0x70c4, 0x6016,
-        0x0078, 0x1283, 0x2061, 0x5140, 0x71c4, 0x2011, 0x0004, 0x601f,
-        0x0019, 0x2019, 0x1212, 0xa186, 0x0028, 0x0040, 0x145b, 0x2011,
+        0x004b, 0x03e8, 0x00fa, 0x01f4, 0x02ee, 0x0004, 0x0001, 0x0002,
+        0x0003, 0x2061, 0x5240, 0x610c, 0x6210, 0x70c4, 0x600e, 0x70c8,
+        0x6012, 0x0078, 0x1282, 0x2061, 0x5240, 0x6114, 0x70c4, 0x6016,
+        0x0078, 0x1283, 0x2061, 0x5240, 0x71c4, 0x2011, 0x0004, 0x601f,
+        0x0019, 0x2019, 0x1212, 0xa186, 0x0028, 0x0040, 0x1483, 0x2011,
         0x0005, 0x601f, 0x0019, 0x2019, 0x1212, 0xa186, 0x0032, 0x0040,
-        0x145b, 0x2011, 0x0006, 0x601f, 0x000c, 0x2019, 0x2222, 0xa186,
+        0x1483, 0x2011, 0x0006, 0x601f, 0x000c, 0x2019, 0x2222, 0xa186,
         0x003c, 0x00c0, 0x127c, 0x6018, 0x007e, 0x611a, 0x7800, 0xa084,
-        0x0001, 0x00c0, 0x1476, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
-        0x0048, 0x146e, 0x0038, 0x1472, 0x0078, 0x1476, 0x0028, 0x1472,
-        0x0078, 0x1476, 0x2019, 0x2222, 0x0078, 0x1478, 0x2019, 0x1212,
-        0x23b8, 0x1078, 0x22b8, 0x1078, 0x4d22, 0x017f, 0x0078, 0x1283,
-        0x71c4, 0xa184, 0xffcf, 0x00c0, 0x127c, 0x2011, 0x5148, 0x2204,
-        0x2112, 0x007e, 0x1078, 0x22da, 0x017f, 0x0078, 0x1283, 0x71c4,
-        0xa182, 0x0010, 0x00c8, 0x127c, 0x2011, 0x5149, 0x2204, 0x007e,
-        0x2112, 0x1078, 0x22c9, 0x017f, 0x0078, 0x1283, 0x71c4, 0x72c8,
+        0x0001, 0x00c0, 0x149e, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
+        0x0048, 0x1496, 0x0038, 0x149a, 0x0078, 0x149e, 0x0028, 0x149a,
+        0x0078, 0x149e, 0x2019, 0x2222, 0x0078, 0x14a0, 0x2019, 0x1212,
+        0x23b8, 0x1078, 0x2355, 0x1078, 0x4e33, 0x017f, 0x0078, 0x1283,
+        0x71c4, 0xa184, 0xffcf, 0x00c0, 0x127c, 0x2011, 0x5248, 0x2204,
+        0x2112, 0x007e, 0x1078, 0x2377, 0x017f, 0x0078, 0x1283, 0x71c4,
+        0xa182, 0x0010, 0x00c8, 0x127c, 0x2011, 0x5249, 0x2204, 0x007e,
+        0x2112, 0x1078, 0x2366, 0x017f, 0x0078, 0x1283, 0x71c4, 0x72c8,
         0xa184, 0xfffd, 0x00c0, 0x127b, 0xa284, 0xfffd, 0x00c0, 0x127b,
         0x2100, 0x7908, 0x780a, 0x2200, 0x7a0c, 0x780e, 0x0078, 0x1282,
         0x71c4, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e8,
-        0x5380, 0x2019, 0x0000, 0x72c8, 0xa284, 0x0080, 0x0040, 0x14c6,
-        0x6c14, 0x84ff, 0x00c0, 0x14c6, 0x6817, 0x0040, 0xa284, 0x0040,
-        0x0040, 0x14d0, 0x6c10, 0x84ff, 0x00c0, 0x14d0, 0x6813, 0x0001,
-        0x6800, 0x007e, 0xa226, 0x0040, 0x14f3, 0x6a02, 0xa484, 0x2000,
-        0x0040, 0x14dc, 0xa39d, 0x0010, 0xa484, 0x1000, 0x0040, 0x14e2,
-        0xa39d, 0x0008, 0xa484, 0x4000, 0x0040, 0x14f3, 0x810f, 0xa284,
-        0x4000, 0x0040, 0x14ef, 0x1078, 0x22fc, 0x0078, 0x14f3, 0x1078,
-        0x22ee, 0x0078, 0x14f3, 0x72cc, 0x6808, 0xa206, 0x0040, 0x1522,
-        0xa2a4, 0x00ff, 0x2061, 0x5140, 0x6118, 0xa186, 0x0028, 0x0040,
-        0x1509, 0xa186, 0x0032, 0x0040, 0x150f, 0xa186, 0x003c, 0x0040,
-        0x1515, 0xa482, 0x0064, 0x0048, 0x151f, 0x0078, 0x1519, 0xa482,
-        0x0050, 0x0048, 0x151f, 0x0078, 0x1519, 0xa482, 0x0043, 0x0048,
-        0x151f, 0x71c4, 0x71c6, 0x027f, 0x72ca, 0x0078, 0x127d, 0x6a0a,
-        0xa39d, 0x000a, 0x6804, 0xa305, 0x6806, 0x027f, 0x6b0c, 0x71c4,
-        0x0078, 0x1281, 0x77c4, 0x1078, 0x1973, 0x2091, 0x8000, 0x6a14,
-        0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816, 0x70cc, 0x681e, 0x2708,
-        0x0078, 0x1281, 0x70c4, 0x794c, 0x784e, 0x0078, 0x1283, 0x71c4,
-        0x72c8, 0x73cc, 0xa182, 0x0010, 0x00c8, 0x127c, 0x1078, 0x230a,
-        0x0078, 0x1281, 0x77c4, 0x1078, 0x1973, 0x2091, 0x8000, 0x6a08,
-        0xa295, 0x0002, 0x6a0a, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282,
-        0x77c4, 0x1078, 0x1973, 0x2091, 0x8000, 0x6a08, 0xa294, 0xfff9,
-        0x6a0a, 0x6804, 0xa005, 0x0040, 0x1567, 0x1078, 0x21d2, 0x2091,
-        0x8001, 0x2708, 0x0078, 0x1282, 0x77c4, 0x1078, 0x1973, 0x2091,
-        0x8000, 0x6a08, 0xa295, 0x0004, 0x6a0a, 0x6804, 0xa005, 0x0040,
-        0x157b, 0x1078, 0x21d2, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282,
-        0x77c4, 0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091,
-        0x8000, 0x1078, 0x1980, 0x2091, 0x8001, 0x2708, 0x6a08, 0x0078,
-        0x1282, 0x77c4, 0x72c8, 0x73cc, 0x77c6, 0x72ca, 0x73ce, 0x1078,
-        0x19e1, 0x00c0, 0x15a9, 0x6818, 0xa005, 0x0040, 0x15a9, 0x2708,
-        0x1078, 0x231a, 0x00c0, 0x15a9, 0x7817, 0x0015, 0x2091, 0x8001,
-        0x007c, 0x2091, 0x8001, 0x0078, 0x1284, 0x77c4, 0x77c6, 0x2041,
-        0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x1078,
-        0x1980, 0x2061, 0x5140, 0x606f, 0x0003, 0x6782, 0x6093, 0x000f,
-        0x6073, 0x0000, 0x7817, 0x0016, 0x1078, 0x21d2, 0x2091, 0x8001,
-        0x007c, 0x77c8, 0x77ca, 0x77c4, 0x77c6, 0xa7bc, 0xff00, 0x2091,
-        0x8000, 0x2061, 0x5140, 0x606f, 0x0002, 0x6073, 0x0000, 0x6782,
-        0x6093, 0x000f, 0x7817, 0x0017, 0x1078, 0x21d2, 0x2091, 0x8001,
-        0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010, 0x2091, 0x8000,
-        0x1078, 0x1980, 0x70c8, 0x6836, 0x8738, 0xa784, 0x001f, 0x00c0,
-        0x15e8, 0x2091, 0x8001, 0x007c, 0x78cc, 0xa084, 0x0003, 0x00c0,
-        0x1618, 0x2039, 0x0000, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051,
-        0x0008, 0x1078, 0x1973, 0x2091, 0x8000, 0x6808, 0xa80d, 0x690a,
-        0x2091, 0x8001, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1601, 0xa7bc,
-        0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1601,
-        0x2091, 0x8000, 0x2069, 0x0100, 0x6830, 0xa084, 0x0040, 0x0040,
-        0x1641, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0004,
-        0x0040, 0x162e, 0x0070, 0x162e, 0x0078, 0x1625, 0x684b, 0x0009,
-        0x20a9, 0x0014, 0x6848, 0xa084, 0x0001, 0x0040, 0x163b, 0x0070,
-        0x163b, 0x0078, 0x1632, 0x20a9, 0x00fa, 0x0070, 0x1641, 0x0078,
-        0x163d, 0x2079, 0x5100, 0x7817, 0x0018, 0x2061, 0x5140, 0x606f,
-        0x0001, 0x6073, 0x0000, 0x6093, 0x000f, 0x78cc, 0xa085, 0x0002,
-        0x78ce, 0x6808, 0xa084, 0xfffd, 0x680a, 0x681b, 0x0048, 0x2091,
-        0x8001, 0x007c, 0x78cc, 0xa084, 0xfffd, 0x78ce, 0xa084, 0x0001,
-        0x00c0, 0x1664, 0x1078, 0x1a2b, 0x71c4, 0x71c6, 0x794a, 0x007c,
-        0x1078, 0x1b53, 0x00c0, 0x129c, 0x75d8, 0x74dc, 0x75da, 0x74de,
-        0x0078, 0x1675, 0x2029, 0x0000, 0x2520, 0x71c4, 0x73c8, 0x72cc,
-        0x71c6, 0x73ca, 0x72ce, 0x2079, 0x5100, 0x2091, 0x8000, 0x1078,
-        0x192e, 0x2091, 0x8001, 0x0040, 0x172c, 0x20a9, 0x0005, 0x20a1,
-        0x5118, 0x2091, 0x8000, 0x41a1, 0x2091, 0x8001, 0x2009, 0x0020,
-        0x1078, 0x1929, 0x0040, 0x1698, 0x1078, 0x1948, 0x0078, 0x172c,
-        0x6004, 0xa084, 0xff00, 0x8007, 0x8009, 0x0040, 0x16fb, 0x0c7e,
-        0x2c68, 0x2091, 0x8000, 0x1078, 0x192e, 0x2091, 0x8001, 0x0040,
-        0x16cc, 0x2c00, 0x689e, 0x8109, 0x00c0, 0x16a0, 0x609f, 0x0000,
-        0x0c7f, 0x0c7e, 0x7218, 0x731c, 0x7420, 0x7524, 0x2c68, 0x689c,
-        0xa065, 0x0040, 0x16fa, 0x2009, 0x0020, 0x1078, 0x1929, 0x00c0,
-        0x16e3, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0002, 0x00c0, 0x16cc,
-        0x2d00, 0x6002, 0x0078, 0x16b2, 0x0c7f, 0x0c7e, 0x609c, 0x2060,
-        0x1078, 0x19b3, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009,
-        0x000c, 0x6008, 0xa085, 0x0200, 0x600a, 0x1078, 0x1924, 0x1078,
-        0x1948, 0x0078, 0x172c, 0x0c7f, 0x0c7e, 0x609c, 0x2060, 0x1078,
-        0x19b3, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1730, 0x2009, 0x000c,
-        0x6007, 0x0103, 0x601b, 0x0003, 0x1078, 0x1924, 0x1078, 0x1948,
-        0x0078, 0x172c, 0x0c7f, 0x74c4, 0x73c8, 0x72cc, 0x6014, 0x2091,
-        0x8000, 0x7817, 0x0012, 0x0e7e, 0x2071, 0x5140, 0x706f, 0x0005,
-        0x7073, 0x0000, 0x7376, 0x727a, 0x747e, 0x7082, 0x7087, 0x0000,
-        0x2c00, 0x708a, 0x708f, 0x0000, 0xa02e, 0x2530, 0x611c, 0x61a2,
-        0xa184, 0x0060, 0x0040, 0x171e, 0x1078, 0x47c2, 0x0e7f, 0x6596,
-        0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x1078,
-        0x21d2, 0x2091, 0x8001, 0x007c, 0x70c3, 0x4005, 0x0078, 0x1287,
-        0x20a9, 0x0005, 0x2099, 0x5118, 0x2091, 0x8000, 0x530a, 0x2091,
-        0x8001, 0x2100, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9,
-        0x0000, 0x007c, 0x71c4, 0x70c7, 0x0000, 0x7906, 0x0078, 0x1284,
-        0x71c4, 0x71c6, 0x2168, 0x0078, 0x174f, 0x2069, 0x1000, 0x690c,
-        0xa016, 0x2d04, 0xa210, 0x8d68, 0x8109, 0x00c0, 0x1751, 0xa285,
-        0x0000, 0x00c0, 0x175f, 0x70c3, 0x4000, 0x0078, 0x1761, 0x70c3,
-        0x4003, 0x70ca, 0x0078, 0x1287, 0x2011, 0x5167, 0x220c, 0x70c4,
-        0x8003, 0x0048, 0x1771, 0x1078, 0x3b7f, 0xa184, 0x7fff, 0x0078,
-        0x1775, 0x1078, 0x3b72, 0xa185, 0x8000, 0x2012, 0x0078, 0x1283,
-        0x71c4, 0x1078, 0x3b69, 0x6100, 0x2001, 0x5167, 0x2004, 0xa084,
-        0x8000, 0xa10d, 0x6204, 0x6308, 0x0078, 0x1281, 0x79e4, 0x0078,
-        0x1283, 0x71c4, 0x71c6, 0x2198, 0x20a1, 0x0042, 0x20a9, 0x0004,
-        0x53a3, 0x21a0, 0x2099, 0x0042, 0x20a9, 0x0004, 0x53a3, 0x0078,
-        0x1284, 0x70c4, 0x2068, 0x2079, 0x5100, 0x2091, 0x8000, 0x1078,
-        0x192e, 0x2091, 0x8001, 0x0040, 0x1825, 0x6007, 0x0001, 0x600b,
-        0x0000, 0x602b, 0x0000, 0x601b, 0x0006, 0x6a10, 0xa28c, 0x000f,
-        0xa284, 0x00f0, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0x6016,
-        0xa284, 0x0800, 0x0040, 0x17c0, 0x601b, 0x000a, 0x0078, 0x17c6,
-        0xa284, 0x1000, 0x0040, 0x17c6, 0x601b, 0x000c, 0xa284, 0x0300,
-        0x0040, 0x17cf, 0x602b, 0x0001, 0x8004, 0x8004, 0x8004, 0xa085,
-        0x0001, 0x601e, 0x6023, 0x0000, 0x6027, 0x0000, 0xa284, 0x0400,
-        0x0040, 0x17dc, 0x602b, 0x0000, 0x20a9, 0x0006, 0xac80, 0x000b,
-        0x20a0, 0xad80, 0x0005, 0x2098, 0x53a3, 0xa284, 0x0300, 0x00c0,
-        0x17f1, 0x6046, 0x604a, 0x604e, 0x6052, 0x6096, 0x609a, 0x0078,
-        0x17fb, 0x6800, 0x6046, 0x6804, 0x604a, 0x6e08, 0x664e, 0x6d0c,
-        0x6552, 0x6596, 0x669a, 0x6014, 0x2091, 0x8000, 0x7817, 0x0042,
-        0x2c08, 0x2061, 0x5140, 0x606f, 0x0005, 0x6073, 0x0000, 0x6077,
-        0x0000, 0x607b, 0x0000, 0x607f, 0x0000, 0x6082, 0x618a, 0xa284,
-        0x0400, 0x608e, 0x2091, 0x8001, 0x0e7e, 0x2071, 0x0020, 0x7007,
-        0x000a, 0x7007, 0x0002, 0x7003, 0x0000, 0x0e7f, 0x2091, 0x8000,
-        0x1078, 0x21d2, 0x2091, 0x8001, 0x007c, 0x70c3, 0x4005, 0x0078,
-        0x1287, 0x0c7e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2091, 0x8000, 0x2071,
-        0x5140, 0x2079, 0x0100, 0x2061, 0x0010, 0x70a0, 0xa06d, 0x0040,
-        0x18b1, 0x6a04, 0xa294, 0x00ff, 0xa286, 0x0007, 0x0040, 0x1844,
-        0xa286, 0x000f, 0x00c0, 0x18b1, 0x691c, 0xa184, 0x0080, 0x00c0,
-        0x18b1, 0x6824, 0xa18c, 0xff00, 0xa085, 0x0019, 0x6826, 0x71b0,
-        0x81ff, 0x0040, 0x1867, 0x0d7e, 0x2069, 0x0020, 0x6807, 0x0010,
-        0x6908, 0x6808, 0xa106, 0x00c0, 0x1858, 0x690c, 0x680c, 0xa106,
-        0x00c0, 0x185d, 0xa184, 0x00ff, 0x00c0, 0x185d, 0x0d7f, 0x78b8,
-        0xa084, 0x801f, 0x00c0, 0x1867, 0x7848, 0xa085, 0x000c, 0x784a,
-        0x71b0, 0x81ff, 0x0040, 0x188a, 0x70b3, 0x0000, 0x0d7e, 0x2069,
-        0x0020, 0x6807, 0x0018, 0x6804, 0xa084, 0x0008, 0x00c0, 0x187b,
-        0x6807, 0x0008, 0x6804, 0xa084, 0x0008, 0x00c0, 0x1882, 0x6807,
-        0x0002, 0x0d7f, 0x61c4, 0x62c8, 0x63cc, 0x61c6, 0x62ca, 0x63ce,
-        0x0e7e, 0x2071, 0x5100, 0x7266, 0x736a, 0xae80, 0x0019, 0x0e7f,
-        0x7848, 0xa084, 0x000c, 0x00c0, 0x1898, 0x1078, 0x46db, 0x78a3,
-        0x0000, 0x7858, 0xa084, 0xedff, 0x785a, 0x70b4, 0xa080, 0x00df,
-        0x781a, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091, 0x8001, 0x0078,
-        0x1284, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091, 0x8001, 0x2001,
-        0x4005, 0x0078, 0x1286, 0x7980, 0x71c6, 0x71c4, 0xa182, 0x0003,
-        0x00c8, 0x127c, 0x7982, 0x0078, 0x1284, 0x7980, 0x71c6, 0x0078,
-        0x1284, 0x7974, 0x71c6, 0x71c4, 0x7976, 0x7978, 0x71ca, 0x71c8,
-        0x797a, 0x797c, 0x71ce, 0x71cc, 0x797e, 0x0078, 0x1284, 0x7974,
-        0x71c6, 0x7978, 0x71ca, 0x797c, 0x71ce, 0x0078, 0x1284, 0x7900,
-        0x71c6, 0x71c4, 0x7902, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
-        0x0048, 0x18ee, 0x0038, 0x18f0, 0x0078, 0x18fa, 0x00a8, 0x18fa,
-        0xa18c, 0x0001, 0x00c0, 0x18f8, 0x20b9, 0x2222, 0x0078, 0x18fa,
-        0x20b9, 0x1212, 0x0078, 0x1284, 0x7900, 0x71c6, 0x0078, 0x1284,
-        0x2009, 0x5174, 0x2104, 0x70c6, 0x70c4, 0x200a, 0x0078, 0x1284,
-        0x2009, 0x5174, 0x2104, 0x70c6, 0x0078, 0x1284, 0x71c4, 0x8107,
-        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e8, 0x5380, 0x6a14,
-        0xd2b4, 0x0040, 0x191f, 0x2011, 0x0001, 0x0078, 0x1921, 0x2011,
-        0x0000, 0x6b0c, 0x0078, 0x1281, 0xac80, 0x0001, 0x1078, 0x1b0f,
-        0x007c, 0xac80, 0x0001, 0x1078, 0x1aaf, 0x007c, 0x7850, 0xa065,
-        0x0040, 0x1936, 0x2c04, 0x7852, 0x2063, 0x0000, 0x007c, 0x0f7e,
-        0x2079, 0x5100, 0x7850, 0xa06d, 0x0040, 0x1946, 0x2d04, 0x7852,
-        0x6803, 0x0000, 0x6807, 0x0000, 0x680b, 0x0000, 0x0f7f, 0x007c,
-        0x2091, 0x8000, 0x0f7e, 0x2079, 0x5100, 0x7850, 0x2062, 0x2c00,
-        0xa005, 0x00c0, 0x1955, 0x1078, 0x23eb, 0x7852, 0x0f7f, 0x2091,
-        0x8001, 0x007c, 0x0f7e, 0x2079, 0x5100, 0x7850, 0x206a, 0x2d00,
-        0x7852, 0x0f7f, 0x007c, 0x2011, 0x7800, 0x7a52, 0x7bec, 0x8319,
-        0x0040, 0x1970, 0xa280, 0x0031, 0x2012, 0x2010, 0x0078, 0x1967,
-        0x2013, 0x0000, 0x007c, 0xa784, 0x0f00, 0x800b, 0xa784, 0x001f,
-        0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa0e8, 0x5400, 0x007c,
-        0x1078, 0x1973, 0x2900, 0x682a, 0x2a00, 0x682e, 0x6808, 0xa084,
-        0xffef, 0xa80d, 0x690a, 0x2009, 0x5152, 0x210c, 0x6804, 0xa005,
-        0x0040, 0x19b2, 0xa116, 0x00c0, 0x199d, 0x2060, 0x6000, 0x6806,
-        0x017e, 0x200b, 0x0000, 0x0078, 0x19a0, 0x2009, 0x0000, 0x017e,
-        0x6804, 0xa065, 0x0040, 0x19af, 0x6000, 0x6806, 0x1078, 0x19c0,
-        0x1078, 0x1c5f, 0x6810, 0x8001, 0x6812, 0x00c0, 0x19a0, 0x017f,
-        0x6902, 0x6906, 0x007c, 0xa065, 0x0040, 0x19bf, 0x609c, 0x609f,
-        0x0000, 0x2008, 0x1078, 0x1948, 0x2100, 0x0078, 0x19b3, 0x007c,
-        0x6007, 0x0103, 0x608f, 0x0000, 0x20a9, 0x001c, 0xac80, 0x0005,
-        0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828, 0x601a, 0x682c, 0x6022,
-        0x007c, 0x0e7e, 0x2071, 0x5140, 0x704c, 0xa08c, 0x0200, 0x00c0,
-        0x19df, 0xa088, 0x5180, 0x2d0a, 0x8000, 0x704e, 0xa006, 0x0e7f,
-        0x007c, 0x1078, 0x1973, 0x2091, 0x8000, 0x6804, 0x781e, 0xa065,
-        0x0040, 0x1a2a, 0x0078, 0x19f2, 0x2c00, 0x781e, 0x6000, 0xa065,
-        0x0040, 0x1a2a, 0x600c, 0xa306, 0x00c0, 0x19ec, 0x6010, 0xa206,
-        0x00c0, 0x19ec, 0x2c28, 0x2001, 0x5152, 0x2004, 0xac06, 0x00c0,
-        0x1a03, 0x0078, 0x1a28, 0x6804, 0xac06, 0x00c0, 0x1a10, 0x6000,
-        0xa065, 0x6806, 0x00c0, 0x1a1a, 0x6803, 0x0000, 0x0078, 0x1a1a,
-        0x6400, 0x781c, 0x2060, 0x6402, 0xa486, 0x0000, 0x00c0, 0x1a1a,
-        0x2c00, 0x6802, 0x2560, 0x1078, 0x19c0, 0x601b, 0x0005, 0x6023,
-        0x0020, 0x1078, 0x1c5f, 0x6810, 0x8001, 0x1050, 0x23eb, 0x6812,
-        0xa085, 0xffff, 0x007c, 0x2039, 0x0000, 0x2041, 0x0021, 0x2049,
-        0x0004, 0x2051, 0x0008, 0x2091, 0x8000, 0x1078, 0x1980, 0x8738,
-        0xa784, 0x001f, 0x00c0, 0x1a35, 0xa7bc, 0xff00, 0x873f, 0x8738,
-        0x873f, 0xa784, 0x0f00, 0x00c0, 0x1a35, 0x2091, 0x8001, 0x007c,
-        0x2061, 0x0000, 0x6018, 0xa084, 0x0001, 0x00c0, 0x1a59, 0x2091,
-        0x8000, 0x78e0, 0x78e3, 0x0000, 0x2091, 0x8001, 0xa005, 0x00c0,
-        0x1a5a, 0x007c, 0xa08c, 0xfff0, 0x0040, 0x1a60, 0x1078, 0x23eb,
-        0x0079, 0x1a62, 0x1a72, 0x1a75, 0x1a7b, 0x1a7f, 0x1a73, 0x1a83,
-        0x1a89, 0x1a73, 0x1a73, 0x1c29, 0x1c4d, 0x1c51, 0x1a73, 0x1a73,
-        0x1a73, 0x1a73, 0x007c, 0x1078, 0x23eb, 0x1078, 0x1a2b, 0x2001,
-        0x8001, 0x0078, 0x1c57, 0x2001, 0x8003, 0x0078, 0x1c57, 0x2001,
-        0x8004, 0x0078, 0x1c57, 0x1078, 0x1a2b, 0x2001, 0x8006, 0x0078,
-        0x1c57, 0x2001, 0x8007, 0x0078, 0x1c57, 0x2030, 0x2138, 0xa782,
-        0x0021, 0x0048, 0x1a95, 0x2009, 0x0020, 0x2600, 0x1078, 0x1aaf,
-        0x00c0, 0x1aae, 0xa7ba, 0x0020, 0x0048, 0x1aad, 0x0040, 0x1aad,
-        0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040, 0xa399, 0x0000, 0xa4a1,
-        0x0000, 0xa5a9, 0x0000, 0x0078, 0x1a8f, 0xa006, 0x007c, 0x81ff,
-        0x0040, 0x1aea, 0x2099, 0x0030, 0x20a0, 0x700c, 0xa084, 0x00ff,
-        0x0040, 0x1ac1, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0,
-        0x1abc, 0x21a8, 0x7017, 0x0000, 0x810b, 0x7112, 0x721a, 0x731e,
-        0x7422, 0x7526, 0x780c, 0xa085, 0x0001, 0x7002, 0x7007, 0x0001,
-        0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x1ade, 0x2009,
-        0x0022, 0x2104, 0xa084, 0x4000, 0x00c0, 0x1ad0, 0x7008, 0x800b,
-        0x00c8, 0x1ad0, 0x7007, 0x0002, 0xa08c, 0x01e0, 0x00c0, 0x1aea,
-        0x53a5, 0xa006, 0x7003, 0x0000, 0x007c, 0x2030, 0x2138, 0xa782,
-        0x0021, 0x0048, 0x1af5, 0x2009, 0x0020, 0x2600, 0x1078, 0x1b0f,
-        0x00c0, 0x1b0e, 0xa7ba, 0x0020, 0x0048, 0x1b0d, 0x0040, 0x1b0d,
-        0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040, 0xa399, 0x0000, 0xa4a1,
-        0x0000, 0xa5a9, 0x0000, 0x0078, 0x1aef, 0xa006, 0x007c, 0x81ff,
-        0x0040, 0x1b50, 0x2098, 0x20a1, 0x0030, 0x700c, 0xa084, 0x00ff,
-        0x0040, 0x1b21, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0,
-        0x1b1c, 0x21a8, 0x7017, 0x0000, 0x810b, 0x7112, 0x721a, 0x731e,
-        0x7422, 0x7526, 0x780c, 0xa085, 0x0000, 0x7002, 0x53a6, 0x7007,
-        0x0001, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x1b3f,
-        0x2009, 0x0022, 0x2104, 0xa084, 0x4000, 0x00c0, 0x1b31, 0x7010,
-        0xa084, 0xf000, 0x0040, 0x1b48, 0x7007, 0x0008, 0x0078, 0x1b4c,
-        0x7108, 0x8103, 0x00c8, 0x1b31, 0x7007, 0x0002, 0xa184, 0x01e0,
-        0x7003, 0x0000, 0x007c, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0004,
-        0x00c8, 0x1b5c, 0x0078, 0x1b5f, 0xa006, 0x0078, 0x1b61, 0xa085,
-        0x0001, 0x007c, 0x0e7e, 0x2071, 0x5100, 0x2d08, 0x7058, 0x6802,
-        0xa005, 0x00c0, 0x1b6c, 0x715e, 0x715a, 0x0e7f, 0x007c, 0x2c08,
-        0x7858, 0x6002, 0xa005, 0x00c0, 0x1b76, 0x795e, 0x795a, 0x007c,
-        0x2091, 0x8000, 0x6003, 0x0000, 0x2c08, 0x785c, 0xa065, 0x00c0,
-        0x1b84, 0x795a, 0x0078, 0x1b85, 0x6102, 0x795e, 0x2091, 0x8001,
-        0x1078, 0x21ef, 0x007c, 0x0e7e, 0x2071, 0x5100, 0x7058, 0xa06d,
-        0x0040, 0x1b99, 0x6800, 0x705a, 0xa005, 0x00c0, 0x1b98, 0x705e,
-        0x8dff, 0x0e7f, 0x007c, 0x0d7e, 0x0c7e, 0x0f7e, 0x2079, 0x5100,
-        0xaf80, 0x0016, 0x2060, 0x6000, 0xa005, 0x0040, 0x1bc9, 0x2068,
-        0x6814, 0xa306, 0x00c0, 0x1bb2, 0x6828, 0xa084, 0x00ff, 0xa406,
-        0x0040, 0x1bb5, 0x2d60, 0x0078, 0x1ba3, 0x6800, 0xa005, 0x6002,
-        0x00c0, 0x1bc1, 0xaf80, 0x0016, 0xac06, 0x0040, 0x1bc0, 0x2c00,
-        0x785e, 0x0d7e, 0x689c, 0xa005, 0x0040, 0x1bc8, 0x1078, 0x19b3,
-        0x007f, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c, 0x0d7e, 0x0c7e,
-        0x0f7e, 0x2079, 0x5100, 0xaf80, 0x0016, 0x2060, 0x6000, 0xa005,
-        0x0040, 0x1bf8, 0x2068, 0x6814, 0xa084, 0x00ff, 0xa306, 0x0040,
-        0x1be4, 0x2d60, 0x0078, 0x1bd6, 0x6800, 0xa005, 0x6002, 0x00c0,
-        0x1bf0, 0xaf80, 0x0016, 0xac06, 0x0040, 0x1bef, 0x2c00, 0x785e,
-        0x0d7e, 0x689c, 0xa005, 0x0040, 0x1bf7, 0x1078, 0x19b3, 0x007f,
-        0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c, 0x0d7e, 0x0c7e, 0x0f7e,
-        0x2079, 0x5100, 0xaf80, 0x0016, 0x2060, 0x6000, 0xa06d, 0x0040,
-        0x1c24, 0x6814, 0xa306, 0x0040, 0x1c10, 0x2d60, 0x0078, 0x1c05,
-        0x6800, 0xa005, 0x6002, 0x00c0, 0x1c1c, 0xaf80, 0x0016, 0xac06,
-        0x0040, 0x1c1b, 0x2c00, 0x785e, 0x0d7e, 0x689c, 0xa005, 0x0040,
-        0x1c23, 0x1078, 0x19b3, 0x007f, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005,
-        0x007c, 0x2091, 0x8000, 0x2069, 0x5140, 0x6800, 0xa086, 0x0000,
-        0x0040, 0x1c37, 0x2091, 0x8001, 0x78e3, 0x0009, 0x007c, 0x6880,
-        0xa0bc, 0xff00, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010,
-        0x1078, 0x1980, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1c40, 0x2091,
-        0x8001, 0x2001, 0x800a, 0x0078, 0x1c57, 0x2001, 0x800c, 0x0078,
-        0x1c57, 0x1078, 0x1a2b, 0x2001, 0x800d, 0x0078, 0x1c57, 0x70c2,
-        0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x4080, 0x007c, 0x6004,
-        0x2c08, 0x2063, 0x0000, 0x7884, 0x8000, 0x7886, 0x7888, 0xa005,
-        0x798a, 0x0040, 0x1c6e, 0x2c02, 0x0078, 0x1c6f, 0x798e, 0x007c,
-        0x6807, 0x0103, 0x0c7e, 0x2061, 0x5100, 0x2d08, 0x206b, 0x0000,
-        0x6084, 0x8000, 0x6086, 0x6088, 0xa005, 0x618a, 0x0040, 0x1c83,
-        0x2d02, 0x0078, 0x1c84, 0x618e, 0x0c7f, 0x007c, 0x1078, 0x1c97,
-        0x0040, 0x1c96, 0x0c7e, 0x609c, 0xa065, 0x0040, 0x1c91, 0x1078,
-        0x19b3, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1948, 0x007c, 0x788c,
-        0xa065, 0x0040, 0x1ca9, 0x2091, 0x8000, 0x7884, 0x8001, 0x7886,
-        0x2c04, 0x788e, 0xa005, 0x00c0, 0x1ca7, 0x788a, 0x8000, 0x2091,
-        0x8001, 0x007c, 0x20a9, 0x0010, 0xa006, 0x8004, 0x8086, 0x818e,
-        0x00c8, 0x1cb3, 0xa200, 0x0070, 0x1cb7, 0x0078, 0x1cae, 0x8086,
-        0x818e, 0x007c, 0x157e, 0x20a9, 0x0010, 0xa005, 0x0040, 0x1cdd,
-        0xa11a, 0x00c8, 0x1cdd, 0x8213, 0x818d, 0x0048, 0x1cce, 0xa11a,
-        0x00c8, 0x1ccf, 0x0070, 0x1cd5, 0x0078, 0x1cc3, 0xa11a, 0x2308,
-        0x8210, 0x0070, 0x1cd5, 0x0078, 0x1cc3, 0x007e, 0x3200, 0xa084,
-        0xf7ff, 0x2080, 0x007f, 0x157f, 0x007c, 0x007e, 0x3200, 0xa085,
-        0x0800, 0x0078, 0x1cd9, 0x7994, 0x70d0, 0xa106, 0x0040, 0x1d51,
-        0x2091, 0x8000, 0x2071, 0x0020, 0x7004, 0xa005, 0x00c0, 0x1d51,
-        0x7008, 0x7208, 0xa206, 0x00c0, 0x1d51, 0xa286, 0x0008, 0x00c0,
-        0x1d51, 0x2071, 0x0010, 0x1078, 0x192e, 0x0040, 0x1d51, 0x7a9c,
-        0x7b98, 0x7ca4, 0x7da0, 0xa184, 0xff00, 0x0040, 0x1d1f, 0x2031,
-        0x0000, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b,
-        0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x2100, 0xa210, 0x2600,
-        0xa319, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x0078, 0x1d29, 0x8107,
-        0x8004, 0x8004, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9,
-        0x0000, 0x2009, 0x0020, 0x1078, 0x1929, 0x2091, 0x8001, 0x0040,
-        0x1d48, 0x1078, 0x1948, 0x78a8, 0x8000, 0x78aa, 0xa086, 0x0002,
-        0x00c0, 0x1d51, 0x2091, 0x8000, 0x78e3, 0x0002, 0x78ab, 0x0000,
-        0x78cc, 0xa085, 0x0003, 0x78ce, 0x2091, 0x8001, 0x0078, 0x1d51,
-        0x78ab, 0x0000, 0x1078, 0x20ac, 0x6004, 0xa084, 0x000f, 0x0079,
-        0x1d56, 0x2071, 0x0010, 0x2091, 0x8001, 0x007c, 0x1d66, 0x1d88,
-        0x1dae, 0x1d66, 0x1dcb, 0x1d75, 0x1f2c, 0x1f47, 0x1d66, 0x1d82,
-        0x1da8, 0x1e13, 0x1e82, 0x1ed2, 0x1ee4, 0x1f43, 0x2039, 0x0400,
-        0x78dc, 0xa705, 0x78de, 0x6008, 0xa705, 0x600a, 0x1078, 0x1fc7,
-        0x609c, 0x78da, 0x1078, 0x2094, 0x007c, 0x78dc, 0xa084, 0x0100,
-        0x0040, 0x1d7c, 0x0078, 0x1d66, 0x601c, 0xa085, 0x0080, 0x601e,
-        0x0078, 0x1d8f, 0x1078, 0x1b53, 0x00c0, 0x1d66, 0x1078, 0x20c6,
-        0x78dc, 0xa084, 0x0100, 0x0040, 0x1d8f, 0x0078, 0x1d66, 0x78df,
-        0x0000, 0x6004, 0x8007, 0xa084, 0x00ff, 0x78d2, 0x8001, 0x609f,
-        0x0000, 0x0040, 0x1da5, 0x1078, 0x1fc7, 0x0040, 0x1da5, 0x78dc,
-        0xa085, 0x0100, 0x78de, 0x0078, 0x1da7, 0x1078, 0x1feb, 0x007c,
-        0x1078, 0x1b53, 0x00c0, 0x1d66, 0x1078, 0x20c2, 0x78dc, 0xa08c,
-        0x0e00, 0x00c0, 0x1db7, 0xa084, 0x0100, 0x00c0, 0x1db9, 0x0078,
-        0x1d66, 0x1078, 0x1fc7, 0x00c0, 0x1dca, 0x6104, 0xa18c, 0x00ff,
-        0xa186, 0x0007, 0x0040, 0x1f84, 0xa186, 0x000f, 0x0040, 0x1f84,
-        0x1078, 0x1feb, 0x007c, 0x78dc, 0xa084, 0x0100, 0x0040, 0x1dd2,
-        0x0078, 0x1d66, 0x78df, 0x0000, 0x6714, 0x2011, 0x0001, 0x20a9,
-        0x0001, 0x6018, 0xa084, 0x00ff, 0xa005, 0x0040, 0x1df5, 0x2011,
-        0x0001, 0xa7bc, 0xff00, 0x20a9, 0x0020, 0xa08e, 0x0001, 0x0040,
-        0x1df5, 0x2039, 0x0000, 0x2011, 0x0002, 0x20a9, 0x0100, 0xa08e,
-        0x0002, 0x0040, 0x1df5, 0x0078, 0x1e10, 0x1078, 0x1973, 0x2091,
-        0x8000, 0x682b, 0x0000, 0x682f, 0x0000, 0x6808, 0xa084, 0xffde,
-        0x680a, 0xade8, 0x0010, 0x2091, 0x8001, 0x0070, 0x1e09, 0x0078,
-        0x1df7, 0x8211, 0x0040, 0x1e10, 0x20a9, 0x0100, 0x0078, 0x1df7,
-        0x1078, 0x1948, 0x007c, 0x2001, 0x5167, 0x2004, 0xa084, 0x8000,
-        0x0040, 0x1fac, 0x6114, 0x1078, 0x20e3, 0x6900, 0xa184, 0x0001,
-        0x0040, 0x1e34, 0x6028, 0xa084, 0x00ff, 0x00c0, 0x1fa4, 0x6800,
-        0xa084, 0x0001, 0x0040, 0x1fac, 0x6803, 0x0000, 0x680b, 0x0000,
-        0x6807, 0x0000, 0x0078, 0x1fb4, 0x2011, 0x0001, 0x6020, 0xd0f4,
-        0x0040, 0x1e3c, 0xa295, 0x0002, 0xd0c4, 0x0040, 0x1e41, 0xa295,
-        0x0008, 0xd0cc, 0x0040, 0x1e46, 0xa295, 0x0400, 0x601c, 0xa084,
-        0x0002, 0x0040, 0x1e4d, 0xa295, 0x0004, 0x602c, 0xa08c, 0x00ff,
-        0xa182, 0x0002, 0x0048, 0x1fb0, 0xa182, 0x001b, 0x00c8, 0x1fb0,
-        0x0040, 0x1fb0, 0x690e, 0x602c, 0x8007, 0xa08c, 0x00ff, 0xa182,
-        0x0002, 0x0048, 0x1fb0, 0xa182, 0x001b, 0x00c8, 0x1fb0, 0x0040,
-        0x1fb0, 0x6912, 0x6030, 0xa005, 0x00c0, 0x1e70, 0x2001, 0x001e,
-        0x8000, 0x6816, 0x6028, 0xa084, 0x00ff, 0x0040, 0x1fac, 0x6806,
-        0x6028, 0x8007, 0xa084, 0x00ff, 0x0040, 0x1fac, 0x680a, 0x6a02,
-        0x0078, 0x1fb4, 0x2001, 0x5167, 0x2004, 0xa084, 0x8000, 0x0040,
-        0x1fac, 0x6114, 0x1078, 0x20e3, 0x2091, 0x8000, 0x6a04, 0x6b08,
-        0x6418, 0xa484, 0x0003, 0x0040, 0x1ea8, 0x6128, 0xa18c, 0x00ff,
-        0x8001, 0x00c0, 0x1ea1, 0x2100, 0xa210, 0x0048, 0x1ece, 0x0078,
-        0x1ea8, 0x8001, 0x00c0, 0x1ece, 0x2100, 0xa212, 0x0048, 0x1ece,
-        0xa484, 0x000c, 0x0040, 0x1ec2, 0x6128, 0x810f, 0xa18c, 0x00ff,
-        0xa082, 0x0004, 0x00c0, 0x1eba, 0x2100, 0xa318, 0x0048, 0x1ece,
-        0x0078, 0x1ec2, 0xa082, 0x0004, 0x00c0, 0x1ece, 0x2100, 0xa31a,
-        0x0048, 0x1ece, 0x6030, 0xa005, 0x0040, 0x1ec8, 0x8000, 0x6816,
-        0x6a06, 0x6b0a, 0x2091, 0x8001, 0x0078, 0x1fb4, 0x2091, 0x8001,
-        0x0078, 0x1fb0, 0x6114, 0x1078, 0x20e3, 0x2091, 0x8000, 0x6b08,
-        0x8318, 0x0048, 0x1ee0, 0x6b0a, 0x2091, 0x8001, 0x0078, 0x1fc3,
-        0x2091, 0x8001, 0x0078, 0x1fb0, 0x6024, 0x8007, 0xa084, 0x00ff,
-        0x0040, 0x1f02, 0xa086, 0x0080, 0x00c0, 0x1f2a, 0x20a9, 0x0008,
-        0x2069, 0x7510, 0x2091, 0x8000, 0x6800, 0xa084, 0xfcff, 0x6802,
-        0xade8, 0x0008, 0x0070, 0x1efe, 0x0078, 0x1ef4, 0x2091, 0x8001,
-        0x0078, 0x1fb4, 0x6028, 0xa015, 0x0040, 0x1f2a, 0x6114, 0x1078,
-        0x20e3, 0x0d7e, 0xade8, 0x0007, 0x2091, 0x8000, 0x6800, 0xa00d,
-        0x0040, 0x1f27, 0xa206, 0x0040, 0x1f18, 0x2168, 0x0078, 0x1f0e,
-        0x0c7e, 0x2160, 0x6000, 0x6802, 0x1078, 0x1948, 0x0c7f, 0x0d7f,
-        0x6808, 0x8000, 0x680a, 0x2091, 0x8001, 0x0078, 0x1fc3, 0x2091,
-        0x8001, 0x0d7f, 0x0078, 0x1fac, 0x6114, 0x1078, 0x20e3, 0x6800,
-        0xa084, 0x0001, 0x0040, 0x1f9c, 0x2091, 0x8000, 0x6a04, 0x8210,
-        0x0048, 0x1f3f, 0x6a06, 0x2091, 0x8001, 0x0078, 0x1fc3, 0x2091,
-        0x8001, 0x0078, 0x1fb0, 0x1078, 0x1b53, 0x00c0, 0x1d66, 0x6114,
-        0x1078, 0x20e3, 0x60be, 0x60bb, 0x0000, 0x6900, 0xa184, 0x0008,
-        0x0040, 0x1f56, 0x6020, 0xa085, 0x0100, 0x6022, 0xa184, 0x0001,
-        0x0040, 0x1fac, 0xa184, 0x0100, 0x00c0, 0x1f98, 0xa184, 0x0200,
-        0x00c0, 0x1f94, 0x681c, 0xa005, 0x00c0, 0x1fa0, 0x6004, 0xa084,
-        0x00ff, 0xa086, 0x000f, 0x00c0, 0x1f6f, 0x1078, 0x20c6, 0x78df,
-        0x0000, 0x6004, 0x8007, 0xa084, 0x00ff, 0x78d2, 0x8001, 0x609f,
-        0x0000, 0x0040, 0x1f84, 0x1078, 0x1fc7, 0x0040, 0x1f84, 0x78dc,
-        0xa085, 0x0100, 0x78de, 0x007c, 0x78d7, 0x0000, 0x78db, 0x0000,
-        0x6024, 0xa084, 0xff00, 0x6026, 0x1078, 0x39de, 0x0040, 0x1ce3,
-        0x1078, 0x1b78, 0x0078, 0x1ce3, 0x2009, 0x0017, 0x0078, 0x1fb6,
-        0x2009, 0x000e, 0x0078, 0x1fb6, 0x2009, 0x0007, 0x0078, 0x1fb6,
-        0x2009, 0x0035, 0x0078, 0x1fb6, 0x2009, 0x003e, 0x0078, 0x1fb6,
-        0x2009, 0x0004, 0x0078, 0x1fb6, 0x2009, 0x0006, 0x0078, 0x1fb6,
-        0x2009, 0x0016, 0x0078, 0x1fb6, 0x2009, 0x0001, 0x6024, 0xa084,
-        0xff00, 0xa105, 0x6026, 0x2091, 0x8000, 0x1078, 0x1c5f, 0x2091,
-        0x8001, 0x0078, 0x1ce3, 0x1078, 0x1948, 0x0078, 0x1ce3, 0x78d4,
-        0xa06d, 0x00c0, 0x1fd2, 0x2c00, 0x78d6, 0x78da, 0x609f, 0x0000,
-        0x0078, 0x1fde, 0x2c00, 0x689e, 0x609f, 0x0000, 0x78d6, 0x2d00,
-        0x6002, 0x78d8, 0xad06, 0x00c0, 0x1fde, 0x6002, 0x78d0, 0x8001,
-        0x78d2, 0x00c0, 0x1fea, 0x78dc, 0xa084, 0xfeff, 0x78de, 0x78d8,
-        0x2060, 0xa006, 0x007c, 0xa02e, 0x2530, 0x611c, 0x61a2, 0xa184,
-        0xe1ff, 0x601e, 0xa184, 0x0060, 0x0040, 0x1ffa, 0x0e7e, 0x1078,
-        0x47c2, 0x0e7f, 0x6596, 0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000,
-        0x60b3, 0x0000, 0x6714, 0x1078, 0x1973, 0x2091, 0x8000, 0x60a0,
-        0xa084, 0x8000, 0x00c0, 0x2021, 0x6808, 0xa084, 0x0001, 0x0040,
-        0x2021, 0x2091, 0x8001, 0x1078, 0x19c0, 0x2091, 0x8000, 0x1078,
-        0x1c5f, 0x2091, 0x8001, 0x78d7, 0x0000, 0x78db, 0x0000, 0x0078,
-        0x2093, 0x6024, 0xa096, 0x0001, 0x00c0, 0x2028, 0x8000, 0x6026,
-        0x6a10, 0x6814, 0x2091, 0x8001, 0xa202, 0x0048, 0x2037, 0x0040,
-        0x2037, 0x2039, 0x0200, 0x1078, 0x2094, 0x0078, 0x2093, 0x2c08,
-        0x2091, 0x8000, 0x60a0, 0xa084, 0x8000, 0x0040, 0x2064, 0x6800,
-        0xa065, 0x0040, 0x2069, 0x6a04, 0x0e7e, 0x2071, 0x5140, 0x7000,
-        0xa084, 0x0001, 0x0040, 0x205e, 0x7048, 0xa206, 0x00c0, 0x205e,
-        0x6b04, 0x231c, 0x2160, 0x6302, 0x2300, 0xa005, 0x00c0, 0x2059,
-        0x6902, 0x2260, 0x6102, 0x0e7f, 0x0078, 0x2070, 0x2160, 0x6202,
-        0x6906, 0x0e7f, 0x0078, 0x2070, 0x6800, 0xa065, 0x0040, 0x2069,
-        0x6102, 0x6902, 0x00c0, 0x206d, 0x6906, 0x2160, 0x6003, 0x0000,
-        0x2160, 0x60a0, 0xa084, 0x8000, 0x0040, 0x207a, 0x6808, 0xa084,
-        0xfffc, 0x680a, 0x6810, 0x8000, 0x6812, 0x2091, 0x8001, 0x6808,
-        0xa08c, 0x0040, 0x0040, 0x2089, 0xa086, 0x0040, 0x680a, 0x1078,
-        0x19d1, 0x2091, 0x8000, 0x1078, 0x21d2, 0x2091, 0x8001, 0x78db,
-        0x0000, 0x78d7, 0x0000, 0x007c, 0x6008, 0xa705, 0x600a, 0x2091,
-        0x8000, 0x1078, 0x1c5f, 0x2091, 0x8001, 0x78d8, 0xa065, 0x0040,
-        0x20a7, 0x609c, 0x78da, 0x609f, 0x0000, 0x0078, 0x2097, 0x78d7,
-        0x0000, 0x78db, 0x0000, 0x007c, 0x7990, 0x7894, 0x8000, 0xa10a,
-        0x00c8, 0x20b3, 0xa006, 0x7896, 0x70d2, 0x7804, 0xa005, 0x0040,
-        0x20c1, 0x8001, 0x7806, 0x00c0, 0x20c1, 0x0068, 0x20c1, 0x2091,
-        0x4080, 0x007c, 0x2039, 0x20da, 0x0078, 0x20c8, 0x2039, 0x20e0,
-        0x2704, 0xa005, 0x0040, 0x20d9, 0xac00, 0x2068, 0x6b08, 0x6c0c,
-        0x6910, 0x6a14, 0x690a, 0x6a0e, 0x6b12, 0x6c16, 0x8738, 0x0078,
-        0x20c8, 0x007c, 0x0003, 0x0009, 0x000f, 0x0015, 0x001b, 0x0000,
-        0x0015, 0x001b, 0x0000, 0x0c7e, 0x1078, 0x3b69, 0x2c68, 0x0c7f,
-        0x007c, 0x0010, 0x215a, 0x0068, 0x215a, 0x2029, 0x0000, 0x78cb,
-        0x0000, 0x788c, 0xa065, 0x0040, 0x2153, 0x2009, 0x5174, 0x2104,
-        0xa084, 0x0001, 0x0040, 0x2121, 0x6004, 0xa086, 0x0103, 0x00c0,
-        0x2121, 0x6018, 0xa005, 0x00c0, 0x2121, 0x6014, 0xa005, 0x00c0,
-        0x2121, 0x0d7e, 0x2069, 0x0000, 0x6818, 0xa084, 0x0001, 0x00c0,
-        0x2120, 0x600c, 0x70c6, 0x6010, 0x70ca, 0x70c3, 0x8020, 0x681b,
-        0x0001, 0x2091, 0x4080, 0x0d7f, 0x1078, 0x1c86, 0x0078, 0x2158,
-        0x0d7f, 0x1078, 0x215b, 0x0040, 0x2153, 0x6204, 0xa294, 0x00ff,
-        0xa296, 0x0003, 0x0040, 0x2133, 0x6204, 0xa296, 0x0110, 0x00c0,
-        0x2141, 0x78cb, 0x0001, 0x6204, 0xa294, 0xff00, 0x8217, 0x8211,
-        0x0040, 0x2141, 0x85ff, 0x00c0, 0x2153, 0x8210, 0xa202, 0x00c8,
-        0x2153, 0x057e, 0x1078, 0x216a, 0x057f, 0x0040, 0x214e, 0x78e0,
-        0xa086, 0x0003, 0x0040, 0x2153, 0x0078, 0x2141, 0x8528, 0x78c8,
-        0xa005, 0x0040, 0x20f1, 0x85ff, 0x0040, 0x215a, 0x2091, 0x4080,
-        0x78b0, 0x70d6, 0x007c, 0x7bac, 0x79b0, 0x70d4, 0xa102, 0x00c0,
-        0x2164, 0x2300, 0xa005, 0x007c, 0x0048, 0x2168, 0xa302, 0x007c,
-        0x8002, 0x007c, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8,
-        0x2184, 0x2091, 0x8000, 0x2071, 0x0020, 0x7004, 0xa005, 0x00c0,
-        0x21b9, 0x7008, 0x7208, 0xa206, 0x00c0, 0x21b9, 0xa286, 0x0008,
-        0x00c0, 0x21b9, 0x2071, 0x0010, 0x1078, 0x21be, 0x2009, 0x0020,
-        0x6004, 0xa086, 0x0103, 0x00c0, 0x2193, 0x6028, 0xa005, 0x00c0,
-        0x2193, 0x2009, 0x000c, 0x1078, 0x1924, 0x0040, 0x21ac, 0x78c4,
-        0x8000, 0x78c6, 0xa086, 0x0002, 0x00c0, 0x21b9, 0x2091, 0x8000,
-        0x78e3, 0x0003, 0x78c7, 0x0000, 0x78cc, 0xa085, 0x0300, 0x78ce,
-        0x2091, 0x8001, 0x0078, 0x21b9, 0x78c7, 0x0000, 0x1078, 0x1c86,
-        0x79ac, 0x78b0, 0x8000, 0xa10a, 0x00c8, 0x21b7, 0xa006, 0x78b2,
-        0xa006, 0x2071, 0x0010, 0x2091, 0x8001, 0x007c, 0x8107, 0x8004,
-        0x8004, 0x7ab8, 0x7bb4, 0x7cc0, 0x7dbc, 0xa210, 0xa399, 0x0000,
-        0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x007c, 0x2009, 0x515b, 0x2091,
-        0x8000, 0x200a, 0x0f7e, 0x0e7e, 0x2071, 0x5140, 0x7000, 0xa086,
-        0x0000, 0x00c0, 0x21ec, 0x2009, 0x5112, 0x2104, 0xa005, 0x00c0,
-        0x21ec, 0x2079, 0x0100, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x21ec,
-        0x0018, 0x21ec, 0x781b, 0x004b, 0x0e7f, 0x0f7f, 0x007c, 0x0f7e,
-        0x0e7e, 0x2071, 0x5140, 0x2091, 0x8000, 0x7000, 0xa086, 0x0000,
-        0x00c0, 0x2205, 0x2079, 0x0100, 0x7830, 0xa084, 0x00c0, 0x00c0,
-        0x2205, 0x0018, 0x2205, 0x781b, 0x004d, 0x2091, 0x8001, 0x0e7f,
-        0x0f7f, 0x007c, 0x127e, 0x2091, 0x2300, 0x2071, 0x5140, 0x2079,
-        0x0100, 0x784b, 0x000f, 0x0098, 0x2218, 0x7838, 0x0078, 0x2211,
-        0x20a9, 0x0040, 0x7800, 0xa082, 0x0004, 0x0048, 0x2221, 0x20a9,
-        0x0060, 0x789b, 0x0000, 0x78af, 0x0000, 0x78af, 0x0000, 0x0070,
-        0x222b, 0x0078, 0x2223, 0x7800, 0xa082, 0x0004, 0x0048, 0x223a,
-        0x70b7, 0x0096, 0x2019, 0x4ee7, 0x1078, 0x2276, 0x702f, 0x8001,
-        0x0078, 0x2246, 0x70b7, 0x0000, 0x2019, 0x4d5f, 0x1078, 0x2276,
-        0x2019, 0x4d9e, 0x1078, 0x2276, 0x702f, 0x8000, 0x7003, 0x0000,
-        0x1078, 0x237f, 0x7004, 0xa084, 0x000f, 0x017e, 0x2009, 0x04fd,
-        0x210c, 0xa18a, 0x0005, 0x0048, 0x225b, 0x0038, 0x2261, 0xa085,
-        0x6280, 0x0078, 0x2263, 0x0028, 0x2261, 0xa085, 0x6280, 0x0078,
-        0x2263, 0xa085, 0x62c0, 0x017f, 0x7806, 0x780f, 0xb204, 0x7843,
-        0x00d8, 0x7853, 0x0080, 0x780b, 0x0008, 0x7047, 0x0008, 0x7053,
-        0x517f, 0x704f, 0x0000, 0x127f, 0x2000, 0x007c, 0x137e, 0x147e,
-        0x157e, 0x047e, 0x20a1, 0x012b, 0x2304, 0xa005, 0x789a, 0x0040,
-        0x2296, 0x8318, 0x2324, 0x8318, 0x2398, 0x24a8, 0xa484, 0xff00,
-        0x0040, 0x228e, 0xa482, 0x0100, 0x20a9, 0x0100, 0x2020, 0x53a6,
-        0xa005, 0x00c0, 0x2285, 0x3318, 0x0078, 0x227c, 0x047f, 0x157f,
-        0x147f, 0x137f, 0x007c, 0xa18c, 0x000f, 0x2011, 0x0101, 0x2204,
-        0xa084, 0xfff0, 0xa105, 0x2012, 0x1078, 0x237f, 0x007c, 0x2011,
-        0x0101, 0x20a9, 0x0009, 0x810b, 0x0070, 0x22b0, 0x0078, 0x22ab,
-        0xa18c, 0x0e00, 0x2204, 0xa084, 0xf1ff, 0xa105, 0x2012, 0x007c,
-        0x2009, 0x0101, 0x20a9, 0x0005, 0x8213, 0x0070, 0x22c1, 0x0078,
-        0x22bc, 0xa294, 0x00e0, 0x2104, 0xa084, 0xff1f, 0xa205, 0x200a,
-        0x007c, 0x2011, 0x0101, 0x20a9, 0x000c, 0x810b, 0x0070, 0x22d2,
-        0x0078, 0x22cd, 0xa18c, 0xf000, 0x2204, 0xa084, 0x0fff, 0xa105,
-        0x2012, 0x007c, 0x2011, 0x0102, 0x2204, 0xa084, 0xffcf, 0xa105,
-        0x2012, 0x007c, 0x8103, 0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061,
-        0x0100, 0x609a, 0x62ac, 0x63ac, 0x0c7f, 0x007c, 0x8103, 0x8003,
-        0xa080, 0x0022, 0x0c7e, 0x2061, 0x0100, 0x609a, 0x60a4, 0xa084,
-        0xffdf, 0x60ae, 0x0c7f, 0x007c, 0x8103, 0x8003, 0xa080, 0x0022,
-        0x0c7e, 0x2061, 0x0100, 0x609a, 0x60a4, 0xa085, 0x0020, 0x60ae,
-        0x0c7f, 0x007c, 0x8103, 0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061,
-        0x0100, 0x609a, 0x60a4, 0x62ae, 0x2010, 0x60a4, 0x63ae, 0x2018,
-        0x0c7f, 0x007c, 0x2091, 0x8000, 0x0c7e, 0x0e7e, 0x6818, 0xa005,
-        0x0040, 0x235d, 0x2061, 0x7500, 0x1078, 0x2365, 0x0040, 0x2349,
-        0x20a9, 0x0000, 0x2061, 0x7400, 0x0c7e, 0x1078, 0x2365, 0x0040,
-        0x2339, 0x0c7f, 0x8c60, 0x0070, 0x2337, 0x0078, 0x232c, 0x0078,
-        0x235d, 0x007f, 0xa082, 0x7400, 0x2071, 0x5140, 0x7086, 0x7182,
-        0x2001, 0x0004, 0x706e, 0x7093, 0x000f, 0x1078, 0x21cd, 0x0078,
-        0x2359, 0x60c0, 0xa005, 0x00c0, 0x235d, 0x2071, 0x5140, 0x7182,
-        0x2c00, 0x708a, 0x2001, 0x0006, 0x706e, 0x7093, 0x000f, 0x1078,
-        0x21cd, 0x2001, 0x0000, 0x0078, 0x235f, 0x2001, 0x0001, 0x2091,
-        0x8001, 0xa005, 0x0e7f, 0x0c7f, 0x007c, 0x2c04, 0xa005, 0x0040,
-        0x237c, 0x2060, 0x600c, 0xa306, 0x00c0, 0x2379, 0x6010, 0xa206,
-        0x00c0, 0x2379, 0x6014, 0xa106, 0x00c0, 0x2379, 0xa006, 0x0078,
-        0x237e, 0x6000, 0x0078, 0x2366, 0xa085, 0x0001, 0x007c, 0x2011,
-        0x5141, 0x220c, 0xa18c, 0x000f, 0x2011, 0x013b, 0x2204, 0xa084,
-        0x0100, 0x0040, 0x2395, 0x2021, 0xff04, 0x2122, 0x810b, 0x810b,
-        0x810b, 0x810b, 0xa18d, 0x0f00, 0x2104, 0x007c, 0x0e7e, 0x68e4,
-        0xa08c, 0x0020, 0x0040, 0x23e9, 0xa084, 0x0006, 0x00c0, 0x23e9,
-        0x6014, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0f0,
-        0x5380, 0x7004, 0xa084, 0x000a, 0x00c0, 0x23e9, 0x7108, 0xa194,
-        0xff00, 0x0040, 0x23e9, 0xa18c, 0x00ff, 0x2001, 0x000c, 0xa106,
-        0x0040, 0x23d0, 0x2001, 0x0012, 0xa106, 0x0040, 0x23d4, 0x2001,
-        0x0014, 0xa106, 0x0040, 0x23d8, 0x2001, 0x0019, 0xa106, 0x0040,
-        0x23dc, 0x2001, 0x0032, 0xa106, 0x0040, 0x23e0, 0x0078, 0x23e4,
-        0x2009, 0x0012, 0x0078, 0x23e6, 0x2009, 0x0014, 0x0078, 0x23e6,
-        0x2009, 0x0019, 0x0078, 0x23e6, 0x2009, 0x0020, 0x0078, 0x23e6,
-        0x2009, 0x003f, 0x0078, 0x23e6, 0x2011, 0x0000, 0x2100, 0xa205,
-        0x700a, 0x0e7f, 0x007c, 0x0068, 0x23eb, 0x2091, 0x8000, 0x2071,
-        0x0000, 0x007e, 0x7018, 0xa084, 0x0001, 0x00c0, 0x23f2, 0x007f,
-        0x2071, 0x0010, 0x70ca, 0x007f, 0x70c6, 0x70c3, 0x8002, 0x70db,
-        0x0741, 0x70df, 0x0000, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091,
-        0x4080, 0x0078, 0x2409, 0x107e, 0x007e, 0x127e, 0x2091, 0x2300,
-        0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x77c2, 0x74c6, 0x76ca, 0x75ce,
-        0xa594, 0x003f, 0xa49c, 0x0003, 0xa484, 0x000f, 0x0079, 0x2420,
-        0x2432, 0x2432, 0x2432, 0x276c, 0x393b, 0x2430, 0x2461, 0x246b,
-        0x2430, 0x2430, 0x2430, 0x2430, 0x2430, 0x2430, 0x2430, 0x2430,
-        0x1078, 0x23eb, 0x8507, 0xa084, 0x001f, 0x0079, 0x2437, 0x2475,
-        0x276c, 0x2926, 0x2a23, 0x2a4b, 0x2ced, 0x2f98, 0x2fdb, 0x3026,
-        0x30ab, 0x3163, 0x320c, 0x2461, 0x2848, 0x2f6d, 0x2457, 0x3cc8,
-        0x3ce8, 0x3eae, 0x3eba, 0x3f8f, 0x2457, 0x2457, 0x4062, 0x4066,
-        0x3cc6, 0x2457, 0x3e19, 0x2457, 0x3b8c, 0x246b, 0x2457, 0x1078,
-        0x23eb, 0x0018, 0x2410, 0x127f, 0x2091, 0x8001, 0x007f, 0x107f,
-        0x007c, 0x2019, 0x4e3b, 0x1078, 0x2276, 0x702f, 0x0001, 0x781b,
-        0x004f, 0x0078, 0x2459, 0x2019, 0x4d9e, 0x1078, 0x2276, 0x702f,
-        0x8000, 0x781b, 0x00d0, 0x0078, 0x2459, 0x7242, 0x2009, 0x510f,
-        0x200b, 0x0000, 0xa584, 0x0001, 0x00c0, 0x3ba0, 0x0040, 0x2492,
-        0x1078, 0x23eb, 0x7003, 0x0000, 0x704b, 0x0000, 0x7043, 0x0000,
-        0x7037, 0x0000, 0x1078, 0x3912, 0x0018, 0x2410, 0x2009, 0x510f,
-        0x200b, 0x0000, 0x7068, 0xa005, 0x00c0, 0x255d, 0x706c, 0xa084,
-        0x0007, 0x0079, 0x249b, 0x2594, 0x24a3, 0x24af, 0x24cc, 0x24ee,
-        0x253b, 0x2514, 0x24a3, 0x1078, 0x38fa, 0x2009, 0x0048, 0x1078,
-        0x2e39, 0x00c0, 0x24ad, 0x7003, 0x0004, 0x0078, 0x2459, 0x1078,
-        0x38fa, 0x00c0, 0x24ca, 0x7080, 0x8007, 0x7882, 0x789b, 0x0010,
-        0x78ab, 0x000c, 0x789b, 0x0060, 0x78ab, 0x0001, 0x785b, 0x0004,
-        0x2009, 0x00e0, 0x1078, 0x2e2d, 0x00c0, 0x24ca, 0x7003, 0x0004,
-        0x7093, 0x000f, 0x0078, 0x2459, 0x1078, 0x38fa, 0x00c0, 0x24ec,
-        0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f, 0xa18d,
-        0x00c0, 0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab, 0x0002,
-        0x785b, 0x0004, 0x2009, 0x00e0, 0x1078, 0x2e2d, 0x00c0, 0x24ec,
-        0x7003, 0x0004, 0x7093, 0x000f, 0x0078, 0x2459, 0x1078, 0x38fa,
-        0x00c0, 0x2512, 0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c,
-        0x001f, 0xa18d, 0x00c0, 0x79aa, 0x78ab, 0x0020, 0x7184, 0x79aa,
-        0x78ab, 0x000d, 0x789b, 0x0060, 0x78ab, 0x0004, 0x785b, 0x0004,
-        0x2009, 0x00e0, 0x1078, 0x2e2d, 0x00c0, 0x2512, 0x7003, 0x0004,
-        0x7093, 0x000f, 0x0078, 0x2459, 0x1078, 0x38fa, 0x00c0, 0x2539,
-        0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f, 0xa18d,
-        0x00c0, 0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab, 0x0002,
-        0x785b, 0x0004, 0x2009, 0x00e0, 0x1078, 0x2e2d, 0x00c0, 0x2539,
-        0x7088, 0x708b, 0x0000, 0x2068, 0x704a, 0x7003, 0x0002, 0x7093,
-        0x000f, 0x0078, 0x2459, 0x1078, 0x38fa, 0x00c0, 0x2459, 0x7088,
-        0x2068, 0x6f14, 0x1078, 0x37ef, 0x2c50, 0x1078, 0x39ac, 0x789b,
-        0x0010, 0x6814, 0xa084, 0x001f, 0xa085, 0x0080, 0x78aa, 0x6e1c,
-        0x2041, 0x0001, 0x708c, 0xa084, 0x0400, 0x2001, 0x0004, 0x0040,
-        0x255b, 0x2001, 0x0006, 0x0078, 0x267c, 0x1078, 0x38fa, 0x00c0,
-        0x2459, 0x789b, 0x0010, 0x7068, 0x2068, 0x6f14, 0x1078, 0x37ef,
-        0x2c50, 0x1078, 0x39ac, 0x6008, 0xa085, 0x0010, 0x600a, 0x6824,
-        0xa005, 0x0040, 0x257b, 0xa082, 0x0006, 0x0048, 0x2579, 0x0078,
-        0x257b, 0x6827, 0x0005, 0x6b14, 0xa39c, 0x001f, 0xa39d, 0x00c0,
-        0x7058, 0xa084, 0x8000, 0x0040, 0x2589, 0xa684, 0x0001, 0x0040,
-        0x258b, 0xa39c, 0xffbf, 0x7baa, 0x2031, 0x0020, 0x2041, 0x0001,
-        0x2001, 0x0003, 0x0078, 0x267c, 0x0018, 0x2410, 0x744c, 0xa485,
-        0x0000, 0x0040, 0x25ae, 0xa080, 0x5180, 0x2030, 0x7150, 0x8108,
-        0xa12a, 0x0048, 0x25a5, 0x2009, 0x5180, 0x2164, 0x6504, 0x85ff,
-        0x00c0, 0x25bf, 0x8421, 0x00c0, 0x259f, 0x7152, 0x7003, 0x0000,
-        0x704b, 0x0000, 0x7040, 0xa005, 0x0040, 0x3ba0, 0x0078, 0x2459,
-        0x764c, 0xa6b0, 0x5180, 0x7150, 0x2600, 0x0078, 0x25aa, 0x7152,
-        0x2568, 0x2558, 0x754a, 0x2c50, 0x6034, 0xa085, 0x0000, 0x00c0,
-        0x25bc, 0x6708, 0x773a, 0xa784, 0x033f, 0x0040, 0x25f5, 0xa784,
-        0x0021, 0x00c0, 0x25bc, 0xa784, 0x0002, 0x0040, 0x25de, 0xa784,
-        0x0004, 0x0040, 0x25bc, 0xa7bc, 0xfffb, 0x670a, 0xa784, 0x0008,
-        0x00c0, 0x25bc, 0xa784, 0x0010, 0x00c0, 0x25bc, 0xa784, 0x0200,
-        0x00c0, 0x25bc, 0xa784, 0x0100, 0x0040, 0x25f5, 0x6018, 0xa005,
-        0x00c0, 0x25bc, 0xa7bc, 0xfeff, 0x670a, 0x6823, 0x0000, 0x6e1c,
-        0xa684, 0x000e, 0x6118, 0x0040, 0x2605, 0x601c, 0xa102, 0x0048,
-        0x2608, 0x0040, 0x2608, 0x0078, 0x25b8, 0x81ff, 0x00c0, 0x25b8,
-        0x68c3, 0x0000, 0xa784, 0x0080, 0x00c0, 0x2610, 0x700c, 0x6022,
-        0xa7bc, 0xff7f, 0x670a, 0x1078, 0x39ac, 0x0018, 0x2410, 0x789b,
-        0x0010, 0xa046, 0x1078, 0x38fa, 0x00c0, 0x2459, 0x6b14, 0xa39c,
-        0x001f, 0xa39d, 0x00c0, 0x7058, 0xa084, 0x8000, 0x0040, 0x262c,
-        0xa684, 0x0001, 0x0040, 0x262e, 0xa39c, 0xffbf, 0xa684, 0x0010,
-        0x0040, 0x2634, 0xa39d, 0x0020, 0x7baa, 0x8840, 0xa684, 0x000e,
-        0x00c0, 0x263f, 0xa7bd, 0x0010, 0x670a, 0x0078, 0x267a, 0x7158,
-        0xa18c, 0x0800, 0x0040, 0x3401, 0x2011, 0x0020, 0xa684, 0x0008,
-        0x00c0, 0x2650, 0x8210, 0xa684, 0x0002, 0x00c0, 0x2650, 0x8210,
-        0x7aaa, 0x8840, 0x1078, 0x3912, 0x6a14, 0x610c, 0x8108, 0xa18c,
-        0x00ff, 0xa1e0, 0x7400, 0x2c64, 0x8cff, 0x0040, 0x2671, 0x6014,
-        0xa206, 0x00c0, 0x265b, 0x60b8, 0x8001, 0x60ba, 0x00c0, 0x2656,
-        0x0c7e, 0x2a60, 0x6008, 0xa085, 0x0100, 0x600a, 0x0c7f, 0x0078,
-        0x2594, 0x1078, 0x38fa, 0x00c0, 0x2459, 0x2a60, 0x610e, 0x79aa,
-        0x8840, 0x7132, 0x2001, 0x0001, 0x007e, 0x715c, 0xa184, 0x0018,
-        0x0040, 0x2697, 0xa184, 0x0010, 0x0040, 0x268a, 0x1078, 0x3604,
-        0x00c0, 0x26ba, 0xa184, 0x0008, 0x0040, 0x2697, 0x69a0, 0xa184,
-        0x0600, 0x00c0, 0x2697, 0x1078, 0x34f1, 0x0078, 0x26ba, 0x69a0,
-        0xa184, 0x0800, 0x0040, 0x26ae, 0x0c7e, 0x027e, 0x2960, 0x6000,
-        0xa085, 0x2000, 0x6002, 0x6104, 0xa18d, 0x0010, 0x6106, 0x027f,
-        0x0c7f, 0x1078, 0x3604, 0x00c0, 0x26ba, 0x69a0, 0xa184, 0x0200,
-        0x0040, 0x26b6, 0x1078, 0x3540, 0x0078, 0x26ba, 0xa184, 0x0400,
-        0x00c0, 0x2693, 0x69a0, 0xa184, 0x1000, 0x0040, 0x26c5, 0x6914,
-        0xa18c, 0xff00, 0x810f, 0x1078, 0x22ee, 0x007f, 0x7002, 0xa68c,
-        0x00e0, 0xa684, 0x0060, 0x0040, 0x26d3, 0xa086, 0x0060, 0x00c0,
-        0x26d3, 0xa18d, 0x4000, 0x88ff, 0x0040, 0x26d8, 0xa18d, 0x0004,
-        0x795a, 0x69b6, 0x789b, 0x0060, 0x2800, 0x78aa, 0x789b, 0x0061,
-        0x6818, 0xa08d, 0x8000, 0xa084, 0x7fff, 0x691a, 0xa68c, 0x0080,
-        0x0040, 0x26f7, 0x7097, 0x0000, 0xa08a, 0x000d, 0x0050, 0x26f5,
-        0xa08a, 0x000c, 0x7196, 0x2001, 0x000c, 0x800c, 0x719a, 0x78aa,
-        0x8008, 0x810c, 0x0040, 0x3407, 0xa18c, 0x00f8, 0x00c0, 0x3407,
-        0x157e, 0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8000,
-        0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f, 0x157f,
-        0x6814, 0x8007, 0x7882, 0x6d94, 0x7dd6, 0x7dde, 0x6e98, 0x7ed2,
-        0x7eda, 0x1078, 0x38fa, 0x00c0, 0x272e, 0x702c, 0x8003, 0x0048,
-        0x2727, 0x2019, 0x4d9e, 0x1078, 0x2276, 0x702f, 0x8000, 0x7830,
-        0xa084, 0x00c0, 0x00c0, 0x272e, 0x0098, 0x2736, 0x6008, 0xa084,
-        0xffef, 0x600a, 0x1078, 0x3912, 0x0078, 0x2482, 0x7200, 0xa284,
-        0x0007, 0xa086, 0x0001, 0x00c0, 0x2743, 0x781b, 0x004f, 0x1078,
-        0x3912, 0x0078, 0x2754, 0x6ab4, 0xa295, 0x2000, 0x7a5a, 0x781b,
-        0x004f, 0x1078, 0x3912, 0x7200, 0x2500, 0xa605, 0x0040, 0x2754,
-        0xa284, 0x0007, 0x1079, 0x2762, 0xad80, 0x0009, 0x7036, 0xa284,
-        0x0007, 0xa086, 0x0001, 0x00c0, 0x2459, 0x6018, 0x8000, 0x601a,
-        0x0078, 0x2459, 0x276a, 0x4a3a, 0x4a3a, 0x4a29, 0x4a3a, 0x276a,
-        0x4a29, 0x276a, 0x1078, 0x23eb, 0x1078, 0x38fa, 0x0f7e, 0x2079,
-        0x5100, 0x78cc, 0x0f7f, 0xa084, 0x0001, 0x0040, 0x2790, 0x706c,
-        0xa086, 0x0001, 0x00c0, 0x277f, 0x706e, 0x0078, 0x2823, 0x706c,
-        0xa086, 0x0005, 0x00c0, 0x278e, 0x7088, 0x2068, 0x681b, 0x0004,
-        0x6817, 0x0000, 0x6820, 0xa085, 0x0008, 0x6822, 0x706f, 0x0000,
-        0x2011, 0x0004, 0x716c, 0xa186, 0x0001, 0x0040, 0x27b1, 0xa186,
-        0x0007, 0x00c0, 0x27a1, 0x2009, 0x5138, 0x200b, 0x0005, 0x0078,
-        0x27b1, 0x2009, 0x5113, 0x2104, 0x2009, 0x5112, 0x200a, 0x2009,
-        0x5138, 0x200b, 0x0001, 0x706f, 0x0000, 0x7073, 0x0001, 0x0078,
-        0x27b3, 0x706f, 0x0000, 0x1078, 0x4776, 0x157e, 0x20a9, 0x0010,
-        0x2039, 0x0000, 0x1078, 0x36e2, 0xa7b8, 0x0100, 0x0070, 0x27c2,
-        0x0078, 0x27ba, 0x157f, 0x7000, 0x0079, 0x27c6, 0x27f4, 0x27db,
-        0x27db, 0x27ce, 0x27f4, 0x27f4, 0x27f4, 0x27f4, 0x2021, 0x515a,
-        0x2404, 0xa005, 0x0040, 0x27f4, 0xad06, 0x00c0, 0x27db, 0x6800,
-        0x2022, 0x0078, 0x27eb, 0x6820, 0xa084, 0x0001, 0x00c0, 0x27e7,
-        0x6f14, 0x1078, 0x37ef, 0x1078, 0x33d8, 0x0078, 0x27eb, 0x7060,
-        0x2060, 0x6800, 0x6002, 0x6a1a, 0x6817, 0x0000, 0x6820, 0xa085,
-        0x0008, 0x6822, 0x1078, 0x1c70, 0x2021, 0x7500, 0x1078, 0x2830,
-        0x2021, 0x515a, 0x1078, 0x2830, 0x157e, 0x20a9, 0x0000, 0x2021,
-        0x7400, 0x1078, 0x2830, 0x8420, 0x0070, 0x2808, 0x0078, 0x2801,
-        0x2061, 0x5400, 0x2021, 0x0002, 0x20a9, 0x0100, 0x6018, 0x6110,
-        0x81ff, 0x0040, 0x2817, 0xa102, 0x0050, 0x2817, 0x6012, 0x601b,
-        0x0000, 0xace0, 0x0010, 0x0070, 0x281f, 0x0078, 0x280e, 0x8421,
-        0x00c0, 0x280c, 0x157f, 0x709c, 0xa084, 0x8000, 0x0040, 0x282a,
-        0x1078, 0x3a00, 0x7003, 0x0000, 0x704b, 0x0000, 0x0078, 0x2459,
-        0x047e, 0x2404, 0xa005, 0x0040, 0x2844, 0x2068, 0x6800, 0x007e,
-        0x6a1a, 0x6817, 0x0000, 0x6820, 0xa085, 0x0008, 0x6822, 0x1078,
-        0x1c70, 0x007f, 0x0078, 0x2832, 0x047f, 0x2023, 0x0000, 0x007c,
-        0xa282, 0x0003, 0x0050, 0x284e, 0x1078, 0x23eb, 0x2300, 0x0079,
-        0x2851, 0x2854, 0x28c7, 0x28e4, 0xa282, 0x0002, 0x0040, 0x285a,
-        0x1078, 0x23eb, 0x706c, 0x706f, 0x0000, 0x7093, 0x0000, 0x0079,
-        0x2861, 0x2869, 0x2869, 0x286b, 0x289f, 0x340d, 0x2869, 0x289f,
-        0x2869, 0x1078, 0x23eb, 0x7780, 0x1078, 0x36e2, 0x7780, 0xa7bc,
-        0x0f00, 0x1078, 0x37ef, 0x6018, 0xa005, 0x0040, 0x2896, 0x2021,
-        0x7500, 0x2009, 0x0004, 0x2011, 0x0010, 0x1078, 0x28ff, 0x0040,
-        0x2896, 0x157e, 0x20a9, 0x0000, 0x2021, 0x7400, 0x047e, 0x2009,
-        0x0004, 0x2011, 0x0010, 0x1078, 0x28ff, 0x047f, 0x0040, 0x2895,
-        0x8420, 0x0070, 0x2895, 0x0078, 0x2886, 0x157f, 0x8738, 0xa784,
-        0x001f, 0x00c0, 0x2871, 0x0078, 0x2482, 0x0078, 0x2482, 0x7780,
-        0x1078, 0x37ef, 0x6018, 0xa005, 0x0040, 0x28c5, 0x2021, 0x7500,
-        0x2009, 0x0005, 0x2011, 0x0020, 0x1078, 0x28ff, 0x0040, 0x28c5,
-        0x157e, 0x20a9, 0x0000, 0x2021, 0x7400, 0x047e, 0x2009, 0x0005,
-        0x2011, 0x0020, 0x1078, 0x28ff, 0x047f, 0x0040, 0x28c4, 0x8420,
-        0x0070, 0x28c4, 0x0078, 0x28b5, 0x157f, 0x0078, 0x2482, 0x2200,
-        0x0079, 0x28ca, 0x28cd, 0x28cf, 0x28cf, 0x1078, 0x23eb, 0x2009,
-        0x0012, 0x706c, 0xa086, 0x0002, 0x0040, 0x28d8, 0x2009, 0x000e,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x28de, 0x691a, 0x706f, 0x0000,
-        0x7073, 0x0001, 0x0078, 0x3888, 0x2200, 0x0079, 0x28e7, 0x28ec,
-        0x28cf, 0x28ea, 0x1078, 0x23eb, 0x1078, 0x4776, 0x7000, 0xa086,
-        0x0001, 0x00c0, 0x339d, 0x1078, 0x33ee, 0x6008, 0xa084, 0xffef,
-        0x600a, 0x1078, 0x3390, 0x0040, 0x339d, 0x0078, 0x2594, 0x2404,
-        0xa005, 0x0040, 0x2922, 0x2068, 0x2d04, 0x007e, 0x6814, 0xa706,
-        0x0040, 0x290e, 0x2d20, 0x007f, 0x0078, 0x2900, 0x007f, 0x2022,
-        0x691a, 0x6817, 0x0000, 0x6820, 0xa205, 0x6822, 0x1078, 0x1c70,
-        0x6010, 0x8001, 0x6012, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078,
-        0x33ee, 0x007c, 0xa085, 0x0001, 0x0078, 0x2921, 0x2300, 0x0079,
-        0x2929, 0x292e, 0x292c, 0x29c7, 0x1078, 0x23eb, 0x78ec, 0xa084,
-        0x0001, 0x00c0, 0x2942, 0x7000, 0xa086, 0x0004, 0x00c0, 0x293a,
-        0x0078, 0x2965, 0x1078, 0x33ee, 0x6008, 0xa084, 0xffef, 0x600a,
-        0x0078, 0x339d, 0x78e4, 0xa005, 0x00d0, 0x2965, 0x0018, 0x2459,
-        0x2008, 0xa084, 0x0030, 0x00c0, 0x2951, 0x781b, 0x004f, 0x0078,
-        0x2459, 0x78ec, 0xa084, 0x0003, 0x0040, 0x294d, 0x2100, 0xa084,
-        0x0007, 0x0079, 0x295b, 0x299e, 0x29a9, 0x298f, 0x2963, 0x38ed,
-        0x38ed, 0x2963, 0x29b8, 0x1078, 0x23eb, 0x7000, 0xa086, 0x0004,
-        0x00c0, 0x297f, 0x706c, 0xa086, 0x0002, 0x00c0, 0x2975, 0x2011,
-        0x0002, 0x2019, 0x0000, 0x0078, 0x2848, 0x706c, 0xa086, 0x0006,
-        0x0040, 0x296f, 0x706c, 0xa086, 0x0004, 0x0040, 0x296f, 0x79e4,
-        0xa184, 0x0030, 0x0040, 0x2989, 0x78ec, 0xa084, 0x0003, 0x00c0,
-        0x298b, 0x0078, 0x2f6d, 0x2001, 0x0003, 0x0078, 0x2d01, 0x6818,
-        0xa084, 0x8000, 0x0040, 0x2996, 0x681b, 0x001d, 0x1078, 0x36c1,
-        0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2459, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x29a5, 0x681b, 0x001d, 0x1078, 0x36c1, 0x0078,
-        0x38b8, 0x6818, 0xa084, 0x8000, 0x0040, 0x29b0, 0x681b, 0x001d,
-        0x1078, 0x36c1, 0x782b, 0x3008, 0x781b, 0x00cd, 0x0078, 0x2459,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x29bf, 0x681b, 0x001d, 0x1078,
-        0x36c1, 0x782b, 0x3008, 0x781b, 0x008e, 0x0078, 0x2459, 0xa584,
-        0x000f, 0x00c0, 0x29e4, 0x7000, 0x0079, 0x29ce, 0x2482, 0x29d8,
-        0x29d6, 0x339d, 0x339d, 0x339d, 0x339d, 0x29d6, 0x1078, 0x23eb,
-        0x1078, 0x33ee, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078, 0x3390,
-        0x0040, 0x339d, 0x0078, 0x2594, 0x78e4, 0xa005, 0x00d0, 0x2965,
-        0x0018, 0x2965, 0x2008, 0xa084, 0x0030, 0x00c0, 0x29f3, 0x781b,
-        0x004f, 0x0078, 0x2459, 0x78ec, 0xa084, 0x0003, 0x0040, 0x29ef,
-        0x2100, 0xa184, 0x0007, 0x0079, 0x29fd, 0x2a0f, 0x2a13, 0x2a07,
-        0x2a05, 0x38ed, 0x38ed, 0x2a05, 0x38e3, 0x1078, 0x23eb, 0x1078,
-        0x36c9, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2459, 0x1078,
-        0x36c9, 0x0078, 0x38b8, 0x1078, 0x36c9, 0x782b, 0x3008, 0x781b,
-        0x00cd, 0x0078, 0x2459, 0x1078, 0x36c9, 0x782b, 0x3008, 0x781b,
-        0x008e, 0x0078, 0x2459, 0x2300, 0x0079, 0x2a26, 0x2a2b, 0x2a29,
-        0x2a2d, 0x1078, 0x23eb, 0x0078, 0x30ab, 0x681b, 0x0008, 0x78a3,
-        0x0000, 0x79e4, 0xa184, 0x0030, 0x0040, 0x30ab, 0x78ec, 0xa084,
-        0x0003, 0x0040, 0x30ab, 0xa184, 0x0007, 0x0079, 0x2a3f, 0x2a47,
-        0x2a13, 0x298f, 0x3888, 0x38ed, 0x38ed, 0x2a47, 0x38e3, 0x1078,
-        0x389c, 0x0078, 0x2459, 0xa282, 0x0005, 0x0050, 0x2a51, 0x1078,
-        0x23eb, 0x2300, 0x0079, 0x2a54, 0x2a57, 0x2cae, 0x2cbc, 0x2200,
-        0x0079, 0x2a5a, 0x2a74, 0x2a61, 0x2a74, 0x2a5f, 0x2c93, 0x1078,
-        0x23eb, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa082, 0x0020,
-        0x0048, 0x369d, 0xa08a, 0x0004, 0x00c8, 0x369d, 0x0079, 0x2a70,
-        0x369d, 0x369d, 0x369d, 0x364b, 0x789b, 0x0018, 0x79a8, 0xa184,
-        0x0080, 0x0040, 0x2a85, 0x0078, 0x369d, 0x7000, 0xa005, 0x00c0,
-        0x2a7b, 0x2011, 0x0004, 0x0078, 0x321f, 0xa184, 0x00ff, 0xa08a,
-        0x0010, 0x00c8, 0x369d, 0x0079, 0x2a8d, 0x2a9f, 0x2a9d, 0x2ab7,
-        0x2abb, 0x2b78, 0x369d, 0x369d, 0x2b7a, 0x369d, 0x369d, 0x2c8f,
-        0x2c8f, 0x369d, 0x369d, 0x369d, 0x2c91, 0x1078, 0x23eb, 0xa684,
-        0x1000, 0x0040, 0x2aac, 0x2001, 0x0500, 0x8000, 0x8000, 0x783a,
-        0x781b, 0x008c, 0x0078, 0x2459, 0x6818, 0xa084, 0x8000, 0x0040,
-        0x2ab5, 0x681b, 0x001d, 0x0078, 0x2aa3, 0x0078, 0x3888, 0x681b,
-        0x001d, 0x0078, 0x36ad, 0x6920, 0x6922, 0xa684, 0x1800, 0x00c0,
-        0x2afc, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2b04, 0x6818, 0xa086,
-        0x0008, 0x00c0, 0x2acd, 0x681b, 0x0000, 0xa684, 0x0400, 0x0040,
-        0x2b74, 0xa684, 0x0080, 0x0040, 0x2af8, 0x7097, 0x0000, 0x6818,
-        0xa084, 0x003f, 0xa08a, 0x000d, 0x0050, 0x2af8, 0xa08a, 0x000c,
-        0x7196, 0x2001, 0x000c, 0x800c, 0x719a, 0x789b, 0x0061, 0x78aa,
+        0x5480, 0x2019, 0x0000, 0x72c8, 0xd2bc, 0x0040, 0x14e9, 0xa39d,
+        0x0010, 0xd2b4, 0x0040, 0x14ee, 0xa39d, 0x0008, 0x6800, 0x007e,
+        0xa226, 0x0040, 0x1511, 0x6a02, 0xa484, 0x2000, 0x0040, 0x14fa,
+        0xa39d, 0x0010, 0xa484, 0x1000, 0x0040, 0x1500, 0xa39d, 0x0008,
+        0xa484, 0x4000, 0x0040, 0x1511, 0x810f, 0xa284, 0x4000, 0x0040,
+        0x150d, 0x1078, 0x2399, 0x0078, 0x1511, 0x1078, 0x238b, 0x0078,
+        0x1511, 0x72cc, 0x6808, 0xa206, 0x0040, 0x1540, 0xa2a4, 0x00ff,
+        0x2061, 0x5240, 0x6118, 0xa186, 0x0028, 0x0040, 0x1527, 0xa186,
+        0x0032, 0x0040, 0x152d, 0xa186, 0x003c, 0x0040, 0x1533, 0xa482,
+        0x0064, 0x0048, 0x153d, 0x0078, 0x1537, 0xa482, 0x0050, 0x0048,
+        0x153d, 0x0078, 0x1537, 0xa482, 0x0043, 0x0048, 0x153d, 0x71c4,
+        0x71c6, 0x027f, 0x72ca, 0x0078, 0x127d, 0x6a0a, 0xa39d, 0x000a,
+        0x6804, 0xa305, 0x6806, 0x027f, 0x6b0c, 0x71c4, 0x0078, 0x1281,
+        0x77c4, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6a14, 0x6b1c, 0x2091,
+        0x8001, 0x70c8, 0x6816, 0x70cc, 0x681e, 0x2708, 0x0078, 0x1281,
+        0x70c4, 0x794c, 0x784e, 0x0078, 0x1283, 0x71c4, 0x72c8, 0x73cc,
+        0xa182, 0x0010, 0x00c8, 0x127c, 0x1078, 0x23a7, 0x0078, 0x1281,
+        0x77c4, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6a08, 0xa295, 0x0002,
+        0x6a0a, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282, 0x77c4, 0x1078,
+        0x19c5, 0x2091, 0x8000, 0x6a08, 0xa294, 0xfff9, 0x6a0a, 0x6804,
+        0xa005, 0x0040, 0x1585, 0x1078, 0x226f, 0x2091, 0x8001, 0x2708,
+        0x0078, 0x1282, 0x77c4, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6a08,
+        0xa295, 0x0004, 0x6a0a, 0x6804, 0xa005, 0x0040, 0x1599, 0x1078,
+        0x226f, 0x2091, 0x8001, 0x2708, 0x0078, 0x1282, 0x77c4, 0x2041,
+        0x0001, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x1078,
+        0x19d2, 0x2091, 0x8001, 0x2708, 0x6a08, 0x0078, 0x1282, 0x77c4,
+        0x72c8, 0x73cc, 0x77c6, 0x72ca, 0x73ce, 0x1078, 0x1a52, 0x00c0,
+        0x15c7, 0x6818, 0xa005, 0x0040, 0x15c7, 0x2708, 0x1078, 0x23b7,
+        0x00c0, 0x15c7, 0x7817, 0x0015, 0x2091, 0x8001, 0x007c, 0x2091,
+        0x8001, 0x0078, 0x1284, 0x77c4, 0x77c6, 0x2041, 0x0021, 0x2049,
+        0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x1078, 0x19d2, 0x2061,
+        0x5240, 0x606f, 0x0003, 0x6782, 0x6093, 0x000f, 0x6073, 0x0000,
+        0x7817, 0x0016, 0x1078, 0x226f, 0x2091, 0x8001, 0x007c, 0x77c8,
+        0x77ca, 0x77c4, 0x77c6, 0xa7bc, 0xff00, 0x2091, 0x8000, 0x2061,
+        0x5240, 0x606f, 0x0002, 0x6073, 0x0000, 0x6782, 0x6093, 0x000f,
+        0x7817, 0x0017, 0x1078, 0x226f, 0x2091, 0x8001, 0x2041, 0x0021,
+        0x2049, 0x0004, 0x2051, 0x0010, 0x2091, 0x8000, 0x1078, 0x19d2,
+        0x70c8, 0x6836, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1606, 0x2091,
+        0x8001, 0x007c, 0x78cc, 0xa084, 0x0003, 0x00c0, 0x1636, 0x2039,
+        0x0000, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008, 0x1078,
+        0x19c5, 0x2091, 0x8000, 0x6808, 0xa80d, 0x690a, 0x2091, 0x8001,
+        0x8738, 0xa784, 0x001f, 0x00c0, 0x161f, 0xa7bc, 0xff00, 0x873f,
+        0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x161f, 0x2091, 0x8000,
+        0x2069, 0x0100, 0x6830, 0xa084, 0x0040, 0x0040, 0x165f, 0x684b,
+        0x0004, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0004, 0x0040, 0x164c,
+        0x0070, 0x164c, 0x0078, 0x1643, 0x684b, 0x0009, 0x20a9, 0x0014,
+        0x6848, 0xa084, 0x0001, 0x0040, 0x1659, 0x0070, 0x1659, 0x0078,
+        0x1650, 0x20a9, 0x00fa, 0x0070, 0x165f, 0x0078, 0x165b, 0x2079,
+        0x5200, 0x7817, 0x0018, 0x2061, 0x5240, 0x606f, 0x0001, 0x6073,
+        0x0000, 0x6093, 0x000f, 0x78cc, 0xa085, 0x0002, 0x78ce, 0x6808,
+        0xa084, 0xfffd, 0x680a, 0x681b, 0x0048, 0x2091, 0x8001, 0x007c,
+        0x78cc, 0xa084, 0xfffd, 0x78ce, 0xa084, 0x0001, 0x00c0, 0x1682,
+        0x1078, 0x1a9c, 0x71c4, 0x71c6, 0x794a, 0x007c, 0x1078, 0x1bc4,
+        0x00c0, 0x129c, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x1693,
+        0x2029, 0x0000, 0x2520, 0x71c4, 0x73c8, 0x72cc, 0x71c6, 0x73ca,
+        0x72ce, 0x2079, 0x5200, 0x2091, 0x8000, 0x1078, 0x1980, 0x2091,
+        0x8001, 0x0040, 0x174a, 0x20a9, 0x0005, 0x20a1, 0x5218, 0x2091,
+        0x8000, 0x41a1, 0x2091, 0x8001, 0x2009, 0x0020, 0x1078, 0x197b,
+        0x0040, 0x16b6, 0x1078, 0x199a, 0x0078, 0x174a, 0x6004, 0xa084,
+        0xff00, 0x8007, 0x8009, 0x0040, 0x1719, 0x0c7e, 0x2c68, 0x2091,
+        0x8000, 0x1078, 0x1980, 0x2091, 0x8001, 0x0040, 0x16ea, 0x2c00,
+        0x689e, 0x8109, 0x00c0, 0x16be, 0x609f, 0x0000, 0x0c7f, 0x0c7e,
+        0x7218, 0x731c, 0x7420, 0x7524, 0x2c68, 0x689c, 0xa065, 0x0040,
+        0x1718, 0x2009, 0x0020, 0x1078, 0x197b, 0x00c0, 0x1701, 0x6004,
+        0xa084, 0x00ff, 0xa086, 0x0002, 0x00c0, 0x16ea, 0x2d00, 0x6002,
+        0x0078, 0x16d0, 0x0c7f, 0x0c7e, 0x609c, 0x2060, 0x1078, 0x1a17,
+        0x0c7f, 0x609f, 0x0000, 0x1078, 0x174e, 0x2009, 0x000c, 0x6008,
+        0xa085, 0x0200, 0x600a, 0x1078, 0x1976, 0x1078, 0x199a, 0x0078,
+        0x174a, 0x0c7f, 0x0c7e, 0x609c, 0x2060, 0x1078, 0x1a17, 0x0c7f,
+        0x609f, 0x0000, 0x1078, 0x174e, 0x2009, 0x000c, 0x6007, 0x0103,
+        0x601b, 0x0003, 0x1078, 0x1976, 0x1078, 0x199a, 0x0078, 0x174a,
+        0x0c7f, 0x74c4, 0x73c8, 0x72cc, 0x6014, 0x2091, 0x8000, 0x7817,
+        0x0012, 0x0e7e, 0x2071, 0x5240, 0x706f, 0x0005, 0x7073, 0x0000,
+        0x7376, 0x727a, 0x747e, 0x7082, 0x7087, 0x0000, 0x2c00, 0x708a,
+        0x708f, 0x0000, 0xa02e, 0x2530, 0x611c, 0x61a2, 0xa184, 0x0060,
+        0x0040, 0x173c, 0x1078, 0x48d3, 0x0e7f, 0x6596, 0x65a6, 0x669a,
+        0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x1078, 0x226f, 0x2091,
+        0x8001, 0x007c, 0x70c3, 0x4005, 0x0078, 0x1287, 0x20a9, 0x0005,
+        0x2099, 0x5218, 0x2091, 0x8000, 0x530a, 0x2091, 0x8001, 0x2100,
+        0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x007c,
+        0x71c4, 0x70c7, 0x0000, 0x7906, 0x0078, 0x1284, 0x71c4, 0x71c6,
+        0x2168, 0x0078, 0x176d, 0x2069, 0x1000, 0x690c, 0xa016, 0x2d04,
+        0xa210, 0x8d68, 0x8109, 0x00c0, 0x176f, 0xa285, 0x0000, 0x00c0,
+        0x177d, 0x70c3, 0x4000, 0x0078, 0x177f, 0x70c3, 0x4003, 0x70ca,
+        0x0078, 0x1287, 0x2011, 0x5267, 0x220c, 0x70c4, 0x8003, 0x0048,
+        0x178f, 0x1078, 0x3c51, 0xa184, 0x7fff, 0x0078, 0x1793, 0x1078,
+        0x3c44, 0xa185, 0x8000, 0x2012, 0x0078, 0x1283, 0x71c4, 0x1078,
+        0x3c3b, 0x6100, 0x2001, 0x5267, 0x2004, 0xa084, 0x8000, 0xa10d,
+        0x6204, 0x6308, 0x0078, 0x1281, 0x79e4, 0x0078, 0x1283, 0x71c4,
+        0x71c6, 0x2198, 0x20a1, 0x0042, 0x20a9, 0x0004, 0x53a3, 0x21a0,
+        0x2099, 0x0042, 0x20a9, 0x0004, 0x53a3, 0x0078, 0x1284, 0x70c4,
+        0x2068, 0x2079, 0x5200, 0x2091, 0x8000, 0x1078, 0x1980, 0x2091,
+        0x8001, 0x0040, 0x1843, 0x6007, 0x0001, 0x600b, 0x0000, 0x602b,
+        0x0000, 0x601b, 0x0006, 0x6a10, 0xa28c, 0x000f, 0xa284, 0x00f0,
+        0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0x6016, 0xa284, 0x0800,
+        0x0040, 0x17de, 0x601b, 0x000a, 0x0078, 0x17e4, 0xa284, 0x1000,
+        0x0040, 0x17e4, 0x601b, 0x000c, 0xa284, 0x0300, 0x0040, 0x17ed,
+        0x602b, 0x0001, 0x8004, 0x8004, 0x8004, 0xa085, 0x0001, 0x601e,
+        0x6023, 0x0000, 0x6027, 0x0000, 0xa284, 0x0400, 0x0040, 0x17fa,
+        0x602b, 0x0000, 0x20a9, 0x0006, 0xac80, 0x000b, 0x20a0, 0xad80,
+        0x0005, 0x2098, 0x53a3, 0xa284, 0x0300, 0x00c0, 0x180f, 0x6046,
+        0x604a, 0x604e, 0x6052, 0x6096, 0x609a, 0x0078, 0x1819, 0x6800,
+        0x6046, 0x6804, 0x604a, 0x6e08, 0x664e, 0x6d0c, 0x6552, 0x6596,
+        0x669a, 0x6014, 0x2091, 0x8000, 0x7817, 0x0042, 0x2c08, 0x2061,
+        0x5240, 0x606f, 0x0005, 0x6073, 0x0000, 0x6077, 0x0000, 0x607b,
+        0x0000, 0x607f, 0x0000, 0x6082, 0x618a, 0xa284, 0x0400, 0x608e,
+        0x2091, 0x8001, 0x0e7e, 0x2071, 0x0020, 0x7007, 0x000a, 0x7007,
+        0x0002, 0x7003, 0x0000, 0x0e7f, 0x2091, 0x8000, 0x1078, 0x226f,
+        0x2091, 0x8001, 0x007c, 0x70c3, 0x4005, 0x0078, 0x1287, 0x0c7e,
+        0x0d7e, 0x0e7e, 0x0f7e, 0x2091, 0x8000, 0x2071, 0x5240, 0x2079,
+        0x0100, 0x2061, 0x0010, 0x70a0, 0xa06d, 0x0040, 0x1903, 0x6a04,
+        0xa294, 0x00ff, 0xa286, 0x0007, 0x0040, 0x1862, 0xa286, 0x000f,
+        0x00c0, 0x1903, 0x691c, 0xa184, 0x00c0, 0x0040, 0x1903, 0xa184,
+        0x0080, 0x00c0, 0x18d3, 0x6824, 0xa084, 0xff00, 0xa085, 0x0019,
+        0x6826, 0x71b0, 0x81ff, 0x0040, 0x1889, 0x0d7e, 0x2069, 0x0020,
+        0x6807, 0x0010, 0x6908, 0x6808, 0xa106, 0x00c0, 0x187a, 0x690c,
+        0x680c, 0xa106, 0x00c0, 0x187f, 0xa184, 0x00ff, 0x00c0, 0x187f,
+        0x0d7f, 0x78b8, 0xa084, 0x801f, 0x00c0, 0x1889, 0x7848, 0xa085,
+        0x000c, 0x784a, 0x71b0, 0x81ff, 0x0040, 0x18ac, 0x70b3, 0x0000,
+        0x0d7e, 0x2069, 0x0020, 0x6807, 0x0018, 0x6804, 0xa084, 0x0008,
+        0x00c0, 0x189d, 0x6807, 0x0008, 0x6804, 0xa084, 0x0008, 0x00c0,
+        0x18a4, 0x6807, 0x0002, 0x0d7f, 0x61c4, 0x62c8, 0x63cc, 0x61c6,
+        0x62ca, 0x63ce, 0x0e7e, 0x2071, 0x5200, 0x7266, 0x736a, 0xae80,
+        0x0019, 0x0e7f, 0x7848, 0xa084, 0x000c, 0x00c0, 0x18ba, 0x1078,
+        0x47e1, 0x78a3, 0x0000, 0x7858, 0xa084, 0xedff, 0x785a, 0x70b4,
+        0xa080, 0x00da, 0x781a, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091,
+        0x8001, 0x0078, 0x1284, 0x6824, 0xa084, 0xff00, 0xa085, 0x0019,
+        0x6826, 0x78b8, 0xa084, 0x801f, 0x00c0, 0x18d9, 0x7848, 0xa085,
+        0x000c, 0x784a, 0x7848, 0xa084, 0x000c, 0x00c0, 0x18e2, 0x71b0,
+        0x81ff, 0x0040, 0x1901, 0x70b3, 0x0000, 0x0d7e, 0x2069, 0x0020,
+        0x6807, 0x0018, 0x6804, 0xa084, 0x0008, 0x00c0, 0x18f2, 0x6807,
+        0x0008, 0x6804, 0xa084, 0x0008, 0x00c0, 0x18f9, 0x6807, 0x0002,
+        0x0d7f, 0x0078, 0x18cb, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x2091,
+        0x8001, 0x2001, 0x4005, 0x0078, 0x1286, 0x7980, 0x71c6, 0x71c4,
+        0xa182, 0x0003, 0x00c8, 0x127c, 0x7982, 0x0078, 0x1284, 0x7980,
+        0x71c6, 0x0078, 0x1284, 0x7974, 0x71c6, 0x71c4, 0x7976, 0x7978,
+        0x71ca, 0x71c8, 0x797a, 0x797c, 0x71ce, 0x71cc, 0x797e, 0x0078,
+        0x1284, 0x7974, 0x71c6, 0x7978, 0x71ca, 0x797c, 0x71ce, 0x0078,
+        0x1284, 0x7900, 0x71c6, 0x71c4, 0x7902, 0x2001, 0x04fd, 0x2004,
+        0xa082, 0x0005, 0x0048, 0x1940, 0x0038, 0x1942, 0x0078, 0x194c,
+        0x00a8, 0x194c, 0xa18c, 0x0001, 0x00c0, 0x194a, 0x20b9, 0x2222,
+        0x0078, 0x194c, 0x20b9, 0x1212, 0x0078, 0x1284, 0x7900, 0x71c6,
+        0x0078, 0x1284, 0x2009, 0x5274, 0x2104, 0x70c6, 0x70c4, 0x200a,
+        0x0078, 0x1284, 0x2009, 0x5274, 0x2104, 0x70c6, 0x0078, 0x1284,
+        0x71c4, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e8,
+        0x5480, 0x6a14, 0xd2b4, 0x0040, 0x1971, 0x2011, 0x0001, 0x0078,
+        0x1973, 0x2011, 0x0000, 0x6b0c, 0x0078, 0x1281, 0xac80, 0x0001,
+        0x1078, 0x1b80, 0x007c, 0xac80, 0x0001, 0x1078, 0x1b20, 0x007c,
+        0x7850, 0xa065, 0x0040, 0x1988, 0x2c04, 0x7852, 0x2063, 0x0000,
+        0x007c, 0x0f7e, 0x2079, 0x5200, 0x7850, 0xa06d, 0x0040, 0x1998,
+        0x2d04, 0x7852, 0x6803, 0x0000, 0x6807, 0x0000, 0x680b, 0x0000,
+        0x0f7f, 0x007c, 0x2091, 0x8000, 0x0f7e, 0x2079, 0x5200, 0x7850,
+        0x2062, 0x2c00, 0xa005, 0x00c0, 0x19a7, 0x1078, 0x248c, 0x7852,
+        0x0f7f, 0x2091, 0x8001, 0x007c, 0x0f7e, 0x2079, 0x5200, 0x7850,
+        0x206a, 0x2d00, 0x7852, 0x0f7f, 0x007c, 0x2011, 0x7900, 0x7a52,
+        0x7bec, 0x8319, 0x0040, 0x19c2, 0xa280, 0x0031, 0x2012, 0x2010,
+        0x0078, 0x19b9, 0x2013, 0x0000, 0x007c, 0xa784, 0x0f00, 0x800b,
+        0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa0e8,
+        0x5500, 0x007c, 0x1078, 0x19c5, 0x2900, 0x682a, 0x2a00, 0x682e,
+        0x6808, 0xa084, 0xffef, 0xa80d, 0x690a, 0x2009, 0x5252, 0x210c,
+        0x6804, 0xa005, 0x0040, 0x1a04, 0xa116, 0x00c0, 0x19ef, 0x2060,
+        0x6000, 0x6806, 0x017e, 0x200b, 0x0000, 0x0078, 0x19f2, 0x2009,
+        0x0000, 0x017e, 0x6804, 0xa065, 0x0040, 0x1a01, 0x6000, 0x6806,
+        0x1078, 0x1a31, 0x1078, 0x1ccb, 0x6810, 0x8001, 0x6812, 0x00c0,
+        0x19f2, 0x017f, 0x6902, 0x6906, 0x007c, 0xa065, 0x0040, 0x1a16,
+        0x2008, 0x609c, 0xa005, 0x0040, 0x1a13, 0x2062, 0x609f, 0x0000,
+        0xa065, 0x0078, 0x1a09, 0x7850, 0x7952, 0x2062, 0x007c, 0xa065,
+        0x0040, 0x1a30, 0x2008, 0x609c, 0xa005, 0x0040, 0x1a25, 0x2062,
+        0x609f, 0x0000, 0xa065, 0x0078, 0x1a1b, 0x0f7e, 0x2079, 0x5200,
+        0x2091, 0x8000, 0x7850, 0x7952, 0x0f7f, 0x2062, 0x2091, 0x8001,
+        0x007c, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9, 0x001c, 0xac80,
+        0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828, 0x601a, 0x682c,
+        0x6022, 0x007c, 0x0e7e, 0x2071, 0x5240, 0x704c, 0xa08c, 0x0200,
+        0x00c0, 0x1a50, 0xa088, 0x5280, 0x2d0a, 0x8000, 0x704e, 0xa006,
+        0x0e7f, 0x007c, 0x1078, 0x19c5, 0x2091, 0x8000, 0x6804, 0x781e,
+        0xa065, 0x0040, 0x1a9b, 0x0078, 0x1a63, 0x2c00, 0x781e, 0x6000,
+        0xa065, 0x0040, 0x1a9b, 0x600c, 0xa306, 0x00c0, 0x1a5d, 0x6010,
+        0xa206, 0x00c0, 0x1a5d, 0x2c28, 0x2001, 0x5252, 0x2004, 0xac06,
+        0x00c0, 0x1a74, 0x0078, 0x1a99, 0x6804, 0xac06, 0x00c0, 0x1a81,
+        0x6000, 0xa065, 0x6806, 0x00c0, 0x1a8b, 0x6803, 0x0000, 0x0078,
+        0x1a8b, 0x6400, 0x781c, 0x2060, 0x6402, 0xa486, 0x0000, 0x00c0,
+        0x1a8b, 0x2c00, 0x6802, 0x2560, 0x1078, 0x1a31, 0x601b, 0x0005,
+        0x6023, 0x0020, 0x1078, 0x1ccb, 0x6810, 0x8001, 0x1050, 0x248c,
+        0x6812, 0xa085, 0xffff, 0x007c, 0x2039, 0x0000, 0x2041, 0x0021,
+        0x2049, 0x0004, 0x2051, 0x0008, 0x2091, 0x8000, 0x1078, 0x19d2,
+        0x8738, 0xa784, 0x001f, 0x00c0, 0x1aa6, 0xa7bc, 0xff00, 0x873f,
+        0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1aa6, 0x2091, 0x8001,
+        0x007c, 0x2061, 0x0000, 0x6018, 0xa084, 0x0001, 0x00c0, 0x1aca,
+        0x2091, 0x8000, 0x78e0, 0x78e3, 0x0000, 0x2091, 0x8001, 0xa005,
+        0x00c0, 0x1acb, 0x007c, 0xa08c, 0xfff0, 0x0040, 0x1ad1, 0x1078,
+        0x248c, 0x0079, 0x1ad3, 0x1ae3, 0x1ae6, 0x1aec, 0x1af0, 0x1ae4,
+        0x1af4, 0x1afa, 0x1ae4, 0x1ae4, 0x1c95, 0x1cb9, 0x1cbd, 0x1ae4,
+        0x1ae4, 0x1ae4, 0x1ae4, 0x007c, 0x1078, 0x248c, 0x1078, 0x1a9c,
+        0x2001, 0x8001, 0x0078, 0x1cc3, 0x2001, 0x8003, 0x0078, 0x1cc3,
+        0x2001, 0x8004, 0x0078, 0x1cc3, 0x1078, 0x1a9c, 0x2001, 0x8006,
+        0x0078, 0x1cc3, 0x2001, 0x8007, 0x0078, 0x1cc3, 0x2030, 0x2138,
+        0xa782, 0x0021, 0x0048, 0x1b06, 0x2009, 0x0020, 0x2600, 0x1078,
+        0x1b20, 0x00c0, 0x1b1f, 0xa7ba, 0x0020, 0x0048, 0x1b1e, 0x0040,
+        0x1b1e, 0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040, 0xa399, 0x0000,
+        0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x0078, 0x1b00, 0xa006, 0x007c,
+        0x81ff, 0x0040, 0x1b5b, 0x2099, 0x0030, 0x20a0, 0x700c, 0xa084,
+        0x00ff, 0x0040, 0x1b32, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004,
+        0x00c0, 0x1b2d, 0x21a8, 0x7017, 0x0000, 0x810b, 0x7112, 0x721a,
+        0x731e, 0x7422, 0x7526, 0x780c, 0xa085, 0x0001, 0x7002, 0x7007,
+        0x0001, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x1b4f,
+        0x2009, 0x0022, 0x2104, 0xa084, 0x4000, 0x00c0, 0x1b41, 0x7008,
+        0x800b, 0x00c8, 0x1b41, 0x7007, 0x0002, 0xa08c, 0x01e0, 0x00c0,
+        0x1b5b, 0x53a5, 0xa006, 0x7003, 0x0000, 0x007c, 0x2030, 0x2138,
+        0xa782, 0x0021, 0x0048, 0x1b66, 0x2009, 0x0020, 0x2600, 0x1078,
+        0x1b80, 0x00c0, 0x1b7f, 0xa7ba, 0x0020, 0x0048, 0x1b7e, 0x0040,
+        0x1b7e, 0x2708, 0xa6b0, 0x0020, 0xa290, 0x0040, 0xa399, 0x0000,
+        0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x0078, 0x1b60, 0xa006, 0x007c,
+        0x81ff, 0x0040, 0x1bc1, 0x2098, 0x20a1, 0x0030, 0x700c, 0xa084,
+        0x00ff, 0x0040, 0x1b92, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004,
+        0x00c0, 0x1b8d, 0x21a8, 0x7017, 0x0000, 0x810b, 0x7112, 0x721a,
+        0x731e, 0x7422, 0x7526, 0x780c, 0xa085, 0x0000, 0x7002, 0x53a6,
+        0x7007, 0x0001, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8,
+        0x1bb0, 0x2009, 0x0022, 0x2104, 0xa084, 0x4000, 0x00c0, 0x1ba2,
+        0x7010, 0xa084, 0xf000, 0x0040, 0x1bb9, 0x7007, 0x0008, 0x0078,
+        0x1bbd, 0x7108, 0x8103, 0x00c8, 0x1ba2, 0x7007, 0x0002, 0xa184,
+        0x01e0, 0x7003, 0x0000, 0x007c, 0x2001, 0x04fd, 0x2004, 0xa082,
+        0x0004, 0x00c8, 0x1bcd, 0x0078, 0x1bd0, 0xa006, 0x0078, 0x1bd2,
+        0xa085, 0x0001, 0x007c, 0x0e7e, 0x2071, 0x5200, 0x2d08, 0x7058,
+        0x6802, 0xa005, 0x00c0, 0x1bdd, 0x715e, 0x715a, 0x0e7f, 0x007c,
+        0x2c08, 0x7858, 0x6002, 0xa005, 0x00c0, 0x1be7, 0x795e, 0x795a,
+        0x007c, 0x2091, 0x8000, 0x6114, 0x1078, 0x2180, 0x6900, 0xa184,
+        0x0100, 0x00c0, 0x2035, 0xa184, 0x0200, 0x00c0, 0x2031, 0x681c,
+        0xa005, 0x00c0, 0x203d, 0x6003, 0x0000, 0x2c08, 0x785c, 0xa065,
+        0x00c0, 0x1c05, 0x795a, 0x0078, 0x1c06, 0x6102, 0x795e, 0x2091,
+        0x8001, 0x1078, 0x228c, 0x007c, 0x0e7e, 0x2071, 0x5200, 0x7058,
+        0xa06d, 0x0040, 0x1c1a, 0x6800, 0x705a, 0xa005, 0x00c0, 0x1c19,
+        0x705e, 0x8dff, 0x0e7f, 0x007c, 0x0d7e, 0x0c7e, 0x0f7e, 0x2079,
+        0x5200, 0xaf80, 0x0016, 0x2060, 0x6000, 0xa005, 0x0040, 0x1c43,
+        0x2068, 0x6814, 0xa306, 0x00c0, 0x1c33, 0x6828, 0xa084, 0x00ff,
+        0xa406, 0x0040, 0x1c36, 0x2d60, 0x0078, 0x1c24, 0x6800, 0xa005,
+        0x6002, 0x00c0, 0x1c42, 0xaf80, 0x0016, 0xac06, 0x0040, 0x1c41,
+        0x2c00, 0x785e, 0x2d00, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c,
+        0x0d7e, 0x0c7e, 0x0f7e, 0x2079, 0x5200, 0xaf80, 0x0016, 0x2060,
+        0x6000, 0xa005, 0x0040, 0x1c6b, 0x2068, 0x6814, 0xa084, 0x00ff,
+        0xa306, 0x0040, 0x1c5e, 0x2d60, 0x0078, 0x1c50, 0x6800, 0xa005,
+        0x6002, 0x00c0, 0x1c6a, 0xaf80, 0x0016, 0xac06, 0x0040, 0x1c69,
+        0x2c00, 0x785e, 0x2d00, 0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c,
+        0x0d7e, 0x0c7e, 0x0f7e, 0x2079, 0x5200, 0xaf80, 0x0016, 0x2060,
+        0x6000, 0xa06d, 0x0040, 0x1c90, 0x6814, 0xa306, 0x0040, 0x1c83,
+        0x2d60, 0x0078, 0x1c78, 0x6800, 0xa005, 0x6002, 0x00c0, 0x1c8f,
+        0xaf80, 0x0016, 0xac06, 0x0040, 0x1c8e, 0x2c00, 0x785e, 0x2d00,
+        0x0f7f, 0x0c7f, 0x0d7f, 0xa005, 0x007c, 0x2091, 0x8000, 0x2069,
+        0x5240, 0x6800, 0xa086, 0x0000, 0x0040, 0x1ca3, 0x2091, 0x8001,
+        0x78e3, 0x0009, 0x007c, 0x6880, 0xa0bc, 0xff00, 0x2041, 0x0021,
+        0x2049, 0x0004, 0x2051, 0x0010, 0x1078, 0x19d2, 0x8738, 0xa784,
+        0x001f, 0x00c0, 0x1cac, 0x2091, 0x8001, 0x2001, 0x800a, 0x0078,
+        0x1cc3, 0x2001, 0x800c, 0x0078, 0x1cc3, 0x1078, 0x1a9c, 0x2001,
+        0x800d, 0x0078, 0x1cc3, 0x70c2, 0x2061, 0x0000, 0x601b, 0x0001,
+        0x2091, 0x4080, 0x007c, 0x6004, 0x2c08, 0x2063, 0x0000, 0x7884,
+        0x8000, 0x7886, 0x7888, 0xa005, 0x798a, 0x0040, 0x1cda, 0x2c02,
+        0x0078, 0x1cdb, 0x798e, 0x007c, 0x6807, 0x0103, 0x0c7e, 0x2061,
+        0x5200, 0x2d08, 0x206b, 0x0000, 0x6084, 0x8000, 0x6086, 0x6088,
+        0xa005, 0x618a, 0x0040, 0x1cef, 0x2d02, 0x0078, 0x1cf0, 0x618e,
+        0x0c7f, 0x007c, 0x1078, 0x1d03, 0x0040, 0x1d02, 0x0c7e, 0x609c,
+        0xa065, 0x0040, 0x1cfd, 0x1078, 0x1a17, 0x0c7f, 0x609f, 0x0000,
+        0x1078, 0x199a, 0x007c, 0x788c, 0xa065, 0x0040, 0x1d15, 0x2091,
+        0x8000, 0x7884, 0x8001, 0x7886, 0x2c04, 0x788e, 0xa005, 0x00c0,
+        0x1d13, 0x788a, 0x8000, 0x2091, 0x8001, 0x007c, 0x20a9, 0x0010,
+        0xa006, 0x8004, 0x8086, 0x818e, 0x00c8, 0x1d1f, 0xa200, 0x0070,
+        0x1d23, 0x0078, 0x1d1a, 0x8086, 0x818e, 0x007c, 0x157e, 0x20a9,
+        0x0010, 0xa005, 0x0040, 0x1d49, 0xa11a, 0x00c8, 0x1d49, 0x8213,
+        0x818d, 0x0048, 0x1d3a, 0xa11a, 0x00c8, 0x1d3b, 0x0070, 0x1d41,
+        0x0078, 0x1d2f, 0xa11a, 0x2308, 0x8210, 0x0070, 0x1d41, 0x0078,
+        0x1d2f, 0x007e, 0x3200, 0xa084, 0xf7ff, 0x2080, 0x007f, 0x157f,
+        0x007c, 0x007e, 0x3200, 0xa085, 0x0800, 0x0078, 0x1d45, 0x7994,
+        0x70d0, 0xa106, 0x0040, 0x1dbd, 0x2091, 0x8000, 0x2071, 0x0020,
+        0x7004, 0xa005, 0x00c0, 0x1dbd, 0x7008, 0x7208, 0xa206, 0x00c0,
+        0x1dbd, 0xa286, 0x0008, 0x00c0, 0x1dbd, 0x2071, 0x0010, 0x1078,
+        0x1980, 0x0040, 0x1dbd, 0x7a9c, 0x7b98, 0x7ca4, 0x7da0, 0xa184,
+        0xff00, 0x0040, 0x1d8b, 0x2031, 0x0000, 0x810b, 0x86b5, 0x810b,
+        0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b, 0x86b5, 0x810b,
+        0x86b5, 0x2100, 0xa210, 0x2600, 0xa319, 0xa4a1, 0x0000, 0xa5a9,
+        0x0000, 0x0078, 0x1d95, 0x8107, 0x8004, 0x8004, 0xa210, 0xa399,
+        0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x2009, 0x0020, 0x1078,
+        0x197b, 0x2091, 0x8001, 0x0040, 0x1db4, 0x1078, 0x199a, 0x78a8,
+        0x8000, 0x78aa, 0xa086, 0x0002, 0x00c0, 0x1dbd, 0x2091, 0x8000,
+        0x78e3, 0x0002, 0x78ab, 0x0000, 0x78cc, 0xa085, 0x0003, 0x78ce,
+        0x2091, 0x8001, 0x0078, 0x1dbd, 0x78ab, 0x0000, 0x1078, 0x2149,
+        0x6004, 0xa084, 0x000f, 0x0079, 0x1dc2, 0x2071, 0x0010, 0x2091,
+        0x8001, 0x007c, 0x1dd2, 0x1df4, 0x1e1a, 0x1dd2, 0x1e37, 0x1de1,
+        0x1fc9, 0x1fe4, 0x1dd2, 0x1dee, 0x1e14, 0x1e7f, 0x1eee, 0x1f57,
+        0x1f69, 0x1fe0, 0x2039, 0x0400, 0x78dc, 0xa705, 0x78de, 0x6008,
+        0xa705, 0x600a, 0x1078, 0x2064, 0x609c, 0x78da, 0x1078, 0x2131,
+        0x007c, 0x78dc, 0xa084, 0x0100, 0x0040, 0x1de8, 0x0078, 0x1dd2,
+        0x601c, 0xa085, 0x0080, 0x601e, 0x0078, 0x1dfb, 0x1078, 0x1bc4,
+        0x00c0, 0x1dd2, 0x1078, 0x2163, 0x78dc, 0xa084, 0x0100, 0x0040,
+        0x1dfb, 0x0078, 0x1dd2, 0x78df, 0x0000, 0x6004, 0x8007, 0xa084,
+        0x00ff, 0x78d2, 0x8001, 0x609f, 0x0000, 0x0040, 0x1e11, 0x1078,
+        0x2064, 0x0040, 0x1e11, 0x78dc, 0xa085, 0x0100, 0x78de, 0x0078,
+        0x1e13, 0x1078, 0x2088, 0x007c, 0x1078, 0x1bc4, 0x00c0, 0x1dd2,
+        0x1078, 0x215f, 0x78dc, 0xa08c, 0x0e00, 0x00c0, 0x1e23, 0xa084,
+        0x0100, 0x00c0, 0x1e25, 0x0078, 0x1dd2, 0x1078, 0x2064, 0x00c0,
+        0x1e36, 0x6104, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x2021,
+        0xa186, 0x000f, 0x0040, 0x2021, 0x1078, 0x2088, 0x007c, 0x78dc,
+        0xa084, 0x0100, 0x0040, 0x1e3e, 0x0078, 0x1dd2, 0x78df, 0x0000,
+        0x6714, 0x2011, 0x0001, 0x20a9, 0x0001, 0x6018, 0xa084, 0x00ff,
+        0xa005, 0x0040, 0x1e61, 0x2011, 0x0001, 0xa7bc, 0xff00, 0x20a9,
+        0x0020, 0xa08e, 0x0001, 0x0040, 0x1e61, 0x2039, 0x0000, 0x2011,
+        0x0002, 0x20a9, 0x0100, 0xa08e, 0x0002, 0x0040, 0x1e61, 0x0078,
+        0x1e7c, 0x1078, 0x19c5, 0x2091, 0x8000, 0x682b, 0x0000, 0x682f,
+        0x0000, 0x6808, 0xa084, 0xffde, 0x680a, 0xade8, 0x0010, 0x2091,
+        0x8001, 0x0070, 0x1e75, 0x0078, 0x1e63, 0x8211, 0x0040, 0x1e7c,
+        0x20a9, 0x0100, 0x0078, 0x1e63, 0x1078, 0x199a, 0x007c, 0x2001,
+        0x5267, 0x2004, 0xa084, 0x8000, 0x0040, 0x2049, 0x6114, 0x1078,
+        0x2180, 0x6900, 0xa184, 0x0001, 0x0040, 0x1ea0, 0x6028, 0xa084,
+        0x00ff, 0x00c0, 0x2041, 0x6800, 0xa084, 0x0001, 0x0040, 0x2049,
+        0x6803, 0x0000, 0x680b, 0x0000, 0x6807, 0x0000, 0x0078, 0x2051,
+        0x2011, 0x0001, 0x6020, 0xd0f4, 0x0040, 0x1ea8, 0xa295, 0x0002,
+        0xd0c4, 0x0040, 0x1ead, 0xa295, 0x0008, 0xd0cc, 0x0040, 0x1eb2,
+        0xa295, 0x0400, 0x601c, 0xa084, 0x0002, 0x0040, 0x1eb9, 0xa295,
+        0x0004, 0x602c, 0xa08c, 0x00ff, 0xa182, 0x0002, 0x0048, 0x204d,
+        0xa182, 0x001b, 0x00c8, 0x204d, 0x0040, 0x204d, 0x690e, 0x602c,
+        0x8007, 0xa08c, 0x00ff, 0xa182, 0x0002, 0x0048, 0x204d, 0xa182,
+        0x001b, 0x00c8, 0x204d, 0x0040, 0x204d, 0x6912, 0x6030, 0xa005,
+        0x00c0, 0x1edc, 0x2001, 0x001e, 0x8000, 0x6816, 0x6028, 0xa084,
+        0x00ff, 0x0040, 0x2049, 0x6806, 0x6028, 0x8007, 0xa084, 0x00ff,
+        0x0040, 0x2049, 0x680a, 0x6a02, 0x0078, 0x2051, 0x2001, 0x5240,
+        0x2004, 0xa086, 0x0007, 0x00c0, 0x1f53, 0x2001, 0x5267, 0x2004,
+        0xa084, 0x8000, 0x0040, 0x2049, 0x6114, 0x1078, 0x2180, 0x2001,
+        0x5252, 0x2004, 0x2010, 0x82ff, 0x0040, 0x1f0e, 0xa080, 0x0005,
+        0x2004, 0xa084, 0x00ff, 0xa106, 0x00c0, 0x1f53, 0x2091, 0x8000,
+        0x6a04, 0x6b08, 0x6418, 0xa484, 0x0003, 0x0040, 0x1f2d, 0x6128,
+        0xa18c, 0x00ff, 0x8001, 0x00c0, 0x1f23, 0x2100, 0xa210, 0x0048,
+        0x1f53, 0x0078, 0x1f2d, 0x8001, 0x00c0, 0x1f53, 0x2100, 0xa212,
+        0x0048, 0x1f53, 0x82ff, 0x0040, 0x1f53, 0xa484, 0x000c, 0x0040,
+        0x1f47, 0x6128, 0x810f, 0xa18c, 0x00ff, 0xa082, 0x0004, 0x00c0,
+        0x1f3f, 0x2100, 0xa318, 0x0048, 0x1f53, 0x0078, 0x1f47, 0xa082,
+        0x0004, 0x00c0, 0x1f53, 0x2100, 0xa31a, 0x0048, 0x1f53, 0x6030,
+        0xa005, 0x0040, 0x1f4d, 0x8000, 0x6816, 0x6a06, 0x6b0a, 0x2091,
+        0x8001, 0x0078, 0x2051, 0x2091, 0x8001, 0x0078, 0x204d, 0x6114,
+        0x1078, 0x2180, 0x2091, 0x8000, 0x6b08, 0x8318, 0x0048, 0x1f65,
+        0x6b0a, 0x2091, 0x8001, 0x0078, 0x2060, 0x2091, 0x8001, 0x0078,
+        0x204d, 0x6024, 0x8007, 0xa084, 0x00ff, 0x0040, 0x1f87, 0xa086,
+        0x0080, 0x00c0, 0x1fc7, 0x20a9, 0x0008, 0x2069, 0x7610, 0x2091,
+        0x8000, 0x6800, 0xa084, 0xfcff, 0x6802, 0xade8, 0x0008, 0x0070,
+        0x1f83, 0x0078, 0x1f79, 0x2091, 0x8001, 0x0078, 0x2051, 0x6028,
+        0xa015, 0x0040, 0x1fc7, 0x6114, 0x1078, 0x2180, 0x0c7e, 0x0d7e,
+        0xade8, 0x0007, 0x2091, 0x8000, 0x6800, 0xa00d, 0x0040, 0x1fc3,
+        0xa206, 0x0040, 0x1f9e, 0x2168, 0x0078, 0x1f94, 0x2160, 0x6000,
+        0x6802, 0x2c68, 0x1078, 0x19ac, 0x0d7f, 0x6818, 0xa00d, 0x0040,
+        0x1fbb, 0x2060, 0x6200, 0x6a1a, 0x6a1c, 0x6202, 0x681e, 0x1078,
+        0x1989, 0x2da0, 0x2198, 0x20a9, 0x0031, 0x53a3, 0x2d60, 0x1078,
+        0x1ccb, 0x0078, 0x1fbe, 0x6808, 0x8000, 0x680a, 0x2091, 0x8001,
+        0x0c7f, 0x0078, 0x2060, 0x2091, 0x8001, 0x0d7f, 0x0c7f, 0x0078,
+        0x2049, 0x6114, 0x1078, 0x2180, 0x6800, 0xa084, 0x0001, 0x0040,
+        0x2039, 0x2091, 0x8000, 0x6a04, 0x8210, 0x0048, 0x1fdc, 0x6a06,
+        0x2091, 0x8001, 0x0078, 0x2060, 0x2091, 0x8001, 0x0078, 0x204d,
+        0x1078, 0x1bc4, 0x00c0, 0x1dd2, 0x6114, 0x1078, 0x2180, 0x60be,
+        0x60bb, 0x0000, 0x6900, 0xa184, 0x0008, 0x0040, 0x1ff3, 0x6020,
+        0xa085, 0x0100, 0x6022, 0xa184, 0x0001, 0x0040, 0x2049, 0xa184,
+        0x0100, 0x00c0, 0x2035, 0xa184, 0x0200, 0x00c0, 0x2031, 0x681c,
+        0xa005, 0x00c0, 0x203d, 0x6004, 0xa084, 0x00ff, 0xa086, 0x000f,
+        0x00c0, 0x200c, 0x1078, 0x2163, 0x78df, 0x0000, 0x6004, 0x8007,
+        0xa084, 0x00ff, 0x78d2, 0x8001, 0x609f, 0x0000, 0x0040, 0x2021,
+        0x1078, 0x2064, 0x0040, 0x2021, 0x78dc, 0xa085, 0x0100, 0x78de,
+        0x007c, 0x78d7, 0x0000, 0x78db, 0x0000, 0x6024, 0xa084, 0xff00,
+        0x6026, 0x1078, 0x3aac, 0x0040, 0x1d4f, 0x1078, 0x1be9, 0x0078,
+        0x1d4f, 0x2009, 0x0017, 0x0078, 0x2053, 0x2009, 0x000e, 0x0078,
+        0x2053, 0x2009, 0x0007, 0x0078, 0x2053, 0x2009, 0x0035, 0x0078,
+        0x2053, 0x2009, 0x003e, 0x0078, 0x2053, 0x2009, 0x0004, 0x0078,
+        0x2053, 0x2009, 0x0006, 0x0078, 0x2053, 0x2009, 0x0016, 0x0078,
+        0x2053, 0x2009, 0x0001, 0x6024, 0xa084, 0xff00, 0xa105, 0x6026,
+        0x2091, 0x8000, 0x1078, 0x1ccb, 0x2091, 0x8001, 0x0078, 0x1d4f,
+        0x1078, 0x199a, 0x0078, 0x1d4f, 0x78d4, 0xa06d, 0x00c0, 0x206f,
+        0x2c00, 0x78d6, 0x78da, 0x609f, 0x0000, 0x0078, 0x207b, 0x2c00,
+        0x689e, 0x609f, 0x0000, 0x78d6, 0x2d00, 0x6002, 0x78d8, 0xad06,
+        0x00c0, 0x207b, 0x6002, 0x78d0, 0x8001, 0x78d2, 0x00c0, 0x2087,
+        0x78dc, 0xa084, 0xfeff, 0x78de, 0x78d8, 0x2060, 0xa006, 0x007c,
+        0xa02e, 0x2530, 0x611c, 0x61a2, 0xa184, 0xe1ff, 0x601e, 0xa184,
+        0x0060, 0x0040, 0x2097, 0x0e7e, 0x1078, 0x48d3, 0x0e7f, 0x6596,
+        0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x6714,
+        0x1078, 0x19c5, 0x2091, 0x8000, 0x60a0, 0xa084, 0x8000, 0x00c0,
+        0x20be, 0x6808, 0xa084, 0x0001, 0x0040, 0x20be, 0x2091, 0x8001,
+        0x1078, 0x1a31, 0x2091, 0x8000, 0x1078, 0x1ccb, 0x2091, 0x8001,
+        0x78d7, 0x0000, 0x78db, 0x0000, 0x0078, 0x2130, 0x6024, 0xa096,
+        0x0001, 0x00c0, 0x20c5, 0x8000, 0x6026, 0x6a10, 0x6814, 0x2091,
+        0x8001, 0xa202, 0x0048, 0x20d4, 0x0040, 0x20d4, 0x2039, 0x0200,
+        0x1078, 0x2131, 0x0078, 0x2130, 0x2c08, 0x2091, 0x8000, 0x60a0,
+        0xa084, 0x8000, 0x0040, 0x2101, 0x6800, 0xa065, 0x0040, 0x2106,
+        0x6a04, 0x0e7e, 0x2071, 0x5240, 0x7000, 0xa084, 0x0001, 0x0040,
+        0x20fb, 0x7048, 0xa206, 0x00c0, 0x20fb, 0x6b04, 0x231c, 0x2160,
+        0x6302, 0x2300, 0xa005, 0x00c0, 0x20f6, 0x6902, 0x2260, 0x6102,
+        0x0e7f, 0x0078, 0x210d, 0x2160, 0x6202, 0x6906, 0x0e7f, 0x0078,
+        0x210d, 0x6800, 0xa065, 0x0040, 0x2106, 0x6102, 0x6902, 0x00c0,
+        0x210a, 0x6906, 0x2160, 0x6003, 0x0000, 0x2160, 0x60a0, 0xa084,
+        0x8000, 0x0040, 0x2117, 0x6808, 0xa084, 0xfffc, 0x680a, 0x6810,
+        0x8000, 0x6812, 0x2091, 0x8001, 0x6808, 0xa08c, 0x0040, 0x0040,
+        0x2126, 0xa086, 0x0040, 0x680a, 0x1078, 0x1a42, 0x2091, 0x8000,
+        0x1078, 0x226f, 0x2091, 0x8001, 0x78db, 0x0000, 0x78d7, 0x0000,
+        0x007c, 0x6008, 0xa705, 0x600a, 0x2091, 0x8000, 0x1078, 0x1ccb,
+        0x2091, 0x8001, 0x78d8, 0xa065, 0x0040, 0x2144, 0x609c, 0x78da,
+        0x609f, 0x0000, 0x0078, 0x2134, 0x78d7, 0x0000, 0x78db, 0x0000,
+        0x007c, 0x7990, 0x7894, 0x8000, 0xa10a, 0x00c8, 0x2150, 0xa006,
+        0x7896, 0x70d2, 0x7804, 0xa005, 0x0040, 0x215e, 0x8001, 0x7806,
+        0x00c0, 0x215e, 0x0068, 0x215e, 0x2091, 0x4080, 0x007c, 0x2039,
+        0x2177, 0x0078, 0x2165, 0x2039, 0x217d, 0x2704, 0xa005, 0x0040,
+        0x2176, 0xac00, 0x2068, 0x6b08, 0x6c0c, 0x6910, 0x6a14, 0x690a,
+        0x6a0e, 0x6b12, 0x6c16, 0x8738, 0x0078, 0x2165, 0x007c, 0x0003,
+        0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0015, 0x001b, 0x0000,
+        0x0c7e, 0x1078, 0x3c3b, 0x2c68, 0x0c7f, 0x007c, 0x0010, 0x21f7,
+        0x0068, 0x21f7, 0x2029, 0x0000, 0x78cb, 0x0000, 0x788c, 0xa065,
+        0x0040, 0x21f0, 0x2009, 0x5274, 0x2104, 0xa084, 0x0001, 0x0040,
+        0x21be, 0x6004, 0xa086, 0x0103, 0x00c0, 0x21be, 0x6018, 0xa005,
+        0x00c0, 0x21be, 0x6014, 0xa005, 0x00c0, 0x21be, 0x0d7e, 0x2069,
+        0x0000, 0x6818, 0xa084, 0x0001, 0x00c0, 0x21bd, 0x600c, 0x70c6,
+        0x6010, 0x70ca, 0x70c3, 0x8020, 0x681b, 0x0001, 0x2091, 0x4080,
+        0x0d7f, 0x1078, 0x1cf2, 0x0078, 0x21f5, 0x0d7f, 0x1078, 0x21f8,
+        0x0040, 0x21f0, 0x6204, 0xa294, 0x00ff, 0xa296, 0x0003, 0x0040,
+        0x21d0, 0x6204, 0xa296, 0x0110, 0x00c0, 0x21de, 0x78cb, 0x0001,
+        0x6204, 0xa294, 0xff00, 0x8217, 0x8211, 0x0040, 0x21de, 0x85ff,
+        0x00c0, 0x21f0, 0x8210, 0xa202, 0x00c8, 0x21f0, 0x057e, 0x1078,
+        0x2207, 0x057f, 0x0040, 0x21eb, 0x78e0, 0xa086, 0x0003, 0x0040,
+        0x21f0, 0x0078, 0x21de, 0x8528, 0x78c8, 0xa005, 0x0040, 0x218e,
+        0x85ff, 0x0040, 0x21f7, 0x2091, 0x4080, 0x78b0, 0x70d6, 0x007c,
+        0x7bac, 0x79b0, 0x70d4, 0xa102, 0x00c0, 0x2201, 0x2300, 0xa005,
+        0x007c, 0x0048, 0x2205, 0xa302, 0x007c, 0x8002, 0x007c, 0x2001,
+        0x04fd, 0x2004, 0xa082, 0x0005, 0x00c8, 0x2221, 0x2091, 0x8000,
+        0x2071, 0x0020, 0x7004, 0xa005, 0x00c0, 0x2256, 0x7008, 0x7208,
+        0xa206, 0x00c0, 0x2256, 0xa286, 0x0008, 0x00c0, 0x2256, 0x2071,
+        0x0010, 0x1078, 0x225b, 0x2009, 0x0020, 0x6004, 0xa086, 0x0103,
+        0x00c0, 0x2230, 0x6028, 0xa005, 0x00c0, 0x2230, 0x2009, 0x000c,
+        0x1078, 0x1976, 0x0040, 0x2249, 0x78c4, 0x8000, 0x78c6, 0xa086,
+        0x0002, 0x00c0, 0x2256, 0x2091, 0x8000, 0x78e3, 0x0003, 0x78c7,
+        0x0000, 0x78cc, 0xa085, 0x0300, 0x78ce, 0x2091, 0x8001, 0x0078,
+        0x2256, 0x78c7, 0x0000, 0x1078, 0x1cf2, 0x79ac, 0x78b0, 0x8000,
+        0xa10a, 0x00c8, 0x2254, 0xa006, 0x78b2, 0xa006, 0x2071, 0x0010,
+        0x2091, 0x8001, 0x007c, 0x8107, 0x8004, 0x8004, 0x7ab8, 0x7bb4,
+        0x7cc0, 0x7dbc, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9,
+        0x0000, 0x007c, 0x2009, 0x525b, 0x2091, 0x8000, 0x200a, 0x0f7e,
+        0x0e7e, 0x2071, 0x5240, 0x7000, 0xa086, 0x0000, 0x00c0, 0x2289,
+        0x2009, 0x5212, 0x2104, 0xa005, 0x00c0, 0x2289, 0x2079, 0x0100,
+        0x7830, 0xa084, 0x00c0, 0x00c0, 0x2289, 0x0018, 0x2289, 0x781b,
+        0x004b, 0x0e7f, 0x0f7f, 0x007c, 0x0f7e, 0x0e7e, 0x2071, 0x5240,
+        0x2091, 0x8000, 0x7000, 0xa086, 0x0000, 0x00c0, 0x22a2, 0x2079,
+        0x0100, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x22a2, 0x0018, 0x22a2,
+        0x781b, 0x004d, 0x2091, 0x8001, 0x0e7f, 0x0f7f, 0x007c, 0x127e,
+        0x2091, 0x2300, 0x2071, 0x5240, 0x2079, 0x0100, 0x784b, 0x000f,
+        0x0098, 0x22b5, 0x7838, 0x0078, 0x22ae, 0x20a9, 0x0040, 0x7800,
+        0xa082, 0x0004, 0x0048, 0x22be, 0x20a9, 0x0060, 0x789b, 0x0000,
+        0x78af, 0x0000, 0x78af, 0x0000, 0x0070, 0x22c8, 0x0078, 0x22c0,
+        0x7800, 0xa082, 0x0004, 0x0048, 0x22d7, 0x70b7, 0x0093, 0x2019,
+        0x4ff0, 0x1078, 0x2313, 0x702f, 0x8001, 0x0078, 0x22e3, 0x70b7,
+        0x0000, 0x2019, 0x4e70, 0x1078, 0x2313, 0x2019, 0x4eaf, 0x1078,
+        0x2313, 0x702f, 0x8000, 0x7003, 0x0000, 0x1078, 0x2420, 0x7004,
+        0xa084, 0x000f, 0x017e, 0x2009, 0x04fd, 0x210c, 0xa18a, 0x0005,
+        0x0048, 0x22f8, 0x0038, 0x22fe, 0xa085, 0x6280, 0x0078, 0x2300,
+        0x0028, 0x22fe, 0xa085, 0x6280, 0x0078, 0x2300, 0xa085, 0x62c0,
+        0x017f, 0x7806, 0x780f, 0xb204, 0x7843, 0x00d8, 0x7853, 0x0080,
+        0x780b, 0x0008, 0x7047, 0x0008, 0x7053, 0x527f, 0x704f, 0x0000,
+        0x127f, 0x2000, 0x007c, 0x137e, 0x147e, 0x157e, 0x047e, 0x20a1,
+        0x012b, 0x2304, 0xa005, 0x789a, 0x0040, 0x2333, 0x8318, 0x2324,
+        0x8318, 0x2398, 0x24a8, 0xa484, 0xff00, 0x0040, 0x232b, 0xa482,
+        0x0100, 0x20a9, 0x0100, 0x2020, 0x53a6, 0xa005, 0x00c0, 0x2322,
+        0x3318, 0x0078, 0x2319, 0x047f, 0x157f, 0x147f, 0x137f, 0x007c,
+        0xa18c, 0x000f, 0x2011, 0x0101, 0x2204, 0xa084, 0xfff0, 0xa105,
+        0x2012, 0x1078, 0x2420, 0x007c, 0x2011, 0x0101, 0x20a9, 0x0009,
+        0x810b, 0x0070, 0x234d, 0x0078, 0x2348, 0xa18c, 0x0e00, 0x2204,
+        0xa084, 0xf1ff, 0xa105, 0x2012, 0x007c, 0x2009, 0x0101, 0x20a9,
+        0x0005, 0x8213, 0x0070, 0x235e, 0x0078, 0x2359, 0xa294, 0x00e0,
+        0x2104, 0xa084, 0xff1f, 0xa205, 0x200a, 0x007c, 0x2011, 0x0101,
+        0x20a9, 0x000c, 0x810b, 0x0070, 0x236f, 0x0078, 0x236a, 0xa18c,
+        0xf000, 0x2204, 0xa084, 0x0fff, 0xa105, 0x2012, 0x007c, 0x2011,
+        0x0102, 0x2204, 0xa084, 0xffcf, 0xa105, 0x2012, 0x007c, 0x8103,
+        0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061, 0x0100, 0x609a, 0x62ac,
+        0x63ac, 0x0c7f, 0x007c, 0x8103, 0x8003, 0xa080, 0x0022, 0x0c7e,
+        0x2061, 0x0100, 0x609a, 0x60a4, 0xa084, 0xffdf, 0x60ae, 0x0c7f,
+        0x007c, 0x8103, 0x8003, 0xa080, 0x0022, 0x0c7e, 0x2061, 0x0100,
+        0x609a, 0x60a4, 0xa085, 0x0020, 0x60ae, 0x0c7f, 0x007c, 0x8103,
+        0x8003, 0xa080, 0x0020, 0x0c7e, 0x2061, 0x0100, 0x609a, 0x60a4,
+        0x62ae, 0x2010, 0x60a4, 0x63ae, 0x2018, 0x0c7f, 0x007c, 0x2091,
+        0x8000, 0x0c7e, 0x0e7e, 0x6818, 0xa005, 0x0040, 0x23fe, 0x2061,
+        0x7600, 0x1078, 0x2406, 0x0040, 0x23e8, 0x20a9, 0x0000, 0x2061,
+        0x7500, 0x0c7e, 0x1078, 0x2406, 0x0040, 0x23d6, 0x0c7f, 0x8c60,
+        0x0070, 0x23d4, 0x0078, 0x23c9, 0x0078, 0x23fe, 0x007f, 0xa082,
+        0x7500, 0x2071, 0x5240, 0x7086, 0x7182, 0x2001, 0x0004, 0x706e,
+        0x7093, 0x000f, 0x7073, 0x0000, 0x1078, 0x226a, 0x0078, 0x23fa,
+        0x60c0, 0xa005, 0x00c0, 0x23fe, 0x2071, 0x5240, 0x7182, 0x2c00,
+        0x708a, 0x2001, 0x0006, 0x706e, 0x7093, 0x000f, 0x7073, 0x0000,
+        0x1078, 0x226a, 0x2001, 0x0000, 0x0078, 0x2400, 0x2001, 0x0001,
+        0x2091, 0x8001, 0xa005, 0x0e7f, 0x0c7f, 0x007c, 0x2c04, 0xa005,
+        0x0040, 0x241d, 0x2060, 0x600c, 0xa306, 0x00c0, 0x241a, 0x6010,
+        0xa206, 0x00c0, 0x241a, 0x6014, 0xa106, 0x00c0, 0x241a, 0xa006,
+        0x0078, 0x241f, 0x6000, 0x0078, 0x2407, 0xa085, 0x0001, 0x007c,
+        0x2011, 0x5241, 0x220c, 0xa18c, 0x000f, 0x2011, 0x013b, 0x2204,
+        0xa084, 0x0100, 0x0040, 0x2436, 0x2021, 0xff04, 0x2122, 0x810b,
+        0x810b, 0x810b, 0x810b, 0xa18d, 0x0f00, 0x2104, 0x007c, 0x0e7e,
+        0x68e4, 0xa08c, 0x0020, 0x0040, 0x248a, 0xa084, 0x0006, 0x00c0,
+        0x248a, 0x6014, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003,
+        0xa0f0, 0x5480, 0x7004, 0xa084, 0x000a, 0x00c0, 0x248a, 0x7108,
+        0xa194, 0xff00, 0x0040, 0x248a, 0xa18c, 0x00ff, 0x2001, 0x000c,
+        0xa106, 0x0040, 0x2471, 0x2001, 0x0012, 0xa106, 0x0040, 0x2475,
+        0x2001, 0x0014, 0xa106, 0x0040, 0x2479, 0x2001, 0x0019, 0xa106,
+        0x0040, 0x247d, 0x2001, 0x0032, 0xa106, 0x0040, 0x2481, 0x0078,
+        0x2485, 0x2009, 0x0012, 0x0078, 0x2487, 0x2009, 0x0014, 0x0078,
+        0x2487, 0x2009, 0x0019, 0x0078, 0x2487, 0x2009, 0x0020, 0x0078,
+        0x2487, 0x2009, 0x003f, 0x0078, 0x2487, 0x2011, 0x0000, 0x2100,
+        0xa205, 0x700a, 0x0e7f, 0x007c, 0x0068, 0x248c, 0x2091, 0x8000,
+        0x2071, 0x0000, 0x007e, 0x7018, 0xa084, 0x0001, 0x00c0, 0x2493,
+        0x007f, 0x2071, 0x0010, 0x70ca, 0x007f, 0x70c6, 0x70c3, 0x8002,
+        0x70db, 0x0741, 0x70df, 0x0006, 0x2071, 0x0000, 0x701b, 0x0001,
+        0x2091, 0x4080, 0x0078, 0x24aa, 0x107e, 0x007e, 0x127e, 0x2091,
+        0x2300, 0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x77c2, 0x74c6, 0x76ca,
+        0x75ce, 0xa594, 0x003f, 0xa49c, 0x0003, 0xa484, 0x000f, 0x0079,
+        0x24c1, 0x24d3, 0x24d3, 0x24d3, 0x280d, 0x3a09, 0x24d1, 0x2502,
+        0x250c, 0x24d1, 0x24d1, 0x24d1, 0x24d1, 0x24d1, 0x24d1, 0x24d1,
+        0x24d1, 0x1078, 0x248c, 0x8507, 0xa084, 0x001f, 0x0079, 0x24d8,
+        0x2516, 0x280d, 0x29c7, 0x2ac4, 0x2aec, 0x2d8c, 0x3037, 0x309a,
+        0x30fb, 0x3180, 0x3238, 0x32d6, 0x2502, 0x28e9, 0x300c, 0x24f8,
+        0x3dac, 0x3dcc, 0x3f8f, 0x3f9b, 0x4074, 0x24f8, 0x24f8, 0x4149,
+        0x414d, 0x3daa, 0x24f8, 0x3efa, 0x24f8, 0x3c5e, 0x250c, 0x24f8,
+        0x1078, 0x248c, 0x0018, 0x24b1, 0x127f, 0x2091, 0x8001, 0x007f,
+        0x107f, 0x007c, 0x2019, 0x4f49, 0x1078, 0x2313, 0x702f, 0x0001,
+        0x781b, 0x004f, 0x0078, 0x24fa, 0x2019, 0x4eaf, 0x1078, 0x2313,
+        0x702f, 0x8000, 0x781b, 0x00cd, 0x0078, 0x24fa, 0x7242, 0x2009,
+        0x520f, 0x200b, 0x0000, 0xa584, 0x0001, 0x00c0, 0x3c72, 0x0040,
+        0x2533, 0x1078, 0x248c, 0x7003, 0x0000, 0x704b, 0x0000, 0x7043,
+        0x0000, 0x7037, 0x0000, 0x1078, 0x39e0, 0x0018, 0x24b1, 0x2009,
+        0x520f, 0x200b, 0x0000, 0x7068, 0xa005, 0x00c0, 0x25fe, 0x706c,
+        0xa084, 0x0007, 0x0079, 0x253c, 0x2635, 0x2544, 0x2550, 0x256d,
+        0x258f, 0x25dc, 0x25b5, 0x2544, 0x1078, 0x39c8, 0x2009, 0x0048,
+        0x1078, 0x2ed8, 0x00c0, 0x254e, 0x7003, 0x0004, 0x0078, 0x24fa,
+        0x1078, 0x39c8, 0x00c0, 0x256b, 0x7080, 0x8007, 0x7882, 0x789b,
+        0x0010, 0x78ab, 0x000c, 0x789b, 0x0060, 0x78ab, 0x0001, 0x785b,
+        0x0004, 0x2009, 0x00dd, 0x1078, 0x2ecc, 0x00c0, 0x256b, 0x7003,
+        0x0004, 0x7093, 0x000f, 0x0078, 0x24fa, 0x1078, 0x39c8, 0x00c0,
+        0x258d, 0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f,
+        0xa18d, 0x00c0, 0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab,
+        0x0002, 0x785b, 0x0004, 0x2009, 0x00dd, 0x1078, 0x2ecc, 0x00c0,
+        0x258d, 0x7003, 0x0004, 0x7093, 0x000f, 0x0078, 0x24fa, 0x1078,
+        0x39c8, 0x00c0, 0x25b3, 0x7180, 0x8107, 0x7882, 0x789b, 0x0010,
+        0xa18c, 0x001f, 0xa18d, 0x00c0, 0x79aa, 0x78ab, 0x0020, 0x7184,
+        0x79aa, 0x78ab, 0x000d, 0x789b, 0x0060, 0x78ab, 0x0004, 0x785b,
+        0x0004, 0x2009, 0x00dd, 0x1078, 0x2ecc, 0x00c0, 0x25b3, 0x7003,
+        0x0004, 0x7093, 0x000f, 0x0078, 0x24fa, 0x1078, 0x39c8, 0x00c0,
+        0x25da, 0x7180, 0x8107, 0x7882, 0x789b, 0x0010, 0xa18c, 0x001f,
+        0xa18d, 0x00c0, 0x79aa, 0x78ab, 0x0006, 0x789b, 0x0060, 0x78ab,
+        0x0002, 0x785b, 0x0004, 0x2009, 0x00dd, 0x1078, 0x2ecc, 0x00c0,
+        0x25da, 0x7088, 0x708b, 0x0000, 0x2068, 0x704a, 0x7003, 0x0002,
+        0x7093, 0x000f, 0x0078, 0x24fa, 0x1078, 0x39c8, 0x00c0, 0x24fa,
+        0x7088, 0x2068, 0x6f14, 0x1078, 0x38bd, 0x2c50, 0x1078, 0x3a7a,
+        0x789b, 0x0010, 0x6814, 0xa084, 0x001f, 0xa085, 0x0080, 0x78aa,
+        0x6e1c, 0x2041, 0x0001, 0x708c, 0xa084, 0x0400, 0x2001, 0x0004,
+        0x0040, 0x25fc, 0x2001, 0x0006, 0x0078, 0x271d, 0x1078, 0x39c8,
+        0x00c0, 0x24fa, 0x789b, 0x0010, 0x7068, 0x2068, 0x6f14, 0x1078,
+        0x38bd, 0x2c50, 0x1078, 0x3a7a, 0x6008, 0xa085, 0x0010, 0x600a,
+        0x6824, 0xa005, 0x0040, 0x261c, 0xa082, 0x0006, 0x0048, 0x261a,
+        0x0078, 0x261c, 0x6827, 0x0005, 0x6b14, 0xa39c, 0x001f, 0xa39d,
+        0x00c0, 0x7058, 0xa084, 0x8000, 0x0040, 0x262a, 0xa684, 0x0001,
+        0x0040, 0x262c, 0xa39c, 0xffbf, 0x7baa, 0x2031, 0x0020, 0x2041,
+        0x0001, 0x2001, 0x0003, 0x0078, 0x271d, 0x0018, 0x24b1, 0x744c,
+        0xa485, 0x0000, 0x0040, 0x264f, 0xa080, 0x5280, 0x2030, 0x7150,
+        0x8108, 0xa12a, 0x0048, 0x2646, 0x2009, 0x5280, 0x2164, 0x6504,
+        0x85ff, 0x00c0, 0x2660, 0x8421, 0x00c0, 0x2640, 0x7152, 0x7003,
+        0x0000, 0x704b, 0x0000, 0x7040, 0xa005, 0x0040, 0x3c72, 0x0078,
+        0x24fa, 0x764c, 0xa6b0, 0x5280, 0x7150, 0x2600, 0x0078, 0x264b,
+        0x7152, 0x2568, 0x2558, 0x754a, 0x2c50, 0x6034, 0xa085, 0x0000,
+        0x00c0, 0x265d, 0x6708, 0x773a, 0xa784, 0x033f, 0x0040, 0x2696,
+        0xa784, 0x0021, 0x00c0, 0x265d, 0xa784, 0x0002, 0x0040, 0x267f,
+        0xa784, 0x0004, 0x0040, 0x265d, 0xa7bc, 0xfffb, 0x670a, 0xa784,
+        0x0008, 0x00c0, 0x265d, 0xa784, 0x0010, 0x00c0, 0x265d, 0xa784,
+        0x0200, 0x00c0, 0x265d, 0xa784, 0x0100, 0x0040, 0x2696, 0x6018,
+        0xa005, 0x00c0, 0x265d, 0xa7bc, 0xfeff, 0x670a, 0x6823, 0x0000,
+        0x6e1c, 0xa684, 0x000e, 0x6118, 0x0040, 0x26a6, 0x601c, 0xa102,
+        0x0048, 0x26a9, 0x0040, 0x26a9, 0x0078, 0x2659, 0x81ff, 0x00c0,
+        0x2659, 0x68c3, 0x0000, 0xa784, 0x0080, 0x00c0, 0x26b1, 0x700c,
+        0x6022, 0xa7bc, 0xff7f, 0x670a, 0x1078, 0x3a7a, 0x0018, 0x24b1,
+        0x789b, 0x0010, 0xa046, 0x1078, 0x39c8, 0x00c0, 0x24fa, 0x6b14,
+        0xa39c, 0x001f, 0xa39d, 0x00c0, 0x7058, 0xa084, 0x8000, 0x0040,
+        0x26cd, 0xa684, 0x0001, 0x0040, 0x26cf, 0xa39c, 0xffbf, 0xa684,
+        0x0010, 0x0040, 0x26d5, 0xa39d, 0x0020, 0x7baa, 0x8840, 0xa684,
+        0x000e, 0x00c0, 0x26e0, 0xa7bd, 0x0010, 0x670a, 0x0078, 0x271b,
+        0x7158, 0xa18c, 0x0800, 0x0040, 0x34cb, 0x2011, 0x0020, 0xa684,
+        0x0008, 0x00c0, 0x26f1, 0x8210, 0xa684, 0x0002, 0x00c0, 0x26f1,
+        0x8210, 0x7aaa, 0x8840, 0x1078, 0x39e0, 0x6a14, 0x610c, 0x8108,
+        0xa18c, 0x00ff, 0xa1e0, 0x7500, 0x2c64, 0x8cff, 0x0040, 0x2712,
+        0x6014, 0xa206, 0x00c0, 0x26fc, 0x60b8, 0x8001, 0x60ba, 0x00c0,
+        0x26f7, 0x0c7e, 0x2a60, 0x6008, 0xa085, 0x0100, 0x600a, 0x0c7f,
+        0x0078, 0x2635, 0x1078, 0x39c8, 0x00c0, 0x24fa, 0x2a60, 0x610e,
+        0x79aa, 0x8840, 0x7132, 0x2001, 0x0001, 0x007e, 0x715c, 0xa184,
+        0x0018, 0x0040, 0x2738, 0xa184, 0x0010, 0x0040, 0x272b, 0x1078,
+        0x36d0, 0x00c0, 0x275b, 0xa184, 0x0008, 0x0040, 0x2738, 0x69a0,
+        0xa184, 0x0600, 0x00c0, 0x2738, 0x1078, 0x35bb, 0x0078, 0x275b,
+        0x69a0, 0xa184, 0x0800, 0x0040, 0x274f, 0x0c7e, 0x027e, 0x2960,
+        0x6000, 0xa085, 0x2000, 0x6002, 0x6104, 0xa18d, 0x0010, 0x6106,
+        0x027f, 0x0c7f, 0x1078, 0x36d0, 0x00c0, 0x275b, 0x69a0, 0xa184,
+        0x0200, 0x0040, 0x2757, 0x1078, 0x360c, 0x0078, 0x275b, 0xa184,
+        0x0400, 0x00c0, 0x2734, 0x69a0, 0xa184, 0x1000, 0x0040, 0x2766,
+        0x6914, 0xa18c, 0xff00, 0x810f, 0x1078, 0x238b, 0x007f, 0x7002,
+        0xa68c, 0x00e0, 0xa684, 0x0060, 0x0040, 0x2774, 0xa086, 0x0060,
+        0x00c0, 0x2774, 0xa18d, 0x4000, 0x88ff, 0x0040, 0x2779, 0xa18d,
+        0x0004, 0x795a, 0x69b6, 0x789b, 0x0060, 0x2800, 0x78aa, 0x789b,
+        0x0061, 0x6818, 0xa08d, 0x8000, 0xa084, 0x7fff, 0x691a, 0xa68c,
+        0x0080, 0x0040, 0x2798, 0x7097, 0x0000, 0xa08a, 0x000d, 0x0050,
+        0x2796, 0xa08a, 0x000c, 0x7196, 0x2001, 0x000c, 0x800c, 0x719a,
+        0x78aa, 0x8008, 0x810c, 0x0040, 0x34d1, 0xa18c, 0x00f8, 0x00c0,
+        0x34d1, 0x157e, 0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000,
+        0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f,
+        0x157f, 0x6814, 0x8007, 0x7882, 0x6d94, 0x7dd6, 0x7dde, 0x6e98,
+        0x7ed2, 0x7eda, 0x1078, 0x39c8, 0x00c0, 0x27cf, 0x702c, 0x8003,
+        0x0048, 0x27c8, 0x2019, 0x4eaf, 0x1078, 0x2313, 0x702f, 0x8000,
+        0x7830, 0xa084, 0x00c0, 0x00c0, 0x27cf, 0x0098, 0x27d7, 0x6008,
+        0xa084, 0xffef, 0x600a, 0x1078, 0x39e0, 0x0078, 0x2523, 0x7200,
+        0xa284, 0x0007, 0xa086, 0x0001, 0x00c0, 0x27e4, 0x781b, 0x004f,
+        0x1078, 0x39e0, 0x0078, 0x27f5, 0x6ab4, 0xa295, 0x2000, 0x7a5a,
+        0x781b, 0x004f, 0x1078, 0x39e0, 0x7200, 0x2500, 0xa605, 0x0040,
+        0x27f5, 0xa284, 0x0007, 0x1079, 0x2803, 0xad80, 0x0009, 0x7036,
+        0xa284, 0x0007, 0xa086, 0x0001, 0x00c0, 0x24fa, 0x6018, 0x8000,
+        0x601a, 0x0078, 0x24fa, 0x280b, 0x4b4b, 0x4b4b, 0x4b3a, 0x4b4b,
+        0x280b, 0x4b3a, 0x280b, 0x1078, 0x248c, 0x1078, 0x39c8, 0x0f7e,
+        0x2079, 0x5200, 0x78cc, 0x0f7f, 0xa084, 0x0001, 0x0040, 0x2831,
+        0x706c, 0xa086, 0x0001, 0x00c0, 0x2820, 0x706e, 0x0078, 0x28c4,
+        0x706c, 0xa086, 0x0005, 0x00c0, 0x282f, 0x7088, 0x2068, 0x681b,
+        0x0004, 0x6817, 0x0000, 0x6820, 0xa085, 0x0008, 0x6822, 0x706f,
+        0x0000, 0x2011, 0x0004, 0x716c, 0xa186, 0x0001, 0x0040, 0x2852,
+        0xa186, 0x0007, 0x00c0, 0x2842, 0x2009, 0x5238, 0x200b, 0x0005,
+        0x0078, 0x2852, 0x2009, 0x5213, 0x2104, 0x2009, 0x5212, 0x200a,
+        0x2009, 0x5238, 0x200b, 0x0001, 0x706f, 0x0000, 0x7073, 0x0001,
+        0x0078, 0x2854, 0x706f, 0x0000, 0x1078, 0x4887, 0x157e, 0x20a9,
+        0x0010, 0x2039, 0x0000, 0x1078, 0x37b0, 0xa7b8, 0x0100, 0x0070,
+        0x2863, 0x0078, 0x285b, 0x157f, 0x7000, 0x0079, 0x2867, 0x2895,
+        0x287c, 0x287c, 0x286f, 0x2895, 0x2895, 0x2895, 0x2895, 0x2021,
+        0x525a, 0x2404, 0xa005, 0x0040, 0x2895, 0xad06, 0x00c0, 0x287c,
+        0x6800, 0x2022, 0x0078, 0x288c, 0x6820, 0xa084, 0x0001, 0x00c0,
+        0x2888, 0x6f14, 0x1078, 0x38bd, 0x1078, 0x34a2, 0x0078, 0x288c,
+        0x7060, 0x2060, 0x6800, 0x6002, 0x6a1a, 0x6817, 0x0000, 0x6820,
+        0xa085, 0x0008, 0x6822, 0x1078, 0x1cdc, 0x2021, 0x7600, 0x1078,
+        0x28d1, 0x2021, 0x525a, 0x1078, 0x28d1, 0x157e, 0x20a9, 0x0000,
+        0x2021, 0x7500, 0x1078, 0x28d1, 0x8420, 0x0070, 0x28a9, 0x0078,
+        0x28a2, 0x2061, 0x5500, 0x2021, 0x0002, 0x20a9, 0x0100, 0x6018,
+        0x6110, 0x81ff, 0x0040, 0x28b8, 0xa102, 0x0050, 0x28b8, 0x6012,
+        0x601b, 0x0000, 0xace0, 0x0010, 0x0070, 0x28c0, 0x0078, 0x28af,
+        0x8421, 0x00c0, 0x28ad, 0x157f, 0x709c, 0xa084, 0x8000, 0x0040,
+        0x28cb, 0x1078, 0x3ace, 0x7003, 0x0000, 0x704b, 0x0000, 0x0078,
+        0x24fa, 0x047e, 0x2404, 0xa005, 0x0040, 0x28e5, 0x2068, 0x6800,
+        0x007e, 0x6a1a, 0x6817, 0x0000, 0x6820, 0xa085, 0x0008, 0x6822,
+        0x1078, 0x1cdc, 0x007f, 0x0078, 0x28d3, 0x047f, 0x2023, 0x0000,
+        0x007c, 0xa282, 0x0003, 0x0050, 0x28ef, 0x1078, 0x248c, 0x2300,
+        0x0079, 0x28f2, 0x28f5, 0x2968, 0x2985, 0xa282, 0x0002, 0x0040,
+        0x28fb, 0x1078, 0x248c, 0x706c, 0x706f, 0x0000, 0x7093, 0x0000,
+        0x0079, 0x2902, 0x290a, 0x290a, 0x290c, 0x2940, 0x34d7, 0x290a,
+        0x2940, 0x290a, 0x1078, 0x248c, 0x7780, 0x1078, 0x37b0, 0x7780,
+        0xa7bc, 0x0f00, 0x1078, 0x38bd, 0x6018, 0xa005, 0x0040, 0x2937,
+        0x2021, 0x7600, 0x2009, 0x0004, 0x2011, 0x0010, 0x1078, 0x29a0,
+        0x0040, 0x2937, 0x157e, 0x20a9, 0x0000, 0x2021, 0x7500, 0x047e,
+        0x2009, 0x0004, 0x2011, 0x0010, 0x1078, 0x29a0, 0x047f, 0x0040,
+        0x2936, 0x8420, 0x0070, 0x2936, 0x0078, 0x2927, 0x157f, 0x8738,
+        0xa784, 0x001f, 0x00c0, 0x2912, 0x0078, 0x2523, 0x0078, 0x2523,
+        0x7780, 0x1078, 0x38bd, 0x6018, 0xa005, 0x0040, 0x2966, 0x2021,
+        0x7600, 0x2009, 0x0005, 0x2011, 0x0020, 0x1078, 0x29a0, 0x0040,
+        0x2966, 0x157e, 0x20a9, 0x0000, 0x2021, 0x7500, 0x047e, 0x2009,
+        0x0005, 0x2011, 0x0020, 0x1078, 0x29a0, 0x047f, 0x0040, 0x2965,
+        0x8420, 0x0070, 0x2965, 0x0078, 0x2956, 0x157f, 0x0078, 0x2523,
+        0x2200, 0x0079, 0x296b, 0x296e, 0x2970, 0x2970, 0x1078, 0x248c,
+        0x2009, 0x0012, 0x706c, 0xa086, 0x0002, 0x0040, 0x2979, 0x2009,
+        0x000e, 0x6818, 0xa084, 0x8000, 0x0040, 0x297f, 0x691a, 0x706f,
+        0x0000, 0x7073, 0x0001, 0x0078, 0x3956, 0x2200, 0x0079, 0x2988,
+        0x298d, 0x2970, 0x298b, 0x1078, 0x248c, 0x1078, 0x4887, 0x7000,
+        0xa086, 0x0001, 0x00c0, 0x3467, 0x1078, 0x34b8, 0x6008, 0xa084,
+        0xffef, 0x600a, 0x1078, 0x345a, 0x0040, 0x3467, 0x0078, 0x2635,
+        0x2404, 0xa005, 0x0040, 0x29c3, 0x2068, 0x2d04, 0x007e, 0x6814,
+        0xa706, 0x0040, 0x29af, 0x2d20, 0x007f, 0x0078, 0x29a1, 0x007f,
+        0x2022, 0x691a, 0x6817, 0x0000, 0x6820, 0xa205, 0x6822, 0x1078,
+        0x1cdc, 0x6010, 0x8001, 0x6012, 0x6008, 0xa084, 0xffef, 0x600a,
+        0x1078, 0x34b8, 0x007c, 0xa085, 0x0001, 0x0078, 0x29c2, 0x2300,
+        0x0079, 0x29ca, 0x29cf, 0x29cd, 0x2a68, 0x1078, 0x248c, 0x78ec,
+        0xa084, 0x0001, 0x00c0, 0x29e3, 0x7000, 0xa086, 0x0004, 0x00c0,
+        0x29db, 0x0078, 0x2a06, 0x1078, 0x34b8, 0x6008, 0xa084, 0xffef,
+        0x600a, 0x0078, 0x3467, 0x78e4, 0xa005, 0x00d0, 0x2a06, 0x0018,
+        0x24fa, 0x2008, 0xa084, 0x0030, 0x00c0, 0x29f2, 0x781b, 0x004f,
+        0x0078, 0x24fa, 0x78ec, 0xa084, 0x0003, 0x0040, 0x29ee, 0x2100,
+        0xa084, 0x0007, 0x0079, 0x29fc, 0x2a3f, 0x2a4a, 0x2a30, 0x2a04,
+        0x39bb, 0x39bb, 0x2a04, 0x2a59, 0x1078, 0x248c, 0x7000, 0xa086,
+        0x0004, 0x00c0, 0x2a20, 0x706c, 0xa086, 0x0002, 0x00c0, 0x2a16,
+        0x2011, 0x0002, 0x2019, 0x0000, 0x0078, 0x28e9, 0x706c, 0xa086,
+        0x0006, 0x0040, 0x2a10, 0x706c, 0xa086, 0x0004, 0x0040, 0x2a10,
+        0x79e4, 0xa184, 0x0030, 0x0040, 0x2a2a, 0x78ec, 0xa084, 0x0003,
+        0x00c0, 0x2a2c, 0x0078, 0x300c, 0x2001, 0x0003, 0x0078, 0x2da0,
+        0x6818, 0xa084, 0x8000, 0x0040, 0x2a37, 0x681b, 0x001d, 0x1078,
+        0x378f, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x24fa, 0x6818,
+        0xa084, 0x8000, 0x0040, 0x2a46, 0x681b, 0x001d, 0x1078, 0x378f,
+        0x0078, 0x3986, 0x6818, 0xa084, 0x8000, 0x0040, 0x2a51, 0x681b,
+        0x001d, 0x1078, 0x378f, 0x782b, 0x3008, 0x781b, 0x00ca, 0x0078,
+        0x24fa, 0x6818, 0xa084, 0x8000, 0x0040, 0x2a60, 0x681b, 0x001d,
+        0x1078, 0x378f, 0x782b, 0x3008, 0x781b, 0x008f, 0x0078, 0x24fa,
+        0xa584, 0x000f, 0x00c0, 0x2a85, 0x7000, 0x0079, 0x2a6f, 0x2523,
+        0x2a79, 0x2a77, 0x3467, 0x3467, 0x3467, 0x3467, 0x2a77, 0x1078,
+        0x248c, 0x1078, 0x34b8, 0x6008, 0xa084, 0xffef, 0x600a, 0x1078,
+        0x345a, 0x0040, 0x3467, 0x0078, 0x2635, 0x78e4, 0xa005, 0x00d0,
+        0x2a06, 0x0018, 0x2a06, 0x2008, 0xa084, 0x0030, 0x00c0, 0x2a94,
+        0x781b, 0x004f, 0x0078, 0x24fa, 0x78ec, 0xa084, 0x0003, 0x0040,
+        0x2a90, 0x2100, 0xa184, 0x0007, 0x0079, 0x2a9e, 0x2ab0, 0x2ab4,
+        0x2aa8, 0x2aa6, 0x39bb, 0x39bb, 0x2aa6, 0x39b1, 0x1078, 0x248c,
+        0x1078, 0x3797, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x24fa,
+        0x1078, 0x3797, 0x0078, 0x3986, 0x1078, 0x3797, 0x782b, 0x3008,
+        0x781b, 0x00ca, 0x0078, 0x24fa, 0x1078, 0x3797, 0x782b, 0x3008,
+        0x781b, 0x008f, 0x0078, 0x24fa, 0x2300, 0x0079, 0x2ac7, 0x2acc,
+        0x2aca, 0x2ace, 0x1078, 0x248c, 0x0078, 0x3180, 0x681b, 0x0008,
+        0x78a3, 0x0000, 0x79e4, 0xa184, 0x0030, 0x0040, 0x3180, 0x78ec,
+        0xa084, 0x0003, 0x0040, 0x3180, 0xa184, 0x0007, 0x0079, 0x2ae0,
+        0x2ae8, 0x2ab4, 0x2a30, 0x3956, 0x39bb, 0x39bb, 0x2ae8, 0x39b1,
+        0x1078, 0x396a, 0x0078, 0x24fa, 0xa282, 0x0005, 0x0050, 0x2af2,
+        0x1078, 0x248c, 0x2300, 0x0079, 0x2af5, 0x2af8, 0x2d4d, 0x2d5b,
+        0x2200, 0x0079, 0x2afb, 0x2b15, 0x2b02, 0x2b15, 0x2b00, 0x2d32,
+        0x1078, 0x248c, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa082,
+        0x0020, 0x0048, 0x376b, 0xa08a, 0x0004, 0x00c8, 0x376b, 0x0079,
+        0x2b11, 0x376b, 0x376b, 0x376b, 0x3719, 0x789b, 0x0018, 0x79a8,
+        0xa184, 0x0080, 0x0040, 0x2b26, 0x0078, 0x376b, 0x7000, 0xa005,
+        0x00c0, 0x2b1c, 0x2011, 0x0004, 0x0078, 0x32e9, 0xa184, 0x00ff,
+        0xa08a, 0x0010, 0x00c8, 0x376b, 0x0079, 0x2b2e, 0x2b40, 0x2b3e,
+        0x2b58, 0x2b5c, 0x2c17, 0x376b, 0x376b, 0x2c19, 0x376b, 0x376b,
+        0x2d2e, 0x2d2e, 0x376b, 0x376b, 0x376b, 0x2d30, 0x1078, 0x248c,
+        0xa684, 0x1000, 0x0040, 0x2b4d, 0x2001, 0x0500, 0x8000, 0x8000,
+        0x783a, 0x781b, 0x008d, 0x0078, 0x24fa, 0x6818, 0xa084, 0x8000,
+        0x0040, 0x2b56, 0x681b, 0x001d, 0x0078, 0x2b44, 0x0078, 0x3956,
+        0x681b, 0x001d, 0x0078, 0x377b, 0x6920, 0x6922, 0xa684, 0x1800,
+        0x00c0, 0x2b9d, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2ba5, 0x6818,
+        0xa086, 0x0008, 0x00c0, 0x2b6e, 0x681b, 0x0000, 0xa684, 0x0400,
+        0x0040, 0x2c13, 0xa684, 0x0080, 0x0040, 0x2b99, 0x7097, 0x0000,
+        0x6818, 0xa084, 0x003f, 0xa08a, 0x000d, 0x0050, 0x2b99, 0xa08a,
+        0x000c, 0x7196, 0x2001, 0x000c, 0x800c, 0x719a, 0x789b, 0x0061,
+        0x78aa, 0x157e, 0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000,
+        0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f,
+        0x157f, 0x781b, 0x0058, 0x0078, 0x24fa, 0xa684, 0x1000, 0x0040,
+        0x2ba5, 0x781b, 0x0065, 0x0078, 0x24fa, 0xa684, 0x0060, 0x0040,
+        0x2c0f, 0xa684, 0x0800, 0x0040, 0x2c0f, 0xa684, 0x8000, 0x00c0,
+        0x2bb3, 0x0078, 0x2bcb, 0xa6b4, 0x7fff, 0x7e5a, 0x6eb6, 0x7adc,
+        0x79d8, 0x78d0, 0x801b, 0x00c8, 0x2bbe, 0x8000, 0xa084, 0x003f,
+        0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94,
+        0x2200, 0xa303, 0x68ae, 0xa684, 0x4000, 0x0040, 0x2bd3, 0xa6b4,
+        0xbfff, 0x7e5a, 0x6eb6, 0x7000, 0xa086, 0x0003, 0x00c0, 0x2be0,
+        0x1078, 0x493d, 0x1078, 0x4b3a, 0x781b, 0x0064, 0x0078, 0x24fa,
+        0xa006, 0x1078, 0x4c41, 0x6ab0, 0x69ac, 0x6c98, 0x6b94, 0x2200,
+        0xa105, 0x0040, 0x2bef, 0x2200, 0xa422, 0x2100, 0xa31b, 0x6caa,
+        0x7cd2, 0x7cda, 0x6ba6, 0x7bd6, 0x7bde, 0x2300, 0xa405, 0x00c0,
+        0x2c01, 0xa6b5, 0x4000, 0x7e5a, 0x6eb6, 0x781b, 0x0064, 0x0078,
+        0x24fa, 0x781b, 0x0064, 0x2200, 0xa115, 0x00c0, 0x2c0b, 0x1078,
+        0x4b4b, 0x0078, 0x24fa, 0x1078, 0x4b96, 0x0078, 0x24fa, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x781b, 0x0058, 0x0078, 0x24fa, 0x1078,
+        0x248c, 0x0078, 0x2c7a, 0x6920, 0xa184, 0x0100, 0x0040, 0x2c31,
+        0xa18c, 0xfeff, 0x6922, 0x0c7e, 0x7054, 0x2060, 0x6000, 0xa084,
+        0xefff, 0x6002, 0x6004, 0xa084, 0xfff5, 0x6006, 0x0c7f, 0x0078,
+        0x2c69, 0xa184, 0x0200, 0x0040, 0x2c69, 0xa18c, 0xfdff, 0x6922,
+        0x0c7e, 0x7054, 0x2060, 0x6000, 0xa084, 0xdfff, 0x6002, 0x6004,
+        0xa084, 0xffef, 0x6006, 0x2008, 0x2c48, 0x0c7f, 0xa184, 0x0008,
+        0x0040, 0x2c69, 0x1078, 0x38b9, 0x1078, 0x35bb, 0x88ff, 0x0040,
+        0x2c69, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xa6b5, 0x0004,
+        0x7e5a, 0xa684, 0x0400, 0x00c0, 0x2c63, 0x782b, 0x3008, 0x781b,
+        0x0056, 0x0078, 0x24fa, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078,
+        0x24fa, 0x7e58, 0xa684, 0x0400, 0x00c0, 0x2c72, 0x781b, 0x0058,
+        0x0078, 0x24fa, 0x781b, 0x0065, 0x0078, 0x24fa, 0x0078, 0x3773,
+        0x0078, 0x3773, 0x2019, 0x0000, 0x7990, 0xa18c, 0x0007, 0x00c0,
+        0x2c88, 0x6820, 0xa084, 0x0100, 0x0040, 0x2c78, 0x2009, 0x0008,
+        0x789b, 0x0010, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001, 0x00c0,
+        0x2cbf, 0x2300, 0x7ca8, 0xa400, 0x2018, 0xa102, 0x0040, 0x2cb7,
+        0x0048, 0x2c9c, 0x0078, 0x2cb9, 0xa380, 0x0002, 0xa102, 0x00c8,
+        0x2cb7, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0c7e, 0x7054, 0x2060,
+        0x6000, 0xa084, 0xefef, 0x6002, 0x6004, 0xa084, 0xffe5, 0x6006,
+        0x0c7f, 0x7e58, 0xa6b4, 0xfffb, 0x7e5a, 0x0078, 0x2c6a, 0x0078,
+        0x2c1b, 0x24a8, 0x7aa8, 0x00f0, 0x2cb9, 0x0078, 0x2c8a, 0xa284,
+        0x00f0, 0xa086, 0x0020, 0x00c0, 0x2d1f, 0x8318, 0x8318, 0x2300,
+        0xa102, 0x0040, 0x2ccf, 0x0048, 0x2ccf, 0x0078, 0x2d1c, 0xa286,
+        0x0023, 0x0040, 0x2c78, 0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58,
+        0xa684, 0xfff1, 0xa085, 0x0010, 0x2030, 0x7e5a, 0x6008, 0xa085,
+        0x0010, 0x600a, 0x0c7e, 0x7054, 0x2060, 0x6004, 0x2008, 0x2c48,
+        0x0c7f, 0xa184, 0x0010, 0x0040, 0x2cf3, 0x1078, 0x38b9, 0x1078,
+        0x36d0, 0x0078, 0x2d02, 0x0c7e, 0x7054, 0x2060, 0x6004, 0x2008,
+        0x2c48, 0x0c7f, 0xa184, 0x0008, 0x0040, 0x2c69, 0x1078, 0x38b9,
+        0x1078, 0x35bb, 0x88ff, 0x0040, 0x2c69, 0x789b, 0x0060, 0x2800,
+        0x78aa, 0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0, 0x2d16,
+        0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x24fa, 0x782b, 0x3008,
+        0x781b, 0x0065, 0x0078, 0x24fa, 0x7aa8, 0x0078, 0x2c8a, 0x8318,
+        0x2300, 0xa102, 0x0040, 0x2d28, 0x0048, 0x2d28, 0x0078, 0x2c8a,
+        0xa284, 0x0080, 0x00c0, 0x377b, 0x0078, 0x3773, 0x0078, 0x377b,
+        0x0078, 0x376b, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa08e,
+        0x0001, 0x0040, 0x2d3d, 0x1078, 0x248c, 0x7aa8, 0xa294, 0x00ff,
+        0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0004, 0x00c8, 0x376b, 0x0079,
+        0x2d49, 0x376b, 0x3508, 0x376b, 0x3665, 0xa282, 0x0000, 0x00c0,
+        0x2d53, 0x1078, 0x248c, 0x1078, 0x378f, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0xa282, 0x0003, 0x00c0, 0x2d61, 0x1078,
+        0x248c, 0xa484, 0x8000, 0x00c0, 0x2d84, 0x706c, 0xa005, 0x0040,
+        0x2d6b, 0x1078, 0x248c, 0x6f14, 0x7782, 0xa7bc, 0x0f00, 0x1078,
+        0x38bd, 0x6008, 0xa085, 0x0021, 0x600a, 0x8738, 0xa784, 0x001f,
+        0x00c0, 0x2d6f, 0x1078, 0x3793, 0x706f, 0x0002, 0x2009, 0x5238,
+        0x200b, 0x0009, 0x0078, 0x2d86, 0x1078, 0x379f, 0x782b, 0x3008,
+        0x781b, 0x0065, 0x0078, 0x24fa, 0xa282, 0x0004, 0x0050, 0x2d92,
+        0x1078, 0x248c, 0x2300, 0x0079, 0x2d95, 0x2d98, 0x2e81, 0x2eb4,
+        0xa286, 0x0003, 0x0040, 0x2d9e, 0x1078, 0x248c, 0x2001, 0x0000,
+        0x007e, 0x68c0, 0xa005, 0x0040, 0x2da7, 0x7003, 0x0003, 0x68a0,
+        0xa084, 0x2000, 0x0040, 0x2db0, 0x6008, 0xa085, 0x0002, 0x600a,
+        0x007f, 0x703e, 0x7000, 0xa084, 0x0007, 0x0079, 0x2db7, 0x2523,
+        0x2dc1, 0x2dc1, 0x2fb6, 0x2ff2, 0x2523, 0x2ff2, 0x2dbf, 0x1078,
+        0x248c, 0xa684, 0x1000, 0x00c0, 0x2dc9, 0x1078, 0x4887, 0x0040,
+        0x2e5b, 0x7868, 0xa08c, 0x00ff, 0x0040, 0x2e11, 0xa186, 0x0008,
+        0x00c0, 0x2de0, 0x1078, 0x34b8, 0x6008, 0xa084, 0xffef, 0x600a,
+        0x1078, 0x345a, 0x0040, 0x2e11, 0x1078, 0x4887, 0x0078, 0x2df8,
+        0xa186, 0x0028, 0x00c0, 0x2e11, 0x1078, 0x4887, 0x6008, 0xa084,
+        0xffef, 0x600a, 0x6018, 0xa005, 0x0040, 0x2df8, 0x8001, 0x601a,
+        0xa005, 0x0040, 0x2df8, 0x8001, 0xa005, 0x0040, 0x2df8, 0x601e,
+        0x6820, 0xa084, 0x0001, 0x0040, 0x2523, 0x6820, 0xa084, 0xfffe,
+        0x6822, 0x7060, 0x0c7e, 0x2060, 0x6800, 0x6002, 0x0c7f, 0x6004,
+        0x6802, 0xa005, 0x2d00, 0x00c0, 0x2e0e, 0x6002, 0x6006, 0x0078,
+        0x2523, 0x017e, 0x1078, 0x2ee5, 0x017f, 0xa684, 0xdf00, 0x681e,
+        0x682b, 0x0000, 0x6f14, 0x81ff, 0x0040, 0x2e5b, 0xa186, 0x0002,
+        0x00c0, 0x2e5b, 0xa684, 0x0800, 0x00c0, 0x2e2e, 0xa684, 0x0060,
+        0x0040, 0x2e2e, 0x78d8, 0x7adc, 0x682e, 0x6a32, 0x6820, 0xa084,
+        0x0800, 0x00c0, 0x2e5b, 0x8717, 0xa294, 0x000f, 0x8213, 0x8213,
+        0x8213, 0xa290, 0x5480, 0xa290, 0x0000, 0x221c, 0xa384, 0x0100,
+        0x00c0, 0x2e44, 0x0078, 0x2e4a, 0x8210, 0x2204, 0xa085, 0x0018,
+        0x2012, 0x8211, 0xa384, 0x0400, 0x0040, 0x2e57, 0x68a0, 0xa084,
+        0x0100, 0x00c0, 0x2e57, 0x1078, 0x2f69, 0x0078, 0x2523, 0x6008,
+        0xa085, 0x0002, 0x600a, 0x6916, 0x6818, 0xa084, 0x8000, 0x0040,
+        0x2e63, 0x703c, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x1078, 0x34a9,
+        0x1078, 0x34b8, 0x00c0, 0x2e70, 0x6008, 0xa084, 0xffef, 0x600a,
+        0x6820, 0xa084, 0x0001, 0x00c0, 0x2e79, 0x1078, 0x34a2, 0x0078,
+        0x2e7d, 0x7060, 0x2060, 0x6800, 0x6002, 0x1078, 0x1cdc, 0x0078,
+        0x2523, 0xa282, 0x0004, 0x0048, 0x2e87, 0x1078, 0x248c, 0x2200,
+        0x0079, 0x2e8a, 0x2e85, 0x2e8e, 0x2e9b, 0x2e8e, 0x7000, 0xa086,
+        0x0005, 0x0040, 0x2e97, 0x1078, 0x378f, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x7890, 0x8007, 0x8001, 0xa084, 0x0007,
+        0xa080, 0x0018, 0x789a, 0x79a8, 0xa18c, 0x00ff, 0xa186, 0x0003,
+        0x0040, 0x2eb0, 0xa186, 0x0000, 0x0040, 0x2eb0, 0x0078, 0x376b,
+        0x781b, 0x0065, 0x0078, 0x24fa, 0x6820, 0xa085, 0x0004, 0x6822,
+        0x82ff, 0x00c0, 0x2ebf, 0x1078, 0x378f, 0x0078, 0x2ec6, 0x8211,
+        0x0040, 0x2ec4, 0x1078, 0x248c, 0x1078, 0x379f, 0x782b, 0x3008,
+        0x781b, 0x0065, 0x0078, 0x24fa, 0x702c, 0x8003, 0x0048, 0x2ed6,
+        0x2019, 0x4eaf, 0x1078, 0x2313, 0x702f, 0x8000, 0x1078, 0x39e0,
+        0x7830, 0xa084, 0x00c0, 0x00c0, 0x2ee2, 0x0018, 0x2ee2, 0x791a,
+        0xa006, 0x007c, 0xa085, 0x0001, 0x007c, 0xa684, 0x0060, 0x00c0,
+        0x2eef, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2f68, 0xa684,
+        0x0800, 0x00c0, 0x2f11, 0x68b4, 0xa084, 0x4800, 0xa635, 0xa684,
+        0x0800, 0x00c0, 0x2f11, 0x6998, 0x6a94, 0x692e, 0x6a32, 0x703c,
+        0xa005, 0x00c0, 0x2f09, 0x2200, 0xa105, 0x0040, 0x2f10, 0x703f,
+        0x0015, 0x7000, 0xa086, 0x0006, 0x0040, 0x2f10, 0x1078, 0x4887,
+        0x007c, 0xa684, 0x0020, 0x0040, 0x2f33, 0xa684, 0x4000, 0x0040,
+        0x2f1f, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2f09, 0x68b4,
+        0xa084, 0x4800, 0xa635, 0xa684, 0x4000, 0x00c0, 0x2f19, 0x703c,
+        0xa005, 0x00c0, 0x2f2d, 0x703f, 0x0015, 0x79d8, 0x7adc, 0x692e,
+        0x6a32, 0x0078, 0x2f09, 0xa684, 0x4000, 0x0040, 0x2f3d, 0x682f,
+        0x0000, 0x6833, 0x0000, 0x0078, 0x2f09, 0x68b4, 0xa084, 0x4800,
+        0xa635, 0xa684, 0x4000, 0x00c0, 0x2f37, 0x703c, 0xa005, 0x00c0,
+        0x2f4b, 0x703f, 0x0015, 0x79d8, 0x7adc, 0x78d0, 0x80fb, 0x00c8,
+        0x2f52, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x692e,
+        0x6a32, 0x2100, 0xa205, 0x00c0, 0x2f5f, 0x0078, 0x2f09, 0x7000,
+        0xa086, 0x0006, 0x0040, 0x2f68, 0x1078, 0x4c41, 0x0078, 0x2f09,
+        0x007c, 0x6008, 0xa085, 0x0200, 0x600a, 0xa384, 0x0200, 0x0040,
+        0x2f75, 0x6008, 0xa085, 0x0002, 0x600a, 0x681b, 0x0006, 0x688f,
+        0x0000, 0x6893, 0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942, 0x682f,
+        0x0003, 0x6833, 0x0000, 0x6837, 0x0020, 0x6897, 0x0000, 0x689b,
+        0x0020, 0x68b3, 0x0000, 0x68af, 0x0000, 0x7000, 0x0079, 0x2f90,
+        0x2523, 0x2f9a, 0x2fa3, 0x2f98, 0x2f98, 0x2f98, 0x2f98, 0x2f98,
+        0x1078, 0x248c, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2fa3, 0x1078,
+        0x34a2, 0x0078, 0x2fa9, 0x7060, 0x2c50, 0x2060, 0x6800, 0x6002,
+        0x2a60, 0x2021, 0x525a, 0x2404, 0xa005, 0x0040, 0x2fb2, 0x2020,
+        0x0078, 0x2fab, 0x2d22, 0x206b, 0x0000, 0x007c, 0x1078, 0x34a9,
+        0x1078, 0x34b8, 0x6008, 0xa084, 0xfdff, 0x600a, 0x682b, 0x0000,
+        0x789b, 0x000e, 0x6f14, 0x6817, 0x0002, 0x1078, 0x4c89, 0xa684,
+        0x0800, 0x0040, 0x2fcf, 0x691c, 0xa18d, 0x2000, 0x691e, 0x6818,
+        0xa084, 0x8000, 0x0040, 0x2fdf, 0x7868, 0xa08c, 0x00ff, 0x0040,
+        0x2fdd, 0x681b, 0x001e, 0x0078, 0x2fdf, 0x681b, 0x0000, 0x2021,
+        0x525a, 0x2404, 0xad06, 0x0040, 0x2fe6, 0x7460, 0x6800, 0x2022,
+        0x68c3, 0x0000, 0x6a3c, 0x6940, 0x6a32, 0x692e, 0x1078, 0x1cdc,
+        0x0078, 0x2523, 0x1078, 0x2ee5, 0x682b, 0x0000, 0x2001, 0x000e,
+        0x6f14, 0x1078, 0x39e6, 0xa08c, 0x00ff, 0x6916, 0x6818, 0xa084,
+        0x8000, 0x0040, 0x3005, 0x703c, 0x681a, 0xa68c, 0xdf00, 0x691e,
+        0x706f, 0x0000, 0x0078, 0x2523, 0x7000, 0xa005, 0x00c0, 0x3012,
+        0x0078, 0x2523, 0xa006, 0x1078, 0x4887, 0x6817, 0x0000, 0x681b,
+        0x0014, 0xa68c, 0xdf00, 0x691e, 0x682b, 0x0000, 0x6820, 0xa085,
+        0x00ff, 0x6822, 0x7000, 0x0079, 0x3025, 0x2523, 0x302f, 0x302f,
+        0x3031, 0x3031, 0x3031, 0x3031, 0x302d, 0x1078, 0x248c, 0x1078,
+        0x34b8, 0x6008, 0xa084, 0xffef, 0x600a, 0x0078, 0x3472, 0x2300,
+        0x0079, 0x303a, 0x303d, 0x303f, 0x3098, 0x1078, 0x248c, 0xa684,
+        0x8000, 0x00c0, 0x307d, 0x7000, 0x0079, 0x3046, 0x2523, 0x3050,
+        0x3050, 0x306c, 0x3050, 0x3079, 0x306c, 0x304e, 0x1078, 0x248c,
+        0xa684, 0x0060, 0xa086, 0x0060, 0x00c0, 0x3068, 0xa6b4, 0xffdf,
+        0xa6b4, 0xbfff, 0xa6b5, 0x2000, 0x7e5a, 0x6eb6, 0x681c, 0xa084,
+        0xffdf, 0x681e, 0x1078, 0x4887, 0x1078, 0x4b4b, 0x0078, 0x3956,
+        0xa684, 0x2000, 0x0040, 0x305a, 0x6818, 0xa084, 0x8000, 0x0040,
+        0x3079, 0x681b, 0x0015, 0xa684, 0x4000, 0x0040, 0x3079, 0x681b,
+        0x0007, 0x1078, 0x396a, 0x0078, 0x24fa, 0xa6b4, 0x7fff, 0x7e5a,
+        0x7adc, 0x79d8, 0x78d0, 0x79d2, 0x801b, 0x00c8, 0x3088, 0x8000,
+        0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302,
+        0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x781b, 0x0065, 0x007c,
+        0x1078, 0x248c, 0x2300, 0x0079, 0x309d, 0x30a0, 0x30a2, 0x30eb,
+        0x1078, 0x248c, 0xa684, 0x8000, 0x00c0, 0x30da, 0x7000, 0x0079,
+        0x30a9, 0x2523, 0x30b3, 0x30b3, 0x30cf, 0x30b3, 0x30d6, 0x30cf,
+        0x30b1, 0x1078, 0x248c, 0xa684, 0x0060, 0xa086, 0x0060, 0x00c0,
+        0x30cb, 0xa6b4, 0xffbf, 0xa6b4, 0xbfff, 0xa6b5, 0x2000, 0x7e5a,
+        0x6eb6, 0x681c, 0xa084, 0xffbf, 0x681e, 0x1078, 0x4887, 0x1078,
+        0x4b4b, 0x0078, 0x3956, 0xa684, 0x2000, 0x0040, 0x30bd, 0x6818,
+        0xa084, 0x8000, 0x0040, 0x30d6, 0x681b, 0x0007, 0x781b, 0x00ca,
+        0x0078, 0x24fa, 0xa6b4, 0x7fff, 0x7e5a, 0x7adc, 0x79d8, 0x6b98,
+        0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x79d2,
+        0x781b, 0x0065, 0x007c, 0x6820, 0xa085, 0x0004, 0x6822, 0x1078,
+        0x3921, 0xa6b5, 0x0800, 0x1078, 0x378f, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x2300, 0x0079, 0x30fe, 0x3101, 0x3103,
+        0x3105, 0x1078, 0x248c, 0x0078, 0x377b, 0xa684, 0x0400, 0x00c0,
+        0x312e, 0x79e4, 0xa184, 0x0020, 0x0040, 0x3115, 0x78ec, 0xa084,
+        0x0003, 0x0040, 0x3115, 0x782b, 0x3009, 0x789b, 0x0060, 0x78ab,
+        0x0000, 0xa684, 0xfffb, 0x785a, 0x79e4, 0xa184, 0x0020, 0x0040,
+        0x3126, 0x78ec, 0xa084, 0x0003, 0x00c0, 0x312a, 0x2001, 0x0014,
+        0x0078, 0x2da0, 0xa184, 0x0007, 0x0079, 0x3166, 0x7a90, 0xa294,
+        0x0007, 0x789b, 0x0060, 0x79a8, 0x81ff, 0x0040, 0x3164, 0x789b,
+        0x0010, 0x7ba8, 0xa384, 0x0001, 0x00c0, 0x3155, 0x7ba8, 0x7ba8,
+        0xa386, 0x0001, 0x00c0, 0x3148, 0x2009, 0xfff7, 0x0078, 0x314e,
+        0xa386, 0x0003, 0x00c0, 0x3155, 0x2009, 0xffef, 0x0c7e, 0x7054,
+        0x2060, 0x6004, 0xa104, 0x6006, 0x0c7f, 0x789b, 0x0060, 0x78ab,
+        0x0000, 0xa684, 0xfffb, 0x785a, 0x782b, 0x3009, 0x6920, 0xa18c,
+        0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078, 0x3956, 0x2a3f, 0x2a4a,
+        0x3170, 0x3178, 0x316e, 0x316e, 0x3956, 0x3956, 0x1078, 0x248c,
+        0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078, 0x3960,
+        0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078, 0x3956,
+        0x79e4, 0xa184, 0x0030, 0x0040, 0x318a, 0x78ec, 0xa084, 0x0003,
+        0x00c0, 0x31b1, 0x7000, 0xa086, 0x0004, 0x00c0, 0x31a4, 0x706c,
+        0xa086, 0x0002, 0x00c0, 0x319a, 0x2011, 0x0002, 0x2019, 0x0000,
+        0x0078, 0x28e9, 0x706c, 0xa086, 0x0006, 0x0040, 0x3194, 0x706c,
+        0xa086, 0x0004, 0x0040, 0x3194, 0x7000, 0xa086, 0x0000, 0x0040,
+        0x24fa, 0x6818, 0xa085, 0x8000, 0x681a, 0x2001, 0x0014, 0x0078,
+        0x2da0, 0xa184, 0x0007, 0x0079, 0x31b5, 0x3956, 0x3956, 0x31bd,
+        0x3956, 0x39bb, 0x39bb, 0x3956, 0x3956, 0xa684, 0x0080, 0x0040,
+        0x31ec, 0x7194, 0x81ff, 0x0040, 0x31ec, 0xa182, 0x000d, 0x00d0,
+        0x31cd, 0x7097, 0x0000, 0x0078, 0x31d2, 0xa182, 0x000c, 0x7096,
+        0x2009, 0x000c, 0x789b, 0x0061, 0x79aa, 0x157e, 0x137e, 0x147e,
+        0x7098, 0x8114, 0xa210, 0x729a, 0xa080, 0x000b, 0xad00, 0x2098,
+        0x20a1, 0x012b, 0x789b, 0x0000, 0x8108, 0x81ac, 0x53a6, 0x147f,
+        0x137f, 0x157f, 0x0078, 0x3960, 0xa684, 0x0400, 0x00c0, 0x322d,
+        0x6820, 0xa084, 0x0001, 0x0040, 0x3960, 0xa68c, 0x0060, 0xa684,
+        0x0060, 0x0040, 0x3201, 0xa086, 0x0060, 0x00c0, 0x3201, 0xa18d,
+        0x4000, 0xa18c, 0xfffb, 0x795a, 0x69b6, 0x789b, 0x0060, 0x78ab,
+        0x0000, 0x789b, 0x0061, 0x6818, 0xa085, 0x8000, 0x681a, 0x78aa,
+        0x8008, 0x810c, 0x0040, 0x34d1, 0xa18c, 0x00f8, 0x00c0, 0x34d1,
         0x157e, 0x137e, 0x147e, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8000,
         0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f, 0x157f,
-        0x781b, 0x0058, 0x0078, 0x2459, 0xa684, 0x1000, 0x0040, 0x2b04,
-        0x781b, 0x0065, 0x0078, 0x2459, 0xa684, 0x0060, 0x0040, 0x2b70,
-        0xa684, 0x0800, 0x0040, 0x2b70, 0xa684, 0x8000, 0x00c0, 0x2b12,
-        0x0078, 0x2b2c, 0xa6b4, 0x7fff, 0x7e5a, 0x6eb6, 0x789b, 0x0076,
-        0x7aac, 0x79ac, 0x78ac, 0x801b, 0x00c8, 0x2b1f, 0x8000, 0xa084,
-        0x003f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2,
-        0x6b94, 0x2200, 0xa303, 0x68ae, 0xa684, 0x4000, 0x0040, 0x2b34,
-        0xa6b4, 0xbfff, 0x7e5a, 0x6eb6, 0x7000, 0xa086, 0x0003, 0x00c0,
-        0x2b41, 0x1078, 0x482c, 0x1078, 0x4a29, 0x781b, 0x0064, 0x0078,
-        0x2459, 0xa006, 0x1078, 0x4b30, 0x6ab0, 0x69ac, 0x6c98, 0x6b94,
-        0x2200, 0xa105, 0x0040, 0x2b50, 0x2200, 0xa422, 0x2100, 0xa31b,
-        0x6caa, 0x7cd2, 0x7cda, 0x6ba6, 0x7bd6, 0x7bde, 0x2300, 0xa405,
-        0x00c0, 0x2b62, 0xa6b5, 0x4000, 0x7e5a, 0x6eb6, 0x781b, 0x0064,
-        0x0078, 0x2459, 0x781b, 0x0064, 0x2200, 0xa115, 0x00c0, 0x2b6c,
-        0x1078, 0x4a3a, 0x0078, 0x2459, 0x1078, 0x4a85, 0x0078, 0x2459,
-        0x781b, 0x0065, 0x0078, 0x2459, 0x781b, 0x0058, 0x0078, 0x2459,
-        0x1078, 0x23eb, 0x0078, 0x2bdb, 0x6920, 0xa184, 0x0100, 0x0040,
-        0x2b92, 0xa18c, 0xfeff, 0x6922, 0x0c7e, 0x7054, 0x2060, 0x6000,
-        0xa084, 0xefff, 0x6002, 0x6004, 0xa084, 0xfff5, 0x6006, 0x0c7f,
-        0x0078, 0x2bca, 0xa184, 0x0200, 0x0040, 0x2bca, 0xa18c, 0xfdff,
-        0x6922, 0x0c7e, 0x7054, 0x2060, 0x6000, 0xa084, 0xdfff, 0x6002,
-        0x6004, 0xa084, 0xffef, 0x6006, 0x2008, 0x2c48, 0x0c7f, 0xa184,
-        0x0008, 0x0040, 0x2bca, 0x1078, 0x37eb, 0x1078, 0x34f1, 0x88ff,
-        0x0040, 0x2bca, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xa6b5,
-        0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0, 0x2bc4, 0x782b, 0x3008,
-        0x781b, 0x0056, 0x0078, 0x2459, 0x782b, 0x3008, 0x781b, 0x0065,
-        0x0078, 0x2459, 0x7e58, 0xa684, 0x0400, 0x00c0, 0x2bd3, 0x781b,
-        0x0058, 0x0078, 0x2459, 0x781b, 0x0065, 0x0078, 0x2459, 0x0078,
-        0x36a5, 0x0078, 0x36a5, 0x2019, 0x0000, 0x7990, 0xa18c, 0x0007,
-        0x00c0, 0x2be9, 0x6820, 0xa084, 0x0100, 0x0040, 0x2bd9, 0x2009,
-        0x0008, 0x789b, 0x0010, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001,
-        0x00c0, 0x2c20, 0x2300, 0x7ca8, 0xa400, 0x2018, 0xa102, 0x0040,
-        0x2c18, 0x0048, 0x2bfd, 0x0078, 0x2c1a, 0xa380, 0x0002, 0xa102,
-        0x00c8, 0x2c18, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0c7e, 0x7054,
-        0x2060, 0x6000, 0xa084, 0xefef, 0x6002, 0x6004, 0xa084, 0xffe5,
-        0x6006, 0x0c7f, 0x7e58, 0xa6b4, 0xfffb, 0x7e5a, 0x0078, 0x2bcb,
-        0x0078, 0x2b7c, 0x24a8, 0x7aa8, 0x00f0, 0x2c1a, 0x0078, 0x2beb,
-        0xa284, 0x00f0, 0xa086, 0x0020, 0x00c0, 0x2c80, 0x8318, 0x8318,
-        0x2300, 0xa102, 0x0040, 0x2c30, 0x0048, 0x2c30, 0x0078, 0x2c7d,
-        0xa286, 0x0023, 0x0040, 0x2bd9, 0x681c, 0xa084, 0xfff1, 0x681e,
-        0x7e58, 0xa684, 0xfff1, 0xa085, 0x0010, 0x2030, 0x7e5a, 0x6008,
-        0xa085, 0x0010, 0x600a, 0x0c7e, 0x7054, 0x2060, 0x6004, 0x2008,
-        0x2c48, 0x0c7f, 0xa184, 0x0010, 0x0040, 0x2c54, 0x1078, 0x37eb,
-        0x1078, 0x3604, 0x0078, 0x2c63, 0x0c7e, 0x7054, 0x2060, 0x6004,
-        0x2008, 0x2c48, 0x0c7f, 0xa184, 0x0008, 0x0040, 0x2bca, 0x1078,
-        0x37eb, 0x1078, 0x34f1, 0x88ff, 0x0040, 0x2bca, 0x789b, 0x0060,
-        0x2800, 0x78aa, 0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0,
-        0x2c77, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2459, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x7aa8, 0x0078, 0x2beb,
-        0x8318, 0x2300, 0xa102, 0x0040, 0x2c89, 0x0048, 0x2c89, 0x0078,
-        0x2beb, 0xa284, 0x0080, 0x00c0, 0x36ad, 0x0078, 0x36a5, 0x0078,
-        0x36ad, 0x0078, 0x369d, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff,
-        0xa08e, 0x0001, 0x0040, 0x2c9e, 0x1078, 0x23eb, 0x7aa8, 0xa294,
-        0x00ff, 0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0004, 0x00c8, 0x369d,
-        0x0079, 0x2caa, 0x369d, 0x343e, 0x369d, 0x3599, 0xa282, 0x0000,
-        0x00c0, 0x2cb4, 0x1078, 0x23eb, 0x1078, 0x36c1, 0x782b, 0x3008,
-        0x781b, 0x0065, 0x0078, 0x2459, 0xa282, 0x0003, 0x00c0, 0x2cc2,
-        0x1078, 0x23eb, 0xa484, 0x8000, 0x00c0, 0x2ce5, 0x706c, 0xa005,
-        0x0040, 0x2ccc, 0x1078, 0x23eb, 0x6f14, 0x7782, 0xa7bc, 0x0f00,
-        0x1078, 0x37ef, 0x6008, 0xa085, 0x0021, 0x600a, 0x8738, 0xa784,
-        0x001f, 0x00c0, 0x2cd0, 0x1078, 0x36c5, 0x706f, 0x0002, 0x2009,
-        0x5138, 0x200b, 0x0009, 0x0078, 0x2ce7, 0x1078, 0x36d1, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0xa282, 0x0004, 0x0050,
-        0x2cf3, 0x1078, 0x23eb, 0x2300, 0x0079, 0x2cf6, 0x2cf9, 0x2de2,
-        0x2e15, 0xa286, 0x0003, 0x0040, 0x2cff, 0x1078, 0x23eb, 0x2001,
-        0x0000, 0x007e, 0x68c0, 0xa005, 0x0040, 0x2d08, 0x7003, 0x0003,
-        0x68a0, 0xa084, 0x2000, 0x0040, 0x2d11, 0x6008, 0xa085, 0x0002,
-        0x600a, 0x007f, 0x703e, 0x7000, 0xa084, 0x0007, 0x0079, 0x2d18,
-        0x2482, 0x2d22, 0x2d22, 0x2f17, 0x2f53, 0x2482, 0x2f53, 0x2d20,
-        0x1078, 0x23eb, 0xa684, 0x1000, 0x00c0, 0x2d2a, 0x1078, 0x4776,
-        0x0040, 0x2dbc, 0x7868, 0xa08c, 0x00ff, 0x0040, 0x2d72, 0xa186,
-        0x0008, 0x00c0, 0x2d41, 0x1078, 0x33ee, 0x6008, 0xa084, 0xffef,
-        0x600a, 0x1078, 0x3390, 0x0040, 0x2d72, 0x1078, 0x4776, 0x0078,
-        0x2d59, 0xa186, 0x0028, 0x00c0, 0x2d72, 0x1078, 0x4776, 0x6008,
-        0xa084, 0xffef, 0x600a, 0x6018, 0xa005, 0x0040, 0x2d59, 0x8001,
-        0x601a, 0xa005, 0x0040, 0x2d59, 0x8001, 0xa005, 0x0040, 0x2d59,
-        0x601e, 0x6820, 0xa084, 0x0001, 0x0040, 0x2482, 0x6820, 0xa084,
-        0xfffe, 0x6822, 0x7060, 0x0c7e, 0x2060, 0x6800, 0x6002, 0x0c7f,
-        0x6004, 0x6802, 0xa005, 0x2d00, 0x00c0, 0x2d6f, 0x6002, 0x6006,
-        0x0078, 0x2482, 0x017e, 0x1078, 0x2e46, 0x017f, 0xa684, 0xdf00,
-        0x681e, 0x682b, 0x0000, 0x6f14, 0x81ff, 0x0040, 0x2dbc, 0xa186,
-        0x0002, 0x00c0, 0x2dbc, 0xa684, 0x0800, 0x00c0, 0x2d8f, 0xa684,
-        0x0060, 0x0040, 0x2d8f, 0x78d8, 0x7adc, 0x682e, 0x6a32, 0x6820,
-        0xa084, 0x0800, 0x00c0, 0x2dbc, 0x8717, 0xa294, 0x000f, 0x8213,
-        0x8213, 0x8213, 0xa290, 0x5380, 0xa290, 0x0000, 0x221c, 0xa384,
-        0x0100, 0x00c0, 0x2da5, 0x0078, 0x2dab, 0x8210, 0x2204, 0xa085,
-        0x0018, 0x2012, 0x8211, 0xa384, 0x0400, 0x0040, 0x2db8, 0x68a0,
-        0xa084, 0x0100, 0x00c0, 0x2db8, 0x1078, 0x2eca, 0x0078, 0x2482,
-        0x6008, 0xa085, 0x0002, 0x600a, 0x6916, 0x6818, 0xa084, 0x8000,
-        0x0040, 0x2dc4, 0x703c, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x1078,
-        0x33df, 0x1078, 0x33ee, 0x00c0, 0x2dd1, 0x6008, 0xa084, 0xffef,
-        0x600a, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2dda, 0x1078, 0x33d8,
-        0x0078, 0x2dde, 0x7060, 0x2060, 0x6800, 0x6002, 0x1078, 0x1c70,
-        0x0078, 0x2482, 0xa282, 0x0004, 0x0048, 0x2de8, 0x1078, 0x23eb,
-        0x2200, 0x0079, 0x2deb, 0x2de6, 0x2def, 0x2dfc, 0x2def, 0x7000,
-        0xa086, 0x0005, 0x0040, 0x2df8, 0x1078, 0x36c1, 0x782b, 0x3008,
-        0x781b, 0x0065, 0x0078, 0x2459, 0x7890, 0x8007, 0x8001, 0xa084,
-        0x0007, 0xa080, 0x0018, 0x789a, 0x79a8, 0xa18c, 0x00ff, 0xa186,
-        0x0003, 0x0040, 0x2e11, 0xa186, 0x0000, 0x0040, 0x2e11, 0x0078,
-        0x369d, 0x781b, 0x0065, 0x0078, 0x2459, 0x6820, 0xa085, 0x0004,
-        0x6822, 0x82ff, 0x00c0, 0x2e20, 0x1078, 0x36c1, 0x0078, 0x2e27,
-        0x8211, 0x0040, 0x2e25, 0x1078, 0x23eb, 0x1078, 0x36d1, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x702c, 0x8003, 0x0048,
-        0x2e37, 0x2019, 0x4d9e, 0x1078, 0x2276, 0x702f, 0x8000, 0x1078,
-        0x3912, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x2e43, 0x0018, 0x2e43,
-        0x791a, 0xa006, 0x007c, 0xa085, 0x0001, 0x007c, 0xa684, 0x0060,
-        0x00c0, 0x2e50, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2ec9,
-        0xa684, 0x0800, 0x00c0, 0x2e72, 0x68b4, 0xa084, 0x4800, 0xa635,
-        0xa684, 0x0800, 0x00c0, 0x2e72, 0x6998, 0x6a94, 0x692e, 0x6a32,
-        0x703c, 0xa005, 0x00c0, 0x2e6a, 0x2200, 0xa105, 0x0040, 0x2e71,
-        0x703f, 0x0015, 0x7000, 0xa086, 0x0006, 0x0040, 0x2e71, 0x1078,
-        0x4776, 0x007c, 0xa684, 0x0020, 0x0040, 0x2e94, 0xa684, 0x4000,
-        0x0040, 0x2e80, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2e6a,
-        0x68b4, 0xa084, 0x4800, 0xa635, 0xa684, 0x4000, 0x00c0, 0x2e7a,
-        0x703c, 0xa005, 0x00c0, 0x2e8e, 0x703f, 0x0015, 0x79d8, 0x7adc,
-        0x692e, 0x6a32, 0x0078, 0x2e6a, 0xa684, 0x4000, 0x0040, 0x2e9e,
-        0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x2e6a, 0x68b4, 0xa084,
-        0x4800, 0xa635, 0xa684, 0x4000, 0x00c0, 0x2e98, 0x703c, 0xa005,
-        0x00c0, 0x2eac, 0x703f, 0x0015, 0x79d8, 0x7adc, 0x78d0, 0x80fb,
-        0x00c8, 0x2eb3, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
-        0x692e, 0x6a32, 0x2100, 0xa205, 0x00c0, 0x2ec0, 0x0078, 0x2e6a,
-        0x7000, 0xa086, 0x0006, 0x0040, 0x2ec9, 0x1078, 0x4b30, 0x0078,
-        0x2e6a, 0x007c, 0x6008, 0xa085, 0x0200, 0x600a, 0xa384, 0x0200,
-        0x0040, 0x2ed6, 0x6008, 0xa085, 0x0002, 0x600a, 0x681b, 0x0006,
-        0x688f, 0x0000, 0x6893, 0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942,
-        0x682f, 0x0003, 0x6833, 0x0000, 0x6837, 0x0020, 0x6897, 0x0000,
-        0x689b, 0x0020, 0x68b3, 0x0000, 0x68af, 0x0000, 0x7000, 0x0079,
-        0x2ef1, 0x2482, 0x2efb, 0x2f04, 0x2ef9, 0x2ef9, 0x2ef9, 0x2ef9,
-        0x2ef9, 0x1078, 0x23eb, 0x6820, 0xa084, 0x0001, 0x00c0, 0x2f04,
-        0x1078, 0x33d8, 0x0078, 0x2f0a, 0x7060, 0x2c50, 0x2060, 0x6800,
-        0x6002, 0x2a60, 0x2021, 0x515a, 0x2404, 0xa005, 0x0040, 0x2f13,
-        0x2020, 0x0078, 0x2f0c, 0x2d22, 0x206b, 0x0000, 0x007c, 0x1078,
-        0x33df, 0x1078, 0x33ee, 0x6008, 0xa084, 0xfdff, 0x600a, 0x682b,
-        0x0000, 0x789b, 0x000e, 0x6f14, 0x6817, 0x0002, 0x1078, 0x4b78,
-        0xa684, 0x0800, 0x0040, 0x2f30, 0x691c, 0xa18d, 0x2000, 0x691e,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x2f40, 0x7868, 0xa08c, 0x00ff,
-        0x0040, 0x2f3e, 0x681b, 0x001e, 0x0078, 0x2f40, 0x681b, 0x0000,
-        0x2021, 0x515a, 0x2404, 0xad06, 0x0040, 0x2f47, 0x7460, 0x6800,
-        0x2022, 0x68c3, 0x0000, 0x6a3c, 0x6940, 0x6a32, 0x692e, 0x1078,
-        0x1c70, 0x0078, 0x2482, 0x1078, 0x2e46, 0x682b, 0x0000, 0x2001,
-        0x000e, 0x6f14, 0x1078, 0x3918, 0xa08c, 0x00ff, 0x6916, 0x6818,
-        0xa084, 0x8000, 0x0040, 0x2f66, 0x703c, 0x681a, 0xa68c, 0xdf00,
-        0x691e, 0x706f, 0x0000, 0x0078, 0x2482, 0x7000, 0xa005, 0x00c0,
-        0x2f73, 0x0078, 0x2482, 0xa006, 0x1078, 0x4776, 0x6817, 0x0000,
-        0x681b, 0x0014, 0xa68c, 0xdf00, 0x691e, 0x682b, 0x0000, 0x6820,
-        0xa085, 0x00ff, 0x6822, 0x7000, 0x0079, 0x2f86, 0x2482, 0x2f90,
-        0x2f90, 0x2f92, 0x2f92, 0x2f92, 0x2f92, 0x2f8e, 0x1078, 0x23eb,
-        0x1078, 0x33ee, 0x6008, 0xa084, 0xffef, 0x600a, 0x0078, 0x33a8,
-        0x2300, 0x0079, 0x2f9b, 0x2f9e, 0x2fa0, 0x2fd9, 0x1078, 0x23eb,
-        0x7000, 0x0079, 0x2fa3, 0x2482, 0x2fad, 0x2fad, 0x2fc8, 0x2fad,
-        0x2fd5, 0x2fc8, 0x2fab, 0x1078, 0x23eb, 0xa684, 0x0060, 0xa086,
-        0x0060, 0x00c0, 0x2fc4, 0xa6b4, 0xffdf, 0xa6b4, 0xbfff, 0xa6b5,
-        0x2000, 0x7e5a, 0x681c, 0xa084, 0xffdf, 0x681e, 0x1078, 0x4776,
-        0x1078, 0x4a3a, 0x0078, 0x3888, 0xa684, 0x2000, 0x0040, 0x2fb7,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x2fd5, 0x681b, 0x0015, 0xa684,
-        0x4000, 0x0040, 0x2fd5, 0x681b, 0x0007, 0x1078, 0x389c, 0x0078,
-        0x2459, 0x1078, 0x23eb, 0x2300, 0x0079, 0x2fde, 0x2fe1, 0x2fe3,
-        0x3016, 0x1078, 0x23eb, 0x7000, 0x0079, 0x2fe6, 0x2482, 0x2ff0,
-        0x2ff0, 0x300b, 0x2ff0, 0x3012, 0x300b, 0x2fee, 0x1078, 0x23eb,
-        0xa684, 0x0060, 0xa086, 0x0060, 0x00c0, 0x3007, 0xa6b4, 0xffbf,
-        0xa6b4, 0xbfff, 0xa6b5, 0x2000, 0x7e5a, 0x681c, 0xa084, 0xffbf,
-        0x681e, 0x1078, 0x4776, 0x1078, 0x4a3a, 0x0078, 0x3888, 0xa684,
-        0x2000, 0x0040, 0x2ffa, 0x6818, 0xa084, 0x8000, 0x0040, 0x3012,
-        0x681b, 0x0007, 0x781b, 0x00cd, 0x0078, 0x2459, 0x6820, 0xa085,
-        0x0004, 0x6822, 0x1078, 0x3853, 0xa6b5, 0x0800, 0x1078, 0x36c1,
-        0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x2300, 0x0079,
-        0x3029, 0x302c, 0x302e, 0x3030, 0x1078, 0x23eb, 0x0078, 0x36ad,
-        0xa684, 0x0400, 0x00c0, 0x3059, 0x79e4, 0xa184, 0x0020, 0x0040,
-        0x3040, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3040, 0x782b, 0x3009,
-        0x789b, 0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x79e4,
-        0xa184, 0x0020, 0x0040, 0x3051, 0x78ec, 0xa084, 0x0003, 0x00c0,
-        0x3055, 0x2001, 0x0014, 0x0078, 0x2d01, 0xa184, 0x0007, 0x0079,
-        0x3091, 0x7a90, 0xa294, 0x0007, 0x789b, 0x0060, 0x79a8, 0x81ff,
-        0x0040, 0x308f, 0x789b, 0x0010, 0x7ba8, 0xa384, 0x0001, 0x00c0,
-        0x3080, 0x7ba8, 0x7ba8, 0xa386, 0x0001, 0x00c0, 0x3073, 0x2009,
-        0xfff7, 0x0078, 0x3079, 0xa386, 0x0003, 0x00c0, 0x3080, 0x2009,
-        0xffef, 0x0c7e, 0x7054, 0x2060, 0x6004, 0xa104, 0x6006, 0x0c7f,
-        0x789b, 0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x782b,
-        0x3009, 0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff, 0x6922, 0x0078,
-        0x3888, 0x299e, 0x29a9, 0x309b, 0x30a3, 0x3099, 0x3099, 0x3888,
-        0x3888, 0x1078, 0x23eb, 0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff,
-        0x6922, 0x0078, 0x3892, 0x6920, 0xa18c, 0xfdff, 0xa18c, 0xfeff,
-        0x6922, 0x0078, 0x3888, 0x79e4, 0xa184, 0x0030, 0x0040, 0x30b5,
-        0x78ec, 0xa084, 0x0003, 0x00c0, 0x30dc, 0x7000, 0xa086, 0x0004,
-        0x00c0, 0x30cf, 0x706c, 0xa086, 0x0002, 0x00c0, 0x30c5, 0x2011,
-        0x0002, 0x2019, 0x0000, 0x0078, 0x2848, 0x706c, 0xa086, 0x0006,
-        0x0040, 0x30bf, 0x706c, 0xa086, 0x0004, 0x0040, 0x30bf, 0x7000,
-        0xa086, 0x0000, 0x0040, 0x2459, 0x6818, 0xa085, 0x8000, 0x681a,
-        0x2001, 0x0014, 0x0078, 0x2d01, 0xa184, 0x0007, 0x0079, 0x30e0,
-        0x3888, 0x3888, 0x30e8, 0x3888, 0x38ed, 0x38ed, 0x3888, 0x3888,
-        0xa684, 0x0080, 0x0040, 0x3117, 0x7194, 0x81ff, 0x0040, 0x3117,
-        0xa182, 0x000d, 0x00d0, 0x30f8, 0x7097, 0x0000, 0x0078, 0x30fd,
-        0xa182, 0x000c, 0x7096, 0x2009, 0x000c, 0x789b, 0x0061, 0x79aa,
-        0x157e, 0x137e, 0x147e, 0x7098, 0x8114, 0xa210, 0x729a, 0xa080,
-        0x000b, 0xad00, 0x2098, 0x20a1, 0x012b, 0x789b, 0x0000, 0x8108,
-        0x81ac, 0x53a6, 0x147f, 0x137f, 0x157f, 0x0078, 0x3892, 0xa684,
-        0x0400, 0x00c0, 0x3158, 0x6820, 0xa084, 0x0001, 0x0040, 0x3892,
-        0xa68c, 0x0060, 0xa684, 0x0060, 0x0040, 0x312c, 0xa086, 0x0060,
-        0x00c0, 0x312c, 0xa18d, 0x4000, 0xa18c, 0xfffb, 0x795a, 0x69b6,
-        0x789b, 0x0060, 0x78ab, 0x0000, 0x789b, 0x0061, 0x6818, 0xa085,
-        0x8000, 0x681a, 0x78aa, 0x8008, 0x810c, 0x0040, 0x3407, 0xa18c,
-        0x00f8, 0x00c0, 0x3407, 0x157e, 0x137e, 0x147e, 0x20a1, 0x012b,
-        0x789b, 0x0000, 0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6,
-        0x147f, 0x137f, 0x157f, 0x6814, 0x8007, 0x7882, 0x0078, 0x3892,
-        0x6818, 0xa084, 0x8000, 0x0040, 0x315f, 0x681b, 0x0008, 0x781b,
-        0x00c3, 0x0078, 0x2459, 0x2300, 0x0079, 0x3166, 0x316b, 0x320a,
-        0x3169, 0x1078, 0x23eb, 0x7000, 0xa084, 0x0007, 0x0079, 0x3170,
-        0x2482, 0x317a, 0x31af, 0x3185, 0x3178, 0x2482, 0x3178, 0x3178,
-        0x1078, 0x23eb, 0x681c, 0xa084, 0x2000, 0x0040, 0x3193, 0x6008,
-        0xa085, 0x0002, 0x600a, 0x0078, 0x3193, 0x68c0, 0xa005, 0x00c0,
-        0x31af, 0x6920, 0xa18d, 0x0001, 0x6922, 0x68c3, 0x0001, 0x6800,
-        0x706a, 0x0078, 0x31a9, 0x6920, 0xa18d, 0x0001, 0x6922, 0x6800,
-        0x6006, 0xa005, 0x00c0, 0x319d, 0x6002, 0x681c, 0xa084, 0x000e,
-        0x0040, 0x31a9, 0x7014, 0x68ba, 0x7130, 0xa188, 0x7400, 0x0078,
-        0x31ab, 0x2009, 0x7500, 0x2104, 0x6802, 0x2d0a, 0x7162, 0x6eb6,
-        0xa684, 0x0060, 0x0040, 0x3208, 0xa684, 0x0800, 0x00c0, 0x31c3,
-        0xa684, 0x7fff, 0x68b6, 0x6894, 0x68a6, 0x6898, 0x68aa, 0x1078,
-        0x4776, 0x0078, 0x3208, 0xa684, 0x0020, 0x0040, 0x31d8, 0x68c0,
-        0xa005, 0x0040, 0x31cf, 0x1078, 0x4b78, 0x0078, 0x31d2, 0xa006,
-        0x1078, 0x4b30, 0x79d8, 0x7adc, 0x69aa, 0x6aa6, 0x0078, 0x31de,
-        0x1078, 0x37fc, 0x69aa, 0x6aa6, 0x1078, 0x4b30, 0xa684, 0x8000,
-        0x0040, 0x3208, 0xa684, 0x7fff, 0x68b6, 0x2001, 0x0076, 0x1078,
-        0x3918, 0x2010, 0x2001, 0x0078, 0x1078, 0x3918, 0x2008, 0xa684,
-        0x0020, 0x00c0, 0x3200, 0x2001, 0x007a, 0x1078, 0x3918, 0x801b,
-        0x00c8, 0x31fb, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
-        0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae,
-        0x0078, 0x2482, 0x0078, 0x36ad, 0x7037, 0x0000, 0xa282, 0x0006,
-        0x0050, 0x3214, 0x1078, 0x23eb, 0x7000, 0xa084, 0x0007, 0x10c0,
-        0x39be, 0x2300, 0x0079, 0x321c, 0x321f, 0x3248, 0x325c, 0x2200,
-        0x0079, 0x3222, 0x3246, 0x36ad, 0x3228, 0x3246, 0x3278, 0x32ba,
-        0x7003, 0x0005, 0x2001, 0x7610, 0x2068, 0x704a, 0x157e, 0x20a9,
-        0x0031, 0x2003, 0x0000, 0x8000, 0x0070, 0x3238, 0x0078, 0x3231,
-        0x157f, 0xad80, 0x0009, 0x7036, 0x6817, 0x0000, 0x68b7, 0x0700,
-        0x6823, 0x0800, 0x6827, 0x0003, 0x0078, 0x369d, 0x1078, 0x23eb,
-        0x7003, 0x0005, 0x2001, 0x7610, 0x2068, 0x704a, 0xad80, 0x0009,
-        0x7036, 0x2200, 0x0079, 0x3254, 0x36ad, 0x325a, 0x325a, 0x3278,
-        0x325a, 0x36ad, 0x1078, 0x23eb, 0x7003, 0x0005, 0x2001, 0x7610,
-        0x2068, 0x704a, 0xad80, 0x0009, 0x7036, 0x2200, 0x0079, 0x3268,
-        0x3270, 0x326e, 0x326e, 0x3270, 0x326e, 0x3270, 0x1078, 0x23eb,
-        0x1078, 0x36d1, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x2459,
-        0x7003, 0x0002, 0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8,
-        0xa484, 0x001f, 0xa215, 0x2069, 0x7500, 0x2d04, 0x2d08, 0x7162,
-        0x2068, 0xa005, 0x0040, 0x3293, 0x6814, 0xa206, 0x0040, 0x32af,
-        0x6800, 0x0078, 0x3286, 0x7003, 0x0005, 0x2001, 0x7610, 0x2068,
-        0x704a, 0x7036, 0x157e, 0x20a9, 0x0031, 0x2003, 0x0000, 0x8000,
-        0x0070, 0x32a4, 0x0078, 0x329d, 0x157f, 0xad80, 0x0009, 0x7036,
-        0x6a16, 0x68b7, 0x0700, 0x6823, 0x0800, 0x6827, 0x0003, 0x6eb4,
-        0x7e5a, 0x6820, 0xa084, 0x0c00, 0x0040, 0x3309, 0x1078, 0x36c9,
-        0x0078, 0x3309, 0x7003, 0x0002, 0x7a80, 0xa294, 0x0f00, 0x789b,
-        0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0x79a8, 0x79a8, 0xa18c,
-        0x00ff, 0xa1e8, 0x7400, 0x2d04, 0x2d08, 0x7162, 0x2068, 0xa005,
-        0x0040, 0x32d9, 0x6814, 0xa206, 0x0040, 0x32f4, 0x6800, 0x0078,
-        0x32cc, 0x7003, 0x0005, 0x2001, 0x7610, 0x2068, 0x704a, 0x157e,
-        0x20a9, 0x0031, 0x2003, 0x0000, 0x8000, 0x0070, 0x32e9, 0x0078,
-        0x32e2, 0x157f, 0xad80, 0x0009, 0x7036, 0x6a16, 0x68b7, 0x0700,
-        0x6823, 0x0800, 0x6827, 0x0003, 0x6eb4, 0x7e5a, 0x6820, 0xa084,
-        0x0c00, 0x0040, 0x3309, 0xa084, 0x0800, 0x0040, 0x3303, 0x1078,
-        0x36cd, 0x0078, 0x3309, 0x1078, 0x36c9, 0x708b, 0x0000, 0x0078,
-        0x3309, 0x027e, 0x8207, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003,
-        0xa080, 0x5380, 0x2060, 0x7056, 0x6000, 0x705a, 0x6004, 0x705e,
-        0xa684, 0x0060, 0x0040, 0x3361, 0x6b98, 0x6c94, 0x69ac, 0x68b0,
-        0xa105, 0x00c0, 0x3343, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0xa6b4,
-        0xb7ff, 0x7e5a, 0xa684, 0x0060, 0xa086, 0x0060, 0x0040, 0x3361,
-        0x68c0, 0xa005, 0x0040, 0x333c, 0x7003, 0x0003, 0x682b, 0x0000,
-        0x1078, 0x4a29, 0x0078, 0x333e, 0x1078, 0x4a3a, 0xa6b5, 0x2000,
-        0x7e5a, 0x0078, 0x3361, 0x68b0, 0xa31a, 0x2100, 0xa423, 0x2400,
-        0xa305, 0x0040, 0x3361, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0x68b0,
-        0xa6b4, 0xbfff, 0x7e5a, 0x007e, 0x68c0, 0xa005, 0x007f, 0x0040,
-        0x335f, 0x7003, 0x0003, 0x1078, 0x4a29, 0x0078, 0x3361, 0x1078,
-        0x4a85, 0x077f, 0x1078, 0x37ef, 0x2009, 0x0065, 0xa684, 0x0004,
-        0x0040, 0x3382, 0x78e4, 0xa084, 0x0030, 0x0040, 0x337a, 0x78ec,
-        0xa084, 0x0003, 0x0040, 0x337a, 0x782b, 0x3008, 0x2009, 0x0065,
-        0x0078, 0x3382, 0x0f7e, 0x2079, 0x5100, 0x1078, 0x4776, 0x0f7f,
-        0x0040, 0x2482, 0x791a, 0x2d00, 0x704a, 0x8207, 0xa084, 0x000f,
-        0x8003, 0x8003, 0x8003, 0xa080, 0x5380, 0x2048, 0x0078, 0x2459,
-        0x6020, 0xa005, 0x0040, 0x339c, 0x8001, 0x6022, 0x6008, 0xa085,
-        0x0008, 0x600a, 0x7010, 0x6026, 0x007c, 0xa006, 0x1078, 0x4776,
-        0x6817, 0x0000, 0x681b, 0x0001, 0x6823, 0x0040, 0x681f, 0x0100,
-        0x7000, 0xa084, 0x0007, 0x0079, 0x33ad, 0x2482, 0x33b7, 0x33b7,
-        0x33d4, 0x33bf, 0x33bd, 0x33bf, 0x33b5, 0x1078, 0x23eb, 0x1078,
-        0x33df, 0x1078, 0x33d8, 0x1078, 0x1c70, 0x0078, 0x2482, 0x706c,
-        0x706f, 0x0000, 0x7093, 0x0000, 0x0079, 0x33c6, 0x33d0, 0x33d0,
-        0x33ce, 0x33ce, 0x33ce, 0x33d0, 0x33ce, 0x33d0, 0x0079, 0x2861,
-        0x706f, 0x0000, 0x0078, 0x2482, 0x681b, 0x0000, 0x0078, 0x2f17,
-        0x6800, 0xa005, 0x00c0, 0x33dd, 0x6002, 0x6006, 0x007c, 0x6010,
-        0xa005, 0x0040, 0x33e8, 0x8001, 0x00d0, 0x33e8, 0x1078, 0x23eb,
-        0x6012, 0x6008, 0xa084, 0xffef, 0x600a, 0x007c, 0x6018, 0xa005,
-        0x0040, 0x33f4, 0x8001, 0x601a, 0x007c, 0x1078, 0x3912, 0x681b,
-        0x0018, 0x0078, 0x342b, 0x1078, 0x3912, 0x681b, 0x0019, 0x0078,
-        0x342b, 0x1078, 0x3912, 0x681b, 0x001a, 0x0078, 0x342b, 0x1078,
-        0x3912, 0x681b, 0x0003, 0x0078, 0x342b, 0x7780, 0x1078, 0x37ef,
-        0x7184, 0xa18c, 0x00ff, 0xa1e8, 0x7400, 0x2d04, 0x2d08, 0x2068,
-        0xa005, 0x00c0, 0x341d, 0x0078, 0x2482, 0x6814, 0x7280, 0xa206,
-        0x0040, 0x3425, 0x6800, 0x0078, 0x3416, 0x6800, 0x200a, 0x681b,
-        0x0005, 0x708b, 0x0000, 0x1078, 0x33df, 0x6820, 0xa084, 0x0001,
-        0x00c0, 0x3434, 0x1078, 0x33d8, 0x1078, 0x33ee, 0x681f, 0x0000,
-        0x6823, 0x0020, 0x1078, 0x1c70, 0x0078, 0x2482, 0xa282, 0x0003,
-        0x00c0, 0x369d, 0x7da8, 0xa5ac, 0x00ff, 0x7ca8, 0xa4a4, 0x00ff,
-        0x6920, 0xa18d, 0x0080, 0x6922, 0xa184, 0x0100, 0x0040, 0x34a2,
-        0xa18c, 0xfeff, 0x6922, 0xa4a4, 0x00ff, 0x0040, 0x348c, 0xa482,
-        0x000c, 0x0048, 0x345f, 0x0040, 0x345f, 0x2021, 0x000c, 0x852b,
-        0x852b, 0x1078, 0x3760, 0x0040, 0x3469, 0x1078, 0x355b, 0x0078,
-        0x3495, 0x1078, 0x371b, 0x0c7e, 0x2960, 0x6004, 0xa084, 0xfff5,
-        0x6006, 0x1078, 0x3586, 0x0c7f, 0x6920, 0xa18d, 0x0100, 0x6922,
-        0x7e58, 0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0, 0x3486,
-        0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2459, 0x782b, 0x3008,
-        0x781b, 0x0065, 0x0078, 0x2459, 0x0c7e, 0x2960, 0x6004, 0xa084,
-        0xfff5, 0x6006, 0x1078, 0x3586, 0x0c7f, 0x7e58, 0xa684, 0x0400,
-        0x00c0, 0x349e, 0x781b, 0x0058, 0x0078, 0x2459, 0x781b, 0x0065,
-        0x0078, 0x2459, 0x0c7e, 0x7054, 0x2060, 0x6100, 0xa18c, 0x1000,
-        0x0040, 0x34e2, 0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x000c,
-        0x0048, 0x34b6, 0x0040, 0x34b6, 0x2011, 0x000c, 0x2400, 0xa202,
-        0x00c8, 0x34bb, 0x2220, 0x6208, 0xa294, 0x00ff, 0x7018, 0xa086,
-        0x0028, 0x00c0, 0x34cb, 0xa282, 0x0019, 0x00c8, 0x34d1, 0x2011,
-        0x0019, 0x0078, 0x34d1, 0xa282, 0x000c, 0x00c8, 0x34d1, 0x2011,
-        0x000c, 0x2200, 0xa502, 0x00c8, 0x34d6, 0x2228, 0x1078, 0x371f,
-        0x852b, 0x852b, 0x1078, 0x3760, 0x0040, 0x34e2, 0x1078, 0x355b,
-        0x0078, 0x34e6, 0x1078, 0x371b, 0x1078, 0x3586, 0x7858, 0xa085,
-        0x0004, 0x785a, 0x0c7f, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078,
-        0x2459, 0x0c7e, 0x2960, 0x6000, 0xa084, 0x1000, 0x00c0, 0x3509,
-        0x6010, 0xa084, 0x000f, 0x00c0, 0x3503, 0x6104, 0xa18c, 0xfff5,
-        0x6106, 0x0c7f, 0x007c, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078,
-        0x3530, 0x68a0, 0xa084, 0x0200, 0x00c0, 0x3503, 0x6208, 0xa294,
-        0x00ff, 0x7018, 0xa086, 0x0028, 0x00c0, 0x351e, 0xa282, 0x0019,
-        0x00c8, 0x3524, 0x2011, 0x0019, 0x0078, 0x3524, 0xa282, 0x000c,
-        0x00c8, 0x3524, 0x2011, 0x000c, 0x6308, 0x831f, 0xa39c, 0x00ff,
-        0xa382, 0x000c, 0x0048, 0x3530, 0x0040, 0x3530, 0x2019, 0x000c,
-        0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa,
-        0xa8c0, 0x0005, 0x6820, 0xa085, 0x0100, 0x6822, 0x0c7f, 0x007c,
-        0x0c7e, 0x2960, 0xa18c, 0xfff5, 0x6106, 0x2011, 0x0032, 0x2019,
-        0x0000, 0x0078, 0x354b, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab,
-        0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820, 0xa085, 0x0100,
-        0x6822, 0x0c7f, 0x007c, 0x0c7e, 0x7154, 0x2160, 0x1078, 0x3562,
-        0x0c7f, 0x007c, 0x2008, 0xa084, 0xfff0, 0xa425, 0x7c86, 0x6018,
-        0x789a, 0x7cae, 0x6412, 0x78a4, 0xa084, 0xfff8, 0xa18c, 0x0007,
-        0xa105, 0x78a6, 0x6016, 0x788a, 0xa4a4, 0x000f, 0x8427, 0x8204,
-        0x8004, 0xa084, 0x00ff, 0xa405, 0x600e, 0x78ec, 0xd08c, 0x00c0,
-        0x3585, 0x6004, 0xa084, 0xfff5, 0x6006, 0x007c, 0x0c7e, 0x7054,
-        0x2060, 0x1078, 0x358d, 0x0c7f, 0x007c, 0x6018, 0x789a, 0x78a4,
-        0xa084, 0xfff0, 0x78a6, 0x6012, 0x7884, 0xa084, 0xfff0, 0x7886,
-        0x007c, 0xa282, 0x0002, 0x00c0, 0x369d, 0x7aa8, 0x6920, 0xa18d,
-        0x0080, 0x6922, 0xa184, 0x0200, 0x0040, 0x35e2, 0xa18c, 0xfdff,
-        0x6922, 0xa294, 0x00ff, 0xa282, 0x0002, 0x00c8, 0x369d, 0x1078,
-        0x362b, 0x1078, 0x3586, 0xa980, 0x0001, 0x200c, 0x1078, 0x37eb,
-        0x1078, 0x34f1, 0x88ff, 0x0040, 0x35d5, 0x789b, 0x0060, 0x2800,
-        0x78aa, 0x7e58, 0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400, 0x00c0,
-        0x35cf, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x2459, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x7e58, 0xa684, 0x0400,
-        0x00c0, 0x35de, 0x781b, 0x0058, 0x0078, 0x2459, 0x781b, 0x0065,
-        0x0078, 0x2459, 0xa282, 0x0002, 0x00c8, 0x35ea, 0xa284, 0x0001,
-        0x0040, 0x35f4, 0x7154, 0xa188, 0x0000, 0x210c, 0xa18c, 0x2000,
-        0x00c0, 0x35f4, 0x2011, 0x0000, 0x1078, 0x370d, 0x1078, 0x362b,
-        0x1078, 0x3586, 0x7858, 0xa085, 0x0004, 0x785a, 0x782b, 0x3008,
-        0x781b, 0x0065, 0x0078, 0x2459, 0x0c7e, 0x027e, 0x2960, 0x6000,
-        0x2011, 0x0001, 0xa084, 0x2000, 0x00c0, 0x361b, 0x6014, 0xa084,
-        0x0040, 0x00c0, 0x3619, 0xa18c, 0xffef, 0x6106, 0xa006, 0x0078,
-        0x3628, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab,
-        0x0003, 0x7aaa, 0xa8c0, 0x0004, 0x6820, 0xa085, 0x0200, 0x6822,
-        0x027f, 0x0c7f, 0x007c, 0x0c7e, 0x7054, 0x2060, 0x1078, 0x3632,
-        0x0c7f, 0x007c, 0x82ff, 0x0040, 0x3637, 0x2011, 0x0040, 0x6018,
-        0xa080, 0x0002, 0x789a, 0x78a4, 0xa084, 0xffbf, 0xa205, 0x78a6,
-        0x788a, 0x6016, 0x78ec, 0xd08c, 0x00c0, 0x364a, 0x6004, 0xa084,
-        0xffef, 0x6006, 0x007c, 0x007e, 0x7000, 0xa086, 0x0003, 0x0040,
-        0x3654, 0x007f, 0x0078, 0x3657, 0x007f, 0x0078, 0x3699, 0xa684,
-        0x0020, 0x0040, 0x3699, 0x7888, 0xa084, 0x0040, 0x0040, 0x3699,
-        0x7bb8, 0xa384, 0x003f, 0x831b, 0x00c8, 0x3667, 0x8000, 0xa005,
-        0x0040, 0x367d, 0x831b, 0x00c8, 0x3670, 0x8001, 0x0040, 0x3695,
-        0xa684, 0x4000, 0x0040, 0x367d, 0x78b8, 0x801b, 0x00c8, 0x3679,
-        0x8000, 0xa084, 0x003f, 0x00c0, 0x3695, 0xa6b4, 0xbfff, 0x7e5a,
-        0x79d8, 0x7adc, 0x2001, 0x0001, 0xa108, 0x00c8, 0x3689, 0xa291,
-        0x0000, 0x79d2, 0x79da, 0x7ad6, 0x7ade, 0x1078, 0x4b30, 0x781b,
-        0x0064, 0x1078, 0x49b5, 0x0078, 0x2459, 0x781b, 0x0064, 0x0078,
-        0x2459, 0x781b, 0x0065, 0x0078, 0x2459, 0x1078, 0x36d5, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x1078, 0x36c1, 0x782b,
-        0x3008, 0x781b, 0x0065, 0x0078, 0x2459, 0x6827, 0x0002, 0x1078,
-        0x36c9, 0x78e4, 0xa084, 0x0030, 0x0040, 0x2482, 0x78ec, 0xa084,
-        0x0003, 0x0040, 0x2482, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078,
-        0x2459, 0x2001, 0x0005, 0x0078, 0x36d7, 0x2001, 0x000c, 0x0078,
-        0x36d7, 0x2001, 0x0006, 0x0078, 0x36d7, 0x2001, 0x000d, 0x0078,
-        0x36d7, 0x2001, 0x0009, 0x0078, 0x36d7, 0x2001, 0x0007, 0x789b,
-        0x0010, 0x78aa, 0x789b, 0x0060, 0x78ab, 0x0001, 0xa6b5, 0x0004,
-        0x7e5a, 0x007c, 0x077e, 0x873f, 0xa7bc, 0x000f, 0x873b, 0x873b,
-        0x8703, 0xa0e0, 0x5380, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184,
-        0x000f, 0x0040, 0x36fb, 0xa184, 0xfff0, 0x78a6, 0x6012, 0x6004,
-        0xa085, 0x0008, 0x6006, 0x8738, 0x8738, 0x7f9a, 0x79a4, 0xa184,
-        0x0040, 0x0040, 0x370b, 0xa184, 0xffbf, 0x78a6, 0x6016, 0x6004,
-        0xa085, 0x0010, 0x6006, 0x077f, 0x007c, 0x789b, 0x0010, 0x78ab,
-        0x0001, 0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0060,
-        0x78ab, 0x0004, 0x007c, 0x2021, 0x0000, 0x2029, 0x0032, 0x789b,
-        0x0010, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa,
-        0x7caa, 0x789b, 0x0060, 0x78ab, 0x0005, 0x007c, 0x157e, 0x8007,
-        0xa084, 0x00ff, 0x8003, 0x8003, 0xa080, 0x0020, 0x789a, 0x79a4,
-        0xa18c, 0xfff0, 0x2001, 0x5146, 0x2004, 0xa082, 0x0028, 0x0040,
-        0x3749, 0x2021, 0x37d2, 0x2019, 0x0014, 0x20a9, 0x000c, 0x0078,
-        0x374f, 0x2021, 0x37de, 0x2019, 0x0019, 0x20a9, 0x000d, 0x2011,
-        0x0064, 0x2404, 0xa084, 0xfff0, 0xa106, 0x0040, 0x375e, 0x8420,
-        0x2300, 0xa210, 0x0070, 0x375e, 0x0078, 0x3751, 0x157f, 0x007c,
-        0x157e, 0x2009, 0x5146, 0x210c, 0xa182, 0x0032, 0x0048, 0x3774,
-        0x0040, 0x3778, 0x2009, 0x37c4, 0x2019, 0x0011, 0x20a9, 0x000e,
-        0x2011, 0x0032, 0x0078, 0x378a, 0xa182, 0x0028, 0x0040, 0x3782,
-        0x2009, 0x37d2, 0x2019, 0x0014, 0x20a9, 0x000c, 0x2011, 0x0064,
-        0x0078, 0x378a, 0x2009, 0x37de, 0x2019, 0x0019, 0x20a9, 0x000d,
-        0x2011, 0x0064, 0x2200, 0xa502, 0x0040, 0x379a, 0x0048, 0x379a,
-        0x8108, 0x2300, 0xa210, 0x0070, 0x3797, 0x0078, 0x378a, 0x157f,
-        0xa006, 0x007c, 0x157f, 0xa582, 0x0064, 0x00c8, 0x37a9, 0x7808,
-        0xa085, 0x0070, 0x780a, 0x7044, 0xa085, 0x0070, 0x7046, 0x0078,
-        0x37a9, 0x78ec, 0xa084, 0x0300, 0x0040, 0x37b1, 0x2104, 0x0078,
-        0x37c2, 0x2104, 0xa09e, 0x1102, 0x00c0, 0x37c2, 0x2001, 0x04fd,
-        0x2004, 0xa082, 0x0005, 0x0048, 0x37c1, 0x2001, 0x1201, 0x0078,
-        0x37c2, 0x2104, 0xa005, 0x007c, 0x1102, 0x3002, 0x3202, 0x4203,
-        0x4403, 0x5404, 0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07,
-        0x0c07, 0x0e07, 0x3202, 0x4202, 0x5202, 0x6202, 0x7202, 0x6605,
-        0x7605, 0x7805, 0x7a05, 0x7c05, 0x7e05, 0x7f05, 0x2202, 0x3202,
-        0x4202, 0x5202, 0x5404, 0x6404, 0x7404, 0x7604, 0x7804, 0x7a04,
-        0x7c04, 0x7e04, 0x7f04, 0x789b, 0x0010, 0xa046, 0x007c, 0xa784,
-        0x0f00, 0x800b, 0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003,
-        0xa105, 0xa0e0, 0x5400, 0x007c, 0x79d8, 0x7adc, 0x78d0, 0x801b,
-        0x00c8, 0x3803, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
-        0x007c, 0x0f7e, 0x2079, 0x0100, 0x2009, 0x5140, 0x2091, 0x8000,
-        0x2104, 0x0079, 0x3813, 0x3849, 0x381d, 0x381d, 0x381d, 0x381d,
-        0x381d, 0x381d, 0x384d, 0x1078, 0x23eb, 0x784b, 0x0004, 0x7848,
-        0xa084, 0x0004, 0x00c0, 0x381f, 0x784b, 0x0008, 0x7848, 0xa084,
-        0x0008, 0x00c0, 0x3826, 0x68b4, 0xa085, 0x4000, 0x68b6, 0x7858,
-        0xa085, 0x4000, 0x785a, 0x7830, 0xa084, 0x0080, 0x00c0, 0x3849,
-        0x0018, 0x3849, 0x681c, 0xa084, 0x0020, 0x00c0, 0x3847, 0x0e7e,
-        0x2071, 0x5140, 0x1078, 0x389c, 0x0e7f, 0x0078, 0x3849, 0x781b,
-        0x00cd, 0x2091, 0x8001, 0x0f7f, 0x007c, 0x70b3, 0x0000, 0x1078,
-        0x3a76, 0x0078, 0x3849, 0x0c7e, 0x6814, 0x8007, 0xa084, 0x000f,
-        0x8003, 0x8003, 0x8003, 0xa0e0, 0x5380, 0x6004, 0xa084, 0x000a,
-        0x00c0, 0x3886, 0x6108, 0xa194, 0xff00, 0x0040, 0x3886, 0xa18c,
-        0x00ff, 0x2001, 0x0019, 0xa106, 0x0040, 0x3875, 0x2001, 0x0032,
-        0xa106, 0x0040, 0x3879, 0x0078, 0x387d, 0x2009, 0x0020, 0x0078,
-        0x387f, 0x2009, 0x003f, 0x0078, 0x387f, 0x2011, 0x0000, 0x2100,
-        0xa205, 0x600a, 0x6004, 0xa085, 0x0002, 0x6006, 0x0c7f, 0x007c,
-        0x781b, 0x0065, 0x0078, 0x2459, 0x782b, 0x3008, 0x781b, 0x0065,
-        0x0078, 0x2459, 0x781b, 0x0058, 0x0078, 0x2459, 0x782b, 0x3008,
-        0x781b, 0x0056, 0x0078, 0x2459, 0x2009, 0x5120, 0x210c, 0xa186,
-        0x0000, 0x0040, 0x38b0, 0xa186, 0x0001, 0x0040, 0x38b3, 0x2009,
-        0x5138, 0x200b, 0x000b, 0x706f, 0x0001, 0x781b, 0x0048, 0x007c,
-        0x781b, 0x00c7, 0x007c, 0x2009, 0x5138, 0x200b, 0x000a, 0x007c,
-        0x2009, 0x5120, 0x210c, 0xa186, 0x0000, 0x0040, 0x38d3, 0xa186,
-        0x0001, 0x0040, 0x38cd, 0x2009, 0x5138, 0x200b, 0x000b, 0x706f,
-        0x0001, 0x781b, 0x0048, 0x0078, 0x2459, 0x2009, 0x5138, 0x200b,
-        0x000a, 0x0078, 0x2459, 0x782b, 0x3008, 0x781b, 0x00c7, 0x0078,
-        0x2459, 0x781b, 0x00cd, 0x0078, 0x2459, 0x782b, 0x3008, 0x781b,
-        0x00cd, 0x0078, 0x2459, 0x781b, 0x008e, 0x0078, 0x2459, 0x782b,
-        0x3008, 0x781b, 0x008e, 0x0078, 0x2459, 0x6818, 0xa084, 0x8000,
-        0x0040, 0x38f4, 0x681b, 0x001d, 0x706f, 0x0001, 0x781b, 0x0048,
-        0x0078, 0x2459, 0x007e, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x3910,
-        0x7808, 0xa084, 0xfffc, 0x780a, 0x0005, 0x0005, 0x0005, 0x0005,
-        0x78ec, 0xa084, 0x0021, 0x0040, 0x3910, 0x7044, 0x780a, 0xa005,
-        0x007f, 0x007c, 0x7044, 0xa085, 0x0002, 0x7046, 0x780a, 0x007c,
-        0x007e, 0x7830, 0xa084, 0x0040, 0x00c0, 0x3919, 0x0098, 0x3924,
-        0x007f, 0x789a, 0x78ac, 0x007c, 0x7808, 0xa084, 0xfffd, 0x780a,
-        0x0005, 0x0005, 0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x0040,
-        0x3933, 0x0098, 0x3931, 0x007f, 0x789a, 0x78ac, 0x007e, 0x7044,
-        0x780a, 0x007f, 0x007c, 0x78ec, 0xa084, 0x0002, 0x00c0, 0x4760,
-        0xa784, 0x007d, 0x00c0, 0x3947, 0x2700, 0x1078, 0x23eb, 0xa784,
-        0x0001, 0x00c0, 0x2f6d, 0xa784, 0x0070, 0x0040, 0x3957, 0x0c7e,
-        0x2d60, 0x2f68, 0x1078, 0x2396, 0x2d78, 0x2c68, 0x0c7f, 0xa784,
-        0x0008, 0x0040, 0x3964, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003,
-        0x0040, 0x2482, 0x0078, 0x3888, 0xa784, 0x0004, 0x0040, 0x3997,
-        0x78b8, 0xa084, 0x4001, 0x0040, 0x3997, 0x784b, 0x0008, 0x78ec,
-        0xa084, 0x0003, 0x0040, 0x2482, 0x78e4, 0xa084, 0x0007, 0xa086,
-        0x0001, 0x00c0, 0x3997, 0x78c0, 0xa085, 0x4800, 0x2030, 0x7e5a,
-        0x781b, 0x00cd, 0x0078, 0x2459, 0x784b, 0x0008, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x3993, 0x681b, 0x0015, 0xa684, 0x4000, 0x0040,
-        0x3993, 0x681b, 0x0007, 0x1078, 0x389c, 0x0078, 0x2459, 0x681b,
-        0x0003, 0x7858, 0xa084, 0x3f00, 0x681e, 0x682f, 0x0000, 0x6833,
-        0x0000, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x2965,
-        0x0018, 0x2459, 0x0078, 0x36a5, 0x6b14, 0x8307, 0xa084, 0x000f,
-        0x8003, 0x8003, 0x8003, 0xa080, 0x5380, 0x2060, 0x2048, 0x7056,
-        0x6000, 0x705a, 0x6004, 0x705e, 0x2a60, 0x007c, 0x0079, 0x39c0,
-        0x39c8, 0x39c9, 0x39c8, 0x39cb, 0x39c8, 0x39c8, 0x39c8, 0x39d0,
-        0x007c, 0x1078, 0x33ee, 0x1078, 0x4776, 0x7038, 0x600a, 0x007c,
-        0x70a0, 0xa005, 0x0040, 0x39dd, 0x2068, 0x1078, 0x1b62, 0x1078,
-        0x46f8, 0x1078, 0x46ff, 0x70a3, 0x0000, 0x007c, 0x0e7e, 0x2091,
-        0x8000, 0x2071, 0x5140, 0x7000, 0xa086, 0x0007, 0x00c0, 0x39f4,
-        0x6110, 0x70bc, 0xa106, 0x00c0, 0x39f4, 0x0e7f, 0x1078, 0x1b6f,
-        0x1078, 0x39fa, 0xa006, 0x007c, 0x2091, 0x8001, 0x0e7f, 0xa085,
-        0x0001, 0x007c, 0x0f7e, 0x0e7e, 0x2071, 0x5140, 0x0078, 0x21fa,
-        0x785b, 0x0000, 0x70af, 0x000e, 0x2009, 0x0100, 0x017e, 0x70a0,
-        0xa06d, 0x0040, 0x3a0f, 0x70a3, 0x0000, 0x0078, 0x3a15, 0x70b3,
-        0x0000, 0x1078, 0x1b8b, 0x0040, 0x3a1b, 0x70ac, 0x6826, 0x1078,
-        0x3af8, 0x0078, 0x3a0f, 0x017f, 0x157e, 0x0c7e, 0x0d7e, 0x20a9,
-        0x0008, 0x2061, 0x7510, 0x6000, 0xa105, 0x6002, 0x601c, 0xa06d,
-        0x0040, 0x3a33, 0x6800, 0x601e, 0x1078, 0x195a, 0x6008, 0x8000,
-        0x600a, 0x0078, 0x3a26, 0x6018, 0xa06d, 0x0040, 0x3a3d, 0x6800,
-        0x601a, 0x1078, 0x195a, 0x0078, 0x3a33, 0xace0, 0x0008, 0x0070,
-        0x3a43, 0x0078, 0x3a23, 0x709c, 0xa084, 0x8000, 0x0040, 0x3a4a,
-        0x1078, 0x3b72, 0x0d7f, 0x0c7f, 0x157f, 0x007c, 0x127e, 0x2091,
-        0x2300, 0x6804, 0xa084, 0x000f, 0x0079, 0x3a56, 0x3a66, 0x3a66,
-        0x3a66, 0x3a66, 0x3a66, 0x3a66, 0x3a68, 0x3a6e, 0x3a66, 0x3a66,
-        0x3a66, 0x3a66, 0x3a66, 0x3a70, 0x3a66, 0x3a68, 0x1078, 0x23eb,
-        0x1078, 0x44d0, 0x1078, 0x195a, 0x0078, 0x3a74, 0x6827, 0x000b,
-        0x1078, 0x44d0, 0x1078, 0x3af8, 0x127f, 0x007c, 0x127e, 0x2091,
-        0x2300, 0x0098, 0x3a92, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x3a92,
-        0x0d7e, 0x1078, 0x4708, 0x2d00, 0x682e, 0x2009, 0x0004, 0x2001,
-        0x0000, 0x6827, 0x0084, 0x1078, 0x46c1, 0x1078, 0x3af8, 0x0d7f,
-        0x0078, 0x3ac6, 0x7948, 0xa185, 0x4000, 0x784a, 0x0098, 0x3a9b,
-        0x794a, 0x0078, 0x3a80, 0x7828, 0xa086, 0x1834, 0x00c0, 0x3aa4,
-        0xa185, 0x0004, 0x0078, 0x3aab, 0x7828, 0xa086, 0x1814, 0x00c0,
-        0x3a98, 0xa185, 0x000c, 0x784a, 0x789b, 0x000e, 0x78ab, 0x0002,
-        0x7858, 0xa084, 0x00ff, 0xa085, 0x0400, 0x785a, 0x70b4, 0xa080,
-        0x0091, 0x781a, 0x6827, 0x0284, 0x682c, 0x6836, 0x6830, 0x683a,
-        0x2009, 0x0004, 0x2001, 0x0000, 0x1078, 0x46c1, 0x127f, 0x007c,
-        0x0d7e, 0x6b14, 0x1078, 0x1bfd, 0x0040, 0x3ad5, 0x2068, 0x6827,
-        0x0002, 0x1078, 0x3af8, 0x0078, 0x3aca, 0x0d7f, 0x007c, 0x0d7e,
-        0x6b14, 0x6c28, 0xa4a4, 0x00ff, 0x1078, 0x1b9b, 0x0040, 0x3ae5,
-        0x2068, 0x6827, 0x0002, 0x1078, 0x3af8, 0x0d7f, 0x007c, 0x0d7e,
-        0x6b14, 0xa39c, 0x00ff, 0x1078, 0x1bce, 0x0040, 0x3af6, 0x2068,
-        0x6827, 0x0002, 0x1078, 0x3af8, 0x0078, 0x3aeb, 0x0d7f, 0x007c,
-        0x0c7e, 0x6914, 0x1078, 0x3b69, 0x6904, 0xa18c, 0x00ff, 0xa186,
-        0x0006, 0x0040, 0x3b13, 0xa186, 0x000d, 0x0040, 0x3b32, 0xa186,
-        0x0017, 0x00c0, 0x3b0f, 0x1078, 0x195a, 0x0078, 0x3b11, 0x1078,
-        0x1c72, 0x0c7f, 0x007c, 0x6004, 0x8001, 0x0048, 0x3b30, 0x6006,
-        0x2009, 0x0000, 0xa684, 0x0001, 0x00c0, 0x3b20, 0xa18d, 0x8000,
-        0xa684, 0x0004, 0x0040, 0x3b26, 0xa18d, 0x0002, 0x691e, 0x6823,
-        0x0000, 0x7104, 0x810f, 0x6818, 0xa105, 0x681a, 0x0078, 0x3b0f,
-        0x1078, 0x23eb, 0x6018, 0xa005, 0x00c0, 0x3b41, 0x6008, 0x8001,
-        0x0048, 0x3b41, 0x600a, 0x601c, 0x6802, 0x2d00, 0x601e, 0x0078,
-        0x3b57, 0xac88, 0x0006, 0x2104, 0xa005, 0x0040, 0x3b4a, 0x2008,
-        0x0078, 0x3b43, 0x6802, 0x2d0a, 0x6008, 0x8001, 0x0048, 0x3b11,
-        0x600a, 0x6018, 0x2068, 0x6800, 0x601a, 0x0078, 0x3b3b, 0x157e,
-        0x137e, 0x147e, 0x0c7e, 0x0d7e, 0x1078, 0x1937, 0x2da0, 0x137f,
-        0x20a9, 0x0031, 0x53a3, 0x0c7f, 0x147f, 0x137f, 0x157f, 0x0078,
-        0x3b0f, 0xa184, 0x001f, 0x8003, 0x8003, 0x8003, 0xa080, 0x7510,
-        0x2060, 0x007c, 0x2019, 0x5151, 0x2304, 0xa085, 0x0001, 0x201a,
-        0x2019, 0x0102, 0x2304, 0xa085, 0x0001, 0x201a, 0x007c, 0x2019,
-        0x5151, 0x2304, 0xa084, 0xfffe, 0x201a, 0x2019, 0x0102, 0x2304,
-        0xa084, 0xfffe, 0x201a, 0x007c, 0x7990, 0xa18c, 0xfff8, 0x7992,
-        0x70b4, 0xa080, 0x00dd, 0x781a, 0x0078, 0x2459, 0x70a3, 0x0000,
-        0x7003, 0x0000, 0x7043, 0x0001, 0x7037, 0x0000, 0x0018, 0x2410,
-        0x1078, 0x1b8b, 0x0040, 0x3bc7, 0x2009, 0x510f, 0x200b, 0x0000,
-        0x68bc, 0x2060, 0x6100, 0xa184, 0x0300, 0x0040, 0x3bbb, 0x6827,
-        0x000e, 0xa084, 0x0200, 0x0040, 0x3bb7, 0x6827, 0x0017, 0x1078,
-        0x3af8, 0x0078, 0x3b96, 0x7000, 0xa086, 0x0007, 0x00c0, 0x3c29,
-        0x2d00, 0x70a2, 0xad80, 0x000f, 0x7036, 0x0078, 0x3bce, 0x7040,
-        0xa086, 0x0001, 0x0040, 0x2492, 0x0078, 0x2459, 0x2031, 0x0000,
-        0x691c, 0xa184, 0x0002, 0x0040, 0x3bd7, 0xa6b5, 0x0004, 0xa184,
-        0x00c0, 0x8003, 0x8003, 0x8007, 0xa080, 0x3cc2, 0x2004, 0xa635,
-        0x6820, 0xa084, 0x0400, 0x0040, 0x3bef, 0x789b, 0x0018, 0x78ab,
-        0x0003, 0x789b, 0x0081, 0x78ab, 0x0001, 0xa6b5, 0x1000, 0x6820,
-        0xa084, 0x8000, 0x00c0, 0x3bfd, 0x681c, 0xa084, 0x8000, 0x00c0,
-        0x3c04, 0xa6b5, 0x0800, 0x0078, 0x3c04, 0xa6b5, 0x0400, 0x789b,
-        0x000e, 0x6824, 0x8007, 0x78aa, 0x6820, 0xa084, 0x0100, 0x0040,
-        0x3c0b, 0xa6b5, 0x4000, 0xa684, 0x0200, 0x0040, 0x3c25, 0x682c,
-        0x78d2, 0x6830, 0x78d6, 0xa684, 0x0100, 0x0040, 0x3c23, 0x682c,
-        0xa084, 0x0001, 0x0040, 0x3c23, 0x7888, 0xa084, 0x0040, 0x0040,
-        0x3c23, 0xa6b5, 0x8000, 0x1078, 0x46f0, 0x7e5a, 0x6eb6, 0x0078,
-        0x4727, 0x1078, 0x38fa, 0x00c0, 0x3cbc, 0x702c, 0x8004, 0x0048,
-        0x3c37, 0x2019, 0x4e3b, 0x1078, 0x2276, 0x702f, 0x0001, 0x2041,
-        0x0001, 0x2031, 0x1000, 0x789b, 0x0018, 0x6814, 0xa084, 0x001f,
-        0xa085, 0x0080, 0x78aa, 0x691c, 0xa184, 0x0002, 0x0040, 0x3c50,
-        0xa6b5, 0x0004, 0x78ab, 0x0020, 0x6828, 0x78aa, 0xa8c0, 0x0002,
-        0x681c, 0xd0f4, 0x0040, 0x3c59, 0x2c50, 0x1078, 0x39ac, 0x1078,
-        0x45ff, 0x6820, 0xa084, 0x8000, 0x0040, 0x3c67, 0xa6b5, 0x0400,
-        0x789b, 0x000e, 0x6824, 0x8007, 0x78aa, 0x0078, 0x3c6e, 0x681c,
-        0xa084, 0x8000, 0x00c0, 0x3c6e, 0xa6b5, 0x0800, 0x6820, 0xa084,
-        0x0100, 0x0040, 0x3c75, 0xa6b5, 0x4000, 0x681c, 0xa084, 0x00c0,
-        0x8003, 0x8003, 0x8007, 0xa080, 0x3cc2, 0x2004, 0xa635, 0xa684,
-        0x0100, 0x0040, 0x3c8f, 0x682c, 0xa084, 0x0001, 0x0040, 0x3c8f,
-        0x7888, 0xa084, 0x0040, 0x0040, 0x3c8f, 0xa6b5, 0x8000, 0x789b,
-        0x007e, 0x7eae, 0x6eb6, 0x6814, 0x8007, 0x78aa, 0x7882, 0x2810,
-        0x7aaa, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x3cbc, 0x0018, 0x3cbc,
-        0x70b4, 0xa080, 0x00e2, 0x781a, 0x1078, 0x3912, 0xa684, 0x0200,
-        0x0040, 0x3cb0, 0x682c, 0x78d2, 0x6830, 0x78d6, 0x1078, 0x46f0,
-        0x2d00, 0x70a2, 0x704a, 0x6810, 0x70be, 0x7003, 0x0007, 0xad80,
-        0x000f, 0x7036, 0x0078, 0x2459, 0x1078, 0x1b62, 0x1078, 0x3912,
-        0x0078, 0x2459, 0x0000, 0x0300, 0x0200, 0x0000, 0x1078, 0x23eb,
-        0x2300, 0x0079, 0x3ccb, 0x3cce, 0x3cce, 0x3cd0, 0x1078, 0x23eb,
-        0x1078, 0x46ff, 0x6924, 0xa184, 0x00ff, 0xa086, 0x000a, 0x0040,
-        0x3ce2, 0xa184, 0xff00, 0xa085, 0x000a, 0x6826, 0x1078, 0x1b62,
-        0x0078, 0x3b96, 0x2001, 0x000a, 0x1078, 0x4691, 0x0078, 0x3b96,
-        0xa282, 0x0005, 0x0050, 0x3cee, 0x1078, 0x23eb, 0x7000, 0xa084,
-        0x0007, 0x10c0, 0x39be, 0x1078, 0x1937, 0x00c0, 0x3d0d, 0xa684,
-        0x0004, 0x0040, 0x3cff, 0x2001, 0x2800, 0x0078, 0x3d01, 0x2001,
-        0x0800, 0x71b4, 0xa188, 0x0091, 0x789b, 0x000e, 0x78aa, 0x2031,
-        0x0400, 0x7e5a, 0x791a, 0x0078, 0x2459, 0x6807, 0x0106, 0x680b,
-        0x0000, 0x689f, 0x0000, 0x6827, 0x0000, 0xa386, 0x0002, 0x00c0,
-        0x3d2e, 0xa286, 0x0002, 0x00c0, 0x3d2e, 0x78a0, 0xa005, 0x00c0,
-        0x3d2e, 0xa484, 0x8000, 0x00c0, 0x3d2e, 0x78e4, 0xa084, 0x0008,
-        0x0040, 0x3d2e, 0xa6b5, 0x0008, 0x2019, 0x0000, 0x1078, 0x411e,
-        0x2d00, 0x70a2, 0x704a, 0x7003, 0x0007, 0x7037, 0x0000, 0x6824,
-        0xa084, 0x0080, 0x0040, 0x3d40, 0x1078, 0x41d0, 0x0078, 0x2459,
-        0x2300, 0x0079, 0x3d43, 0x3d46, 0x3dc7, 0x3de6, 0x2200, 0x0079,
-        0x3d49, 0x3d4e, 0x3d5e, 0x3d84, 0x3d90, 0x3db3, 0x2029, 0x0001,
-        0xa026, 0x2011, 0x0000, 0x1078, 0x42f1, 0x0079, 0x3d57, 0x3d5c,
-        0x2459, 0x3b96, 0x3d5c, 0x3d5c, 0x1078, 0x23eb, 0x7990, 0xa18c,
-        0x0007, 0x00c0, 0x3d65, 0x2009, 0x0008, 0x2011, 0x0001, 0xa684,
-        0x0004, 0x0040, 0x3d6d, 0x2011, 0x0003, 0x2220, 0xa12a, 0x2011,
-        0x0001, 0x1078, 0x42f1, 0x0079, 0x3d75, 0x3d7a, 0x2459, 0x3b96,
-        0x3d82, 0x3d7c, 0x0078, 0x472d, 0x70ab, 0x3d80, 0x0078, 0x2459,
-        0x0078, 0x3d7a, 0x1078, 0x23eb, 0xa684, 0x0010, 0x0040, 0x3d8e,
-        0x1078, 0x419f, 0x0040, 0x3d8e, 0x0078, 0x2459, 0x0078, 0x420c,
-        0x6000, 0xa084, 0x0002, 0x0040, 0x3dad, 0x70b4, 0xa080, 0x00d2,
-        0x781a, 0x0d7e, 0x1078, 0x4708, 0x2d00, 0x682e, 0x6827, 0x0000,
-        0x1078, 0x3af8, 0x0d7f, 0x1078, 0x195a, 0x7003, 0x0000, 0x7037,
-        0x0000, 0x704b, 0x0000, 0x0078, 0x3b96, 0xa684, 0x0004, 0x00c0,
-        0x3db3, 0x0078, 0x472d, 0x6000, 0xa084, 0x0004, 0x00c0, 0x3dc5,
-        0x6000, 0xa084, 0x0001, 0x0040, 0x3dc5, 0x70ab, 0x3dc5, 0x2001,
-        0x0007, 0x1078, 0x4689, 0x0078, 0x4733, 0x0078, 0x472d, 0x2200,
-        0x0079, 0x3dca, 0x3dcf, 0x3dcf, 0x3dcf, 0x3dd1, 0x3dcf, 0x1078,
-        0x23eb, 0x70a7, 0x3dd5, 0x0078, 0x4739, 0x2011, 0x0018, 0x1078,
-        0x42eb, 0x0079, 0x3ddb, 0x3de0, 0x2459, 0x3b96, 0x3de2, 0x3de4,
-        0x1078, 0x23eb, 0x1078, 0x23eb, 0x1078, 0x23eb, 0x2200, 0x0079,
-        0x3de9, 0x3dee, 0x3df0, 0x3df0, 0x3dee, 0x3dee, 0x1078, 0x23eb,
-        0x78e4, 0xa084, 0x0008, 0x0040, 0x3e05, 0x70a7, 0x3df9, 0x0078,
-        0x4739, 0x2011, 0x0004, 0x1078, 0x42eb, 0x0079, 0x3dff, 0x3e05,
-        0x2459, 0x3b96, 0x3e05, 0x3e0f, 0x3e13, 0x70ab, 0x3e0d, 0x2001,
-        0x0003, 0x1078, 0x4689, 0x0078, 0x4733, 0x0078, 0x472d, 0x70ab,
-        0x3e05, 0x0078, 0x2459, 0x70ab, 0x3e17, 0x0078, 0x2459, 0x0078,
-        0x3e0d, 0xa282, 0x0003, 0x0050, 0x3e1f, 0x1078, 0x23eb, 0xa386,
-        0x0002, 0x00c0, 0x3e38, 0xa286, 0x0002, 0x00c0, 0x3e3e, 0x78a0,
-        0xa005, 0x00c0, 0x3e3e, 0xa484, 0x8000, 0x00c0, 0x3e3e, 0x78e4,
-        0xa084, 0x0008, 0x0040, 0x3e38, 0xa6b5, 0x0008, 0x2019, 0x0000,
-        0xa684, 0x0008, 0x0040, 0x3e3e, 0x1078, 0x417c, 0x6810, 0x70be,
-        0x7003, 0x0007, 0x2300, 0x0079, 0x3e45, 0x3e48, 0x3e75, 0x3e7d,
-        0x2200, 0x0079, 0x3e4b, 0x3e50, 0x3e4e, 0x3e69, 0x1078, 0x23eb,
-        0x7990, 0xa1ac, 0x0007, 0xa026, 0x2011, 0x0001, 0x1078, 0x42f1,
-        0x0079, 0x3e5a, 0x3e5f, 0x2459, 0x3b96, 0x3e67, 0x3e61, 0x0078,
-        0x472d, 0x70ab, 0x3e65, 0x0078, 0x2459, 0x0078, 0x3e5f, 0x1078,
-        0x23eb, 0xa684, 0x0010, 0x0040, 0x3e73, 0x1078, 0x419f, 0x0040,
-        0x3e73, 0x0078, 0x2459, 0x0078, 0x420c, 0x2200, 0x0079, 0x3e78,
-        0x3e7b, 0x3e7b, 0x3e7b, 0x1078, 0x23eb, 0x2200, 0x0079, 0x3e80,
-        0x3e83, 0x3e85, 0x3e85, 0x1078, 0x23eb, 0x78e4, 0xa084, 0x0008,
-        0x0040, 0x3e9a, 0x70a7, 0x3e8e, 0x0078, 0x4739, 0x2011, 0x0004,
-        0x1078, 0x42eb, 0x0079, 0x3e94, 0x3e9a, 0x2459, 0x3b96, 0x3e9a,
-        0x3ea4, 0x3ea8, 0x70ab, 0x3ea2, 0x2001, 0x0003, 0x1078, 0x4689,
-        0x0078, 0x4733, 0x0078, 0x472d, 0x70ab, 0x3e9a, 0x0078, 0x2459,
-        0x70ab, 0x3eac, 0x0078, 0x2459, 0x0078, 0x3ea2, 0x2300, 0x0079,
-        0x3eb1, 0x3eb6, 0x3eb8, 0x3eb4, 0x1078, 0x23eb, 0x70a4, 0x007a,
-        0x70a4, 0x007a, 0xa282, 0x0002, 0x0050, 0x3ec0, 0x1078, 0x23eb,
-        0xa684, 0x0200, 0x0040, 0x3eca, 0x1078, 0x46f8, 0x1078, 0x42d3,
-        0x1078, 0x46ff, 0x2300, 0x0079, 0x3ecd, 0x3ed0, 0x3ef4, 0x3f5a,
-        0xa286, 0x0001, 0x0040, 0x3ed6, 0x1078, 0x23eb, 0xa684, 0x0200,
-        0x0040, 0x3ede, 0x1078, 0x46f8, 0x1078, 0x46ff, 0x2001, 0x0001,
-        0x1078, 0x4691, 0x78b8, 0xa084, 0xc001, 0x0040, 0x3ef0, 0x7848,
-        0xa085, 0x0008, 0x784a, 0x7848, 0xa084, 0x0008, 0x00c0, 0x3eeb,
-        0x7003, 0x0000, 0x0078, 0x3b96, 0x2200, 0x0079, 0x3ef7, 0x3ef9,
-        0x3f2a, 0x70a7, 0x3efd, 0x0078, 0x4739, 0x2011, 0x000d, 0x1078,
-        0x42eb, 0x0079, 0x3f03, 0x3f0a, 0x2459, 0x3b96, 0x3f12, 0x3f1a,
-        0x3f20, 0x3f22, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x0078, 0x4727, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x0078, 0x4727, 0x70ab, 0x3f1e, 0x0078, 0x2459, 0x0078, 0x3f0a,
-        0x1078, 0x23eb, 0x70ab, 0x3f26, 0x0078, 0x2459, 0x1078, 0x473f,
-        0x0078, 0x2459, 0x70a7, 0x3f2e, 0x0078, 0x4739, 0x2011, 0x0012,
-        0x1078, 0x42eb, 0x0079, 0x3f34, 0x3f3a, 0x2459, 0x3b96, 0x3f46,
-        0x3f4e, 0x3f54, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
-        0x70b4, 0xa080, 0x00a6, 0x781a, 0x0078, 0x2459, 0xa6b4, 0x00ff,
-        0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x0078, 0x4727, 0x70ab, 0x3f52,
-        0x0078, 0x2459, 0x0078, 0x3f3a, 0x70ab, 0x3f58, 0x0078, 0x2459,
-        0x0078, 0x3f46, 0xa286, 0x0001, 0x0040, 0x3f60, 0x1078, 0x23eb,
-        0x70a7, 0x3f64, 0x0078, 0x4739, 0x2011, 0x0015, 0x1078, 0x42eb,
-        0x0079, 0x3f6a, 0x3f6f, 0x2459, 0x3b96, 0x3f7d, 0x3f89, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x783b, 0x1301, 0x70b4,
-        0xa080, 0x00b4, 0x781a, 0x0078, 0x2459, 0xa6b4, 0x00ff, 0xa6b5,
-        0x0400, 0x6eb6, 0x7e5a, 0x70b4, 0xa080, 0x00a6, 0x781a, 0x0078,
-        0x2459, 0x70ab, 0x3f8d, 0x0078, 0x2459, 0x0078, 0x3f6f, 0xa282,
-        0x0003, 0x0050, 0x3f95, 0x1078, 0x23eb, 0x2300, 0x0079, 0x3f98,
-        0x3f9b, 0x3fd2, 0x402d, 0xa286, 0x0001, 0x0040, 0x3fa1, 0x1078,
-        0x23eb, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x3fae,
-        0x1078, 0x3af8, 0x7003, 0x0000, 0x0078, 0x3b96, 0x683b, 0x0000,
-        0x6837, 0x0000, 0xa684, 0x0200, 0x0040, 0x3fbc, 0x1078, 0x46f8,
-        0x1078, 0x42d3, 0x1078, 0x46ff, 0x2001, 0x0001, 0x1078, 0x4691,
-        0x78b8, 0xa084, 0xc001, 0x0040, 0x3fce, 0x7848, 0xa085, 0x0008,
-        0x784a, 0x7848, 0xa084, 0x0008, 0x00c0, 0x3fc9, 0x7003, 0x0000,
-        0x0078, 0x3b96, 0x2200, 0x0079, 0x3fd5, 0x3fd7, 0x4008, 0x70a7,
-        0x3fdb, 0x0078, 0x4739, 0x2011, 0x000d, 0x1078, 0x42eb, 0x0079,
-        0x3fe1, 0x3fe8, 0x2459, 0x3b96, 0x3ff0, 0x3ff8, 0x3ffe, 0x4000,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4727,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4727,
-        0x70ab, 0x3ffc, 0x0078, 0x2459, 0x0078, 0x3fe8, 0x1078, 0x23eb,
-        0x70ab, 0x4004, 0x0078, 0x2459, 0x1078, 0x473f, 0x0078, 0x2459,
-        0x70a7, 0x400c, 0x0078, 0x4739, 0x2011, 0x0005, 0x1078, 0x42eb,
-        0x0079, 0x4012, 0x4017, 0x2459, 0x3b96, 0x401f, 0x4027, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4727, 0xa6b4,
-        0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4727, 0x70ab,
-        0x402b, 0x0078, 0x2459, 0x0078, 0x4017, 0xa286, 0x0001, 0x0040,
-        0x4033, 0x1078, 0x23eb, 0x70a7, 0x4037, 0x0078, 0x4739, 0x2011,
-        0x0006, 0x1078, 0x42eb, 0x0079, 0x403d, 0x4042, 0x2459, 0x3b96,
-        0x4048, 0x4052, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4727,
-        0xa6b4, 0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0xa6b5, 0x4000, 0x7e5a,
-        0x0078, 0x4727, 0x70ab, 0x4056, 0x0078, 0x2459, 0x0078, 0x4042,
-        0x2300, 0x0079, 0x405b, 0x4060, 0x405e, 0x405e, 0x1078, 0x23eb,
-        0x1078, 0x23eb, 0x2300, 0x71a8, 0xa005, 0x017a, 0x6810, 0x70be,
-        0xa282, 0x0003, 0x0050, 0x406e, 0x1078, 0x23eb, 0x2300, 0x0079,
-        0x4071, 0x4074, 0x4082, 0x40a4, 0xa684, 0x0200, 0x0040, 0x407c,
-        0x1078, 0x46f8, 0x1078, 0x46ff, 0x2001, 0x0001, 0x1078, 0x4691,
-        0x0078, 0x2459, 0xa296, 0x0002, 0x0040, 0x408b, 0x82ff, 0x0040,
-        0x408b, 0x1078, 0x23eb, 0x70a7, 0x408f, 0x0078, 0x4739, 0x2011,
-        0x0018, 0x1078, 0x42eb, 0x0079, 0x4095, 0x409a, 0x2459, 0x3b96,
-        0x409c, 0x409e, 0x0078, 0x4727, 0x0078, 0x4727, 0x70ab, 0x40a2,
-        0x0078, 0x2459, 0x0078, 0x409a, 0x2200, 0x0079, 0x40a7, 0x40a9,
-        0x40c2, 0x70a7, 0x40ad, 0x0078, 0x4739, 0x2011, 0x0017, 0x1078,
-        0x42eb, 0x0079, 0x40b3, 0x40b8, 0x2459, 0x3b96, 0x40ba, 0x40bc,
-        0x0078, 0x4727, 0x0078, 0x4727, 0x70ab, 0x40c0, 0x0078, 0x2459,
-        0x0078, 0x40b8, 0xa484, 0x8000, 0x00c0, 0x410c, 0xa684, 0x0100,
-        0x0040, 0x40d6, 0x1078, 0x46f8, 0x1078, 0x42d3, 0x1078, 0x46ff,
-        0x7848, 0xa085, 0x000c, 0x784a, 0x0078, 0x40da, 0x78d8, 0x78d2,
-        0x78dc, 0x78d6, 0xa6b4, 0xefff, 0x7e5a, 0x70a7, 0x40e1, 0x0078,
-        0x4739, 0x2011, 0x000d, 0x1078, 0x42eb, 0x0079, 0x40e7, 0x40ee,
-        0x2459, 0x3b96, 0x40ee, 0x40fc, 0x4102, 0x4104, 0xa684, 0x0100,
-        0x0040, 0x40fa, 0x1078, 0x46b6, 0x682c, 0x78d2, 0x6830, 0x78d6,
-        0x1078, 0x46f0, 0x0078, 0x4727, 0x70ab, 0x4100, 0x0078, 0x2459,
-        0x0078, 0x40ee, 0x1078, 0x23eb, 0x70ab, 0x4108, 0x0078, 0x2459,
-        0x1078, 0x473f, 0x0078, 0x2459, 0x1078, 0x46ff, 0x70ab, 0x4116,
-        0x2001, 0x0003, 0x1078, 0x4689, 0x0078, 0x4733, 0x1078, 0x46f0,
-        0x682c, 0x78d2, 0x6830, 0x78d6, 0x0078, 0x4727, 0x70b8, 0x6812,
-        0x70be, 0x8000, 0x70ba, 0x681b, 0x0000, 0xa684, 0x0008, 0x0040,
-        0x4141, 0x157e, 0x137e, 0x147e, 0x7890, 0x8004, 0x8004, 0x8004,
-        0x8004, 0xa084, 0x000f, 0x681a, 0x80ac, 0x789b, 0x0000, 0xaf80,
-        0x002b, 0x2098, 0xad80, 0x000b, 0x20a0, 0x53a5, 0x147f, 0x137f,
-        0x157f, 0xa6c4, 0x0f00, 0xa684, 0x0002, 0x00c0, 0x4150, 0x692c,
-        0x810d, 0x810d, 0x810d, 0xa184, 0x0007, 0x2008, 0x0078, 0x415f,
-        0x789b, 0x0010, 0x79ac, 0xa184, 0x0020, 0x0040, 0x415f, 0x017e,
-        0x2009, 0x0005, 0x2001, 0x3d00, 0x1078, 0x46c1, 0x017f, 0xa184,
-        0x001f, 0xa805, 0x6816, 0x1078, 0x3b69, 0x68be, 0xa684, 0x0004,
-        0x0040, 0x4170, 0xa18c, 0xff00, 0x78a8, 0xa084, 0x00ff, 0xa105,
-        0x682a, 0xa6b4, 0x00ff, 0x6000, 0xa084, 0x0008, 0x0040, 0x417a,
-        0xa6b5, 0x4000, 0x6eb6, 0x007c, 0x157e, 0x137e, 0x147e, 0x6918,
-        0x7890, 0x8004, 0x8004, 0x8004, 0x8004, 0xa084, 0x000f, 0x007e,
-        0xa100, 0x681a, 0x007f, 0x8000, 0x8004, 0x0040, 0x419b, 0x20a8,
-        0x8104, 0xa080, 0x000b, 0xad00, 0x20a0, 0x789b, 0x0000, 0xaf80,
-        0x002b, 0x2098, 0x53a5, 0x147f, 0x137f, 0x157f, 0x007c, 0x682c,
-        0xa084, 0x0020, 0x00c0, 0x41a7, 0x620c, 0x0078, 0x41a8, 0x6210,
-        0x6b18, 0x2300, 0xa202, 0x0040, 0x41c8, 0x2018, 0xa382, 0x000e,
-        0x0048, 0x41b8, 0x0040, 0x41b8, 0x2019, 0x000e, 0x0078, 0x41bc,
-        0x7858, 0xa084, 0xffef, 0x785a, 0x783b, 0x1b01, 0x7893, 0x0000,
-        0x7ba2, 0x70b4, 0xa080, 0x008e, 0x781a, 0xa085, 0x0001, 0x007c,
-        0x7858, 0xa084, 0xffef, 0x785a, 0x7893, 0x0000, 0xa006, 0x007c,
-        0x6904, 0xa18c, 0x00ff, 0xa196, 0x0007, 0x0040, 0x41dd, 0xa196,
-        0x000f, 0x0040, 0x41dd, 0x6807, 0x0117, 0x6914, 0x1078, 0x3b69,
-        0x6100, 0x8104, 0x00c8, 0x41f8, 0x601c, 0xa005, 0x0040, 0x41ec,
-        0x2001, 0x0800, 0x0078, 0x41fa, 0x0d7e, 0x6824, 0x007e, 0x1078,
-        0x4708, 0x007f, 0x6826, 0x2d00, 0x682e, 0x1078, 0x3af8, 0x0d7f,
-        0x2001, 0x0200, 0x6826, 0x8007, 0x789b, 0x000e, 0x78aa, 0x6820,
-        0xa085, 0x8000, 0x6822, 0x2031, 0x0400, 0x6eb6, 0x7e5a, 0x71b4,
-        0xa188, 0x0091, 0x791a, 0x007c, 0xa6c4, 0x0f00, 0xa684, 0x0002,
-        0x00c0, 0x4220, 0x692c, 0x810d, 0x810d, 0x810d, 0xa184, 0x0007,
-        0x2008, 0xa805, 0x6816, 0x1078, 0x3b69, 0x68be, 0x0078, 0x4223,
-        0x6914, 0x1078, 0x3b69, 0x6100, 0x8104, 0x00c8, 0x4280, 0xa184,
-        0x0300, 0x0040, 0x422f, 0x6807, 0x0117, 0x0078, 0x424d, 0x6004,
-        0xa005, 0x00c0, 0x4256, 0x6807, 0x0117, 0x601c, 0xa005, 0x00c0,
-        0x4243, 0x0d7e, 0x1078, 0x4708, 0x6827, 0x0034, 0x2d00, 0x682e,
-        0x1078, 0x3af8, 0x0d7f, 0xa684, 0x0004, 0x0040, 0x424d, 0x2031,
-        0x0400, 0x2001, 0x2800, 0x0078, 0x4251, 0x2031, 0x0400, 0x2001,
-        0x0800, 0x71b4, 0xa188, 0x0091, 0x0078, 0x42ae, 0x6018, 0xa005,
-        0x00c0, 0x4243, 0x601c, 0xa005, 0x00c0, 0x4243, 0x689f, 0x0000,
-        0x6827, 0x003d, 0xa684, 0x0001, 0x0040, 0x42bc, 0xd694, 0x00c0,
-        0x4279, 0x6100, 0xd1d4, 0x0040, 0x4279, 0x692c, 0x81ff, 0x0040,
-        0x42bc, 0xa186, 0x0003, 0x0040, 0x42bc, 0xa186, 0x0012, 0x0040,
-        0x42bc, 0xa6b5, 0x0800, 0x71b4, 0xa188, 0x00af, 0x0078, 0x42b7,
-        0x6807, 0x0117, 0x2031, 0x0400, 0x692c, 0xa18c, 0x00ff, 0xa186,
-        0x0012, 0x00c0, 0x4291, 0x2001, 0x42c9, 0x2009, 0x0001, 0x0078,
-        0x42a2, 0xa186, 0x0003, 0x00c0, 0x429b, 0x2001, 0x42ca, 0x2009,
-        0x0012, 0x0078, 0x42a2, 0x2001, 0x0200, 0x71b4, 0xa188, 0x0091,
-        0x0078, 0x42ae, 0x1078, 0x46db, 0x78a3, 0x0000, 0x681c, 0xa085,
-        0x0040, 0x681e, 0x71b4, 0xa188, 0x00df, 0xa006, 0x6826, 0x8007,
-        0x789b, 0x000e, 0x78aa, 0x6820, 0xa085, 0x8000, 0x6822, 0x6eb6,
-        0x7e5a, 0x791a, 0x0078, 0x2459, 0x6eb6, 0x1078, 0x3af8, 0x6810,
-        0x70be, 0x7003, 0x0007, 0x70a3, 0x0000, 0x704b, 0x0000, 0x0078,
-        0x2459, 0x0023, 0x0070, 0x0005, 0x0000, 0x0a00, 0x0000, 0x0000,
-        0x0025, 0x0000, 0x0000, 0x683b, 0x0000, 0x6837, 0x0000, 0xa684,
-        0x0200, 0x0040, 0x42ea, 0x78b8, 0xa08c, 0x001f, 0xa084, 0x8000,
-        0x0040, 0x42e3, 0x8108, 0x78d8, 0xa100, 0x6836, 0x78dc, 0xa081,
-        0x0000, 0x683a, 0x007c, 0x7990, 0x810f, 0xa5ac, 0x0007, 0x2021,
-        0x0000, 0xa480, 0x0010, 0x789a, 0x79a8, 0xa18c, 0x00ff, 0xa184,
-        0x0080, 0x00c0, 0x4319, 0xa182, 0x0020, 0x00c8, 0x4337, 0xa182,
-        0x0012, 0x00c8, 0x467b, 0x2100, 0x1079, 0x4307, 0x007c, 0x467b,
-        0x44e8, 0x467b, 0x467b, 0x4344, 0x4347, 0x4381, 0x43b7, 0x43eb,
-        0x43ee, 0x467b, 0x467b, 0x43a2, 0x4412, 0x444c, 0x467b, 0x467b,
-        0x4473, 0xa184, 0x0020, 0x00c0, 0x44a7, 0xa18c, 0x001f, 0x6814,
-        0xa084, 0x001f, 0xa106, 0x0040, 0x4334, 0x70b4, 0xa080, 0x00d2,
-        0x781a, 0x2001, 0x0014, 0x1078, 0x4691, 0x1078, 0x46ff, 0x7003,
-        0x0000, 0x2001, 0x0002, 0x007c, 0x2001, 0x0000, 0x007c, 0xa182,
-        0x0024, 0x00c8, 0x467b, 0xa184, 0x0003, 0x1079, 0x4307, 0x007c,
-        0x467b, 0x467b, 0x467b, 0x467b, 0x1078, 0x467b, 0x007c, 0x2200,
-        0x0079, 0x434a, 0x4476, 0x4476, 0x436e, 0x436e, 0x436e, 0x436e,
-        0x436e, 0x436e, 0x436e, 0x436e, 0x436c, 0x436e, 0x4363, 0x436e,
-        0x436e, 0x436e, 0x436e, 0x436e, 0x4376, 0x4379, 0x4476, 0x4379,
-        0x436e, 0x436e, 0x436e, 0x0c7e, 0x077e, 0x6f14, 0x1078, 0x36e2,
-        0x077f, 0x0c7f, 0x0078, 0x436e, 0x1078, 0x458b, 0x6827, 0x02b3,
-        0x2009, 0x000b, 0x2001, 0x4800, 0x0078, 0x44aa, 0x1078, 0x4670,
-        0x007c, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001, 0x4800, 0x0078,
-        0x4492, 0x2d58, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,
-        0x438b, 0x6807, 0x0117, 0x6827, 0x0002, 0x1078, 0x4708, 0x6827,
-        0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078, 0x3ac8, 0x1078,
-        0x44d0, 0x2b68, 0x1078, 0x3af8, 0x0d7f, 0x1078, 0x3af8, 0x2001,
-        0x0002, 0x007c, 0x1078, 0x44d0, 0x2001, 0x0017, 0x1078, 0x4691,
-        0x70a3, 0x0000, 0x2009, 0x5138, 0x200b, 0x0006, 0x70af, 0x0017,
-        0x2009, 0x0200, 0x1078, 0x3a06, 0x2001, 0x0001, 0x007c, 0x2200,
-        0x0079, 0x43ba, 0x4476, 0x44a7, 0x44a7, 0x44a7, 0x43db, 0x44b7,
-        0x43e3, 0x44b7, 0x44b7, 0x44ba, 0x44ba, 0x44bf, 0x44bf, 0x43d3,
-        0x43d3, 0x44a7, 0x44a7, 0x44b7, 0x44a7, 0x43e3, 0x4476, 0x43e3,
-        0x43e3, 0x43e3, 0x43e3, 0x6827, 0x0084, 0x2009, 0x000b, 0x2001,
-        0x4300, 0x0078, 0x44c9, 0x6827, 0x000d, 0x2009, 0x000b, 0x2001,
-        0x4300, 0x0078, 0x44aa, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001,
-        0x4300, 0x0078, 0x4492, 0x2001, 0x0000, 0x007c, 0x2200, 0x0079,
-        0x43f1, 0x4476, 0x440a, 0x440a, 0x440a, 0x440a, 0x44b7, 0x44b7,
-        0x44b7, 0x44b7, 0x44b7, 0x44b7, 0x44b7, 0x44b7, 0x440a, 0x440a,
-        0x440a, 0x440a, 0x44b7, 0x440a, 0x440a, 0x44b7, 0x44b7, 0x44b7,
-        0x44b7, 0x4476, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001, 0x4300,
-        0x0078, 0x4492, 0xa684, 0x0004, 0x00c0, 0x4426, 0x6804, 0xa084,
-        0x00ff, 0xa086, 0x0006, 0x00c0, 0x467b, 0x1078, 0x44d0, 0x6807,
-        0x0117, 0x1078, 0x3af8, 0x2001, 0x0002, 0x007c, 0x6000, 0xa084,
-        0x0004, 0x0040, 0x467b, 0x2d58, 0x6804, 0xa084, 0x00ff, 0xa086,
-        0x0006, 0x00c0, 0x4435, 0x6807, 0x0117, 0x6827, 0x0002, 0x1078,
-        0x4708, 0x6827, 0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078,
-        0x3ad7, 0x1078, 0x44d0, 0x2b68, 0x1078, 0x3af8, 0x0d7f, 0x1078,
-        0x3af8, 0x2001, 0x0002, 0x007c, 0x6000, 0xa084, 0x0004, 0x0040,
-        0x467b, 0x2d58, 0x6a04, 0xa294, 0x00ff, 0xa286, 0x0006, 0x00c0,
-        0x445b, 0x6807, 0x0117, 0x6827, 0x0002, 0x2d58, 0x1078, 0x4708,
-        0x6827, 0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078, 0x3ae7,
-        0x1078, 0x44d0, 0x2b68, 0x1078, 0x3af8, 0x0d7f, 0x1078, 0x3af8,
-        0x2001, 0x0002, 0x007c, 0x1078, 0x467b, 0x007c, 0x70b4, 0xa080,
-        0x00d2, 0x781a, 0x2001, 0x0001, 0x1078, 0x4691, 0x1078, 0x46ff,
-        0x7003, 0x0000, 0x2001, 0x0002, 0x007c, 0x1078, 0x46c1, 0x1078,
-        0x46f8, 0x1078, 0x42d3, 0x1078, 0x41d0, 0x1078, 0x46ff, 0x2001,
-        0x0001, 0x007c, 0x1078, 0x46c1, 0x1078, 0x46f8, 0x1078, 0x42d3,
-        0x70b4, 0xa080, 0x00d2, 0x781a, 0x2001, 0x0013, 0x1078, 0x4691,
-        0x1078, 0x46ff, 0x7003, 0x0000, 0x2001, 0x0002, 0x007c, 0x1078,
-        0x467b, 0x007c, 0x1078, 0x46c1, 0x1078, 0x46f8, 0x1078, 0x42d3,
-        0x1078, 0x41d0, 0x1078, 0x46ff, 0x2001, 0x0001, 0x007c, 0x2001,
-        0x0003, 0x007c, 0x1078, 0x458b, 0x2001, 0x0000, 0x007c, 0x0c7e,
-        0x077e, 0x6f14, 0x1078, 0x36e2, 0x077f, 0x0c7f, 0x2001, 0x0000,
-        0x007c, 0x1078, 0x46c1, 0x1078, 0x467b, 0x2001, 0x0006, 0x007c,
-        0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x44db, 0xa186,
-        0x000f, 0x00c0, 0x44df, 0x1078, 0x46f8, 0x1078, 0x42d3, 0x70b4,
-        0xa080, 0x00d2, 0x781a, 0x1078, 0x46ff, 0x7003, 0x0000, 0x007c,
-        0x7aa8, 0xa294, 0x00ff, 0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0004,
-        0x00c8, 0x467b, 0x1079, 0x44f5, 0x007c, 0x467b, 0x44f9, 0x467b,
-        0x4592, 0xa282, 0x0003, 0x0040, 0x4500, 0x1078, 0x467b, 0x007c,
-        0x7da8, 0xa5ac, 0x00ff, 0x7ca8, 0xa4a4, 0x00ff, 0x69b8, 0xa184,
-        0x0100, 0x0040, 0x453f, 0xa18c, 0xfeff, 0x69ba, 0x78a0, 0xa005,
-        0x00c0, 0x453f, 0xa4a4, 0x00ff, 0x0040, 0x4533, 0xa482, 0x000c,
-        0x0040, 0x451c, 0x00c8, 0x4526, 0x852b, 0x852b, 0x1078, 0x3760,
-        0x0040, 0x4526, 0x1078, 0x355b, 0x0078, 0x4535, 0x1078, 0x465d,
-        0x1078, 0x3586, 0x69b8, 0xa18d, 0x0100, 0x69ba, 0xa6b5, 0x1000,
-        0x7e5a, 0x0078, 0x4538, 0x1078, 0x3586, 0xa6b4, 0xefff, 0x7e5a,
-        0x70b4, 0xa080, 0x0091, 0x781a, 0x2001, 0x0001, 0x007c, 0x0c7e,
-        0x1078, 0x457f, 0x6200, 0xd2e4, 0x0040, 0x4570, 0x6208, 0x8217,
-        0xa294, 0x00ff, 0xa282, 0x000c, 0x0048, 0x4552, 0x0040, 0x4552,
-        0x2011, 0x000c, 0x2400, 0xa202, 0x00c8, 0x4557, 0x2220, 0x6208,
-        0xa294, 0x00ff, 0x701c, 0xa202, 0x00c8, 0x455f, 0x721c, 0x2200,
-        0xa502, 0x00c8, 0x4564, 0x2228, 0x1078, 0x4661, 0x852b, 0x852b,
-        0x1078, 0x3760, 0x0040, 0x4570, 0x1078, 0x3562, 0x0078, 0x4574,
-        0x1078, 0x465d, 0x1078, 0x358d, 0xa6b5, 0x1000, 0x7e5a, 0x70b4,
-        0xa080, 0x00be, 0x781a, 0x2001, 0x0004, 0x0c7f, 0x007c, 0x007e,
-        0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa0e0,
-        0x5380, 0x007f, 0x007c, 0x0c7e, 0x1078, 0x457f, 0x1078, 0x358d,
-        0x0c7f, 0x007c, 0xa282, 0x0002, 0x00c0, 0x467b, 0x7aa8, 0xa294,
-        0x00ff, 0x69b8, 0xa184, 0x0200, 0x0040, 0x45c9, 0xa18c, 0xfdff,
-        0x69ba, 0x78a0, 0xa005, 0x00c0, 0x45c9, 0xa282, 0x0002, 0x00c8,
-        0x369d, 0x1078, 0x4627, 0x1078, 0x362b, 0x1078, 0x3586, 0xa684,
-        0x0100, 0x0040, 0x45bf, 0x682c, 0xa084, 0x0001, 0x0040, 0x45bf,
-        0xc6fc, 0x7888, 0xa084, 0x0040, 0x0040, 0x45bf, 0xc6fd, 0xa6b5,
-        0x1000, 0x7e5a, 0x70b4, 0xa080, 0x0091, 0x781a, 0x2001, 0x0001,
-        0x007c, 0x0c7e, 0x1078, 0x457f, 0xa284, 0xfffe, 0x0040, 0x45d4,
-        0x2011, 0x0001, 0x0078, 0x45d8, 0xa284, 0x0001, 0x0040, 0x45de,
-        0x6100, 0xd1ec, 0x00c0, 0x45de, 0x2011, 0x0000, 0x1078, 0x4619,
-        0x1078, 0x3632, 0x1078, 0x358d, 0xa684, 0x0100, 0x0040, 0x45f4,
-        0x682c, 0xa084, 0x0001, 0x0040, 0x45f4, 0xc6fc, 0x7888, 0xa084,
-        0x0040, 0x0040, 0x45f4, 0xc6fd, 0xa6b5, 0x1000, 0x7e5a, 0x70b4,
-        0xa080, 0x00be, 0x781a, 0x2001, 0x0004, 0x0c7f, 0x007c, 0x0c7e,
-        0x2960, 0x6000, 0x2011, 0x0001, 0xa084, 0x2000, 0x00c0, 0x460a,
-        0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab, 0x0003,
-        0x7aaa, 0xa8c0, 0x0004, 0x68b8, 0xa085, 0x0200, 0x68ba, 0x0c7f,
-        0x007c, 0x789b, 0x0018, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab,
-        0x0003, 0x7aaa, 0x789b, 0x0081, 0x78ab, 0x0004, 0x007c, 0x0c7e,
-        0x7054, 0x2060, 0x6000, 0xa084, 0x1000, 0x00c0, 0x4635, 0x2029,
-        0x0032, 0x2021, 0x0000, 0x0078, 0x4655, 0x6508, 0xa5ac, 0x00ff,
-        0x7018, 0xa086, 0x0028, 0x00c0, 0x4645, 0xa582, 0x0019, 0x00c8,
-        0x464b, 0x2029, 0x0019, 0x0078, 0x464b, 0xa582, 0x000c, 0x00c8,
-        0x464b, 0x2029, 0x000c, 0x6408, 0x8427, 0xa4a4, 0x00ff, 0xa482,
-        0x000c, 0x0048, 0x4655, 0x2021, 0x000c, 0x1078, 0x4661, 0x68b8,
-        0xa085, 0x0100, 0x68ba, 0x0c7f, 0x007c, 0x2021, 0x0000, 0x2029,
-        0x0032, 0x789b, 0x0018, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab,
-        0x0001, 0x7daa, 0x7caa, 0x789b, 0x0081, 0x78ab, 0x0005, 0x007c,
-        0x2001, 0x0003, 0x1078, 0x4689, 0x70b4, 0xa080, 0x00be, 0x781a,
-        0x2001, 0x0005, 0x007c, 0x2001, 0x0007, 0x1078, 0x4689, 0xa6b5,
-        0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00be, 0x781a, 0x2001, 0x0004,
-        0x007c, 0x789b, 0x0018, 0x78aa, 0x789b, 0x0081, 0x78ab, 0x0001,
-        0x007c, 0x6904, 0xa18c, 0x00ff, 0xa196, 0x0007, 0x0040, 0x469f,
-        0xa196, 0x000f, 0x0040, 0x469f, 0x1078, 0x195a, 0x007c, 0x6924,
-        0xa194, 0x003f, 0x00c0, 0x46a8, 0xa18c, 0xffc0, 0xa105, 0x6826,
-        0x1078, 0x3af8, 0x691c, 0xa184, 0x0100, 0x0040, 0x46b5, 0x6914,
-        0x1078, 0x3b69, 0x6204, 0x8210, 0x6206, 0x007c, 0x692c, 0x6834,
-        0x682e, 0xa112, 0x6930, 0x6838, 0x6832, 0xa11b, 0xa200, 0xa301,
-        0x007c, 0x0c7e, 0xade0, 0x0018, 0x6003, 0x0070, 0x6106, 0x600b,
-        0x0000, 0x600f, 0x0a00, 0x6013, 0x0000, 0x6017, 0x0000, 0x8007,
-        0x601a, 0x601f, 0x0000, 0x6023, 0x0000, 0x0c7f, 0x6824, 0xa085,
-        0x0080, 0x6826, 0x007c, 0x157e, 0x137e, 0x147e, 0x2098, 0xaf80,
-        0x002d, 0x20a0, 0x81ac, 0x0040, 0x46e6, 0x53a6, 0xa184, 0x0001,
-        0x0040, 0x46ec, 0x3304, 0x78be, 0x147f, 0x137f, 0x157f, 0x007c,
-        0x70b0, 0xa005, 0x10c0, 0x23eb, 0x70b3, 0x8000, 0x0078, 0x4a3a,
-        0x71b0, 0x81ff, 0x0040, 0x46fe, 0x1078, 0x4b30, 0x007c, 0x71b0,
-        0x81ff, 0x0040, 0x4707, 0x70b3, 0x0000, 0x1078, 0x4776, 0x007c,
-        0x0c7e, 0x0d7e, 0x1078, 0x1937, 0x0c7f, 0x157e, 0x137e, 0x147e,
-        0x2da0, 0x2c98, 0x20a9, 0x0031, 0x53a3, 0x147f, 0x137f, 0x157f,
-        0x6807, 0x010d, 0x680b, 0x0000, 0x7004, 0x8007, 0x681a, 0x6823,
-        0x0000, 0x681f, 0x0000, 0x689f, 0x0000, 0x0c7f, 0x007c, 0x70b4,
-        0xa080, 0x0091, 0x781a, 0x0078, 0x2459, 0x70b4, 0xa080, 0x0081,
-        0x781a, 0x0078, 0x2459, 0x70b4, 0xa080, 0x00be, 0x781a, 0x0078,
-        0x2459, 0x70b4, 0xa080, 0x00c8, 0x781a, 0x0078, 0x2459, 0x6904,
-        0xa18c, 0x00ff, 0xa196, 0x0007, 0x0040, 0x474c, 0xa196, 0x000f,
-        0x0040, 0x474c, 0x6807, 0x0117, 0x2001, 0x0200, 0x6826, 0x8007,
-        0x789b, 0x000e, 0x78aa, 0x6820, 0xa085, 0x8000, 0x6822, 0x2031,
-        0x0400, 0x6eb6, 0x7e5a, 0x71b4, 0xa188, 0x0091, 0x791a, 0x007c,
-        0x1078, 0x46ff, 0x7848, 0xa085, 0x000c, 0x784a, 0x70b4, 0xa080,
-        0x00d2, 0x781a, 0x2009, 0x000b, 0x2001, 0x4400, 0x1078, 0x46c1,
-        0x2001, 0x0013, 0x1078, 0x4691, 0x0078, 0x3b96, 0x127e, 0x2091,
-        0x2200, 0x2049, 0x4776, 0x7000, 0x7204, 0xa205, 0x720c, 0xa215,
-        0x7008, 0xa084, 0xfff7, 0xa205, 0x0040, 0x4788, 0x0078, 0x478d,
-        0x7003, 0x0000, 0x127f, 0x2000, 0x007c, 0x7000, 0xa084, 0x0001,
-        0x00c0, 0x47bb, 0x7108, 0x8103, 0x00c8, 0x479a, 0x1078, 0x48bd,
-        0x0078, 0x4792, 0x700c, 0xa08c, 0x00ff, 0x0040, 0x47bb, 0x7004,
-        0x8004, 0x00c8, 0x47b2, 0x7014, 0xa005, 0x00c0, 0x47ae, 0x7010,
-        0xa005, 0x0040, 0x47b2, 0xa102, 0x00c8, 0x4792, 0x7007, 0x0010,
-        0x0078, 0x47bb, 0x8aff, 0x0040, 0x47bb, 0x1078, 0x4b07, 0x00c0,
-        0x47b5, 0x0040, 0x4792, 0x1078, 0x4846, 0x7003, 0x0000, 0x127f,
-        0x2000, 0x007c, 0x017e, 0x6104, 0xa18c, 0x00ff, 0xa186, 0x0007,
-        0x0040, 0x47ce, 0xa18e, 0x000f, 0x00c0, 0x47d1, 0x6040, 0x0078,
-        0x47d2, 0x6428, 0x017f, 0x84ff, 0x0040, 0x47fc, 0x2c70, 0x7004,
-        0xa0bc, 0x000f, 0xa7b8, 0x480c, 0x273c, 0x87fb, 0x00c0, 0x47ea,
-        0x0048, 0x47e4, 0x1078, 0x23eb, 0x609c, 0xa075, 0x0040, 0x47fc,
-        0x0078, 0x47d7, 0x2704, 0xae68, 0x6808, 0xa630, 0x680c, 0xa529,
-        0x8421, 0x0040, 0x47fc, 0x8738, 0x2704, 0xa005, 0x00c0, 0x47eb,
-        0x709c, 0xa075, 0x00c0, 0x47d7, 0x007c, 0x0000, 0x0005, 0x0009,
-        0x000d, 0x0011, 0x0015, 0x0019, 0x001d, 0x0000, 0x0003, 0x0009,
-        0x000f, 0x0015, 0x001b, 0x0000, 0x0000, 0x4801, 0x47fe, 0x0000,
-        0x0000, 0x8000, 0x0000, 0x4801, 0x0000, 0x4809, 0x4806, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x4809, 0x0000, 0x4804, 0x4804, 0x0000,
-        0x0000, 0x8000, 0x0000, 0x4804, 0x0000, 0x480a, 0x480a, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x480a, 0x127e, 0x2091, 0x2200, 0x2079,
-        0x5100, 0x2071, 0x0010, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003,
-        0x0000, 0x2071, 0x0020, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003,
-        0x0000, 0x2049, 0x0000, 0x127f, 0x2000, 0x007c, 0x2049, 0x4846,
-        0x2019, 0x0000, 0x7004, 0x8004, 0x00c8, 0x4899, 0x7007, 0x0012,
-        0x7108, 0x7008, 0xa106, 0x00c0, 0x4850, 0xa184, 0x01e0, 0x0040,
-        0x485b, 0x1078, 0x23eb, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
-        0x00c8, 0x4866, 0xa184, 0x4000, 0x00c0, 0x4850, 0xa19c, 0x300c,
-        0xa386, 0x2004, 0x0040, 0x4874, 0xa386, 0x0008, 0x0040, 0x487f,
-        0xa386, 0x200c, 0x00c0, 0x4850, 0x7200, 0x8204, 0x0048, 0x487f,
-        0x730c, 0xa384, 0x00ff, 0x0040, 0x487f, 0x1078, 0x23eb, 0x7007,
-        0x0012, 0x7000, 0xa084, 0x0001, 0x00c0, 0x4899, 0x7008, 0xa084,
-        0x01e0, 0x00c0, 0x4899, 0x7310, 0x7014, 0xa305, 0x0040, 0x4899,
-        0x710c, 0xa184, 0x0300, 0x00c0, 0x4899, 0xa184, 0x00ff, 0x00c0,
-        0x4846, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004, 0xa084, 0x0008,
-        0x00c0, 0x489d, 0x7007, 0x0012, 0x7108, 0x8103, 0x0048, 0x48a2,
-        0x7003, 0x0000, 0x2049, 0x0000, 0x007c, 0x107e, 0x007e, 0x127e,
-        0x157e, 0x2091, 0x2200, 0x7108, 0x1078, 0x48bd, 0x157f, 0x127f,
-        0x2091, 0x8001, 0x007f, 0x107f, 0x007c, 0x7204, 0x7500, 0x730c,
-        0xa384, 0x0300, 0x00c0, 0x48e4, 0xa184, 0x01e0, 0x00c0, 0x4908,
-        0x7108, 0xa184, 0x01e0, 0x00c0, 0x4908, 0x2001, 0x04fd, 0x2004,
-        0xa082, 0x0005, 0x00c8, 0x48d8, 0xa184, 0x4000, 0x00c0, 0x48c8,
-        0xa184, 0x0007, 0x0079, 0x48dc, 0x48e6, 0x48f8, 0x48e4, 0x48f8,
-        0x48e4, 0x4944, 0x48e4, 0x4942, 0x1078, 0x23eb, 0x7004, 0xa084,
-        0x0010, 0xa085, 0x0002, 0x7006, 0x8aff, 0x00c0, 0x48f3, 0x2049,
-        0x0000, 0x0078, 0x48f7, 0x1078, 0x4b07, 0x00c0, 0x48f3, 0x007c,
-        0x7004, 0xa084, 0x0010, 0xa085, 0x0002, 0x7006, 0x8aff, 0x00c0,
-        0x4903, 0x0078, 0x4907, 0x1078, 0x4b07, 0x00c0, 0x4903, 0x007c,
-        0x7007, 0x0012, 0x7108, 0x00e0, 0x490b, 0x2091, 0x6000, 0x00e0,
-        0x490f, 0x2091, 0x6000, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004,
-        0xa084, 0x0008, 0x00c0, 0x4917, 0x7007, 0x0012, 0x7108, 0x8103,
-        0x0048, 0x491c, 0x7003, 0x0000, 0x7000, 0xa005, 0x00c0, 0x4930,
-        0x7004, 0xa005, 0x00c0, 0x4930, 0x700c, 0xa005, 0x0040, 0x4932,
-        0x0078, 0x4913, 0x2049, 0x0000, 0x1078, 0x3809, 0x6818, 0xa084,
-        0x8000, 0x0040, 0x493d, 0x681b, 0x0002, 0x007c, 0x1078, 0x23eb,
-        0x1078, 0x23eb, 0x1078, 0x49a0, 0x7210, 0x7114, 0x700c, 0xa09c,
-        0x00ff, 0x2800, 0xa300, 0xa211, 0xa189, 0x0000, 0x1078, 0x49a0,
-        0x2704, 0x2c58, 0xac60, 0x6308, 0x2200, 0xa322, 0x630c, 0x2100,
-        0xa31b, 0x2400, 0xa305, 0x0040, 0x4967, 0x00c8, 0x4967, 0x8412,
-        0x8210, 0x830a, 0xa189, 0x0000, 0x2b60, 0x0078, 0x494e, 0x2b60,
-        0x8a07, 0x007e, 0x6004, 0xa084, 0x0008, 0x0040, 0x4973, 0xa7ba,
-        0x4806, 0x0078, 0x4975, 0xa7ba, 0x47fe, 0x007f, 0xa73d, 0x2c00,
-        0x6886, 0x6f8a, 0x6c92, 0x6b8e, 0x7007, 0x0012, 0x1078, 0x4846,
-        0x007c, 0x8738, 0x2704, 0xa005, 0x00c0, 0x4994, 0x609c, 0xa005,
-        0x0040, 0x499d, 0x2060, 0x6004, 0xa084, 0x000f, 0xa080, 0x480c,
-        0x203c, 0x87fb, 0x1040, 0x23eb, 0x8a51, 0x0040, 0x499c, 0x7008,
-        0xa084, 0x0003, 0xa086, 0x0003, 0x007c, 0x2051, 0x0000, 0x007c,
-        0x8a50, 0x8739, 0x2704, 0xa004, 0x00c0, 0x49b4, 0x6000, 0xa064,
-        0x00c0, 0x49ab, 0x2d60, 0x6004, 0xa084, 0x000f, 0xa080, 0x481c,
-        0x203c, 0x87fb, 0x1040, 0x23eb, 0x007c, 0x127e, 0x0d7e, 0x2091,
-        0x2200, 0x0d7f, 0x6884, 0x2060, 0x6888, 0x6b8c, 0x6c90, 0x8057,
-        0xaad4, 0x00ff, 0xa084, 0x00ff, 0x007e, 0x6804, 0xa084, 0x0008,
-        0x007f, 0x0040, 0x49cf, 0xa0b8, 0x4806, 0x0078, 0x49d1, 0xa0b8,
-        0x47fe, 0x7e08, 0xa6b5, 0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186,
-        0x0007, 0x0040, 0x49df, 0xa18e, 0x000f, 0x00c0, 0x49e8, 0x681c,
-        0xa084, 0x0040, 0x0040, 0x49ef, 0xa6b5, 0x0001, 0x0078, 0x49ef,
-        0x681c, 0xa084, 0x0040, 0x0040, 0x49ef, 0xa6b5, 0x0001, 0x7007,
-        0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x49f1, 0x2400, 0xa305,
-        0x00c0, 0x49fc, 0x0078, 0x4a22, 0x2c58, 0x2704, 0x6104, 0xac60,
-        0x6000, 0xa400, 0x701a, 0x6004, 0xa301, 0x701e, 0xa184, 0x0008,
-        0x0040, 0x4a12, 0x6010, 0xa081, 0x0000, 0x7022, 0x6014, 0xa081,
-        0x0000, 0x7026, 0x6208, 0x2400, 0xa202, 0x7012, 0x620c, 0x2300,
-        0xa203, 0x7016, 0x7602, 0x7007, 0x0001, 0x2b60, 0x1078, 0x4981,
-        0x0078, 0x4a24, 0x1078, 0x4b07, 0x00c0, 0x4a22, 0x127f, 0x2000,
-        0x007c, 0x127e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x7007, 0x0004,
-        0x7004, 0xa084, 0x0004, 0x00c0, 0x4a30, 0x7003, 0x0008, 0x127f,
-        0x2000, 0x007c, 0x127e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x2049,
-        0x4a3a, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4a43,
-        0x7e08, 0xa6b5, 0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007,
-        0x0040, 0x4a56, 0xa18e, 0x000f, 0x00c0, 0x4a61, 0x681c, 0xa084,
-        0x0040, 0x0040, 0x4a5d, 0xa6b5, 0x0001, 0x6840, 0x2050, 0x0078,
-        0x4a6a, 0x681c, 0xa084, 0x0020, 0x00c0, 0x4a68, 0xa6b5, 0x0001,
-        0x6828, 0x2050, 0x2d60, 0x6004, 0xa0bc, 0x000f, 0xa7b8, 0x480c,
-        0x273c, 0x87fb, 0x00c0, 0x4a7e, 0x0048, 0x4a78, 0x1078, 0x23eb,
-        0x689c, 0xa065, 0x0040, 0x4a82, 0x0078, 0x4a6b, 0x1078, 0x4b07,
-        0x00c0, 0x4a7e, 0x127f, 0x2000, 0x007c, 0x127e, 0x007e, 0x017e,
-        0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x037f, 0x047f, 0x7e08, 0xa6b5,
-        0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4a9c,
-        0xa18e, 0x000f, 0x00c0, 0x4aa5, 0x681c, 0xa084, 0x0040, 0x0040,
-        0x4aac, 0xa6b5, 0x0001, 0x0078, 0x4aac, 0x681c, 0xa084, 0x0040,
-        0x0040, 0x4aac, 0xa6b5, 0x0001, 0x2049, 0x4a85, 0x017e, 0x6904,
-        0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4aba, 0xa18e, 0x000f,
-        0x00c0, 0x4abd, 0x6840, 0x0078, 0x4abe, 0x6828, 0x017f, 0xa055,
-        0x0040, 0x4b04, 0x2d70, 0x2e60, 0x7004, 0xa0bc, 0x000f, 0xa7b8,
-        0x480c, 0x273c, 0x87fb, 0x00c0, 0x4ad8, 0x0048, 0x4ad1, 0x1078,
-        0x23eb, 0x709c, 0xa075, 0x2060, 0x0040, 0x4b04, 0x0078, 0x4ac4,
-        0x2704, 0xae68, 0x6808, 0xa422, 0x680c, 0xa31b, 0x0048, 0x4af1,
-        0x8a51, 0x00c0, 0x4ae5, 0x1078, 0x23eb, 0x8738, 0x2704, 0xa005,
-        0x00c0, 0x4ad9, 0x709c, 0xa075, 0x2060, 0x0040, 0x4b04, 0x0078,
-        0x4ac4, 0x8422, 0x8420, 0x831a, 0xa399, 0x0000, 0x6908, 0x2400,
-        0xa122, 0x690c, 0x2300, 0xa11b, 0x00c8, 0x4b00, 0x1078, 0x23eb,
-        0x2071, 0x0020, 0x0078, 0x49ef, 0x127f, 0x2000, 0x007c, 0x7008,
-        0xa084, 0x0003, 0xa086, 0x0003, 0x0040, 0x4b2f, 0x2704, 0xac08,
-        0x2104, 0x701a, 0x8108, 0x2104, 0x701e, 0x8108, 0x2104, 0x7012,
-        0x8108, 0x2104, 0x7016, 0x6004, 0xa084, 0x0008, 0x0040, 0x4b26,
-        0x8108, 0x2104, 0x7022, 0x8108, 0x2104, 0x7026, 0x7602, 0x7004,
-        0xa084, 0x0010, 0xa085, 0x0001, 0x7006, 0x1078, 0x4981, 0x007c,
-        0x127e, 0x007e, 0x0d7e, 0x2091, 0x2200, 0x2049, 0x4b30, 0x0d7f,
-        0x087f, 0x7108, 0xa184, 0x0003, 0x00c0, 0x4b5a, 0x017e, 0x6904,
-        0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4b4a, 0xa18e, 0x000f,
-        0x00c0, 0x4b4d, 0x6840, 0x0078, 0x4b4e, 0x6828, 0x017f, 0xa005,
-        0x0040, 0x4b68, 0x0078, 0x478d, 0x0020, 0x4b5a, 0x1078, 0x4944,
-        0x0078, 0x4b68, 0x00a0, 0x4b61, 0x7108, 0x1078, 0x48bd, 0x0078,
-        0x4b39, 0x7007, 0x0010, 0x00a0, 0x4b63, 0x7108, 0x1078, 0x48bd,
-        0x7008, 0xa086, 0x0008, 0x00c0, 0x4b39, 0x7000, 0xa005, 0x00c0,
-        0x4b39, 0x7003, 0x0000, 0x2049, 0x0000, 0x127f, 0x2000, 0x007c,
-        0x127e, 0x147e, 0x137e, 0x157e, 0x0c7e, 0x0d7e, 0x2091, 0x2200,
-        0x0d7f, 0x2049, 0x4b78, 0xad80, 0x0011, 0x20a0, 0x2099, 0x0031,
-        0x700c, 0xa084, 0x00ff, 0x682a, 0x7007, 0x0008, 0x7007, 0x0002,
-        0x7003, 0x0001, 0x0040, 0x4b97, 0x8000, 0x80ac, 0x53a5, 0x7007,
-        0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4b99, 0x0c7f, 0x2049,
-        0x0000, 0x7003, 0x0000, 0x157f, 0x137f, 0x147f, 0x127f, 0x2000,
-        0x007c, 0x2091, 0x6000, 0x2091, 0x8000, 0x78cc, 0xa005, 0x0040,
-        0x4bc0, 0x7994, 0x70d0, 0xa106, 0x00c0, 0x4bc0, 0x7804, 0xa005,
-        0x0040, 0x4bc0, 0x7807, 0x0000, 0x0068, 0x4bc0, 0x2091, 0x4080,
-        0x7820, 0x8001, 0x7822, 0x00c0, 0x4c1b, 0x7824, 0x7822, 0x2069,
-        0x5140, 0x6800, 0xa084, 0x0007, 0x0040, 0x4bde, 0xa086, 0x0002,
-        0x0040, 0x4bde, 0x6834, 0xa00d, 0x0040, 0x4bde, 0x2104, 0xa005,
-        0x0040, 0x4bde, 0x8001, 0x200a, 0x0040, 0x4cc3, 0x7848, 0xa005,
-        0x0040, 0x4bec, 0x8001, 0x784a, 0x00c0, 0x4bec, 0x2009, 0x0102,
-        0x6844, 0x200a, 0x1078, 0x21d2, 0x6890, 0xa005, 0x0040, 0x4bf8,
-        0x8001, 0x6892, 0x00c0, 0x4bf8, 0x686f, 0x0000, 0x6873, 0x0001,
-        0x2061, 0x5400, 0x20a9, 0x0100, 0x2009, 0x0002, 0x6034, 0xa005,
-        0x0040, 0x4c0e, 0x8001, 0x6036, 0x00c0, 0x4c0e, 0x6010, 0xa005,
-        0x0040, 0x4c0e, 0x017e, 0x1078, 0x21d2, 0x017f, 0xace0, 0x0010,
-        0x0070, 0x4c14, 0x0078, 0x4bfe, 0x8109, 0x0040, 0x4c1b, 0x20a9,
-        0x0100, 0x0078, 0x4bfe, 0x1078, 0x4c28, 0x1078, 0x4c4d, 0x2009,
-        0x5151, 0x2104, 0x2009, 0x0102, 0x200a, 0x2091, 0x8001, 0x007c,
-        0x7834, 0x8001, 0x7836, 0x00c0, 0x4c4c, 0x7838, 0x7836, 0x2091,
-        0x8000, 0x7844, 0xa005, 0x00c0, 0x4c37, 0x2001, 0x0101, 0x8001,
-        0x7846, 0xa080, 0x7400, 0x2040, 0x2004, 0xa065, 0x0040, 0x4c4c,
-        0x6024, 0xa005, 0x0040, 0x4c48, 0x8001, 0x6026, 0x0040, 0x4c7c,
-        0x6000, 0x2c40, 0x0078, 0x4c3d, 0x007c, 0x7828, 0x8001, 0x782a,
-        0x00c0, 0x4c7b, 0x782c, 0x782a, 0x7830, 0xa005, 0x00c0, 0x4c5a,
-        0x2001, 0x0200, 0x8001, 0x7832, 0x8003, 0x8003, 0x8003, 0x8003,
-        0xa090, 0x5400, 0xa298, 0x0002, 0x2304, 0xa084, 0x0008, 0x0040,
-        0x4c7b, 0xa290, 0x0009, 0x2204, 0xa005, 0x0040, 0x4c73, 0x8001,
-        0x2012, 0x00c0, 0x4c7b, 0x2304, 0xa084, 0xfff7, 0xa085, 0x0080,
-        0x201a, 0x1078, 0x21d2, 0x007c, 0x2069, 0x5140, 0x6800, 0xa005,
-        0x0040, 0x4c86, 0x6848, 0xac06, 0x0040, 0x4cc3, 0x601b, 0x0006,
-        0x60b4, 0xa084, 0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff, 0xa085,
-        0x0060, 0x6022, 0x6000, 0x2042, 0x6714, 0x6f82, 0x1078, 0x1973,
-        0x6818, 0xa005, 0x0040, 0x4c9e, 0x8001, 0x681a, 0x6808, 0xa084,
-        0xffef, 0x680a, 0x6810, 0x8001, 0x00d0, 0x4ca8, 0x1078, 0x23eb,
-        0x6812, 0x602f, 0x0000, 0x6033, 0x0000, 0x2c68, 0x1078, 0x1c70,
-        0x2069, 0x5140, 0x7944, 0xa184, 0x0100, 0x2001, 0x0006, 0x686e,
-        0x00c0, 0x4cbe, 0x6986, 0x2001, 0x0004, 0x686e, 0x1078, 0x21cd,
-        0x2091, 0x8001, 0x007c, 0x2069, 0x0100, 0x2009, 0x5140, 0x2104,
-        0xa084, 0x0007, 0x0040, 0x4d1f, 0xa086, 0x0007, 0x00c0, 0x4cd9,
-        0x0d7e, 0x2009, 0x5152, 0x216c, 0x1078, 0x3a4e, 0x0d7f, 0x0078,
-        0x4d1f, 0x2009, 0x5152, 0x2164, 0x1078, 0x2396, 0x601b, 0x0006,
-        0x6858, 0xa084, 0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff, 0xa085,
-        0x0048, 0x6022, 0x602f, 0x0000, 0x6033, 0x0000, 0x6830, 0xa084,
-        0x0040, 0x0040, 0x4d13, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848,
-        0xa084, 0x0004, 0x0040, 0x4d00, 0x0070, 0x4d00, 0x0078, 0x4cf7,
-        0x684b, 0x0009, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0001, 0x0040,
-        0x4d0d, 0x0070, 0x4d0d, 0x0078, 0x4d04, 0x20a9, 0x00fa, 0x0070,
-        0x4d13, 0x0078, 0x4d0f, 0x6808, 0xa084, 0xfffd, 0x680a, 0x681b,
-        0x0048, 0x2009, 0x515b, 0x200b, 0x0007, 0x784c, 0x784a, 0x2091,
-        0x8001, 0x007c, 0x2079, 0x5100, 0x1078, 0x4d4d, 0x1078, 0x4d31,
-        0x1078, 0x4d3f, 0x7833, 0x0000, 0x7847, 0x0000, 0x784b, 0x0000,
-        0x007c, 0x2019, 0x0003, 0x2011, 0x5146, 0x2204, 0xa086, 0x003c,
-        0x0040, 0x4d3c, 0x2019, 0x0002, 0x7b2a, 0x7b2e, 0x007c, 0x2019,
-        0x0039, 0x2011, 0x5146, 0x2204, 0xa086, 0x003c, 0x0040, 0x4d4a,
-        0x2019, 0x0027, 0x7b36, 0x7b3a, 0x007c, 0x2019, 0x3971, 0x2011,
-        0x5146, 0x2204, 0xa086, 0x003c, 0x0040, 0x4d58, 0x2019, 0x2626,
-        0x7b22, 0x7b26, 0x783f, 0x0000, 0x7843, 0x000a, 0x007c, 0x0020,
-        0x002b, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0014, 0x0014, 0x9849, 0x0014, 0x0014, 0x0014,
-        0x0014, 0x0014, 0x0014, 0x0014, 0x0080, 0x000f, 0x0000, 0x0201,
-        0x0604, 0x0c08, 0x2120, 0x4022, 0xf880, 0x0018, 0x300b, 0xa201,
-        0x0014, 0xa200, 0x0014, 0xa200, 0x0214, 0x0000, 0x006c, 0x0002,
-        0x0014, 0x98d0, 0x009e, 0x0096, 0xa202, 0x8838, 0x3806, 0x8839,
-        0x20c3, 0x0864, 0x9884, 0x28c1, 0x9cb1, 0xa203, 0x300c, 0x2846,
-        0x8161, 0x846a, 0x8300, 0x1856, 0x883a, 0x9865, 0x28f2, 0x9c90,
-        0x9858, 0x300c, 0x28e1, 0x9c90, 0x2802, 0xa206, 0x64c3, 0x282d,
-        0xa207, 0x64a0, 0x67a0, 0x6fc0, 0x1814, 0x883b, 0x7824, 0x68c1,
-        0x7864, 0x883e, 0x9878, 0x8576, 0x8677, 0x206b, 0x28c1, 0x9cb1,
-        0x2044, 0x2103, 0x20a2, 0x2081, 0x9865, 0xa209, 0x2901, 0x988c,
-        0x0014, 0xa205, 0xa300, 0x1872, 0x879a, 0x883c, 0x1fe2, 0xc601,
-        0xa20a, 0x856e, 0x0704, 0x9c90, 0x0014, 0xa204, 0xa300, 0x3009,
-        0x19e2, 0xf868, 0x8176, 0x86eb, 0x85eb, 0x872e, 0x87a9, 0x883f,
-        0x08e6, 0x9890, 0xf881, 0x988b, 0xc801, 0x0014, 0xf8c1, 0x0016,
-        0x85b2, 0x80f0, 0x9532, 0xfb02, 0x1de2, 0x0014, 0x8532, 0xf241,
-        0x0014, 0x1de2, 0x84a8, 0xd7a0, 0x1fe6, 0x0014, 0xa208, 0x6043,
-        0x8008, 0x1dc1, 0x0016, 0x8300, 0x8160, 0x842a, 0xf041, 0x3008,
-        0x84a8, 0x11d6, 0x7042, 0x20dd, 0x0011, 0x20d5, 0x8822, 0x0016,
-        0x8000, 0x2847, 0x1011, 0x98c3, 0x8000, 0xa000, 0x2802, 0x1011,
-        0x98c9, 0x9865, 0x283e, 0x1011, 0x98cd, 0xa20b, 0x0017, 0x300c,
-        0xa300, 0x1de2, 0xdb81, 0x0014, 0x0210, 0x98da, 0x0014, 0x26e0,
-        0x873a, 0xfb02, 0x19f2, 0x1fe2, 0x0014, 0xa20d, 0x3806, 0x0210,
-        0x9cb6, 0x0704, 0x0000, 0x006c, 0x0002, 0x984f, 0x0014, 0x009e,
-        0x00a5, 0x0017, 0x60ff, 0x300c, 0x8720, 0xa211, 0x9cd5, 0x8772,
-        0x8837, 0x2101, 0x987a, 0x10d2, 0x78e2, 0x9cd8, 0x9859, 0xd984,
-        0xf0e2, 0xf0a1, 0x98d2, 0x0014, 0x8831, 0xd166, 0x8830, 0x800f,
-        0x9401, 0xb520, 0xc802, 0x8820, 0x987a, 0x2301, 0x987a, 0x10d2,
-        0x78e4, 0x9cd8, 0x8821, 0x8820, 0x9859, 0xf123, 0xf142, 0xf101,
-        0x98cb, 0x10d2, 0x70f6, 0x8832, 0x8203, 0x870c, 0xd99e, 0x6001,
-        0x0014, 0x6845, 0x0214, 0xa21b, 0x9cd5, 0x2001, 0x98ca, 0x8201,
-        0x1852, 0xd184, 0xd163, 0x8834, 0x8001, 0x988d, 0x3027, 0x84a8,
-        0x1a56, 0x8833, 0x0014, 0xa218, 0x6981, 0x9cc1, 0x692a, 0x6902,
-        0x1834, 0x989d, 0x1a14, 0x8010, 0x8592, 0x8026, 0x84b9, 0x7021,
-        0x0014, 0xa300, 0x69e1, 0x9caa, 0x694c, 0xa213, 0x9cba, 0x1462,
-        0xa213, 0x8000, 0x16e1, 0x98b4, 0x8023, 0x16e1, 0x8001, 0x10f1,
-        0x0016, 0x6968, 0xa214, 0x9cba, 0x8004, 0x16e1, 0x0101, 0x300a,
-        0x8827, 0x0014, 0x9cba, 0x0014, 0x61c2, 0x8002, 0x14e1, 0x0016,
-        0xa217, 0x9cc1, 0x0014, 0xa300, 0x8181, 0x842a, 0x84a8, 0x1ce6,
-        0x882c, 0x0016, 0xa212, 0x9cd5, 0x10d2, 0x70e4, 0x0004, 0x8007,
-        0x9424, 0xcc1a, 0x9cd8, 0x98ca, 0x8827, 0x300a, 0x0013, 0x8000,
-        0x84a4, 0x0016, 0x11c2, 0x211e, 0x870e, 0xa21d, 0x0014, 0x878e,
-        0x0016, 0xa21c, 0x1035, 0x9891, 0xa210, 0xa000, 0x8010, 0x8592,
-        0x853b, 0xd044, 0x8022, 0x3807, 0x84bb, 0x98ef, 0x8021, 0x3807,
-        0x84b9, 0x300c, 0x817e, 0x872b, 0x8772, 0x9891, 0x0000, 0x0020,
-        0x002b, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
-        0x0020, 0x0000, 0x0014, 0x0014, 0x9849, 0x0014, 0x0014, 0x98e5,
-        0x98d0, 0x0014, 0x0014, 0x0014, 0x0080, 0x013f, 0x0000, 0x0201,
-        0x0604, 0x0c08, 0x2120, 0x4022, 0xf880, 0x0018, 0x300b, 0xa201,
-        0x0014, 0xa200, 0x0014, 0xa200, 0x0214, 0xa202, 0x8838, 0x3806,
-        0x8839, 0x20c3, 0x0864, 0xa82e, 0x28c1, 0x9cb1, 0xa203, 0x300c,
-        0x2846, 0x8161, 0x846a, 0x8300, 0x1856, 0x883a, 0xa804, 0x28f2,
-        0x9c90, 0xa8f4, 0x300c, 0x28e1, 0x9c90, 0x2802, 0xa206, 0x64c3,
-        0x282d, 0xa207, 0x64a0, 0x67a0, 0x6fc0, 0x1814, 0x883b, 0x7824,
-        0x68c1, 0x7864, 0x883e, 0xa802, 0x8576, 0x8677, 0x206b, 0x28c1,
-        0x9cb1, 0x2044, 0x2103, 0x20a2, 0x2081, 0xa8e5, 0xa209, 0x2901,
-        0xa809, 0x0014, 0xa205, 0xa300, 0x1872, 0x879a, 0x883c, 0x1fe2,
-        0xc601, 0xa20a, 0x856e, 0x0704, 0x9c90, 0x0014, 0xa204, 0xa300,
-        0x3009, 0x19e2, 0xf868, 0x8176, 0x86eb, 0x85eb, 0x872e, 0x87a9,
-        0x883f, 0x08e6, 0xa8f3, 0xf881, 0xa8ec, 0xc801, 0x0014, 0xf8c1,
-        0x0016, 0x85b2, 0x80f0, 0x9532, 0xfb02, 0x1de2, 0x0014, 0x8532,
-        0xf241, 0x0014, 0x1de2, 0x84a8, 0xd7a0, 0x1fe6, 0x0014, 0xa208,
-        0x6043, 0x8008, 0x1dc1, 0x0016, 0x8300, 0x8160, 0x842a, 0xf041,
-        0x3008, 0x84a8, 0x11d6, 0x7042, 0x20dd, 0x0011, 0x20d5, 0x8822,
-        0x0016, 0x8000, 0x2847, 0x1011, 0xa8fc, 0x8000, 0xa000, 0x2802,
-        0x1011, 0xa8fd, 0xa898, 0x283e, 0x1011, 0xa8fd, 0xa20b, 0x0017,
-        0x300c, 0xa300, 0x1de2, 0xdb81, 0x0014, 0x0210, 0xa801, 0x0014,
-        0x26e0, 0x873a, 0xfb02, 0x19f2, 0x1fe2, 0x0014, 0xa20d, 0x3806,
-        0x0210, 0x9cb6, 0x0704, 0x0017, 0x60ff, 0x300c, 0x8720, 0xa211,
-        0x9d6b, 0x8772, 0x8837, 0x2101, 0xa821, 0x10d2, 0x78e2, 0x9d6e,
-        0xa8fc, 0xd984, 0xf0e2, 0xf0a1, 0xa871, 0x0014, 0x8831, 0xd166,
-        0x8830, 0x800f, 0x9401, 0xb520, 0xc802, 0x8820, 0xa80f, 0x2301,
-        0xa80d, 0x10d2, 0x78e4, 0x9d6e, 0x8821, 0x8820, 0xa8e6, 0xf123,
-        0xf142, 0xf101, 0xa854, 0x10d2, 0x70f6, 0x8832, 0x8203, 0x870c,
-        0xd99e, 0x6001, 0x0014, 0x6845, 0x0214, 0xa21b, 0x9d6b, 0x2001,
-        0xa845, 0x8201, 0x1852, 0xd184, 0xd163, 0x8834, 0x8001, 0xa801,
-        0x3027, 0x84a8, 0x1a56, 0x8833, 0x0014, 0xa218, 0x6981, 0x9d57,
-        0x692a, 0x6902, 0x1834, 0xa805, 0x1a14, 0x8010, 0x8592, 0x8026,
-        0x84b9, 0x7021, 0x0014, 0xa300, 0x69e1, 0x9d40, 0x694c, 0xa213,
-        0x9d50, 0x1462, 0xa213, 0x8000, 0x16e1, 0xa80a, 0x8023, 0x16e1,
-        0x8001, 0x10f1, 0x0016, 0x6968, 0xa214, 0x9d50, 0x8004, 0x16e1,
-        0x0101, 0x300a, 0x8827, 0x0014, 0x9d50, 0x0014, 0x61c2, 0x8002,
-        0x14e1, 0x0016, 0xa217, 0x9d57, 0x0014, 0xa300, 0x8181, 0x842a,
-        0x84a8, 0x1ce6, 0x882c, 0x0016, 0xa212, 0x9d6b, 0x10d2, 0x70e4,
-        0x0004, 0x8007, 0x9424, 0xcc1a, 0x9d6e, 0xa8f8, 0x8827, 0x300a,
-        0x0013, 0x8000, 0x84a4, 0x0016, 0x11c2, 0x211e, 0x870e, 0xa21d,
-        0x0014, 0x878e, 0x0016, 0xa21c, 0x1035, 0xa8af, 0xa210, 0x3807,
-        0x300c, 0x817e, 0x872b, 0x8772, 0xa8a8, 0x0000, 0xdf21
+        0x6814, 0x8007, 0x7882, 0x0078, 0x3960, 0x6818, 0xa084, 0x8000,
+        0x0040, 0x3234, 0x681b, 0x0008, 0x781b, 0x00c0, 0x0078, 0x24fa,
+        0x2300, 0x0079, 0x323b, 0x3240, 0x32d4, 0x323e, 0x1078, 0x248c,
+        0x7000, 0xa084, 0x0007, 0x0079, 0x3245, 0x2523, 0x324f, 0x3284,
+        0x325a, 0x324d, 0x2523, 0x324d, 0x324d, 0x1078, 0x248c, 0x681c,
+        0xa084, 0x2000, 0x0040, 0x3268, 0x6008, 0xa085, 0x0002, 0x600a,
+        0x0078, 0x3268, 0x68c0, 0xa005, 0x00c0, 0x3284, 0x6920, 0xa18d,
+        0x0001, 0x6922, 0x68c3, 0x0001, 0x6800, 0x706a, 0x0078, 0x327e,
+        0x6920, 0xa18d, 0x0001, 0x6922, 0x6800, 0x6006, 0xa005, 0x00c0,
+        0x3272, 0x6002, 0x681c, 0xa084, 0x000e, 0x0040, 0x327e, 0x7014,
+        0x68ba, 0x7130, 0xa188, 0x7500, 0x0078, 0x3280, 0x2009, 0x7600,
+        0x2104, 0x6802, 0x2d0a, 0x7162, 0x6eb6, 0xa684, 0x0060, 0x0040,
+        0x32d2, 0xa684, 0x0800, 0x00c0, 0x3298, 0xa684, 0x7fff, 0x68b6,
+        0x6894, 0x68a6, 0x6898, 0x68aa, 0x1078, 0x4887, 0x0078, 0x32d2,
+        0xa684, 0x0020, 0x0040, 0x32ad, 0x68c0, 0xa005, 0x0040, 0x32a4,
+        0x1078, 0x4c89, 0x0078, 0x32a7, 0xa006, 0x1078, 0x4c41, 0x79d8,
+        0x7adc, 0x69aa, 0x6aa6, 0x0078, 0x32b3, 0x1078, 0x38ca, 0x69aa,
+        0x6aa6, 0x1078, 0x4c41, 0xa684, 0x8000, 0x0040, 0x32d2, 0xa684,
+        0x7fff, 0x68b6, 0x7adc, 0x79d8, 0xa684, 0x0020, 0x00c0, 0x32ca,
+        0x78d0, 0x801b, 0x00c8, 0x32c5, 0x8000, 0xa084, 0x003f, 0xa108,
+        0xa291, 0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200,
+        0xa303, 0x68ae, 0x0078, 0x2523, 0x0078, 0x377b, 0x7037, 0x0000,
+        0xa282, 0x0006, 0x0050, 0x32de, 0x1078, 0x248c, 0x7000, 0xa084,
+        0x0007, 0x10c0, 0x3a8c, 0x2300, 0x0079, 0x32e6, 0x32e9, 0x3312,
+        0x3326, 0x2200, 0x0079, 0x32ec, 0x3310, 0x377b, 0x32f2, 0x3310,
+        0x3342, 0x3384, 0x7003, 0x0005, 0x2001, 0x7710, 0x2068, 0x704a,
+        0x157e, 0x20a9, 0x0031, 0x2003, 0x0000, 0x8000, 0x0070, 0x3302,
+        0x0078, 0x32fb, 0x157f, 0xad80, 0x0009, 0x7036, 0x6817, 0x0000,
+        0x68b7, 0x0700, 0x6823, 0x0800, 0x6827, 0x0003, 0x0078, 0x376b,
+        0x1078, 0x248c, 0x7003, 0x0005, 0x2001, 0x7710, 0x2068, 0x704a,
+        0xad80, 0x0009, 0x7036, 0x2200, 0x0079, 0x331e, 0x377b, 0x3324,
+        0x3324, 0x3342, 0x3324, 0x377b, 0x1078, 0x248c, 0x7003, 0x0005,
+        0x2001, 0x7710, 0x2068, 0x704a, 0xad80, 0x0009, 0x7036, 0x2200,
+        0x0079, 0x3332, 0x333a, 0x3338, 0x3338, 0x333a, 0x3338, 0x333a,
+        0x1078, 0x248c, 0x1078, 0x379f, 0x782b, 0x3008, 0x781b, 0x0065,
+        0x0078, 0x24fa, 0x7003, 0x0002, 0x7a80, 0xa294, 0x0f00, 0x789b,
+        0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0x2069, 0x7600, 0x2d04,
+        0x2d08, 0x7162, 0x2068, 0xa005, 0x0040, 0x335d, 0x6814, 0xa206,
+        0x0040, 0x3379, 0x6800, 0x0078, 0x3350, 0x7003, 0x0005, 0x2001,
+        0x7710, 0x2068, 0x704a, 0x7036, 0x157e, 0x20a9, 0x0031, 0x2003,
+        0x0000, 0x8000, 0x0070, 0x336e, 0x0078, 0x3367, 0x157f, 0xad80,
+        0x0009, 0x7036, 0x6a16, 0x68b7, 0x0700, 0x6823, 0x0800, 0x6827,
+        0x0003, 0x6eb4, 0x7e5a, 0x6820, 0xa084, 0x0c00, 0x0040, 0x33d3,
+        0x1078, 0x3797, 0x0078, 0x33d3, 0x7003, 0x0002, 0x7a80, 0xa294,
+        0x0f00, 0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0x79a8,
+        0x79a8, 0xa18c, 0x00ff, 0xa1e8, 0x7500, 0x2d04, 0x2d08, 0x7162,
+        0x2068, 0xa005, 0x0040, 0x33a3, 0x6814, 0xa206, 0x0040, 0x33be,
+        0x6800, 0x0078, 0x3396, 0x7003, 0x0005, 0x2001, 0x7710, 0x2068,
+        0x704a, 0x157e, 0x20a9, 0x0031, 0x2003, 0x0000, 0x8000, 0x0070,
+        0x33b3, 0x0078, 0x33ac, 0x157f, 0xad80, 0x0009, 0x7036, 0x6a16,
+        0x68b7, 0x0700, 0x6823, 0x0800, 0x6827, 0x0003, 0x6eb4, 0x7e5a,
+        0x6820, 0xa084, 0x0c00, 0x0040, 0x33d3, 0xa084, 0x0800, 0x0040,
+        0x33cd, 0x1078, 0x379b, 0x0078, 0x33d3, 0x1078, 0x3797, 0x708b,
+        0x0000, 0x0078, 0x33d3, 0x027e, 0x8207, 0xa084, 0x000f, 0x8003,
+        0x8003, 0x8003, 0xa080, 0x5480, 0x2060, 0x7056, 0x6000, 0x705a,
+        0x6004, 0x705e, 0xa684, 0x0060, 0x0040, 0x342b, 0x6b98, 0x6c94,
+        0x69ac, 0x68b0, 0xa105, 0x00c0, 0x340d, 0x7bd2, 0x7bda, 0x7cd6,
+        0x7cde, 0xa6b4, 0xb7ff, 0x7e5a, 0xa684, 0x0060, 0xa086, 0x0060,
+        0x0040, 0x342b, 0x68c0, 0xa005, 0x0040, 0x3406, 0x7003, 0x0003,
+        0x682b, 0x0000, 0x1078, 0x4b3a, 0x0078, 0x3408, 0x1078, 0x4b4b,
+        0xa6b5, 0x2000, 0x7e5a, 0x0078, 0x342b, 0x68b0, 0xa31a, 0x2100,
+        0xa423, 0x2400, 0xa305, 0x0040, 0x342b, 0x7bd2, 0x7bda, 0x7cd6,
+        0x7cde, 0x68b0, 0xa6b4, 0xbfff, 0x7e5a, 0x007e, 0x68c0, 0xa005,
+        0x007f, 0x0040, 0x3429, 0x7003, 0x0003, 0x1078, 0x4b3a, 0x0078,
+        0x342b, 0x1078, 0x4b96, 0x077f, 0x1078, 0x38bd, 0x2009, 0x0065,
+        0xa684, 0x0004, 0x0040, 0x344c, 0x78e4, 0xa084, 0x0030, 0x0040,
+        0x3444, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3444, 0x782b, 0x3008,
+        0x2009, 0x0065, 0x0078, 0x344c, 0x0f7e, 0x2079, 0x5200, 0x1078,
+        0x4887, 0x0f7f, 0x0040, 0x2523, 0x791a, 0x2d00, 0x704a, 0x8207,
+        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa080, 0x5480, 0x2048,
+        0x0078, 0x24fa, 0x6020, 0xa005, 0x0040, 0x3466, 0x8001, 0x6022,
+        0x6008, 0xa085, 0x0008, 0x600a, 0x7010, 0x6026, 0x007c, 0xa006,
+        0x1078, 0x4887, 0x6817, 0x0000, 0x681b, 0x0001, 0x6823, 0x0040,
+        0x681f, 0x0100, 0x7000, 0xa084, 0x0007, 0x0079, 0x3477, 0x2523,
+        0x3481, 0x3481, 0x349e, 0x3489, 0x3487, 0x3489, 0x347f, 0x1078,
+        0x248c, 0x1078, 0x34a9, 0x1078, 0x34a2, 0x1078, 0x1cdc, 0x0078,
+        0x2523, 0x706c, 0x706f, 0x0000, 0x7093, 0x0000, 0x0079, 0x3490,
+        0x349a, 0x349a, 0x3498, 0x3498, 0x3498, 0x349a, 0x3498, 0x349a,
+        0x0079, 0x2902, 0x706f, 0x0000, 0x0078, 0x2523, 0x681b, 0x0000,
+        0x0078, 0x2fb6, 0x6800, 0xa005, 0x00c0, 0x34a7, 0x6002, 0x6006,
+        0x007c, 0x6010, 0xa005, 0x0040, 0x34b2, 0x8001, 0x00d0, 0x34b2,
+        0x1078, 0x248c, 0x6012, 0x6008, 0xa084, 0xffef, 0x600a, 0x007c,
+        0x6018, 0xa005, 0x0040, 0x34be, 0x8001, 0x601a, 0x007c, 0x1078,
+        0x39e0, 0x681b, 0x0018, 0x0078, 0x34f5, 0x1078, 0x39e0, 0x681b,
+        0x0019, 0x0078, 0x34f5, 0x1078, 0x39e0, 0x681b, 0x001a, 0x0078,
+        0x34f5, 0x1078, 0x39e0, 0x681b, 0x0003, 0x0078, 0x34f5, 0x7780,
+        0x1078, 0x38bd, 0x7184, 0xa18c, 0x00ff, 0xa1e8, 0x7500, 0x2d04,
+        0x2d08, 0x2068, 0xa005, 0x00c0, 0x34e7, 0x0078, 0x2523, 0x6814,
+        0x7280, 0xa206, 0x0040, 0x34ef, 0x6800, 0x0078, 0x34e0, 0x6800,
+        0x200a, 0x681b, 0x0005, 0x708b, 0x0000, 0x1078, 0x34a9, 0x6820,
+        0xa084, 0x0001, 0x00c0, 0x34fe, 0x1078, 0x34a2, 0x1078, 0x34b8,
+        0x681f, 0x0000, 0x6823, 0x0020, 0x1078, 0x1cdc, 0x0078, 0x2523,
+        0xa282, 0x0003, 0x00c0, 0x376b, 0x7da8, 0xa5ac, 0x00ff, 0x7ca8,
+        0xa4a4, 0x00ff, 0x6920, 0xa18d, 0x0080, 0x6922, 0xa184, 0x0100,
+        0x0040, 0x356c, 0xa18c, 0xfeff, 0x6922, 0xa4a4, 0x00ff, 0x0040,
+        0x3556, 0xa482, 0x000c, 0x0048, 0x3529, 0x0040, 0x3529, 0x2021,
+        0x000c, 0x852b, 0x852b, 0x1078, 0x382e, 0x0040, 0x3533, 0x1078,
+        0x3627, 0x0078, 0x355f, 0x1078, 0x37e9, 0x0c7e, 0x2960, 0x6004,
+        0xa084, 0xfff5, 0x6006, 0x1078, 0x3652, 0x0c7f, 0x6920, 0xa18d,
+        0x0100, 0x6922, 0x7e58, 0xa6b5, 0x0004, 0x7e5a, 0xa684, 0x0400,
+        0x00c0, 0x3550, 0x782b, 0x3008, 0x781b, 0x0056, 0x0078, 0x24fa,
+        0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x24fa, 0x0c7e, 0x2960,
+        0x6004, 0xa084, 0xfff5, 0x6006, 0x1078, 0x3652, 0x0c7f, 0x7e58,
+        0xa684, 0x0400, 0x00c0, 0x3568, 0x781b, 0x0058, 0x0078, 0x24fa,
+        0x781b, 0x0065, 0x0078, 0x24fa, 0x0c7e, 0x7054, 0x2060, 0x6100,
+        0xa18c, 0x1000, 0x0040, 0x35ac, 0x6208, 0x8217, 0xa294, 0x00ff,
+        0xa282, 0x000c, 0x0048, 0x3580, 0x0040, 0x3580, 0x2011, 0x000c,
+        0x2400, 0xa202, 0x00c8, 0x3585, 0x2220, 0x6208, 0xa294, 0x00ff,
+        0x7018, 0xa086, 0x0028, 0x00c0, 0x3595, 0xa282, 0x0019, 0x00c8,
+        0x359b, 0x2011, 0x0019, 0x0078, 0x359b, 0xa282, 0x000c, 0x00c8,
+        0x359b, 0x2011, 0x000c, 0x2200, 0xa502, 0x00c8, 0x35a0, 0x2228,
+        0x1078, 0x37ed, 0x852b, 0x852b, 0x1078, 0x382e, 0x0040, 0x35ac,
+        0x1078, 0x3627, 0x0078, 0x35b0, 0x1078, 0x37e9, 0x1078, 0x3652,
+        0x7858, 0xa085, 0x0004, 0x785a, 0x0c7f, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x0c7e, 0x2960, 0x6000, 0xd0e4, 0x00c0,
+        0x35d5, 0xd0b4, 0x00c0, 0x35cf, 0x6010, 0xa084, 0x000f, 0x00c0,
+        0x35cf, 0x6104, 0xa18c, 0xfff5, 0x6106, 0x0c7f, 0x007c, 0x2011,
+        0x0032, 0x2019, 0x0000, 0x0078, 0x35fc, 0x68a0, 0xa084, 0x0200,
+        0x00c0, 0x35cf, 0x6208, 0xa294, 0x00ff, 0x7018, 0xa086, 0x0028,
+        0x00c0, 0x35ea, 0xa282, 0x0019, 0x00c8, 0x35f0, 0x2011, 0x0019,
+        0x0078, 0x35f0, 0xa282, 0x000c, 0x00c8, 0x35f0, 0x2011, 0x000c,
+        0x6308, 0x831f, 0xa39c, 0x00ff, 0xa382, 0x000c, 0x0048, 0x35fc,
+        0x0040, 0x35fc, 0x2019, 0x000c, 0x78ab, 0x0001, 0x78ab, 0x0003,
+        0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820, 0xa085,
+        0x0100, 0x6822, 0x0c7f, 0x007c, 0x0c7e, 0x2960, 0xa18c, 0xfff5,
+        0x6106, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078, 0x3617, 0x78ab,
+        0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0,
+        0x0005, 0x6820, 0xa085, 0x0100, 0x6822, 0x0c7f, 0x007c, 0x0c7e,
+        0x7154, 0x2160, 0x1078, 0x362e, 0x0c7f, 0x007c, 0x2008, 0xa084,
+        0xfff0, 0xa425, 0x7c86, 0x6018, 0x789a, 0x7cae, 0x6412, 0x78a4,
+        0xa084, 0xfff8, 0xa18c, 0x0007, 0xa105, 0x78a6, 0x6016, 0x788a,
+        0xa4a4, 0x000f, 0x8427, 0x8204, 0x8004, 0xa084, 0x00ff, 0xa405,
+        0x600e, 0x78ec, 0xd08c, 0x00c0, 0x3651, 0x6004, 0xa084, 0xfff5,
+        0x6006, 0x007c, 0x0c7e, 0x7054, 0x2060, 0x1078, 0x3659, 0x0c7f,
+        0x007c, 0x6018, 0x789a, 0x78a4, 0xa084, 0xfff0, 0x78a6, 0x6012,
+        0x7884, 0xa084, 0xfff0, 0x7886, 0x007c, 0xa282, 0x0002, 0x00c0,
+        0x376b, 0x7aa8, 0x6920, 0xa18d, 0x0080, 0x6922, 0xa184, 0x0200,
+        0x0040, 0x36ae, 0xa18c, 0xfdff, 0x6922, 0xa294, 0x00ff, 0xa282,
+        0x0002, 0x00c8, 0x376b, 0x1078, 0x36f9, 0x1078, 0x3652, 0xa980,
+        0x0001, 0x200c, 0x1078, 0x38b9, 0x1078, 0x35bb, 0x88ff, 0x0040,
+        0x36a1, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xa6b5, 0x0004,
+        0x7e5a, 0xa684, 0x0400, 0x00c0, 0x369b, 0x782b, 0x3008, 0x781b,
+        0x0056, 0x0078, 0x24fa, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078,
+        0x24fa, 0x7e58, 0xa684, 0x0400, 0x00c0, 0x36aa, 0x781b, 0x0058,
+        0x0078, 0x24fa, 0x781b, 0x0065, 0x0078, 0x24fa, 0xa282, 0x0002,
+        0x00c8, 0x36b6, 0xa284, 0x0001, 0x0040, 0x36c0, 0x7154, 0xa188,
+        0x0000, 0x210c, 0xa18c, 0x2000, 0x00c0, 0x36c0, 0x2011, 0x0000,
+        0x1078, 0x37db, 0x1078, 0x36f9, 0x1078, 0x3652, 0x7858, 0xa085,
+        0x0004, 0x785a, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x24fa,
+        0x0c7e, 0x027e, 0x2960, 0x6000, 0x2011, 0x0001, 0xd0ec, 0x00c0,
+        0x36e9, 0xd0bc, 0x00c0, 0x36e7, 0x6014, 0xa084, 0x0040, 0x00c0,
+        0x36e7, 0xa18c, 0xffef, 0x6106, 0xa006, 0x0078, 0x36f6, 0x2011,
+        0x0000, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa,
+        0xa8c0, 0x0004, 0x6820, 0xa085, 0x0200, 0x6822, 0x027f, 0x0c7f,
+        0x007c, 0x0c7e, 0x7054, 0x2060, 0x1078, 0x3700, 0x0c7f, 0x007c,
+        0x82ff, 0x0040, 0x3705, 0x2011, 0x0040, 0x6018, 0xa080, 0x0002,
+        0x789a, 0x78a4, 0xa084, 0xffbf, 0xa205, 0x78a6, 0x788a, 0x6016,
+        0x78ec, 0xd08c, 0x00c0, 0x3718, 0x6004, 0xa084, 0xffef, 0x6006,
+        0x007c, 0x007e, 0x7000, 0xa086, 0x0003, 0x0040, 0x3722, 0x007f,
+        0x0078, 0x3725, 0x007f, 0x0078, 0x3767, 0xa684, 0x0020, 0x0040,
+        0x3767, 0x7888, 0xa084, 0x0040, 0x0040, 0x3767, 0x7bb8, 0xa384,
+        0x003f, 0x831b, 0x00c8, 0x3735, 0x8000, 0xa005, 0x0040, 0x374b,
+        0x831b, 0x00c8, 0x373e, 0x8001, 0x0040, 0x3763, 0xa684, 0x4000,
+        0x0040, 0x374b, 0x78b8, 0x801b, 0x00c8, 0x3747, 0x8000, 0xa084,
+        0x003f, 0x00c0, 0x3763, 0xa6b4, 0xbfff, 0x7e5a, 0x79d8, 0x7adc,
+        0x2001, 0x0001, 0xa108, 0x00c8, 0x3757, 0xa291, 0x0000, 0x79d2,
+        0x79da, 0x7ad6, 0x7ade, 0x1078, 0x4c41, 0x781b, 0x0064, 0x1078,
+        0x4ac6, 0x0078, 0x24fa, 0x781b, 0x0064, 0x0078, 0x24fa, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x1078, 0x37a3, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x1078, 0x378f, 0x782b, 0x3008, 0x781b,
+        0x0065, 0x0078, 0x24fa, 0x6827, 0x0002, 0x1078, 0x3797, 0x78e4,
+        0xa084, 0x0030, 0x0040, 0x2523, 0x78ec, 0xa084, 0x0003, 0x0040,
+        0x2523, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x24fa, 0x2001,
+        0x0005, 0x0078, 0x37a5, 0x2001, 0x000c, 0x0078, 0x37a5, 0x2001,
+        0x0006, 0x0078, 0x37a5, 0x2001, 0x000d, 0x0078, 0x37a5, 0x2001,
+        0x0009, 0x0078, 0x37a5, 0x2001, 0x0007, 0x789b, 0x0010, 0x78aa,
+        0x789b, 0x0060, 0x78ab, 0x0001, 0xa6b5, 0x0004, 0x7e5a, 0x007c,
+        0x077e, 0x873f, 0xa7bc, 0x000f, 0x873b, 0x873b, 0x8703, 0xa0e0,
+        0x5480, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184, 0x000f, 0x0040,
+        0x37c9, 0xa184, 0xfff0, 0x78a6, 0x6012, 0x6004, 0xa085, 0x0008,
+        0x6006, 0x8738, 0x8738, 0x7f9a, 0x79a4, 0xa184, 0x0040, 0x0040,
+        0x37d9, 0xa184, 0xffbf, 0x78a6, 0x6016, 0x6004, 0xa085, 0x0010,
+        0x6006, 0x077f, 0x007c, 0x789b, 0x0010, 0x78ab, 0x0001, 0x78ab,
+        0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0060, 0x78ab, 0x0004,
+        0x007c, 0x2021, 0x0000, 0x2029, 0x0032, 0x789b, 0x0010, 0x78ab,
+        0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa, 0x7caa, 0x789b,
+        0x0060, 0x78ab, 0x0005, 0x007c, 0x157e, 0x8007, 0xa084, 0x00ff,
+        0x8003, 0x8003, 0xa080, 0x0020, 0x789a, 0x79a4, 0xa18c, 0xfff0,
+        0x2001, 0x5246, 0x2004, 0xa082, 0x0028, 0x0040, 0x3817, 0x2021,
+        0x38a0, 0x2019, 0x0014, 0x20a9, 0x000c, 0x0078, 0x381d, 0x2021,
+        0x38ac, 0x2019, 0x0019, 0x20a9, 0x000d, 0x2011, 0x0064, 0x2404,
+        0xa084, 0xfff0, 0xa106, 0x0040, 0x382c, 0x8420, 0x2300, 0xa210,
+        0x0070, 0x382c, 0x0078, 0x381f, 0x157f, 0x007c, 0x157e, 0x2009,
+        0x5246, 0x210c, 0xa182, 0x0032, 0x0048, 0x3842, 0x0040, 0x3846,
+        0x2009, 0x3892, 0x2019, 0x0011, 0x20a9, 0x000e, 0x2011, 0x0032,
+        0x0078, 0x3858, 0xa182, 0x0028, 0x0040, 0x3850, 0x2009, 0x38a0,
+        0x2019, 0x0014, 0x20a9, 0x000c, 0x2011, 0x0064, 0x0078, 0x3858,
+        0x2009, 0x38ac, 0x2019, 0x0019, 0x20a9, 0x000d, 0x2011, 0x0064,
+        0x2200, 0xa502, 0x0040, 0x3868, 0x0048, 0x3868, 0x8108, 0x2300,
+        0xa210, 0x0070, 0x3865, 0x0078, 0x3858, 0x157f, 0xa006, 0x007c,
+        0x157f, 0xa582, 0x0064, 0x00c8, 0x3877, 0x7808, 0xa085, 0x0070,
+        0x780a, 0x7044, 0xa085, 0x0070, 0x7046, 0x0078, 0x3877, 0x78ec,
+        0xa084, 0x0300, 0x0040, 0x387f, 0x2104, 0x0078, 0x3890, 0x2104,
+        0xa09e, 0x1102, 0x00c0, 0x3890, 0x2001, 0x04fd, 0x2004, 0xa082,
+        0x0005, 0x0048, 0x388f, 0x2001, 0x1201, 0x0078, 0x3890, 0x2104,
+        0xa005, 0x007c, 0x1102, 0x3002, 0x3202, 0x4203, 0x4403, 0x5404,
+        0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07, 0x0c07, 0x0e07,
+        0x3202, 0x4202, 0x5202, 0x6202, 0x7202, 0x6605, 0x7605, 0x7805,
+        0x7a05, 0x7c05, 0x7e05, 0x7f05, 0x2202, 0x3202, 0x4202, 0x5202,
+        0x5404, 0x6404, 0x7404, 0x7604, 0x7804, 0x7a04, 0x7c04, 0x7e04,
+        0x7f04, 0x789b, 0x0010, 0xa046, 0x007c, 0xa784, 0x0f00, 0x800b,
+        0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa0e0,
+        0x5500, 0x007c, 0x79d8, 0x7adc, 0x78d0, 0x801b, 0x00c8, 0x38d1,
+        0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x007c, 0x0f7e,
+        0x2079, 0x0100, 0x2009, 0x5240, 0x2091, 0x8000, 0x2104, 0x0079,
+        0x38e1, 0x3917, 0x38eb, 0x38eb, 0x38eb, 0x38eb, 0x38eb, 0x38eb,
+        0x391b, 0x1078, 0x248c, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004,
+        0x00c0, 0x38ed, 0x784b, 0x0008, 0x7848, 0xa084, 0x0008, 0x00c0,
+        0x38f4, 0x68b4, 0xa085, 0x4000, 0x68b6, 0x7858, 0xa085, 0x4000,
+        0x785a, 0x7830, 0xa084, 0x0080, 0x00c0, 0x3917, 0x0018, 0x3917,
+        0x681c, 0xa084, 0x0020, 0x00c0, 0x3915, 0x0e7e, 0x2071, 0x5240,
+        0x1078, 0x396a, 0x0e7f, 0x0078, 0x3917, 0x781b, 0x00ca, 0x2091,
+        0x8001, 0x0f7f, 0x007c, 0x70b3, 0x0000, 0x1078, 0x3b44, 0x0078,
+        0x3917, 0x0c7e, 0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003,
+        0x8003, 0xa0e0, 0x5480, 0x6004, 0xa084, 0x000a, 0x00c0, 0x3954,
+        0x6108, 0xa194, 0xff00, 0x0040, 0x3954, 0xa18c, 0x00ff, 0x2001,
+        0x0019, 0xa106, 0x0040, 0x3943, 0x2001, 0x0032, 0xa106, 0x0040,
+        0x3947, 0x0078, 0x394b, 0x2009, 0x0020, 0x0078, 0x394d, 0x2009,
+        0x003f, 0x0078, 0x394d, 0x2011, 0x0000, 0x2100, 0xa205, 0x600a,
+        0x6004, 0xa085, 0x0002, 0x6006, 0x0c7f, 0x007c, 0x781b, 0x0065,
+        0x0078, 0x24fa, 0x782b, 0x3008, 0x781b, 0x0065, 0x0078, 0x24fa,
+        0x781b, 0x0058, 0x0078, 0x24fa, 0x782b, 0x3008, 0x781b, 0x0056,
+        0x0078, 0x24fa, 0x2009, 0x5220, 0x210c, 0xa186, 0x0000, 0x0040,
+        0x397e, 0xa186, 0x0001, 0x0040, 0x3981, 0x2009, 0x5238, 0x200b,
+        0x000b, 0x706f, 0x0001, 0x781b, 0x0048, 0x007c, 0x781b, 0x00c4,
+        0x007c, 0x2009, 0x5238, 0x200b, 0x000a, 0x007c, 0x2009, 0x5220,
+        0x210c, 0xa186, 0x0000, 0x0040, 0x39a1, 0xa186, 0x0001, 0x0040,
+        0x399b, 0x2009, 0x5238, 0x200b, 0x000b, 0x706f, 0x0001, 0x781b,
+        0x0048, 0x0078, 0x24fa, 0x2009, 0x5238, 0x200b, 0x000a, 0x0078,
+        0x24fa, 0x782b, 0x3008, 0x781b, 0x00c4, 0x0078, 0x24fa, 0x781b,
+        0x00ca, 0x0078, 0x24fa, 0x782b, 0x3008, 0x781b, 0x00ca, 0x0078,
+        0x24fa, 0x781b, 0x008f, 0x0078, 0x24fa, 0x782b, 0x3008, 0x781b,
+        0x008f, 0x0078, 0x24fa, 0x6818, 0xa084, 0x8000, 0x0040, 0x39c2,
+        0x681b, 0x001d, 0x706f, 0x0001, 0x781b, 0x0048, 0x0078, 0x24fa,
+        0x007e, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x39de, 0x7808, 0xa084,
+        0xfffc, 0x780a, 0x0005, 0x0005, 0x0005, 0x0005, 0x78ec, 0xa084,
+        0x0021, 0x0040, 0x39de, 0x7044, 0x780a, 0xa005, 0x007f, 0x007c,
+        0x7044, 0xa085, 0x0002, 0x7046, 0x780a, 0x007c, 0x007e, 0x7830,
+        0xa084, 0x0040, 0x00c0, 0x39e7, 0x0098, 0x39f2, 0x007f, 0x789a,
+        0x78ac, 0x007c, 0x7808, 0xa084, 0xfffd, 0x780a, 0x0005, 0x0005,
+        0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x0040, 0x3a01, 0x0098,
+        0x39ff, 0x007f, 0x789a, 0x78ac, 0x007e, 0x7044, 0x780a, 0x007f,
+        0x007c, 0x78ec, 0xa084, 0x0002, 0x00c0, 0x4871, 0xa784, 0x007d,
+        0x00c0, 0x3a15, 0x2700, 0x1078, 0x248c, 0xa784, 0x0001, 0x00c0,
+        0x300c, 0xa784, 0x0070, 0x0040, 0x3a25, 0x0c7e, 0x2d60, 0x2f68,
+        0x1078, 0x2437, 0x2d78, 0x2c68, 0x0c7f, 0xa784, 0x0008, 0x0040,
+        0x3a32, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x2523,
+        0x0078, 0x3956, 0xa784, 0x0004, 0x0040, 0x3a65, 0x78b8, 0xa084,
+        0x4001, 0x0040, 0x3a65, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003,
+        0x0040, 0x2523, 0x78e4, 0xa084, 0x0007, 0xa086, 0x0001, 0x00c0,
+        0x3a65, 0x78c0, 0xa085, 0x4800, 0x2030, 0x7e5a, 0x781b, 0x00ca,
+        0x0078, 0x24fa, 0x784b, 0x0008, 0x6818, 0xa084, 0x8000, 0x0040,
+        0x3a61, 0x681b, 0x0015, 0xa684, 0x4000, 0x0040, 0x3a61, 0x681b,
+        0x0007, 0x1078, 0x396a, 0x0078, 0x24fa, 0x681b, 0x0003, 0x7858,
+        0xa084, 0x3f00, 0x681e, 0x682f, 0x0000, 0x6833, 0x0000, 0x784b,
+        0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x2a06, 0x0018, 0x24fa,
+        0x0078, 0x3773, 0x6b14, 0x8307, 0xa084, 0x000f, 0x8003, 0x8003,
+        0x8003, 0xa080, 0x5480, 0x2060, 0x2048, 0x7056, 0x6000, 0x705a,
+        0x6004, 0x705e, 0x2a60, 0x007c, 0x0079, 0x3a8e, 0x3a96, 0x3a97,
+        0x3a96, 0x3a99, 0x3a96, 0x3a96, 0x3a96, 0x3a9e, 0x007c, 0x1078,
+        0x34b8, 0x1078, 0x4887, 0x7038, 0x600a, 0x007c, 0x70a0, 0xa005,
+        0x0040, 0x3aab, 0x2068, 0x1078, 0x1bd3, 0x1078, 0x47fe, 0x1078,
+        0x4805, 0x70a3, 0x0000, 0x007c, 0x0e7e, 0x2091, 0x8000, 0x2071,
+        0x5240, 0x7000, 0xa086, 0x0007, 0x00c0, 0x3ac2, 0x6110, 0x70bc,
+        0xa106, 0x00c0, 0x3ac2, 0x0e7f, 0x1078, 0x1be0, 0x1078, 0x3ac8,
+        0xa006, 0x007c, 0x2091, 0x8001, 0x0e7f, 0xa085, 0x0001, 0x007c,
+        0x0f7e, 0x0e7e, 0x2071, 0x5240, 0x0078, 0x2297, 0x785b, 0x0000,
+        0x70af, 0x000e, 0x2009, 0x0100, 0x017e, 0x70a0, 0xa06d, 0x0040,
+        0x3add, 0x70a3, 0x0000, 0x0078, 0x3ae3, 0x70b3, 0x0000, 0x1078,
+        0x1c0c, 0x0040, 0x3ae9, 0x70ac, 0x6826, 0x1078, 0x3bc6, 0x0078,
+        0x3add, 0x017f, 0x157e, 0x0c7e, 0x0d7e, 0x20a9, 0x0008, 0x2061,
+        0x7610, 0x6000, 0xa105, 0x6002, 0x601c, 0xa06d, 0x0040, 0x3b01,
+        0x6800, 0x601e, 0x1078, 0x19ac, 0x6008, 0x8000, 0x600a, 0x0078,
+        0x3af4, 0x6018, 0xa06d, 0x0040, 0x3b0b, 0x6800, 0x601a, 0x1078,
+        0x19ac, 0x0078, 0x3b01, 0xace0, 0x0008, 0x0070, 0x3b11, 0x0078,
+        0x3af1, 0x709c, 0xa084, 0x8000, 0x0040, 0x3b18, 0x1078, 0x3c44,
+        0x0d7f, 0x0c7f, 0x157f, 0x007c, 0x127e, 0x2091, 0x2300, 0x6804,
+        0xa084, 0x000f, 0x0079, 0x3b24, 0x3b34, 0x3b34, 0x3b34, 0x3b34,
+        0x3b34, 0x3b34, 0x3b36, 0x3b3c, 0x3b34, 0x3b34, 0x3b34, 0x3b34,
+        0x3b34, 0x3b3e, 0x3b34, 0x3b36, 0x1078, 0x248c, 0x1078, 0x45d3,
+        0x1078, 0x19ac, 0x0078, 0x3b42, 0x6827, 0x000b, 0x1078, 0x45d3,
+        0x1078, 0x3bc6, 0x127f, 0x007c, 0x127e, 0x2091, 0x2300, 0x0098,
+        0x3b60, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x3b60, 0x0d7e, 0x1078,
+        0x4812, 0x2d00, 0x682e, 0x2009, 0x0004, 0x2001, 0x0000, 0x6827,
+        0x0084, 0x1078, 0x47c7, 0x1078, 0x3bc6, 0x0d7f, 0x0078, 0x3b94,
+        0x7948, 0xa185, 0x4000, 0x784a, 0x0098, 0x3b69, 0x794a, 0x0078,
+        0x3b4e, 0x7828, 0xa086, 0x1834, 0x00c0, 0x3b72, 0xa185, 0x0004,
+        0x0078, 0x3b79, 0x7828, 0xa086, 0x1814, 0x00c0, 0x3b66, 0xa185,
+        0x000c, 0x784a, 0x789b, 0x000e, 0x78ab, 0x0002, 0x7858, 0xa084,
+        0x00ff, 0xa085, 0x0400, 0x785a, 0x70b4, 0xa080, 0x0091, 0x781a,
+        0x6827, 0x0284, 0x682c, 0x6836, 0x6830, 0x683a, 0x2009, 0x0004,
+        0x2001, 0x0000, 0x1078, 0x47c7, 0x127f, 0x007c, 0x0d7e, 0x6b14,
+        0x1078, 0x1c70, 0x0040, 0x3ba3, 0x2068, 0x6827, 0x0002, 0x1078,
+        0x3bc6, 0x0078, 0x3b98, 0x0d7f, 0x007c, 0x0d7e, 0x6b14, 0x6c28,
+        0xa4a4, 0x00ff, 0x1078, 0x1c1c, 0x0040, 0x3bb3, 0x2068, 0x6827,
+        0x0002, 0x1078, 0x3bc6, 0x0d7f, 0x007c, 0x0d7e, 0x6b14, 0xa39c,
+        0x00ff, 0x1078, 0x1c48, 0x0040, 0x3bc4, 0x2068, 0x6827, 0x0002,
+        0x1078, 0x3bc6, 0x0078, 0x3bb9, 0x0d7f, 0x007c, 0x0c7e, 0x6914,
+        0x1078, 0x3c3b, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0006, 0x0040,
+        0x3be1, 0xa186, 0x000d, 0x0040, 0x3c00, 0xa186, 0x0017, 0x00c0,
+        0x3bdd, 0x1078, 0x19ac, 0x0078, 0x3bdf, 0x1078, 0x1cde, 0x0c7f,
+        0x007c, 0x6004, 0x8001, 0x0048, 0x3bfe, 0x6006, 0x2009, 0x0000,
+        0xa684, 0x0001, 0x00c0, 0x3bee, 0xa18d, 0x8000, 0xa684, 0x0004,
+        0x0040, 0x3bf4, 0xa18d, 0x0002, 0x691e, 0x6823, 0x0000, 0x7104,
+        0x810f, 0x6818, 0xa105, 0x681a, 0x0078, 0x3bdd, 0x1078, 0x248c,
+        0x6018, 0xa005, 0x00c0, 0x3c0f, 0x6008, 0x8001, 0x0048, 0x3c0f,
+        0x600a, 0x601c, 0x6802, 0x2d00, 0x601e, 0x0078, 0x3c25, 0xac88,
+        0x0006, 0x2104, 0xa005, 0x0040, 0x3c18, 0x2008, 0x0078, 0x3c11,
+        0x6802, 0x2d0a, 0x6008, 0x8001, 0x0048, 0x3bdf, 0x600a, 0x6018,
+        0x2068, 0x6800, 0x601a, 0x0078, 0x3c09, 0x157e, 0x137e, 0x147e,
+        0x0c7e, 0x0d7e, 0x1078, 0x1989, 0x00c0, 0x3c30, 0x1078, 0x248c,
+        0x2da0, 0x137f, 0x20a9, 0x0031, 0x53a3, 0x0c7f, 0x147f, 0x137f,
+        0x157f, 0x0078, 0x3bdd, 0xa184, 0x001f, 0x8003, 0x8003, 0x8003,
+        0xa080, 0x7610, 0x2060, 0x007c, 0x2019, 0x5251, 0x2304, 0xa085,
+        0x0001, 0x201a, 0x2019, 0x0102, 0x2304, 0xa085, 0x0001, 0x201a,
+        0x007c, 0x2019, 0x5251, 0x2304, 0xa084, 0xfffe, 0x201a, 0x2019,
+        0x0102, 0x2304, 0xa084, 0xfffe, 0x201a, 0x007c, 0x7990, 0xa18c,
+        0xfff8, 0x7992, 0x70b4, 0xa080, 0x00d8, 0x781a, 0x0078, 0x24fa,
+        0x70a3, 0x0000, 0x7003, 0x0000, 0x7043, 0x0001, 0x7037, 0x0000,
+        0x0018, 0x24b1, 0x1078, 0x1c0c, 0x0040, 0x3c99, 0x2009, 0x520f,
+        0x200b, 0x0000, 0x68bc, 0x2060, 0x6100, 0xa184, 0x0300, 0x0040,
+        0x3c8d, 0x6827, 0x000e, 0xa084, 0x0200, 0x0040, 0x3c89, 0x6827,
+        0x0017, 0x1078, 0x3bc6, 0x0078, 0x3c68, 0x7000, 0xa086, 0x0007,
+        0x00c0, 0x3d0d, 0x2d00, 0x70a2, 0xad80, 0x000f, 0x7036, 0x0078,
+        0x3ca0, 0x7040, 0xa086, 0x0001, 0x0040, 0x2533, 0x0078, 0x24fa,
+        0x2031, 0x0000, 0x691c, 0xa184, 0x0002, 0x0040, 0x3ca9, 0xa6b5,
+        0x0004, 0xa184, 0x00c0, 0x8003, 0x8003, 0x8007, 0xa080, 0x3da6,
+        0x2004, 0xa635, 0x6820, 0xa084, 0x0400, 0x0040, 0x3cc1, 0x789b,
+        0x0018, 0x78ab, 0x0003, 0x789b, 0x0081, 0x78ab, 0x0001, 0xa6b5,
+        0x5000, 0x6820, 0xa084, 0x8000, 0x0040, 0x3ccf, 0xa6b5, 0x0400,
+        0x789b, 0x000e, 0x6824, 0x8007, 0x78aa, 0x0078, 0x3cef, 0x681c,
+        0xd0fc, 0x00c0, 0x3cdd, 0xa6b5, 0x0800, 0x6820, 0xd0c4, 0x0040,
+        0x3cef, 0xa6b5, 0x4000, 0x0078, 0x3cef, 0x6820, 0xd0c4, 0x0040,
+        0x3ce5, 0xa6b5, 0x4000, 0x0078, 0x3cef, 0x789b, 0x0018, 0x78ab,
+        0x0002, 0x789b, 0x0081, 0x78ab, 0x0001, 0xa6b5, 0x1000, 0xa684,
+        0x0200, 0x0040, 0x3d09, 0x682c, 0x78d2, 0x6830, 0x78d6, 0xa684,
+        0x0100, 0x0040, 0x3d07, 0x682c, 0xa084, 0x0001, 0x0040, 0x3d07,
+        0x7888, 0xa084, 0x0040, 0x0040, 0x3d07, 0xa6b5, 0x8000, 0x1078,
+        0x47f6, 0x7e5a, 0x6eb6, 0x0078, 0x4835, 0x1078, 0x39c8, 0x00c0,
+        0x3da0, 0x702c, 0x8004, 0x0048, 0x3d1b, 0x2019, 0x4f49, 0x1078,
+        0x2313, 0x702f, 0x0001, 0x2041, 0x0001, 0x2031, 0x1000, 0x789b,
+        0x0018, 0x6814, 0xa084, 0x001f, 0xa085, 0x0080, 0x78aa, 0x691c,
+        0xa184, 0x0002, 0x0040, 0x3d34, 0xa6b5, 0x0004, 0x78ab, 0x0020,
+        0x6828, 0x78aa, 0xa8c0, 0x0002, 0x681c, 0xd0f4, 0x0040, 0x3d3d,
+        0x2c50, 0x1078, 0x3a7a, 0x1078, 0x4702, 0x6820, 0xa084, 0x8000,
+        0x0040, 0x3d4b, 0xa6b5, 0x0400, 0x789b, 0x000e, 0x6824, 0x8007,
+        0x78aa, 0x0078, 0x3d52, 0x681c, 0xa084, 0x8000, 0x00c0, 0x3d52,
+        0xa6b5, 0x0800, 0x6820, 0xa084, 0x0100, 0x0040, 0x3d59, 0xa6b5,
+        0x4000, 0x681c, 0xa084, 0x00c0, 0x8003, 0x8003, 0x8007, 0xa080,
+        0x3da6, 0x2004, 0xa635, 0xa684, 0x0100, 0x0040, 0x3d73, 0x682c,
+        0xa084, 0x0001, 0x0040, 0x3d73, 0x7888, 0xa084, 0x0040, 0x0040,
+        0x3d73, 0xa6b5, 0x8000, 0x789b, 0x007e, 0x7eae, 0x6eb6, 0x6814,
+        0x8007, 0x78aa, 0x7882, 0x2810, 0x7aaa, 0x7830, 0xa084, 0x00c0,
+        0x00c0, 0x3da0, 0x0018, 0x3da0, 0x70b4, 0xa080, 0x00dd, 0x781a,
+        0x1078, 0x39e0, 0xa684, 0x0200, 0x0040, 0x3d94, 0x682c, 0x78d2,
+        0x6830, 0x78d6, 0x1078, 0x47f6, 0x2d00, 0x70a2, 0x704a, 0x6810,
+        0x70be, 0x7003, 0x0007, 0xad80, 0x000f, 0x7036, 0x0078, 0x24fa,
+        0x1078, 0x1bd3, 0x1078, 0x39e0, 0x0078, 0x24fa, 0x0000, 0x0300,
+        0x0200, 0x0000, 0x1078, 0x248c, 0x2300, 0x0079, 0x3daf, 0x3db2,
+        0x3db2, 0x3db4, 0x1078, 0x248c, 0x1078, 0x4805, 0x6924, 0xa184,
+        0x00ff, 0xa086, 0x000a, 0x0040, 0x3dc6, 0xa184, 0xff00, 0xa085,
+        0x000a, 0x6826, 0x1078, 0x1bd3, 0x0078, 0x3c68, 0x2001, 0x000a,
+        0x1078, 0x4797, 0x0078, 0x3c68, 0xa282, 0x0005, 0x0050, 0x3dd2,
+        0x1078, 0x248c, 0x7000, 0xa084, 0x0007, 0x10c0, 0x3a8c, 0x1078,
+        0x1989, 0x00c0, 0x3df4, 0x2069, 0xffff, 0xa684, 0x0004, 0x0040,
+        0x3de5, 0x2001, 0x2800, 0x0078, 0x3de7, 0x2001, 0x0800, 0x71b4,
+        0xa188, 0x0091, 0x789b, 0x000e, 0x8007, 0x78aa, 0x2031, 0x0400,
+        0x7e5a, 0x791a, 0x0078, 0x24fa, 0x6807, 0x0106, 0x680b, 0x0000,
+        0x689f, 0x0000, 0x6827, 0x0000, 0xa386, 0x0002, 0x00c0, 0x3e15,
+        0xa286, 0x0002, 0x00c0, 0x3e15, 0x78a0, 0xa005, 0x00c0, 0x3e15,
+        0xa484, 0x8000, 0x00c0, 0x3e15, 0x78e4, 0xa084, 0x0008, 0x0040,
+        0x3e15, 0xa6b5, 0x0008, 0x2019, 0x0000, 0x1078, 0x4217, 0x2d00,
+        0x70a2, 0x704a, 0x7003, 0x0007, 0x7037, 0x0000, 0x6824, 0xa084,
+        0x0080, 0x0040, 0x3e27, 0x1078, 0x42cd, 0x0078, 0x24fa, 0x2300,
+        0x0079, 0x3e2a, 0x3e2d, 0x3eae, 0x3ec7, 0x2200, 0x0079, 0x3e30,
+        0x3e35, 0x3e45, 0x3e6b, 0x3e77, 0x3e9a, 0x2029, 0x0001, 0xa026,
+        0x2011, 0x0000, 0x1078, 0x43f3, 0x0079, 0x3e3e, 0x3e43, 0x24fa,
+        0x3c68, 0x3e43, 0x3e43, 0x1078, 0x248c, 0x7990, 0xa18c, 0x0007,
+        0x00c0, 0x3e4c, 0x2009, 0x0008, 0x2011, 0x0001, 0xa684, 0x0004,
+        0x0040, 0x3e54, 0x2011, 0x0003, 0x2220, 0xa12a, 0x2011, 0x0001,
+        0x1078, 0x43f3, 0x0079, 0x3e5c, 0x3e61, 0x24fa, 0x3c68, 0x3e69,
+        0x3e63, 0x0078, 0x483b, 0x70ab, 0x3e67, 0x0078, 0x24fa, 0x0078,
+        0x3e61, 0x1078, 0x248c, 0xa684, 0x0010, 0x0040, 0x3e75, 0x1078,
+        0x429c, 0x0040, 0x3e75, 0x0078, 0x24fa, 0x0078, 0x430d, 0x6000,
+        0xa084, 0x0002, 0x0040, 0x3e94, 0x70b4, 0xa080, 0x00cd, 0x781a,
+        0x0d7e, 0x1078, 0x4812, 0x2d00, 0x682e, 0x6827, 0x0000, 0x1078,
+        0x3bc6, 0x0d7f, 0x1078, 0x19ac, 0x7003, 0x0000, 0x7037, 0x0000,
+        0x704b, 0x0000, 0x0078, 0x3c68, 0xa684, 0x0004, 0x00c0, 0x3e9a,
+        0x0078, 0x483b, 0x6000, 0xa084, 0x0004, 0x00c0, 0x3eac, 0x6000,
+        0xa084, 0x0001, 0x0040, 0x3eac, 0x70ab, 0x3eac, 0x2001, 0x0007,
+        0x1078, 0x478f, 0x0078, 0x4841, 0x0078, 0x483b, 0x2200, 0x0079,
+        0x3eb1, 0x3eb6, 0x3eb8, 0x3eb6, 0x3eb6, 0x3eb6, 0x1078, 0x248c,
+        0x70a7, 0x3ebc, 0x0078, 0x4847, 0x78e4, 0xa084, 0x0008, 0x00c0,
+        0x3eb8, 0x1078, 0x4781, 0x70ab, 0x3ec5, 0x0078, 0x483b, 0x2200,
+        0x0079, 0x3eca, 0x3ecf, 0x3ed1, 0x3ed1, 0x3ecf, 0x3ecf, 0x1078,
+        0x248c, 0x78e4, 0xa084, 0x0008, 0x0040, 0x3ee6, 0x70a7, 0x3eda,
+        0x0078, 0x4847, 0x2011, 0x0004, 0x1078, 0x43ed, 0x0079, 0x3ee0,
+        0x3ee6, 0x24fa, 0x3c68, 0x3ee6, 0x3ef0, 0x3ef4, 0x70ab, 0x3eee,
+        0x2001, 0x0003, 0x1078, 0x478f, 0x0078, 0x4841, 0x0078, 0x483b,
+        0x70ab, 0x3ee6, 0x0078, 0x24fa, 0x70ab, 0x3ef8, 0x0078, 0x24fa,
+        0x0078, 0x3eee, 0xa282, 0x0003, 0x0050, 0x3f00, 0x1078, 0x248c,
+        0xa386, 0x0002, 0x00c0, 0x3f19, 0xa286, 0x0002, 0x00c0, 0x3f1f,
+        0x78a0, 0xa005, 0x00c0, 0x3f1f, 0xa484, 0x8000, 0x00c0, 0x3f1f,
+        0x78e4, 0xa084, 0x0008, 0x0040, 0x3f19, 0xa6b5, 0x0008, 0x2019,
+        0x0000, 0xa684, 0x0008, 0x0040, 0x3f1f, 0x1078, 0x4279, 0x6810,
+        0x70be, 0x7003, 0x0007, 0x2300, 0x0079, 0x3f26, 0x3f29, 0x3f56,
+        0x3f5e, 0x2200, 0x0079, 0x3f2c, 0x3f31, 0x3f2f, 0x3f4a, 0x1078,
+        0x248c, 0x7990, 0xa1ac, 0x0007, 0xa026, 0x2011, 0x0001, 0x1078,
+        0x43f3, 0x0079, 0x3f3b, 0x3f40, 0x24fa, 0x3c68, 0x3f48, 0x3f42,
+        0x0078, 0x483b, 0x70ab, 0x3f46, 0x0078, 0x24fa, 0x0078, 0x3f40,
+        0x1078, 0x248c, 0xa684, 0x0010, 0x0040, 0x3f54, 0x1078, 0x429c,
+        0x0040, 0x3f54, 0x0078, 0x24fa, 0x0078, 0x430d, 0x2200, 0x0079,
+        0x3f59, 0x3f5c, 0x3f5c, 0x3f5c, 0x1078, 0x248c, 0x2200, 0x0079,
+        0x3f61, 0x3f64, 0x3f66, 0x3f66, 0x1078, 0x248c, 0x78e4, 0xa084,
+        0x0008, 0x0040, 0x3f7b, 0x70a7, 0x3f6f, 0x0078, 0x4847, 0x2011,
+        0x0004, 0x1078, 0x43ed, 0x0079, 0x3f75, 0x3f7b, 0x24fa, 0x3c68,
+        0x3f7b, 0x3f85, 0x3f89, 0x70ab, 0x3f83, 0x2001, 0x0003, 0x1078,
+        0x478f, 0x0078, 0x4841, 0x0078, 0x483b, 0x70ab, 0x3f7b, 0x0078,
+        0x24fa, 0x70ab, 0x3f8d, 0x0078, 0x24fa, 0x0078, 0x3f83, 0x2300,
+        0x0079, 0x3f92, 0x3f97, 0x3f99, 0x3f95, 0x1078, 0x248c, 0x70a4,
+        0x007a, 0x70a4, 0x007a, 0xa282, 0x0002, 0x0050, 0x3fa1, 0x1078,
+        0x248c, 0xa684, 0x0200, 0x0040, 0x3fab, 0x1078, 0x47fe, 0x1078,
+        0x43d5, 0x1078, 0x4805, 0x2300, 0x0079, 0x3fae, 0x3fb1, 0x3fd9,
+        0x403f, 0xad86, 0xffff, 0x0040, 0x3c68, 0xa286, 0x0001, 0x0040,
+        0x3fbb, 0x1078, 0x248c, 0xa684, 0x0200, 0x0040, 0x3fc3, 0x1078,
+        0x47fe, 0x1078, 0x4805, 0x2001, 0x0001, 0x1078, 0x4797, 0x78b8,
+        0xa084, 0xc001, 0x0040, 0x3fd5, 0x7848, 0xa085, 0x0008, 0x784a,
+        0x7848, 0xa084, 0x0008, 0x00c0, 0x3fd0, 0x7003, 0x0000, 0x0078,
+        0x3c68, 0x2200, 0x0079, 0x3fdc, 0x3fde, 0x400f, 0x70a7, 0x3fe2,
+        0x0078, 0x4847, 0x2011, 0x000d, 0x1078, 0x43ed, 0x0079, 0x3fe8,
+        0x3fef, 0x24fa, 0x3c68, 0x3ff7, 0x3fff, 0x4005, 0x4007, 0xa6b4,
+        0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0xa6b4,
+        0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0x70ab,
+        0x4003, 0x0078, 0x24fa, 0x0078, 0x3fef, 0x1078, 0x248c, 0x70ab,
+        0x400b, 0x0078, 0x24fa, 0x1078, 0x484d, 0x0078, 0x24fa, 0x70a7,
+        0x4013, 0x0078, 0x4847, 0x2011, 0x0012, 0x1078, 0x43ed, 0x0079,
+        0x4019, 0x401f, 0x24fa, 0x3c68, 0x402b, 0x4033, 0x4039, 0xa6b4,
+        0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a, 0x70b4, 0xa080, 0x00aa,
+        0x781a, 0x0078, 0x24fa, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6,
+        0x7e5a, 0x0078, 0x4835, 0x70ab, 0x4037, 0x0078, 0x24fa, 0x0078,
+        0x401f, 0x70ab, 0x403d, 0x0078, 0x24fa, 0x0078, 0x402b, 0xa286,
+        0x0001, 0x0040, 0x4045, 0x1078, 0x248c, 0x70a7, 0x4049, 0x0078,
+        0x4847, 0x2011, 0x0015, 0x1078, 0x43ed, 0x0079, 0x404f, 0x4054,
+        0x24fa, 0x3c68, 0x4062, 0x406e, 0xa6b4, 0x00ff, 0xa6b5, 0x0400,
+        0x6eb6, 0x7e5a, 0x783b, 0x1301, 0x70b4, 0xa080, 0x00b5, 0x781a,
+        0x0078, 0x24fa, 0xa6b4, 0x00ff, 0xa6b5, 0x0400, 0x6eb6, 0x7e5a,
+        0x70b4, 0xa080, 0x00aa, 0x781a, 0x0078, 0x24fa, 0x70ab, 0x4072,
+        0x0078, 0x24fa, 0x0078, 0x4054, 0xa282, 0x0003, 0x0050, 0x407a,
+        0x1078, 0x248c, 0x2300, 0x0079, 0x407d, 0x4080, 0x40b7, 0x4114,
+        0xa286, 0x0001, 0x0040, 0x4086, 0x1078, 0x248c, 0x6804, 0xa084,
+        0x00ff, 0xa086, 0x0006, 0x00c0, 0x4093, 0x1078, 0x3bc6, 0x7003,
+        0x0000, 0x0078, 0x3c68, 0x683b, 0x0000, 0x6837, 0x0000, 0xa684,
+        0x0200, 0x0040, 0x40a1, 0x1078, 0x47fe, 0x1078, 0x43d5, 0x1078,
+        0x4805, 0x2001, 0x0001, 0x1078, 0x4797, 0x78b8, 0xa084, 0xc001,
+        0x0040, 0x40b3, 0x7848, 0xa085, 0x0008, 0x784a, 0x7848, 0xa084,
+        0x0008, 0x00c0, 0x40ae, 0x7003, 0x0000, 0x0078, 0x3c68, 0x2200,
+        0x0079, 0x40ba, 0x40bc, 0x40ef, 0x70a7, 0x40c0, 0x0078, 0x4847,
+        0x2011, 0x000d, 0x1078, 0x43ed, 0x0079, 0x40c6, 0x40cd, 0x24fa,
+        0x3c68, 0x40d5, 0x40dd, 0x40e3, 0x40e5, 0xa6b4, 0x00ff, 0xa6b5,
+        0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0xa6b4, 0x00ff, 0xa6b5,
+        0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0x70ab, 0x40e1, 0x0078,
+        0x24fa, 0x0078, 0x40cd, 0x1078, 0x248c, 0x70ab, 0x40eb, 0x1078,
+        0x4805, 0x0078, 0x24fa, 0x1078, 0x484d, 0x0078, 0x24fa, 0x70a7,
+        0x40f3, 0x0078, 0x4847, 0x2011, 0x0005, 0x1078, 0x43ed, 0x0079,
+        0x40f9, 0x40fe, 0x24fa, 0x3c68, 0x4106, 0x410e, 0xa6b4, 0x00ff,
+        0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0xa6b4, 0x00ff,
+        0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0x70ab, 0x4112,
+        0x0078, 0x24fa, 0x0078, 0x40fe, 0xa286, 0x0001, 0x0040, 0x411a,
+        0x1078, 0x248c, 0x70a7, 0x411e, 0x0078, 0x4847, 0x2011, 0x0006,
+        0x1078, 0x43ed, 0x0079, 0x4124, 0x4129, 0x24fa, 0x3c68, 0x412f,
+        0x4139, 0xa6b5, 0x0800, 0x6eb6, 0x7e5a, 0x0078, 0x4835, 0xa6b4,
+        0x00ff, 0xa6b5, 0x0800, 0x6eb6, 0xa6b5, 0x4000, 0x7e5a, 0x0078,
+        0x4835, 0x70ab, 0x413d, 0x0078, 0x24fa, 0x0078, 0x4129, 0x2300,
+        0x0079, 0x4142, 0x4147, 0x4145, 0x4145, 0x1078, 0x248c, 0x1078,
+        0x248c, 0x2300, 0x71a8, 0xa005, 0x017a, 0x6810, 0x70be, 0xa282,
+        0x0003, 0x0050, 0x4155, 0x1078, 0x248c, 0x2300, 0x0079, 0x4158,
+        0x415b, 0x4169, 0x418b, 0xa684, 0x0200, 0x0040, 0x4163, 0x1078,
+        0x47fe, 0x1078, 0x4805, 0x2001, 0x0001, 0x1078, 0x4797, 0x0078,
+        0x24fa, 0xa296, 0x0002, 0x0040, 0x4172, 0x82ff, 0x0040, 0x4172,
+        0x1078, 0x248c, 0x70a7, 0x4176, 0x0078, 0x4847, 0x2011, 0x0018,
+        0x1078, 0x43ed, 0x0079, 0x417c, 0x4181, 0x24fa, 0x3c68, 0x4183,
+        0x4185, 0x0078, 0x4835, 0x0078, 0x4835, 0x70ab, 0x4189, 0x0078,
+        0x24fa, 0x0078, 0x4181, 0x2200, 0x0079, 0x418e, 0x4190, 0x41a9,
+        0x70a7, 0x4194, 0x0078, 0x4847, 0x2011, 0x0017, 0x1078, 0x43ed,
+        0x0079, 0x419a, 0x419f, 0x24fa, 0x3c68, 0x41a1, 0x41a3, 0x0078,
+        0x4835, 0x0078, 0x4835, 0x70ab, 0x41a7, 0x0078, 0x24fa, 0x0078,
+        0x419f, 0xa484, 0x8000, 0x00c0, 0x4205, 0xa684, 0x0100, 0x0040,
+        0x41b5, 0x1078, 0x47fe, 0x1078, 0x43d5, 0x78d8, 0x78d2, 0x78dc,
+        0x78d6, 0xa6b4, 0xefff, 0x7e5a, 0x70a7, 0x41c0, 0x0078, 0x4847,
+        0x2011, 0x000d, 0x1078, 0x43ed, 0x0079, 0x41c6, 0x41cd, 0x24fa,
+        0x3c68, 0x41cd, 0x41f3, 0x41f9, 0x41fb, 0x78d8, 0x79dc, 0xa105,
+        0x00c0, 0x41df, 0x78b8, 0xa084, 0x001f, 0x00c0, 0x41df, 0x70b3,
+        0x0000, 0x7858, 0xa084, 0xfdff, 0x785a, 0x0078, 0x4835, 0xa684,
+        0x0100, 0x0040, 0x41f1, 0x7848, 0xa085, 0x0008, 0x784a, 0x1078,
+        0x47bc, 0x682c, 0x78d2, 0x6830, 0x78d6, 0x70b3, 0x0000, 0x1078,
+        0x47f6, 0x0078, 0x4835, 0x70ab, 0x41f7, 0x0078, 0x24fa, 0x0078,
+        0x41cd, 0x1078, 0x248c, 0x70ab, 0x4201, 0x1078, 0x4805, 0x0078,
+        0x24fa, 0x1078, 0x484d, 0x0078, 0x24fa, 0x1078, 0x4805, 0x70ab,
+        0x420f, 0x2001, 0x0003, 0x1078, 0x478f, 0x0078, 0x4841, 0x1078,
+        0x47f6, 0x682c, 0x78d2, 0x6830, 0x78d6, 0x0078, 0x4835, 0x70b8,
+        0x6812, 0x70be, 0x8000, 0x70ba, 0x681b, 0x0000, 0xa684, 0x0008,
+        0x0040, 0x423a, 0x157e, 0x137e, 0x147e, 0x7890, 0x8004, 0x8004,
+        0x8004, 0x8004, 0xa084, 0x000f, 0x681a, 0x80ac, 0x789b, 0x0000,
+        0xaf80, 0x002b, 0x2098, 0xad80, 0x000b, 0x20a0, 0x53a5, 0x147f,
+        0x137f, 0x157f, 0xa6c4, 0x0f00, 0xa684, 0x0002, 0x00c0, 0x4249,
+        0x692c, 0x810d, 0x810d, 0x810d, 0xa184, 0x0007, 0x2008, 0x0078,
+        0x425c, 0x789b, 0x0010, 0x79ac, 0xa184, 0x0020, 0x0040, 0x425c,
+        0x017e, 0x2009, 0x0005, 0x2001, 0x3d00, 0x1078, 0x47c7, 0x6824,
+        0xa085, 0x003b, 0x6826, 0x017f, 0xa184, 0x001f, 0xa805, 0x6816,
+        0x1078, 0x3c3b, 0x68be, 0xa684, 0x0004, 0x0040, 0x426d, 0xa18c,
+        0xff00, 0x78a8, 0xa084, 0x00ff, 0xa105, 0x682a, 0xa6b4, 0x00ff,
+        0x6000, 0xa084, 0x0008, 0x0040, 0x4277, 0xa6b5, 0x4000, 0x6eb6,
+        0x007c, 0x157e, 0x137e, 0x147e, 0x6918, 0x7890, 0x8004, 0x8004,
+        0x8004, 0x8004, 0xa084, 0x000f, 0x007e, 0xa100, 0x681a, 0x007f,
+        0x8000, 0x8004, 0x0040, 0x4298, 0x20a8, 0x8104, 0xa080, 0x000b,
+        0xad00, 0x20a0, 0x789b, 0x0000, 0xaf80, 0x002b, 0x2098, 0x53a5,
+        0x147f, 0x137f, 0x157f, 0x007c, 0x682c, 0xa084, 0x0020, 0x00c0,
+        0x42a4, 0x620c, 0x0078, 0x42a5, 0x6210, 0x6b18, 0x2300, 0xa202,
+        0x0040, 0x42c5, 0x2018, 0xa382, 0x000e, 0x0048, 0x42b5, 0x0040,
+        0x42b5, 0x2019, 0x000e, 0x0078, 0x42b9, 0x7858, 0xa084, 0xffef,
+        0x785a, 0x783b, 0x1b01, 0x7893, 0x0000, 0x7ba2, 0x70b4, 0xa080,
+        0x008e, 0x781a, 0xa085, 0x0001, 0x007c, 0x7858, 0xa084, 0xffef,
+        0x785a, 0x7893, 0x0000, 0xa006, 0x007c, 0x6904, 0xa18c, 0x00ff,
+        0xa196, 0x0007, 0x0040, 0x42da, 0xa196, 0x000f, 0x0040, 0x42da,
+        0x6807, 0x0117, 0x6914, 0x1078, 0x3c3b, 0x6100, 0x8104, 0x00c8,
+        0x42f5, 0x601c, 0xa005, 0x0040, 0x42e9, 0x2001, 0x0800, 0x0078,
+        0x42f7, 0x0d7e, 0x6824, 0x007e, 0x1078, 0x4812, 0x007f, 0x6826,
+        0x2d00, 0x682e, 0x1078, 0x3bc6, 0x0d7f, 0x2001, 0x0200, 0x6924,
+        0xa18c, 0x00ff, 0xa10d, 0x6926, 0x8007, 0x789b, 0x000e, 0x78aa,
+        0x6820, 0xa085, 0x8000, 0x6822, 0x2031, 0x0400, 0x6eb6, 0x7e5a,
+        0x71b4, 0xa188, 0x0091, 0x791a, 0x007c, 0xa6c4, 0x0f00, 0xa684,
+        0x0002, 0x00c0, 0x4321, 0x692c, 0x810d, 0x810d, 0x810d, 0xa184,
+        0x0007, 0x2008, 0xa805, 0x6816, 0x1078, 0x3c3b, 0x68be, 0x0078,
+        0x4324, 0x6914, 0x1078, 0x3c3b, 0x6100, 0x8104, 0x00c8, 0x4382,
+        0xa184, 0x0300, 0x0040, 0x4330, 0x6807, 0x0117, 0x0078, 0x434e,
+        0x6004, 0xa005, 0x00c0, 0x4357, 0x6807, 0x0117, 0x601c, 0xa005,
+        0x00c0, 0x4344, 0x0d7e, 0x1078, 0x4812, 0x6827, 0x0034, 0x2d00,
+        0x682e, 0x1078, 0x3bc6, 0x0d7f, 0xa684, 0x0004, 0x0040, 0x434e,
+        0x2031, 0x0400, 0x2001, 0x2800, 0x0078, 0x4352, 0x2031, 0x0400,
+        0x2001, 0x0800, 0x71b4, 0xa188, 0x0091, 0x0078, 0x43b0, 0x6018,
+        0xa005, 0x00c0, 0x4344, 0x601c, 0xa005, 0x00c0, 0x4344, 0x689f,
+        0x0000, 0x6827, 0x003d, 0xa684, 0x0001, 0x0040, 0x43be, 0xd694,
+        0x00c0, 0x437b, 0x6100, 0xd1d4, 0x0040, 0x437b, 0x692c, 0xa18c,
+        0x00ff, 0x0040, 0x43be, 0xa186, 0x0003, 0x0040, 0x43be, 0xa186,
+        0x0012, 0x0040, 0x43be, 0xa6b5, 0x0800, 0x71b4, 0xa188, 0x00ae,
+        0x0078, 0x43b9, 0x6807, 0x0117, 0x2031, 0x0400, 0x692c, 0xa18c,
+        0x00ff, 0xa186, 0x0012, 0x00c0, 0x4393, 0x2001, 0x43cb, 0x2009,
+        0x0001, 0x0078, 0x43a4, 0xa186, 0x0003, 0x00c0, 0x439d, 0x2001,
+        0x43cc, 0x2009, 0x0012, 0x0078, 0x43a4, 0x2001, 0x0200, 0x71b4,
+        0xa188, 0x0091, 0x0078, 0x43b0, 0x1078, 0x47e1, 0x78a3, 0x0000,
+        0x681c, 0xa085, 0x0040, 0x681e, 0x71b4, 0xa188, 0x00da, 0xa006,
+        0x6826, 0x8007, 0x789b, 0x000e, 0x78aa, 0x6820, 0xa085, 0x8000,
+        0x6822, 0x6eb6, 0x7e5a, 0x791a, 0x0078, 0x24fa, 0x6eb6, 0x1078,
+        0x3bc6, 0x6810, 0x70be, 0x7003, 0x0007, 0x70a3, 0x0000, 0x704b,
+        0x0000, 0x0078, 0x24fa, 0x0023, 0x0070, 0x0005, 0x0000, 0x0a00,
+        0x0000, 0x0000, 0x0025, 0x0000, 0x0000, 0x683b, 0x0000, 0x6837,
+        0x0000, 0xa684, 0x0200, 0x0040, 0x43ec, 0x78b8, 0xa08c, 0x001f,
+        0xa084, 0x8000, 0x0040, 0x43e5, 0x8108, 0x78d8, 0xa100, 0x6836,
+        0x78dc, 0xa081, 0x0000, 0x683a, 0x007c, 0x7990, 0x810f, 0xa5ac,
+        0x0007, 0x2021, 0x0000, 0xa480, 0x0010, 0x789a, 0x79a8, 0xa18c,
+        0x00ff, 0xa184, 0x0080, 0x00c0, 0x441b, 0xa182, 0x0020, 0x00c8,
+        0x4439, 0xa182, 0x0012, 0x00c8, 0x4781, 0x2100, 0x1079, 0x4409,
+        0x007c, 0x4781, 0x45eb, 0x4781, 0x4781, 0x4446, 0x4449, 0x4483,
+        0x44b9, 0x44ed, 0x44f0, 0x4781, 0x4781, 0x44a4, 0x4514, 0x454e,
+        0x4781, 0x4781, 0x4574, 0xa184, 0x0020, 0x00c0, 0x45a8, 0xa18c,
+        0x001f, 0x6814, 0xa084, 0x001f, 0xa106, 0x0040, 0x4436, 0x70b4,
+        0xa080, 0x00cd, 0x781a, 0x2001, 0x0014, 0x1078, 0x4797, 0x1078,
+        0x4805, 0x7003, 0x0000, 0x2001, 0x0002, 0x007c, 0x2001, 0x0000,
+        0x007c, 0xa182, 0x0024, 0x00c8, 0x4781, 0xa184, 0x0003, 0x1079,
+        0x4409, 0x007c, 0x4781, 0x4781, 0x4781, 0x4781, 0x1078, 0x4781,
+        0x007c, 0x2200, 0x0079, 0x444c, 0x4577, 0x4577, 0x4470, 0x4470,
+        0x4470, 0x4470, 0x4470, 0x4470, 0x4470, 0x4470, 0x446e, 0x4470,
+        0x4465, 0x4470, 0x4470, 0x4470, 0x4470, 0x4470, 0x4478, 0x447b,
+        0x4577, 0x447b, 0x4470, 0x4470, 0x4470, 0x0c7e, 0x077e, 0x6f14,
+        0x1078, 0x37b0, 0x077f, 0x0c7f, 0x0078, 0x4470, 0x1078, 0x468e,
+        0x6827, 0x02b3, 0x2009, 0x000b, 0x2001, 0x4800, 0x0078, 0x45ab,
+        0x1078, 0x4773, 0x007c, 0x6827, 0x0093, 0x2009, 0x000b, 0x2001,
+        0x4800, 0x0078, 0x4593, 0x2d58, 0x6804, 0xa084, 0x00ff, 0xa086,
+        0x0006, 0x00c0, 0x448d, 0x6807, 0x0117, 0x6827, 0x0002, 0x1078,
+        0x4812, 0x6827, 0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078,
+        0x3b96, 0x1078, 0x45d3, 0x2b68, 0x1078, 0x3bc6, 0x0d7f, 0x1078,
+        0x3bc6, 0x2001, 0x0002, 0x007c, 0x1078, 0x45d3, 0x2001, 0x0017,
+        0x1078, 0x4797, 0x70a3, 0x0000, 0x2009, 0x5238, 0x200b, 0x0006,
+        0x70af, 0x0017, 0x2009, 0x0200, 0x1078, 0x3ad4, 0x2001, 0x0001,
+        0x007c, 0x2200, 0x0079, 0x44bc, 0x4577, 0x45a8, 0x45a8, 0x45a8,
+        0x44dd, 0x45ba, 0x44e5, 0x45ba, 0x45ba, 0x45bd, 0x45bd, 0x45c2,
+        0x45c2, 0x44d5, 0x44d5, 0x45a8, 0x45a8, 0x45ba, 0x45a8, 0x44e5,
+        0x4577, 0x44e5, 0x44e5, 0x44e5, 0x44e5, 0x6827, 0x0084, 0x2009,
+        0x000b, 0x2001, 0x4300, 0x0078, 0x45cc, 0x6827, 0x000d, 0x2009,
+        0x000b, 0x2001, 0x4300, 0x0078, 0x45ab, 0x6827, 0x0093, 0x2009,
+        0x000b, 0x2001, 0x4300, 0x0078, 0x4593, 0x2001, 0x0000, 0x007c,
+        0x2200, 0x0079, 0x44f3, 0x4577, 0x450c, 0x450c, 0x450c, 0x450c,
+        0x45ba, 0x45ba, 0x45ba, 0x45ba, 0x45ba, 0x45ba, 0x45ba, 0x45ba,
+        0x450c, 0x450c, 0x450c, 0x450c, 0x45ba, 0x450c, 0x450c, 0x45ba,
+        0x45ba, 0x45ba, 0x45ba, 0x4577, 0x6827, 0x0093, 0x2009, 0x000b,
+        0x2001, 0x4300, 0x0078, 0x4593, 0xa684, 0x0004, 0x00c0, 0x4528,
+        0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x4781, 0x1078,
+        0x45d3, 0x6807, 0x0117, 0x1078, 0x3bc6, 0x2001, 0x0002, 0x007c,
+        0x6000, 0xa084, 0x0004, 0x0040, 0x4781, 0x2d58, 0x6804, 0xa084,
+        0x00ff, 0xa086, 0x0006, 0x00c0, 0x4537, 0x6807, 0x0117, 0x6827,
+        0x0002, 0x1078, 0x4812, 0x6827, 0x0036, 0x6932, 0x2d00, 0x682e,
+        0x0d7e, 0x1078, 0x3ba5, 0x1078, 0x45d3, 0x2b68, 0x1078, 0x3bc6,
+        0x0d7f, 0x1078, 0x3bc6, 0x2001, 0x0002, 0x007c, 0x6000, 0xa084,
+        0x0004, 0x0040, 0x4781, 0x6a04, 0xa294, 0x00ff, 0xa286, 0x0006,
+        0x00c0, 0x455c, 0x6807, 0x0117, 0x6827, 0x0002, 0x2d58, 0x1078,
+        0x4812, 0x6827, 0x0036, 0x6932, 0x2d00, 0x682e, 0x0d7e, 0x1078,
+        0x3bb5, 0x1078, 0x45d3, 0x2b68, 0x1078, 0x3bc6, 0x0d7f, 0x1078,
+        0x3bc6, 0x2001, 0x0002, 0x007c, 0x1078, 0x4781, 0x007c, 0x70b4,
+        0xa080, 0x00cd, 0x781a, 0x2001, 0x0001, 0x1078, 0x4797, 0x1078,
+        0x4805, 0x7003, 0x0000, 0x2001, 0x0002, 0x007c, 0x1078, 0x47c7,
+        0x1078, 0x47fe, 0x1078, 0x43d5, 0x1078, 0x42cd, 0x1078, 0x4805,
+        0x2001, 0x0001, 0x007c, 0x1078, 0x47c7, 0x1078, 0x47fe, 0x1078,
+        0x43d5, 0x70b4, 0xa080, 0x00cd, 0x781a, 0x2001, 0x0013, 0x1078,
+        0x4797, 0x1078, 0x4805, 0x7003, 0x0000, 0x2001, 0x0002, 0x007c,
+        0x1078, 0x4781, 0x007c, 0x1078, 0x47c7, 0x1078, 0x47fe, 0x1078,
+        0x43d5, 0x1078, 0x42cd, 0x1078, 0x4805, 0x1078, 0x484d, 0x2001,
+        0x0001, 0x007c, 0x2001, 0x0003, 0x007c, 0x1078, 0x468e, 0x2001,
+        0x0000, 0x007c, 0x0c7e, 0x077e, 0x6f14, 0x1078, 0x37b0, 0x077f,
+        0x0c7f, 0x2001, 0x0000, 0x007c, 0x1078, 0x47c7, 0x1078, 0x4781,
+        0x2001, 0x0006, 0x007c, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007,
+        0x0040, 0x45de, 0xa186, 0x000f, 0x00c0, 0x45e2, 0x1078, 0x47fe,
+        0x1078, 0x43d5, 0x70b4, 0xa080, 0x00cd, 0x781a, 0x1078, 0x4805,
+        0x7003, 0x0000, 0x007c, 0x7aa8, 0xa294, 0x00ff, 0x78a8, 0xa084,
+        0x00ff, 0xa08a, 0x0004, 0x00c8, 0x4781, 0x1079, 0x45f8, 0x007c,
+        0x4781, 0x45fc, 0x4781, 0x4695, 0xa282, 0x0003, 0x0040, 0x4603,
+        0x1078, 0x4781, 0x007c, 0x7da8, 0xa5ac, 0x00ff, 0x7ca8, 0xa4a4,
+        0x00ff, 0x69b8, 0xa184, 0x0100, 0x0040, 0x4642, 0xa18c, 0xfeff,
+        0x69ba, 0x78a0, 0xa005, 0x00c0, 0x4642, 0xa4a4, 0x00ff, 0x0040,
+        0x4636, 0xa482, 0x000c, 0x0040, 0x461f, 0x00c8, 0x4629, 0x852b,
+        0x852b, 0x1078, 0x382e, 0x0040, 0x4629, 0x1078, 0x3627, 0x0078,
+        0x4638, 0x1078, 0x4760, 0x1078, 0x3652, 0x69b8, 0xa18d, 0x0100,
+        0x69ba, 0xa6b5, 0x1000, 0x7e5a, 0x0078, 0x463b, 0x1078, 0x3652,
+        0xa6b4, 0xefff, 0x7e5a, 0x70b4, 0xa080, 0x0091, 0x781a, 0x2001,
+        0x0001, 0x007c, 0x0c7e, 0x1078, 0x4682, 0x6200, 0xd2e4, 0x0040,
+        0x4673, 0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x000c, 0x0048,
+        0x4655, 0x0040, 0x4655, 0x2011, 0x000c, 0x2400, 0xa202, 0x00c8,
+        0x465a, 0x2220, 0x6208, 0xa294, 0x00ff, 0x701c, 0xa202, 0x00c8,
+        0x4662, 0x721c, 0x2200, 0xa502, 0x00c8, 0x4667, 0x2228, 0x1078,
+        0x4764, 0x852b, 0x852b, 0x1078, 0x382e, 0x0040, 0x4673, 0x1078,
+        0x362e, 0x0078, 0x4677, 0x1078, 0x4760, 0x1078, 0x3659, 0xa6b5,
+        0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9, 0x781a, 0x2001, 0x0004,
+        0x0c7f, 0x007c, 0x007e, 0x6814, 0x8007, 0xa084, 0x000f, 0x8003,
+        0x8003, 0x8003, 0xa0e0, 0x5480, 0x007f, 0x007c, 0x0c7e, 0x1078,
+        0x4682, 0x1078, 0x3659, 0x0c7f, 0x007c, 0xa282, 0x0002, 0x00c0,
+        0x4781, 0x7aa8, 0xa294, 0x00ff, 0x69b8, 0xa184, 0x0200, 0x0040,
+        0x46cc, 0xa18c, 0xfdff, 0x69ba, 0x78a0, 0xa005, 0x00c0, 0x46cc,
+        0xa282, 0x0002, 0x00c8, 0x376b, 0x1078, 0x472a, 0x1078, 0x36f9,
+        0x1078, 0x3652, 0xa684, 0x0100, 0x0040, 0x46c2, 0x682c, 0xa084,
+        0x0001, 0x0040, 0x46c2, 0xc6fc, 0x7888, 0xa084, 0x0040, 0x0040,
+        0x46c2, 0xc6fd, 0xa6b5, 0x1000, 0x7e5a, 0x70b4, 0xa080, 0x0091,
+        0x781a, 0x2001, 0x0001, 0x007c, 0x0c7e, 0x1078, 0x4682, 0xa284,
+        0xfffe, 0x0040, 0x46d7, 0x2011, 0x0001, 0x0078, 0x46db, 0xa284,
+        0x0001, 0x0040, 0x46e1, 0x6100, 0xd1ec, 0x00c0, 0x46e1, 0x2011,
+        0x0000, 0x1078, 0x471c, 0x1078, 0x3700, 0x1078, 0x3659, 0xa684,
+        0x0100, 0x0040, 0x46f7, 0x682c, 0xa084, 0x0001, 0x0040, 0x46f7,
+        0xc6fc, 0x7888, 0xa084, 0x0040, 0x0040, 0x46f7, 0xc6fd, 0xa6b5,
+        0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9, 0x781a, 0x2001, 0x0004,
+        0x0c7f, 0x007c, 0x0c7e, 0x2960, 0x6000, 0x2011, 0x0001, 0xa084,
+        0x2000, 0x00c0, 0x470d, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab,
+        0x0002, 0x78ab, 0x0003, 0x7aaa, 0xa8c0, 0x0004, 0x68b8, 0xa085,
+        0x0200, 0x68ba, 0x0c7f, 0x007c, 0x789b, 0x0018, 0x78ab, 0x0001,
+        0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0081, 0x78ab,
+        0x0004, 0x007c, 0x0c7e, 0x7054, 0x2060, 0x6000, 0xa084, 0x1000,
+        0x00c0, 0x4738, 0x2029, 0x0032, 0x2021, 0x0000, 0x0078, 0x4758,
+        0x6508, 0xa5ac, 0x00ff, 0x7018, 0xa086, 0x0028, 0x00c0, 0x4748,
+        0xa582, 0x0019, 0x00c8, 0x474e, 0x2029, 0x0019, 0x0078, 0x474e,
+        0xa582, 0x000c, 0x00c8, 0x474e, 0x2029, 0x000c, 0x6408, 0x8427,
+        0xa4a4, 0x00ff, 0xa482, 0x000c, 0x0048, 0x4758, 0x2021, 0x000c,
+        0x1078, 0x4764, 0x68b8, 0xa085, 0x0100, 0x68ba, 0x0c7f, 0x007c,
+        0x2021, 0x0000, 0x2029, 0x0032, 0x789b, 0x0018, 0x78ab, 0x0001,
+        0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa, 0x7caa, 0x789b, 0x0081,
+        0x78ab, 0x0005, 0x007c, 0x2001, 0x0003, 0x1078, 0x478f, 0xa6b5,
+        0x1000, 0x7e5a, 0x70b4, 0xa080, 0x00b9, 0x781a, 0x2001, 0x0005,
+        0x007c, 0x2001, 0x0007, 0x1078, 0x478f, 0xa6b5, 0x1000, 0x7e5a,
+        0x70b4, 0xa080, 0x00b9, 0x781a, 0x2001, 0x0004, 0x007c, 0x789b,
+        0x0018, 0x78aa, 0x789b, 0x0081, 0x78ab, 0x0001, 0x007c, 0x6904,
+        0xa18c, 0x00ff, 0xa196, 0x0007, 0x0040, 0x47a5, 0xa196, 0x000f,
+        0x0040, 0x47a5, 0x1078, 0x19ac, 0x007c, 0x6924, 0xa194, 0x003f,
+        0x00c0, 0x47ae, 0xa18c, 0xffc0, 0xa105, 0x6826, 0x1078, 0x3bc6,
+        0x691c, 0xa184, 0x0100, 0x0040, 0x47bb, 0x6914, 0x1078, 0x3c3b,
+        0x6204, 0x8210, 0x6206, 0x007c, 0x692c, 0x6834, 0x682e, 0xa112,
+        0x6930, 0x6838, 0x6832, 0xa11b, 0xa200, 0xa301, 0x007c, 0x0c7e,
+        0xade0, 0x0018, 0x6003, 0x0070, 0x6106, 0x600b, 0x0000, 0x600f,
+        0x0a00, 0x6013, 0x0000, 0x6017, 0x0000, 0x8007, 0x601a, 0x601f,
+        0x0000, 0x6023, 0x0000, 0x0c7f, 0x6824, 0xa085, 0x0080, 0x6826,
+        0x007c, 0x157e, 0x137e, 0x147e, 0x2098, 0xaf80, 0x002d, 0x20a0,
+        0x81ac, 0x0040, 0x47ec, 0x53a6, 0xa184, 0x0001, 0x0040, 0x47f2,
+        0x3304, 0x78be, 0x147f, 0x137f, 0x157f, 0x007c, 0x70b0, 0xa005,
+        0x10c0, 0x248c, 0x70b3, 0x8000, 0x0078, 0x4b4b, 0x71b0, 0x81ff,
+        0x0040, 0x4804, 0x1078, 0x4c41, 0x007c, 0x71b0, 0x81ff, 0x0040,
+        0x4811, 0x7848, 0xa085, 0x0008, 0x784a, 0x70b3, 0x0000, 0x1078,
+        0x4887, 0x007c, 0x0c7e, 0x0d7e, 0x1078, 0x1989, 0x00c0, 0x481a,
+        0x1078, 0x248c, 0x0c7f, 0x157e, 0x137e, 0x147e, 0x2da0, 0x2c98,
+        0x20a9, 0x0031, 0x53a3, 0x147f, 0x137f, 0x157f, 0x6807, 0x010d,
+        0x680b, 0x0000, 0x7004, 0x8007, 0x681a, 0x6823, 0x0000, 0x681f,
+        0x0000, 0x689f, 0x0000, 0x0c7f, 0x007c, 0x70b4, 0xa080, 0x0091,
+        0x781a, 0x0078, 0x24fa, 0x70b4, 0xa080, 0x0081, 0x781a, 0x0078,
+        0x24fa, 0x70b4, 0xa080, 0x00b9, 0x781a, 0x0078, 0x24fa, 0x70b4,
+        0xa080, 0x00c3, 0x781a, 0x0078, 0x24fa, 0x6904, 0xa18c, 0x00ff,
+        0xa196, 0x0007, 0x0040, 0x485a, 0xa196, 0x000f, 0x0040, 0x485a,
+        0x6807, 0x0117, 0x6824, 0xa084, 0x00ff, 0xa085, 0x0200, 0x6826,
+        0x8007, 0x789b, 0x000e, 0x78aa, 0x6820, 0xa085, 0x8000, 0x6822,
+        0x2031, 0x0400, 0x6eb6, 0x7e5a, 0x71b4, 0xa188, 0x0091, 0x791a,
+        0x007c, 0x1078, 0x4805, 0x7848, 0xa085, 0x000c, 0x784a, 0x70b4,
+        0xa080, 0x00cd, 0x781a, 0x2009, 0x000b, 0x2001, 0x4400, 0x1078,
+        0x47c7, 0x2001, 0x0013, 0x1078, 0x4797, 0x0078, 0x3c68, 0x127e,
+        0x2091, 0x2200, 0x2049, 0x4887, 0x7000, 0x7204, 0xa205, 0x720c,
+        0xa215, 0x7008, 0xa084, 0xfff7, 0xa205, 0x0040, 0x4899, 0x0078,
+        0x489e, 0x7003, 0x0000, 0x127f, 0x2000, 0x007c, 0x7000, 0xa084,
+        0x0001, 0x00c0, 0x48cc, 0x7108, 0x8103, 0x00c8, 0x48ab, 0x1078,
+        0x49ce, 0x0078, 0x48a3, 0x700c, 0xa08c, 0x00ff, 0x0040, 0x48cc,
+        0x7004, 0x8004, 0x00c8, 0x48c3, 0x7014, 0xa005, 0x00c0, 0x48bf,
+        0x7010, 0xa005, 0x0040, 0x48c3, 0xa102, 0x00c8, 0x48a3, 0x7007,
+        0x0010, 0x0078, 0x48cc, 0x8aff, 0x0040, 0x48cc, 0x1078, 0x4c18,
+        0x00c0, 0x48c6, 0x0040, 0x48a3, 0x1078, 0x4957, 0x7003, 0x0000,
+        0x127f, 0x2000, 0x007c, 0x017e, 0x6104, 0xa18c, 0x00ff, 0xa186,
+        0x0007, 0x0040, 0x48df, 0xa18e, 0x000f, 0x00c0, 0x48e2, 0x6040,
+        0x0078, 0x48e3, 0x6428, 0x017f, 0x84ff, 0x0040, 0x490d, 0x2c70,
+        0x7004, 0xa0bc, 0x000f, 0xa7b8, 0x491d, 0x273c, 0x87fb, 0x00c0,
+        0x48fb, 0x0048, 0x48f5, 0x1078, 0x248c, 0x609c, 0xa075, 0x0040,
+        0x490d, 0x0078, 0x48e8, 0x2704, 0xae68, 0x6808, 0xa630, 0x680c,
+        0xa529, 0x8421, 0x0040, 0x490d, 0x8738, 0x2704, 0xa005, 0x00c0,
+        0x48fc, 0x709c, 0xa075, 0x00c0, 0x48e8, 0x007c, 0x0000, 0x0005,
+        0x0009, 0x000d, 0x0011, 0x0015, 0x0019, 0x001d, 0x0000, 0x0003,
+        0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0000, 0x4912, 0x490f,
+        0x0000, 0x0000, 0x8000, 0x0000, 0x4912, 0x0000, 0x491a, 0x4917,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x491a, 0x0000, 0x4915, 0x4915,
+        0x0000, 0x0000, 0x8000, 0x0000, 0x4915, 0x0000, 0x491b, 0x491b,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x491b, 0x127e, 0x2091, 0x2200,
+        0x2079, 0x5200, 0x2071, 0x0010, 0x7007, 0x000a, 0x7007, 0x0002,
+        0x7003, 0x0000, 0x2071, 0x0020, 0x7007, 0x000a, 0x7007, 0x0002,
+        0x7003, 0x0000, 0x2049, 0x0000, 0x127f, 0x2000, 0x007c, 0x2049,
+        0x4957, 0x2019, 0x0000, 0x7004, 0x8004, 0x00c8, 0x49aa, 0x7007,
+        0x0012, 0x7108, 0x7008, 0xa106, 0x00c0, 0x4961, 0xa184, 0x01e0,
+        0x0040, 0x496c, 0x1078, 0x248c, 0x2001, 0x04fd, 0x2004, 0xa082,
+        0x0005, 0x00c8, 0x4977, 0xa184, 0x4000, 0x00c0, 0x4961, 0xa19c,
+        0x300c, 0xa386, 0x2004, 0x0040, 0x4985, 0xa386, 0x0008, 0x0040,
+        0x4990, 0xa386, 0x200c, 0x00c0, 0x4961, 0x7200, 0x8204, 0x0048,
+        0x4990, 0x730c, 0xa384, 0x00ff, 0x0040, 0x4990, 0x1078, 0x248c,
+        0x7007, 0x0012, 0x7000, 0xa084, 0x0001, 0x00c0, 0x49aa, 0x7008,
+        0xa084, 0x01e0, 0x00c0, 0x49aa, 0x7310, 0x7014, 0xa305, 0x0040,
+        0x49aa, 0x710c, 0xa184, 0x0300, 0x00c0, 0x49aa, 0xa184, 0x00ff,
+        0x00c0, 0x4957, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004, 0xa084,
+        0x0008, 0x00c0, 0x49ae, 0x7007, 0x0012, 0x7108, 0x8103, 0x0048,
+        0x49b3, 0x7003, 0x0000, 0x2049, 0x0000, 0x007c, 0x107e, 0x007e,
+        0x127e, 0x157e, 0x2091, 0x2200, 0x7108, 0x1078, 0x49ce, 0x157f,
+        0x127f, 0x2091, 0x8001, 0x007f, 0x107f, 0x007c, 0x7204, 0x7500,
+        0x730c, 0xa384, 0x0300, 0x00c0, 0x49f5, 0xa184, 0x01e0, 0x00c0,
+        0x4a19, 0x7108, 0xa184, 0x01e0, 0x00c0, 0x4a19, 0x2001, 0x04fd,
+        0x2004, 0xa082, 0x0005, 0x00c8, 0x49e9, 0xa184, 0x4000, 0x00c0,
+        0x49d9, 0xa184, 0x0007, 0x0079, 0x49ed, 0x49f7, 0x4a09, 0x49f5,
+        0x4a09, 0x49f5, 0x4a55, 0x49f5, 0x4a53, 0x1078, 0x248c, 0x7004,
+        0xa084, 0x0010, 0xa085, 0x0002, 0x7006, 0x8aff, 0x00c0, 0x4a04,
+        0x2049, 0x0000, 0x0078, 0x4a08, 0x1078, 0x4c18, 0x00c0, 0x4a04,
+        0x007c, 0x7004, 0xa084, 0x0010, 0xa085, 0x0002, 0x7006, 0x8aff,
+        0x00c0, 0x4a14, 0x0078, 0x4a18, 0x1078, 0x4c18, 0x00c0, 0x4a14,
+        0x007c, 0x7007, 0x0012, 0x7108, 0x00e0, 0x4a1c, 0x2091, 0x6000,
+        0x00e0, 0x4a20, 0x2091, 0x6000, 0x7007, 0x0012, 0x7007, 0x0008,
+        0x7004, 0xa084, 0x0008, 0x00c0, 0x4a28, 0x7007, 0x0012, 0x7108,
+        0x8103, 0x0048, 0x4a2d, 0x7003, 0x0000, 0x7000, 0xa005, 0x00c0,
+        0x4a41, 0x7004, 0xa005, 0x00c0, 0x4a41, 0x700c, 0xa005, 0x0040,
+        0x4a43, 0x0078, 0x4a24, 0x2049, 0x0000, 0x1078, 0x38d7, 0x6818,
+        0xa084, 0x8000, 0x0040, 0x4a4e, 0x681b, 0x0002, 0x007c, 0x1078,
+        0x248c, 0x1078, 0x248c, 0x1078, 0x4ab1, 0x7210, 0x7114, 0x700c,
+        0xa09c, 0x00ff, 0x2800, 0xa300, 0xa211, 0xa189, 0x0000, 0x1078,
+        0x4ab1, 0x2704, 0x2c58, 0xac60, 0x6308, 0x2200, 0xa322, 0x630c,
+        0x2100, 0xa31b, 0x2400, 0xa305, 0x0040, 0x4a78, 0x00c8, 0x4a78,
+        0x8412, 0x8210, 0x830a, 0xa189, 0x0000, 0x2b60, 0x0078, 0x4a5f,
+        0x2b60, 0x8a07, 0x007e, 0x6004, 0xa084, 0x0008, 0x0040, 0x4a84,
+        0xa7ba, 0x4917, 0x0078, 0x4a86, 0xa7ba, 0x490f, 0x007f, 0xa73d,
+        0x2c00, 0x6886, 0x6f8a, 0x6c92, 0x6b8e, 0x7007, 0x0012, 0x1078,
+        0x4957, 0x007c, 0x8738, 0x2704, 0xa005, 0x00c0, 0x4aa5, 0x609c,
+        0xa005, 0x0040, 0x4aae, 0x2060, 0x6004, 0xa084, 0x000f, 0xa080,
+        0x491d, 0x203c, 0x87fb, 0x1040, 0x248c, 0x8a51, 0x0040, 0x4aad,
+        0x7008, 0xa084, 0x0003, 0xa086, 0x0003, 0x007c, 0x2051, 0x0000,
+        0x007c, 0x8a50, 0x8739, 0x2704, 0xa004, 0x00c0, 0x4ac5, 0x6000,
+        0xa064, 0x00c0, 0x4abc, 0x2d60, 0x6004, 0xa084, 0x000f, 0xa080,
+        0x492d, 0x203c, 0x87fb, 0x1040, 0x248c, 0x007c, 0x127e, 0x0d7e,
+        0x2091, 0x2200, 0x0d7f, 0x6884, 0x2060, 0x6888, 0x6b8c, 0x6c90,
+        0x8057, 0xaad4, 0x00ff, 0xa084, 0x00ff, 0x007e, 0x6804, 0xa084,
+        0x0008, 0x007f, 0x0040, 0x4ae0, 0xa0b8, 0x4917, 0x0078, 0x4ae2,
+        0xa0b8, 0x490f, 0x7e08, 0xa6b5, 0x000c, 0x6904, 0xa18c, 0x00ff,
+        0xa186, 0x0007, 0x0040, 0x4af0, 0xa18e, 0x000f, 0x00c0, 0x4af9,
+        0x681c, 0xa084, 0x0040, 0x0040, 0x4b00, 0xa6b5, 0x0001, 0x0078,
+        0x4b00, 0x681c, 0xa084, 0x0040, 0x0040, 0x4b00, 0xa6b5, 0x0001,
+        0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4b02, 0x2400,
+        0xa305, 0x00c0, 0x4b0d, 0x0078, 0x4b33, 0x2c58, 0x2704, 0x6104,
+        0xac60, 0x6000, 0xa400, 0x701a, 0x6004, 0xa301, 0x701e, 0xa184,
+        0x0008, 0x0040, 0x4b23, 0x6010, 0xa081, 0x0000, 0x7022, 0x6014,
+        0xa081, 0x0000, 0x7026, 0x6208, 0x2400, 0xa202, 0x7012, 0x620c,
+        0x2300, 0xa203, 0x7016, 0x7602, 0x7007, 0x0001, 0x2b60, 0x1078,
+        0x4a92, 0x0078, 0x4b35, 0x1078, 0x4c18, 0x00c0, 0x4b33, 0x127f,
+        0x2000, 0x007c, 0x127e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x7007,
+        0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4b41, 0x7003, 0x0008,
+        0x127f, 0x2000, 0x007c, 0x127e, 0x0d7e, 0x2091, 0x2200, 0x0d7f,
+        0x2049, 0x4b4b, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0,
+        0x4b54, 0x7e08, 0xa6b5, 0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186,
+        0x0007, 0x0040, 0x4b67, 0xa18e, 0x000f, 0x00c0, 0x4b72, 0x681c,
+        0xa084, 0x0040, 0x0040, 0x4b6e, 0xa6b5, 0x0001, 0x6840, 0x2050,
+        0x0078, 0x4b7b, 0x681c, 0xa084, 0x0020, 0x00c0, 0x4b79, 0xa6b5,
+        0x0001, 0x6828, 0x2050, 0x2d60, 0x6004, 0xa0bc, 0x000f, 0xa7b8,
+        0x491d, 0x273c, 0x87fb, 0x00c0, 0x4b8f, 0x0048, 0x4b89, 0x1078,
+        0x248c, 0x689c, 0xa065, 0x0040, 0x4b93, 0x0078, 0x4b7c, 0x1078,
+        0x4c18, 0x00c0, 0x4b8f, 0x127f, 0x2000, 0x007c, 0x127e, 0x007e,
+        0x017e, 0x0d7e, 0x2091, 0x2200, 0x0d7f, 0x037f, 0x047f, 0x7e08,
+        0xa6b5, 0x000c, 0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040,
+        0x4bad, 0xa18e, 0x000f, 0x00c0, 0x4bb6, 0x681c, 0xa084, 0x0040,
+        0x0040, 0x4bbd, 0xa6b5, 0x0001, 0x0078, 0x4bbd, 0x681c, 0xa084,
+        0x0040, 0x0040, 0x4bbd, 0xa6b5, 0x0001, 0x2049, 0x4b96, 0x017e,
+        0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4bcb, 0xa18e,
+        0x000f, 0x00c0, 0x4bce, 0x6840, 0x0078, 0x4bcf, 0x6828, 0x017f,
+        0xa055, 0x0040, 0x4c15, 0x2d70, 0x2e60, 0x7004, 0xa0bc, 0x000f,
+        0xa7b8, 0x491d, 0x273c, 0x87fb, 0x00c0, 0x4be9, 0x0048, 0x4be2,
+        0x1078, 0x248c, 0x709c, 0xa075, 0x2060, 0x0040, 0x4c15, 0x0078,
+        0x4bd5, 0x2704, 0xae68, 0x6808, 0xa422, 0x680c, 0xa31b, 0x0048,
+        0x4c02, 0x8a51, 0x00c0, 0x4bf6, 0x1078, 0x248c, 0x8738, 0x2704,
+        0xa005, 0x00c0, 0x4bea, 0x709c, 0xa075, 0x2060, 0x0040, 0x4c15,
+        0x0078, 0x4bd5, 0x8422, 0x8420, 0x831a, 0xa399, 0x0000, 0x6908,
+        0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x00c8, 0x4c11, 0x1078,
+        0x248c, 0x2071, 0x0020, 0x0078, 0x4b00, 0x127f, 0x2000, 0x007c,
+        0x7008, 0xa084, 0x0003, 0xa086, 0x0003, 0x0040, 0x4c40, 0x2704,
+        0xac08, 0x2104, 0x701a, 0x8108, 0x2104, 0x701e, 0x8108, 0x2104,
+        0x7012, 0x8108, 0x2104, 0x7016, 0x6004, 0xa084, 0x0008, 0x0040,
+        0x4c37, 0x8108, 0x2104, 0x7022, 0x8108, 0x2104, 0x7026, 0x7602,
+        0x7004, 0xa084, 0x0010, 0xa085, 0x0001, 0x7006, 0x1078, 0x4a92,
+        0x007c, 0x127e, 0x007e, 0x0d7e, 0x2091, 0x2200, 0x2049, 0x4c41,
+        0x0d7f, 0x087f, 0x7108, 0xa184, 0x0003, 0x00c0, 0x4c6b, 0x017e,
+        0x6904, 0xa18c, 0x00ff, 0xa186, 0x0007, 0x0040, 0x4c5b, 0xa18e,
+        0x000f, 0x00c0, 0x4c5e, 0x6840, 0x0078, 0x4c5f, 0x6828, 0x017f,
+        0xa005, 0x0040, 0x4c79, 0x0078, 0x489e, 0x0020, 0x4c6b, 0x1078,
+        0x4a55, 0x0078, 0x4c79, 0x00a0, 0x4c72, 0x7108, 0x1078, 0x49ce,
+        0x0078, 0x4c4a, 0x7007, 0x0010, 0x00a0, 0x4c74, 0x7108, 0x1078,
+        0x49ce, 0x7008, 0xa086, 0x0008, 0x00c0, 0x4c4a, 0x7000, 0xa005,
+        0x00c0, 0x4c4a, 0x7003, 0x0000, 0x2049, 0x0000, 0x127f, 0x2000,
+        0x007c, 0x127e, 0x147e, 0x137e, 0x157e, 0x0c7e, 0x0d7e, 0x2091,
+        0x2200, 0x0d7f, 0x2049, 0x4c89, 0xad80, 0x0011, 0x20a0, 0x2099,
+        0x0031, 0x700c, 0xa084, 0x00ff, 0x682a, 0x7007, 0x0008, 0x7007,
+        0x0002, 0x7003, 0x0001, 0x0040, 0x4ca8, 0x8000, 0x80ac, 0x53a5,
+        0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4caa, 0x0c7f,
+        0x2049, 0x0000, 0x7003, 0x0000, 0x157f, 0x137f, 0x147f, 0x127f,
+        0x2000, 0x007c, 0x2091, 0x6000, 0x2091, 0x8000, 0x78cc, 0xa005,
+        0x0040, 0x4cd1, 0x7994, 0x70d0, 0xa106, 0x00c0, 0x4cd1, 0x7804,
+        0xa005, 0x0040, 0x4cd1, 0x7807, 0x0000, 0x0068, 0x4cd1, 0x2091,
+        0x4080, 0x7820, 0x8001, 0x7822, 0x00c0, 0x4d2c, 0x7824, 0x7822,
+        0x2069, 0x5240, 0x6800, 0xa084, 0x0007, 0x0040, 0x4cef, 0xa086,
+        0x0002, 0x0040, 0x4cef, 0x6834, 0xa00d, 0x0040, 0x4cef, 0x2104,
+        0xa005, 0x0040, 0x4cef, 0x8001, 0x200a, 0x0040, 0x4dd4, 0x7848,
+        0xa005, 0x0040, 0x4cfd, 0x8001, 0x784a, 0x00c0, 0x4cfd, 0x2009,
+        0x0102, 0x6844, 0x200a, 0x1078, 0x226f, 0x6890, 0xa005, 0x0040,
+        0x4d09, 0x8001, 0x6892, 0x00c0, 0x4d09, 0x686f, 0x0000, 0x6873,
+        0x0001, 0x2061, 0x5500, 0x20a9, 0x0100, 0x2009, 0x0002, 0x6034,
+        0xa005, 0x0040, 0x4d1f, 0x8001, 0x6036, 0x00c0, 0x4d1f, 0x6010,
+        0xa005, 0x0040, 0x4d1f, 0x017e, 0x1078, 0x226f, 0x017f, 0xace0,
+        0x0010, 0x0070, 0x4d25, 0x0078, 0x4d0f, 0x8109, 0x0040, 0x4d2c,
+        0x20a9, 0x0100, 0x0078, 0x4d0f, 0x1078, 0x4d39, 0x1078, 0x4d5e,
+        0x2009, 0x5251, 0x2104, 0x2009, 0x0102, 0x200a, 0x2091, 0x8001,
+        0x007c, 0x7834, 0x8001, 0x7836, 0x00c0, 0x4d5d, 0x7838, 0x7836,
+        0x2091, 0x8000, 0x7844, 0xa005, 0x00c0, 0x4d48, 0x2001, 0x0101,
+        0x8001, 0x7846, 0xa080, 0x7500, 0x2040, 0x2004, 0xa065, 0x0040,
+        0x4d5d, 0x6024, 0xa005, 0x0040, 0x4d59, 0x8001, 0x6026, 0x0040,
+        0x4d8d, 0x6000, 0x2c40, 0x0078, 0x4d4e, 0x007c, 0x7828, 0x8001,
+        0x782a, 0x00c0, 0x4d8c, 0x782c, 0x782a, 0x7830, 0xa005, 0x00c0,
+        0x4d6b, 0x2001, 0x0200, 0x8001, 0x7832, 0x8003, 0x8003, 0x8003,
+        0x8003, 0xa090, 0x5500, 0xa298, 0x0002, 0x2304, 0xa084, 0x0008,
+        0x0040, 0x4d8c, 0xa290, 0x0009, 0x2204, 0xa005, 0x0040, 0x4d84,
+        0x8001, 0x2012, 0x00c0, 0x4d8c, 0x2304, 0xa084, 0xfff7, 0xa085,
+        0x0080, 0x201a, 0x1078, 0x226f, 0x007c, 0x2069, 0x5240, 0x6800,
+        0xa005, 0x0040, 0x4d97, 0x6848, 0xac06, 0x0040, 0x4dd4, 0x601b,
+        0x0006, 0x60b4, 0xa084, 0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff,
+        0xa085, 0x0060, 0x6022, 0x6000, 0x2042, 0x6714, 0x6f82, 0x1078,
+        0x19c5, 0x6818, 0xa005, 0x0040, 0x4daf, 0x8001, 0x681a, 0x6808,
+        0xa084, 0xffef, 0x680a, 0x6810, 0x8001, 0x00d0, 0x4db9, 0x1078,
+        0x248c, 0x6812, 0x602f, 0x0000, 0x6033, 0x0000, 0x2c68, 0x1078,
+        0x1cdc, 0x2069, 0x5240, 0x7944, 0xa184, 0x0100, 0x2001, 0x0006,
+        0x686e, 0x00c0, 0x4dcf, 0x6986, 0x2001, 0x0004, 0x686e, 0x1078,
+        0x226a, 0x2091, 0x8001, 0x007c, 0x2069, 0x0100, 0x2009, 0x5240,
+        0x2104, 0xa084, 0x0007, 0x0040, 0x4e30, 0xa086, 0x0007, 0x00c0,
+        0x4dea, 0x0d7e, 0x2009, 0x5252, 0x216c, 0x1078, 0x3b1c, 0x0d7f,
+        0x0078, 0x4e30, 0x2009, 0x5252, 0x2164, 0x1078, 0x2437, 0x601b,
+        0x0006, 0x6858, 0xa084, 0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff,
+        0xa085, 0x0048, 0x6022, 0x602f, 0x0000, 0x6033, 0x0000, 0x6830,
+        0xa084, 0x0040, 0x0040, 0x4e24, 0x684b, 0x0004, 0x20a9, 0x0014,
+        0x6848, 0xa084, 0x0004, 0x0040, 0x4e11, 0x0070, 0x4e11, 0x0078,
+        0x4e08, 0x684b, 0x0009, 0x20a9, 0x0014, 0x6848, 0xa084, 0x0001,
+        0x0040, 0x4e1e, 0x0070, 0x4e1e, 0x0078, 0x4e15, 0x20a9, 0x00fa,
+        0x0070, 0x4e24, 0x0078, 0x4e20, 0x6808, 0xa084, 0xfffd, 0x680a,
+        0x681b, 0x0048, 0x2009, 0x525b, 0x200b, 0x0007, 0x784c, 0x784a,
+        0x2091, 0x8001, 0x007c, 0x2079, 0x5200, 0x1078, 0x4e5e, 0x1078,
+        0x4e42, 0x1078, 0x4e50, 0x7833, 0x0000, 0x7847, 0x0000, 0x784b,
+        0x0000, 0x007c, 0x2019, 0x0003, 0x2011, 0x5246, 0x2204, 0xa086,
+        0x003c, 0x0040, 0x4e4d, 0x2019, 0x0002, 0x7b2a, 0x7b2e, 0x007c,
+        0x2019, 0x0039, 0x2011, 0x5246, 0x2204, 0xa086, 0x003c, 0x0040,
+        0x4e5b, 0x2019, 0x0027, 0x7b36, 0x7b3a, 0x007c, 0x2019, 0x3971,
+        0x2011, 0x5246, 0x2204, 0xa086, 0x003c, 0x0040, 0x4e69, 0x2019,
+        0x2626, 0x7b22, 0x7b26, 0x783f, 0x0000, 0x7843, 0x000a, 0x007c,
+        0x0020, 0x002b, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0014, 0x0014, 0x9849, 0x0014, 0x0014,
+        0x0014, 0x0014, 0x0014, 0x0014, 0x0014, 0x0080, 0x000f, 0x0000,
+        0x0201, 0x0604, 0x0c08, 0x2120, 0x4022, 0xf880, 0x0018, 0x300b,
+        0xa201, 0x0014, 0xa200, 0x0014, 0xa200, 0x0214, 0x0000, 0x006c,
+        0x0002, 0x0014, 0x98cd, 0x009e, 0x0093, 0xa202, 0x8838, 0x3806,
+        0x8839, 0x20c3, 0x0864, 0x9885, 0x28c1, 0x9cae, 0xa203, 0x300c,
+        0x2846, 0x8161, 0x846a, 0x8300, 0x1856, 0x883a, 0x9865, 0x28f2,
+        0x9c91, 0x9858, 0x300c, 0x28e1, 0x9c91, 0x2802, 0xa206, 0x64c3,
+        0x282e, 0xa207, 0x64a0, 0x6de0, 0x67a0, 0x6fc0, 0x1814, 0x883b,
+        0x7824, 0x68c1, 0x7864, 0x883e, 0x9879, 0x8576, 0x8677, 0x206b,
+        0x28c1, 0x9cae, 0x2044, 0x2103, 0x20a2, 0x2081, 0x9865, 0xa209,
+        0x2901, 0x988d, 0x0014, 0xa205, 0xa300, 0x1872, 0x879a, 0x883c,
+        0x1fe2, 0xc601, 0xa20a, 0x856e, 0x0704, 0x9c91, 0x0014, 0xa204,
+        0xa300, 0x3009, 0x19e2, 0xf864, 0x856e, 0x883f, 0x08e6, 0x9891,
+        0xf881, 0x988c, 0xc801, 0x0014, 0xf8c1, 0x0016, 0x85b2, 0x80f0,
+        0x9532, 0xfb02, 0x1de2, 0x0014, 0x8532, 0xf241, 0x0014, 0x1de2,
+        0x84a8, 0xd7a0, 0x1fe6, 0x0014, 0xa208, 0x6043, 0x8008, 0x1dc1,
+        0x0016, 0x8300, 0x8160, 0x842a, 0xf041, 0x3008, 0x84a8, 0x11d6,
+        0x7042, 0x20dd, 0x0011, 0x20d5, 0x8822, 0x0016, 0x8000, 0x2847,
+        0x1011, 0x98c0, 0x8000, 0xa000, 0x2802, 0x1011, 0x98c6, 0x9865,
+        0x283e, 0x1011, 0x98ca, 0xa20b, 0x0017, 0x300c, 0xa300, 0x1de2,
+        0xdb81, 0x0014, 0x0210, 0x98d7, 0x0014, 0x26e0, 0x873a, 0xfb02,
+        0x19f2, 0x1fe2, 0x0014, 0xa20d, 0x3806, 0x0210, 0x9cb3, 0x0704,
+        0x0000, 0x006c, 0x0002, 0x984f, 0x0014, 0x009e, 0x00a0, 0x0017,
+        0x60ff, 0x300c, 0x8720, 0xa211, 0x9cd0, 0x8772, 0x8837, 0x2101,
+        0x987a, 0x10d2, 0x78e2, 0x9cd3, 0x9859, 0xd984, 0xf0e2, 0xf0a1,
+        0x98cd, 0x0014, 0x8831, 0xd166, 0x8830, 0x800f, 0x9401, 0xb520,
+        0xc802, 0x8820, 0x987a, 0x2301, 0x987a, 0x10d2, 0x78e4, 0x9cd3,
+        0x8821, 0x8820, 0x9859, 0xf123, 0xf142, 0xf101, 0x98c6, 0x10d2,
+        0x70f6, 0x8832, 0x8203, 0x870c, 0xd99e, 0x6001, 0x0014, 0x6845,
+        0x0214, 0xa21b, 0x9cd0, 0x2001, 0x98c5, 0x8201, 0x1852, 0xd184,
+        0xd163, 0x8834, 0x8001, 0x988d, 0x3027, 0x84a8, 0x1a56, 0x8833,
+        0x0014, 0xa218, 0x6981, 0x9cbc, 0x6926, 0x6902, 0x1a34, 0x9899,
+        0x1a14, 0x7021, 0x0014, 0xa300, 0x6141, 0x6964, 0x8010, 0x8592,
+        0x8026, 0x84b9, 0x69e4, 0x8023, 0x16e1, 0x8001, 0x10f1, 0x6946,
+        0xa213, 0x1462, 0xa213, 0x8000, 0x16e1, 0x98b5, 0x6969, 0xa214,
+        0x61c2, 0x8002, 0x14e1, 0x8004, 0x16e1, 0x0101, 0x300a, 0x8827,
+        0x0014, 0xa217, 0x9cbc, 0x0014, 0xa300, 0x8181, 0x842a, 0x84a8,
+        0x1ce6, 0x882c, 0x0016, 0xa212, 0x9cd0, 0x10d2, 0x70e4, 0x0004,
+        0x8007, 0x9424, 0xcc1a, 0x9cd3, 0x98c5, 0x8827, 0x300a, 0x0013,
+        0x8000, 0x84a4, 0x0016, 0x11c2, 0x211e, 0x870e, 0xa21d, 0x0014,
+        0x878e, 0x0016, 0xa21c, 0x1035, 0x9891, 0xa210, 0xa000, 0x8010,
+        0x8592, 0x853b, 0xd044, 0x8022, 0x3807, 0x84bb, 0x98ea, 0x8021,
+        0x3807, 0x84b9, 0x300c, 0x817e, 0x872b, 0x8772, 0x9891, 0x0000,
+        0x0020, 0x002b, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020,
+        0x0000, 0x0020, 0x0000, 0x0014, 0x0014, 0x9849, 0x0014, 0x0014,
+        0x98e2, 0x98cd, 0x0014, 0x0014, 0x0014, 0x0080, 0x0137, 0x0000,
+        0x0201, 0x0604, 0x0c08, 0x2120, 0x4022, 0xf880, 0x0018, 0x300b,
+        0xa201, 0x0014, 0xa200, 0x0014, 0xa200, 0x0214, 0xa202, 0x8838,
+        0x3806, 0x8839, 0x20c3, 0x0864, 0xa82f, 0x28c1, 0x9cae, 0xa203,
+        0x300c, 0x2846, 0x8161, 0x846a, 0x8300, 0x1856, 0x883a, 0xa804,
+        0x28f2, 0x9c91, 0xa8f4, 0x300c, 0x28e1, 0x9c91, 0x2802, 0xa206,
+        0x64c3, 0x282e, 0xa207, 0x64a0, 0x6de0, 0x67a0, 0x6fc0, 0x1814,
+        0x883b, 0x7824, 0x68c1, 0x7864, 0x883e, 0xa802, 0x8576, 0x8677,
+        0x206b, 0x28c1, 0x9cae, 0x2044, 0x2103, 0x20a2, 0x2081, 0xa8e4,
+        0xa209, 0x2901, 0xa809, 0x0014, 0xa205, 0xa300, 0x1872, 0x879a,
+        0x883c, 0x1fe2, 0xc601, 0xa20a, 0x856e, 0x0704, 0x9c91, 0x0014,
+        0xa204, 0xa300, 0x3009, 0x19e2, 0xf864, 0x856e, 0x883f, 0x08e6,
+        0xa8f7, 0xf881, 0xa8f0, 0xc801, 0x0014, 0xf8c1, 0x0016, 0x85b2,
+        0x80f0, 0x9532, 0xfb02, 0x1de2, 0x0014, 0x8532, 0xf241, 0x0014,
+        0x1de2, 0x84a8, 0xd7a0, 0x1fe6, 0x0014, 0xa208, 0x6043, 0x8008,
+        0x1dc1, 0x0016, 0x8300, 0x8160, 0x842a, 0xf041, 0x3008, 0x84a8,
+        0x11d6, 0x7042, 0x20dd, 0x0011, 0x20d5, 0x8822, 0x0016, 0x8000,
+        0x2847, 0x1011, 0xa8fc, 0x8000, 0xa000, 0x2802, 0x1011, 0xa8fd,
+        0xa89b, 0x283e, 0x1011, 0xa8fd, 0xa20b, 0x0017, 0x300c, 0xa300,
+        0x1de2, 0xdb81, 0x0014, 0x0210, 0xa801, 0x0014, 0x26e0, 0x873a,
+        0xfb02, 0x19f2, 0x1fe2, 0x0014, 0xa20d, 0x3806, 0x0210, 0x9cb3,
+        0x0704, 0x0017, 0x60ff, 0x300c, 0x8720, 0xa211, 0x9d63, 0x8772,
+        0x8837, 0x2101, 0xa821, 0x10d2, 0x78e2, 0x9d66, 0xa8fc, 0xd984,
+        0xf0e2, 0xf0a1, 0xa86c, 0x0014, 0x8831, 0xd166, 0x8830, 0x800f,
+        0x9401, 0xb520, 0xc802, 0x8820, 0xa80f, 0x2301, 0xa80d, 0x10d2,
+        0x78e4, 0x9d66, 0x8821, 0x8820, 0xa8e6, 0xf123, 0xf142, 0xf101,
+        0xa84f, 0x10d2, 0x70f6, 0x8832, 0x8203, 0x870c, 0xd99e, 0x6001,
+        0x0014, 0x6845, 0x0214, 0xa21b, 0x9d63, 0x2001, 0xa840, 0x8201,
+        0x1852, 0xd184, 0xd163, 0x8834, 0x8001, 0xa801, 0x3027, 0x84a8,
+        0x1a56, 0x8833, 0x0014, 0xa218, 0x6981, 0x9d4f, 0x6926, 0x6902,
+        0x1a34, 0xa801, 0x1a14, 0x7021, 0x0014, 0xa300, 0x6141, 0x6964,
+        0x8010, 0x8592, 0x8026, 0x84b9, 0x69e4, 0x8023, 0x16e1, 0x8001,
+        0x10f1, 0x6946, 0xa213, 0x1462, 0xa213, 0x8000, 0x16e1, 0xa807,
+        0x6969, 0xa214, 0x61c2, 0x8002, 0x14e1, 0x8004, 0x16e1, 0x0101,
+        0x300a, 0x8827, 0x0014, 0xa217, 0x9d4f, 0x0014, 0xa300, 0x8181,
+        0x842a, 0x84a8, 0x1ce6, 0x882c, 0x0016, 0xa212, 0x9d63, 0x10d2,
+        0x70e4, 0x0004, 0x8007, 0x9424, 0xcc1a, 0x9d66, 0xa8f8, 0x8827,
+        0x300a, 0x0013, 0x8000, 0x84a4, 0x0016, 0x11c2, 0x211e, 0x870e,
+        0xa21d, 0x0014, 0x878e, 0x0016, 0xa21c, 0x1035, 0xa8b4, 0xa210,
+        0x3807, 0x300c, 0x817e, 0x872b, 0x8772, 0xa8ad, 0x0000, 0x0d0c
 };
-static unsigned short   risc_code_length01 = 0x4057;
-
+static unsigned short risc_code_length01 = 0x4158;
diff --git a/drivers/scsi/ql12160_fw.h b/drivers/scsi/ql12160_fw.h
index 9db6a208c9f8..d89dac0cc9d4 100644
--- a/drivers/scsi/ql12160_fw.h
+++ b/drivers/scsi/ql12160_fw.h
@@ -22,19 +22,19 @@
  ************************************************************************/
 
 /*
- *      Firmware Version 10.04.32 (12:03 May 09, 2001)
+ *      Firmware Version 10.04.42 (15:44 Apr 18, 2003)
  */
 
 #ifdef UNIQUE_FW_NAME
-static unsigned char fw12160i_version_str[] = {10,4,32};
+static unsigned char fw12160i_version_str[] = {10,4,42};
 #else
-static unsigned char firmware_version[] = {10,4,32};
+static unsigned char firmware_version[] = {10,4,42};
 #endif
 
 #ifdef UNIQUE_FW_NAME
-#define fw12160i_VERSION_STRING "10.04.32"
+#define fw12160i_VERSION_STRING "10.04.42"
 #else
-#define FW_VERSION_STRING "10.04.32"
+#define FW_VERSION_STRING "10.04.42"
 #endif
 
 #ifdef UNIQUE_FW_NAME
@@ -48,7 +48,7 @@ static unsigned short fw12160i_code01[] = {
 #else
 static unsigned short risc_code01[] = {
 #endif
-        0x0804, 0x1041, 0x0000, 0x35e6, 0x0000, 0x2043, 0x4f50, 0x5952,
+        0x0804, 0x1041, 0x0000, 0x36c9, 0x0000, 0x2043, 0x4f50, 0x5952,
         0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31,
         0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749, 0x4320,
         0x434f, 0x5250, 0x4f52, 0x4154, 0x494f, 0x4e00, 0x2049, 0x5350,
@@ -56,112 +56,112 @@ static unsigned short risc_code01[] = {
         0x6572, 0x7369, 0x6f6e, 0x2031, 0x302e, 0x3034, 0x2020, 0x2043,
         0x7573, 0x746f, 0x6d65, 0x7220, 0x4e6f, 0x2e20, 0x3030, 0x2050,
         0x726f, 0x6475, 0x6374, 0x204e, 0x6f2e, 0x2020, 0x3030, 0x2020,
-        0x2400, 0x20c9, 0x8fff, 0x2071, 0x0200, 0x70a0, 0x70a2, 0x2001,
+        0x2400, 0x20c9, 0x90ff, 0x2071, 0x0200, 0x70a0, 0x70a2, 0x2001,
         0x01ff, 0x2004, 0xd0fc, 0x1120, 0x2071, 0x0100, 0x70a0, 0x70a2,
         0x20c1, 0x0020, 0x2089, 0x1221, 0x2071, 0x0010, 0x70c3, 0x0004,
         0x70c7, 0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3, 0x000a,
         0x2001, 0x04fd, 0x2004, 0x70d6, 0x2009, 0xfeff, 0x2130, 0x2128,
-        0xa1a2, 0x4600, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424,
-        0xa192, 0x9000, 0x2009, 0x0000, 0x2001, 0x0032, 0x080c, 0x1de8,
-        0x2218, 0x2079, 0x4600, 0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9,
+        0xa1a2, 0x4700, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424,
+        0xa192, 0x9100, 0x2009, 0x0000, 0x2001, 0x0032, 0x080c, 0x1e05,
+        0x2218, 0x2079, 0x4700, 0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9,
         0x0040, 0x42a4, 0x8109, 0x1dd8, 0x2009, 0xff00, 0x3400, 0xa102,
         0x0218, 0x0110, 0x20a8, 0x42a4, 0x781b, 0x0064, 0x7814, 0xc0cd,
-        0xc0d5, 0x7816, 0x2071, 0x0200, 0x00d6, 0x2069, 0x4640, 0x080c,
-        0x459a, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1130, 0x2069, 0x4680,
-        0x2071, 0x0100, 0x080c, 0x459a, 0x7814, 0xc0d4, 0x7816, 0x00de,
+        0xc0d5, 0x7816, 0x2071, 0x0200, 0x00d6, 0x2069, 0x4740, 0x080c,
+        0x465c, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1130, 0x2069, 0x4780,
+        0x2071, 0x0100, 0x080c, 0x465c, 0x7814, 0xc0d4, 0x7816, 0x00de,
         0x7eca, 0x7cc2, 0x7bc6, 0x7867, 0x0000, 0x7800, 0xc08d, 0x7802,
         0x2031, 0x0030, 0x78af, 0x0101, 0x7823, 0x0002, 0x7827, 0x0002,
-        0x2009, 0x0002, 0x2069, 0x4640, 0x681b, 0x0003, 0x6823, 0x0007,
+        0x2009, 0x0002, 0x2069, 0x4740, 0x681b, 0x0003, 0x6823, 0x0007,
         0x6827, 0x00fa, 0x682b, 0x0008, 0x682f, 0x0028, 0x6837, 0x0006,
         0x6833, 0x0008, 0x683b, 0x0000, 0x8109, 0x0500, 0x68cf, 0x000a,
-        0x68bf, 0x46c0, 0x2079, 0x4600, 0x68d3, 0x762d, 0x68c3, 0x4bc0,
-        0x68c7, 0x4ac0, 0x68cb, 0x8bc0, 0x68a7, 0x8e44, 0x68ab, 0x8e49,
-        0x68af, 0x8e44, 0x68b3, 0x8e44, 0x68a3, 0x0001, 0x2001, 0x01ff,
-        0x2004, 0xd0fc, 0x11c8, 0x2069, 0x4680, 0x0870, 0x68cf, 0x000a,
-        0x68bf, 0x48c0, 0x68d3, 0x7839, 0x68c3, 0x6bc0, 0x68c7, 0x4b40,
-        0x68cb, 0x8cd0, 0x68a7, 0x8e49, 0x68ab, 0x8e4e, 0x68af, 0x8e49,
-        0x68b3, 0x8e49, 0x68a3, 0x0001, 0x00e6, 0x2069, 0x4ac0, 0x2071,
+        0x68bf, 0x47c0, 0x2079, 0x4700, 0x68d3, 0x762d, 0x68c3, 0x4cc0,
+        0x68c7, 0x4bc0, 0x68cb, 0x8cc0, 0x68a7, 0x8f44, 0x68ab, 0x8f49,
+        0x68af, 0x8f44, 0x68b3, 0x8f44, 0x68a3, 0x0001, 0x2001, 0x01ff,
+        0x2004, 0xd0fc, 0x11c8, 0x2069, 0x4780, 0x0870, 0x68cf, 0x000a,
+        0x68bf, 0x49c0, 0x68d3, 0x7839, 0x68c3, 0x6cc0, 0x68c7, 0x4c40,
+        0x68cb, 0x8dd0, 0x68a7, 0x8f49, 0x68ab, 0x8f4e, 0x68af, 0x8f49,
+        0x68b3, 0x8f49, 0x68a3, 0x0001, 0x00e6, 0x2069, 0x4bc0, 0x2071,
         0x0200, 0x70ec, 0xd0e4, 0x2019, 0x1809, 0x2021, 0x0009, 0x1120,
-        0x2019, 0x180c, 0x2021, 0x000c, 0x080c, 0x1d58, 0x2001, 0x01ff,
-        0x2004, 0xd0fc, 0x1188, 0x2069, 0x4b40, 0x2071, 0x0100, 0x70ec,
+        0x2019, 0x180c, 0x2021, 0x000c, 0x080c, 0x1d75, 0x2001, 0x01ff,
+        0x2004, 0xd0fc, 0x1188, 0x2069, 0x4c40, 0x2071, 0x0100, 0x70ec,
         0xd0e4, 0x2019, 0x1809, 0x2021, 0x0009, 0x1120, 0x2019, 0x180c,
-        0x2021, 0x000c, 0x080c, 0x1d58, 0x00ee, 0x2011, 0x0002, 0x2069,
-        0x4bc0, 0x2009, 0x0002, 0x20a9, 0x0100, 0x6837, 0x0000, 0x680b,
+        0x2021, 0x000c, 0x080c, 0x1d75, 0x00ee, 0x2011, 0x0002, 0x2069,
+        0x4cc0, 0x2009, 0x0002, 0x20a9, 0x0100, 0x6837, 0x0000, 0x680b,
         0x0040, 0x7bc8, 0xa386, 0xfeff, 0x1128, 0x6817, 0x0100, 0x681f,
         0x0064, 0x0020, 0x6817, 0x0064, 0x681f, 0x0002, 0xade8, 0x0010,
         0x1f04, 0x1135, 0x8109, 0x1d38, 0x2001, 0x01ff, 0x2004, 0xd0fc,
-        0x1128, 0x8211, 0x0118, 0x2069, 0x6bc0, 0x08d8, 0x080c, 0x22cf,
-        0x080c, 0x4015, 0x080c, 0x1b6d, 0x080c, 0x4553, 0x2091, 0x2200,
-        0x2079, 0x4600, 0x2071, 0x0050, 0x2091, 0x2400, 0x2079, 0x4600,
-        0x2071, 0x0020, 0x2091, 0x2600, 0x2079, 0x0200, 0x2071, 0x4640,
-        0x2091, 0x2800, 0x2079, 0x0100, 0x2071, 0x4680, 0x2091, 0x2000,
-        0x2079, 0x4600, 0x2071, 0x0010, 0x3200, 0xa085, 0x303d, 0x2090,
+        0x1128, 0x8211, 0x0118, 0x2069, 0x6cc0, 0x08d8, 0x080c, 0x22f6,
+        0x080c, 0x403d, 0x080c, 0x1b8c, 0x080c, 0x4615, 0x2091, 0x2200,
+        0x2079, 0x4700, 0x2071, 0x0050, 0x2091, 0x2400, 0x2079, 0x4700,
+        0x2071, 0x0020, 0x2091, 0x2600, 0x2079, 0x0200, 0x2071, 0x4740,
+        0x2091, 0x2800, 0x2079, 0x0100, 0x2071, 0x4780, 0x2091, 0x2000,
+        0x2079, 0x4700, 0x2071, 0x0010, 0x3200, 0xa085, 0x303d, 0x2090,
         0x2071, 0x0010, 0x70c3, 0x0000, 0x1004, 0x118c, 0x70c0, 0xa086,
         0x0002, 0x1110, 0x080c, 0x13ba, 0x2039, 0x0000, 0x080c, 0x12ab,
         0x78ac, 0xa005, 0x1180, 0x0e04, 0x119a, 0x786c, 0xa065, 0x0110,
-        0x080c, 0x207a, 0x080c, 0x1e09, 0x0e04, 0x11af, 0x786c, 0xa065,
-        0x0110, 0x080c, 0x207a, 0x0e04, 0x11af, 0x2009, 0x4647, 0x2011,
-        0x4687, 0x2104, 0x220c, 0xa105, 0x0110, 0x080c, 0x1c7c, 0x2071,
-        0x4640, 0x70a0, 0xa005, 0x01e8, 0x744c, 0xa485, 0x0000, 0x01c8,
+        0x080c, 0x20a1, 0x080c, 0x1e26, 0x0e04, 0x11af, 0x786c, 0xa065,
+        0x0110, 0x080c, 0x20a1, 0x0e04, 0x11af, 0x2009, 0x4747, 0x2011,
+        0x4787, 0x2104, 0x220c, 0xa105, 0x0110, 0x080c, 0x1c9b, 0x2071,
+        0x4740, 0x70a0, 0xa005, 0x01e8, 0x744c, 0xa485, 0x0000, 0x01c8,
         0x2079, 0x0200, 0x2091, 0x8000, 0x72d0, 0xa28c, 0x303d, 0x2190,
-        0x080c, 0x2720, 0x2091, 0x8000, 0x2091, 0x303d, 0x0e04, 0x11d1,
-        0x2079, 0x4600, 0x786c, 0xa065, 0x0120, 0x2071, 0x0010, 0x080c,
-        0x207a, 0x1d04, 0x11d9, 0x2079, 0x4600, 0x2071, 0x0010, 0x080c,
-        0x4370, 0x2071, 0x4680, 0x70a0, 0xa005, 0x0188, 0x704c, 0xa025,
+        0x080c, 0x274c, 0x2091, 0x8000, 0x2091, 0x303d, 0x0e04, 0x11d1,
+        0x2079, 0x4700, 0x786c, 0xa065, 0x0120, 0x2071, 0x0010, 0x080c,
+        0x20a1, 0x1d04, 0x11d9, 0x2079, 0x4700, 0x2071, 0x0010, 0x080c,
+        0x4429, 0x2071, 0x4780, 0x70a0, 0xa005, 0x0188, 0x704c, 0xa025,
         0x0170, 0x2079, 0x0100, 0x2091, 0x8000, 0x72d0, 0xa28c, 0x303d,
-        0x2190, 0x080c, 0x2720, 0x2091, 0x8000, 0x2091, 0x303d, 0x2079,
-        0x4600, 0x2071, 0x0010, 0x0e04, 0x11fa, 0x786c, 0xa065, 0x0110,
-        0x080c, 0x207a, 0x1d04, 0x118e, 0x080c, 0x4370, 0x0804, 0x118e,
+        0x2190, 0x080c, 0x274c, 0x2091, 0x8000, 0x2091, 0x303d, 0x2079,
+        0x4700, 0x2071, 0x0010, 0x0e04, 0x11fa, 0x786c, 0xa065, 0x0110,
+        0x080c, 0x20a1, 0x1d04, 0x118e, 0x080c, 0x4429, 0x0804, 0x118e,
         0x3c00, 0xa084, 0x0007, 0x0002, 0x120c, 0x120c, 0x120e, 0x120e,
-        0x1213, 0x1213, 0x1218, 0x1218, 0x080c, 0x254c, 0x2091, 0x2400,
-        0x080c, 0x40ad, 0x0005, 0x2091, 0x2200, 0x080c, 0x40ad, 0x0005,
-        0x2091, 0x2200, 0x080c, 0x40ad, 0x2091, 0x2400, 0x080c, 0x40ad,
+        0x1213, 0x1213, 0x1218, 0x1218, 0x080c, 0x2575, 0x2091, 0x2400,
+        0x080c, 0x40d5, 0x0005, 0x2091, 0x2200, 0x080c, 0x40d5, 0x0005,
+        0x2091, 0x2200, 0x080c, 0x40d5, 0x2091, 0x2400, 0x080c, 0x40d5,
         0x0005, 0x1241, 0x1241, 0x1242, 0x1242, 0x124d, 0x124d, 0x124d,
         0x124d, 0x1256, 0x1256, 0x1261, 0x1261, 0x124d, 0x124d, 0x124d,
         0x124d, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270,
         0x1270, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270, 0x1270,
         0x1270, 0x0cf8, 0x0006, 0x0106, 0x0126, 0x2091, 0x2800, 0x080c,
-        0x2569, 0x012e, 0x010e, 0x000e, 0x000d, 0x0006, 0x0106, 0x0126,
+        0x2592, 0x012e, 0x010e, 0x000e, 0x000d, 0x0006, 0x0106, 0x0126,
         0x080c, 0x1200, 0x012e, 0x010e, 0x000e, 0x000d, 0x0006, 0x0106,
-        0x0126, 0x2091, 0x2600, 0x080c, 0x2569, 0x012e, 0x010e, 0x000e,
-        0x000d, 0x0006, 0x0106, 0x0126, 0x2091, 0x2600, 0x080c, 0x2569,
-        0x2091, 0x2800, 0x080c, 0x2569, 0x012e, 0x010e, 0x000e, 0x000d,
-        0x0006, 0x0106, 0x0126, 0x00d6, 0x00e6, 0x00f6, 0x2079, 0x4600,
-        0x2071, 0x0200, 0x2069, 0x4640, 0x3d00, 0xd08c, 0x0130, 0x70ec,
-        0xa084, 0x1c00, 0x78e2, 0x080c, 0x459a, 0x3d00, 0xd084, 0x0150,
-        0x2069, 0x4680, 0x2071, 0x0100, 0x70ec, 0xa084, 0x1c00, 0x78e6,
-        0x080c, 0x459a, 0x080c, 0x24fd, 0x00fe, 0x00ee, 0x00de, 0x012e,
+        0x0126, 0x2091, 0x2600, 0x080c, 0x2592, 0x012e, 0x010e, 0x000e,
+        0x000d, 0x0006, 0x0106, 0x0126, 0x2091, 0x2600, 0x080c, 0x2592,
+        0x2091, 0x2800, 0x080c, 0x2592, 0x012e, 0x010e, 0x000e, 0x000d,
+        0x0006, 0x0106, 0x0126, 0x00d6, 0x00e6, 0x00f6, 0x2079, 0x4700,
+        0x2071, 0x0200, 0x2069, 0x4740, 0x3d00, 0xd08c, 0x0130, 0x70ec,
+        0xa084, 0x1c00, 0x78e2, 0x080c, 0x465c, 0x3d00, 0xd084, 0x0150,
+        0x2069, 0x4780, 0x2071, 0x0100, 0x70ec, 0xa084, 0x1c00, 0x78e6,
+        0x080c, 0x465c, 0x080c, 0x2526, 0x00fe, 0x00ee, 0x00de, 0x012e,
         0x010e, 0x000e, 0x000d, 0x7008, 0x800b, 0x1240, 0x7007, 0x0002,
         0xa08c, 0x01e0, 0x1120, 0xd09c, 0x0108, 0x0887, 0x0897, 0x70c3,
         0x4002, 0x0804, 0x13bd, 0x0e04, 0x131e, 0x2061, 0x0000, 0x6018,
         0xd084, 0x1904, 0x131e, 0x7828, 0xa005, 0x1120, 0x0004, 0x131f,
-        0x0804, 0x131e, 0xd0fc, 0x0130, 0x0006, 0x080c, 0x1b0a, 0x000e,
-        0x0150, 0x0028, 0x0006, 0x080c, 0x1aff, 0x000e, 0x0120, 0x2001,
-        0x4007, 0x0804, 0x13bc, 0x7910, 0xd0fc, 0x1128, 0x2061, 0x4640,
-        0xc19c, 0xc7fc, 0x0020, 0x2061, 0x4680, 0xc19d, 0xc7fd, 0x6060,
+        0x0804, 0x131e, 0xd0fc, 0x0130, 0x0006, 0x080c, 0x1b29, 0x000e,
+        0x0150, 0x0028, 0x0006, 0x080c, 0x1b1e, 0x000e, 0x0120, 0x2001,
+        0x4007, 0x0804, 0x13bc, 0x7910, 0xd0fc, 0x1128, 0x2061, 0x4740,
+        0xc19c, 0xc7fc, 0x0020, 0x2061, 0x4780, 0xc19d, 0xc7fd, 0x6060,
         0xa005, 0x1904, 0x131e, 0x7912, 0x607e, 0x7828, 0xc0fc, 0xa086,
-        0x0018, 0x1120, 0x00c6, 0x080c, 0x1916, 0x00ce, 0x782b, 0x0000,
-        0x6078, 0xa065, 0x01e0, 0x00c6, 0x609c, 0x080c, 0x1bd4, 0x00ce,
-        0x609f, 0x0000, 0x080c, 0x1a41, 0x2009, 0x0018, 0x6087, 0x0103,
+        0x0018, 0x1120, 0x00c6, 0x080c, 0x1926, 0x00ce, 0x782b, 0x0000,
+        0x6078, 0xa065, 0x01e0, 0x00c6, 0x609c, 0x080c, 0x1bf3, 0x00ce,
+        0x609f, 0x0000, 0x080c, 0x1a60, 0x2009, 0x0018, 0x6087, 0x0103,
         0x7810, 0x0006, 0x84ff, 0x1110, 0x85ff, 0x0110, 0xc0c5, 0x7812,
-        0x080c, 0x1b15, 0x000e, 0x7812, 0x1198, 0x080c, 0x1b60, 0x7810,
-        0xd09c, 0x1118, 0x2061, 0x4640, 0x0020, 0x2061, 0x4680, 0xc09c,
+        0x080c, 0x1b34, 0x000e, 0x7812, 0x1198, 0x080c, 0x1b7f, 0x7810,
+        0xd09c, 0x1118, 0x2061, 0x4740, 0x0020, 0x2061, 0x4780, 0xc09c,
         0x7812, 0x607b, 0x0000, 0x60d0, 0xd0c4, 0x0130, 0xc0c4, 0x60d2,
         0x2001, 0x4005, 0x0804, 0x13bc, 0x0804, 0x13ba, 0x0005, 0xa006,
         0x70c2, 0x70c6, 0x70ca, 0x70ce, 0x70da, 0x70c0, 0xa03d, 0xa08a,
         0x0040, 0x1a04, 0x136c, 0x0002, 0x13ba, 0x1408, 0x13d6, 0x143c,
-        0x1470, 0x1470, 0x13ce, 0x1a59, 0x147a, 0x13c8, 0x13da, 0x13db,
-        0x13dc, 0x13dd, 0x1a5d, 0x13c8, 0x1487, 0x14db, 0x1931, 0x1a53,
-        0x13de, 0x17ba, 0x17f0, 0x1822, 0x1868, 0x1777, 0x1784, 0x1797,
-        0x17a9, 0x15b0, 0x13c8, 0x150d, 0x1518, 0x1526, 0x1534, 0x154b,
-        0x1559, 0x155c, 0x156a, 0x1578, 0x1582, 0x1596, 0x15a2, 0x13c8,
-        0x13c8, 0x13c8, 0x13c8, 0x15bd, 0x15ce, 0x15e8, 0x161c, 0x1645,
-        0x1657, 0x165a, 0x1685, 0x16be, 0x16d0, 0x1745, 0x1755, 0x13c8,
-        0x13c8, 0x13c8, 0x13c8, 0x1767, 0x2100, 0xa08a, 0x0040, 0x1a04,
-        0x13c8, 0x0002, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x1a7f,
-        0x1a85, 0x13c8, 0x13c8, 0x13c8, 0x1a89, 0x1ac9, 0x13c8, 0x13c8,
-        0x13c8, 0x13c8, 0x1403, 0x146b, 0x1482, 0x14d6, 0x192c, 0x13c8,
-        0x13c8, 0x18fb, 0x13c8, 0x1acd, 0x1a71, 0x1a7b, 0x13c8, 0x13c8,
+        0x1470, 0x1470, 0x13ce, 0x1a78, 0x147a, 0x13c8, 0x13da, 0x13db,
+        0x13dc, 0x13dd, 0x1a7c, 0x13c8, 0x1487, 0x14db, 0x1941, 0x1a72,
+        0x13de, 0x17c8, 0x17fe, 0x1830, 0x1876, 0x1785, 0x1792, 0x17a5,
+        0x17b7, 0x15bf, 0x13c8, 0x150d, 0x1518, 0x1526, 0x1534, 0x154b,
+        0x1559, 0x155c, 0x156e, 0x157c, 0x1586, 0x15a5, 0x15b1, 0x13c8,
+        0x13c8, 0x13c8, 0x13c8, 0x15cc, 0x15dd, 0x15f7, 0x162b, 0x1654,
+        0x1666, 0x1669, 0x1693, 0x16cc, 0x16de, 0x1753, 0x1763, 0x13c8,
+        0x13c8, 0x13c8, 0x13c8, 0x1775, 0x2100, 0xa08a, 0x0040, 0x1a04,
+        0x13c8, 0x0002, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x1a9e,
+        0x1aa4, 0x13c8, 0x13c8, 0x13c8, 0x1aa8, 0x1ae8, 0x13c8, 0x13c8,
+        0x13c8, 0x13c8, 0x1403, 0x146b, 0x1482, 0x14d6, 0x193c, 0x13c8,
+        0x13c8, 0x190b, 0x13c8, 0x1aec, 0x1a90, 0x1a9a, 0x13c8, 0x13c8,
         0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8,
         0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8,
         0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8, 0x13c8,
@@ -191,7 +191,7 @@ static unsigned short risc_code01[] = {
         0x0001, 0x7008, 0xd0fc, 0x0de8, 0xa084, 0x01e0, 0x0d48, 0x70c3,
         0x4002, 0x0804, 0x13bd, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0878,
         0x71c4, 0x70c8, 0x2114, 0xa79e, 0x0004, 0x1108, 0x200a, 0x72ca,
-        0x0804, 0x13b9, 0x70c7, 0x000a, 0x70cb, 0x0004, 0x70cf, 0x0020,
+        0x0804, 0x13b9, 0x70c7, 0x000a, 0x70cb, 0x0004, 0x70cf, 0x002a,
         0x0804, 0x13ba, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0018, 0x2029,
         0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d0, 0x70c6, 0x72ca,
         0x73ce, 0x74d2, 0xa005, 0x05e8, 0xa40a, 0x0108, 0x1240, 0x8001,
@@ -211,1281 +211,1286 @@ static unsigned short risc_code01[] = {
         0xc2c5, 0x7a12, 0x7c96, 0x78ac, 0xa084, 0xfcff, 0x78ae, 0x0018,
         0x78ac, 0xc0c5, 0x78ae, 0x0804, 0x13ba, 0x2009, 0x0000, 0x786c,
         0xa065, 0x0118, 0x8108, 0x6000, 0x0cd8, 0x7ac4, 0x0804, 0x13b8,
-        0x2009, 0x4648, 0x210c, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904,
-        0x13b9, 0x2011, 0x4688, 0x2214, 0x0804, 0x13b8, 0x2009, 0x4649,
+        0x2009, 0x4748, 0x210c, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904,
+        0x13b9, 0x2011, 0x4788, 0x2214, 0x0804, 0x13b8, 0x2009, 0x4749,
         0x210c, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011,
-        0x4689, 0x2214, 0x0804, 0x13b8, 0x2061, 0x4640, 0x6128, 0x622c,
+        0x4789, 0x2214, 0x0804, 0x13b8, 0x2061, 0x4740, 0x6128, 0x622c,
         0x8214, 0x8214, 0x8214, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1148,
-        0x2061, 0x4680, 0x6328, 0x73da, 0x632c, 0x831c, 0x831c, 0x831c,
-        0x73de, 0x0804, 0x13b8, 0x2009, 0x464c, 0x210c, 0x2001, 0x01ff,
-        0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011, 0x468c, 0x2214, 0x0804,
-        0x13b8, 0x7918, 0x0804, 0x13b9, 0x2009, 0x0202, 0x210c, 0x2001,
-        0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011, 0x0102, 0x2214,
-        0x0804, 0x13b8, 0x2009, 0x464d, 0x210c, 0x2001, 0x01ff, 0x2004,
-        0xd0fc, 0x1904, 0x13b9, 0x2011, 0x468d, 0x2214, 0x0804, 0x13b8,
-        0x7920, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x7a24,
-        0x0804, 0x13b8, 0x2011, 0x4b40, 0x71c4, 0xd1fc, 0x1110, 0x2011,
-        0x4ac0, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa268,
-        0x6a00, 0x6b08, 0x6c1c, 0x74da, 0x0804, 0x13b7, 0x77c4, 0x080c,
-        0x1b7b, 0x2091, 0x8000, 0x6b1c, 0x6a14, 0x2091, 0x8001, 0x2708,
-        0x0804, 0x13b7, 0x2061, 0x4640, 0x6118, 0x2001, 0x01ff, 0x2004,
-        0xd0fc, 0x1904, 0x13b9, 0x2061, 0x4680, 0x6218, 0x0804, 0x13b8,
-        0x77c4, 0x080c, 0x1b7b, 0x2091, 0x8000, 0x6908, 0x6a18, 0x6b10,
-        0x77da, 0x2091, 0x8001, 0x0804, 0x13b7, 0x71c4, 0x2110, 0xa294,
-        0x000f, 0xa282, 0x0010, 0x1a04, 0x13b3, 0x080c, 0x238b, 0xa384,
-        0x4000, 0x0110, 0xa295, 0x0020, 0x0804, 0x13b7, 0x71c4, 0x2100,
-        0xc0bc, 0xa082, 0x0010, 0x1a04, 0x13b3, 0xd1bc, 0x1120, 0x2011,
-        0x4648, 0x2204, 0x0020, 0x2011, 0x4688, 0x2204, 0xc0bd, 0x0006,
-        0x2100, 0xc0bc, 0x2012, 0x080c, 0x2331, 0x001e, 0x0804, 0x13b9,
-        0x71c4, 0x2021, 0x4649, 0x2404, 0x70c6, 0x2019, 0x0000, 0x0030,
-        0x71c8, 0x2021, 0x4689, 0x2404, 0x70ca, 0xc3fd, 0x2011, 0x1614,
-        0x20a9, 0x0008, 0x2204, 0xa106, 0x0138, 0x8210, 0x1f04, 0x15fa,
-        0x71c4, 0x72c8, 0x0804, 0x13b2, 0xa292, 0x1614, 0x0026, 0x2122,
-        0x001e, 0x080c, 0x2343, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1110,
-        0xd3fc, 0x09f0, 0x0804, 0x13ba, 0x03e8, 0x00fa, 0x01f4, 0x02ee,
-        0x0004, 0x0001, 0x0002, 0x0003, 0x2061, 0x4640, 0x6128, 0x622c,
-        0x8214, 0x8214, 0x8214, 0x70c4, 0x602a, 0x70c8, 0x8003, 0x8003,
-        0x8003, 0x602e, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x11a0, 0x0026,
-        0x0016, 0x2061, 0x4680, 0x6128, 0x622c, 0x8214, 0x8214, 0x8214,
-        0x70d8, 0x602a, 0x70dc, 0x8003, 0x8003, 0x8003, 0x602e, 0x71da,
-        0x72de, 0x001e, 0x002e, 0x0804, 0x13b8, 0x2061, 0x4640, 0x6130,
-        0x70c4, 0x6032, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9,
-        0x2061, 0x4680, 0x6230, 0x70c8, 0x6032, 0x0804, 0x13b8, 0x7918,
-        0x0804, 0x13b9, 0x71c4, 0xa184, 0xf0cf, 0x0148, 0x2001, 0x01ff,
-        0x2004, 0xd0fc, 0x1904, 0x13b3, 0x72c8, 0x0804, 0x13b2, 0x0006,
-        0x2019, 0x0000, 0x080c, 0x237f, 0x2001, 0x01ff, 0x2004, 0xd0fc,
-        0x0118, 0x001e, 0x0804, 0x13b9, 0x71c8, 0xa184, 0xf0cf, 0x0128,
-        0x0006, 0x2110, 0x71c4, 0x0804, 0x13b2, 0x0006, 0xc3fd, 0x080c,
-        0x237f, 0x002e, 0x001e, 0x0804, 0x13b8, 0x71c4, 0xa182, 0x0010,
-        0x0248, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b3, 0x72c8,
-        0x0804, 0x13b2, 0x2011, 0x464d, 0x2204, 0x0006, 0x8104, 0x1208,
-        0x8108, 0x2112, 0x2019, 0x0000, 0x080c, 0x236c, 0x2001, 0x01ff,
-        0x2004, 0xd0fc, 0x0118, 0x001e, 0x0804, 0x13b9, 0x71c8, 0xa182,
-        0x0010, 0x0228, 0x0006, 0x2110, 0x71c4, 0x0804, 0x13b2, 0x2011,
-        0x468d, 0x2204, 0x0006, 0x8104, 0x1208, 0x8108, 0x2112, 0xc3fd,
-        0x080c, 0x236c, 0x002e, 0x001e, 0x0804, 0x13b8, 0x71c4, 0x72c8,
-        0xa184, 0xfffd, 0x1904, 0x13b2, 0xa284, 0xfffd, 0x1904, 0x13b2,
-        0x2100, 0x7920, 0x7822, 0x2200, 0x7a24, 0x7826, 0x0804, 0x13b8,
-        0x2011, 0x4b40, 0x71c4, 0xd1fc, 0x1110, 0x2011, 0x4ac0, 0x8107,
-        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa268, 0x72c8, 0x73cc,
-        0x74d8, 0x71c6, 0x6800, 0x70ca, 0x73ce, 0x74da, 0x2091, 0x8000,
-        0x6a02, 0xd2ac, 0x1118, 0x2021, 0x0000, 0x0090, 0xa484, 0x00ff,
-        0xa082, 0x0002, 0x1a04, 0x1741, 0x843f, 0xa7bc, 0x00ff, 0x0140,
-        0xa786, 0x0002, 0x1904, 0x1741, 0xa484, 0x00ff, 0x0904, 0x1741,
-        0x2061, 0x0200, 0xd1fc, 0x0110, 0x2061, 0x0100, 0x2029, 0x0009,
-        0x2031, 0x0062, 0x843f, 0xa7bc, 0x00ff, 0x0130, 0x8307, 0xa084,
-        0x00ff, 0x1110, 0xa73d, 0x1138, 0x2041, 0x0019, 0xa384, 0x00ff,
-        0xa082, 0x001a, 0x0210, 0xa4a4, 0x00ff, 0x8307, 0xa084, 0x00ff,
-        0x0188, 0xa842, 0x02f0, 0xa086, 0x0010, 0x1120, 0xa39c, 0x00ff,
-        0xa39d, 0x0f00, 0xa3bc, 0x00ff, 0x2500, 0xa702, 0x0290, 0x2600,
-        0xa702, 0x1278, 0x2039, 0x003a, 0x6804, 0xa705, 0x6806, 0x6b0a,
-        0x6b0c, 0x73ce, 0x681c, 0x70da, 0x6c1e, 0x2091, 0x8001, 0x0804,
-        0x13ba, 0x2091, 0x8001, 0x0804, 0x13b4, 0x77c4, 0x080c, 0x1b7b,
-        0x2091, 0x8000, 0x6a14, 0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816,
-        0x70cc, 0x681e, 0x2708, 0x0804, 0x13b7, 0x70c4, 0x2061, 0x4640,
-        0x6118, 0x601a, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9,
-        0x70c8, 0x2061, 0x4680, 0x6218, 0x601a, 0x0804, 0x13b8, 0x71c4,
-        0x72c8, 0x73cc, 0xa182, 0x0010, 0x1a04, 0x13b3, 0x080c, 0x23af,
-        0xa384, 0x4000, 0x0110, 0xa295, 0x0020, 0x0804, 0x13b7, 0x77c4,
-        0x080c, 0x1b7b, 0x2091, 0x8000, 0x6a08, 0xc28d, 0x6a0a, 0x2091,
-        0x8001, 0x2708, 0x0804, 0x13b8, 0x77c4, 0x080c, 0x1b7b, 0x2091,
-        0x8000, 0x6a08, 0xa294, 0xfff9, 0x6a0a, 0x6804, 0xa005, 0x0110,
-        0x080c, 0x22ae, 0x2091, 0x8001, 0x2708, 0x0804, 0x13b8, 0x77c4,
-        0x080c, 0x1b7b, 0x2091, 0x8000, 0x6a08, 0xc295, 0x6a0a, 0x6804,
-        0xa005, 0x0110, 0x080c, 0x22ae, 0x2091, 0x8001, 0x2708, 0x0804,
-        0x13b8, 0x77c4, 0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020,
-        0x2091, 0x8000, 0x080c, 0x1b93, 0x2091, 0x8001, 0x2708, 0x6a08,
-        0x0804, 0x13b8, 0x77c4, 0xd7fc, 0x0128, 0x080c, 0x1b0a, 0x0138,
-        0x0804, 0x13bc, 0x080c, 0x1aff, 0x0110, 0x0804, 0x13bc, 0x73c8,
-        0x72cc, 0x77c6, 0x73ca, 0x72ce, 0x080c, 0x1c0b, 0x11e8, 0x6818,
-        0xa005, 0x01a0, 0x2708, 0x0076, 0x080c, 0x23ce, 0x007e, 0x1170,
-        0x2001, 0x0015, 0xd7fc, 0x1118, 0x2061, 0x4640, 0x0018, 0xc0fd,
-        0x2061, 0x4680, 0x782a, 0x2091, 0x8001, 0x0005, 0x2091, 0x8001,
-        0x2001, 0x4005, 0x0804, 0x13bc, 0x2091, 0x8001, 0x0804, 0x13ba,
-        0x77c4, 0xd7fc, 0x0128, 0x080c, 0x1b0a, 0x0138, 0x0804, 0x13bc,
-        0x080c, 0x1aff, 0x0110, 0x0804, 0x13bc, 0x77c6, 0x2041, 0x0021,
-        0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x080c, 0x1b93,
-        0x2009, 0x0016, 0xd7fc, 0x1118, 0x2061, 0x4640, 0x0018, 0x2061,
-        0x4680, 0xc1fd, 0x6063, 0x0003, 0x607b, 0x0000, 0x6772, 0x607f,
-        0x000f, 0x792a, 0x61d0, 0xc1c4, 0x61d2, 0x080c, 0x22ae, 0x2091,
-        0x8001, 0x0005, 0x77c8, 0x77ca, 0x77c4, 0x77c6, 0xd7fc, 0x0128,
-        0x080c, 0x1b0a, 0x0138, 0x0804, 0x13bc, 0x080c, 0x1aff, 0x0110,
-        0x0804, 0x13bc, 0xa7bc, 0xff00, 0x2091, 0x8000, 0x2009, 0x0017,
-        0xd7fc, 0x1118, 0x2061, 0x4640, 0x0018, 0x2061, 0x4680, 0xc1fd,
-        0x607b, 0x0000, 0x6063, 0x0002, 0x6772, 0x607f, 0x000f, 0x792a,
-        0x61d0, 0xc1c4, 0x61d2, 0x080c, 0x22ae, 0x2091, 0x8001, 0x2041,
-        0x0021, 0x2049, 0x0005, 0x2051, 0x0030, 0x2091, 0x8000, 0x70c8,
-        0xa005, 0x0118, 0x60d0, 0xc0fd, 0x60d2, 0x080c, 0x1b93, 0x70c8,
-        0x6836, 0x8738, 0xa784, 0x001f, 0x1dc0, 0x2091, 0x8001, 0x0005,
-        0x2019, 0x0000, 0x72c8, 0xd284, 0x0128, 0x080c, 0x1b0a, 0x0138,
-        0x0804, 0x13bc, 0x080c, 0x1aff, 0x0110, 0x0804, 0x13bc, 0x72c8,
-        0x72ca, 0x78ac, 0xa084, 0x0003, 0x1508, 0x2039, 0x0000, 0xd284,
-        0x0108, 0xc7fd, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008,
-        0x080c, 0x1b7b, 0x2091, 0x8000, 0x6808, 0xc0d4, 0xa80d, 0x690a,
-        0x2091, 0x8001, 0x8738, 0xa784, 0x001f, 0x1d90, 0xa7bc, 0xff00,
-        0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x1d50, 0x2091, 0x8000,
+        0x2061, 0x4780, 0x6328, 0x73da, 0x632c, 0x831c, 0x831c, 0x831c,
+        0x73de, 0x0804, 0x13b8, 0x2009, 0x474c, 0x210c, 0x2001, 0x01ff,
+        0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011, 0x478c, 0x2214, 0x0804,
+        0x13b8, 0x7918, 0x0804, 0x13b9, 0x2009, 0x0202, 0x210c, 0xa18c,
+        0x0f30, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011,
+        0x0102, 0x2214, 0xa294, 0x0f30, 0x0804, 0x13b8, 0x2009, 0x474d,
+        0x210c, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2011,
+        0x478d, 0x2214, 0x0804, 0x13b8, 0x7920, 0x2001, 0x01ff, 0x2004,
+        0xd0fc, 0x1904, 0x13b9, 0x7a24, 0x0804, 0x13b8, 0x2011, 0x4c40,
+        0x71c4, 0xd1fc, 0x1110, 0x2011, 0x4bc0, 0x8107, 0xa084, 0x000f,
+        0x8003, 0x8003, 0x8003, 0xa268, 0x6a00, 0x6b08, 0x6c1c, 0x74da,
+        0xd1fc, 0x1118, 0x2021, 0x023b, 0x0010, 0x2021, 0x013b, 0x2424,
+        0xa4a4, 0x1c00, 0x74de, 0x0804, 0x13b7, 0x77c4, 0x080c, 0x1b9a,
+        0x2091, 0x8000, 0x6b1c, 0x6a14, 0x2091, 0x8001, 0x2708, 0x0804,
+        0x13b7, 0x2061, 0x4740, 0x6118, 0x2001, 0x01ff, 0x2004, 0xd0fc,
+        0x1904, 0x13b9, 0x2061, 0x4780, 0x6218, 0x0804, 0x13b8, 0x77c4,
+        0x080c, 0x1b9a, 0x2091, 0x8000, 0x6908, 0x6a18, 0x6b10, 0x77da,
+        0x2091, 0x8001, 0x0804, 0x13b7, 0x71c4, 0x2110, 0xa294, 0x000f,
+        0xa282, 0x0010, 0x1a04, 0x13b3, 0x080c, 0x23b4, 0xa384, 0x4000,
+        0x0110, 0xa295, 0x0020, 0x0804, 0x13b7, 0x71c4, 0x2100, 0xc0bc,
+        0xa082, 0x0010, 0x1a04, 0x13b3, 0xd1bc, 0x1120, 0x2011, 0x4748,
+        0x2204, 0x0020, 0x2011, 0x4788, 0x2204, 0xc0bd, 0x0006, 0x2100,
+        0xc0bc, 0x2012, 0x080c, 0x2358, 0x001e, 0x0804, 0x13b9, 0x71c4,
+        0x2021, 0x4749, 0x2404, 0x70c6, 0x2019, 0x0000, 0x0030, 0x71c8,
+        0x2021, 0x4789, 0x2404, 0x70ca, 0xc3fd, 0x2011, 0x1623, 0x20a9,
+        0x0008, 0x2204, 0xa106, 0x0138, 0x8210, 0x1f04, 0x1609, 0x71c4,
+        0x72c8, 0x0804, 0x13b2, 0xa292, 0x1623, 0x0026, 0x2122, 0x001e,
+        0x080c, 0x236a, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1110, 0xd3fc,
+        0x09f0, 0x0804, 0x13ba, 0x03e8, 0x00fa, 0x01f4, 0x02ee, 0x0004,
+        0x0001, 0x0002, 0x0003, 0x2061, 0x4740, 0x6128, 0x622c, 0x8214,
+        0x8214, 0x8214, 0x70c4, 0x602a, 0x70c8, 0x8003, 0x8003, 0x8003,
+        0x602e, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x11a0, 0x0026, 0x0016,
+        0x2061, 0x4780, 0x6128, 0x622c, 0x8214, 0x8214, 0x8214, 0x70d8,
+        0x602a, 0x70dc, 0x8003, 0x8003, 0x8003, 0x602e, 0x71da, 0x72de,
+        0x001e, 0x002e, 0x0804, 0x13b8, 0x2061, 0x4740, 0x6130, 0x70c4,
+        0x6032, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x2061,
+        0x4780, 0x6230, 0x70c8, 0x6032, 0x0804, 0x13b8, 0x7918, 0x0804,
+        0x13b9, 0x71c4, 0xa184, 0xf0cf, 0x0148, 0x2001, 0x01ff, 0x2004,
+        0xd0fc, 0x1904, 0x13b3, 0x72c8, 0x0804, 0x13b2, 0x2019, 0x0000,
+        0x080c, 0x23a6, 0x0036, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x0118,
+        0x001e, 0x0804, 0x13b9, 0x71c8, 0xa184, 0xf0cf, 0x0128, 0x000e,
+        0x2110, 0x71c4, 0x0804, 0x13b2, 0xc3fd, 0x080c, 0x23a6, 0x2310,
+        0x001e, 0x0804, 0x13b8, 0x71c4, 0xa182, 0x0010, 0x0248, 0x2001,
+        0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b3, 0x72c8, 0x0804, 0x13b2,
+        0x2011, 0x474d, 0x2204, 0x0006, 0x8104, 0x1208, 0x8108, 0x2112,
+        0x2019, 0x0000, 0x080c, 0x2393, 0x2001, 0x01ff, 0x2004, 0xd0fc,
+        0x0118, 0x001e, 0x0804, 0x13b9, 0x71c8, 0xa182, 0x0010, 0x0228,
+        0x0006, 0x2110, 0x71c4, 0x0804, 0x13b2, 0x2011, 0x478d, 0x2204,
+        0x0006, 0x8104, 0x1208, 0x8108, 0x2112, 0xc3fd, 0x080c, 0x2393,
+        0x002e, 0x001e, 0x0804, 0x13b8, 0x71c4, 0x72c8, 0xa184, 0xfffd,
+        0x1904, 0x13b2, 0xa284, 0xfffd, 0x1904, 0x13b2, 0x2100, 0x7920,
+        0x7822, 0x2200, 0x7a24, 0x7826, 0x0804, 0x13b8, 0x2011, 0x4c40,
+        0x71c4, 0xd1fc, 0x1110, 0x2011, 0x4bc0, 0x8107, 0xa084, 0x000f,
+        0x8003, 0x8003, 0x8003, 0xa268, 0x72c8, 0x73cc, 0x74d8, 0x71c6,
+        0x6800, 0x70ca, 0x73ce, 0x74da, 0x2091, 0x8000, 0x6a02, 0xd2ac,
+        0x1118, 0x2021, 0x0000, 0x0090, 0xa484, 0x00ff, 0xa082, 0x0002,
+        0x1a04, 0x174f, 0x843f, 0xa7bc, 0x00ff, 0x0140, 0xa786, 0x0002,
+        0x1904, 0x174f, 0xa484, 0x00ff, 0x0904, 0x174f, 0x2061, 0x0200,
+        0xd1fc, 0x0110, 0x2061, 0x0100, 0x2029, 0x0009, 0x2031, 0x0062,
+        0x843f, 0xa7bc, 0x00ff, 0x0130, 0x8307, 0xa084, 0x00ff, 0x1110,
+        0xa73d, 0x1138, 0x2041, 0x0019, 0xa384, 0x00ff, 0xa082, 0x001a,
+        0x0210, 0xa4a4, 0x00ff, 0x8307, 0xa084, 0x00ff, 0x0188, 0xa842,
+        0x02f0, 0xa086, 0x0010, 0x1120, 0xa39c, 0x00ff, 0xa39d, 0x0f00,
+        0xa3bc, 0x00ff, 0x2500, 0xa702, 0x0290, 0x2600, 0xa702, 0x1278,
+        0x2039, 0x003a, 0x6804, 0xa705, 0x6806, 0x6b0a, 0x6b0c, 0x73ce,
+        0x681c, 0x70da, 0x6c1e, 0x2091, 0x8001, 0x0804, 0x13ba, 0x2091,
+        0x8001, 0x0804, 0x13b4, 0x77c4, 0x080c, 0x1b9a, 0x2091, 0x8000,
+        0x6a14, 0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816, 0x70cc, 0x681e,
+        0x2708, 0x0804, 0x13b7, 0x70c4, 0x2061, 0x4740, 0x6118, 0x601a,
+        0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x13b9, 0x70c8, 0x2061,
+        0x4780, 0x6218, 0x601a, 0x0804, 0x13b8, 0x71c4, 0x72c8, 0x73cc,
+        0xa182, 0x0010, 0x1a04, 0x13b3, 0x080c, 0x23d8, 0xa384, 0x4000,
+        0x0110, 0xa295, 0x0020, 0x0804, 0x13b7, 0x77c4, 0x080c, 0x1b9a,
+        0x2091, 0x8000, 0x6a08, 0xc28d, 0x6a0a, 0x2091, 0x8001, 0x2708,
+        0x0804, 0x13b8, 0x77c4, 0x080c, 0x1b9a, 0x2091, 0x8000, 0x6a08,
+        0xa294, 0xfff9, 0x6a0a, 0x6804, 0xa005, 0x0110, 0x080c, 0x22d5,
+        0x2091, 0x8001, 0x2708, 0x0804, 0x13b8, 0x77c4, 0x080c, 0x1b9a,
+        0x2091, 0x8000, 0x6a08, 0xc295, 0x6a0a, 0x6804, 0xa005, 0x0110,
+        0x080c, 0x22d5, 0x2091, 0x8001, 0x2708, 0x0804, 0x13b8, 0x77c4,
+        0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000,
+        0x080c, 0x1bb2, 0x2091, 0x8001, 0x2708, 0x6a08, 0x0804, 0x13b8,
+        0x77c4, 0xd7fc, 0x0128, 0x080c, 0x1b29, 0x0138, 0x0804, 0x13bc,
+        0x080c, 0x1b1e, 0x0110, 0x0804, 0x13bc, 0x73c8, 0x72cc, 0x77c6,
+        0x73ca, 0x72ce, 0x080c, 0x1c2a, 0x11e8, 0x6818, 0xa005, 0x01a0,
+        0x2708, 0x0076, 0x080c, 0x23f7, 0x007e, 0x1170, 0x2001, 0x0015,
+        0xd7fc, 0x1118, 0x2061, 0x4740, 0x0018, 0xc0fd, 0x2061, 0x4780,
+        0x782a, 0x2091, 0x8001, 0x0005, 0x2091, 0x8001, 0x2001, 0x4005,
+        0x0804, 0x13bc, 0x2091, 0x8001, 0x0804, 0x13ba, 0x77c4, 0xd7fc,
+        0x0128, 0x080c, 0x1b29, 0x0138, 0x0804, 0x13bc, 0x080c, 0x1b1e,
+        0x0110, 0x0804, 0x13bc, 0x77c6, 0x2041, 0x0021, 0x2049, 0x0005,
+        0x2051, 0x0020, 0x2091, 0x8000, 0x080c, 0x1bb2, 0x2009, 0x0016,
+        0xd7fc, 0x1118, 0x2061, 0x4740, 0x0018, 0x2061, 0x4780, 0xc1fd,
+        0x6063, 0x0003, 0x607b, 0x0000, 0x6772, 0x607f, 0x000f, 0x792a,
+        0x61d0, 0xc1c4, 0x61d2, 0x080c, 0x22d5, 0x2091, 0x8001, 0x0005,
+        0x77c8, 0x77ca, 0x77c4, 0x77c6, 0xd7fc, 0x0128, 0x080c, 0x1b29,
+        0x0138, 0x0804, 0x13bc, 0x080c, 0x1b1e, 0x0110, 0x0804, 0x13bc,
+        0xa7bc, 0xff00, 0x2091, 0x8000, 0x2009, 0x0017, 0xd7fc, 0x1118,
+        0x2061, 0x4740, 0x0018, 0x2061, 0x4780, 0xc1fd, 0x607b, 0x0000,
+        0x6063, 0x0002, 0x6772, 0x607f, 0x000f, 0x792a, 0x61d0, 0xc1c4,
+        0x61d2, 0x080c, 0x22d5, 0x2091, 0x8001, 0x2041, 0x0021, 0x2049,
+        0x0005, 0x2051, 0x0010, 0x2091, 0x8000, 0x70c8, 0xa005, 0x0118,
+        0x60d0, 0xc0fd, 0x60d2, 0x080c, 0x1bb2, 0x70c8, 0x6836, 0x8738,
+        0xa784, 0x001f, 0x1dc0, 0x2091, 0x8001, 0x0005, 0x2019, 0x0000,
+        0x72c8, 0xd284, 0x0128, 0x080c, 0x1b29, 0x0138, 0x0804, 0x13bc,
+        0x080c, 0x1b1e, 0x0110, 0x0804, 0x13bc, 0x72c8, 0x72ca, 0x78ac,
+        0xa084, 0x0003, 0x1518, 0x2039, 0x0000, 0xd284, 0x0108, 0xc7fd,
+        0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008, 0x080c, 0x1b9a,
+        0x2091, 0x8000, 0x6808, 0xc0d4, 0xa80d, 0x690a, 0x6837, 0x0000,
+        0x2091, 0x8001, 0x8738, 0xa784, 0x001f, 0x1d80, 0xa7bc, 0xff00,
+        0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x1d40, 0x2091, 0x8000,
         0x72c8, 0x2069, 0x0100, 0xd284, 0x1110, 0x2069, 0x0200, 0x6808,
         0xa084, 0xfffd, 0x680a, 0x6830, 0xd0b4, 0x01b0, 0x684b, 0x0004,
-        0x20a9, 0x0014, 0x6848, 0xd094, 0x0110, 0x1f04, 0x18b2, 0x684b,
-        0x0009, 0x20a9, 0x0014, 0x6848, 0xd084, 0x0110, 0x1f04, 0x18bb,
-        0x20a9, 0x00fa, 0x1f04, 0x18c2, 0x2079, 0x4600, 0x2009, 0x0018,
-        0x72c8, 0xd284, 0x1118, 0x2061, 0x4640, 0x0018, 0x2061, 0x4680,
+        0x20a9, 0x0014, 0x6848, 0xd094, 0x0110, 0x1f04, 0x18c2, 0x684b,
+        0x0009, 0x20a9, 0x0014, 0x6848, 0xd084, 0x0110, 0x1f04, 0x18cb,
+        0x20a9, 0x00fa, 0x1f04, 0x18d2, 0x2079, 0x4700, 0x2009, 0x0018,
+        0x72c8, 0xd284, 0x1118, 0x2061, 0x4740, 0x0018, 0x2061, 0x4780,
         0xc1fd, 0x607b, 0x0000, 0x792a, 0x6063, 0x0001, 0x607f, 0x000f,
         0x60a3, 0x0000, 0x60a4, 0x60ae, 0x60b2, 0x60d0, 0xd0b4, 0x0160,
         0xc0b4, 0x60d2, 0x00c6, 0x60b4, 0xa065, 0x6008, 0xc0d4, 0x600a,
         0x6018, 0x8001, 0x601a, 0x00ce, 0x60d0, 0xa084, 0x7eff, 0x60d2,
         0x78ac, 0xc08d, 0x78ae, 0x83ff, 0x0108, 0x0005, 0x681b, 0x0054,
-        0x2091, 0x8001, 0x0005, 0x73cc, 0x080c, 0x186a, 0x69ec, 0x6a48,
+        0x2091, 0x8001, 0x0005, 0x73cc, 0x080c, 0x1878, 0x69ec, 0x6a48,
         0xa185, 0x1800, 0x684a, 0xa185, 0x0040, 0x68ee, 0x73cc, 0x2021,
-        0x0004, 0x20a9, 0x09ff, 0x1f04, 0x190b, 0x8421, 0x1dd0, 0x8319,
+        0x0004, 0x20a9, 0x09ff, 0x1f04, 0x191b, 0x8421, 0x1dd0, 0x8319,
         0x1db0, 0x69ee, 0x6a4a, 0x2091, 0x8001, 0x0005, 0xd7fc, 0x1118,
-        0x2069, 0x4640, 0x0010, 0x2069, 0x4680, 0x71c4, 0x71c6, 0x6916,
+        0x2069, 0x4740, 0x0010, 0x2069, 0x4780, 0x71c4, 0x71c6, 0x6916,
         0x81ff, 0x1110, 0x68a3, 0x0001, 0x78ac, 0xc08c, 0x78ae, 0xd084,
-        0x1110, 0x080c, 0x1c5b, 0x0005, 0x75d8, 0x74dc, 0x75da, 0x74de,
+        0x1110, 0x080c, 0x1c7a, 0x0005, 0x75d8, 0x74dc, 0x75da, 0x74de,
         0x0010, 0xa02e, 0x2520, 0x71c4, 0x73c8, 0x72cc, 0x71c6, 0x73ca,
-        0x72ce, 0x2079, 0x4600, 0x7dde, 0x7cda, 0x7bd6, 0x7ad2, 0x080c,
-        0x1b58, 0x0904, 0x1a3d, 0x20a9, 0x0005, 0x20a1, 0x4614, 0x2091,
-        0x8000, 0x41a1, 0x2091, 0x8001, 0x2009, 0x0040, 0x080c, 0x1d24,
-        0x0120, 0x080c, 0x1b60, 0x0804, 0x1a3d, 0x6004, 0xa08c, 0x00ff,
-        0xa18e, 0x0009, 0x1120, 0x0006, 0x080c, 0x205f, 0x000e, 0xa084,
-        0xff00, 0x8007, 0x8009, 0x0904, 0x19e1, 0x00c6, 0x2c68, 0x080c,
-        0x1b58, 0x05a8, 0x2c00, 0x689e, 0x8109, 0x1dc0, 0x609f, 0x0000,
+        0x72ce, 0x2079, 0x4700, 0x7dde, 0x7cda, 0x7bd6, 0x7ad2, 0x080c,
+        0x1b77, 0x0904, 0x1a5c, 0x20a9, 0x0005, 0x20a1, 0x4714, 0x2091,
+        0x8000, 0x41a1, 0x2091, 0x8001, 0x2009, 0x0040, 0x080c, 0x1d41,
+        0x0120, 0x080c, 0x1b7f, 0x0804, 0x1a5c, 0x6004, 0xa08c, 0x00ff,
+        0xa18e, 0x0009, 0x1120, 0x0006, 0x080c, 0x2086, 0x000e, 0xa084,
+        0xff00, 0x8007, 0x8009, 0x0904, 0x19f1, 0x00c6, 0x2c68, 0x080c,
+        0x1b77, 0x05a8, 0x2c00, 0x689e, 0x8109, 0x1dc0, 0x609f, 0x0000,
         0x00ce, 0x00c6, 0x7ddc, 0x7cd8, 0x7bd4, 0x7ad0, 0xa290, 0x0040,
         0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x7dde, 0x7cda,
-        0x7bd6, 0x7ad2, 0x2c68, 0x689c, 0xa065, 0x0904, 0x19e0, 0x2009,
-        0x0040, 0x080c, 0x1d24, 0x15a0, 0x6004, 0xa084, 0x00ff, 0xa086,
-        0x0002, 0x1168, 0x6004, 0xa084, 0x00ff, 0xa086, 0x000a, 0x1120,
-        0x0016, 0x080c, 0x205c, 0x001e, 0x2d00, 0x6002, 0x0898, 0x00ce,
-        0x00c6, 0x609c, 0x080c, 0x1bd4, 0x00ce, 0x609f, 0x0000, 0x080c,
-        0x1a41, 0x2009, 0x0018, 0x6008, 0xc0cd, 0x600a, 0x6004, 0x6086,
+        0x7bd6, 0x7ad2, 0x2c68, 0x689c, 0xa065, 0x0904, 0x19f0, 0x2009,
+        0x0040, 0x080c, 0x1d41, 0x15a0, 0x6004, 0xa084, 0x00ff, 0xa086,
+        0x0002, 0x0150, 0x6004, 0xa084, 0x00ff, 0xa086, 0x000a, 0x1138,
+        0x0016, 0x080c, 0x2083, 0x001e, 0x2d00, 0x6002, 0x0898, 0x00ce,
+        0x00c6, 0x609c, 0x080c, 0x1bf3, 0x00ce, 0x609f, 0x0000, 0x080c,
+        0x1a60, 0x2009, 0x0018, 0x6008, 0xc0cd, 0x600a, 0x6004, 0x6086,
         0x7810, 0x0006, 0x84ff, 0x1110, 0x85ff, 0x0110, 0xc0c5, 0x7812,
-        0x080c, 0x1b15, 0x000e, 0x7812, 0x080c, 0x1b60, 0x0804, 0x1a3d,
-        0x00ce, 0x00c6, 0x609c, 0x080c, 0x1bd4, 0x00ce, 0x609f, 0x0000,
-        0x080c, 0x1a41, 0x2009, 0x0018, 0x6087, 0x0103, 0x601b, 0x0003,
+        0x080c, 0x1b34, 0x000e, 0x7812, 0x080c, 0x1b7f, 0x0804, 0x1a5c,
+        0x00ce, 0x00c6, 0x609c, 0x080c, 0x1bf3, 0x00ce, 0x609f, 0x0000,
+        0x080c, 0x1a60, 0x2009, 0x0018, 0x6087, 0x0103, 0x601b, 0x0003,
         0x7810, 0x0006, 0x84ff, 0x1110, 0x85ff, 0x0110, 0xc0c5, 0x7812,
-        0x080c, 0x1b15, 0x000e, 0x7812, 0x080c, 0x1b60, 0x0804, 0x1a3d,
-        0x00ce, 0x6114, 0xd1fc, 0x0120, 0x080c, 0x1b0a, 0x01f0, 0x0018,
-        0x080c, 0x1aff, 0x01d0, 0x080c, 0x1a41, 0x2009, 0x0018, 0x6087,
+        0x080c, 0x1b34, 0x000e, 0x7812, 0x080c, 0x1b7f, 0x0804, 0x1a5c,
+        0x00ce, 0x6114, 0xd1fc, 0x0120, 0x080c, 0x1b29, 0x01f0, 0x0018,
+        0x080c, 0x1b1e, 0x01d0, 0x080c, 0x1a60, 0x2009, 0x0018, 0x6087,
         0x0103, 0x601b, 0x0021, 0x7810, 0x0006, 0x84ff, 0x1110, 0x85ff,
-        0x0110, 0xc0c5, 0x7812, 0x080c, 0x1b15, 0x000e, 0x7812, 0x080c,
-        0x1b60, 0x2001, 0x4007, 0x0804, 0x13bc, 0x74c4, 0x73c8, 0x72cc,
-        0x6014, 0x2091, 0x8000, 0x00e6, 0x2009, 0x0012, 0xd0fc, 0x1118,
-        0x2071, 0x4640, 0x0018, 0x2071, 0x4680, 0xc1fd, 0x792a, 0x7063,
-        0x0005, 0x71d0, 0xc1c4, 0x71d2, 0x7366, 0x726a, 0x746e, 0x7072,
-        0x7077, 0x0000, 0x2c00, 0x707a, 0xa02e, 0x2530, 0x611c, 0xa184,
-        0x0060, 0x0110, 0x080c, 0x3fc1, 0x00ee, 0x6596, 0x65a6, 0x669a,
-        0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x6714, 0x6023, 0x0000,
-        0x080c, 0x22ae, 0x2091, 0x8001, 0x0005, 0x70c3, 0x4005, 0x0804,
-        0x13bd, 0x20a9, 0x0005, 0x2099, 0x4614, 0x2091, 0x8000, 0x530a,
-        0x2091, 0x8001, 0x2100, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000,
-        0xa5a9, 0x0000, 0x0005, 0x71c4, 0x70c7, 0x0000, 0x791e, 0x0804,
-        0x13ba, 0x71c4, 0x71c6, 0x2168, 0x0010, 0x2069, 0x1000, 0x690c,
-        0xa016, 0x2d04, 0xa210, 0x8d68, 0x8109, 0x1dd8, 0xa285, 0x0000,
-        0x1118, 0x70c3, 0x4000, 0x0010, 0x70c3, 0x4003, 0x70ca, 0x0804,
-        0x13bd, 0x7964, 0x71c6, 0x71c4, 0xa182, 0x0003, 0x1a04, 0x13b3,
-        0x7966, 0x0804, 0x13ba, 0x7964, 0x71c6, 0x0804, 0x13ba, 0x7900,
-        0x71c6, 0x71c4, 0x7902, 0x0804, 0x13ba, 0x7900, 0x71c6, 0x0804,
-        0x13ba, 0x70c4, 0x2011, 0x0000, 0xa08c, 0x000d, 0x0160, 0x810c,
-        0x0230, 0x8210, 0x810c, 0x810c, 0x0210, 0x8210, 0x810c, 0x81ff,
-        0x1904, 0x13b4, 0x8210, 0x7a0e, 0xd28c, 0x0538, 0x7910, 0xc1cd,
-        0x7912, 0x2009, 0x0021, 0x2019, 0x0003, 0xd284, 0x01c0, 0x8108,
-        0x2019, 0x0041, 0x2011, 0x8e4e, 0x2312, 0x2019, 0x0042, 0x8210,
-        0x2312, 0x2019, 0x0043, 0x8210, 0x2312, 0x2019, 0x0046, 0x8210,
-        0x2312, 0x2019, 0x0047, 0x8210, 0x2312, 0x2019, 0x0006, 0x2011,
-        0x8e53, 0x2112, 0x2011, 0x8e73, 0x2312, 0x7904, 0x7806, 0x0804,
-        0x13b9, 0x7804, 0x70c6, 0x0804, 0x13ba, 0x71c4, 0xd1fc, 0x1118,
-        0x2011, 0x4ac0, 0x0010, 0x2011, 0x4b40, 0x8107, 0xa084, 0x000f,
-        0x8003, 0x8003, 0x8003, 0xa268, 0x2011, 0x0000, 0x6814, 0xd0fc,
-        0x0110, 0xa295, 0x0200, 0xd0b4, 0x0110, 0xa295, 0x0001, 0x6b0c,
-        0x6800, 0x70da, 0x0804, 0x13b7, 0x7814, 0xd0f4, 0x0130, 0x2001,
-        0x4007, 0x70db, 0x0000, 0xa005, 0x0048, 0xd0fc, 0x0130, 0x2001,
-        0x4007, 0x70db, 0x0001, 0xa005, 0x0008, 0xa006, 0x0005, 0x7814,
-        0xd0f4, 0x0130, 0x2001, 0x4007, 0x70db, 0x0000, 0xa005, 0x0008,
-        0xa006, 0x0005, 0x7814, 0xd0fc, 0x0130, 0x2001, 0x4007, 0x70db,
-        0x0001, 0xa005, 0x0008, 0xa006, 0x0005, 0x7112, 0x721a, 0x731e,
-        0x7810, 0xd0c4, 0x0110, 0x7422, 0x7526, 0xac80, 0x0001, 0x8108,
-        0x810c, 0x81a9, 0x8098, 0x20a1, 0x0030, 0x7003, 0x0000, 0x6084,
-        0x20a2, 0x53a6, 0x7007, 0x0001, 0x7974, 0xa184, 0xff00, 0x0140,
-        0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0018,
-        0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006, 0xa211,
-        0x7d10, 0xd5c4, 0x0120, 0x7b84, 0xa319, 0x7c80, 0xa421, 0x7008,
-        0xd0fc, 0x0de8, 0x7003, 0x0001, 0x7007, 0x0006, 0x711a, 0x721e,
-        0x7d10, 0xd5c4, 0x0110, 0x7322, 0x7426, 0xa084, 0x01e0, 0x0005,
-        0x7848, 0xa065, 0x0120, 0x2c04, 0x784a, 0x2063, 0x0000, 0x0005,
-        0x00f6, 0x2079, 0x4600, 0x7848, 0x2062, 0x2c00, 0xa005, 0x1110,
-        0x080c, 0x254c, 0x784a, 0x00fe, 0x0005, 0x2011, 0x9000, 0x7a4a,
-        0x7bc4, 0x8319, 0x0128, 0xa280, 0x0032, 0x2012, 0x2010, 0x0cc8,
-        0x2013, 0x0000, 0x0005, 0x0016, 0x0026, 0xd7fc, 0x1118, 0x2011,
-        0x4bc0, 0x0010, 0x2011, 0x6bc0, 0xa784, 0x0f00, 0x800b, 0xa784,
-        0x001f, 0x0120, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa268,
-        0x002e, 0x001e, 0x0005, 0x0c39, 0x2900, 0x682a, 0x2a00, 0x682e,
-        0x6808, 0xa084, 0xf9ef, 0xa80d, 0x690a, 0x00e6, 0xd7fc, 0x1128,
-        0x2009, 0x4652, 0x2071, 0x4640, 0x0020, 0x2009, 0x4692, 0x2071,
-        0x4680, 0x210c, 0x6804, 0xa005, 0x0148, 0xa116, 0x1138, 0x2060,
-        0x6000, 0x6806, 0x0016, 0x200b, 0x0000, 0x0018, 0x2009, 0x0000,
-        0x0016, 0x6804, 0xa065, 0x0178, 0x6000, 0x6806, 0x0421, 0x080c,
-        0x1d95, 0x6810, 0x7908, 0x8109, 0x790a, 0x8001, 0x6812, 0x1d88,
-        0x7910, 0xc1a5, 0x7912, 0x001e, 0x6902, 0x6906, 0x2d00, 0x2060,
-        0x080c, 0x2693, 0x00ee, 0x0005, 0xa065, 0x0160, 0x2008, 0x609c,
-        0xa005, 0x0128, 0x2062, 0x609f, 0x0000, 0xa065, 0x0cc0, 0x7848,
-        0x794a, 0x2062, 0x0005, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9,
-        0x001c, 0xac80, 0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828,
-        0x601a, 0x682c, 0x6022, 0x0005, 0x00e6, 0xd7fc, 0x1128, 0x2071,
-        0x4640, 0x2031, 0x46c0, 0x0020, 0x2071, 0x4680, 0x2031, 0x48c0,
-        0x704c, 0xa08c, 0x0200, 0x1128, 0xa608, 0x2d0a, 0x8000, 0x704e,
-        0xa006, 0x00ee, 0x0005, 0x00f6, 0xd7fc, 0x1118, 0x2079, 0x4640,
-        0x0010, 0x2079, 0x4680, 0x080c, 0x1b7b, 0x2091, 0x8000, 0x6804,
-        0x780a, 0xa065, 0x05f0, 0x0030, 0x2c00, 0x780a, 0x2060, 0x6000,
-        0xa065, 0x05b8, 0x6010, 0xa306, 0x1db8, 0x600c, 0xa206, 0x1da0,
-        0x2c28, 0x7848, 0xac06, 0x1108, 0x0448, 0x6804, 0xac06, 0x1140,
-        0x6000, 0x2060, 0x6806, 0xa005, 0x1118, 0x6803, 0x0000, 0x0048,
-        0x6400, 0x7808, 0x2060, 0x6402, 0xa486, 0x0000, 0x1110, 0x2c00,
-        0x6802, 0x2560, 0x080c, 0x1be3, 0x601b, 0x0005, 0x6023, 0x0020,
-        0x00fe, 0x080c, 0x1d95, 0x00f6, 0x7908, 0x8109, 0x790a, 0x6810,
-        0x8001, 0x6812, 0x1118, 0x7810, 0xc0a5, 0x7812, 0x2001, 0xffff,
-        0xa005, 0x00fe, 0x0005, 0x0076, 0x2700, 0x2039, 0x0000, 0xd0fc,
-        0x0108, 0xc7fd, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008,
-        0x2091, 0x8000, 0x080c, 0x1b93, 0x8738, 0xa784, 0x001f, 0x1dd0,
-        0xa7bc, 0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x1d90,
-        0x2091, 0x8001, 0x007e, 0x0005, 0x786c, 0x2009, 0x8e74, 0x210c,
-        0xa10d, 0x0118, 0xa065, 0x0804, 0x207a, 0x2061, 0x0000, 0x6018,
-        0xd084, 0x11b8, 0x7810, 0xd08c, 0x0130, 0xc08c, 0x7812, 0xc7fc,
-        0x2069, 0x4640, 0x0028, 0xc08d, 0x7812, 0x2069, 0x4680, 0xc7fd,
-        0x2091, 0x8000, 0x681c, 0x681f, 0x0000, 0x2091, 0x8001, 0xa005,
-        0x1108, 0x0005, 0xa08c, 0xfff0, 0x0110, 0x080c, 0x254c, 0x0002,
-        0x1cb8, 0x1cbb, 0x1cc1, 0x1cc5, 0x1cb9, 0x1cc9, 0x1cb9, 0x1cb9,
-        0x1cb9, 0x1ccf, 0x1cfb, 0x1cfe, 0x1d03, 0x1d0c, 0x1cb9, 0x1cb9,
-        0x0005, 0x080c, 0x254c, 0x080c, 0x1c5b, 0x2001, 0x8001, 0x0804,
-        0x1d15, 0x2001, 0x8003, 0x0804, 0x1d15, 0x2001, 0x8004, 0x0804,
-        0x1d15, 0x080c, 0x1c5b, 0x2001, 0x8006, 0x0804, 0x1d15, 0x2091,
-        0x8000, 0x0076, 0xd7fc, 0x1128, 0x2069, 0x4640, 0x2039, 0x0009,
-        0x0020, 0x2069, 0x4680, 0x2039, 0x0009, 0x6800, 0xa086, 0x0000,
-        0x0128, 0x000e, 0x6f1e, 0x2091, 0x8001, 0x0005, 0x6870, 0x007e,
-        0xa0bc, 0xff00, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010,
-        0x080c, 0x1b93, 0x8738, 0xa784, 0x001f, 0x1dd0, 0x2091, 0x8001,
-        0x2001, 0x800a, 0x00d0, 0x2001, 0x800c, 0x00b8, 0x080c, 0x1c5b,
-        0x2001, 0x800d, 0x0090, 0xd7fc, 0x0110, 0x78e4, 0x0008, 0x78e0,
-        0x70c6, 0x2001, 0x800e, 0x0048, 0xd7fc, 0x0110, 0x78ec, 0x0008,
-        0x78e8, 0x70c6, 0x2001, 0x800f, 0x0000, 0x70c2, 0xd7fc, 0x1118,
-        0x70db, 0x0000, 0x0010, 0x70db, 0x0001, 0x2061, 0x0000, 0x601b,
-        0x0001, 0x2091, 0x4080, 0x0005, 0xac80, 0x0001, 0x81ff, 0x0518,
-        0x2099, 0x0030, 0x20a0, 0x700c, 0xa084, 0x07ff, 0x0100, 0x7018,
-        0x0006, 0x701c, 0x0006, 0x7020, 0x0006, 0x7024, 0x0006, 0x7112,
-        0x81ac, 0x721a, 0x731e, 0x7422, 0x7526, 0x7003, 0x0001, 0x7007,
-        0x0001, 0x7008, 0x800b, 0x1ee8, 0x7007, 0x0002, 0xa08c, 0x01e0,
-        0x1110, 0x53a5, 0xa006, 0x7003, 0x0000, 0x7007, 0x0004, 0x000e,
-        0x7026, 0x000e, 0x7022, 0x000e, 0x701e, 0x000e, 0x701a, 0x0005,
-        0x2011, 0x0020, 0x2009, 0x0010, 0x6b0a, 0x6c0e, 0x681f, 0x0201,
-        0x6803, 0xfd20, 0x6807, 0x0038, 0x6a1a, 0x2d00, 0xa0e8, 0x0008,
-        0xa290, 0x0004, 0x8109, 0x1d80, 0x0005, 0x70ec, 0xd0dc, 0x1520,
-        0x2029, 0x0001, 0x7814, 0xd0cc, 0x1160, 0x70ec, 0xd0e4, 0x2019,
-        0x0c0a, 0x2021, 0x000a, 0x1120, 0x2019, 0x0c0c, 0x2021, 0x000c,
-        0x0070, 0x70ec, 0xd0e4, 0x1128, 0x2019, 0x180c, 0x2021, 0x000c,
-        0x0030, 0x2019, 0x1809, 0x2021, 0x0009, 0xa5ad, 0x0200, 0x6b0a,
-        0x6c0e, 0x6d1e, 0x6807, 0x0038, 0x0005, 0x6004, 0x6086, 0x2c08,
-        0x2063, 0x0000, 0x7868, 0xa005, 0x796a, 0x0110, 0x2c02, 0x0008,
-        0x796e, 0x0005, 0x00c6, 0x2061, 0x4600, 0x6887, 0x0103, 0x2d08,
-        0x206b, 0x0000, 0x6068, 0xa005, 0x616a, 0x0110, 0x2d02, 0x0008,
-        0x616e, 0x00ce, 0x0005, 0x2091, 0x8000, 0x2c04, 0x786e, 0xa005,
-        0x1108, 0x786a, 0x2091, 0x8001, 0x609c, 0xa005, 0x0188, 0x00c6,
-        0x2060, 0x2008, 0x609c, 0xa005, 0x0138, 0x2062, 0x609f, 0x0000,
-        0xa065, 0x609c, 0xa005, 0x1dc8, 0x7848, 0x794a, 0x2062, 0x00ce,
-        0x7848, 0x2062, 0x609f, 0x0000, 0xac85, 0x0000, 0x1110, 0x080c,
-        0x254c, 0x784a, 0x0005, 0x20a9, 0x0010, 0xa006, 0x8004, 0x8086,
-        0x818e, 0x1208, 0xa200, 0x1f04, 0x1ddf, 0x8086, 0x818e, 0x0005,
-        0x0156, 0x20a9, 0x0010, 0xa005, 0x01b8, 0xa11a, 0x12a8, 0x8213,
-        0x818d, 0x0228, 0xa11a, 0x1220, 0x1f04, 0x1def, 0x0028, 0xa11a,
-        0x2308, 0x8210, 0x1f04, 0x1def, 0x0006, 0x3200, 0xa084, 0xefff,
-        0x2080, 0x000e, 0x015e, 0x0005, 0x0006, 0x3200, 0xa085, 0x1000,
-        0x0cb8, 0x7d74, 0x70d0, 0xa506, 0x0904, 0x1ebd, 0x7810, 0x2050,
-        0x080c, 0x1b58, 0x0904, 0x1ebd, 0xa046, 0x7970, 0x2500, 0x8000,
-        0xa112, 0x2009, 0x0040, 0x1208, 0x0030, 0x72d0, 0xa206, 0x0118,
-        0x8840, 0x2009, 0x0080, 0x00c6, 0x7112, 0x7007, 0x0001, 0x2099,
-        0x0030, 0x20a9, 0x0020, 0xac80, 0x0001, 0x20a0, 0x2061, 0x0000,
-        0x88ff, 0x0110, 0x080c, 0x1b58, 0x7008, 0xd0fc, 0x0de8, 0x7007,
-        0x0002, 0x2091, 0x8001, 0xa08c, 0x01e0, 0x1538, 0x53a5, 0x8cff,
-        0x1120, 0x88ff, 0x0904, 0x1eaa, 0x0050, 0x2c00, 0x788e, 0x20a9,
-        0x0020, 0xac80, 0x0001, 0x20a0, 0x53a5, 0x0804, 0x1eaa, 0xa046,
-        0x7218, 0x731c, 0xdac4, 0x0110, 0x7420, 0x7524, 0xa292, 0x0040,
-        0xa39b, 0x0000, 0xa4a3, 0x0000, 0xa5ab, 0x0000, 0x721a, 0x731e,
-        0xdac4, 0x0118, 0x7422, 0x7526, 0xa006, 0x7007, 0x0004, 0x0904,
-        0x1eaa, 0x8cff, 0x0110, 0x080c, 0x1b60, 0x00ce, 0x080c, 0x1b60,
-        0xa046, 0x7888, 0x8000, 0x788a, 0xa086, 0x0002, 0x01c0, 0x7a7c,
-        0x7b78, 0xdac4, 0x0110, 0x7c84, 0x7d80, 0x7974, 0x8107, 0x8004,
-        0x8004, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000,
-        0x721a, 0x731e, 0xdac4, 0x0588, 0x7422, 0x7526, 0x0470, 0x6014,
-        0xd0fc, 0x1118, 0x2069, 0x4640, 0x0010, 0x2069, 0x4680, 0x2091,
-        0x8000, 0x681f, 0x0002, 0x88ff, 0x0120, 0xa046, 0x788c, 0x2060,
-        0x0c70, 0x788b, 0x0000, 0x78ac, 0xa085, 0x0003, 0x78ae, 0x2091,
-        0x8001, 0x0098, 0x00ce, 0x788b, 0x0000, 0x080c, 0x2035, 0x6004,
-        0xa084, 0x000f, 0x0059, 0x88ff, 0x0130, 0x788c, 0x2060, 0x6004,
-        0xa084, 0x000f, 0x0019, 0x0804, 0x1e09, 0x0005, 0x0002, 0x1ecf,
-        0x1eea, 0x1f03, 0x1ecf, 0x1f10, 0x1ee0, 0x1ecf, 0x1ecf, 0x1ecf,
-        0x1ee8, 0x1f01, 0x1ecf, 0x1ecf, 0x1ecf, 0x1ecf, 0x1ecf, 0x2039,
-        0x0400, 0x78bc, 0xa705, 0x78be, 0x6008, 0xa705, 0x600a, 0x080c,
-        0x1f4c, 0x609c, 0x78ba, 0x609f, 0x0000, 0x080c, 0x2021, 0x0005,
-        0x78bc, 0xd0c4, 0x0108, 0x0c58, 0x601c, 0xc0bd, 0x601e, 0x0030,
-        0x080c, 0x205f, 0x78bc, 0xd0c4, 0x0108, 0x0c08, 0x78bf, 0x0000,
-        0x6004, 0x8007, 0xa084, 0x00ff, 0x78b2, 0x8001, 0x0138, 0x080c,
-        0x1f4c, 0x0120, 0x78bc, 0xc0c5, 0x78be, 0x0010, 0x0804, 0x1f67,
-        0x0005, 0x080c, 0x205c, 0x78bc, 0xa08c, 0x0e00, 0x1110, 0xd0c4,
-        0x1108, 0x0828, 0x080c, 0x1f4c, 0x1110, 0x0804, 0x1f67, 0x0005,
-        0x78bc, 0xd0c4, 0x0110, 0x0804, 0x1ecf, 0x78bf, 0x0000, 0x6714,
-        0x2011, 0x0001, 0x22a8, 0x6018, 0xa084, 0x00ff, 0xa005, 0x0188,
-        0xa7bc, 0xff00, 0x20a9, 0x0020, 0xa08e, 0x0001, 0x0150, 0xa7bc,
-        0x8000, 0x2011, 0x0002, 0x20a9, 0x0100, 0xa08e, 0x0002, 0x0108,
-        0x00c0, 0x080c, 0x1b7b, 0x2d00, 0x2091, 0x8000, 0x682b, 0x0000,
-        0x682f, 0x0000, 0x6808, 0xa084, 0xffde, 0x680a, 0xade8, 0x0010,
-        0x2091, 0x8001, 0x1f04, 0x1f34, 0x8211, 0x0118, 0x20a9, 0x0100,
-        0x0c58, 0x080c, 0x1b60, 0x0005, 0x609f, 0x0000, 0x78b4, 0xa06d,
-        0x2c00, 0x78b6, 0x1110, 0x78ba, 0x0038, 0x689e, 0x2d00, 0x6002,
-        0x78b8, 0xad06, 0x1108, 0x6002, 0x78b0, 0x8001, 0x78b2, 0x1130,
-        0x78bc, 0xc0c4, 0x78be, 0x78b8, 0x2060, 0xa006, 0x0005, 0x00e6,
-        0xa02e, 0x2530, 0x7dba, 0x7db6, 0x65ae, 0x65b2, 0x601c, 0x60a2,
-        0x2048, 0xa984, 0xe1ff, 0x601e, 0xa984, 0x0060, 0x0110, 0x080c,
-        0x3fc1, 0x6596, 0x65a6, 0x669a, 0x66aa, 0x6714, 0x2071, 0x4680,
-        0xd7fc, 0x1110, 0x2071, 0x4640, 0xa784, 0x0f00, 0x800b, 0xa784,
-        0x001f, 0x0120, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0x71c0,
-        0xa168, 0x2700, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003,
-        0x71c4, 0xa100, 0x60c2, 0x2091, 0x8000, 0x7814, 0xd0c4, 0x0138,
-        0xd7fc, 0x1118, 0xd0f4, 0x1140, 0x0010, 0xd0fc, 0x1128, 0x6e08,
-        0xd684, 0x01f0, 0xd9fc, 0x11e0, 0x2091, 0x8001, 0x080c, 0x1be3,
-        0x2091, 0x8000, 0x080c, 0x1d95, 0x2091, 0x8001, 0x7814, 0xd0c4,
-        0x0904, 0x201f, 0xd7fc, 0x1120, 0xd0f4, 0x1130, 0x0804, 0x201f,
-        0xd0fc, 0x1110, 0x0804, 0x201f, 0x601b, 0x0021, 0x0804, 0x201f,
-        0x6024, 0xa096, 0x0001, 0x1110, 0x8000, 0x6026, 0x6a10, 0x6814,
-        0xa202, 0x0268, 0x0160, 0x2091, 0x8001, 0x2039, 0x0200, 0x609c,
-        0x78ba, 0x609f, 0x0000, 0x080c, 0x2021, 0x0804, 0x201f, 0x2c08,
-        0xd9fc, 0x01f0, 0x6800, 0xa065, 0x01d8, 0x6a04, 0x7000, 0xa084,
-        0x0002, 0x0168, 0x7048, 0xa206, 0x1150, 0x6b04, 0x2160, 0x2304,
-        0x6002, 0xa005, 0x1108, 0x6902, 0x2260, 0x6102, 0x0098, 0x2d00,
-        0x2060, 0x080c, 0x2693, 0x6e08, 0x2160, 0x6202, 0x6906, 0x0050,
-        0x6800, 0x6902, 0xa065, 0x0110, 0x6102, 0x0008, 0x6906, 0x2160,
-        0x6003, 0x0000, 0x2160, 0xd9fc, 0x0118, 0xa6b4, 0xfffc, 0x6e0a,
-        0x6810, 0x7d08, 0x8528, 0x7d0a, 0x8000, 0x6812, 0x2091, 0x8001,
-        0xd6b4, 0x0128, 0xa6b6, 0x0040, 0x6e0a, 0x080c, 0x1bf4, 0x00ee,
-        0x0005, 0x6008, 0xa705, 0x600a, 0x2091, 0x8000, 0x080c, 0x1d95,
-        0x2091, 0x8001, 0x78b8, 0xa065, 0x0128, 0x609c, 0x78ba, 0x609f,
-        0x0000, 0x0c78, 0x78b6, 0x78ba, 0x0005, 0x7970, 0x7874, 0x2818,
-        0xd384, 0x0118, 0x8000, 0xa112, 0x0220, 0x8000, 0xa112, 0x1278,
-        0xc384, 0x7a7c, 0x721a, 0x7a78, 0x721e, 0xdac4, 0x0120, 0x7a84,
-        0x7222, 0x7a80, 0x7226, 0xa006, 0xd384, 0x0108, 0x8000, 0x7876,
-        0x70d2, 0x781c, 0xa005, 0x0138, 0x8001, 0x781e, 0x1120, 0x0e04,
-        0x205b, 0x2091, 0x4080, 0x0005, 0x2039, 0x2071, 0x0010, 0x2039,
-        0x2077, 0x2704, 0xa005, 0x0160, 0xac00, 0x2068, 0x6908, 0x6810,
-        0x6912, 0x680a, 0x690c, 0x6814, 0x6916, 0x680e, 0x8738, 0x0c88,
-        0x0005, 0x0003, 0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0015,
-        0x001b, 0x0000, 0x2041, 0x0000, 0x780c, 0x0002, 0x2223, 0x21fe,
-        0x2082, 0x20f2, 0x2039, 0x8e74, 0x2734, 0x7d10, 0x00c0, 0x6084,
-        0xa086, 0x0103, 0x1904, 0x20dc, 0x6114, 0x6018, 0xa105, 0x0120,
-        0x86ff, 0x11d8, 0x0804, 0x20dc, 0x8603, 0xa080, 0x8e55, 0x620c,
-        0x2202, 0x8000, 0x6210, 0x2202, 0x080c, 0x1db3, 0x8630, 0xa68e,
-        0x000f, 0x0904, 0x215d, 0x786c, 0xa065, 0x1d08, 0x7808, 0xa602,
-        0x1220, 0xd5ac, 0x1110, 0x263a, 0x0005, 0xa682, 0x0003, 0x1a04,
-        0x215d, 0x2091, 0x8000, 0x2069, 0x0000, 0x6818, 0xd084, 0x11f8,
-        0x2011, 0x8e55, 0x2204, 0x70c6, 0x8210, 0x2204, 0x70ca, 0xd684,
-        0x1130, 0x8210, 0x2204, 0x70da, 0x8210, 0x2204, 0x70de, 0xa685,
-        0x8020, 0x70c2, 0x681b, 0x0001, 0x2091, 0x4080, 0x7810, 0xa084,
-        0xffcf, 0x7812, 0x2091, 0x8001, 0x203b, 0x0000, 0x0005, 0x7810,
-        0xc0ad, 0x7812, 0x0804, 0x215d, 0x263a, 0x080c, 0x2229, 0x1904,
-        0x2245, 0x786c, 0xa065, 0x1904, 0x2087, 0x2091, 0x8000, 0x7810,
-        0xa084, 0xffcf, 0x86ff, 0x0108, 0xc0ad, 0x7812, 0x2091, 0x8001,
-        0x0804, 0x2245, 0x2039, 0x8e74, 0x2734, 0x7d10, 0x00a0, 0x6084,
-        0xa086, 0x0103, 0x1904, 0x2147, 0x6114, 0x6018, 0xa105, 0x0120,
-        0x86ff, 0x11b8, 0x0804, 0x2147, 0xa680, 0x8e55, 0x620c, 0x2202,
-        0x080c, 0x1db3, 0x8630, 0xa68e, 0x001e, 0x0904, 0x215d, 0x786c,
-        0xa065, 0x1d28, 0x7808, 0xa602, 0x1220, 0xd5ac, 0x1110, 0x263a,
-        0x0005, 0xa682, 0x0006, 0x1a04, 0x215d, 0x2091, 0x8000, 0x2069,
-        0x0000, 0x6818, 0xd084, 0x11f8, 0x2011, 0x8e55, 0x2009, 0x8e4e,
-        0x26a8, 0x211c, 0x2204, 0x201a, 0x8108, 0x8210, 0x1f04, 0x2129,
-        0xa685, 0x8030, 0x70c2, 0x681b, 0x0001, 0x2091, 0x4080, 0x7810,
-        0xa084, 0xffcf, 0x7812, 0x2091, 0x8001, 0xa006, 0x2009, 0x8e75,
-        0x200a, 0x203a, 0x0005, 0x7810, 0xc0ad, 0x7812, 0x00b0, 0x263a,
-        0x080c, 0x2229, 0x1904, 0x2245, 0x786c, 0xa065, 0x1904, 0x20f7,
-        0x2091, 0x8000, 0x7810, 0xa084, 0xffcf, 0x86ff, 0x0108, 0xc0ad,
-        0x7812, 0x2091, 0x8001, 0x0804, 0x2245, 0x2091, 0x8000, 0x7007,
-        0x0004, 0x7994, 0x70d4, 0xa102, 0x0228, 0x0168, 0x7b90, 0xa302,
-        0x1150, 0x0010, 0x8002, 0x1138, 0x263a, 0x7810, 0xc0ad, 0x7812,
-        0x2091, 0x8001, 0x0005, 0xa184, 0xff00, 0x0140, 0x810f, 0x810c,
-        0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0018, 0x8107, 0x8004,
-        0x8004, 0x7a9c, 0xa210, 0x721a, 0x7a98, 0xa006, 0xa211, 0x721e,
-        0xd4c4, 0x0130, 0x7aa4, 0xa211, 0x7222, 0x7aa0, 0xa211, 0x7226,
-        0x20a1, 0x0030, 0x7003, 0x0000, 0x2009, 0x8e54, 0x260a, 0x8109,
-        0x2198, 0x2104, 0xd084, 0x0108, 0x8633, 0xa6b0, 0x0002, 0x26a8,
-        0x53a6, 0x8603, 0x7012, 0x7007, 0x0001, 0x7990, 0x7894, 0x8000,
-        0xa10a, 0x1208, 0xa006, 0x2028, 0x7974, 0xa184, 0xff00, 0x0140,
-        0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0018,
-        0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006, 0xa211,
-        0xd4c4, 0x0120, 0x7b84, 0xa319, 0x7c80, 0xa421, 0x7008, 0xd0fc,
-        0x0de8, 0xa084, 0x01e0, 0x01d0, 0x7d10, 0x2031, 0x8e54, 0x2634,
-        0x78a8, 0x8000, 0x78aa, 0xd08c, 0x1138, 0x7007, 0x0006, 0x7004,
-        0xd094, 0x1de8, 0x0804, 0x215f, 0x2069, 0x4647, 0x206b, 0x0003,
-        0x78ac, 0xa085, 0x0300, 0x78ae, 0xa006, 0x0048, 0x2030, 0x75d6,
-        0x2091, 0x4080, 0x7d96, 0x7d10, 0xa5ac, 0xffcf, 0x7d12, 0x2091,
-        0x8001, 0x78aa, 0x7007, 0x0006, 0x263a, 0x7003, 0x0001, 0x711a,
-        0x721e, 0xd5c4, 0x0110, 0x7322, 0x7426, 0x0005, 0x6084, 0xa086,
-        0x0103, 0x11d8, 0x6114, 0x6018, 0xa105, 0x11b8, 0x2069, 0x0000,
-        0x6818, 0xd084, 0x1190, 0x600c, 0x70c6, 0x6010, 0x70ca, 0x70c3,
-        0x8020, 0x681b, 0x0001, 0x2091, 0x4080, 0x080c, 0x1db3, 0x0e04,
-        0x221c, 0x786c, 0xa065, 0x1d10, 0x0005, 0x0059, 0x1530, 0x786c,
-        0xa065, 0x19e0, 0x0410, 0x0029, 0x1500, 0x786c, 0xa065, 0x1dd8,
-        0x00e0, 0x6084, 0xa086, 0x0103, 0x1168, 0x6018, 0xc0fc, 0x601a,
-        0xa086, 0x0004, 0x1138, 0x7804, 0xd0a4, 0x0120, 0x080c, 0x1db3,
-        0xa006, 0x0005, 0x0079, 0x1118, 0xa085, 0x0001, 0x0005, 0x00b9,
-        0x1110, 0x2041, 0x0001, 0x7d10, 0x0005, 0x88ff, 0x0110, 0x2091,
-        0x4080, 0x0005, 0x7b90, 0x7994, 0x70d4, 0xa102, 0x1118, 0xa385,
-        0x0000, 0x0005, 0x0210, 0xa302, 0x0005, 0x8002, 0x0005, 0xa184,
-        0xff00, 0x0140, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007,
-        0xa100, 0x0018, 0x8107, 0x8004, 0x8004, 0x7a9c, 0x7b98, 0x7ca4,
-        0x7da0, 0xa210, 0xa006, 0xa319, 0xa421, 0xa529, 0x2009, 0x0018,
-        0x6028, 0xa005, 0x0110, 0x2009, 0x0040, 0x080c, 0x1b15, 0x01d0,
-        0x78a8, 0x8000, 0x78aa, 0xd08c, 0x1510, 0x6014, 0xd0fc, 0x1118,
-        0x2069, 0x4640, 0x0010, 0x2069, 0x4680, 0x2091, 0x8000, 0x681f,
-        0x0003, 0x78ab, 0x0000, 0x78ac, 0xa085, 0x0300, 0x78ae, 0x2091,
-        0x8001, 0x0068, 0x78ab, 0x0000, 0x080c, 0x1db3, 0x7990, 0x7894,
-        0x8000, 0xa10a, 0x1208, 0xa006, 0x7896, 0x70d6, 0xa006, 0x2071,
-        0x0010, 0x2091, 0x8001, 0x0005, 0xd7fc, 0x1118, 0x2009, 0x4658,
-        0x0010, 0x2009, 0x4698, 0x2091, 0x8000, 0x200a, 0x00f6, 0x2009,
-        0x4680, 0x2079, 0x0100, 0xd7fc, 0x1120, 0x2009, 0x4640, 0x2079,
-        0x0200, 0x2104, 0xa086, 0x0000, 0x1180, 0xd7fc, 0x1118, 0x2009,
-        0x4645, 0x0010, 0x2009, 0x4685, 0x2104, 0xa005, 0x1130, 0x7830,
-        0xa084, 0x00c0, 0x1110, 0x781b, 0x0052, 0x00fe, 0x0005, 0x2009,
-        0x0002, 0x2069, 0x4600, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904,
-        0x2324, 0x2071, 0x4680, 0x2079, 0x0100, 0x2021, 0x48bf, 0x784b,
-        0x000f, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x0118, 0x2019, 0x3e0f,
-        0x0030, 0x20a1, 0x012b, 0x2019, 0x3e0f, 0xd184, 0x0110, 0x20a1,
-        0x022b, 0x2304, 0xa005, 0x0140, 0x789a, 0x8318, 0x23ac, 0x8318,
-        0x2398, 0x53a6, 0x3318, 0x0ca8, 0x789b, 0x0000, 0x789b, 0x0020,
-        0x20a9, 0x0010, 0x78af, 0x0000, 0x78af, 0x2020, 0x1f04, 0x2302,
-        0x7003, 0x0000, 0x0016, 0xd18c, 0x2009, 0x0000, 0x0108, 0xc1bd,
-        0x080c, 0x2443, 0x001e, 0x7020, 0xa084, 0x000f, 0xa085, 0x6300,
-        0x7806, 0x780f, 0x9000, 0x7843, 0x00d8, 0x7853, 0x0090, 0x780b,
-        0x2f08, 0x7452, 0x704f, 0x0000, 0x8109, 0x0140, 0x2071, 0x4640,
-        0x2079, 0x0200, 0x2021, 0x46bf, 0x0804, 0x22df, 0x080c, 0x24fd,
-        0x0005, 0x0016, 0x2011, 0x0101, 0xd1bc, 0x1110, 0x2011, 0x0201,
-        0xa18c, 0x000f, 0x2204, 0xa084, 0xfff0, 0xa105, 0x2012, 0x001e,
-        0x080c, 0x2443, 0x0005, 0x2011, 0x0101, 0xd3fc, 0x1110, 0x2011,
-        0x0201, 0x20a9, 0x0009, 0x810b, 0x1f04, 0x234b, 0xa18c, 0x0e00,
-        0x2204, 0xa084, 0xf1ff, 0xa105, 0x2012, 0x0005, 0x2019, 0x0002,
-        0x2009, 0x0101, 0x20a9, 0x0005, 0x8213, 0x1f04, 0x235c, 0xa294,
-        0x00e0, 0x2104, 0xa084, 0xff1f, 0xa205, 0x200a, 0x8319, 0x0118,
-        0x2009, 0x0201, 0x0c78, 0x0005, 0x2011, 0x0101, 0xd3fc, 0x1110,
-        0x2011, 0x0201, 0x20a9, 0x000c, 0x810b, 0x1f04, 0x2374, 0xa18c,
-        0xf000, 0x2204, 0xa084, 0x0fff, 0xa105, 0x2012, 0x0005, 0x2011,
-        0x0102, 0xd3fc, 0x1110, 0x2011, 0x0202, 0x2204, 0xa084, 0xf0cf,
-        0xa105, 0x2012, 0x0005, 0x00c6, 0x2061, 0x0100, 0xd1bc, 0x1110,
-        0x2061, 0x0200, 0xc1bc, 0x8103, 0x8003, 0xa080, 0x0020, 0x609a,
-        0x62ac, 0x63ac, 0x00ce, 0x0005, 0x00c6, 0x2061, 0x0100, 0xd1bc,
-        0x1110, 0x2061, 0x0200, 0xc1bc, 0x8103, 0x8003, 0xa080, 0x0022,
-        0x609a, 0x60a4, 0xa084, 0xffdf, 0x60ae, 0x00ce, 0x0005, 0x00c6,
-        0x2061, 0x0100, 0xd1bc, 0x1110, 0x2061, 0x0200, 0xc1bc, 0x8103,
-        0x8003, 0xa080, 0x0020, 0x609a, 0x60a4, 0xa28c, 0x0020, 0x0118,
-        0xc2ac, 0xa39d, 0x4000, 0xc3ec, 0xd3b4, 0x1108, 0xc3ed, 0x62ae,
-        0x2010, 0x60a4, 0x63ae, 0x2018, 0x00ce, 0x0005, 0x2091, 0x8000,
-        0x00c6, 0x00e6, 0x6818, 0xa005, 0x0904, 0x2427, 0xd1fc, 0x0118,
-        0x2061, 0x8dd0, 0x0010, 0x2061, 0x8cc0, 0x080c, 0x242f, 0x0560,
-        0x20a9, 0x0101, 0xd1fc, 0x0118, 0x2061, 0x8cd0, 0x0010, 0x2061,
-        0x8bc0, 0x00c6, 0x080c, 0x242f, 0x0128, 0x00ce, 0x8c60, 0x1f04,
-        0x23e9, 0x04a8, 0x000e, 0xd1fc, 0x0128, 0xa082, 0x8cd0, 0x2071,
-        0x4680, 0x0020, 0xa082, 0x8bc0, 0x2071, 0x4640, 0x7076, 0x7172,
-        0x2138, 0x2001, 0x0004, 0x7062, 0x707f, 0x000f, 0x71d0, 0xc1c4,
-        0x71d2, 0x080c, 0x22a4, 0x00c0, 0xd1fc, 0x1118, 0x2071, 0x4640,
-        0x0010, 0x2071, 0x4680, 0x6020, 0xc0dd, 0x6022, 0x7172, 0x2138,
-        0x2c00, 0x707a, 0x2001, 0x0006, 0x7062, 0x707f, 0x000f, 0x71d0,
-        0xc1c4, 0x71d2, 0x080c, 0x22a4, 0x2001, 0x0000, 0x0010, 0x2001,
-        0x0001, 0x2091, 0x8001, 0xa005, 0x00ee, 0x00ce, 0x0005, 0x2c04,
-        0xa005, 0x0170, 0x2060, 0x6010, 0xa306, 0x1140, 0x600c, 0xa206,
-        0x1128, 0x6014, 0xa106, 0x1110, 0xa006, 0x0020, 0x6000, 0x0c80,
-        0xa085, 0x0001, 0x0005, 0x00f6, 0x00e6, 0x0016, 0x2079, 0x4680,
-        0x2071, 0x0100, 0xd1bc, 0x1120, 0x2079, 0x4640, 0x2071, 0x0200,
-        0x7920, 0xa18c, 0x000f, 0x70ec, 0xd0c4, 0x1110, 0x001e, 0x0060,
-        0x810b, 0x810b, 0x810b, 0x810b, 0x000e, 0xa18d, 0x0800, 0xd0bc,
-        0x1110, 0xa18d, 0x0f00, 0x2104, 0x00ee, 0x00fe, 0x0005, 0x2001,
-        0x4601, 0x2004, 0xd0ac, 0x1138, 0x68e4, 0xd0ac, 0x0120, 0xa084,
-        0x0006, 0x1108, 0x0009, 0x0005, 0x6014, 0x00e6, 0x0036, 0x2018,
-        0x2071, 0x4b40, 0xd0fc, 0x1110, 0x2071, 0x4ac0, 0x8007, 0xa084,
-        0x000f, 0x8003, 0x8003, 0x8003, 0xae70, 0x7004, 0xa084, 0x000a,
-        0x1904, 0x24fa, 0x7108, 0xa194, 0xff00, 0x0904, 0x24fa, 0xa18c,
-        0x00ff, 0x701c, 0xa084, 0xff00, 0x01c0, 0x7004, 0xa085, 0x003a,
-        0x7006, 0x2001, 0x0009, 0xa102, 0x16d8, 0x2001, 0x000a, 0xa102,
-        0x16d0, 0x2001, 0x000c, 0xa102, 0x16c8, 0x701c, 0xa084, 0x00ff,
-        0x701e, 0x7004, 0xa084, 0xffdf, 0x7006, 0x2001, 0x000a, 0xa106,
-        0x01a8, 0x2001, 0x000c, 0xa106, 0x01a0, 0x2001, 0x0012, 0xa106,
-        0x0198, 0x2001, 0x0014, 0xa106, 0x0190, 0x2001, 0x0019, 0xa106,
-        0x0188, 0x2001, 0x0032, 0xa106, 0x0180, 0x00d8, 0x2009, 0x000c,
-        0x00d0, 0x2009, 0x0012, 0x00b8, 0x2009, 0x0014, 0x00a0, 0x2009,
-        0x0019, 0x0088, 0x2009, 0x0020, 0x0070, 0x2009, 0x003f, 0x0058,
-        0x2009, 0x000a, 0x0040, 0x2009, 0x000c, 0x0028, 0x2009, 0x0019,
-        0x0010, 0x2011, 0x0000, 0x2100, 0xa205, 0x700a, 0x7004, 0xa085,
-        0x000a, 0x7006, 0x2071, 0x4600, 0x7004, 0xd0bc, 0x0158, 0xd3fc,
-        0x1120, 0x73ea, 0x2071, 0x4640, 0x0018, 0x73ee, 0x2071, 0x4680,
-        0x701f, 0x000d, 0x003e, 0x00ee, 0x0005, 0x2001, 0x01ff, 0x2004,
-        0xd0fc, 0x11d0, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005, 0x12a0,
-        0x2071, 0x0200, 0x71ec, 0xa18c, 0x1c00, 0x810f, 0x810c, 0x810c,
-        0x2079, 0x0100, 0x78ec, 0xa084, 0x1c00, 0x8007, 0x8004, 0x8004,
-        0xa105, 0xa08a, 0x0007, 0x0208, 0x0005, 0x0002, 0x254b, 0x2532,
-        0x254b, 0x2532, 0x2525, 0x253f, 0x2525, 0x7008, 0xa084, 0xc3ff,
-        0xa085, 0x3000, 0x700a, 0x7808, 0xa084, 0xc3ff, 0xa085, 0x3000,
-        0x780a, 0x0005, 0x7008, 0xa084, 0xc3ff, 0xa085, 0x2000, 0x700a,
-        0x7808, 0xa084, 0xc3ff, 0xa085, 0x2000, 0x780a, 0x0005, 0x7008,
-        0xa084, 0xc3ff, 0xa085, 0x0c00, 0x700a, 0x7808, 0xa084, 0xc3ff,
-        0xa085, 0x0c00, 0x780a, 0x0005, 0x0e04, 0x254c, 0x2091, 0x8000,
-        0x2071, 0x0000, 0x0006, 0x7018, 0xd084, 0x1de8, 0x000e, 0x2071,
-        0x0010, 0x70ca, 0x000e, 0x70c6, 0x70c3, 0x8002, 0x70db, 0x0a04,
-        0x70df, 0x0020, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080,
-        0x0cf8, 0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x78a0, 0x708a, 0x758e,
-        0x7492, 0x7696, 0x779a, 0xa594, 0x003f, 0xd4f4, 0x0138, 0xd7bc,
-        0x1128, 0xa784, 0x007d, 0x1904, 0x3c74, 0x0871, 0xa49c, 0x000f,
-        0xa382, 0x0004, 0x0320, 0xa3a6, 0x0007, 0x1930, 0x2418, 0x8507,
-        0xa084, 0x000f, 0x0002, 0x2b49, 0x2c34, 0x2c72, 0x2ed8, 0x3256,
-        0x32ad, 0x3353, 0x33e2, 0x34b6, 0x3588, 0x259e, 0x259b, 0x2970,
-        0x2a56, 0x322a, 0x259b, 0x080c, 0x254c, 0x0005, 0xa006, 0x0038,
-        0x7808, 0xc08d, 0x780a, 0xa006, 0x7002, 0x704a, 0x7042, 0x70ce,
-        0x705c, 0xa005, 0x1904, 0x26ec, 0x7060, 0xa084, 0x0007, 0x0002,
-        0x25b8, 0x2626, 0x262e, 0x2637, 0x2640, 0x26d2, 0x2649, 0x2626,
-        0x7830, 0xd0bc, 0x1d10, 0x71d0, 0xd1bc, 0x19f8, 0xd1b4, 0x1904,
-        0x2603, 0x70a0, 0xa086, 0x0001, 0x09c0, 0x70b0, 0xa06d, 0x6800,
-        0xa065, 0xa055, 0x789b, 0x0080, 0x6b0c, 0x7baa, 0x6808, 0xa045,
-        0x6d10, 0x6804, 0xa06d, 0xa05d, 0xa886, 0x0001, 0x0118, 0x69bc,
-        0x7daa, 0x79aa, 0x68c0, 0xa04d, 0x6e1c, 0x2001, 0x0010, 0x0804,
-        0x281f, 0x705c, 0xa005, 0x1904, 0x259d, 0x00c6, 0x00d6, 0x70b0,
-        0xa06d, 0x6800, 0xa065, 0xa055, 0x789b, 0x0080, 0x6b0c, 0x7baa,
-        0x6808, 0xa045, 0x6d10, 0x6804, 0xa06d, 0xa05d, 0xa886, 0x0001,
-        0x0118, 0x69bc, 0x7daa, 0x79aa, 0x68c0, 0xa04d, 0x6e1c, 0x2001,
-        0x0020, 0x0804, 0x281f, 0x080c, 0x3c33, 0x1904, 0x259d, 0x781b,
-        0x0068, 0x70b8, 0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de,
-        0x6898, 0x78d2, 0x78da, 0x7808, 0xc08d, 0x780a, 0x68bc, 0x703e,
-        0xc1b4, 0x71d2, 0x70b4, 0xa065, 0x68c0, 0x7056, 0x7003, 0x0002,
-        0x2d00, 0x704a, 0xad80, 0x0009, 0x7042, 0x0005, 0x080c, 0x3c33,
-        0x1120, 0x781b, 0x0054, 0x7003, 0x0004, 0x0005, 0x080c, 0x3c33,
-        0x1128, 0x2011, 0x000c, 0x0419, 0x7003, 0x0004, 0x0005, 0x080c,
-        0x3c33, 0x1128, 0x2011, 0x0006, 0x00d1, 0x7003, 0x0004, 0x0005,
-        0x080c, 0x3c33, 0x1128, 0x2011, 0x000d, 0x0089, 0x7003, 0x0004,
-        0x0005, 0x080c, 0x3c33, 0x1150, 0x2011, 0x0006, 0x0041, 0x7078,
-        0x707b, 0x0000, 0x2068, 0x704a, 0x7003, 0x0004, 0x0005, 0x7170,
-        0xc1fc, 0x8107, 0x7882, 0x789b, 0x0080, 0xa286, 0x000c, 0x1120,
-        0x7aaa, 0x2001, 0x0001, 0x0098, 0xa18c, 0x001f, 0xa18d, 0x00c0,
-        0x79aa, 0xa286, 0x000d, 0x0120, 0x7aaa, 0x2001, 0x0002, 0x0038,
-        0x78ab, 0x0020, 0x7174, 0x79aa, 0x7aaa, 0x2001, 0x0004, 0x789b,
-        0x0060, 0x78aa, 0x785b, 0x0004, 0x781b, 0x0113, 0x080c, 0x3c46,
-        0x707f, 0x000f, 0x70d0, 0xd0b4, 0x0168, 0xc0b4, 0x70d2, 0x00c6,
-        0x70b4, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001,
-        0x601a, 0x00ce, 0x0005, 0x7014, 0xa005, 0x1138, 0x70d0, 0xd0b4,
-        0x0128, 0x70b4, 0xac06, 0x1110, 0x0c29, 0x0005, 0x0016, 0x71a0,
-        0xa186, 0x0001, 0x0528, 0x00d6, 0x0026, 0x2100, 0x2011, 0x0001,
-        0xa212, 0x70b0, 0x2068, 0x6800, 0xac06, 0x0120, 0x8211, 0x01b0,
-        0x00c9, 0x0cc8, 0x00c6, 0x2100, 0x2011, 0x0001, 0xa212, 0x70b0,
-        0x2068, 0x6800, 0x2060, 0x6008, 0xa084, 0xfbef, 0x600a, 0x8211,
-        0x0110, 0x0041, 0x0cb0, 0x70a3, 0x0001, 0x00ce, 0x002e, 0x00de,
-        0x001e, 0x0005, 0xade8, 0x0005, 0x70a8, 0xad06, 0x1110, 0x70a4,
-        0x2068, 0x0005, 0x080c, 0x3c33, 0x1904, 0x259d, 0x7078, 0x2068,
-        0x7770, 0x080c, 0x3b6f, 0x2c50, 0x080c, 0x3cce, 0x789b, 0x0080,
-        0x6814, 0xa084, 0x001f, 0xc0bd, 0x78aa, 0x6e1c, 0x2041, 0x0001,
-        0x2001, 0x0004, 0x0804, 0x2824, 0x080c, 0x3c33, 0x1904, 0x259d,
-        0x789b, 0x0080, 0x705c, 0x2068, 0x6f14, 0x70d0, 0xd0b4, 0x0168,
-        0xc0b4, 0x70d2, 0x00c6, 0x70b4, 0xa065, 0x6008, 0xa084, 0xfbef,
-        0x600a, 0x6018, 0x8001, 0x601a, 0x00ce, 0x080c, 0x3b6f, 0x2c50,
-        0x080c, 0x3cce, 0x6824, 0xa005, 0x0130, 0xa082, 0x0006, 0x0208,
-        0x0010, 0x6827, 0x0005, 0x6814, 0xa084, 0x001f, 0xc0bd, 0x78aa,
-        0x2031, 0x0020, 0x2041, 0x0001, 0x2001, 0x0003, 0x0804, 0x2824,
-        0xc28d, 0x72d2, 0x72bc, 0xa200, 0xa015, 0x7150, 0x8108, 0xa12a,
-        0x0208, 0x71bc, 0x2164, 0x6504, 0x85ff, 0x1170, 0x7152, 0x8421,
-        0x1da8, 0x70d0, 0xd08c, 0x0128, 0x70cc, 0xa005, 0x1110, 0x70cf,
-        0x000a, 0x0005, 0x2200, 0x0c90, 0x70d0, 0xc08c, 0x70d2, 0x70cf,
-        0x0000, 0x6034, 0xa005, 0x1db0, 0x6708, 0xa784, 0x073f, 0x01d0,
-        0xd7d4, 0x1d80, 0xa784, 0x0021, 0x1d68, 0xa784, 0x0002, 0x0130,
-        0xa784, 0x0004, 0x0d38, 0xa7bc, 0xfffb, 0x670a, 0xa784, 0x0218,
-        0x1d08, 0xa784, 0x0100, 0x0130, 0x6018, 0xa005, 0x19d8, 0xa7bc,
-        0xfeff, 0x670a, 0x2568, 0x6823, 0x0000, 0x6e1c, 0xa684, 0x000e,
-        0x6318, 0x0128, 0x601c, 0xa302, 0x0220, 0x0118, 0x0858, 0x83ff,
-        0x1948, 0x2d58, 0x2c50, 0x7152, 0xd7bc, 0x1120, 0x7028, 0x6022,
-        0x603a, 0x0010, 0xc7bc, 0x670a, 0x68c0, 0xa065, 0xa04d, 0x6100,
-        0x2a60, 0x2041, 0x0001, 0x6b14, 0xa39c, 0x001f, 0xa39d, 0x00c0,
-        0xd1fc, 0x0110, 0xd684, 0x0110, 0xa39c, 0xffbf, 0xd6a4, 0x0110,
-        0xa39d, 0x0020, 0xa684, 0x000e, 0x1904, 0x27d6, 0xc7a5, 0x670a,
-        0x2c00, 0x68c6, 0x77a0, 0xa786, 0x0001, 0x1178, 0x70d0, 0xd0b4,
-        0x1160, 0x7000, 0xa082, 0x0002, 0x1240, 0x7830, 0xd0bc, 0x1128,
-        0x789b, 0x0080, 0x7baa, 0x0804, 0x281d, 0x8739, 0x77a2, 0x2750,
-        0x77ac, 0xa7b0, 0x0005, 0x70a8, 0xa606, 0x1108, 0x76a4, 0x76ae,
-        0x2c3a, 0x8738, 0x2d3a, 0x8738, 0x283a, 0x8738, 0x233a, 0x8738,
-        0x253a, 0x7830, 0xd0bc, 0x0150, 0x2091, 0x8000, 0x2091, 0x303d,
-        0x70d0, 0xa084, 0x303d, 0x2091, 0x8000, 0x2090, 0xaad5, 0x0000,
-        0x0120, 0x8421, 0x2200, 0x1904, 0x2725, 0x0005, 0xd1dc, 0x0904,
-        0x37ce, 0x2029, 0x0020, 0xd69c, 0x1120, 0x8528, 0xd68c, 0x1108,
-        0x8528, 0x8840, 0x6f14, 0x610c, 0x8108, 0xa18c, 0x00ff, 0x70c8,
-        0xa160, 0x2c64, 0x8cff, 0x0188, 0x6014, 0xa706, 0x1dd0, 0x60b8,
-        0x8001, 0x60ba, 0x1d88, 0x2a60, 0x6008, 0xa085, 0x0100, 0x600a,
-        0x2200, 0x8421, 0x1904, 0x2725, 0x0005, 0x2a60, 0x610e, 0x69be,
-        0x2c00, 0x68c6, 0x8840, 0x6008, 0xc0d5, 0x600a, 0x77a0, 0xa786,
-        0x0001, 0x1904, 0x27ad, 0x70d0, 0xd0b4, 0x1904, 0x27ad, 0x7000,
-        0xa082, 0x0002, 0x1a04, 0x27ad, 0x7830, 0xd0bc, 0x1904, 0x27ad,
-        0x789b, 0x0080, 0x7baa, 0x7daa, 0x79aa, 0x2001, 0x0002, 0x0006,
-        0x6018, 0x8000, 0x601a, 0x0008, 0x0006, 0x2960, 0x6104, 0x2a60,
-        0x080c, 0x3ce1, 0x1590, 0xa184, 0x0018, 0x0180, 0xa184, 0x0010,
-        0x0118, 0x080c, 0x3977, 0x1548, 0xa184, 0x0008, 0x0138, 0x69a0,
-        0xa184, 0x0600, 0x1118, 0x080c, 0x3895, 0x00f8, 0x69a0, 0xa184,
-        0x1e00, 0x0528, 0xa184, 0x0800, 0x0178, 0x00c6, 0x2960, 0x6000,
-        0xa085, 0x2000, 0x6002, 0x6104, 0xa18d, 0x0010, 0x6106, 0x00ce,
-        0x080c, 0x3977, 0x1150, 0x69a0, 0xa184, 0x0200, 0x0118, 0x080c,
-        0x38da, 0x0018, 0xa184, 0x0400, 0x19f0, 0x69a0, 0xa184, 0x1000,
-        0x0130, 0x6914, 0xa18c, 0xff00, 0x810f, 0x080c, 0x239c, 0x002e,
-        0xa68c, 0x00e0, 0xa684, 0x0060, 0x0128, 0xa086, 0x0060, 0x1110,
-        0xa18d, 0x4000, 0xa18d, 0x0104, 0x69b6, 0x789b, 0x0060, 0x2800,
-        0x78aa, 0x6818, 0xc0fd, 0x681a, 0xd6bc, 0x0168, 0xc0fc, 0x7083,
-        0x0000, 0xa08a, 0x000d, 0x0328, 0xa08a, 0x000c, 0x7182, 0x2001,
-        0x000c, 0x800c, 0x7186, 0x78aa, 0x3518, 0x3340, 0x3428, 0x8000,
-        0x80ac, 0xaf80, 0x002b, 0x20a0, 0x789b, 0x0000, 0xad80, 0x000b,
-        0x2098, 0x53a6, 0x23a8, 0x2898, 0x25a0, 0xa286, 0x0020, 0x1508,
-        0x70d0, 0xc0b5, 0x70d2, 0x2c00, 0x70b6, 0x2d00, 0x70ba, 0x6814,
-        0xc0fc, 0x8007, 0x7882, 0xa286, 0x0002, 0x0904, 0x28f5, 0x70a0,
-        0x8000, 0x70a2, 0x74b0, 0xa498, 0x0005, 0x70a8, 0xa306, 0x1108,
-        0x73a4, 0x73b2, 0xa286, 0x0010, 0x0904, 0x259d, 0x00de, 0x00ce,
-        0x0005, 0x7000, 0xa005, 0x19e0, 0xa286, 0x0002, 0x1904, 0x290c,
-        0x080c, 0x3c33, 0x19a8, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x2091,
-        0x8000, 0x781b, 0x0068, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de,
-        0x6898, 0x78d2, 0x78da, 0x2091, 0x8001, 0x7808, 0xc08d, 0x780a,
-        0x0126, 0x00d6, 0x00c6, 0x70d0, 0xa084, 0x2e00, 0x2090, 0x00ce,
-        0x00de, 0x012e, 0x2900, 0x7056, 0x68bc, 0x703e, 0x7003, 0x0002,
-        0x2d00, 0x704a, 0xad80, 0x0009, 0x7042, 0x7830, 0xd0bc, 0x0140,
-        0x2091, 0x303d, 0x70d0, 0xa084, 0x303d, 0x2091, 0x8000, 0x2090,
-        0x70a0, 0xa005, 0x1108, 0x0005, 0x8421, 0x0de8, 0x724c, 0x70bc,
-        0xa200, 0xa015, 0x0804, 0x2725, 0xa286, 0x0010, 0x1560, 0x080c,
-        0x3c33, 0x1904, 0x28a0, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x781b,
-        0x0068, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2,
-        0x78da, 0x7808, 0xc08d, 0x780a, 0x70a0, 0x8000, 0x70a2, 0x74b0,
-        0xa490, 0x0005, 0x70a8, 0xa206, 0x1108, 0x72a4, 0x72b2, 0x2900,
-        0x7056, 0x68bc, 0x703e, 0x7003, 0x0002, 0x2d00, 0x704a, 0xad80,
-        0x0009, 0x7042, 0x0005, 0x6bb4, 0xa39d, 0x2000, 0x7b5a, 0x6814,
-        0xc0fc, 0x8007, 0x7882, 0x6b94, 0x7bd6, 0x7bde, 0x6e98, 0x7ed2,
-        0x7eda, 0x781b, 0x0068, 0x2900, 0x7056, 0x7202, 0x7808, 0xc08d,
-        0x780a, 0x2300, 0xa605, 0x0170, 0x70d0, 0xa084, 0x2e00, 0xa086,
-        0x2600, 0x1118, 0x2009, 0x0000, 0x0010, 0x2009, 0x0001, 0xa284,
-        0x000f, 0x0023, 0xad80, 0x0009, 0x7042, 0x0005, 0x296e, 0x41d9,
-        0x41d9, 0x41c7, 0x41d9, 0x296e, 0x296e, 0x296e, 0x080c, 0x254c,
-        0x7808, 0xa084, 0xfffd, 0x780a, 0x00f6, 0x2079, 0x4600, 0x78ac,
-        0x00fe, 0xd084, 0x01b0, 0x7060, 0xa086, 0x0001, 0x0904, 0x2a32,
-        0x7060, 0xa086, 0x0005, 0x1158, 0x7078, 0x2068, 0x681b, 0x0004,
+        0x0110, 0xc0c5, 0x7812, 0x080c, 0x1b34, 0x000e, 0x7812, 0x080c,
+        0x1b7f, 0x2001, 0x4007, 0x0804, 0x13bc, 0x6104, 0xa18c, 0x00ff,
+        0xa186, 0x0005, 0x1118, 0x601c, 0xc0bd, 0x601e, 0x74c4, 0x73c8,
+        0x72cc, 0x6014, 0x2091, 0x8000, 0x00e6, 0x2009, 0x0012, 0xd0fc,
+        0x1118, 0x2071, 0x4740, 0x0018, 0x2071, 0x4780, 0xc1fd, 0x792a,
+        0x7063, 0x0005, 0x71d0, 0xc1c4, 0x71d2, 0x7366, 0x726a, 0x746e,
+        0x7072, 0x7077, 0x0000, 0x2c00, 0x707a, 0xa02e, 0x2530, 0x611c,
+        0xa184, 0x0060, 0x0110, 0x080c, 0x3fe9, 0x00ee, 0x6596, 0x65a6,
+        0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000, 0x6714, 0x6023,
+        0x0000, 0x6024, 0xa096, 0x0001, 0x1110, 0x8000, 0x6026, 0x080c,
+        0x22d5, 0x2091, 0x8001, 0x0005, 0x70c3, 0x4005, 0x0804, 0x13bd,
+        0x20a9, 0x0005, 0x2099, 0x4714, 0x2091, 0x8000, 0x530a, 0x2091,
+        0x8001, 0x2100, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9,
+        0x0000, 0x0005, 0x71c4, 0x70c7, 0x0000, 0x791e, 0x0804, 0x13ba,
+        0x71c4, 0x71c6, 0x2168, 0x0010, 0x2069, 0x1000, 0x690c, 0xa016,
+        0x2d04, 0xa210, 0x8d68, 0x8109, 0x1dd8, 0xa285, 0x0000, 0x1118,
+        0x70c3, 0x4000, 0x0010, 0x70c3, 0x4003, 0x70ca, 0x0804, 0x13bd,
+        0x7964, 0x71c6, 0x71c4, 0xa182, 0x0003, 0x1a04, 0x13b3, 0x7966,
+        0x0804, 0x13ba, 0x7964, 0x71c6, 0x0804, 0x13ba, 0x7900, 0x71c6,
+        0x71c4, 0x7902, 0x0804, 0x13ba, 0x7900, 0x71c6, 0x0804, 0x13ba,
+        0x70c4, 0x2011, 0x0000, 0xa08c, 0x000d, 0x0160, 0x810c, 0x0230,
+        0x8210, 0x810c, 0x810c, 0x0210, 0x8210, 0x810c, 0x81ff, 0x1904,
+        0x13b4, 0x8210, 0x7a0e, 0xd28c, 0x0538, 0x7910, 0xc1cd, 0x7912,
+        0x2009, 0x0021, 0x2019, 0x0003, 0xd284, 0x01c0, 0x8108, 0x2019,
+        0x0041, 0x2011, 0x8f4e, 0x2312, 0x2019, 0x0042, 0x8210, 0x2312,
+        0x2019, 0x0043, 0x8210, 0x2312, 0x2019, 0x0046, 0x8210, 0x2312,
+        0x2019, 0x0047, 0x8210, 0x2312, 0x2019, 0x0006, 0x2011, 0x8f53,
+        0x2112, 0x2011, 0x8f73, 0x2312, 0x7904, 0x7806, 0x0804, 0x13b9,
+        0x7804, 0x70c6, 0x0804, 0x13ba, 0x71c4, 0xd1fc, 0x1118, 0x2011,
+        0x4bc0, 0x0010, 0x2011, 0x4c40, 0x8107, 0xa084, 0x000f, 0x8003,
+        0x8003, 0x8003, 0xa268, 0x2011, 0x0000, 0x6814, 0xd0fc, 0x0110,
+        0xa295, 0x0200, 0xd0b4, 0x0110, 0xa295, 0x0001, 0x6b0c, 0x6800,
+        0x70da, 0x0804, 0x13b7, 0x7814, 0xd0f4, 0x0130, 0x2001, 0x4007,
+        0x70db, 0x0000, 0xa005, 0x0048, 0xd0fc, 0x0130, 0x2001, 0x4007,
+        0x70db, 0x0001, 0xa005, 0x0008, 0xa006, 0x0005, 0x7814, 0xd0f4,
+        0x0130, 0x2001, 0x4007, 0x70db, 0x0000, 0xa005, 0x0008, 0xa006,
+        0x0005, 0x7814, 0xd0fc, 0x0130, 0x2001, 0x4007, 0x70db, 0x0001,
+        0xa005, 0x0008, 0xa006, 0x0005, 0x7112, 0x721a, 0x731e, 0x7810,
+        0xd0c4, 0x0110, 0x7422, 0x7526, 0xac80, 0x0001, 0x8108, 0x810c,
+        0x81a9, 0x8098, 0x20a1, 0x0030, 0x7003, 0x0000, 0x6084, 0x20a2,
+        0x53a6, 0x7007, 0x0001, 0x7974, 0xa184, 0xff00, 0x0140, 0x810f,
+        0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0018, 0x8107,
+        0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006, 0xa211, 0x7d10,
+        0xd5c4, 0x0120, 0x7b84, 0xa319, 0x7c80, 0xa421, 0x7008, 0xd0fc,
+        0x0de8, 0x7003, 0x0001, 0x7007, 0x0006, 0x711a, 0x721e, 0x7d10,
+        0xd5c4, 0x0110, 0x7322, 0x7426, 0xa084, 0x01e0, 0x0005, 0x7848,
+        0xa065, 0x0120, 0x2c04, 0x784a, 0x2063, 0x0000, 0x0005, 0x00f6,
+        0x2079, 0x4700, 0x7848, 0x2062, 0x2c00, 0xa005, 0x1110, 0x080c,
+        0x2575, 0x784a, 0x00fe, 0x0005, 0x2011, 0x9100, 0x7a4a, 0x7bc4,
+        0x8319, 0x0128, 0xa280, 0x0032, 0x2012, 0x2010, 0x0cc8, 0x2013,
+        0x0000, 0x0005, 0x0016, 0x0026, 0xd7fc, 0x1118, 0x2011, 0x4cc0,
+        0x0010, 0x2011, 0x6cc0, 0xa784, 0x0f00, 0x800b, 0xa784, 0x001f,
+        0x0120, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xa268, 0x002e,
+        0x001e, 0x0005, 0x0c39, 0x2900, 0x682a, 0x2a00, 0x682e, 0x6808,
+        0xa084, 0xf9ef, 0xa80d, 0x690a, 0x00e6, 0xd7fc, 0x1128, 0x2009,
+        0x4752, 0x2071, 0x4740, 0x0020, 0x2009, 0x4792, 0x2071, 0x4780,
+        0x210c, 0x6804, 0xa005, 0x0148, 0xa116, 0x1138, 0x2060, 0x6000,
+        0x6806, 0x0016, 0x200b, 0x0000, 0x0018, 0x2009, 0x0000, 0x0016,
+        0x6804, 0xa065, 0x0178, 0x6000, 0x6806, 0x0421, 0x080c, 0x1db2,
+        0x6810, 0x7908, 0x8109, 0x790a, 0x8001, 0x6812, 0x1d88, 0x7910,
+        0xc1a5, 0x7912, 0x001e, 0x6902, 0x6906, 0x2d00, 0x2060, 0x080c,
+        0x26bf, 0x00ee, 0x0005, 0xa065, 0x0160, 0x2008, 0x609c, 0xa005,
+        0x0128, 0x2062, 0x609f, 0x0000, 0xa065, 0x0cc0, 0x7848, 0x794a,
+        0x2062, 0x0005, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9, 0x001c,
+        0xac80, 0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828, 0x601a,
+        0x682c, 0x6022, 0x0005, 0x00e6, 0xd7fc, 0x1128, 0x2071, 0x4740,
+        0x2031, 0x47c0, 0x0020, 0x2071, 0x4780, 0x2031, 0x49c0, 0x704c,
+        0xa08c, 0x0200, 0x1128, 0xa608, 0x2d0a, 0x8000, 0x704e, 0xa006,
+        0x00ee, 0x0005, 0x00f6, 0xd7fc, 0x1118, 0x2079, 0x4740, 0x0010,
+        0x2079, 0x4780, 0x080c, 0x1b9a, 0x2091, 0x8000, 0x6804, 0x780a,
+        0xa065, 0x05f0, 0x0030, 0x2c00, 0x780a, 0x2060, 0x6000, 0xa065,
+        0x05b8, 0x6010, 0xa306, 0x1db8, 0x600c, 0xa206, 0x1da0, 0x2c28,
+        0x7848, 0xac06, 0x1108, 0x0448, 0x6804, 0xac06, 0x1140, 0x6000,
+        0x2060, 0x6806, 0xa005, 0x1118, 0x6803, 0x0000, 0x0048, 0x6400,
+        0x7808, 0x2060, 0x6402, 0xa486, 0x0000, 0x1110, 0x2c00, 0x6802,
+        0x2560, 0x080c, 0x1c02, 0x601b, 0x0005, 0x6023, 0x0020, 0x00fe,
+        0x080c, 0x1db2, 0x00f6, 0x7908, 0x8109, 0x790a, 0x6810, 0x8001,
+        0x6812, 0x1118, 0x7810, 0xc0a5, 0x7812, 0x2001, 0xffff, 0xa005,
+        0x00fe, 0x0005, 0x0076, 0x2700, 0x2039, 0x0000, 0xd0fc, 0x0108,
+        0xc7fd, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008, 0x2091,
+        0x8000, 0x080c, 0x1bb2, 0x8738, 0xa784, 0x001f, 0x1dd0, 0xa7bc,
+        0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x1d90, 0x2091,
+        0x8001, 0x007e, 0x0005, 0x786c, 0x2009, 0x8f74, 0x210c, 0xa10d,
+        0x0118, 0xa065, 0x0804, 0x20a1, 0x2061, 0x0000, 0x6018, 0xd084,
+        0x11b8, 0x7810, 0xd08c, 0x0130, 0xc08c, 0x7812, 0xc7fc, 0x2069,
+        0x4740, 0x0028, 0xc08d, 0x7812, 0x2069, 0x4780, 0xc7fd, 0x2091,
+        0x8000, 0x681c, 0x681f, 0x0000, 0x2091, 0x8001, 0xa005, 0x1108,
+        0x0005, 0xa08c, 0xfff0, 0x0110, 0x080c, 0x2575, 0x0002, 0x1cd7,
+        0x1cda, 0x1ce0, 0x1ce4, 0x1cd8, 0x1ce8, 0x1cd8, 0x1cd8, 0x1cd8,
+        0x1cee, 0x1d18, 0x1d1b, 0x1d20, 0x1d29, 0x1cd8, 0x1cd8, 0x0005,
+        0x080c, 0x2575, 0x080c, 0x1c7a, 0x2001, 0x8001, 0x0804, 0x1d32,
+        0x2001, 0x8003, 0x0804, 0x1d32, 0x2001, 0x8004, 0x0804, 0x1d32,
+        0x080c, 0x1c7a, 0x2001, 0x8006, 0x0804, 0x1d32, 0x2011, 0x800a,
+        0x2091, 0x8000, 0xd7fc, 0x1118, 0x2069, 0x4740, 0x0010, 0x2069,
+        0x4780, 0x2038, 0x6800, 0xa086, 0x0000, 0x0120, 0x6f1e, 0x2091,
+        0x8001, 0x0005, 0x0026, 0x6870, 0xa0bc, 0xff00, 0x2041, 0x0021,
+        0x2049, 0x0004, 0x2051, 0x0010, 0x080c, 0x1bb2, 0x8738, 0xa784,
+        0x001f, 0x1dd0, 0x2091, 0x8001, 0x000e, 0x6970, 0x71c6, 0x00d0,
+        0x2001, 0x800c, 0x00b8, 0x080c, 0x1c7a, 0x2001, 0x800d, 0x0090,
+        0xd7fc, 0x0110, 0x78e4, 0x0008, 0x78e0, 0x70c6, 0x2001, 0x800e,
+        0x0048, 0xd7fc, 0x0110, 0x78ec, 0x0008, 0x78e8, 0x70c6, 0x2001,
+        0x800f, 0x0000, 0x70c2, 0xd7fc, 0x1118, 0x70db, 0x0000, 0x0010,
+        0x70db, 0x0001, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x4080,
+        0x0005, 0xac80, 0x0001, 0x81ff, 0x0518, 0x2099, 0x0030, 0x20a0,
+        0x700c, 0xa084, 0x07ff, 0x0100, 0x7018, 0x0006, 0x701c, 0x0006,
+        0x7020, 0x0006, 0x7024, 0x0006, 0x7112, 0x81ac, 0x721a, 0x731e,
+        0x7422, 0x7526, 0x7003, 0x0001, 0x7007, 0x0001, 0x7008, 0x800b,
+        0x1ee8, 0x7007, 0x0002, 0xa08c, 0x01e0, 0x1110, 0x53a5, 0xa006,
+        0x7003, 0x0000, 0x7007, 0x0004, 0x000e, 0x7026, 0x000e, 0x7022,
+        0x000e, 0x701e, 0x000e, 0x701a, 0x0005, 0x2011, 0x0020, 0x2009,
+        0x0010, 0x6b0a, 0x6c0e, 0x681f, 0x0201, 0x6803, 0xfd20, 0x6807,
+        0x0038, 0x6a1a, 0x2d00, 0xa0e8, 0x0008, 0xa290, 0x0004, 0x8109,
+        0x1d80, 0x0005, 0x70ec, 0xd0dc, 0x1520, 0x2029, 0x0001, 0x7814,
+        0xd0cc, 0x1160, 0x70ec, 0xd0e4, 0x2019, 0x0c0a, 0x2021, 0x000a,
+        0x1120, 0x2019, 0x0c0c, 0x2021, 0x000c, 0x0070, 0x70ec, 0xd0e4,
+        0x1128, 0x2019, 0x180c, 0x2021, 0x000c, 0x0030, 0x2019, 0x1809,
+        0x2021, 0x0009, 0xa5ad, 0x0200, 0x6b0a, 0x6c0e, 0x6d1e, 0x6807,
+        0x0038, 0x0005, 0x6004, 0x6086, 0x2c08, 0x2063, 0x0000, 0x7868,
+        0xa005, 0x796a, 0x0110, 0x2c02, 0x0008, 0x796e, 0x0005, 0x00c6,
+        0x2061, 0x4700, 0x6887, 0x0103, 0x2d08, 0x206b, 0x0000, 0x6068,
+        0xa005, 0x616a, 0x0110, 0x2d02, 0x0008, 0x616e, 0x00ce, 0x0005,
+        0x2091, 0x8000, 0x2c04, 0x786e, 0xa005, 0x1108, 0x786a, 0x2091,
+        0x8001, 0x609c, 0xa005, 0x0188, 0x00c6, 0x2060, 0x2008, 0x609c,
+        0xa005, 0x0138, 0x2062, 0x609f, 0x0000, 0xa065, 0x609c, 0xa005,
+        0x1dc8, 0x7848, 0x794a, 0x2062, 0x00ce, 0x7848, 0x2062, 0x609f,
+        0x0000, 0xac85, 0x0000, 0x1110, 0x080c, 0x2575, 0x784a, 0x0005,
+        0x20a9, 0x0010, 0xa006, 0x8004, 0x8086, 0x818e, 0x1208, 0xa200,
+        0x1f04, 0x1dfc, 0x8086, 0x818e, 0x0005, 0x0156, 0x20a9, 0x0010,
+        0xa005, 0x01b8, 0xa11a, 0x12a8, 0x8213, 0x818d, 0x0228, 0xa11a,
+        0x1220, 0x1f04, 0x1e0c, 0x0028, 0xa11a, 0x2308, 0x8210, 0x1f04,
+        0x1e0c, 0x0006, 0x3200, 0xa084, 0xefff, 0x2080, 0x000e, 0x015e,
+        0x0005, 0x0006, 0x3200, 0xa085, 0x1000, 0x0cb8, 0x7d74, 0x70d0,
+        0xa506, 0x0904, 0x1eda, 0x7810, 0x2050, 0x080c, 0x1b77, 0x0904,
+        0x1eda, 0xa046, 0x7970, 0x2500, 0x8000, 0xa112, 0x2009, 0x0040,
+        0x1208, 0x0030, 0x72d0, 0xa206, 0x0118, 0x8840, 0x2009, 0x0080,
+        0x00c6, 0x7112, 0x7007, 0x0001, 0x2099, 0x0030, 0x20a9, 0x0020,
+        0xac80, 0x0001, 0x20a0, 0x2061, 0x0000, 0x88ff, 0x0110, 0x080c,
+        0x1b77, 0x7008, 0xd0fc, 0x0de8, 0x7007, 0x0002, 0x2091, 0x8001,
+        0xa08c, 0x01e0, 0x1538, 0x53a5, 0x8cff, 0x1120, 0x88ff, 0x0904,
+        0x1ec7, 0x0050, 0x2c00, 0x788e, 0x20a9, 0x0020, 0xac80, 0x0001,
+        0x20a0, 0x53a5, 0x0804, 0x1ec7, 0xa046, 0x7218, 0x731c, 0xdac4,
+        0x0110, 0x7420, 0x7524, 0xa292, 0x0040, 0xa39b, 0x0000, 0xa4a3,
+        0x0000, 0xa5ab, 0x0000, 0x721a, 0x731e, 0xdac4, 0x0118, 0x7422,
+        0x7526, 0xa006, 0x7007, 0x0004, 0x0904, 0x1ec7, 0x8cff, 0x0110,
+        0x080c, 0x1b7f, 0x00ce, 0x080c, 0x1b7f, 0xa046, 0x7888, 0x8000,
+        0x788a, 0xa086, 0x0002, 0x01c0, 0x7a7c, 0x7b78, 0xdac4, 0x0110,
+        0x7c84, 0x7d80, 0x7974, 0x8107, 0x8004, 0x8004, 0xa210, 0xa399,
+        0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x721a, 0x731e, 0xdac4,
+        0x0588, 0x7422, 0x7526, 0x0470, 0x6014, 0xd0fc, 0x1118, 0x2069,
+        0x4740, 0x0010, 0x2069, 0x4780, 0x2091, 0x8000, 0x681f, 0x0002,
+        0x88ff, 0x0120, 0xa046, 0x788c, 0x2060, 0x0c70, 0x788b, 0x0000,
+        0x78ac, 0xa085, 0x0003, 0x78ae, 0x2091, 0x8001, 0x0098, 0x00ce,
+        0x788b, 0x0000, 0x080c, 0x205c, 0x6004, 0xa084, 0x000f, 0x0059,
+        0x88ff, 0x0130, 0x788c, 0x2060, 0x6004, 0xa084, 0x000f, 0x0019,
+        0x0804, 0x1e26, 0x0005, 0x0002, 0x1eec, 0x1f07, 0x1f20, 0x1eec,
+        0x1f2d, 0x1efd, 0x1eec, 0x1eec, 0x1eec, 0x1f05, 0x1f1e, 0x1eec,
+        0x1eec, 0x1eec, 0x1eec, 0x1eec, 0x2039, 0x0400, 0x78bc, 0xa705,
+        0x78be, 0x6008, 0xa705, 0x600a, 0x080c, 0x1f69, 0x609c, 0x78ba,
+        0x609f, 0x0000, 0x080c, 0x2048, 0x0005, 0x78bc, 0xd0c4, 0x0108,
+        0x0c58, 0x601c, 0xc0bd, 0x601e, 0x0030, 0x080c, 0x2086, 0x78bc,
+        0xd0c4, 0x0108, 0x0c08, 0x78bf, 0x0000, 0x6004, 0x8007, 0xa084,
+        0x00ff, 0x78b2, 0x8001, 0x0138, 0x080c, 0x1f69, 0x0120, 0x78bc,
+        0xc0c5, 0x78be, 0x0010, 0x0804, 0x1f84, 0x0005, 0x080c, 0x2083,
+        0x78bc, 0xa08c, 0x0e00, 0x1110, 0xd0c4, 0x1108, 0x0828, 0x080c,
+        0x1f69, 0x1110, 0x0804, 0x1f84, 0x0005, 0x78bc, 0xd0c4, 0x0110,
+        0x0804, 0x1eec, 0x78bf, 0x0000, 0x6714, 0x2011, 0x0001, 0x22a8,
+        0x6018, 0xa084, 0x00ff, 0xa005, 0x0188, 0xa7bc, 0xff00, 0x20a9,
+        0x0020, 0xa08e, 0x0001, 0x0150, 0xa7bc, 0x8000, 0x2011, 0x0002,
+        0x20a9, 0x0100, 0xa08e, 0x0002, 0x0108, 0x00c0, 0x080c, 0x1b9a,
+        0x2d00, 0x2091, 0x8000, 0x682b, 0x0000, 0x682f, 0x0000, 0x6808,
+        0xa084, 0xffde, 0x680a, 0xade8, 0x0010, 0x2091, 0x8001, 0x1f04,
+        0x1f51, 0x8211, 0x0118, 0x20a9, 0x0100, 0x0c58, 0x080c, 0x1b7f,
+        0x0005, 0x609f, 0x0000, 0x78b4, 0xa06d, 0x2c00, 0x78b6, 0x1110,
+        0x78ba, 0x0038, 0x689e, 0x2d00, 0x6002, 0x78b8, 0xad06, 0x1108,
+        0x6002, 0x78b0, 0x8001, 0x78b2, 0x1130, 0x78bc, 0xc0c4, 0x78be,
+        0x78b8, 0x2060, 0xa006, 0x0005, 0x00e6, 0xa02e, 0x2530, 0x7dba,
+        0x7db6, 0x65ae, 0x65b2, 0x601c, 0x60a2, 0x2048, 0xa984, 0xe1ff,
+        0x601e, 0xa984, 0x0060, 0x0160, 0x080c, 0x3fe9, 0x86ff, 0x1140,
+        0x85ff, 0x1130, 0x2039, 0x0800, 0x080c, 0x2048, 0x0804, 0x2046,
+        0x6596, 0x65a6, 0x669a, 0x66aa, 0x6714, 0x2071, 0x4780, 0xd7fc,
+        0x1110, 0x2071, 0x4740, 0xa784, 0x0f00, 0x800b, 0xa784, 0x001f,
+        0x0120, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0x71c0, 0xa168,
+        0x2700, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0x71c4,
+        0xa100, 0x60c2, 0x2091, 0x8000, 0x7814, 0xd0c4, 0x0138, 0xd7fc,
+        0x1118, 0xd0f4, 0x1140, 0x0010, 0xd0fc, 0x1128, 0x6e08, 0xd684,
+        0x01f0, 0xd9fc, 0x11e0, 0x2091, 0x8001, 0x080c, 0x1c02, 0x2091,
+        0x8000, 0x080c, 0x1db2, 0x2091, 0x8001, 0x7814, 0xd0c4, 0x0904,
+        0x2046, 0xd7fc, 0x1120, 0xd0f4, 0x1130, 0x0804, 0x2046, 0xd0fc,
+        0x1110, 0x0804, 0x2046, 0x601b, 0x0021, 0x0804, 0x2046, 0x6024,
+        0xa096, 0x0001, 0x1110, 0x8000, 0x6026, 0x6a10, 0x6814, 0xa202,
+        0x0268, 0x0160, 0x2091, 0x8001, 0x2039, 0x0200, 0x609c, 0x78ba,
+        0x609f, 0x0000, 0x080c, 0x2048, 0x0804, 0x2046, 0x2c08, 0xd9fc,
+        0x01f0, 0x6800, 0xa065, 0x01d8, 0x6a04, 0x7000, 0xa084, 0x0002,
+        0x0168, 0x7048, 0xa206, 0x1150, 0x6b04, 0x2160, 0x2304, 0x6002,
+        0xa005, 0x1108, 0x6902, 0x2260, 0x6102, 0x0098, 0x2d00, 0x2060,
+        0x080c, 0x26bf, 0x6e08, 0x2160, 0x6202, 0x6906, 0x0050, 0x6800,
+        0x6902, 0xa065, 0x0110, 0x6102, 0x0008, 0x6906, 0x2160, 0x6003,
+        0x0000, 0x2160, 0xd9fc, 0x0118, 0xa6b4, 0xfffc, 0x6e0a, 0x6810,
+        0x7d08, 0x8528, 0x7d0a, 0x8000, 0x6812, 0x2091, 0x8001, 0xd6b4,
+        0x0128, 0xa6b6, 0x0040, 0x6e0a, 0x080c, 0x1c13, 0x00ee, 0x0005,
+        0x6008, 0xa705, 0x600a, 0x2091, 0x8000, 0x080c, 0x1db2, 0x2091,
+        0x8001, 0x78b8, 0xa065, 0x0128, 0x609c, 0x78ba, 0x609f, 0x0000,
+        0x0c78, 0x78b6, 0x78ba, 0x0005, 0x7970, 0x7874, 0x2818, 0xd384,
+        0x0118, 0x8000, 0xa112, 0x0220, 0x8000, 0xa112, 0x1278, 0xc384,
+        0x7a7c, 0x721a, 0x7a78, 0x721e, 0xdac4, 0x0120, 0x7a84, 0x7222,
+        0x7a80, 0x7226, 0xa006, 0xd384, 0x0108, 0x8000, 0x7876, 0x70d2,
+        0x781c, 0xa005, 0x0138, 0x8001, 0x781e, 0x1120, 0x0e04, 0x2082,
+        0x2091, 0x4080, 0x0005, 0x2039, 0x2098, 0x0010, 0x2039, 0x209e,
+        0x2704, 0xa005, 0x0160, 0xac00, 0x2068, 0x6908, 0x6810, 0x6912,
+        0x680a, 0x690c, 0x6814, 0x6916, 0x680e, 0x8738, 0x0c88, 0x0005,
+        0x0003, 0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0015, 0x001b,
+        0x0000, 0x2041, 0x0000, 0x780c, 0x0002, 0x224a, 0x2225, 0x20a9,
+        0x2119, 0x2039, 0x8f74, 0x2734, 0x7d10, 0x00c0, 0x6084, 0xa086,
+        0x0103, 0x1904, 0x2103, 0x6114, 0x6018, 0xa105, 0x0120, 0x86ff,
+        0x11d8, 0x0804, 0x2103, 0x8603, 0xa080, 0x8f55, 0x620c, 0x2202,
+        0x8000, 0x6210, 0x2202, 0x080c, 0x1dd0, 0x8630, 0xa68e, 0x000f,
+        0x0904, 0x2184, 0x786c, 0xa065, 0x1d08, 0x7808, 0xa602, 0x1220,
+        0xd5ac, 0x1110, 0x263a, 0x0005, 0xa682, 0x0003, 0x1a04, 0x2184,
+        0x2091, 0x8000, 0x2069, 0x0000, 0x6818, 0xd084, 0x11f8, 0x2011,
+        0x8f55, 0x2204, 0x70c6, 0x8210, 0x2204, 0x70ca, 0xd684, 0x1130,
+        0x8210, 0x2204, 0x70da, 0x8210, 0x2204, 0x70de, 0xa685, 0x8020,
+        0x70c2, 0x681b, 0x0001, 0x2091, 0x4080, 0x7810, 0xa084, 0xffcf,
+        0x7812, 0x2091, 0x8001, 0x203b, 0x0000, 0x0005, 0x7810, 0xc0ad,
+        0x7812, 0x0804, 0x2184, 0x263a, 0x080c, 0x2250, 0x1904, 0x226c,
+        0x786c, 0xa065, 0x1904, 0x20ae, 0x2091, 0x8000, 0x7810, 0xa084,
+        0xffcf, 0x86ff, 0x0108, 0xc0ad, 0x7812, 0x2091, 0x8001, 0x0804,
+        0x226c, 0x2039, 0x8f74, 0x2734, 0x7d10, 0x00a0, 0x6084, 0xa086,
+        0x0103, 0x1904, 0x216e, 0x6114, 0x6018, 0xa105, 0x0120, 0x86ff,
+        0x11b8, 0x0804, 0x216e, 0xa680, 0x8f55, 0x620c, 0x2202, 0x080c,
+        0x1dd0, 0x8630, 0xa68e, 0x001e, 0x0904, 0x2184, 0x786c, 0xa065,
+        0x1d28, 0x7808, 0xa602, 0x1220, 0xd5ac, 0x1110, 0x263a, 0x0005,
+        0xa682, 0x0006, 0x1a04, 0x2184, 0x2091, 0x8000, 0x2069, 0x0000,
+        0x6818, 0xd084, 0x11f8, 0x2011, 0x8f55, 0x2009, 0x8f4e, 0x26a8,
+        0x211c, 0x2204, 0x201a, 0x8108, 0x8210, 0x1f04, 0x2150, 0xa685,
+        0x8030, 0x70c2, 0x681b, 0x0001, 0x2091, 0x4080, 0x7810, 0xa084,
+        0xffcf, 0x7812, 0x2091, 0x8001, 0xa006, 0x2009, 0x8f75, 0x200a,
+        0x203a, 0x0005, 0x7810, 0xc0ad, 0x7812, 0x00b0, 0x263a, 0x080c,
+        0x2250, 0x1904, 0x226c, 0x786c, 0xa065, 0x1904, 0x211e, 0x2091,
+        0x8000, 0x7810, 0xa084, 0xffcf, 0x86ff, 0x0108, 0xc0ad, 0x7812,
+        0x2091, 0x8001, 0x0804, 0x226c, 0x2091, 0x8000, 0x7007, 0x0004,
+        0x7994, 0x70d4, 0xa102, 0x0228, 0x0168, 0x7b90, 0xa302, 0x1150,
+        0x0010, 0x8002, 0x1138, 0x263a, 0x7810, 0xc0ad, 0x7812, 0x2091,
+        0x8001, 0x0005, 0xa184, 0xff00, 0x0140, 0x810f, 0x810c, 0x810c,
+        0x8004, 0x8004, 0x8007, 0xa100, 0x0018, 0x8107, 0x8004, 0x8004,
+        0x7a9c, 0xa210, 0x721a, 0x7a98, 0xa006, 0xa211, 0x721e, 0xd4c4,
+        0x0130, 0x7aa4, 0xa211, 0x7222, 0x7aa0, 0xa211, 0x7226, 0x20a1,
+        0x0030, 0x7003, 0x0000, 0x2009, 0x8f54, 0x260a, 0x8109, 0x2198,
+        0x2104, 0xd084, 0x0108, 0x8633, 0xa6b0, 0x0002, 0x26a8, 0x53a6,
+        0x8603, 0x7012, 0x7007, 0x0001, 0x7990, 0x7894, 0x8000, 0xa10a,
+        0x1208, 0xa006, 0x2028, 0x7974, 0xa184, 0xff00, 0x0140, 0x810f,
+        0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0018, 0x8107,
+        0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006, 0xa211, 0xd4c4,
+        0x0120, 0x7b84, 0xa319, 0x7c80, 0xa421, 0x7008, 0xd0fc, 0x0de8,
+        0xa084, 0x01e0, 0x01d0, 0x7d10, 0x2031, 0x8f54, 0x2634, 0x78a8,
+        0x8000, 0x78aa, 0xd08c, 0x1138, 0x7007, 0x0006, 0x7004, 0xd094,
+        0x1de8, 0x0804, 0x2186, 0x2069, 0x4747, 0x206b, 0x0003, 0x78ac,
+        0xa085, 0x0300, 0x78ae, 0xa006, 0x0048, 0x2030, 0x75d6, 0x2091,
+        0x4080, 0x7d96, 0x7d10, 0xa5ac, 0xffcf, 0x7d12, 0x2091, 0x8001,
+        0x78aa, 0x7007, 0x0006, 0x263a, 0x7003, 0x0001, 0x711a, 0x721e,
+        0xd5c4, 0x0110, 0x7322, 0x7426, 0x0005, 0x6084, 0xa086, 0x0103,
+        0x11d8, 0x6114, 0x6018, 0xa105, 0x11b8, 0x2069, 0x0000, 0x6818,
+        0xd084, 0x1190, 0x600c, 0x70c6, 0x6010, 0x70ca, 0x70c3, 0x8020,
+        0x681b, 0x0001, 0x2091, 0x4080, 0x080c, 0x1dd0, 0x0e04, 0x2243,
+        0x786c, 0xa065, 0x1d10, 0x0005, 0x0059, 0x1530, 0x786c, 0xa065,
+        0x19e0, 0x0410, 0x0029, 0x1500, 0x786c, 0xa065, 0x1dd8, 0x00e0,
+        0x6084, 0xa086, 0x0103, 0x1168, 0x6018, 0xc0fc, 0x601a, 0xa086,
+        0x0004, 0x1138, 0x7804, 0xd0a4, 0x0120, 0x080c, 0x1dd0, 0xa006,
+        0x0005, 0x0079, 0x1118, 0xa085, 0x0001, 0x0005, 0x00b9, 0x1110,
+        0x2041, 0x0001, 0x7d10, 0x0005, 0x88ff, 0x0110, 0x2091, 0x4080,
+        0x0005, 0x7b90, 0x7994, 0x70d4, 0xa102, 0x1118, 0xa385, 0x0000,
+        0x0005, 0x0210, 0xa302, 0x0005, 0x8002, 0x0005, 0xa184, 0xff00,
+        0x0140, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100,
+        0x0018, 0x8107, 0x8004, 0x8004, 0x7a9c, 0x7b98, 0x7ca4, 0x7da0,
+        0xa210, 0xa006, 0xa319, 0xa421, 0xa529, 0x2009, 0x0018, 0x6028,
+        0xa005, 0x0110, 0x2009, 0x0040, 0x080c, 0x1b34, 0x01d0, 0x78a8,
+        0x8000, 0x78aa, 0xd08c, 0x1510, 0x6014, 0xd0fc, 0x1118, 0x2069,
+        0x4740, 0x0010, 0x2069, 0x4780, 0x2091, 0x8000, 0x681f, 0x0003,
+        0x78ab, 0x0000, 0x78ac, 0xa085, 0x0300, 0x78ae, 0x2091, 0x8001,
+        0x0068, 0x78ab, 0x0000, 0x080c, 0x1dd0, 0x7990, 0x7894, 0x8000,
+        0xa10a, 0x1208, 0xa006, 0x7896, 0x70d6, 0xa006, 0x2071, 0x0010,
+        0x2091, 0x8001, 0x0005, 0xd7fc, 0x1118, 0x2009, 0x4758, 0x0010,
+        0x2009, 0x4798, 0x2091, 0x8000, 0x200a, 0x00f6, 0x2009, 0x4780,
+        0x2079, 0x0100, 0xd7fc, 0x1120, 0x2009, 0x4740, 0x2079, 0x0200,
+        0x2104, 0xa086, 0x0000, 0x1180, 0xd7fc, 0x1118, 0x2009, 0x4745,
+        0x0010, 0x2009, 0x4785, 0x2104, 0xa005, 0x1130, 0x7830, 0xa084,
+        0x00c0, 0x1110, 0x781b, 0x0052, 0x00fe, 0x0005, 0x2009, 0x0002,
+        0x2069, 0x4700, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1904, 0x234b,
+        0x2071, 0x4780, 0x2079, 0x0100, 0x2021, 0x49bf, 0x784b, 0x000f,
+        0x2001, 0x01ff, 0x2004, 0xd0fc, 0x0118, 0x2019, 0x3e37, 0x0030,
+        0x20a1, 0x012b, 0x2019, 0x3e37, 0xd184, 0x0110, 0x20a1, 0x022b,
+        0x2304, 0xa005, 0x0140, 0x789a, 0x8318, 0x23ac, 0x8318, 0x2398,
+        0x53a6, 0x3318, 0x0ca8, 0x789b, 0x0000, 0x789b, 0x0020, 0x20a9,
+        0x0010, 0x78af, 0x0000, 0x78af, 0x2020, 0x1f04, 0x2329, 0x7003,
+        0x0000, 0x0016, 0xd18c, 0x2009, 0x0000, 0x0108, 0xc1bd, 0x080c,
+        0x246c, 0x001e, 0x7020, 0xa084, 0x000f, 0xa085, 0x6300, 0x7806,
+        0x780f, 0x9000, 0x7843, 0x00d8, 0x7853, 0x0090, 0x780b, 0x2f08,
+        0x7452, 0x704f, 0x0000, 0x8109, 0x0140, 0x2071, 0x4740, 0x2079,
+        0x0200, 0x2021, 0x47bf, 0x0804, 0x2306, 0x080c, 0x2526, 0x0005,
+        0x0016, 0x2011, 0x0101, 0xd1bc, 0x1110, 0x2011, 0x0201, 0xa18c,
+        0x000f, 0x2204, 0xa084, 0xfff0, 0xa105, 0x2012, 0x001e, 0x080c,
+        0x246c, 0x0005, 0x2011, 0x0101, 0xd3fc, 0x1110, 0x2011, 0x0201,
+        0x20a9, 0x0009, 0x810b, 0x1f04, 0x2372, 0xa18c, 0x0e00, 0x2204,
+        0xa084, 0xf1ff, 0xa105, 0x2012, 0x0005, 0x2019, 0x0002, 0x2009,
+        0x0101, 0x20a9, 0x0005, 0x8213, 0x1f04, 0x2383, 0xa294, 0x00e0,
+        0x2104, 0xa084, 0xff1f, 0xa205, 0x200a, 0x8319, 0x0118, 0x2009,
+        0x0201, 0x0c78, 0x0005, 0x2011, 0x0101, 0xd3fc, 0x1110, 0x2011,
+        0x0201, 0x20a9, 0x000c, 0x810b, 0x1f04, 0x239b, 0xa18c, 0xf000,
+        0x2204, 0xa084, 0x0fff, 0xa105, 0x2012, 0x0005, 0x2011, 0x0102,
+        0xd3fc, 0x1110, 0x2011, 0x0202, 0x2204, 0xa09c, 0x0f30, 0xa084,
+        0xf0cf, 0xa105, 0x2012, 0x0005, 0x00c6, 0x2061, 0x0100, 0xd1bc,
+        0x1110, 0x2061, 0x0200, 0xc1bc, 0x8103, 0x8003, 0xa080, 0x0020,
+        0x609a, 0x62ac, 0x63ac, 0x00ce, 0x0005, 0x00c6, 0x2061, 0x0100,
+        0xd1bc, 0x1110, 0x2061, 0x0200, 0xc1bc, 0x8103, 0x8003, 0xa080,
+        0x0022, 0x609a, 0x60a4, 0xa084, 0xffdf, 0x60ae, 0x00ce, 0x0005,
+        0x00c6, 0x2061, 0x0100, 0xd1bc, 0x1110, 0x2061, 0x0200, 0xc1bc,
+        0x8103, 0x8003, 0xa080, 0x0020, 0x609a, 0x60a4, 0xa28c, 0x0020,
+        0x0118, 0xc2ac, 0xa39d, 0x4000, 0xc3ec, 0xd3b4, 0x1108, 0xc3ed,
+        0x62ae, 0x2010, 0x60a4, 0x63ae, 0x2018, 0x00ce, 0x0005, 0x2091,
+        0x8000, 0x00c6, 0x00e6, 0x6818, 0xa005, 0x0904, 0x2450, 0xd1fc,
+        0x0118, 0x2061, 0x8ed0, 0x0010, 0x2061, 0x8dc0, 0x080c, 0x2458,
+        0x0560, 0x20a9, 0x0101, 0xd1fc, 0x0118, 0x2061, 0x8dd0, 0x0010,
+        0x2061, 0x8cc0, 0x00c6, 0x080c, 0x2458, 0x0128, 0x00ce, 0x8c60,
+        0x1f04, 0x2412, 0x04a8, 0x000e, 0xd1fc, 0x0128, 0xa082, 0x8dd0,
+        0x2071, 0x4780, 0x0020, 0xa082, 0x8cc0, 0x2071, 0x4740, 0x7076,
+        0x7172, 0x2138, 0x2001, 0x0004, 0x7062, 0x707f, 0x000f, 0x71d0,
+        0xc1c4, 0x71d2, 0x080c, 0x22cb, 0x00c0, 0xd1fc, 0x1118, 0x2071,
+        0x4740, 0x0010, 0x2071, 0x4780, 0x6020, 0xc0dd, 0x6022, 0x7172,
+        0x2138, 0x2c00, 0x707a, 0x2001, 0x0006, 0x7062, 0x707f, 0x000f,
+        0x71d0, 0xc1c4, 0x71d2, 0x080c, 0x22cb, 0x2001, 0x0000, 0x0010,
+        0x2001, 0x0001, 0x2091, 0x8001, 0xa005, 0x00ee, 0x00ce, 0x0005,
+        0x2c04, 0xa005, 0x0170, 0x2060, 0x6010, 0xa306, 0x1140, 0x600c,
+        0xa206, 0x1128, 0x6014, 0xa106, 0x1110, 0xa006, 0x0020, 0x6000,
+        0x0c80, 0xa085, 0x0001, 0x0005, 0x00f6, 0x00e6, 0x0016, 0x2079,
+        0x4780, 0x2071, 0x0100, 0xd1bc, 0x1120, 0x2079, 0x4740, 0x2071,
+        0x0200, 0x7920, 0xa18c, 0x000f, 0x70ec, 0xd0c4, 0x1110, 0x001e,
+        0x0060, 0x810b, 0x810b, 0x810b, 0x810b, 0x000e, 0xa18d, 0x0800,
+        0xd0bc, 0x1110, 0xa18d, 0x0f00, 0x2104, 0x00ee, 0x00fe, 0x0005,
+        0x2001, 0x4701, 0x2004, 0xd0ac, 0x1138, 0x68e4, 0xd0ac, 0x0120,
+        0xa084, 0x0006, 0x1108, 0x0009, 0x0005, 0x6014, 0x00e6, 0x0036,
+        0x2018, 0x2071, 0x4c40, 0xd0fc, 0x1110, 0x2071, 0x4bc0, 0x8007,
+        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xae70, 0x7004, 0xa084,
+        0x000a, 0x1904, 0x2523, 0x7108, 0xa194, 0xff00, 0x0904, 0x2523,
+        0xa18c, 0x00ff, 0x701c, 0xa084, 0xff00, 0x01c0, 0x7004, 0xa085,
+        0x003a, 0x7006, 0x2001, 0x0009, 0xa102, 0x16d8, 0x2001, 0x000a,
+        0xa102, 0x16d0, 0x2001, 0x000c, 0xa102, 0x16c8, 0x701c, 0xa084,
+        0x00ff, 0x701e, 0x7004, 0xa084, 0xffdf, 0x7006, 0x2001, 0x000a,
+        0xa106, 0x01a8, 0x2001, 0x000c, 0xa106, 0x01a0, 0x2001, 0x0012,
+        0xa106, 0x0198, 0x2001, 0x0014, 0xa106, 0x0190, 0x2001, 0x0019,
+        0xa106, 0x0188, 0x2001, 0x0032, 0xa106, 0x0180, 0x00d8, 0x2009,
+        0x000c, 0x00d0, 0x2009, 0x0012, 0x00b8, 0x2009, 0x0014, 0x00a0,
+        0x2009, 0x0019, 0x0088, 0x2009, 0x0020, 0x0070, 0x2009, 0x003f,
+        0x0058, 0x2009, 0x000a, 0x0040, 0x2009, 0x000c, 0x0028, 0x2009,
+        0x0019, 0x0010, 0x2011, 0x0000, 0x2100, 0xa205, 0x700a, 0x7004,
+        0xa085, 0x000a, 0x7006, 0x2071, 0x4700, 0x7004, 0xd0bc, 0x0158,
+        0xd3fc, 0x1120, 0x73ea, 0x2071, 0x4740, 0x0018, 0x73ee, 0x2071,
+        0x4780, 0x701f, 0x000d, 0x003e, 0x00ee, 0x0005, 0x2001, 0x01ff,
+        0x2004, 0xd0fc, 0x11d0, 0x2001, 0x04fd, 0x2004, 0xa082, 0x0005,
+        0x12a0, 0x2071, 0x0200, 0x71ec, 0xa18c, 0x1c00, 0x810f, 0x810c,
+        0x810c, 0x2079, 0x0100, 0x78ec, 0xa084, 0x1c00, 0x8007, 0x8004,
+        0x8004, 0xa105, 0xa08a, 0x0007, 0x0208, 0x0005, 0x0002, 0x2574,
+        0x255b, 0x2574, 0x255b, 0x254e, 0x2568, 0x254e, 0x7008, 0xa084,
+        0xc3ff, 0xa085, 0x3000, 0x700a, 0x7808, 0xa084, 0xc3ff, 0xa085,
+        0x3000, 0x780a, 0x0005, 0x7008, 0xa084, 0xc3ff, 0xa085, 0x2000,
+        0x700a, 0x7808, 0xa084, 0xc3ff, 0xa085, 0x2000, 0x780a, 0x0005,
+        0x7008, 0xa084, 0xc3ff, 0xa085, 0x0c00, 0x700a, 0x7808, 0xa084,
+        0xc3ff, 0xa085, 0x0c00, 0x780a, 0x0005, 0x0e04, 0x2575, 0x2091,
+        0x8000, 0x2071, 0x0000, 0x0006, 0x7018, 0xd084, 0x1de8, 0x000e,
+        0x2071, 0x0010, 0x70ca, 0x000e, 0x70c6, 0x70c3, 0x8002, 0x70db,
+        0x0a04, 0x70df, 0x002a, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091,
+        0x4080, 0x0cf8, 0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x78a0, 0x708a,
+        0x758e, 0x7492, 0x7696, 0x779a, 0xa594, 0x003f, 0xd4f4, 0x0138,
+        0xd7bc, 0x1128, 0xa784, 0x007d, 0x1904, 0x3c9c, 0x0871, 0xa49c,
+        0x000f, 0xa382, 0x0004, 0x0320, 0xa3a6, 0x0007, 0x1930, 0x2418,
+        0x8507, 0xa084, 0x000f, 0x0002, 0x2b6c, 0x2c57, 0x2c95, 0x2efb,
+        0x3279, 0x32d0, 0x3376, 0x3405, 0x34d9, 0x35ab, 0x25c7, 0x25c4,
+        0x299e, 0x2a85, 0x324d, 0x25c4, 0x080c, 0x2575, 0x0005, 0xa006,
+        0x0038, 0x7808, 0xc08d, 0x780a, 0xa006, 0x7002, 0x704a, 0x7042,
+        0x70ce, 0x705c, 0xa005, 0x1904, 0x2718, 0x7060, 0xa084, 0x0007,
+        0x0002, 0x25e1, 0x2652, 0x265a, 0x2663, 0x266c, 0x26fe, 0x2675,
+        0x2652, 0x7830, 0xd0bc, 0x1d10, 0x71d0, 0xd1bc, 0x19f8, 0xd1b4,
+        0x1904, 0x262f, 0x70a0, 0xa086, 0x0001, 0x09c0, 0x7014, 0xa005,
+        0x19a8, 0x70b0, 0xa06d, 0x6800, 0xa065, 0xa055, 0x789b, 0x0080,
+        0x6b0c, 0x7baa, 0x6808, 0xa045, 0x6d10, 0x6804, 0xa06d, 0xa05d,
+        0xa886, 0x0001, 0x0118, 0x69bc, 0x7daa, 0x79aa, 0x68c0, 0xa04d,
+        0x6e1c, 0x2001, 0x0010, 0x0804, 0x284b, 0x705c, 0xa005, 0x1904,
+        0x25c6, 0x00c6, 0x00d6, 0x70b0, 0xa06d, 0x6800, 0xa065, 0xa055,
+        0x789b, 0x0080, 0x6b0c, 0x7baa, 0x6808, 0xa045, 0x6d10, 0x6804,
+        0xa06d, 0xa05d, 0xa886, 0x0001, 0x0118, 0x69bc, 0x7daa, 0x79aa,
+        0x68c0, 0xa04d, 0x6e1c, 0x2001, 0x0020, 0x0804, 0x284b, 0x080c,
+        0x3c5b, 0x1904, 0x25c6, 0x781b, 0x0068, 0x70b8, 0xa06d, 0x68b4,
+        0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0x7808,
+        0xc08d, 0x780a, 0x68bc, 0x703e, 0xc1b4, 0x71d2, 0x70b4, 0xa065,
+        0x68c0, 0x7056, 0x7003, 0x0002, 0x2d00, 0x704a, 0xad80, 0x0009,
+        0x7042, 0x0005, 0x080c, 0x3c5b, 0x1120, 0x781b, 0x0054, 0x7003,
+        0x0004, 0x0005, 0x080c, 0x3c5b, 0x1128, 0x2011, 0x000c, 0x0419,
+        0x7003, 0x0004, 0x0005, 0x080c, 0x3c5b, 0x1128, 0x2011, 0x0006,
+        0x00d1, 0x7003, 0x0004, 0x0005, 0x080c, 0x3c5b, 0x1128, 0x2011,
+        0x000d, 0x0089, 0x7003, 0x0004, 0x0005, 0x080c, 0x3c5b, 0x1150,
+        0x2011, 0x0006, 0x0041, 0x7078, 0x707b, 0x0000, 0x2068, 0x704a,
+        0x7003, 0x0004, 0x0005, 0x7170, 0xc1fc, 0x8107, 0x7882, 0x789b,
+        0x0080, 0xa286, 0x000c, 0x1120, 0x7aaa, 0x2001, 0x0001, 0x0098,
+        0xa18c, 0x001f, 0xa18d, 0x00c0, 0x79aa, 0xa286, 0x000d, 0x0120,
+        0x7aaa, 0x2001, 0x0002, 0x0038, 0x78ab, 0x0020, 0x7174, 0x79aa,
+        0x7aaa, 0x2001, 0x0004, 0x789b, 0x0060, 0x78aa, 0x785b, 0x0004,
+        0x781b, 0x0113, 0x080c, 0x3c6e, 0x707f, 0x000f, 0x70d0, 0xd0b4,
+        0x0168, 0xc0b4, 0x70d2, 0x00c6, 0x70b4, 0xa065, 0x6008, 0xa084,
+        0xfbef, 0x600a, 0x6018, 0x8001, 0x601a, 0x00ce, 0x0005, 0x7014,
+        0xa005, 0x1138, 0x70d0, 0xd0b4, 0x0128, 0x70b4, 0xac06, 0x1110,
+        0x0c29, 0x0005, 0x0016, 0x71a0, 0xa186, 0x0001, 0x0528, 0x00d6,
+        0x0026, 0x2100, 0x2011, 0x0001, 0xa212, 0x70b0, 0x2068, 0x6800,
+        0xac06, 0x0120, 0x8211, 0x01b0, 0x00c9, 0x0cc8, 0x00c6, 0x2100,
+        0x2011, 0x0001, 0xa212, 0x70b0, 0x2068, 0x6800, 0x2060, 0x6008,
+        0xa084, 0xfbef, 0x600a, 0x8211, 0x0110, 0x0041, 0x0cb0, 0x70a3,
+        0x0001, 0x00ce, 0x002e, 0x00de, 0x001e, 0x0005, 0xade8, 0x0005,
+        0x70a8, 0xad06, 0x1110, 0x70a4, 0x2068, 0x0005, 0x080c, 0x3c5b,
+        0x1904, 0x25c6, 0x7078, 0x2068, 0x7770, 0x080c, 0x3b95, 0x2c50,
+        0x080c, 0x3cf6, 0x789b, 0x0080, 0x6814, 0xa084, 0x001f, 0xc0bd,
+        0x78aa, 0x6e1c, 0x2041, 0x0001, 0x2001, 0x0004, 0x0804, 0x2850,
+        0x080c, 0x3c5b, 0x1904, 0x25c6, 0x789b, 0x0080, 0x705c, 0x2068,
+        0x6f14, 0x70d0, 0xd0b4, 0x0168, 0xc0b4, 0x70d2, 0x00c6, 0x70b4,
+        0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001, 0x601a,
+        0x00ce, 0x080c, 0x3b95, 0x2c50, 0x080c, 0x3cf6, 0x6824, 0xa005,
+        0x0130, 0xa082, 0x0006, 0x0208, 0x0010, 0x6827, 0x0005, 0x6814,
+        0xa084, 0x001f, 0xc0bd, 0x78aa, 0x2031, 0x0020, 0x2041, 0x0001,
+        0x2001, 0x0003, 0x0804, 0x2850, 0xc28d, 0x72d2, 0x72bc, 0xa200,
+        0xa015, 0x7150, 0x8108, 0xa12a, 0x0208, 0x71bc, 0x2164, 0x6504,
+        0x85ff, 0x1170, 0x7152, 0x8421, 0x1da8, 0x70d0, 0xd08c, 0x0128,
+        0x70cc, 0xa005, 0x1110, 0x70cf, 0x000a, 0x0005, 0x2200, 0x0c90,
+        0x70d0, 0xc08c, 0x70d2, 0x70cf, 0x0000, 0x6034, 0xa005, 0x1db0,
+        0x6708, 0xa784, 0x073f, 0x01d0, 0xd7d4, 0x1d80, 0xa784, 0x0021,
+        0x1d68, 0xa784, 0x0002, 0x0130, 0xa784, 0x0004, 0x0d38, 0xa7bc,
+        0xfffb, 0x670a, 0xa784, 0x0218, 0x1d08, 0xa784, 0x0100, 0x0130,
+        0x6018, 0xa005, 0x19d8, 0xa7bc, 0xfeff, 0x670a, 0x2568, 0x6823,
+        0x0000, 0x6e1c, 0xa684, 0x000e, 0x6318, 0x0128, 0x601c, 0xa302,
+        0x0220, 0x0118, 0x0858, 0x83ff, 0x1948, 0x2d58, 0x2c50, 0x7152,
+        0xd7bc, 0x1120, 0x7028, 0x6022, 0x603a, 0x0010, 0xc7bc, 0x670a,
+        0x68c0, 0xa065, 0xa04d, 0x6100, 0x2a60, 0x2041, 0x0001, 0x6b14,
+        0xa39c, 0x001f, 0xa39d, 0x00c0, 0xd1fc, 0x0110, 0xd684, 0x0110,
+        0xa39c, 0xffbf, 0xd6a4, 0x0110, 0xa39d, 0x0020, 0xa684, 0x000e,
+        0x1904, 0x2802, 0xc7a5, 0x670a, 0x2c00, 0x68c6, 0x77a0, 0xa786,
+        0x0001, 0x1178, 0x70d0, 0xd0b4, 0x1160, 0x7000, 0xa082, 0x0002,
+        0x1240, 0x7830, 0xd0bc, 0x1128, 0x789b, 0x0080, 0x7baa, 0x0804,
+        0x2849, 0x8739, 0x77a2, 0x2750, 0x77ac, 0xa7b0, 0x0005, 0x70a8,
+        0xa606, 0x1108, 0x76a4, 0x76ae, 0x2c3a, 0x8738, 0x2d3a, 0x8738,
+        0x283a, 0x8738, 0x233a, 0x8738, 0x253a, 0x7830, 0xd0bc, 0x0150,
+        0x2091, 0x8000, 0x2091, 0x303d, 0x70d0, 0xa084, 0x303d, 0x2091,
+        0x8000, 0x2090, 0xaad5, 0x0000, 0x0120, 0x8421, 0x2200, 0x1904,
+        0x2751, 0x0005, 0xd1dc, 0x0904, 0x37f1, 0x2029, 0x0020, 0xd69c,
+        0x1120, 0x8528, 0xd68c, 0x1108, 0x8528, 0x8840, 0x6f14, 0x610c,
+        0x8108, 0xa18c, 0x00ff, 0x70c8, 0xa160, 0x2c64, 0x8cff, 0x0188,
+        0x6014, 0xa706, 0x1dd0, 0x60b8, 0x8001, 0x60ba, 0x1d88, 0x2a60,
+        0x6008, 0xa085, 0x0100, 0x600a, 0x2200, 0x8421, 0x1904, 0x2751,
+        0x0005, 0x2a60, 0x610e, 0x69be, 0x2c00, 0x68c6, 0x8840, 0x6008,
+        0xc0d5, 0x600a, 0x77a0, 0xa786, 0x0001, 0x1904, 0x27d9, 0x70d0,
+        0xd0b4, 0x1904, 0x27d9, 0x7000, 0xa082, 0x0002, 0x1a04, 0x27d9,
+        0x7830, 0xd0bc, 0x1904, 0x27d9, 0x789b, 0x0080, 0x7baa, 0x7daa,
+        0x79aa, 0x2001, 0x0002, 0x0006, 0x6018, 0x8000, 0x601a, 0x0008,
+        0x0006, 0x2960, 0x6104, 0x2a60, 0x080c, 0x3d09, 0x1590, 0xa184,
+        0x0018, 0x0180, 0xa184, 0x0010, 0x0118, 0x080c, 0x399a, 0x1548,
+        0xa184, 0x0008, 0x0138, 0x69a0, 0xa184, 0x0600, 0x1118, 0x080c,
+        0x38b8, 0x00f8, 0x69a0, 0xa184, 0x1e00, 0x0528, 0xa184, 0x0800,
+        0x0178, 0x00c6, 0x2960, 0x6000, 0xa085, 0x2000, 0x6002, 0x6104,
+        0xa18d, 0x0010, 0x6106, 0x00ce, 0x080c, 0x399a, 0x1150, 0x69a0,
+        0xa184, 0x0200, 0x0118, 0x080c, 0x38fd, 0x0018, 0xa184, 0x0400,
+        0x19f0, 0x69a0, 0xa184, 0x1000, 0x0130, 0x6914, 0xa18c, 0xff00,
+        0x810f, 0x080c, 0x23c5, 0x002e, 0xa68c, 0x00e0, 0xa684, 0x0060,
+        0x0128, 0xa086, 0x0060, 0x1110, 0xa18d, 0x4000, 0xa18d, 0x0104,
+        0x69b6, 0x789b, 0x0060, 0x2800, 0x78aa, 0x6818, 0xc0fd, 0x681a,
+        0xd6bc, 0x0168, 0xc0fc, 0x7083, 0x0000, 0xa08a, 0x000d, 0x0328,
+        0xa08a, 0x000c, 0x7182, 0x2001, 0x000c, 0x800c, 0x7186, 0x78aa,
+        0x3518, 0x3340, 0x3428, 0x8000, 0x80ac, 0xaf80, 0x002b, 0x20a0,
+        0x789b, 0x0000, 0xad80, 0x000b, 0x2098, 0x53a6, 0x23a8, 0x2898,
+        0x25a0, 0xa286, 0x0020, 0x1508, 0x70d0, 0xc0b5, 0x70d2, 0x2c00,
+        0x70b6, 0x2d00, 0x70ba, 0x6814, 0xc0fc, 0x8007, 0x7882, 0xa286,
+        0x0002, 0x0904, 0x2921, 0x70a0, 0x8000, 0x70a2, 0x74b0, 0xa498,
+        0x0005, 0x70a8, 0xa306, 0x1108, 0x73a4, 0x73b2, 0xa286, 0x0010,
+        0x0904, 0x25c6, 0x00de, 0x00ce, 0x0005, 0x7000, 0xa005, 0x19e0,
+        0xa286, 0x0002, 0x1904, 0x2938, 0x080c, 0x3c5b, 0x19a8, 0x6814,
+        0xc0fc, 0x8007, 0x7882, 0x2091, 0x8000, 0x781b, 0x0068, 0x68b4,
+        0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0x2091,
+        0x8001, 0x7808, 0xc08d, 0x780a, 0x0126, 0x00d6, 0x00c6, 0x70d0,
+        0xa084, 0x2e00, 0x2090, 0x00ce, 0x00de, 0x012e, 0x2900, 0x7056,
+        0x68bc, 0x703e, 0x7003, 0x0002, 0x2d00, 0x704a, 0xad80, 0x0009,
+        0x7042, 0x7830, 0xd0bc, 0x0140, 0x2091, 0x303d, 0x70d0, 0xa084,
+        0x303d, 0x2091, 0x8000, 0x2090, 0x70a0, 0xa005, 0x1108, 0x0005,
+        0x8421, 0x0de8, 0x724c, 0x70bc, 0xa200, 0xa015, 0x0804, 0x2751,
+        0xa286, 0x0010, 0x1560, 0x080c, 0x3c5b, 0x1904, 0x28cc, 0x6814,
+        0xc0fc, 0x8007, 0x7882, 0x781b, 0x0068, 0x68b4, 0x785a, 0x6894,
+        0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0x7808, 0xc08d, 0x780a,
+        0x70a0, 0x8000, 0x70a2, 0x74b0, 0xa490, 0x0005, 0x70a8, 0xa206,
+        0x1108, 0x72a4, 0x72b2, 0x2900, 0x7056, 0x68bc, 0x703e, 0x7003,
+        0x0002, 0x2d00, 0x704a, 0xad80, 0x0009, 0x7042, 0x0005, 0x6bb4,
+        0xa39d, 0x2000, 0x7b5a, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x6b94,
+        0x7bd6, 0x7bde, 0x6e98, 0x7ed2, 0x7eda, 0x781b, 0x0068, 0x2900,
+        0x7056, 0x7202, 0x7808, 0xc08d, 0x780a, 0x2300, 0xa605, 0x0170,
+        0x70d0, 0xa084, 0x2e00, 0xa086, 0x2600, 0x1118, 0x2009, 0x0000,
+        0x0010, 0x2009, 0x0001, 0xa284, 0x000f, 0x0033, 0xad80, 0x0009,
+        0x7042, 0x2d00, 0x704a, 0x0005, 0x299c, 0x4208, 0x4208, 0x41f6,
+        0x4208, 0x299c, 0x299c, 0x299c, 0x080c, 0x2575, 0x7808, 0xa084,
+        0xfffd, 0x780a, 0x00f6, 0x2079, 0x4700, 0x78ac, 0x00fe, 0xd084,
+        0x01c0, 0x7160, 0xa186, 0x0001, 0x0904, 0x2a61, 0xa186, 0x0007,
+        0x0170, 0xa186, 0x0005, 0x1158, 0x7078, 0x2068, 0x681b, 0x0004,
         0x6817, 0x0000, 0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822, 0x7063,
-        0x0000, 0x70a3, 0x0000, 0x70a4, 0x70ae, 0x70b2, 0x080c, 0x2682,
-        0x0156, 0x2011, 0x0004, 0x7160, 0xa186, 0x0001, 0x0160, 0xa186,
-        0x0007, 0x1118, 0x701f, 0x0005, 0x0030, 0x701f, 0x0001, 0x70d0,
-        0xc0c5, 0x70d2, 0x0000, 0x2001, 0x460a, 0x2004, 0xa084, 0x00ff,
-        0xa086, 0x0018, 0x0130, 0x7018, 0x7016, 0xa005, 0x1110, 0x70a3,
-        0x0001, 0x0066, 0x080c, 0x3f26, 0x20a9, 0x0010, 0x2039, 0x0000,
-        0x080c, 0x3a66, 0xa7b8, 0x0100, 0x1f04, 0x29c0, 0x006e, 0x7000,
-        0x0002, 0x29fd, 0x29db, 0x29db, 0x29d3, 0x29fd, 0x29fd, 0x29fd,
-        0x29d1, 0x080c, 0x254c, 0x705c, 0xa005, 0x0538, 0xad06, 0x1118,
-        0x6800, 0x705e, 0x0080, 0x6820, 0xd084, 0x1148, 0x6f14, 0x080c,
-        0x3b6f, 0x6008, 0xc0d4, 0x600a, 0x080c, 0x37a4, 0x0020, 0x7058,
-        0x2060, 0x6800, 0x6002, 0xa684, 0x5f00, 0x681e, 0x6818, 0xd0fc,
-        0x0108, 0x6a1a, 0x6817, 0x0000, 0x682b, 0x0000, 0x6820, 0xa084,
-        0x00ff, 0xc09d, 0x6822, 0x080c, 0x1da2, 0x2011, 0x0004, 0x74c8,
-        0xa4a0, 0x0100, 0x04b1, 0xaea0, 0x0017, 0x0499, 0x20a9, 0x0101,
-        0x74c8, 0x0479, 0x8420, 0x1f04, 0x2a09, 0x70c0, 0x2060, 0x2021,
-        0x0002, 0x20a9, 0x0100, 0x6110, 0x81ff, 0x0198, 0x6018, 0x0016,
-        0x0006, 0x2011, 0x4602, 0x220c, 0xa102, 0x2012, 0x000e, 0x001e,
-        0xa102, 0x0338, 0x6012, 0x1128, 0x2011, 0x4604, 0x2204, 0xc0a5,
-        0x2012, 0x601b, 0x0000, 0xace0, 0x0010, 0x1f04, 0x2a13, 0x8421,
-        0x1d00, 0x015e, 0x7063, 0x0000, 0x7003, 0x0000, 0x704b, 0x0000,
-        0x0005, 0x0046, 0x2404, 0xa005, 0x01a8, 0x2068, 0x6800, 0x0006,
-        0x6a1a, 0x6817, 0x0000, 0x682b, 0x0000, 0x68b4, 0xa084, 0x5f00,
-        0x681e, 0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822, 0x080c, 0x1da2,
-        0x000e, 0x0c48, 0x004e, 0x2023, 0x0000, 0x0005, 0xa282, 0x0003,
-        0x0310, 0x080c, 0x254c, 0x2300, 0x0002, 0x2a60, 0x2add, 0x2af7,
-        0xa282, 0x0002, 0x0110, 0x080c, 0x254c, 0x7060, 0x7063, 0x0000,
-        0x707f, 0x0000, 0x0022, 0x77d0, 0xc7c5, 0x77d2, 0x0002, 0x2a77,
-        0x2a77, 0x2a79, 0x2ab1, 0x37d8, 0x2a77, 0x2ab1, 0x2a77, 0x080c,
-        0x254c, 0x7770, 0x080c, 0x3a66, 0x7770, 0xa7bc, 0x8f00, 0x080c,
-        0x3b6f, 0x6018, 0xa005, 0x0528, 0xd7fc, 0x1118, 0x2021, 0x8cc0,
-        0x0010, 0x2021, 0x8dd0, 0x2009, 0x0005, 0x2011, 0x0010, 0x080c,
-        0x2b11, 0x01b8, 0x0156, 0x20a9, 0x0101, 0xd7fc, 0x1118, 0x2021,
-        0x8bc0, 0x0010, 0x2021, 0x8cd0, 0x0046, 0x2009, 0x0005, 0x2011,
-        0x0010, 0x080c, 0x2b11, 0x004e, 0x0118, 0x8420, 0x1f04, 0x2a9c,
-        0x015e, 0x8738, 0xa784, 0x001f, 0x1990, 0x0804, 0x25a0, 0x0804,
-        0x25a0, 0x7770, 0x080c, 0x3b6f, 0x6018, 0xa005, 0x0520, 0xd7fc,
-        0x1118, 0x2021, 0x8cc0, 0x0010, 0x2021, 0x8dd0, 0x2009, 0x0005,
-        0x2011, 0x0020, 0x080c, 0x2b11, 0x01b0, 0x0156, 0x20a9, 0x0101,
-        0xd7fc, 0x1118, 0x2021, 0x8bc0, 0x0010, 0x2021, 0x8cd0, 0x0046,
-        0x2009, 0x0005, 0x2011, 0x0020, 0x04e1, 0x004e, 0x0118, 0x8420,
-        0x1f04, 0x2acf, 0x015e, 0x0804, 0x25a0, 0x2200, 0x0002, 0x2ae2,
-        0x2ae4, 0x2ae4, 0x080c, 0x254c, 0x2009, 0x0012, 0x7060, 0xa086,
-        0x0002, 0x0110, 0x2009, 0x000e, 0x6818, 0xd0fc, 0x0108, 0x691a,
-        0x7063, 0x0000, 0x70d0, 0xc0c5, 0x70d2, 0x0804, 0x3be5, 0x2200,
-        0x0002, 0x2afe, 0x2ae4, 0x2afc, 0x080c, 0x254c, 0x080c, 0x3f26,
-        0x7000, 0xa086, 0x0002, 0x1904, 0x375d, 0x080c, 0x37be, 0x6008,
-        0xa084, 0xfbef, 0x600a, 0x080c, 0x374f, 0x0904, 0x375d, 0x0804,
-        0x25a0, 0x2404, 0xa005, 0x0590, 0x2068, 0x2d04, 0x0006, 0x6814,
-        0xa706, 0x0118, 0x2d20, 0x000e, 0x0ca8, 0x000e, 0x2022, 0x691a,
+        0x0000, 0x70a3, 0x0000, 0x70a4, 0x70ae, 0x70b2, 0x080c, 0x26ae,
+        0x0156, 0x2011, 0x0004, 0x7160, 0xa186, 0x0001, 0x0158, 0xa186,
+        0x0007, 0x1118, 0x701f, 0x0005, 0x0010, 0x701f, 0x0001, 0x70d0,
+        0xc0c5, 0x70d2, 0x2001, 0x470a, 0x2004, 0xa084, 0x00ff, 0xa086,
+        0x0018, 0x0130, 0x7018, 0x7016, 0xa005, 0x1110, 0x70a3, 0x0001,
+        0x0066, 0x080c, 0x3f4e, 0x20a9, 0x0010, 0x2039, 0x0000, 0x080c,
+        0x3a8b, 0xa7b8, 0x0100, 0x1f04, 0x29ef, 0x006e, 0x7000, 0x0002,
+        0x2a2c, 0x2a0a, 0x2a0a, 0x2a02, 0x2a2c, 0x2a2c, 0x2a2c, 0x2a00,
+        0x080c, 0x2575, 0x705c, 0xa005, 0x0538, 0xad06, 0x1118, 0x6800,
+        0x705e, 0x0080, 0x6820, 0xd084, 0x1148, 0x6f14, 0x080c, 0x3b95,
+        0x6008, 0xc0d4, 0x600a, 0x080c, 0x37c7, 0x0020, 0x7058, 0x2060,
+        0x6800, 0x6002, 0xa684, 0x5f00, 0x681e, 0x6818, 0xd0fc, 0x0108,
+        0x6a1a, 0x6817, 0x0000, 0x682b, 0x0000, 0x6820, 0xa084, 0x00ff,
+        0xc09d, 0x6822, 0x080c, 0x1dbf, 0x2011, 0x0004, 0x74c8, 0xa4a0,
+        0x0100, 0x04b1, 0xaea0, 0x0017, 0x0499, 0x20a9, 0x0101, 0x74c8,
+        0x0479, 0x8420, 0x1f04, 0x2a38, 0x70c0, 0x2060, 0x2021, 0x0002,
+        0x20a9, 0x0100, 0x6110, 0x81ff, 0x0198, 0x6018, 0x0016, 0x0006,
+        0x2011, 0x4702, 0x220c, 0xa102, 0x2012, 0x000e, 0x001e, 0xa102,
+        0x0338, 0x6012, 0x1128, 0x2011, 0x4704, 0x2204, 0xc0a5, 0x2012,
+        0x601b, 0x0000, 0xace0, 0x0010, 0x1f04, 0x2a42, 0x8421, 0x1d00,
+        0x015e, 0x7063, 0x0000, 0x7003, 0x0000, 0x704b, 0x0000, 0x0005,
+        0x0046, 0x2404, 0xa005, 0x01a8, 0x2068, 0x6800, 0x0006, 0x6a1a,
         0x6817, 0x0000, 0x682b, 0x0000, 0x68b4, 0xa084, 0x5f00, 0x681e,
-        0x6820, 0xa084, 0x00ff, 0xa205, 0x6822, 0x080c, 0x1da2, 0x2021,
-        0x4602, 0x241c, 0x8319, 0x2322, 0x6010, 0x8001, 0x6012, 0x1128,
-        0x2021, 0x4604, 0x2404, 0xc0a5, 0x2022, 0x6008, 0xa084, 0xf9ef,
-        0x600a, 0x080c, 0x269e, 0x080c, 0x37be, 0x0005, 0xa085, 0x0001,
-        0x0ce0, 0x2300, 0x0002, 0x2b50, 0x2b4e, 0x2bcb, 0x080c, 0x254c,
-        0x78e4, 0xa005, 0x17b0, 0x3208, 0xa18c, 0x0800, 0x0118, 0x0104,
-        0x259d, 0x0010, 0x0304, 0x259d, 0x2008, 0xa084, 0x0030, 0x1110,
-        0x0804, 0x322a, 0x78ec, 0xa084, 0x0003, 0x0dd0, 0x7884, 0xd0fc,
-        0x1118, 0xa184, 0x0007, 0x0090, 0xa184, 0x0007, 0xa086, 0x0004,
-        0x1118, 0x2001, 0x0000, 0x0050, 0xa184, 0x0007, 0xa086, 0x0005,
-        0x0118, 0xa184, 0x0007, 0x0010, 0x2001, 0x0001, 0x0002, 0x2bae,
-        0x2bb7, 0x2ba4, 0x2b87, 0x3c29, 0x3c29, 0x2b87, 0x2bc1, 0x080c,
-        0x254c, 0x7000, 0xa086, 0x0004, 0x1190, 0x7060, 0xa086, 0x0002,
-        0x1130, 0x2011, 0x0002, 0x2019, 0x0000, 0x0804, 0x2a56, 0x7060,
-        0xa086, 0x0006, 0x0db0, 0x7060, 0xa086, 0x0004, 0x0d90, 0x79e4,
-        0x2001, 0x0003, 0x0804, 0x2f18, 0x6818, 0xd0fc, 0x0110, 0x681b,
-        0x001d, 0x080c, 0x3a3c, 0x781b, 0x006e, 0x0005, 0x6818, 0xd0fc,
-        0x0110, 0x681b, 0x001d, 0x080c, 0x3a3c, 0x0804, 0x3c07, 0x6818,
-        0xd0fc, 0x0110, 0x681b, 0x001d, 0x080c, 0x3a3c, 0x781b, 0x00fa,
-        0x0005, 0x6818, 0xd0fc, 0x0110, 0x681b, 0x001d, 0x080c, 0x3a3c,
-        0x781b, 0x00cb, 0x0005, 0xa584, 0x000f, 0x11c0, 0x7000, 0x0002,
-        0x25a0, 0x2bd8, 0x2bda, 0x375d, 0x375d, 0x375d, 0x2bd8, 0x2bd8,
-        0x080c, 0x254c, 0x080c, 0x37be, 0x6008, 0xa084, 0xfbef, 0x600a,
-        0x080c, 0x374f, 0x0904, 0x375d, 0x0804, 0x25a0, 0x78e4, 0xa005,
-        0x1b04, 0x2b89, 0x3208, 0xa18c, 0x0800, 0x0118, 0x0104, 0x2b89,
-        0x0010, 0x0304, 0x2b89, 0x2008, 0xa084, 0x0030, 0x1118, 0x781b,
-        0x0068, 0x0005, 0x78ec, 0xa084, 0x0003, 0x0dc8, 0x7884, 0xd0fc,
-        0x1118, 0xa184, 0x0007, 0x0090, 0xa184, 0x0007, 0xa086, 0x0004,
-        0x1118, 0x2001, 0x0000, 0x0050, 0xa184, 0x0007, 0xa086, 0x0005,
-        0x0118, 0xa184, 0x0007, 0x0010, 0x2001, 0x0001, 0x0002, 0x2c26,
-        0x2c2a, 0x2c21, 0x2c1f, 0x3c29, 0x3c29, 0x2c1f, 0x3c23, 0x080c,
-        0x254c, 0x080c, 0x3a42, 0x781b, 0x006e, 0x0005, 0x080c, 0x3a42,
-        0x0804, 0x3c07, 0x080c, 0x3a42, 0x781b, 0x00fa, 0x0005, 0x080c,
-        0x3a42, 0x781b, 0x00cb, 0x0005, 0x2300, 0x0002, 0x2c3b, 0x2c39,
-        0x2c3d, 0x080c, 0x254c, 0x0804, 0x33e2, 0x681b, 0x0016, 0x78a3,
-        0x0000, 0x79e4, 0xa184, 0x0030, 0x0904, 0x33e2, 0x78ec, 0xa084,
-        0x0003, 0x0904, 0x33e2, 0xa184, 0x0100, 0x0d98, 0x7884, 0xd0fc,
+        0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822, 0x080c, 0x1dbf, 0x000e,
+        0x0c48, 0x004e, 0x2023, 0x0000, 0x0005, 0xa282, 0x0003, 0x0310,
+        0x080c, 0x2575, 0x2300, 0x0002, 0x2a8f, 0x2b0c, 0x2b1a, 0xa282,
+        0x0002, 0x0110, 0x080c, 0x2575, 0x7060, 0x7063, 0x0000, 0x707f,
+        0x0000, 0x0022, 0x77d0, 0xc7c5, 0x77d2, 0x0002, 0x2aa6, 0x2aa6,
+        0x2aa8, 0x2ae0, 0x37fb, 0x2aa6, 0x2ae0, 0x2aa6, 0x080c, 0x2575,
+        0x7770, 0x080c, 0x3a8b, 0x7770, 0xa7bc, 0x8f00, 0x080c, 0x3b95,
+        0x6018, 0xa005, 0x0528, 0xd7fc, 0x1118, 0x2021, 0x8dc0, 0x0010,
+        0x2021, 0x8ed0, 0x2009, 0x0005, 0x2011, 0x0010, 0x080c, 0x2b34,
+        0x01b8, 0x0156, 0x20a9, 0x0101, 0xd7fc, 0x1118, 0x2021, 0x8cc0,
+        0x0010, 0x2021, 0x8dd0, 0x0046, 0x2009, 0x0005, 0x2011, 0x0010,
+        0x080c, 0x2b34, 0x004e, 0x0118, 0x8420, 0x1f04, 0x2acb, 0x015e,
+        0x8738, 0xa784, 0x001f, 0x1990, 0x0804, 0x25c9, 0x0804, 0x25c9,
+        0x7770, 0x080c, 0x3b95, 0x6018, 0xa005, 0x0520, 0xd7fc, 0x1118,
+        0x2021, 0x8dc0, 0x0010, 0x2021, 0x8ed0, 0x2009, 0x0005, 0x2011,
+        0x0020, 0x080c, 0x2b34, 0x01b0, 0x0156, 0x20a9, 0x0101, 0xd7fc,
+        0x1118, 0x2021, 0x8cc0, 0x0010, 0x2021, 0x8dd0, 0x0046, 0x2009,
+        0x0005, 0x2011, 0x0020, 0x0481, 0x004e, 0x0118, 0x8420, 0x1f04,
+        0x2afe, 0x015e, 0x0804, 0x25c9, 0x2200, 0x0002, 0x2b11, 0x2b13,
+        0x2b13, 0x080c, 0x2575, 0x7063, 0x0000, 0x70d0, 0xc0c5, 0x70d2,
+        0x0804, 0x25c9, 0x2200, 0x0002, 0x2b21, 0x2b13, 0x2b1f, 0x080c,
+        0x2575, 0x080c, 0x3f4e, 0x7000, 0xa086, 0x0002, 0x1904, 0x3780,
+        0x080c, 0x37e1, 0x6008, 0xa084, 0xfbef, 0x600a, 0x080c, 0x3772,
+        0x0904, 0x3780, 0x0804, 0x25c9, 0x2404, 0xa005, 0x0590, 0x2068,
+        0x2d04, 0x0006, 0x6814, 0xa706, 0x0118, 0x2d20, 0x000e, 0x0ca8,
+        0x000e, 0x2022, 0x691a, 0x6817, 0x0000, 0x682b, 0x0000, 0x68b4,
+        0xa084, 0x5f00, 0x681e, 0x6820, 0xa084, 0x00ff, 0xa205, 0x6822,
+        0x080c, 0x1dbf, 0x2021, 0x4702, 0x241c, 0x8319, 0x2322, 0x6010,
+        0x8001, 0x6012, 0x1128, 0x2021, 0x4704, 0x2404, 0xc0a5, 0x2022,
+        0x6008, 0xa084, 0xf9ef, 0x600a, 0x080c, 0x26ca, 0x080c, 0x37e1,
+        0x0005, 0xa085, 0x0001, 0x0ce0, 0x2300, 0x0002, 0x2b73, 0x2b71,
+        0x2bee, 0x080c, 0x2575, 0x78e4, 0xa005, 0x17b0, 0x3208, 0xa18c,
+        0x0800, 0x0118, 0x0104, 0x25c6, 0x0010, 0x0304, 0x25c6, 0x2008,
+        0xa084, 0x0030, 0x1110, 0x0804, 0x324d, 0x78ec, 0xa084, 0x0003,
+        0x0dd0, 0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007, 0x0090, 0xa184,
+        0x0007, 0xa086, 0x0004, 0x1118, 0x2001, 0x0000, 0x0050, 0xa184,
+        0x0007, 0xa086, 0x0005, 0x0118, 0xa184, 0x0007, 0x0010, 0x2001,
+        0x0001, 0x0002, 0x2bd1, 0x2bda, 0x2bc7, 0x2baa, 0x3c4f, 0x3c4f,
+        0x2baa, 0x2be4, 0x080c, 0x2575, 0x7000, 0xa086, 0x0004, 0x1190,
+        0x7060, 0xa086, 0x0002, 0x1130, 0x2011, 0x0002, 0x2019, 0x0000,
+        0x0804, 0x2a85, 0x7060, 0xa086, 0x0006, 0x0db0, 0x7060, 0xa086,
+        0x0004, 0x0d90, 0x79e4, 0x2001, 0x0003, 0x0804, 0x2f3b, 0x6818,
+        0xd0fc, 0x0110, 0x681b, 0x001d, 0x080c, 0x3a61, 0x781b, 0x006e,
+        0x0005, 0x6818, 0xd0fc, 0x0110, 0x681b, 0x001d, 0x080c, 0x3a61,
+        0x0804, 0x3c2d, 0x6818, 0xd0fc, 0x0110, 0x681b, 0x001d, 0x080c,
+        0x3a61, 0x781b, 0x00fa, 0x0005, 0x6818, 0xd0fc, 0x0110, 0x681b,
+        0x001d, 0x080c, 0x3a61, 0x781b, 0x00cb, 0x0005, 0xa584, 0x000f,
+        0x11c0, 0x7000, 0x0002, 0x25c9, 0x2bfb, 0x2bfd, 0x3780, 0x3780,
+        0x3780, 0x2bfb, 0x2bfb, 0x080c, 0x2575, 0x080c, 0x37e1, 0x6008,
+        0xa084, 0xfbef, 0x600a, 0x080c, 0x3772, 0x0904, 0x3780, 0x0804,
+        0x25c9, 0x78e4, 0xa005, 0x1b04, 0x2bac, 0x3208, 0xa18c, 0x0800,
+        0x0118, 0x0104, 0x2bac, 0x0010, 0x0304, 0x2bac, 0x2008, 0xa084,
+        0x0030, 0x1118, 0x781b, 0x0068, 0x0005, 0x78ec, 0xa084, 0x0003,
+        0x0dc8, 0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007, 0x0090, 0xa184,
+        0x0007, 0xa086, 0x0004, 0x1118, 0x2001, 0x0000, 0x0050, 0xa184,
+        0x0007, 0xa086, 0x0005, 0x0118, 0xa184, 0x0007, 0x0010, 0x2001,
+        0x0001, 0x0002, 0x2c49, 0x2c4d, 0x2c44, 0x2c42, 0x3c4f, 0x3c4f,
+        0x2c42, 0x3c49, 0x080c, 0x2575, 0x080c, 0x3a67, 0x781b, 0x006e,
+        0x0005, 0x080c, 0x3a67, 0x0804, 0x3c2d, 0x080c, 0x3a67, 0x781b,
+        0x00fa, 0x0005, 0x080c, 0x3a67, 0x781b, 0x00cb, 0x0005, 0x2300,
+        0x0002, 0x2c5e, 0x2c5c, 0x2c60, 0x080c, 0x2575, 0x0804, 0x3405,
+        0x681b, 0x0016, 0x78a3, 0x0000, 0x79e4, 0xa184, 0x0030, 0x0904,
+        0x3405, 0x78ec, 0xa084, 0x0003, 0x0904, 0x3405, 0xa184, 0x0100,
+        0x0d98, 0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007, 0x0090, 0xa184,
+        0x0007, 0xa086, 0x0004, 0x1118, 0x2001, 0x0000, 0x0050, 0xa184,
+        0x0007, 0xa086, 0x0005, 0x0118, 0xa184, 0x0007, 0x0010, 0x2001,
+        0x0001, 0x0002, 0x2c92, 0x2c4d, 0x2bc7, 0x3c0b, 0x3c4f, 0x3c4f,
+        0x3c0b, 0x3c49, 0x080c, 0x3c17, 0x0005, 0xa282, 0x0005, 0x0310,
+        0x080c, 0x2575, 0x7898, 0x2040, 0x2300, 0x0002, 0x2ca1, 0x2ecb,
+        0x2ed5, 0x2200, 0x0002, 0x2cbd, 0x2caa, 0x2cbd, 0x2ca8, 0x2ead,
+        0x080c, 0x2575, 0x789b, 0x0018, 0x78a8, 0x2010, 0xa084, 0x00ff,
+        0xa082, 0x0020, 0x0a04, 0x3a30, 0xa08a, 0x0004, 0x1a04, 0x3a30,
+        0x0002, 0x3a30, 0x3a30, 0x3a30, 0x39e4, 0x789b, 0x0018, 0x79a8,
+        0xa184, 0x0080, 0x0148, 0x0804, 0x3a30, 0x7000, 0xa005, 0x1dd8,
+        0x2011, 0x0004, 0x0804, 0x35b7, 0xa184, 0x00ff, 0xa08a, 0x0010,
+        0x1a04, 0x3a30, 0x0002, 0x2ce5, 0x2ce3, 0x2cf7, 0x2cfb, 0x2da9,
+        0x3a30, 0x3a30, 0x2dab, 0x3a30, 0x3a30, 0x2ea9, 0x2ea9, 0x3a30,
+        0x3a30, 0x3a30, 0x2eab, 0x080c, 0x2575, 0xd6e4, 0x0140, 0x2001,
+        0x0300, 0x8000, 0x8000, 0x783a, 0x781b, 0x00c7, 0x0005, 0x6818,
+        0xd0fc, 0x0118, 0x681b, 0x001d, 0x0c90, 0x0804, 0x3c0b, 0x681b,
+        0x001d, 0x0804, 0x3a5b, 0x6920, 0x6922, 0xa684, 0x1800, 0x1904,
+        0x2d4c, 0x6820, 0xd084, 0x1904, 0x2d54, 0x6818, 0xa086, 0x0008,
+        0x1110, 0x681b, 0x0000, 0xd6d4, 0x0568, 0xd6bc, 0x0558, 0x7083,
+        0x0000, 0x6818, 0xa084, 0x003f, 0xa08a, 0x000d, 0x0718, 0xa08a,
+        0x000c, 0x7182, 0x2001, 0x000c, 0x800c, 0x7186, 0x789b, 0x0061,
+        0x78aa, 0x0156, 0x0136, 0x0146, 0x0016, 0x3208, 0xa18c, 0x0600,
+        0x0118, 0x20a1, 0x022b, 0x0010, 0x20a1, 0x012b, 0x001e, 0x789b,
+        0x0000, 0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x014e,
+        0x013e, 0x015e, 0x6038, 0xa005, 0x1150, 0x681c, 0xa084, 0x000e,
+        0x0904, 0x3a5b, 0x080c, 0x3a6d, 0x782b, 0x3008, 0x0010, 0x8001,
+        0x603a, 0x781b, 0x0071, 0x0005, 0xd6e4, 0x0130, 0x781b, 0x0083,
+        0x0005, 0x781b, 0x0083, 0x0005, 0xa684, 0x0060, 0x0dd0, 0xd6dc,
+        0x0dc0, 0xd6fc, 0x01a0, 0xc6fc, 0x7e5a, 0x6eb6, 0x7adc, 0x79d8,
+        0x78d0, 0x8007, 0xa084, 0x007f, 0xa108, 0xa291, 0x0000, 0x6b98,
+        0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0xd6f4,
+        0x0118, 0xc6f4, 0x7e5a, 0x6eb6, 0x7000, 0xa086, 0x0003, 0x1148,
+        0x0006, 0x080c, 0x3f4e, 0x080c, 0x4208, 0x000e, 0x781b, 0x0080,
+        0x0005, 0xa006, 0x080c, 0x42e8, 0x6ab0, 0x69ac, 0x6c98, 0x6b94,
+        0x2200, 0xa105, 0x0120, 0x2200, 0xa422, 0x2100, 0xa31b, 0x6caa,
+        0x7cd2, 0x7cda, 0x6ba6, 0x7bd6, 0x7bde, 0x2300, 0xa405, 0x1130,
+        0xc6f5, 0x7e5a, 0x6eb6, 0x781b, 0x0080, 0x0005, 0x781b, 0x0080,
+        0x2200, 0xa115, 0x1118, 0x080c, 0x4208, 0x0005, 0x080c, 0x4235,
+        0x0005, 0x080c, 0x2575, 0x0804, 0x2e3f, 0x00c6, 0x7054, 0x2060,
+        0x6920, 0xa18c, 0xecff, 0x6922, 0x6000, 0xa084, 0xcfdf, 0x6002,
+        0x080c, 0x3917, 0xa006, 0x2040, 0x2038, 0x080c, 0x39bf, 0x0804,
+        0x2e33, 0x00c6, 0x7054, 0x2060, 0x2c48, 0x7aa8, 0xa294, 0x00ff,
+        0xa286, 0x0004, 0x11d8, 0x6920, 0xd1e4, 0x1170, 0x2039, 0x0000,
+        0x2041, 0x0000, 0x2031, 0x0000, 0xa006, 0x2010, 0x080c, 0x391a,
+        0x080c, 0x39bf, 0x0804, 0x2e33, 0xa18c, 0xecff, 0x6922, 0x6104,
+        0xa18c, 0xffdd, 0x6106, 0x6000, 0xc0ac, 0x6002, 0xa286, 0x0003,
+        0x01d0, 0x6104, 0xa184, 0x0010, 0x0548, 0x080c, 0x3b91, 0x080c,
+        0x399a, 0x88ff, 0x0518, 0x00ce, 0x789b, 0x0060, 0x2800, 0x78aa,
+        0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x1118, 0x781b, 0x006e, 0x0005,
+        0x781b, 0x0082, 0x0005, 0x6920, 0xd1cc, 0x0130, 0xa18c, 0xfdff,
+        0x6922, 0x6000, 0xc0ec, 0x6002, 0x2039, 0x0000, 0x2041, 0x0000,
+        0x2031, 0x0000, 0xa006, 0x2010, 0x080c, 0x39bf, 0xa286, 0x0001,
+        0x0158, 0x6104, 0xa184, 0x0008, 0x01b0, 0x080c, 0x3b91, 0x080c,
+        0x38b8, 0x88ff, 0x1980, 0x0078, 0x6920, 0xd1c4, 0x0130, 0xa18c,
+        0xfeff, 0x6922, 0x6000, 0xc0e4, 0x6002, 0x2031, 0x0000, 0xa006,
+        0x2010, 0x080c, 0x391a, 0x00ce, 0x7e58, 0xd6d4, 0x1118, 0x781b,
+        0x0071, 0x0005, 0x781b, 0x0083, 0x0005, 0x0804, 0x3a57, 0x2808,
+        0x789b, 0x0080, 0x2019, 0x0080, 0x78a8, 0xa094, 0x00ff, 0xa286,
+        0x0001, 0x11b8, 0x2300, 0xa102, 0xa086, 0x0001, 0x0904, 0x2dad,
+        0x7ca8, 0xa4a4, 0x00ff, 0xa480, 0x0002, 0xa300, 0x2018, 0xa102,
+        0x0a04, 0x2dc1, 0x0904, 0x2dc1, 0x24a8, 0x7aa8, 0x1f04, 0x2e5d,
+        0x0c18, 0xa284, 0x00f0, 0xa082, 0x0020, 0x06b8, 0x2200, 0xa082,
+        0x0021, 0x1698, 0x7aa8, 0x8318, 0x8318, 0x2100, 0xa302, 0x0aa0,
+        0xa286, 0x0023, 0x0950, 0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58,
+        0xa684, 0xfff1, 0xc0a5, 0x2030, 0x7e5a, 0x6008, 0xc0a5, 0x600a,
+        0x78a0, 0xa005, 0x0904, 0x2e34, 0x20a8, 0x7998, 0x789b, 0x0060,
+        0x78aa, 0x2011, 0x0080, 0x799a, 0x78a8, 0x7998, 0x7a9a, 0x78aa,
+        0x7a98, 0x1f04, 0x2e8b, 0xc695, 0x7e5a, 0xd6d4, 0x1118, 0x781b,
+        0x006e, 0x0005, 0x781b, 0x0082, 0x0005, 0x8318, 0x2100, 0xa302,
+        0x0a04, 0x2e44, 0xa284, 0x0080, 0x1904, 0x3a5b, 0x78a0, 0xa005,
+        0x08c8, 0x0804, 0x3a5b, 0x0804, 0x3a30, 0x7054, 0xa04d, 0x789b,
+        0x0018, 0x78a8, 0xa084, 0x00ff, 0xa08e, 0x0001, 0x0110, 0x080c,
+        0x2575, 0x7aa8, 0xa294, 0x00ff, 0x784b, 0x0008, 0x78a8, 0xa084,
+        0x00ff, 0xa08a, 0x0005, 0x1a04, 0x3a30, 0x0002, 0x3a30, 0x382f,
+        0x3a30, 0x394a, 0x3d59, 0xa282, 0x0000, 0x1110, 0x080c, 0x2575,
+        0x080c, 0x3a61, 0x781b, 0x0082, 0x0005, 0xa282, 0x0003, 0x1110,
+        0x080c, 0x2575, 0xd4fc, 0x11d0, 0x7060, 0xa005, 0x0110, 0x080c,
+        0x2575, 0x6f14, 0x7772, 0xa7bc, 0x8f00, 0x080c, 0x3b95, 0x6008,
+        0xa085, 0x0021, 0x600a, 0x8738, 0xa784, 0x001f, 0x1db0, 0x080c,
+        0x3a64, 0x7063, 0x0002, 0x701f, 0x0009, 0x0010, 0x080c, 0x3a70,
+        0x781b, 0x0082, 0x0005, 0xa282, 0x0004, 0x0310, 0x080c, 0x2575,
+        0x2300, 0x0002, 0x2f05, 0x309b, 0x30d7, 0xa286, 0x0003, 0x0598,
+        0x7200, 0x7cd8, 0x7ddc, 0x7fd0, 0x71d0, 0xd1b4, 0x0528, 0xd1bc,
+        0x1518, 0x2001, 0x4701, 0x2004, 0xd0c4, 0x11f0, 0x7868, 0xa084,
+        0x00ff, 0x11d0, 0xa282, 0x0002, 0x12b8, 0x00d6, 0x783b, 0x8300,
+        0x781b, 0x0059, 0x70b8, 0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6,
+        0x78de, 0x6898, 0x78d2, 0x78da, 0xc1b4, 0x71d2, 0x7003, 0x0030,
+        0x00de, 0x2001, 0x0000, 0x0058, 0x783b, 0x1300, 0x781b, 0x0057,
+        0x2001, 0x0000, 0x0020, 0x7200, 0x7cd8, 0x7ddc, 0x7fd0, 0x7046,
+        0x68a0, 0xd0ec, 0x0118, 0x6008, 0xc08d, 0x600a, 0xa284, 0x000f,
+        0x0002, 0x307c, 0x2f56, 0x2f53, 0x31a7, 0x3232, 0x25c9, 0x2f51,
+        0x2f51, 0x080c, 0x2575, 0x6008, 0xc0d4, 0x600a, 0xd6e4, 0x0120,
+        0x7044, 0xa086, 0x0014, 0x11e8, 0x080c, 0x3f4e, 0x2009, 0x0000,
+        0x6818, 0xd0fc, 0x0108, 0x7044, 0xa086, 0x0014, 0x0168, 0x6818,
+        0xa086, 0x0008, 0x1904, 0x303e, 0x7858, 0xd09c, 0x0904, 0x303e,
+        0x6820, 0xd0ac, 0x0904, 0x303e, 0x681b, 0x0014, 0x2009, 0x0002,
+        0x04a8, 0x7868, 0xa08c, 0x00ff, 0x0588, 0xa186, 0x0008, 0x1158,
+        0x6008, 0xc0a4, 0x600a, 0x080c, 0x3772, 0x0540, 0x080c, 0x37e1,
+        0x080c, 0x3f4e, 0x0060, 0xa186, 0x0028, 0x1500, 0x6018, 0xa005,
+        0x0d78, 0x8001, 0x0d68, 0x8001, 0x0d58, 0x601e, 0x0c48, 0x6820,
+        0xd084, 0x0904, 0x25c9, 0xc084, 0x6822, 0x080c, 0x26bf, 0x7058,
+        0x00c6, 0x2060, 0x6800, 0x6002, 0x00ce, 0x6004, 0x6802, 0xa005,
+        0x2d00, 0x1108, 0x6002, 0x6006, 0x0804, 0x25c9, 0x0016, 0x81ff,
+        0x15f0, 0x7000, 0xa086, 0x0030, 0x05d0, 0x71d0, 0xd1bc, 0x15b8,
+        0xd1b4, 0x11e8, 0x705c, 0xa005, 0x1590, 0x70a0, 0xa086, 0x0001,
+        0x0570, 0x7003, 0x0000, 0x0046, 0x0056, 0x0076, 0x0066, 0x00c6,
+        0x00d6, 0x080c, 0x25f1, 0x00de, 0x00ce, 0x006e, 0x007e, 0x005e,
+        0x004e, 0x71d0, 0xd1b4, 0x11d8, 0x7003, 0x0040, 0x00c0, 0x080c,
+        0x3c5b, 0x11a8, 0x781b, 0x0068, 0x00d6, 0x70b8, 0xa06d, 0x68b4,
+        0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0xc1b4,
+        0x71d2, 0x7003, 0x0030, 0x7808, 0xc08d, 0x780a, 0x00de, 0x080c,
+        0x30ff, 0x001e, 0x81ff, 0x0904, 0x303e, 0xa684, 0xdf00, 0x681e,
+        0x682b, 0x0000, 0x6f14, 0xa186, 0x0002, 0x1904, 0x303f, 0x6818,
+        0xa086, 0x0014, 0x1130, 0x2008, 0xd6e4, 0x0118, 0x7868, 0xa08c,
+        0x00ff, 0x080c, 0x3a7a, 0x080c, 0x26ca, 0x6820, 0xd0dc, 0x1578,
+        0x8717, 0xa294, 0x000f, 0x8213, 0x8213, 0x8213, 0xb284, 0x0600,
+        0x0118, 0xa290, 0x4bc0, 0x0010, 0xa290, 0x4c40, 0xa290, 0x0000,
+        0x221c, 0xd3c4, 0x0170, 0x6820, 0xd0e4, 0x0128, 0xa084, 0xefff,
+        0x6822, 0xc3ac, 0x2312, 0x8210, 0x2204, 0xa085, 0x0038, 0x2012,
+        0x8211, 0xd3d4, 0x0138, 0x68a0, 0xd0c4, 0x1120, 0x080c, 0x3167,
+        0x0804, 0x25c9, 0x6008, 0xc08d, 0x600a, 0x0008, 0x692a, 0x6916,
+        0x6818, 0xd0fc, 0x0110, 0x7044, 0x681a, 0xa68c, 0xdf00, 0x691e,
+        0x6410, 0x84ff, 0x0168, 0x2009, 0x4702, 0x2104, 0x8001, 0x200a,
+        0x8421, 0x6412, 0x1128, 0x2021, 0x4704, 0x2404, 0xc0a5, 0x2022,
+        0x6018, 0xa005, 0x0118, 0x8001, 0x601a, 0x1118, 0x6008, 0xc0a4,
+        0x600a, 0x6820, 0xd084, 0x1130, 0x6800, 0xa005, 0x1108, 0x6002,
+        0x6006, 0x0020, 0x7058, 0x2060, 0x6800, 0x6002, 0x2061, 0x4700,
+        0x6887, 0x0103, 0x2d08, 0x206b, 0x0000, 0x6068, 0xa005, 0x616a,
+        0x0110, 0x2d02, 0x0008, 0x616e, 0x7200, 0xa286, 0x0030, 0x0158,
+        0xa286, 0x0040, 0x1904, 0x25c9, 0x7003, 0x0002, 0x7048, 0x2068,
+        0x68c4, 0x2060, 0x0005, 0x7003, 0x0002, 0x70b8, 0xa06d, 0x68bc,
+        0x703e, 0x70b4, 0xa065, 0x68c0, 0x7056, 0x2d00, 0x704a, 0xad80,
+        0x0009, 0x7042, 0x0005, 0xa282, 0x0004, 0x0210, 0x080c, 0x2575,
+        0x2200, 0x0002, 0x30a6, 0x30b5, 0x30c1, 0x30b5, 0xa586, 0x1300,
+        0x0160, 0xa586, 0x8300, 0x1d90, 0x7003, 0x0000, 0x6018, 0x8001,
+        0x601a, 0x6008, 0xa084, 0xfbef, 0x600a, 0x7000, 0xa086, 0x0005,
+        0x0128, 0x080c, 0x3a61, 0x781b, 0x0082, 0x0005, 0x781b, 0x0083,
+        0x0005, 0x7890, 0x8007, 0x8001, 0xa084, 0x0007, 0xa080, 0x0018,
+        0x789a, 0x79a8, 0xa18c, 0x00ff, 0xa186, 0x0003, 0x0128, 0xa186,
+        0x0000, 0x0110, 0x0804, 0x3a30, 0x781b, 0x0083, 0x0005, 0x6820,
+        0xc095, 0x6822, 0x82ff, 0x1118, 0x080c, 0x3a61, 0x0030, 0x8211,
+        0x0110, 0x080c, 0x2575, 0x080c, 0x3a70, 0x781b, 0x0082, 0x0005,
+        0x080c, 0x3c6e, 0x7830, 0xa084, 0x00c0, 0x1170, 0x0016, 0x3208,
+        0xa18c, 0x0800, 0x001e, 0x0118, 0x0104, 0x30fc, 0x0010, 0x0304,
+        0x30fc, 0x791a, 0xa006, 0x0005, 0xa085, 0x0001, 0x0005, 0xa684,
+        0x0060, 0x1130, 0x682f, 0x0000, 0x6833, 0x0000, 0x0804, 0x3166,
+        0xd6dc, 0x1198, 0x68b4, 0xd0dc, 0x1180, 0x6998, 0x6a94, 0x692e,
+        0x6a32, 0x7044, 0xa005, 0x1130, 0x2200, 0xa105, 0x0904, 0x3f4e,
+        0x7047, 0x0015, 0x0804, 0x3f4e, 0x0005, 0xd6ac, 0x01f0, 0xd6f4,
+        0x0130, 0x682f, 0x0000, 0x6833, 0x0000, 0x0804, 0x3f4e, 0x68b4,
+        0xa084, 0x4000, 0xa635, 0xd6f4, 0x1da0, 0x7044, 0xa005, 0x1110,
+        0x7047, 0x0015, 0xd6dc, 0x1128, 0x68b4, 0xd0dc, 0x0110, 0x6ca8,
+        0x6da4, 0x6c2e, 0x6d32, 0x0804, 0x3f4e, 0xd6f4, 0x0130, 0x682f,
+        0x0000, 0x6833, 0x0000, 0x0804, 0x3f4e, 0x68b4, 0xa084, 0x4800,
+        0xa635, 0xd6f4, 0x1da0, 0x7044, 0xa005, 0x1110, 0x7047, 0x0015,
+        0x2408, 0x2510, 0x2700, 0x8007, 0xa084, 0x007f, 0xa108, 0xa291,
+        0x0000, 0x692e, 0x6a32, 0x2100, 0xa205, 0x1110, 0x0804, 0x3f4e,
+        0x7000, 0xa086, 0x0006, 0x0110, 0x0804, 0x3f4e, 0x0005, 0x6946,
+        0x6008, 0xc0cd, 0xd3cc, 0x0108, 0xc08d, 0x600a, 0x6818, 0x683a,
+        0x681b, 0x0006, 0x688f, 0x0000, 0x6893, 0x0000, 0x6a30, 0x692c,
+        0x6a3e, 0x6942, 0x682f, 0x0003, 0x6833, 0x0000, 0x6837, 0x0020,
+        0x6897, 0x0000, 0x689b, 0x0020, 0x7000, 0x0002, 0x25c9, 0x3196,
+        0x3190, 0x318e, 0x318e, 0x318e, 0x318e, 0x318e, 0x080c, 0x2575,
+        0x6820, 0xd084, 0x1118, 0x080c, 0x37c7, 0x0030, 0x7058, 0x2c50,
+        0x2060, 0x6800, 0x6002, 0x2a60, 0xaea0, 0x0017, 0x2404, 0xa005,
+        0x0110, 0x2020, 0x0cd8, 0x2d22, 0x206b, 0x0000, 0x0005, 0x080c,
+        0x37cd, 0x080c, 0x37e1, 0x6008, 0xc0cc, 0x600a, 0x682b, 0x0000,
+        0x789b, 0x000e, 0x6f14, 0x6938, 0x691a, 0x6944, 0x6916, 0x2009,
+        0x0000, 0xae86, 0x4740, 0x0110, 0x2009, 0x0001, 0x080c, 0x431f,
+        0xd6dc, 0x01c8, 0x691c, 0xc1ed, 0x691e, 0x6828, 0xa082, 0x000e,
+        0x0290, 0x6848, 0xa084, 0x000f, 0xa086, 0x000b, 0x1160, 0x685c,
+        0xa086, 0x0047, 0x1140, 0x2001, 0x4701, 0x2004, 0xd0ac, 0x1118,
+        0x2700, 0x080c, 0x249e, 0x6818, 0xd0fc, 0x0140, 0x681b, 0x0000,
+        0x7868, 0xa08c, 0x00ff, 0x0110, 0x681b, 0x001e, 0xaea0, 0x0017,
+        0x6800, 0x2022, 0x6a3c, 0x6940, 0x6a32, 0x692e, 0x68c0, 0x2060,
+        0x6000, 0xd0a4, 0x0580, 0x2041, 0x0021, 0x2049, 0x0005, 0x2051,
+        0x0020, 0x00d6, 0x00f6, 0x0156, 0x0146, 0x2079, 0x4700, 0x080c,
+        0x1bb2, 0x014e, 0x015e, 0x00fe, 0x70c8, 0x2010, 0x2009, 0x0101,
+        0x0026, 0x2204, 0xa06d, 0x0140, 0x6814, 0xa706, 0x0110, 0x6800,
+        0x0cc8, 0x6820, 0xc0d5, 0x6822, 0x002e, 0x8210, 0x8109, 0x1d80,
+        0x00de, 0x7063, 0x0003, 0x707b, 0x0000, 0x7772, 0x707f, 0x000f,
+        0x71d0, 0xc1c4, 0x71d2, 0x6818, 0xa086, 0x0002, 0x1138, 0x6817,
+        0x0000, 0x682b, 0x0000, 0x681c, 0xc0ec, 0x681e, 0x080c, 0x1dbf,
+        0x0804, 0x25c9, 0x7cd8, 0x7ddc, 0x7fd0, 0x080c, 0x30ff, 0x682b,
+        0x0000, 0x789b, 0x000e, 0x6f14, 0x080c, 0x3c72, 0xa08c, 0x00ff,
+        0x6916, 0x6818, 0xd0fc, 0x0110, 0x7044, 0x681a, 0xa68c, 0xdf00,
+        0x691e, 0x7063, 0x0000, 0x0804, 0x25c9, 0x7000, 0xa005, 0x1110,
+        0x0804, 0x25c9, 0xa006, 0x080c, 0x3f4e, 0x6920, 0xd1ac, 0x1110,
+        0x681b, 0x0014, 0xa68c, 0xdf00, 0x691e, 0x682b, 0x0000, 0x6820,
+        0xa084, 0x00ff, 0x6822, 0x7000, 0x0002, 0x25c9, 0x326f, 0x326f,
+        0x3272, 0x3272, 0x3272, 0x326d, 0x326d, 0x080c, 0x2575, 0x6818,
+        0x0804, 0x2f3b, 0x6008, 0xc0a4, 0x600a, 0x6817, 0x0000, 0x0804,
+        0x3795, 0x2300, 0x0002, 0x327e, 0x3280, 0x32ce, 0x080c, 0x2575,
+        0xd6fc, 0x1904, 0x2d5b, 0x7000, 0xa00d, 0x0002, 0x25c9, 0x3290,
+        0x3290, 0x32ba, 0x3290, 0x32cb, 0x328e, 0x328e, 0x080c, 0x2575,
+        0xa684, 0x0060, 0x0538, 0xa086, 0x0060, 0x1510, 0xc6ac, 0xc6f4,
+        0xc6ed, 0x7e5a, 0x6eb6, 0x681c, 0xc0ac, 0x681e, 0xa186, 0x0002,
+        0x0148, 0x080c, 0x3f4e, 0x69ac, 0x68b0, 0xa115, 0x0118, 0x080c,
+        0x4235, 0x0010, 0x080c, 0x4208, 0x781b, 0x0083, 0x71d0, 0xd1b4,
+        0x1904, 0x25c6, 0x70a0, 0xa086, 0x0001, 0x1904, 0x260d, 0x0005,
+        0xd6ec, 0x09f0, 0x6818, 0xd0fc, 0x0170, 0xd6f4, 0x1130, 0x681b,
+        0x0015, 0x781b, 0x0083, 0x0804, 0x25c6, 0x681b, 0x0007, 0x682f,
+        0x0000, 0x6833, 0x0000, 0x080c, 0x3c17, 0x0005, 0x080c, 0x2575,
+        0x2300, 0x0002, 0x32d7, 0x32f9, 0x3351, 0x080c, 0x2575, 0x7000,
+        0x0002, 0x32e1, 0x32e3, 0x32ea, 0x32e1, 0x32e1, 0x32e1, 0x32e1,
+        0x32e1, 0x080c, 0x2575, 0x69ac, 0x68b0, 0xa115, 0x0118, 0x080c,
+        0x4235, 0x0010, 0x080c, 0x4208, 0x681c, 0xc0b4, 0x681e, 0x70d0,
+        0xd0b4, 0x1904, 0x25c6, 0x70a0, 0xa086, 0x0001, 0x1904, 0x260d,
+        0x0005, 0xd6fc, 0x1904, 0x3341, 0x7000, 0xa00d, 0x0002, 0x25c9,
+        0x330f, 0x3309, 0x3339, 0x330f, 0x333e, 0x3307, 0x3307, 0x080c,
+        0x2575, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0xa684,
+        0x0060, 0x0538, 0xa086, 0x0060, 0x1510, 0xa6b4, 0xbfbf, 0xc6ed,
+        0x7e5a, 0x6eb6, 0xa186, 0x0002, 0x0148, 0x080c, 0x3f4e, 0x69ac,
+        0x68b0, 0xa115, 0x0118, 0x080c, 0x4235, 0x0010, 0x080c, 0x4208,
+        0x781b, 0x0083, 0x681c, 0xc0b4, 0x681e, 0x71d0, 0xd1b4, 0x1904,
+        0x25c6, 0x70a0, 0xa086, 0x0001, 0x1904, 0x260d, 0x0005, 0xd6ec,
+        0x09f0, 0x6818, 0xd0fc, 0x0110, 0x681b, 0x0007, 0x781b, 0x00fb,
+        0x0005, 0xc6fc, 0x7e5a, 0x7adc, 0x79d8, 0x6b98, 0x2100, 0xa302,
+        0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x79d2, 0x781b, 0x0083,
+        0x0005, 0xd6dc, 0x0130, 0x782b, 0x3009, 0x781b, 0x0083, 0x0804,
+        0x25c6, 0x7884, 0xc0ac, 0x7886, 0x78e4, 0xa084, 0x0008, 0x1150,
+        0xa484, 0x0200, 0x0108, 0xc6f5, 0xc6dd, 0x7e5a, 0x781b, 0x0083,
+        0x0804, 0x25c6, 0x6820, 0xc095, 0x6822, 0x080c, 0x3c02, 0xc6dd,
+        0x080c, 0x3a61, 0x781b, 0x0082, 0x0804, 0x25c6, 0x2300, 0x0002,
+        0x337b, 0x337d, 0x337f, 0x080c, 0x2575, 0x0804, 0x3a5b, 0x7d98,
+        0xd6d4, 0x15a8, 0x79e4, 0xd1ac, 0x0130, 0x78ec, 0xa084, 0x0003,
+        0x0110, 0x782b, 0x3009, 0x789b, 0x0060, 0x78ab, 0x0000, 0xa684,
+        0xfffb, 0x785a, 0x7d9a, 0x79e4, 0xd1ac, 0x0120, 0x78ec, 0xa084,
+        0x0003, 0x1120, 0x2001, 0x0014, 0x0804, 0x2f3b, 0x7884, 0xd0fc,
         0x1118, 0xa184, 0x0007, 0x0090, 0xa184, 0x0007, 0xa086, 0x0004,
         0x1118, 0x2001, 0x0000, 0x0050, 0xa184, 0x0007, 0xa086, 0x0005,
-        0x0118, 0xa184, 0x0007, 0x0010, 0x2001, 0x0001, 0x0002, 0x2c6f,
-        0x2c2a, 0x2ba4, 0x3be5, 0x3c29, 0x3c29, 0x3be5, 0x3c23, 0x080c,
-        0x3bf1, 0x0005, 0xa282, 0x0005, 0x0310, 0x080c, 0x254c, 0x7898,
-        0x2040, 0x2300, 0x0002, 0x2c7e, 0x2ea8, 0x2eb2, 0x2200, 0x0002,
-        0x2c9a, 0x2c87, 0x2c9a, 0x2c85, 0x2e8a, 0x080c, 0x254c, 0x789b,
-        0x0018, 0x78a8, 0x2010, 0xa084, 0x00ff, 0xa082, 0x0020, 0x0a04,
-        0x3a0b, 0xa08a, 0x0004, 0x1a04, 0x3a0b, 0x0002, 0x3a0b, 0x3a0b,
-        0x3a0b, 0x39c1, 0x789b, 0x0018, 0x79a8, 0xa184, 0x0080, 0x0148,
-        0x0804, 0x3a0b, 0x7000, 0xa005, 0x1dd8, 0x2011, 0x0004, 0x0804,
-        0x3594, 0xa184, 0x00ff, 0xa08a, 0x0010, 0x1a04, 0x3a0b, 0x0002,
-        0x2cc2, 0x2cc0, 0x2cd4, 0x2cd8, 0x2d86, 0x3a0b, 0x3a0b, 0x2d88,
-        0x3a0b, 0x3a0b, 0x2e86, 0x2e86, 0x3a0b, 0x3a0b, 0x3a0b, 0x2e88,
-        0x080c, 0x254c, 0xd6e4, 0x0140, 0x2001, 0x0300, 0x8000, 0x8000,
-        0x783a, 0x781b, 0x00c7, 0x0005, 0x6818, 0xd0fc, 0x0118, 0x681b,
-        0x001d, 0x0c90, 0x0804, 0x3be5, 0x681b, 0x001d, 0x0804, 0x3a36,
-        0x6920, 0x6922, 0xa684, 0x1800, 0x1904, 0x2d29, 0x6820, 0xd084,
-        0x1904, 0x2d31, 0x6818, 0xa086, 0x0008, 0x1110, 0x681b, 0x0000,
-        0xd6d4, 0x0568, 0xd6bc, 0x0558, 0x7083, 0x0000, 0x6818, 0xa084,
-        0x003f, 0xa08a, 0x000d, 0x0718, 0xa08a, 0x000c, 0x7182, 0x2001,
-        0x000c, 0x800c, 0x7186, 0x789b, 0x0061, 0x78aa, 0x0156, 0x0136,
-        0x0146, 0x0016, 0x3208, 0xa18c, 0x0600, 0x0118, 0x20a1, 0x022b,
-        0x0010, 0x20a1, 0x012b, 0x001e, 0x789b, 0x0000, 0x8000, 0x80ac,
-        0xad80, 0x000b, 0x2098, 0x53a6, 0x014e, 0x013e, 0x015e, 0x6038,
-        0xa005, 0x1150, 0x681c, 0xa084, 0x000e, 0x0904, 0x3a36, 0x080c,
-        0x3a48, 0x782b, 0x3008, 0x0010, 0x8001, 0x603a, 0x781b, 0x0071,
-        0x0005, 0xd6e4, 0x0130, 0x781b, 0x0083, 0x0005, 0x781b, 0x0083,
-        0x0005, 0xa684, 0x0060, 0x0dd0, 0xd6dc, 0x0dc0, 0xd6fc, 0x01a0,
-        0xc6fc, 0x7e5a, 0x6eb6, 0x7adc, 0x79d8, 0x78d0, 0x8007, 0xa084,
-        0x007f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2,
-        0x6b94, 0x2200, 0xa303, 0x68ae, 0xd6f4, 0x0118, 0xc6f4, 0x7e5a,
-        0x6eb6, 0x7000, 0xa086, 0x0003, 0x1148, 0x0006, 0x080c, 0x3f26,
-        0x080c, 0x41d9, 0x000e, 0x781b, 0x0080, 0x0005, 0xa006, 0x080c,
-        0x42b5, 0x6ab0, 0x69ac, 0x6c98, 0x6b94, 0x2200, 0xa105, 0x0120,
-        0x2200, 0xa422, 0x2100, 0xa31b, 0x6caa, 0x7cd2, 0x7cda, 0x6ba6,
-        0x7bd6, 0x7bde, 0x2300, 0xa405, 0x1130, 0xc6f5, 0x7e5a, 0x6eb6,
-        0x781b, 0x0080, 0x0005, 0x781b, 0x0080, 0x2200, 0xa115, 0x1118,
-        0x080c, 0x41d9, 0x0005, 0x080c, 0x4206, 0x0005, 0x080c, 0x254c,
-        0x0804, 0x2e1c, 0x00c6, 0x7054, 0x2060, 0x6920, 0xa18c, 0xecff,
-        0x6922, 0x6000, 0xa084, 0xcfdf, 0x6002, 0x080c, 0x38f4, 0xa006,
-        0x2040, 0x2038, 0x080c, 0x399c, 0x0804, 0x2e10, 0x00c6, 0x7054,
-        0x2060, 0x2c48, 0x7aa8, 0xa294, 0x00ff, 0xa286, 0x0004, 0x11d8,
-        0x6920, 0xd1e4, 0x1170, 0x2039, 0x0000, 0x2041, 0x0000, 0x2031,
-        0x0000, 0xa006, 0x2010, 0x080c, 0x38f7, 0x080c, 0x399c, 0x0804,
-        0x2e10, 0xa18c, 0xecff, 0x6922, 0x6104, 0xa18c, 0xffdd, 0x6106,
-        0x6000, 0xc0ac, 0x6002, 0xa286, 0x0003, 0x01d0, 0x6104, 0xa184,
-        0x0010, 0x0548, 0x080c, 0x3b6b, 0x080c, 0x3977, 0x88ff, 0x0518,
-        0x00ce, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a,
-        0xd6d4, 0x1118, 0x781b, 0x006e, 0x0005, 0x781b, 0x0082, 0x0005,
-        0x6920, 0xd1cc, 0x0130, 0xa18c, 0xfdff, 0x6922, 0x6000, 0xc0ec,
-        0x6002, 0x2039, 0x0000, 0x2041, 0x0000, 0x2031, 0x0000, 0xa006,
-        0x2010, 0x080c, 0x399c, 0xa286, 0x0001, 0x0158, 0x6104, 0xa184,
-        0x0008, 0x01b0, 0x080c, 0x3b6b, 0x080c, 0x3895, 0x88ff, 0x1980,
-        0x0078, 0x6920, 0xd1c4, 0x0130, 0xa18c, 0xfeff, 0x6922, 0x6000,
-        0xc0e4, 0x6002, 0x2031, 0x0000, 0xa006, 0x2010, 0x080c, 0x38f7,
-        0x00ce, 0x7e58, 0xd6d4, 0x1118, 0x781b, 0x0071, 0x0005, 0x781b,
-        0x0083, 0x0005, 0x0804, 0x3a32, 0x2808, 0x789b, 0x0080, 0x2019,
-        0x0080, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001, 0x11b8, 0x2300,
-        0xa102, 0xa086, 0x0001, 0x0904, 0x2d8a, 0x7ca8, 0xa4a4, 0x00ff,
-        0xa480, 0x0002, 0xa300, 0x2018, 0xa102, 0x0a04, 0x2d9e, 0x0904,
-        0x2d9e, 0x24a8, 0x7aa8, 0x1f04, 0x2e3a, 0x0c18, 0xa284, 0x00f0,
-        0xa082, 0x0020, 0x06b8, 0x2200, 0xa082, 0x0021, 0x1698, 0x7aa8,
-        0x8318, 0x8318, 0x2100, 0xa302, 0x0aa0, 0xa286, 0x0023, 0x0950,
-        0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58, 0xa684, 0xfff1, 0xc0a5,
-        0x2030, 0x7e5a, 0x6008, 0xc0a5, 0x600a, 0x78a0, 0x8001, 0x0904,
-        0x2e10, 0x20a8, 0x7998, 0x789b, 0x0060, 0x78aa, 0x2011, 0x0080,
-        0x799a, 0x78a8, 0x7998, 0x7a9a, 0x78aa, 0x7a98, 0x1f04, 0x2e68,
-        0xc695, 0x7e5a, 0xd6d4, 0x1118, 0x781b, 0x006e, 0x0005, 0x781b,
-        0x0082, 0x0005, 0x8318, 0x2100, 0xa302, 0x0a04, 0x2e21, 0xa284,
-        0x0080, 0x1904, 0x3a36, 0x78a0, 0xa005, 0x08c8, 0x0804, 0x3a36,
-        0x0804, 0x3a0b, 0x7054, 0xa04d, 0x789b, 0x0018, 0x78a8, 0xa084,
-        0x00ff, 0xa08e, 0x0001, 0x0110, 0x080c, 0x254c, 0x7aa8, 0xa294,
-        0x00ff, 0x784b, 0x0008, 0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0005,
-        0x1a04, 0x3a0b, 0x0002, 0x3a0b, 0x380c, 0x3a0b, 0x3927, 0x3d31,
-        0xa282, 0x0000, 0x1110, 0x080c, 0x254c, 0x080c, 0x3a3c, 0x781b,
-        0x0082, 0x0005, 0xa282, 0x0003, 0x1110, 0x080c, 0x254c, 0xd4fc,
-        0x11d0, 0x7060, 0xa005, 0x0110, 0x080c, 0x254c, 0x6f14, 0x7772,
-        0xa7bc, 0x8f00, 0x080c, 0x3b6f, 0x6008, 0xa085, 0x0021, 0x600a,
-        0x8738, 0xa784, 0x001f, 0x1db0, 0x080c, 0x3a3f, 0x7063, 0x0002,
-        0x701f, 0x0009, 0x0010, 0x080c, 0x3a4b, 0x781b, 0x0082, 0x0005,
-        0xa282, 0x0004, 0x0310, 0x080c, 0x254c, 0x2300, 0x0002, 0x2ee2,
-        0x3078, 0x30b4, 0xa286, 0x0003, 0x0598, 0x7200, 0x7cd8, 0x7ddc,
-        0x7fd0, 0x71d0, 0xd1b4, 0x0528, 0xd1bc, 0x1518, 0x2001, 0x4601,
-        0x2004, 0xd0c4, 0x11f0, 0x7868, 0xa084, 0x00ff, 0x11d0, 0xa282,
-        0x0002, 0x12b8, 0x00d6, 0x783b, 0x8300, 0x781b, 0x0059, 0x70b8,
-        0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2,
-        0x78da, 0xc1b4, 0x71d2, 0x7003, 0x0030, 0x00de, 0x2001, 0x0000,
-        0x0058, 0x783b, 0x1300, 0x781b, 0x0057, 0x2001, 0x0000, 0x0020,
-        0x7200, 0x7cd8, 0x7ddc, 0x7fd0, 0x7046, 0x68a0, 0xd0ec, 0x0118,
-        0x6008, 0xc08d, 0x600a, 0xa284, 0x000f, 0x0002, 0x3059, 0x2f33,
-        0x2f30, 0x3184, 0x320f, 0x25a0, 0x2f2e, 0x2f2e, 0x080c, 0x254c,
-        0x6008, 0xc0d4, 0x600a, 0xd6e4, 0x0120, 0x7044, 0xa086, 0x0014,
-        0x11e8, 0x080c, 0x3f26, 0x2009, 0x0000, 0x6818, 0xd0fc, 0x0108,
-        0x7044, 0xa086, 0x0014, 0x0168, 0x6818, 0xa086, 0x0008, 0x1904,
-        0x301b, 0x7858, 0xd09c, 0x0904, 0x301b, 0x6820, 0xd0ac, 0x0904,
-        0x301b, 0x681b, 0x0014, 0x2009, 0x0002, 0x04a8, 0x7868, 0xa08c,
-        0x00ff, 0x0588, 0xa186, 0x0008, 0x1158, 0x6008, 0xc0a4, 0x600a,
-        0x080c, 0x374f, 0x0540, 0x080c, 0x37be, 0x080c, 0x3f26, 0x0060,
-        0xa186, 0x0028, 0x1500, 0x6018, 0xa005, 0x0d78, 0x8001, 0x0d68,
-        0x8001, 0x0d58, 0x601e, 0x0c48, 0x6820, 0xd084, 0x0904, 0x25a0,
-        0xc084, 0x6822, 0x080c, 0x2693, 0x7058, 0x00c6, 0x2060, 0x6800,
-        0x6002, 0x00ce, 0x6004, 0x6802, 0xa005, 0x2d00, 0x1108, 0x6002,
-        0x6006, 0x0804, 0x25a0, 0x0016, 0x81ff, 0x15f0, 0x7000, 0xa086,
-        0x0030, 0x05d0, 0x71d0, 0xd1bc, 0x15b8, 0xd1b4, 0x11e8, 0x705c,
-        0xa005, 0x1590, 0x70a0, 0xa086, 0x0001, 0x0570, 0x7003, 0x0000,
-        0x0046, 0x0056, 0x0076, 0x0066, 0x00c6, 0x00d6, 0x080c, 0x25c5,
-        0x00de, 0x00ce, 0x006e, 0x007e, 0x005e, 0x004e, 0x71d0, 0xd1b4,
-        0x11d8, 0x7003, 0x0040, 0x00c0, 0x080c, 0x3c33, 0x11a8, 0x781b,
-        0x0068, 0x00d6, 0x70b8, 0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6,
-        0x78de, 0x6898, 0x78d2, 0x78da, 0xc1b4, 0x71d2, 0x7003, 0x0030,
-        0x7808, 0xc08d, 0x780a, 0x00de, 0x080c, 0x30dc, 0x001e, 0x81ff,
-        0x0904, 0x301b, 0xa684, 0xdf00, 0x681e, 0x682b, 0x0000, 0x6f14,
-        0xa186, 0x0002, 0x1904, 0x301c, 0x6818, 0xa086, 0x0014, 0x1130,
-        0x2008, 0xd6e4, 0x0118, 0x7868, 0xa08c, 0x00ff, 0x080c, 0x3a55,
-        0x080c, 0x269e, 0x6820, 0xd0dc, 0x1578, 0x8717, 0xa294, 0x000f,
-        0x8213, 0x8213, 0x8213, 0xb284, 0x0600, 0x0118, 0xa290, 0x4ac0,
-        0x0010, 0xa290, 0x4b40, 0xa290, 0x0000, 0x221c, 0xd3c4, 0x0170,
-        0x6820, 0xd0e4, 0x0128, 0xa084, 0xefff, 0x6822, 0xc3ac, 0x2312,
-        0x8210, 0x2204, 0xa085, 0x0038, 0x2012, 0x8211, 0xd3d4, 0x0138,
-        0x68a0, 0xd0c4, 0x1120, 0x080c, 0x3144, 0x0804, 0x25a0, 0x6008,
-        0xc08d, 0x600a, 0x0008, 0x692a, 0x6916, 0x6818, 0xd0fc, 0x0110,
-        0x7044, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x6410, 0x84ff, 0x0168,
-        0x2009, 0x4602, 0x2104, 0x8001, 0x200a, 0x8421, 0x6412, 0x1128,
-        0x2021, 0x4604, 0x2404, 0xc0a5, 0x2022, 0x6018, 0xa005, 0x0118,
-        0x8001, 0x601a, 0x1118, 0x6008, 0xc0a4, 0x600a, 0x6820, 0xd084,
-        0x1130, 0x6800, 0xa005, 0x1108, 0x6002, 0x6006, 0x0020, 0x7058,
-        0x2060, 0x6800, 0x6002, 0x2061, 0x4600, 0x6887, 0x0103, 0x2d08,
-        0x206b, 0x0000, 0x6068, 0xa005, 0x616a, 0x0110, 0x2d02, 0x0008,
-        0x616e, 0x7200, 0xa286, 0x0030, 0x0158, 0xa286, 0x0040, 0x1904,
-        0x25a0, 0x7003, 0x0002, 0x7048, 0x2068, 0x68c4, 0x2060, 0x0005,
-        0x7003, 0x0002, 0x70b8, 0xa06d, 0x68bc, 0x703e, 0x70b4, 0xa065,
-        0x68c0, 0x7056, 0x2d00, 0x704a, 0xad80, 0x0009, 0x7042, 0x0005,
-        0xa282, 0x0004, 0x0210, 0x080c, 0x254c, 0x2200, 0x0002, 0x3083,
-        0x3092, 0x309e, 0x3092, 0xa586, 0x1300, 0x0160, 0xa586, 0x8300,
-        0x1d90, 0x7003, 0x0000, 0x6018, 0x8001, 0x601a, 0x6008, 0xa084,
-        0xfbef, 0x600a, 0x7000, 0xa086, 0x0005, 0x0128, 0x080c, 0x3a3c,
-        0x781b, 0x0082, 0x0005, 0x781b, 0x0083, 0x0005, 0x7890, 0x8007,
-        0x8001, 0xa084, 0x0007, 0xa080, 0x0018, 0x789a, 0x79a8, 0xa18c,
-        0x00ff, 0xa186, 0x0003, 0x0128, 0xa186, 0x0000, 0x0110, 0x0804,
-        0x3a0b, 0x781b, 0x0083, 0x0005, 0x6820, 0xc095, 0x6822, 0x82ff,
-        0x1118, 0x080c, 0x3a3c, 0x0030, 0x8211, 0x0110, 0x080c, 0x254c,
-        0x080c, 0x3a4b, 0x781b, 0x0082, 0x0005, 0x080c, 0x3c46, 0x7830,
-        0xa084, 0x00c0, 0x1170, 0x0016, 0x3208, 0xa18c, 0x0800, 0x001e,
-        0x0118, 0x0104, 0x30d9, 0x0010, 0x0304, 0x30d9, 0x791a, 0xa006,
-        0x0005, 0xa085, 0x0001, 0x0005, 0xa684, 0x0060, 0x1130, 0x682f,
-        0x0000, 0x6833, 0x0000, 0x0804, 0x3143, 0xd6dc, 0x1198, 0x68b4,
-        0xd0dc, 0x1180, 0x6998, 0x6a94, 0x692e, 0x6a32, 0x7044, 0xa005,
-        0x1130, 0x2200, 0xa105, 0x0904, 0x3f26, 0x7047, 0x0015, 0x0804,
-        0x3f26, 0x0005, 0xd6ac, 0x01f0, 0xd6f4, 0x0130, 0x682f, 0x0000,
-        0x6833, 0x0000, 0x0804, 0x3f26, 0x68b4, 0xa084, 0x4000, 0xa635,
-        0xd6f4, 0x1da0, 0x7044, 0xa005, 0x1110, 0x7047, 0x0015, 0xd6dc,
-        0x1128, 0x68b4, 0xd0dc, 0x0110, 0x6ca8, 0x6da4, 0x6c2e, 0x6d32,
-        0x0804, 0x3f26, 0xd6f4, 0x0130, 0x682f, 0x0000, 0x6833, 0x0000,
-        0x0804, 0x3f26, 0x68b4, 0xa084, 0x4800, 0xa635, 0xd6f4, 0x1da0,
-        0x7044, 0xa005, 0x1110, 0x7047, 0x0015, 0x2408, 0x2510, 0x2700,
-        0x8007, 0xa084, 0x007f, 0xa108, 0xa291, 0x0000, 0x692e, 0x6a32,
-        0x2100, 0xa205, 0x1110, 0x0804, 0x3f26, 0x7000, 0xa086, 0x0006,
-        0x0110, 0x0804, 0x3f26, 0x0005, 0x6946, 0x6008, 0xc0cd, 0xd3cc,
-        0x0108, 0xc08d, 0x600a, 0x6818, 0x683a, 0x681b, 0x0006, 0x688f,
-        0x0000, 0x6893, 0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942, 0x682f,
-        0x0003, 0x6833, 0x0000, 0x6837, 0x0020, 0x6897, 0x0000, 0x689b,
-        0x0020, 0x7000, 0x0002, 0x25a0, 0x3173, 0x316d, 0x316b, 0x316b,
-        0x316b, 0x316b, 0x316b, 0x080c, 0x254c, 0x6820, 0xd084, 0x1118,
-        0x080c, 0x37a4, 0x0030, 0x7058, 0x2c50, 0x2060, 0x6800, 0x6002,
-        0x2a60, 0xaea0, 0x0017, 0x2404, 0xa005, 0x0110, 0x2020, 0x0cd8,
-        0x2d22, 0x206b, 0x0000, 0x0005, 0x080c, 0x37aa, 0x080c, 0x37be,
-        0x6008, 0xc0cc, 0x600a, 0x682b, 0x0000, 0x789b, 0x000e, 0x6f14,
-        0x6938, 0x691a, 0x6944, 0x6916, 0x2009, 0x0000, 0xae86, 0x4640,
-        0x0110, 0x2009, 0x0001, 0x080c, 0x42ec, 0xd6dc, 0x01c8, 0x691c,
-        0xc1ed, 0x691e, 0x6828, 0xa082, 0x000e, 0x0290, 0x6848, 0xa084,
-        0x000f, 0xa086, 0x000b, 0x1160, 0x685c, 0xa086, 0x0047, 0x1140,
-        0x2001, 0x4601, 0x2004, 0xd0ac, 0x1118, 0x2700, 0x080c, 0x2475,
-        0x6818, 0xd0fc, 0x0140, 0x681b, 0x0000, 0x7868, 0xa08c, 0x00ff,
-        0x0110, 0x681b, 0x001e, 0xaea0, 0x0017, 0x6800, 0x2022, 0x6a3c,
-        0x6940, 0x6a32, 0x692e, 0x68c0, 0x2060, 0x6000, 0xd0a4, 0x0580,
-        0x2041, 0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x00d6, 0x00f6,
-        0x0156, 0x0146, 0x2079, 0x4600, 0x080c, 0x1b93, 0x014e, 0x015e,
-        0x00fe, 0x70c8, 0x2010, 0x2009, 0x0101, 0x0026, 0x2204, 0xa06d,
-        0x0140, 0x6814, 0xa706, 0x0110, 0x6800, 0x0cc8, 0x6820, 0xc0d5,
-        0x6822, 0x002e, 0x8210, 0x8109, 0x1d80, 0x00de, 0x7063, 0x0003,
-        0x707b, 0x0000, 0x7772, 0x707f, 0x000f, 0x71d0, 0xc1c4, 0x71d2,
-        0x6818, 0xa086, 0x0002, 0x1138, 0x6817, 0x0000, 0x682b, 0x0000,
-        0x681c, 0xc0ec, 0x681e, 0x080c, 0x1da2, 0x0804, 0x25a0, 0x7cd8,
-        0x7ddc, 0x7fd0, 0x080c, 0x30dc, 0x682b, 0x0000, 0x789b, 0x000e,
-        0x6f14, 0x080c, 0x3c4a, 0xa08c, 0x00ff, 0x6916, 0x6818, 0xd0fc,
-        0x0110, 0x7044, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x7063, 0x0000,
-        0x0804, 0x25a0, 0x7000, 0xa005, 0x1110, 0x0804, 0x25a0, 0xa006,
-        0x080c, 0x3f26, 0x6920, 0xd1ac, 0x1110, 0x681b, 0x0014, 0xa68c,
-        0xdf00, 0x691e, 0x682b, 0x0000, 0x6820, 0xa084, 0x00ff, 0x6822,
-        0x7000, 0x0002, 0x25a0, 0x324c, 0x324c, 0x324f, 0x324f, 0x324f,
-        0x324a, 0x324a, 0x080c, 0x254c, 0x6818, 0x0804, 0x2f18, 0x6008,
-        0xc0a4, 0x600a, 0x6817, 0x0000, 0x0804, 0x3772, 0x2300, 0x0002,
-        0x325b, 0x325d, 0x32ab, 0x080c, 0x254c, 0xd6fc, 0x1904, 0x2d38,
-        0x7000, 0xa00d, 0x0002, 0x25a0, 0x326d, 0x326d, 0x3297, 0x326d,
-        0x32a8, 0x326b, 0x326b, 0x080c, 0x254c, 0xa684, 0x0060, 0x0538,
-        0xa086, 0x0060, 0x1510, 0xc6ac, 0xc6f4, 0xc6ed, 0x7e5a, 0x6eb6,
-        0x681c, 0xc0ac, 0x681e, 0xa186, 0x0002, 0x0148, 0x080c, 0x3f26,
-        0x69ac, 0x68b0, 0xa115, 0x0118, 0x080c, 0x4206, 0x0010, 0x080c,
-        0x41d9, 0x781b, 0x0083, 0x71d0, 0xd1b4, 0x1904, 0x259d, 0x70a0,
-        0xa086, 0x0001, 0x1904, 0x25e1, 0x0005, 0xd6ec, 0x09f0, 0x6818,
-        0xd0fc, 0x0170, 0xd6f4, 0x1130, 0x681b, 0x0015, 0x781b, 0x0083,
-        0x0804, 0x259d, 0x681b, 0x0007, 0x682f, 0x0000, 0x6833, 0x0000,
-        0x080c, 0x3bf1, 0x0005, 0x080c, 0x254c, 0x2300, 0x0002, 0x32b4,
-        0x32d6, 0x332e, 0x080c, 0x254c, 0x7000, 0x0002, 0x32be, 0x32c0,
-        0x32c7, 0x32be, 0x32be, 0x32be, 0x32be, 0x32be, 0x080c, 0x254c,
-        0x69ac, 0x68b0, 0xa115, 0x0118, 0x080c, 0x4206, 0x0010, 0x080c,
-        0x41d9, 0x681c, 0xc0b4, 0x681e, 0x70d0, 0xd0b4, 0x1904, 0x259d,
-        0x70a0, 0xa086, 0x0001, 0x1904, 0x25e1, 0x0005, 0xd6fc, 0x1904,
-        0x331e, 0x7000, 0xa00d, 0x0002, 0x25a0, 0x32ec, 0x32e6, 0x3316,
-        0x32ec, 0x331b, 0x32e4, 0x32e4, 0x080c, 0x254c, 0x6894, 0x78d6,
-        0x78de, 0x6898, 0x78d2, 0x78da, 0xa684, 0x0060, 0x0538, 0xa086,
-        0x0060, 0x1510, 0xa6b4, 0xbfbf, 0xc6ed, 0x7e5a, 0x6eb6, 0xa186,
-        0x0002, 0x0148, 0x080c, 0x3f26, 0x69ac, 0x68b0, 0xa115, 0x0118,
-        0x080c, 0x4206, 0x0010, 0x080c, 0x41d9, 0x781b, 0x0083, 0x681c,
-        0xc0b4, 0x681e, 0x71d0, 0xd1b4, 0x1904, 0x259d, 0x70a0, 0xa086,
-        0x0001, 0x1904, 0x25e1, 0x0005, 0xd6ec, 0x09f0, 0x6818, 0xd0fc,
-        0x0110, 0x681b, 0x0007, 0x781b, 0x00fb, 0x0005, 0xc6fc, 0x7e5a,
-        0x7adc, 0x79d8, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200,
-        0xa303, 0x68ae, 0x79d2, 0x781b, 0x0083, 0x0005, 0xd6dc, 0x0130,
-        0x782b, 0x3009, 0x781b, 0x0083, 0x0804, 0x259d, 0x7884, 0xc0ac,
-        0x7886, 0x78e4, 0xa084, 0x0008, 0x1150, 0xa484, 0x0200, 0x0108,
-        0xc6f5, 0xc6dd, 0x7e5a, 0x781b, 0x0083, 0x0804, 0x259d, 0x6820,
-        0xc095, 0x6822, 0x080c, 0x3bdc, 0xc6dd, 0x080c, 0x3a3c, 0x781b,
-        0x0082, 0x0804, 0x259d, 0x2300, 0x0002, 0x3358, 0x335a, 0x335c,
-        0x080c, 0x254c, 0x0804, 0x3a36, 0x7d98, 0xd6d4, 0x15a8, 0x79e4,
-        0xd1ac, 0x0130, 0x78ec, 0xa084, 0x0003, 0x0110, 0x782b, 0x3009,
-        0x789b, 0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x7d9a,
-        0x79e4, 0xd1ac, 0x0120, 0x78ec, 0xa084, 0x0003, 0x1120, 0x2001,
-        0x0014, 0x0804, 0x2f18, 0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007,
+        0x0118, 0xa184, 0x0007, 0x0010, 0x2001, 0x0001, 0x04c2, 0x7a90,
+        0xa294, 0x0007, 0x789b, 0x0060, 0x79a8, 0x81ff, 0x0568, 0x789b,
+        0x0080, 0x7ba8, 0xa384, 0x0001, 0x11d0, 0x7ba8, 0x7ba8, 0xa386,
+        0x0004, 0x1118, 0x2009, 0xffdf, 0x0058, 0xa386, 0x0001, 0x1118,
+        0x2009, 0xfff7, 0x0028, 0xa386, 0x0003, 0x1148, 0x2009, 0xffef,
+        0x00c6, 0x7054, 0x2060, 0x6004, 0xa104, 0x6006, 0x00ce, 0x789b,
+        0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x782b, 0x3009,
+        0x6920, 0xa18c, 0xecff, 0x6922, 0x7d9a, 0x0804, 0x3c0b, 0x2bd1,
+        0x2bda, 0x33f9, 0x33ff, 0x33f7, 0x33f7, 0x3c0b, 0x3c0b, 0x080c,
+        0x2575, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0804, 0x3c11, 0x6920,
+        0xa18c, 0xfcff, 0x6922, 0x0804, 0x3c0b, 0x79e4, 0xa184, 0x0030,
+        0x0120, 0x78ec, 0xa084, 0x0003, 0x1570, 0x7000, 0xa086, 0x0004,
+        0x1190, 0x7060, 0xa086, 0x0002, 0x1130, 0x2011, 0x0002, 0x2019,
+        0x0000, 0x0804, 0x2a85, 0x7060, 0xa086, 0x0006, 0x0db0, 0x7060,
+        0xa086, 0x0004, 0x0d90, 0x7000, 0xa086, 0x0000, 0x0904, 0x25c6,
+        0x6920, 0xa184, 0x0420, 0x0128, 0xc1d4, 0x6922, 0x6818, 0x0804,
+        0x2f3b, 0x6818, 0xa08e, 0x0002, 0x0120, 0xc0fd, 0x681a, 0x2001,
+        0x0014, 0x0804, 0x2f3b, 0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007,
         0x0090, 0xa184, 0x0007, 0xa086, 0x0004, 0x1118, 0x2001, 0x0000,
         0x0050, 0xa184, 0x0007, 0xa086, 0x0005, 0x0118, 0xa184, 0x0007,
-        0x0010, 0x2001, 0x0001, 0x04c2, 0x7a90, 0xa294, 0x0007, 0x789b,
-        0x0060, 0x79a8, 0x81ff, 0x0568, 0x789b, 0x0080, 0x7ba8, 0xa384,
-        0x0001, 0x11d0, 0x7ba8, 0x7ba8, 0xa386, 0x0004, 0x1118, 0x2009,
-        0xffdf, 0x0058, 0xa386, 0x0001, 0x1118, 0x2009, 0xfff7, 0x0028,
-        0xa386, 0x0003, 0x1148, 0x2009, 0xffef, 0x00c6, 0x7054, 0x2060,
-        0x6004, 0xa104, 0x6006, 0x00ce, 0x789b, 0x0060, 0x78ab, 0x0000,
-        0xa684, 0xfffb, 0x785a, 0x782b, 0x3009, 0x6920, 0xa18c, 0xecff,
-        0x6922, 0x7d9a, 0x0804, 0x3be5, 0x2bae, 0x2bb7, 0x33d6, 0x33dc,
-        0x33d4, 0x33d4, 0x3be5, 0x3be5, 0x080c, 0x254c, 0x6920, 0xa18c,
-        0xfcff, 0x6922, 0x0804, 0x3beb, 0x6920, 0xa18c, 0xfcff, 0x6922,
-        0x0804, 0x3be5, 0x79e4, 0xa184, 0x0030, 0x0120, 0x78ec, 0xa084,
-        0x0003, 0x1570, 0x7000, 0xa086, 0x0004, 0x1190, 0x7060, 0xa086,
-        0x0002, 0x1130, 0x2011, 0x0002, 0x2019, 0x0000, 0x0804, 0x2a56,
-        0x7060, 0xa086, 0x0006, 0x0db0, 0x7060, 0xa086, 0x0004, 0x0d90,
-        0x7000, 0xa086, 0x0000, 0x0904, 0x259d, 0x6920, 0xa184, 0x0420,
-        0x0128, 0xc1d4, 0x6922, 0x6818, 0x0804, 0x2f18, 0x6818, 0xa08e,
-        0x0002, 0x0120, 0xc0fd, 0x681a, 0x2001, 0x0014, 0x0804, 0x2f18,
-        0x7884, 0xd0fc, 0x1118, 0xa184, 0x0007, 0x0090, 0xa184, 0x0007,
-        0xa086, 0x0004, 0x1118, 0x2001, 0x0000, 0x0050, 0xa184, 0x0007,
-        0xa086, 0x0005, 0x0118, 0xa184, 0x0007, 0x0010, 0x2001, 0x0001,
-        0x0002, 0x3be5, 0x3be5, 0x3439, 0x3be5, 0x3c29, 0x3c29, 0x3be5,
-        0x3be5, 0xd6bc, 0x0570, 0x7180, 0x81ff, 0x0558, 0xa182, 0x000d,
-        0x1318, 0x7083, 0x0000, 0x0028, 0xa182, 0x000c, 0x7082, 0x2009,
-        0x000c, 0x789b, 0x0061, 0x79aa, 0x0156, 0x0136, 0x0146, 0x7084,
-        0x8114, 0xa210, 0x7286, 0xa080, 0x000b, 0xad00, 0x2098, 0xb284,
-        0x0600, 0x0118, 0x20a1, 0x022b, 0x0010, 0x20a1, 0x012b, 0x789b,
-        0x0000, 0x8108, 0x81ac, 0x53a6, 0x014e, 0x013e, 0x015e, 0x0804,
-        0x3beb, 0xd6d4, 0x1904, 0x34ac, 0x6820, 0xd084, 0x0904, 0x3beb,
-        0xa68c, 0x0060, 0xa684, 0x0060, 0x0120, 0xa086, 0x0060, 0x1108,
-        0xc1f5, 0xc194, 0x795a, 0x69b6, 0x789b, 0x0060, 0x78ab, 0x0000,
-        0x789b, 0x0061, 0x6818, 0xc0fd, 0x681a, 0x78aa, 0x8008, 0x810c,
-        0x0904, 0x37d3, 0xa18c, 0x00f8, 0x1904, 0x37d3, 0x0156, 0x0136,
-        0x0146, 0x0016, 0x20a1, 0x012b, 0x3208, 0xa18c, 0x0600, 0x0110,
-        0x20a1, 0x022b, 0x001e, 0x789b, 0x0000, 0x8000, 0x80ac, 0xad80,
-        0x000b, 0x2098, 0x53a6, 0x014e, 0x013e, 0x015e, 0x6814, 0xc0fc,
-        0x8007, 0x7882, 0x0804, 0x3beb, 0x6818, 0xd0fc, 0x0110, 0x681b,
-        0x0008, 0x080c, 0x3a3c, 0x781b, 0x00ed, 0x0005, 0x2300, 0x0002,
-        0x34bd, 0x357a, 0x34bb, 0x080c, 0x254c, 0x7cd8, 0x7ddc, 0x7fd0,
-        0x82ff, 0x1528, 0x7200, 0xa286, 0x0003, 0x0904, 0x2ee6, 0x71d0,
-        0xd1bc, 0x11f8, 0xd1b4, 0x01e8, 0x2001, 0x4601, 0x2004, 0xd0c4,
-        0x11c0, 0x00d6, 0x783b, 0x8800, 0x781b, 0x0059, 0x70b8, 0xa06d,
-        0x68b4, 0xc0a5, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2,
-        0x78da, 0xc1b4, 0x71d2, 0x7003, 0x0030, 0x00de, 0x0030, 0x7200,
-        0x0020, 0x783b, 0x1800, 0x781b, 0x0057, 0xa284, 0x000f, 0x0002,
-        0x3565, 0x3522, 0x34fa, 0x2f15, 0x34f8, 0x3565, 0x34f8, 0x34f8,
-        0x080c, 0x254c, 0x681c, 0xd0ec, 0x0118, 0x6008, 0xc08d, 0x600a,
-        0x6920, 0xc185, 0x6922, 0x6800, 0x6006, 0xa005, 0x1108, 0x6002,
-        0x6008, 0xc0d4, 0x600a, 0x681c, 0xa084, 0x000e, 0x1120, 0x71c8,
-        0xa188, 0x0100, 0x0028, 0x7030, 0x68ba, 0x713c, 0x70c8, 0xa108,
-        0x2104, 0x6802, 0x2d0a, 0x715a, 0xd6dc, 0x1120, 0xc6fc, 0x6eb6,
-        0x0804, 0x3565, 0x6eb6, 0xa684, 0x0060, 0x1120, 0xa684, 0x7fff,
-        0x68b6, 0x04d8, 0xd6dc, 0x1150, 0xa684, 0x7fff, 0x68b6, 0x6894,
-        0x68a6, 0x6898, 0x68aa, 0x080c, 0x3f26, 0x0478, 0xd6ac, 0x0140,
-        0xa006, 0x080c, 0x3f26, 0x2408, 0x2510, 0x69aa, 0x6aa6, 0x0068,
-        0x2408, 0x2510, 0x2700, 0x8007, 0xa084, 0x007f, 0xa108, 0xa291,
-        0x0000, 0x69aa, 0x6aa6, 0x080c, 0x3f26, 0xd6fc, 0x01b0, 0xa684,
-        0x7fff, 0x68b6, 0x2510, 0x2408, 0xd6ac, 0x1138, 0x2700, 0x8007,
-        0xa084, 0x007f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302,
-        0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x7000, 0xa086, 0x0030,
-        0x1904, 0x25a0, 0x7003, 0x0002, 0x70b8, 0xa06d, 0x68bc, 0x703e,
-        0x70b4, 0xa065, 0x68c0, 0x7056, 0x2d00, 0x704a, 0xad80, 0x0009,
-        0x7042, 0x0005, 0xa586, 0x8800, 0x1148, 0x7003, 0x0000, 0x6018,
-        0x8001, 0x601a, 0x6008, 0xa084, 0xfbef, 0x600a, 0x0804, 0x3a36,
-        0x7043, 0x0000, 0xa282, 0x0006, 0x0310, 0x080c, 0x254c, 0x2300,
-        0x0002, 0x3594, 0x35a5, 0x35af, 0x2200, 0x0002, 0x359c, 0x3a36,
-        0x359e, 0x359c, 0x35e0, 0x362e, 0x080c, 0x254c, 0x7a80, 0xa294,
-        0x0f00, 0x080c, 0x3682, 0x0804, 0x3a0b, 0x00c1, 0x0002, 0x3a36,
-        0x35ad, 0x35ad, 0x35e0, 0x35ad, 0x3a36, 0x080c, 0x254c, 0x0071,
-        0x0002, 0x35b9, 0x35b7, 0x35b7, 0x35b9, 0x35b7, 0x35b9, 0x080c,
-        0x254c, 0x080c, 0x3a4b, 0x781b, 0x0082, 0x0005, 0x7000, 0xa086,
-        0x0002, 0x1150, 0x080c, 0x37be, 0x0010, 0x080c, 0x3f26, 0x6008,
-        0xa084, 0xfbef, 0x600a, 0x0020, 0x7000, 0xa086, 0x0003, 0x0da8,
-        0x7003, 0x0005, 0x2001, 0x8de0, 0xae8e, 0x4640, 0x0110, 0x2001,
-        0x8e12, 0x2068, 0x704a, 0xad80, 0x0009, 0x7042, 0x2200, 0x0005,
-        0x7000, 0xa086, 0x0002, 0x1158, 0x70d0, 0xc0b5, 0x70d2, 0x2c00,
-        0x70b6, 0x2d00, 0x70ba, 0x0038, 0x080c, 0x3f26, 0x0020, 0x7000,
-        0xa086, 0x0003, 0x0dc8, 0x7003, 0x0001, 0x7a80, 0xa294, 0x0f00,
-        0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0x2069, 0x8cc0,
-        0xb284, 0x0600, 0x1118, 0xc2fd, 0x2069, 0x8dd0, 0x2d04, 0x2d08,
-        0x715a, 0xa06d, 0x0128, 0x6814, 0xa206, 0x0120, 0x6800, 0x0cb8,
-        0x080c, 0x3682, 0x6eb4, 0x7e5a, 0x6920, 0xa184, 0x0c00, 0x0904,
-        0x36a8, 0x7060, 0xa086, 0x0006, 0x1128, 0x7070, 0xa206, 0x1110,
-        0x7062, 0x707a, 0x681b, 0x0005, 0xc1ad, 0x681b, 0x0005, 0xc1ad,
-        0xc1d4, 0x6922, 0x080c, 0x3a42, 0x0804, 0x36a8, 0x7200, 0xa286,
-        0x0002, 0x1158, 0x70d0, 0xc0b5, 0x70d2, 0x2c00, 0x70b6, 0x2d00,
-        0x70ba, 0x0030, 0x080c, 0x3f26, 0x0018, 0xa286, 0x0003, 0x0dd0,
-        0x7003, 0x0001, 0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8,
-        0xa484, 0x001f, 0xa215, 0xae86, 0x4640, 0x0108, 0xc2fd, 0x79a8,
-        0x79a8, 0xa18c, 0x00ff, 0x2118, 0x70c8, 0xa168, 0x2d04, 0x2d08,
-        0x715a, 0xa06d, 0x0128, 0x6814, 0xa206, 0x0118, 0x6800, 0x0cb8,
-        0x0409, 0x6eb4, 0x6920, 0xa184, 0x0c00, 0x0904, 0x36a8, 0xd0dc,
-        0x0178, 0x7060, 0xa086, 0x0004, 0x1140, 0x7070, 0xa206, 0x1128,
-        0x7074, 0xa306, 0x1110, 0x7062, 0x707a, 0x080c, 0x3a48, 0x0480,
-        0x681b, 0x0005, 0xc1ad, 0xc1d4, 0x6922, 0x080c, 0x3a42, 0x707b,
-        0x0000, 0x0430, 0x7003, 0x0005, 0xb284, 0x0600, 0x0118, 0x2001,
-        0x8de0, 0x0010, 0x2001, 0x8e12, 0x2068, 0x704a, 0x0156, 0x20a9,
-        0x0032, 0x2003, 0x0000, 0x8000, 0x1f04, 0x3691, 0x015e, 0xb284,
-        0x0600, 0x0110, 0xc2fc, 0x0008, 0xc2fd, 0x6a16, 0xad80, 0x0009,
-        0x7042, 0x68b7, 0x0700, 0x6823, 0x0800, 0x6827, 0x0003, 0x0005,
-        0xc6ec, 0xa6ac, 0x0060, 0x0904, 0x36ef, 0x6b98, 0x6c94, 0x69ac,
-        0x68b0, 0xa105, 0x11e0, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0xa586,
-        0x0060, 0x05c8, 0xd6f4, 0x1108, 0xc6ed, 0xa6b4, 0xb7ff, 0x7e5a,
-        0x2009, 0x0083, 0xd69c, 0x0128, 0x2009, 0x0082, 0x2019, 0x0000,
-        0x2320, 0x791a, 0xd6ec, 0x0588, 0x080c, 0x41d9, 0x0470, 0x68b0,
-        0xa31a, 0x2100, 0xa423, 0x2400, 0xa305, 0x01f8, 0x7bd2, 0x7bda,
-        0x7cd6, 0x7cde, 0x68b0, 0xd6f4, 0x1108, 0xc6ed, 0xc6f4, 0x7e5a,
-        0x2011, 0x0083, 0xd69c, 0x0128, 0x2011, 0x0082, 0x2019, 0x0000,
-        0x2320, 0x7a1a, 0xd6ec, 0x0188, 0x080c, 0x4206, 0x0070, 0x2019,
-        0x0000, 0x2320, 0x0010, 0xa6b4, 0xb7ff, 0x7e5a, 0x2009, 0x0083,
-        0xd69c, 0x0110, 0x2009, 0x0082, 0x791a, 0x68c0, 0x7056, 0x2d00,
-        0x704a, 0x68c4, 0x2060, 0x71d0, 0x2001, 0x4601, 0x2004, 0xd0c4,
-        0x15c8, 0x70d4, 0xa02d, 0x01b8, 0xd1bc, 0x0548, 0x7a80, 0xa294,
-        0x0f00, 0x70d8, 0xa206, 0x0118, 0x78e0, 0xa504, 0x1558, 0x70d6,
-        0xc1bc, 0x71d2, 0x0438, 0x2031, 0x0001, 0x852c, 0x0218, 0x8633,
-        0x8210, 0x0cd8, 0x0005, 0x7de0, 0xa594, 0xff00, 0x0130, 0x2011,
-        0x0008, 0x852f, 0x0c81, 0x8637, 0x0008, 0x0c69, 0x8217, 0x7880,
-        0xa084, 0x0f00, 0xa206, 0x0170, 0x72da, 0x76d6, 0x0058, 0x7a80,
-        0xa294, 0x0f00, 0x70d8, 0xa236, 0x0dc0, 0x78e0, 0xa534, 0x0da8,
-        0xc1bd, 0x71d2, 0xd1b4, 0x1904, 0x259d, 0x2300, 0xa405, 0x0904,
-        0x259d, 0x70a0, 0xa086, 0x0001, 0x1904, 0x25e1, 0x0005, 0x6020,
-        0xa005, 0x0150, 0x8001, 0x6022, 0x6008, 0xa085, 0x0008, 0x600a,
-        0x700f, 0x0100, 0x702c, 0x6026, 0x0005, 0xa006, 0x080c, 0x3f26,
-        0x7000, 0xa086, 0x0002, 0x0120, 0x7060, 0xa086, 0x0005, 0x1150,
-        0x682b, 0x0000, 0x6817, 0x0000, 0x681b, 0x0001, 0x6823, 0x0040,
-        0x681f, 0x0100, 0x7000, 0xa084, 0x000f, 0x0002, 0x25a0, 0x3783,
-        0x3780, 0x37a0, 0x378c, 0x25a0, 0x377e, 0x377e, 0x080c, 0x254c,
-        0x0449, 0x0411, 0x0028, 0x0431, 0x7058, 0x2060, 0x6800, 0x6002,
-        0x080c, 0x1da2, 0x0804, 0x25a0, 0x7060, 0x7063, 0x0000, 0x707f,
-        0x0000, 0x0002, 0x379c, 0x379c, 0x379a, 0x379a, 0x379a, 0x379c,
-        0x379a, 0x379c, 0x0804, 0x2a6b, 0x7063, 0x0000, 0x0804, 0x25a0,
-        0x681b, 0x0000, 0x0804, 0x3184, 0x6800, 0xa005, 0x1108, 0x6002,
-        0x6006, 0x0005, 0x6410, 0x84ff, 0x0168, 0x2009, 0x4602, 0x2104,
-        0x8001, 0x200a, 0x8421, 0x6412, 0x1128, 0x2021, 0x4604, 0x2404,
-        0xc0a5, 0x2022, 0x6008, 0xc0a4, 0x600a, 0x0005, 0x6018, 0xa005,
-        0x0110, 0x8001, 0x601a, 0x0005, 0x080c, 0x3c46, 0x681b, 0x0018,
-        0x0490, 0x080c, 0x3c46, 0x681b, 0x0019, 0x0468, 0x080c, 0x3c46,
-        0x681b, 0x001a, 0x0440, 0x080c, 0x3c46, 0x681b, 0x0003, 0x0418,
-        0x7770, 0x080c, 0x3b6f, 0x7174, 0xa18c, 0x00ff, 0x3210, 0xa294,
-        0x0600, 0x0118, 0xa1e8, 0x8bc0, 0x0010, 0xa1e8, 0x8cd0, 0x2d04,
-        0x2d08, 0x2068, 0xa005, 0x1118, 0x707a, 0x0804, 0x25a0, 0x6814,
-        0x7270, 0xa206, 0x0110, 0x6800, 0x0c98, 0x6800, 0x200a, 0x681b,
-        0x0005, 0x707b, 0x0000, 0x080c, 0x37aa, 0x6820, 0xd084, 0x1110,
-        0x080c, 0x37a4, 0x080c, 0x37be, 0x681f, 0x0000, 0x6823, 0x0020,
-        0x080c, 0x1da2, 0x0804, 0x25a0, 0xa282, 0x0003, 0x1904, 0x3a10,
-        0x7da8, 0xa5ac, 0x00ff, 0x7ea8, 0xa6b4, 0x00ff, 0x6920, 0xc1bd,
-        0x6922, 0xd1c4, 0x05b0, 0xc1c4, 0x6922, 0xa6b4, 0x00ff, 0x0530,
-        0xa682, 0x0018, 0x0218, 0x0110, 0x2031, 0x0018, 0xa686, 0x0010,
-        0x1108, 0x8630, 0x852b, 0x852b, 0x2041, 0x0000, 0x080c, 0x3ac9,
-        0x0118, 0x080c, 0x38f7, 0x00a0, 0x080c, 0x3a95, 0x080c, 0x38f4,
-        0x6920, 0xc1c5, 0x6922, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x1118,
-        0x781b, 0x006e, 0x0005, 0x781b, 0x0082, 0x0005, 0x080c, 0x38f4,
+        0x0010, 0x2001, 0x0001, 0x0002, 0x3c0b, 0x3c0b, 0x345c, 0x3c0b,
+        0x3c4f, 0x3c4f, 0x3c0b, 0x3c0b, 0xd6bc, 0x0570, 0x7180, 0x81ff,
+        0x0558, 0xa182, 0x000d, 0x1318, 0x7083, 0x0000, 0x0028, 0xa182,
+        0x000c, 0x7082, 0x2009, 0x000c, 0x789b, 0x0061, 0x79aa, 0x0156,
+        0x0136, 0x0146, 0x7084, 0x8114, 0xa210, 0x7286, 0xa080, 0x000b,
+        0xad00, 0x2098, 0xb284, 0x0600, 0x0118, 0x20a1, 0x022b, 0x0010,
+        0x20a1, 0x012b, 0x789b, 0x0000, 0x8108, 0x81ac, 0x53a6, 0x014e,
+        0x013e, 0x015e, 0x0804, 0x3c11, 0xd6d4, 0x1904, 0x34cf, 0x6820,
+        0xd084, 0x0904, 0x3c11, 0xa68c, 0x0060, 0xa684, 0x0060, 0x0120,
+        0xa086, 0x0060, 0x1108, 0xc1f5, 0xc194, 0x795a, 0x69b6, 0x789b,
+        0x0060, 0x78ab, 0x0000, 0x789b, 0x0061, 0x6818, 0xc0fd, 0x681a,
+        0x78aa, 0x8008, 0x810c, 0x0904, 0x37f6, 0xa18c, 0x00f8, 0x1904,
+        0x37f6, 0x0156, 0x0136, 0x0146, 0x0016, 0x20a1, 0x012b, 0x3208,
+        0xa18c, 0x0600, 0x0110, 0x20a1, 0x022b, 0x001e, 0x789b, 0x0000,
+        0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x014e, 0x013e,
+        0x015e, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x0804, 0x3c11, 0x6818,
+        0xd0fc, 0x0110, 0x681b, 0x0008, 0x080c, 0x3a61, 0x781b, 0x00ed,
+        0x0005, 0x2300, 0x0002, 0x34e0, 0x359d, 0x34de, 0x080c, 0x2575,
+        0x7cd8, 0x7ddc, 0x7fd0, 0x82ff, 0x1528, 0x7200, 0xa286, 0x0003,
+        0x0904, 0x2f09, 0x71d0, 0xd1bc, 0x11f8, 0xd1b4, 0x01e8, 0x2001,
+        0x4701, 0x2004, 0xd0c4, 0x11c0, 0x00d6, 0x783b, 0x8800, 0x781b,
+        0x0059, 0x70b8, 0xa06d, 0x68b4, 0xc0a5, 0x785a, 0x6894, 0x78d6,
+        0x78de, 0x6898, 0x78d2, 0x78da, 0xc1b4, 0x71d2, 0x7003, 0x0030,
+        0x00de, 0x0030, 0x7200, 0x0020, 0x783b, 0x1800, 0x781b, 0x0057,
+        0xa284, 0x000f, 0x0002, 0x3588, 0x3545, 0x351d, 0x2f38, 0x351b,
+        0x3588, 0x351b, 0x351b, 0x080c, 0x2575, 0x681c, 0xd0ec, 0x0118,
+        0x6008, 0xc08d, 0x600a, 0x6920, 0xc185, 0x6922, 0x6800, 0x6006,
+        0xa005, 0x1108, 0x6002, 0x6008, 0xc0d4, 0x600a, 0x681c, 0xa084,
+        0x000e, 0x1120, 0x71c8, 0xa188, 0x0100, 0x0028, 0x7030, 0x68ba,
+        0x713c, 0x70c8, 0xa108, 0x2104, 0x6802, 0x2d0a, 0x715a, 0xd6dc,
+        0x1120, 0xc6fc, 0x6eb6, 0x0804, 0x3588, 0x6eb6, 0xa684, 0x0060,
+        0x1120, 0xa684, 0x7fff, 0x68b6, 0x04d8, 0xd6dc, 0x1150, 0xa684,
+        0x7fff, 0x68b6, 0x6894, 0x68a6, 0x6898, 0x68aa, 0x080c, 0x3f4e,
+        0x0478, 0xd6ac, 0x0140, 0xa006, 0x080c, 0x3f4e, 0x2408, 0x2510,
+        0x69aa, 0x6aa6, 0x0068, 0x2408, 0x2510, 0x2700, 0x8007, 0xa084,
+        0x007f, 0xa108, 0xa291, 0x0000, 0x69aa, 0x6aa6, 0x080c, 0x3f4e,
+        0xd6fc, 0x01b0, 0xa684, 0x7fff, 0x68b6, 0x2510, 0x2408, 0xd6ac,
+        0x1138, 0x2700, 0x8007, 0xa084, 0x007f, 0xa108, 0xa291, 0x0000,
+        0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae,
+        0x7000, 0xa086, 0x0030, 0x1904, 0x25c9, 0x7003, 0x0002, 0x70b8,
+        0xa06d, 0x68bc, 0x703e, 0x70b4, 0xa065, 0x68c0, 0x7056, 0x2d00,
+        0x704a, 0xad80, 0x0009, 0x7042, 0x0005, 0xa586, 0x8800, 0x1148,
+        0x7003, 0x0000, 0x6018, 0x8001, 0x601a, 0x6008, 0xa084, 0xfbef,
+        0x600a, 0x0804, 0x3a5b, 0x7043, 0x0000, 0xa282, 0x0006, 0x0310,
+        0x080c, 0x2575, 0x2300, 0x0002, 0x35b7, 0x35c8, 0x35d2, 0x2200,
+        0x0002, 0x35bf, 0x3a5b, 0x35c1, 0x35bf, 0x3603, 0x3651, 0x080c,
+        0x2575, 0x7a80, 0xa294, 0x0f00, 0x080c, 0x36a5, 0x0804, 0x3a30,
+        0x00c1, 0x0002, 0x3a5b, 0x35d0, 0x35d0, 0x3603, 0x35d0, 0x3a5b,
+        0x080c, 0x2575, 0x0071, 0x0002, 0x35dc, 0x35da, 0x35da, 0x35dc,
+        0x35da, 0x35dc, 0x080c, 0x2575, 0x080c, 0x3a70, 0x781b, 0x0082,
+        0x0005, 0x7000, 0xa086, 0x0002, 0x1150, 0x080c, 0x37e1, 0x0010,
+        0x080c, 0x3f4e, 0x6008, 0xa084, 0xfbef, 0x600a, 0x0020, 0x7000,
+        0xa086, 0x0003, 0x0da8, 0x7003, 0x0005, 0x2001, 0x8ee0, 0xae8e,
+        0x4740, 0x0110, 0x2001, 0x8f12, 0x2068, 0x704a, 0xad80, 0x0009,
+        0x7042, 0x2200, 0x0005, 0x7000, 0xa086, 0x0002, 0x1158, 0x70d0,
+        0xc0b5, 0x70d2, 0x2c00, 0x70b6, 0x2d00, 0x70ba, 0x0038, 0x080c,
+        0x3f4e, 0x0020, 0x7000, 0xa086, 0x0003, 0x0dc8, 0x7003, 0x0001,
+        0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f,
+        0xa215, 0x2069, 0x8dc0, 0xb284, 0x0600, 0x1118, 0xc2fd, 0x2069,
+        0x8ed0, 0x2d04, 0x2d08, 0x715a, 0xa06d, 0x0128, 0x6814, 0xa206,
+        0x0120, 0x6800, 0x0cb8, 0x080c, 0x36a5, 0x6eb4, 0x7e5a, 0x6920,
+        0xa184, 0x0c00, 0x0904, 0x36cb, 0x7060, 0xa086, 0x0006, 0x1128,
+        0x7070, 0xa206, 0x1110, 0x7062, 0x707a, 0x681b, 0x0005, 0xc1ad,
+        0x681b, 0x0005, 0xc1ad, 0xc1d4, 0x6922, 0x080c, 0x3a67, 0x0804,
+        0x36cb, 0x7200, 0xa286, 0x0002, 0x1158, 0x70d0, 0xc0b5, 0x70d2,
+        0x2c00, 0x70b6, 0x2d00, 0x70ba, 0x0030, 0x080c, 0x3f4e, 0x0018,
+        0xa286, 0x0003, 0x0dd0, 0x7003, 0x0001, 0x7a80, 0xa294, 0x0f00,
+        0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0xae86, 0x4740,
+        0x0108, 0xc2fd, 0x79a8, 0x79a8, 0xa18c, 0x00ff, 0x2118, 0x70c8,
+        0xa168, 0x2d04, 0x2d08, 0x715a, 0xa06d, 0x0128, 0x6814, 0xa206,
+        0x0118, 0x6800, 0x0cb8, 0x0409, 0x6eb4, 0x6920, 0xa184, 0x0c00,
+        0x0904, 0x36cb, 0xd0dc, 0x0178, 0x7060, 0xa086, 0x0004, 0x1140,
+        0x7070, 0xa206, 0x1128, 0x7074, 0xa306, 0x1110, 0x7062, 0x707a,
+        0x080c, 0x3a6d, 0x0480, 0x681b, 0x0005, 0xc1ad, 0xc1d4, 0x6922,
+        0x080c, 0x3a67, 0x707b, 0x0000, 0x0430, 0x7003, 0x0005, 0xb284,
+        0x0600, 0x0118, 0x2001, 0x8ee0, 0x0010, 0x2001, 0x8f12, 0x2068,
+        0x704a, 0x0156, 0x20a9, 0x0032, 0x2003, 0x0000, 0x8000, 0x1f04,
+        0x36b4, 0x015e, 0xb284, 0x0600, 0x0110, 0xc2fc, 0x0008, 0xc2fd,
+        0x6a16, 0xad80, 0x0009, 0x7042, 0x68b7, 0x0700, 0x6823, 0x0800,
+        0x6827, 0x0003, 0x0005, 0xc6ec, 0xa6ac, 0x0060, 0x0904, 0x3712,
+        0x6b98, 0x6c94, 0x69ac, 0x68b0, 0xa105, 0x11e0, 0x7bd2, 0x7bda,
+        0x7cd6, 0x7cde, 0xa586, 0x0060, 0x05c8, 0xd6f4, 0x1108, 0xc6ed,
+        0xa6b4, 0xb7ff, 0x7e5a, 0x2009, 0x0083, 0xd69c, 0x0128, 0x2009,
+        0x0082, 0x2019, 0x0000, 0x2320, 0x791a, 0xd6ec, 0x0588, 0x080c,
+        0x4208, 0x0470, 0x68b0, 0xa31a, 0x2100, 0xa423, 0x2400, 0xa305,
+        0x01f8, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0x68b0, 0xd6f4, 0x1108,
+        0xc6ed, 0xc6f4, 0x7e5a, 0x2011, 0x0083, 0xd69c, 0x0128, 0x2011,
+        0x0082, 0x2019, 0x0000, 0x2320, 0x7a1a, 0xd6ec, 0x0188, 0x080c,
+        0x4235, 0x0070, 0x2019, 0x0000, 0x2320, 0x0010, 0xa6b4, 0xb7ff,
+        0x7e5a, 0x2009, 0x0083, 0xd69c, 0x0110, 0x2009, 0x0082, 0x791a,
+        0x68c0, 0x7056, 0x2d00, 0x704a, 0x68c4, 0x2060, 0x71d0, 0x2001,
+        0x4701, 0x2004, 0xd0c4, 0x15c8, 0x70d4, 0xa02d, 0x01b8, 0xd1bc,
+        0x0548, 0x7a80, 0xa294, 0x0f00, 0x70d8, 0xa206, 0x0118, 0x78e0,
+        0xa504, 0x1558, 0x70d6, 0xc1bc, 0x71d2, 0x0438, 0x2031, 0x0001,
+        0x852c, 0x0218, 0x8633, 0x8210, 0x0cd8, 0x0005, 0x7de0, 0xa594,
+        0xff00, 0x0130, 0x2011, 0x0008, 0x852f, 0x0c81, 0x8637, 0x0008,
+        0x0c69, 0x8217, 0x7880, 0xa084, 0x0f00, 0xa206, 0x0170, 0x72da,
+        0x76d6, 0x0058, 0x7a80, 0xa294, 0x0f00, 0x70d8, 0xa236, 0x0dc0,
+        0x78e0, 0xa534, 0x0da8, 0xc1bd, 0x71d2, 0xd1b4, 0x1904, 0x25c6,
+        0x2300, 0xa405, 0x0904, 0x25c6, 0x70a0, 0xa086, 0x0001, 0x1904,
+        0x260d, 0x0005, 0x6020, 0xa005, 0x0150, 0x8001, 0x6022, 0x6008,
+        0xa085, 0x0008, 0x600a, 0x700f, 0x0100, 0x702c, 0x6026, 0x0005,
+        0xa006, 0x080c, 0x3f4e, 0x7000, 0xa086, 0x0002, 0x0120, 0x7060,
+        0xa086, 0x0005, 0x1150, 0x682b, 0x0000, 0x6817, 0x0000, 0x681b,
+        0x0001, 0x6823, 0x0040, 0x681f, 0x0100, 0x7000, 0xa084, 0x000f,
+        0x0002, 0x25c9, 0x37a6, 0x37a3, 0x37c3, 0x37af, 0x25c9, 0x37a1,
+        0x37a1, 0x080c, 0x2575, 0x0449, 0x0411, 0x0028, 0x0431, 0x7058,
+        0x2060, 0x6800, 0x6002, 0x080c, 0x1dbf, 0x0804, 0x25c9, 0x7060,
+        0x7063, 0x0000, 0x707f, 0x0000, 0x0002, 0x37bf, 0x37bf, 0x37bd,
+        0x37bd, 0x37bd, 0x37bf, 0x37bd, 0x37bf, 0x0804, 0x2a9a, 0x7063,
+        0x0000, 0x0804, 0x25c9, 0x681b, 0x0000, 0x0804, 0x31a7, 0x6800,
+        0xa005, 0x1108, 0x6002, 0x6006, 0x0005, 0x6410, 0x84ff, 0x0168,
+        0x2009, 0x4702, 0x2104, 0x8001, 0x200a, 0x8421, 0x6412, 0x1128,
+        0x2021, 0x4704, 0x2404, 0xc0a5, 0x2022, 0x6008, 0xc0a4, 0x600a,
+        0x0005, 0x6018, 0xa005, 0x0110, 0x8001, 0x601a, 0x0005, 0x080c,
+        0x3c6e, 0x681b, 0x0018, 0x0490, 0x080c, 0x3c6e, 0x681b, 0x0019,
+        0x0468, 0x080c, 0x3c6e, 0x681b, 0x001a, 0x0440, 0x080c, 0x3c6e,
+        0x681b, 0x0003, 0x0418, 0x7770, 0x080c, 0x3b95, 0x7174, 0xa18c,
+        0x00ff, 0x3210, 0xa294, 0x0600, 0x0118, 0xa1e8, 0x8cc0, 0x0010,
+        0xa1e8, 0x8dd0, 0x2d04, 0x2d08, 0x2068, 0xa005, 0x1118, 0x707a,
+        0x0804, 0x25c9, 0x6814, 0x7270, 0xa206, 0x0110, 0x6800, 0x0c98,
+        0x6800, 0x200a, 0x681b, 0x0005, 0x707b, 0x0000, 0x080c, 0x37cd,
+        0x6820, 0xd084, 0x1110, 0x080c, 0x37c7, 0x080c, 0x37e1, 0x681f,
+        0x0000, 0x6823, 0x0020, 0x080c, 0x1dbf, 0x0804, 0x25c9, 0xa282,
+        0x0003, 0x1904, 0x3a35, 0x7da8, 0xa5ac, 0x00ff, 0x7ea8, 0xa6b4,
+        0x00ff, 0x6920, 0xc1bd, 0x6922, 0xd1c4, 0x05b0, 0xc1c4, 0x6922,
+        0xa6b4, 0x00ff, 0x0530, 0xa682, 0x0018, 0x0218, 0x0110, 0x2031,
+        0x0018, 0xa686, 0x0010, 0x1108, 0x8630, 0x852b, 0x852b, 0x2041,
+        0x0000, 0x080c, 0x3aee, 0x0118, 0x080c, 0x391a, 0x00a0, 0x080c,
+        0x3aba, 0x080c, 0x3917, 0x6920, 0xc1c5, 0x6922, 0x7e58, 0xc695,
+        0x7e5a, 0xd6d4, 0x1118, 0x781b, 0x006e, 0x0005, 0x781b, 0x0082,
+        0x0005, 0x080c, 0x3917, 0x7e58, 0xd6d4, 0x1118, 0x781b, 0x0071,
+        0x0005, 0x781b, 0x0083, 0x0005, 0x00c6, 0x7054, 0x2060, 0x6100,
+        0xd1e4, 0x0598, 0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x0018,
+        0x0218, 0x0110, 0x2011, 0x0018, 0x2600, 0xa202, 0x1208, 0x2230,
+        0xa686, 0x0010, 0x1108, 0x8630, 0x6208, 0xa294, 0x00ff, 0x78ec,
+        0xd0e4, 0x0130, 0xa282, 0x000a, 0x1240, 0x2011, 0x000a, 0x0028,
+        0xa282, 0x000c, 0x1210, 0x2011, 0x000c, 0x2200, 0xa502, 0x1208,
+        0x2228, 0x080c, 0x3abe, 0x852b, 0x852b, 0x2041, 0x0000, 0x080c,
+        0x3aee, 0x0118, 0x080c, 0x391a, 0x0020, 0x080c, 0x3aba, 0x080c,
+        0x3917, 0x7858, 0xc095, 0x785a, 0x00ce, 0x781b, 0x0082, 0x0005,
+        0x00c6, 0x2960, 0x6000, 0xd0e4, 0x1188, 0xd0b4, 0x1150, 0x6010,
+        0xa084, 0x000f, 0x1130, 0x6104, 0xa18c, 0xfff5, 0x6106, 0x00ce,
+        0x0005, 0x2011, 0x0032, 0x2019, 0x0000, 0x00f0, 0x68a0, 0xd0cc,
+        0x1dc0, 0x6208, 0xa294, 0x00ff, 0x78ec, 0xd0e4, 0x0130, 0xa282,
+        0x000b, 0x1218, 0x2011, 0x000a, 0x0028, 0xa282, 0x000c, 0x1210,
+        0x2011, 0x000c, 0x6308, 0x831f, 0xa39c, 0x00ff, 0xa382, 0x0018,
+        0x0218, 0x0110, 0x2019, 0x0018, 0x78ab, 0x0001, 0x78ab, 0x0003,
+        0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820, 0xc0c5,
+        0x6822, 0x080c, 0x3a7a, 0x00ce, 0x0005, 0x00c6, 0x2960, 0x6104,
+        0xa18c, 0xfff5, 0x6106, 0x2011, 0x0032, 0x2019, 0x0000, 0x0000,
+        0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa,
+        0xa8c0, 0x0005, 0x6820, 0xc0c5, 0x6822, 0x00ce, 0x0005, 0xa006,
+        0x2030, 0x2010, 0x00c6, 0x7154, 0x2160, 0x2018, 0x2008, 0xa084,
+        0xffe0, 0xa635, 0x7e86, 0x6018, 0x789a, 0x7eae, 0x6612, 0x78a4,
+        0xa084, 0x7770, 0xa18c, 0x000f, 0xa105, 0x2029, 0x4705, 0x252c,
+        0xd5cc, 0x0140, 0xd3a4, 0x0110, 0xa085, 0x0800, 0xd3fc, 0x0110,
+        0xa085, 0x8080, 0x78a6, 0x6016, 0x788a, 0xa6b4, 0x001f, 0x8637,
+        0x8204, 0x8004, 0xa605, 0x600e, 0x6004, 0xa084, 0xffd5, 0x6006,
+        0x00ce, 0x0005, 0xa282, 0x0002, 0x1904, 0x3a3f, 0x7aa8, 0x6920,
+        0xc1bd, 0x6922, 0xd1cc, 0x0568, 0xc1cc, 0x6922, 0xa294, 0x00ff,
+        0xa282, 0x0002, 0x1a04, 0x3a30, 0x080c, 0x39c1, 0x080c, 0x3917,
+        0xa980, 0x0001, 0x200c, 0x080c, 0x3b91, 0x080c, 0x38b8, 0x88ff,
+        0x0178, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a,
+        0xd6d4, 0x1118, 0x781b, 0x006e, 0x0005, 0x781b, 0x0082, 0x0005,
         0x7e58, 0xd6d4, 0x1118, 0x781b, 0x0071, 0x0005, 0x781b, 0x0083,
-        0x0005, 0x00c6, 0x7054, 0x2060, 0x6100, 0xd1e4, 0x0598, 0x6208,
-        0x8217, 0xa294, 0x00ff, 0xa282, 0x0018, 0x0218, 0x0110, 0x2011,
-        0x0018, 0x2600, 0xa202, 0x1208, 0x2230, 0xa686, 0x0010, 0x1108,
-        0x8630, 0x6208, 0xa294, 0x00ff, 0x78ec, 0xd0e4, 0x0130, 0xa282,
-        0x000a, 0x1240, 0x2011, 0x000a, 0x0028, 0xa282, 0x000c, 0x1210,
-        0x2011, 0x000c, 0x2200, 0xa502, 0x1208, 0x2228, 0x080c, 0x3a99,
-        0x852b, 0x852b, 0x2041, 0x0000, 0x080c, 0x3ac9, 0x0118, 0x080c,
-        0x38f7, 0x0020, 0x080c, 0x3a95, 0x080c, 0x38f4, 0x7858, 0xc095,
-        0x785a, 0x00ce, 0x781b, 0x0082, 0x0005, 0x00c6, 0x2960, 0x6000,
-        0xd0e4, 0x1188, 0xd0b4, 0x1150, 0x6010, 0xa084, 0x000f, 0x1130,
-        0x6104, 0xa18c, 0xfff5, 0x6106, 0x00ce, 0x0005, 0x2011, 0x0032,
-        0x2019, 0x0000, 0x00f0, 0x68a0, 0xd0cc, 0x1dc0, 0x6208, 0xa294,
-        0x00ff, 0x78ec, 0xd0e4, 0x0130, 0xa282, 0x000b, 0x1218, 0x2011,
-        0x000a, 0x0028, 0xa282, 0x000c, 0x1210, 0x2011, 0x000c, 0x6308,
-        0x831f, 0xa39c, 0x00ff, 0xa382, 0x0018, 0x0218, 0x0110, 0x2019,
-        0x0018, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa,
-        0x7baa, 0xa8c0, 0x0005, 0x6820, 0xc0c5, 0x6822, 0x080c, 0x3a55,
-        0x00ce, 0x0005, 0x00c6, 0x2960, 0x6104, 0xa18c, 0xfff5, 0x6106,
-        0x2011, 0x0032, 0x2019, 0x0000, 0x0000, 0x78ab, 0x0001, 0x78ab,
-        0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820,
-        0xc0c5, 0x6822, 0x00ce, 0x0005, 0xa006, 0x2030, 0x2010, 0x00c6,
-        0x7154, 0x2160, 0x2018, 0x2008, 0xa084, 0xffe0, 0xa635, 0x7e86,
-        0x6018, 0x789a, 0x7eae, 0x6612, 0x78a4, 0xa084, 0x7770, 0xa18c,
-        0x000f, 0xa105, 0x2029, 0x4605, 0x252c, 0xd5cc, 0x0140, 0xd3a4,
-        0x0110, 0xa085, 0x0800, 0xd3fc, 0x0110, 0xa085, 0x8080, 0x78a6,
-        0x6016, 0x788a, 0xa6b4, 0x001f, 0x8637, 0x8204, 0x8004, 0xa605,
-        0x600e, 0x6004, 0xa084, 0xffd5, 0x6006, 0x00ce, 0x0005, 0xa282,
-        0x0002, 0x1904, 0x3a1a, 0x7aa8, 0x6920, 0xc1bd, 0x6922, 0xd1cc,
-        0x0568, 0xc1cc, 0x6922, 0xa294, 0x00ff, 0xa282, 0x0002, 0x1a04,
-        0x3a0b, 0x080c, 0x399e, 0x080c, 0x38f4, 0xa980, 0x0001, 0x200c,
-        0x080c, 0x3b6b, 0x080c, 0x3895, 0x88ff, 0x0178, 0x789b, 0x0060,
-        0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x1118, 0x781b,
-        0x006e, 0x0005, 0x781b, 0x0082, 0x0005, 0x7e58, 0xd6d4, 0x1118,
-        0x781b, 0x0071, 0x0005, 0x781b, 0x0083, 0x0005, 0xa282, 0x0002,
-        0x1218, 0xa284, 0x0001, 0x0140, 0x7154, 0xa188, 0x0000, 0x210c,
-        0xd1ec, 0x1110, 0x2011, 0x0000, 0x080c, 0x3a87, 0x0479, 0x080c,
-        0x38f4, 0x7858, 0xc095, 0x785a, 0x781b, 0x0082, 0x0005, 0x00c6,
-        0x0026, 0x2960, 0x6000, 0x2011, 0x0001, 0xd0ec, 0x1158, 0xd0bc,
-        0x1138, 0x6014, 0xd0b4, 0x1120, 0xc1a4, 0x6106, 0xa006, 0x0088,
-        0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab, 0x0003,
-        0x7aaa, 0xa8c0, 0x0004, 0x080c, 0x3a55, 0x6820, 0xa085, 0x0200,
-        0x6822, 0x002e, 0x00ce, 0x0005, 0x8807, 0xa715, 0x00c6, 0x2009,
-        0x0000, 0x7054, 0x2060, 0x82ff, 0x0110, 0x2009, 0x0040, 0x6018,
-        0xa080, 0x0002, 0x789a, 0x78a4, 0xa084, 0xff9f, 0xa105, 0xc0ec,
-        0xd0b4, 0x1108, 0xc0ed, 0x6100, 0xd1f4, 0x0110, 0xa085, 0x0020,
-        0x78a6, 0x6016, 0x788a, 0x6004, 0xa084, 0xffef, 0x6006, 0x00ce,
-        0x0005, 0x0006, 0x7000, 0xa086, 0x0003, 0x0110, 0x000e, 0x0010,
-        0x000e, 0x0488, 0xd6ac, 0x0578, 0x7888, 0xa084, 0x0040, 0x0558,
-        0x7bb8, 0x8307, 0xa084, 0x007f, 0x1508, 0x8207, 0xa084, 0x00ff,
-        0xa09e, 0x0001, 0x1904, 0x3a32, 0xd6f4, 0x11d0, 0x79d8, 0x7adc,
-        0xa108, 0xa291, 0x0000, 0x79d2, 0x79da, 0x7ad6, 0x7ade, 0x080c,
-        0x42b5, 0x781b, 0x0080, 0xb284, 0x0600, 0x0118, 0x2001, 0x0000,
-        0x0010, 0x2001, 0x0001, 0x080c, 0x4172, 0x0005, 0x080c, 0x254c,
-        0x781b, 0x0080, 0x0005, 0x781b, 0x0083, 0x0005, 0x2039, 0x0000,
-        0x2041, 0x0000, 0x2031, 0x0000, 0xa006, 0x2010, 0x080c, 0x38f7,
-        0x080c, 0x399c, 0x7e58, 0x080c, 0x3a4e, 0x781b, 0x0082, 0x0005,
-        0x0cd1, 0x6820, 0xc0c4, 0x6822, 0x00c6, 0x7054, 0x2060, 0x080c,
-        0x3921, 0x00b0, 0x0c81, 0x6820, 0xc0cc, 0x6822, 0x00c6, 0x7054,
-        0x2060, 0x080c, 0x39bb, 0x0060, 0x0c31, 0x6820, 0xa084, 0xecff,
-        0x6822, 0x00c6, 0x7054, 0x2060, 0x6004, 0xa084, 0xffc5, 0x6006,
-        0x00ce, 0x0005, 0x0049, 0x781b, 0x0082, 0x0005, 0x6827, 0x0002,
-        0x0049, 0x781b, 0x0082, 0x0005, 0x2001, 0x0005, 0x0088, 0x2001,
-        0x000c, 0x0070, 0x6820, 0xc0d5, 0x6822, 0x2001, 0x0006, 0x0040,
-        0x2001, 0x000d, 0x0028, 0x2001, 0x0009, 0x0010, 0x2001, 0x0007,
-        0x789b, 0x007e, 0x78aa, 0xc69d, 0x7e5a, 0x70d0, 0xd0b4, 0x0168,
-        0xc0b4, 0x70d2, 0x00c6, 0x70b4, 0xa065, 0x6008, 0xa084, 0xfbef,
-        0x600a, 0x6018, 0x8001, 0x601a, 0x00ce, 0x0005, 0x0076, 0x873f,
-        0xa7bc, 0x000f, 0x873b, 0x873b, 0x8703, 0xa0e0, 0x4ac0, 0xae8e,
-        0x4640, 0x0110, 0xa0e0, 0x4b40, 0xa7b8, 0x0020, 0x7f9a, 0x79a4,
-        0xa184, 0x7fe0, 0x78ae, 0x6012, 0x79a4, 0xa184, 0x773f, 0x78a6,
-        0x6016, 0x6004, 0xa085, 0x0038, 0x6006, 0x007e, 0x0005, 0x789b,
-        0x0080, 0x78ab, 0x0001, 0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa,
-        0x789b, 0x0060, 0x78ab, 0x0004, 0x0800, 0x2031, 0x0000, 0x2029,
-        0x0032, 0x789b, 0x0080, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab,
-        0x0001, 0x7daa, 0x7eaa, 0x789b, 0x0060, 0x78ab, 0x0005, 0x0804,
-        0x3a55, 0x0156, 0x8007, 0xa084, 0x00ff, 0x8003, 0x8003, 0xa080,
-        0x0020, 0x789a, 0x79a4, 0xa18c, 0xffe0, 0x2021, 0x3b54, 0x2019,
-        0x0011, 0x20a9, 0x000e, 0x2011, 0x0032, 0x2404, 0xa084, 0xffe0,
-        0xa106, 0x0128, 0x8420, 0x2300, 0xa210, 0x1f04, 0x3abd, 0x015e,
-        0x0005, 0x0156, 0x04f8, 0x2021, 0x3b62, 0x20a9, 0x0009, 0x2011,
-        0x0029, 0xa582, 0x0028, 0x0550, 0x8420, 0x95a9, 0x2011, 0x0033,
-        0xa582, 0x0033, 0x0618, 0x8420, 0x95a9, 0x2019, 0x000a, 0x2011,
-        0x0065, 0x2200, 0xa502, 0x02d0, 0x8420, 0x2300, 0xa210, 0x1f04,
-        0x3ae1, 0x015e, 0x0088, 0x2021, 0x3b54, 0x2019, 0x0011, 0x20a9,
-        0x000e, 0x2011, 0x0033, 0x2200, 0xa502, 0x0240, 0x8420, 0x2300,
-        0xa210, 0x1f04, 0x3af3, 0x015e, 0xa006, 0x0005, 0x8211, 0x015e,
-        0xa582, 0x0064, 0x1220, 0x7808, 0xa085, 0x0070, 0x780a, 0x2404,
-        0xa005, 0x0005, 0xa886, 0x0002, 0x01e8, 0x2021, 0x3b40, 0x20a9,
-        0x000d, 0x2011, 0x0028, 0xa582, 0x0028, 0x0d48, 0x8420, 0x2019,
-        0x0019, 0x2011, 0x0033, 0x2200, 0xa502, 0x0e00, 0x8420, 0x2300,
-        0xa210, 0x1f04, 0x3b1b, 0x015e, 0x2011, 0x0184, 0xa582, 0x0185,
-        0x0ab0, 0x0890, 0x2021, 0x3b4f, 0x20a9, 0x0003, 0x2011, 0x0024,
-        0xa586, 0x0024, 0x0960, 0x8420, 0x2011, 0x0028, 0xa586, 0x0028,
-        0x0930, 0x8420, 0x2019, 0x0019, 0x2011, 0x0033, 0x0804, 0x3af3,
-        0x1021, 0x2202, 0x3403, 0x4604, 0x5805, 0x6a06, 0x7c07, 0x4610,
-        0x4612, 0x5812, 0x5a12, 0x6a14, 0x6c14, 0x6e14, 0x7e17, 0x9021,
-        0xb002, 0xe204, 0xe210, 0xe210, 0x1209, 0x3002, 0x3202, 0x4203,
-        0x4403, 0x5404, 0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07,
-        0x0c07, 0x0e07, 0x10e1, 0x330a, 0x5805, 0x5a05, 0x6a06, 0x6c06,
-        0x7c07, 0x7e07, 0x0e00, 0x789b, 0x0080, 0xa046, 0x0005, 0xa784,
-        0x0f00, 0x800b, 0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003,
-        0xa105, 0xd7fc, 0x0118, 0xa0e0, 0x6bc0, 0x0010, 0xa0e0, 0x4bc0,
-        0x0005, 0x00e6, 0x00f6, 0xd084, 0x0138, 0x2079, 0x0100, 0x2009,
-        0x4680, 0x2071, 0x4680, 0x0030, 0x2009, 0x4640, 0x2079, 0x0200,
-        0x2071, 0x4640, 0x2091, 0x8000, 0x2104, 0xa084, 0x000f, 0x0002,
-        0x3ba2, 0x3ba2, 0x3ba2, 0x3ba2, 0x3ba2, 0x3ba2, 0x3ba0, 0x3ba0,
-        0x080c, 0x254c, 0x69b4, 0xc1f5, 0xa18c, 0xff9f, 0x69b6, 0xa005,
-        0x0580, 0x7858, 0xa084, 0xff9f, 0xa085, 0x6000, 0x785a, 0x7828,
-        0xa086, 0x1814, 0x1530, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004,
-        0x1de0, 0x784b, 0x0008, 0x7848, 0xa084, 0x0008, 0x1de0, 0x7830,
-        0xd0bc, 0x11b8, 0xb284, 0x0800, 0x0118, 0x0104, 0x3bd9, 0x0010,
-        0x0304, 0x3bd9, 0x79e4, 0xa184, 0x0030, 0x0158, 0x78ec, 0xa084,
-        0x0003, 0x0138, 0x681c, 0xd0ac, 0x1110, 0x00d9, 0x0010, 0x781b,
-        0x00fb, 0x00fe, 0x00ee, 0x0005, 0x2001, 0x4601, 0x2004, 0xd0ac,
-        0x1118, 0x6814, 0x080c, 0x2475, 0x0005, 0x781b, 0x0083, 0x0005,
-        0x781b, 0x0082, 0x0005, 0x781b, 0x0071, 0x0005, 0x781b, 0x006e,
-        0x0005, 0x2009, 0x4619, 0x210c, 0xa186, 0x0000, 0x0150, 0xa186,
-        0x0001, 0x0150, 0x701f, 0x000b, 0x7063, 0x0001, 0x781b, 0x0054,
-        0x0005, 0x781b, 0x00f3, 0x0005, 0x701f, 0x000a, 0x0005, 0x2009,
-        0x4619, 0x210c, 0xa186, 0x0000, 0x0168, 0xa186, 0x0001, 0x0138,
-        0x701f, 0x000b, 0x7063, 0x0001, 0x781b, 0x0054, 0x0005, 0x701f,
-        0x000a, 0x0005, 0x781b, 0x00f2, 0x0005, 0x781b, 0x00fb, 0x0005,
-        0x781b, 0x00fa, 0x0005, 0x781b, 0x00cc, 0x0005, 0x781b, 0x00cb,
-        0x0005, 0x6818, 0xd0fc, 0x0110, 0x681b, 0x001d, 0x7063, 0x0001,
+        0x0005, 0xa282, 0x0002, 0x1218, 0xa284, 0x0001, 0x0140, 0x7154,
+        0xa188, 0x0000, 0x210c, 0xd1ec, 0x1110, 0x2011, 0x0000, 0x080c,
+        0x3aac, 0x0479, 0x080c, 0x3917, 0x7858, 0xc095, 0x785a, 0x781b,
+        0x0082, 0x0005, 0x00c6, 0x0026, 0x2960, 0x6000, 0x2011, 0x0001,
+        0xd0ec, 0x1158, 0xd0bc, 0x1138, 0x6014, 0xd0b4, 0x1120, 0xc1a4,
+        0x6106, 0xa006, 0x0088, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab,
+        0x0002, 0x78ab, 0x0003, 0x7aaa, 0xa8c0, 0x0004, 0x080c, 0x3a7a,
+        0x6820, 0xa085, 0x0200, 0x6822, 0x002e, 0x00ce, 0x0005, 0x8807,
+        0xa715, 0x00c6, 0x2009, 0x0000, 0x7054, 0x2060, 0x82ff, 0x0110,
+        0x2009, 0x0040, 0x6018, 0xa080, 0x0002, 0x789a, 0x78a4, 0xa084,
+        0xff9f, 0xa105, 0xc0ec, 0xd0b4, 0x1108, 0xc0ed, 0x6100, 0xd1f4,
+        0x0110, 0xa085, 0x0020, 0x78a6, 0x6016, 0x788a, 0x6004, 0xa084,
+        0xffef, 0x6006, 0x00ce, 0x0005, 0x0006, 0x7000, 0xa086, 0x0003,
+        0x0110, 0x000e, 0x0010, 0x000e, 0x0498, 0xd6ac, 0x0588, 0x7888,
+        0xa084, 0x0040, 0x0568, 0x7bb8, 0x8307, 0xa084, 0x007f, 0x1518,
+        0x8207, 0xa084, 0x00ff, 0x0904, 0x3a57, 0xa09a, 0x0004, 0x1a04,
+        0x3a57, 0xd6f4, 0x11d0, 0x79d8, 0x7adc, 0xa108, 0xa291, 0x0000,
+        0x79d2, 0x79da, 0x7ad6, 0x7ade, 0x080c, 0x42e8, 0x781b, 0x0080,
+        0xb284, 0x0600, 0x0118, 0x2001, 0x0000, 0x0010, 0x2001, 0x0001,
+        0x080c, 0x419a, 0x0005, 0x080c, 0x2575, 0x781b, 0x0080, 0x0005,
+        0x781b, 0x0083, 0x0005, 0x2039, 0x0000, 0x2041, 0x0000, 0x2031,
+        0x0000, 0xa006, 0x2010, 0x080c, 0x391a, 0x080c, 0x39bf, 0x7e58,
+        0x080c, 0x3a73, 0x781b, 0x0082, 0x0005, 0x0cd1, 0x6820, 0xc0c4,
+        0x6822, 0x00c6, 0x7054, 0x2060, 0x080c, 0x3944, 0x00b0, 0x0c81,
+        0x6820, 0xc0cc, 0x6822, 0x00c6, 0x7054, 0x2060, 0x080c, 0x39de,
+        0x0060, 0x0c31, 0x6820, 0xa084, 0xecff, 0x6822, 0x00c6, 0x7054,
+        0x2060, 0x6004, 0xa084, 0xffc5, 0x6006, 0x00ce, 0x0005, 0x0049,
+        0x781b, 0x0082, 0x0005, 0x6827, 0x0002, 0x0049, 0x781b, 0x0082,
+        0x0005, 0x2001, 0x0005, 0x0088, 0x2001, 0x000c, 0x0070, 0x6820,
+        0xc0d5, 0x6822, 0x2001, 0x0006, 0x0040, 0x2001, 0x000d, 0x0028,
+        0x2001, 0x0009, 0x0010, 0x2001, 0x0007, 0x789b, 0x007e, 0x78aa,
+        0xc69d, 0x7e5a, 0x70d0, 0xd0b4, 0x0168, 0xc0b4, 0x70d2, 0x00c6,
+        0x70b4, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001,
+        0x601a, 0x00ce, 0x0005, 0x0076, 0x873f, 0xa7bc, 0x000f, 0x873b,
+        0x873b, 0x8703, 0xa0e0, 0x4bc0, 0xae8e, 0x4740, 0x0110, 0xa0e0,
+        0x4c40, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184, 0x7fe0, 0x78ae,
+        0x6012, 0x79a4, 0xa184, 0x773f, 0x78a6, 0x6016, 0x6004, 0xa085,
+        0x0038, 0x6006, 0x007e, 0x0005, 0x789b, 0x0080, 0x78ab, 0x0001,
+        0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0060, 0x78ab,
+        0x0004, 0x0800, 0x2031, 0x0000, 0x2029, 0x0032, 0x789b, 0x0080,
+        0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa, 0x7eaa,
+        0x789b, 0x0060, 0x78ab, 0x0005, 0x0804, 0x3a7a, 0x0156, 0x8007,
+        0xa084, 0x00ff, 0x8003, 0x8003, 0xa080, 0x0020, 0x789a, 0x79a4,
+        0xa18c, 0xffe0, 0x2021, 0x3b7a, 0x2019, 0x0011, 0x20a9, 0x000e,
+        0x2011, 0x0032, 0x2404, 0xa084, 0xffe0, 0xa106, 0x0128, 0x8420,
+        0x2300, 0xa210, 0x1f04, 0x3ae2, 0x015e, 0x0005, 0x0156, 0x0804,
+        0x3b30, 0x2021, 0x3b88, 0x20a9, 0x0009, 0x2011, 0x0029, 0xa582,
+        0x0028, 0x0550, 0x8420, 0x95a9, 0x2011, 0x0033, 0xa582, 0x0033,
+        0x0618, 0x8420, 0x95a9, 0x2019, 0x000a, 0x2011, 0x0065, 0x2200,
+        0xa502, 0x02d0, 0x8420, 0x2300, 0xa210, 0x1f04, 0x3b07, 0x015e,
+        0x0088, 0x2021, 0x3b7a, 0x2019, 0x0011, 0x20a9, 0x000e, 0x2011,
+        0x0033, 0x2200, 0xa502, 0x0240, 0x8420, 0x2300, 0xa210, 0x1f04,
+        0x3b19, 0x015e, 0xa006, 0x0005, 0x8211, 0x015e, 0xa582, 0x0064,
+        0x1220, 0x7808, 0xa085, 0x0070, 0x780a, 0x2404, 0xa005, 0x0005,
+        0xa886, 0x0002, 0x01e8, 0x2021, 0x3b66, 0x20a9, 0x000d, 0x2011,
+        0x0028, 0xa582, 0x0028, 0x0d48, 0x8420, 0x2019, 0x0019, 0x2011,
+        0x0033, 0x2200, 0xa502, 0x0e00, 0x8420, 0x2300, 0xa210, 0x1f04,
+        0x3b41, 0x015e, 0x2011, 0x0184, 0xa582, 0x0185, 0x0ab0, 0x0890,
+        0x2021, 0x3b75, 0x20a9, 0x0003, 0x2011, 0x0024, 0xa586, 0x0024,
+        0x0960, 0x8420, 0x2011, 0x0028, 0xa586, 0x0028, 0x0930, 0x8420,
+        0x2019, 0x0019, 0x2011, 0x0033, 0x0804, 0x3b19, 0x1021, 0x2202,
+        0x3403, 0x4604, 0x5805, 0x6a06, 0x7c07, 0x4610, 0x4612, 0x5812,
+        0x5a12, 0x6a14, 0x6c14, 0x6e14, 0x7e17, 0x9021, 0xb002, 0xe204,
+        0xe210, 0xe210, 0x1209, 0x3002, 0x3202, 0x4203, 0x4403, 0x5404,
+        0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07, 0x0c07, 0x0e07,
+        0x10e1, 0x330a, 0x5805, 0x5a05, 0x6a06, 0x6c06, 0x7c07, 0x7e07,
+        0x0e00, 0x789b, 0x0080, 0xa046, 0x0005, 0xa784, 0x0f00, 0x800b,
+        0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105, 0xd7fc,
+        0x0118, 0xa0e0, 0x6cc0, 0x0010, 0xa0e0, 0x4cc0, 0x0005, 0x00e6,
+        0x00f6, 0xd084, 0x0138, 0x2079, 0x0100, 0x2009, 0x4780, 0x2071,
+        0x4780, 0x0030, 0x2009, 0x4740, 0x2079, 0x0200, 0x2071, 0x4740,
+        0x2091, 0x8000, 0x2104, 0xa084, 0x000f, 0x0002, 0x3bc8, 0x3bc8,
+        0x3bc8, 0x3bc8, 0x3bc8, 0x3bc8, 0x3bc6, 0x3bc6, 0x080c, 0x2575,
+        0x69b4, 0xc1f5, 0xa18c, 0xff9f, 0x69b6, 0xa005, 0x0580, 0x7858,
+        0xa084, 0xff9f, 0xa085, 0x6000, 0x785a, 0x7828, 0xa086, 0x1814,
+        0x1530, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004, 0x1de0, 0x784b,
+        0x0008, 0x7848, 0xa084, 0x0008, 0x1de0, 0x7830, 0xd0bc, 0x11b8,
+        0xb284, 0x0800, 0x0118, 0x0104, 0x3bff, 0x0010, 0x0304, 0x3bff,
+        0x79e4, 0xa184, 0x0030, 0x0158, 0x78ec, 0xa084, 0x0003, 0x0138,
+        0x681c, 0xd0ac, 0x1110, 0x00d9, 0x0010, 0x781b, 0x00fb, 0x00fe,
+        0x00ee, 0x0005, 0x2001, 0x4701, 0x2004, 0xd0ac, 0x1118, 0x6814,
+        0x080c, 0x249e, 0x0005, 0x781b, 0x0083, 0x0005, 0x781b, 0x0082,
+        0x0005, 0x781b, 0x0071, 0x0005, 0x781b, 0x006e, 0x0005, 0x2009,
+        0x4719, 0x210c, 0xa186, 0x0000, 0x0150, 0xa186, 0x0001, 0x0150,
+        0x701f, 0x000b, 0x7063, 0x0001, 0x781b, 0x0054, 0x0005, 0x781b,
+        0x00f3, 0x0005, 0x701f, 0x000a, 0x0005, 0x2009, 0x4719, 0x210c,
+        0xa186, 0x0000, 0x0168, 0xa186, 0x0001, 0x0138, 0x701f, 0x000b,
+        0x7063, 0x0001, 0x781b, 0x0054, 0x0005, 0x701f, 0x000a, 0x0005,
+        0x781b, 0x00f2, 0x0005, 0x781b, 0x00fb, 0x0005, 0x781b, 0x00fa,
+        0x0005, 0x781b, 0x00cc, 0x0005, 0x781b, 0x00cb, 0x0005, 0x6818,
+        0xd0fc, 0x0110, 0x681b, 0x001d, 0x701f, 0x000b, 0x7063, 0x0001,
         0x781b, 0x0054, 0x0005, 0x7830, 0xa084, 0x00c0, 0x1170, 0x7808,
         0xc08c, 0x780a, 0xe000, 0xe000, 0xe000, 0xe000, 0x78ec, 0xa084,
         0x0021, 0x0118, 0x7808, 0xc08d, 0x780a, 0x0005, 0x7808, 0xc08d,
         0x780a, 0x0005, 0x7830, 0xa084, 0x0040, 0x1de0, 0xb284, 0x0800,
-        0x0118, 0x1104, 0x3c58, 0x0010, 0x1304, 0x3c58, 0x78ac, 0x0005,
+        0x0118, 0x1104, 0x3c80, 0x0010, 0x1304, 0x3c80, 0x78ac, 0x0005,
         0x7808, 0xa084, 0xfffd, 0x780a, 0xe000, 0xe000, 0xe000, 0xe000,
         0x78ec, 0xa084, 0x0021, 0x0140, 0xb284, 0x0800, 0x0118, 0x1104,
-        0x3c67, 0x0010, 0x1304, 0x3c6a, 0x78ac, 0x0006, 0x7808, 0xa085,
-        0x0002, 0x780a, 0x000e, 0x0005, 0xa784, 0x0001, 0x1904, 0x322a,
-        0xa784, 0x0070, 0x0140, 0x00c6, 0x2d60, 0x2f68, 0x080c, 0x2467,
+        0x3c8f, 0x0010, 0x1304, 0x3c92, 0x78ac, 0x0006, 0x7808, 0xa085,
+        0x0002, 0x780a, 0x000e, 0x0005, 0xa784, 0x0001, 0x1904, 0x324d,
+        0xa784, 0x0070, 0x0140, 0x00c6, 0x2d60, 0x2f68, 0x080c, 0x2490,
         0x2d78, 0x2c68, 0x00ce, 0xa784, 0x0008, 0x0148, 0x784b, 0x0008,
-        0x78ec, 0xa084, 0x0003, 0x0904, 0x322a, 0x0804, 0x3be5, 0xa784,
+        0x78ec, 0xa084, 0x0003, 0x0904, 0x324d, 0x0804, 0x3c0b, 0xa784,
         0x0004, 0x01c8, 0x78b8, 0xa084, 0x8000, 0x01a8, 0x784b, 0x0008,
-        0x78ec, 0xa084, 0x0003, 0x0904, 0x322a, 0x78e4, 0xa084, 0x0007,
+        0x78ec, 0xa084, 0x0003, 0x0904, 0x324d, 0x78e4, 0xa084, 0x0007,
         0xa086, 0x0001, 0x1140, 0x78c0, 0xa685, 0x4800, 0x2030, 0x7e5a,
         0x781b, 0x00fb, 0x0005, 0xa784, 0x0080, 0x0140, 0x7884, 0xd0fc,
-        0x0128, 0x080c, 0x3a32, 0x681b, 0x0022, 0x0005, 0x681b, 0x0003,
+        0x0128, 0x080c, 0x3a57, 0x681b, 0x0022, 0x0005, 0x681b, 0x0003,
         0x7858, 0xa084, 0x5f00, 0x681e, 0x682f, 0x0000, 0x6833, 0x0000,
-        0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0904, 0x2b89, 0xb284,
-        0x0800, 0x0110, 0x0104, 0x259d, 0x0304, 0x259d, 0x6b14, 0x8307,
+        0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0904, 0x2bac, 0xb284,
+        0x0800, 0x0110, 0x0104, 0x25c6, 0x0304, 0x25c6, 0x6b14, 0x8307,
         0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xd3fc, 0x0118, 0xa080,
-        0x4b40, 0x0010, 0xa080, 0x4ac0, 0x2060, 0x2048, 0x7056, 0x2a60,
-        0x0005, 0x00c6, 0x2960, 0x6000, 0xd0ac, 0x0904, 0x3d2f, 0x68a0,
-        0xd1ac, 0x1120, 0xa084, 0x0e00, 0x0904, 0x3d2d, 0x6108, 0x8117,
+        0x4c40, 0x0010, 0xa080, 0x4bc0, 0x2060, 0x2048, 0x7056, 0x2a60,
+        0x0005, 0x00c6, 0x2960, 0x6000, 0xd0ac, 0x0904, 0x3d57, 0x68a0,
+        0xd1ac, 0x1120, 0xa084, 0x0e00, 0x0904, 0x3d55, 0x6108, 0x8117,
         0xa18c, 0x00ff, 0x631c, 0x832f, 0xd0dc, 0x0110, 0xa39d, 0x0001,
         0xd0cc, 0x11c8, 0xa584, 0x00ff, 0x0138, 0x78ec, 0xd0e4, 0x0110,
         0x8213, 0x00b8, 0x2029, 0x0000, 0xa182, 0x000c, 0x1290, 0x78ec,
@@ -1493,23 +1498,23 @@ static unsigned short risc_code01[] = {
         0x2009, 0x000a, 0x0030, 0x2009, 0x0032, 0x2011, 0x0000, 0x2029,
         0x0000, 0x78ab, 0x0001, 0x78ab, 0x0006, 0x78ab, 0x0004, 0x79aa,
         0x78ab, 0x0000, 0x7aaa, 0x7baa, 0x7daa, 0xa8c0, 0x0008, 0x6820,
-        0xa085, 0x1000, 0x6822, 0x080c, 0x3a55, 0xa085, 0x0001, 0x00ce,
-        0x0005, 0xa282, 0x0006, 0x1904, 0x3a24, 0x7da8, 0x7eac, 0x8637,
+        0xa085, 0x1000, 0x6822, 0x080c, 0x3a7a, 0xa085, 0x0001, 0x00ce,
+        0x0005, 0xa282, 0x0006, 0x1904, 0x3a49, 0x7da8, 0x7eac, 0x8637,
         0xa5ac, 0x00ff, 0xa6b4, 0x00ff, 0x7fac, 0x8747, 0xa7bc, 0x00ff,
-        0xa8c4, 0x00ff, 0x6920, 0xc1bd, 0x6922, 0xd1e4, 0x0904, 0x3da3,
-        0xa18c, 0xecff, 0x6922, 0xa782, 0x0002, 0x1a04, 0x39fe, 0xa6b4,
-        0x00ff, 0x0904, 0x3da0, 0xa682, 0x0031, 0x1a04, 0x39fe, 0xa582,
-        0x0009, 0x0a04, 0x39fe, 0xa882, 0x0003, 0x1a04, 0x39fe, 0xa886,
-        0x0002, 0x01d0, 0xa886, 0x0000, 0x1904, 0x39fe, 0x2001, 0x000c,
+        0xa8c4, 0x00ff, 0x6920, 0xc1bd, 0x6922, 0xd1e4, 0x0904, 0x3dcb,
+        0xa18c, 0xecff, 0x6922, 0xa782, 0x0002, 0x1a04, 0x3a23, 0xa6b4,
+        0x00ff, 0x0904, 0x3dc8, 0xa682, 0x0031, 0x1a04, 0x3a23, 0xa582,
+        0x0009, 0x0a04, 0x3a23, 0xa882, 0x0003, 0x1a04, 0x3a23, 0xa886,
+        0x0002, 0x01d0, 0xa886, 0x0000, 0x1904, 0x3a23, 0x2001, 0x000c,
         0x79ec, 0xd1e4, 0x0110, 0x2001, 0x000a, 0xa502, 0x1290, 0x080c,
-        0x39fe, 0x00c6, 0x2960, 0x6004, 0xa085, 0x001a, 0x6006, 0x6000,
-        0xc0ac, 0x6002, 0x00ce, 0x0005, 0xa786, 0x0000, 0x0904, 0x39fe,
+        0x3a23, 0x00c6, 0x2960, 0x6004, 0xa085, 0x001a, 0x6006, 0x6000,
+        0xc0ac, 0x6002, 0x00ce, 0x0005, 0xa786, 0x0000, 0x0904, 0x3a23,
         0x8634, 0xa682, 0x0018, 0x0228, 0x0120, 0x2031, 0x0018, 0x0804,
-        0x3df1, 0xa686, 0x0010, 0x1108, 0x8630, 0x852b, 0x852b, 0x080c,
-        0x3ac9, 0x0904, 0x39fe, 0x080c, 0x38f7, 0x080c, 0x399c, 0x7e58,
+        0x3e19, 0xa686, 0x0010, 0x1108, 0x8630, 0x852b, 0x852b, 0x080c,
+        0x3aee, 0x0904, 0x3a23, 0x080c, 0x391a, 0x080c, 0x39bf, 0x7e58,
         0xd6d4, 0x1118, 0x781b, 0x0071, 0x0005, 0x781b, 0x0083, 0x0005,
-        0x080c, 0x38f4, 0x0c90, 0xa886, 0x0002, 0x1108, 0x8634, 0x7154,
-        0xa188, 0x0000, 0x210c, 0xd1ac, 0x0904, 0x39fe, 0xd1ec, 0x1120,
+        0x080c, 0x3917, 0x0c90, 0xa886, 0x0002, 0x1108, 0x8634, 0x7154,
+        0xa188, 0x0000, 0x210c, 0xd1ac, 0x0904, 0x3a23, 0xd1ec, 0x1120,
         0x2039, 0x0000, 0x2041, 0x0000, 0xd1e4, 0x1120, 0x2031, 0x0000,
         0x2041, 0x0000, 0xa782, 0x0002, 0x12c8, 0x621c, 0xa284, 0x00ff,
         0xa706, 0x0110, 0x2039, 0x0000, 0xa605, 0x0190, 0x6108, 0x811f,
@@ -1517,11 +1522,11 @@ static unsigned short risc_code01[] = {
         0xa086, 0x0201, 0x0160, 0xa886, 0x0000, 0x0168, 0x2039, 0x0000,
         0x2041, 0x0000, 0x2031, 0x0000, 0xa006, 0x2010, 0x0070, 0xa284,
         0xff00, 0x1108, 0x2040, 0xa184, 0x00ff, 0xa502, 0x0108, 0x2128,
-        0x852b, 0x852b, 0x080c, 0x3ac9, 0x0d58, 0x080c, 0x38f7, 0x080c,
-        0x399c, 0x789b, 0x0080, 0x78ab, 0x0001, 0x78ab, 0x0006, 0x78ab,
+        0x852b, 0x852b, 0x080c, 0x3aee, 0x0d58, 0x080c, 0x391a, 0x080c,
+        0x39bf, 0x789b, 0x0080, 0x78ab, 0x0001, 0x78ab, 0x0006, 0x78ab,
         0x0004, 0x7daa, 0x78ab, 0x0000, 0x7eaa, 0x7faa, 0x2800, 0x78aa,
         0x789b, 0x0060, 0x78ab, 0x0008, 0x6820, 0xc0e5, 0x6822, 0x080c,
-        0x3a55, 0x7858, 0xc095, 0x785a, 0x781b, 0x0082, 0x0005, 0x0020,
+        0x3a7a, 0x7858, 0xc095, 0x785a, 0x781b, 0x0082, 0x0005, 0x0020,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
@@ -1559,223 +1564,248 @@ static unsigned short risc_code01[] = {
         0x20dd, 0x0011, 0x20d5, 0x8822, 0x0016, 0x0000, 0x0126, 0x70d0,
         0xa084, 0x4c00, 0x8004, 0x2090, 0x7204, 0x7008, 0xc09c, 0xa205,
         0x11a0, 0x720c, 0x82ff, 0x0128, 0x8aff, 0x1178, 0x7200, 0xd284,
-        0x1160, 0x7804, 0xd0cc, 0x0110, 0x080c, 0x4328, 0x7007, 0x0008,
+        0x1160, 0x7804, 0xd0cc, 0x0110, 0x080c, 0x435b, 0x7007, 0x0008,
         0x7003, 0x0008, 0x012e, 0x2000, 0x0005, 0x7000, 0xa084, 0x0003,
         0x7002, 0xc69c, 0xd084, 0x0588, 0x7108, 0xe000, 0x7008, 0xa106,
-        0x1dd8, 0xa184, 0x0003, 0x0904, 0x3fa2, 0xa184, 0x01e0, 0x1904,
-        0x3fa2, 0xd1f4, 0x1d88, 0xa184, 0x3000, 0xa086, 0x1000, 0x0d60,
+        0x1dd8, 0xa184, 0x0003, 0x0904, 0x3fca, 0xa184, 0x01e0, 0x1904,
+        0x3fca, 0xd1f4, 0x1d88, 0xa184, 0x3000, 0xa086, 0x1000, 0x0d60,
         0x2011, 0x0180, 0x710c, 0x8211, 0x0130, 0x7008, 0xd0f4, 0x1d20,
         0x700c, 0xa106, 0x0dc0, 0x7007, 0x0012, 0x7108, 0xe000, 0x7008,
         0xa106, 0x1dd8, 0xa184, 0x0003, 0x0568, 0xd194, 0x0db0, 0xd1f4,
         0x0548, 0x7007, 0x0002, 0x0880, 0x0428, 0x7108, 0xd1fc, 0x0130,
-        0x080c, 0x40ae, 0x8aff, 0x0904, 0x3f2c, 0x0cb8, 0x700c, 0xa08c,
+        0x080c, 0x40d6, 0x8aff, 0x0904, 0x3f54, 0x0cb8, 0x700c, 0xa08c,
         0x07ff, 0x01e8, 0x7004, 0xd084, 0x0178, 0x7014, 0xa005, 0x1148,
         0x7010, 0x7310, 0xa306, 0x1de0, 0x2300, 0xa005, 0x0128, 0xa102,
-        0x1e20, 0x7007, 0x0010, 0x0030, 0x8aff, 0x0148, 0x080c, 0x426b,
-        0x1de8, 0x09d8, 0x080c, 0x4034, 0x012e, 0x2000, 0x0005, 0x7204,
+        0x1e20, 0x7007, 0x0010, 0x0030, 0x8aff, 0x0148, 0x080c, 0x429a,
+        0x1de8, 0x09d8, 0x080c, 0x405c, 0x012e, 0x2000, 0x0005, 0x7204,
         0x7108, 0xc19c, 0x8103, 0x1218, 0x7007, 0x0002, 0x0cc0, 0xa205,
-        0x1d88, 0x7007, 0x0008, 0x7003, 0x0008, 0x0006, 0x2001, 0x4601,
-        0x2004, 0xd0cc, 0x0110, 0x080c, 0x4328, 0x000e, 0x012e, 0x2000,
+        0x1d88, 0x7007, 0x0008, 0x7003, 0x0008, 0x0006, 0x2001, 0x4701,
+        0x2004, 0xd0cc, 0x0110, 0x080c, 0x435b, 0x000e, 0x012e, 0x2000,
         0x0005, 0x6428, 0x84ff, 0x0508, 0x2c70, 0x7004, 0xa0bc, 0x000f,
-        0xa7b8, 0x3ff5, 0x273c, 0x87fb, 0x1148, 0x0210, 0x080c, 0x254c,
-        0x609c, 0xa075, 0x0190, 0x0c88, 0x2039, 0x3fea, 0x2704, 0xae68,
+        0xa7b8, 0x401d, 0x273c, 0x87fb, 0x1148, 0x0210, 0x080c, 0x2575,
+        0x609c, 0xa075, 0x0190, 0x0c88, 0x2039, 0x4012, 0x2704, 0xae68,
         0x6808, 0xa630, 0x680c, 0xa529, 0x8421, 0x0138, 0x8738, 0x2704,
         0xa005, 0x1da8, 0x709c, 0xa075, 0x1d00, 0x0005, 0x0000, 0x0005,
         0x0009, 0x000d, 0x0011, 0x0015, 0x0019, 0x001d, 0x0000, 0x0003,
-        0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0000, 0x3fea, 0x3fe7,
-        0x0000, 0x0000, 0x8000, 0x0000, 0x3fea, 0x0000, 0x3ff2, 0x3fef,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x3ff2, 0x0000, 0x3fed, 0x3fed,
-        0x0000, 0x0000, 0x8000, 0x0000, 0x3fed, 0x0000, 0x3ff3, 0x3ff3,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x3ff3, 0x2079, 0x4600, 0x2071,
+        0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0000, 0x4012, 0x400f,
+        0x0000, 0x0000, 0x8000, 0x0000, 0x4012, 0x0000, 0x401a, 0x4017,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x401a, 0x0000, 0x4015, 0x4015,
+        0x0000, 0x0000, 0x8000, 0x0000, 0x4015, 0x0000, 0x401b, 0x401b,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x401b, 0x2079, 0x4700, 0x2071,
         0x0010, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003, 0x0001, 0x2009,
         0x0002, 0x2071, 0x0050, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003,
         0x0000, 0x2001, 0x01ff, 0x2004, 0xd0fc, 0x1128, 0x8109, 0x0118,
-        0x2071, 0x0020, 0x0c80, 0x0005, 0x7004, 0x8004, 0x1a04, 0x408a,
+        0x2071, 0x0020, 0x0c80, 0x0005, 0x7004, 0x8004, 0x1a04, 0x40b2,
         0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0, 0x0120, 0x080c,
-        0x40e6, 0x0804, 0x40aa, 0x7007, 0x0012, 0x2019, 0x0000, 0x7108,
-        0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0, 0x0120, 0x080c, 0x40e6,
-        0x0804, 0x40aa, 0xa19c, 0x300c, 0xa386, 0x2004, 0x0190, 0xa386,
+        0x410e, 0x0804, 0x40d2, 0x7007, 0x0012, 0x2019, 0x0000, 0x7108,
+        0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0, 0x0120, 0x080c, 0x410e,
+        0x0804, 0x40d2, 0xa19c, 0x300c, 0xa386, 0x2004, 0x0190, 0xa386,
         0x0008, 0x01c0, 0x7004, 0xd084, 0x1148, 0x7108, 0x7008, 0xa106,
-        0x1de0, 0xa184, 0x0003, 0x0110, 0x0804, 0x40e6, 0xa386, 0x200c,
+        0x1de0, 0xa184, 0x0003, 0x0110, 0x0804, 0x410e, 0xa386, 0x200c,
         0x19f0, 0x7200, 0x8204, 0x0230, 0x730c, 0xa384, 0x07ff, 0x0110,
-        0x080c, 0x254c, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0,
-        0x0118, 0x080c, 0x40e6, 0x0470, 0x7007, 0x0012, 0x7000, 0xd084,
+        0x080c, 0x2575, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0,
+        0x0118, 0x080c, 0x410e, 0x0470, 0x7007, 0x0012, 0x7000, 0xd084,
         0x1148, 0x7310, 0x7014, 0xa305, 0x0128, 0x710c, 0xa184, 0x07ff,
-        0x1904, 0x4034, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0,
-        0x0118, 0x080c, 0x40e6, 0x00b0, 0x7007, 0x0012, 0x7007, 0x0008,
+        0x1904, 0x405c, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0,
+        0x0118, 0x080c, 0x410e, 0x00b0, 0x7007, 0x0012, 0x7007, 0x0008,
         0x7004, 0xd09c, 0x1de8, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184,
-        0x01e0, 0x0118, 0x080c, 0x40e6, 0x0028, 0x7007, 0x0012, 0x7108,
+        0x01e0, 0x0118, 0x080c, 0x410e, 0x0028, 0x7007, 0x0012, 0x7108,
         0x8103, 0x0e88, 0x7003, 0x0008, 0x0005, 0x7108, 0xa184, 0x01e0,
         0x15a8, 0x7108, 0xa184, 0x01e0, 0x1588, 0xa184, 0x0007, 0x0002,
-        0x40c2, 0x40d0, 0x40c0, 0x40d0, 0x40c0, 0x4120, 0x40c0, 0x411e,
-        0x080c, 0x254c, 0x7004, 0xa084, 0x0010, 0xc08d, 0x7006, 0x8aff,
-        0x1118, 0x2049, 0x0000, 0x0005, 0x080c, 0x426b, 0x1de8, 0x0005,
+        0x40ea, 0x40f8, 0x40e8, 0x40f8, 0x40e8, 0x4148, 0x40e8, 0x4146,
+        0x080c, 0x2575, 0x7004, 0xa084, 0x0010, 0xc08d, 0x7006, 0x8aff,
+        0x1118, 0x2049, 0x0000, 0x0005, 0x080c, 0x429a, 0x1de8, 0x0005,
         0x7004, 0xa084, 0x0010, 0xc08d, 0x7006, 0x7004, 0xd084, 0x1140,
         0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x0003, 0x0108, 0x0030,
-        0x8aff, 0x0118, 0x080c, 0x426b, 0x1de8, 0x0005, 0x7007, 0x0012,
-        0x7108, 0x1d04, 0x40e9, 0x2091, 0x6000, 0x1d04, 0x40ed, 0x2091,
+        0x8aff, 0x0118, 0x080c, 0x429a, 0x1de8, 0x0005, 0x7007, 0x0012,
+        0x7108, 0x1d04, 0x4111, 0x2091, 0x6000, 0x1d04, 0x4115, 0x2091,
         0x6000, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004, 0xd09c, 0x1de8,
         0x7007, 0x0012, 0x7108, 0xd1fc, 0x1dd8, 0x7003, 0x0000, 0x7000,
         0xa005, 0x1130, 0x7004, 0xa005, 0x1118, 0x700c, 0xa005, 0x0108,
         0x0c40, 0x2049, 0x0000, 0xb284, 0x0200, 0x0118, 0x2001, 0x0000,
-        0x0010, 0x2001, 0x0001, 0x080c, 0x3b81, 0x681b, 0x0002, 0x2051,
-        0x0000, 0x0005, 0x080c, 0x254c, 0x080c, 0x254c, 0x080c, 0x415f,
+        0x0010, 0x2001, 0x0001, 0x080c, 0x3ba7, 0x681b, 0x0002, 0x2051,
+        0x0000, 0x0005, 0x080c, 0x2575, 0x080c, 0x2575, 0x080c, 0x4187,
         0x7210, 0x7114, 0x700c, 0xa09c, 0x07ff, 0x2800, 0xa300, 0xa211,
         0xa189, 0x0000, 0x04a1, 0x2704, 0x2c58, 0xac60, 0x6308, 0x2200,
         0xa322, 0x630c, 0x2100, 0xa31b, 0x2400, 0xa305, 0x0140, 0x1238,
         0x8412, 0x8210, 0x830a, 0xa189, 0x0000, 0x2b60, 0x0c58, 0x2b60,
-        0x8a07, 0x0006, 0x6004, 0xd09c, 0x0118, 0xa7ba, 0x3fef, 0x0010,
-        0xa7ba, 0x3fe7, 0x000e, 0xa73d, 0x2c00, 0x6886, 0x6f8a, 0x6c92,
+        0x8a07, 0x0006, 0x6004, 0xd09c, 0x0118, 0xa7ba, 0x4017, 0x0010,
+        0xa7ba, 0x400f, 0x000e, 0xa73d, 0x2c00, 0x6886, 0x6f8a, 0x6c92,
         0x6b8e, 0x7108, 0x7008, 0xa106, 0x1de0, 0xa184, 0x01e0, 0x0110,
-        0x080c, 0x40e6, 0x7007, 0x0012, 0x080c, 0x4034, 0x0005, 0x8a50,
+        0x080c, 0x410e, 0x7007, 0x0012, 0x080c, 0x405c, 0x0005, 0x8a50,
         0x8739, 0x2704, 0xa004, 0x1168, 0x6000, 0xa064, 0x1108, 0x2d60,
-        0x6004, 0xa084, 0x000f, 0xa080, 0x4005, 0x203c, 0x87fb, 0x090c,
-        0x254c, 0x0005, 0x0126, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004,
+        0x6004, 0xa084, 0x000f, 0xa080, 0x402d, 0x203c, 0x87fb, 0x090c,
+        0x2575, 0x0005, 0x0126, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004,
         0x2090, 0x00de, 0x6884, 0x2060, 0x6888, 0x6b8c, 0x6c90, 0x8057,
         0xaad4, 0x00ff, 0xa084, 0x00ff, 0x0006, 0x6804, 0xa084, 0x0008,
-        0x000e, 0x0118, 0xa0b8, 0x3fef, 0x0010, 0xa0b8, 0x3fe7, 0xb284,
+        0x000e, 0x0118, 0xa0b8, 0x4017, 0x0010, 0xa0b8, 0x400f, 0xb284,
         0x0200, 0x0110, 0x7e20, 0x0008, 0x7e24, 0xa6b5, 0x000c, 0x681c,
-        0xd0b4, 0x0108, 0xc685, 0x2400, 0xa305, 0x0518, 0x2c58, 0x2704,
-        0x6104, 0xac60, 0x6000, 0xa400, 0x701a, 0x6004, 0xa301, 0x701e,
-        0xd19c, 0x0140, 0x6010, 0xa081, 0x0000, 0x7022, 0x6014, 0xa081,
-        0x0000, 0x7026, 0x6208, 0x2400, 0xa202, 0x7012, 0x620c, 0x2300,
-        0xa203, 0x7016, 0x7602, 0x7007, 0x0001, 0x2b60, 0x080c, 0x4292,
-        0x0010, 0x080c, 0x426b, 0x1de8, 0x012e, 0x2000, 0x0005, 0x0126,
-        0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x00de, 0x7007,
-        0x0004, 0x7004, 0xd094, 0x1de8, 0x7003, 0x0008, 0x012e, 0x2000,
-        0x0005, 0x0126, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090,
-        0x00de, 0x7e20, 0xb284, 0x0200, 0x1108, 0x7e24, 0xa6b5, 0x000c,
-        0x681c, 0xd0ac, 0x1118, 0xc685, 0x7003, 0x0000, 0x6828, 0x2050,
-        0x2d60, 0x6004, 0xa0bc, 0x000f, 0xa7b8, 0x3ff5, 0x273c, 0x87fb,
-        0x1138, 0x0210, 0x080c, 0x254c, 0x689c, 0xa065, 0x0120, 0x0c88,
-        0x080c, 0x426b, 0x1de8, 0x012e, 0x2000, 0x0005, 0x0126, 0x0006,
-        0x0016, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x7e20,
-        0xb284, 0x0200, 0x1108, 0x7e24, 0x00de, 0x003e, 0x004e, 0xa6b5,
-        0x000c, 0x681c, 0xd0b4, 0x0128, 0xc685, 0x7003, 0x0000, 0x7007,
-        0x0004, 0x2049, 0x4206, 0x6828, 0xa055, 0x00d6, 0x0904, 0x4267,
-        0x2d70, 0x2e60, 0x7004, 0xa0bc, 0x000f, 0xa7b8, 0x3ff5, 0x273c,
-        0x87fb, 0x1140, 0x0210, 0x080c, 0x254c, 0x709c, 0xa075, 0x2060,
-        0x0570, 0x0c80, 0x2704, 0xae68, 0x6808, 0xa422, 0x680c, 0xa31b,
-        0x0268, 0x8a51, 0x1110, 0x080c, 0x254c, 0x8738, 0x2704, 0xa005,
-        0x1d90, 0x709c, 0xa075, 0x2060, 0x01d0, 0x08e0, 0x8422, 0x8420,
-        0x831a, 0xa399, 0x0000, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300,
-        0xa11b, 0x1210, 0x080c, 0x254c, 0xb284, 0x0200, 0x0118, 0x2071,
-        0x0050, 0x0010, 0x2071, 0x0020, 0x00de, 0x0804, 0x419b, 0x00de,
-        0x012e, 0x2000, 0x0005, 0x7008, 0x0006, 0xa084, 0x01e0, 0x000e,
-        0x0110, 0xa006, 0x0005, 0xa084, 0x0003, 0xa086, 0x0003, 0x1108,
-        0x0005, 0x2704, 0xac78, 0x7800, 0x701a, 0x7804, 0x701e, 0x7808,
-        0x7012, 0x780c, 0x7016, 0x6004, 0xd09c, 0x0120, 0x7810, 0x7022,
-        0x7814, 0x7026, 0x7602, 0x7004, 0xa084, 0x0010, 0xc085, 0x7006,
-        0x2079, 0x4600, 0x8a51, 0x01e8, 0x8738, 0x2704, 0xa005, 0x1168,
-        0x609c, 0xa005, 0x01b8, 0x2060, 0x6004, 0xa084, 0x000f, 0xa080,
-        0x3ff5, 0x203c, 0x87fb, 0x090c, 0x254c, 0x7008, 0x0006, 0xa084,
-        0x01e0, 0x000e, 0x0110, 0xa006, 0x0028, 0xa084, 0x0003, 0xa086,
-        0x0003, 0x0005, 0x2051, 0x0000, 0x0005, 0x0126, 0x0006, 0x00d6,
-        0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x00de, 0x008e, 0x7108,
-        0xa184, 0x0003, 0x1128, 0x6828, 0xa005, 0x0178, 0x0804, 0x3f45,
-        0x7108, 0xd1fc, 0x0118, 0x080c, 0x40ae, 0x0c88, 0x7007, 0x0010,
-        0x7108, 0xd1fc, 0x0de8, 0x080c, 0x40ae, 0x7008, 0xa086, 0x0008,
-        0x1d30, 0x7000, 0xa005, 0x1d18, 0x7003, 0x0000, 0x2049, 0x0000,
-        0x0006, 0x2001, 0x4601, 0x2004, 0xd0cc, 0x0110, 0x080c, 0x4328,
-        0x000e, 0x012e, 0x2000, 0x0005, 0x0126, 0x0146, 0x0136, 0x0156,
-        0x00c6, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x00de,
-        0x2049, 0x42ec, 0xad80, 0x0011, 0x20a0, 0xb284, 0x0200, 0x0118,
-        0x2099, 0x0032, 0x0010, 0x2099, 0x0031, 0x700c, 0xa084, 0x07ff,
-        0x682a, 0x7007, 0x0008, 0x7007, 0x0002, 0x7003, 0x0001, 0x0118,
-        0x8000, 0x80ac, 0x53a5, 0x700c, 0xa084, 0x07ff, 0x0130, 0x7007,
-        0x0004, 0x7004, 0xa084, 0x0004, 0x1de0, 0x00ce, 0x2049, 0x0000,
-        0x7003, 0x0000, 0x015e, 0x013e, 0x014e, 0x012e, 0x2000, 0x0005,
-        0x6814, 0xd0fc, 0x0904, 0x436b, 0x7000, 0xd084, 0x05e0, 0x7e24,
-        0xa6b5, 0x0004, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x1de0,
-        0x7118, 0x0016, 0x711c, 0x0016, 0x7120, 0x0016, 0x7124, 0x0016,
-        0x701b, 0x0000, 0x701f, 0x3fff, 0x7023, 0x0000, 0x7027, 0x0000,
-        0x7013, 0x0004, 0x7017, 0x0000, 0x7602, 0x7007, 0x0001, 0x2001,
-        0xffff, 0x2009, 0x0031, 0x200a, 0x200a, 0x7108, 0x7008, 0xa106,
-        0x1de0, 0xd1fc, 0x0dd0, 0x002e, 0x7226, 0x002e, 0x7222, 0x002e,
-        0x721e, 0x002e, 0x721a, 0x7007, 0x0002, 0x7008, 0xa086, 0x0008,
-        0x0110, 0x0804, 0x40e6, 0x7007, 0x0004, 0x7003, 0x0000, 0x0005,
-        0x2091, 0x8000, 0x2091, 0x6000, 0x78ac, 0xa005, 0x1168, 0x7974,
-        0x70d0, 0xa106, 0x1148, 0x781c, 0xa005, 0x0130, 0x781f, 0x0000,
-        0x0e04, 0x4384, 0x2091, 0x4080, 0x2069, 0x4680, 0xd7fc, 0x1110,
-        0x2069, 0x4640, 0x6800, 0xa084, 0x000f, 0x1198, 0x68d0, 0xd0b4,
-        0x0180, 0xd0bc, 0x1170, 0x00f6, 0x2079, 0x0100, 0xd7fc, 0x1110,
-        0x2079, 0x0200, 0x7830, 0xa084, 0x00c0, 0x1110, 0x080c, 0x22ae,
-        0x00fe, 0x7830, 0x8001, 0x7832, 0x1904, 0x440b, 0x7834, 0x7832,
-        0x2061, 0x6bc0, 0x2069, 0x4680, 0xc7fd, 0x68cc, 0xa005, 0x0128,
-        0x8001, 0x68ce, 0x1110, 0x080c, 0x4577, 0x6800, 0xa084, 0x000f,
-        0x0168, 0xa086, 0x0001, 0x0150, 0x6840, 0xa00d, 0x0138, 0x2104,
-        0xa005, 0x0120, 0x8001, 0x200a, 0x0904, 0x4514, 0x6814, 0xa005,
-        0x01a8, 0x8001, 0x6816, 0x1190, 0x68a3, 0x0001, 0x00f6, 0xd7fc,
-        0x1118, 0x2079, 0x0200, 0x0010, 0x2079, 0x0100, 0x080c, 0x3c46,
-        0x00fe, 0x6860, 0xa005, 0x0110, 0x080c, 0x22ae, 0x687c, 0xa005,
-        0x0140, 0x8001, 0x687e, 0x1128, 0x6863, 0x0000, 0x68d0, 0xc0c5,
-        0x68d2, 0x68d0, 0xd0fc, 0x01b0, 0xc0fc, 0x68d2, 0x20a9, 0x0200,
-        0x6034, 0xa005, 0x0158, 0x8001, 0x6036, 0x68d0, 0xc0fd, 0x68d2,
-        0x1128, 0x6010, 0xa005, 0x0110, 0x080c, 0x22ae, 0xace0, 0x0010,
-        0x1f04, 0x43f0, 0xd7fc, 0x0138, 0x2061, 0x4bc0, 0x2069, 0x4640,
-        0xc7fc, 0x0804, 0x43ad, 0x0459, 0x7838, 0x8001, 0x783a, 0x11a0,
-        0x783c, 0x783a, 0x2061, 0x4bc0, 0x2069, 0x4640, 0xc7fc, 0x680c,
-        0xa005, 0x0110, 0x080c, 0x4487, 0xd7fc, 0x1130, 0x2061, 0x6bc0,
-        0x2069, 0x4680, 0xc7fd, 0x0c98, 0x7810, 0xd0cc, 0x0168, 0xd0ac,
-        0x1120, 0xd0a4, 0x0148, 0xc0ad, 0x7812, 0x2091, 0x8001, 0x0e04,
-        0x4433, 0x080c, 0x207a, 0x0005, 0x2091, 0x8001, 0x0005, 0x7840,
-        0x8001, 0x7842, 0x1904, 0x4486, 0x7844, 0x7842, 0x2069, 0x4640,
-        0xc7fc, 0x2079, 0x0200, 0x68d4, 0xa005, 0x0138, 0x7de0, 0xa504,
-        0x1120, 0x68d6, 0x68d0, 0xc0bc, 0x68d2, 0x2079, 0x4600, 0x6810,
-        0xa005, 0x1110, 0x2001, 0x0101, 0x8001, 0x6812, 0xd7fc, 0x0118,
-        0xa080, 0x8cd0, 0x0010, 0xa080, 0x8bc0, 0x2040, 0x2004, 0xa065,
-        0x01e0, 0x6024, 0xa005, 0x01b0, 0x8001, 0x6026, 0x1198, 0x6800,
-        0xa005, 0x0130, 0x6848, 0xac06, 0x1118, 0x080c, 0x4514, 0x0068,
-        0x6860, 0xa005, 0x0118, 0x6027, 0x0001, 0x0020, 0x080c, 0x44c8,
-        0x2804, 0x0c28, 0x6000, 0x2c40, 0x0c10, 0xd7fc, 0x1138, 0x2069,
-        0x4680, 0xc7fd, 0x2079, 0x0100, 0x0804, 0x4443, 0x0005, 0x2009,
-        0x0000, 0x20a9, 0x0200, 0x6008, 0xd09c, 0x0558, 0x6024, 0xa005,
-        0x0118, 0x8001, 0x6026, 0x0418, 0x6008, 0xc09c, 0xd084, 0x1110,
-        0xd0ac, 0x01c0, 0x600a, 0x6004, 0xa005, 0x01d8, 0x00d6, 0x00c6,
-        0x0016, 0x2068, 0x6010, 0x8001, 0x6012, 0x080c, 0x37a4, 0x2d00,
-        0x2c68, 0x2060, 0x080c, 0x1be3, 0x080c, 0x1d95, 0x001e, 0x00ce,
-        0x00de, 0x0038, 0xc0bd, 0x600a, 0xa18d, 0x0001, 0x0010, 0xa18d,
-        0x0100, 0xace0, 0x0010, 0x1f04, 0x448b, 0xa184, 0x0001, 0x0130,
-        0xa18c, 0xfffe, 0x690e, 0x080c, 0x22ae, 0x0008, 0x690e, 0x0005,
-        0x2c00, 0x687a, 0x6714, 0x6f72, 0x6017, 0x0000, 0x602b, 0x0000,
-        0x601b, 0x0006, 0x60b4, 0xa084, 0x5f00, 0x601e, 0x6020, 0xa084,
-        0x00ff, 0xa085, 0x0060, 0x6022, 0x6000, 0x2042, 0x6858, 0xac06,
-        0x1110, 0x2800, 0x685a, 0x080c, 0x1b7b, 0x6818, 0xa005, 0x0110,
-        0x8001, 0x681a, 0x6808, 0xc0a4, 0x680a, 0x6810, 0x7908, 0x8109,
-        0x790a, 0x8001, 0x1310, 0x080c, 0x254c, 0x6812, 0x1118, 0x7910,
-        0xc1a5, 0x7912, 0x602f, 0x0000, 0x6033, 0x0000, 0x2c68, 0x080c,
-        0x1da2, 0xd7fc, 0x1118, 0x2069, 0x4640, 0x0010, 0x2069, 0x4680,
-        0x6910, 0xa184, 0x0100, 0x2001, 0x0006, 0x1118, 0x6976, 0x2001,
-        0x0004, 0x080c, 0x22a4, 0x0005, 0x00d6, 0x6948, 0x2160, 0xd7fc,
-        0x1118, 0x2069, 0x0200, 0x0010, 0x2069, 0x0100, 0x080c, 0x2467,
-        0x601b, 0x0006, 0x6858, 0xa084, 0x5f00, 0x601e, 0x6020, 0xa084,
-        0x00ff, 0xa085, 0x0048, 0x6022, 0x602f, 0x0000, 0x6033, 0x0000,
-        0x6808, 0xa084, 0xfffd, 0x680a, 0x6830, 0xd0b4, 0x01b0, 0x684b,
-        0x0004, 0x20a9, 0x0014, 0x6848, 0xd094, 0x0110, 0x1f04, 0x453b,
-        0x684b, 0x0009, 0x20a9, 0x0014, 0x6848, 0xd084, 0x0110, 0x1f04,
-        0x4544, 0x20a9, 0x00fa, 0x1f04, 0x454b, 0x681b, 0x0054, 0x00de,
-        0x6863, 0x0007, 0x0005, 0x2079, 0x4600, 0x00e1, 0x0089, 0x00a9,
-        0x2009, 0x0002, 0x2069, 0x4680, 0x680f, 0x0000, 0x6813, 0x0000,
-        0x6817, 0x0000, 0x8109, 0x0118, 0x2069, 0x4640, 0x0ca8, 0x0005,
-        0x2019, 0x00a3, 0x7b3a, 0x7b3e, 0x0005, 0x2019, 0x0033, 0x7b42,
-        0x7b46, 0x0005, 0x2019, 0x32dd, 0x7b32, 0x7b36, 0x0005, 0x6a4c,
-        0xa285, 0x0000, 0x01f0, 0x6950, 0x6bbc, 0xa300, 0x00c6, 0x2164,
-        0x6304, 0x83ff, 0x1138, 0x8211, 0x0148, 0x8108, 0xa11a, 0x0eb8,
-        0x69bc, 0x0ca8, 0x68cf, 0x000a, 0x00ce, 0x0005, 0x694c, 0x6abc,
-        0x2264, 0x6008, 0xc0b5, 0x600a, 0x8210, 0x8109, 0x1dc8, 0x694e,
-        0x00ce, 0x0005, 0x1d04, 0x459a, 0x2091, 0x6000, 0x1d04, 0x459e,
-        0x2091, 0x6000, 0x70ec, 0xd0dc, 0x1118, 0xd0d4, 0x0190, 0x0098,
-        0xae8e, 0x0100, 0x0138, 0x7814, 0xc0f5, 0xc0c5, 0x7816, 0xd0d4,
-        0x1578, 0x0458, 0x7814, 0xc0fd, 0xc0c5, 0x7816, 0xd0d4, 0x1540,
-        0x0420, 0xd0e4, 0x0538, 0x1d04, 0x45bb, 0x2091, 0x6000, 0x2009,
-        0x000c, 0x1d04, 0x45c1, 0x2091, 0x6000, 0x8109, 0x1dd0, 0x70e4,
-        0xa084, 0x01ff, 0xa086, 0x01ff, 0x1110, 0x70ec, 0x08c8, 0xae8e,
-        0x0100, 0x0128, 0x7814, 0xc0f4, 0xd0fc, 0x1130, 0x0020, 0x7814,
-        0xc0fc, 0xd0f4, 0x1108, 0xc0c4, 0x7816, 0x7804, 0xd08c, 0x0110,
-        0x681f, 0x000c, 0x70a0, 0x70a2, 0x0005, 0x7c12
+        0xd0b4, 0x0108, 0xc685, 0x2400, 0xa305, 0x0550, 0x2c58, 0x2704,
+        0x6104, 0xac60, 0x6000, 0xa400, 0x2048, 0xa9cc, 0x0004, 0x0118,
+        0x080c, 0x43a3, 0x0400, 0x701a, 0x6004, 0xa301, 0x701e, 0xd19c,
+        0x0140, 0x6010, 0xa081, 0x0000, 0x7022, 0x6014, 0xa081, 0x0000,
+        0x7026, 0x6208, 0x2400, 0xa202, 0x7012, 0x620c, 0x2300, 0xa203,
+        0x7016, 0x7602, 0x7007, 0x0001, 0x2b60, 0x080c, 0x42c5, 0x0010,
+        0x080c, 0x429a, 0x1de8, 0x012e, 0x2000, 0x0005, 0x0126, 0x00d6,
+        0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x00de, 0x7007, 0x0004,
+        0x7004, 0xd094, 0x1de8, 0x7003, 0x0008, 0x012e, 0x2000, 0x0005,
+        0x0126, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x00de,
+        0x7e20, 0xb284, 0x0200, 0x1108, 0x7e24, 0xa6b5, 0x000c, 0x681c,
+        0xd0ac, 0x1118, 0xc685, 0x7003, 0x0000, 0x6828, 0x2050, 0x2d60,
+        0x6004, 0xa0bc, 0x000f, 0xa7b8, 0x401d, 0x273c, 0x87fb, 0x1138,
+        0x0210, 0x080c, 0x2575, 0x689c, 0xa065, 0x0120, 0x0c88, 0x080c,
+        0x429a, 0x1de8, 0x012e, 0x2000, 0x0005, 0x0126, 0x0006, 0x0016,
+        0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090, 0x7e20, 0xb284,
+        0x0200, 0x1108, 0x7e24, 0x00de, 0x003e, 0x004e, 0xa6b5, 0x000c,
+        0x681c, 0xd0b4, 0x0128, 0xc685, 0x7003, 0x0000, 0x7007, 0x0004,
+        0x2049, 0x4235, 0x6828, 0xa055, 0x00d6, 0x0904, 0x4296, 0x2d70,
+        0x2e60, 0x7004, 0xa0bc, 0x000f, 0xa7b8, 0x401d, 0x273c, 0x87fb,
+        0x1140, 0x0210, 0x080c, 0x2575, 0x709c, 0xa075, 0x2060, 0x0570,
+        0x0c80, 0x2704, 0xae68, 0x6808, 0xa422, 0x680c, 0xa31b, 0x0268,
+        0x8a51, 0x1110, 0x080c, 0x2575, 0x8738, 0x2704, 0xa005, 0x1d90,
+        0x709c, 0xa075, 0x2060, 0x01d0, 0x08e0, 0x8422, 0x8420, 0x831a,
+        0xa399, 0x0000, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300, 0xa11b,
+        0x1210, 0x080c, 0x2575, 0xb284, 0x0200, 0x0118, 0x2071, 0x0050,
+        0x0010, 0x2071, 0x0020, 0x00de, 0x0804, 0x41c3, 0x00de, 0x012e,
+        0x2000, 0x0005, 0x7008, 0x0006, 0xa084, 0x01e0, 0x000e, 0x0110,
+        0xa006, 0x0005, 0xa084, 0x0003, 0xa086, 0x0003, 0x1108, 0x0005,
+        0x2704, 0xac78, 0x7800, 0x2f08, 0xd094, 0x1904, 0x43a6, 0x701a,
+        0x7804, 0x701e, 0x7808, 0x7012, 0x780c, 0x7016, 0x6004, 0xd09c,
+        0x0120, 0x7810, 0x7022, 0x7814, 0x7026, 0x7602, 0x7004, 0xa084,
+        0x0010, 0xc085, 0x7006, 0x2079, 0x4700, 0x8a51, 0x01e8, 0x8738,
+        0x2704, 0xa005, 0x1168, 0x609c, 0xa005, 0x01b8, 0x2060, 0x6004,
+        0xa084, 0x000f, 0xa080, 0x401d, 0x203c, 0x87fb, 0x090c, 0x2575,
+        0x7008, 0x0006, 0xa084, 0x01e0, 0x000e, 0x0110, 0xa006, 0x0028,
+        0xa084, 0x0003, 0xa086, 0x0003, 0x0005, 0x2051, 0x0000, 0x0005,
+        0x0126, 0x0006, 0x00d6, 0x70d0, 0xa084, 0x4c00, 0x8004, 0x2090,
+        0x00de, 0x008e, 0x7108, 0xa184, 0x0003, 0x1128, 0x6828, 0xa005,
+        0x0178, 0x0804, 0x3f6d, 0x7108, 0xd1fc, 0x0118, 0x080c, 0x40d6,
+        0x0c88, 0x7007, 0x0010, 0x7108, 0xd1fc, 0x0de8, 0x080c, 0x40d6,
+        0x7008, 0xa086, 0x0008, 0x1d30, 0x7000, 0xa005, 0x1d18, 0x7003,
+        0x0000, 0x2049, 0x0000, 0x0006, 0x2001, 0x4701, 0x2004, 0xd0cc,
+        0x0110, 0x080c, 0x435b, 0x000e, 0x012e, 0x2000, 0x0005, 0x0126,
+        0x0146, 0x0136, 0x0156, 0x00c6, 0x00d6, 0x70d0, 0xa084, 0x4c00,
+        0x8004, 0x2090, 0x00de, 0x2049, 0x431f, 0xad80, 0x0011, 0x20a0,
+        0xb284, 0x0200, 0x0118, 0x2099, 0x0032, 0x0010, 0x2099, 0x0031,
+        0x700c, 0xa084, 0x07ff, 0x682a, 0x7007, 0x0008, 0x7007, 0x0002,
+        0x7003, 0x0001, 0x0118, 0x8000, 0x80ac, 0x53a5, 0x700c, 0xa084,
+        0x07ff, 0x0130, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x1de0,
+        0x00ce, 0x2049, 0x0000, 0x7003, 0x0000, 0x015e, 0x013e, 0x014e,
+        0x012e, 0x2000, 0x0005, 0x6814, 0xd0fc, 0x0904, 0x439e, 0x7000,
+        0xd084, 0x05e0, 0x7e24, 0xa6b5, 0x0004, 0x7007, 0x0004, 0x7004,
+        0xa084, 0x0004, 0x1de0, 0x7118, 0x0016, 0x711c, 0x0016, 0x7120,
+        0x0016, 0x7124, 0x0016, 0x701b, 0x0000, 0x701f, 0x3fff, 0x7023,
+        0x0000, 0x7027, 0x0000, 0x7013, 0x0004, 0x7017, 0x0000, 0x7602,
+        0x7007, 0x0001, 0x2001, 0xffff, 0x2009, 0x0031, 0x200a, 0x200a,
+        0x7108, 0x7008, 0xa106, 0x1de0, 0xd1fc, 0x0dd0, 0x002e, 0x7226,
+        0x002e, 0x7222, 0x002e, 0x721e, 0x002e, 0x721a, 0x7007, 0x0002,
+        0x7008, 0xa086, 0x0008, 0x0110, 0x0804, 0x410e, 0x7007, 0x0004,
+        0x7003, 0x0000, 0x0005, 0x2049, 0x41c3, 0x0068, 0x7008, 0xa084,
+        0x0003, 0x0110, 0xa006, 0x0005, 0xa006, 0x2020, 0x2018, 0x2c58,
+        0x2160, 0x2049, 0x0000, 0x8b58, 0x6100, 0x2100, 0xa408, 0x711a,
+        0x6004, 0xa301, 0x701e, 0x0006, 0x2b04, 0xa084, 0x0008, 0x0150,
+        0x6010, 0xa081, 0x0000, 0x7022, 0x0006, 0x6014, 0xa081, 0x0000,
+        0x7026, 0x0006, 0xa184, 0x0007, 0x2011, 0x0008, 0xa22a, 0x6208,
+        0x2400, 0xa212, 0x0026, 0x620c, 0x2240, 0x2300, 0xa843, 0x002e,
+        0x88ff, 0x1170, 0x2500, 0xa202, 0x0108, 0x1250, 0x2220, 0x2041,
+        0x0000, 0x2b04, 0xd09c, 0x0110, 0x000e, 0x000e, 0x000e, 0x0450,
+        0x7512, 0x7017, 0x0000, 0x7602, 0xa986, 0x41c3, 0x1118, 0x7007,
+        0x0001, 0x0028, 0x7004, 0xa084, 0x0010, 0xc085, 0x7006, 0x2500,
+        0xa100, 0x701a, 0x2b04, 0xa084, 0x0008, 0x0110, 0x000e, 0x004e,
+        0x001e, 0xa189, 0x0000, 0x711e, 0x2b0c, 0xa18c, 0x0008, 0x0130,
+        0xa4a1, 0x0000, 0x7422, 0xa081, 0x0000, 0x7026, 0x2500, 0xa222,
+        0xa8c3, 0x0000, 0x7412, 0x2820, 0x7416, 0x7602, 0xa986, 0x41c3,
+        0x1118, 0x7007, 0x0001, 0x0028, 0x7004, 0xa084, 0x0010, 0xc085,
+        0x7006, 0x8b59, 0x2b60, 0x2079, 0x4700, 0x080c, 0x42c5, 0xa006,
+        0x0005, 0x2091, 0x8000, 0x2091, 0x6000, 0x78ac, 0xa005, 0x1168,
+        0x7974, 0x70d0, 0xa106, 0x1148, 0x781c, 0xa005, 0x0130, 0x781f,
+        0x0000, 0x0e04, 0x443d, 0x2091, 0x4080, 0x2069, 0x4780, 0xc7fd,
+        0x6800, 0xa084, 0x000f, 0x1198, 0x68d0, 0xd0b4, 0x0180, 0xd0bc,
+        0x1170, 0x00f6, 0x2079, 0x0100, 0xd7fc, 0x1110, 0x2079, 0x0200,
+        0x7830, 0xa084, 0x00c0, 0x1110, 0x080c, 0x22d5, 0x00fe, 0xd7fc,
+        0x0120, 0x2069, 0x4740, 0xc7fc, 0x0c18, 0x7830, 0x8001, 0x7832,
+        0x1904, 0x44c7, 0x7834, 0x7832, 0x2061, 0x6cc0, 0x2069, 0x4780,
+        0xc7fd, 0x68cc, 0xa005, 0x0128, 0x8001, 0x68ce, 0x1110, 0x080c,
+        0x4639, 0x6800, 0xa084, 0x000f, 0x0168, 0xa086, 0x0001, 0x0150,
+        0x6840, 0xa00d, 0x0138, 0x2104, 0xa005, 0x0120, 0x8001, 0x200a,
+        0x0904, 0x45d6, 0x6814, 0xa005, 0x01a8, 0x8001, 0x6816, 0x1190,
+        0x68a3, 0x0001, 0x00f6, 0xd7fc, 0x1118, 0x2079, 0x0200, 0x0010,
+        0x2079, 0x0100, 0x080c, 0x3c6e, 0x00fe, 0x6860, 0xa005, 0x0110,
+        0x080c, 0x22d5, 0x687c, 0xa005, 0x0140, 0x8001, 0x687e, 0x1128,
+        0x6863, 0x0000, 0x68d0, 0xc0c5, 0x68d2, 0x68d0, 0xd0fc, 0x01b0,
+        0xc0fc, 0x68d2, 0x20a9, 0x0200, 0x6034, 0xa005, 0x0158, 0x8001,
+        0x6036, 0x68d0, 0xc0fd, 0x68d2, 0x1128, 0x6010, 0xa005, 0x0110,
+        0x080c, 0x22d5, 0xace0, 0x0010, 0x1f04, 0x44ac, 0xd7fc, 0x0138,
+        0x2061, 0x4cc0, 0x2069, 0x4740, 0xc7fc, 0x0804, 0x4469, 0x0459,
+        0x7838, 0x8001, 0x783a, 0x11a0, 0x783c, 0x783a, 0x2061, 0x4cc0,
+        0x2069, 0x4740, 0xc7fc, 0x680c, 0xa005, 0x0110, 0x080c, 0x4543,
+        0xd7fc, 0x1130, 0x2061, 0x6cc0, 0x2069, 0x4780, 0xc7fd, 0x0c98,
+        0x7810, 0xd0cc, 0x0168, 0xd0ac, 0x1120, 0xd0a4, 0x0148, 0xc0ad,
+        0x7812, 0x2091, 0x8001, 0x0e04, 0x44ef, 0x080c, 0x20a1, 0x0005,
+        0x2091, 0x8001, 0x0005, 0x7840, 0x8001, 0x7842, 0x1904, 0x4542,
+        0x7844, 0x7842, 0x2069, 0x4740, 0xc7fc, 0x2079, 0x0200, 0x68d4,
+        0xa005, 0x0138, 0x7de0, 0xa504, 0x1120, 0x68d6, 0x68d0, 0xc0bc,
+        0x68d2, 0x2079, 0x4700, 0x6810, 0xa005, 0x1110, 0x2001, 0x0101,
+        0x8001, 0x6812, 0xd7fc, 0x0118, 0xa080, 0x8dd0, 0x0010, 0xa080,
+        0x8cc0, 0x2040, 0x2004, 0xa065, 0x01e0, 0x6024, 0xa005, 0x01b0,
+        0x8001, 0x6026, 0x1198, 0x6800, 0xa005, 0x0130, 0x6848, 0xac06,
+        0x1118, 0x080c, 0x45d6, 0x0068, 0x6860, 0xa005, 0x0118, 0x6027,
+        0x0001, 0x0020, 0x080c, 0x4584, 0x2804, 0x0c28, 0x6000, 0x2c40,
+        0x0c10, 0xd7fc, 0x1138, 0x2069, 0x4780, 0xc7fd, 0x2079, 0x0100,
+        0x0804, 0x44ff, 0x0005, 0x2009, 0x0000, 0x20a9, 0x0200, 0x6008,
+        0xd09c, 0x0558, 0x6024, 0xa005, 0x0118, 0x8001, 0x6026, 0x0418,
+        0x6008, 0xc09c, 0xd084, 0x1110, 0xd0ac, 0x01c0, 0x600a, 0x6004,
+        0xa005, 0x01d8, 0x00d6, 0x00c6, 0x0016, 0x2068, 0x6010, 0x8001,
+        0x6012, 0x080c, 0x37c7, 0x2d00, 0x2c68, 0x2060, 0x080c, 0x1c02,
+        0x080c, 0x1db2, 0x001e, 0x00ce, 0x00de, 0x0038, 0xc0bd, 0x600a,
+        0xa18d, 0x0001, 0x0010, 0xa18d, 0x0100, 0xace0, 0x0010, 0x1f04,
+        0x4547, 0xa184, 0x0001, 0x0130, 0xa18c, 0xfffe, 0x690e, 0x080c,
+        0x22d5, 0x0008, 0x690e, 0x0005, 0x2c00, 0x687a, 0x6714, 0x6f72,
+        0x6017, 0x0000, 0x602b, 0x0000, 0x601b, 0x0006, 0x60b4, 0xa084,
+        0x5f00, 0x601e, 0x6020, 0xa084, 0x00ff, 0xa085, 0x0060, 0x6022,
+        0x6000, 0x2042, 0x2069, 0x4780, 0xd7fc, 0x1110, 0x2069, 0x4740,
+        0x6858, 0xac06, 0x1110, 0x2800, 0x685a, 0x080c, 0x1b9a, 0x6818,
+        0xa005, 0x0110, 0x8001, 0x681a, 0x6808, 0xc0a4, 0x680a, 0x6810,
+        0x7908, 0x8109, 0x790a, 0x8001, 0x1310, 0x080c, 0x2575, 0x6812,
+        0x1118, 0x7910, 0xc1a5, 0x7912, 0x602f, 0x0000, 0x6033, 0x0000,
+        0x2c68, 0x080c, 0x1dbf, 0xd7fc, 0x1118, 0x2069, 0x4740, 0x0010,
+        0x2069, 0x4780, 0x6910, 0xa184, 0x0100, 0x2001, 0x0006, 0x1118,
+        0x6976, 0x2001, 0x0004, 0x080c, 0x22cb, 0x0005, 0x00d6, 0x6948,
+        0x2160, 0xd7fc, 0x1118, 0x2069, 0x0200, 0x0010, 0x2069, 0x0100,
+        0x080c, 0x2490, 0x601b, 0x0006, 0x6858, 0xa084, 0x5f00, 0x601e,
+        0x6020, 0xa084, 0x00ff, 0xa085, 0x0048, 0x6022, 0x602f, 0x0000,
+        0x6033, 0x0000, 0x6808, 0xa084, 0xfffd, 0x680a, 0x6830, 0xd0b4,
+        0x01b0, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848, 0xd094, 0x0110,
+        0x1f04, 0x45fd, 0x684b, 0x0009, 0x20a9, 0x0014, 0x6848, 0xd084,
+        0x0110, 0x1f04, 0x4606, 0x20a9, 0x00fa, 0x1f04, 0x460d, 0x681b,
+        0x0054, 0x00de, 0x6863, 0x0007, 0x0005, 0x2079, 0x4700, 0x00e1,
+        0x0089, 0x00a9, 0x2009, 0x0002, 0x2069, 0x4780, 0x680f, 0x0000,
+        0x6813, 0x0000, 0x6817, 0x0000, 0x8109, 0x0118, 0x2069, 0x4740,
+        0x0ca8, 0x0005, 0x2019, 0x00a3, 0x7b3a, 0x7b3e, 0x0005, 0x2019,
+        0x0033, 0x7b42, 0x7b46, 0x0005, 0x2019, 0x32dd, 0x7b32, 0x7b36,
+        0x0005, 0x6a4c, 0xa285, 0x0000, 0x01f0, 0x6950, 0x6bbc, 0xa300,
+        0x00c6, 0x2164, 0x6304, 0x83ff, 0x1138, 0x8211, 0x0148, 0x8108,
+        0xa11a, 0x0eb8, 0x69bc, 0x0ca8, 0x68cf, 0x000a, 0x00ce, 0x0005,
+        0x694c, 0x6abc, 0x2264, 0x6008, 0xc0b5, 0x600a, 0x8210, 0x8109,
+        0x1dc8, 0x694e, 0x00ce, 0x0005, 0x0016, 0x1d04, 0x465d, 0x2091,
+        0x6000, 0x1d04, 0x4661, 0x2091, 0x6000, 0x70ec, 0xd0dc, 0x1118,
+        0xd0d4, 0x0190, 0x00a0, 0xae8e, 0x0100, 0x0138, 0x7814, 0xc0f5,
+        0xc0c5, 0x7816, 0xd0d4, 0x1580, 0x0460, 0x7814, 0xc0fd, 0xc0c5,
+        0x7816, 0xd0d4, 0x1548, 0x0428, 0xd0e4, 0x0904, 0x46c4, 0x1d04,
+        0x467f, 0x2091, 0x6000, 0x2009, 0x000c, 0x1d04, 0x4685, 0x2091,
+        0x6000, 0x8109, 0x1dd0, 0x70e4, 0xa084, 0x01ff, 0xa086, 0x01ff,
+        0x1110, 0x70ec, 0x08c0, 0xae8e, 0x0100, 0x0128, 0x7814, 0xc0f4,
+        0xd0fc, 0x1130, 0x0020, 0x7814, 0xc0fc, 0xd0f4, 0x1108, 0xc0c4,
+        0x7816, 0x7804, 0xd08c, 0x0500, 0x00c6, 0x2061, 0x0000, 0x6018,
+        0xd084, 0x11b8, 0xae86, 0x0200, 0x00e6, 0x2071, 0x0010, 0x0120,
+        0x70db, 0x0001, 0x78e4, 0x0018, 0x70db, 0x0000, 0x78e0, 0x70c6,
+        0x70c3, 0x800e, 0x601b, 0x0001, 0x2091, 0x4080, 0x00ee, 0x00ce,
+        0x0018, 0x00ce, 0x681f, 0x000c, 0x001e, 0x70a0, 0x70a2, 0x0005,
+        0x0c26
 };
 #ifdef UNIQUE_FW_NAME
-static unsigned short   fw12160i_length01 = 0x35e6;
+static unsigned short fw12160i_length01 = 0x36c9;
 #else
-static unsigned short   risc_code_length01 = 0x35e6;
+static unsigned short risc_code_length01 = 0x36c9;
 #endif
+
diff --git a/drivers/scsi/ql1280_fw.h b/drivers/scsi/ql1280_fw.h
index 2621e99a4311..784f2a04bf28 100644
--- a/drivers/scsi/ql1280_fw.h
+++ b/drivers/scsi/ql1280_fw.h
@@ -23,25 +23,25 @@
 
 
 /*
- *      Firmware Version 8.15.00 (14:35 Aug 22, 2000)
+ *      Firmware Version 8.15.11 (10:20 Jan 02, 2002)
  */
 
 #ifdef UNIQUE_FW_NAME
-static unsigned char fw1280ei_version_str[] = {8,15,0};
+static unsigned char fw1280ei_version_str[] = {8,15,11};
 #else
-static unsigned char firmware_version[] = {8,15,0};
+static unsigned char firmware_version[] = {8,15,11};
 #endif
 
 #ifdef UNIQUE_FW_NAME
-#define fw1280ei_VERSION_STRING "8.15.00"
+#define fw1280ei_VERSION_STRING "8.15.11"
 #else
-#define FW_VERSION_STRING "8.15.00"
+#define FW_VERSION_STRING "8.15.11"
 #endif
 
 #ifdef UNIQUE_FW_NAME
-static unsigned short fw1280ei_addr01 = 0x1000;
+static unsigned short fw1280ei_addr01 = 0x1000 ;
 #else
-static unsigned short risc_code_addr01 = 0x1000;
+static unsigned short risc_code_addr01 = 0x1000 ;
 #endif
 
 #ifdef UNIQUE_FW_NAME
@@ -49,7 +49,7 @@ static unsigned short fw1280ei_code01[] = {
 #else
 static unsigned short risc_code01[] = {
 #endif
-        0x0078, 0x1041, 0x0000, 0x3d3b, 0x0000, 0x2043, 0x4f50, 0x5952,
+        0x0078, 0x1041, 0x0000, 0x3e2e, 0x0000, 0x2043, 0x4f50, 0x5952,
         0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31,
         0x3939, 0x332c, 0x3139, 0x3934, 0x2051, 0x4c4f, 0x4749, 0x4320,
         0x434f, 0x5250, 0x4f52, 0x4154, 0x494f, 0x4e00, 0x2049, 0x5350,
@@ -57,7 +57,7 @@ static unsigned short risc_code01[] = {
         0x6572, 0x7369, 0x6f6e, 0x2030, 0x382e, 0x3135, 0x2020, 0x2043,
         0x7573, 0x746f, 0x6d65, 0x7220, 0x4e6f, 0x2e20, 0x3030, 0x2050,
         0x726f, 0x6475, 0x6374, 0x204e, 0x6f2e, 0x2020, 0x3030, 0x2020,
-        0x2400, 0x20c9, 0x97ff, 0x2001, 0x04fc, 0x2004, 0xa086, 0x1080,
+        0x2400, 0x20c9, 0x98ff, 0x2001, 0x04fc, 0x2004, 0xa086, 0x1080,
         0x00c0, 0x1054, 0x2071, 0x0100, 0x70a0, 0x70a2, 0x20c1, 0x0010,
         0x2089, 0x1374, 0x0078, 0x106d, 0x2001, 0x04fc, 0x2004, 0xa086,
         0x1280, 0x00c0, 0x1069, 0x2071, 0x0200, 0x70a0, 0x70a2, 0x2071,
@@ -70,1660 +70,1670 @@ static unsigned short risc_code01[] = {
         0xa286, 0xa5a5, 0x0040, 0x10a4, 0xa386, 0x000f, 0x0040, 0x10a0,
         0x2c6a, 0x2a5a, 0x20c1, 0x0020, 0x2019, 0x000f, 0x0078, 0x1080,
         0x2c6a, 0x2a5a, 0x0078, 0x10a2, 0x2c6a, 0x2a5a, 0x2130, 0x2128,
-        0xa1a2, 0x4e00, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424,
-        0xa192, 0x9800, 0x2009, 0x0000, 0x2001, 0x0032, 0x1078, 0x207a,
-        0x2218, 0x2079, 0x4e00, 0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9,
+        0xa1a2, 0x4f00, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424, 0x8424,
+        0xa192, 0x9900, 0x2009, 0x0000, 0x2001, 0x0032, 0x1078, 0x20c1,
+        0x2218, 0x2079, 0x4f00, 0x2fa0, 0x2408, 0x2011, 0x0000, 0x20a9,
         0x0040, 0x42a4, 0x8109, 0x00c0, 0x10bf, 0x2009, 0xff00, 0x3400,
         0xa102, 0x0048, 0x10cf, 0x0040, 0x10cf, 0x20a8, 0x42a4, 0x2001,
         0x04fc, 0x2004, 0xa086, 0x1080, 0x00c0, 0x10e5, 0x2071, 0x0100,
-        0x0d7e, 0x2069, 0x4e40, 0x1078, 0x4cdd, 0x0d7f, 0x7810, 0xc0ed,
+        0x0d7e, 0x2069, 0x4f40, 0x1078, 0x4db0, 0x0d7f, 0x7810, 0xc0ed,
         0x7812, 0x781b, 0x0064, 0x0078, 0x110a, 0x2001, 0x04fc, 0x2004,
         0xa086, 0x1280, 0x00c0, 0x1105, 0x7814, 0xc0ed, 0xc0d5, 0x7816,
-        0x781b, 0x0064, 0x2071, 0x0200, 0x0d7e, 0x2069, 0x4e40, 0x1078,
-        0x4cdd, 0x2069, 0x4e80, 0x2071, 0x0100, 0x1078, 0x4cdd, 0x7814,
+        0x781b, 0x0064, 0x2071, 0x0200, 0x0d7e, 0x2069, 0x4f40, 0x1078,
+        0x4db0, 0x2069, 0x4f80, 0x2071, 0x0100, 0x1078, 0x4db0, 0x7814,
         0xc0d4, 0x7816, 0x0d7f, 0x0078, 0x110a, 0x7814, 0xc0e5, 0x7816,
         0x781b, 0x003c, 0x7eca, 0x7cc2, 0x7bc6, 0x7867, 0x0000, 0x7800,
         0xc08d, 0x7802, 0x2031, 0x0030, 0x78af, 0x0101, 0x7823, 0x0002,
-        0x7827, 0x0002, 0x2009, 0x0002, 0x2069, 0x4e40, 0x681b, 0x0003,
+        0x7827, 0x0002, 0x2009, 0x0002, 0x2069, 0x4f40, 0x681b, 0x0003,
         0x6823, 0x0007, 0x6827, 0x00fa, 0x682b, 0x0008, 0x682f, 0x0028,
         0x6837, 0x0000, 0x683b, 0x0006, 0x6833, 0x0008, 0x683f, 0x0000,
-        0x8109, 0x0040, 0x115e, 0x68d3, 0x000a, 0x68c3, 0x4ec0, 0x2079,
-        0x4e00, 0x7814, 0xd0e4, 0x00c0, 0x1144, 0xd0ec, 0x00c0, 0x1148,
+        0x8109, 0x0040, 0x115e, 0x68d3, 0x000a, 0x68c3, 0x4fc0, 0x2079,
+        0x4f00, 0x7814, 0xd0e4, 0x00c0, 0x1144, 0xd0ec, 0x00c0, 0x1148,
         0x68d7, 0x7329, 0x0078, 0x114a, 0x68d7, 0x730d, 0x0078, 0x114a,
-        0x68d7, 0x732d, 0x68c7, 0x53c0, 0x68cb, 0x52c0, 0x68cf, 0x93c0,
-        0x68ab, 0x9644, 0x68af, 0x9649, 0x68b3, 0x9644, 0x68b7, 0x9644,
-        0x68a7, 0x0001, 0x2069, 0x4e80, 0x0078, 0x111e, 0x68d3, 0x000a,
-        0x68c3, 0x50c0, 0x7814, 0xd0e4, 0x00c0, 0x116a, 0x68d7, 0x7439,
-        0x0078, 0x116c, 0x68d7, 0x7419, 0x68c7, 0x73c0, 0x68cb, 0x5340,
-        0x68cf, 0x94d0, 0x68ab, 0x9649, 0x68af, 0x964e, 0x68b3, 0x9649,
-        0x68b7, 0x9649, 0x68a7, 0x0001, 0x7810, 0xd0ec, 0x00c0, 0x11c2,
-        0x7814, 0xd0e4, 0x00c0, 0x11b4, 0x0e7e, 0x2069, 0x52c0, 0x2071,
+        0x68d7, 0x732d, 0x68c7, 0x54c0, 0x68cb, 0x53c0, 0x68cf, 0x94c0,
+        0x68ab, 0x9744, 0x68af, 0x9749, 0x68b3, 0x9744, 0x68b7, 0x9744,
+        0x68a7, 0x0001, 0x2069, 0x4f80, 0x0078, 0x111e, 0x68d3, 0x000a,
+        0x68c3, 0x51c0, 0x7814, 0xd0e4, 0x00c0, 0x116a, 0x68d7, 0x7439,
+        0x0078, 0x116c, 0x68d7, 0x7419, 0x68c7, 0x74c0, 0x68cb, 0x5440,
+        0x68cf, 0x95d0, 0x68ab, 0x9749, 0x68af, 0x974e, 0x68b3, 0x9749,
+        0x68b7, 0x9749, 0x68a7, 0x0001, 0x7810, 0xd0ec, 0x00c0, 0x11c2,
+        0x7814, 0xd0e4, 0x00c0, 0x11b4, 0x0e7e, 0x2069, 0x53c0, 0x2071,
         0x0200, 0x70ec, 0xd0e4, 0x00c0, 0x1195, 0x2019, 0x0c0c, 0x2021,
-        0x000c, 0x1078, 0x2009, 0x0078, 0x119b, 0x2019, 0x0c0a, 0x2021,
-        0x000a, 0x1078, 0x2009, 0x2069, 0x5340, 0x2071, 0x0100, 0x70ec,
+        0x000c, 0x1078, 0x2050, 0x0078, 0x119b, 0x2019, 0x0c0a, 0x2021,
+        0x000a, 0x1078, 0x2050, 0x2069, 0x5440, 0x2071, 0x0100, 0x70ec,
         0xd0e4, 0x00c0, 0x11ab, 0x2019, 0x0c0c, 0x2021, 0x000c, 0x1078,
-        0x2009, 0x0078, 0x11b1, 0x2019, 0x0c0a, 0x2021, 0x000a, 0x1078,
-        0x2009, 0x0e7f, 0x0078, 0x11db, 0x2019, 0x0c0c, 0x2021, 0x000c,
-        0x2069, 0x52c0, 0x1078, 0x2009, 0x2069, 0x5340, 0x1078, 0x2009,
-        0x0078, 0x11db, 0x2069, 0x52c0, 0x0e7e, 0x2071, 0x0100, 0x70ec,
+        0x2050, 0x0078, 0x11b1, 0x2019, 0x0c0a, 0x2021, 0x000a, 0x1078,
+        0x2050, 0x0e7f, 0x0078, 0x11db, 0x2019, 0x0c0c, 0x2021, 0x000c,
+        0x2069, 0x53c0, 0x1078, 0x2050, 0x2069, 0x5440, 0x1078, 0x2050,
+        0x0078, 0x11db, 0x2069, 0x53c0, 0x0e7e, 0x2071, 0x0100, 0x70ec,
         0xd0e4, 0x00c0, 0x11d4, 0x2019, 0x0c0c, 0x2021, 0x000c, 0x1078,
-        0x2009, 0x0e7f, 0x0078, 0x11db, 0x2019, 0x0c0a, 0x2021, 0x000a,
-        0x1078, 0x2009, 0x0e7f, 0x2011, 0x0002, 0x2069, 0x53c0, 0x2009,
+        0x2050, 0x0e7f, 0x0078, 0x11db, 0x2019, 0x0c0a, 0x2021, 0x000a,
+        0x1078, 0x2050, 0x0e7f, 0x2011, 0x0002, 0x2069, 0x54c0, 0x2009,
         0x0002, 0x20a9, 0x0100, 0x6837, 0x0000, 0x680b, 0x0040, 0x7bc8,
         0xa386, 0xfeff, 0x00c0, 0x11f2, 0x6817, 0x0100, 0x681f, 0x0064,
         0x0078, 0x11f6, 0x6817, 0x0064, 0x681f, 0x0002, 0xade8, 0x0010,
         0x00f0, 0x11e3, 0x8109, 0x00c0, 0x11e1, 0x8211, 0x0040, 0x1204,
-        0x2069, 0x73c0, 0x0078, 0x11df, 0x1078, 0x265b, 0x1078, 0x468e,
-        0x1078, 0x1dd4, 0x1078, 0x4c6f, 0x2091, 0x2100, 0x2079, 0x4e00,
+        0x2069, 0x74c0, 0x0078, 0x11df, 0x1078, 0x26a2, 0x1078, 0x4712,
+        0x1078, 0x1e1b, 0x1078, 0x4d42, 0x2091, 0x2100, 0x2079, 0x4f00,
         0x7810, 0xd0ec, 0x0040, 0x1218, 0x2071, 0x0020, 0x0078, 0x121a,
-        0x2071, 0x0050, 0x2091, 0x2200, 0x2079, 0x4e00, 0x2071, 0x0020,
-        0x2091, 0x2300, 0x2079, 0x4e00, 0x7810, 0xd0ec, 0x0040, 0x122c,
-        0x2079, 0x0100, 0x0078, 0x122e, 0x2079, 0x0200, 0x2071, 0x4e40,
-        0x2091, 0x2400, 0x2079, 0x0100, 0x2071, 0x4e80, 0x2091, 0x2000,
-        0x2079, 0x4e00, 0x2071, 0x0010, 0x3200, 0xa085, 0x303d, 0x2090,
+        0x2071, 0x0050, 0x2091, 0x2200, 0x2079, 0x4f00, 0x2071, 0x0020,
+        0x2091, 0x2300, 0x2079, 0x4f00, 0x7810, 0xd0ec, 0x0040, 0x122c,
+        0x2079, 0x0100, 0x0078, 0x122e, 0x2079, 0x0200, 0x2071, 0x4f40,
+        0x2091, 0x2400, 0x2079, 0x0100, 0x2071, 0x4f80, 0x2091, 0x2000,
+        0x2079, 0x4f00, 0x2071, 0x0010, 0x3200, 0xa085, 0x303d, 0x2090,
         0x2071, 0x0010, 0x70c3, 0x0000, 0x0090, 0x124d, 0x70c0, 0xa086,
-        0x0002, 0x00c0, 0x124d, 0x1078, 0x15ba, 0x2039, 0x0000, 0x7810,
+        0x0002, 0x00c0, 0x124d, 0x1078, 0x15c1, 0x2039, 0x0000, 0x7810,
         0xd0ec, 0x00c0, 0x12cf, 0x1078, 0x148e, 0x78ac, 0xa005, 0x00c0,
         0x126b, 0x0068, 0x1261, 0x786c, 0xa065, 0x0040, 0x1261, 0x1078,
-        0x2395, 0x1078, 0x20a1, 0x0068, 0x1278, 0x786c, 0xa065, 0x0040,
-        0x126b, 0x1078, 0x2395, 0x0068, 0x1278, 0x2009, 0x4e47, 0x2011,
-        0x4e87, 0x2104, 0x220c, 0xa105, 0x0040, 0x1278, 0x1078, 0x1f0a,
-        0x2071, 0x4e40, 0x70a4, 0xa005, 0x0040, 0x129d, 0x7450, 0xa485,
+        0x23dc, 0x1078, 0x20e8, 0x0068, 0x1278, 0x786c, 0xa065, 0x0040,
+        0x126b, 0x1078, 0x23dc, 0x0068, 0x1278, 0x2009, 0x4f47, 0x2011,
+        0x4f87, 0x2104, 0x220c, 0xa105, 0x0040, 0x1278, 0x1078, 0x1f51,
+        0x2071, 0x4f40, 0x70a4, 0xa005, 0x0040, 0x129d, 0x7450, 0xa485,
         0x0000, 0x0040, 0x129d, 0x2079, 0x0200, 0x2091, 0x8000, 0x72d4,
-        0xa28c, 0x303d, 0x2190, 0x1078, 0x2b6a, 0x2091, 0x8000, 0x2091,
-        0x303d, 0x0068, 0x129d, 0x2079, 0x4e00, 0x786c, 0xa065, 0x0040,
-        0x129d, 0x2071, 0x0010, 0x1078, 0x2395, 0x00e0, 0x12a5, 0x2079,
-        0x4e00, 0x2071, 0x0010, 0x1078, 0x4a43, 0x2071, 0x4e80, 0x70a4,
+        0xa28c, 0x303d, 0x2190, 0x1078, 0x2bb1, 0x2091, 0x8000, 0x2091,
+        0x303d, 0x0068, 0x129d, 0x2079, 0x4f00, 0x786c, 0xa065, 0x0040,
+        0x129d, 0x2071, 0x0010, 0x1078, 0x23dc, 0x00e0, 0x12a5, 0x2079,
+        0x4f00, 0x2071, 0x0010, 0x1078, 0x4b16, 0x2071, 0x4f80, 0x70a4,
         0xa005, 0x0040, 0x12bd, 0x7050, 0xa025, 0x0040, 0x12bd, 0x2079,
         0x0100, 0x2091, 0x8000, 0x72d4, 0xa28c, 0x303d, 0x2190, 0x1078,
-        0x2b6a, 0x2091, 0x8000, 0x2091, 0x303d, 0x2079, 0x4e00, 0x2071,
+        0x2bb1, 0x2091, 0x8000, 0x2091, 0x303d, 0x2079, 0x4f00, 0x2071,
         0x0010, 0x0068, 0x12c9, 0x786c, 0xa065, 0x0040, 0x12c9, 0x1078,
-        0x2395, 0x00e0, 0x1253, 0x1078, 0x4a43, 0x0078, 0x1253, 0x1078,
+        0x23dc, 0x00e0, 0x1253, 0x1078, 0x4b16, 0x0078, 0x1253, 0x1078,
         0x148e, 0x78ac, 0xa005, 0x00c0, 0x12e7, 0x0068, 0x12dd, 0x786c,
-        0xa065, 0x0040, 0x12dd, 0x1078, 0x2395, 0x1078, 0x20a1, 0x0068,
-        0x12f1, 0x786c, 0xa065, 0x0040, 0x12e7, 0x1078, 0x2395, 0x0068,
-        0x12f1, 0x2009, 0x4e47, 0x2104, 0xa005, 0x0040, 0x12f1, 0x1078,
-        0x1f0a, 0x2071, 0x4e40, 0x70a4, 0xa005, 0x0040, 0x130c, 0x7450,
+        0xa065, 0x0040, 0x12dd, 0x1078, 0x23dc, 0x1078, 0x20e8, 0x0068,
+        0x12f1, 0x786c, 0xa065, 0x0040, 0x12e7, 0x1078, 0x23dc, 0x0068,
+        0x12f1, 0x2009, 0x4f47, 0x2104, 0xa005, 0x0040, 0x12f1, 0x1078,
+        0x1f51, 0x2071, 0x4f40, 0x70a4, 0xa005, 0x0040, 0x130c, 0x7450,
         0xa485, 0x0000, 0x0040, 0x130c, 0x2079, 0x0100, 0x2091, 0x8000,
-        0x72d4, 0xa28c, 0x303d, 0x2190, 0x1078, 0x2b6a, 0x2091, 0x8000,
-        0x2091, 0x303d, 0x2079, 0x4e00, 0x2071, 0x0010, 0x0068, 0x1316,
-        0x786c, 0xa065, 0x0040, 0x1316, 0x1078, 0x2395, 0x00e0, 0x12cf,
-        0x1078, 0x4a43, 0x0078, 0x12cf, 0x133c, 0x133c, 0x133e, 0x133e,
+        0x72d4, 0xa28c, 0x303d, 0x2190, 0x1078, 0x2bb1, 0x2091, 0x8000,
+        0x2091, 0x303d, 0x2079, 0x4f00, 0x2071, 0x0010, 0x0068, 0x1316,
+        0x786c, 0xa065, 0x0040, 0x1316, 0x1078, 0x23dc, 0x00e0, 0x12cf,
+        0x1078, 0x4b16, 0x0078, 0x12cf, 0x133c, 0x133c, 0x133e, 0x133e,
         0x134b, 0x134b, 0x134b, 0x134b, 0x1356, 0x1356, 0x1363, 0x1363,
         0x134b, 0x134b, 0x134b, 0x134b, 0x133c, 0x133c, 0x133e, 0x133e,
         0x134b, 0x134b, 0x134b, 0x134b, 0x1356, 0x1356, 0x1363, 0x1363,
         0x134b, 0x134b, 0x134b, 0x134b, 0x0078, 0x133c, 0x007e, 0x107e,
-        0x127e, 0x2091, 0x2400, 0x1078, 0x298a, 0x127f, 0x107f, 0x007f,
+        0x127e, 0x2091, 0x2400, 0x1078, 0x29d1, 0x127f, 0x107f, 0x007f,
         0x2091, 0x8001, 0x007c, 0x007e, 0x107e, 0x127e, 0x1078, 0x13c8,
         0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007e, 0x107e,
-        0x127e, 0x2091, 0x2300, 0x1078, 0x298a, 0x127f, 0x107f, 0x007f,
+        0x127e, 0x2091, 0x2300, 0x1078, 0x29d1, 0x127f, 0x107f, 0x007f,
         0x2091, 0x8001, 0x007c, 0x007e, 0x107e, 0x127e, 0x2091, 0x2300,
-        0x1078, 0x298a, 0x2091, 0x2400, 0x1078, 0x298a, 0x127f, 0x107f,
+        0x1078, 0x29d1, 0x2091, 0x2400, 0x1078, 0x29d1, 0x127f, 0x107f,
         0x007f, 0x2091, 0x8001, 0x007c, 0x1394, 0x1394, 0x1396, 0x1396,
         0x13a3, 0x13a3, 0x13a3, 0x13a3, 0x13ae, 0x13ae, 0x1396, 0x1396,
         0x13a3, 0x13a3, 0x13a3, 0x13a3, 0x13af, 0x13af, 0x13af, 0x13af,
         0x13af, 0x13af, 0x13af, 0x13af, 0x13af, 0x13af, 0x13af, 0x13af,
         0x13af, 0x13af, 0x13af, 0x13af, 0x0078, 0x1394, 0x007e, 0x107e,
-        0x127e, 0x2091, 0x2300, 0x1078, 0x298a, 0x127f, 0x107f, 0x007f,
+        0x127e, 0x2091, 0x2300, 0x1078, 0x29d1, 0x127f, 0x107f, 0x007f,
         0x2091, 0x8001, 0x007c, 0x007e, 0x107e, 0x127e, 0x1078, 0x13d5,
         0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007c, 0x107e,
         0x127e, 0x0d7e, 0x0e7e, 0x0f7e, 0x007e, 0x2071, 0x0100, 0x2069,
-        0x4e40, 0x2079, 0x4e00, 0x70ec, 0xa084, 0x1c00, 0x78e2, 0x1078,
-        0x4cdd, 0x007f, 0x0f7f, 0x0e7f, 0x0d7f, 0x127f, 0x107f, 0x007c,
+        0x4f40, 0x2079, 0x4f00, 0x70ec, 0xa084, 0x1c00, 0x78e2, 0x1078,
+        0x4db0, 0x007f, 0x0f7f, 0x0e7f, 0x0d7f, 0x127f, 0x107f, 0x007c,
         0x3c00, 0xa084, 0x0007, 0x0079, 0x13cd, 0x13de, 0x13de, 0x13e0,
         0x13e0, 0x13e5, 0x13e5, 0x13ea, 0x13ea, 0x3c00, 0xa084, 0x0003,
-        0x0079, 0x13da, 0x13de, 0x13de, 0x13f3, 0x13f3, 0x1078, 0x296b,
-        0x2091, 0x2200, 0x1078, 0x4768, 0x007c, 0x2091, 0x2100, 0x1078,
-        0x4768, 0x007c, 0x2091, 0x2100, 0x1078, 0x4768, 0x2091, 0x2200,
-        0x1078, 0x4768, 0x007c, 0x2091, 0x2100, 0x1078, 0x4768, 0x007c,
+        0x0079, 0x13da, 0x13de, 0x13de, 0x13f3, 0x13f3, 0x1078, 0x29b2,
+        0x2091, 0x2200, 0x1078, 0x47ec, 0x007c, 0x2091, 0x2100, 0x1078,
+        0x47ec, 0x007c, 0x2091, 0x2100, 0x1078, 0x47ec, 0x2091, 0x2200,
+        0x1078, 0x47ec, 0x007c, 0x2091, 0x2100, 0x1078, 0x47ec, 0x007c,
         0x1418, 0x1418, 0x141a, 0x141a, 0x1427, 0x1427, 0x1427, 0x1427,
         0x1432, 0x1432, 0x143f, 0x143f, 0x1427, 0x1427, 0x1427, 0x1427,
         0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450,
         0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450, 0x1450,
         0x0078, 0x1418, 0x007e, 0x107e, 0x127e, 0x2091, 0x2400, 0x1078,
-        0x298a, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007e,
+        0x29d1, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007e,
         0x107e, 0x127e, 0x1078, 0x13c8, 0x127f, 0x107f, 0x007f, 0x2091,
         0x8001, 0x007c, 0x007e, 0x107e, 0x127e, 0x2091, 0x2300, 0x1078,
-        0x298a, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007e,
-        0x107e, 0x127e, 0x2091, 0x2300, 0x1078, 0x298a, 0x2091, 0x2400,
-        0x1078, 0x298a, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c,
-        0x007e, 0x107e, 0x127e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2079, 0x4e00,
-        0x2071, 0x0200, 0x2069, 0x4e40, 0x3d00, 0xd08c, 0x0040, 0x1466,
-        0x70ec, 0xa084, 0x1c00, 0x78e2, 0x1078, 0x4cdd, 0x3d00, 0xd084,
-        0x0040, 0x1474, 0x2069, 0x4e80, 0x2071, 0x0100, 0x70ec, 0xa084,
-        0x1c00, 0x78e6, 0x1078, 0x4cdd, 0x0f7f, 0x0e7f, 0x0d7f, 0x127f,
+        0x29d1, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c, 0x007e,
+        0x107e, 0x127e, 0x2091, 0x2300, 0x1078, 0x29d1, 0x2091, 0x2400,
+        0x1078, 0x29d1, 0x127f, 0x107f, 0x007f, 0x2091, 0x8001, 0x007c,
+        0x007e, 0x107e, 0x127e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2079, 0x4f00,
+        0x2071, 0x0200, 0x2069, 0x4f40, 0x3d00, 0xd08c, 0x0040, 0x1466,
+        0x70ec, 0xa084, 0x1c00, 0x78e2, 0x1078, 0x4db0, 0x3d00, 0xd084,
+        0x0040, 0x1474, 0x2069, 0x4f80, 0x2071, 0x0100, 0x70ec, 0xa084,
+        0x1c00, 0x78e6, 0x1078, 0x4db0, 0x0f7f, 0x0e7f, 0x0d7f, 0x127f,
         0x107f, 0x007f, 0x007c, 0x7008, 0x800b, 0x00c8, 0x1489, 0x7007,
         0x0002, 0xa08c, 0x01e0, 0x00c0, 0x148a, 0xd09c, 0x0040, 0x1489,
-        0x087a, 0x097a, 0x70c3, 0x4002, 0x0078, 0x15bd, 0x0068, 0x1513,
-        0x2061, 0x0000, 0x6018, 0xd084, 0x00c0, 0x1513, 0x7828, 0xa005,
-        0x00c0, 0x149e, 0x0010, 0x1514, 0x0078, 0x1513, 0x7910, 0xd1f4,
-        0x0040, 0x14a6, 0x2001, 0x4007, 0x0078, 0x15bc, 0x7914, 0xd1ec,
-        0x0040, 0x14c1, 0xd0fc, 0x0040, 0x14b7, 0x007e, 0x1078, 0x1d64,
-        0x007f, 0x0040, 0x14c1, 0x2001, 0x4007, 0x0078, 0x15bc, 0x007e,
-        0x1078, 0x1d54, 0x007f, 0x0040, 0x14c1, 0x2001, 0x4007, 0x0078,
-        0x15bc, 0x7910, 0xd0fc, 0x00c0, 0x14cb, 0x2061, 0x4e40, 0xc19c,
-        0xc7fc, 0x0078, 0x14cf, 0x2061, 0x4e80, 0xc19d, 0xc7fd, 0x6064,
-        0xa005, 0x00c0, 0x1513, 0x7912, 0x6083, 0x0000, 0x7828, 0xc0fc,
-        0xa086, 0x0018, 0x00c0, 0x14e0, 0x0c7e, 0x1078, 0x1b5b, 0x0c7f,
-        0x782b, 0x0000, 0x607c, 0xa065, 0x0040, 0x14f9, 0x0c7e, 0x609c,
-        0x1078, 0x1e49, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1c84, 0x2009,
-        0x0018, 0x6087, 0x0103, 0x1078, 0x1d74, 0x00c0, 0x150d, 0x1078,
-        0x1dc6, 0x7810, 0xd09c, 0x00c0, 0x1501, 0x2061, 0x4e40, 0x0078,
-        0x1505, 0x2061, 0x4e80, 0xc09c, 0x7812, 0x607f, 0x0000, 0x60d4,
-        0xd0dc, 0x0040, 0x1511, 0xc0dc, 0x60d6, 0x2001, 0x4005, 0x0078,
-        0x15bc, 0x0078, 0x15ba, 0x007c, 0x7810, 0xd0f4, 0x0040, 0x151c,
-        0x2001, 0x4007, 0x0078, 0x15bc, 0xa006, 0x70c2, 0x70c6, 0x70ca,
-        0x70ce, 0x70da, 0x70c0, 0xa03d, 0xa08a, 0x0040, 0x00c8, 0x152a,
-        0x0079, 0x1531, 0x2100, 0xa08a, 0x0040, 0x00c8, 0x15c8, 0x0079,
-        0x1571, 0x15ba, 0x1610, 0x15d9, 0x1648, 0x1680, 0x1680, 0x15d0,
-        0x1c9c, 0x168b, 0x15c8, 0x15dd, 0x15df, 0x15e1, 0x15e3, 0x1ca1,
-        0x15c8, 0x1699, 0x16f6, 0x1b7b, 0x1c96, 0x15e5, 0x19c0, 0x1a02,
-        0x1a3d, 0x1a8e, 0x197b, 0x1988, 0x199c, 0x19af, 0x17cb, 0x15c8,
-        0x172d, 0x173a, 0x1746, 0x1752, 0x1768, 0x1774, 0x1777, 0x1783,
-        0x178f, 0x1797, 0x17b3, 0x17bf, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x17d8, 0x17ea, 0x1806, 0x183c, 0x1864, 0x1874, 0x1877, 0x18a8,
-        0x18d9, 0x18eb, 0x194a, 0x195a, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x196a, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x1cc6, 0x1ccc,
-        0x15c8, 0x15c8, 0x15c8, 0x1cd0, 0x1d15, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x160a, 0x167a, 0x1693, 0x16f0, 0x1b75, 0x15c8, 0x15c8,
-        0x1b3e, 0x15c8, 0x1d19, 0x1cb8, 0x1cc2, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8, 0x15c8,
-        0x15c8, 0x72ca, 0x71c6, 0x2001, 0x4006, 0x0078, 0x15bc, 0x73ce,
-        0x72ca, 0x71c6, 0x2001, 0x4000, 0x70c2, 0x0068, 0x15bd, 0x2061,
-        0x0000, 0x601b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x007c,
-        0x70c3, 0x4001, 0x0078, 0x15bd, 0x70c3, 0x4006, 0x0078, 0x15bd,
-        0x2099, 0x0041, 0x20a1, 0x0041, 0x20a9, 0x0005, 0x53a3, 0x0078,
-        0x15ba, 0x70c4, 0x70c3, 0x0004, 0x007a, 0x0078, 0x15ba, 0x0078,
-        0x15ba, 0x0078, 0x15ba, 0x0078, 0x15ba, 0x2091, 0x8000, 0x70c3,
-        0x0004, 0x70c7, 0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3,
-        0x0008, 0x2001, 0x000f, 0x70d6, 0x2079, 0x0000, 0x781b, 0x0001,
-        0x2031, 0x0030, 0x2059, 0x1000, 0x2029, 0x041a, 0x2051, 0x0445,
-        0x2061, 0x0447, 0x20c1, 0x0020, 0x2091, 0x5000, 0x2091, 0x4080,
-        0x0078, 0x0418, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x1613,
-        0x2029, 0x0000, 0x2520, 0x71d0, 0x72c8, 0x73cc, 0x70c4, 0x20a0,
-        0x2099, 0x0030, 0x7003, 0x0001, 0x7007, 0x0006, 0x731a, 0x721e,
-        0x7422, 0x7526, 0x2021, 0x0040, 0x81ff, 0x0040, 0x15ba, 0xa182,
-        0x0040, 0x00c8, 0x162d, 0x2120, 0xa006, 0x2008, 0x8403, 0x7012,
-        0x7007, 0x0004, 0x7007, 0x0001, 0x7008, 0xd0fc, 0x0040, 0x1634,
-        0x7007, 0x0002, 0xa084, 0x01e0, 0x0040, 0x1642, 0x70c3, 0x4002,
-        0x0078, 0x15bd, 0x24a8, 0x53a5, 0x0078, 0x1624, 0x0078, 0x15ba,
-        0x2029, 0x0000, 0x2520, 0x71d0, 0x72c8, 0x73cc, 0x70c4, 0x2098,
-        0x20a1, 0x0030, 0x7003, 0x0000, 0x7007, 0x0006, 0x731a, 0x721e,
-        0x7422, 0x7526, 0x2021, 0x0040, 0x7007, 0x0006, 0x81ff, 0x0040,
-        0x15ba, 0xa182, 0x0040, 0x00c8, 0x1667, 0x2120, 0xa006, 0x2008,
-        0x8403, 0x7012, 0x24a8, 0x53a6, 0x7007, 0x0001, 0x7008, 0xd0fc,
-        0x0040, 0x166e, 0xa084, 0x01e0, 0x0040, 0x165c, 0x70c3, 0x4002,
-        0x0078, 0x15bd, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x164b,
-        0x71c4, 0x70c8, 0x2114, 0xa79e, 0x0004, 0x00c0, 0x1688, 0x200a,
-        0x72ca, 0x0078, 0x15b9, 0x70c7, 0x0008, 0x70cb, 0x000f, 0x70cf,
-        0x0000, 0x0078, 0x15ba, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078,
-        0x169c, 0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d0,
-        0x70c6, 0x72ca, 0x73ce, 0x74d2, 0xa005, 0x0040, 0x16eb, 0xa40a,
-        0x0040, 0x16ac, 0x00c8, 0x16b5, 0x8001, 0x7872, 0xa084, 0xfc00,
-        0x0040, 0x16b9, 0x78ac, 0xc085, 0x78ae, 0x2001, 0x4005, 0x0078,
-        0x15bc, 0x7b7e, 0x7a7a, 0x7e86, 0x7d82, 0x7c76, 0xa48c, 0xff00,
-        0x0040, 0x16d1, 0x8407, 0x8004, 0x8004, 0x810c, 0x810c, 0x810f,
-        0xa118, 0xa291, 0x0000, 0xa6b1, 0x0000, 0xa581, 0x0000, 0x0078,
-        0x16db, 0x8407, 0x8004, 0x8004, 0xa318, 0xa291, 0x0000, 0xa6b1,
-        0x0000, 0xa581, 0x0000, 0x731a, 0x721e, 0x7622, 0x7026, 0xa605,
-        0x0040, 0x16e5, 0x7a10, 0xc2c5, 0x7a12, 0x78ac, 0xa084, 0xfffc,
-        0x78ae, 0x0078, 0x16ee, 0x78ac, 0xc085, 0x78ae, 0x0078, 0x15ba,
-        0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078, 0x16f9, 0x2029, 0x0000,
-        0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d4, 0x70c6, 0x72ca, 0x73ce,
-        0x74d6, 0xa005, 0x0040, 0x1728, 0xa40a, 0x0040, 0x1709, 0x00c8,
-        0x15bc, 0x8001, 0x7892, 0xa084, 0xfc00, 0x0040, 0x1716, 0x78ac,
-        0xc0c5, 0x78ae, 0x2001, 0x4005, 0x0078, 0x15bc, 0x7a9a, 0x7b9e,
-        0x7da2, 0x7ea6, 0x2600, 0xa505, 0x0040, 0x1721, 0x7a10, 0xc2c5,
-        0x7a12, 0x7c96, 0x78ac, 0xa084, 0xfcff, 0x78ae, 0x0078, 0x172b,
-        0x78ac, 0xc0c5, 0x78ae, 0x0078, 0x15ba, 0x2009, 0x0000, 0x786c,
-        0xa065, 0x0040, 0x1737, 0x8108, 0x6000, 0x0078, 0x1730, 0x7ac4,
-        0x0078, 0x15b8, 0x2009, 0x4e48, 0x210c, 0x7810, 0xd0ec, 0x00c0,
-        0x15b9, 0x2011, 0x4e88, 0x2214, 0x0078, 0x15b8, 0x2009, 0x4e49,
-        0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x2011, 0x4e89, 0x2214,
-        0x0078, 0x15b8, 0x2061, 0x4e40, 0x6128, 0x622c, 0x8214, 0x8214,
-        0x8214, 0x7810, 0xd0ec, 0x00c0, 0x1766, 0x2061, 0x4e80, 0x6328,
-        0x73da, 0x632c, 0x831c, 0x831c, 0x831c, 0x73de, 0x0078, 0x15b8,
-        0x2009, 0x4e4c, 0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x2011,
-        0x4e8c, 0x2214, 0x0078, 0x15b8, 0x7918, 0x0078, 0x15b9, 0x2009,
-        0x4e4d, 0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x2011, 0x4e8d,
-        0x2214, 0x0078, 0x15b8, 0x2009, 0x4e4e, 0x210c, 0x7810, 0xd0ec,
-        0x00c0, 0x15b9, 0x2011, 0x4e8e, 0x2214, 0x0078, 0x15b8, 0x7920,
-        0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x7a24, 0x0078, 0x15b8, 0x71c4,
-        0xd1fc, 0x00c0, 0x179f, 0x2011, 0x52c0, 0x0078, 0x17a1, 0x2011,
-        0x5340, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa268,
-        0x6a00, 0x6804, 0xd09c, 0x0040, 0x17b0, 0x6b08, 0x0078, 0x17b1,
-        0x6b0c, 0x0078, 0x15b7, 0x77c4, 0x1078, 0x1de4, 0x2091, 0x8000,
-        0x6b1c, 0x6a14, 0x2091, 0x8001, 0x2708, 0x0078, 0x15b7, 0x2061,
-        0x4e40, 0x6118, 0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x2061, 0x4e80,
-        0x6218, 0x0078, 0x15b8, 0x77c4, 0x1078, 0x1de4, 0x2091, 0x8000,
-        0x6908, 0x6a18, 0x6b10, 0x77da, 0x2091, 0x8001, 0x0078, 0x15b7,
-        0x71c4, 0x2110, 0xa294, 0x000f, 0xa282, 0x0010, 0x00c8, 0x15b2,
-        0x1078, 0x277f, 0xa384, 0x4000, 0x0040, 0x17e8, 0xa295, 0x0020,
-        0x0078, 0x15b7, 0x71c4, 0x2100, 0xc0bc, 0xa082, 0x0010, 0x00c8,
-        0x15b2, 0xd1bc, 0x00c0, 0x17f9, 0x2011, 0x4e48, 0x2204, 0x0078,
-        0x17fd, 0x2011, 0x4e88, 0x2204, 0xc0bd, 0x007e, 0x2100, 0xc0bc,
-        0x2012, 0x1078, 0x26dc, 0x017f, 0x0078, 0x15b9, 0x71c4, 0x2021,
-        0x4e49, 0x2404, 0x70c6, 0x2019, 0x0000, 0x0078, 0x1815, 0x71c8,
-        0x2021, 0x4e89, 0x2404, 0x70ca, 0xc3fd, 0x2011, 0x1834, 0x20a9,
-        0x0008, 0x2204, 0xa106, 0x0040, 0x1824, 0x8210, 0x00f0, 0x1819,
-        0x71c4, 0x72c8, 0x0078, 0x15b1, 0xa292, 0x1834, 0x027e, 0x2122,
-        0x017f, 0x1078, 0x26fd, 0x7810, 0xd0ec, 0x00c0, 0x1832, 0xd3fc,
-        0x0040, 0x180f, 0x0078, 0x15ba, 0x03e8, 0x00fa, 0x01f4, 0x02ee,
-        0x0004, 0x0001, 0x0002, 0x0003, 0x2061, 0x4e40, 0x6128, 0x622c,
+        0x087a, 0x097a, 0x70c3, 0x4002, 0x0078, 0x15c4, 0x0068, 0x151a,
+        0x2061, 0x0000, 0x6018, 0xd084, 0x00c0, 0x151a, 0x7828, 0xa005,
+        0x00c0, 0x149e, 0x0010, 0x151b, 0x0078, 0x151a, 0x7910, 0xd1f4,
+        0x0040, 0x14a4, 0x0078, 0x14b9, 0x7914, 0xd1ec, 0x0040, 0x14bd,
+        0xd0fc, 0x0040, 0x14b3, 0x007e, 0x1078, 0x1dae, 0x007f, 0x0040,
+        0x14bd, 0x0078, 0x14b9, 0x007e, 0x1078, 0x1da1, 0x007f, 0x0040,
+        0x14bd, 0x2001, 0x4007, 0x0078, 0x15c3, 0x7910, 0xd0fc, 0x00c0,
+        0x14c7, 0x2061, 0x4f40, 0xc19c, 0xc7fc, 0x0078, 0x14cb, 0x2061,
+        0x4f80, 0xc19d, 0xc7fd, 0x6064, 0xa005, 0x00c0, 0x151a, 0x7912,
+        0x6082, 0x7828, 0xc0fc, 0xa086, 0x0018, 0x00c0, 0x14db, 0x0c7e,
+        0x1078, 0x1b85, 0x0c7f, 0x782b, 0x0000, 0x607c, 0xa065, 0x0040,
+        0x1500, 0x0c7e, 0x609c, 0x1078, 0x1e90, 0x0c7f, 0x609f, 0x0000,
+        0x1078, 0x1cd5, 0x2009, 0x0018, 0x6087, 0x0103, 0x7810, 0x007e,
+        0x84ff, 0x00c0, 0x14f6, 0x85ff, 0x0040, 0x14f8, 0xc0c5, 0x7812,
+        0x1078, 0x1dbb, 0x007f, 0x7812, 0x00c0, 0x1514, 0x1078, 0x1e0d,
+        0x7810, 0xd09c, 0x00c0, 0x1508, 0x2061, 0x4f40, 0x0078, 0x150c,
+        0x2061, 0x4f80, 0xc09c, 0x7812, 0x607f, 0x0000, 0x60d4, 0xd0dc,
+        0x0040, 0x1518, 0xc0dc, 0x60d6, 0x2001, 0x4005, 0x0078, 0x15c3,
+        0x0078, 0x15c1, 0x007c, 0x7810, 0xd0f4, 0x0040, 0x1523, 0x2001,
+        0x4007, 0x0078, 0x15c3, 0xa006, 0x70c2, 0x70c6, 0x70ca, 0x70ce,
+        0x70da, 0x70c0, 0xa03d, 0xa08a, 0x0040, 0x00c8, 0x1531, 0x0079,
+        0x1538, 0x2100, 0xa08a, 0x0040, 0x00c8, 0x15cf, 0x0079, 0x1578,
+        0x15c1, 0x1617, 0x15e0, 0x164f, 0x1687, 0x1687, 0x15d7, 0x1ced,
+        0x1692, 0x15cf, 0x15e4, 0x15e6, 0x15e8, 0x15ea, 0x1cf2, 0x15cf,
+        0x16a0, 0x16fd, 0x1ba5, 0x1ce7, 0x15ec, 0x19ea, 0x1a2c, 0x1a67,
+        0x1ab8, 0x19a5, 0x19b2, 0x19c6, 0x19d9, 0x17eb, 0x15cf, 0x1734,
+        0x1741, 0x174d, 0x1759, 0x176f, 0x177b, 0x177e, 0x178a, 0x1796,
+        0x179e, 0x17d3, 0x17df, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x17f8,
+        0x180a, 0x1826, 0x185c, 0x1884, 0x1894, 0x1897, 0x18c8, 0x18f9,
+        0x190b, 0x1974, 0x1984, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x1994,
+        0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x1d17, 0x1d1d, 0x15cf,
+        0x15cf, 0x15cf, 0x1d21, 0x1d66, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x1611, 0x1681, 0x169a, 0x16f7, 0x1b9f, 0x15cf, 0x15cf, 0x1b68,
+        0x15cf, 0x1d6a, 0x1d09, 0x1d13, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf, 0x15cf,
+        0x72ca, 0x71c6, 0x2001, 0x4006, 0x0078, 0x15c3, 0x73ce, 0x72ca,
+        0x71c6, 0x2001, 0x4000, 0x70c2, 0x0068, 0x15c4, 0x2061, 0x0000,
+        0x601b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x007c, 0x70c3,
+        0x4001, 0x0078, 0x15c4, 0x70c3, 0x4006, 0x0078, 0x15c4, 0x2099,
+        0x0041, 0x20a1, 0x0041, 0x20a9, 0x0005, 0x53a3, 0x0078, 0x15c1,
+        0x70c4, 0x70c3, 0x0004, 0x007a, 0x0078, 0x15c1, 0x0078, 0x15c1,
+        0x0078, 0x15c1, 0x0078, 0x15c1, 0x2091, 0x8000, 0x70c3, 0x0004,
+        0x70c7, 0x4953, 0x70cb, 0x5020, 0x70cf, 0x2020, 0x70d3, 0x0008,
+        0x2001, 0x000f, 0x70d6, 0x2079, 0x0000, 0x781b, 0x0001, 0x2031,
+        0x0030, 0x2059, 0x1000, 0x2029, 0x041a, 0x2051, 0x0445, 0x2061,
+        0x0447, 0x20c1, 0x0020, 0x2091, 0x5000, 0x2091, 0x4080, 0x0078,
+        0x0418, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x161a, 0x2029,
+        0x0000, 0x2520, 0x71d0, 0x72c8, 0x73cc, 0x70c4, 0x20a0, 0x2099,
+        0x0030, 0x7003, 0x0001, 0x7007, 0x0006, 0x731a, 0x721e, 0x7422,
+        0x7526, 0x2021, 0x0040, 0x81ff, 0x0040, 0x15c1, 0xa182, 0x0040,
+        0x00c8, 0x1634, 0x2120, 0xa006, 0x2008, 0x8403, 0x7012, 0x7007,
+        0x0004, 0x7007, 0x0001, 0x7008, 0xd0fc, 0x0040, 0x163b, 0x7007,
+        0x0002, 0xa084, 0x01e0, 0x0040, 0x1649, 0x70c3, 0x4002, 0x0078,
+        0x15c4, 0x24a8, 0x53a5, 0x0078, 0x162b, 0x0078, 0x15c1, 0x2029,
+        0x0000, 0x2520, 0x71d0, 0x72c8, 0x73cc, 0x70c4, 0x2098, 0x20a1,
+        0x0030, 0x7003, 0x0000, 0x7007, 0x0006, 0x731a, 0x721e, 0x7422,
+        0x7526, 0x2021, 0x0040, 0x7007, 0x0006, 0x81ff, 0x0040, 0x15c1,
+        0xa182, 0x0040, 0x00c8, 0x166e, 0x2120, 0xa006, 0x2008, 0x8403,
+        0x7012, 0x24a8, 0x53a6, 0x7007, 0x0001, 0x7008, 0xd0fc, 0x0040,
+        0x1675, 0xa084, 0x01e0, 0x0040, 0x1663, 0x70c3, 0x4002, 0x0078,
+        0x15c4, 0x75d8, 0x74dc, 0x75da, 0x74de, 0x0078, 0x1652, 0x71c4,
+        0x70c8, 0x2114, 0xa79e, 0x0004, 0x00c0, 0x168f, 0x200a, 0x72ca,
+        0x0078, 0x15c0, 0x70c7, 0x0008, 0x70cb, 0x000f, 0x70cf, 0x000b,
+        0x0078, 0x15c1, 0x75d8, 0x76dc, 0x75da, 0x76de, 0x0078, 0x16a3,
+        0x2029, 0x0000, 0x2530, 0x70c4, 0x72c8, 0x73cc, 0x74d0, 0x70c6,
+        0x72ca, 0x73ce, 0x74d2, 0xa005, 0x0040, 0x16f2, 0xa40a, 0x0040,
+        0x16b3, 0x00c8, 0x16bc, 0x8001, 0x7872, 0xa084, 0xfc00, 0x0040,
+        0x16c0, 0x78ac, 0xc085, 0x78ae, 0x2001, 0x4005, 0x0078, 0x15c3,
+        0x7b7e, 0x7a7a, 0x7e86, 0x7d82, 0x7c76, 0xa48c, 0xff00, 0x0040,
+        0x16d8, 0x8407, 0x8004, 0x8004, 0x810c, 0x810c, 0x810f, 0xa118,
+        0xa291, 0x0000, 0xa6b1, 0x0000, 0xa581, 0x0000, 0x0078, 0x16e2,
+        0x8407, 0x8004, 0x8004, 0xa318, 0xa291, 0x0000, 0xa6b1, 0x0000,
+        0xa581, 0x0000, 0x731a, 0x721e, 0x7622, 0x7026, 0xa605, 0x0040,
+        0x16ec, 0x7a10, 0xc2c5, 0x7a12, 0x78ac, 0xa084, 0xfffc, 0x78ae,
+        0x0078, 0x16f5, 0x78ac, 0xc085, 0x78ae, 0x0078, 0x15c1, 0x75d8,
+        0x76dc, 0x75da, 0x76de, 0x0078, 0x1700, 0x2029, 0x0000, 0x2530,
+        0x70c4, 0x72c8, 0x73cc, 0x74d4, 0x70c6, 0x72ca, 0x73ce, 0x74d6,
+        0xa005, 0x0040, 0x172f, 0xa40a, 0x0040, 0x1710, 0x00c8, 0x1719,
+        0x8001, 0x7892, 0xa084, 0xfc00, 0x0040, 0x171d, 0x78ac, 0xc0c5,
+        0x78ae, 0x2001, 0x4005, 0x0078, 0x15c3, 0x7a9a, 0x7b9e, 0x7da2,
+        0x7ea6, 0x2600, 0xa505, 0x0040, 0x1728, 0x7a10, 0xc2c5, 0x7a12,
+        0x7c96, 0x78ac, 0xa084, 0xfcff, 0x78ae, 0x0078, 0x1732, 0x78ac,
+        0xc0c5, 0x78ae, 0x0078, 0x15c1, 0x2009, 0x0000, 0x786c, 0xa065,
+        0x0040, 0x173e, 0x8108, 0x6000, 0x0078, 0x1737, 0x7ac4, 0x0078,
+        0x15bf, 0x2009, 0x4f48, 0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15c0,
+        0x2011, 0x4f88, 0x2214, 0x0078, 0x15bf, 0x2009, 0x4f49, 0x210c,
+        0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x2011, 0x4f89, 0x2214, 0x0078,
+        0x15bf, 0x2061, 0x4f40, 0x6128, 0x622c, 0x8214, 0x8214, 0x8214,
+        0x7810, 0xd0ec, 0x00c0, 0x176d, 0x2061, 0x4f80, 0x6328, 0x73da,
+        0x632c, 0x831c, 0x831c, 0x831c, 0x73de, 0x0078, 0x15bf, 0x2009,
+        0x4f4c, 0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x2011, 0x4f8c,
+        0x2214, 0x0078, 0x15bf, 0x7918, 0x0078, 0x15c0, 0x2009, 0x4f4d,
+        0x210c, 0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x2011, 0x4f8d, 0x2214,
+        0x0078, 0x15bf, 0x2009, 0x4f4e, 0x210c, 0x7810, 0xd0ec, 0x00c0,
+        0x15c0, 0x2011, 0x4f8e, 0x2214, 0x0078, 0x15bf, 0x7920, 0x7810,
+        0xd0ec, 0x00c0, 0x15c0, 0x7a24, 0x0078, 0x15bf, 0x71c4, 0xd1fc,
+        0x00c0, 0x17a6, 0x2011, 0x53c0, 0x0078, 0x17a8, 0x2011, 0x5440,
+        0x8107, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xa268, 0x6a00,
+        0x6804, 0xd09c, 0x0040, 0x17b7, 0x6b08, 0x0078, 0x17b8, 0x6b0c,
+        0xd1fc, 0x00c0, 0x17bf, 0x2021, 0x023b, 0x0078, 0x17c1, 0x2021,
+        0x013b, 0x2424, 0x7914, 0xd1e4, 0x0040, 0x17cd, 0xd4c4, 0x00c0,
+        0x17cc, 0xc4d5, 0x0078, 0x17cd, 0xc4dd, 0xa4a4, 0x1c00, 0x74de,
+        0x71c4, 0x0078, 0x15be, 0x77c4, 0x1078, 0x1e2b, 0x2091, 0x8000,
+        0x6b1c, 0x6a14, 0x2091, 0x8001, 0x2708, 0x0078, 0x15be, 0x2061,
+        0x4f40, 0x6118, 0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x2061, 0x4f80,
+        0x6218, 0x0078, 0x15bf, 0x77c4, 0x1078, 0x1e2b, 0x2091, 0x8000,
+        0x6908, 0x6a18, 0x6b10, 0x77da, 0x2091, 0x8001, 0x0078, 0x15be,
+        0x71c4, 0x2110, 0xa294, 0x000f, 0xa282, 0x0010, 0x00c8, 0x15b9,
+        0x1078, 0x27c6, 0xa384, 0x4000, 0x0040, 0x1808, 0xa295, 0x0020,
+        0x0078, 0x15be, 0x71c4, 0x2100, 0xc0bc, 0xa082, 0x0010, 0x00c8,
+        0x15b9, 0xd1bc, 0x00c0, 0x1819, 0x2011, 0x4f48, 0x2204, 0x0078,
+        0x181d, 0x2011, 0x4f88, 0x2204, 0xc0bd, 0x007e, 0x2100, 0xc0bc,
+        0x2012, 0x1078, 0x2723, 0x017f, 0x0078, 0x15c0, 0x71c4, 0x2021,
+        0x4f49, 0x2404, 0x70c6, 0x2019, 0x0000, 0x0078, 0x1835, 0x71c8,
+        0x2021, 0x4f89, 0x2404, 0x70ca, 0xc3fd, 0x2011, 0x1854, 0x20a9,
+        0x0008, 0x2204, 0xa106, 0x0040, 0x1844, 0x8210, 0x00f0, 0x1839,
+        0x71c4, 0x72c8, 0x0078, 0x15b8, 0xa292, 0x1854, 0x027e, 0x2122,
+        0x017f, 0x1078, 0x2744, 0x7810, 0xd0ec, 0x00c0, 0x1852, 0xd3fc,
+        0x0040, 0x182f, 0x0078, 0x15c1, 0x03e8, 0x00fa, 0x01f4, 0x02ee,
+        0x0004, 0x0001, 0x0002, 0x0003, 0x2061, 0x4f40, 0x6128, 0x622c,
         0x8214, 0x8214, 0x8214, 0x70c4, 0x602a, 0x70c8, 0x8003, 0x8003,
-        0x8003, 0x602e, 0x7810, 0xd0ec, 0x00c0, 0x1862, 0x027e, 0x017e,
-        0x2061, 0x4e80, 0x6128, 0x622c, 0x8214, 0x8214, 0x8214, 0x70d8,
+        0x8003, 0x602e, 0x7810, 0xd0ec, 0x00c0, 0x1882, 0x027e, 0x017e,
+        0x2061, 0x4f80, 0x6128, 0x622c, 0x8214, 0x8214, 0x8214, 0x70d8,
         0x602a, 0x70dc, 0x8003, 0x8003, 0x8003, 0x602e, 0x71da, 0x72de,
-        0x017f, 0x027f, 0x0078, 0x15b8, 0x2061, 0x4e40, 0x6130, 0x70c4,
-        0x6032, 0x7810, 0xd0ec, 0x00c0, 0x15b9, 0x2061, 0x4e80, 0x6230,
-        0x70c8, 0x6032, 0x0078, 0x15b8, 0x7918, 0x0078, 0x15b9, 0x71c4,
-        0xa184, 0xffcf, 0x0040, 0x1883, 0x7810, 0xd0ec, 0x00c0, 0x15b2,
-        0x72c8, 0x0078, 0x15b1, 0x2011, 0x4e4d, 0x2204, 0x2112, 0x007e,
-        0x2019, 0x0000, 0x1078, 0x2764, 0x7810, 0xd0ec, 0x0040, 0x1893,
-        0x017f, 0x0078, 0x15b9, 0x71c8, 0xa184, 0xffcf, 0x0040, 0x189c,
-        0x2110, 0x71c4, 0x0078, 0x15b1, 0x2011, 0x4e8d, 0x2204, 0x2112,
-        0x007e, 0xc3fd, 0x1078, 0x2764, 0x027f, 0x017f, 0x0078, 0x15b8,
-        0x71c4, 0xa182, 0x0010, 0x0048, 0x18b4, 0x7810, 0xd0ec, 0x00c0,
-        0x15b2, 0x72c8, 0x0078, 0x15b1, 0x2011, 0x4e4e, 0x2204, 0x007e,
-        0x2112, 0x2019, 0x0000, 0x1078, 0x2742, 0x7810, 0xd0ec, 0x0040,
-        0x18c4, 0x017f, 0x0078, 0x15b9, 0x71c8, 0xa182, 0x0010, 0x0048,
-        0x18cd, 0x2110, 0x71c4, 0x0078, 0x15b1, 0x2011, 0x4e8e, 0x2204,
-        0x007e, 0x2112, 0xc3fd, 0x1078, 0x2742, 0x027f, 0x017f, 0x0078,
-        0x15b8, 0x71c4, 0x72c8, 0xa184, 0xfffd, 0x00c0, 0x15b1, 0xa284,
-        0xfffd, 0x00c0, 0x15b1, 0x2100, 0x7920, 0x7822, 0x2200, 0x7a24,
-        0x7826, 0x0078, 0x15b8, 0x71c4, 0xd1fc, 0x00c0, 0x18f3, 0x2011,
-        0x52c0, 0x0078, 0x18f5, 0x2011, 0x5340, 0x8107, 0xa084, 0x000f,
-        0x8003, 0x8003, 0x8003, 0xa268, 0x2019, 0x0000, 0x72c8, 0x2091,
-        0x8000, 0x6800, 0x007e, 0xa226, 0x0040, 0x191e, 0x6a02, 0xd4ec,
-        0x0040, 0x190b, 0xc3a5, 0xd4e4, 0x0040, 0x190f, 0xc39d, 0xd4f4,
-        0x0040, 0x191e, 0x810f, 0xd2f4, 0x0040, 0x191a, 0x1078, 0x27c1,
-        0x0078, 0x191e, 0x1078, 0x279f, 0x0078, 0x191e, 0x72cc, 0x6808,
-        0xa206, 0x0040, 0x1940, 0xa2a4, 0x00ff, 0x7814, 0xd0e4, 0x00c0,
-        0x1931, 0xa482, 0x0028, 0x0048, 0x193d, 0x0040, 0x193d, 0x0078,
-        0x1935, 0xa482, 0x0043, 0x0048, 0x193d, 0x71c4, 0x71c6, 0x027f,
-        0x72ca, 0x2091, 0x8001, 0x0078, 0x15b3, 0x6a0a, 0xa39d, 0x000a,
-        0x6804, 0xa305, 0x6806, 0x027f, 0x6b0c, 0x71c4, 0x2091, 0x8001,
-        0x0078, 0x15b7, 0x77c4, 0x1078, 0x1de4, 0x2091, 0x8000, 0x6a14,
-        0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816, 0x70cc, 0x681e, 0x2708,
-        0x0078, 0x15b7, 0x70c4, 0x2061, 0x4e40, 0x6118, 0x601a, 0x7810,
-        0xd0ec, 0x00c0, 0x15b9, 0x70c8, 0x2061, 0x4e80, 0x6218, 0x601a,
-        0x0078, 0x15b8, 0x71c4, 0x72c8, 0x73cc, 0xa182, 0x0010, 0x00c8,
-        0x15b2, 0x1078, 0x27e3, 0xa384, 0x4000, 0x0040, 0x1979, 0xa295,
-        0x0020, 0x0078, 0x15b7, 0x77c4, 0x1078, 0x1de4, 0x2091, 0x8000,
-        0x6a08, 0xc28d, 0x6a0a, 0x2091, 0x8001, 0x2708, 0x0078, 0x15b8,
-        0x77c4, 0x1078, 0x1de4, 0x2091, 0x8000, 0x6a08, 0xa294, 0xfff9,
-        0x6a0a, 0x6804, 0xa005, 0x0040, 0x1997, 0x1078, 0x2628, 0x2091,
-        0x8001, 0x2708, 0x0078, 0x15b8, 0x77c4, 0x1078, 0x1de4, 0x2091,
-        0x8000, 0x6a08, 0xc295, 0x6a0a, 0x6804, 0xa005, 0x0040, 0x19aa,
-        0x1078, 0x2628, 0x2091, 0x8001, 0x2708, 0x0078, 0x15b8, 0x77c4,
-        0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000,
-        0x1078, 0x1dff, 0x2091, 0x8001, 0x2708, 0x6a08, 0x0078, 0x15b8,
-        0x77c4, 0x7814, 0xd0e4, 0x00c0, 0x19d4, 0xd7fc, 0x0040, 0x19ce,
-        0x1078, 0x1d64, 0x0040, 0x19d4, 0x0078, 0x15bc, 0x1078, 0x1d54,
-        0x0040, 0x19d4, 0x0078, 0x15bc, 0x73c8, 0x72cc, 0x77c6, 0x73ca,
-        0x72ce, 0x1078, 0x1e86, 0x00c0, 0x19fe, 0x6818, 0xa005, 0x0040,
-        0x19f8, 0x2708, 0x077e, 0x1078, 0x2813, 0x077f, 0x00c0, 0x19f8,
-        0x2001, 0x0015, 0xd7fc, 0x00c0, 0x19f1, 0x2061, 0x4e40, 0x0078,
-        0x19f4, 0xc0fd, 0x2061, 0x4e80, 0x782a, 0x2091, 0x8001, 0x007c,
-        0x2091, 0x8001, 0x2001, 0x4005, 0x0078, 0x15bc, 0x2091, 0x8001,
-        0x0078, 0x15ba, 0x77c4, 0x7814, 0xd0e4, 0x00c0, 0x1a16, 0xd7fc,
-        0x0040, 0x1a10, 0x1078, 0x1d64, 0x0040, 0x1a16, 0x0078, 0x15bc,
-        0x1078, 0x1d54, 0x0040, 0x1a16, 0x0078, 0x15bc, 0x77c6, 0x2041,
-        0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091, 0x8000, 0x1078,
-        0x1dff, 0x2009, 0x0016, 0xd7fc, 0x00c0, 0x1a2a, 0x2061, 0x4e40,
-        0x0078, 0x1a2d, 0x2061, 0x4e80, 0xc1fd, 0x6067, 0x0003, 0x607f,
-        0x0000, 0x6776, 0x6083, 0x000f, 0x792a, 0x61d4, 0xc1dc, 0x61d6,
-        0x1078, 0x2628, 0x2091, 0x8001, 0x007c, 0x77c8, 0x77ca, 0x77c4,
-        0x77c6, 0x7814, 0xd0e4, 0x00c0, 0x1a54, 0xd7fc, 0x0040, 0x1a4e,
-        0x1078, 0x1d64, 0x0040, 0x1a54, 0x0078, 0x15bc, 0x1078, 0x1d54,
-        0x0040, 0x1a54, 0x0078, 0x15bc, 0xa7bc, 0xff00, 0x2091, 0x8000,
-        0x2009, 0x0017, 0xd7fc, 0x00c0, 0x1a61, 0x2061, 0x4e40, 0x0078,
-        0x1a64, 0x2061, 0x4e80, 0xc1fd, 0x607f, 0x0000, 0x6067, 0x0002,
-        0x6776, 0x6083, 0x000f, 0x792a, 0x61d4, 0xc1dc, 0x61d6, 0x1078,
-        0x2628, 0x2091, 0x8001, 0x2041, 0x0021, 0x2049, 0x0005, 0x2051,
-        0x0010, 0x2091, 0x8000, 0x70c8, 0xa005, 0x0040, 0x1a82, 0x60d4,
-        0xc0fd, 0x60d6, 0x1078, 0x1dff, 0x70c8, 0x6836, 0x8738, 0xa784,
-        0x001f, 0x00c0, 0x1a82, 0x2091, 0x8001, 0x007c, 0x2019, 0x0000,
-        0x7814, 0xd0e4, 0x00c0, 0x1aa4, 0x72c8, 0xd284, 0x0040, 0x1a9e,
-        0x1078, 0x1d64, 0x0040, 0x1aa4, 0x0078, 0x15bc, 0x1078, 0x1d54,
-        0x0040, 0x1aa4, 0x0078, 0x15bc, 0x72c8, 0x72ca, 0x78ac, 0xa084,
-        0x0003, 0x00c0, 0x1acf, 0x2039, 0x0000, 0xd284, 0x0040, 0x1ab1,
-        0xc7fd, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0008, 0x1078,
-        0x1de4, 0x2091, 0x8000, 0x6808, 0xc0d4, 0xa80d, 0x690a, 0x2091,
-        0x8001, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1ab7, 0xa7bc, 0xff00,
-        0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1ab7, 0x2091,
-        0x8000, 0x72c8, 0xd284, 0x00c0, 0x1ae1, 0x7810, 0xd0ec, 0x0040,
-        0x1add, 0x2069, 0x0100, 0x0078, 0x1ae3, 0x2069, 0x0200, 0x0078,
-        0x1ae3, 0x2069, 0x0100, 0x6808, 0xa084, 0xfffd, 0x680a, 0x6830,
-        0xd0b4, 0x0040, 0x1b03, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848,
-        0xd094, 0x0040, 0x1af5, 0x00f0, 0x1aef, 0x684b, 0x0009, 0x20a9,
-        0x0014, 0x6848, 0xd084, 0x0040, 0x1aff, 0x00f0, 0x1af9, 0x20a9,
-        0x00fa, 0x00f0, 0x1b01, 0x2079, 0x4e00, 0x2009, 0x0018, 0x72c8,
-        0xd284, 0x00c0, 0x1b0f, 0x2061, 0x4e40, 0x0078, 0x1b12, 0x2061,
-        0x4e80, 0xc1fd, 0x607f, 0x0000, 0x792a, 0x6067, 0x0001, 0x6083,
-        0x000f, 0x60a7, 0x0000, 0x60a8, 0x60b2, 0x60b6, 0x60d4, 0xd0b4,
-        0x0040, 0x1b2e, 0xc0b4, 0x60d6, 0x0c7e, 0x60b8, 0xa065, 0x6008,
-        0xc0d4, 0x600a, 0x6018, 0x8001, 0x601a, 0x0c7f, 0x60d4, 0xa084,
-        0x77ff, 0x60d6, 0x78ac, 0xc08d, 0x78ae, 0x83ff, 0x0040, 0x1b39,
-        0x007c, 0x681b, 0x0047, 0x2091, 0x8001, 0x007c, 0x73cc, 0x1078,
-        0x1a90, 0x69ec, 0x6a48, 0xa185, 0x1800, 0x684a, 0xa185, 0x0040,
-        0x68ee, 0x73cc, 0x2021, 0x0004, 0x20a9, 0x09ff, 0x00f0, 0x1b4e,
-        0x8421, 0x00c0, 0x1b4c, 0x8319, 0x00c0, 0x1b4a, 0x69ee, 0x6a4a,
-        0x2091, 0x8001, 0x007c, 0xd7fc, 0x00c0, 0x1b62, 0x2069, 0x4e40,
-        0x0078, 0x1b64, 0x2069, 0x4e80, 0x71c4, 0x71c6, 0x6916, 0x81ff,
-        0x00c0, 0x1b6c, 0x68a7, 0x0001, 0x78ac, 0xc08c, 0x78ae, 0xd084,
-        0x00c0, 0x1b74, 0x1078, 0x1ee6, 0x007c, 0x75d8, 0x74dc, 0x75da,
-        0x74de, 0x0078, 0x1b7e, 0x2029, 0x0000, 0x2520, 0x71c4, 0x73c8,
-        0x72cc, 0x71c6, 0x73ca, 0x72ce, 0x2079, 0x4e00, 0x7dde, 0x7cda,
-        0x7bd6, 0x7ad2, 0x1078, 0x1dbd, 0x0040, 0x1c80, 0x20a9, 0x0005,
-        0x20a1, 0x4e14, 0x2091, 0x8000, 0x41a1, 0x2091, 0x8001, 0x2009,
-        0x0040, 0x1078, 0x1fd1, 0x0040, 0x1ba1, 0x1078, 0x1dc6, 0x0078,
-        0x1c80, 0x6004, 0xa08c, 0x00ff, 0xa18e, 0x0009, 0x00c0, 0x1bac,
-        0x007e, 0x1078, 0x2378, 0x007f, 0xa084, 0xff00, 0x8007, 0x8009,
-        0x0040, 0x1c20, 0x0c7e, 0x2c68, 0x1078, 0x1dbd, 0x0040, 0x1bf2,
-        0x2c00, 0x689e, 0x8109, 0x00c0, 0x1bb3, 0x609f, 0x0000, 0x0c7f,
-        0x0c7e, 0x7ddc, 0x7cd8, 0x7bd4, 0x7ad0, 0xa290, 0x0040, 0xa399,
-        0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x7dde, 0x7cda, 0x7bd6,
-        0x7ad2, 0x2c68, 0x689c, 0xa065, 0x0040, 0x1c1f, 0x2009, 0x0040,
-        0x1078, 0x1fd1, 0x00c0, 0x1c09, 0x6004, 0xa084, 0x00ff, 0xa086,
-        0x0002, 0x00c0, 0x1bf2, 0x6004, 0xa084, 0x00ff, 0xa086, 0x000a,
-        0x00c0, 0x1bee, 0x017e, 0x1078, 0x2374, 0x017f, 0x2d00, 0x6002,
-        0x0078, 0x1bc1, 0x0c7f, 0x0c7e, 0x609c, 0x1078, 0x1e49, 0x0c7f,
-        0x609f, 0x0000, 0x1078, 0x1c84, 0x2009, 0x0018, 0x6008, 0xc0cd,
-        0x600a, 0x6004, 0x6086, 0x1078, 0x1d74, 0x1078, 0x1dc6, 0x0078,
-        0x1c80, 0x0c7f, 0x0c7e, 0x609c, 0x1078, 0x1e49, 0x0c7f, 0x609f,
-        0x0000, 0x1078, 0x1c84, 0x2009, 0x0018, 0x6087, 0x0103, 0x601b,
-        0x0003, 0x1078, 0x1d74, 0x1078, 0x1dc6, 0x0078, 0x1c80, 0x0c7f,
-        0x7814, 0xd0e4, 0x00c0, 0x1c45, 0x6114, 0xd1fc, 0x0040, 0x1c2e,
-        0x1078, 0x1d64, 0x0040, 0x1c45, 0x0078, 0x1c32, 0x1078, 0x1d54,
-        0x0040, 0x1c45, 0x2029, 0x0000, 0x2520, 0x2009, 0x0018, 0x73c8,
-        0x72cc, 0x6087, 0x0103, 0x601b, 0x0021, 0x1078, 0x1d74, 0x1078,
-        0x1dc6, 0x2001, 0x4007, 0x0078, 0x15bc, 0x74c4, 0x73c8, 0x72cc,
-        0x6014, 0x2091, 0x8000, 0x0e7e, 0x2009, 0x0012, 0xd0fc, 0x00c0,
-        0x1c55, 0x2071, 0x4e40, 0x0078, 0x1c58, 0x2071, 0x4e80, 0xc1fd,
-        0x792a, 0x7067, 0x0005, 0x71d4, 0xc1dc, 0x71d6, 0x736a, 0x726e,
-        0x7472, 0x7076, 0x707b, 0x0000, 0x2c00, 0x707e, 0xa02e, 0x2530,
-        0x611c, 0xa184, 0x0060, 0x0040, 0x1c6f, 0x1078, 0x4632, 0x0e7f,
-        0x6596, 0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000, 0x60b3, 0x0000,
-        0x6714, 0x6023, 0x0000, 0x1078, 0x2628, 0x2091, 0x8001, 0x007c,
-        0x70c3, 0x4005, 0x0078, 0x15bd, 0x20a9, 0x0005, 0x2099, 0x4e14,
-        0x2091, 0x8000, 0x530a, 0x2091, 0x8001, 0x2100, 0xa210, 0xa399,
-        0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x007c, 0x71c4, 0x70c7,
-        0x0000, 0x791e, 0x0078, 0x15ba, 0x71c4, 0x71c6, 0x2168, 0x0078,
-        0x1ca3, 0x2069, 0x1000, 0x690c, 0xa016, 0x2d04, 0xa210, 0x8d68,
-        0x8109, 0x00c0, 0x1ca5, 0xa285, 0x0000, 0x00c0, 0x1cb3, 0x70c3,
-        0x4000, 0x0078, 0x1cb5, 0x70c3, 0x4003, 0x70ca, 0x0078, 0x15bd,
-        0x7964, 0x71c6, 0x71c4, 0xa182, 0x0003, 0x00c8, 0x15b2, 0x7966,
-        0x0078, 0x15ba, 0x7964, 0x71c6, 0x0078, 0x15ba, 0x7900, 0x71c6,
-        0x71c4, 0x7902, 0x0078, 0x15ba, 0x7900, 0x71c6, 0x0078, 0x15ba,
-        0x70c4, 0x2011, 0x0000, 0xa08c, 0x000d, 0x0040, 0x1ce5, 0x810c,
-        0x0048, 0x1ce1, 0x8210, 0x810c, 0x810c, 0x0048, 0x1ce1, 0x8210,
-        0x810c, 0x81ff, 0x00c0, 0x15b3, 0x8210, 0x7a0e, 0xd28c, 0x0040,
-        0x1d11, 0x7910, 0xc1cd, 0x7912, 0x2009, 0x0021, 0x2019, 0x0003,
-        0xd284, 0x0040, 0x1d0b, 0x8108, 0x2019, 0x0041, 0x2011, 0x964e,
-        0x2312, 0x2019, 0x0042, 0x8210, 0x2312, 0x2019, 0x0043, 0x8210,
-        0x2312, 0x2019, 0x0046, 0x8210, 0x2312, 0x2019, 0x0047, 0x8210,
-        0x2312, 0x2019, 0x0006, 0x2011, 0x9653, 0x2112, 0x2011, 0x9673,
-        0x2312, 0x7904, 0x7806, 0x0078, 0x15b9, 0x7804, 0x70c6, 0x0078,
-        0x15ba, 0x71c4, 0xd1fc, 0x00c0, 0x1d21, 0x2011, 0x52c0, 0x0078,
-        0x1d23, 0x2011, 0x5340, 0x8107, 0xa084, 0x000f, 0x8003, 0x8003,
-        0x8003, 0xa268, 0x6a14, 0xd2b4, 0x0040, 0x1d32, 0x2011, 0x0001,
-        0x0078, 0x1d34, 0x2011, 0x0000, 0x6b0c, 0x6800, 0x70da, 0x0078,
-        0x15b7, 0x017e, 0x7814, 0xd0f4, 0x0040, 0x1d46, 0x2001, 0x4007,
-        0x70db, 0x0000, 0xa18d, 0x0001, 0x0078, 0x1d52, 0xd0fc, 0x0040,
-        0x1d51, 0x2001, 0x4007, 0x70db, 0x0001, 0xa18d, 0x0001, 0x0078,
-        0x1d52, 0xa006, 0x017f, 0x007c, 0x017e, 0x7814, 0xd0f4, 0x0040,
-        0x1d61, 0x2001, 0x4007, 0x70db, 0x0000, 0xa18d, 0x0001, 0x0078,
-        0x1d62, 0xa006, 0x017f, 0x007c, 0x017e, 0x7814, 0xd0fc, 0x0040,
-        0x1d71, 0x2001, 0x4007, 0x70db, 0x0001, 0xa18d, 0x0001, 0x0078,
-        0x1d72, 0xa006, 0x017f, 0x007c, 0x7112, 0x721a, 0x731e, 0x7810,
-        0xd0c4, 0x0040, 0x1d7d, 0x7422, 0x7526, 0xac80, 0x0001, 0x8108,
-        0x810c, 0x81a9, 0x8098, 0x20a1, 0x0030, 0x7003, 0x0000, 0x6084,
-        0x20a2, 0x53a6, 0x7007, 0x0001, 0x7974, 0xa184, 0xff00, 0x0040,
-        0x1d9a, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100,
-        0x0078, 0x1d9d, 0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78,
-        0xa006, 0xa211, 0x7d10, 0xd5c4, 0x0040, 0x1daa, 0x7b84, 0xa319,
-        0x7c80, 0xa421, 0x7008, 0xd0fc, 0x0040, 0x1daa, 0x7003, 0x0001,
-        0x7007, 0x0006, 0x711a, 0x721e, 0x7d10, 0xd5c4, 0x0040, 0x1dba,
-        0x7322, 0x7426, 0xa084, 0x01e0, 0x007c, 0x7848, 0xa065, 0x0040,
-        0x1dc5, 0x2c04, 0x784a, 0x2063, 0x0000, 0x007c, 0x0f7e, 0x2079,
-        0x4e00, 0x7848, 0x2062, 0x2c00, 0xa005, 0x00c0, 0x1dd1, 0x1078,
-        0x296b, 0x784a, 0x0f7f, 0x007c, 0x2011, 0x9800, 0x7a4a, 0x7bc4,
-        0x8319, 0x0040, 0x1de1, 0xa280, 0x0032, 0x2012, 0x2010, 0x0078,
-        0x1dd8, 0x2013, 0x0000, 0x007c, 0x017e, 0x027e, 0xd7fc, 0x00c0,
-        0x1ded, 0x2011, 0x53c0, 0x0078, 0x1def, 0x2011, 0x73c0, 0xa784,
-        0x0f00, 0x800b, 0xa784, 0x001f, 0x0040, 0x1dfa, 0x8003, 0x8003,
-        0x8003, 0x8003, 0xa105, 0xa268, 0x027f, 0x017f, 0x007c, 0x1078,
-        0x1de4, 0x2900, 0x682a, 0x2a00, 0x682e, 0x6808, 0xa084, 0xf9ef,
-        0xa80d, 0x690a, 0x0e7e, 0xd7fc, 0x00c0, 0x1e14, 0x2009, 0x4e53,
-        0x2071, 0x4e40, 0x0078, 0x1e18, 0x2009, 0x4e93, 0x2071, 0x4e80,
-        0x210c, 0x6804, 0xa005, 0x0040, 0x1e28, 0xa116, 0x00c0, 0x1e28,
-        0x2060, 0x6000, 0x6806, 0x017e, 0x200b, 0x0000, 0x0078, 0x1e2b,
-        0x2009, 0x0000, 0x017e, 0x6804, 0xa065, 0x0040, 0x1e40, 0x6000,
-        0x6806, 0x1078, 0x1e5b, 0x1078, 0x201d, 0x6810, 0x7908, 0x8109,
-        0x790a, 0x8001, 0x6812, 0x00c0, 0x1e2b, 0x7910, 0xc1a5, 0x7912,
-        0x017f, 0x6902, 0x6906, 0x2d00, 0x2060, 0x1078, 0x2acc, 0x0e7f,
-        0x007c, 0xa065, 0x0040, 0x1e5a, 0x2008, 0x609c, 0xa005, 0x0040,
-        0x1e57, 0x2062, 0x609f, 0x0000, 0xa065, 0x0078, 0x1e4d, 0x7848,
-        0x794a, 0x2062, 0x007c, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9,
-        0x001c, 0xac80, 0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828,
-        0x601a, 0x682c, 0x6022, 0x007c, 0x0e7e, 0xd7fc, 0x00c0, 0x1e76,
-        0x2071, 0x4e40, 0x2031, 0x4ec0, 0x0078, 0x1e7a, 0x2071, 0x4e80,
-        0x2031, 0x50c0, 0x7050, 0xa08c, 0x0200, 0x00c0, 0x1e84, 0xa608,
-        0x2d0a, 0x8000, 0x7052, 0xa006, 0x0e7f, 0x007c, 0x0f7e, 0xd7fc,
-        0x00c0, 0x1e8e, 0x2079, 0x4e40, 0x0078, 0x1e90, 0x2079, 0x4e80,
-        0x1078, 0x1de4, 0x2091, 0x8000, 0x6804, 0x780a, 0xa065, 0x0040,
-        0x1ee4, 0x0078, 0x1ea2, 0x2c00, 0x780a, 0x2060, 0x6000, 0xa065,
-        0x0040, 0x1ee4, 0x6010, 0xa306, 0x00c0, 0x1e9b, 0x600c, 0xa206,
-        0x00c0, 0x1e9b, 0x2c28, 0x784c, 0xac06, 0x00c0, 0x1eb1, 0x0078,
-        0x1ee1, 0x6804, 0xac06, 0x00c0, 0x1ebf, 0x6000, 0x2060, 0x6806,
-        0xa005, 0x00c0, 0x1ebf, 0x6803, 0x0000, 0x0078, 0x1ec9, 0x6400,
-        0x7808, 0x2060, 0x6402, 0xa486, 0x0000, 0x00c0, 0x1ec9, 0x2c00,
-        0x6802, 0x2560, 0x0f7f, 0x1078, 0x1e5b, 0x0f7e, 0x601b, 0x0005,
-        0x6023, 0x0020, 0x0f7f, 0x1078, 0x201d, 0x0f7e, 0x7908, 0x8109,
-        0x790a, 0x6810, 0x8001, 0x6812, 0x00c0, 0x1ee1, 0x7810, 0xc0a5,
-        0x7812, 0x2001, 0xffff, 0xa005, 0x0f7f, 0x007c, 0x077e, 0x2700,
-        0x2039, 0x0000, 0xd0fc, 0x0040, 0x1eee, 0xc7fd, 0x2041, 0x0021,
-        0x2049, 0x0004, 0x2051, 0x0008, 0x2091, 0x8000, 0x1078, 0x1dff,
-        0x8738, 0xa784, 0x001f, 0x00c0, 0x1ef6, 0xa7bc, 0xff00, 0x873f,
-        0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0, 0x1ef6, 0x2091, 0x8001,
-        0x077f, 0x007c, 0x786c, 0x2009, 0x9674, 0x210c, 0xa10d, 0x0040,
-        0x1f14, 0xa065, 0x0078, 0x2395, 0x2061, 0x0000, 0x6018, 0xd084,
-        0x00c0, 0x1f34, 0x7810, 0xd08c, 0x0040, 0x1f25, 0xc08c, 0x7812,
-        0xc7fc, 0x2069, 0x4e40, 0x0078, 0x1f2a, 0xc08d, 0x7812, 0x2069,
-        0x4e80, 0xc7fd, 0x2091, 0x8000, 0x681c, 0x681f, 0x0000, 0x2091,
-        0x8001, 0xa005, 0x00c0, 0x1f35, 0x007c, 0xa08c, 0xfff0, 0x0040,
-        0x1f3b, 0x1078, 0x296b, 0x0079, 0x1f3d, 0x1f4d, 0x1f50, 0x1f56,
-        0x1f5a, 0x1f4e, 0x1f5e, 0x1f4e, 0x1f4e, 0x1f4e, 0x1f64, 0x1f95,
-        0x1f99, 0x1f9f, 0x1fb4, 0x1f4e, 0x1f4e, 0x007c, 0x1078, 0x296b,
-        0x1078, 0x1ee6, 0x2001, 0x8001, 0x0078, 0x1fc0, 0x2001, 0x8003,
-        0x0078, 0x1fc0, 0x2001, 0x8004, 0x0078, 0x1fc0, 0x1078, 0x1ee6,
-        0x2001, 0x8006, 0x0078, 0x1fc0, 0x2091, 0x8000, 0x077e, 0xd7fc,
-        0x00c0, 0x1f70, 0x2069, 0x4e40, 0x2039, 0x0009, 0x0078, 0x1f74,
-        0x2069, 0x4e80, 0x2039, 0x0009, 0x6800, 0xa086, 0x0000, 0x0040,
-        0x1f7e, 0x007f, 0x6f1e, 0x2091, 0x8001, 0x007c, 0x6874, 0x077f,
-        0xa0bc, 0xff00, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010,
-        0x1078, 0x1dff, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1f88, 0x2091,
-        0x8001, 0x2001, 0x800a, 0x0078, 0x1fc0, 0x2001, 0x800c, 0x0078,
-        0x1fc0, 0x1078, 0x1ee6, 0x2001, 0x800d, 0x0078, 0x1fc0, 0x7814,
-        0xd0e4, 0x00c0, 0x1fb2, 0xd0ec, 0x0040, 0x1fac, 0xd7fc, 0x0040,
-        0x1fac, 0x78e4, 0x0078, 0x1fad, 0x78e0, 0x70c6, 0x2001, 0x800e,
-        0x0078, 0x1fc0, 0x0078, 0x1f4e, 0xd7fc, 0x0040, 0x1fba, 0x78ec,
-        0x0078, 0x1fbb, 0x78e8, 0x70c6, 0x2001, 0x800f, 0x0078, 0x1fc0,
-        0x70c2, 0xd7fc, 0x00c0, 0x1fc8, 0x70db, 0x0000, 0x0078, 0x1fca,
-        0x70db, 0x0001, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x4080,
-        0x007c, 0xac80, 0x0001, 0x81ff, 0x0040, 0x1ffc, 0x2099, 0x0030,
-        0x20a0, 0x700c, 0xa084, 0x03ff, 0x0040, 0x1fde, 0x7018, 0x007e,
-        0x701c, 0x007e, 0x7020, 0x007e, 0x7024, 0x007e, 0x7112, 0x81ac,
-        0x721a, 0x731e, 0x7422, 0x7526, 0x7003, 0x0001, 0x7007, 0x0001,
-        0x7008, 0x800b, 0x00c8, 0x1ff0, 0x7007, 0x0002, 0xa08c, 0x01e0,
-        0x00c0, 0x1ffc, 0x53a5, 0xa006, 0x7003, 0x0000, 0x7007, 0x0004,
-        0x007f, 0x7026, 0x007f, 0x7022, 0x007f, 0x701e, 0x007f, 0x701a,
-        0x007c, 0x2011, 0x0020, 0x2009, 0x0010, 0x6b0a, 0x6c0e, 0x6803,
-        0xfd00, 0x6807, 0x0018, 0x6a1a, 0x2d00, 0xa0e8, 0x0008, 0xa290,
-        0x0004, 0x8109, 0x00c0, 0x200d, 0x007c, 0x6004, 0x6086, 0x2c08,
-        0x2063, 0x0000, 0x7868, 0xa005, 0x796a, 0x0040, 0x202a, 0x2c02,
-        0x0078, 0x202b, 0x796e, 0x007c, 0x0c7e, 0x2061, 0x4e00, 0x6887,
-        0x0103, 0x2d08, 0x206b, 0x0000, 0x6068, 0xa005, 0x616a, 0x0040,
-        0x203c, 0x2d02, 0x0078, 0x203d, 0x616e, 0x0c7f, 0x007c, 0x2091,
-        0x8000, 0x2c04, 0x786e, 0xa005, 0x00c0, 0x2047, 0x786a, 0x2091,
-        0x8001, 0x609c, 0xa005, 0x0040, 0x2060, 0x0c7e, 0x2060, 0x2008,
-        0x609c, 0xa005, 0x0040, 0x205c, 0x2062, 0x609f, 0x0000, 0xa065,
-        0x609c, 0xa005, 0x00c0, 0x2054, 0x7848, 0x794a, 0x2062, 0x0c7f,
-        0x7848, 0x2062, 0x609f, 0x0000, 0xac85, 0x0000, 0x00c0, 0x206a,
-        0x1078, 0x296b, 0x784a, 0x007c, 0x20a9, 0x0010, 0xa006, 0x8004,
-        0x8086, 0x818e, 0x00c8, 0x2075, 0xa200, 0x00f0, 0x2070, 0x8086,
-        0x818e, 0x007c, 0x157e, 0x20a9, 0x0010, 0xa005, 0x0040, 0x209b,
-        0xa11a, 0x00c8, 0x209b, 0x8213, 0x818d, 0x0048, 0x208e, 0xa11a,
-        0x00c8, 0x208f, 0x00f0, 0x2083, 0x0078, 0x2093, 0xa11a, 0x2308,
-        0x8210, 0x00f0, 0x2083, 0x007e, 0x3200, 0xa084, 0xf7ff, 0x2080,
-        0x007f, 0x157f, 0x007c, 0x007e, 0x3200, 0xa085, 0x0800, 0x0078,
-        0x2097, 0x7d74, 0x70d0, 0xa506, 0x0040, 0x2187, 0x7810, 0x2050,
-        0x7800, 0xd08c, 0x0040, 0x20c3, 0xdaec, 0x0040, 0x20c3, 0x0e7e,
-        0x2091, 0x8000, 0x2071, 0x0020, 0x7004, 0xa005, 0x00c0, 0x20c0,
-        0x7008, 0x0e7f, 0xa086, 0x0008, 0x0040, 0x20c3, 0x0078, 0x2187,
-        0x0e7f, 0x0078, 0x2187, 0x1078, 0x1dbd, 0x0040, 0x2187, 0xa046,
-        0x7970, 0x2500, 0x8000, 0xa112, 0x2009, 0x0040, 0x00c8, 0x20d2,
-        0x0078, 0x20d9, 0x72d0, 0xa206, 0x0040, 0x20d9, 0x8840, 0x2009,
-        0x0080, 0x0c7e, 0x7112, 0x7007, 0x0001, 0x2099, 0x0030, 0x20a9,
-        0x0020, 0xac80, 0x0001, 0x20a0, 0x2061, 0x0000, 0x88ff, 0x0040,
-        0x20eb, 0x1078, 0x1dbd, 0x7008, 0xd0fc, 0x0040, 0x20eb, 0x7007,
-        0x0002, 0x2091, 0x8001, 0xa08c, 0x01e0, 0x00c0, 0x2122, 0x53a5,
-        0x8cff, 0x00c0, 0x2100, 0x88ff, 0x0040, 0x2171, 0x0078, 0x210a,
-        0x2c00, 0x788e, 0x20a9, 0x0020, 0xac80, 0x0001, 0x20a0, 0x53a5,
-        0x0078, 0x2171, 0xa046, 0x7218, 0x731c, 0xdac4, 0x0040, 0x2112,
-        0x7420, 0x7524, 0xa292, 0x0040, 0xa39b, 0x0000, 0xa4a3, 0x0000,
-        0xa5ab, 0x0000, 0x721a, 0x731e, 0xdac4, 0x0040, 0x2122, 0x7422,
-        0x7526, 0xa006, 0x7007, 0x0004, 0x0040, 0x2171, 0x8cff, 0x0040,
-        0x212b, 0x1078, 0x1dc6, 0x0c7f, 0x1078, 0x1dc6, 0xa046, 0x7888,
-        0x8000, 0x788a, 0xa086, 0x0002, 0x0040, 0x2151, 0x7a7c, 0x7b78,
-        0xdac4, 0x0040, 0x213d, 0x7c84, 0x7d80, 0x7974, 0x8107, 0x8004,
-        0x8004, 0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000,
-        0x721a, 0x731e, 0xdac4, 0x0040, 0x2187, 0x7422, 0x7526, 0x0078,
-        0x2187, 0x6014, 0xd0fc, 0x00c0, 0x2159, 0x2069, 0x4e40, 0x0078,
-        0x215b, 0x2069, 0x4e80, 0x2091, 0x8000, 0x681f, 0x0002, 0x88ff,
-        0x0040, 0x2167, 0xa046, 0x788c, 0x2060, 0x0078, 0x2151, 0x788b,
-        0x0000, 0x78ac, 0xa085, 0x0003, 0x78ae, 0x2091, 0x8001, 0x0078,
-        0x2187, 0x0c7f, 0x788b, 0x0000, 0x1078, 0x2346, 0x6004, 0xa084,
-        0x000f, 0x1078, 0x2188, 0x88ff, 0x0040, 0x2185, 0x788c, 0x2060,
-        0x6004, 0xa084, 0x000f, 0x1078, 0x2188, 0x0078, 0x20a1, 0x007c,
-        0x0079, 0x218a, 0x219a, 0x21b8, 0x21d6, 0x219a, 0x21e7, 0x21ab,
-        0x219a, 0x219a, 0x219a, 0x21b6, 0x21d4, 0x219a, 0x219a, 0x219a,
-        0x219a, 0x219a, 0x2039, 0x0400, 0x78bc, 0xa705, 0x78be, 0x6008,
-        0xa705, 0x600a, 0x1078, 0x222a, 0x609c, 0x78ba, 0x609f, 0x0000,
-        0x1078, 0x2330, 0x007c, 0x78bc, 0xd0c4, 0x0040, 0x21b1, 0x0078,
-        0x219a, 0x601c, 0xc0bd, 0x601e, 0x0078, 0x21be, 0x1078, 0x2378,
-        0x78bc, 0xd0c4, 0x0040, 0x21be, 0x0078, 0x219a, 0x78bf, 0x0000,
-        0x6004, 0x8007, 0xa084, 0x00ff, 0x78b2, 0x8001, 0x0040, 0x21d1,
-        0x1078, 0x222a, 0x0040, 0x21d1, 0x78bc, 0xc0c5, 0x78be, 0x0078,
-        0x21d3, 0x0078, 0x2249, 0x007c, 0x1078, 0x2374, 0x78bc, 0xa08c,
-        0x0e00, 0x00c0, 0x21de, 0xd0c4, 0x00c0, 0x21e0, 0x0078, 0x219a,
-        0x1078, 0x222a, 0x00c0, 0x21e6, 0x0078, 0x2249, 0x007c, 0x78bc,
-        0xd0c4, 0x0040, 0x21ed, 0x0078, 0x219a, 0x78bf, 0x0000, 0x6714,
-        0x2011, 0x0001, 0x22a8, 0x6018, 0xa084, 0x00ff, 0xa005, 0x0040,
-        0x220d, 0xa7bc, 0xff00, 0x20a9, 0x0020, 0xa08e, 0x0001, 0x0040,
-        0x220d, 0xa7bc, 0x8000, 0x2011, 0x0002, 0x20a9, 0x0100, 0xa08e,
-        0x0002, 0x0040, 0x220d, 0x0078, 0x2227, 0x1078, 0x1de4, 0x2d00,
-        0x2091, 0x8000, 0x682b, 0x0000, 0x682f, 0x0000, 0x6808, 0xa084,
-        0xffde, 0x680a, 0xade8, 0x0010, 0x2091, 0x8001, 0x00f0, 0x2210,
-        0x8211, 0x0040, 0x2227, 0x20a9, 0x0100, 0x0078, 0x2210, 0x1078,
-        0x1dc6, 0x007c, 0x609f, 0x0000, 0x78b4, 0xa06d, 0x2c00, 0x78b6,
-        0x00c0, 0x2235, 0x78ba, 0x0078, 0x223d, 0x689e, 0x2d00, 0x6002,
-        0x78b8, 0xad06, 0x00c0, 0x223d, 0x6002, 0x78b0, 0x8001, 0x78b2,
-        0x00c0, 0x2248, 0x78bc, 0xc0c4, 0x78be, 0x78b8, 0x2060, 0xa006,
-        0x007c, 0x0e7e, 0xa02e, 0x2530, 0x7dba, 0x7db6, 0x65ae, 0x65b2,
-        0x601c, 0x60a2, 0x2048, 0xa984, 0xe1ff, 0x601e, 0xa984, 0x0060,
-        0x0040, 0x225c, 0x1078, 0x4632, 0x6596, 0x65a6, 0x669a, 0x66aa,
-        0x6714, 0x2071, 0x4e80, 0xd7fc, 0x00c0, 0x2268, 0x2071, 0x4e40,
-        0xa784, 0x0f00, 0x800b, 0xa784, 0x001f, 0x0040, 0x2273, 0x8003,
-        0x8003, 0x8003, 0x8003, 0xa105, 0x71c4, 0xa168, 0x2700, 0x8007,
-        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0x71c8, 0xa100, 0x60c2,
-        0x2091, 0x8000, 0x7814, 0xd0c4, 0x0040, 0x2298, 0xd0ec, 0x0040,
-        0x2294, 0xd7fc, 0x00c0, 0x2291, 0xd0f4, 0x00c0, 0x229f, 0x0078,
-        0x2298, 0xd0fc, 0x00c0, 0x229f, 0x7810, 0xd0f4, 0x00c0, 0x229f,
-        0x6e08, 0xd684, 0x0040, 0x22c9, 0xd9fc, 0x00c0, 0x22c9, 0x2091,
-        0x8001, 0x1078, 0x1e5b, 0x2091, 0x8000, 0x1078, 0x201d, 0x2091,
-        0x8001, 0x7814, 0xd0e4, 0x00c0, 0x232e, 0x7814, 0xd0c4, 0x0040,
-        0x232e, 0xd0ec, 0x0040, 0x22c1, 0xd7fc, 0x00c0, 0x22bc, 0xd0f4,
-        0x00c0, 0x22c5, 0x0078, 0x232e, 0xd0fc, 0x00c0, 0x22c5, 0x0078,
-        0x232e, 0x7810, 0xd0f4, 0x0040, 0x232e, 0x601b, 0x0021, 0x0078,
-        0x232e, 0x6024, 0xa096, 0x0001, 0x00c0, 0x22d0, 0x8000, 0x6026,
-        0x6a10, 0x6814, 0xa202, 0x0048, 0x22e3, 0x0040, 0x22e3, 0x2091,
-        0x8001, 0x2039, 0x0200, 0x609c, 0x78ba, 0x609f, 0x0000, 0x1078,
-        0x2330, 0x0078, 0x232e, 0x2c08, 0xd9fc, 0x0040, 0x230b, 0x6800,
-        0xa065, 0x0040, 0x230b, 0x6a04, 0x7000, 0xa084, 0x0002, 0x0040,
-        0x2301, 0x704c, 0xa206, 0x00c0, 0x2301, 0x6b04, 0x2160, 0x2304,
-        0x6002, 0xa005, 0x00c0, 0x22fd, 0x6902, 0x2260, 0x6102, 0x0078,
-        0x2317, 0x2d00, 0x2060, 0x1078, 0x2acc, 0x6e08, 0x2160, 0x6202,
-        0x6906, 0x0078, 0x2317, 0x6800, 0x6902, 0xa065, 0x0040, 0x2313,
-        0x6102, 0x0078, 0x2314, 0x6906, 0x2160, 0x6003, 0x0000, 0x2160,
-        0xd9fc, 0x0040, 0x231e, 0xa6b4, 0xfffc, 0x6e0a, 0x6810, 0x7d08,
-        0x8528, 0x7d0a, 0x8000, 0x6812, 0x2091, 0x8001, 0xd6b4, 0x0040,
-        0x232e, 0xa6b6, 0x0040, 0x6e0a, 0x1078, 0x1e6c, 0x0e7f, 0x007c,
-        0x6008, 0xa705, 0x600a, 0x2091, 0x8000, 0x1078, 0x201d, 0x2091,
-        0x8001, 0x78b8, 0xa065, 0x0040, 0x2343, 0x609c, 0x78ba, 0x609f,
-        0x0000, 0x0078, 0x2330, 0x78b6, 0x78ba, 0x007c, 0x7970, 0x7874,
-        0x2818, 0xd384, 0x0040, 0x2350, 0x8000, 0xa112, 0x0048, 0x2355,
-        0x8000, 0xa112, 0x00c8, 0x2365, 0xc384, 0x7a7c, 0x721a, 0x7a78,
-        0x721e, 0xdac4, 0x0040, 0x2360, 0x7a84, 0x7222, 0x7a80, 0x7226,
-        0xa006, 0xd384, 0x0040, 0x2365, 0x8000, 0x7876, 0x70d2, 0x781c,
-        0xa005, 0x0040, 0x2373, 0x8001, 0x781e, 0x00c0, 0x2373, 0x0068,
-        0x2373, 0x2091, 0x4080, 0x007c, 0x2039, 0x238c, 0x0078, 0x237a,
-        0x2039, 0x2392, 0x2704, 0xa005, 0x0040, 0x238b, 0xac00, 0x2068,
-        0x6908, 0x6810, 0x6912, 0x680a, 0x690c, 0x6814, 0x6916, 0x680e,
-        0x8738, 0x0078, 0x237a, 0x007c, 0x0003, 0x0009, 0x000f, 0x0015,
-        0x001b, 0x0000, 0x0015, 0x001b, 0x0000, 0x2041, 0x0000, 0x780c,
-        0x0079, 0x239a, 0x256c, 0x253f, 0x239e, 0x2417, 0x2039, 0x9674,
-        0x2734, 0x7d10, 0x0078, 0x23be, 0x6084, 0xa086, 0x0103, 0x00c0,
-        0x2400, 0x6114, 0x6018, 0xa105, 0x0040, 0x23b3, 0x86ff, 0x00c0,
-        0x23cf, 0x0078, 0x2400, 0x8603, 0xa080, 0x9655, 0x620c, 0x2202,
-        0x8000, 0x6210, 0x2202, 0x1078, 0x203f, 0x8630, 0xa68e, 0x000f,
-        0x0040, 0x248b, 0x786c, 0xa065, 0x00c0, 0x23a4, 0x7808, 0xa602,
-        0x00c8, 0x23cf, 0xd5ac, 0x00c0, 0x23cf, 0x263a, 0x007c, 0xa682,
-        0x0003, 0x00c8, 0x248b, 0x2091, 0x8000, 0x2069, 0x0000, 0x6818,
-        0xd084, 0x00c0, 0x23fb, 0x2011, 0x9655, 0x2204, 0x70c6, 0x8210,
-        0x2204, 0x70ca, 0xd684, 0x00c0, 0x23eb, 0x8210, 0x2204, 0x70da,
-        0x8210, 0x2204, 0x70de, 0xa685, 0x8020, 0x70c2, 0x681b, 0x0001,
+        0x017f, 0x027f, 0x0078, 0x15bf, 0x2061, 0x4f40, 0x6130, 0x70c4,
+        0x6032, 0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x2061, 0x4f80, 0x6230,
+        0x70c8, 0x6032, 0x0078, 0x15bf, 0x7918, 0x0078, 0x15c0, 0x71c4,
+        0xa184, 0xffcf, 0x0040, 0x18a3, 0x7810, 0xd0ec, 0x00c0, 0x15b9,
+        0x72c8, 0x0078, 0x15b8, 0x2011, 0x4f4d, 0x2204, 0x2112, 0x007e,
+        0x2019, 0x0000, 0x1078, 0x27ab, 0x7810, 0xd0ec, 0x0040, 0x18b3,
+        0x017f, 0x0078, 0x15c0, 0x71c8, 0xa184, 0xffcf, 0x0040, 0x18bc,
+        0x2110, 0x71c4, 0x0078, 0x15b8, 0x2011, 0x4f8d, 0x2204, 0x2112,
+        0x007e, 0xc3fd, 0x1078, 0x27ab, 0x027f, 0x017f, 0x0078, 0x15bf,
+        0x71c4, 0xa182, 0x0010, 0x0048, 0x18d4, 0x7810, 0xd0ec, 0x00c0,
+        0x15b9, 0x72c8, 0x0078, 0x15b8, 0x2011, 0x4f4e, 0x2204, 0x007e,
+        0x2112, 0x2019, 0x0000, 0x1078, 0x2789, 0x7810, 0xd0ec, 0x0040,
+        0x18e4, 0x017f, 0x0078, 0x15c0, 0x71c8, 0xa182, 0x0010, 0x0048,
+        0x18ed, 0x2110, 0x71c4, 0x0078, 0x15b8, 0x2011, 0x4f8e, 0x2204,
+        0x007e, 0x2112, 0xc3fd, 0x1078, 0x2789, 0x027f, 0x017f, 0x0078,
+        0x15bf, 0x71c4, 0x72c8, 0xa184, 0xfffd, 0x00c0, 0x15b8, 0xa284,
+        0xfffd, 0x00c0, 0x15b8, 0x2100, 0x7920, 0x7822, 0x2200, 0x7a24,
+        0x7826, 0x0078, 0x15bf, 0x71c4, 0xd1fc, 0x00c0, 0x1913, 0x2011,
+        0x53c0, 0x0078, 0x1915, 0x2011, 0x5440, 0x8107, 0xa084, 0x000f,
+        0x8003, 0x8003, 0x8003, 0xa268, 0x2019, 0x0000, 0x72c8, 0xd2bc,
+        0x0040, 0x1924, 0xa39d, 0x0010, 0xd2b4, 0x0040, 0x1929, 0xa39d,
+        0x0008, 0x2091, 0x8000, 0x6800, 0x007e, 0xa226, 0x0040, 0x1948,
+        0x6a02, 0xd4ec, 0x0040, 0x1935, 0xc3a5, 0xd4e4, 0x0040, 0x1939,
+        0xc39d, 0xd4f4, 0x0040, 0x1948, 0x810f, 0xd2f4, 0x0040, 0x1944,
+        0x1078, 0x2808, 0x0078, 0x1948, 0x1078, 0x27e6, 0x0078, 0x1948,
+        0x72cc, 0x6808, 0xa206, 0x0040, 0x196a, 0xa2a4, 0x00ff, 0x7814,
+        0xd0e4, 0x00c0, 0x195b, 0xa482, 0x0028, 0x0048, 0x1967, 0x0040,
+        0x1967, 0x0078, 0x195f, 0xa482, 0x0043, 0x0048, 0x1967, 0x71c4,
+        0x71c6, 0x027f, 0x72ca, 0x2091, 0x8001, 0x0078, 0x15ba, 0x6a0a,
+        0xa39d, 0x000a, 0x6804, 0xa305, 0x6806, 0x027f, 0x6b0c, 0x71c4,
+        0x2091, 0x8001, 0x0078, 0x15be, 0x77c4, 0x1078, 0x1e2b, 0x2091,
+        0x8000, 0x6a14, 0x6b1c, 0x2091, 0x8001, 0x70c8, 0x6816, 0x70cc,
+        0x681e, 0x2708, 0x0078, 0x15be, 0x70c4, 0x2061, 0x4f40, 0x6118,
+        0x601a, 0x7810, 0xd0ec, 0x00c0, 0x15c0, 0x70c8, 0x2061, 0x4f80,
+        0x6218, 0x601a, 0x0078, 0x15bf, 0x71c4, 0x72c8, 0x73cc, 0xa182,
+        0x0010, 0x00c8, 0x15b9, 0x1078, 0x282a, 0xa384, 0x4000, 0x0040,
+        0x19a3, 0xa295, 0x0020, 0x0078, 0x15be, 0x77c4, 0x1078, 0x1e2b,
+        0x2091, 0x8000, 0x6a08, 0xc28d, 0x6a0a, 0x2091, 0x8001, 0x2708,
+        0x0078, 0x15bf, 0x77c4, 0x1078, 0x1e2b, 0x2091, 0x8000, 0x6a08,
+        0xa294, 0xfff9, 0x6a0a, 0x6804, 0xa005, 0x0040, 0x19c1, 0x1078,
+        0x266f, 0x2091, 0x8001, 0x2708, 0x0078, 0x15bf, 0x77c4, 0x1078,
+        0x1e2b, 0x2091, 0x8000, 0x6a08, 0xc295, 0x6a0a, 0x6804, 0xa005,
+        0x0040, 0x19d4, 0x1078, 0x266f, 0x2091, 0x8001, 0x2708, 0x0078,
+        0x15bf, 0x77c4, 0x2041, 0x0001, 0x2049, 0x0005, 0x2051, 0x0020,
+        0x2091, 0x8000, 0x1078, 0x1e46, 0x2091, 0x8001, 0x2708, 0x6a08,
+        0x0078, 0x15bf, 0x77c4, 0x7814, 0xd0e4, 0x00c0, 0x19fe, 0xd7fc,
+        0x0040, 0x19f8, 0x1078, 0x1dae, 0x0040, 0x19fe, 0x0078, 0x15c3,
+        0x1078, 0x1da1, 0x0040, 0x19fe, 0x0078, 0x15c3, 0x73c8, 0x72cc,
+        0x77c6, 0x73ca, 0x72ce, 0x1078, 0x1ecd, 0x00c0, 0x1a28, 0x6818,
+        0xa005, 0x0040, 0x1a22, 0x2708, 0x077e, 0x1078, 0x285a, 0x077f,
+        0x00c0, 0x1a22, 0x2001, 0x0015, 0xd7fc, 0x00c0, 0x1a1b, 0x2061,
+        0x4f40, 0x0078, 0x1a1e, 0xc0fd, 0x2061, 0x4f80, 0x782a, 0x2091,
+        0x8001, 0x007c, 0x2091, 0x8001, 0x2001, 0x4005, 0x0078, 0x15c3,
+        0x2091, 0x8001, 0x0078, 0x15c1, 0x77c4, 0x7814, 0xd0e4, 0x00c0,
+        0x1a40, 0xd7fc, 0x0040, 0x1a3a, 0x1078, 0x1dae, 0x0040, 0x1a40,
+        0x0078, 0x15c3, 0x1078, 0x1da1, 0x0040, 0x1a40, 0x0078, 0x15c3,
+        0x77c6, 0x2041, 0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x2091,
+        0x8000, 0x1078, 0x1e46, 0x2009, 0x0016, 0xd7fc, 0x00c0, 0x1a54,
+        0x2061, 0x4f40, 0x0078, 0x1a57, 0x2061, 0x4f80, 0xc1fd, 0x6067,
+        0x0003, 0x607f, 0x0000, 0x6776, 0x6083, 0x000f, 0x792a, 0x61d4,
+        0xc1dc, 0x61d6, 0x1078, 0x266f, 0x2091, 0x8001, 0x007c, 0x77c8,
+        0x77ca, 0x77c4, 0x77c6, 0x7814, 0xd0e4, 0x00c0, 0x1a7e, 0xd7fc,
+        0x0040, 0x1a78, 0x1078, 0x1dae, 0x0040, 0x1a7e, 0x0078, 0x15c3,
+        0x1078, 0x1da1, 0x0040, 0x1a7e, 0x0078, 0x15c3, 0xa7bc, 0xff00,
+        0x2091, 0x8000, 0x2009, 0x0017, 0xd7fc, 0x00c0, 0x1a8b, 0x2061,
+        0x4f40, 0x0078, 0x1a8e, 0x2061, 0x4f80, 0xc1fd, 0x607f, 0x0000,
+        0x6067, 0x0002, 0x6776, 0x6083, 0x000f, 0x792a, 0x61d4, 0xc1dc,
+        0x61d6, 0x1078, 0x266f, 0x2091, 0x8001, 0x2041, 0x0021, 0x2049,
+        0x0005, 0x2051, 0x0010, 0x2091, 0x8000, 0x70c8, 0xa005, 0x0040,
+        0x1aac, 0x60d4, 0xc0fd, 0x60d6, 0x1078, 0x1e46, 0x70c8, 0x6836,
+        0x8738, 0xa784, 0x001f, 0x00c0, 0x1aac, 0x2091, 0x8001, 0x007c,
+        0x2019, 0x0000, 0x7814, 0xd0e4, 0x00c0, 0x1ace, 0x72c8, 0xd284,
+        0x0040, 0x1ac8, 0x1078, 0x1dae, 0x0040, 0x1ace, 0x0078, 0x15c3,
+        0x1078, 0x1da1, 0x0040, 0x1ace, 0x0078, 0x15c3, 0x72c8, 0x72ca,
+        0x78ac, 0xa084, 0x0003, 0x00c0, 0x1af9, 0x2039, 0x0000, 0xd284,
+        0x0040, 0x1adb, 0xc7fd, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051,
+        0x0008, 0x1078, 0x1e2b, 0x2091, 0x8000, 0x6808, 0xc0d4, 0xa80d,
+        0x690a, 0x2091, 0x8001, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1ae1,
+        0xa7bc, 0xff00, 0x873f, 0x8738, 0x873f, 0xa784, 0x0f00, 0x00c0,
+        0x1ae1, 0x2091, 0x8000, 0x72c8, 0xd284, 0x00c0, 0x1b0b, 0x7810,
+        0xd0ec, 0x0040, 0x1b07, 0x2069, 0x0100, 0x0078, 0x1b0d, 0x2069,
+        0x0200, 0x0078, 0x1b0d, 0x2069, 0x0100, 0x6808, 0xa084, 0xfffd,
+        0x680a, 0x6830, 0xd0b4, 0x0040, 0x1b2d, 0x684b, 0x0004, 0x20a9,
+        0x0014, 0x6848, 0xd094, 0x0040, 0x1b1f, 0x00f0, 0x1b19, 0x684b,
+        0x0009, 0x20a9, 0x0014, 0x6848, 0xd084, 0x0040, 0x1b29, 0x00f0,
+        0x1b23, 0x20a9, 0x00fa, 0x00f0, 0x1b2b, 0x2079, 0x4f00, 0x2009,
+        0x0018, 0x72c8, 0xd284, 0x00c0, 0x1b39, 0x2061, 0x4f40, 0x0078,
+        0x1b3c, 0x2061, 0x4f80, 0xc1fd, 0x607f, 0x0000, 0x792a, 0x6067,
+        0x0001, 0x6083, 0x000f, 0x60a7, 0x0000, 0x60a8, 0x60b2, 0x60b6,
+        0x60d4, 0xd0b4, 0x0040, 0x1b58, 0xc0b4, 0x60d6, 0x0c7e, 0x60b8,
+        0xa065, 0x6008, 0xc0d4, 0x600a, 0x6018, 0x8001, 0x601a, 0x0c7f,
+        0x60d4, 0xa084, 0x77ff, 0x60d6, 0x78ac, 0xc08d, 0x78ae, 0x83ff,
+        0x0040, 0x1b63, 0x007c, 0x681b, 0x0047, 0x2091, 0x8001, 0x007c,
+        0x73cc, 0x1078, 0x1aba, 0x69ec, 0x6a48, 0xa185, 0x1800, 0x684a,
+        0xa185, 0x0040, 0x68ee, 0x73cc, 0x2021, 0x0004, 0x20a9, 0x09ff,
+        0x00f0, 0x1b78, 0x8421, 0x00c0, 0x1b76, 0x8319, 0x00c0, 0x1b74,
+        0x69ee, 0x6a4a, 0x2091, 0x8001, 0x007c, 0xd7fc, 0x00c0, 0x1b8c,
+        0x2069, 0x4f40, 0x0078, 0x1b8e, 0x2069, 0x4f80, 0x71c4, 0x71c6,
+        0x6916, 0x81ff, 0x00c0, 0x1b96, 0x68a7, 0x0001, 0x78ac, 0xc08c,
+        0x78ae, 0xd084, 0x00c0, 0x1b9e, 0x1078, 0x1f2d, 0x007c, 0x75d8,
+        0x74dc, 0x75da, 0x74de, 0x0078, 0x1ba7, 0xa02e, 0x2520, 0x71c4,
+        0x73c8, 0x72cc, 0x71c6, 0x73ca, 0x72ce, 0x2079, 0x4f00, 0x7dde,
+        0x7cda, 0x7bd6, 0x7ad2, 0x1078, 0x1e04, 0x0040, 0x1cd1, 0x20a9,
+        0x0005, 0x20a1, 0x4f14, 0x2091, 0x8000, 0x41a1, 0x2091, 0x8001,
+        0x2009, 0x0040, 0x1078, 0x2018, 0x0040, 0x1bca, 0x1078, 0x1e0d,
+        0x0078, 0x1cd1, 0x6004, 0xa08c, 0x00ff, 0xa18e, 0x0009, 0x00c0,
+        0x1bd5, 0x007e, 0x1078, 0x23bf, 0x007f, 0xa084, 0xff00, 0x8007,
+        0x8009, 0x0040, 0x1c61, 0x0c7e, 0x2c68, 0x1078, 0x1e04, 0x0040,
+        0x1c1b, 0x2c00, 0x689e, 0x8109, 0x00c0, 0x1bdc, 0x609f, 0x0000,
+        0x0c7f, 0x0c7e, 0x7ddc, 0x7cd8, 0x7bd4, 0x7ad0, 0xa290, 0x0040,
+        0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x7dde, 0x7cda,
+        0x7bd6, 0x7ad2, 0x2c68, 0x689c, 0xa065, 0x0040, 0x1c60, 0x2009,
+        0x0040, 0x1078, 0x2018, 0x00c0, 0x1c3e, 0x6004, 0xa084, 0x00ff,
+        0xa086, 0x0002, 0x00c0, 0x1c1b, 0x6004, 0xa084, 0x00ff, 0xa086,
+        0x000a, 0x00c0, 0x1c17, 0x017e, 0x1078, 0x23bb, 0x017f, 0x2d00,
+        0x6002, 0x0078, 0x1bea, 0x0c7f, 0x0c7e, 0x609c, 0x1078, 0x1e90,
+        0x0c7f, 0x609f, 0x0000, 0x1078, 0x1cd5, 0x2009, 0x0018, 0x6008,
+        0xc0cd, 0x600a, 0x6004, 0x6086, 0x7810, 0x007e, 0x84ff, 0x00c0,
+        0x1c34, 0x85ff, 0x0040, 0x1c36, 0xc0c5, 0x7812, 0x1078, 0x1dbb,
+        0x007f, 0x7812, 0x1078, 0x1e0d, 0x0078, 0x1cd1, 0x0c7f, 0x0c7e,
+        0x609c, 0x1078, 0x1e90, 0x0c7f, 0x609f, 0x0000, 0x1078, 0x1cd5,
+        0x2009, 0x0018, 0x6087, 0x0103, 0x601b, 0x0003, 0x7810, 0x007e,
+        0x84ff, 0x00c0, 0x1c56, 0x85ff, 0x0040, 0x1c58, 0xc0c5, 0x7812,
+        0x1078, 0x1dbb, 0x007f, 0x7812, 0x1078, 0x1e0d, 0x0078, 0x1cd1,
+        0x0c7f, 0x7814, 0xd0e4, 0x00c0, 0x1c8f, 0x6114, 0xd1fc, 0x0040,
+        0x1c6f, 0x1078, 0x1dae, 0x0040, 0x1c8f, 0x0078, 0x1c73, 0x1078,
+        0x1da1, 0x0040, 0x1c8f, 0x1078, 0x1cd5, 0x2009, 0x0018, 0x6087,
+        0x0103, 0x601b, 0x0021, 0x7810, 0x007e, 0x84ff, 0x00c0, 0x1c83,
+        0x85ff, 0x0040, 0x1c85, 0xc0c5, 0x7812, 0x1078, 0x1dbb, 0x007f,
+        0x7812, 0x1078, 0x1e0d, 0x2001, 0x4007, 0x0078, 0x15c3, 0x74c4,
+        0x73c8, 0x72cc, 0x6014, 0x2091, 0x8000, 0x0e7e, 0x2009, 0x0012,
+        0xd0fc, 0x00c0, 0x1c9f, 0x2071, 0x4f40, 0x0078, 0x1ca2, 0x2071,
+        0x4f80, 0xc1fd, 0x792a, 0x7067, 0x0005, 0x71d4, 0xc1dc, 0x71d6,
+        0x736a, 0x726e, 0x7472, 0x7076, 0x707b, 0x0000, 0x2c00, 0x707e,
+        0xa02e, 0x2530, 0x611c, 0xa184, 0x0060, 0x0040, 0x1cb9, 0x1078,
+        0x46b6, 0x0e7f, 0x6596, 0x65a6, 0x669a, 0x66aa, 0x60af, 0x0000,
+        0x60b3, 0x0000, 0x6714, 0x6023, 0x0000, 0x6024, 0xa096, 0x0001,
+        0x00c0, 0x1ccc, 0x8000, 0x6026, 0x1078, 0x266f, 0x2091, 0x8001,
+        0x007c, 0x70c3, 0x4005, 0x0078, 0x15c4, 0x20a9, 0x0005, 0x2099,
+        0x4f14, 0x2091, 0x8000, 0x530a, 0x2091, 0x8001, 0x2100, 0xa210,
+        0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x007c, 0x71c4,
+        0x70c7, 0x0000, 0x791e, 0x0078, 0x15c1, 0x71c4, 0x71c6, 0x2168,
+        0x0078, 0x1cf4, 0x2069, 0x1000, 0x690c, 0xa016, 0x2d04, 0xa210,
+        0x8d68, 0x8109, 0x00c0, 0x1cf6, 0xa285, 0x0000, 0x00c0, 0x1d04,
+        0x70c3, 0x4000, 0x0078, 0x1d06, 0x70c3, 0x4003, 0x70ca, 0x0078,
+        0x15c4, 0x7964, 0x71c6, 0x71c4, 0xa182, 0x0003, 0x00c8, 0x15b9,
+        0x7966, 0x0078, 0x15c1, 0x7964, 0x71c6, 0x0078, 0x15c1, 0x7900,
+        0x71c6, 0x71c4, 0x7902, 0x0078, 0x15c1, 0x7900, 0x71c6, 0x0078,
+        0x15c1, 0x70c4, 0x2011, 0x0000, 0xa08c, 0x000d, 0x0040, 0x1d36,
+        0x810c, 0x0048, 0x1d32, 0x8210, 0x810c, 0x810c, 0x0048, 0x1d32,
+        0x8210, 0x810c, 0x81ff, 0x00c0, 0x15ba, 0x8210, 0x7a0e, 0xd28c,
+        0x0040, 0x1d62, 0x7910, 0xc1cd, 0x7912, 0x2009, 0x0021, 0x2019,
+        0x0003, 0xd284, 0x0040, 0x1d5c, 0x8108, 0x2019, 0x0041, 0x2011,
+        0x974e, 0x2312, 0x2019, 0x0042, 0x8210, 0x2312, 0x2019, 0x0043,
+        0x8210, 0x2312, 0x2019, 0x0046, 0x8210, 0x2312, 0x2019, 0x0047,
+        0x8210, 0x2312, 0x2019, 0x0006, 0x2011, 0x9753, 0x2112, 0x2011,
+        0x9773, 0x2312, 0x7904, 0x7806, 0x0078, 0x15c0, 0x7804, 0x70c6,
+        0x0078, 0x15c1, 0x71c4, 0xd1fc, 0x00c0, 0x1d72, 0x2011, 0x53c0,
+        0x0078, 0x1d74, 0x2011, 0x5440, 0x8107, 0xa084, 0x000f, 0x8003,
+        0x8003, 0x8003, 0xa268, 0x6a14, 0xd2b4, 0x0040, 0x1d83, 0x2011,
+        0x0001, 0x0078, 0x1d85, 0x2011, 0x0000, 0x6b0c, 0x6800, 0x70da,
+        0x0078, 0x15be, 0x7814, 0xd0f4, 0x0040, 0x1d95, 0x2001, 0x4007,
+        0x70db, 0x0000, 0xa005, 0x0078, 0x1da0, 0xd0fc, 0x0040, 0x1d9f,
+        0x2001, 0x4007, 0x70db, 0x0001, 0xa005, 0x0078, 0x1da0, 0xa006,
+        0x007c, 0x7814, 0xd0f4, 0x0040, 0x1dac, 0x2001, 0x4007, 0x70db,
+        0x0000, 0xa005, 0x0078, 0x1dad, 0xa006, 0x007c, 0x7814, 0xd0fc,
+        0x0040, 0x1db9, 0x2001, 0x4007, 0x70db, 0x0001, 0xa005, 0x0078,
+        0x1dba, 0xa006, 0x007c, 0x7112, 0x721a, 0x731e, 0x7810, 0xd0c4,
+        0x0040, 0x1dc4, 0x7422, 0x7526, 0xac80, 0x0001, 0x8108, 0x810c,
+        0x81a9, 0x8098, 0x20a1, 0x0030, 0x7003, 0x0000, 0x6084, 0x20a2,
+        0x53a6, 0x7007, 0x0001, 0x7974, 0xa184, 0xff00, 0x0040, 0x1de1,
+        0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0078,
+        0x1de4, 0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006,
+        0xa211, 0x7d10, 0xd5c4, 0x0040, 0x1df1, 0x7b84, 0xa319, 0x7c80,
+        0xa421, 0x7008, 0xd0fc, 0x0040, 0x1df1, 0x7003, 0x0001, 0x7007,
+        0x0006, 0x711a, 0x721e, 0x7d10, 0xd5c4, 0x0040, 0x1e01, 0x7322,
+        0x7426, 0xa084, 0x01e0, 0x007c, 0x7848, 0xa065, 0x0040, 0x1e0c,
+        0x2c04, 0x784a, 0x2063, 0x0000, 0x007c, 0x0f7e, 0x2079, 0x4f00,
+        0x7848, 0x2062, 0x2c00, 0xa005, 0x00c0, 0x1e18, 0x1078, 0x29b2,
+        0x784a, 0x0f7f, 0x007c, 0x2011, 0x9900, 0x7a4a, 0x7bc4, 0x8319,
+        0x0040, 0x1e28, 0xa280, 0x0032, 0x2012, 0x2010, 0x0078, 0x1e1f,
+        0x2013, 0x0000, 0x007c, 0x017e, 0x027e, 0xd7fc, 0x00c0, 0x1e34,
+        0x2011, 0x54c0, 0x0078, 0x1e36, 0x2011, 0x74c0, 0xa784, 0x0f00,
+        0x800b, 0xa784, 0x001f, 0x0040, 0x1e41, 0x8003, 0x8003, 0x8003,
+        0x8003, 0xa105, 0xa268, 0x027f, 0x017f, 0x007c, 0x1078, 0x1e2b,
+        0x2900, 0x682a, 0x2a00, 0x682e, 0x6808, 0xa084, 0xf9ef, 0xa80d,
+        0x690a, 0x0e7e, 0xd7fc, 0x00c0, 0x1e5b, 0x2009, 0x4f53, 0x2071,
+        0x4f40, 0x0078, 0x1e5f, 0x2009, 0x4f93, 0x2071, 0x4f80, 0x210c,
+        0x6804, 0xa005, 0x0040, 0x1e6f, 0xa116, 0x00c0, 0x1e6f, 0x2060,
+        0x6000, 0x6806, 0x017e, 0x200b, 0x0000, 0x0078, 0x1e72, 0x2009,
+        0x0000, 0x017e, 0x6804, 0xa065, 0x0040, 0x1e87, 0x6000, 0x6806,
+        0x1078, 0x1ea2, 0x1078, 0x2064, 0x6810, 0x7908, 0x8109, 0x790a,
+        0x8001, 0x6812, 0x00c0, 0x1e72, 0x7910, 0xc1a5, 0x7912, 0x017f,
+        0x6902, 0x6906, 0x2d00, 0x2060, 0x1078, 0x2b13, 0x0e7f, 0x007c,
+        0xa065, 0x0040, 0x1ea1, 0x2008, 0x609c, 0xa005, 0x0040, 0x1e9e,
+        0x2062, 0x609f, 0x0000, 0xa065, 0x0078, 0x1e94, 0x7848, 0x794a,
+        0x2062, 0x007c, 0x6007, 0x0103, 0x608f, 0x0000, 0x20a9, 0x001c,
+        0xac80, 0x0005, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x6828, 0x601a,
+        0x682c, 0x6022, 0x007c, 0x0e7e, 0xd7fc, 0x00c0, 0x1ebd, 0x2071,
+        0x4f40, 0x2031, 0x4fc0, 0x0078, 0x1ec1, 0x2071, 0x4f80, 0x2031,
+        0x51c0, 0x7050, 0xa08c, 0x0200, 0x00c0, 0x1ecb, 0xa608, 0x2d0a,
+        0x8000, 0x7052, 0xa006, 0x0e7f, 0x007c, 0x0f7e, 0xd7fc, 0x00c0,
+        0x1ed5, 0x2079, 0x4f40, 0x0078, 0x1ed7, 0x2079, 0x4f80, 0x1078,
+        0x1e2b, 0x2091, 0x8000, 0x6804, 0x780a, 0xa065, 0x0040, 0x1f2b,
+        0x0078, 0x1ee9, 0x2c00, 0x780a, 0x2060, 0x6000, 0xa065, 0x0040,
+        0x1f2b, 0x6010, 0xa306, 0x00c0, 0x1ee2, 0x600c, 0xa206, 0x00c0,
+        0x1ee2, 0x2c28, 0x784c, 0xac06, 0x00c0, 0x1ef8, 0x0078, 0x1f28,
+        0x6804, 0xac06, 0x00c0, 0x1f06, 0x6000, 0x2060, 0x6806, 0xa005,
+        0x00c0, 0x1f06, 0x6803, 0x0000, 0x0078, 0x1f10, 0x6400, 0x7808,
+        0x2060, 0x6402, 0xa486, 0x0000, 0x00c0, 0x1f10, 0x2c00, 0x6802,
+        0x2560, 0x0f7f, 0x1078, 0x1ea2, 0x0f7e, 0x601b, 0x0005, 0x6023,
+        0x0020, 0x0f7f, 0x1078, 0x2064, 0x0f7e, 0x7908, 0x8109, 0x790a,
+        0x6810, 0x8001, 0x6812, 0x00c0, 0x1f28, 0x7810, 0xc0a5, 0x7812,
+        0x2001, 0xffff, 0xa005, 0x0f7f, 0x007c, 0x077e, 0x2700, 0x2039,
+        0x0000, 0xd0fc, 0x0040, 0x1f35, 0xc7fd, 0x2041, 0x0021, 0x2049,
+        0x0004, 0x2051, 0x0008, 0x2091, 0x8000, 0x1078, 0x1e46, 0x8738,
+        0xa784, 0x001f, 0x00c0, 0x1f3d, 0xa7bc, 0xff00, 0x873f, 0x8738,
+        0x873f, 0xa784, 0x0f00, 0x00c0, 0x1f3d, 0x2091, 0x8001, 0x077f,
+        0x007c, 0x786c, 0x2009, 0x9774, 0x210c, 0xa10d, 0x0040, 0x1f5b,
+        0xa065, 0x0078, 0x23dc, 0x2061, 0x0000, 0x6018, 0xd084, 0x00c0,
+        0x1f7b, 0x7810, 0xd08c, 0x0040, 0x1f6c, 0xc08c, 0x7812, 0xc7fc,
+        0x2069, 0x4f40, 0x0078, 0x1f71, 0xc08d, 0x7812, 0x2069, 0x4f80,
+        0xc7fd, 0x2091, 0x8000, 0x681c, 0x681f, 0x0000, 0x2091, 0x8001,
+        0xa005, 0x00c0, 0x1f7c, 0x007c, 0xa08c, 0xfff0, 0x0040, 0x1f82,
+        0x1078, 0x29b2, 0x0079, 0x1f84, 0x1f94, 0x1f97, 0x1f9d, 0x1fa1,
+        0x1f95, 0x1fa5, 0x1f95, 0x1f95, 0x1f95, 0x1fab, 0x1fdc, 0x1fe0,
+        0x1fe6, 0x1ffb, 0x1f95, 0x1f95, 0x007c, 0x1078, 0x29b2, 0x1078,
+        0x1f2d, 0x2001, 0x8001, 0x0078, 0x2007, 0x2001, 0x8003, 0x0078,
+        0x2007, 0x2001, 0x8004, 0x0078, 0x2007, 0x1078, 0x1f2d, 0x2001,
+        0x8006, 0x0078, 0x2007, 0x2091, 0x8000, 0x077e, 0xd7fc, 0x00c0,
+        0x1fb7, 0x2069, 0x4f40, 0x2039, 0x0009, 0x0078, 0x1fbb, 0x2069,
+        0x4f80, 0x2039, 0x0009, 0x6800, 0xa086, 0x0000, 0x0040, 0x1fc5,
+        0x007f, 0x6f1e, 0x2091, 0x8001, 0x007c, 0x6874, 0x077f, 0xa0bc,
+        0xff00, 0x2041, 0x0021, 0x2049, 0x0004, 0x2051, 0x0010, 0x1078,
+        0x1e46, 0x8738, 0xa784, 0x001f, 0x00c0, 0x1fcf, 0x2091, 0x8001,
+        0x2001, 0x800a, 0x0078, 0x2007, 0x2001, 0x800c, 0x0078, 0x2007,
+        0x1078, 0x1f2d, 0x2001, 0x800d, 0x0078, 0x2007, 0x7814, 0xd0e4,
+        0x00c0, 0x1ff9, 0xd0ec, 0x0040, 0x1ff3, 0xd7fc, 0x0040, 0x1ff3,
+        0x78e4, 0x0078, 0x1ff4, 0x78e0, 0x70c6, 0x2001, 0x800e, 0x0078,
+        0x2007, 0x0078, 0x1f95, 0xd7fc, 0x0040, 0x2001, 0x78ec, 0x0078,
+        0x2002, 0x78e8, 0x70c6, 0x2001, 0x800f, 0x0078, 0x2007, 0x70c2,
+        0xd7fc, 0x00c0, 0x200f, 0x70db, 0x0000, 0x0078, 0x2011, 0x70db,
+        0x0001, 0x2061, 0x0000, 0x601b, 0x0001, 0x2091, 0x4080, 0x007c,
+        0xac80, 0x0001, 0x81ff, 0x0040, 0x2043, 0x2099, 0x0030, 0x20a0,
+        0x700c, 0xa084, 0x03ff, 0x0040, 0x2025, 0x7018, 0x007e, 0x701c,
+        0x007e, 0x7020, 0x007e, 0x7024, 0x007e, 0x7112, 0x81ac, 0x721a,
+        0x731e, 0x7422, 0x7526, 0x7003, 0x0001, 0x7007, 0x0001, 0x7008,
+        0x800b, 0x00c8, 0x2037, 0x7007, 0x0002, 0xa08c, 0x01e0, 0x00c0,
+        0x2043, 0x53a5, 0xa006, 0x7003, 0x0000, 0x7007, 0x0004, 0x007f,
+        0x7026, 0x007f, 0x7022, 0x007f, 0x701e, 0x007f, 0x701a, 0x007c,
+        0x2011, 0x0020, 0x2009, 0x0010, 0x6b0a, 0x6c0e, 0x6803, 0xfd00,
+        0x6807, 0x0018, 0x6a1a, 0x2d00, 0xa0e8, 0x0008, 0xa290, 0x0004,
+        0x8109, 0x00c0, 0x2054, 0x007c, 0x6004, 0x6086, 0x2c08, 0x2063,
+        0x0000, 0x7868, 0xa005, 0x796a, 0x0040, 0x2071, 0x2c02, 0x0078,
+        0x2072, 0x796e, 0x007c, 0x0c7e, 0x2061, 0x4f00, 0x6887, 0x0103,
+        0x2d08, 0x206b, 0x0000, 0x6068, 0xa005, 0x616a, 0x0040, 0x2083,
+        0x2d02, 0x0078, 0x2084, 0x616e, 0x0c7f, 0x007c, 0x2091, 0x8000,
+        0x2c04, 0x786e, 0xa005, 0x00c0, 0x208e, 0x786a, 0x2091, 0x8001,
+        0x609c, 0xa005, 0x0040, 0x20a7, 0x0c7e, 0x2060, 0x2008, 0x609c,
+        0xa005, 0x0040, 0x20a3, 0x2062, 0x609f, 0x0000, 0xa065, 0x609c,
+        0xa005, 0x00c0, 0x209b, 0x7848, 0x794a, 0x2062, 0x0c7f, 0x7848,
+        0x2062, 0x609f, 0x0000, 0xac85, 0x0000, 0x00c0, 0x20b1, 0x1078,
+        0x29b2, 0x784a, 0x007c, 0x20a9, 0x0010, 0xa006, 0x8004, 0x8086,
+        0x818e, 0x00c8, 0x20bc, 0xa200, 0x00f0, 0x20b7, 0x8086, 0x818e,
+        0x007c, 0x157e, 0x20a9, 0x0010, 0xa005, 0x0040, 0x20e2, 0xa11a,
+        0x00c8, 0x20e2, 0x8213, 0x818d, 0x0048, 0x20d5, 0xa11a, 0x00c8,
+        0x20d6, 0x00f0, 0x20ca, 0x0078, 0x20da, 0xa11a, 0x2308, 0x8210,
+        0x00f0, 0x20ca, 0x007e, 0x3200, 0xa084, 0xf7ff, 0x2080, 0x007f,
+        0x157f, 0x007c, 0x007e, 0x3200, 0xa085, 0x0800, 0x0078, 0x20de,
+        0x7d74, 0x70d0, 0xa506, 0x0040, 0x21ce, 0x7810, 0x2050, 0x7800,
+        0xd08c, 0x0040, 0x210a, 0xdaec, 0x0040, 0x210a, 0x0e7e, 0x2091,
+        0x8000, 0x2071, 0x0020, 0x7004, 0xa005, 0x00c0, 0x2107, 0x7008,
+        0x0e7f, 0xa086, 0x0008, 0x0040, 0x210a, 0x0078, 0x21ce, 0x0e7f,
+        0x0078, 0x21ce, 0x1078, 0x1e04, 0x0040, 0x21ce, 0xa046, 0x7970,
+        0x2500, 0x8000, 0xa112, 0x2009, 0x0040, 0x00c8, 0x2119, 0x0078,
+        0x2120, 0x72d0, 0xa206, 0x0040, 0x2120, 0x8840, 0x2009, 0x0080,
+        0x0c7e, 0x7112, 0x7007, 0x0001, 0x2099, 0x0030, 0x20a9, 0x0020,
+        0xac80, 0x0001, 0x20a0, 0x2061, 0x0000, 0x88ff, 0x0040, 0x2132,
+        0x1078, 0x1e04, 0x7008, 0xd0fc, 0x0040, 0x2132, 0x7007, 0x0002,
+        0x2091, 0x8001, 0xa08c, 0x01e0, 0x00c0, 0x2169, 0x53a5, 0x8cff,
+        0x00c0, 0x2147, 0x88ff, 0x0040, 0x21b8, 0x0078, 0x2151, 0x2c00,
+        0x788e, 0x20a9, 0x0020, 0xac80, 0x0001, 0x20a0, 0x53a5, 0x0078,
+        0x21b8, 0xa046, 0x7218, 0x731c, 0xdac4, 0x0040, 0x2159, 0x7420,
+        0x7524, 0xa292, 0x0040, 0xa39b, 0x0000, 0xa4a3, 0x0000, 0xa5ab,
+        0x0000, 0x721a, 0x731e, 0xdac4, 0x0040, 0x2169, 0x7422, 0x7526,
+        0xa006, 0x7007, 0x0004, 0x0040, 0x21b8, 0x8cff, 0x0040, 0x2172,
+        0x1078, 0x1e0d, 0x0c7f, 0x1078, 0x1e0d, 0xa046, 0x7888, 0x8000,
+        0x788a, 0xa086, 0x0002, 0x0040, 0x2198, 0x7a7c, 0x7b78, 0xdac4,
+        0x0040, 0x2184, 0x7c84, 0x7d80, 0x7974, 0x8107, 0x8004, 0x8004,
+        0xa210, 0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x721a,
+        0x731e, 0xdac4, 0x0040, 0x21ce, 0x7422, 0x7526, 0x0078, 0x21ce,
+        0x6014, 0xd0fc, 0x00c0, 0x21a0, 0x2069, 0x4f40, 0x0078, 0x21a2,
+        0x2069, 0x4f80, 0x2091, 0x8000, 0x681f, 0x0002, 0x88ff, 0x0040,
+        0x21ae, 0xa046, 0x788c, 0x2060, 0x0078, 0x2198, 0x788b, 0x0000,
+        0x78ac, 0xa085, 0x0003, 0x78ae, 0x2091, 0x8001, 0x0078, 0x21ce,
+        0x0c7f, 0x788b, 0x0000, 0x1078, 0x238d, 0x6004, 0xa084, 0x000f,
+        0x1078, 0x21cf, 0x88ff, 0x0040, 0x21cc, 0x788c, 0x2060, 0x6004,
+        0xa084, 0x000f, 0x1078, 0x21cf, 0x0078, 0x20e8, 0x007c, 0x0079,
+        0x21d1, 0x21e1, 0x21ff, 0x221d, 0x21e1, 0x222e, 0x21f2, 0x21e1,
+        0x21e1, 0x21e1, 0x21fd, 0x221b, 0x21e1, 0x21e1, 0x21e1, 0x21e1,
+        0x21e1, 0x2039, 0x0400, 0x78bc, 0xa705, 0x78be, 0x6008, 0xa705,
+        0x600a, 0x1078, 0x2271, 0x609c, 0x78ba, 0x609f, 0x0000, 0x1078,
+        0x2377, 0x007c, 0x78bc, 0xd0c4, 0x0040, 0x21f8, 0x0078, 0x21e1,
+        0x601c, 0xc0bd, 0x601e, 0x0078, 0x2205, 0x1078, 0x23bf, 0x78bc,
+        0xd0c4, 0x0040, 0x2205, 0x0078, 0x21e1, 0x78bf, 0x0000, 0x6004,
+        0x8007, 0xa084, 0x00ff, 0x78b2, 0x8001, 0x0040, 0x2218, 0x1078,
+        0x2271, 0x0040, 0x2218, 0x78bc, 0xc0c5, 0x78be, 0x0078, 0x221a,
+        0x0078, 0x2290, 0x007c, 0x1078, 0x23bb, 0x78bc, 0xa08c, 0x0e00,
+        0x00c0, 0x2225, 0xd0c4, 0x00c0, 0x2227, 0x0078, 0x21e1, 0x1078,
+        0x2271, 0x00c0, 0x222d, 0x0078, 0x2290, 0x007c, 0x78bc, 0xd0c4,
+        0x0040, 0x2234, 0x0078, 0x21e1, 0x78bf, 0x0000, 0x6714, 0x2011,
+        0x0001, 0x22a8, 0x6018, 0xa084, 0x00ff, 0xa005, 0x0040, 0x2254,
+        0xa7bc, 0xff00, 0x20a9, 0x0020, 0xa08e, 0x0001, 0x0040, 0x2254,
+        0xa7bc, 0x8000, 0x2011, 0x0002, 0x20a9, 0x0100, 0xa08e, 0x0002,
+        0x0040, 0x2254, 0x0078, 0x226e, 0x1078, 0x1e2b, 0x2d00, 0x2091,
+        0x8000, 0x682b, 0x0000, 0x682f, 0x0000, 0x6808, 0xa084, 0xffde,
+        0x680a, 0xade8, 0x0010, 0x2091, 0x8001, 0x00f0, 0x2257, 0x8211,
+        0x0040, 0x226e, 0x20a9, 0x0100, 0x0078, 0x2257, 0x1078, 0x1e0d,
+        0x007c, 0x609f, 0x0000, 0x78b4, 0xa06d, 0x2c00, 0x78b6, 0x00c0,
+        0x227c, 0x78ba, 0x0078, 0x2284, 0x689e, 0x2d00, 0x6002, 0x78b8,
+        0xad06, 0x00c0, 0x2284, 0x6002, 0x78b0, 0x8001, 0x78b2, 0x00c0,
+        0x228f, 0x78bc, 0xc0c4, 0x78be, 0x78b8, 0x2060, 0xa006, 0x007c,
+        0x0e7e, 0xa02e, 0x2530, 0x7dba, 0x7db6, 0x65ae, 0x65b2, 0x601c,
+        0x60a2, 0x2048, 0xa984, 0xe1ff, 0x601e, 0xa984, 0x0060, 0x0040,
+        0x22a3, 0x1078, 0x46b6, 0x6596, 0x65a6, 0x669a, 0x66aa, 0x6714,
+        0x2071, 0x4f80, 0xd7fc, 0x00c0, 0x22af, 0x2071, 0x4f40, 0xa784,
+        0x0f00, 0x800b, 0xa784, 0x001f, 0x0040, 0x22ba, 0x8003, 0x8003,
+        0x8003, 0x8003, 0xa105, 0x71c4, 0xa168, 0x2700, 0x8007, 0xa084,
+        0x000f, 0x8003, 0x8003, 0x8003, 0x71c8, 0xa100, 0x60c2, 0x2091,
+        0x8000, 0x7814, 0xd0c4, 0x0040, 0x22df, 0xd0ec, 0x0040, 0x22db,
+        0xd7fc, 0x00c0, 0x22d8, 0xd0f4, 0x00c0, 0x22e6, 0x0078, 0x22df,
+        0xd0fc, 0x00c0, 0x22e6, 0x7810, 0xd0f4, 0x00c0, 0x22e6, 0x6e08,
+        0xd684, 0x0040, 0x2310, 0xd9fc, 0x00c0, 0x2310, 0x2091, 0x8001,
+        0x1078, 0x1ea2, 0x2091, 0x8000, 0x1078, 0x2064, 0x2091, 0x8001,
+        0x7814, 0xd0e4, 0x00c0, 0x2375, 0x7814, 0xd0c4, 0x0040, 0x2375,
+        0xd0ec, 0x0040, 0x2308, 0xd7fc, 0x00c0, 0x2303, 0xd0f4, 0x00c0,
+        0x230c, 0x0078, 0x2375, 0xd0fc, 0x00c0, 0x230c, 0x0078, 0x2375,
+        0x7810, 0xd0f4, 0x0040, 0x2375, 0x601b, 0x0021, 0x0078, 0x2375,
+        0x6024, 0xa096, 0x0001, 0x00c0, 0x2317, 0x8000, 0x6026, 0x6a10,
+        0x6814, 0xa202, 0x0048, 0x232a, 0x0040, 0x232a, 0x2091, 0x8001,
+        0x2039, 0x0200, 0x609c, 0x78ba, 0x609f, 0x0000, 0x1078, 0x2377,
+        0x0078, 0x2375, 0x2c08, 0xd9fc, 0x0040, 0x2352, 0x6800, 0xa065,
+        0x0040, 0x2352, 0x6a04, 0x7000, 0xa084, 0x0002, 0x0040, 0x2348,
+        0x704c, 0xa206, 0x00c0, 0x2348, 0x6b04, 0x2160, 0x2304, 0x6002,
+        0xa005, 0x00c0, 0x2344, 0x6902, 0x2260, 0x6102, 0x0078, 0x235e,
+        0x2d00, 0x2060, 0x1078, 0x2b13, 0x6e08, 0x2160, 0x6202, 0x6906,
+        0x0078, 0x235e, 0x6800, 0x6902, 0xa065, 0x0040, 0x235a, 0x6102,
+        0x0078, 0x235b, 0x6906, 0x2160, 0x6003, 0x0000, 0x2160, 0xd9fc,
+        0x0040, 0x2365, 0xa6b4, 0xfffc, 0x6e0a, 0x6810, 0x7d08, 0x8528,
+        0x7d0a, 0x8000, 0x6812, 0x2091, 0x8001, 0xd6b4, 0x0040, 0x2375,
+        0xa6b6, 0x0040, 0x6e0a, 0x1078, 0x1eb3, 0x0e7f, 0x007c, 0x6008,
+        0xa705, 0x600a, 0x2091, 0x8000, 0x1078, 0x2064, 0x2091, 0x8001,
+        0x78b8, 0xa065, 0x0040, 0x238a, 0x609c, 0x78ba, 0x609f, 0x0000,
+        0x0078, 0x2377, 0x78b6, 0x78ba, 0x007c, 0x7970, 0x7874, 0x2818,
+        0xd384, 0x0040, 0x2397, 0x8000, 0xa112, 0x0048, 0x239c, 0x8000,
+        0xa112, 0x00c8, 0x23ac, 0xc384, 0x7a7c, 0x721a, 0x7a78, 0x721e,
+        0xdac4, 0x0040, 0x23a7, 0x7a84, 0x7222, 0x7a80, 0x7226, 0xa006,
+        0xd384, 0x0040, 0x23ac, 0x8000, 0x7876, 0x70d2, 0x781c, 0xa005,
+        0x0040, 0x23ba, 0x8001, 0x781e, 0x00c0, 0x23ba, 0x0068, 0x23ba,
+        0x2091, 0x4080, 0x007c, 0x2039, 0x23d3, 0x0078, 0x23c1, 0x2039,
+        0x23d9, 0x2704, 0xa005, 0x0040, 0x23d2, 0xac00, 0x2068, 0x6908,
+        0x6810, 0x6912, 0x680a, 0x690c, 0x6814, 0x6916, 0x680e, 0x8738,
+        0x0078, 0x23c1, 0x007c, 0x0003, 0x0009, 0x000f, 0x0015, 0x001b,
+        0x0000, 0x0015, 0x001b, 0x0000, 0x2041, 0x0000, 0x780c, 0x0079,
+        0x23e1, 0x25b3, 0x2586, 0x23e5, 0x245e, 0x2039, 0x9774, 0x2734,
+        0x7d10, 0x0078, 0x2405, 0x6084, 0xa086, 0x0103, 0x00c0, 0x2447,
+        0x6114, 0x6018, 0xa105, 0x0040, 0x23fa, 0x86ff, 0x00c0, 0x2416,
+        0x0078, 0x2447, 0x8603, 0xa080, 0x9755, 0x620c, 0x2202, 0x8000,
+        0x6210, 0x2202, 0x1078, 0x2086, 0x8630, 0xa68e, 0x000f, 0x0040,
+        0x24d2, 0x786c, 0xa065, 0x00c0, 0x23eb, 0x7808, 0xa602, 0x00c8,
+        0x2416, 0xd5ac, 0x00c0, 0x2416, 0x263a, 0x007c, 0xa682, 0x0003,
+        0x00c8, 0x24d2, 0x2091, 0x8000, 0x2069, 0x0000, 0x6818, 0xd084,
+        0x00c0, 0x2442, 0x2011, 0x9755, 0x2204, 0x70c6, 0x8210, 0x2204,
+        0x70ca, 0xd684, 0x00c0, 0x2432, 0x8210, 0x2204, 0x70da, 0x8210,
+        0x2204, 0x70de, 0xa685, 0x8020, 0x70c2, 0x681b, 0x0001, 0x2091,
+        0x4080, 0x7810, 0xa084, 0xffcf, 0x7812, 0x2091, 0x8001, 0x203b,
+        0x0000, 0x007c, 0x7810, 0xc0ad, 0x7812, 0x0078, 0x24d2, 0x263a,
+        0x1078, 0x25bd, 0x00c0, 0x25e0, 0x786c, 0xa065, 0x00c0, 0x23eb,
+        0x2091, 0x8000, 0x7810, 0xa084, 0xffcf, 0x86ff, 0x0040, 0x2459,
+        0xc0ad, 0x7812, 0x2091, 0x8001, 0x0078, 0x25e0, 0x2039, 0x9774,
+        0x2734, 0x7d10, 0x0078, 0x247a, 0x6084, 0xa086, 0x0103, 0x00c0,
+        0x24bb, 0x6114, 0x6018, 0xa105, 0x0040, 0x2473, 0x86ff, 0x00c0,
+        0x248b, 0x0078, 0x24bb, 0xa680, 0x9755, 0x620c, 0x2202, 0x1078,
+        0x2086, 0x8630, 0xa68e, 0x001e, 0x0040, 0x24d2, 0x786c, 0xa065,
+        0x00c0, 0x2464, 0x7808, 0xa602, 0x00c8, 0x248b, 0xd5ac, 0x00c0,
+        0x248b, 0x263a, 0x007c, 0xa682, 0x0006, 0x00c8, 0x24d2, 0x2091,
+        0x8000, 0x2069, 0x0000, 0x6818, 0xd084, 0x00c0, 0x24b6, 0x2011,
+        0x9755, 0x2009, 0x974e, 0x26a8, 0x211c, 0x2204, 0x201a, 0x8108,
+        0x8210, 0x00f0, 0x249c, 0xa685, 0x8030, 0x70c2, 0x681b, 0x0001,
         0x2091, 0x4080, 0x7810, 0xa084, 0xffcf, 0x7812, 0x2091, 0x8001,
-        0x203b, 0x0000, 0x007c, 0x7810, 0xc0ad, 0x7812, 0x0078, 0x248b,
-        0x263a, 0x1078, 0x2576, 0x00c0, 0x2599, 0x786c, 0xa065, 0x00c0,
-        0x23a4, 0x2091, 0x8000, 0x7810, 0xa084, 0xffcf, 0x86ff, 0x0040,
-        0x2412, 0xc0ad, 0x7812, 0x2091, 0x8001, 0x0078, 0x2599, 0x2039,
-        0x9674, 0x2734, 0x7d10, 0x0078, 0x2433, 0x6084, 0xa086, 0x0103,
-        0x00c0, 0x2474, 0x6114, 0x6018, 0xa105, 0x0040, 0x242c, 0x86ff,
-        0x00c0, 0x2444, 0x0078, 0x2474, 0xa680, 0x9655, 0x620c, 0x2202,
-        0x1078, 0x203f, 0x8630, 0xa68e, 0x001e, 0x0040, 0x248b, 0x786c,
-        0xa065, 0x00c0, 0x241d, 0x7808, 0xa602, 0x00c8, 0x2444, 0xd5ac,
-        0x00c0, 0x2444, 0x263a, 0x007c, 0xa682, 0x0006, 0x00c8, 0x248b,
-        0x2091, 0x8000, 0x2069, 0x0000, 0x6818, 0xd084, 0x00c0, 0x246f,
-        0x2011, 0x9655, 0x2009, 0x964e, 0x26a8, 0x211c, 0x2204, 0x201a,
-        0x8108, 0x8210, 0x00f0, 0x2455, 0xa685, 0x8030, 0x70c2, 0x681b,
-        0x0001, 0x2091, 0x4080, 0x7810, 0xa084, 0xffcf, 0x7812, 0x2091,
-        0x8001, 0xa006, 0x2009, 0x9675, 0x200a, 0x203a, 0x007c, 0x7810,
-        0xc0ad, 0x7812, 0x0078, 0x248b, 0x263a, 0x1078, 0x2576, 0x00c0,
-        0x2599, 0x786c, 0xa065, 0x00c0, 0x241d, 0x2091, 0x8000, 0x7810,
-        0xa084, 0xffcf, 0x86ff, 0x0040, 0x2486, 0xc0ad, 0x7812, 0x2091,
-        0x8001, 0x0078, 0x2599, 0x2091, 0x8000, 0x7007, 0x0004, 0x7994,
-        0x70d4, 0xa102, 0x0048, 0x249c, 0x0040, 0x24a6, 0x7b90, 0xa302,
-        0x00c0, 0x24a6, 0x0078, 0x249f, 0x8002, 0x00c0, 0x24a6, 0x263a,
-        0x7810, 0xc0ad, 0x7812, 0x2091, 0x8001, 0x007c, 0xa184, 0xff00,
-        0x0040, 0x24b3, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007,
-        0xa100, 0x0078, 0x24b6, 0x8107, 0x8004, 0x8004, 0x7a9c, 0xa210,
-        0x721a, 0x7a98, 0xa006, 0xa211, 0x721e, 0xd4c4, 0x0040, 0x24c6,
-        0x7aa4, 0xa211, 0x7222, 0x7aa0, 0xa211, 0x7226, 0x20a1, 0x0030,
-        0x7003, 0x0000, 0x2009, 0x9654, 0x260a, 0x8109, 0x2198, 0x2104,
-        0xd084, 0x0040, 0x24d4, 0x8633, 0xa6b0, 0x0002, 0x26a8, 0x53a6,
-        0x8603, 0x7012, 0x7007, 0x0001, 0x7990, 0x7894, 0x8000, 0xa10a,
-        0x00c8, 0x24e3, 0xa006, 0x2028, 0x7974, 0xa184, 0xff00, 0x0040,
-        0x24f2, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100,
-        0x0078, 0x24f5, 0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78,
-        0xa006, 0xa211, 0xd4c4, 0x0040, 0x2501, 0x7b84, 0xa319, 0x7c80,
-        0xa421, 0x7008, 0xd0fc, 0x0040, 0x2501, 0xa084, 0x01e0, 0x0040,
-        0x2526, 0x7d10, 0x2031, 0x9654, 0x2634, 0x78a8, 0x8000, 0x78aa,
-        0xd08c, 0x00c0, 0x251b, 0x7007, 0x0006, 0x7004, 0xd094, 0x00c0,
-        0x2515, 0x0078, 0x248d, 0x2069, 0x4e47, 0x206b, 0x0003, 0x78ac,
-        0xa085, 0x0300, 0x78ae, 0xa006, 0x0078, 0x252f, 0x2030, 0x75d6,
-        0x2091, 0x4080, 0x7d96, 0x7d10, 0xa5ac, 0xffcf, 0x7d12, 0x2091,
-        0x8001, 0x78aa, 0x7007, 0x0006, 0x263a, 0x7003, 0x0001, 0x711a,
-        0x721e, 0xd5c4, 0x0040, 0x253e, 0x7322, 0x7426, 0x007c, 0x6084,
-        0xa086, 0x0103, 0x00c0, 0x2562, 0x6114, 0x6018, 0xa105, 0x00c0,
-        0x2562, 0x2069, 0x0000, 0x6818, 0xd084, 0x00c0, 0x2562, 0x600c,
-        0x70c6, 0x6010, 0x70ca, 0x70c3, 0x8020, 0x681b, 0x0001, 0x2091,
-        0x4080, 0x1078, 0x203f, 0x0068, 0x2561, 0x786c, 0xa065, 0x00c0,
-        0x253f, 0x007c, 0x1078, 0x2576, 0x00c0, 0x2599, 0x786c, 0xa065,
-        0x00c0, 0x253f, 0x0078, 0x2599, 0x1078, 0x2576, 0x00c0, 0x2599,
-        0x786c, 0xa065, 0x00c0, 0x256c, 0x0078, 0x2599, 0x6084, 0xa086,
-        0x0103, 0x00c0, 0x258a, 0x6018, 0xc0fc, 0x601a, 0xa086, 0x0004,
-        0x00c0, 0x258a, 0x7804, 0xd0a4, 0x0040, 0x258a, 0x1078, 0x203f,
-        0xa006, 0x007c, 0x1078, 0x259f, 0x00c0, 0x2591, 0xa085, 0x0001,
-        0x007c, 0x1078, 0x25ae, 0x00c0, 0x2597, 0x2041, 0x0001, 0x7d10,
-        0x007c, 0x88ff, 0x0040, 0x259e, 0x2091, 0x4080, 0x007c, 0x7b90,
-        0x7994, 0x70d4, 0xa102, 0x00c0, 0x25a8, 0xa385, 0x0000, 0x007c,
-        0x0048, 0x25ac, 0xa302, 0x007c, 0x8002, 0x007c, 0x7810, 0xd0ec,
-        0x0040, 0x25c6, 0x0e7e, 0x2091, 0x8000, 0x2071, 0x0020, 0x7004,
-        0xa005, 0x00c0, 0x25c3, 0x7008, 0x0e7f, 0xa086, 0x0008, 0x0040,
-        0x25c6, 0x0078, 0x2617, 0x0e7f, 0x0078, 0x2617, 0xa184, 0xff00,
-        0x0040, 0x25d3, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007,
-        0xa100, 0x0078, 0x25d6, 0x8107, 0x8004, 0x8004, 0x7a9c, 0x7b98,
-        0x7ca4, 0x7da0, 0xa210, 0xa006, 0xa319, 0xa421, 0xa529, 0x2009,
-        0x0018, 0x6028, 0xa005, 0x0040, 0x25e7, 0x2009, 0x0040, 0x1078,
-        0x1d74, 0x0040, 0x2609, 0x78a8, 0x8000, 0x78aa, 0xd08c, 0x00c0,
-        0x2617, 0x6014, 0xd0fc, 0x00c0, 0x25f9, 0x2069, 0x4e40, 0x0078,
-        0x25fb, 0x2069, 0x4e80, 0x2091, 0x8000, 0x681f, 0x0003, 0x78ab,
-        0x0000, 0x78ac, 0xa085, 0x0300, 0x78ae, 0x2091, 0x8001, 0x0078,
-        0x2617, 0x78ab, 0x0000, 0x1078, 0x203f, 0x7990, 0x7894, 0x8000,
-        0xa10a, 0x00c8, 0x2614, 0xa006, 0x7896, 0x70d6, 0xa006, 0x2071,
-        0x0010, 0x2091, 0x8001, 0x007c, 0xd7fc, 0x00c0, 0x2623, 0x2009,
-        0x4e59, 0x0078, 0x2625, 0x2009, 0x4e99, 0x2091, 0x8000, 0x200a,
-        0x0f7e, 0xd7fc, 0x00c0, 0x263c, 0x2009, 0x4e40, 0x2001, 0x4e04,
-        0x2004, 0xd0ec, 0x0040, 0x2638, 0x2079, 0x0100, 0x0078, 0x2640,
-        0x2079, 0x0200, 0x0078, 0x2640, 0x2009, 0x4e80, 0x2079, 0x0100,
-        0x2104, 0xa086, 0x0000, 0x00c0, 0x2659, 0xd7fc, 0x00c0, 0x264c,
-        0x2009, 0x4e45, 0x0078, 0x264e, 0x2009, 0x4e85, 0x2104, 0xa005,
-        0x00c0, 0x2659, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x2659, 0x781b,
-        0x0045, 0x0f7f, 0x007c, 0x2009, 0x0002, 0x2069, 0x4e00, 0x6810,
-        0xd0ec, 0x00c0, 0x26c8, 0x2071, 0x4e80, 0x2079, 0x0100, 0x2021,
-        0x50bf, 0x784b, 0x000f, 0x2019, 0x4457, 0xd184, 0x0040, 0x267c,
-        0x6810, 0xd0ec, 0x0040, 0x2678, 0x20a1, 0x012b, 0x0078, 0x267e,
-        0x20a1, 0x022b, 0x0078, 0x267e, 0x20a1, 0x012b, 0x2304, 0xa005,
-        0x0040, 0x268b, 0x789a, 0x8318, 0x23ac, 0x8318, 0x2398, 0x53a6,
-        0x3318, 0x0078, 0x267e, 0x789b, 0x0020, 0x20a9, 0x0010, 0x6814,
-        0xd0e4, 0x0040, 0x269b, 0x78af, 0x0000, 0x78af, 0x9020, 0x00f0,
-        0x2693, 0x0078, 0x26a1, 0x78af, 0x0000, 0x78af, 0x8020, 0x00f0,
-        0x269b, 0x7003, 0x0000, 0x017e, 0xd18c, 0x2009, 0x0000, 0x0040,
-        0x26aa, 0xc1bd, 0x1078, 0x289b, 0x017f, 0x7020, 0xa084, 0x000f,
-        0x007e, 0x6814, 0xd0e4, 0x007f, 0x00c0, 0x26ba, 0xa085, 0x6340,
-        0x0078, 0x26bc, 0xa085, 0x62c0, 0x7806, 0x780f, 0x9200, 0x7843,
-        0x00d8, 0x7853, 0x0080, 0x780b, 0x0008, 0x7456, 0x7053, 0x0000,
-        0x8109, 0x0040, 0x26db, 0x2071, 0x4e40, 0x6810, 0xd0ec, 0x0040,
-        0x26d5, 0x2079, 0x0100, 0x0078, 0x26d7, 0x2079, 0x0200, 0x2021,
-        0x4ebf, 0x0078, 0x2669, 0x007c, 0x017e, 0xd1bc, 0x00c0, 0x26f0,
-        0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x26ec,
-        0x2011, 0x0101, 0x0078, 0x26f2, 0x2011, 0x0201, 0x0078, 0x26f2,
-        0x2011, 0x0101, 0xa18c, 0x000f, 0x2204, 0xa084, 0xfff0, 0xa105,
-        0x2012, 0x017f, 0x1078, 0x289b, 0x007c, 0xd3fc, 0x00c0, 0x2710,
-        0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x270c,
-        0x2011, 0x0101, 0x0078, 0x2712, 0x2011, 0x0201, 0x0078, 0x2712,
-        0x2011, 0x0101, 0x20a9, 0x0009, 0x810b, 0x00f0, 0x2714, 0xa18c,
-        0x0e00, 0x2204, 0xa084, 0xf1ff, 0xa105, 0x2012, 0x007c, 0x2019,
-        0x0002, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x0040, 0x272c, 0x8319,
-        0x2009, 0x0101, 0x0078, 0x272e, 0x2009, 0x0101, 0x20a9, 0x0005,
-        0x8213, 0x00f0, 0x2730, 0xa294, 0x00e0, 0x2104, 0xa084, 0xff1f,
-        0xa205, 0x200a, 0x8319, 0x0040, 0x2741, 0x2009, 0x0201, 0x0078,
-        0x272e, 0x007c, 0xd3fc, 0x00c0, 0x2755, 0x007e, 0x2001, 0x4e04,
-        0x2004, 0xd0ec, 0x007f, 0x0040, 0x2751, 0x2011, 0x0101, 0x0078,
-        0x2757, 0x2011, 0x0201, 0x0078, 0x2757, 0x2011, 0x0101, 0x20a9,
-        0x000c, 0x810b, 0x00f0, 0x2759, 0xa18c, 0xf000, 0x2204, 0xa084,
-        0x0fff, 0xa105, 0x2012, 0x007c, 0xd3fc, 0x00c0, 0x2777, 0x007e,
-        0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x2773, 0x2011,
-        0x0102, 0x0078, 0x2779, 0x2011, 0x0202, 0x0078, 0x2779, 0x2011,
-        0x0102, 0x2204, 0xa084, 0xffcf, 0xa105, 0x2012, 0x007c, 0x0c7e,
-        0xd1bc, 0x00c0, 0x2793, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec,
-        0x007f, 0x0040, 0x278f, 0x2061, 0x0100, 0x0078, 0x2795, 0x2061,
-        0x0200, 0x0078, 0x2795, 0x2061, 0x0100, 0xc1bc, 0x8103, 0x8003,
-        0xa080, 0x0020, 0x609a, 0x62ac, 0x63ac, 0x0c7f, 0x007c, 0x0c7e,
-        0xd1bc, 0x00c0, 0x27b3, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec,
-        0x007f, 0x0040, 0x27af, 0x2061, 0x0100, 0x0078, 0x27b5, 0x2061,
-        0x0200, 0x0078, 0x27b5, 0x2061, 0x0100, 0xc1bc, 0x8103, 0x8003,
-        0xa080, 0x0022, 0x609a, 0x60a4, 0xa084, 0xffdf, 0x60ae, 0x0c7f,
-        0x007c, 0x0c7e, 0xd1bc, 0x00c0, 0x27d5, 0x007e, 0x2001, 0x4e04,
-        0x2004, 0xd0ec, 0x007f, 0x0040, 0x27d1, 0x2061, 0x0100, 0x0078,
-        0x27d7, 0x2061, 0x0200, 0x0078, 0x27d7, 0x2061, 0x0100, 0xc1bc,
-        0x8103, 0x8003, 0xa080, 0x0022, 0x609a, 0x60a4, 0xa085, 0x0020,
-        0x60ae, 0x0c7f, 0x007c, 0x0c7e, 0xd1bc, 0x00c0, 0x27f7, 0x007e,
-        0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x27f3, 0x2061,
-        0x0100, 0x0078, 0x27f9, 0x2061, 0x0200, 0x0078, 0x27f9, 0x2061,
-        0x0100, 0xc1bc, 0x8103, 0x8003, 0xa080, 0x0020, 0x609a, 0x60a4,
-        0xa28c, 0x0020, 0x0040, 0x2807, 0xc2ac, 0xa39d, 0x4000, 0xc3fc,
-        0xd3b4, 0x00c0, 0x280c, 0xc3fd, 0x62ae, 0x2010, 0x60a4, 0x63ae,
-        0x2018, 0x0c7f, 0x007c, 0x2091, 0x8000, 0x0c7e, 0x0e7e, 0x6818,
-        0xa005, 0x0040, 0x2879, 0xd1fc, 0x0040, 0x2822, 0x2061, 0x95d0,
-        0x0078, 0x2824, 0x2061, 0x94c0, 0x1078, 0x2881, 0x0040, 0x285b,
-        0x20a9, 0x0101, 0xd1fc, 0x0040, 0x2831, 0x2061, 0x94d0, 0x0078,
-        0x2833, 0x2061, 0x93c0, 0x0c7e, 0x1078, 0x2881, 0x0040, 0x283e,
-        0x0c7f, 0x8c60, 0x00f0, 0x2833, 0x0078, 0x2879, 0x007f, 0xd1fc,
-        0x0040, 0x2848, 0xa082, 0x94d0, 0x2071, 0x4e80, 0x0078, 0x284c,
-        0xa082, 0x93c0, 0x2071, 0x4e40, 0x707a, 0x7176, 0x2138, 0x2001,
-        0x0004, 0x7066, 0x7083, 0x000f, 0x71d4, 0xc1dc, 0x71d6, 0x1078,
-        0x261c, 0x0078, 0x2875, 0xd1fc, 0x00c0, 0x2862, 0x2071, 0x4e40,
-        0x0078, 0x2864, 0x2071, 0x4e80, 0x6020, 0xc0dd, 0x6022, 0x7176,
-        0x2138, 0x2c00, 0x707e, 0x2001, 0x0006, 0x7066, 0x7083, 0x000f,
-        0x71d4, 0xc1dc, 0x71d6, 0x1078, 0x261c, 0x2001, 0x0000, 0x0078,
-        0x287b, 0x2001, 0x0001, 0x2091, 0x8001, 0xa005, 0x0e7f, 0x0c7f,
-        0x007c, 0x2c04, 0xa005, 0x0040, 0x2898, 0x2060, 0x6010, 0xa306,
-        0x00c0, 0x2895, 0x600c, 0xa206, 0x00c0, 0x2895, 0x6014, 0xa106,
-        0x00c0, 0x2895, 0xa006, 0x0078, 0x289a, 0x6000, 0x0078, 0x2882,
-        0xa085, 0x0001, 0x007c, 0x0f7e, 0x0e7e, 0x017e, 0xd1bc, 0x00c0,
-        0x28b3, 0x2079, 0x4e40, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec,
-        0x007f, 0x0040, 0x28af, 0x2071, 0x0100, 0x0078, 0x28b7, 0x2071,
-        0x0200, 0x0078, 0x28b7, 0x2079, 0x4e80, 0x2071, 0x0100, 0x7920,
-        0xa18c, 0x000f, 0x70ec, 0xd0c4, 0x00c0, 0x28c1, 0x017f, 0x0078,
-        0x28dc, 0x810b, 0x810b, 0x810b, 0x810b, 0x007f, 0xd0bc, 0x00c0,
-        0x28d9, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040,
-        0x28d5, 0xa18d, 0x0f00, 0x0078, 0x28db, 0xa18d, 0x0f00, 0x0078,
-        0x28db, 0xa18d, 0x0800, 0x2104, 0x0e7f, 0x0f7f, 0x007c, 0x0e7e,
-        0x2001, 0x4e01, 0x2004, 0xd0ac, 0x00c0, 0x295c, 0x68e4, 0xd0ac,
-        0x0040, 0x295c, 0xa084, 0x0006, 0x00c0, 0x295c, 0x6014, 0xd0fc,
-        0x00c0, 0x28f6, 0x2071, 0x52c0, 0x0078, 0x28f8, 0x2071, 0x5340,
-        0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xae70, 0x7004,
-        0xa084, 0x000a, 0x00c0, 0x295c, 0x7108, 0xa194, 0xff00, 0x0040,
-        0x295c, 0xa18c, 0x00ff, 0x2001, 0x000a, 0xa106, 0x0040, 0x292b,
-        0x2001, 0x000c, 0xa106, 0x0040, 0x292f, 0x2001, 0x0012, 0xa106,
-        0x0040, 0x2933, 0x2001, 0x0014, 0xa106, 0x0040, 0x2937, 0x2001,
-        0x0019, 0xa106, 0x0040, 0x293b, 0x2001, 0x0032, 0xa106, 0x0040,
-        0x293f, 0x0078, 0x2943, 0x2009, 0x000c, 0x0078, 0x2945, 0x2009,
-        0x0012, 0x0078, 0x2945, 0x2009, 0x0014, 0x0078, 0x2945, 0x2009,
-        0x0019, 0x0078, 0x2945, 0x2009, 0x0020, 0x0078, 0x2945, 0x2009,
-        0x003f, 0x0078, 0x2945, 0x2011, 0x0000, 0x2100, 0xa205, 0x700a,
-        0x2071, 0x4e00, 0x7004, 0xd0bc, 0x0040, 0x295c, 0x6014, 0xd0fc,
-        0x00c0, 0x2957, 0x70ea, 0x2071, 0x4e40, 0x0078, 0x295a, 0x70ee,
-        0x2071, 0x4e80, 0x701f, 0x000d, 0x0e7f, 0x007c, 0x2001, 0x4e05,
-        0x2004, 0xd0e4, 0x00c0, 0x296a, 0x7804, 0xa084, 0xff1f, 0xa085,
-        0x6340, 0x7806, 0x007c, 0x0068, 0x296b, 0x2091, 0x8000, 0x2071,
-        0x0000, 0x007e, 0x7018, 0xd084, 0x00c0, 0x2972, 0x007f, 0x2071,
-        0x0010, 0x70ca, 0x007f, 0x70c6, 0x70c3, 0x8002, 0x70db, 0x080f,
-        0x70df, 0x0000, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080,
-        0x0078, 0x2988, 0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x78a0, 0x708e,
-        0x7592, 0x7496, 0x769a, 0x779e, 0xa594, 0x003f, 0xd4f4, 0x0040,
-        0x299f, 0xa784, 0x007d, 0x00c0, 0x43cd, 0x1078, 0x296b, 0xa49c,
-        0x000f, 0xa382, 0x0004, 0x0050, 0x29aa, 0xa3a6, 0x0007, 0x00c0,
-        0x296b, 0x2418, 0x8507, 0xa084, 0x000f, 0x0079, 0x29af, 0x3028,
-        0x3119, 0x3144, 0x33b6, 0x379f, 0x3819, 0x38ce, 0x395f, 0x3a4d,
-        0x3b3c, 0x29c2, 0x29bf, 0x2df9, 0x2f1c, 0x3770, 0x29bf, 0x1078,
-        0x296b, 0x007c, 0xa006, 0x0078, 0x29cc, 0x7808, 0xc08d, 0x780a,
-        0xa006, 0x7002, 0x704e, 0x7046, 0x70d2, 0x7060, 0xa005, 0x00c0,
-        0x2b32, 0x7064, 0xa084, 0x0007, 0x0079, 0x29d6, 0x29de, 0x2a51,
-        0x2a5a, 0x2a65, 0x2a70, 0x2b18, 0x2a7b, 0x2a51, 0x7830, 0xd0bc,
-        0x00c0, 0x29c1, 0x71d4, 0xd1bc, 0x00c0, 0x29c1, 0xd1b4, 0x00c0,
-        0x2a2e, 0x70a4, 0xa086, 0x0001, 0x0040, 0x29c1, 0x70b4, 0xa06d,
-        0x6800, 0xa065, 0xa055, 0x789b, 0x0010, 0x6b0c, 0x7baa, 0x6808,
-        0xa045, 0x6d10, 0x6804, 0xa06d, 0xa05d, 0xa886, 0x0001, 0x0040,
-        0x2a04, 0x69bc, 0x7daa, 0x79aa, 0x68c0, 0xa04d, 0x6e1c, 0x2001,
-        0x0010, 0x0078, 0x2c8c, 0x7060, 0xa005, 0x00c0, 0x29c1, 0x0c7e,
-        0x0d7e, 0x70b4, 0xa06d, 0x6800, 0xa065, 0xa055, 0x789b, 0x0010,
-        0x6b0c, 0x7baa, 0x6808, 0xa045, 0x6d10, 0x6804, 0xa06d, 0xa05d,
-        0xa886, 0x0001, 0x0040, 0x2a27, 0x69bc, 0x7daa, 0x79aa, 0x68c0,
-        0xa04d, 0x6e1c, 0x2001, 0x0020, 0x0078, 0x2c8c, 0x1078, 0x4360,
-        0x00c0, 0x29c1, 0x781b, 0x005b, 0x70bc, 0xa06d, 0x68b4, 0x785a,
-        0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0x7808, 0xc08d,
-        0x780a, 0x68bc, 0x7042, 0xc1b4, 0x71d6, 0x70b8, 0xa065, 0x68c0,
-        0x705a, 0x7003, 0x0002, 0x2d00, 0x704e, 0xad80, 0x0009, 0x7046,
-        0x007c, 0x1078, 0x4360, 0x00c0, 0x2a59, 0x781b, 0x0047, 0x7003,
-        0x0004, 0x007c, 0x1078, 0x4360, 0x00c0, 0x2a64, 0x2011, 0x000c,
-        0x1078, 0x2a8b, 0x7003, 0x0004, 0x007c, 0x1078, 0x4360, 0x00c0,
-        0x2a6f, 0x2011, 0x0006, 0x1078, 0x2a8b, 0x7003, 0x0004, 0x007c,
-        0x1078, 0x4360, 0x00c0, 0x2a7a, 0x2011, 0x000d, 0x1078, 0x2a8b,
-        0x7003, 0x0004, 0x007c, 0x1078, 0x4360, 0x00c0, 0x2a8a, 0x2011,
-        0x0006, 0x1078, 0x2a8b, 0x707c, 0x707f, 0x0000, 0x2068, 0x704e,
-        0x7003, 0x0001, 0x007c, 0x7174, 0xc1fc, 0x8107, 0x7882, 0x789b,
-        0x0010, 0xa286, 0x000c, 0x00c0, 0x2a9a, 0x7aaa, 0x2001, 0x0001,
-        0x0078, 0x2aaf, 0xa18c, 0x001f, 0xa18d, 0x00c0, 0x79aa, 0xa286,
-        0x000d, 0x0040, 0x2aa8, 0x7aaa, 0x2001, 0x0002, 0x0078, 0x2aaf,
-        0x78ab, 0x0020, 0x7178, 0x79aa, 0x7aaa, 0x2001, 0x0004, 0x789b,
-        0x0060, 0x78aa, 0x785b, 0x0004, 0x781b, 0x0116, 0x1078, 0x4383,
-        0x7083, 0x000f, 0x70d4, 0xd0b4, 0x0040, 0x2acb, 0xc0b4, 0x70d6,
-        0x0c7e, 0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018,
-        0x8001, 0x601a, 0x0c7f, 0x007c, 0x7014, 0xa005, 0x00c0, 0x2ada,
-        0x70d4, 0xd0b4, 0x0040, 0x2adb, 0x70b8, 0xac06, 0x00c0, 0x2adb,
-        0x1078, 0x2aba, 0x007c, 0x017e, 0x71a4, 0xa186, 0x0001, 0x0040,
-        0x2b0d, 0x0d7e, 0x027e, 0x2100, 0x2011, 0x0001, 0xa212, 0x70b4,
-        0x2068, 0x6800, 0xac06, 0x0040, 0x2af4, 0x8211, 0x0040, 0x2b0b,
-        0x1078, 0x2b0f, 0x0078, 0x2ae9, 0x0c7e, 0x2100, 0x2011, 0x0001,
-        0xa212, 0x70b4, 0x2068, 0x6800, 0x2060, 0x6008, 0xa084, 0xfbef,
-        0x600a, 0x8211, 0x0040, 0x2b08, 0x1078, 0x2b0f, 0x0078, 0x2afb,
-        0x70a7, 0x0001, 0x0c7f, 0x027f, 0x0d7f, 0x017f, 0x007c, 0xade8,
-        0x0005, 0x70ac, 0xad06, 0x00c0, 0x2b17, 0x70a8, 0x2068, 0x007c,
-        0x1078, 0x4360, 0x00c0, 0x29c1, 0x707c, 0x2068, 0x7774, 0x1078,
-        0x41fe, 0x2c50, 0x1078, 0x4442, 0x789b, 0x0010, 0x6814, 0xa084,
-        0x001f, 0xc0bd, 0x78aa, 0x6e1c, 0x2041, 0x0001, 0x2001, 0x0004,
-        0x0078, 0x2c92, 0x1078, 0x4360, 0x00c0, 0x29c1, 0x789b, 0x0010,
-        0x7060, 0x2068, 0x6f14, 0x70d4, 0xd0b4, 0x0040, 0x2b4c, 0xc0b4,
-        0x70d6, 0x0c7e, 0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a,
-        0x6018, 0x8001, 0x601a, 0x0c7f, 0x1078, 0x41fe, 0x2c50, 0x1078,
-        0x4442, 0x6824, 0xa005, 0x0040, 0x2b5d, 0xa082, 0x0006, 0x0048,
-        0x2b5b, 0x0078, 0x2b5d, 0x6827, 0x0005, 0x6814, 0xa084, 0x001f,
-        0xc0bd, 0x78aa, 0x2031, 0x0020, 0x2041, 0x0001, 0x2001, 0x0003,
-        0x0078, 0x2c92, 0xc28d, 0x72d6, 0x72c0, 0xa200, 0xa015, 0x7154,
-        0x8108, 0xa12a, 0x0048, 0x2b75, 0x71c0, 0x2164, 0x6504, 0x85ff,
-        0x00c0, 0x2b8c, 0x7156, 0x8421, 0x00c0, 0x2b70, 0x70d4, 0xd08c,
-        0x0040, 0x2b88, 0x70d0, 0xa005, 0x00c0, 0x2b88, 0x70d3, 0x000a,
-        0x007c, 0x2200, 0x0078, 0x2b7a, 0x70d4, 0xc08c, 0x70d6, 0x70d3,
-        0x0000, 0x6034, 0xa005, 0x00c0, 0x2b89, 0x6708, 0xa784, 0x073f,
-        0x0040, 0x2bbb, 0xd7d4, 0x00c0, 0x2b89, 0xa784, 0x0021, 0x00c0,
-        0x2b89, 0xa784, 0x0002, 0x0040, 0x2bac, 0xa784, 0x0004, 0x0040,
-        0x2b89, 0xa7bc, 0xfffb, 0x670a, 0xa784, 0x0218, 0x00c0, 0x2b89,
-        0xa784, 0x0100, 0x0040, 0x2bbb, 0x6018, 0xa005, 0x00c0, 0x2b89,
-        0xa7bc, 0xfeff, 0x670a, 0x2568, 0x6823, 0x0000, 0x6e1c, 0xa684,
-        0x000e, 0x6318, 0x0040, 0x2bcc, 0x601c, 0xa302, 0x0048, 0x2bcf,
-        0x0040, 0x2bcf, 0x0078, 0x2b89, 0x83ff, 0x00c0, 0x2b89, 0x2d58,
-        0x2c50, 0x7156, 0xd7bc, 0x00c0, 0x2bd8, 0x7028, 0x6022, 0x603a,
-        0xc7bc, 0x670a, 0x68c0, 0xa065, 0xa04d, 0x6100, 0x2a60, 0x2041,
-        0x0001, 0x6b14, 0xa39c, 0x001f, 0xa39d, 0x00c0, 0xd1fc, 0x0040,
-        0x2bec, 0xd684, 0x0040, 0x2bee, 0xa39c, 0xffbf, 0xd6a4, 0x0040,
-        0x2bf3, 0xa39d, 0x0020, 0xa684, 0x000e, 0x00c0, 0x2c3e, 0xc7a5,
-        0x670a, 0x2c00, 0x68c6, 0x77a4, 0xa786, 0x0001, 0x00c0, 0x2c12,
-        0x70d4, 0xd0b4, 0x00c0, 0x2c12, 0x7000, 0xa082, 0x0002, 0x00c8,
-        0x2c12, 0x7830, 0xd0bc, 0x00c0, 0x2c12, 0x789b, 0x0010, 0x7baa,
-        0x0078, 0x2c8a, 0x8739, 0x77a6, 0x2750, 0x77b0, 0xa7b0, 0x0005,
-        0x70ac, 0xa606, 0x00c0, 0x2c1d, 0x76a8, 0x76b2, 0x2c3a, 0x8738,
-        0x2d3a, 0x8738, 0x283a, 0x8738, 0x233a, 0x8738, 0x253a, 0x7830,
-        0xd0bc, 0x0040, 0x2c35, 0x2091, 0x8000, 0x2091, 0x303d, 0x70d4,
-        0xa084, 0x303d, 0x2091, 0x8000, 0x2090, 0xaad5, 0x0000, 0x0040,
-        0x2c3d, 0x8421, 0x2200, 0x00c0, 0x2b6f, 0x007c, 0xd1dc, 0x0040,
-        0x3e00, 0x2029, 0x0020, 0xd69c, 0x00c0, 0x2c4b, 0x8528, 0xd68c,
-        0x00c0, 0x2c4b, 0x8528, 0x8840, 0x6f14, 0x610c, 0x8108, 0xa18c,
-        0x00ff, 0x70cc, 0xa160, 0x2c64, 0x8cff, 0x0040, 0x2c6a, 0x6014,
-        0xa706, 0x00c0, 0x2c53, 0x60b8, 0x8001, 0x60ba, 0x00c0, 0x2c4e,
-        0x2a60, 0x6008, 0xa085, 0x0100, 0x600a, 0x2200, 0x8421, 0x00c0,
-        0x2b6f, 0x007c, 0x2a60, 0x610e, 0x69be, 0x2c00, 0x68c6, 0x8840,
-        0x6008, 0xc0d5, 0x600a, 0x77a4, 0xa786, 0x0001, 0x00c0, 0x2c12,
-        0x70d4, 0xd0b4, 0x00c0, 0x2c12, 0x7000, 0xa082, 0x0002, 0x00c8,
-        0x2c12, 0x7830, 0xd0bc, 0x00c0, 0x2c12, 0x789b, 0x0010, 0x7baa,
-        0x7daa, 0x79aa, 0x2001, 0x0002, 0x007e, 0x6018, 0x8000, 0x601a,
-        0x0078, 0x2c93, 0x007e, 0x2960, 0x6104, 0x2a60, 0xa184, 0x0018,
-        0x0040, 0x2caf, 0xa184, 0x0010, 0x0040, 0x2ca2, 0x1078, 0x4011,
-        0x00c0, 0x2cd4, 0xa184, 0x0008, 0x0040, 0x2caf, 0x69a0, 0xa184,
-        0x0600, 0x00c0, 0x2caf, 0x1078, 0x3ef5, 0x0078, 0x2cd4, 0x69a0,
-        0xa184, 0x1e00, 0x0040, 0x2cdf, 0xa184, 0x0800, 0x0040, 0x2cc8,
-        0x0c7e, 0x2960, 0x6000, 0xa085, 0x2000, 0x6002, 0x6104, 0xa18d,
-        0x0010, 0x6106, 0x0c7f, 0x1078, 0x4011, 0x00c0, 0x2cd4, 0x69a0,
-        0xa184, 0x0200, 0x0040, 0x2cd0, 0x1078, 0x3f54, 0x0078, 0x2cd4,
-        0xa184, 0x0400, 0x00c0, 0x2cab, 0x69a0, 0xa184, 0x1000, 0x0040,
-        0x2cdf, 0x6914, 0xa18c, 0xff00, 0x810f, 0x1078, 0x279f, 0x027f,
-        0xa68c, 0x00e0, 0xa684, 0x0060, 0x0040, 0x2cec, 0xa086, 0x0060,
-        0x00c0, 0x2cec, 0xa18d, 0x4000, 0xa18d, 0x0104, 0x69b6, 0x789b,
-        0x0060, 0x2800, 0x78aa, 0x6818, 0xc0fd, 0x681a, 0xd6bc, 0x0040,
-        0x2d07, 0xc0fc, 0x7087, 0x0000, 0xa08a, 0x000d, 0x0050, 0x2d05,
-        0xa08a, 0x000c, 0x7186, 0x2001, 0x000c, 0x800c, 0x718a, 0x78aa,
-        0x3518, 0x3340, 0x3428, 0x8000, 0x80ac, 0xaf80, 0x002b, 0x20a0,
-        0x789b, 0x0000, 0xad80, 0x000b, 0x2098, 0x53a6, 0x23a8, 0x2898,
-        0x25a0, 0xa286, 0x0020, 0x00c0, 0x2d3f, 0x70d4, 0xc0b5, 0x70d6,
-        0x2c00, 0x70ba, 0x2d00, 0x70be, 0x6814, 0xc0fc, 0x8007, 0x7882,
-        0xa286, 0x0002, 0x0040, 0x2d75, 0x70a4, 0x8000, 0x70a6, 0x74b4,
-        0xa498, 0x0005, 0x70ac, 0xa306, 0x00c0, 0x2d37, 0x73a8, 0x73b6,
-        0xa286, 0x0010, 0x0040, 0x29c1, 0x0d7f, 0x0c7f, 0x007c, 0x7000,
-        0xa005, 0x00c0, 0x2d1d, 0xa286, 0x0002, 0x00c0, 0x2d8f, 0x1078,
-        0x4360, 0x00c0, 0x2d1d, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x2091,
-        0x8000, 0x781b, 0x005b, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de,
-        0x6898, 0x78d2, 0x78da, 0x2091, 0x8001, 0x7808, 0xc08d, 0x780a,
-        0x127e, 0x0d7e, 0x0c7e, 0x70d4, 0xa084, 0x2700, 0x2090, 0x0c7f,
-        0x0d7f, 0x127f, 0x2900, 0x705a, 0x68bc, 0x7042, 0x7003, 0x0002,
-        0x2d00, 0x704e, 0xad80, 0x0009, 0x7046, 0x7830, 0xd0bc, 0x0040,
-        0x2d81, 0x2091, 0x303d, 0x70d4, 0xa084, 0x303d, 0x2091, 0x8000,
-        0x2090, 0x70a4, 0xa005, 0x00c0, 0x2d86, 0x007c, 0x8421, 0x0040,
-        0x2d85, 0x7250, 0x70c0, 0xa200, 0xa015, 0x0078, 0x2b6f, 0xa286,
-        0x0010, 0x00c0, 0x2dc0, 0x1078, 0x4360, 0x00c0, 0x2d1d, 0x6814,
-        0xc0fc, 0x8007, 0x7882, 0x781b, 0x005b, 0x68b4, 0x785a, 0x6894,
+        0xa006, 0x2009, 0x9775, 0x200a, 0x203a, 0x007c, 0x7810, 0xc0ad,
+        0x7812, 0x0078, 0x24d2, 0x263a, 0x1078, 0x25bd, 0x00c0, 0x25e0,
+        0x786c, 0xa065, 0x00c0, 0x2464, 0x2091, 0x8000, 0x7810, 0xa084,
+        0xffcf, 0x86ff, 0x0040, 0x24cd, 0xc0ad, 0x7812, 0x2091, 0x8001,
+        0x0078, 0x25e0, 0x2091, 0x8000, 0x7007, 0x0004, 0x7994, 0x70d4,
+        0xa102, 0x0048, 0x24e3, 0x0040, 0x24ed, 0x7b90, 0xa302, 0x00c0,
+        0x24ed, 0x0078, 0x24e6, 0x8002, 0x00c0, 0x24ed, 0x263a, 0x7810,
+        0xc0ad, 0x7812, 0x2091, 0x8001, 0x007c, 0xa184, 0xff00, 0x0040,
+        0x24fa, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100,
+        0x0078, 0x24fd, 0x8107, 0x8004, 0x8004, 0x7a9c, 0xa210, 0x721a,
+        0x7a98, 0xa006, 0xa211, 0x721e, 0xd4c4, 0x0040, 0x250d, 0x7aa4,
+        0xa211, 0x7222, 0x7aa0, 0xa211, 0x7226, 0x20a1, 0x0030, 0x7003,
+        0x0000, 0x2009, 0x9754, 0x260a, 0x8109, 0x2198, 0x2104, 0xd084,
+        0x0040, 0x251b, 0x8633, 0xa6b0, 0x0002, 0x26a8, 0x53a6, 0x8603,
+        0x7012, 0x7007, 0x0001, 0x7990, 0x7894, 0x8000, 0xa10a, 0x00c8,
+        0x252a, 0xa006, 0x2028, 0x7974, 0xa184, 0xff00, 0x0040, 0x2539,
+        0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100, 0x0078,
+        0x253c, 0x8107, 0x8004, 0x8004, 0x797c, 0xa108, 0x7a78, 0xa006,
+        0xa211, 0xd4c4, 0x0040, 0x2548, 0x7b84, 0xa319, 0x7c80, 0xa421,
+        0x7008, 0xd0fc, 0x0040, 0x2548, 0xa084, 0x01e0, 0x0040, 0x256d,
+        0x7d10, 0x2031, 0x9754, 0x2634, 0x78a8, 0x8000, 0x78aa, 0xd08c,
+        0x00c0, 0x2562, 0x7007, 0x0006, 0x7004, 0xd094, 0x00c0, 0x255c,
+        0x0078, 0x24d4, 0x2069, 0x4f47, 0x206b, 0x0003, 0x78ac, 0xa085,
+        0x0300, 0x78ae, 0xa006, 0x0078, 0x2576, 0x2030, 0x75d6, 0x2091,
+        0x4080, 0x7d96, 0x7d10, 0xa5ac, 0xffcf, 0x7d12, 0x2091, 0x8001,
+        0x78aa, 0x7007, 0x0006, 0x263a, 0x7003, 0x0001, 0x711a, 0x721e,
+        0xd5c4, 0x0040, 0x2585, 0x7322, 0x7426, 0x007c, 0x6084, 0xa086,
+        0x0103, 0x00c0, 0x25a9, 0x6114, 0x6018, 0xa105, 0x00c0, 0x25a9,
+        0x2069, 0x0000, 0x6818, 0xd084, 0x00c0, 0x25a9, 0x600c, 0x70c6,
+        0x6010, 0x70ca, 0x70c3, 0x8020, 0x681b, 0x0001, 0x2091, 0x4080,
+        0x1078, 0x2086, 0x0068, 0x25a8, 0x786c, 0xa065, 0x00c0, 0x2586,
+        0x007c, 0x1078, 0x25bd, 0x00c0, 0x25e0, 0x786c, 0xa065, 0x00c0,
+        0x2586, 0x0078, 0x25e0, 0x1078, 0x25bd, 0x00c0, 0x25e0, 0x786c,
+        0xa065, 0x00c0, 0x25b3, 0x0078, 0x25e0, 0x6084, 0xa086, 0x0103,
+        0x00c0, 0x25d1, 0x6018, 0xc0fc, 0x601a, 0xa086, 0x0004, 0x00c0,
+        0x25d1, 0x7804, 0xd0a4, 0x0040, 0x25d1, 0x1078, 0x2086, 0xa006,
+        0x007c, 0x1078, 0x25e6, 0x00c0, 0x25d8, 0xa085, 0x0001, 0x007c,
+        0x1078, 0x25f5, 0x00c0, 0x25de, 0x2041, 0x0001, 0x7d10, 0x007c,
+        0x88ff, 0x0040, 0x25e5, 0x2091, 0x4080, 0x007c, 0x7b90, 0x7994,
+        0x70d4, 0xa102, 0x00c0, 0x25ef, 0xa385, 0x0000, 0x007c, 0x0048,
+        0x25f3, 0xa302, 0x007c, 0x8002, 0x007c, 0x7810, 0xd0ec, 0x0040,
+        0x260d, 0x0e7e, 0x2091, 0x8000, 0x2071, 0x0020, 0x7004, 0xa005,
+        0x00c0, 0x260a, 0x7008, 0x0e7f, 0xa086, 0x0008, 0x0040, 0x260d,
+        0x0078, 0x265e, 0x0e7f, 0x0078, 0x265e, 0xa184, 0xff00, 0x0040,
+        0x261a, 0x810f, 0x810c, 0x810c, 0x8004, 0x8004, 0x8007, 0xa100,
+        0x0078, 0x261d, 0x8107, 0x8004, 0x8004, 0x7a9c, 0x7b98, 0x7ca4,
+        0x7da0, 0xa210, 0xa006, 0xa319, 0xa421, 0xa529, 0x2009, 0x0018,
+        0x6028, 0xa005, 0x0040, 0x262e, 0x2009, 0x0040, 0x1078, 0x1dbb,
+        0x0040, 0x2650, 0x78a8, 0x8000, 0x78aa, 0xd08c, 0x00c0, 0x265e,
+        0x6014, 0xd0fc, 0x00c0, 0x2640, 0x2069, 0x4f40, 0x0078, 0x2642,
+        0x2069, 0x4f80, 0x2091, 0x8000, 0x681f, 0x0003, 0x78ab, 0x0000,
+        0x78ac, 0xa085, 0x0300, 0x78ae, 0x2091, 0x8001, 0x0078, 0x265e,
+        0x78ab, 0x0000, 0x1078, 0x2086, 0x7990, 0x7894, 0x8000, 0xa10a,
+        0x00c8, 0x265b, 0xa006, 0x7896, 0x70d6, 0xa006, 0x2071, 0x0010,
+        0x2091, 0x8001, 0x007c, 0xd7fc, 0x00c0, 0x266a, 0x2009, 0x4f59,
+        0x0078, 0x266c, 0x2009, 0x4f99, 0x2091, 0x8000, 0x200a, 0x0f7e,
+        0xd7fc, 0x00c0, 0x2683, 0x2009, 0x4f40, 0x2001, 0x4f04, 0x2004,
+        0xd0ec, 0x0040, 0x267f, 0x2079, 0x0100, 0x0078, 0x2687, 0x2079,
+        0x0200, 0x0078, 0x2687, 0x2009, 0x4f80, 0x2079, 0x0100, 0x2104,
+        0xa086, 0x0000, 0x00c0, 0x26a0, 0xd7fc, 0x00c0, 0x2693, 0x2009,
+        0x4f45, 0x0078, 0x2695, 0x2009, 0x4f85, 0x2104, 0xa005, 0x00c0,
+        0x26a0, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x26a0, 0x781b, 0x0045,
+        0x0f7f, 0x007c, 0x2009, 0x0002, 0x2069, 0x4f00, 0x6810, 0xd0ec,
+        0x00c0, 0x270f, 0x2071, 0x4f80, 0x2079, 0x0100, 0x2021, 0x51bf,
+        0x784b, 0x000f, 0x2019, 0x44a7, 0xd184, 0x0040, 0x26c3, 0x6810,
+        0xd0ec, 0x0040, 0x26bf, 0x20a1, 0x012b, 0x0078, 0x26c5, 0x20a1,
+        0x022b, 0x0078, 0x26c5, 0x20a1, 0x012b, 0x2304, 0xa005, 0x0040,
+        0x26d2, 0x789a, 0x8318, 0x23ac, 0x8318, 0x2398, 0x53a6, 0x3318,
+        0x0078, 0x26c5, 0x789b, 0x0020, 0x20a9, 0x0010, 0x6814, 0xd0e4,
+        0x0040, 0x26e2, 0x78af, 0x0000, 0x78af, 0x9020, 0x00f0, 0x26da,
+        0x0078, 0x26e8, 0x78af, 0x0000, 0x78af, 0x8020, 0x00f0, 0x26e2,
+        0x7003, 0x0000, 0x017e, 0xd18c, 0x2009, 0x0000, 0x0040, 0x26f1,
+        0xc1bd, 0x1078, 0x28e2, 0x017f, 0x7020, 0xa084, 0x000f, 0x007e,
+        0x6814, 0xd0e4, 0x007f, 0x00c0, 0x2701, 0xa085, 0x6340, 0x0078,
+        0x2703, 0xa085, 0x62c0, 0x7806, 0x780f, 0x9200, 0x7843, 0x00d8,
+        0x7853, 0x0080, 0x780b, 0x0008, 0x7456, 0x7053, 0x0000, 0x8109,
+        0x0040, 0x2722, 0x2071, 0x4f40, 0x6810, 0xd0ec, 0x0040, 0x271c,
+        0x2079, 0x0100, 0x0078, 0x271e, 0x2079, 0x0200, 0x2021, 0x4fbf,
+        0x0078, 0x26b0, 0x007c, 0x017e, 0xd1bc, 0x00c0, 0x2737, 0x007e,
+        0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x2733, 0x2011,
+        0x0101, 0x0078, 0x2739, 0x2011, 0x0201, 0x0078, 0x2739, 0x2011,
+        0x0101, 0xa18c, 0x000f, 0x2204, 0xa084, 0xfff0, 0xa105, 0x2012,
+        0x017f, 0x1078, 0x28e2, 0x007c, 0xd3fc, 0x00c0, 0x2757, 0x007e,
+        0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x2753, 0x2011,
+        0x0101, 0x0078, 0x2759, 0x2011, 0x0201, 0x0078, 0x2759, 0x2011,
+        0x0101, 0x20a9, 0x0009, 0x810b, 0x00f0, 0x275b, 0xa18c, 0x0e00,
+        0x2204, 0xa084, 0xf1ff, 0xa105, 0x2012, 0x007c, 0x2019, 0x0002,
+        0x2001, 0x4f04, 0x2004, 0xd0ec, 0x0040, 0x2773, 0x8319, 0x2009,
+        0x0101, 0x0078, 0x2775, 0x2009, 0x0101, 0x20a9, 0x0005, 0x8213,
+        0x00f0, 0x2777, 0xa294, 0x00e0, 0x2104, 0xa084, 0xff1f, 0xa205,
+        0x200a, 0x8319, 0x0040, 0x2788, 0x2009, 0x0201, 0x0078, 0x2775,
+        0x007c, 0xd3fc, 0x00c0, 0x279c, 0x007e, 0x2001, 0x4f04, 0x2004,
+        0xd0ec, 0x007f, 0x0040, 0x2798, 0x2011, 0x0101, 0x0078, 0x279e,
+        0x2011, 0x0201, 0x0078, 0x279e, 0x2011, 0x0101, 0x20a9, 0x000c,
+        0x810b, 0x00f0, 0x27a0, 0xa18c, 0xf000, 0x2204, 0xa084, 0x0fff,
+        0xa105, 0x2012, 0x007c, 0xd3fc, 0x00c0, 0x27be, 0x007e, 0x2001,
+        0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x27ba, 0x2011, 0x0102,
+        0x0078, 0x27c0, 0x2011, 0x0202, 0x0078, 0x27c0, 0x2011, 0x0102,
+        0x2204, 0xa084, 0xffcf, 0xa105, 0x2012, 0x007c, 0x0c7e, 0xd1bc,
+        0x00c0, 0x27da, 0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f,
+        0x0040, 0x27d6, 0x2061, 0x0100, 0x0078, 0x27dc, 0x2061, 0x0200,
+        0x0078, 0x27dc, 0x2061, 0x0100, 0xc1bc, 0x8103, 0x8003, 0xa080,
+        0x0020, 0x609a, 0x62ac, 0x63ac, 0x0c7f, 0x007c, 0x0c7e, 0xd1bc,
+        0x00c0, 0x27fa, 0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f,
+        0x0040, 0x27f6, 0x2061, 0x0100, 0x0078, 0x27fc, 0x2061, 0x0200,
+        0x0078, 0x27fc, 0x2061, 0x0100, 0xc1bc, 0x8103, 0x8003, 0xa080,
+        0x0022, 0x609a, 0x60a4, 0xa084, 0xffdf, 0x60ae, 0x0c7f, 0x007c,
+        0x0c7e, 0xd1bc, 0x00c0, 0x281c, 0x007e, 0x2001, 0x4f04, 0x2004,
+        0xd0ec, 0x007f, 0x0040, 0x2818, 0x2061, 0x0100, 0x0078, 0x281e,
+        0x2061, 0x0200, 0x0078, 0x281e, 0x2061, 0x0100, 0xc1bc, 0x8103,
+        0x8003, 0xa080, 0x0022, 0x609a, 0x60a4, 0xa085, 0x0020, 0x60ae,
+        0x0c7f, 0x007c, 0x0c7e, 0xd1bc, 0x00c0, 0x283e, 0x007e, 0x2001,
+        0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x283a, 0x2061, 0x0100,
+        0x0078, 0x2840, 0x2061, 0x0200, 0x0078, 0x2840, 0x2061, 0x0100,
+        0xc1bc, 0x8103, 0x8003, 0xa080, 0x0020, 0x609a, 0x60a4, 0xa28c,
+        0x0020, 0x0040, 0x284e, 0xc2ac, 0xa39d, 0x4000, 0xc3fc, 0xd3b4,
+        0x00c0, 0x2853, 0xc3fd, 0x62ae, 0x2010, 0x60a4, 0x63ae, 0x2018,
+        0x0c7f, 0x007c, 0x2091, 0x8000, 0x0c7e, 0x0e7e, 0x6818, 0xa005,
+        0x0040, 0x28c0, 0xd1fc, 0x0040, 0x2869, 0x2061, 0x96d0, 0x0078,
+        0x286b, 0x2061, 0x95c0, 0x1078, 0x28c8, 0x0040, 0x28a2, 0x20a9,
+        0x0101, 0xd1fc, 0x0040, 0x2878, 0x2061, 0x95d0, 0x0078, 0x287a,
+        0x2061, 0x94c0, 0x0c7e, 0x1078, 0x28c8, 0x0040, 0x2885, 0x0c7f,
+        0x8c60, 0x00f0, 0x287a, 0x0078, 0x28c0, 0x007f, 0xd1fc, 0x0040,
+        0x288f, 0xa082, 0x95d0, 0x2071, 0x4f80, 0x0078, 0x2893, 0xa082,
+        0x94c0, 0x2071, 0x4f40, 0x707a, 0x7176, 0x2138, 0x2001, 0x0004,
+        0x7066, 0x7083, 0x000f, 0x71d4, 0xc1dc, 0x71d6, 0x1078, 0x2663,
+        0x0078, 0x28bc, 0xd1fc, 0x00c0, 0x28a9, 0x2071, 0x4f40, 0x0078,
+        0x28ab, 0x2071, 0x4f80, 0x6020, 0xc0dd, 0x6022, 0x7176, 0x2138,
+        0x2c00, 0x707e, 0x2001, 0x0006, 0x7066, 0x7083, 0x000f, 0x71d4,
+        0xc1dc, 0x71d6, 0x1078, 0x2663, 0x2001, 0x0000, 0x0078, 0x28c2,
+        0x2001, 0x0001, 0x2091, 0x8001, 0xa005, 0x0e7f, 0x0c7f, 0x007c,
+        0x2c04, 0xa005, 0x0040, 0x28df, 0x2060, 0x6010, 0xa306, 0x00c0,
+        0x28dc, 0x600c, 0xa206, 0x00c0, 0x28dc, 0x6014, 0xa106, 0x00c0,
+        0x28dc, 0xa006, 0x0078, 0x28e1, 0x6000, 0x0078, 0x28c9, 0xa085,
+        0x0001, 0x007c, 0x0f7e, 0x0e7e, 0x017e, 0xd1bc, 0x00c0, 0x28fa,
+        0x2079, 0x4f40, 0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f,
+        0x0040, 0x28f6, 0x2071, 0x0100, 0x0078, 0x28fe, 0x2071, 0x0200,
+        0x0078, 0x28fe, 0x2079, 0x4f80, 0x2071, 0x0100, 0x7920, 0xa18c,
+        0x000f, 0x70ec, 0xd0c4, 0x00c0, 0x2908, 0x017f, 0x0078, 0x2923,
+        0x810b, 0x810b, 0x810b, 0x810b, 0x007f, 0xd0bc, 0x00c0, 0x2920,
+        0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x291c,
+        0xa18d, 0x0f00, 0x0078, 0x2922, 0xa18d, 0x0f00, 0x0078, 0x2922,
+        0xa18d, 0x0800, 0x2104, 0x0e7f, 0x0f7f, 0x007c, 0x0e7e, 0x2001,
+        0x4f01, 0x2004, 0xd0ac, 0x00c0, 0x29a3, 0x68e4, 0xd0ac, 0x0040,
+        0x29a3, 0xa084, 0x0006, 0x00c0, 0x29a3, 0x6014, 0xd0fc, 0x00c0,
+        0x293d, 0x2071, 0x53c0, 0x0078, 0x293f, 0x2071, 0x5440, 0x8007,
+        0xa084, 0x000f, 0x8003, 0x8003, 0x8003, 0xae70, 0x7004, 0xa084,
+        0x000a, 0x00c0, 0x29a3, 0x7108, 0xa194, 0xff00, 0x0040, 0x29a3,
+        0xa18c, 0x00ff, 0x2001, 0x000a, 0xa106, 0x0040, 0x2972, 0x2001,
+        0x000c, 0xa106, 0x0040, 0x2976, 0x2001, 0x0012, 0xa106, 0x0040,
+        0x297a, 0x2001, 0x0014, 0xa106, 0x0040, 0x297e, 0x2001, 0x0019,
+        0xa106, 0x0040, 0x2982, 0x2001, 0x0032, 0xa106, 0x0040, 0x2986,
+        0x0078, 0x298a, 0x2009, 0x000c, 0x0078, 0x298c, 0x2009, 0x0012,
+        0x0078, 0x298c, 0x2009, 0x0014, 0x0078, 0x298c, 0x2009, 0x0019,
+        0x0078, 0x298c, 0x2009, 0x0020, 0x0078, 0x298c, 0x2009, 0x003f,
+        0x0078, 0x298c, 0x2011, 0x0000, 0x2100, 0xa205, 0x700a, 0x2071,
+        0x4f00, 0x7004, 0xd0bc, 0x0040, 0x29a3, 0x6014, 0xd0fc, 0x00c0,
+        0x299e, 0x70ea, 0x2071, 0x4f40, 0x0078, 0x29a1, 0x70ee, 0x2071,
+        0x4f80, 0x701f, 0x000d, 0x0e7f, 0x007c, 0x2001, 0x4f05, 0x2004,
+        0xd0e4, 0x00c0, 0x29b1, 0x7804, 0xa084, 0xff1f, 0xa085, 0x6340,
+        0x7806, 0x007c, 0x0068, 0x29b2, 0x2091, 0x8000, 0x2071, 0x0000,
+        0x007e, 0x7018, 0xd084, 0x00c0, 0x29b9, 0x007f, 0x2071, 0x0010,
+        0x70ca, 0x007f, 0x70c6, 0x70c3, 0x8002, 0x70db, 0x080f, 0x70df,
+        0x000b, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078,
+        0x29cf, 0x7f3c, 0x7e58, 0x7c30, 0x7d38, 0x78a0, 0x708e, 0x7592,
+        0x7496, 0x769a, 0x779e, 0xa594, 0x003f, 0xd4f4, 0x0040, 0x29e6,
+        0xa784, 0x007d, 0x00c0, 0x441d, 0x1078, 0x29b2, 0xa49c, 0x000f,
+        0xa382, 0x0004, 0x0050, 0x29f1, 0xa3a6, 0x0007, 0x00c0, 0x29b2,
+        0x2418, 0x8507, 0xa084, 0x000f, 0x0079, 0x29f6, 0x3071, 0x3162,
+        0x318d, 0x33ff, 0x37e8, 0x3862, 0x3917, 0x39a8, 0x3a96, 0x3b85,
+        0x2a09, 0x2a06, 0x2e42, 0x2f65, 0x37b9, 0x2a06, 0x1078, 0x29b2,
+        0x007c, 0xa006, 0x0078, 0x2a13, 0x7808, 0xc08d, 0x780a, 0xa006,
+        0x7002, 0x704e, 0x7046, 0x70d2, 0x7060, 0xa005, 0x00c0, 0x2b79,
+        0x7064, 0xa084, 0x0007, 0x0079, 0x2a1d, 0x2a25, 0x2a98, 0x2aa1,
+        0x2aac, 0x2ab7, 0x2b5f, 0x2ac2, 0x2a98, 0x7830, 0xd0bc, 0x00c0,
+        0x2a08, 0x71d4, 0xd1bc, 0x00c0, 0x2a08, 0xd1b4, 0x00c0, 0x2a75,
+        0x70a4, 0xa086, 0x0001, 0x0040, 0x2a08, 0x70b4, 0xa06d, 0x6800,
+        0xa065, 0xa055, 0x789b, 0x0010, 0x6b0c, 0x7baa, 0x6808, 0xa045,
+        0x6d10, 0x6804, 0xa06d, 0xa05d, 0xa886, 0x0001, 0x0040, 0x2a4b,
+        0x69bc, 0x7daa, 0x79aa, 0x68c0, 0xa04d, 0x6e1c, 0x2001, 0x0010,
+        0x0078, 0x2cd3, 0x7060, 0xa005, 0x00c0, 0x2a08, 0x0c7e, 0x0d7e,
+        0x70b4, 0xa06d, 0x6800, 0xa065, 0xa055, 0x789b, 0x0010, 0x6b0c,
+        0x7baa, 0x6808, 0xa045, 0x6d10, 0x6804, 0xa06d, 0xa05d, 0xa886,
+        0x0001, 0x0040, 0x2a6e, 0x69bc, 0x7daa, 0x79aa, 0x68c0, 0xa04d,
+        0x6e1c, 0x2001, 0x0020, 0x0078, 0x2cd3, 0x1078, 0x43b0, 0x00c0,
+        0x2a08, 0x781b, 0x005b, 0x70bc, 0xa06d, 0x68b4, 0x785a, 0x6894,
         0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0x7808, 0xc08d, 0x780a,
-        0x70a4, 0x8000, 0x70a6, 0x74b4, 0xa490, 0x0005, 0x70ac, 0xa206,
-        0x00c0, 0x2db3, 0x72a8, 0x72b6, 0x2900, 0x705a, 0x68bc, 0x7042,
+        0x68bc, 0x7042, 0xc1b4, 0x71d6, 0x70b8, 0xa065, 0x68c0, 0x705a,
         0x7003, 0x0002, 0x2d00, 0x704e, 0xad80, 0x0009, 0x7046, 0x007c,
-        0x6bb4, 0xa39d, 0x2000, 0x7b5a, 0x6814, 0xc0fc, 0x8007, 0x7882,
-        0x6b94, 0x7bd6, 0x7bde, 0x6e98, 0x7ed2, 0x7eda, 0x781b, 0x005b,
-        0x2900, 0x705a, 0x7202, 0x7808, 0xc08d, 0x780a, 0x2300, 0xa605,
-        0x0040, 0x2deb, 0x70d4, 0xa084, 0x2700, 0xa086, 0x2300, 0x00c0,
-        0x2de5, 0x2009, 0x0000, 0x0078, 0x2de7, 0x2009, 0x0001, 0xa284,
-        0x000f, 0x1079, 0x2def, 0xad80, 0x0009, 0x7046, 0x007c, 0x2df7,
-        0x48bd, 0x48bd, 0x48aa, 0x48bd, 0x2df7, 0x2df7, 0x2df7, 0x1078,
-        0x296b, 0x7808, 0xa084, 0xfffd, 0x780a, 0x1078, 0x295e, 0x0f7e,
-        0x2079, 0x4e00, 0x78ac, 0x0f7f, 0xd084, 0x0040, 0x2e21, 0x7064,
-        0xa086, 0x0001, 0x00c0, 0x2e0f, 0x7066, 0x0078, 0x2ef8, 0x7064,
-        0xa086, 0x0005, 0x00c0, 0x2e1f, 0x707c, 0x2068, 0x681b, 0x0004,
-        0x6817, 0x0000, 0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822, 0x7067,
-        0x0000, 0x70a7, 0x0000, 0x70a8, 0x70b2, 0x70b6, 0x1078, 0x2aba,
-        0x157e, 0x2011, 0x0004, 0x7164, 0xa186, 0x0001, 0x0040, 0x2e41,
-        0xa186, 0x0007, 0x00c0, 0x2e38, 0x701f, 0x0005, 0x0078, 0x2e41,
-        0x701f, 0x0001, 0x7067, 0x0000, 0x70d4, 0xc0dd, 0x70d6, 0x0078,
-        0x2e43, 0x7067, 0x0000, 0x2001, 0x4e0a, 0x2004, 0xa084, 0x00ff,
-        0xa086, 0x0018, 0x0040, 0x2e53, 0x7018, 0x7016, 0xa005, 0x00c0,
-        0x2e53, 0x70a7, 0x0001, 0x067e, 0x1078, 0x4586, 0x20a9, 0x0010,
-        0x2039, 0x0000, 0x1078, 0x40f8, 0xa7b8, 0x0100, 0x00f0, 0x2e5a,
-        0x067f, 0x7000, 0x0079, 0x2e64, 0x2e9e, 0x2e79, 0x2e79, 0x2e6e,
-        0x2e9e, 0x2e9e, 0x2e9e, 0x2e6c, 0x1078, 0x296b, 0x7060, 0xa005,
-        0x0040, 0x2e9e, 0xad06, 0x00c0, 0x2e79, 0x6800, 0x7062, 0x0078,
-        0x2e8b, 0x6820, 0xd084, 0x00c0, 0x2e87, 0x6f14, 0x1078, 0x41fe,
-        0x6008, 0xc0d4, 0x600a, 0x1078, 0x3dd0, 0x0078, 0x2e8b, 0x705c,
-        0x2060, 0x6800, 0x6002, 0xa684, 0x5f00, 0x681e, 0x6818, 0xd0fc,
-        0x0040, 0x2e93, 0x6a1a, 0x6817, 0x0000, 0x682b, 0x0000, 0x6820,
-        0xa084, 0x00ff, 0xc09d, 0x6822, 0x1078, 0x202c, 0xb284, 0x0400,
-        0x0040, 0x2ea6, 0x2021, 0x95d0, 0x0078, 0x2ea8, 0x2021, 0x94c0,
-        0x1078, 0x2efd, 0xb284, 0x0400, 0x0040, 0x2eb2, 0x2021, 0x4e98,
-        0x0078, 0x2eb4, 0x2021, 0x4e58, 0x1078, 0x2efd, 0x20a9, 0x0101,
-        0xb284, 0x0400, 0x0040, 0x2ec0, 0x2021, 0x94d0, 0x0078, 0x2ec2,
-        0x2021, 0x93c0, 0x1078, 0x2efd, 0x8420, 0x00f0, 0x2ec2, 0xb284,
-        0x0300, 0x0040, 0x2ecf, 0x2061, 0x53c0, 0x0078, 0x2ed1, 0x2061,
-        0x73c0, 0x2021, 0x0002, 0x20a9, 0x0100, 0x6110, 0x81ff, 0x0040,
-        0x2eee, 0x6018, 0x017e, 0x007e, 0x2011, 0x4e02, 0x220c, 0xa102,
-        0x2012, 0x007f, 0x017f, 0xa102, 0x0050, 0x2eee, 0x6012, 0x00c0,
-        0x2eee, 0x2011, 0x4e04, 0x2204, 0xc0a5, 0x2012, 0x601b, 0x0000,
-        0xace0, 0x0010, 0x00f0, 0x2ed5, 0x8421, 0x00c0, 0x2ed3, 0x157f,
-        0x7003, 0x0000, 0x704f, 0x0000, 0x007c, 0x047e, 0x2404, 0xa005,
-        0x0040, 0x2f18, 0x2068, 0x6800, 0x007e, 0x6a1a, 0x6817, 0x0000,
+        0x1078, 0x43b0, 0x00c0, 0x2aa0, 0x781b, 0x0047, 0x7003, 0x0004,
+        0x007c, 0x1078, 0x43b0, 0x00c0, 0x2aab, 0x2011, 0x000c, 0x1078,
+        0x2ad2, 0x7003, 0x0004, 0x007c, 0x1078, 0x43b0, 0x00c0, 0x2ab6,
+        0x2011, 0x0006, 0x1078, 0x2ad2, 0x7003, 0x0004, 0x007c, 0x1078,
+        0x43b0, 0x00c0, 0x2ac1, 0x2011, 0x000d, 0x1078, 0x2ad2, 0x7003,
+        0x0004, 0x007c, 0x1078, 0x43b0, 0x00c0, 0x2ad1, 0x2011, 0x0006,
+        0x1078, 0x2ad2, 0x707c, 0x707f, 0x0000, 0x2068, 0x704e, 0x7003,
+        0x0001, 0x007c, 0x7174, 0xc1fc, 0x8107, 0x7882, 0x789b, 0x0010,
+        0xa286, 0x000c, 0x00c0, 0x2ae1, 0x7aaa, 0x2001, 0x0001, 0x0078,
+        0x2af6, 0xa18c, 0x001f, 0xa18d, 0x00c0, 0x79aa, 0xa286, 0x000d,
+        0x0040, 0x2aef, 0x7aaa, 0x2001, 0x0002, 0x0078, 0x2af6, 0x78ab,
+        0x0020, 0x7178, 0x79aa, 0x7aaa, 0x2001, 0x0004, 0x789b, 0x0060,
+        0x78aa, 0x785b, 0x0004, 0x781b, 0x0116, 0x1078, 0x43d3, 0x7083,
+        0x000f, 0x70d4, 0xd0b4, 0x0040, 0x2b12, 0xc0b4, 0x70d6, 0x0c7e,
+        0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001,
+        0x601a, 0x0c7f, 0x007c, 0x7014, 0xa005, 0x00c0, 0x2b21, 0x70d4,
+        0xd0b4, 0x0040, 0x2b22, 0x70b8, 0xac06, 0x00c0, 0x2b22, 0x1078,
+        0x2b01, 0x007c, 0x017e, 0x71a4, 0xa186, 0x0001, 0x0040, 0x2b54,
+        0x0d7e, 0x027e, 0x2100, 0x2011, 0x0001, 0xa212, 0x70b4, 0x2068,
+        0x6800, 0xac06, 0x0040, 0x2b3b, 0x8211, 0x0040, 0x2b52, 0x1078,
+        0x2b56, 0x0078, 0x2b30, 0x0c7e, 0x2100, 0x2011, 0x0001, 0xa212,
+        0x70b4, 0x2068, 0x6800, 0x2060, 0x6008, 0xa084, 0xfbef, 0x600a,
+        0x8211, 0x0040, 0x2b4f, 0x1078, 0x2b56, 0x0078, 0x2b42, 0x70a7,
+        0x0001, 0x0c7f, 0x027f, 0x0d7f, 0x017f, 0x007c, 0xade8, 0x0005,
+        0x70ac, 0xad06, 0x00c0, 0x2b5e, 0x70a8, 0x2068, 0x007c, 0x1078,
+        0x43b0, 0x00c0, 0x2a08, 0x707c, 0x2068, 0x7774, 0x1078, 0x424e,
+        0x2c50, 0x1078, 0x4492, 0x789b, 0x0010, 0x6814, 0xa084, 0x001f,
+        0xc0bd, 0x78aa, 0x6e1c, 0x2041, 0x0001, 0x2001, 0x0004, 0x0078,
+        0x2cd9, 0x1078, 0x43b0, 0x00c0, 0x2a08, 0x789b, 0x0010, 0x7060,
+        0x2068, 0x6f14, 0x70d4, 0xd0b4, 0x0040, 0x2b93, 0xc0b4, 0x70d6,
+        0x0c7e, 0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018,
+        0x8001, 0x601a, 0x0c7f, 0x1078, 0x424e, 0x2c50, 0x1078, 0x4492,
+        0x6824, 0xa005, 0x0040, 0x2ba4, 0xa082, 0x0006, 0x0048, 0x2ba2,
+        0x0078, 0x2ba4, 0x6827, 0x0005, 0x6814, 0xa084, 0x001f, 0xc0bd,
+        0x78aa, 0x2031, 0x0020, 0x2041, 0x0001, 0x2001, 0x0003, 0x0078,
+        0x2cd9, 0xc28d, 0x72d6, 0x72c0, 0xa200, 0xa015, 0x7154, 0x8108,
+        0xa12a, 0x0048, 0x2bbc, 0x71c0, 0x2164, 0x6504, 0x85ff, 0x00c0,
+        0x2bd3, 0x7156, 0x8421, 0x00c0, 0x2bb7, 0x70d4, 0xd08c, 0x0040,
+        0x2bcf, 0x70d0, 0xa005, 0x00c0, 0x2bcf, 0x70d3, 0x000a, 0x007c,
+        0x2200, 0x0078, 0x2bc1, 0x70d4, 0xc08c, 0x70d6, 0x70d3, 0x0000,
+        0x6034, 0xa005, 0x00c0, 0x2bd0, 0x6708, 0xa784, 0x073f, 0x0040,
+        0x2c02, 0xd7d4, 0x00c0, 0x2bd0, 0xa784, 0x0021, 0x00c0, 0x2bd0,
+        0xa784, 0x0002, 0x0040, 0x2bf3, 0xa784, 0x0004, 0x0040, 0x2bd0,
+        0xa7bc, 0xfffb, 0x670a, 0xa784, 0x0218, 0x00c0, 0x2bd0, 0xa784,
+        0x0100, 0x0040, 0x2c02, 0x6018, 0xa005, 0x00c0, 0x2bd0, 0xa7bc,
+        0xfeff, 0x670a, 0x2568, 0x6823, 0x0000, 0x6e1c, 0xa684, 0x000e,
+        0x6318, 0x0040, 0x2c13, 0x601c, 0xa302, 0x0048, 0x2c16, 0x0040,
+        0x2c16, 0x0078, 0x2bd0, 0x83ff, 0x00c0, 0x2bd0, 0x2d58, 0x2c50,
+        0x7156, 0xd7bc, 0x00c0, 0x2c1f, 0x7028, 0x6022, 0x603a, 0xc7bc,
+        0x670a, 0x68c0, 0xa065, 0xa04d, 0x6100, 0x2a60, 0x2041, 0x0001,
+        0x6b14, 0xa39c, 0x001f, 0xa39d, 0x00c0, 0xd1fc, 0x0040, 0x2c33,
+        0xd684, 0x0040, 0x2c35, 0xa39c, 0xffbf, 0xd6a4, 0x0040, 0x2c3a,
+        0xa39d, 0x0020, 0xa684, 0x000e, 0x00c0, 0x2c85, 0xc7a5, 0x670a,
+        0x2c00, 0x68c6, 0x77a4, 0xa786, 0x0001, 0x00c0, 0x2c59, 0x70d4,
+        0xd0b4, 0x00c0, 0x2c59, 0x7000, 0xa082, 0x0002, 0x00c8, 0x2c59,
+        0x7830, 0xd0bc, 0x00c0, 0x2c59, 0x789b, 0x0010, 0x7baa, 0x0078,
+        0x2cd1, 0x8739, 0x77a6, 0x2750, 0x77b0, 0xa7b0, 0x0005, 0x70ac,
+        0xa606, 0x00c0, 0x2c64, 0x76a8, 0x76b2, 0x2c3a, 0x8738, 0x2d3a,
+        0x8738, 0x283a, 0x8738, 0x233a, 0x8738, 0x253a, 0x7830, 0xd0bc,
+        0x0040, 0x2c7c, 0x2091, 0x8000, 0x2091, 0x303d, 0x70d4, 0xa084,
+        0x303d, 0x2091, 0x8000, 0x2090, 0xaad5, 0x0000, 0x0040, 0x2c84,
+        0x8421, 0x2200, 0x00c0, 0x2bb6, 0x007c, 0xd1dc, 0x0040, 0x3e49,
+        0x2029, 0x0020, 0xd69c, 0x00c0, 0x2c92, 0x8528, 0xd68c, 0x00c0,
+        0x2c92, 0x8528, 0x8840, 0x6f14, 0x610c, 0x8108, 0xa18c, 0x00ff,
+        0x70cc, 0xa160, 0x2c64, 0x8cff, 0x0040, 0x2cb1, 0x6014, 0xa706,
+        0x00c0, 0x2c9a, 0x60b8, 0x8001, 0x60ba, 0x00c0, 0x2c95, 0x2a60,
+        0x6008, 0xa085, 0x0100, 0x600a, 0x2200, 0x8421, 0x00c0, 0x2bb6,
+        0x007c, 0x2a60, 0x610e, 0x69be, 0x2c00, 0x68c6, 0x8840, 0x6008,
+        0xc0d5, 0x600a, 0x77a4, 0xa786, 0x0001, 0x00c0, 0x2c59, 0x70d4,
+        0xd0b4, 0x00c0, 0x2c59, 0x7000, 0xa082, 0x0002, 0x00c8, 0x2c59,
+        0x7830, 0xd0bc, 0x00c0, 0x2c59, 0x789b, 0x0010, 0x7baa, 0x7daa,
+        0x79aa, 0x2001, 0x0002, 0x007e, 0x6018, 0x8000, 0x601a, 0x0078,
+        0x2cda, 0x007e, 0x2960, 0x6104, 0x2a60, 0xa184, 0x0018, 0x0040,
+        0x2cf6, 0xa184, 0x0010, 0x0040, 0x2ce9, 0x1078, 0x405e, 0x00c0,
+        0x2d1b, 0xa184, 0x0008, 0x0040, 0x2cf6, 0x69a0, 0xa184, 0x0600,
+        0x00c0, 0x2cf6, 0x1078, 0x3f3e, 0x0078, 0x2d1b, 0x69a0, 0xa184,
+        0x1e00, 0x0040, 0x2d26, 0xa184, 0x0800, 0x0040, 0x2d0f, 0x0c7e,
+        0x2960, 0x6000, 0xa085, 0x2000, 0x6002, 0x6104, 0xa18d, 0x0010,
+        0x6106, 0x0c7f, 0x1078, 0x405e, 0x00c0, 0x2d1b, 0x69a0, 0xa184,
+        0x0200, 0x0040, 0x2d17, 0x1078, 0x3fa1, 0x0078, 0x2d1b, 0xa184,
+        0x0400, 0x00c0, 0x2cf2, 0x69a0, 0xa184, 0x1000, 0x0040, 0x2d26,
+        0x6914, 0xa18c, 0xff00, 0x810f, 0x1078, 0x27e6, 0x027f, 0xa68c,
+        0x00e0, 0xa684, 0x0060, 0x0040, 0x2d33, 0xa086, 0x0060, 0x00c0,
+        0x2d33, 0xa18d, 0x4000, 0xa18d, 0x0104, 0x69b6, 0x789b, 0x0060,
+        0x2800, 0x78aa, 0x6818, 0xc0fd, 0x681a, 0xd6bc, 0x0040, 0x2d4e,
+        0xc0fc, 0x7087, 0x0000, 0xa08a, 0x000d, 0x0050, 0x2d4c, 0xa08a,
+        0x000c, 0x7186, 0x2001, 0x000c, 0x800c, 0x718a, 0x78aa, 0x3518,
+        0x3340, 0x3428, 0x8000, 0x80ac, 0xaf80, 0x002b, 0x20a0, 0x789b,
+        0x0000, 0xad80, 0x000b, 0x2098, 0x53a6, 0x23a8, 0x2898, 0x25a0,
+        0xa286, 0x0020, 0x00c0, 0x2d86, 0x70d4, 0xc0b5, 0x70d6, 0x2c00,
+        0x70ba, 0x2d00, 0x70be, 0x6814, 0xc0fc, 0x8007, 0x7882, 0xa286,
+        0x0002, 0x0040, 0x2dbc, 0x70a4, 0x8000, 0x70a6, 0x74b4, 0xa498,
+        0x0005, 0x70ac, 0xa306, 0x00c0, 0x2d7e, 0x73a8, 0x73b6, 0xa286,
+        0x0010, 0x0040, 0x2a08, 0x0d7f, 0x0c7f, 0x007c, 0x7000, 0xa005,
+        0x00c0, 0x2d64, 0xa286, 0x0002, 0x00c0, 0x2dd6, 0x1078, 0x43b0,
+        0x00c0, 0x2d64, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x2091, 0x8000,
+        0x781b, 0x005b, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898,
+        0x78d2, 0x78da, 0x2091, 0x8001, 0x7808, 0xc08d, 0x780a, 0x127e,
+        0x0d7e, 0x0c7e, 0x70d4, 0xa084, 0x2700, 0x2090, 0x0c7f, 0x0d7f,
+        0x127f, 0x2900, 0x705a, 0x68bc, 0x7042, 0x7003, 0x0002, 0x2d00,
+        0x704e, 0xad80, 0x0009, 0x7046, 0x7830, 0xd0bc, 0x0040, 0x2dc8,
+        0x2091, 0x303d, 0x70d4, 0xa084, 0x303d, 0x2091, 0x8000, 0x2090,
+        0x70a4, 0xa005, 0x00c0, 0x2dcd, 0x007c, 0x8421, 0x0040, 0x2dcc,
+        0x7250, 0x70c0, 0xa200, 0xa015, 0x0078, 0x2bb6, 0xa286, 0x0010,
+        0x00c0, 0x2e07, 0x1078, 0x43b0, 0x00c0, 0x2d64, 0x6814, 0xc0fc,
+        0x8007, 0x7882, 0x781b, 0x005b, 0x68b4, 0x785a, 0x6894, 0x78d6,
+        0x78de, 0x6898, 0x78d2, 0x78da, 0x7808, 0xc08d, 0x780a, 0x70a4,
+        0x8000, 0x70a6, 0x74b4, 0xa490, 0x0005, 0x70ac, 0xa206, 0x00c0,
+        0x2dfa, 0x72a8, 0x72b6, 0x2900, 0x705a, 0x68bc, 0x7042, 0x7003,
+        0x0002, 0x2d00, 0x704e, 0xad80, 0x0009, 0x7046, 0x007c, 0x6bb4,
+        0xa39d, 0x2000, 0x7b5a, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x6b94,
+        0x7bd6, 0x7bde, 0x6e98, 0x7ed2, 0x7eda, 0x781b, 0x005b, 0x2900,
+        0x705a, 0x7202, 0x7808, 0xc08d, 0x780a, 0x2300, 0xa605, 0x0040,
+        0x2e32, 0x70d4, 0xa084, 0x2700, 0xa086, 0x2300, 0x00c0, 0x2e2c,
+        0x2009, 0x0000, 0x0078, 0x2e2e, 0x2009, 0x0001, 0xa284, 0x000f,
+        0x1079, 0x2e38, 0xad80, 0x0009, 0x7046, 0x2d00, 0x704e, 0x007c,
+        0x2e40, 0x493f, 0x493f, 0x492c, 0x493f, 0x2e40, 0x2e40, 0x2e40,
+        0x1078, 0x29b2, 0x7808, 0xa084, 0xfffd, 0x780a, 0x1078, 0x29a5,
+        0x0f7e, 0x2079, 0x4f00, 0x78ac, 0x0f7f, 0xd084, 0x0040, 0x2e6a,
+        0x7064, 0xa086, 0x0001, 0x00c0, 0x2e58, 0x7066, 0x0078, 0x2f41,
+        0x7064, 0xa086, 0x0005, 0x00c0, 0x2e68, 0x707c, 0x2068, 0x681b,
+        0x0004, 0x6817, 0x0000, 0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822,
+        0x7067, 0x0000, 0x70a7, 0x0000, 0x70a8, 0x70b2, 0x70b6, 0x1078,
+        0x2b01, 0x157e, 0x2011, 0x0004, 0x7164, 0xa186, 0x0001, 0x0040,
+        0x2e8a, 0xa186, 0x0007, 0x00c0, 0x2e81, 0x701f, 0x0005, 0x0078,
+        0x2e8a, 0x701f, 0x0001, 0x7067, 0x0000, 0x70d4, 0xc0dd, 0x70d6,
+        0x0078, 0x2e8c, 0x7067, 0x0000, 0x2001, 0x4f0a, 0x2004, 0xa084,
+        0x00ff, 0xa086, 0x0018, 0x0040, 0x2e9c, 0x7018, 0x7016, 0xa005,
+        0x00c0, 0x2e9c, 0x70a7, 0x0001, 0x067e, 0x1078, 0x45d6, 0x20a9,
+        0x0010, 0x2039, 0x0000, 0x1078, 0x4148, 0xa7b8, 0x0100, 0x00f0,
+        0x2ea3, 0x067f, 0x7000, 0x0079, 0x2ead, 0x2ee7, 0x2ec2, 0x2ec2,
+        0x2eb7, 0x2ee7, 0x2ee7, 0x2ee7, 0x2eb5, 0x1078, 0x29b2, 0x7060,
+        0xa005, 0x0040, 0x2ee7, 0xad06, 0x00c0, 0x2ec2, 0x6800, 0x7062,
+        0x0078, 0x2ed4, 0x6820, 0xd084, 0x00c0, 0x2ed0, 0x6f14, 0x1078,
+        0x424e, 0x6008, 0xc0d4, 0x600a, 0x1078, 0x3e19, 0x0078, 0x2ed4,
+        0x705c, 0x2060, 0x6800, 0x6002, 0xa684, 0x5f00, 0x681e, 0x6818,
+        0xd0fc, 0x0040, 0x2edc, 0x6a1a, 0x6817, 0x0000, 0x682b, 0x0000,
+        0x6820, 0xa084, 0x00ff, 0xc09d, 0x6822, 0x1078, 0x2073, 0xb284,
+        0x0400, 0x0040, 0x2eef, 0x2021, 0x96d0, 0x0078, 0x2ef1, 0x2021,
+        0x95c0, 0x1078, 0x2f46, 0xb284, 0x0400, 0x0040, 0x2efb, 0x2021,
+        0x4f98, 0x0078, 0x2efd, 0x2021, 0x4f58, 0x1078, 0x2f46, 0x20a9,
+        0x0101, 0xb284, 0x0400, 0x0040, 0x2f09, 0x2021, 0x95d0, 0x0078,
+        0x2f0b, 0x2021, 0x94c0, 0x1078, 0x2f46, 0x8420, 0x00f0, 0x2f0b,
+        0xb284, 0x0300, 0x0040, 0x2f18, 0x2061, 0x54c0, 0x0078, 0x2f1a,
+        0x2061, 0x74c0, 0x2021, 0x0002, 0x20a9, 0x0100, 0x6110, 0x81ff,
+        0x0040, 0x2f37, 0x6018, 0x017e, 0x007e, 0x2011, 0x4f02, 0x220c,
+        0xa102, 0x2012, 0x007f, 0x017f, 0xa102, 0x0050, 0x2f37, 0x6012,
+        0x00c0, 0x2f37, 0x2011, 0x4f04, 0x2204, 0xc0a5, 0x2012, 0x601b,
+        0x0000, 0xace0, 0x0010, 0x00f0, 0x2f1e, 0x8421, 0x00c0, 0x2f1c,
+        0x157f, 0x7003, 0x0000, 0x704f, 0x0000, 0x007c, 0x047e, 0x2404,
+        0xa005, 0x0040, 0x2f61, 0x2068, 0x6800, 0x007e, 0x6a1a, 0x6817,
+        0x0000, 0x682b, 0x0000, 0x68b4, 0xa084, 0x5f00, 0x681e, 0x6820,
+        0xa084, 0x00ff, 0xc09d, 0x6822, 0x1078, 0x2073, 0x007f, 0x0078,
+        0x2f48, 0x047f, 0x2023, 0x0000, 0x007c, 0xa282, 0x0003, 0x0050,
+        0x2f6b, 0x1078, 0x29b2, 0x2300, 0x0079, 0x2f6e, 0x2f71, 0x2ffc,
+        0x3019, 0xa282, 0x0002, 0x0040, 0x2f77, 0x1078, 0x29b2, 0x7064,
+        0x7067, 0x0000, 0x7083, 0x0000, 0x0079, 0x2f7e, 0x2f86, 0x2f86,
+        0x2f88, 0x2fc8, 0x3e55, 0x2f86, 0x2fc8, 0x2f86, 0x1078, 0x29b2,
+        0x7774, 0x1078, 0x4148, 0x7774, 0xa7bc, 0x8f00, 0x1078, 0x424e,
+        0x6018, 0xa005, 0x0040, 0x2fbf, 0xd7fc, 0x00c0, 0x2f9b, 0x2021,
+        0x95c0, 0x0078, 0x2f9d, 0x2021, 0x96d0, 0x2009, 0x0005, 0x2011,
+        0x0010, 0x1078, 0x3034, 0x0040, 0x2fbf, 0x157e, 0x20a9, 0x0101,
+        0xd7fc, 0x00c0, 0x2faf, 0x2021, 0x94c0, 0x0078, 0x2fb1, 0x2021,
+        0x95d0, 0x047e, 0x2009, 0x0005, 0x2011, 0x0010, 0x1078, 0x3034,
+        0x047f, 0x0040, 0x2fbe, 0x8420, 0x00f0, 0x2fb1, 0x157f, 0x8738,
+        0xa784, 0x001f, 0x00c0, 0x2f8e, 0x0078, 0x2a0c, 0x0078, 0x2a0c,
+        0x7774, 0x1078, 0x424e, 0x6018, 0xa005, 0x0040, 0x2ffa, 0xd7fc,
+        0x00c0, 0x2fd6, 0x2021, 0x95c0, 0x0078, 0x2fd8, 0x2021, 0x96d0,
+        0x2009, 0x0005, 0x2011, 0x0020, 0x1078, 0x3034, 0x0040, 0x2ffa,
+        0x157e, 0x20a9, 0x0101, 0xd7fc, 0x00c0, 0x2fea, 0x2021, 0x94c0,
+        0x0078, 0x2fec, 0x2021, 0x95d0, 0x047e, 0x2009, 0x0005, 0x2011,
+        0x0020, 0x1078, 0x3034, 0x047f, 0x0040, 0x2ff9, 0x8420, 0x00f0,
+        0x2fec, 0x157f, 0x0078, 0x2a0c, 0x2200, 0x0079, 0x2fff, 0x3002,
+        0x3004, 0x3004, 0x1078, 0x29b2, 0x2009, 0x0012, 0x7064, 0xa086,
+        0x0002, 0x0040, 0x300d, 0x2009, 0x000e, 0x6818, 0xd0fc, 0x0040,
+        0x3012, 0x691a, 0x7067, 0x0000, 0x70d4, 0xc0dd, 0x70d6, 0x0078,
+        0x435d, 0x2200, 0x0079, 0x301c, 0x3021, 0x3004, 0x301f, 0x1078,
+        0x29b2, 0x1078, 0x45d6, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3dc7,
+        0x1078, 0x3e36, 0x6008, 0xa084, 0xfbef, 0x600a, 0x1078, 0x3db8,
+        0x0040, 0x3dc7, 0x0078, 0x2a0c, 0x2404, 0xa005, 0x0040, 0x306d,
+        0x2068, 0x2d04, 0x007e, 0x6814, 0xa706, 0x0040, 0x3043, 0x2d20,
+        0x007f, 0x0078, 0x3035, 0x007f, 0x2022, 0x691a, 0x6817, 0x0000,
         0x682b, 0x0000, 0x68b4, 0xa084, 0x5f00, 0x681e, 0x6820, 0xa084,
-        0x00ff, 0xc09d, 0x6822, 0x1078, 0x202c, 0x007f, 0x0078, 0x2eff,
-        0x047f, 0x2023, 0x0000, 0x007c, 0xa282, 0x0003, 0x0050, 0x2f22,
-        0x1078, 0x296b, 0x2300, 0x0079, 0x2f25, 0x2f28, 0x2fb3, 0x2fd0,
-        0xa282, 0x0002, 0x0040, 0x2f2e, 0x1078, 0x296b, 0x7064, 0x7067,
-        0x0000, 0x7083, 0x0000, 0x0079, 0x2f35, 0x2f3d, 0x2f3d, 0x2f3f,
-        0x2f7f, 0x3e0c, 0x2f3d, 0x2f7f, 0x2f3d, 0x1078, 0x296b, 0x7774,
-        0x1078, 0x40f8, 0x7774, 0xa7bc, 0x8f00, 0x1078, 0x41fe, 0x6018,
-        0xa005, 0x0040, 0x2f76, 0xd7fc, 0x00c0, 0x2f52, 0x2021, 0x94c0,
-        0x0078, 0x2f54, 0x2021, 0x95d0, 0x2009, 0x0005, 0x2011, 0x0010,
-        0x1078, 0x2feb, 0x0040, 0x2f76, 0x157e, 0x20a9, 0x0101, 0xd7fc,
-        0x00c0, 0x2f66, 0x2021, 0x93c0, 0x0078, 0x2f68, 0x2021, 0x94d0,
-        0x047e, 0x2009, 0x0005, 0x2011, 0x0010, 0x1078, 0x2feb, 0x047f,
-        0x0040, 0x2f75, 0x8420, 0x00f0, 0x2f68, 0x157f, 0x8738, 0xa784,
-        0x001f, 0x00c0, 0x2f45, 0x0078, 0x29c5, 0x0078, 0x29c5, 0x7774,
-        0x1078, 0x41fe, 0x6018, 0xa005, 0x0040, 0x2fb1, 0xd7fc, 0x00c0,
-        0x2f8d, 0x2021, 0x94c0, 0x0078, 0x2f8f, 0x2021, 0x95d0, 0x2009,
-        0x0005, 0x2011, 0x0020, 0x1078, 0x2feb, 0x0040, 0x2fb1, 0x157e,
-        0x20a9, 0x0101, 0xd7fc, 0x00c0, 0x2fa1, 0x2021, 0x93c0, 0x0078,
-        0x2fa3, 0x2021, 0x94d0, 0x047e, 0x2009, 0x0005, 0x2011, 0x0020,
-        0x1078, 0x2feb, 0x047f, 0x0040, 0x2fb0, 0x8420, 0x00f0, 0x2fa3,
-        0x157f, 0x0078, 0x29c5, 0x2200, 0x0079, 0x2fb6, 0x2fb9, 0x2fbb,
-        0x2fbb, 0x1078, 0x296b, 0x2009, 0x0012, 0x7064, 0xa086, 0x0002,
-        0x0040, 0x2fc4, 0x2009, 0x000e, 0x6818, 0xd0fc, 0x0040, 0x2fc9,
-        0x691a, 0x7067, 0x0000, 0x70d4, 0xc0dd, 0x70d6, 0x0078, 0x430d,
-        0x2200, 0x0079, 0x2fd3, 0x2fd8, 0x2fbb, 0x2fd6, 0x1078, 0x296b,
-        0x1078, 0x4586, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3d7e, 0x1078,
-        0x3ded, 0x6008, 0xa084, 0xfbef, 0x600a, 0x1078, 0x3d6f, 0x0040,
-        0x3d7e, 0x0078, 0x29c5, 0x2404, 0xa005, 0x0040, 0x3024, 0x2068,
-        0x2d04, 0x007e, 0x6814, 0xa706, 0x0040, 0x2ffa, 0x2d20, 0x007f,
-        0x0078, 0x2fec, 0x007f, 0x2022, 0x691a, 0x6817, 0x0000, 0x682b,
-        0x0000, 0x68b4, 0xa084, 0x5f00, 0x681e, 0x6820, 0xa084, 0x00ff,
-        0xa205, 0x6822, 0x1078, 0x202c, 0x2021, 0x4e02, 0x241c, 0x8319,
-        0x2322, 0x6010, 0x8001, 0x6012, 0x00c0, 0x301b, 0x2021, 0x4e04,
-        0x2404, 0xc0a5, 0x2022, 0x6008, 0xa084, 0xf9ef, 0x600a, 0x1078,
-        0x2adb, 0x1078, 0x3ded, 0x007c, 0xa085, 0x0001, 0x0078, 0x3023,
-        0x2300, 0x0079, 0x302b, 0x3030, 0x302e, 0x30b0, 0x1078, 0x296b,
-        0x78e4, 0xa005, 0x00d0, 0x3066, 0x3208, 0x007e, 0x2001, 0x4e04,
-        0x2004, 0xd0ec, 0x007f, 0x0040, 0x3041, 0xa18c, 0x0300, 0x0078,
-        0x3043, 0xa18c, 0x0400, 0x0040, 0x3049, 0x0018, 0x29c1, 0x0078,
-        0x304b, 0x0028, 0x29c1, 0x2008, 0xa084, 0x0030, 0x00c0, 0x3052,
-        0x0078, 0x3770, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3050, 0x2100,
-        0xa084, 0x0007, 0x0079, 0x305c, 0x3090, 0x309a, 0x3085, 0x3064,
-        0x4355, 0x4355, 0x3064, 0x30a5, 0x1078, 0x296b, 0x7000, 0xa086,
-        0x0004, 0x00c0, 0x3080, 0x7064, 0xa086, 0x0002, 0x00c0, 0x3076,
-        0x2011, 0x0002, 0x2019, 0x0000, 0x0078, 0x2f1c, 0x7064, 0xa086,
-        0x0006, 0x0040, 0x3070, 0x7064, 0xa086, 0x0004, 0x0040, 0x3070,
-        0x79e4, 0x2001, 0x0003, 0x0078, 0x33fa, 0x6818, 0xd0fc, 0x0040,
-        0x308b, 0x681b, 0x001d, 0x1078, 0x40c8, 0x781b, 0x0064, 0x007c,
-        0x6818, 0xd0fc, 0x0040, 0x3096, 0x681b, 0x001d, 0x1078, 0x40c8,
-        0x0078, 0x4331, 0x6818, 0xd0fc, 0x0040, 0x30a0, 0x681b, 0x001d,
-        0x1078, 0x40c8, 0x781b, 0x00f8, 0x007c, 0x6818, 0xd0fc, 0x0040,
-        0x30ab, 0x681b, 0x001d, 0x1078, 0x40c8, 0x781b, 0x00c8, 0x007c,
-        0xa584, 0x000f, 0x00c0, 0x30cf, 0x1078, 0x295e, 0x7000, 0x0079,
-        0x30b9, 0x29c5, 0x30c1, 0x30c3, 0x3d7e, 0x3d7e, 0x3d7e, 0x30c1,
-        0x30c1, 0x1078, 0x296b, 0x1078, 0x3ded, 0x6008, 0xa084, 0xfbef,
-        0x600a, 0x1078, 0x3d6f, 0x0040, 0x3d7e, 0x0078, 0x29c5, 0x78e4,
-        0xa005, 0x00d0, 0x3066, 0x3208, 0x007e, 0x2001, 0x4e04, 0x2004,
-        0xd0ec, 0x007f, 0x0040, 0x30e0, 0xa18c, 0x0300, 0x0078, 0x30e2,
-        0xa18c, 0x0400, 0x0040, 0x30e8, 0x0018, 0x3066, 0x0078, 0x30ea,
-        0x0028, 0x3066, 0x2008, 0xa084, 0x0030, 0x00c0, 0x30f2, 0x781b,
-        0x005b, 0x007c, 0x78ec, 0xa084, 0x0003, 0x0040, 0x30ef, 0x2100,
-        0xa184, 0x0007, 0x0079, 0x30fc, 0x310b, 0x310f, 0x3106, 0x3104,
-        0x4355, 0x4355, 0x3104, 0x434f, 0x1078, 0x296b, 0x1078, 0x40d0,
-        0x781b, 0x0064, 0x007c, 0x1078, 0x40d0, 0x0078, 0x4331, 0x1078,
-        0x40d0, 0x781b, 0x00f8, 0x007c, 0x1078, 0x40d0, 0x781b, 0x00c8,
-        0x007c, 0x2300, 0x0079, 0x311c, 0x3121, 0x311f, 0x3123, 0x1078,
-        0x296b, 0x0078, 0x395f, 0x681b, 0x0016, 0x78a3, 0x0000, 0x79e4,
-        0xa184, 0x0030, 0x0040, 0x395f, 0x78ec, 0xa084, 0x0003, 0x0040,
-        0x395f, 0xa184, 0x0100, 0x0040, 0x3127, 0xa184, 0x0007, 0x0079,
-        0x3139, 0x3141, 0x310f, 0x3085, 0x430d, 0x4355, 0x4355, 0x430d,
-        0x434f, 0x1078, 0x4319, 0x007c, 0xa282, 0x0005, 0x0050, 0x314a,
-        0x1078, 0x296b, 0x2300, 0x0079, 0x314d, 0x3150, 0x3380, 0x338b,
-        0x2200, 0x0079, 0x3153, 0x316d, 0x315a, 0x316d, 0x3158, 0x3363,
-        0x1078, 0x296b, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff, 0xa082,
-        0x0020, 0x0048, 0x40b7, 0xa08a, 0x0004, 0x00c8, 0x40b7, 0x0079,
-        0x3169, 0x40b7, 0x40b7, 0x40b7, 0x4061, 0x789b, 0x0018, 0x79a8,
-        0xa184, 0x0080, 0x0040, 0x317e, 0x0078, 0x40b7, 0x7000, 0xa005,
-        0x00c0, 0x3174, 0x2011, 0x0004, 0x0078, 0x3b4a, 0xa184, 0x00ff,
-        0xa08a, 0x0010, 0x00c8, 0x40b7, 0x0079, 0x3186, 0x3198, 0x3196,
-        0x31ad, 0x31b1, 0x3284, 0x40b7, 0x40b7, 0x3286, 0x40b7, 0x40b7,
-        0x335f, 0x335f, 0x40b7, 0x40b7, 0x40b7, 0x3361, 0x1078, 0x296b,
-        0xd6e4, 0x0040, 0x31a3, 0x2001, 0x0300, 0x8000, 0x8000, 0x783a,
-        0x781b, 0x00c3, 0x007c, 0x6818, 0xd0fc, 0x0040, 0x31ab, 0x681b,
-        0x001d, 0x0078, 0x319b, 0x0078, 0x430d, 0x681b, 0x001d, 0x0078,
-        0x40c1, 0x6920, 0x6922, 0xa684, 0x1800, 0x00c0, 0x3216, 0x6820,
-        0xd084, 0x00c0, 0x321c, 0x6818, 0xa086, 0x0008, 0x00c0, 0x31c2,
-        0x681b, 0x0000, 0xd6d4, 0x0040, 0x3281, 0xd6bc, 0x0040, 0x3202,
-        0x7087, 0x0000, 0x6818, 0xa084, 0x003f, 0xa08a, 0x000d, 0x0050,
-        0x3202, 0xa08a, 0x000c, 0x7186, 0x2001, 0x000c, 0x800c, 0x718a,
-        0x789b, 0x0061, 0x78aa, 0x157e, 0x137e, 0x147e, 0x017e, 0x3208,
-        0xa18c, 0x0300, 0x0040, 0x31f4, 0x007e, 0x2001, 0x4e04, 0x2004,
-        0xd0ec, 0x007f, 0x0040, 0x31f0, 0x20a1, 0x012b, 0x0078, 0x31f6,
-        0x20a1, 0x022b, 0x0078, 0x31f6, 0x20a1, 0x012b, 0x017f, 0x789b,
-        0x0000, 0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f,
-        0x137f, 0x157f, 0x6038, 0xa005, 0x00c0, 0x3211, 0x681c, 0xa084,
-        0x000e, 0x0040, 0x40c1, 0x1078, 0x40d7, 0x782b, 0x3008, 0x0078,
-        0x3213, 0x8001, 0x603a, 0x781b, 0x0067, 0x007c, 0xd6e4, 0x0040,
-        0x321c, 0x781b, 0x0079, 0x007c, 0xa684, 0x0060, 0x0040, 0x327e,
-        0xd6dc, 0x0040, 0x327e, 0xd6fc, 0x00c0, 0x3228, 0x0078, 0x323f,
-        0xc6fc, 0x7e5a, 0x6eb6, 0x7adc, 0x79d8, 0x78d0, 0x801b, 0x00c8,
-        0x3232, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x6b98,
-        0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0xd6f4,
-        0x0040, 0x3245, 0xc6f4, 0x7e5a, 0x6eb6, 0x7000, 0xa086, 0x0003,
-        0x00c0, 0x3253, 0x007e, 0x1078, 0x4586, 0x1078, 0x48bd, 0x007f,
-        0x781b, 0x0076, 0x007c, 0xa006, 0x1078, 0x49c3, 0x6ab0, 0x69ac,
-        0x6c98, 0x6b94, 0x2200, 0xa105, 0x0040, 0x3262, 0x2200, 0xa422,
-        0x2100, 0xa31b, 0x6caa, 0x7cd2, 0x7cda, 0x6ba6, 0x7bd6, 0x7bde,
-        0x2300, 0xa405, 0x00c0, 0x3272, 0xc6f5, 0x7e5a, 0x6eb6, 0x781b,
-        0x0076, 0x007c, 0x781b, 0x0076, 0x2200, 0xa115, 0x00c0, 0x327b,
-        0x1078, 0x48bd, 0x007c, 0x1078, 0x48f5, 0x007c, 0x781b, 0x0079,
-        0x007c, 0x781b, 0x0067, 0x007c, 0x1078, 0x296b, 0x0078, 0x32d2,
-        0x6920, 0xd1c4, 0x0040, 0x329b, 0xc1c4, 0x6922, 0x0c7e, 0x7058,
-        0x2060, 0x6000, 0xc0e4, 0x6002, 0x6004, 0xa084, 0xfff5, 0x6006,
-        0x0c7f, 0x0078, 0x32c6, 0xd1cc, 0x0040, 0x32c6, 0xc1cc, 0x6922,
-        0x0c7e, 0x7058, 0x2060, 0x6000, 0xc0ec, 0x6002, 0x6004, 0xc0a4,
-        0x6006, 0x2008, 0x2c48, 0x0c7f, 0xd19c, 0x0040, 0x32c6, 0x1078,
-        0x41fa, 0x1078, 0x3ef5, 0x88ff, 0x0040, 0x32c6, 0x789b, 0x0060,
-        0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x00c0, 0x32c3,
-        0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x7e58, 0xd6d4,
-        0x00c0, 0x32cd, 0x781b, 0x0067, 0x007c, 0x781b, 0x0079, 0x007c,
-        0x0078, 0x40bc, 0x2019, 0x0000, 0x7990, 0xa18c, 0x0007, 0x00c0,
-        0x32e0, 0x6820, 0xa084, 0x0100, 0x0040, 0x32d0, 0x2009, 0x0008,
-        0x789b, 0x0010, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001, 0x00c0,
-        0x32fc, 0x2300, 0x7ca8, 0xa400, 0x2018, 0xa102, 0x0040, 0x32f4,
-        0x0048, 0x32f4, 0x0078, 0x32f6, 0x0078, 0x3288, 0x24a8, 0x7aa8,
-        0x00f0, 0x32f6, 0x0078, 0x32e2, 0xa284, 0x00f0, 0xa086, 0x0020,
-        0x00c0, 0x3350, 0x8318, 0x8318, 0x2300, 0xa102, 0x0040, 0x330c,
-        0x0048, 0x330c, 0x0078, 0x334d, 0xa286, 0x0023, 0x0040, 0x32d0,
-        0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58, 0xa684, 0xfff1, 0xc0a5,
-        0x2030, 0x7e5a, 0x6008, 0xc0a5, 0x600a, 0x0c7e, 0x7058, 0x2060,
-        0x6004, 0x2008, 0x2c48, 0x0c7f, 0xd1a4, 0x0040, 0x332d, 0x1078,
-        0x41fa, 0x1078, 0x4011, 0x0078, 0x333b, 0x0c7e, 0x7058, 0x2060,
-        0x6004, 0x2008, 0x2c48, 0x0c7f, 0xd19c, 0x0040, 0x32c6, 0x1078,
-        0x41fa, 0x1078, 0x3ef5, 0x88ff, 0x0040, 0x32c6, 0x789b, 0x0060,
-        0x2800, 0x78aa, 0xc695, 0x7e5a, 0xd6d4, 0x00c0, 0x334a, 0x781b,
-        0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x7aa8, 0x0078, 0x32e2,
-        0x8318, 0x2300, 0xa102, 0x0040, 0x3359, 0x0048, 0x3359, 0x0078,
-        0x32e2, 0xa284, 0x0080, 0x00c0, 0x40c1, 0x0078, 0x40bc, 0x0078,
-        0x40c1, 0x0078, 0x40b7, 0x7058, 0xa04d, 0x789b, 0x0018, 0x78a8,
-        0xa084, 0x00ff, 0xa08e, 0x0001, 0x0040, 0x3370, 0x1078, 0x296b,
-        0x7aa8, 0xa294, 0x00ff, 0x78a8, 0xa084, 0x00ff, 0xa08a, 0x0004,
-        0x00c8, 0x40b7, 0x0079, 0x337c, 0x40b7, 0x3e46, 0x40b7, 0x3fb9,
-        0xa282, 0x0000, 0x00c0, 0x3386, 0x1078, 0x296b, 0x1078, 0x40c8,
-        0x781b, 0x0078, 0x007c, 0xa282, 0x0003, 0x00c0, 0x3391, 0x1078,
-        0x296b, 0xd4fc, 0x00c0, 0x33b1, 0x7064, 0xa005, 0x0040, 0x339a,
-        0x1078, 0x296b, 0x6f14, 0x7776, 0xa7bc, 0x8f00, 0x1078, 0x41fe,
-        0x6008, 0xa085, 0x0021, 0x600a, 0x8738, 0xa784, 0x001f, 0x00c0,
-        0x339e, 0x1078, 0x40cc, 0x7067, 0x0002, 0x701f, 0x0009, 0x0078,
-        0x33b3, 0x1078, 0x40db, 0x781b, 0x0078, 0x007c, 0xa282, 0x0004,
-        0x0050, 0x33bc, 0x1078, 0x296b, 0x2300, 0x0079, 0x33bf, 0x33c2,
-        0x3582, 0x35c5, 0xa286, 0x0003, 0x0040, 0x33fa, 0x7200, 0x7cd8,
-        0x7ddc, 0x7fd0, 0x71d4, 0xd1bc, 0x00c0, 0x33f2, 0xd1b4, 0x0040,
-        0x33f2, 0x7868, 0xa084, 0x00ff, 0x00c0, 0x33f2, 0xa282, 0x0002,
-        0x00c8, 0x33f2, 0x0d7e, 0x783b, 0x8300, 0x781b, 0x004c, 0x70bc,
-        0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2,
-        0x78da, 0xc1b4, 0x71d6, 0x7003, 0x0030, 0x0d7f, 0x2001, 0x0000,
-        0x0078, 0x33fe, 0x783b, 0x1300, 0x781b, 0x004a, 0x2001, 0x0000,
-        0x0078, 0x33fe, 0x7200, 0x7cd8, 0x7ddc, 0x7fd0, 0x704a, 0x68a0,
-        0xd0ec, 0x0040, 0x3406, 0x6008, 0xc08d, 0x600a, 0xa284, 0x000f,
-        0x0079, 0x340a, 0x3562, 0x3417, 0x3414, 0x36c8, 0x3754, 0x29c5,
-        0x3412, 0x3412, 0x1078, 0x296b, 0x6008, 0xc0d4, 0x600a, 0xd6e4,
-        0x0040, 0x341f, 0x7048, 0xa086, 0x0014, 0x00c0, 0x343f, 0x1078,
-        0x4586, 0x2009, 0x0000, 0x6818, 0xd0fc, 0x0040, 0x3428, 0x7048,
-        0xa086, 0x0014, 0x0040, 0x3439, 0x6818, 0xa086, 0x0008, 0x00c0,
-        0x351a, 0x7858, 0xd09c, 0x0040, 0x351a, 0x6820, 0xd0ac, 0x0040,
-        0x351a, 0x681b, 0x0014, 0x2009, 0x0002, 0x0078, 0x347e, 0x7868,
-        0xa08c, 0x00ff, 0x0040, 0x347e, 0xa186, 0x0008, 0x00c0, 0x3455,
-        0x6008, 0xc0a4, 0x600a, 0x1078, 0x3d6f, 0x0040, 0x347e, 0x1078,
-        0x3ded, 0x1078, 0x4586, 0x0078, 0x3466, 0xa186, 0x0028, 0x00c0,
-        0x347e, 0x6018, 0xa005, 0x0040, 0x3448, 0x8001, 0x0040, 0x3448,
-        0x8001, 0x0040, 0x3448, 0x601e, 0x0078, 0x3448, 0x6820, 0xd084,
-        0x0040, 0x29c5, 0xc084, 0x6822, 0x1078, 0x2acc, 0x705c, 0x0c7e,
-        0x2060, 0x6800, 0x6002, 0x0c7f, 0x6004, 0x6802, 0xa005, 0x2d00,
-        0x00c0, 0x347b, 0x6002, 0x6006, 0x0078, 0x29c5, 0x017e, 0x81ff,
-        0x00c0, 0x34c8, 0x7000, 0xa086, 0x0030, 0x0040, 0x34c8, 0x71d4,
-        0xd1bc, 0x00c0, 0x34c8, 0xd1b4, 0x00c0, 0x34af, 0x7060, 0xa005,
-        0x00c0, 0x34c8, 0x70a4, 0xa086, 0x0001, 0x0040, 0x34c8, 0x7003,
-        0x0000, 0x047e, 0x057e, 0x077e, 0x067e, 0x0c7e, 0x0d7e, 0x1078,
-        0x29ee, 0x0d7f, 0x0c7f, 0x067f, 0x077f, 0x057f, 0x047f, 0x71d4,
-        0xd1b4, 0x00c0, 0x34c8, 0x7003, 0x0040, 0x0078, 0x34c8, 0x1078,
-        0x4360, 0x00c0, 0x34c8, 0x781b, 0x005b, 0x0d7e, 0x70bc, 0xa06d,
-        0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da,
-        0xc1b4, 0x71d6, 0x7003, 0x0030, 0x7808, 0xc08d, 0x780a, 0x0d7f,
-        0x1078, 0x35ff, 0x017f, 0x81ff, 0x0040, 0x351a, 0xa684, 0xdf00,
-        0x681e, 0x682b, 0x0000, 0x6f14, 0xa186, 0x0002, 0x00c0, 0x351b,
-        0x6818, 0xa086, 0x0014, 0x00c0, 0x34e4, 0x2008, 0xd6e4, 0x0040,
-        0x34e4, 0x7868, 0xa08c, 0x00ff, 0x1078, 0x2aba, 0x1078, 0x2adb,
-        0x6820, 0xd0dc, 0x00c0, 0x351b, 0x8717, 0xa294, 0x000f, 0x8213,
-        0x8213, 0x8213, 0xb284, 0x0300, 0x0040, 0x34fa, 0xa290, 0x52c0,
-        0x0078, 0x34fc, 0xa290, 0x5340, 0xa290, 0x0000, 0x221c, 0xd3c4,
-        0x00c0, 0x3504, 0x0078, 0x350a, 0x8210, 0x2204, 0xa085, 0x0018,
-        0x2012, 0x8211, 0xd3d4, 0x0040, 0x3515, 0x68a0, 0xd0c4, 0x00c0,
-        0x3515, 0x1078, 0x3679, 0x0078, 0x29c5, 0x6008, 0xc08d, 0x600a,
-        0x0078, 0x351b, 0x692a, 0x6916, 0x6818, 0xd0fc, 0x0040, 0x3522,
-        0x7048, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x6410, 0x84ff, 0x0040,
-        0x3537, 0x2009, 0x4e02, 0x2104, 0x8001, 0x200a, 0x8421, 0x6412,
-        0x00c0, 0x3537, 0x2021, 0x4e04, 0x2404, 0xc0a5, 0x2022, 0x6018,
-        0xa005, 0x0040, 0x353f, 0x8001, 0x601a, 0x00c0, 0x3542, 0x6008,
-        0xc0a4, 0x600a, 0x6820, 0xd084, 0x00c0, 0x354e, 0x6800, 0xa005,
-        0x00c0, 0x354b, 0x6002, 0x6006, 0x0078, 0x3552, 0x705c, 0x2060,
-        0x6800, 0x6002, 0x2061, 0x4e00, 0x6887, 0x0103, 0x2d08, 0x206b,
-        0x0000, 0x6068, 0xa005, 0x616a, 0x0040, 0x3561, 0x2d02, 0x0078,
-        0x3562, 0x616e, 0x7200, 0xa286, 0x0030, 0x0040, 0x3572, 0xa286,
-        0x0040, 0x00c0, 0x29c5, 0x7003, 0x0002, 0x704c, 0x2068, 0x68c4,
-        0x2060, 0x007c, 0x7003, 0x0002, 0x70bc, 0xa06d, 0x68bc, 0x7042,
-        0x70b8, 0xa065, 0x68c0, 0x705a, 0x2d00, 0x704e, 0xad80, 0x0009,
-        0x7046, 0x007c, 0xa282, 0x0004, 0x0048, 0x3588, 0x1078, 0x296b,
-        0x2200, 0x0079, 0x358b, 0x358f, 0x35a0, 0x35ad, 0x35a0, 0xa586,
-        0x1300, 0x0040, 0x35a0, 0xa586, 0x8300, 0x00c0, 0x3586, 0x7003,
-        0x0000, 0x6018, 0x8001, 0x601a, 0x6008, 0xa084, 0xfbef, 0x600a,
-        0x7000, 0xa086, 0x0005, 0x0040, 0x35aa, 0x1078, 0x40c8, 0x781b,
-        0x0078, 0x007c, 0x781b, 0x0079, 0x007c, 0x7890, 0x8007, 0x8001,
-        0xa084, 0x0007, 0xa080, 0x0018, 0x789a, 0x79a8, 0xa18c, 0x00ff,
-        0xa186, 0x0003, 0x0040, 0x35c2, 0xa186, 0x0000, 0x0040, 0x35c2,
-        0x0078, 0x40b7, 0x781b, 0x0079, 0x007c, 0x6820, 0xc095, 0x6822,
-        0x82ff, 0x00c0, 0x35cf, 0x1078, 0x40c8, 0x0078, 0x35d6, 0x8211,
-        0x0040, 0x35d4, 0x1078, 0x296b, 0x1078, 0x40db, 0x781b, 0x0078,
-        0x007c, 0x1078, 0x4383, 0x7830, 0xa084, 0x00c0, 0x00c0, 0x35fc,
-        0x017e, 0x3208, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f,
-        0x0040, 0x35ee, 0xa18c, 0x0300, 0x0078, 0x35f0, 0xa18c, 0x0400,
-        0x017f, 0x0040, 0x35f7, 0x0018, 0x35fc, 0x0078, 0x35f9, 0x0028,
-        0x35fc, 0x791a, 0xa006, 0x007c, 0xa085, 0x0001, 0x007c, 0xa684,
-        0x0060, 0x00c0, 0x3609, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078,
-        0x3678, 0xd6dc, 0x00c0, 0x3621, 0x68b4, 0xd0dc, 0x00c0, 0x3621,
-        0x6998, 0x6a94, 0x692e, 0x6a32, 0x7048, 0xa005, 0x00c0, 0x361e,
-        0x2200, 0xa105, 0x0040, 0x4586, 0x704b, 0x0015, 0x0078, 0x4586,
-        0x007c, 0xd6ac, 0x0040, 0x3647, 0xd6f4, 0x0040, 0x362d, 0x682f,
-        0x0000, 0x6833, 0x0000, 0x0078, 0x4586, 0x68b4, 0xa084, 0x4000,
-        0xa635, 0xd6f4, 0x00c0, 0x3627, 0x7048, 0xa005, 0x00c0, 0x363a,
-        0x704b, 0x0015, 0xd6dc, 0x00c0, 0x3643, 0x68b4, 0xd0dc, 0x0040,
-        0x3643, 0x6ca8, 0x6da4, 0x6c2e, 0x6d32, 0x0078, 0x4586, 0xd6f4,
-        0x0040, 0x3650, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x4586,
-        0x68b4, 0xa084, 0x4800, 0xa635, 0xd6f4, 0x00c0, 0x364a, 0x7048,
-        0xa005, 0x00c0, 0x365d, 0x704b, 0x0015, 0x2408, 0x2510, 0x2700,
-        0x80fb, 0x00c8, 0x3664, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291,
-        0x0000, 0x692e, 0x6a32, 0x2100, 0xa205, 0x00c0, 0x3671, 0x0078,
-        0x4586, 0x7000, 0xa086, 0x0006, 0x0040, 0x3678, 0x0078, 0x4586,
-        0x007c, 0x6946, 0x6008, 0xc0cd, 0xd3cc, 0x0040, 0x3680, 0xc08d,
-        0x600a, 0x6818, 0x683a, 0x681b, 0x0006, 0x688f, 0x0000, 0x6893,
-        0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942, 0x682f, 0x0003, 0x6833,
-        0x0000, 0x6837, 0x0020, 0x6897, 0x0000, 0x689b, 0x0020, 0x7000,
-        0x0079, 0x369a, 0x29c5, 0x36ac, 0x36a4, 0x36a2, 0x36a2, 0x36a2,
-        0x36a2, 0x36a2, 0x1078, 0x296b, 0x6820, 0xd084, 0x00c0, 0x36ac,
-        0x1078, 0x3dd0, 0x0078, 0x36b2, 0x705c, 0x2c50, 0x2060, 0x6800,
-        0x6002, 0x2a60, 0x3208, 0xa18c, 0x0300, 0x0040, 0x36bb, 0x2021,
-        0x4e58, 0x0078, 0x36bd, 0x2021, 0x4e98, 0x2404, 0xa005, 0x0040,
-        0x36c4, 0x2020, 0x0078, 0x36bd, 0x2d22, 0x206b, 0x0000, 0x007c,
-        0x1078, 0x3dd7, 0x1078, 0x3ded, 0x6008, 0xc0cc, 0x600a, 0x682b,
-        0x0000, 0x789b, 0x000e, 0x6f14, 0x6938, 0x691a, 0x6944, 0x6916,
-        0x3208, 0xa18c, 0x0300, 0x0040, 0x36e1, 0x2009, 0x0000, 0x0078,
-        0x36e3, 0x2009, 0x0001, 0x1078, 0x49f8, 0xd6dc, 0x0040, 0x36eb,
-        0x691c, 0xc1ed, 0x691e, 0x6818, 0xd0fc, 0x0040, 0x36fa, 0x7868,
-        0xa08c, 0x00ff, 0x0040, 0x36f8, 0x681b, 0x001e, 0x0078, 0x36fa,
-        0x681b, 0x0000, 0xb284, 0x0300, 0x00c0, 0x3702, 0x2021, 0x4e98,
-        0x0078, 0x3704, 0x2021, 0x4e58, 0x6800, 0x2022, 0x6a3c, 0x6940,
-        0x6a32, 0x692e, 0x68c0, 0x2060, 0x6000, 0xd0a4, 0x0040, 0x3744,
-        0x2041, 0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x0d7e, 0x0f7e,
-        0x157e, 0x147e, 0x2079, 0x4e00, 0x1078, 0x1dff, 0x147f, 0x157f,
-        0x0f7f, 0x70cc, 0x2010, 0x2009, 0x0101, 0x027e, 0x2204, 0xa06d,
-        0x0040, 0x3734, 0x6814, 0xa706, 0x0040, 0x3731, 0x6800, 0x0078,
-        0x3727, 0x6820, 0xc0d5, 0x6822, 0x027f, 0x8210, 0x8109, 0x00c0,
-        0x3725, 0x0d7f, 0x7067, 0x0003, 0x707f, 0x0000, 0x7776, 0x7083,
-        0x000f, 0x71d4, 0xc1dc, 0x71d6, 0x6818, 0xa086, 0x0002, 0x00c0,
-        0x3750, 0x6817, 0x0000, 0x682b, 0x0000, 0x681c, 0xc0ec, 0x681e,
-        0x1078, 0x202c, 0x0078, 0x29c5, 0x7cd8, 0x7ddc, 0x7fd0, 0x1078,
-        0x35ff, 0x682b, 0x0000, 0x789b, 0x000e, 0x6f14, 0x1078, 0x4387,
-        0xa08c, 0x00ff, 0x6916, 0x6818, 0xd0fc, 0x0040, 0x3769, 0x7048,
-        0x681a, 0xa68c, 0xdf00, 0x691e, 0x7067, 0x0000, 0x0078, 0x29c5,
-        0x7000, 0xa005, 0x00c0, 0x3776, 0x0078, 0x29c5, 0xa006, 0x1078,
-        0x4586, 0x6920, 0xd1ac, 0x00c0, 0x377f, 0x681b, 0x0014, 0xa68c,
-        0xdf00, 0x691e, 0x682b, 0x0000, 0x6820, 0xa084, 0x00ff, 0x6822,
-        0x7000, 0x0079, 0x378b, 0x29c5, 0x3795, 0x3795, 0x3798, 0x3798,
-        0x3798, 0x3793, 0x3793, 0x1078, 0x296b, 0x6818, 0x0078, 0x33fa,
-        0x6008, 0xc0a4, 0x600a, 0x6817, 0x0000, 0x0078, 0x3d95, 0x2300,
-        0x0079, 0x37a2, 0x37a5, 0x37a7, 0x3817, 0x1078, 0x296b, 0xd6fc,
-        0x00c0, 0x37fe, 0x7000, 0xa00d, 0x0079, 0x37ae, 0x29c5, 0x37b8,
-        0x37b8, 0x37e8, 0x37b8, 0x37fb, 0x37b6, 0x37b6, 0x1078, 0x296b,
-        0xa684, 0x0060, 0x0040, 0x37e8, 0xa086, 0x0060, 0x00c0, 0x37e5,
-        0xc6ac, 0xc6f4, 0xc6ed, 0x7e5a, 0x6eb6, 0x681c, 0xc0ac, 0x681e,
-        0xa186, 0x0002, 0x0040, 0x37d7, 0x1078, 0x4586, 0x69ac, 0x68b0,
-        0xa115, 0x0040, 0x37d7, 0x1078, 0x48f5, 0x0078, 0x37d9, 0x1078,
-        0x48bd, 0x781b, 0x0079, 0x71d4, 0xd1b4, 0x00c0, 0x29c1, 0x70a4,
-        0xa086, 0x0001, 0x00c0, 0x2a0b, 0x007c, 0xd6ec, 0x0040, 0x37c2,
-        0x6818, 0xd0fc, 0x0040, 0x37fb, 0xd6f4, 0x00c0, 0x37f5, 0x681b,
-        0x0015, 0x781b, 0x0079, 0x0078, 0x29c1, 0x681b, 0x0007, 0x682f,
-        0x0000, 0x6833, 0x0000, 0x1078, 0x4319, 0x007c, 0xc6fc, 0x7e5a,
-        0x7adc, 0x79d8, 0x78d0, 0x801b, 0x00c8, 0x3807, 0x8000, 0xa084,
-        0x003f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2,
-        0x6b94, 0x2200, 0xa303, 0x68ae, 0x781b, 0x0079, 0x007c, 0x1078,
-        0x296b, 0x2300, 0x0079, 0x381c, 0x3821, 0x3846, 0x38a6, 0x1078,
-        0x296b, 0x7000, 0x0079, 0x3824, 0x382c, 0x382e, 0x3837, 0x382c,
-        0x382c, 0x382c, 0x382c, 0x382c, 0x1078, 0x296b, 0x69ac, 0x68b0,
-        0xa115, 0x0040, 0x3837, 0x1078, 0x48f5, 0x0078, 0x3839, 0x1078,
-        0x48bd, 0x681c, 0xc0b4, 0x681e, 0x70d4, 0xd0b4, 0x00c0, 0x29c1,
-        0x70a4, 0xa086, 0x0001, 0x00c0, 0x2a0b, 0x007c, 0xd6fc, 0x00c0,
-        0x3896, 0x7000, 0xa00d, 0x0079, 0x384d, 0x29c5, 0x385d, 0x3857,
-        0x388d, 0x385d, 0x3893, 0x3855, 0x3855, 0x1078, 0x296b, 0x6894,
-        0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0xa684, 0x0060, 0x0040,
-        0x388d, 0xa086, 0x0060, 0x00c0, 0x388a, 0xa6b4, 0xbfbf, 0xc6ed,
-        0x7e5a, 0x6eb6, 0xa186, 0x0002, 0x0040, 0x3879, 0x1078, 0x4586,
-        0x69ac, 0x68b0, 0xa115, 0x0040, 0x3879, 0x1078, 0x48f5, 0x0078,
-        0x387b, 0x1078, 0x48bd, 0x781b, 0x0079, 0x681c, 0xc0b4, 0x681e,
-        0x71d4, 0xd1b4, 0x00c0, 0x29c1, 0x70a4, 0xa086, 0x0001, 0x00c0,
-        0x2a0b, 0x007c, 0xd6ec, 0x0040, 0x3867, 0x6818, 0xd0fc, 0x0040,
-        0x3893, 0x681b, 0x0007, 0x781b, 0x00f9, 0x007c, 0xc6fc, 0x7e5a,
-        0x7adc, 0x79d8, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200,
-        0xa303, 0x68ae, 0x79d2, 0x781b, 0x0079, 0x007c, 0xd6dc, 0x0040,
-        0x38af, 0x782b, 0x3009, 0x781b, 0x0079, 0x0078, 0x29c1, 0x7884,
-        0xc0ac, 0x7886, 0x78e4, 0xa084, 0x0008, 0x00c0, 0x38c2, 0xa484,
-        0x0200, 0x0040, 0x38bc, 0xc6f5, 0xc6dd, 0x7e5a, 0x781b, 0x0079,
-        0x0078, 0x29c1, 0x6820, 0xc095, 0x6822, 0x1078, 0x4292, 0xc6dd,
-        0x1078, 0x40c8, 0x781b, 0x0078, 0x0078, 0x29c1, 0x2300, 0x0079,
-        0x38d1, 0x38d4, 0x38d6, 0x38d8, 0x1078, 0x296b, 0x0078, 0x40c1,
-        0xd6d4, 0x00c0, 0x3913, 0x79e4, 0xd1ac, 0x0040, 0x38e6, 0x78ec,
-        0xa084, 0x0003, 0x0040, 0x38e6, 0x782b, 0x3009, 0x789b, 0x0060,
-        0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x79e4, 0xd1ac, 0x0040,
-        0x38f6, 0x78ec, 0xa084, 0x0003, 0x00c0, 0x390f, 0x2001, 0x4e04,
-        0x2004, 0xd0e4, 0x00c0, 0x390b, 0x6820, 0xd0c4, 0x0040, 0x390b,
-        0x0c7e, 0x7058, 0x2060, 0x6004, 0xc09d, 0x6006, 0x6008, 0xa084,
-        0x00ff, 0x600a, 0x0c7f, 0x2001, 0x0014, 0x0078, 0x33fa, 0xa184,
-        0x0007, 0x0079, 0x3949, 0x7a90, 0xa294, 0x0007, 0x789b, 0x0060,
-        0x79a8, 0x81ff, 0x0040, 0x3947, 0x789b, 0x0010, 0x7ba8, 0xa384,
-        0x0001, 0x00c0, 0x393a, 0x7ba8, 0x7ba8, 0xa386, 0x0001, 0x00c0,
-        0x392d, 0x2009, 0xfff7, 0x0078, 0x3933, 0xa386, 0x0003, 0x00c0,
-        0x393a, 0x2009, 0xffef, 0x0c7e, 0x7058, 0x2060, 0x6004, 0xa104,
-        0x6006, 0x0c7f, 0x789b, 0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb,
-        0x785a, 0x782b, 0x3009, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0078,
-        0x430d, 0x3090, 0x309a, 0x3953, 0x3959, 0x3951, 0x3951, 0x430d,
-        0x430d, 0x1078, 0x296b, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0078,
-        0x4313, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0078, 0x430d, 0x79e4,
-        0xa184, 0x0030, 0x0040, 0x3969, 0x78ec, 0xa084, 0x0003, 0x00c0,
-        0x399d, 0x7000, 0xa086, 0x0004, 0x00c0, 0x3983, 0x7064, 0xa086,
-        0x0002, 0x00c0, 0x3979, 0x2011, 0x0002, 0x2019, 0x0000, 0x0078,
-        0x2f1c, 0x7064, 0xa086, 0x0006, 0x0040, 0x3973, 0x7064, 0xa086,
-        0x0004, 0x0040, 0x3973, 0x7000, 0xa086, 0x0000, 0x0040, 0x29c1,
-        0x6920, 0xa184, 0x0420, 0x0040, 0x3992, 0xc1d4, 0x6922, 0x6818,
-        0x0078, 0x33fa, 0x6818, 0xa08e, 0x0002, 0x0040, 0x399b, 0xc0fd,
-        0x681a, 0x2001, 0x0014, 0x0078, 0x33fa, 0xa184, 0x0007, 0x0079,
-        0x39a1, 0x430d, 0x430d, 0x39a9, 0x430d, 0x4355, 0x4355, 0x430d,
-        0x430d, 0xd6bc, 0x0040, 0x39eb, 0x7184, 0x81ff, 0x0040, 0x39eb,
-        0xa182, 0x000d, 0x00d0, 0x39b8, 0x7087, 0x0000, 0x0078, 0x39bd,
-        0xa182, 0x000c, 0x7086, 0x2009, 0x000c, 0x789b, 0x0061, 0x79aa,
-        0x157e, 0x137e, 0x147e, 0x7088, 0x8114, 0xa210, 0x728a, 0xa080,
-        0x000b, 0xad00, 0x2098, 0xb284, 0x0300, 0x0040, 0x39df, 0x007e,
-        0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x39db, 0x20a1,
-        0x012b, 0x0078, 0x39e1, 0x20a1, 0x022b, 0x0078, 0x39e1, 0x20a1,
-        0x012b, 0x789b, 0x0000, 0x8108, 0x81ac, 0x53a6, 0x147f, 0x137f,
-        0x157f, 0x0078, 0x4313, 0xd6d4, 0x00c0, 0x3a3f, 0x6820, 0xd084,
-        0x0040, 0x4313, 0xa68c, 0x0060, 0xa684, 0x0060, 0x0040, 0x39fd,
-        0xa086, 0x0060, 0x00c0, 0x39fd, 0xc1f5, 0xc194, 0x795a, 0x69b6,
-        0x789b, 0x0060, 0x78ab, 0x0000, 0x789b, 0x0061, 0x6818, 0xc0fd,
-        0x681a, 0x78aa, 0x8008, 0x810c, 0x0040, 0x3e06, 0xa18c, 0x00f8,
-        0x00c0, 0x3e06, 0x157e, 0x137e, 0x147e, 0x017e, 0x3208, 0xa18c,
-        0x0300, 0x0040, 0x3a2b, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec,
-        0x007f, 0x0040, 0x3a27, 0x20a1, 0x012b, 0x0078, 0x3a2d, 0x20a1,
-        0x022b, 0x0078, 0x3a2d, 0x20a1, 0x012b, 0x017f, 0x789b, 0x0000,
-        0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f, 0x137f,
-        0x157f, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x0078, 0x4313, 0x6818,
-        0xd0fc, 0x0040, 0x3a45, 0x681b, 0x0008, 0x6820, 0xc0ad, 0x6822,
-        0x1078, 0x40d0, 0x781b, 0x00ea, 0x007c, 0x2300, 0x0079, 0x3a50,
-        0x3a55, 0x3b2d, 0x3a53, 0x1078, 0x296b, 0x7cd8, 0x7ddc, 0x7fd0,
-        0x82ff, 0x00c0, 0x3a7e, 0x7200, 0xa286, 0x0003, 0x0040, 0x33c7,
-        0x71d4, 0xd1bc, 0x00c0, 0x3a81, 0xd1b4, 0x0040, 0x3a81, 0x0d7e,
-        0x783b, 0x8800, 0x781b, 0x004c, 0x70bc, 0xa06d, 0x68b4, 0xc0a5,
-        0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0xc1b4,
-        0x71d6, 0x7003, 0x0030, 0x0d7f, 0x0078, 0x3a85, 0x7200, 0x0078,
-        0x3a85, 0x783b, 0x1800, 0x781b, 0x004a, 0xa284, 0x000f, 0x0079,
-        0x3a89, 0x3b18, 0x3ac7, 0x3a93, 0x33f6, 0x3a91, 0x3b18, 0x3a91,
-        0x3a91, 0x1078, 0x296b, 0x681c, 0xd0ec, 0x0040, 0x3a9a, 0x6008,
-        0xc08d, 0x600a, 0x6920, 0xc185, 0x6922, 0x6800, 0x6006, 0xa005,
-        0x00c0, 0x3aa3, 0x6002, 0x6008, 0xc0d4, 0x600a, 0x681c, 0xa084,
-        0x000e, 0x00c0, 0x3ab7, 0xb284, 0x0300, 0x0040, 0x3ab3, 0x2009,
-        0x94c0, 0x0078, 0x3abc, 0x2009, 0x95d0, 0x0078, 0x3abc, 0x7030,
-        0x68ba, 0x7140, 0x70cc, 0xa108, 0x2104, 0x6802, 0x2d0a, 0x715e,
-        0xd6dc, 0x00c0, 0x3ac7, 0xc6fc, 0x6eb6, 0x0078, 0x3b18, 0x6eb6,
-        0xa684, 0x0060, 0x00c0, 0x3ad1, 0xa684, 0x7fff, 0x68b6, 0x0078,
-        0x3b18, 0xd6dc, 0x00c0, 0x3adf, 0xa684, 0x7fff, 0x68b6, 0x6894,
-        0x68a6, 0x6898, 0x68aa, 0x1078, 0x4586, 0x0078, 0x3b18, 0xd6ac,
-        0x0040, 0x3aeb, 0xa006, 0x1078, 0x4586, 0x2408, 0x2510, 0x69aa,
-        0x6aa6, 0x0078, 0x3afb, 0x2408, 0x2510, 0x2700, 0x801b, 0x00c8,
-        0x3af2, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x69aa,
-        0x6aa6, 0x1078, 0x4586, 0xd6fc, 0x0040, 0x3b18, 0xa684, 0x7fff,
-        0x68b6, 0x2510, 0x2408, 0xd6ac, 0x00c0, 0x3b10, 0x2700, 0x801b,
-        0x00c8, 0x3b0b, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
+        0x00ff, 0xa205, 0x6822, 0x1078, 0x2073, 0x2021, 0x4f02, 0x241c,
+        0x8319, 0x2322, 0x6010, 0x8001, 0x6012, 0x00c0, 0x3064, 0x2021,
+        0x4f04, 0x2404, 0xc0a5, 0x2022, 0x6008, 0xa084, 0xf9ef, 0x600a,
+        0x1078, 0x2b22, 0x1078, 0x3e36, 0x007c, 0xa085, 0x0001, 0x0078,
+        0x306c, 0x2300, 0x0079, 0x3074, 0x3079, 0x3077, 0x30f9, 0x1078,
+        0x29b2, 0x78e4, 0xa005, 0x00d0, 0x30af, 0x3208, 0x007e, 0x2001,
+        0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x308a, 0xa18c, 0x0300,
+        0x0078, 0x308c, 0xa18c, 0x0400, 0x0040, 0x3092, 0x0018, 0x2a08,
+        0x0078, 0x3094, 0x0028, 0x2a08, 0x2008, 0xa084, 0x0030, 0x00c0,
+        0x309b, 0x0078, 0x37b9, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3099,
+        0x2100, 0xa084, 0x0007, 0x0079, 0x30a5, 0x30d9, 0x30e3, 0x30ce,
+        0x30ad, 0x43a5, 0x43a5, 0x30ad, 0x30ee, 0x1078, 0x29b2, 0x7000,
+        0xa086, 0x0004, 0x00c0, 0x30c9, 0x7064, 0xa086, 0x0002, 0x00c0,
+        0x30bf, 0x2011, 0x0002, 0x2019, 0x0000, 0x0078, 0x2f65, 0x7064,
+        0xa086, 0x0006, 0x0040, 0x30b9, 0x7064, 0xa086, 0x0004, 0x0040,
+        0x30b9, 0x79e4, 0x2001, 0x0003, 0x0078, 0x3443, 0x6818, 0xd0fc,
+        0x0040, 0x30d4, 0x681b, 0x001d, 0x1078, 0x4118, 0x781b, 0x0064,
+        0x007c, 0x6818, 0xd0fc, 0x0040, 0x30df, 0x681b, 0x001d, 0x1078,
+        0x4118, 0x0078, 0x4381, 0x6818, 0xd0fc, 0x0040, 0x30e9, 0x681b,
+        0x001d, 0x1078, 0x4118, 0x781b, 0x00f8, 0x007c, 0x6818, 0xd0fc,
+        0x0040, 0x30f4, 0x681b, 0x001d, 0x1078, 0x4118, 0x781b, 0x00c8,
+        0x007c, 0xa584, 0x000f, 0x00c0, 0x3118, 0x1078, 0x29a5, 0x7000,
+        0x0079, 0x3102, 0x2a0c, 0x310a, 0x310c, 0x3dc7, 0x3dc7, 0x3dc7,
+        0x310a, 0x310a, 0x1078, 0x29b2, 0x1078, 0x3e36, 0x6008, 0xa084,
+        0xfbef, 0x600a, 0x1078, 0x3db8, 0x0040, 0x3dc7, 0x0078, 0x2a0c,
+        0x78e4, 0xa005, 0x00d0, 0x30af, 0x3208, 0x007e, 0x2001, 0x4f04,
+        0x2004, 0xd0ec, 0x007f, 0x0040, 0x3129, 0xa18c, 0x0300, 0x0078,
+        0x312b, 0xa18c, 0x0400, 0x0040, 0x3131, 0x0018, 0x30af, 0x0078,
+        0x3133, 0x0028, 0x30af, 0x2008, 0xa084, 0x0030, 0x00c0, 0x313b,
+        0x781b, 0x005b, 0x007c, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3138,
+        0x2100, 0xa184, 0x0007, 0x0079, 0x3145, 0x3154, 0x3158, 0x314f,
+        0x314d, 0x43a5, 0x43a5, 0x314d, 0x439f, 0x1078, 0x29b2, 0x1078,
+        0x4120, 0x781b, 0x0064, 0x007c, 0x1078, 0x4120, 0x0078, 0x4381,
+        0x1078, 0x4120, 0x781b, 0x00f8, 0x007c, 0x1078, 0x4120, 0x781b,
+        0x00c8, 0x007c, 0x2300, 0x0079, 0x3165, 0x316a, 0x3168, 0x316c,
+        0x1078, 0x29b2, 0x0078, 0x39a8, 0x681b, 0x0016, 0x78a3, 0x0000,
+        0x79e4, 0xa184, 0x0030, 0x0040, 0x39a8, 0x78ec, 0xa084, 0x0003,
+        0x0040, 0x39a8, 0xa184, 0x0100, 0x0040, 0x3170, 0xa184, 0x0007,
+        0x0079, 0x3182, 0x318a, 0x3158, 0x30ce, 0x435d, 0x43a5, 0x43a5,
+        0x435d, 0x439f, 0x1078, 0x4369, 0x007c, 0xa282, 0x0005, 0x0050,
+        0x3193, 0x1078, 0x29b2, 0x2300, 0x0079, 0x3196, 0x3199, 0x33c9,
+        0x33d4, 0x2200, 0x0079, 0x319c, 0x31b6, 0x31a3, 0x31b6, 0x31a1,
+        0x33ac, 0x1078, 0x29b2, 0x789b, 0x0018, 0x78a8, 0xa084, 0x00ff,
+        0xa082, 0x0020, 0x0048, 0x4107, 0xa08a, 0x0004, 0x00c8, 0x4107,
+        0x0079, 0x31b2, 0x4107, 0x4107, 0x4107, 0x40b1, 0x789b, 0x0018,
+        0x79a8, 0xa184, 0x0080, 0x0040, 0x31c7, 0x0078, 0x4107, 0x7000,
+        0xa005, 0x00c0, 0x31bd, 0x2011, 0x0004, 0x0078, 0x3b93, 0xa184,
+        0x00ff, 0xa08a, 0x0010, 0x00c8, 0x4107, 0x0079, 0x31cf, 0x31e1,
+        0x31df, 0x31f6, 0x31fa, 0x32cd, 0x4107, 0x4107, 0x32cf, 0x4107,
+        0x4107, 0x33a8, 0x33a8, 0x4107, 0x4107, 0x4107, 0x33aa, 0x1078,
+        0x29b2, 0xd6e4, 0x0040, 0x31ec, 0x2001, 0x0300, 0x8000, 0x8000,
+        0x783a, 0x781b, 0x00c3, 0x007c, 0x6818, 0xd0fc, 0x0040, 0x31f4,
+        0x681b, 0x001d, 0x0078, 0x31e4, 0x0078, 0x435d, 0x681b, 0x001d,
+        0x0078, 0x4111, 0x6920, 0x6922, 0xa684, 0x1800, 0x00c0, 0x325f,
+        0x6820, 0xd084, 0x00c0, 0x3265, 0x6818, 0xa086, 0x0008, 0x00c0,
+        0x320b, 0x681b, 0x0000, 0xd6d4, 0x0040, 0x32ca, 0xd6bc, 0x0040,
+        0x324b, 0x7087, 0x0000, 0x6818, 0xa084, 0x003f, 0xa08a, 0x000d,
+        0x0050, 0x324b, 0xa08a, 0x000c, 0x7186, 0x2001, 0x000c, 0x800c,
+        0x718a, 0x789b, 0x0061, 0x78aa, 0x157e, 0x137e, 0x147e, 0x017e,
+        0x3208, 0xa18c, 0x0300, 0x0040, 0x323d, 0x007e, 0x2001, 0x4f04,
+        0x2004, 0xd0ec, 0x007f, 0x0040, 0x3239, 0x20a1, 0x012b, 0x0078,
+        0x323f, 0x20a1, 0x022b, 0x0078, 0x323f, 0x20a1, 0x012b, 0x017f,
+        0x789b, 0x0000, 0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6,
+        0x147f, 0x137f, 0x157f, 0x6038, 0xa005, 0x00c0, 0x325a, 0x681c,
+        0xa084, 0x000e, 0x0040, 0x4111, 0x1078, 0x4127, 0x782b, 0x3008,
+        0x0078, 0x325c, 0x8001, 0x603a, 0x781b, 0x0067, 0x007c, 0xd6e4,
+        0x0040, 0x3265, 0x781b, 0x0079, 0x007c, 0xa684, 0x0060, 0x0040,
+        0x32c7, 0xd6dc, 0x0040, 0x32c7, 0xd6fc, 0x00c0, 0x3271, 0x0078,
+        0x3288, 0xc6fc, 0x7e5a, 0x6eb6, 0x7adc, 0x79d8, 0x78d0, 0x801b,
+        0x00c8, 0x327b, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
         0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae,
-        0x7000, 0xa086, 0x0030, 0x00c0, 0x29c5, 0x7003, 0x0002, 0x70bc,
-        0xa06d, 0x68bc, 0x7042, 0x70b8, 0xa065, 0x68c0, 0x705a, 0x2d00,
-        0x704e, 0xad80, 0x0009, 0x7046, 0x007c, 0xa586, 0x8800, 0x00c0,
-        0x3b3a, 0x7003, 0x0000, 0x6018, 0x8001, 0x601a, 0x6008, 0xa084,
-        0xfbef, 0x600a, 0x0078, 0x40c1, 0x7047, 0x0000, 0xa282, 0x0006,
-        0x0050, 0x3b44, 0x1078, 0x296b, 0x2300, 0x0079, 0x3b47, 0x3b4a,
-        0x3b5c, 0x3b68, 0x2200, 0x0079, 0x3b4d, 0x3b53, 0x40c1, 0x3b55,
-        0x3b53, 0x3ba2, 0x3bf7, 0x1078, 0x296b, 0x7a80, 0xa294, 0x0f00,
-        0x1078, 0x3c81, 0x0078, 0x40b7, 0x1078, 0x3b79, 0x0079, 0x3b60,
-        0x40c1, 0x3b66, 0x3b66, 0x3ba2, 0x3b66, 0x40c1, 0x1078, 0x296b,
-        0x1078, 0x3b79, 0x0079, 0x3b6c, 0x3b74, 0x3b72, 0x3b72, 0x3b74,
-        0x3b72, 0x3b74, 0x1078, 0x296b, 0x1078, 0x40db, 0x781b, 0x0078,
-        0x007c, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3b8a, 0x1078, 0x3ded,
-        0x0078, 0x3b84, 0x1078, 0x4586, 0x6008, 0xa084, 0xfbef, 0x600a,
-        0x0078, 0x3b8f, 0x7000, 0xa086, 0x0003, 0x0040, 0x3b82, 0x7003,
-        0x0005, 0xb284, 0x0300, 0x0040, 0x3b99, 0x2001, 0x95e0, 0x0078,
-        0x3b9b, 0x2001, 0x9612, 0x2068, 0x704e, 0xad80, 0x0009, 0x7046,
-        0x2200, 0x007c, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3bb4, 0x70d4,
-        0xc0b5, 0x70d6, 0x2c00, 0x70ba, 0x2d00, 0x70be, 0x0078, 0x3bb9,
-        0x1078, 0x4586, 0x0078, 0x3bb9, 0x7000, 0xa086, 0x0003, 0x0040,
-        0x3bb0, 0x7003, 0x0001, 0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018,
-        0x7ca8, 0xa484, 0x001f, 0xa215, 0x2069, 0x94c0, 0xb284, 0x0300,
-        0x00c0, 0x3bcd, 0xc2fd, 0x2069, 0x95d0, 0x2d04, 0x2d08, 0x715e,
-        0xa06d, 0x0040, 0x3bda, 0x6814, 0xa206, 0x0040, 0x3bdc, 0x6800,
-        0x0078, 0x3bce, 0x1078, 0x3c81, 0x6eb4, 0x7e5a, 0x6920, 0xa184,
-        0x0c00, 0x0040, 0x3cab, 0x7064, 0xa086, 0x0006, 0x00c0, 0x3bee,
-        0x7074, 0xa206, 0x00c0, 0x3bee, 0x7066, 0x707e, 0x681b, 0x0005,
-        0xc1ad, 0xc1d4, 0x6922, 0x1078, 0x40d0, 0x0078, 0x3cab, 0x7200,
-        0xa286, 0x0002, 0x00c0, 0x3c09, 0x70d4, 0xc0b5, 0x70d6, 0x2c00,
-        0x70ba, 0x2d00, 0x70be, 0x0078, 0x3c0d, 0x1078, 0x4586, 0x0078,
-        0x3c0d, 0xa286, 0x0003, 0x0040, 0x3c05, 0x7003, 0x0001, 0x7a80,
-        0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215,
-        0xb284, 0x0300, 0x00c0, 0x3c1d, 0xc2fd, 0x79a8, 0x79a8, 0xa18c,
-        0x00ff, 0x2118, 0x70cc, 0xa168, 0x2d04, 0x2d08, 0x715e, 0xa06d,
-        0x0040, 0x3c31, 0x6814, 0xa206, 0x0040, 0x3c5a, 0x6800, 0x0078,
-        0x3c25, 0x7003, 0x0005, 0xb284, 0x0300, 0x0040, 0x3c3b, 0x2001,
-        0x95e0, 0x0078, 0x3c3d, 0x2001, 0x9612, 0x2068, 0x704e, 0x157e,
-        0x20a9, 0x0032, 0x2003, 0x0000, 0x8000, 0x00f0, 0x3c42, 0x157f,
-        0xb284, 0x0300, 0x0040, 0x3c4f, 0xc2fc, 0x0078, 0x3c50, 0xc2fd,
-        0x6a16, 0xad80, 0x0009, 0x7046, 0x68b7, 0x0700, 0x6823, 0x0800,
-        0x6827, 0x0003, 0x6eb4, 0x6920, 0xa184, 0x0c00, 0x0040, 0x3cab,
-        0xd0dc, 0x0040, 0x3c76, 0x7064, 0xa086, 0x0004, 0x00c0, 0x3c72,
-        0x7074, 0xa206, 0x00c0, 0x3c72, 0x7078, 0xa306, 0x00c0, 0x3c72,
-        0x7066, 0x707e, 0x1078, 0x40d7, 0x0078, 0x3cab, 0x681b, 0x0005,
-        0xc1ad, 0xc1d4, 0x6922, 0x1078, 0x40d0, 0x707f, 0x0000, 0x0078,
-        0x3cab, 0x7003, 0x0005, 0xb284, 0x0300, 0x0040, 0x3c8b, 0x2001,
-        0x95e0, 0x0078, 0x3c8d, 0x2001, 0x9612, 0x2068, 0x704e, 0x157e,
-        0x20a9, 0x0032, 0x2003, 0x0000, 0x8000, 0x00f0, 0x3c92, 0x157f,
-        0xb284, 0x0300, 0x0040, 0x3c9f, 0xc2fc, 0x0078, 0x3ca0, 0xc2fd,
-        0x6a16, 0xad80, 0x0009, 0x7046, 0x68b7, 0x0700, 0x6823, 0x0800,
-        0x6827, 0x0003, 0x007c, 0xc6ec, 0xa6ac, 0x0060, 0x0040, 0x3cfd,
-        0x6b98, 0x6c94, 0x69ac, 0x68b0, 0xa105, 0x00c0, 0x3cd8, 0x7bd2,
-        0x7bda, 0x7cd6, 0x7cde, 0xa586, 0x0060, 0x0040, 0x3d02, 0xd6f4,
-        0x00c0, 0x3cc3, 0xc6ed, 0xa6b4, 0xb7ff, 0x7e5a, 0x2009, 0x0079,
-        0xd69c, 0x0040, 0x3cd0, 0x2009, 0x0078, 0x2019, 0x0000, 0x2320,
-        0x791a, 0xd6ec, 0x0040, 0x3d0d, 0x1078, 0x48bd, 0x0078, 0x3d0d,
-        0x68b0, 0xa31a, 0x2100, 0xa423, 0x2400, 0xa305, 0x0040, 0x3d04,
-        0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0x68b0, 0xd6f4, 0x00c0, 0x3ce9,
-        0xc6ed, 0xc6f4, 0x7e5a, 0x2011, 0x0079, 0xd69c, 0x0040, 0x3cf5,
-        0x2011, 0x0078, 0x2019, 0x0000, 0x2320, 0x7a1a, 0xd6ec, 0x0040,
-        0x3d0d, 0x1078, 0x48f5, 0x0078, 0x3d0d, 0x2019, 0x0000, 0x2320,
-        0x0078, 0x3d04, 0xa6b4, 0xb7ff, 0x7e5a, 0x2009, 0x0079, 0xd69c,
-        0x0040, 0x3d0c, 0x2009, 0x0078, 0x791a, 0x68c0, 0x705a, 0x2d00,
-        0x704e, 0x68c4, 0x2060, 0x71d4, 0x2001, 0x4e01, 0x2004, 0xd0c4,
-        0x00c0, 0x3d62, 0x70d8, 0xa02d, 0x0040, 0x3d3b, 0xd1bc, 0x0040,
-        0x3d55, 0x7a80, 0xa294, 0x0f00, 0x70dc, 0xa206, 0x0040, 0x3d2c,
-        0x78e0, 0xa504, 0x00c0, 0x3d62, 0x70da, 0xc1bc, 0x71d6, 0x0078,
-        0x3d62, 0x2031, 0x0001, 0x852c, 0x0048, 0x3d3a, 0x8633, 0x8210,
-        0x0078, 0x3d33, 0x007c, 0x7de0, 0xa594, 0xff00, 0x0040, 0x3d48,
-        0x2011, 0x0008, 0x852f, 0x1078, 0x3d31, 0x8637, 0x0078, 0x3d4a,
-        0x1078, 0x3d31, 0x8217, 0x7880, 0xa084, 0x0f00, 0xa206, 0x0040,
-        0x3d62, 0x72de, 0x76da, 0x0078, 0x3d62, 0x7a80, 0xa294, 0x0f00,
-        0x70dc, 0xa236, 0x0040, 0x3d52, 0x78e0, 0xa534, 0x0040, 0x3d52,
-        0xc1bd, 0x71d6, 0xd1b4, 0x00c0, 0x29c1, 0x2300, 0xa405, 0x0040,
-        0x29c1, 0x70a4, 0xa086, 0x0001, 0x00c0, 0x2a0b, 0x007c, 0x6020,
-        0xa005, 0x0040, 0x3d7d, 0x8001, 0x6022, 0x6008, 0xa085, 0x0008,
-        0x600a, 0x700f, 0x0100, 0x702c, 0x6026, 0x007c, 0xa006, 0x1078,
-        0x4586, 0x7000, 0xa086, 0x0002, 0x0040, 0x3d8b, 0x7064, 0xa086,
-        0x0005, 0x00c0, 0x3d95, 0x682b, 0x0000, 0x6817, 0x0000, 0x681b,
-        0x0001, 0x6823, 0x0040, 0x681f, 0x0100, 0x7000, 0xa084, 0x000f,
-        0x0079, 0x3d9a, 0x29c5, 0x3daa, 0x3da4, 0x3dcc, 0x3db4, 0x29c5,
-        0x3da2, 0x3da2, 0x1078, 0x296b, 0x1078, 0x3dd7, 0x1078, 0x3dd0,
-        0x0078, 0x3db0, 0x1078, 0x3dd7, 0x705c, 0x2060, 0x6800, 0x6002,
-        0x1078, 0x202c, 0x0078, 0x29c5, 0x7064, 0x7067, 0x0000, 0x7083,
-        0x0000, 0x0079, 0x3dbb, 0x3dc8, 0x3dc8, 0x3dc3, 0x3dc3, 0x3dc3,
-        0x3dc8, 0x3dc3, 0x3dc8, 0x77d4, 0xc7dd, 0x77d6, 0x0079, 0x2f35,
-        0x7067, 0x0000, 0x0078, 0x29c5, 0x681b, 0x0000, 0x0078, 0x36c8,
-        0x6800, 0xa005, 0x00c0, 0x3dd5, 0x6002, 0x6006, 0x007c, 0x6410,
-        0x84ff, 0x0040, 0x3de9, 0x2009, 0x4e02, 0x2104, 0x8001, 0x200a,
-        0x8421, 0x6412, 0x00c0, 0x3de9, 0x2021, 0x4e04, 0x2404, 0xc0a5,
-        0x2022, 0x6008, 0xc0a4, 0x600a, 0x007c, 0x6018, 0xa005, 0x0040,
-        0x3df3, 0x8001, 0x601a, 0x007c, 0x1078, 0x4383, 0x681b, 0x0018,
-        0x0078, 0x3e34, 0x1078, 0x4383, 0x681b, 0x0019, 0x0078, 0x3e34,
-        0x1078, 0x4383, 0x681b, 0x001a, 0x0078, 0x3e34, 0x1078, 0x4383,
-        0x681b, 0x0003, 0x0078, 0x3e34, 0x7774, 0x1078, 0x41fe, 0x7178,
-        0xa18c, 0x00ff, 0x3210, 0xa294, 0x0300, 0x0040, 0x3e1b, 0xa1e8,
-        0x93c0, 0x0078, 0x3e1d, 0xa1e8, 0x94d0, 0x2d04, 0x2d08, 0x2068,
-        0xa005, 0x00c0, 0x3e26, 0x707e, 0x0078, 0x29c5, 0x6814, 0x7274,
-        0xa206, 0x0040, 0x3e2e, 0x6800, 0x0078, 0x3e1e, 0x6800, 0x200a,
-        0x681b, 0x0005, 0x707f, 0x0000, 0x1078, 0x3dd7, 0x6820, 0xd084,
-        0x00c0, 0x3e3c, 0x1078, 0x3dd0, 0x1078, 0x3ded, 0x681f, 0x0000,
-        0x6823, 0x0020, 0x1078, 0x202c, 0x0078, 0x29c5, 0xa282, 0x0003,
-        0x00c0, 0x40b7, 0x7da8, 0xa5ac, 0x00ff, 0x7e5a, 0x7ea8, 0xa6b4,
-        0x00ff, 0x6920, 0xc1bd, 0x6922, 0xd1c4, 0x0040, 0x3ea1, 0xc1c4,
-        0x6922, 0xa6b4, 0x00ff, 0x0040, 0x3e8e, 0xa682, 0x000c, 0x0048,
-        0x3e65, 0x0040, 0x3e65, 0x2031, 0x000c, 0x2500, 0xa086, 0x000a,
-        0x0040, 0x3e6c, 0x852b, 0x852b, 0x1078, 0x4190, 0x0040, 0x3e74,
-        0x1078, 0x3f6f, 0x0078, 0x3e97, 0x1078, 0x414b, 0x0c7e, 0x2960,
-        0x6004, 0xa084, 0xfff5, 0x6006, 0x1078, 0x3fa5, 0x0c7f, 0x6920,
-        0xc1c5, 0x6922, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x00c0, 0x3e8b,
-        0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x0c7e, 0x2960,
-        0x6004, 0xa084, 0xfff5, 0x6006, 0x1078, 0x3fa5, 0x0c7f, 0x7e58,
-        0xd6d4, 0x00c0, 0x3e9e, 0x781b, 0x0067, 0x007c, 0x781b, 0x0079,
-        0x007c, 0x0c7e, 0x7058, 0x2060, 0x6100, 0xd1e4, 0x0040, 0x3eea,
-        0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x000c, 0x0048, 0x3eb4,
-        0x0040, 0x3eb4, 0x2011, 0x000c, 0x2600, 0xa202, 0x00c8, 0x3eb9,
-        0x2230, 0x6208, 0xa294, 0x00ff, 0x2001, 0x4e05, 0x2004, 0xd0e4,
-        0x00c0, 0x3ece, 0x78ec, 0xd0e4, 0x0040, 0x3ece, 0xa282, 0x000a,
-        0x00c8, 0x3ed4, 0x2011, 0x000a, 0x0078, 0x3ed4, 0xa282, 0x000c,
-        0x00c8, 0x3ed4, 0x2011, 0x000c, 0x2200, 0xa502, 0x00c8, 0x3ed9,
-        0x2228, 0x1078, 0x414f, 0x2500, 0xa086, 0x000a, 0x0040, 0x3ee2,
-        0x852b, 0x852b, 0x1078, 0x4190, 0x0040, 0x3eea, 0x1078, 0x3f6f,
-        0x0078, 0x3eee, 0x1078, 0x414b, 0x1078, 0x3fa5, 0x7858, 0xc095,
-        0x785a, 0x0c7f, 0x781b, 0x0078, 0x007c, 0x0c7e, 0x2960, 0x6000,
-        0xd0e4, 0x00c0, 0x3f0b, 0xa084, 0x0040, 0x00c0, 0x3f05, 0x6104,
-        0xa18c, 0xfff5, 0x6106, 0x0c7f, 0x007c, 0x2011, 0x0032, 0x2019,
-        0x0000, 0x0078, 0x3f36, 0x68a0, 0xd0cc, 0x00c0, 0x3f05, 0x6208,
-        0xa294, 0x00ff, 0x2001, 0x4e05, 0x2004, 0xd0e4, 0x00c0, 0x3f24,
-        0x78ec, 0xd0e4, 0x0040, 0x3f24, 0xa282, 0x000b, 0x00c8, 0x3f24,
-        0x2011, 0x000a, 0x0078, 0x3f2a, 0xa282, 0x000c, 0x00c8, 0x3f2a,
-        0x2011, 0x000c, 0x6308, 0x831f, 0xa39c, 0x00ff, 0xa382, 0x000c,
-        0x0048, 0x3f36, 0x0040, 0x3f36, 0x2019, 0x000c, 0x78ab, 0x0001,
-        0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005,
-        0x6820, 0xc0c5, 0x6822, 0x70d4, 0xd0b4, 0x0040, 0x3f52, 0xc0b4,
-        0x70d6, 0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018,
-        0x8001, 0x601a, 0x0c7f, 0x007c, 0x0c7e, 0x2960, 0x6104, 0xa18c,
-        0xfff5, 0x6106, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078, 0x3f60,
-        0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa,
-        0xa8c0, 0x0005, 0x6820, 0xc0c5, 0x6822, 0x0c7f, 0x007c, 0x0c7e,
-        0x7158, 0x2160, 0x2018, 0xa08c, 0x0020, 0x0040, 0x3f78, 0xc0ac,
-        0x2008, 0xa084, 0xfff0, 0xa635, 0x7e86, 0x6018, 0x789a, 0x7eae,
-        0x6612, 0x78a4, 0xa084, 0xfff0, 0xa18c, 0x000f, 0xa105, 0xc0f4,
-        0xa39c, 0x0020, 0x0040, 0x3f8e, 0xa085, 0x4000, 0xc0fc, 0xd0b4,
-        0x00c0, 0x3f93, 0xc0fd, 0x78a6, 0x6016, 0x788a, 0xa6b4, 0x000f,
-        0x8637, 0x8204, 0x8004, 0xa084, 0x00ff, 0xa605, 0x600e, 0x6004,
-        0xa084, 0xfff5, 0x6006, 0x0c7f, 0x007c, 0x0c7e, 0x7058, 0x2060,
-        0x6018, 0x789a, 0x78a4, 0xa084, 0xfff0, 0x78a6, 0x6012, 0x7884,
-        0xa084, 0xfff0, 0x7886, 0x600c, 0xa084, 0x00ff, 0x600e, 0x0c7f,
-        0x007c, 0xa282, 0x0002, 0x00c0, 0x40b7, 0x7aa8, 0x6920, 0xc1bd,
-        0x6922, 0xd1cc, 0x0040, 0x3ff4, 0xc1cc, 0x6922, 0xa294, 0x00ff,
-        0xa282, 0x0002, 0x00c8, 0x40b7, 0x1078, 0x4044, 0x1078, 0x3fa5,
-        0xa980, 0x0001, 0x200c, 0x1078, 0x41fa, 0x1078, 0x3ef5, 0x88ff,
-        0x0040, 0x3fea, 0x789b, 0x0060, 0x2800, 0x78aa, 0x7e58, 0xc695,
-        0x7e5a, 0xd6d4, 0x00c0, 0x3fe7, 0x781b, 0x0064, 0x007c, 0x781b,
-        0x0078, 0x007c, 0x7e58, 0xd6d4, 0x00c0, 0x3ff1, 0x781b, 0x0067,
-        0x007c, 0x781b, 0x0079, 0x007c, 0xa282, 0x0002, 0x00c8, 0x3ffc,
-        0xa284, 0x0001, 0x0040, 0x4005, 0x7158, 0xa188, 0x0000, 0x210c,
-        0xd1ec, 0x00c0, 0x4005, 0x2011, 0x0000, 0x1078, 0x412c, 0x1078,
-        0x4044, 0x1078, 0x3fa5, 0x7858, 0xc095, 0x785a, 0x781b, 0x0078,
-        0x007c, 0x0c7e, 0x027e, 0x2960, 0x6000, 0x2011, 0x0001, 0xd0ec,
-        0x00c0, 0x4025, 0xa084, 0x0080, 0x00c0, 0x4023, 0xc1a4, 0x6106,
-        0xa006, 0x0078, 0x4041, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab,
+        0xd6f4, 0x0040, 0x328e, 0xc6f4, 0x7e5a, 0x6eb6, 0x7000, 0xa086,
+        0x0003, 0x00c0, 0x329c, 0x007e, 0x1078, 0x45d6, 0x1078, 0x493f,
+        0x007f, 0x781b, 0x0076, 0x007c, 0xa006, 0x1078, 0x4a44, 0x6ab0,
+        0x69ac, 0x6c98, 0x6b94, 0x2200, 0xa105, 0x0040, 0x32ab, 0x2200,
+        0xa422, 0x2100, 0xa31b, 0x6caa, 0x7cd2, 0x7cda, 0x6ba6, 0x7bd6,
+        0x7bde, 0x2300, 0xa405, 0x00c0, 0x32bb, 0xc6f5, 0x7e5a, 0x6eb6,
+        0x781b, 0x0076, 0x007c, 0x781b, 0x0076, 0x2200, 0xa115, 0x00c0,
+        0x32c4, 0x1078, 0x493f, 0x007c, 0x1078, 0x4977, 0x007c, 0x781b,
+        0x0079, 0x007c, 0x781b, 0x0067, 0x007c, 0x1078, 0x29b2, 0x0078,
+        0x331b, 0x6920, 0xd1c4, 0x0040, 0x32e4, 0xc1c4, 0x6922, 0x0c7e,
+        0x7058, 0x2060, 0x6000, 0xc0e4, 0x6002, 0x6004, 0xa084, 0xfff5,
+        0x6006, 0x0c7f, 0x0078, 0x330f, 0xd1cc, 0x0040, 0x330f, 0xc1cc,
+        0x6922, 0x0c7e, 0x7058, 0x2060, 0x6000, 0xc0ec, 0x6002, 0x6004,
+        0xc0a4, 0x6006, 0x2008, 0x2c48, 0x0c7f, 0xd19c, 0x0040, 0x330f,
+        0x1078, 0x424a, 0x1078, 0x3f3e, 0x88ff, 0x0040, 0x330f, 0x789b,
+        0x0060, 0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x00c0,
+        0x330c, 0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x7e58,
+        0xd6d4, 0x00c0, 0x3316, 0x781b, 0x0067, 0x007c, 0x781b, 0x0079,
+        0x007c, 0x0078, 0x410c, 0x2019, 0x0000, 0x7990, 0xa18c, 0x0007,
+        0x00c0, 0x3329, 0x6820, 0xa084, 0x0100, 0x0040, 0x3319, 0x2009,
+        0x0008, 0x789b, 0x0010, 0x78a8, 0xa094, 0x00ff, 0xa286, 0x0001,
+        0x00c0, 0x3345, 0x2300, 0x7ca8, 0xa400, 0x2018, 0xa102, 0x0040,
+        0x333d, 0x0048, 0x333d, 0x0078, 0x333f, 0x0078, 0x32d1, 0x24a8,
+        0x7aa8, 0x00f0, 0x333f, 0x0078, 0x332b, 0xa284, 0x00f0, 0xa086,
+        0x0020, 0x00c0, 0x3399, 0x8318, 0x8318, 0x2300, 0xa102, 0x0040,
+        0x3355, 0x0048, 0x3355, 0x0078, 0x3396, 0xa286, 0x0023, 0x0040,
+        0x3319, 0x681c, 0xa084, 0xfff1, 0x681e, 0x7e58, 0xa684, 0xfff1,
+        0xc0a5, 0x2030, 0x7e5a, 0x6008, 0xc0a5, 0x600a, 0x0c7e, 0x7058,
+        0x2060, 0x6004, 0x2008, 0x2c48, 0x0c7f, 0xd1a4, 0x0040, 0x3376,
+        0x1078, 0x424a, 0x1078, 0x405e, 0x0078, 0x3384, 0x0c7e, 0x7058,
+        0x2060, 0x6004, 0x2008, 0x2c48, 0x0c7f, 0xd19c, 0x0040, 0x330f,
+        0x1078, 0x424a, 0x1078, 0x3f3e, 0x88ff, 0x0040, 0x330f, 0x789b,
+        0x0060, 0x2800, 0x78aa, 0xc695, 0x7e5a, 0xd6d4, 0x00c0, 0x3393,
+        0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x7aa8, 0x0078,
+        0x332b, 0x8318, 0x2300, 0xa102, 0x0040, 0x33a2, 0x0048, 0x33a2,
+        0x0078, 0x332b, 0xa284, 0x0080, 0x00c0, 0x4111, 0x0078, 0x410c,
+        0x0078, 0x4111, 0x0078, 0x4107, 0x7058, 0xa04d, 0x789b, 0x0018,
+        0x78a8, 0xa084, 0x00ff, 0xa08e, 0x0001, 0x0040, 0x33b9, 0x1078,
+        0x29b2, 0x7aa8, 0xa294, 0x00ff, 0x78a8, 0xa084, 0x00ff, 0xa08a,
+        0x0004, 0x00c8, 0x4107, 0x0079, 0x33c5, 0x4107, 0x3e8f, 0x4107,
+        0x4006, 0xa282, 0x0000, 0x00c0, 0x33cf, 0x1078, 0x29b2, 0x1078,
+        0x4118, 0x781b, 0x0078, 0x007c, 0xa282, 0x0003, 0x00c0, 0x33da,
+        0x1078, 0x29b2, 0xd4fc, 0x00c0, 0x33fa, 0x7064, 0xa005, 0x0040,
+        0x33e3, 0x1078, 0x29b2, 0x6f14, 0x7776, 0xa7bc, 0x8f00, 0x1078,
+        0x424e, 0x6008, 0xa085, 0x0021, 0x600a, 0x8738, 0xa784, 0x001f,
+        0x00c0, 0x33e7, 0x1078, 0x411c, 0x7067, 0x0002, 0x701f, 0x0009,
+        0x0078, 0x33fc, 0x1078, 0x412b, 0x781b, 0x0078, 0x007c, 0xa282,
+        0x0004, 0x0050, 0x3405, 0x1078, 0x29b2, 0x2300, 0x0079, 0x3408,
+        0x340b, 0x35cb, 0x360e, 0xa286, 0x0003, 0x0040, 0x3443, 0x7200,
+        0x7cd8, 0x7ddc, 0x7fd0, 0x71d4, 0xd1bc, 0x00c0, 0x343b, 0xd1b4,
+        0x0040, 0x343b, 0x7868, 0xa084, 0x00ff, 0x00c0, 0x343b, 0xa282,
+        0x0002, 0x00c8, 0x343b, 0x0d7e, 0x783b, 0x8300, 0x781b, 0x004c,
+        0x70bc, 0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898,
+        0x78d2, 0x78da, 0xc1b4, 0x71d6, 0x7003, 0x0030, 0x0d7f, 0x2001,
+        0x0000, 0x0078, 0x3447, 0x783b, 0x1300, 0x781b, 0x004a, 0x2001,
+        0x0000, 0x0078, 0x3447, 0x7200, 0x7cd8, 0x7ddc, 0x7fd0, 0x704a,
+        0x68a0, 0xd0ec, 0x0040, 0x344f, 0x6008, 0xc08d, 0x600a, 0xa284,
+        0x000f, 0x0079, 0x3453, 0x35ab, 0x3460, 0x345d, 0x3711, 0x379d,
+        0x2a0c, 0x345b, 0x345b, 0x1078, 0x29b2, 0x6008, 0xc0d4, 0x600a,
+        0xd6e4, 0x0040, 0x3468, 0x7048, 0xa086, 0x0014, 0x00c0, 0x3488,
+        0x1078, 0x45d6, 0x2009, 0x0000, 0x6818, 0xd0fc, 0x0040, 0x3471,
+        0x7048, 0xa086, 0x0014, 0x0040, 0x3482, 0x6818, 0xa086, 0x0008,
+        0x00c0, 0x3563, 0x7858, 0xd09c, 0x0040, 0x3563, 0x6820, 0xd0ac,
+        0x0040, 0x3563, 0x681b, 0x0014, 0x2009, 0x0002, 0x0078, 0x34c7,
+        0x7868, 0xa08c, 0x00ff, 0x0040, 0x34c7, 0xa186, 0x0008, 0x00c0,
+        0x349e, 0x6008, 0xc0a4, 0x600a, 0x1078, 0x3db8, 0x0040, 0x34c7,
+        0x1078, 0x3e36, 0x1078, 0x45d6, 0x0078, 0x34af, 0xa186, 0x0028,
+        0x00c0, 0x34c7, 0x6018, 0xa005, 0x0040, 0x3491, 0x8001, 0x0040,
+        0x3491, 0x8001, 0x0040, 0x3491, 0x601e, 0x0078, 0x3491, 0x6820,
+        0xd084, 0x0040, 0x2a0c, 0xc084, 0x6822, 0x1078, 0x2b13, 0x705c,
+        0x0c7e, 0x2060, 0x6800, 0x6002, 0x0c7f, 0x6004, 0x6802, 0xa005,
+        0x2d00, 0x00c0, 0x34c4, 0x6002, 0x6006, 0x0078, 0x2a0c, 0x017e,
+        0x81ff, 0x00c0, 0x3511, 0x7000, 0xa086, 0x0030, 0x0040, 0x3511,
+        0x71d4, 0xd1bc, 0x00c0, 0x3511, 0xd1b4, 0x00c0, 0x34f8, 0x7060,
+        0xa005, 0x00c0, 0x3511, 0x70a4, 0xa086, 0x0001, 0x0040, 0x3511,
+        0x7003, 0x0000, 0x047e, 0x057e, 0x077e, 0x067e, 0x0c7e, 0x0d7e,
+        0x1078, 0x2a35, 0x0d7f, 0x0c7f, 0x067f, 0x077f, 0x057f, 0x047f,
+        0x71d4, 0xd1b4, 0x00c0, 0x3511, 0x7003, 0x0040, 0x0078, 0x3511,
+        0x1078, 0x43b0, 0x00c0, 0x3511, 0x781b, 0x005b, 0x0d7e, 0x70bc,
+        0xa06d, 0x68b4, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2,
+        0x78da, 0xc1b4, 0x71d6, 0x7003, 0x0030, 0x7808, 0xc08d, 0x780a,
+        0x0d7f, 0x1078, 0x3648, 0x017f, 0x81ff, 0x0040, 0x3563, 0xa684,
+        0xdf00, 0x681e, 0x682b, 0x0000, 0x6f14, 0xa186, 0x0002, 0x00c0,
+        0x3564, 0x6818, 0xa086, 0x0014, 0x00c0, 0x352d, 0x2008, 0xd6e4,
+        0x0040, 0x352d, 0x7868, 0xa08c, 0x00ff, 0x1078, 0x2b01, 0x1078,
+        0x2b22, 0x6820, 0xd0dc, 0x00c0, 0x3564, 0x8717, 0xa294, 0x000f,
+        0x8213, 0x8213, 0x8213, 0xb284, 0x0300, 0x0040, 0x3543, 0xa290,
+        0x53c0, 0x0078, 0x3545, 0xa290, 0x5440, 0xa290, 0x0000, 0x221c,
+        0xd3c4, 0x00c0, 0x354d, 0x0078, 0x3553, 0x8210, 0x2204, 0xa085,
+        0x0018, 0x2012, 0x8211, 0xd3d4, 0x0040, 0x355e, 0x68a0, 0xd0c4,
+        0x00c0, 0x355e, 0x1078, 0x36c2, 0x0078, 0x2a0c, 0x6008, 0xc08d,
+        0x600a, 0x0078, 0x3564, 0x692a, 0x6916, 0x6818, 0xd0fc, 0x0040,
+        0x356b, 0x7048, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x6410, 0x84ff,
+        0x0040, 0x3580, 0x2009, 0x4f02, 0x2104, 0x8001, 0x200a, 0x8421,
+        0x6412, 0x00c0, 0x3580, 0x2021, 0x4f04, 0x2404, 0xc0a5, 0x2022,
+        0x6018, 0xa005, 0x0040, 0x3588, 0x8001, 0x601a, 0x00c0, 0x358b,
+        0x6008, 0xc0a4, 0x600a, 0x6820, 0xd084, 0x00c0, 0x3597, 0x6800,
+        0xa005, 0x00c0, 0x3594, 0x6002, 0x6006, 0x0078, 0x359b, 0x705c,
+        0x2060, 0x6800, 0x6002, 0x2061, 0x4f00, 0x6887, 0x0103, 0x2d08,
+        0x206b, 0x0000, 0x6068, 0xa005, 0x616a, 0x0040, 0x35aa, 0x2d02,
+        0x0078, 0x35ab, 0x616e, 0x7200, 0xa286, 0x0030, 0x0040, 0x35bb,
+        0xa286, 0x0040, 0x00c0, 0x2a0c, 0x7003, 0x0002, 0x704c, 0x2068,
+        0x68c4, 0x2060, 0x007c, 0x7003, 0x0002, 0x70bc, 0xa06d, 0x68bc,
+        0x7042, 0x70b8, 0xa065, 0x68c0, 0x705a, 0x2d00, 0x704e, 0xad80,
+        0x0009, 0x7046, 0x007c, 0xa282, 0x0004, 0x0048, 0x35d1, 0x1078,
+        0x29b2, 0x2200, 0x0079, 0x35d4, 0x35d8, 0x35e9, 0x35f6, 0x35e9,
+        0xa586, 0x1300, 0x0040, 0x35e9, 0xa586, 0x8300, 0x00c0, 0x35cf,
+        0x7003, 0x0000, 0x6018, 0x8001, 0x601a, 0x6008, 0xa084, 0xfbef,
+        0x600a, 0x7000, 0xa086, 0x0005, 0x0040, 0x35f3, 0x1078, 0x4118,
+        0x781b, 0x0078, 0x007c, 0x781b, 0x0079, 0x007c, 0x7890, 0x8007,
+        0x8001, 0xa084, 0x0007, 0xa080, 0x0018, 0x789a, 0x79a8, 0xa18c,
+        0x00ff, 0xa186, 0x0003, 0x0040, 0x360b, 0xa186, 0x0000, 0x0040,
+        0x360b, 0x0078, 0x4107, 0x781b, 0x0079, 0x007c, 0x6820, 0xc095,
+        0x6822, 0x82ff, 0x00c0, 0x3618, 0x1078, 0x4118, 0x0078, 0x361f,
+        0x8211, 0x0040, 0x361d, 0x1078, 0x29b2, 0x1078, 0x412b, 0x781b,
+        0x0078, 0x007c, 0x1078, 0x43d3, 0x7830, 0xa084, 0x00c0, 0x00c0,
+        0x3645, 0x017e, 0x3208, 0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec,
+        0x007f, 0x0040, 0x3637, 0xa18c, 0x0300, 0x0078, 0x3639, 0xa18c,
+        0x0400, 0x017f, 0x0040, 0x3640, 0x0018, 0x3645, 0x0078, 0x3642,
+        0x0028, 0x3645, 0x791a, 0xa006, 0x007c, 0xa085, 0x0001, 0x007c,
+        0xa684, 0x0060, 0x00c0, 0x3652, 0x682f, 0x0000, 0x6833, 0x0000,
+        0x0078, 0x36c1, 0xd6dc, 0x00c0, 0x366a, 0x68b4, 0xd0dc, 0x00c0,
+        0x366a, 0x6998, 0x6a94, 0x692e, 0x6a32, 0x7048, 0xa005, 0x00c0,
+        0x3667, 0x2200, 0xa105, 0x0040, 0x45d6, 0x704b, 0x0015, 0x0078,
+        0x45d6, 0x007c, 0xd6ac, 0x0040, 0x3690, 0xd6f4, 0x0040, 0x3676,
+        0x682f, 0x0000, 0x6833, 0x0000, 0x0078, 0x45d6, 0x68b4, 0xa084,
+        0x4000, 0xa635, 0xd6f4, 0x00c0, 0x3670, 0x7048, 0xa005, 0x00c0,
+        0x3683, 0x704b, 0x0015, 0xd6dc, 0x00c0, 0x368c, 0x68b4, 0xd0dc,
+        0x0040, 0x368c, 0x6ca8, 0x6da4, 0x6c2e, 0x6d32, 0x0078, 0x45d6,
+        0xd6f4, 0x0040, 0x3699, 0x682f, 0x0000, 0x6833, 0x0000, 0x0078,
+        0x45d6, 0x68b4, 0xa084, 0x4800, 0xa635, 0xd6f4, 0x00c0, 0x3693,
+        0x7048, 0xa005, 0x00c0, 0x36a6, 0x704b, 0x0015, 0x2408, 0x2510,
+        0x2700, 0x80fb, 0x00c8, 0x36ad, 0x8000, 0xa084, 0x003f, 0xa108,
+        0xa291, 0x0000, 0x692e, 0x6a32, 0x2100, 0xa205, 0x00c0, 0x36ba,
+        0x0078, 0x45d6, 0x7000, 0xa086, 0x0006, 0x0040, 0x36c1, 0x0078,
+        0x45d6, 0x007c, 0x6946, 0x6008, 0xc0cd, 0xd3cc, 0x0040, 0x36c9,
+        0xc08d, 0x600a, 0x6818, 0x683a, 0x681b, 0x0006, 0x688f, 0x0000,
+        0x6893, 0x0000, 0x6a30, 0x692c, 0x6a3e, 0x6942, 0x682f, 0x0003,
+        0x6833, 0x0000, 0x6837, 0x0020, 0x6897, 0x0000, 0x689b, 0x0020,
+        0x7000, 0x0079, 0x36e3, 0x2a0c, 0x36f5, 0x36ed, 0x36eb, 0x36eb,
+        0x36eb, 0x36eb, 0x36eb, 0x1078, 0x29b2, 0x6820, 0xd084, 0x00c0,
+        0x36f5, 0x1078, 0x3e19, 0x0078, 0x36fb, 0x705c, 0x2c50, 0x2060,
+        0x6800, 0x6002, 0x2a60, 0x3208, 0xa18c, 0x0300, 0x0040, 0x3704,
+        0x2021, 0x4f58, 0x0078, 0x3706, 0x2021, 0x4f98, 0x2404, 0xa005,
+        0x0040, 0x370d, 0x2020, 0x0078, 0x3706, 0x2d22, 0x206b, 0x0000,
+        0x007c, 0x1078, 0x3e20, 0x1078, 0x3e36, 0x6008, 0xc0cc, 0x600a,
+        0x682b, 0x0000, 0x789b, 0x000e, 0x6f14, 0x6938, 0x691a, 0x6944,
+        0x6916, 0x3208, 0xa18c, 0x0300, 0x0040, 0x372a, 0x2009, 0x0000,
+        0x0078, 0x372c, 0x2009, 0x0001, 0x1078, 0x4a81, 0xd6dc, 0x0040,
+        0x3734, 0x691c, 0xc1ed, 0x691e, 0x6818, 0xd0fc, 0x0040, 0x3743,
+        0x7868, 0xa08c, 0x00ff, 0x0040, 0x3741, 0x681b, 0x001e, 0x0078,
+        0x3743, 0x681b, 0x0000, 0xb284, 0x0300, 0x00c0, 0x374b, 0x2021,
+        0x4f98, 0x0078, 0x374d, 0x2021, 0x4f58, 0x6800, 0x2022, 0x6a3c,
+        0x6940, 0x6a32, 0x692e, 0x68c0, 0x2060, 0x6000, 0xd0a4, 0x0040,
+        0x378d, 0x2041, 0x0021, 0x2049, 0x0005, 0x2051, 0x0020, 0x0d7e,
+        0x0f7e, 0x157e, 0x147e, 0x2079, 0x4f00, 0x1078, 0x1e46, 0x147f,
+        0x157f, 0x0f7f, 0x70cc, 0x2010, 0x2009, 0x0101, 0x027e, 0x2204,
+        0xa06d, 0x0040, 0x377d, 0x6814, 0xa706, 0x0040, 0x377a, 0x6800,
+        0x0078, 0x3770, 0x6820, 0xc0d5, 0x6822, 0x027f, 0x8210, 0x8109,
+        0x00c0, 0x376e, 0x0d7f, 0x7067, 0x0003, 0x707f, 0x0000, 0x7776,
+        0x7083, 0x000f, 0x71d4, 0xc1dc, 0x71d6, 0x6818, 0xa086, 0x0002,
+        0x00c0, 0x3799, 0x6817, 0x0000, 0x682b, 0x0000, 0x681c, 0xc0ec,
+        0x681e, 0x1078, 0x2073, 0x0078, 0x2a0c, 0x7cd8, 0x7ddc, 0x7fd0,
+        0x1078, 0x3648, 0x682b, 0x0000, 0x789b, 0x000e, 0x6f14, 0x1078,
+        0x43d7, 0xa08c, 0x00ff, 0x6916, 0x6818, 0xd0fc, 0x0040, 0x37b2,
+        0x7048, 0x681a, 0xa68c, 0xdf00, 0x691e, 0x7067, 0x0000, 0x0078,
+        0x2a0c, 0x7000, 0xa005, 0x00c0, 0x37bf, 0x0078, 0x2a0c, 0xa006,
+        0x1078, 0x45d6, 0x6920, 0xd1ac, 0x00c0, 0x37c8, 0x681b, 0x0014,
+        0xa68c, 0xdf00, 0x691e, 0x682b, 0x0000, 0x6820, 0xa084, 0x00ff,
+        0x6822, 0x7000, 0x0079, 0x37d4, 0x2a0c, 0x37de, 0x37de, 0x37e1,
+        0x37e1, 0x37e1, 0x37dc, 0x37dc, 0x1078, 0x29b2, 0x6818, 0x0078,
+        0x3443, 0x6008, 0xc0a4, 0x600a, 0x6817, 0x0000, 0x0078, 0x3dde,
+        0x2300, 0x0079, 0x37eb, 0x37ee, 0x37f0, 0x3860, 0x1078, 0x29b2,
+        0xd6fc, 0x00c0, 0x3847, 0x7000, 0xa00d, 0x0079, 0x37f7, 0x2a0c,
+        0x3801, 0x3801, 0x3831, 0x3801, 0x3844, 0x37ff, 0x37ff, 0x1078,
+        0x29b2, 0xa684, 0x0060, 0x0040, 0x3831, 0xa086, 0x0060, 0x00c0,
+        0x382e, 0xc6ac, 0xc6f4, 0xc6ed, 0x7e5a, 0x6eb6, 0x681c, 0xc0ac,
+        0x681e, 0xa186, 0x0002, 0x0040, 0x3820, 0x1078, 0x45d6, 0x69ac,
+        0x68b0, 0xa115, 0x0040, 0x3820, 0x1078, 0x4977, 0x0078, 0x3822,
+        0x1078, 0x493f, 0x781b, 0x0079, 0x71d4, 0xd1b4, 0x00c0, 0x2a08,
+        0x70a4, 0xa086, 0x0001, 0x00c0, 0x2a52, 0x007c, 0xd6ec, 0x0040,
+        0x380b, 0x6818, 0xd0fc, 0x0040, 0x3844, 0xd6f4, 0x00c0, 0x383e,
+        0x681b, 0x0015, 0x781b, 0x0079, 0x0078, 0x2a08, 0x681b, 0x0007,
+        0x682f, 0x0000, 0x6833, 0x0000, 0x1078, 0x4369, 0x007c, 0xc6fc,
+        0x7e5a, 0x7adc, 0x79d8, 0x78d0, 0x801b, 0x00c8, 0x3850, 0x8000,
+        0xa084, 0x003f, 0xa108, 0xa291, 0x0000, 0x6b98, 0x2100, 0xa302,
+        0x68b2, 0x6b94, 0x2200, 0xa303, 0x68ae, 0x781b, 0x0079, 0x007c,
+        0x1078, 0x29b2, 0x2300, 0x0079, 0x3865, 0x386a, 0x388f, 0x38ef,
+        0x1078, 0x29b2, 0x7000, 0x0079, 0x386d, 0x3875, 0x3877, 0x3880,
+        0x3875, 0x3875, 0x3875, 0x3875, 0x3875, 0x1078, 0x29b2, 0x69ac,
+        0x68b0, 0xa115, 0x0040, 0x3880, 0x1078, 0x4977, 0x0078, 0x3882,
+        0x1078, 0x493f, 0x681c, 0xc0b4, 0x681e, 0x70d4, 0xd0b4, 0x00c0,
+        0x2a08, 0x70a4, 0xa086, 0x0001, 0x00c0, 0x2a52, 0x007c, 0xd6fc,
+        0x00c0, 0x38df, 0x7000, 0xa00d, 0x0079, 0x3896, 0x2a0c, 0x38a6,
+        0x38a0, 0x38d6, 0x38a6, 0x38dc, 0x389e, 0x389e, 0x1078, 0x29b2,
+        0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da, 0xa684, 0x0060,
+        0x0040, 0x38d6, 0xa086, 0x0060, 0x00c0, 0x38d3, 0xa6b4, 0xbfbf,
+        0xc6ed, 0x7e5a, 0x6eb6, 0xa186, 0x0002, 0x0040, 0x38c2, 0x1078,
+        0x45d6, 0x69ac, 0x68b0, 0xa115, 0x0040, 0x38c2, 0x1078, 0x4977,
+        0x0078, 0x38c4, 0x1078, 0x493f, 0x781b, 0x0079, 0x681c, 0xc0b4,
+        0x681e, 0x71d4, 0xd1b4, 0x00c0, 0x2a08, 0x70a4, 0xa086, 0x0001,
+        0x00c0, 0x2a52, 0x007c, 0xd6ec, 0x0040, 0x38b0, 0x6818, 0xd0fc,
+        0x0040, 0x38dc, 0x681b, 0x0007, 0x781b, 0x00f9, 0x007c, 0xc6fc,
+        0x7e5a, 0x7adc, 0x79d8, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94,
+        0x2200, 0xa303, 0x68ae, 0x79d2, 0x781b, 0x0079, 0x007c, 0xd6dc,
+        0x0040, 0x38f8, 0x782b, 0x3009, 0x781b, 0x0079, 0x0078, 0x2a08,
+        0x7884, 0xc0ac, 0x7886, 0x78e4, 0xa084, 0x0008, 0x00c0, 0x390b,
+        0xa484, 0x0200, 0x0040, 0x3905, 0xc6f5, 0xc6dd, 0x7e5a, 0x781b,
+        0x0079, 0x0078, 0x2a08, 0x6820, 0xc095, 0x6822, 0x1078, 0x42e2,
+        0xc6dd, 0x1078, 0x4118, 0x781b, 0x0078, 0x0078, 0x2a08, 0x2300,
+        0x0079, 0x391a, 0x391d, 0x391f, 0x3921, 0x1078, 0x29b2, 0x0078,
+        0x4111, 0xd6d4, 0x00c0, 0x395c, 0x79e4, 0xd1ac, 0x0040, 0x392f,
+        0x78ec, 0xa084, 0x0003, 0x0040, 0x392f, 0x782b, 0x3009, 0x789b,
+        0x0060, 0x78ab, 0x0000, 0xa684, 0xfffb, 0x785a, 0x79e4, 0xd1ac,
+        0x0040, 0x393f, 0x78ec, 0xa084, 0x0003, 0x00c0, 0x3958, 0x2001,
+        0x4f04, 0x2004, 0xd0e4, 0x00c0, 0x3954, 0x6820, 0xd0c4, 0x0040,
+        0x3954, 0x0c7e, 0x7058, 0x2060, 0x6004, 0xc09d, 0x6006, 0x6008,
+        0xa084, 0x00ff, 0x600a, 0x0c7f, 0x2001, 0x0014, 0x0078, 0x3443,
+        0xa184, 0x0007, 0x0079, 0x3992, 0x7a90, 0xa294, 0x0007, 0x789b,
+        0x0060, 0x79a8, 0x81ff, 0x0040, 0x3990, 0x789b, 0x0010, 0x7ba8,
+        0xa384, 0x0001, 0x00c0, 0x3983, 0x7ba8, 0x7ba8, 0xa386, 0x0001,
+        0x00c0, 0x3976, 0x2009, 0xfff7, 0x0078, 0x397c, 0xa386, 0x0003,
+        0x00c0, 0x3983, 0x2009, 0xffef, 0x0c7e, 0x7058, 0x2060, 0x6004,
+        0xa104, 0x6006, 0x0c7f, 0x789b, 0x0060, 0x78ab, 0x0000, 0xa684,
+        0xfffb, 0x785a, 0x782b, 0x3009, 0x6920, 0xa18c, 0xfcff, 0x6922,
+        0x0078, 0x435d, 0x30d9, 0x30e3, 0x399c, 0x39a2, 0x399a, 0x399a,
+        0x435d, 0x435d, 0x1078, 0x29b2, 0x6920, 0xa18c, 0xfcff, 0x6922,
+        0x0078, 0x4363, 0x6920, 0xa18c, 0xfcff, 0x6922, 0x0078, 0x435d,
+        0x79e4, 0xa184, 0x0030, 0x0040, 0x39b2, 0x78ec, 0xa084, 0x0003,
+        0x00c0, 0x39e6, 0x7000, 0xa086, 0x0004, 0x00c0, 0x39cc, 0x7064,
+        0xa086, 0x0002, 0x00c0, 0x39c2, 0x2011, 0x0002, 0x2019, 0x0000,
+        0x0078, 0x2f65, 0x7064, 0xa086, 0x0006, 0x0040, 0x39bc, 0x7064,
+        0xa086, 0x0004, 0x0040, 0x39bc, 0x7000, 0xa086, 0x0000, 0x0040,
+        0x2a08, 0x6920, 0xa184, 0x0420, 0x0040, 0x39db, 0xc1d4, 0x6922,
+        0x6818, 0x0078, 0x3443, 0x6818, 0xa08e, 0x0002, 0x0040, 0x39e4,
+        0xc0fd, 0x681a, 0x2001, 0x0014, 0x0078, 0x3443, 0xa184, 0x0007,
+        0x0079, 0x39ea, 0x435d, 0x435d, 0x39f2, 0x435d, 0x43a5, 0x43a5,
+        0x435d, 0x435d, 0xd6bc, 0x0040, 0x3a34, 0x7184, 0x81ff, 0x0040,
+        0x3a34, 0xa182, 0x000d, 0x00d0, 0x3a01, 0x7087, 0x0000, 0x0078,
+        0x3a06, 0xa182, 0x000c, 0x7086, 0x2009, 0x000c, 0x789b, 0x0061,
+        0x79aa, 0x157e, 0x137e, 0x147e, 0x7088, 0x8114, 0xa210, 0x728a,
+        0xa080, 0x000b, 0xad00, 0x2098, 0xb284, 0x0300, 0x0040, 0x3a28,
+        0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x3a24,
+        0x20a1, 0x012b, 0x0078, 0x3a2a, 0x20a1, 0x022b, 0x0078, 0x3a2a,
+        0x20a1, 0x012b, 0x789b, 0x0000, 0x8108, 0x81ac, 0x53a6, 0x147f,
+        0x137f, 0x157f, 0x0078, 0x4363, 0xd6d4, 0x00c0, 0x3a88, 0x6820,
+        0xd084, 0x0040, 0x4363, 0xa68c, 0x0060, 0xa684, 0x0060, 0x0040,
+        0x3a46, 0xa086, 0x0060, 0x00c0, 0x3a46, 0xc1f5, 0xc194, 0x795a,
+        0x69b6, 0x789b, 0x0060, 0x78ab, 0x0000, 0x789b, 0x0061, 0x6818,
+        0xc0fd, 0x681a, 0x78aa, 0x8008, 0x810c, 0x0040, 0x3e4f, 0xa18c,
+        0x00f8, 0x00c0, 0x3e4f, 0x157e, 0x137e, 0x147e, 0x017e, 0x3208,
+        0xa18c, 0x0300, 0x0040, 0x3a74, 0x007e, 0x2001, 0x4f04, 0x2004,
+        0xd0ec, 0x007f, 0x0040, 0x3a70, 0x20a1, 0x012b, 0x0078, 0x3a76,
+        0x20a1, 0x022b, 0x0078, 0x3a76, 0x20a1, 0x012b, 0x017f, 0x789b,
+        0x0000, 0x8000, 0x80ac, 0xad80, 0x000b, 0x2098, 0x53a6, 0x147f,
+        0x137f, 0x157f, 0x6814, 0xc0fc, 0x8007, 0x7882, 0x0078, 0x4363,
+        0x6818, 0xd0fc, 0x0040, 0x3a8e, 0x681b, 0x0008, 0x6820, 0xc0ad,
+        0x6822, 0x1078, 0x4120, 0x781b, 0x00ea, 0x007c, 0x2300, 0x0079,
+        0x3a99, 0x3a9e, 0x3b76, 0x3a9c, 0x1078, 0x29b2, 0x7cd8, 0x7ddc,
+        0x7fd0, 0x82ff, 0x00c0, 0x3ac7, 0x7200, 0xa286, 0x0003, 0x0040,
+        0x3410, 0x71d4, 0xd1bc, 0x00c0, 0x3aca, 0xd1b4, 0x0040, 0x3aca,
+        0x0d7e, 0x783b, 0x8800, 0x781b, 0x004c, 0x70bc, 0xa06d, 0x68b4,
+        0xc0a5, 0x785a, 0x6894, 0x78d6, 0x78de, 0x6898, 0x78d2, 0x78da,
+        0xc1b4, 0x71d6, 0x7003, 0x0030, 0x0d7f, 0x0078, 0x3ace, 0x7200,
+        0x0078, 0x3ace, 0x783b, 0x1800, 0x781b, 0x004a, 0xa284, 0x000f,
+        0x0079, 0x3ad2, 0x3b61, 0x3b10, 0x3adc, 0x343f, 0x3ada, 0x3b61,
+        0x3ada, 0x3ada, 0x1078, 0x29b2, 0x681c, 0xd0ec, 0x0040, 0x3ae3,
+        0x6008, 0xc08d, 0x600a, 0x6920, 0xc185, 0x6922, 0x6800, 0x6006,
+        0xa005, 0x00c0, 0x3aec, 0x6002, 0x6008, 0xc0d4, 0x600a, 0x681c,
+        0xa084, 0x000e, 0x00c0, 0x3b00, 0xb284, 0x0300, 0x0040, 0x3afc,
+        0x2009, 0x95c0, 0x0078, 0x3b05, 0x2009, 0x96d0, 0x0078, 0x3b05,
+        0x7030, 0x68ba, 0x7140, 0x70cc, 0xa108, 0x2104, 0x6802, 0x2d0a,
+        0x715e, 0xd6dc, 0x00c0, 0x3b10, 0xc6fc, 0x6eb6, 0x0078, 0x3b61,
+        0x6eb6, 0xa684, 0x0060, 0x00c0, 0x3b1a, 0xa684, 0x7fff, 0x68b6,
+        0x0078, 0x3b61, 0xd6dc, 0x00c0, 0x3b28, 0xa684, 0x7fff, 0x68b6,
+        0x6894, 0x68a6, 0x6898, 0x68aa, 0x1078, 0x45d6, 0x0078, 0x3b61,
+        0xd6ac, 0x0040, 0x3b34, 0xa006, 0x1078, 0x45d6, 0x2408, 0x2510,
+        0x69aa, 0x6aa6, 0x0078, 0x3b44, 0x2408, 0x2510, 0x2700, 0x801b,
+        0x00c8, 0x3b3b, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291, 0x0000,
+        0x69aa, 0x6aa6, 0x1078, 0x45d6, 0xd6fc, 0x0040, 0x3b61, 0xa684,
+        0x7fff, 0x68b6, 0x2510, 0x2408, 0xd6ac, 0x00c0, 0x3b59, 0x2700,
+        0x801b, 0x00c8, 0x3b54, 0x8000, 0xa084, 0x003f, 0xa108, 0xa291,
+        0x0000, 0x6b98, 0x2100, 0xa302, 0x68b2, 0x6b94, 0x2200, 0xa303,
+        0x68ae, 0x7000, 0xa086, 0x0030, 0x00c0, 0x2a0c, 0x7003, 0x0002,
+        0x70bc, 0xa06d, 0x68bc, 0x7042, 0x70b8, 0xa065, 0x68c0, 0x705a,
+        0x2d00, 0x704e, 0xad80, 0x0009, 0x7046, 0x007c, 0xa586, 0x8800,
+        0x00c0, 0x3b83, 0x7003, 0x0000, 0x6018, 0x8001, 0x601a, 0x6008,
+        0xa084, 0xfbef, 0x600a, 0x0078, 0x4111, 0x7047, 0x0000, 0xa282,
+        0x0006, 0x0050, 0x3b8d, 0x1078, 0x29b2, 0x2300, 0x0079, 0x3b90,
+        0x3b93, 0x3ba5, 0x3bb1, 0x2200, 0x0079, 0x3b96, 0x3b9c, 0x4111,
+        0x3b9e, 0x3b9c, 0x3beb, 0x3c40, 0x1078, 0x29b2, 0x7a80, 0xa294,
+        0x0f00, 0x1078, 0x3cca, 0x0078, 0x4107, 0x1078, 0x3bc2, 0x0079,
+        0x3ba9, 0x4111, 0x3baf, 0x3baf, 0x3beb, 0x3baf, 0x4111, 0x1078,
+        0x29b2, 0x1078, 0x3bc2, 0x0079, 0x3bb5, 0x3bbd, 0x3bbb, 0x3bbb,
+        0x3bbd, 0x3bbb, 0x3bbd, 0x1078, 0x29b2, 0x1078, 0x412b, 0x781b,
+        0x0078, 0x007c, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3bd3, 0x1078,
+        0x3e36, 0x0078, 0x3bcd, 0x1078, 0x45d6, 0x6008, 0xa084, 0xfbef,
+        0x600a, 0x0078, 0x3bd8, 0x7000, 0xa086, 0x0003, 0x0040, 0x3bcb,
+        0x7003, 0x0005, 0xb284, 0x0300, 0x0040, 0x3be2, 0x2001, 0x96e0,
+        0x0078, 0x3be4, 0x2001, 0x9712, 0x2068, 0x704e, 0xad80, 0x0009,
+        0x7046, 0x2200, 0x007c, 0x7000, 0xa086, 0x0002, 0x00c0, 0x3bfd,
+        0x70d4, 0xc0b5, 0x70d6, 0x2c00, 0x70ba, 0x2d00, 0x70be, 0x0078,
+        0x3c02, 0x1078, 0x45d6, 0x0078, 0x3c02, 0x7000, 0xa086, 0x0003,
+        0x0040, 0x3bf9, 0x7003, 0x0001, 0x7a80, 0xa294, 0x0f00, 0x789b,
+        0x0018, 0x7ca8, 0xa484, 0x001f, 0xa215, 0x2069, 0x95c0, 0xb284,
+        0x0300, 0x00c0, 0x3c16, 0xc2fd, 0x2069, 0x96d0, 0x2d04, 0x2d08,
+        0x715e, 0xa06d, 0x0040, 0x3c23, 0x6814, 0xa206, 0x0040, 0x3c25,
+        0x6800, 0x0078, 0x3c17, 0x1078, 0x3cca, 0x6eb4, 0x7e5a, 0x6920,
+        0xa184, 0x0c00, 0x0040, 0x3cf4, 0x7064, 0xa086, 0x0006, 0x00c0,
+        0x3c37, 0x7074, 0xa206, 0x00c0, 0x3c37, 0x7066, 0x707e, 0x681b,
+        0x0005, 0xc1ad, 0xc1d4, 0x6922, 0x1078, 0x4120, 0x0078, 0x3cf4,
+        0x7200, 0xa286, 0x0002, 0x00c0, 0x3c52, 0x70d4, 0xc0b5, 0x70d6,
+        0x2c00, 0x70ba, 0x2d00, 0x70be, 0x0078, 0x3c56, 0x1078, 0x45d6,
+        0x0078, 0x3c56, 0xa286, 0x0003, 0x0040, 0x3c4e, 0x7003, 0x0001,
+        0x7a80, 0xa294, 0x0f00, 0x789b, 0x0018, 0x7ca8, 0xa484, 0x001f,
+        0xa215, 0xb284, 0x0300, 0x00c0, 0x3c66, 0xc2fd, 0x79a8, 0x79a8,
+        0xa18c, 0x00ff, 0x2118, 0x70cc, 0xa168, 0x2d04, 0x2d08, 0x715e,
+        0xa06d, 0x0040, 0x3c7a, 0x6814, 0xa206, 0x0040, 0x3ca3, 0x6800,
+        0x0078, 0x3c6e, 0x7003, 0x0005, 0xb284, 0x0300, 0x0040, 0x3c84,
+        0x2001, 0x96e0, 0x0078, 0x3c86, 0x2001, 0x9712, 0x2068, 0x704e,
+        0x157e, 0x20a9, 0x0032, 0x2003, 0x0000, 0x8000, 0x00f0, 0x3c8b,
+        0x157f, 0xb284, 0x0300, 0x0040, 0x3c98, 0xc2fc, 0x0078, 0x3c99,
+        0xc2fd, 0x6a16, 0xad80, 0x0009, 0x7046, 0x68b7, 0x0700, 0x6823,
+        0x0800, 0x6827, 0x0003, 0x6eb4, 0x6920, 0xa184, 0x0c00, 0x0040,
+        0x3cf4, 0xd0dc, 0x0040, 0x3cbf, 0x7064, 0xa086, 0x0004, 0x00c0,
+        0x3cbb, 0x7074, 0xa206, 0x00c0, 0x3cbb, 0x7078, 0xa306, 0x00c0,
+        0x3cbb, 0x7066, 0x707e, 0x1078, 0x4127, 0x0078, 0x3cf4, 0x681b,
+        0x0005, 0xc1ad, 0xc1d4, 0x6922, 0x1078, 0x4120, 0x707f, 0x0000,
+        0x0078, 0x3cf4, 0x7003, 0x0005, 0xb284, 0x0300, 0x0040, 0x3cd4,
+        0x2001, 0x96e0, 0x0078, 0x3cd6, 0x2001, 0x9712, 0x2068, 0x704e,
+        0x157e, 0x20a9, 0x0032, 0x2003, 0x0000, 0x8000, 0x00f0, 0x3cdb,
+        0x157f, 0xb284, 0x0300, 0x0040, 0x3ce8, 0xc2fc, 0x0078, 0x3ce9,
+        0xc2fd, 0x6a16, 0xad80, 0x0009, 0x7046, 0x68b7, 0x0700, 0x6823,
+        0x0800, 0x6827, 0x0003, 0x007c, 0xc6ec, 0xa6ac, 0x0060, 0x0040,
+        0x3d46, 0x6b98, 0x6c94, 0x69ac, 0x68b0, 0xa105, 0x00c0, 0x3d21,
+        0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0xa586, 0x0060, 0x0040, 0x3d4b,
+        0xd6f4, 0x00c0, 0x3d0c, 0xc6ed, 0xa6b4, 0xb7ff, 0x7e5a, 0x2009,
+        0x0079, 0xd69c, 0x0040, 0x3d19, 0x2009, 0x0078, 0x2019, 0x0000,
+        0x2320, 0x791a, 0xd6ec, 0x0040, 0x3d56, 0x1078, 0x493f, 0x0078,
+        0x3d56, 0x68b0, 0xa31a, 0x2100, 0xa423, 0x2400, 0xa305, 0x0040,
+        0x3d4d, 0x7bd2, 0x7bda, 0x7cd6, 0x7cde, 0x68b0, 0xd6f4, 0x00c0,
+        0x3d32, 0xc6ed, 0xc6f4, 0x7e5a, 0x2011, 0x0079, 0xd69c, 0x0040,
+        0x3d3e, 0x2011, 0x0078, 0x2019, 0x0000, 0x2320, 0x7a1a, 0xd6ec,
+        0x0040, 0x3d56, 0x1078, 0x4977, 0x0078, 0x3d56, 0x2019, 0x0000,
+        0x2320, 0x0078, 0x3d4d, 0xa6b4, 0xb7ff, 0x7e5a, 0x2009, 0x0079,
+        0xd69c, 0x0040, 0x3d55, 0x2009, 0x0078, 0x791a, 0x68c0, 0x705a,
+        0x2d00, 0x704e, 0x68c4, 0x2060, 0x71d4, 0x2001, 0x4f01, 0x2004,
+        0xd0c4, 0x00c0, 0x3dab, 0x70d8, 0xa02d, 0x0040, 0x3d84, 0xd1bc,
+        0x0040, 0x3d9e, 0x7a80, 0xa294, 0x0f00, 0x70dc, 0xa206, 0x0040,
+        0x3d75, 0x78e0, 0xa504, 0x00c0, 0x3dab, 0x70da, 0xc1bc, 0x71d6,
+        0x0078, 0x3dab, 0x2031, 0x0001, 0x852c, 0x0048, 0x3d83, 0x8633,
+        0x8210, 0x0078, 0x3d7c, 0x007c, 0x7de0, 0xa594, 0xff00, 0x0040,
+        0x3d91, 0x2011, 0x0008, 0x852f, 0x1078, 0x3d7a, 0x8637, 0x0078,
+        0x3d93, 0x1078, 0x3d7a, 0x8217, 0x7880, 0xa084, 0x0f00, 0xa206,
+        0x0040, 0x3dab, 0x72de, 0x76da, 0x0078, 0x3dab, 0x7a80, 0xa294,
+        0x0f00, 0x70dc, 0xa236, 0x0040, 0x3d9b, 0x78e0, 0xa534, 0x0040,
+        0x3d9b, 0xc1bd, 0x71d6, 0xd1b4, 0x00c0, 0x2a08, 0x2300, 0xa405,
+        0x0040, 0x2a08, 0x70a4, 0xa086, 0x0001, 0x00c0, 0x2a52, 0x007c,
+        0x6020, 0xa005, 0x0040, 0x3dc6, 0x8001, 0x6022, 0x6008, 0xa085,
+        0x0008, 0x600a, 0x700f, 0x0100, 0x702c, 0x6026, 0x007c, 0xa006,
+        0x1078, 0x45d6, 0x7000, 0xa086, 0x0002, 0x0040, 0x3dd4, 0x7064,
+        0xa086, 0x0005, 0x00c0, 0x3dde, 0x682b, 0x0000, 0x6817, 0x0000,
+        0x681b, 0x0001, 0x6823, 0x0040, 0x681f, 0x0100, 0x7000, 0xa084,
+        0x000f, 0x0079, 0x3de3, 0x2a0c, 0x3df3, 0x3ded, 0x3e15, 0x3dfd,
+        0x2a0c, 0x3deb, 0x3deb, 0x1078, 0x29b2, 0x1078, 0x3e20, 0x1078,
+        0x3e19, 0x0078, 0x3df9, 0x1078, 0x3e20, 0x705c, 0x2060, 0x6800,
+        0x6002, 0x1078, 0x2073, 0x0078, 0x2a0c, 0x7064, 0x7067, 0x0000,
+        0x7083, 0x0000, 0x0079, 0x3e04, 0x3e11, 0x3e11, 0x3e0c, 0x3e0c,
+        0x3e0c, 0x3e11, 0x3e0c, 0x3e11, 0x77d4, 0xc7dd, 0x77d6, 0x0079,
+        0x2f7e, 0x7067, 0x0000, 0x0078, 0x2a0c, 0x681b, 0x0000, 0x0078,
+        0x3711, 0x6800, 0xa005, 0x00c0, 0x3e1e, 0x6002, 0x6006, 0x007c,
+        0x6410, 0x84ff, 0x0040, 0x3e32, 0x2009, 0x4f02, 0x2104, 0x8001,
+        0x200a, 0x8421, 0x6412, 0x00c0, 0x3e32, 0x2021, 0x4f04, 0x2404,
+        0xc0a5, 0x2022, 0x6008, 0xc0a4, 0x600a, 0x007c, 0x6018, 0xa005,
+        0x0040, 0x3e3c, 0x8001, 0x601a, 0x007c, 0x1078, 0x43d3, 0x681b,
+        0x0018, 0x0078, 0x3e7d, 0x1078, 0x43d3, 0x681b, 0x0019, 0x0078,
+        0x3e7d, 0x1078, 0x43d3, 0x681b, 0x001a, 0x0078, 0x3e7d, 0x1078,
+        0x43d3, 0x681b, 0x0003, 0x0078, 0x3e7d, 0x7774, 0x1078, 0x424e,
+        0x7178, 0xa18c, 0x00ff, 0x3210, 0xa294, 0x0300, 0x0040, 0x3e64,
+        0xa1e8, 0x94c0, 0x0078, 0x3e66, 0xa1e8, 0x95d0, 0x2d04, 0x2d08,
+        0x2068, 0xa005, 0x00c0, 0x3e6f, 0x707e, 0x0078, 0x2a0c, 0x6814,
+        0x7274, 0xa206, 0x0040, 0x3e77, 0x6800, 0x0078, 0x3e67, 0x6800,
+        0x200a, 0x681b, 0x0005, 0x707f, 0x0000, 0x1078, 0x3e20, 0x6820,
+        0xd084, 0x00c0, 0x3e85, 0x1078, 0x3e19, 0x1078, 0x3e36, 0x681f,
+        0x0000, 0x6823, 0x0020, 0x1078, 0x2073, 0x0078, 0x2a0c, 0xa282,
+        0x0003, 0x00c0, 0x4107, 0x7da8, 0xa5ac, 0x00ff, 0x7e5a, 0x7ea8,
+        0xa6b4, 0x00ff, 0x6920, 0xc1bd, 0x6922, 0xd1c4, 0x0040, 0x3eea,
+        0xc1c4, 0x6922, 0xa6b4, 0x00ff, 0x0040, 0x3ed7, 0xa682, 0x000c,
+        0x0048, 0x3eae, 0x0040, 0x3eae, 0x2031, 0x000c, 0x2500, 0xa086,
+        0x000a, 0x0040, 0x3eb5, 0x852b, 0x852b, 0x1078, 0x41e0, 0x0040,
+        0x3ebd, 0x1078, 0x3fbc, 0x0078, 0x3ee0, 0x1078, 0x419b, 0x0c7e,
+        0x2960, 0x6004, 0xa084, 0xfff5, 0x6006, 0x1078, 0x3ff2, 0x0c7f,
+        0x6920, 0xc1c5, 0x6922, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x00c0,
+        0x3ed4, 0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x0c7e,
+        0x2960, 0x6004, 0xa084, 0xfff5, 0x6006, 0x1078, 0x3ff2, 0x0c7f,
+        0x7e58, 0xd6d4, 0x00c0, 0x3ee7, 0x781b, 0x0067, 0x007c, 0x781b,
+        0x0079, 0x007c, 0x0c7e, 0x7058, 0x2060, 0x6100, 0xd1e4, 0x0040,
+        0x3f33, 0x6208, 0x8217, 0xa294, 0x00ff, 0xa282, 0x000c, 0x0048,
+        0x3efd, 0x0040, 0x3efd, 0x2011, 0x000c, 0x2600, 0xa202, 0x00c8,
+        0x3f02, 0x2230, 0x6208, 0xa294, 0x00ff, 0x2001, 0x4f05, 0x2004,
+        0xd0e4, 0x00c0, 0x3f17, 0x78ec, 0xd0e4, 0x0040, 0x3f17, 0xa282,
+        0x000a, 0x00c8, 0x3f1d, 0x2011, 0x000a, 0x0078, 0x3f1d, 0xa282,
+        0x000c, 0x00c8, 0x3f1d, 0x2011, 0x000c, 0x2200, 0xa502, 0x00c8,
+        0x3f22, 0x2228, 0x1078, 0x419f, 0x2500, 0xa086, 0x000a, 0x0040,
+        0x3f2b, 0x852b, 0x852b, 0x1078, 0x41e0, 0x0040, 0x3f33, 0x1078,
+        0x3fbc, 0x0078, 0x3f37, 0x1078, 0x419b, 0x1078, 0x3ff2, 0x7858,
+        0xc095, 0x785a, 0x0c7f, 0x781b, 0x0078, 0x007c, 0x0c7e, 0x2960,
+        0x6000, 0xd0e4, 0x00c0, 0x3f58, 0xd0b4, 0x00c0, 0x3f52, 0x6010,
+        0xa084, 0x000f, 0x00c0, 0x3f52, 0x6104, 0xa18c, 0xfff5, 0x6106,
+        0x0c7f, 0x007c, 0x2011, 0x0032, 0x2019, 0x0000, 0x0078, 0x3f83,
+        0x68a0, 0xd0cc, 0x00c0, 0x3f52, 0x6208, 0xa294, 0x00ff, 0x2001,
+        0x4f05, 0x2004, 0xd0e4, 0x00c0, 0x3f71, 0x78ec, 0xd0e4, 0x0040,
+        0x3f71, 0xa282, 0x000b, 0x00c8, 0x3f71, 0x2011, 0x000a, 0x0078,
+        0x3f77, 0xa282, 0x000c, 0x00c8, 0x3f77, 0x2011, 0x000c, 0x6308,
+        0x831f, 0xa39c, 0x00ff, 0xa382, 0x000c, 0x0048, 0x3f83, 0x0040,
+        0x3f83, 0x2019, 0x000c, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab,
+        0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820, 0xc0c5, 0x6822,
+        0x70d4, 0xd0b4, 0x0040, 0x3f9f, 0xc0b4, 0x70d6, 0x70b8, 0xa065,
+        0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001, 0x601a, 0x0c7f,
+        0x007c, 0x0c7e, 0x2960, 0x6104, 0xa18c, 0xfff5, 0x6106, 0x2011,
+        0x0032, 0x2019, 0x0000, 0x0078, 0x3fad, 0x78ab, 0x0001, 0x78ab,
+        0x0003, 0x78ab, 0x0001, 0x7aaa, 0x7baa, 0xa8c0, 0x0005, 0x6820,
+        0xc0c5, 0x6822, 0x0c7f, 0x007c, 0x0c7e, 0x7158, 0x2160, 0x2018,
+        0xa08c, 0x0020, 0x0040, 0x3fc5, 0xc0ac, 0x2008, 0xa084, 0xfff0,
+        0xa635, 0x7e86, 0x6018, 0x789a, 0x7eae, 0x6612, 0x78a4, 0xa084,
+        0xfff0, 0xa18c, 0x000f, 0xa105, 0xc0f4, 0xa39c, 0x0020, 0x0040,
+        0x3fdb, 0xa085, 0x4000, 0xc0fc, 0xd0b4, 0x00c0, 0x3fe0, 0xc0fd,
+        0x78a6, 0x6016, 0x788a, 0xa6b4, 0x000f, 0x8637, 0x8204, 0x8004,
+        0xa084, 0x00ff, 0xa605, 0x600e, 0x6004, 0xa084, 0xfff5, 0x6006,
+        0x0c7f, 0x007c, 0x0c7e, 0x7058, 0x2060, 0x6018, 0x789a, 0x78a4,
+        0xa084, 0xfff0, 0x78a6, 0x6012, 0x7884, 0xa084, 0xfff0, 0x7886,
+        0x600c, 0xa084, 0x00ff, 0x600e, 0x0c7f, 0x007c, 0xa282, 0x0002,
+        0x00c0, 0x4107, 0x7aa8, 0x6920, 0xc1bd, 0x6922, 0xd1cc, 0x0040,
+        0x4041, 0xc1cc, 0x6922, 0xa294, 0x00ff, 0xa282, 0x0002, 0x00c8,
+        0x4107, 0x1078, 0x4094, 0x1078, 0x3ff2, 0xa980, 0x0001, 0x200c,
+        0x1078, 0x424a, 0x1078, 0x3f3e, 0x88ff, 0x0040, 0x4037, 0x789b,
+        0x0060, 0x2800, 0x78aa, 0x7e58, 0xc695, 0x7e5a, 0xd6d4, 0x00c0,
+        0x4034, 0x781b, 0x0064, 0x007c, 0x781b, 0x0078, 0x007c, 0x7e58,
+        0xd6d4, 0x00c0, 0x403e, 0x781b, 0x0067, 0x007c, 0x781b, 0x0079,
+        0x007c, 0xa282, 0x0002, 0x00c8, 0x4049, 0xa284, 0x0001, 0x0040,
+        0x4052, 0x7158, 0xa188, 0x0000, 0x210c, 0xd1ec, 0x00c0, 0x4052,
+        0x2011, 0x0000, 0x1078, 0x417c, 0x1078, 0x4094, 0x1078, 0x3ff2,
+        0x7858, 0xc095, 0x785a, 0x781b, 0x0078, 0x007c, 0x0c7e, 0x027e,
+        0x2960, 0x6000, 0x2011, 0x0001, 0xd0ec, 0x00c0, 0x4075, 0xd0bc,
+        0x00c0, 0x4073, 0x6014, 0xd0b4, 0x00c0, 0x4073, 0xc1a4, 0x6106,
+        0xa006, 0x0078, 0x4091, 0x2011, 0x0000, 0x78ab, 0x0001, 0x78ab,
         0x0002, 0x78ab, 0x0003, 0x7aaa, 0xa8c0, 0x0004, 0x70d4, 0xd0b4,
-        0x0040, 0x403d, 0xc0b4, 0x70d6, 0x70b8, 0xa065, 0x6008, 0xa084,
+        0x0040, 0x408d, 0xc0b4, 0x70d6, 0x70b8, 0xa065, 0x6008, 0xa084,
         0xfbef, 0x600a, 0x6018, 0x8001, 0x601a, 0x6820, 0xa085, 0x0200,
         0x6822, 0x027f, 0x0c7f, 0x007c, 0x0c7e, 0x7058, 0x2060, 0x82ff,
-        0x0040, 0x404c, 0x2011, 0x0040, 0x6018, 0xa080, 0x0002, 0x789a,
-        0x78a4, 0xa084, 0xffbf, 0xa205, 0xc0fc, 0xd0b4, 0x00c0, 0x4059,
+        0x0040, 0x409c, 0x2011, 0x0040, 0x6018, 0xa080, 0x0002, 0x789a,
+        0x78a4, 0xa084, 0xffbf, 0xa205, 0xc0fc, 0xd0b4, 0x00c0, 0x40a9,
         0xc0fd, 0x78a6, 0x6016, 0x788a, 0x6004, 0xc0a4, 0x6006, 0x0c7f,
-        0x007c, 0x007e, 0x7000, 0xa086, 0x0003, 0x0040, 0x406a, 0x007f,
-        0x0078, 0x406d, 0x007f, 0x0078, 0x40b4, 0xd6ac, 0x0040, 0x40b4,
-        0x7888, 0xa084, 0x0040, 0x0040, 0x40b4, 0x7bb8, 0xa384, 0x003f,
-        0x831b, 0x00c8, 0x407c, 0x8000, 0xa005, 0x0040, 0x4091, 0x831b,
-        0x00c8, 0x4085, 0x8001, 0x0040, 0x40b1, 0xd6f4, 0x0040, 0x4091,
-        0x78b8, 0x801b, 0x00c8, 0x408d, 0x8000, 0xa084, 0x003f, 0x00c0,
-        0x40b1, 0xc6f4, 0x7e5a, 0x79d8, 0x7adc, 0x2001, 0x0001, 0xa108,
-        0x00c8, 0x409c, 0xa291, 0x0000, 0x79d2, 0x79da, 0x7ad6, 0x7ade,
-        0x1078, 0x49c3, 0x781b, 0x0076, 0xb284, 0x0300, 0x0040, 0x40ac,
-        0x2001, 0x0000, 0x0078, 0x40ae, 0x2001, 0x0001, 0x1078, 0x484b,
+        0x007c, 0x007e, 0x7000, 0xa086, 0x0003, 0x0040, 0x40ba, 0x007f,
+        0x0078, 0x40bd, 0x007f, 0x0078, 0x4104, 0xd6ac, 0x0040, 0x4104,
+        0x7888, 0xa084, 0x0040, 0x0040, 0x4104, 0x7bb8, 0xa384, 0x003f,
+        0x831b, 0x00c8, 0x40cc, 0x8000, 0xa005, 0x0040, 0x40e1, 0x831b,
+        0x00c8, 0x40d5, 0x8001, 0x0040, 0x4101, 0xd6f4, 0x0040, 0x40e1,
+        0x78b8, 0x801b, 0x00c8, 0x40dd, 0x8000, 0xa084, 0x003f, 0x00c0,
+        0x4101, 0xc6f4, 0x7e5a, 0x79d8, 0x7adc, 0x2001, 0x0001, 0xa108,
+        0x00c8, 0x40ec, 0xa291, 0x0000, 0x79d2, 0x79da, 0x7ad6, 0x7ade,
+        0x1078, 0x4a44, 0x781b, 0x0076, 0xb284, 0x0300, 0x0040, 0x40fc,
+        0x2001, 0x0000, 0x0078, 0x40fe, 0x2001, 0x0001, 0x1078, 0x48ce,
         0x007c, 0x781b, 0x0076, 0x007c, 0x781b, 0x0079, 0x007c, 0x1078,
-        0x40df, 0x781b, 0x0078, 0x007c, 0x1078, 0x40c8, 0x781b, 0x0078,
-        0x007c, 0x6827, 0x0002, 0x1078, 0x40d0, 0x781b, 0x0078, 0x007c,
-        0x2001, 0x0005, 0x0078, 0x40e1, 0x2001, 0x000c, 0x0078, 0x40e1,
-        0x6820, 0xc0d5, 0x6822, 0x2001, 0x0006, 0x0078, 0x40e1, 0x2001,
-        0x000d, 0x0078, 0x40e1, 0x2001, 0x0009, 0x0078, 0x40e1, 0x2001,
+        0x412f, 0x781b, 0x0078, 0x007c, 0x1078, 0x4118, 0x781b, 0x0078,
+        0x007c, 0x6827, 0x0002, 0x1078, 0x4120, 0x781b, 0x0078, 0x007c,
+        0x2001, 0x0005, 0x0078, 0x4131, 0x2001, 0x000c, 0x0078, 0x4131,
+        0x6820, 0xc0d5, 0x6822, 0x2001, 0x0006, 0x0078, 0x4131, 0x2001,
+        0x000d, 0x0078, 0x4131, 0x2001, 0x0009, 0x0078, 0x4131, 0x2001,
         0x0007, 0x789b, 0x007e, 0x78aa, 0xc69d, 0x7e5a, 0x70d4, 0xd0b4,
-        0x0040, 0x40f7, 0xc0b4, 0x70d6, 0x0c7e, 0x70b8, 0xa065, 0x6008,
+        0x0040, 0x4147, 0xc0b4, 0x70d6, 0x0c7e, 0x70b8, 0xa065, 0x6008,
         0xa084, 0xfbef, 0x600a, 0x6018, 0x8001, 0x601a, 0x0c7f, 0x007c,
         0x077e, 0x873f, 0xa7bc, 0x000f, 0x873b, 0x873b, 0x8703, 0x017e,
-        0xb28c, 0x0300, 0x0040, 0x4108, 0xa0e0, 0x52c0, 0x0078, 0x410a,
-        0xa0e0, 0x5340, 0x017f, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184,
-        0x000f, 0x0040, 0x411a, 0xa184, 0xfff0, 0x78a6, 0x6012, 0x6004,
+        0xb28c, 0x0300, 0x0040, 0x4158, 0xa0e0, 0x53c0, 0x0078, 0x415a,
+        0xa0e0, 0x5440, 0x017f, 0xa7b8, 0x0020, 0x7f9a, 0x79a4, 0xa184,
+        0x000f, 0x0040, 0x416a, 0xa184, 0xfff0, 0x78a6, 0x6012, 0x6004,
         0xc09d, 0x6006, 0x8738, 0x8738, 0x7f9a, 0x79a4, 0xa184, 0x0040,
-        0x0040, 0x412a, 0xa184, 0xffbf, 0xc0fd, 0x78a6, 0x6016, 0x6004,
+        0x0040, 0x417a, 0xa184, 0xffbf, 0xc0fd, 0x78a6, 0x6016, 0x6004,
         0xc0a5, 0x6006, 0x077f, 0x007c, 0x789b, 0x0010, 0x78ab, 0x0001,
         0x78ab, 0x0002, 0x78ab, 0x0003, 0x7aaa, 0x789b, 0x0060, 0x78ab,
-        0x0004, 0x70d4, 0xd0b4, 0x0040, 0x414a, 0xc0b4, 0x70d6, 0x0c7e,
+        0x0004, 0x70d4, 0xd0b4, 0x0040, 0x419a, 0xc0b4, 0x70d6, 0x0c7e,
         0x70b8, 0xa065, 0x6008, 0xa084, 0xfbef, 0x600a, 0x6018, 0x8001,
         0x601a, 0x0c7f, 0x007c, 0x2031, 0x0000, 0x2029, 0x0032, 0x789b,
         0x0010, 0x78ab, 0x0001, 0x78ab, 0x0003, 0x78ab, 0x0001, 0x7daa,
         0x7eaa, 0x789b, 0x0060, 0x78ab, 0x0005, 0x70d4, 0xd0b4, 0x0040,
-        0x416e, 0xc0b4, 0x70d6, 0x0c7e, 0x70b8, 0xa065, 0x6008, 0xa084,
+        0x41be, 0xc0b4, 0x70d6, 0x0c7e, 0x70b8, 0xa065, 0x6008, 0xa084,
         0xfbef, 0x600a, 0x6018, 0x8001, 0x601a, 0x0c7f, 0x007c, 0x157e,
         0x8007, 0xa084, 0x00ff, 0x8003, 0x8003, 0xa080, 0x0020, 0x789a,
-        0x79a4, 0xa18c, 0xfff0, 0x2021, 0x41e3, 0x2019, 0x0011, 0x20a9,
+        0x79a4, 0xa18c, 0xfff0, 0x2021, 0x4233, 0x2019, 0x0011, 0x20a9,
         0x000e, 0x2011, 0x0032, 0x2404, 0xa084, 0xfff0, 0xa106, 0x0040,
-        0x418e, 0x8420, 0x2300, 0xa210, 0x00f0, 0x4183, 0x157f, 0x007c,
-        0x157e, 0x2001, 0x4e05, 0x2004, 0xd0e4, 0x00c0, 0x41c1, 0x2021,
-        0x41f1, 0x20a9, 0x0009, 0x2011, 0x0028, 0xa582, 0x0019, 0x0040,
-        0x41d7, 0x0048, 0x41d7, 0x8420, 0x95a9, 0x2011, 0x0032, 0xa582,
-        0x0032, 0x0040, 0x41d7, 0x0048, 0x41d7, 0x8420, 0x95a9, 0x2019,
-        0x000a, 0x2011, 0x0064, 0x2200, 0xa502, 0x0040, 0x41d7, 0x0048,
-        0x41d7, 0x8420, 0x2300, 0xa210, 0x00f0, 0x41b3, 0x157f, 0x0078,
-        0x41d5, 0x2021, 0x41e3, 0x2019, 0x0011, 0x20a9, 0x000e, 0x2011,
-        0x0032, 0x2200, 0xa502, 0x0040, 0x41d7, 0x0048, 0x41d7, 0x8420,
-        0x2300, 0xa210, 0x00f0, 0x41c9, 0x157f, 0xa006, 0x007c, 0x157f,
-        0xa582, 0x0064, 0x00c8, 0x41e0, 0x7808, 0xa085, 0x0070, 0x780a,
+        0x41de, 0x8420, 0x2300, 0xa210, 0x00f0, 0x41d3, 0x157f, 0x007c,
+        0x157e, 0x2001, 0x4f05, 0x2004, 0xd0e4, 0x00c0, 0x4211, 0x2021,
+        0x4241, 0x20a9, 0x0009, 0x2011, 0x0028, 0xa582, 0x0019, 0x0040,
+        0x4227, 0x0048, 0x4227, 0x8420, 0x95a9, 0x2011, 0x0032, 0xa582,
+        0x0032, 0x0040, 0x4227, 0x0048, 0x4227, 0x8420, 0x95a9, 0x2019,
+        0x000a, 0x2011, 0x0064, 0x2200, 0xa502, 0x0040, 0x4227, 0x0048,
+        0x4227, 0x8420, 0x2300, 0xa210, 0x00f0, 0x4203, 0x157f, 0x0078,
+        0x4225, 0x2021, 0x4233, 0x2019, 0x0011, 0x20a9, 0x000e, 0x2011,
+        0x0032, 0x2200, 0xa502, 0x0040, 0x4227, 0x0048, 0x4227, 0x8420,
+        0x2300, 0xa210, 0x00f0, 0x4219, 0x157f, 0xa006, 0x007c, 0x157f,
+        0xa582, 0x0064, 0x00c8, 0x4230, 0x7808, 0xa085, 0x0070, 0x780a,
         0x2404, 0xa005, 0x007c, 0x1209, 0x3002, 0x3202, 0x4203, 0x4403,
         0x5404, 0x5604, 0x6605, 0x6805, 0x7806, 0x7a06, 0x0c07, 0x0c07,
         0x0e07, 0x10e1, 0x330a, 0x5805, 0x5a05, 0x6a06, 0x6c06, 0x7c07,
         0x7e07, 0x0e00, 0x789b, 0x0010, 0xa046, 0x007c, 0xa784, 0x0f00,
         0x800b, 0xa784, 0x001f, 0x8003, 0x8003, 0x8003, 0x8003, 0xa105,
-        0xd7fc, 0x0040, 0x420f, 0xa0e0, 0x73c0, 0x0078, 0x4211, 0xa0e0,
-        0x53c0, 0x007c, 0x0e7e, 0x0f7e, 0xd084, 0x0040, 0x421f, 0x2079,
-        0x0100, 0x2009, 0x4e80, 0x2071, 0x4e80, 0x0078, 0x422f, 0x2009,
-        0x4e40, 0x2071, 0x4e40, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x0040,
-        0x422d, 0x2079, 0x0100, 0x0078, 0x422f, 0x2079, 0x0200, 0x2091,
-        0x8000, 0x2104, 0xa084, 0x000f, 0x0079, 0x4236, 0x4240, 0x4240,
-        0x4240, 0x4240, 0x4240, 0x4240, 0x423e, 0x423e, 0x1078, 0x296b,
-        0x69b4, 0xc1f5, 0xa18c, 0xff9f, 0x69b6, 0xa005, 0x0040, 0x428f,
+        0xd7fc, 0x0040, 0x425f, 0xa0e0, 0x74c0, 0x0078, 0x4261, 0xa0e0,
+        0x54c0, 0x007c, 0x0e7e, 0x0f7e, 0xd084, 0x0040, 0x426f, 0x2079,
+        0x0100, 0x2009, 0x4f80, 0x2071, 0x4f80, 0x0078, 0x427f, 0x2009,
+        0x4f40, 0x2071, 0x4f40, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x0040,
+        0x427d, 0x2079, 0x0100, 0x0078, 0x427f, 0x2079, 0x0200, 0x2091,
+        0x8000, 0x2104, 0xa084, 0x000f, 0x0079, 0x4286, 0x4290, 0x4290,
+        0x4290, 0x4290, 0x4290, 0x4290, 0x428e, 0x428e, 0x1078, 0x29b2,
+        0x69b4, 0xc1f5, 0xa18c, 0xff9f, 0x69b6, 0xa005, 0x0040, 0x42df,
         0x7858, 0xa084, 0xff9f, 0xa085, 0x6000, 0x785a, 0x7828, 0xa086,
-        0x1814, 0x00c0, 0x428f, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004,
-        0x00c0, 0x4255, 0x784b, 0x0008, 0x7848, 0xa084, 0x0008, 0x00c0,
-        0x425c, 0x7830, 0xd0bc, 0x00c0, 0x428f, 0x007e, 0x2001, 0x4e04,
-        0x2004, 0xd0ec, 0x007f, 0x0040, 0x4271, 0xb284, 0x0300, 0x0078,
-        0x4273, 0xb284, 0x0400, 0x0040, 0x4279, 0x0018, 0x428f, 0x0078,
-        0x427b, 0x0028, 0x428f, 0x79e4, 0xa184, 0x0030, 0x0040, 0x428f,
-        0x78ec, 0xa084, 0x0003, 0x0040, 0x428f, 0x681c, 0xd0ac, 0x00c0,
-        0x428d, 0x1078, 0x4319, 0x0078, 0x428f, 0x781b, 0x00f9, 0x0f7f,
-        0x0e7f, 0x007c, 0x0c7e, 0x2001, 0x4e01, 0x2004, 0xd0ac, 0x00c0,
-        0x430b, 0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003,
-        0xb28c, 0x0300, 0x0040, 0x42a8, 0xa0e0, 0x52c0, 0x0078, 0x42aa,
-        0xa0e0, 0x5340, 0x6004, 0xa084, 0x000a, 0x00c0, 0x430b, 0x6108,
-        0xa194, 0xff00, 0x0040, 0x430b, 0xa18c, 0x00ff, 0x2001, 0x000a,
-        0xa106, 0x0040, 0x42d6, 0x2001, 0x000c, 0xa106, 0x0040, 0x42da,
-        0x2001, 0x0012, 0xa106, 0x0040, 0x42de, 0x2001, 0x0014, 0xa106,
-        0x0040, 0x42e2, 0x2001, 0x0019, 0xa106, 0x0040, 0x42e6, 0x2001,
-        0x0032, 0xa106, 0x0040, 0x42ea, 0x0078, 0x42ee, 0x2009, 0x000c,
-        0x0078, 0x42f0, 0x2009, 0x0012, 0x0078, 0x42f0, 0x2009, 0x0014,
-        0x0078, 0x42f0, 0x2009, 0x0019, 0x0078, 0x42f0, 0x2009, 0x0020,
-        0x0078, 0x42f0, 0x2009, 0x003f, 0x0078, 0x42f0, 0x2011, 0x0000,
+        0x1814, 0x00c0, 0x42df, 0x784b, 0x0004, 0x7848, 0xa084, 0x0004,
+        0x00c0, 0x42a5, 0x784b, 0x0008, 0x7848, 0xa084, 0x0008, 0x00c0,
+        0x42ac, 0x7830, 0xd0bc, 0x00c0, 0x42df, 0x007e, 0x2001, 0x4f04,
+        0x2004, 0xd0ec, 0x007f, 0x0040, 0x42c1, 0xb284, 0x0300, 0x0078,
+        0x42c3, 0xb284, 0x0400, 0x0040, 0x42c9, 0x0018, 0x42df, 0x0078,
+        0x42cb, 0x0028, 0x42df, 0x79e4, 0xa184, 0x0030, 0x0040, 0x42df,
+        0x78ec, 0xa084, 0x0003, 0x0040, 0x42df, 0x681c, 0xd0ac, 0x00c0,
+        0x42dd, 0x1078, 0x4369, 0x0078, 0x42df, 0x781b, 0x00f9, 0x0f7f,
+        0x0e7f, 0x007c, 0x0c7e, 0x2001, 0x4f01, 0x2004, 0xd0ac, 0x00c0,
+        0x435b, 0x6814, 0x8007, 0xa084, 0x000f, 0x8003, 0x8003, 0x8003,
+        0xb28c, 0x0300, 0x0040, 0x42f8, 0xa0e0, 0x53c0, 0x0078, 0x42fa,
+        0xa0e0, 0x5440, 0x6004, 0xa084, 0x000a, 0x00c0, 0x435b, 0x6108,
+        0xa194, 0xff00, 0x0040, 0x435b, 0xa18c, 0x00ff, 0x2001, 0x000a,
+        0xa106, 0x0040, 0x4326, 0x2001, 0x000c, 0xa106, 0x0040, 0x432a,
+        0x2001, 0x0012, 0xa106, 0x0040, 0x432e, 0x2001, 0x0014, 0xa106,
+        0x0040, 0x4332, 0x2001, 0x0019, 0xa106, 0x0040, 0x4336, 0x2001,
+        0x0032, 0xa106, 0x0040, 0x433a, 0x0078, 0x433e, 0x2009, 0x000c,
+        0x0078, 0x4340, 0x2009, 0x0012, 0x0078, 0x4340, 0x2009, 0x0014,
+        0x0078, 0x4340, 0x2009, 0x0019, 0x0078, 0x4340, 0x2009, 0x0020,
+        0x0078, 0x4340, 0x2009, 0x003f, 0x0078, 0x4340, 0x2011, 0x0000,
         0x2100, 0xa205, 0x600a, 0x6004, 0xa085, 0x0002, 0x6006, 0x2061,
-        0x4e00, 0x6004, 0xd0bc, 0x0040, 0x430b, 0x6814, 0xd0fc, 0x00c0,
-        0x4306, 0x60ea, 0x2061, 0x4e40, 0x0078, 0x4309, 0x60ee, 0x2061,
-        0x4e80, 0x601f, 0x800f, 0x0c7f, 0x007c, 0x781b, 0x0079, 0x007c,
+        0x4f00, 0x6004, 0xd0bc, 0x0040, 0x435b, 0x6814, 0xd0fc, 0x00c0,
+        0x4356, 0x60ea, 0x2061, 0x4f40, 0x0078, 0x4359, 0x60ee, 0x2061,
+        0x4f80, 0x601f, 0x800f, 0x0c7f, 0x007c, 0x781b, 0x0079, 0x007c,
         0x781b, 0x0078, 0x007c, 0x781b, 0x0067, 0x007c, 0x781b, 0x0064,
-        0x007c, 0x2009, 0x4e19, 0x210c, 0xa186, 0x0000, 0x0040, 0x432b,
-        0xa186, 0x0001, 0x0040, 0x432e, 0x701f, 0x000b, 0x7067, 0x0001,
+        0x007c, 0x2009, 0x4f19, 0x210c, 0xa186, 0x0000, 0x0040, 0x437b,
+        0xa186, 0x0001, 0x0040, 0x437e, 0x701f, 0x000b, 0x7067, 0x0001,
         0x781b, 0x0047, 0x007c, 0x781b, 0x00f0, 0x007c, 0x701f, 0x000a,
-        0x007c, 0x2009, 0x4e19, 0x210c, 0xa186, 0x0000, 0x0040, 0x4346,
-        0xa186, 0x0001, 0x0040, 0x4343, 0x701f, 0x000b, 0x7067, 0x0001,
+        0x007c, 0x2009, 0x4f19, 0x210c, 0xa186, 0x0000, 0x0040, 0x4396,
+        0xa186, 0x0001, 0x0040, 0x4393, 0x701f, 0x000b, 0x7067, 0x0001,
         0x781b, 0x0047, 0x007c, 0x701f, 0x000a, 0x007c, 0x781b, 0x00ef,
         0x007c, 0x781b, 0x00f9, 0x007c, 0x781b, 0x00f8, 0x007c, 0x781b,
         0x00c9, 0x007c, 0x781b, 0x00c8, 0x007c, 0x6818, 0xd0fc, 0x0040,
-        0x435b, 0x681b, 0x001d, 0x7067, 0x0001, 0x781b, 0x0047, 0x007c,
-        0x7830, 0xa084, 0x00c0, 0x00c0, 0x4382, 0x7808, 0xc08c, 0x780a,
+        0x43ab, 0x681b, 0x001d, 0x7067, 0x0001, 0x781b, 0x0047, 0x007c,
+        0x7830, 0xa084, 0x00c0, 0x00c0, 0x43d2, 0x7808, 0xc08c, 0x780a,
         0x0005, 0x0005, 0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x00c0,
-        0x437f, 0x2001, 0x4e05, 0x2004, 0xd0e4, 0x00c0, 0x437d, 0x7804,
+        0x43cf, 0x2001, 0x4f05, 0x2004, 0xd0e4, 0x00c0, 0x43cd, 0x7804,
         0xa084, 0xff1f, 0xa085, 0x00e0, 0x7806, 0xa006, 0x007c, 0x7808,
         0xc08d, 0x780a, 0x007c, 0x7808, 0xc08d, 0x780a, 0x007c, 0x7830,
-        0xa084, 0x0040, 0x00c0, 0x4387, 0x2001, 0x4e04, 0x2004, 0xd0ec,
-        0x0040, 0x4396, 0xb284, 0x0300, 0x0078, 0x4398, 0xb284, 0x0400,
-        0x0040, 0x439e, 0x0098, 0x43a2, 0x0078, 0x43a0, 0x00a8, 0x43a2,
+        0xa084, 0x0040, 0x00c0, 0x43d7, 0x2001, 0x4f04, 0x2004, 0xd0ec,
+        0x0040, 0x43e6, 0xb284, 0x0300, 0x0078, 0x43e8, 0xb284, 0x0400,
+        0x0040, 0x43ee, 0x0098, 0x43f2, 0x0078, 0x43f0, 0x00a8, 0x43f2,
         0x78ac, 0x007c, 0x7808, 0xa084, 0xfffd, 0x780a, 0x0005, 0x0005,
-        0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x0040, 0x43c5, 0x007e,
-        0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x43bb, 0xb284,
-        0x0300, 0x0078, 0x43bd, 0xb284, 0x0400, 0x0040, 0x43c3, 0x0098,
-        0x43bf, 0x0078, 0x43c5, 0x00a8, 0x43c3, 0x78ac, 0x007e, 0x7808,
+        0x0005, 0x0005, 0x78ec, 0xa084, 0x0021, 0x0040, 0x4415, 0x007e,
+        0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f, 0x0040, 0x440b, 0xb284,
+        0x0300, 0x0078, 0x440d, 0xb284, 0x0400, 0x0040, 0x4413, 0x0098,
+        0x440f, 0x0078, 0x4415, 0x00a8, 0x4413, 0x78ac, 0x007e, 0x7808,
         0xa085, 0x0002, 0x780a, 0x007f, 0x007c, 0xa784, 0x0001, 0x00c0,
-        0x3770, 0xa784, 0x0070, 0x0040, 0x43dd, 0x0c7e, 0x2d60, 0x2f68,
-        0x1078, 0x28df, 0x2d78, 0x2c68, 0x0c7f, 0xa784, 0x0008, 0x0040,
-        0x43ea, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x3770,
-        0x0078, 0x430d, 0xa784, 0x0004, 0x0040, 0x4419, 0x78b8, 0xa084,
-        0x4001, 0x0040, 0x4419, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003,
-        0x0040, 0x3770, 0x78e4, 0xa084, 0x0007, 0xa086, 0x0001, 0x00c0,
-        0x4419, 0x78c0, 0xa685, 0x4800, 0x2030, 0x7e5a, 0x781b, 0x00f9,
-        0x007c, 0x784b, 0x0008, 0x6818, 0xd0fc, 0x0040, 0x4416, 0x681b,
-        0x0015, 0xd6f4, 0x0040, 0x4416, 0x681b, 0x0007, 0x1078, 0x4319,
+        0x37b9, 0xa784, 0x0070, 0x0040, 0x442d, 0x0c7e, 0x2d60, 0x2f68,
+        0x1078, 0x2926, 0x2d78, 0x2c68, 0x0c7f, 0xa784, 0x0008, 0x0040,
+        0x443a, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003, 0x0040, 0x37b9,
+        0x0078, 0x435d, 0xa784, 0x0004, 0x0040, 0x4469, 0x78b8, 0xa084,
+        0x4001, 0x0040, 0x4469, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003,
+        0x0040, 0x37b9, 0x78e4, 0xa084, 0x0007, 0xa086, 0x0001, 0x00c0,
+        0x4469, 0x78c0, 0xa685, 0x4800, 0x2030, 0x7e5a, 0x781b, 0x00f9,
+        0x007c, 0x784b, 0x0008, 0x6818, 0xd0fc, 0x0040, 0x4466, 0x681b,
+        0x0015, 0xd6f4, 0x0040, 0x4466, 0x681b, 0x0007, 0x1078, 0x4369,
         0x007c, 0x681b, 0x0003, 0x7858, 0xa084, 0x3f00, 0x681e, 0x682f,
         0x0000, 0x6833, 0x0000, 0x784b, 0x0008, 0x78ec, 0xa084, 0x0003,
-        0x0040, 0x3066, 0x007e, 0x2001, 0x4e04, 0x2004, 0xd0ec, 0x007f,
-        0x0040, 0x4436, 0xb284, 0x0300, 0x0078, 0x4438, 0xb284, 0x0400,
-        0x0040, 0x443e, 0x0018, 0x29c1, 0x0078, 0x4440, 0x0028, 0x29c1,
-        0x0078, 0x40bc, 0x6b14, 0x8307, 0xa084, 0x000f, 0x8003, 0x8003,
-        0x8003, 0xd3fc, 0x0040, 0x4450, 0xa080, 0x5340, 0x0078, 0x4452,
-        0xa080, 0x52c0, 0x2060, 0x2048, 0x705a, 0x2a60, 0x007c, 0x0020,
+        0x0040, 0x30af, 0x007e, 0x2001, 0x4f04, 0x2004, 0xd0ec, 0x007f,
+        0x0040, 0x4486, 0xb284, 0x0300, 0x0078, 0x4488, 0xb284, 0x0400,
+        0x0040, 0x448e, 0x0018, 0x2a08, 0x0078, 0x4490, 0x0028, 0x2a08,
+        0x0078, 0x410c, 0x6b14, 0x8307, 0xa084, 0x000f, 0x8003, 0x8003,
+        0x8003, 0xd3fc, 0x0040, 0x44a0, 0xa080, 0x5440, 0x0078, 0x44a2,
+        0xa080, 0x53c0, 0x2060, 0x2048, 0x705a, 0x2a60, 0x007c, 0x0020,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
         0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000, 0x0020, 0x0000,
@@ -1763,255 +1773,276 @@ static unsigned short risc_code01[] = {
         0x0016, 0x7944, 0x8421, 0xa020, 0xa532, 0x84a1, 0x0016, 0x7944,
         0x8421, 0xa0df, 0x9532, 0x84a1, 0x0016, 0x0000, 0x127e, 0x70d4,
         0xa084, 0x4600, 0x8004, 0x2090, 0x7204, 0x7008, 0xc09c, 0xa205,
-        0x00c0, 0x45a2, 0x720c, 0x82ff, 0x0040, 0x459d, 0x8aff, 0x00c0,
-        0x45a2, 0x7200, 0xd284, 0x00c0, 0x45a2, 0x7003, 0x0008, 0x127f,
+        0x00c0, 0x4602, 0x720c, 0x82ff, 0x0040, 0x45ed, 0x8aff, 0x00c0,
+        0x4602, 0x7200, 0xd284, 0x00c0, 0x4602, 0x7804, 0xd0cc, 0x0040,
+        0x45f3, 0x1078, 0x4acc, 0x7023, 0x0000, 0x7027, 0x0000, 0x7000,
+        0xd084, 0x0040, 0x45fd, 0x7007, 0x0004, 0x7003, 0x0008, 0x127f,
         0x2000, 0x007c, 0x7000, 0xa084, 0x0003, 0x7002, 0xc69c, 0xd084,
-        0x0040, 0x45e5, 0x7108, 0x0005, 0x7008, 0xa106, 0x00c0, 0x45aa,
-        0xa184, 0x0003, 0x0040, 0x4616, 0xa184, 0x01e0, 0x00c0, 0x4616,
-        0xd1f4, 0x00c0, 0x45aa, 0xa184, 0x3000, 0xa086, 0x1000, 0x0040,
-        0x45aa, 0x2011, 0x0180, 0x710c, 0x8211, 0x0040, 0x45cf, 0x7008,
-        0xd0f4, 0x00c0, 0x45aa, 0x700c, 0xa106, 0x0040, 0x45c4, 0x7007,
-        0x0012, 0x7108, 0x0005, 0x7008, 0xa106, 0x00c0, 0x45d1, 0xa184,
-        0x0003, 0x0040, 0x4616, 0xd194, 0x0040, 0x45d1, 0xd1f4, 0x0040,
-        0x4616, 0x7007, 0x0002, 0x0078, 0x45aa, 0x7108, 0xd1fc, 0x0040,
-        0x45f0, 0x1078, 0x4769, 0x8aff, 0x0040, 0x458c, 0x0078, 0x45e5,
-        0x700c, 0xa08c, 0x03ff, 0x0040, 0x461b, 0x7004, 0xd084, 0x0040,
-        0x460d, 0x7014, 0xa005, 0x00c0, 0x4609, 0x7010, 0x7310, 0xa306,
-        0x00c0, 0x45fd, 0x2300, 0xa005, 0x0040, 0x460d, 0xa102, 0x00c8,
-        0x45e5, 0x7007, 0x0010, 0x0078, 0x4616, 0x8aff, 0x0040, 0x461b,
-        0x1078, 0x4970, 0x00c0, 0x4610, 0x0040, 0x45e5, 0x1078, 0x46b4,
-        0x127f, 0x2000, 0x007c, 0x7204, 0x7108, 0xc19c, 0x8103, 0x00c8,
-        0x462a, 0x7007, 0x0002, 0x0078, 0x461b, 0x7003, 0x0008, 0x127f,
-        0x2000, 0x007c, 0xa205, 0x00c0, 0x4616, 0x7003, 0x0008, 0x127f,
-        0x2000, 0x007c, 0x6428, 0x84ff, 0x0040, 0x465e, 0x2c70, 0x7004,
-        0xa0bc, 0x000f, 0xa7b8, 0x466e, 0x273c, 0x87fb, 0x00c0, 0x464c,
-        0x0048, 0x4644, 0x1078, 0x296b, 0x609c, 0xa075, 0x0040, 0x465e,
-        0x0078, 0x4637, 0x2039, 0x4663, 0x2704, 0xae68, 0x6808, 0xa630,
-        0x680c, 0xa529, 0x8421, 0x0040, 0x465e, 0x8738, 0x2704, 0xa005,
-        0x00c0, 0x464d, 0x709c, 0xa075, 0x00c0, 0x4637, 0x007c, 0x0000,
-        0x0005, 0x0009, 0x000d, 0x0011, 0x0015, 0x0019, 0x001d, 0x0000,
-        0x0003, 0x0009, 0x000f, 0x0015, 0x001b, 0x0000, 0x0000, 0x4663,
-        0x4660, 0x0000, 0x0000, 0x8000, 0x0000, 0x4663, 0x0000, 0x466b,
-        0x4668, 0x0000, 0x0000, 0x0000, 0x0000, 0x466b, 0x0000, 0x4666,
-        0x4666, 0x0000, 0x0000, 0x8000, 0x0000, 0x4666, 0x0000, 0x466c,
-        0x466c, 0x0000, 0x0000, 0x0000, 0x0000, 0x466c, 0x2079, 0x4e00,
-        0x2071, 0x0010, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003, 0x0001,
-        0x7810, 0xd0ec, 0x0040, 0x46a2, 0x2009, 0x0001, 0x2071, 0x0020,
-        0x0078, 0x46a6, 0x2009, 0x0002, 0x2071, 0x0050, 0x7007, 0x000a,
-        0x7007, 0x0002, 0x7003, 0x0000, 0x8109, 0x0040, 0x46b3, 0x2071,
-        0x0020, 0x0078, 0x46a6, 0x007c, 0x7004, 0x8004, 0x00c8, 0x473d,
-        0x7108, 0x7008, 0xa106, 0x00c0, 0x46b8, 0xa184, 0x01e0, 0x0040,
-        0x46c5, 0x1078, 0x47ac, 0x0078, 0x4765, 0x7007, 0x0012, 0x2019,
-        0x0000, 0x7108, 0x7008, 0xa106, 0x00c0, 0x46c9, 0xa184, 0x01e0,
-        0x0040, 0x46d6, 0x1078, 0x47ac, 0x0078, 0x4765, 0x7810, 0xd0ec,
-        0x0040, 0x46f0, 0x2001, 0x04fd, 0x2004, 0xa086, 0x0003, 0x00c0,
-        0x46f4, 0xa184, 0x4000, 0x0040, 0x46f8, 0xa382, 0x0003, 0x00c8,
-        0x46f8, 0xa184, 0x0004, 0x0040, 0x46c9, 0x8318, 0x0078, 0x46c9,
-        0x7814, 0xd0ec, 0x00c0, 0x46f8, 0xa184, 0x4000, 0x00c0, 0x46c9,
-        0xa19c, 0x300c, 0xa386, 0x2004, 0x0040, 0x4715, 0xa386, 0x0008,
-        0x0040, 0x4720, 0x7004, 0xd084, 0x00c0, 0x4711, 0x7108, 0x7008,
-        0xa106, 0x00c0, 0x4706, 0xa184, 0x0003, 0x0040, 0x4711, 0x0078,
-        0x47ac, 0xa386, 0x200c, 0x00c0, 0x46c9, 0x7200, 0x8204, 0x0048,
-        0x4720, 0x730c, 0xa384, 0x03ff, 0x0040, 0x4720, 0x1078, 0x296b,
-        0x7108, 0x7008, 0xa106, 0x00c0, 0x4720, 0xa184, 0x01e0, 0x0040,
-        0x472d, 0x1078, 0x47ac, 0x0078, 0x4765, 0x7007, 0x0012, 0x7000,
-        0xd084, 0x00c0, 0x473d, 0x7310, 0x7014, 0xa305, 0x0040, 0x473d,
-        0x710c, 0xa184, 0x03ff, 0x00c0, 0x46b4, 0x7108, 0x7008, 0xa106,
-        0x00c0, 0x473d, 0xa184, 0x01e0, 0x0040, 0x474a, 0x1078, 0x47ac,
-        0x0078, 0x4765, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004, 0xd09c,
-        0x00c0, 0x474e, 0x7108, 0x7008, 0xa106, 0x00c0, 0x4752, 0xa184,
-        0x01e0, 0x0040, 0x475f, 0x1078, 0x47ac, 0x0078, 0x4765, 0x7007,
-        0x0012, 0x7108, 0x8103, 0x0048, 0x4752, 0x7003, 0x0008, 0x007c,
-        0x7108, 0xa184, 0x01e0, 0x00c0, 0x47ac, 0x7108, 0xa184, 0x01e0,
-        0x00c0, 0x47ac, 0xa184, 0x0007, 0x0079, 0x4776, 0x4780, 0x4790,
-        0x477e, 0x4790, 0x477e, 0x47ee, 0x477e, 0x47ec, 0x1078, 0x296b,
-        0x7004, 0xa084, 0x0010, 0xc08d, 0x7006, 0x8aff, 0x00c0, 0x478b,
-        0x2049, 0x0000, 0x007c, 0x1078, 0x4970, 0x00c0, 0x478b, 0x007c,
-        0x7004, 0xa084, 0x0010, 0xc08d, 0x7006, 0x7004, 0xd084, 0x00c0,
-        0x47a4, 0x7108, 0x7008, 0xa106, 0x00c0, 0x4799, 0xa184, 0x0003,
-        0x0040, 0x47a4, 0x0078, 0x47ac, 0x8aff, 0x0040, 0x47ab, 0x1078,
-        0x4970, 0x00c0, 0x47a7, 0x007c, 0x7007, 0x0012, 0x7108, 0x00e0,
-        0x47af, 0x2091, 0x6000, 0x00e0, 0x47b3, 0x2091, 0x6000, 0x7007,
-        0x0012, 0x7007, 0x0008, 0x7004, 0xd09c, 0x00c0, 0x47bb, 0x7007,
-        0x0012, 0x7108, 0xd1fc, 0x00c0, 0x47bf, 0x7003, 0x0000, 0x7000,
-        0xa005, 0x00c0, 0x47d3, 0x7004, 0xa005, 0x00c0, 0x47d3, 0x700c,
-        0xa005, 0x0040, 0x47d5, 0x0078, 0x47b7, 0x2049, 0x0000, 0xb284,
-        0x0100, 0x0040, 0x47df, 0x2001, 0x0000, 0x0078, 0x47e1, 0x2001,
-        0x0001, 0x1078, 0x4212, 0x681b, 0x0002, 0x2051, 0x0000, 0x007c,
-        0x1078, 0x296b, 0x1078, 0x296b, 0x1078, 0x4836, 0x7210, 0x7114,
-        0x700c, 0xa09c, 0x03ff, 0x2800, 0xa300, 0xa211, 0xa189, 0x0000,
-        0x1078, 0x4836, 0x2704, 0x2c58, 0xac60, 0x6308, 0x2200, 0xa322,
-        0x630c, 0x2100, 0xa31b, 0x2400, 0xa305, 0x0040, 0x4811, 0x00c8,
-        0x4811, 0x8412, 0x8210, 0x830a, 0xa189, 0x0000, 0x2b60, 0x0078,
-        0x47f8, 0x2b60, 0x8a07, 0x007e, 0x6004, 0xa084, 0x0008, 0x0040,
-        0x481d, 0xa7ba, 0x4668, 0x0078, 0x481f, 0xa7ba, 0x4660, 0x007f,
-        0xa73d, 0x2c00, 0x6886, 0x6f8a, 0x6c92, 0x6b8e, 0x7108, 0x7008,
-        0xa106, 0x00c0, 0x4826, 0xa184, 0x01e0, 0x0040, 0x4831, 0x1078,
-        0x47ac, 0x7007, 0x0012, 0x1078, 0x46b4, 0x007c, 0x8a50, 0x8739,
-        0x2704, 0xa004, 0x00c0, 0x484a, 0x6000, 0xa064, 0x00c0, 0x4841,
-        0x2d60, 0x6004, 0xa084, 0x000f, 0xa080, 0x467e, 0x203c, 0x87fb,
-        0x1040, 0x296b, 0x007c, 0x127e, 0x0d7e, 0x70d4, 0xa084, 0x4600,
-        0x8004, 0x2090, 0x0d7f, 0x6884, 0x2060, 0x6888, 0x6b8c, 0x6c90,
-        0x8057, 0xaad4, 0x00ff, 0xa084, 0x00ff, 0x007e, 0x6804, 0xa084,
-        0x0008, 0x007f, 0x0040, 0x4868, 0xa0b8, 0x4668, 0x0078, 0x486a,
-        0xa0b8, 0x4660, 0xb284, 0x0100, 0x0040, 0x4871, 0x7e20, 0x0078,
-        0x4872, 0x7e24, 0xa6b5, 0x000c, 0x681c, 0xd0b4, 0x0040, 0x4879,
-        0xc685, 0x2400, 0xa305, 0x0040, 0x48a3, 0x2c58, 0x2704, 0x6104,
-        0xac60, 0x6000, 0xa400, 0x701a, 0x6004, 0xa301, 0x701e, 0xa184,
-        0x0008, 0x0040, 0x4893, 0x6010, 0xa081, 0x0000, 0x7022, 0x6014,
-        0xa081, 0x0000, 0x7026, 0x6208, 0x2400, 0xa202, 0x7012, 0x620c,
-        0x2300, 0xa203, 0x7016, 0x7602, 0x7007, 0x0001, 0x2b60, 0x1078,
-        0x499b, 0x0078, 0x48a5, 0x1078, 0x4970, 0x00c0, 0x48a3, 0x127f,
-        0x2000, 0x007c, 0x127e, 0x0d7e, 0x70d4, 0xa084, 0x4600, 0x8004,
-        0x2090, 0x0d7f, 0x7007, 0x0004, 0x7004, 0xd094, 0x00c0, 0x48b4,
-        0x7003, 0x0008, 0x127f, 0x2000, 0x007c, 0x127e, 0x0d7e, 0x70d4,
-        0xa084, 0x4600, 0x8004, 0x007e, 0x2090, 0x007f, 0x0d7f, 0x7e20,
-        0xb284, 0x0100, 0x00c0, 0x48cd, 0x7e24, 0xa6b5, 0x000c, 0x681c,
-        0xd0ac, 0x00c0, 0x48d8, 0xc685, 0x7003, 0x0000, 0x7007, 0x0004,
-        0x6828, 0x2050, 0x2d60, 0x6004, 0xa0bc, 0x000f, 0xa7b8, 0x466e,
-        0x273c, 0x87fb, 0x00c0, 0x48ee, 0x0048, 0x48e8, 0x1078, 0x296b,
-        0x689c, 0xa065, 0x0040, 0x48f2, 0x0078, 0x48db, 0x1078, 0x4970,
-        0x00c0, 0x48ee, 0x127f, 0x2000, 0x007c, 0x127e, 0x007e, 0x017e,
+        0x0040, 0x465b, 0x7108, 0x0005, 0x7008, 0xa106, 0x00c0, 0x460a,
+        0xa184, 0x0003, 0x0040, 0x468c, 0xa184, 0x01e0, 0x00c0, 0x468c,
+        0xd1f4, 0x00c0, 0x460a, 0xa184, 0x3000, 0xa086, 0x1000, 0x0040,
+        0x460a, 0x2001, 0x4f05, 0x2004, 0xd0e4, 0x0040, 0x4637, 0x2011,
+        0x0180, 0x710c, 0x8211, 0x0040, 0x4645, 0x7008, 0xd0f4, 0x00c0,
+        0x460a, 0x700c, 0xa106, 0x0040, 0x462a, 0x0078, 0x4627, 0x2011,
+        0x0180, 0x710c, 0x8211, 0x0040, 0x4645, 0x7008, 0xd0f4, 0x00c0,
+        0x460a, 0x700c, 0xa106, 0x0040, 0x463a, 0x7007, 0x0012, 0x7108,
+        0x0005, 0x7008, 0xa106, 0x00c0, 0x4647, 0xa184, 0x0003, 0x0040,
+        0x468c, 0xd194, 0x0040, 0x4647, 0xd1f4, 0x0040, 0x468c, 0x7007,
+        0x0002, 0x0078, 0x460a, 0x7108, 0xd1fc, 0x0040, 0x4666, 0x1078,
+        0x47ed, 0x8aff, 0x0040, 0x45dc, 0x0078, 0x465b, 0x700c, 0xa08c,
+        0x03ff, 0x0040, 0x4691, 0x7004, 0xd084, 0x0040, 0x4683, 0x7014,
+        0xa005, 0x00c0, 0x467f, 0x7010, 0x7310, 0xa306, 0x00c0, 0x4673,
+        0x2300, 0xa005, 0x0040, 0x4683, 0xa102, 0x00c8, 0x465b, 0x7007,
+        0x0010, 0x0078, 0x468c, 0x8aff, 0x0040, 0x4691, 0x1078, 0x49f2,
+        0x00c0, 0x4686, 0x0040, 0x465b, 0x1078, 0x4738, 0x127f, 0x2000,
+        0x007c, 0x7204, 0x7108, 0xc19c, 0x8103, 0x00c8, 0x46a0, 0x7007,
+        0x0002, 0x0078, 0x4691, 0x7003, 0x0008, 0x127f, 0x2000, 0x007c,
+        0xa205, 0x00c0, 0x468c, 0x7023, 0x0000, 0x7027, 0x0000, 0x7003,
+        0x0008, 0x007e, 0x2001, 0x4f01, 0x2004, 0xd0cc, 0x0040, 0x46b2,
+        0x1078, 0x4acc, 0x007f, 0x127f, 0x2000, 0x007c, 0x6428, 0x84ff,
+        0x0040, 0x46e2, 0x2c70, 0x7004, 0xa0bc, 0x000f, 0xa7b8, 0x46f2,
+        0x273c, 0x87fb, 0x00c0, 0x46d0, 0x0048, 0x46c8, 0x1078, 0x29b2,
+        0x609c, 0xa075, 0x0040, 0x46e2, 0x0078, 0x46bb, 0x2039, 0x46e7,
+        0x2704, 0xae68, 0x6808, 0xa630, 0x680c, 0xa529, 0x8421, 0x0040,
+        0x46e2, 0x8738, 0x2704, 0xa005, 0x00c0, 0x46d1, 0x709c, 0xa075,
+        0x00c0, 0x46bb, 0x007c, 0x0000, 0x0005, 0x0009, 0x000d, 0x0011,
+        0x0015, 0x0019, 0x001d, 0x0000, 0x0003, 0x0009, 0x000f, 0x0015,
+        0x001b, 0x0000, 0x0000, 0x46e7, 0x46e4, 0x0000, 0x0000, 0x8000,
+        0x0000, 0x46e7, 0x0000, 0x46ef, 0x46ec, 0x0000, 0x0000, 0x0000,
+        0x0000, 0x46ef, 0x0000, 0x46ea, 0x46ea, 0x0000, 0x0000, 0x8000,
+        0x0000, 0x46ea, 0x0000, 0x46f0, 0x46f0, 0x0000, 0x0000, 0x0000,
+        0x0000, 0x46f0, 0x2079, 0x4f00, 0x2071, 0x0010, 0x7007, 0x000a,
+        0x7007, 0x0002, 0x7003, 0x0001, 0x7810, 0xd0ec, 0x0040, 0x4726,
+        0x2009, 0x0001, 0x2071, 0x0020, 0x0078, 0x472a, 0x2009, 0x0002,
+        0x2071, 0x0050, 0x7007, 0x000a, 0x7007, 0x0002, 0x7003, 0x0000,
+        0x8109, 0x0040, 0x4737, 0x2071, 0x0020, 0x0078, 0x472a, 0x007c,
+        0x7004, 0x8004, 0x00c8, 0x47c1, 0x7108, 0x7008, 0xa106, 0x00c0,
+        0x473c, 0xa184, 0x01e0, 0x0040, 0x4749, 0x1078, 0x4830, 0x0078,
+        0x47e9, 0x7007, 0x0012, 0x2019, 0x0000, 0x7108, 0x7008, 0xa106,
+        0x00c0, 0x474d, 0xa184, 0x01e0, 0x0040, 0x475a, 0x1078, 0x4830,
+        0x0078, 0x47e9, 0x7810, 0xd0ec, 0x0040, 0x4774, 0x2001, 0x04fd,
+        0x2004, 0xa086, 0x0003, 0x00c0, 0x4778, 0xa184, 0x4000, 0x0040,
+        0x477c, 0xa382, 0x0003, 0x00c8, 0x477c, 0xa184, 0x0004, 0x0040,
+        0x474d, 0x8318, 0x0078, 0x474d, 0x7814, 0xd0ec, 0x00c0, 0x477c,
+        0xa184, 0x4000, 0x00c0, 0x474d, 0xa19c, 0x300c, 0xa386, 0x2004,
+        0x0040, 0x4799, 0xa386, 0x0008, 0x0040, 0x47a4, 0x7004, 0xd084,
+        0x00c0, 0x4795, 0x7108, 0x7008, 0xa106, 0x00c0, 0x478a, 0xa184,
+        0x0003, 0x0040, 0x4795, 0x0078, 0x4830, 0xa386, 0x200c, 0x00c0,
+        0x474d, 0x7200, 0x8204, 0x0048, 0x47a4, 0x730c, 0xa384, 0x03ff,
+        0x0040, 0x47a4, 0x1078, 0x29b2, 0x7108, 0x7008, 0xa106, 0x00c0,
+        0x47a4, 0xa184, 0x01e0, 0x0040, 0x47b1, 0x1078, 0x4830, 0x0078,
+        0x47e9, 0x7007, 0x0012, 0x7000, 0xd084, 0x00c0, 0x47c1, 0x7310,
+        0x7014, 0xa305, 0x0040, 0x47c1, 0x710c, 0xa184, 0x03ff, 0x00c0,
+        0x4738, 0x7108, 0x7008, 0xa106, 0x00c0, 0x47c1, 0xa184, 0x01e0,
+        0x0040, 0x47ce, 0x1078, 0x4830, 0x0078, 0x47e9, 0x7007, 0x0012,
+        0x7007, 0x0008, 0x7004, 0xd09c, 0x00c0, 0x47d2, 0x7108, 0x7008,
+        0xa106, 0x00c0, 0x47d6, 0xa184, 0x01e0, 0x0040, 0x47e3, 0x1078,
+        0x4830, 0x0078, 0x47e9, 0x7007, 0x0012, 0x7108, 0x8103, 0x0048,
+        0x47d6, 0x7003, 0x0008, 0x007c, 0x7108, 0xa184, 0x01e0, 0x00c0,
+        0x4830, 0x7108, 0xa184, 0x01e0, 0x00c0, 0x4830, 0xa184, 0x0007,
+        0x0079, 0x47fa, 0x4804, 0x4814, 0x4802, 0x4814, 0x4802, 0x4872,
+        0x4802, 0x4870, 0x1078, 0x29b2, 0x7004, 0xa084, 0x0010, 0xc08d,
+        0x7006, 0x8aff, 0x00c0, 0x480f, 0x2049, 0x0000, 0x007c, 0x1078,
+        0x49f2, 0x00c0, 0x480f, 0x007c, 0x7004, 0xa084, 0x0010, 0xc08d,
+        0x7006, 0x7004, 0xd084, 0x00c0, 0x4828, 0x7108, 0x7008, 0xa106,
+        0x00c0, 0x481d, 0xa184, 0x0003, 0x0040, 0x4828, 0x0078, 0x4830,
+        0x8aff, 0x0040, 0x482f, 0x1078, 0x49f2, 0x00c0, 0x482b, 0x007c,
+        0x7007, 0x0012, 0x7108, 0x00e0, 0x4833, 0x2091, 0x6000, 0x00e0,
+        0x4837, 0x2091, 0x6000, 0x7007, 0x0012, 0x7007, 0x0008, 0x7004,
+        0xd09c, 0x00c0, 0x483f, 0x7007, 0x0012, 0x7108, 0xd1fc, 0x00c0,
+        0x4843, 0x7003, 0x0000, 0x7000, 0xa005, 0x00c0, 0x4857, 0x7004,
+        0xa005, 0x00c0, 0x4857, 0x700c, 0xa005, 0x0040, 0x4859, 0x0078,
+        0x483b, 0x2049, 0x0000, 0xb284, 0x0100, 0x0040, 0x4863, 0x2001,
+        0x0000, 0x0078, 0x4865, 0x2001, 0x0001, 0x1078, 0x4262, 0x681b,
+        0x0002, 0x2051, 0x0000, 0x007c, 0x1078, 0x29b2, 0x1078, 0x29b2,
+        0x1078, 0x48b9, 0x7210, 0x7114, 0x700c, 0xa09c, 0x03ff, 0x2800,
+        0xa300, 0xa211, 0xa189, 0x0000, 0x1078, 0x48b9, 0x2704, 0x2c58,
+        0xac60, 0x6308, 0x2200, 0xa322, 0x630c, 0x2100, 0xa31b, 0x2400,
+        0xa305, 0x0040, 0x4895, 0x00c8, 0x4895, 0x8412, 0x8210, 0x830a,
+        0xa189, 0x0000, 0x2b60, 0x0078, 0x487c, 0x2b60, 0x8a07, 0x007e,
+        0x6004, 0xd09c, 0x0040, 0x48a0, 0xa7ba, 0x46ec, 0x0078, 0x48a2,
+        0xa7ba, 0x46e4, 0x007f, 0xa73d, 0x2c00, 0x6886, 0x6f8a, 0x6c92,
+        0x6b8e, 0x7108, 0x7008, 0xa106, 0x00c0, 0x48a9, 0xa184, 0x01e0,
+        0x0040, 0x48b4, 0x1078, 0x4830, 0x7007, 0x0012, 0x1078, 0x4738,
+        0x007c, 0x8a50, 0x8739, 0x2704, 0xa004, 0x00c0, 0x48cd, 0x6000,
+        0xa064, 0x00c0, 0x48c4, 0x2d60, 0x6004, 0xa084, 0x000f, 0xa080,
+        0x4702, 0x203c, 0x87fb, 0x1040, 0x29b2, 0x007c, 0x127e, 0x0d7e,
+        0x70d4, 0xa084, 0x4600, 0x8004, 0x2090, 0x0d7f, 0x6884, 0x2060,
+        0x6888, 0x6b8c, 0x6c90, 0x8057, 0xaad4, 0x00ff, 0xa084, 0x00ff,
+        0x007e, 0x6804, 0xa084, 0x0008, 0x007f, 0x0040, 0x48eb, 0xa0b8,
+        0x46ec, 0x0078, 0x48ed, 0xa0b8, 0x46e4, 0xb284, 0x0100, 0x0040,
+        0x48f4, 0x7e20, 0x0078, 0x48f5, 0x7e24, 0xa6b5, 0x000c, 0x681c,
+        0xd0b4, 0x0040, 0x48fc, 0xc685, 0x2400, 0xa305, 0x0040, 0x4925,
+        0x2c58, 0x2704, 0x6104, 0xac60, 0x6000, 0xa400, 0x701a, 0x6004,
+        0xa301, 0x701e, 0xd19c, 0x0040, 0x4915, 0x6010, 0xa081, 0x0000,
+        0x7022, 0x6014, 0xa081, 0x0000, 0x7026, 0x6208, 0x2400, 0xa202,
+        0x7012, 0x620c, 0x2300, 0xa203, 0x7016, 0x7602, 0x7007, 0x0001,
+        0x2b60, 0x1078, 0x4a1c, 0x0078, 0x4927, 0x1078, 0x49f2, 0x00c0,
+        0x4925, 0x127f, 0x2000, 0x007c, 0x127e, 0x0d7e, 0x70d4, 0xa084,
+        0x4600, 0x8004, 0x2090, 0x0d7f, 0x7007, 0x0004, 0x7004, 0xd094,
+        0x00c0, 0x4936, 0x7003, 0x0008, 0x127f, 0x2000, 0x007c, 0x127e,
         0x0d7e, 0x70d4, 0xa084, 0x4600, 0x8004, 0x007e, 0x2090, 0x007f,
-        0x7e20, 0xb284, 0x0100, 0x00c0, 0x4906, 0x7e24, 0x0d7f, 0x037f,
-        0x047f, 0xa6b5, 0x000c, 0x681c, 0xd0b4, 0x0040, 0x4914, 0xc685,
-        0x7003, 0x0000, 0x7007, 0x0004, 0x2049, 0x48f5, 0x6828, 0xa055,
-        0x0d7e, 0x0040, 0x496c, 0x2d70, 0x2e60, 0x7004, 0xa0bc, 0x000f,
-        0xa7b8, 0x466e, 0x273c, 0x87fb, 0x00c0, 0x4931, 0x0048, 0x492a,
-        0x1078, 0x296b, 0x709c, 0xa075, 0x2060, 0x0040, 0x496c, 0x0078,
-        0x491d, 0x2704, 0xae68, 0x6808, 0xa422, 0x680c, 0xa31b, 0x0048,
-        0x494a, 0x8a51, 0x00c0, 0x493e, 0x1078, 0x296b, 0x8738, 0x2704,
-        0xa005, 0x00c0, 0x4932, 0x709c, 0xa075, 0x2060, 0x0040, 0x496c,
-        0x0078, 0x491d, 0x8422, 0x8420, 0x831a, 0xa399, 0x0000, 0x6908,
-        0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x00c8, 0x4959, 0x1078,
-        0x296b, 0xb284, 0x0100, 0x0040, 0x4967, 0x2001, 0x4e04, 0x2004,
-        0xd0ec, 0x00c0, 0x4967, 0x2071, 0x0050, 0x0078, 0x4969, 0x2071,
-        0x0020, 0x0d7f, 0x0078, 0x4879, 0x0d7f, 0x127f, 0x2000, 0x007c,
-        0x7008, 0x007e, 0xa084, 0x01e0, 0x007f, 0x0040, 0x4979, 0xa006,
-        0x007c, 0xa084, 0x0003, 0xa086, 0x0003, 0x00c0, 0x4980, 0x007c,
-        0x2704, 0xac78, 0x7800, 0x701a, 0x7804, 0x701e, 0x7808, 0x7012,
-        0x780c, 0x7016, 0x6004, 0xa084, 0x0008, 0x0040, 0x4993, 0x7810,
-        0x7022, 0x7814, 0x7026, 0x7602, 0x7004, 0xa084, 0x0010, 0xc085,
-        0x7006, 0x2079, 0x4e00, 0x8a51, 0x0040, 0x49bf, 0x8738, 0x2704,
-        0xa005, 0x00c0, 0x49b1, 0x609c, 0xa005, 0x0040, 0x49c0, 0x2060,
-        0x6004, 0xa084, 0x000f, 0xa080, 0x466e, 0x203c, 0x87fb, 0x1040,
-        0x296b, 0x7008, 0x007e, 0xa084, 0x01e0, 0x007f, 0x0040, 0x49bb,
-        0xa006, 0x0078, 0x49c0, 0xa084, 0x0003, 0xa086, 0x0003, 0x007c,
-        0x2051, 0x0000, 0x007c, 0x127e, 0x007e, 0x0d7e, 0x70d4, 0xa084,
-        0x4600, 0x8004, 0x2090, 0x0d7f, 0x087f, 0x7108, 0xa184, 0x0003,
-        0x00c0, 0x49d8, 0x6828, 0xa005, 0x0040, 0x49e8, 0x0078, 0x45a2,
-        0x7108, 0xd1fc, 0x0040, 0x49e0, 0x1078, 0x4769, 0x0078, 0x49cd,
-        0x7007, 0x0010, 0x7108, 0xd1fc, 0x0040, 0x49e2, 0x1078, 0x4769,
-        0x7008, 0xa086, 0x0008, 0x00c0, 0x49cd, 0x7000, 0xa005, 0x00c0,
-        0x49cd, 0x7003, 0x0000, 0x2049, 0x0000, 0x127f, 0x2000, 0x007c,
-        0x127e, 0x147e, 0x137e, 0x157e, 0x0c7e, 0x0d7e, 0x70d4, 0xa084,
-        0x4600, 0x8004, 0x2090, 0x0d7f, 0x2049, 0x49f8, 0xad80, 0x0011,
-        0x20a0, 0xb284, 0x0100, 0x0040, 0x4a1b, 0x2001, 0x4e04, 0x2004,
-        0xd0ec, 0x0040, 0x4a17, 0x2099, 0x0031, 0x0078, 0x4a1d, 0x2099,
-        0x0032, 0x0078, 0x4a1d, 0x2099, 0x0031, 0x700c, 0xa084, 0x03ff,
-        0x682a, 0x7007, 0x0008, 0x7007, 0x0002, 0x7003, 0x0001, 0x0040,
-        0x4a2c, 0x8000, 0x80ac, 0x53a5, 0x700c, 0xa084, 0x03ff, 0x0040,
-        0x4a38, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4a33,
-        0x0c7f, 0x2049, 0x0000, 0x7003, 0x0000, 0x157f, 0x137f, 0x147f,
-        0x127f, 0x2000, 0x007c, 0x2091, 0x8000, 0x2091, 0x6000, 0x78ac,
-        0xa005, 0x00c0, 0x4a5a, 0x7974, 0x70d0, 0xa106, 0x00c0, 0x4a5a,
-        0x781c, 0xa005, 0x0040, 0x4a5a, 0x781f, 0x0000, 0x0068, 0x4a5a,
-        0x2091, 0x4080, 0x7830, 0x8001, 0x7832, 0x00c0, 0x4ae2, 0x7834,
-        0x7832, 0x7810, 0xd0ec, 0x00c0, 0x4adb, 0x2061, 0x73c0, 0x2069,
-        0x4e80, 0xc7fd, 0x68d0, 0xa005, 0x0040, 0x4a74, 0x8001, 0x68d2,
-        0x00c0, 0x4a74, 0x1078, 0x4cb0, 0x6800, 0xa084, 0x000f, 0x0040,
-        0x4a89, 0xa086, 0x0001, 0x0040, 0x4a89, 0x6844, 0xa00d, 0x0040,
-        0x4a89, 0x2104, 0xa005, 0x0040, 0x4a89, 0x8001, 0x200a, 0x0040,
-        0x4c23, 0x6814, 0xa005, 0x0040, 0x4aae, 0x8001, 0x6816, 0x00c0,
-        0x4aae, 0x68a7, 0x0001, 0x0f7e, 0xd7fc, 0x00c0, 0x4aa3, 0x7810,
-        0xd0ec, 0x0040, 0x4a9f, 0x2079, 0x0100, 0x0078, 0x4aa5, 0x2079,
-        0x0200, 0x0078, 0x4aa5, 0x2079, 0x0100, 0x1078, 0x4383, 0x0f7f,
-        0x6864, 0xa005, 0x0040, 0x4aae, 0x1078, 0x2628, 0x6880, 0xa005,
-        0x0040, 0x4abb, 0x8001, 0x6882, 0x00c0, 0x4abb, 0x6867, 0x0000,
-        0x68d4, 0xc0dd, 0x68d6, 0x68d4, 0xd0fc, 0x0040, 0x4ad8, 0xc0fc,
-        0x68d6, 0x20a9, 0x0200, 0x6034, 0xa005, 0x0040, 0x4ad4, 0x8001,
-        0x6036, 0x68d4, 0xc0fd, 0x68d6, 0x00c0, 0x4ad4, 0x6010, 0xa005,
-        0x0040, 0x4ad4, 0x1078, 0x2628, 0xace0, 0x0010, 0x00f0, 0x4ac3,
-        0xd7fc, 0x0040, 0x4ae2, 0x2061, 0x53c0, 0x2069, 0x4e40, 0xc7fc,
-        0x0078, 0x4a6a, 0x1078, 0x4b1e, 0x7838, 0x8001, 0x783a, 0x00c0,
-        0x4b04, 0x783c, 0x783a, 0x2061, 0x53c0, 0x2069, 0x4e40, 0xc7fc,
-        0x680c, 0xa005, 0x0040, 0x4af6, 0x1078, 0x4b88, 0xd7fc, 0x00c0,
-        0x4b04, 0x7810, 0xd0ec, 0x00c0, 0x4b04, 0x2061, 0x73c0, 0x2069,
-        0x4e80, 0xc7fd, 0x0078, 0x4af0, 0x7814, 0xd0e4, 0x00c0, 0x4b08,
-        0x7810, 0xd0cc, 0x0040, 0x4b1b, 0xd0ac, 0x00c0, 0x4b14, 0xd0a4,
-        0x0040, 0x4b1b, 0xc0ad, 0x7812, 0x2091, 0x8001, 0x0068, 0x4b1a,
-        0x1078, 0x2395, 0x007c, 0x2091, 0x8001, 0x007c, 0x7840, 0x8001,
-        0x7842, 0x00c0, 0x4b87, 0x7844, 0x7842, 0x2069, 0x4e40, 0xc7fc,
-        0x7810, 0x2079, 0x0200, 0xd0ec, 0x0040, 0x4b30, 0x2079, 0x0100,
-        0x68d8, 0xa005, 0x0040, 0x4b3c, 0x7de0, 0xa504, 0x00c0, 0x4b3c,
-        0x68da, 0x68d4, 0xc0bc, 0x68d6, 0x2079, 0x4e00, 0x6810, 0xa005,
-        0x00c0, 0x4b44, 0x2001, 0x0101, 0x8001, 0x6812, 0xd7fc, 0x0040,
-        0x4b4d, 0xa080, 0x94d0, 0x0078, 0x4b4f, 0xa080, 0x93c0, 0x2040,
-        0x2004, 0xa065, 0x0040, 0x4b79, 0x6024, 0xa005, 0x0040, 0x4b75,
-        0x8001, 0x6026, 0x00c0, 0x4b75, 0x6800, 0xa005, 0x0040, 0x4b68,
-        0x684c, 0xac06, 0x00c0, 0x4b68, 0x1078, 0x4c23, 0x0078, 0x4b79,
-        0x6864, 0xa005, 0x0040, 0x4b70, 0x6027, 0x0001, 0x0078, 0x4b75,
-        0x1078, 0x4bd6, 0x2804, 0x0078, 0x4b51, 0x6000, 0x2c40, 0x0078,
-        0x4b51, 0xd7fc, 0x00c0, 0x4b87, 0x7810, 0xd0ec, 0x00c0, 0x4b87,
-        0x2069, 0x4e80, 0xc7fd, 0x2079, 0x0100, 0x0078, 0x4b30, 0x007c,
-        0x2009, 0x0000, 0x20a9, 0x0200, 0x6008, 0xd09c, 0x0040, 0x4bc2,
-        0x6024, 0xa005, 0x0040, 0x4b98, 0x8001, 0x6026, 0x0078, 0x4bc0,
-        0x6008, 0xc09c, 0xd084, 0x00c0, 0x4ba0, 0xd0ac, 0x0040, 0x4bba,
-        0x600a, 0x6004, 0xa005, 0x0040, 0x4bc2, 0x0d7e, 0x0c7e, 0x017e,
-        0x2068, 0x6010, 0x8001, 0x6012, 0x1078, 0x3dd0, 0x2d00, 0x2c68,
-        0x2060, 0x1078, 0x1e5b, 0x1078, 0x201d, 0x017f, 0x0c7f, 0x0d7f,
-        0x0078, 0x4bc2, 0xc0bd, 0x600a, 0xa18d, 0x0001, 0x0078, 0x4bc2,
-        0xa18d, 0x0100, 0xace0, 0x0010, 0x00f0, 0x4b8c, 0xa184, 0x0001,
-        0x0040, 0x4bd1, 0xa18c, 0xfffe, 0x690e, 0x1078, 0x2628, 0x0078,
-        0x4bd2, 0x690e, 0x007c, 0x00c0, 0x4bd2, 0x786c, 0x2c00, 0x687e,
-        0x6714, 0x6f76, 0x6017, 0x0000, 0x602b, 0x0000, 0x601b, 0x0006,
-        0x60b4, 0xa084, 0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff, 0xa085,
-        0x0060, 0x6022, 0x6000, 0x2042, 0x1078, 0x1de4, 0x6818, 0xa005,
-        0x0040, 0x4bf4, 0x8001, 0x681a, 0x6808, 0xc0a4, 0x680a, 0x6810,
-        0x7908, 0x8109, 0x790a, 0x8001, 0x00d0, 0x4c00, 0x1078, 0x296b,
-        0x6812, 0x00c0, 0x4c06, 0x7910, 0xc1a5, 0x7912, 0x602f, 0x0000,
-        0x6033, 0x0000, 0x2c68, 0x1078, 0x202c, 0xd7fc, 0x00c0, 0x4c14,
-        0x2069, 0x4e40, 0x0078, 0x4c16, 0x2069, 0x4e80, 0x6910, 0xa184,
-        0x0100, 0x2001, 0x0006, 0x00c0, 0x4c20, 0x697a, 0x2001, 0x0004,
-        0x1078, 0x261c, 0x007c, 0x0d7e, 0x694c, 0x2160, 0xd7fc, 0x00c0,
-        0x4c35, 0x7810, 0xd0ec, 0x0040, 0x4c31, 0x2069, 0x0100, 0x0078,
-        0x4c37, 0x2069, 0x0200, 0x0078, 0x4c37, 0x2069, 0x0100, 0x1078,
-        0x28df, 0x601b, 0x0006, 0x6858, 0xa084, 0x3f00, 0x601e, 0x6020,
-        0xa084, 0x00ff, 0xa085, 0x0048, 0x6022, 0x602f, 0x0000, 0x6033,
-        0x0000, 0x6808, 0xa084, 0xfffd, 0x680a, 0x6830, 0xd0b4, 0x0040,
-        0x4c69, 0x684b, 0x0004, 0x20a9, 0x0014, 0x6848, 0xd094, 0x0040,
-        0x4c5b, 0x00f0, 0x4c55, 0x684b, 0x0009, 0x20a9, 0x0014, 0x6848,
-        0xd084, 0x0040, 0x4c65, 0x00f0, 0x4c5f, 0x20a9, 0x00fa, 0x00f0,
-        0x4c67, 0x681b, 0x0047, 0x0d7f, 0x6867, 0x0007, 0x007c, 0x2079,
-        0x4e00, 0x1078, 0x4ca3, 0x1078, 0x4c89, 0x1078, 0x4c96, 0x2009,
-        0x0002, 0x2069, 0x4e80, 0x680f, 0x0000, 0x6813, 0x0000, 0x6817,
-        0x0000, 0x8109, 0x0040, 0x4c88, 0x2069, 0x4e40, 0x0078, 0x4c7b,
-        0x007c, 0x7810, 0xd0ec, 0x0040, 0x4c91, 0x2019, 0x00cc, 0x0078,
-        0x4c93, 0x2019, 0x007b, 0x7b3a, 0x7b3e, 0x007c, 0x7814, 0xd0e4,
-        0x00c0, 0x4c9e, 0x2019, 0x0040, 0x0078, 0x4ca0, 0x2019, 0x0026,
-        0x7b42, 0x7b46, 0x007c, 0x7814, 0xd0e4, 0x00c0, 0x4cab, 0x2019,
-        0x3f94, 0x0078, 0x4cad, 0x2019, 0x2624, 0x7b32, 0x7b36, 0x007c,
-        0x6a50, 0xa285, 0x0000, 0x0040, 0x4cdc, 0x6954, 0x6bc0, 0xa300,
-        0x0c7e, 0x2164, 0x6304, 0x83ff, 0x00c0, 0x4cc8, 0x8211, 0x0040,
-        0x4ccc, 0x8108, 0xa11a, 0x0048, 0x4cb9, 0x69c0, 0x0078, 0x4cb9,
-        0x68d3, 0x000a, 0x0c7f, 0x007c, 0x6950, 0x6ac0, 0x2264, 0x602b,
-        0x0000, 0x602f, 0x0000, 0x6008, 0xc0b5, 0x600a, 0x8210, 0x8109,
-        0x00c0, 0x4cce, 0x6952, 0x0c7f, 0x007c, 0x00e0, 0x4cdd, 0x2091,
-        0x6000, 0x00e0, 0x4ce1, 0x2091, 0x6000, 0x70ec, 0xd0dc, 0x00c0,
-        0x4cee, 0xd0d4, 0x0040, 0x4d17, 0x0078, 0x4d1a, 0x2008, 0x7810,
-        0xd0ec, 0x0040, 0x4d01, 0xd1c4, 0x00c0, 0x4d39, 0x7814, 0xc0c5,
-        0x7816, 0x7810, 0xc0f5, 0x7812, 0xd0ec, 0x0040, 0x4d35, 0x0078,
-        0x4d31, 0xae8e, 0x0100, 0x0040, 0x4d0e, 0x7814, 0xc0f5, 0xc0c5,
-        0x7816, 0xd0d4, 0x00c0, 0x4d35, 0x0078, 0x4d31, 0x7814, 0xc0fd,
-        0xc0c5, 0x7816, 0xd0d4, 0x00c0, 0x4d35, 0x0078, 0x4d31, 0xd0e4,
-        0x0040, 0x4d37, 0x00e0, 0x4d1a, 0x2091, 0x6000, 0x2009, 0x000c,
-        0x00e0, 0x4d20, 0x2091, 0x6000, 0x8109, 0x00c0, 0x4d20, 0x70e4,
-        0xa084, 0x01ff, 0xa086, 0x01ff, 0x00c0, 0x4d31, 0x70ec, 0x0078,
-        0x4cee, 0x7804, 0xd08c, 0x0040, 0x4d37, 0x681f, 0x000c, 0x70a0,
-        0x70a2, 0x007c, 0x205b
+        0x0d7f, 0x7e20, 0xb284, 0x0100, 0x00c0, 0x494f, 0x7e24, 0xa6b5,
+        0x000c, 0x681c, 0xd0ac, 0x00c0, 0x495a, 0xc685, 0x7003, 0x0000,
+        0x7007, 0x0004, 0x6828, 0x2050, 0x2d60, 0x6004, 0xa0bc, 0x000f,
+        0xa7b8, 0x46f2, 0x273c, 0x87fb, 0x00c0, 0x4970, 0x0048, 0x496a,
+        0x1078, 0x29b2, 0x689c, 0xa065, 0x0040, 0x4974, 0x0078, 0x495d,
+        0x1078, 0x49f2, 0x00c0, 0x4970, 0x127f, 0x2000, 0x007c, 0x127e,
+        0x007e, 0x017e, 0x0d7e, 0x70d4, 0xa084, 0x4600, 0x8004, 0x007e,
+        0x2090, 0x007f, 0x7e20, 0xb284, 0x0100, 0x00c0, 0x4988, 0x7e24,
+        0x0d7f, 0x037f, 0x047f, 0xa6b5, 0x000c, 0x681c, 0xd0b4, 0x0040,
+        0x4996, 0xc685, 0x7003, 0x0000, 0x7007, 0x0004, 0x2049, 0x4977,
+        0x6828, 0xa055, 0x0d7e, 0x0040, 0x49ee, 0x2d70, 0x2e60, 0x7004,
+        0xa0bc, 0x000f, 0xa7b8, 0x46f2, 0x273c, 0x87fb, 0x00c0, 0x49b3,
+        0x0048, 0x49ac, 0x1078, 0x29b2, 0x709c, 0xa075, 0x2060, 0x0040,
+        0x49ee, 0x0078, 0x499f, 0x2704, 0xae68, 0x6808, 0xa422, 0x680c,
+        0xa31b, 0x0048, 0x49cc, 0x8a51, 0x00c0, 0x49c0, 0x1078, 0x29b2,
+        0x8738, 0x2704, 0xa005, 0x00c0, 0x49b4, 0x709c, 0xa075, 0x2060,
+        0x0040, 0x49ee, 0x0078, 0x499f, 0x8422, 0x8420, 0x831a, 0xa399,
+        0x0000, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x00c8,
+        0x49db, 0x1078, 0x29b2, 0xb284, 0x0100, 0x0040, 0x49e9, 0x2001,
+        0x4f04, 0x2004, 0xd0ec, 0x00c0, 0x49e9, 0x2071, 0x0050, 0x0078,
+        0x49eb, 0x2071, 0x0020, 0x0d7f, 0x0078, 0x48fc, 0x0d7f, 0x127f,
+        0x2000, 0x007c, 0x7008, 0x007e, 0xa084, 0x01e0, 0x007f, 0x0040,
+        0x49fb, 0xa006, 0x007c, 0xa084, 0x0003, 0xa086, 0x0003, 0x00c0,
+        0x4a02, 0x007c, 0x2704, 0xac78, 0x7800, 0x701a, 0x7804, 0x701e,
+        0x7808, 0x7012, 0x780c, 0x7016, 0x6004, 0xd09c, 0x0040, 0x4a14,
+        0x7810, 0x7022, 0x7814, 0x7026, 0x7602, 0x7004, 0xa084, 0x0010,
+        0xc085, 0x7006, 0x2079, 0x4f00, 0x8738, 0x8a51, 0x0040, 0x4a40,
+        0x2704, 0xa005, 0x00c0, 0x4a32, 0x609c, 0xa005, 0x0040, 0x4a41,
+        0x2060, 0x6004, 0xa084, 0x000f, 0xa080, 0x46f2, 0x203c, 0x87fb,
+        0x1040, 0x29b2, 0x7008, 0x007e, 0xa084, 0x01e0, 0x007f, 0x0040,
+        0x4a3c, 0xa006, 0x0078, 0x4a41, 0xa084, 0x0003, 0xa086, 0x0003,
+        0x007c, 0x2051, 0x0000, 0x007c, 0x127e, 0x007e, 0x0d7e, 0x70d4,
+        0xa084, 0x4600, 0x8004, 0x2090, 0x0d7f, 0x087f, 0x7108, 0xa184,
+        0x0003, 0x00c0, 0x4a59, 0x6828, 0xa005, 0x0040, 0x4a69, 0x0078,
+        0x4602, 0x7108, 0xd1fc, 0x0040, 0x4a61, 0x1078, 0x47ed, 0x0078,
+        0x4a4e, 0x7007, 0x0010, 0x7108, 0xd1fc, 0x0040, 0x4a63, 0x1078,
+        0x47ed, 0x7008, 0xa086, 0x0008, 0x00c0, 0x4a4e, 0x7000, 0xa005,
+        0x00c0, 0x4a4e, 0x7003, 0x0000, 0x2049, 0x0000, 0x007e, 0x7804,
+        0xd0cc, 0x0040, 0x4a7d, 0x1078, 0x4acc, 0x007f, 0x127f, 0x2000,
+        0x007c, 0x127e, 0x147e, 0x137e, 0x157e, 0x0c7e, 0x0d7e, 0x70d4,
+        0xa084, 0x4600, 0x8004, 0x2090, 0x0d7f, 0x2049, 0x4a81, 0xad80,
+        0x0011, 0x20a0, 0xb284, 0x0100, 0x0040, 0x4aa4, 0x2001, 0x4f04,
+        0x2004, 0xd0ec, 0x0040, 0x4aa0, 0x2099, 0x0031, 0x0078, 0x4aa6,
+        0x2099, 0x0032, 0x0078, 0x4aa6, 0x2099, 0x0031, 0x700c, 0xa084,
+        0x03ff, 0x682a, 0x7007, 0x0008, 0x7007, 0x0002, 0x7003, 0x0001,
+        0x0040, 0x4ab5, 0x8000, 0x80ac, 0x53a5, 0x700c, 0xa084, 0x03ff,
+        0x0040, 0x4ac1, 0x7007, 0x0004, 0x7004, 0xa084, 0x0004, 0x00c0,
+        0x4abc, 0x0c7f, 0x2049, 0x0000, 0x7003, 0x0000, 0x157f, 0x137f,
+        0x147f, 0x127f, 0x2000, 0x007c, 0x6814, 0xd0fc, 0x0040, 0x4b11,
+        0x7000, 0xd084, 0x0040, 0x4b11, 0x7e24, 0xa6b5, 0x0004, 0x7007,
+        0x0004, 0x7004, 0xa084, 0x0004, 0x00c0, 0x4ad9, 0x7118, 0x017e,
+        0x711c, 0x017e, 0x7120, 0x017e, 0x7124, 0x017e, 0xa00e, 0x711a,
+        0x701f, 0x3fff, 0x7122, 0x7126, 0x7013, 0x0004, 0x7116, 0x7602,
+        0x7007, 0x0001, 0x2001, 0xffff, 0x2009, 0x0031, 0x200a, 0x200a,
+        0x7108, 0x7008, 0xa106, 0x00c0, 0x4af8, 0xd1fc, 0x0040, 0x4af8,
+        0x027f, 0x7226, 0x027f, 0x7222, 0x027f, 0x721e, 0x027f, 0x721a,
+        0x7007, 0x0002, 0x7008, 0xa086, 0x0008, 0x0040, 0x4b11, 0x0078,
+        0x4830, 0x7007, 0x0004, 0x7003, 0x0000, 0x007c, 0x2091, 0x8000,
+        0x2091, 0x6000, 0x78ac, 0xa005, 0x00c0, 0x4b2d, 0x7974, 0x70d0,
+        0xa106, 0x00c0, 0x4b2d, 0x781c, 0xa005, 0x0040, 0x4b2d, 0x781f,
+        0x0000, 0x0068, 0x4b2d, 0x2091, 0x4080, 0x7830, 0x8001, 0x7832,
+        0x00c0, 0x4bb5, 0x7834, 0x7832, 0x7810, 0xd0ec, 0x00c0, 0x4bae,
+        0x2061, 0x74c0, 0x2069, 0x4f80, 0xc7fd, 0x68d0, 0xa005, 0x0040,
+        0x4b47, 0x8001, 0x68d2, 0x00c0, 0x4b47, 0x1078, 0x4d83, 0x6800,
+        0xa084, 0x000f, 0x0040, 0x4b5c, 0xa086, 0x0001, 0x0040, 0x4b5c,
+        0x6844, 0xa00d, 0x0040, 0x4b5c, 0x2104, 0xa005, 0x0040, 0x4b5c,
+        0x8001, 0x200a, 0x0040, 0x4cf6, 0x6814, 0xa005, 0x0040, 0x4b81,
+        0x8001, 0x6816, 0x00c0, 0x4b81, 0x68a7, 0x0001, 0x0f7e, 0xd7fc,
+        0x00c0, 0x4b76, 0x7810, 0xd0ec, 0x0040, 0x4b72, 0x2079, 0x0100,
+        0x0078, 0x4b78, 0x2079, 0x0200, 0x0078, 0x4b78, 0x2079, 0x0100,
+        0x1078, 0x43d3, 0x0f7f, 0x6864, 0xa005, 0x0040, 0x4b81, 0x1078,
+        0x266f, 0x6880, 0xa005, 0x0040, 0x4b8e, 0x8001, 0x6882, 0x00c0,
+        0x4b8e, 0x6867, 0x0000, 0x68d4, 0xc0dd, 0x68d6, 0x68d4, 0xd0fc,
+        0x0040, 0x4bab, 0xc0fc, 0x68d6, 0x20a9, 0x0200, 0x6034, 0xa005,
+        0x0040, 0x4ba7, 0x8001, 0x6036, 0x68d4, 0xc0fd, 0x68d6, 0x00c0,
+        0x4ba7, 0x6010, 0xa005, 0x0040, 0x4ba7, 0x1078, 0x266f, 0xace0,
+        0x0010, 0x00f0, 0x4b96, 0xd7fc, 0x0040, 0x4bb5, 0x2061, 0x54c0,
+        0x2069, 0x4f40, 0xc7fc, 0x0078, 0x4b3d, 0x1078, 0x4bf1, 0x7838,
+        0x8001, 0x783a, 0x00c0, 0x4bd7, 0x783c, 0x783a, 0x2061, 0x54c0,
+        0x2069, 0x4f40, 0xc7fc, 0x680c, 0xa005, 0x0040, 0x4bc9, 0x1078,
+        0x4c5b, 0xd7fc, 0x00c0, 0x4bd7, 0x7810, 0xd0ec, 0x00c0, 0x4bd7,
+        0x2061, 0x74c0, 0x2069, 0x4f80, 0xc7fd, 0x0078, 0x4bc3, 0x7814,
+        0xd0e4, 0x00c0, 0x4bdb, 0x7810, 0xd0cc, 0x0040, 0x4bee, 0xd0ac,
+        0x00c0, 0x4be7, 0xd0a4, 0x0040, 0x4bee, 0xc0ad, 0x7812, 0x2091,
+        0x8001, 0x0068, 0x4bed, 0x1078, 0x23dc, 0x007c, 0x2091, 0x8001,
+        0x007c, 0x7840, 0x8001, 0x7842, 0x00c0, 0x4c5a, 0x7844, 0x7842,
+        0x2069, 0x4f40, 0xc7fc, 0x7810, 0x2079, 0x0200, 0xd0ec, 0x0040,
+        0x4c03, 0x2079, 0x0100, 0x68d8, 0xa005, 0x0040, 0x4c0f, 0x7de0,
+        0xa504, 0x00c0, 0x4c0f, 0x68da, 0x68d4, 0xc0bc, 0x68d6, 0x2079,
+        0x4f00, 0x6810, 0xa005, 0x00c0, 0x4c17, 0x2001, 0x0101, 0x8001,
+        0x6812, 0xd7fc, 0x0040, 0x4c20, 0xa080, 0x95d0, 0x0078, 0x4c22,
+        0xa080, 0x94c0, 0x2040, 0x2004, 0xa065, 0x0040, 0x4c4c, 0x6024,
+        0xa005, 0x0040, 0x4c48, 0x8001, 0x6026, 0x00c0, 0x4c48, 0x6800,
+        0xa005, 0x0040, 0x4c3b, 0x684c, 0xac06, 0x00c0, 0x4c3b, 0x1078,
+        0x4cf6, 0x0078, 0x4c4c, 0x6864, 0xa005, 0x0040, 0x4c43, 0x6027,
+        0x0001, 0x0078, 0x4c48, 0x1078, 0x4ca9, 0x2804, 0x0078, 0x4c24,
+        0x6000, 0x2c40, 0x0078, 0x4c24, 0xd7fc, 0x00c0, 0x4c5a, 0x7810,
+        0xd0ec, 0x00c0, 0x4c5a, 0x2069, 0x4f80, 0xc7fd, 0x2079, 0x0100,
+        0x0078, 0x4c03, 0x007c, 0x2009, 0x0000, 0x20a9, 0x0200, 0x6008,
+        0xd09c, 0x0040, 0x4c95, 0x6024, 0xa005, 0x0040, 0x4c6b, 0x8001,
+        0x6026, 0x0078, 0x4c93, 0x6008, 0xc09c, 0xd084, 0x00c0, 0x4c73,
+        0xd0ac, 0x0040, 0x4c8d, 0x600a, 0x6004, 0xa005, 0x0040, 0x4c95,
+        0x0d7e, 0x0c7e, 0x017e, 0x2068, 0x6010, 0x8001, 0x6012, 0x1078,
+        0x3e19, 0x2d00, 0x2c68, 0x2060, 0x1078, 0x1ea2, 0x1078, 0x2064,
+        0x017f, 0x0c7f, 0x0d7f, 0x0078, 0x4c95, 0xc0bd, 0x600a, 0xa18d,
+        0x0001, 0x0078, 0x4c95, 0xa18d, 0x0100, 0xace0, 0x0010, 0x00f0,
+        0x4c5f, 0xa184, 0x0001, 0x0040, 0x4ca4, 0xa18c, 0xfffe, 0x690e,
+        0x1078, 0x266f, 0x0078, 0x4ca5, 0x690e, 0x007c, 0x00c0, 0x4ca5,
+        0x786c, 0x2c00, 0x687e, 0x6714, 0x6f76, 0x6017, 0x0000, 0x602b,
+        0x0000, 0x601b, 0x0006, 0x60b4, 0xa084, 0x3f00, 0x601e, 0x6020,
+        0xa084, 0x00ff, 0xa085, 0x0060, 0x6022, 0x6000, 0x2042, 0x1078,
+        0x1e2b, 0x6818, 0xa005, 0x0040, 0x4cc7, 0x8001, 0x681a, 0x6808,
+        0xc0a4, 0x680a, 0x6810, 0x7908, 0x8109, 0x790a, 0x8001, 0x00d0,
+        0x4cd3, 0x1078, 0x29b2, 0x6812, 0x00c0, 0x4cd9, 0x7910, 0xc1a5,
+        0x7912, 0x602f, 0x0000, 0x6033, 0x0000, 0x2c68, 0x1078, 0x2073,
+        0xd7fc, 0x00c0, 0x4ce7, 0x2069, 0x4f40, 0x0078, 0x4ce9, 0x2069,
+        0x4f80, 0x6910, 0xa184, 0x0100, 0x2001, 0x0006, 0x00c0, 0x4cf3,
+        0x697a, 0x2001, 0x0004, 0x1078, 0x2663, 0x007c, 0x0d7e, 0x694c,
+        0x2160, 0xd7fc, 0x00c0, 0x4d08, 0x7810, 0xd0ec, 0x0040, 0x4d04,
+        0x2069, 0x0100, 0x0078, 0x4d0a, 0x2069, 0x0200, 0x0078, 0x4d0a,
+        0x2069, 0x0100, 0x1078, 0x2926, 0x601b, 0x0006, 0x6858, 0xa084,
+        0x3f00, 0x601e, 0x6020, 0xa084, 0x00ff, 0xa085, 0x0048, 0x6022,
+        0x602f, 0x0000, 0x6033, 0x0000, 0x6808, 0xa084, 0xfffd, 0x680a,
+        0x6830, 0xd0b4, 0x0040, 0x4d3c, 0x684b, 0x0004, 0x20a9, 0x0014,
+        0x6848, 0xd094, 0x0040, 0x4d2e, 0x00f0, 0x4d28, 0x684b, 0x0009,
+        0x20a9, 0x0014, 0x6848, 0xd084, 0x0040, 0x4d38, 0x00f0, 0x4d32,
+        0x20a9, 0x00fa, 0x00f0, 0x4d3a, 0x681b, 0x0047, 0x0d7f, 0x6867,
+        0x0007, 0x007c, 0x2079, 0x4f00, 0x1078, 0x4d76, 0x1078, 0x4d5c,
+        0x1078, 0x4d69, 0x2009, 0x0002, 0x2069, 0x4f80, 0x680f, 0x0000,
+        0x6813, 0x0000, 0x6817, 0x0000, 0x8109, 0x0040, 0x4d5b, 0x2069,
+        0x4f40, 0x0078, 0x4d4e, 0x007c, 0x7810, 0xd0ec, 0x0040, 0x4d64,
+        0x2019, 0x00cc, 0x0078, 0x4d66, 0x2019, 0x007b, 0x7b3a, 0x7b3e,
+        0x007c, 0x7814, 0xd0e4, 0x00c0, 0x4d71, 0x2019, 0x0040, 0x0078,
+        0x4d73, 0x2019, 0x0026, 0x7b42, 0x7b46, 0x007c, 0x7814, 0xd0e4,
+        0x00c0, 0x4d7e, 0x2019, 0x3f94, 0x0078, 0x4d80, 0x2019, 0x2624,
+        0x7b32, 0x7b36, 0x007c, 0x6a50, 0xa285, 0x0000, 0x0040, 0x4daf,
+        0x6954, 0x6bc0, 0xa300, 0x0c7e, 0x2164, 0x6304, 0x83ff, 0x00c0,
+        0x4d9b, 0x8211, 0x0040, 0x4d9f, 0x8108, 0xa11a, 0x0048, 0x4d8c,
+        0x69c0, 0x0078, 0x4d8c, 0x68d3, 0x000a, 0x0c7f, 0x007c, 0x6950,
+        0x6ac0, 0x2264, 0x602b, 0x0000, 0x602f, 0x0000, 0x6008, 0xc0b5,
+        0x600a, 0x8210, 0x8109, 0x00c0, 0x4da1, 0x6952, 0x0c7f, 0x007c,
+        0x00e0, 0x4db0, 0x2091, 0x6000, 0x00e0, 0x4db4, 0x2091, 0x6000,
+        0x70ec, 0xd0dc, 0x00c0, 0x4dc1, 0xd0d4, 0x0040, 0x4dea, 0x0078,
+        0x4ded, 0x2008, 0x7810, 0xd0ec, 0x0040, 0x4dd4, 0xd1c4, 0x00c0,
+        0x4e0e, 0x7814, 0xc0c5, 0x7816, 0x7810, 0xc0f5, 0x7812, 0xd0ec,
+        0x0040, 0x4e0a, 0x0078, 0x4e06, 0xae8e, 0x0100, 0x0040, 0x4de1,
+        0x7814, 0xc0f5, 0xc0c5, 0x7816, 0xd0d4, 0x00c0, 0x4e0a, 0x0078,
+        0x4e06, 0x7814, 0xc0fd, 0xc0c5, 0x7816, 0xd0d4, 0x00c0, 0x4e0a,
+        0x0078, 0x4e06, 0xd0e4, 0x0040, 0x4e0c, 0x00e0, 0x4ded, 0x2091,
+        0x6000, 0x2009, 0x000c, 0x00e0, 0x4df3, 0x2091, 0x6000, 0x8109,
+        0x00c0, 0x4df3, 0x70e4, 0xa084, 0x01ff, 0xa086, 0x01ff, 0x00c0,
+        0x4e04, 0x70ec, 0x0078, 0x4dc1, 0x1078, 0x4e0f, 0x7804, 0xd08c,
+        0x0040, 0x4e0c, 0x681f, 0x000c, 0x70a0, 0x70a2, 0x007c, 0x7910,
+        0xd1ec, 0x0040, 0x4e19, 0x7814, 0xc0c4, 0xc1f4, 0x7912, 0x0078,
+        0x4e2b, 0xae8e, 0x0100, 0x0040, 0x4e25, 0x7814, 0xc0f4, 0xd0fc,
+        0x00c0, 0x4e2b, 0xc0c4, 0x0078, 0x4e2b, 0x7814, 0xc0fc, 0xd0f4,
+        0x00c0, 0x4e2b, 0xc0c4, 0x7816, 0x007c, 0x14e3
 };
 #ifdef UNIQUE_FW_NAME
-static unsigned short   fw1280ei_length01 = 0x3d3b;
+static unsigned short fw1280ei_length01 = 0x3e2e;
 #else
-static unsigned short   risc_code_length01 = 0x3d3b;
+static unsigned short risc_code_length01 = 0x3e2e;
 #endif
+
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 4ad280814990..1a4ce1c39478 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1098,7 +1098,13 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
 static int
 qla1280_eh_abort(struct scsi_cmnd * cmd)
 {
-        return qla1280_error_action(cmd, ABORT_COMMAND);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = qla1280_error_action(cmd, ABORT_COMMAND);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 /**************************************************************************
@@ -1108,7 +1114,13 @@ qla1280_eh_abort(struct scsi_cmnd * cmd)
 static int
 qla1280_eh_device_reset(struct scsi_cmnd *cmd)
 {
-        return qla1280_error_action(cmd, DEVICE_RESET);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = qla1280_error_action(cmd, DEVICE_RESET);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 /**************************************************************************
@@ -1118,7 +1130,13 @@ qla1280_eh_device_reset(struct scsi_cmnd *cmd)
 static int
 qla1280_eh_bus_reset(struct scsi_cmnd *cmd)
 {
-        return qla1280_error_action(cmd, BUS_RESET);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = qla1280_error_action(cmd, BUS_RESET);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 /**************************************************************************
@@ -1128,7 +1146,13 @@ qla1280_eh_bus_reset(struct scsi_cmnd *cmd)
 static int
 qla1280_eh_adapter_reset(struct scsi_cmnd *cmd)
 {
-        return qla1280_error_action(cmd, ADAPTER_RESET);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = qla1280_error_action(cmd, ADAPTER_RESET);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 static int
@@ -4038,11 +4062,10 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
                         scsi_status, handle);
         }
 
-        /* Target busy */
-        if (scsi_status & SS_BUSY_CONDITION &&
-            scsi_status != SS_RESERVE_CONFLICT) {
-                CMD_RESULT(cmd) =
-                        DID_BUS_BUSY << 16 | (scsi_status & 0xff);
+        /* Target busy or queue full */
+        if ((scsi_status & 0xFF) == SAM_STAT_TASK_SET_FULL ||
+            (scsi_status & 0xFF) == SAM_STAT_BUSY) {
+                CMD_RESULT(cmd) = scsi_status & 0xff;
         } else {
 
                 /* Save ISP completion status */
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index c4cd4ac414c4..329d1a1fa547 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -1063,8 +1063,7 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd * cmd)
                 return;
 
         printk("  sp flags=0x%x\n", sp->flags);
-        printk("  r_start=0x%lx, u_start=0x%lx, f_start=0x%lx, state=%d\n",
-            sp->r_start, sp->u_start, sp->f_start, sp->state);
+        printk("  state=%d\n", sp->state);
 }
 
 #if defined(QL_DEBUG_ROUTINES)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7d47b8d92047..83a32e403e29 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -252,31 +252,12 @@ typedef struct srb {
         /* Request state */
         uint16_t state;
 
-        /* Timing counts. */
-        unsigned long e_start;          /* Start of extend timeout */
-        unsigned long r_start;          /* Start of request */
-        unsigned long u_start;          /* When sent to RISC */
-        unsigned long f_start;          /* When placed in FO queue*/
-
         /* Single transfer DMA context */
         dma_addr_t dma_handle;
 
         uint32_t request_sense_length;
         uint8_t *request_sense_ptr;
 
-        int ext_history;
-
-        /* Suspend delay */
-        int delay;
-
-        /* Raw completion info for use by failover ? */
-        uint8_t fo_retry_cnt;           /* Retry count this request */
-        uint8_t err_id;                 /* error id */
-#define SRB_ERR_PORT    1               /* Request failed -- "port down" */
-#define SRB_ERR_LOOP    2               /* Request failed -- "loop down" */
-#define SRB_ERR_DEVICE  3               /* Request failed -- "device error" */
-#define SRB_ERR_OTHER   4
-
         /* SRB magic number */
         uint16_t magic;
 #define SRB_MAGIC       0x10CB
@@ -2082,23 +2063,8 @@ typedef struct scsi_qla_host {
         uint32_t        current_outstanding_cmd; 
         srb_t           *status_srb;    /* Status continuation entry. */
 
-        unsigned long   last_irq_cpu;   /* cpu where we got our last irq */
-
         uint16_t           revision;
         uint8_t           ports;
-        u_long            actthreads;
-        u_long            ipreq_cnt;
-        u_long            qthreads;
-
-        uint32_t        total_isr_cnt;          /* Interrupt count */
-        uint32_t        total_isp_aborts;       /* controller err cnt */
-        uint32_t        total_lip_cnt;          /* LIP cnt */
-        uint32_t        total_dev_errs;         /* device error cnt */
-        uint32_t        total_ios;              /* IO cnt */
-        uint64_t        total_bytes;            /* xfr byte cnt */
-        uint32_t        total_mbx_timeout;      /* mailbox timeout cnt */
-        uint32_t        total_loop_resync;      /* loop resyn cnt */
-        uint32_t        dropped_frame_error_cnt;
 
         /* ISP configuration data. */
         uint16_t        loop_id;                /* Host adapter loop id */
@@ -2124,8 +2090,6 @@ typedef struct scsi_qla_host {
 #define P2P_LOOP  3
 
         uint8_t         marker_needed; 
-        uint8_t         sns_retry_cnt;
-        uint8_t         mem_err;
 
         uint8_t         interrupts_on;
 
@@ -2138,16 +2102,11 @@ typedef struct scsi_qla_host {
         uint16_t        nvram_base;
 
         uint16_t        loop_reset_delay;
-        uint16_t        minimum_timeout;
         uint8_t         retry_count;
         uint8_t         login_timeout;
         uint16_t        r_a_tov;
         int             port_down_retry_count;
-        uint8_t         loop_down_timeout;
         uint8_t         mbx_count;
-        uint16_t        max_probe_luns;
-        uint16_t        max_luns;
-        uint16_t        max_targets;
         uint16_t        last_loop_id;
 
         uint32_t        login_retry_count; 
@@ -2181,7 +2140,6 @@ typedef struct scsi_qla_host {
         uint8_t dpc_active;                  /* DPC routine is active */
 
         /* Timeout timers. */
-        uint8_t         queue_restart_timer;   
         uint8_t         loop_down_abort_time;    /* port down timer */
         atomic_t        loop_down_timer;         /* loop down timer */
         uint8_t         link_down_timeout;       /* link down timeout */
@@ -2230,18 +2188,6 @@ typedef struct scsi_qla_host {
 
         mbx_cmd_t       mc;
 
-        uint8_t *cmdline;
-
-        uint32_t failover_type;
-        uint32_t failback_delay;
-        unsigned long   cfg_flags;
-#define CFG_ACTIVE      0       /* CFG during a failover, event update, or ioctl */
-#define CFG_FAILOVER    1       /* CFG during path change */
-
-        uint32_t        binding_type;
-#define BIND_BY_PORT_NAME       0
-#define BIND_BY_PORT_ID         1
-
         /* Basic firmware related information. */
         struct qla_board_info   *brd_info;
         uint16_t        fw_major_version;
@@ -2274,12 +2220,6 @@ typedef struct scsi_qla_host {
         uint8_t     nvram_version; 
         uint32_t    isp_abort_cnt;
 
-        /* Adapter I/O statistics for failover */
-        uint64_t        IosRequested;
-        uint64_t        BytesRequested;
-        uint64_t        IosExecuted;
-        uint64_t        BytesExecuted;
-
         /* Needed for BEACON */
         uint16_t        beacon_blink_led;
         uint16_t        beacon_green_on;
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 2efec6c24d60..164866b199e6 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -53,27 +53,13 @@ extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);
  */
 extern char qla2x00_version_str[];
 
-extern int num_hosts;
-extern int apiHBAInstance;
-
-extern struct _qla2x00stats qla2x00_stats;
-extern int ql2xretrycount;
 extern int ql2xlogintimeout;
 extern int qlport_down_retry;
-extern int ql2xmaxqdepth;
-extern int displayConfig;
 extern int ql2xplogiabsentdevice;
 extern int ql2xenablezio;
 extern int ql2xintrdelaytimer;
 extern int ql2xloginretrycount;
 
-extern int ConfigRequired;
-
-extern int Bind;
-extern int ql2xsuspendcount;
-#if defined(MODULE)
-extern char *ql2xopts;
-#endif
 extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
 
 extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 0387005fcb6d..7629558eba25 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -85,9 +85,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
         atomic_set(&ha->loop_state, LOOP_DOWN);
         ha->device_flags = 0;
-        ha->sns_retry_cnt = 0;
         ha->dpc_flags = 0;
-        ha->failback_delay = 0;
         ha->flags.management_server_logged_in = 0;
         ha->marker_needed = 0;
         ha->mbx_flags = 0;
@@ -171,8 +169,6 @@ check_fw_ready_again:
 
                                 if (wait_time == 0)
                                         rval = QLA_FUNCTION_FAILED;
-                                if (ha->mem_err)
-                                        restart_risc = 1;
                         } else if (ha->device_flags & DFLG_NO_CABLE)
                                 /* If no cable, then all is good. */
                                 rval = QLA_SUCCESS;
@@ -1410,13 +1406,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         /* Set minimum RATOV to 200 tenths of a second. */
         ha->r_a_tov = 200;
 
-        ha->minimum_timeout =
-            (ha->login_timeout * ha->retry_count) + nv->port_down_retry_count;
         ha->loop_reset_delay = nv->reset_delay;
 
-        /* Will get the value from NVRAM. */
-        ha->loop_down_timeout = LOOP_DOWN_TIMEOUT;
-
         /* Link Down Timeout = 0:
          *
          *      When Port Down timer expires we will start returning
@@ -1429,18 +1420,13 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
          */                                             
         if (nv->link_down_timeout == 0) {
                 ha->loop_down_abort_time =
-                    (LOOP_DOWN_TIME - ha->loop_down_timeout);
+                    (LOOP_DOWN_TIME - LOOP_DOWN_TIMEOUT);
         } else {
                 ha->link_down_timeout =  nv->link_down_timeout;
                 ha->loop_down_abort_time =
                     (LOOP_DOWN_TIME - ha->link_down_timeout);
         } 
 
-        ha->max_luns = MAX_LUNS;
-        ha->max_probe_luns = le16_to_cpu(nv->max_luns_per_target);
-        if (ha->max_probe_luns == 0)
-                ha->max_probe_luns = MIN_LUNS;
-
         /*
          * Need enough time to try and get the port back.
          */
@@ -1457,16 +1443,6 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         if (ql2xloginretrycount)
                 ha->login_retry_count = ql2xloginretrycount;
 
-        ha->binding_type = Bind;
-        if (ha->binding_type != BIND_BY_PORT_NAME &&
-            ha->binding_type != BIND_BY_PORT_ID) {
-                qla_printk(KERN_WARNING, ha,
-                    "Invalid binding type specified (%d), "
-                    "defaulting to BIND_BY_PORT_NAME!!!\n", ha->binding_type);
-
-                ha->binding_type = BIND_BY_PORT_NAME;
-        }
-
         icb->lun_enables = __constant_cpu_to_le16(0);
         icb->command_resource_count = 0;
         icb->immediate_notify_resource_count = 0;
@@ -1578,7 +1554,6 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
          */
         clear_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
         clear_bit(RSCN_UPDATE, &ha->dpc_flags);
-        ha->mem_err = 0 ;
 
         /* Determine what we need to do */
         if (ha->current_topology == ISP_CFG_FL &&
@@ -2707,7 +2682,6 @@ qla2x00_loop_resync(scsi_qla_host_t *ha)
         rval = QLA_SUCCESS;
 
         atomic_set(&ha->loop_state, LOOP_UPDATE);
-        qla2x00_stats.loop_resync++;
         clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
         if (ha->flags.online) {
                 if (!(rval = qla2x00_fw_ready(ha))) {
@@ -2786,9 +2760,6 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
         if (ha->flags.online) {
                 ha->flags.online = 0;
                 clear_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
-                qla2x00_stats.ispAbort++;
-                ha->total_isp_aborts++;  /* used by ioctl */
-                ha->sns_retry_cnt = 0;
 
                 qla_printk(KERN_INFO, ha,
                     "Performing ISP error recovery - ha= %p.\n", ha);
@@ -2810,8 +2781,6 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                         sp = ha->outstanding_cmds[cnt];
                         if (sp) {
                                 ha->outstanding_cmds[cnt] = NULL;
-                                if (ha->actthreads)
-                                        ha->actthreads--;
                                 sp->flags = 0;
                                 sp->cmd->result = DID_RESET << 16;
                                 sp->cmd->host_scribble = (unsigned char *)NULL;
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index af964bb3d870..ecaf9f83b2d4 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -433,11 +433,8 @@ qla2x00_start_scsi(srb_t *sp)
         } else
                 ha->request_ring_ptr++;
 
-        ha->actthreads++;
-        ha->total_ios++;
         sp->flags |= SRB_DMA_VALID;
         sp->state = SRB_ACTIVE_STATE;
-        sp->u_start = jiffies;
 
         /* Set chip new ring index. */
         WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), ha->req_ring_index);
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 6792cfae56e2..e7a8b74157a5 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -91,9 +91,6 @@ qla2100_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         }
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        ha->last_irq_cpu = _smp_processor_id();
-        ha->total_isr_cnt++;
-
         if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
             (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
                 spin_lock_irqsave(&ha->mbx_reg_lock, flags);
@@ -200,9 +197,6 @@ qla2300_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         }
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        ha->last_irq_cpu = _smp_processor_id();
-        ha->total_isr_cnt++;
-
         if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
             (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
                 spin_lock_irqsave(&ha->mbx_reg_lock, flags);
@@ -417,7 +411,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx)
                 /* Update AEN queue. */
                 qla2x00_enqueue_aen(ha, MBA_LIP_OCCURRED, NULL);
 
-                ha->total_lip_cnt++;
                 break;
 
         case MBA_LOOP_UP:               /* Loop Up Event */
@@ -485,7 +478,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx)
                 /* Update AEN queue. */
                 qla2x00_enqueue_aen(ha, MBA_LIP_RESET, NULL);
 
-                ha->total_lip_cnt++;
                 break;
 
         case MBA_POINT_TO_POINT:        /* Point-to-Point */
@@ -695,14 +687,11 @@ qla2x00_process_completed_request(struct scsi_qla_host *ha, uint32_t index)
                 /* Free outstanding command slot. */
                 ha->outstanding_cmds[index] = NULL;
 
-                if (ha->actthreads)
-                        ha->actthreads--;
                 CMD_COMPL_STATUS(sp->cmd) = 0L;
                 CMD_SCSI_STATUS(sp->cmd) = 0L;
 
                 /* Save ISP completion status */
                 sp->cmd->result = DID_OK << 16;
-                sp->fo_retry_cnt = 0;
                 qla2x00_sp_compl(ha, sp);
         } else {
                 DEBUG2(printk("scsi(%ld): Invalid ISP SCSI completion handle\n",
@@ -865,9 +854,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt)
                 return;
         }
 
-        if (ha->actthreads)
-                ha->actthreads--;
-
         comp_status = le16_to_cpu(pkt->comp_status);
         /* Mask of reserved bits 12-15, before we examine the scsi status */
         scsi_status = le16_to_cpu(pkt->scsi_status) & SS_MASK;
@@ -1026,7 +1012,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt)
                                     cp->request_bufflen));
 
                                 cp->result = DID_BUS_BUSY << 16;
-                                ha->dropped_frame_error_cnt++;
                                 break;
                         }
 
@@ -1233,8 +1218,7 @@ qla2x00_error_entry(scsi_qla_host_t *ha, sts_entry_t *pkt)
         if (sp) {
                 /* Free outstanding command slot. */
                 ha->outstanding_cmds[pkt->handle] = NULL;
-                if (ha->actthreads)
-                        ha->actthreads--;
+
                 /* Bad payload or header */
                 if (pkt->entry_status &
                     (RF_INV_E_ORDER | RF_INV_E_COUNT |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 15f6acaca305..eeaec7c50e6a 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -219,10 +219,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                 ha->flags.mbox_int = 0;
                 clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
-                if (ha->mailbox_out[0] != MBS_COMMAND_COMPLETE) {
-                        qla2x00_stats.mboxerr++;
+                if (ha->mailbox_out[0] != MBS_COMMAND_COMPLETE)
                         rval = QLA_FUNCTION_FAILED;
-                }
 
                 /* Load return mailbox registers. */
                 iptr2 = mcp->mb;
@@ -249,8 +247,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                 qla2x00_dump_regs(ha);
 #endif
 
-                qla2x00_stats.mboxtout++;
-                ha->total_mbx_timeout++;
                 rval = QLA_FUNCTION_TIMEOUT;
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 579448222d69..0b12498b7672 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -36,27 +36,12 @@ char qla2x00_version_str[40];
 /*
  * SRB allocation cache
  */
-char srb_cachep_name[16];
-kmem_cache_t *srb_cachep;
-
-/*
- * Stats for all adpaters.
- */
-struct _qla2x00stats qla2x00_stats;
+static kmem_cache_t *srb_cachep;
 
 /*
  * Ioctl related information.
  */
-int num_hosts;
-int apiHBAInstance;
-
-/*
- * Module parameter information and variables
- */
-int ql2xmaxqdepth;
-module_param(ql2xmaxqdepth, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(ql2xmaxqdepth,
-                "Maximum queue depth to report for target devices.");
+static int num_hosts;
 
 int ql2xlogintimeout = 20;
 module_param(ql2xlogintimeout, int, S_IRUGO|S_IRUSR);
@@ -69,12 +54,6 @@ MODULE_PARM_DESC(qlport_down_retry,
                 "Maximum number of command retries to a port that returns"
                 "a PORT-DOWN status.");
 
-int ql2xretrycount = 20;
-module_param(ql2xretrycount, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(ql2xretrycount,
-                "Maximum number of mid-layer retries allowed for a command.  "
-                "Default value is 20, ");
-
 int ql2xplogiabsentdevice;
 module_param(ql2xplogiabsentdevice, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xplogiabsentdevice,
@@ -95,25 +74,6 @@ MODULE_PARM_DESC(ql2xintrdelaytimer,
                 "ZIO: Waiting time for Firmware before it generates an "
                 "interrupt to the host to notify completion of request.");
 
-int ConfigRequired;
-module_param(ConfigRequired, int, S_IRUGO|S_IRUSR);
-MODULE_PARM_DESC(ConfigRequired,
-                "If 1, then only configured devices passed in through the"
-                "ql2xopts parameter will be presented to the OS");
-
-int Bind = BIND_BY_PORT_NAME;
-module_param(Bind, int, S_IRUGO|S_IRUSR);
-MODULE_PARM_DESC(Bind,
-                "Target persistent binding method: "
-                "0 by Portname (default); 1 by PortID; 2 by Nodename. ");
-
-int ql2xsuspendcount = SUSPEND_COUNT;
-module_param(ql2xsuspendcount, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(ql2xsuspendcount,
-                "Number of 6-second suspend iterations to perform while a "
-                "target returns a <NOT READY> status.  Default is 10 "
-                "iterations.");
-
 int ql2xloginretrycount = 0;
 module_param(ql2xloginretrycount, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xloginretrycount,
@@ -330,7 +290,6 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
         sp->fcport = fcport;
         sp->cmd = cmd;
         sp->flags = 0;
-        sp->err_id = 0;
 
         CMD_SP(cmd) = (void *)sp;
         cmd->scsi_done = done;
@@ -474,7 +433,6 @@ qla2x00_wait_for_loop_ready(scsi_qla_host_t *ha)
 
         while ((!atomic_read(&ha->loop_down_timer) &&
             atomic_read(&ha->loop_state) == LOOP_DOWN) ||
-            test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
             atomic_read(&ha->loop_state) != LOOP_READY) {
                 msleep(1000);
                 if (time_after_eq(jiffies, loop_timeout)) {
@@ -507,6 +465,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         int ret, i;
         unsigned int id, lun;
         unsigned long serial;
+        unsigned long flags;
 
         if (!CMD_SP(cmd))
                 return FAILED;
@@ -518,8 +477,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
         serial = cmd->serial_number;
 
         /* Check active list for command command. */
-        spin_unlock_irq(ha->host->host_lock);
-        spin_lock(&ha->hardware_lock);
+        spin_lock_irqsave(&ha->hardware_lock, flags);
         for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
                 sp = ha->outstanding_cmds[i];
 
@@ -534,7 +492,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
                     sp->state));
                 DEBUG3(qla2x00_print_scsi_cmd(cmd);)
 
-                spin_unlock(&ha->hardware_lock);
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 if (qla2x00_abort_command(ha, sp)) {
                         DEBUG2(printk("%s(%ld): abort_command "
                             "mbx failed.\n", __func__, ha->host_no));
@@ -543,22 +501,20 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
                             "mbx success.\n", __func__, ha->host_no));
                         ret = SUCCESS;
                 }
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
 
                 break;
         }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Wait for the command to be returned. */
         if (ret == SUCCESS) {
-                spin_unlock(&ha->hardware_lock);
                 if (qla2x00_eh_wait_on_command(ha, cmd) != QLA_SUCCESS) {
                         qla_printk(KERN_ERR, ha, 
                             "scsi(%ld:%d:%d): Abort handler timed out -- %lx "
                             "%x.\n", ha->host_no, id, lun, serial, ret);
                 }
-                spin_lock(&ha->hardware_lock);
         }
-        spin_lock_irq(ha->host->host_lock);
 
         qla_printk(KERN_INFO, ha, 
             "scsi(%ld:%d:%d): Abort command issued -- %lx %x.\n", ha->host_no,
@@ -588,6 +544,7 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
         int     status;
         srb_t           *sp;
         struct scsi_cmnd *cmd;
+        unsigned long flags;
 
         status = 0;
 
@@ -596,11 +553,11 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
          * array
          */
         for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
                 sp = ha->outstanding_cmds[cnt];
                 if (sp) {
                         cmd = sp->cmd;
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                         if (cmd->device->id == t) {
                                 if (!qla2x00_eh_wait_on_command(ha, cmd)) {
                                         status = 1;
@@ -608,7 +565,7 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
                                 }
                         }
                 } else {
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 }
         }
         return (status);
@@ -657,12 +614,8 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
         qla_printk(KERN_INFO, ha,
             "scsi(%ld:%d:%d): DEVICE RESET ISSUED.\n", ha->host_no, id, lun);
 
-        spin_unlock_irq(ha->host->host_lock);
-
-        if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS) {
-                spin_lock_irq(ha->host->host_lock);
+        if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS)
                 goto eh_dev_reset_done;
-        }
 
         if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) {
                 if (qla2x00_device_reset(ha, fcport) == 0)
@@ -713,8 +666,6 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
             "scsi(%ld:%d:%d): DEVICE RESET SUCCEEDED.\n", ha->host_no, id, lun);
 
 eh_dev_reset_done:
-        spin_lock_irq(ha->host->host_lock);
-
         return ret;
 }
 
@@ -740,6 +691,7 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha)
         int     status;
         srb_t           *sp;
         struct scsi_cmnd *cmd;
+        unsigned long flags;
 
         status = 1;
 
@@ -748,17 +700,17 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha)
          * array
          */
         for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
                 sp = ha->outstanding_cmds[cnt];
                 if (sp) {
                         cmd = sp->cmd;
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                         status = qla2x00_eh_wait_on_command(ha, cmd);
                         if (status == 0)
                                 break;
                 }
                 else {
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 }
         }
         return (status);
@@ -803,8 +755,6 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
         qla_printk(KERN_INFO, ha,
             "scsi(%ld:%d:%d): LOOP RESET ISSUED.\n", ha->host_no, id, lun);
 
-        spin_unlock_irq(ha->host->host_lock);
-
         if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS) {
                 DEBUG2(printk("%s failed:board disabled\n",__func__));
                 goto eh_bus_reset_done;
@@ -826,8 +776,6 @@ eh_bus_reset_done:
         qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__,
             (ret == FAILED) ? "failed" : "succeded");
 
-        spin_lock_irq(ha->host->host_lock);
-
         return ret;
 }
 
@@ -869,8 +817,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
         qla_printk(KERN_INFO, ha,
             "scsi(%ld:%d:%d): ADAPTER RESET ISSUED.\n", ha->host_no, id, lun);
 
-        spin_unlock_irq(ha->host->host_lock);
-
         if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS)
                 goto eh_host_reset_lock;
 
@@ -899,8 +845,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
                 ret = SUCCESS;
 
 eh_host_reset_lock:
-        spin_lock_irq(ha->host->host_lock);
-
         qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__,
             (ret == FAILED) ? "failed" : "succeded");
 
@@ -1148,7 +1092,7 @@ iospace_error_exit:
  */
 int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
 {
-        int     ret;
+        int     ret = -ENODEV;
         device_reg_t __iomem *reg;
         struct Scsi_Host *host;
         scsi_qla_host_t *ha;
@@ -1159,7 +1103,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         fc_port_t *fcport;
 
         if (pci_enable_device(pdev))
-                return -1;
+                goto probe_out;
 
         host = scsi_host_alloc(&qla2x00_driver_template,
             sizeof(scsi_qla_host_t));
@@ -1181,9 +1125,8 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
 
         /* Configure PCI I/O space */
         ret = qla2x00_iospace_config(ha);
-        if (ret != 0) {
-                goto probe_alloc_failed;
-        }
+        if (ret)
+                goto probe_failed;
 
         /* Sanitize the information from PCI BIOS. */
         host->irq = pdev->irq;
@@ -1194,34 +1137,24 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
 
         spin_lock_init(&ha->hardware_lock);
 
-        /* 4.23 Initialize /proc/scsi/qla2x00 counters */
-        ha->actthreads = 0;
-        ha->qthreads   = 0;
-        ha->total_isr_cnt = 0;
-        ha->total_isp_aborts = 0;
-        ha->total_lip_cnt = 0;
-        ha->total_dev_errs = 0;
-        ha->total_ios = 0;
-        ha->total_bytes = 0;
-
         ha->prev_topology = 0;
         ha->ports = MAX_BUSES;
 
         if (IS_QLA2100(ha)) {
-                ha->max_targets = MAX_TARGETS_2100;
+                host->max_id = MAX_TARGETS_2100;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT_2100;
                 ha->request_q_length = REQUEST_ENTRY_CNT_2100;
                 ha->response_q_length = RESPONSE_ENTRY_CNT_2100;
                 ha->last_loop_id = SNS_LAST_LOOP_ID_2100;
                 host->sg_tablesize = 32;
         } else if (IS_QLA2200(ha)) {
-                ha->max_targets = MAX_TARGETS_2200;
+                host->max_id = MAX_TARGETS_2200;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 ha->request_q_length = REQUEST_ENTRY_CNT_2200;
                 ha->response_q_length = RESPONSE_ENTRY_CNT_2100;
                 ha->last_loop_id = SNS_LAST_LOOP_ID_2100;
         } else /*if (IS_QLA2300(ha))*/ {
-                ha->max_targets = MAX_TARGETS_2200;
+                host->max_id = MAX_TARGETS_2200;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 ha->request_q_length = REQUEST_ENTRY_CNT_2200;
                 ha->response_q_length = RESPONSE_ENTRY_CNT_2300;
@@ -1256,23 +1189,10 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 qla_printk(KERN_WARNING, ha,
                     "[ERROR] Failed to allocate memory for adapter\n");
 
-                goto probe_alloc_failed;
+                ret = -ENOMEM;
+                goto probe_failed;
         }
 
-        pci_set_drvdata(pdev, ha);
-        host->this_id = 255;
-        host->cmd_per_lun = 3;
-        host->unique_id = ha->instance;
-        host->max_cmd_len = MAX_CMDSZ;
-        host->max_channel = ha->ports - 1;
-        host->max_id = ha->max_targets;
-        host->max_lun = ha->max_luns;
-        host->transportt = qla2xxx_transport_template;
-        if (scsi_add_host(host, &pdev->dev))
-                goto probe_alloc_failed;
-
-        qla2x00_alloc_sysfs_attr(ha);
-
         if (qla2x00_initialize_adapter(ha) &&
             !(ha->device_flags & DFLG_NO_CABLE)) {
 
@@ -1283,11 +1203,10 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                     "Adapter flags %x.\n",
                     ha->host_no, ha->device_flags));
 
+                ret = -ENODEV;
                 goto probe_failed;
         }
 
-        qla2x00_init_host_attr(ha);
-
         /*
          * Startup the kernel thread for this host adapter
          */
@@ -1297,17 +1216,26 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 qla_printk(KERN_WARNING, ha,
                     "Unable to start DPC thread!\n");
 
+                ret = -ENODEV;
                 goto probe_failed;
         }
         wait_for_completion(&ha->dpc_inited);
 
+        host->this_id = 255;
+        host->cmd_per_lun = 3;
+        host->unique_id = ha->instance;
+        host->max_cmd_len = MAX_CMDSZ;
+        host->max_channel = ha->ports - 1;
+        host->max_lun = MAX_LUNS;
+        host->transportt = qla2xxx_transport_template;
+
         if (IS_QLA2100(ha) || IS_QLA2200(ha))
                 ret = request_irq(host->irq, qla2100_intr_handler,
                     SA_INTERRUPT|SA_SHIRQ, ha->brd_info->drv_name, ha);
         else
                 ret = request_irq(host->irq, qla2300_intr_handler,
                     SA_INTERRUPT|SA_SHIRQ, ha->brd_info->drv_name, ha);
-        if (ret != 0) {
+        if (ret) {
                 qla_printk(KERN_WARNING, ha,
                     "Failed to reserve interrupt %d already in use.\n",
                     host->irq);
@@ -1361,9 +1289,18 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 msleep(10);
         }
 
+        pci_set_drvdata(pdev, ha);
         ha->flags.init_done = 1;
         num_hosts++;
 
+        ret = scsi_add_host(host, &pdev->dev);
+        if (ret)
+                goto probe_failed;
+
+        qla2x00_alloc_sysfs_attr(ha);
+
+        qla2x00_init_host_attr(ha);
+
         qla_printk(KERN_INFO, ha, "\n"
             " QLogic Fibre Channel HBA Driver: %s\n"
             "  QLogic %s - %s\n"
@@ -1382,9 +1319,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
 probe_failed:
         fc_remove_host(ha->host);
 
-        scsi_remove_host(host);
-
-probe_alloc_failed:
         qla2x00_free_device(ha);
 
         scsi_host_put(host);
@@ -1392,7 +1326,8 @@ probe_alloc_failed:
 probe_disable_device:
         pci_disable_device(pdev);
 
-        return -1;
+probe_out:
+        return ret;
 }
 EXPORT_SYMBOL_GPL(qla2x00_probe_one);
 
@@ -2336,8 +2271,7 @@ static int __init
 qla2x00_module_init(void)
 {
         /* Allocate cache for SRBs. */
-        sprintf(srb_cachep_name, "qla2xxx_srbs");
-        srb_cachep = kmem_cache_create(srb_cachep_name, sizeof(srb_t), 0,
+        srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
             SLAB_HWCACHE_ALIGN, NULL, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
@@ -2365,16 +2299,7 @@ qla2x00_module_init(void)
 static void __exit
 qla2x00_module_exit(void)
 {
-        /* Free SRBs cache. */
-        if (srb_cachep != NULL) {
-                if (kmem_cache_destroy(srb_cachep) != 0) {
-                        printk(KERN_ERR
-                            "qla2xxx: Unable to free SRB cache...Memory pools "
-                            "still active?\n");
-                }
-                srb_cachep = NULL;
-        }
-
+        kmem_cache_destroy(srb_cachep);
         fc_release_transport(qla2xxx_transport_template);
 }
 
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index a1adb38f69bb..55e698b651d6 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -191,8 +191,6 @@ static Scsi_Host_Template qlogicfas_driver_template = {
         .queuecommand           = qlogicfas408_queuecommand,
         .eh_abort_handler       = qlogicfas408_abort,
         .eh_bus_reset_handler   = qlogicfas408_bus_reset,
-        .eh_device_reset_handler= qlogicfas408_device_reset,
-        .eh_host_reset_handler  = qlogicfas408_host_reset,
         .bios_param             = qlogicfas408_biosparam,
         .can_queue              = 1,
         .this_id                = -1,
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 5b6ce0a88f08..cb75e0b7baea 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -511,27 +511,15 @@ int qlogicfas408_abort(Scsi_Cmnd * cmd)
 int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)
 {
         struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
-        priv->qabort = 2;
-        ql_zap(priv);
-        return SUCCESS;
-}
-
-/* 
- *      Reset SCSI host controller
- */
+        unsigned long flags;
 
-int qlogicfas408_host_reset(Scsi_Cmnd * cmd)
-{
-        return FAILED;
-}
+        priv->qabort = 2;
 
-/* 
- *      Reset SCSI device
- */
+        spin_lock_irqsave(cmd->device->host->host_lock, flags);
+        ql_zap(priv);
+        spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
 
-int qlogicfas408_device_reset(Scsi_Cmnd * cmd)
-{
-        return FAILED;
+        return SUCCESS;
 }
 
 /*
@@ -626,8 +614,6 @@ EXPORT_SYMBOL(qlogicfas408_info);
 EXPORT_SYMBOL(qlogicfas408_queuecommand);
 EXPORT_SYMBOL(qlogicfas408_abort);
 EXPORT_SYMBOL(qlogicfas408_bus_reset);
-EXPORT_SYMBOL(qlogicfas408_device_reset);
-EXPORT_SYMBOL(qlogicfas408_host_reset);
 EXPORT_SYMBOL(qlogicfas408_biosparam);
 EXPORT_SYMBOL(qlogicfas408_ihandl);
 EXPORT_SYMBOL(qlogicfas408_get_chip_type);
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index f01cbd66c224..4b3df2003660 100644
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -109,8 +109,6 @@ int qlogicfas408_biosparam(struct scsi_device * disk,
                         sector_t capacity, int ip[]);
 int qlogicfas408_abort(Scsi_Cmnd * cmd);
 int qlogicfas408_bus_reset(Scsi_Cmnd * cmd);
-int qlogicfas408_host_reset(Scsi_Cmnd * cmd);
-int qlogicfas408_device_reset(Scsi_Cmnd * cmd);
 const char *qlogicfas408_info(struct Scsi_Host *host);
 int qlogicfas408_get_chip_type(int qbase, int int_type);
 void qlogicfas408_setup(int qbase, int id, int int_type);
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 69009f853a49..b0403ccd8a25 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -329,6 +329,8 @@ static void nv_host_stop (struct ata_host_set *host_set)
                 host->host_desc->disable_hotplug(host_set);
 
         kfree(host);
+
+        ata_host_stop(host_set);
 }
 
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index c4e9e0298122..5c1d4411457a 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -59,6 +59,7 @@ enum {
 
         board_2037x             = 0,    /* FastTrak S150 TX2plus */
         board_20319             = 1,    /* FastTrak S150 TX4 */
+        board_20619             = 2,    /* FastTrak TX4000 */
 
         PDC_HAS_PATA            = (1 << 1), /* PDC20375 has PATA */
 
@@ -122,6 +123,7 @@ static struct ata_port_operations pdc_ata_ops = {
         .scr_write              = pdc_sata_scr_write,
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info pdc_port_info[] = {
@@ -146,6 +148,17 @@ static struct ata_port_info pdc_port_info[] = {
                 .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                 .port_ops       = &pdc_ata_ops,
         },
+
+        /* board_20619 */
+        {
+                .sht            = &pdc_ata_sht,
+                .host_flags     = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST |
+                                  ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
+                .port_ops       = &pdc_ata_ops,
+        },
 };
 
 static struct pci_device_id pdc_ata_pci_tbl[] = {
@@ -171,6 +184,9 @@ static struct pci_device_id pdc_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x3d18, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_20319 },
 
+        { PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_20619 },
+
         { }     /* terminate list */
 };
 
@@ -635,6 +651,15 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         case board_2037x:
                 probe_ent->n_ports = 2;
                 break;
+        case board_20619:
+                probe_ent->n_ports = 4;
+
+                pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
+                pdc_ata_setup_port(&probe_ent->port[3], base + 0x380);
+
+                probe_ent->port[2].scr_addr = base + 0x600;
+                probe_ent->port[3].scr_addr = base + 0x700;
+                break;
         default:
                 BUG();
                 break;
@@ -675,7 +700,7 @@ static void __exit pdc_ata_exit(void)
 
 
 MODULE_AUTHOR("Jeff Garzik");
-MODULE_DESCRIPTION("Promise SATA TX2/TX4 low-level driver");
+MODULE_DESCRIPTION("Promise ATA TX2/TX4/TX4000 low-level driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index dfd362104717..1383e8a28d72 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -536,6 +536,8 @@ static void qs_host_stop(struct ata_host_set *host_set)
 
         writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
         writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */
+
+        ata_host_stop(host_set);
 }
 
 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 2b2ff48be396..49ed557a4b66 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -161,6 +161,7 @@ static struct ata_port_operations sil_ops = {
         .scr_write              = sil_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info sil_port_info[] = {
@@ -431,7 +432,13 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 writeb(cls, mmio_base + SIL_FIFO_R0);
                 writeb(cls, mmio_base + SIL_FIFO_W0);
                 writeb(cls, mmio_base + SIL_FIFO_R1);
-                writeb(cls, mmio_base + SIL_FIFO_W2);
+                writeb(cls, mmio_base + SIL_FIFO_W1);
+                if (ent->driver_data == sil_3114) {
+                        writeb(cls, mmio_base + SIL_FIFO_R2);
+                        writeb(cls, mmio_base + SIL_FIFO_W2);
+                        writeb(cls, mmio_base + SIL_FIFO_R3);
+                        writeb(cls, mmio_base + SIL_FIFO_W3);
+                }
         } else
                 printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
                         pci_name(pdev));
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 5105ddd08447..e418b89c6b9d 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -114,6 +114,7 @@ static struct ata_port_operations sis_ops = {
         .scr_write              = sis_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info sis_port_info = {
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 05075bd3a893..858e07185dbd 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -49,7 +49,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "1.05"
+#define DRV_VERSION     "1.06"
 
 /* Taskfile registers offsets */
 #define K2_SATA_TF_CMD_OFFSET           0x00
@@ -313,6 +313,7 @@ static struct ata_port_operations k2_sata_ops = {
         .scr_write              = k2_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -343,6 +344,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         void *mmio_base;
         int pci_dev_busy = 0;
         int rc;
+        int i;
 
         if (!printed_version++)
                 printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
@@ -420,11 +422,11 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->mwdma_mask = 0x7;
         probe_ent->udma_mask = 0x7f;
 
-        /* We have 4 ports per PCI function */
-        k2_sata_setup_port(&probe_ent->port[0], base + 0 * K2_SATA_PORT_OFFSET);
-        k2_sata_setup_port(&probe_ent->port[1], base + 1 * K2_SATA_PORT_OFFSET);
-        k2_sata_setup_port(&probe_ent->port[2], base + 2 * K2_SATA_PORT_OFFSET);
-        k2_sata_setup_port(&probe_ent->port[3], base + 3 * K2_SATA_PORT_OFFSET);
+        /* different controllers have different number of ports - currently 4 or 8 */
+        /* All ports are on the same function. Multi-function device is no
+         * longer available. This should not be seen in any system. */
+        for (i = 0; i < ent->driver_data; i++)
+                k2_sata_setup_port(&probe_ent->port[i], base + i * K2_SATA_PORT_OFFSET);
 
         pci_set_master(pdev);
 
@@ -444,11 +446,17 @@ err_out:
         return rc;
 }
 
-
+/* 0x240 is device ID for Apple K2 device
+ * 0x241 is device ID for Serverworks Frodo4
+ * 0x242 is device ID for Serverworks Frodo8
+ * 0x24a is device ID for BCM5785 (aka HT1000) HT southbridge integrated SATA
+ * controller
+ * */
 static struct pci_device_id k2_sata_pci_tbl[] = {
-        { 0x1166, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-        { 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+        { 0x1166, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+        { 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+        { 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
+        { 0x1166, 0x024a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { }
 };
 
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 70118650c461..140cea05de3f 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -245,6 +245,8 @@ static void pdc20621_host_stop(struct ata_host_set *host_set)
 
         iounmap(dimm_mmio);
         kfree(hpriv);
+
+        ata_host_stop(host_set);
 }
 
 static int pdc_port_start(struct ata_port *ap)
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 0bff4f475f26..a71fb54eebd3 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -113,6 +113,7 @@ static struct ata_port_operations uli_ops = {
 
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info uli_port_info = {
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 3a7830667277..f43183c19a12 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -134,6 +134,7 @@ static struct ata_port_operations svia_sata_ops = {
 
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info svia_port_info = {
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 2c28f0ad73c2..c5e09dc6f3de 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -21,6 +21,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -230,6 +231,7 @@ static struct ata_port_operations vsc_sata_ops = {
         .scr_write              = vsc_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 184bcaeaf812..5578ae9a9e45 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -638,10 +638,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         }
         spin_unlock_irqrestore(host->host_lock, flags);
         if (rtn) {
-                atomic_inc(&cmd->device->iodone_cnt);
-                scsi_queue_insert(cmd,
-                                (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
-                                 rtn : SCSI_MLQUEUE_HOST_BUSY);
+                if (scsi_delete_timer(cmd)) {
+                        atomic_inc(&cmd->device->iodone_cnt);
+                        scsi_queue_insert(cmd,
+                                          (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
+                                          rtn : SCSI_MLQUEUE_HOST_BUSY);
+                }
                 SCSI_LOG_MLQUEUE(3,
                     printk("queuecommand : request rejected\n"));
         }
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 2bf1ee2b47b6..ceb4e0c99b37 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -434,8 +434,7 @@ static void scsi_eh_times_out(struct scsi_cmnd *scmd)
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd:%p\n", __FUNCTION__,
                                           scmd));
 
-        if (scmd->device->host->eh_action)
-                up(scmd->device->host->eh_action);
+        up(scmd->device->host->eh_action);
 }
 
 /**
@@ -457,8 +456,7 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
                 SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n",
                                            __FUNCTION__, scmd, scmd->result));
 
-                if (scmd->device->host->eh_action)
-                        up(scmd->device->host->eh_action);
+                up(scmd->device->host->eh_action);
         }
 }
 
@@ -528,10 +526,8 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
                  * abort a timed out command or not.  not sure how
                  * we should treat them differently anyways.
                  */
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (shost->hostt->eh_abort_handler)
                         shost->hostt->eh_abort_handler(scmd);
-                spin_unlock_irqrestore(shost->host_lock, flags);
                         
                 scmd->request->rq_status = RQ_SCSI_DONE;
                 scmd->owner = SCSI_OWNER_ERROR_HANDLER;
@@ -737,11 +733,8 @@ static int scsi_eh_get_sense(struct list_head *work_q,
  **/
 static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
 {
-        unsigned long flags;
-        int rtn = FAILED;
-
         if (!scmd->device->host->hostt->eh_abort_handler)
-                return rtn;
+                return FAILED;
 
         /*
          * scsi_done was called just after the command timed out and before
@@ -752,11 +745,7 @@ static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
 
         scmd->owner = SCSI_OWNER_LOWLEVEL;
 
-        spin_lock_irqsave(scmd->device->host->host_lock, flags);
-        rtn = scmd->device->host->hostt->eh_abort_handler(scmd);
-        spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
-
-        return rtn;
+        return scmd->device->host->hostt->eh_abort_handler(scmd);
 }
 
 /**
@@ -770,6 +759,7 @@ static int scsi_eh_tur(struct scsi_cmnd *scmd)
 {
         static unsigned char tur_command[6] = {TEST_UNIT_READY, 0, 0, 0, 0, 0};
         int retry_cnt = 1, rtn;
+        int saved_result;
 
 retry_tur:
         memcpy(scmd->cmnd, tur_command, sizeof(tur_command));
@@ -780,6 +770,7 @@ retry_tur:
          */
         memset(scmd->sense_buffer, 0, sizeof(scmd->sense_buffer));
 
+        saved_result = scmd->result;
         scmd->request_buffer = NULL;
         scmd->request_bufflen = 0;
         scmd->use_sg = 0;
@@ -794,6 +785,7 @@ retry_tur:
          * the original request, so let's restore the original data. (db)
          */
         scsi_setup_cmd_retry(scmd);
+        scmd->result = saved_result;
 
         /*
          * hey, we are done.  let's look to see what happened.
@@ -865,17 +857,14 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
  **/
 static int scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
 {
-        unsigned long flags;
-        int rtn = FAILED;
+        int rtn;
 
         if (!scmd->device->host->hostt->eh_device_reset_handler)
-                return rtn;
+                return FAILED;
 
         scmd->owner = SCSI_OWNER_LOWLEVEL;
 
-        spin_lock_irqsave(scmd->device->host->host_lock, flags);
         rtn = scmd->device->host->hostt->eh_device_reset_handler(scmd);
-        spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
 
         if (rtn == SUCCESS) {
                 scmd->device->was_reset = 1;
@@ -896,6 +885,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
 {
         static unsigned char stu_command[6] = {START_STOP, 0, 0, 0, 1, 0};
         int rtn;
+        int saved_result;
 
         if (!scmd->device->allow_restart)
                 return 1;
@@ -908,6 +898,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
          */
         memset(scmd->sense_buffer, 0, sizeof(scmd->sense_buffer));
 
+        saved_result = scmd->result;
         scmd->request_buffer = NULL;
         scmd->request_bufflen = 0;
         scmd->use_sg = 0;
@@ -922,6 +913,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
          * the original request, so let's restore the original data. (db)
          */
         scsi_setup_cmd_retry(scmd);
+        scmd->result = saved_result;
 
         /*
          * hey, we are done.  let's look to see what happened.
@@ -1061,9 +1053,7 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)
         if (!scmd->device->host->hostt->eh_bus_reset_handler)
                 return FAILED;
 
-        spin_lock_irqsave(scmd->device->host->host_lock, flags);
         rtn = scmd->device->host->hostt->eh_bus_reset_handler(scmd);
-        spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
 
         if (rtn == SUCCESS) {
                 if (!scmd->device->host->hostt->skip_settle_delay)
@@ -1092,9 +1082,7 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)
         if (!scmd->device->host->hostt->eh_host_reset_handler)
                 return FAILED;
 
-        spin_lock_irqsave(scmd->device->host->host_lock, flags);
         rtn = scmd->device->host->hostt->eh_host_reset_handler(scmd);
-        spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
 
         if (rtn == SUCCESS) {
                 if (!scmd->device->host->hostt->skip_settle_delay)
@@ -1561,6 +1549,11 @@ static void scsi_eh_flush_done_q(struct list_head *done_q)
                                                           scmd));
                                 scsi_queue_insert(scmd, SCSI_MLQUEUE_EH_RETRY);
                 } else {
+                        /*
+                         * If just we got sense for the device (called
+                         * scsi_eh_get_sense), scmd->result is already
+                         * set, do not set DRIVER_TIMEOUT.
+                         */
                         if (!scmd->result)
                                 scmd->result |= (DRIVER_TIMEOUT << 24);
                         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush finish"
@@ -1870,7 +1863,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
                 rtn = FAILED;
         }
 
-        scsi_delete_timer(scmd);
         scsi_next_command(scmd);
         return rtn;
 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d18da21c9c57..9f996499fa9d 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -92,10 +92,12 @@ int scsi_insert_special_req(struct scsi_request *sreq, int at_head)
          */
         sreq->sr_request->flags &= ~REQ_DONTPREP;
         blk_insert_request(sreq->sr_device->request_queue, sreq->sr_request,
-                           at_head, sreq, 0);
+                           at_head, sreq);
         return 0;
 }
 
+static void scsi_run_queue(struct request_queue *q);
+
 /*
  * Function:    scsi_queue_insert()
  *
@@ -119,18 +121,14 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
 {
         struct Scsi_Host *host = cmd->device->host;
         struct scsi_device *device = cmd->device;
+        struct request_queue *q = device->request_queue;
+        unsigned long flags;
 
         SCSI_LOG_MLQUEUE(1,
                  printk("Inserting command %p into mlqueue\n", cmd));
 
         /*
-         * We are inserting the command into the ml queue.  First, we
-         * cancel the timer, so it doesn't time out.
-         */
-        scsi_delete_timer(cmd);
-
-        /*
-         * Next, set the appropriate busy bit for the device/host.
+         * Set the appropriate busy bit for the device/host.
          *
          * If the host/device isn't busy, assume that something actually
          * completed, and that we should be able to queue a command now.
@@ -160,17 +158,22 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
         scsi_device_unbusy(device);
 
         /*
-         * Insert this command at the head of the queue for it's device.
-         * It will go before all other commands that are already in the queue.
+         * Requeue this command.  It will go before all other commands
+         * that are already in the queue.
          *
          * NOTE: there is magic here about the way the queue is plugged if
          * we have no outstanding commands.
          * 
-         * Although this *doesn't* plug the queue, it does call the request
+         * Although we *don't* plug the queue, we call the request
          * function.  The SCSI request function detects the blocked condition
          * and plugs the queue appropriately.
-         */
-        blk_insert_request(device->request_queue, cmd->request, 1, cmd, 1);
+         */
+        spin_lock_irqsave(q->queue_lock, flags);
+        blk_requeue_request(q, cmd->request);
+        spin_unlock_irqrestore(q->queue_lock, flags);
+
+        scsi_run_queue(q);
+
         return 0;
 }
 
@@ -485,8 +488,13 @@ static void scsi_run_queue(struct request_queue *q)
  */
 static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 {
+        unsigned long flags;
+
         cmd->request->flags &= ~REQ_DONTPREP;
-        blk_insert_request(q, cmd->request, 1, cmd, 1);
+
+        spin_lock_irqsave(q->queue_lock, flags);
+        blk_requeue_request(q, cmd->request);
+        spin_unlock_irqrestore(q->queue_lock, flags);
 
         scsi_run_queue(q);
 }
@@ -941,10 +949,8 @@ static int scsi_init_io(struct scsi_cmnd *cmd)
          * if sg table allocation fails, requeue request later.
          */
         sgpnt = scsi_alloc_sgtable(cmd, GFP_ATOMIC);
-        if (unlikely(!sgpnt)) {
-                req->flags |= REQ_SPECIAL;
+        if (unlikely(!sgpnt))
                 return BLKPREP_DEFER;
-        }
 
         cmd->request_buffer = (char *) sgpnt;
         cmd->request_bufflen = req->nr_sectors << 9;
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index cca772624ae7..9fa209097e3b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -293,6 +293,10 @@ static void scsi_target_dev_release(struct device *dev)
 {
         struct device *parent = dev->parent;
         struct scsi_target *starget = to_scsi_target(dev);
+        struct Scsi_Host *shost = dev_to_shost(parent);
+
+        if (shost->hostt->target_destroy)
+                shost->hostt->target_destroy(starget);
         kfree(starget);
         put_device(parent);
 }
@@ -360,9 +364,23 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         list_add_tail(&starget->siblings, &shost->__targets);
         spin_unlock_irqrestore(shost->host_lock, flags);
         /* allocate and add */
-        transport_setup_device(&starget->dev);
-        device_add(&starget->dev);
-        transport_add_device(&starget->dev);
+        transport_setup_device(dev);
+        device_add(dev);
+        transport_add_device(dev);
+        if (shost->hostt->target_alloc) {
+                int error = shost->hostt->target_alloc(starget);
+
+                if(error) {
+                        dev_printk(KERN_ERR, dev, "target allocation failed, error %d\n", error);
+                        /* don't want scsi_target_reap to do the final
+                         * put because it will be under the host lock */
+                        get_device(dev);
+                        scsi_target_reap(starget);
+                        put_device(dev);
+                        return NULL;
+                }
+        }
+
         return starget;
 
  found:
@@ -625,6 +643,7 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
         case TYPE_MEDIUM_CHANGER:
         case TYPE_ENCLOSURE:
         case TYPE_COMM:
+        case TYPE_RBC:
                 sdev->writeable = 1;
                 break;
         case TYPE_WORM:
@@ -1197,6 +1216,7 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
         if (!starget)
                 return ERR_PTR(-ENOMEM);
 
+        get_device(&starget->dev);
         down(&shost->scan_mutex);
         res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
         if (res != SCSI_SCAN_LUN_PRESENT)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index e75ee4671ee3..93b41100a6d8 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -230,7 +230,7 @@ void scsi_sysfs_unregister(void)
  */
 #define sdev_show_function(field, format_string)                                \
 static ssize_t                                                          \
-sdev_show_##field (struct device *dev, char *buf)                               \
+sdev_show_##field (struct device *dev, struct device_attribute *attr, char *buf)                                \
 {                                                                       \
         struct scsi_device *sdev;                                       \
         sdev = to_scsi_device(dev);                                     \
@@ -254,7 +254,7 @@ static DEVICE_ATTR(field, S_IRUGO, sdev_show_##field, NULL);
         sdev_show_function(field, format_string)                                \
                                                                         \
 static ssize_t                                                          \
-sdev_store_##field (struct device *dev, const char *buf, size_t count)  \
+sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)   \
 {                                                                       \
         struct scsi_device *sdev;                                       \
         sdev = to_scsi_device(dev);                                     \
@@ -274,7 +274,7 @@ static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##fie
         sdev_show_function(field, "%d\n")                                       \
                                                                         \
 static ssize_t                                                          \
-sdev_store_##field (struct device *dev, const char *buf, size_t count)  \
+sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)   \
 {                                                                       \
         int ret;                                                        \
         struct scsi_device *sdev;                                       \
@@ -317,7 +317,7 @@ sdev_rd_attr (model, "%.16s\n");
 sdev_rd_attr (rev, "%.4s\n");
 
 static ssize_t
-sdev_show_timeout (struct device *dev, char *buf)
+sdev_show_timeout (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev;
         sdev = to_scsi_device(dev);
@@ -325,7 +325,7 @@ sdev_show_timeout (struct device *dev, char *buf)
 }
 
 static ssize_t
-sdev_store_timeout (struct device *dev, const char *buf, size_t count)
+sdev_store_timeout (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct scsi_device *sdev;
         int timeout;
@@ -337,14 +337,14 @@ sdev_store_timeout (struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);
 
 static ssize_t
-store_rescan_field (struct device *dev, const char *buf, size_t count) 
+store_rescan_field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         scsi_rescan_device(dev);
         return count;
 }
 static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field);
 
-static ssize_t sdev_store_delete(struct device *dev, const char *buf,
+static ssize_t sdev_store_delete(struct device *dev, struct device_attribute *attr, const char *buf,
                                  size_t count)
 {
         scsi_remove_device(to_scsi_device(dev));
@@ -353,7 +353,7 @@ static ssize_t sdev_store_delete(struct device *dev, const char *buf,
 static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
 
 static ssize_t
-store_state_field(struct device *dev, const char *buf, size_t count)
+store_state_field(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         int i;
         struct scsi_device *sdev = to_scsi_device(dev);
@@ -376,7 +376,7 @@ store_state_field(struct device *dev, const char *buf, size_t count)
 }
 
 static ssize_t
-show_state_field(struct device *dev, char *buf)
+show_state_field(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         const char *name = scsi_device_state_name(sdev->sdev_state);
@@ -390,7 +390,7 @@ show_state_field(struct device *dev, char *buf)
 static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_state_field, store_state_field);
 
 static ssize_t
-show_queue_type_field(struct device *dev, char *buf)
+show_queue_type_field(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         const char *name = "none";
@@ -406,7 +406,7 @@ show_queue_type_field(struct device *dev, char *buf)
 static DEVICE_ATTR(queue_type, S_IRUGO, show_queue_type_field, NULL);
 
 static ssize_t
-show_iostat_counterbits(struct device *dev, char *buf)
+show_iostat_counterbits(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, 20, "%d\n", (int)sizeof(atomic_t) * 8);
 }
@@ -415,7 +415,7 @@ static DEVICE_ATTR(iocounterbits, S_IRUGO, show_iostat_counterbits, NULL);
 
 #define show_sdev_iostat(field)                                         \
 static ssize_t                                                          \
-show_iostat_##field(struct device *dev, char *buf)                      \
+show_iostat_##field(struct device *dev, struct device_attribute *attr, char *buf)                       \
 {                                                                       \
         struct scsi_device *sdev = to_scsi_device(dev);                 \
         unsigned long long count = atomic_read(&sdev->field);           \
@@ -449,7 +449,7 @@ static struct device_attribute *scsi_sysfs_sdev_attrs[] = {
         NULL
 };
 
-static ssize_t sdev_store_queue_depth_rw(struct device *dev, const char *buf,
+static ssize_t sdev_store_queue_depth_rw(struct device *dev, struct device_attribute *attr, const char *buf,
                                          size_t count)
 {
         int depth, retval;
@@ -475,7 +475,7 @@ static struct device_attribute sdev_attr_queue_depth_rw =
         __ATTR(queue_depth, S_IRUGO | S_IWUSR, sdev_show_queue_depth,
                sdev_store_queue_depth_rw);
 
-static ssize_t sdev_store_queue_type_rw(struct device *dev, const char *buf,
+static ssize_t sdev_store_queue_type_rw(struct device *dev, struct device_attribute *attr, const char *buf,
                                         size_t count)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
@@ -669,6 +669,13 @@ void __scsi_remove_target(struct scsi_target *starget)
         scsi_target_reap(starget);
 }
 
+static int __remove_child (struct device * dev, void * data)
+{
+        if (scsi_is_target_device(dev))
+                __scsi_remove_target(to_scsi_target(dev));
+        return 0;
+}
+
 /**
  * scsi_remove_target - try to remove a target and all its devices
  * @dev: generic starget or parent of generic stargets to be removed
@@ -679,7 +686,7 @@ void __scsi_remove_target(struct scsi_target *starget)
  */
 void scsi_remove_target(struct device *dev)
 {
-        struct device *rdev, *idev, *next;
+        struct device *rdev;
 
         if (scsi_is_target_device(dev)) {
                 __scsi_remove_target(to_scsi_target(dev));
@@ -687,10 +694,7 @@ void scsi_remove_target(struct device *dev)
         }
 
         rdev = get_device(dev);
-        list_for_each_entry_safe(idev, next, &dev->children, node) {
-                if (scsi_is_target_device(idev))
-                        __scsi_remove_target(to_scsi_target(idev));
-        }
+        device_for_each_child(dev, NULL, __remove_child);
         put_device(rdev);
 }
 EXPORT_SYMBOL(scsi_remove_target);
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 67c6cc40ce16..2918b9600db7 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -348,17 +348,21 @@ spi_transport_rd_attr(rd_strm, "%d\n");
 spi_transport_rd_attr(rti, "%d\n");
 spi_transport_rd_attr(pcomp_en, "%d\n");
 
+/* we only care about the first child device so we return 1 */
+static int child_iter(struct device *dev, void *data)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+
+        spi_dv_device(sdev);
+        return 1;
+}
+
 static ssize_t
 store_spi_revalidate(struct class_device *cdev, const char *buf, size_t count)
 {
         struct scsi_target *starget = transport_class_to_starget(cdev);
 
-        /* FIXME: we're relying on an awful lot of device internals
-         * here.  We really need a function to get the first available
-         * child */
-        struct device *dev = container_of(starget->dev.children.next, struct device, node);
-        struct scsi_device *sdev = to_scsi_device(dev);
-        spi_dv_device(sdev);
+        device_for_each_child(&starget->dev, NULL, child_iter);
         return count;
 }
 static CLASS_DEVICE_ATTR(revalidate, S_IWUSR, NULL, store_spi_revalidate);
@@ -669,6 +673,7 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
 {
         struct spi_internal *i = to_spi_internal(sreq->sr_host->transportt);
         struct scsi_device *sdev = sreq->sr_device;
+        struct scsi_target *starget = sdev->sdev_target;
         int period = 0, prevperiod = 0; 
         enum spi_compare_returns retval;
 
@@ -682,24 +687,40 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
                         break;
 
                 /* OK, retrain, fallback */
+                if (i->f->get_iu)
+                        i->f->get_iu(starget);
+                if (i->f->get_qas)
+                        i->f->get_qas(starget);
                 if (i->f->get_period)
                         i->f->get_period(sdev->sdev_target);
-                newperiod = spi_period(sdev->sdev_target);
-                period = newperiod > period ? newperiod : period;
-                if (period < 0x0d)
-                        period++;
-                else
-                        period += period >> 1;
-
-                if (unlikely(period > 0xff || period == prevperiod)) {
-                        /* Total failure; set to async and return */
-                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Domain Validation Failure, dropping back to Asynchronous\n");
-                        DV_SET(offset, 0);
-                        return SPI_COMPARE_FAILURE;
+
+                /* Here's the fallback sequence; first try turning off
+                 * IU, then QAS (if we can control them), then finally
+                 * fall down the periods */
+                if (i->f->set_iu && spi_iu(starget)) {
+                        SPI_PRINTK(starget, KERN_ERR, "Domain Validation Disabing Information Units\n");
+                        DV_SET(iu, 0);
+                } else if (i->f->set_qas && spi_qas(starget)) {
+                        SPI_PRINTK(starget, KERN_ERR, "Domain Validation Disabing Quick Arbitration and Selection\n");
+                        DV_SET(qas, 0);
+                } else {
+                        newperiod = spi_period(starget);
+                        period = newperiod > period ? newperiod : period;
+                        if (period < 0x0d)
+                                period++;
+                        else
+                                period += period >> 1;
+
+                        if (unlikely(period > 0xff || period == prevperiod)) {
+                                /* Total failure; set to async and return */
+                                SPI_PRINTK(starget, KERN_ERR, "Domain Validation Failure, dropping back to Asynchronous\n");
+                                DV_SET(offset, 0);
+                                return SPI_COMPARE_FAILURE;
+                        }
+                        SPI_PRINTK(starget, KERN_ERR, "Domain Validation detected failure, dropping back\n");
+                        DV_SET(period, period);
+                        prevperiod = period;
                 }
-                SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Domain Validation detected failure, dropping back\n");
-                DV_SET(period, period);
-                prevperiod = period;
         }
         return retval;
 }
@@ -768,23 +789,21 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
         
         if (spi_dv_device_compare_inquiry(sreq, buffer, buffer, DV_LOOPS)
             != SPI_COMPARE_SUCCESS) {
-                SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Domain Validation Initial Inquiry Failed\n");
+                SPI_PRINTK(starget, KERN_ERR, "Domain Validation Initial Inquiry Failed\n");
                 /* FIXME: should probably offline the device here? */
                 return;
         }
 
         /* test width */
         if (i->f->set_width && spi_max_width(starget) && sdev->wdtr) {
-                i->f->set_width(sdev->sdev_target, 1);
-
-                printk("WIDTH IS %d\n", spi_max_width(starget));
+                i->f->set_width(starget, 1);
 
                 if (spi_dv_device_compare_inquiry(sreq, buffer,
                                                    buffer + len,
                                                    DV_LOOPS)
                     != SPI_COMPARE_SUCCESS) {
-                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Wide Transfers Fail\n");
-                        i->f->set_width(sdev->sdev_target, 0);
+                        SPI_PRINTK(starget, KERN_ERR, "Wide Transfers Fail\n");
+                        i->f->set_width(starget, 0);
                 }
         }
 
@@ -792,7 +811,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
                 return;
 
         /* device can't handle synchronous */
-        if(!sdev->ppr && !sdev->sdtr)
+        if (!sdev->ppr && !sdev->sdtr)
                 return;
 
         /* see if the device has an echo buffer.  If it does we can
@@ -807,16 +826,30 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
         /* now set up to the maximum */
         DV_SET(offset, spi_max_offset(starget));
         DV_SET(period, spi_min_period(starget));
+        /* try QAS requests; this should be harmless to set if the
+         * target supports it */
+        DV_SET(qas, 1);
+        /* Also try IU transfers */
+        DV_SET(iu, 1);
+        if (spi_min_period(starget) < 9) {
+                /* This u320 (or u640). Ignore the coupled parameters
+                 * like DT and IU, but set the optional ones */
+                DV_SET(rd_strm, 1);
+                DV_SET(wr_flow, 1);
+                DV_SET(rti, 1);
+                if (spi_min_period(starget) == 8)
+                        DV_SET(pcomp_en, 1);
+        }
 
         if (len == 0) {
-                SPI_PRINTK(sdev->sdev_target, KERN_INFO, "Domain Validation skipping write tests\n");
+                SPI_PRINTK(starget, KERN_INFO, "Domain Validation skipping write tests\n");
                 spi_dv_retrain(sreq, buffer, buffer + len,
                                spi_dv_device_compare_inquiry);
                 return;
         }
 
         if (len > SPI_MAX_ECHO_BUFFER_SIZE) {
-                SPI_PRINTK(sdev->sdev_target, KERN_WARNING, "Echo buffer size %d is too big, trimming to %d\n", len, SPI_MAX_ECHO_BUFFER_SIZE);
+                SPI_PRINTK(starget, KERN_WARNING, "Echo buffer size %d is too big, trimming to %d\n", len, SPI_MAX_ECHO_BUFFER_SIZE);
                 len = SPI_MAX_ECHO_BUFFER_SIZE;
         }
 
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 19afb25e44d3..bb8235598787 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1368,17 +1368,26 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
  */
 static void
 sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
-                   struct scsi_request *SRpnt, unsigned char *buffer) {
+                   struct scsi_request *SRpnt, unsigned char *buffer)
+{
         int len = 0, res;
 
-        const int dbd = 0;         /* DBD */
-        const int modepage = 0x08; /* current values, cache page */
+        int dbd;
+        int modepage;
         struct scsi_mode_data data;
         struct scsi_sense_hdr sshdr;
 
         if (sdkp->device->skip_ms_page_8)
                 goto defaults;
 
+        if (sdkp->device->type == TYPE_RBC) {
+                modepage = 6;
+                dbd = 8;
+        } else {
+                modepage = 8;
+                dbd = 0;
+        }
+
         /* cautiously ask */
         res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, 4, &data);
 
@@ -1409,11 +1418,20 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
                         "write back, no read (daft)"
                 };
                 int ct = 0;
-                int offset = data.header_length +
-                        data.block_descriptor_length + 2;
+                int offset = data.header_length + data.block_descriptor_length;
 
-                sdkp->WCE = ((buffer[offset] & 0x04) != 0);
-                sdkp->RCD = ((buffer[offset] & 0x01) != 0);
+                if ((buffer[offset] & 0x3f) != modepage) {
+                        printk(KERN_ERR "%s: got wrong page\n", diskname);
+                        goto defaults;
+                }
+
+                if (modepage == 8) {
+                        sdkp->WCE = ((buffer[offset + 2] & 0x04) != 0);
+                        sdkp->RCD = ((buffer[offset + 2] & 0x01) != 0);
+                } else {
+                        sdkp->WCE = ((buffer[offset + 2] & 0x01) == 0);
+                        sdkp->RCD = 0;
+                }
 
                 ct =  sdkp->RCD + 2*sdkp->WCE;
 
@@ -1533,7 +1551,7 @@ static int sd_probe(struct device *dev)
         int error;
 
         error = -ENODEV;
-        if ((sdp->type != TYPE_DISK) && (sdp->type != TYPE_MOD))
+        if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC)
                 goto out;
 
         SCSI_LOG_HLQUEUE(3, printk("sd_attach: scsi device: <%d,%d,%d,%d>\n", 
@@ -1570,7 +1588,7 @@ static int sd_probe(struct device *dev)
         sdkp->openers = 0;
 
         if (!sdp->timeout) {
-                if (sdp->type == TYPE_DISK)
+                if (sdp->type != TYPE_MOD)
                         sdp->timeout = SD_TIMEOUT;
                 else
                         sdp->timeout = SD_MOD_TIMEOUT;
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 4c95abb54057..a0cace9aeb79 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -97,6 +97,7 @@
 #include <linux/delay.h>
 #include <linux/blkdev.h>
 #include <linux/stat.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
@@ -1631,7 +1632,7 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt)
         /* assert  RESET signal on SCSI bus.  */
         WRITE_CONTROL (BASE_CMD | CMD_RST);
 
-        udelay (20 * 1000);
+        mdelay (20);
 
         WRITE_CONTROL (BASE_CMD);
         st0x_aborted = DID_RESET;
@@ -1640,16 +1641,6 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt)
         return SUCCESS;
 }
 
-static int seagate_st0x_host_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
-static int seagate_st0x_device_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
 static int seagate_st0x_release(struct Scsi_Host *shost)
 {
         if (shost->irq)
@@ -1665,8 +1656,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand           = seagate_st0x_queue_command,
         .eh_abort_handler       = seagate_st0x_abort,
         .eh_bus_reset_handler   = seagate_st0x_bus_reset,
-        .eh_host_reset_handler  = seagate_st0x_host_reset,
-        .eh_device_reset_handler = seagate_st0x_device_reset,
         .can_queue              = 1,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
diff --git a/drivers/scsi/seagate.h b/drivers/scsi/seagate.h
index e49e8ecfb54d..8889ff1a6b20 100644
--- a/drivers/scsi/seagate.h
+++ b/drivers/scsi/seagate.h
@@ -15,7 +15,5 @@ static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 static int seagate_st0x_abort(Scsi_Cmnd *);
 static const char *seagate_st0x_info(struct Scsi_Host *);
 static int seagate_st0x_bus_reset(Scsi_Cmnd *);
-static int seagate_st0x_device_reset(Scsi_Cmnd *);
-static int seagate_st0x_host_reset(Scsi_Cmnd *);
 
 #endif /* _SEAGATE_H */
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 7936aafc3d05..51292f269ce5 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1430,7 +1430,7 @@ static struct file_operations sg_fops = {
         .fasync = sg_fasync,
 };
 
-static struct class_simple * sg_sysfs_class;
+static struct class *sg_sysfs_class;
 
 static int sg_sysfs_valid = 0;
 
@@ -1551,13 +1551,13 @@ sg_add(struct class_device *cl_dev)
         if (sg_sysfs_valid) {
                 struct class_device * sg_class_member;
 
-                sg_class_member = class_simple_device_add(sg_sysfs_class, 
+                sg_class_member = class_device_create(sg_sysfs_class,
                                 MKDEV(SCSI_GENERIC_MAJOR, k), 
                                 cl_dev->dev, "%s", 
                                 disk->disk_name);
                 if (IS_ERR(sg_class_member))
                         printk(KERN_WARNING "sg_add: "
-                                "class_simple_device_add failed\n");
+                                "class_device_create failed\n");
                 class_set_devdata(sg_class_member, sdp);
                 error = sysfs_create_link(&scsidp->sdev_gendev.kobj, 
                                           &sg_class_member->kobj, "generic");
@@ -1636,7 +1636,7 @@ sg_remove(struct class_device *cl_dev)
 
         if (sdp) {
                 sysfs_remove_link(&scsidp->sdev_gendev.kobj, "generic");
-                class_simple_device_remove(MKDEV(SCSI_GENERIC_MAJOR, k));
+                class_device_destroy(sg_sysfs_class, MKDEV(SCSI_GENERIC_MAJOR, k));
                 cdev_del(sdp->cdev);
                 sdp->cdev = NULL;
                 devfs_remove("%s/generic", scsidp->devfs_name);
@@ -1677,7 +1677,7 @@ init_sg(void)
                                     SG_MAX_DEVS, "sg");
         if (rc)
                 return rc;
-        sg_sysfs_class = class_simple_create(THIS_MODULE, "scsi_generic");
+        sg_sysfs_class = class_create(THIS_MODULE, "scsi_generic");
         if ( IS_ERR(sg_sysfs_class) ) {
                 rc = PTR_ERR(sg_sysfs_class);
                 goto err_out;
@@ -1690,7 +1690,7 @@ init_sg(void)
 #endif                          /* CONFIG_SCSI_PROC_FS */
                 return 0;
         }
-        class_simple_destroy(sg_sysfs_class);
+        class_destroy(sg_sysfs_class);
 err_out:
         unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0), SG_MAX_DEVS);
         return rc;
@@ -1703,7 +1703,7 @@ exit_sg(void)
         sg_proc_cleanup();
 #endif                          /* CONFIG_SCSI_PROC_FS */
         scsi_unregister_interface(&sg_interface);
-        class_simple_destroy(sg_sysfs_class);
+        class_destroy(sg_sysfs_class);
         sg_sysfs_valid = 0;
         unregister_chrdev_region(MKDEV(SCSI_GENERIC_MAJOR, 0),
                                  SG_MAX_DEVS);
@@ -2472,6 +2472,8 @@ sg_remove_request(Sg_fd * sfp, Sg_request * srp)
         if ((!sfp) || (!srp) || (!sfp->headrp))
                 return res;
         write_lock_irqsave(&sfp->rq_list_lock, iflags);
+        if (srp->my_cmdp)
+                srp->my_cmdp->upper_private_data = NULL;
         prev_rp = sfp->headrp;
         if (srp == prev_rp) {
                 sfp->headrp = prev_rp->nextrp;
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 270f2aa88faa..a5ba2c692752 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -310,7 +310,14 @@ int sgiwd93_release(struct Scsi_Host *instance)
 static int sgiwd93_bus_reset(Scsi_Cmnd *cmd)
 {
         /* FIXME perform bus-specific reset */
+
+        /* FIXME 2: kill this function, and let midlayer fallback
+           to the same result, calling wd33c93_host_reset() */
+
+        spin_lock_irq(cmd->device->host->host_lock);
         wd33c93_host_reset(cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 265d1eed64fa..0291a8fb654d 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static char *verstr = "20050312";
+static char *verstr = "20050501";
 
 #include <linux/module.h>
 
@@ -29,6 +29,7 @@ static char *verstr = "20050312";
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/mtio.h>
+#include <linux/cdrom.h>
 #include <linux/ioctl.h>
 #include <linux/fcntl.h>
 #include <linux/spinlock.h>
@@ -50,6 +51,7 @@ static char *verstr = "20050312";
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi_request.h>
+#include <scsi/sg.h>
 
 
 /* The driver prints some debugging information on the console if DEBUG
@@ -82,7 +84,7 @@ static int try_wdio = 1;
 static int st_dev_max;
 static int st_nr_dev;
 
-static struct class_simple *st_sysfs_class;
+static struct class *st_sysfs_class;
 
 MODULE_AUTHOR("Kai Makisara");
 MODULE_DESCRIPTION("SCSI Tape Driver");
@@ -3463,7 +3465,10 @@ static int st_ioctl(struct inode *inode, struct file *file,
                 case SCSI_IOCTL_GET_BUS_NUMBER:
                         break;
                 default:
-                        if (!capable(CAP_SYS_ADMIN))
+                        if ((cmd_in == SG_IO ||
+                             cmd_in == SCSI_IOCTL_SEND_COMMAND ||
+                             cmd_in == CDROM_SEND_PACKET) &&
+                            !capable(CAP_SYS_RAWIO))
                                 i = -EPERM;
                         else
                                 i = scsi_cmd_ioctl(file, STp->disk, cmd_in, p);
@@ -3471,10 +3476,12 @@ static int st_ioctl(struct inode *inode, struct file *file,
                                 return i;
                         break;
         }
-        if (!capable(CAP_SYS_ADMIN) &&
-            (cmd_in == SCSI_IOCTL_START_UNIT || cmd_in == SCSI_IOCTL_STOP_UNIT))
-                return -EPERM;
-        return scsi_ioctl(STp->device, cmd_in, p);
+        retval = scsi_ioctl(STp->device, cmd_in, p);
+        if (!retval && cmd_in == SCSI_IOCTL_STOP_UNIT) { /* unload */
+                STp->rew_at_close = 0;
+                STp->ready = ST_NO_TAPE;
+        }
+        return retval;
 
  out:
         up(&STp->lock);
@@ -4017,8 +4024,9 @@ out_free_tape:
                         if (STm->cdevs[j]) {
                                 if (cdev == STm->cdevs[j])
                                         cdev = NULL;
-                                class_simple_device_remove(MKDEV(SCSI_TAPE_MAJOR,
-                                                                 TAPE_MINOR(i, mode, j)));
+                                class_device_destroy(st_sysfs_class,
+                                                     MKDEV(SCSI_TAPE_MAJOR,
+                                                           TAPE_MINOR(i, mode, j)));
                                 cdev_del(STm->cdevs[j]);
                         }
                 }
@@ -4061,8 +4069,9 @@ static int st_remove(struct device *dev)
                                 devfs_remove("%s/mt%s", SDp->devfs_name, st_formats[j]);
                                 devfs_remove("%s/mt%sn", SDp->devfs_name, st_formats[j]);
                                 for (j=0; j < 2; j++) {
-                                        class_simple_device_remove(MKDEV(SCSI_TAPE_MAJOR,
-                                                                         TAPE_MINOR(i, mode, j)));
+                                        class_device_destroy(st_sysfs_class,
+                                                             MKDEV(SCSI_TAPE_MAJOR,
+                                                                   TAPE_MINOR(i, mode, j)));
                                         cdev_del(tpnt->modes[mode].cdevs[j]);
                                         tpnt->modes[mode].cdevs[j] = NULL;
                                 }
@@ -4127,7 +4136,7 @@ static int __init init_st(void)
                 "st: Version %s, fixed bufsize %d, s/g segs %d\n",
                 verstr, st_fixed_buffer_size, st_max_sg_segs);
 
-        st_sysfs_class = class_simple_create(THIS_MODULE, "scsi_tape");
+        st_sysfs_class = class_create(THIS_MODULE, "scsi_tape");
         if (IS_ERR(st_sysfs_class)) {
                 st_sysfs_class = NULL;
                 printk(KERN_ERR "Unable create sysfs class for SCSI tapes\n");
@@ -4141,7 +4150,7 @@ static int __init init_st(void)
                         return 0;
                 }
                 if (st_sysfs_class)
-                        class_simple_destroy(st_sysfs_class);           
+                        class_destroy(st_sysfs_class);
                 unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
 
                                          ST_MAX_TAPE_ENTRIES);
@@ -4154,7 +4163,7 @@ static int __init init_st(void)
 static void __exit exit_st(void)
 {
         if (st_sysfs_class)
-                class_simple_destroy(st_sysfs_class);
+                class_destroy(st_sysfs_class);
         st_sysfs_class = NULL;
         do_remove_driverfs_files();
         scsi_unregister_driver(&st_template.gendrv);
@@ -4277,12 +4286,12 @@ static void do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)
                 snprintf(name, 10, "%s%s%s", rew ? "n" : "",
                          STp->disk->disk_name, st_formats[i]);
                 st_class_member =
-                        class_simple_device_add(st_sysfs_class,
-                                                MKDEV(SCSI_TAPE_MAJOR,
-                                                      TAPE_MINOR(dev_num, mode, rew)),
-                                                &STp->device->sdev_gendev, "%s", name);
+                        class_device_create(st_sysfs_class,
+                                            MKDEV(SCSI_TAPE_MAJOR,
+                                                  TAPE_MINOR(dev_num, mode, rew)),
+                                            &STp->device->sdev_gendev, "%s", name);
                 if (IS_ERR(st_class_member)) {
-                        printk(KERN_WARNING "st%d: class_simple_device_add failed\n",
+                        printk(KERN_WARNING "st%d: class_device_create failed\n",
                                dev_num);
                         goto out;
                 }
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 5d1dc0e8ba21..09d7639079b4 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -23,8 +23,6 @@
 #include <asm/dvma.h>
 #include <asm/irq.h>
 
-extern struct NCR_ESP *espchain;
-
 static void dma_barrier(struct NCR_ESP *esp);
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
 static int  dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index ebfddd40ce67..ef19adc67eff 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -785,26 +785,14 @@ int sym53c416_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
         return 0;
 }
 
-static int sym53c416_abort(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
-static int sym53c416_bus_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
-static int sym53c416_device_reset(Scsi_Cmnd *SCpnt)
-{
-        return FAILED;
-}
-
 static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
 {
         int base;
         int scsi_id = -1;       
         int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&sym53c416_lock, flags);
 
         /* printk("sym53c416_reset\n"); */
         base = SCpnt->device->host->io_port;
@@ -816,6 +804,8 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
         outb(NOOP | PIO_MODE, base + COMMAND_REG);
         outb(RESET_SCSI_BUS, base + COMMAND_REG);
         sym53c416_init(base, scsi_id);
+
+        spin_unlock_irqrestore(&sym53c416_lock, flags);
         return SUCCESS;
 }
 
@@ -865,10 +855,7 @@ static Scsi_Host_Template driver_template = {
         .detect =               sym53c416_detect,
         .info =                 sym53c416_info, 
         .queuecommand =         sym53c416_queuecommand,
-        .eh_abort_handler =     sym53c416_abort,
         .eh_host_reset_handler =sym53c416_host_reset,
-        .eh_bus_reset_handler = sym53c416_bus_reset,
-        .eh_device_reset_handler =sym53c416_device_reset,
         .release =              sym53c416_release,
         .bios_param =           sym53c416_bios_param,
         .can_queue =            1,
diff --git a/drivers/scsi/sym53c416.h b/drivers/scsi/sym53c416.h
index 3c0e3f8301f1..fd6b120d38c4 100644
--- a/drivers/scsi/sym53c416.h
+++ b/drivers/scsi/sym53c416.h
@@ -26,10 +26,7 @@ static int sym53c416_detect(Scsi_Host_Template *);
 static const char *sym53c416_info(struct Scsi_Host *);
 static int sym53c416_release(struct Scsi_Host *);
 static int sym53c416_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-static int sym53c416_abort(Scsi_Cmnd *);
 static int sym53c416_host_reset(Scsi_Cmnd *);
-static int sym53c416_bus_reset(Scsi_Cmnd *);
-static int sym53c416_device_reset(Scsi_Cmnd *);
 static int sym53c416_bios_param(struct scsi_device *, struct block_device *,
                 sector_t, int *);
 static void sym53c416_setup(char *str, int *ints);
diff --git a/drivers/scsi/sym53c8xx_2/sym_defs.h b/drivers/scsi/sym53c8xx_2/sym_defs.h
index 15bb89195c09..2d9437d7242b 100644
--- a/drivers/scsi/sym53c8xx_2/sym_defs.h
+++ b/drivers/scsi/sym53c8xx_2/sym_defs.h
@@ -40,7 +40,7 @@
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
 
-#define SYM_VERSION "2.2.0"
+#define SYM_VERSION "2.2.1"
 #define SYM_DRIVER_NAME "sym-" SYM_VERSION
 
 /*
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 5b07c6ec3ecc..d76766c3ce16 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -155,10 +155,11 @@ pci_get_base_address(struct pci_dev *pdev, int index, unsigned long *basep)
         base = tmp;
         if ((tmp & 0x7) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
                 pci_read_config_dword(pdev, PCI_BAR_OFFSET(index++), &tmp);
-                if (tmp > 0)
+                if (tmp > 0) {
                         dev_err(&pdev->dev,
                                 "BAR %d is 64-bit, disabling\n", index - 1);
-                base = 0;
+                        base = 0;
+                }
         }
 
         if ((base & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
@@ -389,13 +390,20 @@ static int sym_scatter_no_sglist(struct sym_hcb *np, struct sym_ccb *cp, struct
 {
         struct sym_tblmove *data = &cp->phys.data[SYM_CONF_MAX_SG-1];
         int segment;
+        unsigned int len = cmd->request_bufflen;
 
-        cp->data_len = cmd->request_bufflen;
-
-        if (cmd->request_bufflen) {
+        if (len) {
                 dma_addr_t baddr = map_scsi_single_data(np, cmd);
                 if (baddr) {
-                        sym_build_sge(np, data, baddr, cmd->request_bufflen);
+                        if (len & 1) {
+                                struct sym_tcb *tp = &np->target[cp->target];
+                                if (tp->head.wval & EWS) {
+                                        len++;
+                                        cp->odd_byte_adjustment++;
+                                }
+                        }
+                        cp->data_len = len;
+                        sym_build_sge(np, data, baddr, len);
                         segment = 1;
                 } else {
                         segment = -2;
@@ -418,6 +426,7 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd
                 segment = sym_scatter_no_sglist(np, cp, cmd);
         else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
                 struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
+                struct sym_tcb *tp = &np->target[cp->target];
                 struct sym_tblmove *data;
 
                 if (use_sg > SYM_CONF_MAX_SG) {
@@ -431,6 +440,11 @@ static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd
                         dma_addr_t baddr = sg_dma_address(&scatter[segment]);
                         unsigned int len = sg_dma_len(&scatter[segment]);
 
+                        if ((len & 1) && (tp->head.wval & EWS)) {
+                                len++;
+                                cp->odd_byte_adjustment++;
+                        }
+
                         sym_build_sge(np, &data[segment], baddr, len);
                         cp->data_len += len;
                 }
@@ -456,10 +470,8 @@ static int sym_queue_command(struct sym_hcb *np, struct scsi_cmnd *cmd)
          *  Minimal checkings, so that we will not 
          *  go outside our tables.
          */
-        if (sdev->id == np->myaddr ||
-            sdev->id >= SYM_CONF_MAX_TARGET ||
-            sdev->lun >= SYM_CONF_MAX_LUN) {
-                sym_xpt_done2(np, cmd, CAM_DEV_NOT_THERE);
+        if (sdev->id == np->myaddr) {
+                sym_xpt_done2(np, cmd, DID_NO_CONNECT);
                 return 0;
         }
 
@@ -469,28 +481,6 @@ static int sym_queue_command(struct sym_hcb *np, struct scsi_cmnd *cmd)
         tp = &np->target[sdev->id];
 
         /*
-         *  Complete the 1st INQUIRY command with error 
-         *  condition if the device is flagged NOSCAN 
-         *  at BOOT in the NVRAM. This may speed up 
-         *  the boot and maintain coherency with BIOS 
-         *  device numbering. Clearing the flag allows 
-         *  user to rescan skipped devices later.
-         *  We also return error for devices not flagged 
-         *  for SCAN LUNS in the NVRAM since some mono-lun 
-         *  devices behave badly when asked for some non 
-         *  zero LUN. Btw, this is an absolute hack.:-)
-         */
-        if (cmd->cmnd[0] == 0x12 || cmd->cmnd[0] == 0x0) {
-                if ((tp->usrflags & SYM_SCAN_BOOT_DISABLED) ||
-                    ((tp->usrflags & SYM_SCAN_LUNS_DISABLED) && 
-                     sdev->lun != 0)) {
-                        tp->usrflags &= ~SYM_SCAN_BOOT_DISABLED;
-                        sym_xpt_done2(np, cmd, CAM_DEV_NOT_THERE);
-                        return 0;
-                }
-        }
-
-        /*
          *  Select tagged/untagged.
          */
         lp = sym_lp(tp, sdev->lun);
@@ -511,23 +501,10 @@ static int sym_queue_command(struct sym_hcb *np, struct scsi_cmnd *cmd)
  */
 static inline int sym_setup_cdb(struct sym_hcb *np, struct scsi_cmnd *cmd, struct sym_ccb *cp)
 {
-        u32     cmd_ba;
-        int     cmd_len;
-
-        /*
-         *  CDB is 16 bytes max.
-         */
-        if (cmd->cmd_len > sizeof(cp->cdb_buf)) {
-                sym_set_cam_status(cp->cmd, CAM_REQ_INVALID);
-                return -1;
-        }
-
         memcpy(cp->cdb_buf, cmd->cmnd, cmd->cmd_len);
-        cmd_ba  = CCB_BA (cp, cdb_buf[0]);
-        cmd_len = cmd->cmd_len;
 
-        cp->phys.cmd.addr       = cpu_to_scr(cmd_ba);
-        cp->phys.cmd.size       = cpu_to_scr(cmd_len);
+        cp->phys.cmd.addr = CCB_BA(cp, cdb_buf[0]);
+        cp->phys.cmd.size = cpu_to_scr(cmd->cmd_len);
 
         return 0;
 }
@@ -554,10 +531,7 @@ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct s
         if (dir != DMA_NONE) {
                 cp->segments = sym_scatter(np, cp, cmd);
                 if (cp->segments < 0) {
-                        if (cp->segments == -2)
-                                sym_set_cam_status(cmd, CAM_RESRC_UNAVAIL);
-                        else
-                                sym_set_cam_status(cmd, CAM_REQ_TOO_BIG);
+                        sym_set_cam_status(cmd, DID_ERROR);
                         goto out_abort;
                 }
         } else {
@@ -855,7 +829,7 @@ prepare:
         ep->to_do = to_do;
         /* Complete the command with locks held as required by the driver */
         if (to_do == SYM_EH_DO_COMPLETE)
-                sym_xpt_done2(np, cmd, CAM_REQ_ABORTED);
+                sym_xpt_done2(np, cmd, DID_ABORT);
 
         /* Wait for completion with locks released, as required by kernel */
         if (to_do == SYM_EH_DO_WAIT) {
@@ -882,22 +856,46 @@ prepare:
  */
 static int sym53c8xx_eh_abort_handler(struct scsi_cmnd *cmd)
 {
-        return sym_eh_handler(SYM_EH_ABORT, "ABORT", cmd);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = sym_eh_handler(SYM_EH_ABORT, "ABORT", cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 static int sym53c8xx_eh_device_reset_handler(struct scsi_cmnd *cmd)
 {
-        return sym_eh_handler(SYM_EH_DEVICE_RESET, "DEVICE RESET", cmd);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = sym_eh_handler(SYM_EH_DEVICE_RESET, "DEVICE RESET", cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 static int sym53c8xx_eh_bus_reset_handler(struct scsi_cmnd *cmd)
 {
-        return sym_eh_handler(SYM_EH_BUS_RESET, "BUS RESET", cmd);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = sym_eh_handler(SYM_EH_BUS_RESET, "BUS RESET", cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 static int sym53c8xx_eh_host_reset_handler(struct scsi_cmnd *cmd)
 {
-        return sym_eh_handler(SYM_EH_HOST_RESET, "HOST RESET", cmd);
+        int rc;
+
+        spin_lock_irq(cmd->device->host->host_lock);
+        rc = sym_eh_handler(SYM_EH_HOST_RESET, "HOST RESET", cmd);
+        spin_unlock_irq(cmd->device->host->host_lock);
+
+        return rc;
 }
 
 /*
@@ -921,7 +919,7 @@ static void sym_tune_dev_queuing(struct sym_tcb *tp, int lun, u_short reqtags)
         lp->s.reqtags     = reqtags;
 
         if (reqtags != oldtags) {
-                dev_info(&tp->sdev->sdev_target->dev,
+                dev_info(&tp->starget->dev,
                          "tagged command queuing %s, command queue depth %d.\n",
                           lp->s.reqtags ? "enabled" : "disabled",
                           lp->started_limit);
@@ -981,22 +979,34 @@ static int device_queue_depth(struct sym_hcb *np, int target, int lun)
         return DEF_DEPTH;
 }
 
-static int sym53c8xx_slave_alloc(struct scsi_device *device)
+static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
 {
-        struct sym_hcb *np = sym_get_hcb(device->host);
-        struct sym_tcb *tp = &np->target[device->id];
-        if (!tp->sdev)
-                tp->sdev = device;
+        struct sym_hcb *np;
+        struct sym_tcb *tp;
 
-        return 0;
-}
+        if (sdev->id >= SYM_CONF_MAX_TARGET || sdev->lun >= SYM_CONF_MAX_LUN)
+                return -ENXIO;
 
-static void sym53c8xx_slave_destroy(struct scsi_device *device)
-{
-        struct sym_hcb *np = sym_get_hcb(device->host);
-        struct sym_tcb *tp = &np->target[device->id];
-        if (tp->sdev == device)
-                tp->sdev = NULL;
+        np = sym_get_hcb(sdev->host);
+        tp = &np->target[sdev->id];
+
+        /*
+         * Fail the device init if the device is flagged NOSCAN at BOOT in
+         * the NVRAM.  This may speed up boot and maintain coherency with
+         * BIOS device numbering.  Clearing the flag allows the user to
+         * rescan skipped devices later.  We also return an error for
+         * devices not flagged for SCAN LUNS in the NVRAM since some single
+         * lun devices behave badly when asked for a non zero LUN.
+         */
+
+        if ((tp->usrflags & SYM_SCAN_BOOT_DISABLED) ||
+            ((tp->usrflags & SYM_SCAN_LUNS_DISABLED) && sdev->lun != 0)) {
+                tp->usrflags &= ~SYM_SCAN_BOOT_DISABLED;
+                return -ENXIO;
+        }
+
+        tp->starget = sdev->sdev_target;
+        return 0;
 }
 
 /*
@@ -1897,6 +1907,7 @@ static int sym_detach(struct sym_hcb *np, struct pci_dev *pdev)
          */
         printk("%s: resetting chip\n", sym_name(np));
         OUTB(np, nc_istat, SRST);
+        INB(np, nc_mbox1);
         udelay(10);
         OUTB(np, nc_istat, 0);
 
@@ -1915,7 +1926,6 @@ static struct scsi_host_template sym2_template = {
         .queuecommand           = sym53c8xx_queue_command,
         .slave_alloc            = sym53c8xx_slave_alloc,
         .slave_configure        = sym53c8xx_slave_configure,
-        .slave_destroy          = sym53c8xx_slave_destroy,
         .eh_abort_handler       = sym53c8xx_eh_abort_handler,
         .eh_device_reset_handler = sym53c8xx_eh_device_reset_handler,
         .eh_bus_reset_handler   = sym53c8xx_eh_bus_reset_handler,
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h
index e943f167fb51..d3d52f14d7c0 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.h
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.h
@@ -142,33 +142,6 @@
 #define scr_to_cpu(dw)  le32_to_cpu(dw)
 
 /*
- *  Remap some status field values.
- */
-#define CAM_REQ_CMP             DID_OK
-#define CAM_SEL_TIMEOUT         DID_NO_CONNECT
-#define CAM_CMD_TIMEOUT         DID_TIME_OUT
-#define CAM_REQ_ABORTED         DID_ABORT
-#define CAM_UNCOR_PARITY        DID_PARITY
-#define CAM_SCSI_BUS_RESET      DID_RESET       
-#define CAM_REQUEUE_REQ         DID_SOFT_ERROR
-#define CAM_UNEXP_BUSFREE       DID_ERROR
-#define CAM_SCSI_BUSY           DID_BUS_BUSY
-
-#define CAM_DEV_NOT_THERE       DID_NO_CONNECT
-#define CAM_REQ_INVALID         DID_ERROR
-#define CAM_REQ_TOO_BIG         DID_ERROR
-
-#define CAM_RESRC_UNAVAIL       DID_ERROR
-
-/*
- *  Remap data direction values.
- */
-#define CAM_DIR_NONE            DMA_NONE
-#define CAM_DIR_IN              DMA_FROM_DEVICE
-#define CAM_DIR_OUT             DMA_TO_DEVICE
-#define CAM_DIR_UNKNOWN         DMA_BIDIRECTIONAL
-
-/*
  *  These ones are used as return code from 
  *  error recovery handlers under Linux.
  */
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 50a176b3888d..e753ba27dc59 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -97,7 +97,7 @@ static void sym_print_msg(struct sym_ccb *cp, char *label, u_char *msg)
 static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_char *msg)
 {
         struct sym_tcb *tp = &np->target[target];
-        dev_info(&tp->sdev->sdev_target->dev, "%s: ", label);
+        dev_info(&tp->starget->dev, "%s: ", label);
 
         sym_show_msg(msg);
         printf(".\n");
@@ -149,8 +149,10 @@ static char *sym_scsi_bus_mode(int mode)
 static void sym_chip_reset (struct sym_hcb *np)
 {
         OUTB(np, nc_istat, SRST);
+        INB(np, nc_mbox1);
         udelay(10);
         OUTB(np, nc_istat, 0);
+        INB(np, nc_mbox1);
         udelay(2000);   /* For BUS MODE to settle */
 }
 
@@ -216,6 +218,7 @@ int sym_reset_scsi_bus(struct sym_hcb *np, int enab_int)
         OUTB(np, nc_stest3, TE);
         OUTB(np, nc_dcntl, (np->rv_dcntl & IRQM));
         OUTB(np, nc_scntl1, CRST);
+        INB(np, nc_mbox1);
         udelay(200);
 
         if (!SYM_SETUP_SCSI_BUS_CHECK)
@@ -280,8 +283,10 @@ static void sym_selectclock(struct sym_hcb *np, u_char scntl3)
                 if (!i)
                         printf("%s: the chip cannot lock the frequency\n",
                                 sym_name(np));
-        } else
-                udelay((50+10));
+        } else {
+                INB(np, nc_mbox1);
+                udelay(50+10);
+        }
         OUTB(np, nc_stest3, HSC);               /* Halt the scsi clock  */
         OUTB(np, nc_scntl3, scntl3);
         OUTB(np, nc_stest1, (DBLEN|DBLSEL));/* Select clock multiplier  */
@@ -1445,7 +1450,7 @@ static void sym_check_goals(struct sym_hcb *np, struct scsi_target *starget,
 static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgptr)
 {
         struct sym_tcb *tp = &np->target[cp->target];
-        struct scsi_target *starget = tp->sdev->sdev_target;
+        struct scsi_target *starget = tp->starget;
         struct sym_trans *goal = &tp->tgoal;
         int msglen = 0;
         int nego;
@@ -1690,7 +1695,7 @@ static void sym_flush_comp_queue(struct sym_hcb *np, int cam_status)
                 if (cam_status)
                         sym_set_cam_status(cmd, cam_status);
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
-                if (sym_get_cam_status(cmd) == CAM_REQUEUE_REQ) {
+                if (sym_get_cam_status(cmd) == DID_SOFT_ERROR) {
                         struct sym_tcb *tp = &np->target[cp->target];
                         struct sym_lcb *lp = sym_lp(tp, cp->lun);
                         if (lp) {
@@ -1791,12 +1796,13 @@ void sym_start_up (struct sym_hcb *np, int reason)
         /*
          *  Wakeup all pending jobs.
          */
-        sym_flush_busy_queue(np, CAM_SCSI_BUS_RESET);
+        sym_flush_busy_queue(np, DID_RESET);
 
         /*
          *  Init chip.
          */
         OUTB(np, nc_istat,  0x00);                      /*  Remove Reset, abort */
+        INB(np, nc_mbox1);
         udelay(2000); /* The 895 needs time for the bus mode to settle */
 
         OUTB(np, nc_scntl0, np->rv_scntl0 | 0xc0);
@@ -1905,6 +1911,7 @@ void sym_start_up (struct sym_hcb *np, int reason)
         if (np->features & (FE_ULTRA2|FE_ULTRA3)) {
                 OUTONW(np, nc_sien, SBMC);
                 if (reason == 0) {
+                        INB(np, nc_mbox1);
                         mdelay(100);
                         INW(np, nc_sist);
                 }
@@ -2074,7 +2081,7 @@ static void sym_settrans(struct sym_hcb *np, int target, u_char opts, u_char ofs
 static void sym_setwide(struct sym_hcb *np, int target, u_char wide)
 {
         struct sym_tcb *tp = &np->target[target];
-        struct scsi_target *starget = tp->sdev->sdev_target;
+        struct scsi_target *starget = tp->starget;
 
         if (spi_width(starget) == wide)
                 return;
@@ -2102,7 +2109,7 @@ sym_setsync(struct sym_hcb *np, int target,
             u_char ofs, u_char per, u_char div, u_char fak)
 {
         struct sym_tcb *tp = &np->target[target];
-        struct scsi_target *starget = tp->sdev->sdev_target;
+        struct scsi_target *starget = tp->starget;
         u_char wide = (tp->head.wval & EWS) ? BUS_16_BIT : BUS_8_BIT;
 
         sym_settrans(np, target, 0, ofs, per, wide, div, fak);
@@ -2129,7 +2136,7 @@ sym_setpprot(struct sym_hcb *np, int target, u_char opts, u_char ofs,
              u_char per, u_char wide, u_char div, u_char fak)
 {
         struct sym_tcb *tp = &np->target[target];
-        struct scsi_target *starget = tp->sdev->sdev_target;
+        struct scsi_target *starget = tp->starget;
 
         sym_settrans(np, target, opts, ofs, per, wide, div, fak);
 
@@ -2944,7 +2951,7 @@ unknown_int:
  *  Dequeue from the START queue all CCBs that match 
  *  a given target/lun/task condition (-1 means all),
  *  and move them from the BUSY queue to the COMP queue 
- *  with CAM_REQUEUE_REQ status condition.
+ *  with DID_SOFT_ERROR status condition.
  *  This function is used during error handling/recovery.
  *  It is called with SCRIPTS not running.
  */
@@ -2974,7 +2981,7 @@ sym_dequeue_from_squeue(struct sym_hcb *np, int i, int target, int lun, int task
                 if ((target == -1 || cp->target == target) &&
                     (lun    == -1 || cp->lun    == lun)    &&
                     (task   == -1 || cp->tag    == task)) {
-                        sym_set_cam_status(cp->cmd, CAM_REQUEUE_REQ);
+                        sym_set_cam_status(cp->cmd, DID_SOFT_ERROR);
                         sym_remque(&cp->link_ccbq);
                         sym_insque_tail(&cp->link_ccbq, &np->comp_ccbq);
                 }
@@ -3093,13 +3100,13 @@ static void sym_sir_bad_scsi_status(struct sym_hcb *np, int num, struct sym_ccb
                 /*
                  *  Message table indirect structure.
                  */
-                cp->phys.smsg.addr      = cpu_to_scr(CCB_BA(cp, scsi_smsg2));
+                cp->phys.smsg.addr      = CCB_BA(cp, scsi_smsg2);
                 cp->phys.smsg.size      = cpu_to_scr(msglen);
 
                 /*
                  *  sense command
                  */
-                cp->phys.cmd.addr       = cpu_to_scr(CCB_BA(cp, sensecmd));
+                cp->phys.cmd.addr       = CCB_BA(cp, sensecmd);
                 cp->phys.cmd.size       = cpu_to_scr(6);
 
                 /*
@@ -3116,7 +3123,7 @@ static void sym_sir_bad_scsi_status(struct sym_hcb *np, int num, struct sym_ccb
                  *  sense data
                  */
                 memset(cp->sns_bbuf, 0, SYM_SNS_BBUF_LEN);
-                cp->phys.sense.addr     = cpu_to_scr(CCB_BA(cp, sns_bbuf));
+                cp->phys.sense.addr     = CCB_BA(cp, sns_bbuf);
                 cp->phys.sense.size     = cpu_to_scr(SYM_SNS_BBUF_LEN);
 
                 /*
@@ -3198,7 +3205,7 @@ int sym_clear_tasks(struct sym_hcb *np, int cam_status, int target, int lun, int
                 sym_insque_tail(&cp->link_ccbq, &np->comp_ccbq);
 
                 /* Preserve the software timeout condition */
-                if (sym_get_cam_status(cmd) != CAM_CMD_TIMEOUT)
+                if (sym_get_cam_status(cmd) != DID_TIME_OUT)
                         sym_set_cam_status(cmd, cam_status);
                 ++i;
 #if 0
@@ -3366,7 +3373,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
                  *  Make sure at least our IO to abort has been dequeued.
                  */
 #ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING
-                assert(i && sym_get_cam_status(cp->cmd) == CAM_REQUEUE_REQ);
+                assert(i && sym_get_cam_status(cp->cmd) == DID_SOFT_ERROR);
 #else
                 sym_remque(&cp->link_ccbq);
                 sym_insque_tail(&cp->link_ccbq, &np->comp_ccbq);
@@ -3375,9 +3382,9 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
                  *  Keep track in cam status of the reason of the abort.
                  */
                 if (cp->to_abort == 2)
-                        sym_set_cam_status(cp->cmd, CAM_CMD_TIMEOUT);
+                        sym_set_cam_status(cp->cmd, DID_TIME_OUT);
                 else
-                        sym_set_cam_status(cp->cmd, CAM_REQ_ABORTED);
+                        sym_set_cam_status(cp->cmd, DID_ABORT);
 
                 /*
                  *  Complete with error everything that we have dequeued.
@@ -3491,7 +3498,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
                  *  conditions not due to timeout.
                  */
                 if (cp->to_abort == 2)
-                        sym_set_cam_status(cp->cmd, CAM_CMD_TIMEOUT);
+                        sym_set_cam_status(cp->cmd, DID_TIME_OUT);
                 cp->to_abort = 0; /* We donnot expect to fail here */
                 break;
 
@@ -3502,7 +3509,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
         case SIR_ABORT_SENT:
                 target = INB(np, nc_sdid) & 0xf;
                 tp = &np->target[target];
-                starget = tp->sdev->sdev_target;
+                starget = tp->starget;
                 
                 /*
                 **  If we didn't abort anything, leave here.
@@ -3551,7 +3558,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
                  */
                 i = (INL(np, nc_scratcha) - np->squeue_ba) / 4;
                 sym_dequeue_from_squeue(np, i, target, lun, -1);
-                sym_clear_tasks(np, CAM_REQ_ABORTED, target, lun, task);
+                sym_clear_tasks(np, DID_ABORT, target, lun, task);
                 sym_flush_comp_queue(np, 0);
 
                 /*
@@ -3566,7 +3573,7 @@ static void sym_sir_task_recovery(struct sym_hcb *np, int num)
          *  Print to the log the message we intend to send.
          */
         if (num == SIR_TARGET_SELECTED) {
-                dev_info(&tp->sdev->sdev_target->dev, "control msgout:");
+                dev_info(&tp->starget->dev, "control msgout:");
                 sym_printl_hex(np->abrt_msg, np->abrt_tbl.size);
                 np->abrt_tbl.size = cpu_to_scr(np->abrt_tbl.size);
         }
@@ -3877,6 +3884,8 @@ int sym_compute_residual(struct sym_hcb *np, struct sym_ccb *cp)
                 resid += (tmp & 0xffffff);
         }
 
+        resid -= cp->odd_byte_adjustment;
+
         /*
          *  Hopefully, the result is not too wrong.
          */
@@ -4758,10 +4767,8 @@ struct sym_ccb *sym_get_ccb (struct sym_hcb *np, struct scsi_cmnd *cmd, u_char t
         }
 
 #endif
-        /*
-         *  Remember all informations needed to free this CCB.
-         */
         cp->to_abort = 0;
+        cp->odd_byte_adjustment = 0;
         cp->tag    = tag;
         cp->order  = tag_order;
         cp->target = tn;
@@ -5104,7 +5111,7 @@ static void sym_alloc_lcb_tags (struct sym_hcb *np, u_char tn, u_char ln)
         lp->itlq_tbl = sym_calloc_dma(SYM_CONF_MAX_TASK*4, "ITLQ_TBL");
         if (!lp->itlq_tbl)
                 goto fail;
-        lp->cb_tags = kcalloc(SYM_CONF_MAX_TASK, 1, GFP_KERNEL);
+        lp->cb_tags = kcalloc(SYM_CONF_MAX_TASK, 1, GFP_ATOMIC);
         if (!lp->cb_tags) {
                 sym_mfree_dma(lp->itlq_tbl, SYM_CONF_MAX_TASK*4, "ITLQ_TBL");
                 lp->itlq_tbl = NULL;
@@ -5243,7 +5250,7 @@ int sym_queue_scsiio(struct sym_hcb *np, struct scsi_cmnd *cmd, struct sym_ccb *
         /*
          *  message
          */
-        cp->phys.smsg.addr      = cpu_to_scr(CCB_BA(cp, scsi_smsg));
+        cp->phys.smsg.addr      = CCB_BA(cp, scsi_smsg);
         cp->phys.smsg.size      = cpu_to_scr(msglen);
 
         /*
@@ -5343,7 +5350,7 @@ int sym_abort_scsiio(struct sym_hcb *np, struct scsi_cmnd *cmd, int timed_out)
 }
 
 /*
- *  Complete execution of a SCSI command with extented 
+ *  Complete execution of a SCSI command with extended 
  *  error, SCSI status error, or having been auto-sensed.
  *
  *  The SCRIPTS processor is not running there, so we 
@@ -5441,7 +5448,7 @@ if (resid)
                 /*
                  *  Let's requeue it to device.
                  */
-                sym_set_cam_status(cmd, CAM_REQUEUE_REQ);
+                sym_set_cam_status(cmd, DID_SOFT_ERROR);
                 goto finish;
         }
 weirdness:
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index a95cbe4b8e39..c55c7a57afa0 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -444,7 +444,7 @@ struct sym_tcb {
          */
         u_char  usrflags;
         u_short usrtags;
-        struct scsi_device *sdev;
+        struct scsi_target *starget;
 };
 
 /*
@@ -754,10 +754,8 @@ struct sym_ccb {
         int     segments;       /* Number of SG segments        */
 
         u8      order;          /* Tag type (if tagged command) */
+        unsigned char odd_byte_adjustment;      /* odd-sized req on wide bus */
 
-        /*
-         *  Miscellaneous status'.
-         */
         u_char  nego_status;    /* Negotiation status           */
         u_char  xerr_status;    /* Extended error flags         */
         u32     extra_bytes;    /* Extraneous bytes transferred */
@@ -809,7 +807,7 @@ struct sym_ccb {
 #endif
 };
 
-#define CCB_BA(cp,lbl)  (cp->ccb_ba + offsetof(struct sym_ccb, lbl))
+#define CCB_BA(cp,lbl)  cpu_to_scr(cp->ccb_ba + offsetof(struct sym_ccb, lbl))
 
 #ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
 #define sym_goalp(cp) ((cp->host_flags & HF_DATA_IN) ? cp->goalp : cp->wgoalp)
@@ -1138,33 +1136,33 @@ static inline void sym_setup_data_pointers(struct sym_hcb *np,
          *  No segments means no data.
          */
         if (!cp->segments)
-                dir = CAM_DIR_NONE;
+                dir = DMA_NONE;
 
         /*
          *  Set the data pointer.
          */
         switch(dir) {
 #ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        case CAM_DIR_UNKNOWN:
+        case DMA_BIDIRECTIONAL:
 #endif
-        case CAM_DIR_OUT:
+        case DMA_TO_DEVICE:
                 goalp = SCRIPTA_BA(np, data_out2) + 8;
                 lastp = goalp - 8 - (cp->segments * (2*4));
 #ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
                 cp->wgoalp = cpu_to_scr(goalp);
-                if (dir != CAM_DIR_UNKNOWN)
+                if (dir != DMA_BIDIRECTIONAL)
                         break;
                 cp->phys.head.wlastp = cpu_to_scr(lastp);
                 /* fall through */
 #else
                 break;
 #endif
-        case CAM_DIR_IN:
+        case DMA_FROM_DEVICE:
                 cp->host_flags |= HF_DATA_IN;
                 goalp = SCRIPTA_BA(np, data_in2) + 8;
                 lastp = goalp - 8 - (cp->segments * (2*4));
                 break;
-        case CAM_DIR_NONE:
+        case DMA_NONE:
         default:
 #ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
                 cp->host_flags |= HF_DATA_IN;
@@ -1185,7 +1183,7 @@ static inline void sym_setup_data_pointers(struct sym_hcb *np,
         /*
          *  If direction is unknown, start at data_io.
          */
-        if (dir == CAM_DIR_UNKNOWN)
+        if (dir == DMA_BIDIRECTIONAL)
                 cp->phys.head.savep = cpu_to_scr(SCRIPTB_BA(np, data_io));
 #endif
 }
diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.c b/drivers/scsi/sym53c8xx_2/sym_nvram.c
index 1b721e3ec520..cd9140e158cf 100644
--- a/drivers/scsi/sym53c8xx_2/sym_nvram.c
+++ b/drivers/scsi/sym53c8xx_2/sym_nvram.c
@@ -270,6 +270,7 @@ static void S24C16_set_bit(struct sym_device *np, u_char write_bit, u_char *gpre
 
         }
         OUTB(np, nc_gpreg, *gpreg);
+        INB(np, nc_mbox1);
         udelay(5);
 }
 
@@ -547,6 +548,7 @@ static int sym_read_Symbios_nvram(struct sym_device *np, Symbios_nvram *nvram)
 static void T93C46_Clk(struct sym_device *np, u_char *gpreg)
 {
         OUTB(np, nc_gpreg, *gpreg | 0x04);
+        INB(np, nc_mbox1);
         udelay(2);
         OUTB(np, nc_gpreg, *gpreg);
 }
@@ -574,6 +576,7 @@ static void T93C46_Write_Bit(struct sym_device *np, u_char write_bit, u_char *gp
         *gpreg |= 0x10;
                 
         OUTB(np, nc_gpreg, *gpreg);
+        INB(np, nc_mbox1);
         udelay(2);
 
         T93C46_Clk(np, gpreg);
@@ -586,6 +589,7 @@ static void T93C46_Stop(struct sym_device *np, u_char *gpreg)
 {
         *gpreg &= 0xef;
         OUTB(np, nc_gpreg, *gpreg);
+        INB(np, nc_mbox1);
         udelay(2);
 
         T93C46_Clk(np, gpreg);
@@ -733,7 +737,8 @@ static int sym_read_parisc_pdc(struct sym_device *np, struct pdc_initiator *pdc)
         return SYM_PARISC_PDC;
 }
 #else
-static int sym_read_parisc_pdc(struct sym_device *np, struct pdc_initiator *x)
+static inline int sym_read_parisc_pdc(struct sym_device *np,
+                                        struct pdc_initiator *x)
 {
         return 0;
 }
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 6dc2897672a1..f4b780e35cb6 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -437,8 +437,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand   = t128_queue_command,
         .eh_abort_handler = t128_abort,
         .eh_bus_reset_handler    = t128_bus_reset,
-        .eh_host_reset_handler   = t128_host_reset,
-        .eh_device_reset_handler = t128_device_reset,
         .bios_param     = t128_biosparam,
         .can_queue      = CAN_QUEUE,
         .this_id        = 7,
diff --git a/drivers/scsi/t128.h b/drivers/scsi/t128.h
index 161ba53d982b..9ad1d68827a7 100644
--- a/drivers/scsi/t128.h
+++ b/drivers/scsi/t128.h
@@ -96,9 +96,7 @@ static int t128_biosparam(struct scsi_device *, struct block_device *,
                           sector_t, int*);
 static int t128_detect(Scsi_Host_Template *);
 static int t128_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-static int t128_host_reset(Scsi_Cmnd *);
 static int t128_bus_reset(Scsi_Cmnd *);
-static int t128_device_reset(Scsi_Cmnd *);
 
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN 2
@@ -140,8 +138,6 @@ static int t128_device_reset(Scsi_Cmnd *);
 #define do_NCR5380_intr do_t128_intr
 #define NCR5380_queue_command t128_queue_command
 #define NCR5380_abort t128_abort
-#define NCR5380_host_reset t128_host_reset
-#define NCR5380_device_reset t128_device_reset
 #define NCR5380_bus_reset t128_bus_reset
 #define NCR5380_proc_info t128_proc_info
 
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index ee9df02efd5b..9589c67de535 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2120,6 +2120,8 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)
         struct dc390_acb*    pACB = (struct dc390_acb*) cmd->device->host->hostdata;
         u8   bval;
 
+        spin_lock_irq(cmd->device->host->host_lock);
+
         bval = DC390_read8(CtrlReg1) | DIS_INT_ON_SCSI_RST;
         DC390_write8(CtrlReg1, bval);   /* disable IRQ on bus reset */
 
@@ -2127,7 +2129,7 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)
         dc390_ResetSCSIBus(pACB);
 
         dc390_ResetDevParam(pACB);
-        udelay(1000);
+        mdelay(1);
         pACB->pScsiHost->last_reset = jiffies + 3*HZ/2 
                 + HZ * dc390_eepromBuf[pACB->AdapterIndex][EE_DELAY];
     
@@ -2142,6 +2144,8 @@ static int DC390_bus_reset (struct scsi_cmnd *cmd)
         bval = DC390_read8(CtrlReg1) & ~DIS_INT_ON_SCSI_RST;
         DC390_write8(CtrlReg1, bval);   /* re-enable interrupt */
 
+        spin_unlock_irq(cmd->device->host->host_lock);
+
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index dca215411f68..98369ce09283 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -446,8 +446,6 @@ static struct scsi_host_template driver_template = {
                 .release                 = u14_34f_release,
                 .queuecommand            = u14_34f_queuecommand,
                 .eh_abort_handler        = u14_34f_eh_abort,
-                .eh_device_reset_handler = NULL,
-                .eh_bus_reset_handler    = NULL,
                 .eh_host_reset_handler   = u14_34f_eh_host_reset,
                 .bios_param              = u14_34f_bios_param,
                 .slave_configure         = u14_34f_slave_configure,
@@ -1419,16 +1417,20 @@ static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) {
    printk("%s: reset, enter, target %d.%d:%d, pid %ld.\n",
           BN(j), SCarg->device->channel, SCarg->device->id, SCarg->device->lun, SCarg->pid);
 
+   spin_lock_irq(sh[j]->host_lock);
+
    if (SCarg->host_scribble == NULL)
       printk("%s: reset, pid %ld inactive.\n", BN(j), SCarg->pid);
 
    if (HD(j)->in_reset) {
       printk("%s: reset, exit, already in reset.\n", BN(j));
+      spin_unlock_irq(sh[j]->host_lock);
       return FAILED;
       }
 
    if (wait_on_busy(sh[j]->io_port, MAXLOOP)) {
       printk("%s: reset, exit, timeout error.\n", BN(j));
+      spin_unlock_irq(sh[j]->host_lock);
       return FAILED;
       }
 
@@ -1479,6 +1481,7 @@ static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) {
 
    if (wait_on_busy(sh[j]->io_port, MAXLOOP)) {
       printk("%s: reset, cannot reset, timeout error.\n", BN(j));
+      spin_unlock_irq(sh[j]->host_lock);
       return FAILED;
       }
 
@@ -1540,6 +1543,7 @@ static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) {
    if (arg_done) printk("%s: reset, exit, pid %ld done.\n", BN(j), SCarg->pid);
    else          printk("%s: reset, exit.\n", BN(j));
 
+   spin_unlock_irq(sh[j]->host_lock);
    return SUCCESS;
 }
 
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 97f4d9112b48..486551bd54ba 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -879,7 +879,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
         ogm_addr = (unsigned int)isa_bus_to_virt(inl(port0 + 23));
         icm_status = inb(port0 + 27);
         icm_addr = (unsigned int)isa_bus_to_virt(inl(port0 + 28));
-        spin_lock_irqsave(host->host_lock, flags);
+        spin_unlock_irqrestore(host->host_lock, flags);
       }
 
     /* First check to see if an interrupt is pending.  I suspect the SiS
@@ -954,9 +954,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
     SCpnt->result = DID_ABORT << 16;
     
     /* Take the host lock to guard against scsi layer re-entry */
-    spin_lock_irqsave(host->host_lock, flags);
     done(SCpnt);
-    spin_unlock_irqrestore(host->host_lock, flags);
 
     /* Need to set a timeout here in case command never completes.  */
     return SUCCESS;
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index bf4a758e2801..fb54a87a80a3 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -1586,9 +1586,16 @@ static int wd7000_host_reset(struct scsi_cmnd *SCpnt)
 {
         Adapter *host = (Adapter *) SCpnt->device->host->hostdata;
 
-        if (wd7000_adapter_reset(host) < 0)
+        spin_unlock_irq(SCpnt->device->host->host_lock);
+
+        if (wd7000_adapter_reset(host) < 0) {
+                spin_unlock_irq(SCpnt->device->host->host_lock);
                 return FAILED;
+        }
+
         wd7000_enable_intr(host);
+
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 }
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 6e44b46c9e9d..25fcef2c42de 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -753,7 +753,7 @@ config SERIAL_MPC52xx_CONSOLE_BAUD
 
 config SERIAL_ICOM
         tristate "IBM Multiport Serial Adapter"
-        depends on PPC_ISERIES || PPC_PSERIES
+        depends on PCI && (PPC_ISERIES || PPC_PSERIES)
         select SERIAL_CORE
         help
           This driver is for a family of multiport serial adapters
@@ -843,4 +843,13 @@ config SERIAL_JSM
           To compile this driver as a module, choose M here: the
           module will be called jsm.
 
+config SERIAL_SGI_IOC4
+        tristate "SGI IOC4 controller serial support"
+        depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC4
+        select SERIAL_CORE
+        help
+                If you have an SGI Altix with an IOC4 based Base IO card
+                and wish to use the serial ports on this card, say Y.
+                Otherwise, say N.
+
 endmenu
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 81b77d769b84..8f1cdde7dbed 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -51,4 +51,4 @@ obj-$(CONFIG_ETRAX_SERIAL) += crisv10.o
 obj-$(CONFIG_SERIAL_JSM) += jsm/
 obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o
 obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o
-obj-$(CONFIG_BLK_DEV_SGIIOC4) += ioc4_serial.o
+obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index b422c3abfba6..c4c8f4b44f53 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -134,12 +134,21 @@ void scc1_lineif(struct uart_cpm_port *pinfo)
 
 void scc2_lineif(struct uart_cpm_port *pinfo)
 {
+        /*
+         * STx GP3 uses the SCC2 secondary option pin assignment
+         * which this driver doesn't account for in the static
+         * pin assignments. This kind of board specific info
+         * really has to get out of the driver so boards can
+         * be supported in a sane fashion.
+         */
+#ifndef CONFIG_STX_GP3
         volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
         io->iop_psorb |= 0x00880000;
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
+#endif
         cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
         cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
         pinfo->brg = 2;
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index ba4e13a22a50..793c3a7cbe47 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -20,7 +20,7 @@
 #include <linux/serial_reg.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/ioc4_common.h>
+#include <linux/ioc4.h>
 #include <linux/serial_core.h>
 
 /*
@@ -130,12 +130,19 @@
                                  IOC4_SIO_IR_S3_TX_EXPLICIT)
 
 /* Bitmasks for IOC4_OTHER_IR, IOC4_OTHER_IEC, and IOC4_OTHER_IES  */
-#define IOC4_OTHER_IR_ATA_INT           0x00000001  /* ATAPI intr pass-thru */
-#define IOC4_OTHER_IR_ATA_MEMERR        0x00000002  /* ATAPI DMA PCI error */
-#define IOC4_OTHER_IR_S0_MEMERR         0x00000004  /* Port 0 PCI error */
-#define IOC4_OTHER_IR_S1_MEMERR         0x00000008  /* Port 1 PCI error */
-#define IOC4_OTHER_IR_S2_MEMERR         0x00000010  /* Port 2 PCI error */
-#define IOC4_OTHER_IR_S3_MEMERR         0x00000020  /* Port 3 PCI error */
+#define IOC4_OTHER_IR_ATA_INT           0x00000001  /* ATAPI intr pass-thru */
+#define IOC4_OTHER_IR_ATA_MEMERR        0x00000002  /* ATAPI DMA PCI error */
+#define IOC4_OTHER_IR_S0_MEMERR         0x00000004  /* Port 0 PCI error */
+#define IOC4_OTHER_IR_S1_MEMERR         0x00000008  /* Port 1 PCI error */
+#define IOC4_OTHER_IR_S2_MEMERR         0x00000010  /* Port 2 PCI error */
+#define IOC4_OTHER_IR_S3_MEMERR         0x00000020  /* Port 3 PCI error */
+#define IOC4_OTHER_IR_KBD_INT           0x00000040  /* Keyboard/mouse */
+#define IOC4_OTHER_IR_RESERVED          0x007fff80  /* Reserved */
+#define IOC4_OTHER_IR_RT_INT            0x00800000  /* INT_OUT section output */
+#define IOC4_OTHER_IR_GEN_INT           0xff000000  /* Generic pins */
+
+#define IOC4_OTHER_IR_SER_MEMERR (IOC4_OTHER_IR_S0_MEMERR | IOC4_OTHER_IR_S1_MEMERR | \
+                                  IOC4_OTHER_IR_S2_MEMERR | IOC4_OTHER_IR_S3_MEMERR)
 
 /* Bitmasks for IOC4_SIO_CR */
 #define IOC4_SIO_CR_CMD_PULSE_SHIFT              0  /* byte bus strobe shift */
@@ -274,70 +281,24 @@ struct ioc4_uartregs {
 #define i4u_dlm u2.dlm
 #define i4u_fcr u3.fcr
 
-/* PCI memory space register map addressed using pci_bar0 */
-struct ioc4_memregs {
-        struct ioc4_mem {
-                /* Miscellaneous IOC4  registers */
-                uint32_t pci_err_addr_l;
-                uint32_t pci_err_addr_h;
-                uint32_t sio_ir;
-                uint32_t other_ir;
-
-                /* These registers are read-only for general kernel code.  */
-                uint32_t sio_ies_ro;
-                uint32_t other_ies_ro;
-                uint32_t sio_iec_ro;
-                uint32_t other_iec_ro;
-                uint32_t sio_cr;
-                uint32_t misc_fill1;
-                uint32_t int_out;
-                uint32_t misc_fill2;
-                uint32_t gpcr_s;
-                uint32_t gpcr_c;
-                uint32_t gpdr;
-                uint32_t misc_fill3;
-                uint32_t gppr_0;
-                uint32_t gppr_1;
-                uint32_t gppr_2;
-                uint32_t gppr_3;
-                uint32_t gppr_4;
-                uint32_t gppr_5;
-                uint32_t gppr_6;
-                uint32_t gppr_7;
-        } ioc4_mem;
-
-        char misc_fill4[0x100 - 0x5C - 4];
-
-        /* ATA/ATAP registers */
-        uint32_t ata_notused[9];
-        char ata_fill1[0x140 - 0x120 - 4];
-        uint32_t ata_notused1[8];
-        char ata_fill2[0x200 - 0x15C - 4];
-
-        /* Keyboard and mouse registers */
-        uint32_t km_notused[5];;
-        char km_fill1[0x300 - 0x210 - 4];
-
-        /* Serial port registers used for DMA serial I/O */
-        struct ioc4_serial {
-                uint32_t sbbr01_l;
-                uint32_t sbbr01_h;
-                uint32_t sbbr23_l;
-                uint32_t sbbr23_h;
-
-                struct ioc4_serialregs port_0;
-                struct ioc4_serialregs port_1;
-                struct ioc4_serialregs port_2;
-                struct ioc4_serialregs port_3;
-                struct ioc4_uartregs uart_0;
-                struct ioc4_uartregs uart_1;
-                struct ioc4_uartregs uart_2;
-                struct ioc4_uartregs uart_3;
-        } ioc4_serial;
-};
+/* Serial port registers used for DMA serial I/O */
+struct ioc4_serial {
+        uint32_t sbbr01_l;
+        uint32_t sbbr01_h;
+        uint32_t sbbr23_l;
+        uint32_t sbbr23_h;
+
+        struct ioc4_serialregs port_0;
+        struct ioc4_serialregs port_1;
+        struct ioc4_serialregs port_2;
+        struct ioc4_serialregs port_3;
+        struct ioc4_uartregs uart_0;
+        struct ioc4_uartregs uart_1;
+        struct ioc4_uartregs uart_2;
+        struct ioc4_uartregs uart_3;
+} ioc4_serial;
 
 /* UART clock speed */
-#define IOC4_SER_XIN_CLK        IOC4_SER_XIN_CLK_66
 #define IOC4_SER_XIN_CLK_66     66666667
 #define IOC4_SER_XIN_CLK_33     33333333
 
@@ -412,8 +373,8 @@ enum sio_proto {
                                         | UART_LCR_WLEN7 | UART_LCR_WLEN8)
 #define LCR_MASK_STOP_BITS      (UART_LCR_STOP)
 
-#define PENDING(_p)     (readl(&(_p)->ip_mem->sio_ir) & _p->ip_ienb)
-#define READ_SIO_IR(_p) readl(&(_p)->ip_mem->sio_ir)
+#define PENDING(_p)     (readl(&(_p)->ip_mem->sio_ir.raw) & _p->ip_ienb)
+#define READ_SIO_IR(_p) readl(&(_p)->ip_mem->sio_ir.raw)
 
 /* Default to 4k buffers */
 #ifdef IOC4_1K_BUFFERS
@@ -447,7 +408,7 @@ struct ioc4_control {
  */
 #define MAX_IOC4_INTR_ENTS      (8 * sizeof(uint32_t))
 struct ioc4_soft {
-        struct ioc4_mem __iomem *is_ioc4_mem_addr;
+        struct ioc4_misc_regs __iomem *is_ioc4_misc_addr;
         struct ioc4_serial __iomem *is_ioc4_serial_addr;
 
         /* Each interrupt type has an entry in the array */
@@ -486,7 +447,7 @@ struct ioc4_port {
         struct ioc4_soft *ip_ioc4_soft;
 
         /* pci mem addresses */
-        struct ioc4_mem __iomem *ip_mem;
+        struct ioc4_misc_regs __iomem *ip_mem;
         struct ioc4_serial __iomem *ip_serial;
         struct ioc4_serialregs __iomem *ip_serial_regs;
         struct ioc4_uartregs __iomem *ip_uart_regs;
@@ -553,7 +514,7 @@ struct hooks {
         uint32_t intr_dma_error;
         uint32_t intr_clear;
         uint32_t intr_all;
-        char rs422_select_pin;
+        int rs422_select_pin;
 };
 
 static struct hooks hooks_array[IOC4_NUM_SERIAL_PORTS] = {
@@ -669,7 +630,7 @@ static void handle_intr(void *arg, uint32_t sio_ir);
 static inline void
 write_ireg(struct ioc4_soft *ioc4_soft, uint32_t val, int which, int type)
 {
-        struct ioc4_mem __iomem *mem = ioc4_soft->is_ioc4_mem_addr;
+        struct ioc4_misc_regs __iomem *mem = ioc4_soft->is_ioc4_misc_addr;
         unsigned long flags;
 
         spin_lock_irqsave(&ioc4_soft->is_ir_lock, flags);
@@ -678,11 +639,11 @@ write_ireg(struct ioc4_soft *ioc4_soft, uint32_t val, int which, int type)
         case IOC4_SIO_INTR_TYPE:
                 switch (which) {
                 case IOC4_W_IES:
-                        writel(val, &mem->sio_ies_ro);
+                        writel(val, &mem->sio_ies.raw);
                         break;
 
                 case IOC4_W_IEC:
-                        writel(val, &mem->sio_iec_ro);
+                        writel(val, &mem->sio_iec.raw);
                         break;
                 }
                 break;
@@ -690,11 +651,11 @@ write_ireg(struct ioc4_soft *ioc4_soft, uint32_t val, int which, int type)
         case IOC4_OTHER_INTR_TYPE:
                 switch (which) {
                 case IOC4_W_IES:
-                        writel(val, &mem->other_ies_ro);
+                        writel(val, &mem->other_ies.raw);
                         break;
 
                 case IOC4_W_IEC:
-                        writel(val, &mem->other_iec_ro);
+                        writel(val, &mem->other_iec.raw);
                         break;
                 }
                 break;
@@ -747,7 +708,8 @@ static int set_baud(struct ioc4_port *port, int baud)
  */
 static struct ioc4_port *get_ioc4_port(struct uart_port *the_port)
 {
-        struct ioc4_control *control = dev_get_drvdata(the_port->dev);
+        struct ioc4_driver_data *idd = dev_get_drvdata(the_port->dev);
+        struct ioc4_control *control = idd->idd_serial_data;
         int ii;
 
         if (control) {
@@ -782,7 +744,7 @@ static struct ioc4_port *get_ioc4_port(struct uart_port *the_port)
 static inline uint32_t
 pending_intrs(struct ioc4_soft *soft, int type)
 {
-        struct ioc4_mem __iomem *mem = soft->is_ioc4_mem_addr;
+        struct ioc4_misc_regs __iomem *mem = soft->is_ioc4_misc_addr;
         unsigned long flag;
         uint32_t intrs = 0;
 
@@ -793,11 +755,11 @@ pending_intrs(struct ioc4_soft *soft, int type)
 
         switch (type) {
         case IOC4_SIO_INTR_TYPE:
-                intrs = readl(&mem->sio_ir) & readl(&mem->sio_ies_ro);
+                intrs = readl(&mem->sio_ir.raw) & readl(&mem->sio_ies.raw);
                 break;
 
         case IOC4_OTHER_INTR_TYPE:
-                intrs = readl(&mem->other_ir) & readl(&mem->other_ies_ro);
+                intrs = readl(&mem->other_ir.raw) & readl(&mem->other_ies.raw);
 
                 /* Don't process any ATA interrupte */
                 intrs &= ~(IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR);
@@ -826,7 +788,7 @@ static int inline port_init(struct ioc4_port *port)
 
         /* Wait until any pending bus activity for this port has ceased */
         do
-                sio_cr = readl(&port->ip_mem->sio_cr);
+                sio_cr = readl(&port->ip_mem->sio_cr.raw);
         while (!(sio_cr & IOC4_SIO_CR_SIO_DIAG_IDLE));
 
         /* Finish reset sequence */
@@ -899,7 +861,7 @@ static int inline port_init(struct ioc4_port *port)
         write_ireg(port->ip_ioc4_soft, hooks->intr_clear,
                        IOC4_W_IEC, IOC4_SIO_INTR_TYPE);
         port->ip_ienb &= ~hooks->intr_clear;
-        writel(hooks->intr_clear, &port->ip_mem->sio_ir);
+        writel(hooks->intr_clear, &port->ip_mem->sio_ir.raw);
         return 0;
 }
 
@@ -918,23 +880,23 @@ static void handle_dma_error_intr(void *arg, uint32_t other_ir)
         spin_lock_irqsave(&port->ip_lock, flags);
 
         /* ACK the interrupt */
-        writel(hooks->intr_dma_error, &port->ip_mem->other_ir);
+        writel(hooks->intr_dma_error, &port->ip_mem->other_ir.raw);
 
-        if (readl(&port->ip_mem->pci_err_addr_l) & IOC4_PCI_ERR_ADDR_VLD) {
+        if (readl(&port->ip_mem->pci_err_addr_l.raw) & IOC4_PCI_ERR_ADDR_VLD) {
                 printk(KERN_ERR
                         "PCI error address is 0x%lx, "
                                 "master is serial port %c %s\n",
                      (((uint64_t)readl(&port->ip_mem->pci_err_addr_h)
                                                          << 32)
-                                | readl(&port->ip_mem->pci_err_addr_l))
+                                | readl(&port->ip_mem->pci_err_addr_l.raw))
                                         & IOC4_PCI_ERR_ADDR_ADDR_MSK, '1' +
-                     ((char)(readl(&port->ip_mem-> pci_err_addr_l) &
+                     ((char)(readl(&port->ip_mem->pci_err_addr_l.raw) &
                              IOC4_PCI_ERR_ADDR_MST_NUM_MSK) >> 1),
-                     (readl(&port->ip_mem->pci_err_addr_l)
+                     (readl(&port->ip_mem->pci_err_addr_l.raw)
                                 & IOC4_PCI_ERR_ADDR_MST_TYP_MSK)
                                 ? "RX" : "TX");
 
-                if (readl(&port->ip_mem->pci_err_addr_l)
+                if (readl(&port->ip_mem->pci_err_addr_l.raw)
                                                 & IOC4_PCI_ERR_ADDR_MUL_ERR) {
                         printk(KERN_ERR
                                 "Multiple errors occurred\n");
@@ -1018,26 +980,26 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
                                 "other_ies = 0x%x\n",
                                (intr_type == IOC4_SIO_INTR_TYPE) ? "sio" :
                                "other", this_ir,
-                               readl(&soft->is_ioc4_mem_addr->sio_ir),
-                               readl(&soft->is_ioc4_mem_addr->sio_ies_ro),
-                               readl(&soft->is_ioc4_mem_addr->other_ir),
-                               readl(&soft->is_ioc4_mem_addr->other_ies_ro));
+                               readl(&soft->is_ioc4_misc_addr->sio_ir.raw),
+                               readl(&soft->is_ioc4_misc_addr->sio_ies.raw),
+                               readl(&soft->is_ioc4_misc_addr->other_ir.raw),
+                               readl(&soft->is_ioc4_misc_addr->other_ies.raw));
                 }
         }
 #ifdef DEBUG_INTERRUPTS
         {
-                struct ioc4_mem __iomem *mem = soft->is_ioc4_mem_addr;
+                struct ioc4_misc_regs __iomem *mem = soft->is_ioc4_misc_addr;
                 spinlock_t *lp = &soft->is_ir_lock;
                 unsigned long flag;
 
                 spin_lock_irqsave(&soft->is_ir_lock, flag);
-                printk ("%s : %d : mem 0x%p sio_ir 0x%x sio_ies_ro 0x%x "
-                                "other_ir 0x%x other_ies_ro 0x%x mask 0x%x\n",
+                printk ("%s : %d : mem 0x%p sio_ir 0x%x sio_ies 0x%x "
+                                "other_ir 0x%x other_ies 0x%x mask 0x%x\n",
                      __FUNCTION__, __LINE__,
-                     (void *)mem, readl(&mem->sio_ir),
-                     readl(&mem->sio_ies_ro),
-                     readl(&mem->other_ir),
-                     readl(&mem->other_ies_ro),
+                     (void *)mem, readl(&mem->sio_ir.raw),
+                     readl(&mem->sio_ies.raw),
+                     readl(&mem->other_ir.raw),
+                     readl(&mem->other_ies.raw),
                      IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR);
                 spin_unlock_irqrestore(&soft->is_ir_lock, flag);
         }
@@ -1049,21 +1011,20 @@ static irqreturn_t ioc4_intr(int irq, void *arg, struct pt_regs *regs)
  * ioc4_attach_local - Device initialization.
  *                      Called at *_attach() time for each
  *                      IOC4 with serial ports in the system.
- * @control: ioc4_control ptr
- * @pdev: PCI handle for this device
- * @soft: soft struct for this device
- * @ioc4: ioc4 mem space
+ * @idd: Master module data for this IOC4
  */
-static int inline ioc4_attach_local(struct pci_dev *pdev,
-                        struct ioc4_control *control,
-                        struct ioc4_soft *soft, void __iomem *ioc4_mem,
-                        void __iomem *ioc4_serial)
+static int inline ioc4_attach_local(struct ioc4_driver_data *idd)
 {
         struct ioc4_port *port;
         struct ioc4_port *ports[IOC4_NUM_SERIAL_PORTS];
         int port_number;
         uint16_t ioc4_revid_min = 62;
         uint16_t ioc4_revid;
+        struct pci_dev *pdev = idd->idd_pdev;
+        struct ioc4_control* control = idd->idd_serial_data;
+        struct ioc4_soft *soft = control->ic_soft;
+        void __iomem *ioc4_misc = idd->idd_misc_regs;
+        void __iomem *ioc4_serial = soft->is_ioc4_serial_addr;
 
         /* IOC4 firmware must be at least rev 62 */
         pci_read_config_word(pdev, PCI_COMMAND_SPECIAL, &ioc4_revid);
@@ -1076,7 +1037,7 @@ static int inline ioc4_attach_local(struct pci_dev *pdev,
                                 ioc4_revid, ioc4_revid_min);
                 return -EPERM;
         }
-        BUG_ON(ioc4_mem == NULL);
+        BUG_ON(ioc4_misc == NULL);
         BUG_ON(ioc4_serial == NULL);
 
         /* Create port structures for each port */
@@ -1100,10 +1061,18 @@ static int inline ioc4_attach_local(struct pci_dev *pdev,
                 port->ip_ioc4_soft = soft;
                 port->ip_pdev = pdev;
                 port->ip_ienb = 0;
-                port->ip_pci_bus_speed = IOC4_SER_XIN_CLK;
+                /* Use baud rate calculations based on detected PCI
+                 * bus speed.  Simply test whether the PCI clock is
+                 * running closer to 66MHz or 33MHz.
+                 */
+                if (idd->count_period/IOC4_EXTINT_COUNT_DIVISOR < 20) {
+                        port->ip_pci_bus_speed = IOC4_SER_XIN_CLK_66;
+                } else {
+                        port->ip_pci_bus_speed = IOC4_SER_XIN_CLK_33;
+                }
                 port->ip_baud = 9600;
                 port->ip_control = control;
-                port->ip_mem = ioc4_mem;
+                port->ip_mem = ioc4_misc;
                 port->ip_serial = ioc4_serial;
 
                 /* point to the right hook */
@@ -1604,14 +1573,12 @@ static int ioc4_set_proto(struct ioc4_port *port, enum sio_proto proto)
         switch (proto) {
         case PROTO_RS232:
                 /* Clear the appropriate GIO pin */
-                writel(0, (&port->ip_mem->gppr_0 +
-                                  hooks->rs422_select_pin));
+                writel(0, (&port->ip_mem->gppr[hooks->rs422_select_pin].raw));
                 break;
 
         case PROTO_RS422:
                 /* Set the appropriate GIO pin */
-                writel(1, (&port->ip_mem->gppr_0 +
-                                  hooks->rs422_select_pin));
+                writel(1, (&port->ip_mem->gppr[hooks->rs422_select_pin].raw));
                 break;
 
         default:
@@ -1885,7 +1852,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                 if (sio_ir & hooks->intr_delta_dcd) {
                         /* ACK the interrupt */
                         writel(hooks->intr_delta_dcd,
-                                &port->ip_mem->sio_ir);
+                                &port->ip_mem->sio_ir.raw);
 
                         shadow = readl(&port->ip_serial_regs->shadow);
 
@@ -1907,7 +1874,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                 if (sio_ir & hooks->intr_delta_cts) {
                         /* ACK the interrupt */
                         writel(hooks->intr_delta_cts,
-                                        &port->ip_mem->sio_ir);
+                                        &port->ip_mem->sio_ir.raw);
 
                         shadow = readl(&port->ip_serial_regs->shadow);
 
@@ -1928,7 +1895,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                 if (sio_ir & hooks->intr_rx_timer) {
                         /* ACK the interrupt */
                         writel(hooks->intr_rx_timer,
-                                &port->ip_mem->sio_ir);
+                                &port->ip_mem->sio_ir.raw);
 
                         if ((port->ip_notify & N_DATA_READY)
                                         && (port->ip_port)) {
@@ -1974,7 +1941,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
 
                         /* ACK the interrupt */
                         writel(hooks->intr_tx_explicit,
-                                        &port->ip_mem->sio_ir);
+                                        &port->ip_mem->sio_ir.raw);
 
                         if (port->ip_notify & N_OUTPUT_LOWAT)
                                 ioc4_cb_output_lowat(port);
@@ -2634,7 +2601,8 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
 {
         struct ioc4_port *port;
         struct uart_port *the_port;
-        struct ioc4_control *control = pci_get_drvdata(pdev);
+        struct ioc4_driver_data *idd = pci_get_drvdata(pdev);
+        struct ioc4_control *control = idd->idd_serial_data;
         int ii;
 
         DPRINT_CONFIG(("%s: attach pdev 0x%p - control 0x%p\n",
@@ -2680,55 +2648,29 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
 
 /**
  * ioc4_serial_attach_one - register attach function
- *              called per card found from ioc4_serial_detect as part
- *              of module_init().
- * @pdev: handle for this card
- * @pci_id: pci id for this card
+ *              called per card found from IOC4 master module.
+ * @idd: Master module data for this IOC4
  */
 int
-ioc4_serial_attach_one(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+ioc4_serial_attach_one(struct ioc4_driver_data *idd)
 {
-        struct ioc4_mem __iomem *mem;
-        unsigned long tmp_addr, tmp_addr1;
+        unsigned long tmp_addr1;
         struct ioc4_serial __iomem *serial;
         struct ioc4_soft *soft;
         struct ioc4_control *control;
-        int tmp, ret = 0;
+        int ret = 0;
 
 
-        DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, pdev, pci_id));
-
-        /* Map in the ioc4 memory */
-        tmp_addr = pci_resource_start(pdev, 0);
-        if (!tmp_addr) {
-                printk(KERN_WARNING
-                         "ioc4 (%p) : unable to get PIO mapping for "
-                                "MEM space\n", (void *)pdev);
-                return -ENODEV;
-        }
-        if (!request_region(tmp_addr, sizeof(struct ioc4_mem), "sioc4_mem")) {
-                printk(KERN_ALERT
-                        "ioc4 (%p): unable to get request region for "
-                        "MEM space\n", (void *)pdev);
-                return -ENODEV;
-        }
-        mem = ioremap(tmp_addr, sizeof(struct ioc4_mem));
-        if (!mem) {
-                printk(KERN_WARNING
-                         "ioc4 (%p) : unable to remap ioc4 memory\n",
-                                (void *)pdev);
-                ret = -ENODEV;
-                goto out1;
-        }
+        DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __FUNCTION__, idd->idd_pdev, idd->idd_pci_id));
 
         /* request serial registers */
-        tmp_addr1 = pci_resource_start(pdev, 0) + IOC4_SERIAL_OFFSET;
+        tmp_addr1 = idd->idd_bar0 + IOC4_SERIAL_OFFSET;
 
         if (!request_region(tmp_addr1, sizeof(struct ioc4_serial),
                                         "sioc4_uart")) {
                 printk(KERN_WARNING
                         "ioc4 (%p): unable to get request region for "
-                                "uart space\n", (void *)pdev);
+                                "uart space\n", (void *)idd->idd_pdev);
                 ret = -ENODEV;
                 goto out1;
         }
@@ -2736,12 +2678,12 @@ ioc4_serial_attach_one(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         if (!serial) {
                 printk(KERN_WARNING
                          "ioc4 (%p) : unable to remap ioc4 serial register\n",
-                                (void *)pdev);
+                                (void *)idd->idd_pdev);
                 ret = -ENODEV;
                 goto out2;
         }
         DPRINT_CONFIG(("%s : mem 0x%p, serial 0x%p\n",
-                                __FUNCTION__, (void *)mem, (void *)serial));
+                                __FUNCTION__, (void *)idd->idd_misc_regs, (void *)serial));
 
         /* Get memory for the new card */
         control = kmalloc(sizeof(struct ioc4_control) * IOC4_NUM_SERIAL_PORTS,
@@ -2754,59 +2696,56 @@ ioc4_serial_attach_one(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                 goto out2;
         }
         memset(control, 0, sizeof(struct ioc4_control));
-        pci_set_drvdata(pdev, control);
+        idd->idd_serial_data = control;
 
         /* Allocate the soft structure */
         soft = kmalloc(sizeof(struct ioc4_soft), GFP_KERNEL);
         if (!soft) {
                 printk(KERN_WARNING
                        "ioc4 (%p): unable to get memory for the soft struct\n",
-                       (void *)pdev);
+                       (void *)idd->idd_pdev);
                 ret = -ENOMEM;
                 goto out3;
         }
         memset(soft, 0, sizeof(struct ioc4_soft));
 
         spin_lock_init(&soft->is_ir_lock);
-        soft->is_ioc4_mem_addr = mem;
+        soft->is_ioc4_misc_addr = idd->idd_misc_regs;
         soft->is_ioc4_serial_addr = serial;
 
         /* Init the IOC4 */
-        pci_read_config_dword(pdev, PCI_COMMAND, &tmp);
-        pci_write_config_dword(pdev, PCI_COMMAND,
-                               tmp | PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
-
-        writel(0xf << IOC4_SIO_CR_CMD_PULSE_SHIFT, &mem->sio_cr);
+        writel(0xf << IOC4_SIO_CR_CMD_PULSE_SHIFT,
+               &idd->idd_misc_regs->sio_cr.raw);
 
         /* Enable serial port mode select generic PIO pins as outputs */
         writel(IOC4_GPCR_UART0_MODESEL | IOC4_GPCR_UART1_MODESEL
                 | IOC4_GPCR_UART2_MODESEL | IOC4_GPCR_UART3_MODESEL,
-                &mem->gpcr_s);
+                &idd->idd_misc_regs->gpcr_s.raw);
 
-        /* Clear and disable all interrupts */
+        /* Clear and disable all serial interrupts */
         write_ireg(soft, ~0, IOC4_W_IEC, IOC4_SIO_INTR_TYPE);
-        writel(~0, &mem->sio_ir);
-        write_ireg(soft, ~(IOC4_OTHER_IR_ATA_INT | IOC4_OTHER_IR_ATA_MEMERR),
-                        IOC4_W_IEC, IOC4_OTHER_INTR_TYPE);
-        writel(~(IOC4_OTHER_IR_ATA_MEMERR | IOC4_OTHER_IR_ATA_MEMERR),
-                                        &mem->other_ir);
+        writel(~0, &idd->idd_misc_regs->sio_ir.raw);
+        write_ireg(soft, IOC4_OTHER_IR_SER_MEMERR, IOC4_W_IEC,
+                   IOC4_OTHER_INTR_TYPE);
+        writel(IOC4_OTHER_IR_SER_MEMERR, &idd->idd_misc_regs->other_ir.raw);
         control->ic_soft = soft;
-        if (!request_irq(pdev->irq, ioc4_intr, SA_SHIRQ,
+
+        /* Hook up interrupt handler */
+        if (!request_irq(idd->idd_pdev->irq, ioc4_intr, SA_SHIRQ,
                                 "sgi-ioc4serial", (void *)soft)) {
-                control->ic_irq = pdev->irq;
+                control->ic_irq = idd->idd_pdev->irq;
         } else {
                 printk(KERN_WARNING
                     "%s : request_irq fails for IRQ 0x%x\n ",
-                        __FUNCTION__, pdev->irq);
+                        __FUNCTION__, idd->idd_pdev->irq);
         }
-        if ((ret = ioc4_attach_local(pdev, control, soft,
-                                soft->is_ioc4_mem_addr,
-                                soft->is_ioc4_serial_addr)))
+        ret = ioc4_attach_local(idd);
+        if (ret)
                 goto out4;
 
         /* register port with the serial core */
 
-        if ((ret = ioc4_serial_core_attach(pdev)))
+        if ((ret = ioc4_serial_core_attach(idd->idd_pdev)))
                 goto out4;
 
         return ret;
@@ -2819,7 +2758,6 @@ out3:
 out2:
         release_region(tmp_addr1, sizeof(struct ioc4_serial));
 out1:
-        release_region(tmp_addr, sizeof(struct ioc4_mem));
 
         return ret;
 }
@@ -2828,11 +2766,10 @@ out1:
 /**
  * ioc4_serial_remove_one - detach function
  *
- * @pdev: handle for this card
+ * @idd: IOC4 master module data for this IOC4
  */
 
-#if 0
-void ioc4_serial_remove_one(struct pci_dev *pdev)
+int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
 {
         int ii;
         struct ioc4_control *control;
@@ -2840,7 +2777,7 @@ void ioc4_serial_remove_one(struct pci_dev *pdev)
         struct ioc4_port *port;
         struct ioc4_soft *soft;
 
-        control = pci_get_drvdata(pdev);
+        control = idd->idd_serial_data;
 
         for (ii = 0; ii < IOC4_NUM_SERIAL_PORTS; ii++) {
                 the_port = &control->ic_port[ii].icp_uart_port;
@@ -2867,10 +2804,17 @@ void ioc4_serial_remove_one(struct pci_dev *pdev)
                 kfree(soft);
         }
         kfree(control);
-        pci_set_drvdata(pdev, NULL);
-        uart_unregister_driver(&ioc4_uart);
+        idd->idd_serial_data = NULL;
+
+        return 0;
 }
-#endif
+
+static struct ioc4_submodule ioc4_serial_submodule = {
+        .is_name = "IOC4_serial",
+        .is_owner = THIS_MODULE,
+        .is_probe = ioc4_serial_attach_one,
+        .is_remove = ioc4_serial_remove_one,
+};
 
 /**
  * ioc4_serial_init - module init
@@ -2886,12 +2830,20 @@ int ioc4_serial_init(void)
                         __FUNCTION__);
                 return ret;
         }
-        return 0;
+
+        /* register with IOC4 main module */
+        return ioc4_register_submodule(&ioc4_serial_submodule);
+}
+
+static void __devexit ioc4_serial_exit(void)
+{
+        ioc4_unregister_submodule(&ioc4_serial_submodule);
+        uart_unregister_driver(&ioc4_uart);
 }
 
+module_init(ioc4_serial_init);
+module_exit(ioc4_serial_exit);
+
 MODULE_AUTHOR("Pat Gefre - Silicon Graphics Inc. (SGI) <pfg@sgi.com>");
 MODULE_DESCRIPTION("Serial PCI driver module for SGI IOC4 Base-IO Card");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(ioc4_serial_init);
-EXPORT_SYMBOL(ioc4_serial_attach_one);
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 22565a67a57c..98641c3f5ab9 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -197,7 +197,7 @@ static void
 sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
 {
         struct tty_struct *tty = sport->port.info->tty;
-        unsigned int status, ch, flg, ignored = 0;
+        unsigned int status, ch, flg;
 
         status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
                  UTSR0_TO_SM(UART_GET_UTSR0(sport));
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 5d2ceb623e6f..1f985327b0d4 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -234,7 +234,7 @@ static inline const char *siu_type_name(struct uart_port *port)
                 return "DSIU";
         }
 
-        return "unknown";
+        return NULL;
 }
 
 static unsigned int siu_tx_empty(struct uart_port *port)
@@ -482,9 +482,6 @@ static irqreturn_t siu_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         struct uart_port *port;
         uint8_t iir, lsr;
 
-        if (dev_id == NULL)
-                return IRQ_NONE;
-
         port = (struct uart_port *)dev_id;
 
         iir = siu_read(port, UART_IIR);
@@ -507,6 +504,9 @@ static int siu_startup(struct uart_port *port)
 {
         int retval;
 
+        if (port->membase == NULL)
+                return -ENODEV;
+
         siu_clear_fifo(port);
 
         (void)siu_read(port, UART_LSR);
@@ -545,9 +545,6 @@ static void siu_shutdown(struct uart_port *port)
         unsigned long flags;
         uint8_t lcr;
 
-        if (port->membase == NULL)
-                return;
-
         siu_write(port, UART_IER, 0);
 
         spin_lock_irqsave(&port->lock, flags);
@@ -802,53 +799,6 @@ static int siu_init_ports(void)
 
 #ifdef CONFIG_SERIAL_VR41XX_CONSOLE
 
-static void early_set_termios(struct uart_port *port, struct termios *new,
-                              struct termios *old)
-{
-        tcflag_t c_cflag;
-        uint8_t lcr;
-        unsigned int baud, quot;
-
-        c_cflag = new->c_cflag;
-        switch (c_cflag & CSIZE) {
-        case CS5:
-                lcr = UART_LCR_WLEN5;
-                break;
-        case CS6:
-                lcr = UART_LCR_WLEN6;
-                break;
-        case CS7:
-                lcr = UART_LCR_WLEN7;
-                break;
-        default:
-                lcr = UART_LCR_WLEN8;
-                break;
-        }
-
-        if (c_cflag & CSTOPB)
-                lcr |= UART_LCR_STOP;
-        if (c_cflag & PARENB)
-                lcr |= UART_LCR_PARITY;
-        if ((c_cflag & PARODD) != PARODD)
-                lcr |= UART_LCR_EPAR;
-        if (c_cflag & CMSPAR)
-                lcr |= UART_LCR_SPAR;
-
-        baud = uart_get_baud_rate(port, new, old, 0, port->uartclk/16);
-        quot = uart_get_divisor(port, baud);
-
-        siu_write(port, UART_LCR, lcr | UART_LCR_DLAB);
-
-        siu_write(port, UART_DLL, (uint8_t)quot);
-        siu_write(port, UART_DLM, (uint8_t)(quot >> 8));
-
-        siu_write(port, UART_LCR, lcr);
-}
-
-static struct uart_ops early_uart_ops = {
-        .set_termios    = early_set_termios,
-};
-
 #define BOTH_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
 
 static void wait_for_xmitr(struct uart_port *port)
@@ -915,7 +865,7 @@ static int siu_console_setup(struct console *con, char *options)
         if (port->membase == NULL) {
                 if (port->mapbase == 0)
                         return -ENODEV;
-                port->membase = (unsigned char __iomem *)KSEG1ADDR(port->mapbase);
+                port->membase = ioremap(port->mapbase, siu_port_size(port));
         }
 
         vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
@@ -949,7 +899,7 @@ static int __devinit siu_console_init(void)
 
         for (i = 0; i < num; i++) {
                 port = &siu_uart_ports[i];
-                port->ops = &early_uart_ops;
+                port->ops = &siu_uart_ops;
         }
 
         register_console(&siu_console);
@@ -994,8 +944,10 @@ static int siu_probe(struct device *dev)
                 port->dev = dev;
 
                 retval = uart_add_one_port(&siu_uart_driver, port);
-                if (retval)
+                if (retval < 0) {
+                        port->dev = NULL;
                         break;
+                }
         }
 
         if (i == 0 && retval < 0) {
diff --git a/drivers/sh/superhyway/superhyway-sysfs.c b/drivers/sh/superhyway/superhyway-sysfs.c
index 39ab6a12da76..dc119ce68e3e 100644
--- a/drivers/sh/superhyway/superhyway-sysfs.c
+++ b/drivers/sh/superhyway/superhyway-sysfs.c
@@ -15,7 +15,7 @@
 #include <linux/superhyway.h>
 
 #define superhyway_ro_attr(name, fmt, field)                            \
-static ssize_t name##_show(struct device *dev, char *buf)               \
+static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                       \
         struct superhyway_device *s = to_superhyway_device(dev);        \
         return sprintf(buf, fmt, s->field);                             \
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
new file mode 100644
index 000000000000..13b8d249da5c
--- /dev/null
+++ b/drivers/sn/Kconfig
@@ -0,0 +1,20 @@
+#
+# Miscellaneous SN-specific devices
+#
+
+menu "SN Devices"
+
+config SGI_IOC4
+        tristate "SGI IOC4 Base IO support"
+        depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER
+        default m
+        ---help---
+        This option enables basic support for the SGI IOC4-based Base IO
+        controller card.  This option does not enable any specific
+        functions on such a card, but provides necessary infrastructure
+        for other drivers to utilize.
+
+        If you have an SGI Altix with an IOC4-based
+        I/O controller say Y.  Otherwise say N.
+
+endmenu
diff --git a/drivers/sn/Makefile b/drivers/sn/Makefile
index 631e54958448..c2a284185372 100644
--- a/drivers/sn/Makefile
+++ b/drivers/sn/Makefile
@@ -3,4 +3,4 @@
 #
 #
 
-obj-$(CONFIG_BLK_DEV_SGIIOC4) += ioc4.o
+obj-$(CONFIG_SGI_IOC4) += ioc4.o
diff --git a/drivers/sn/ioc4.c b/drivers/sn/ioc4.c
index d9e4ee280e5f..ea75b3d0612b 100644
--- a/drivers/sn/ioc4.c
+++ b/drivers/sn/ioc4.c
@@ -6,60 +6,422 @@
  * Copyright (C) 2005 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
-/*
- * This file contains a shim driver for the IOC4 IDE and serial drivers.
+/* This file contains the master driver module for use by SGI IOC4 subdrivers.
+ *
+ * It allocates any resources shared between multiple subdevices, and
+ * provides accessor functions (where needed) and the like for those
+ * resources.  It also provides a mechanism for the subdevice modules
+ * to support loading and unloading.
+ *
+ * Non-shared resources (e.g. external interrupt A_INT_OUT register page
+ * alias, serial port and UART registers) are handled by the subdevice
+ * modules themselves.
+ *
+ * This is all necessary because IOC4 is not implemented as a multi-function
+ * PCI device, but an amalgamation of disparate registers for several
+ * types of device (ATA, serial, external interrupts).  The normal
+ * resource management in the kernel doesn't have quite the right interfaces
+ * to handle this situation (e.g. multiple modules can't claim the same
+ * PCI ID), thus this IOC4 master module.
  */
 
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/ioc4_common.h>
-#include <linux/ide.h>
+#include <linux/ioc4.h>
+#include <linux/mmtimer.h>
+#include <linux/rtc.h>
+#include <linux/rwsem.h>
+#include <asm/sn/addrs.h>
+#include <asm/sn/clksupport.h>
+#include <asm/sn/shub_mmr.h>
 
+/***************
+ * Definitions *
+ ***************/
 
-static int __devinit
-ioc4_probe_one(struct pci_dev *pdev, const struct pci_device_id *pci_id)
+/* Tweakable values */
+
+/* PCI bus speed detection/calibration */
+#define IOC4_CALIBRATE_COUNT 63 /* Calibration cycle period */
+#define IOC4_CALIBRATE_CYCLES 256       /* Average over this many cycles */
+#define IOC4_CALIBRATE_DISCARD 2        /* Discard first few cycles */
+#define IOC4_CALIBRATE_LOW_MHZ 25       /* Lower bound on bus speed sanity */
+#define IOC4_CALIBRATE_HIGH_MHZ 75      /* Upper bound on bus speed sanity */
+#define IOC4_CALIBRATE_DEFAULT_MHZ 66   /* Assumed if sanity check fails */
+
+/************************
+ * Submodule management *
+ ************************/
+
+static LIST_HEAD(ioc4_devices);
+static DECLARE_RWSEM(ioc4_devices_rwsem);
+
+static LIST_HEAD(ioc4_submodules);
+static DECLARE_RWSEM(ioc4_submodules_rwsem);
+
+/* Register an IOC4 submodule */
+int
+ioc4_register_submodule(struct ioc4_submodule *is)
+{
+        struct ioc4_driver_data *idd;
+
+        down_write(&ioc4_submodules_rwsem);
+        list_add(&is->is_list, &ioc4_submodules);
+        up_write(&ioc4_submodules_rwsem);
+
+        /* Initialize submodule for each IOC4 */
+        if (!is->is_probe)
+                return 0;
+
+        down_read(&ioc4_devices_rwsem);
+        list_for_each_entry(idd, &ioc4_devices, idd_list) {
+                if (is->is_probe(idd)) {
+                        printk(KERN_WARNING
+                               "%s: IOC4 submodule %s probe failed "
+                               "for pci_dev %s",
+                               __FUNCTION__, module_name(is->is_owner),
+                               pci_name(idd->idd_pdev));
+                }
+        }
+        up_read(&ioc4_devices_rwsem);
+
+        return 0;
+}
+
+/* Unregister an IOC4 submodule */
+void
+ioc4_unregister_submodule(struct ioc4_submodule *is)
+{
+        struct ioc4_driver_data *idd;
+
+        down_write(&ioc4_submodules_rwsem);
+        list_del(&is->is_list);
+        up_write(&ioc4_submodules_rwsem);
+
+        /* Remove submodule for each IOC4 */
+        if (!is->is_remove)
+                return;
+
+        down_read(&ioc4_devices_rwsem);
+        list_for_each_entry(idd, &ioc4_devices, idd_list) {
+                if (is->is_remove(idd)) {
+                        printk(KERN_WARNING
+                               "%s: IOC4 submodule %s remove failed "
+                               "for pci_dev %s.\n",
+                               __FUNCTION__, module_name(is->is_owner),
+                               pci_name(idd->idd_pdev));
+                }
+        }
+        up_read(&ioc4_devices_rwsem);
+}
+
+/*********************
+ * Device management *
+ *********************/
+
+#define IOC4_CALIBRATE_LOW_LIMIT \
+        (1000*IOC4_EXTINT_COUNT_DIVISOR/IOC4_CALIBRATE_LOW_MHZ)
+#define IOC4_CALIBRATE_HIGH_LIMIT \
+        (1000*IOC4_EXTINT_COUNT_DIVISOR/IOC4_CALIBRATE_HIGH_MHZ)
+#define IOC4_CALIBRATE_DEFAULT \
+        (1000*IOC4_EXTINT_COUNT_DIVISOR/IOC4_CALIBRATE_DEFAULT_MHZ)
+
+#define IOC4_CALIBRATE_END \
+        (IOC4_CALIBRATE_CYCLES + IOC4_CALIBRATE_DISCARD)
+
+#define IOC4_INT_OUT_MODE_TOGGLE 0x7    /* Toggle INT_OUT every COUNT+1 ticks */
+
+/* Determines external interrupt output clock period of the PCI bus an
+ * IOC4 is attached to.  This value can be used to determine the PCI
+ * bus speed.
+ *
+ * IOC4 has a design feature that various internal timers are derived from
+ * the PCI bus clock.  This causes IOC4 device drivers to need to take the
+ * bus speed into account when setting various register values (e.g. INT_OUT
+ * register COUNT field, UART divisors, etc).  Since this information is
+ * needed by several subdrivers, it is determined by the main IOC4 driver,
+ * even though the following code utilizes external interrupt registers
+ * to perform the speed calculation.
+ */
+static void
+ioc4_clock_calibrate(struct ioc4_driver_data *idd)
+{
+        extern unsigned long sn_rtc_cycles_per_second;
+        union ioc4_int_out int_out;
+        union ioc4_gpcr gpcr;
+        unsigned int state, last_state = 1;
+        uint64_t start = 0, end, period;
+        unsigned int count = 0;
+
+        /* Enable output */
+        gpcr.raw = 0;
+        gpcr.fields.dir = IOC4_GPCR_DIR_0;
+        gpcr.fields.int_out_en = 1;
+        writel(gpcr.raw, &idd->idd_misc_regs->gpcr_s.raw);
+
+        /* Reset to power-on state */
+        writel(0, &idd->idd_misc_regs->int_out.raw);
+        mmiowb();
+
+        printk(KERN_INFO
+               "%s: Calibrating PCI bus speed "
+               "for pci_dev %s ... ", __FUNCTION__, pci_name(idd->idd_pdev));
+        /* Set up square wave */
+        int_out.raw = 0;
+        int_out.fields.count = IOC4_CALIBRATE_COUNT;
+        int_out.fields.mode = IOC4_INT_OUT_MODE_TOGGLE;
+        int_out.fields.diag = 0;
+        writel(int_out.raw, &idd->idd_misc_regs->int_out.raw);
+        mmiowb();
+
+        /* Check square wave period averaged over some number of cycles */
+        do {
+                int_out.raw = readl(&idd->idd_misc_regs->int_out.raw);
+                state = int_out.fields.int_out;
+                if (!last_state && state) {
+                        count++;
+                        if (count == IOC4_CALIBRATE_END) {
+                                end = rtc_time();
+                                break;
+                        } else if (count == IOC4_CALIBRATE_DISCARD)
+                                start = rtc_time();
+                }
+                last_state = state;
+        } while (1);
+
+        /* Calculation rearranged to preserve intermediate precision.
+         * Logically:
+         * 1. "end - start" gives us number of RTC cycles over all the
+         *    square wave cycles measured.
+         * 2. Divide by number of square wave cycles to get number of
+         *    RTC cycles per square wave cycle.
+         * 3. Divide by 2*(int_out.fields.count+1), which is the formula
+         *    by which the IOC4 generates the square wave, to get the
+         *    number of RTC cycles per IOC4 INT_OUT count.
+         * 4. Divide by sn_rtc_cycles_per_second to get seconds per
+         *    count.
+         * 5. Multiply by 1E9 to get nanoseconds per count.
+         */
+        period = ((end - start) * 1000000000) /
+            (IOC4_CALIBRATE_CYCLES * 2 * (IOC4_CALIBRATE_COUNT + 1)
+             * sn_rtc_cycles_per_second);
+
+        /* Bounds check the result. */
+        if (period > IOC4_CALIBRATE_LOW_LIMIT ||
+            period < IOC4_CALIBRATE_HIGH_LIMIT) {
+                printk("failed. Assuming PCI clock ticks are %d ns.\n",
+                       IOC4_CALIBRATE_DEFAULT / IOC4_EXTINT_COUNT_DIVISOR);
+                period = IOC4_CALIBRATE_DEFAULT;
+        } else {
+                printk("succeeded. PCI clock ticks are %ld ns.\n",
+                       period / IOC4_EXTINT_COUNT_DIVISOR);
+        }
+
+        /* Remember results.  We store the extint clock period rather
+         * than the PCI clock period so that greater precision is
+         * retained.  Divide by IOC4_EXTINT_COUNT_DIVISOR to get
+         * PCI clock period.
+         */
+        idd->count_period = period;
+}
+
+/* Adds a new instance of an IOC4 card */
+static int
+ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 {
+        struct ioc4_driver_data *idd;
+        struct ioc4_submodule *is;
+        uint32_t pcmd;
         int ret;
 
+        /* Enable IOC4 and take ownership of it */
         if ((ret = pci_enable_device(pdev))) {
                 printk(KERN_WARNING
-                         "%s: Failed to enable device with "
-                                "pci_dev 0x%p... returning\n",
-                                __FUNCTION__, (void *)pdev);
-                return ret;
+                       "%s: Failed to enable IOC4 device for pci_dev %s.\n",
+                       __FUNCTION__, pci_name(pdev));
+                goto out;
         }
         pci_set_master(pdev);
 
-        /* attach each sub-device */
-        ret = ioc4_ide_attach_one(pdev, pci_id);
-        if (ret)
-                return ret;
-        return ioc4_serial_attach_one(pdev, pci_id);
+        /* Set up per-IOC4 data */
+        idd = kmalloc(sizeof(struct ioc4_driver_data), GFP_KERNEL);
+        if (!idd) {
+                printk(KERN_WARNING
+                       "%s: Failed to allocate IOC4 data for pci_dev %s.\n",
+                       __FUNCTION__, pci_name(pdev));
+                ret = -ENODEV;
+                goto out_idd;
+        }
+        idd->idd_pdev = pdev;
+        idd->idd_pci_id = pci_id;
+
+        /* Map IOC4 misc registers.  These are shared between subdevices
+         * so the main IOC4 module manages them.
+         */
+        idd->idd_bar0 = pci_resource_start(idd->idd_pdev, 0);
+        if (!idd->idd_bar0) {
+                printk(KERN_WARNING
+                       "%s: Unable to find IOC4 misc resource "
+                       "for pci_dev %s.\n",
+                       __FUNCTION__, pci_name(idd->idd_pdev));
+                ret = -ENODEV;
+                goto out_pci;
+        }
+        if (!request_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
+                            "ioc4_misc")) {
+                printk(KERN_WARNING
+                       "%s: Unable to request IOC4 misc region "
+                       "for pci_dev %s.\n",
+                       __FUNCTION__, pci_name(idd->idd_pdev));
+                ret = -ENODEV;
+                goto out_pci;
+        }
+        idd->idd_misc_regs = ioremap(idd->idd_bar0,
+                                     sizeof(struct ioc4_misc_regs));
+        if (!idd->idd_misc_regs) {
+                printk(KERN_WARNING
+                       "%s: Unable to remap IOC4 misc region "
+                       "for pci_dev %s.\n",
+                       __FUNCTION__, pci_name(idd->idd_pdev));
+                ret = -ENODEV;
+                goto out_misc_region;
+        }
+
+        /* Failsafe portion of per-IOC4 initialization */
+
+        /* Initialize IOC4 */
+        pci_read_config_dword(idd->idd_pdev, PCI_COMMAND, &pcmd);
+        pci_write_config_dword(idd->idd_pdev, PCI_COMMAND,
+                               pcmd | PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
+
+        /* Determine PCI clock */
+        ioc4_clock_calibrate(idd);
+
+        /* Disable/clear all interrupts.  Need to do this here lest
+         * one submodule request the shared IOC4 IRQ, but interrupt
+         * is generated by a different subdevice.
+         */
+        /* Disable */
+        writel(~0, &idd->idd_misc_regs->other_iec.raw);
+        writel(~0, &idd->idd_misc_regs->sio_iec);
+        /* Clear (i.e. acknowledge) */
+        writel(~0, &idd->idd_misc_regs->other_ir.raw);
+        writel(~0, &idd->idd_misc_regs->sio_ir);
+
+        /* Track PCI-device specific data */
+        idd->idd_serial_data = NULL;
+        pci_set_drvdata(idd->idd_pdev, idd);
+        down_write(&ioc4_devices_rwsem);
+        list_add(&idd->idd_list, &ioc4_devices);
+        up_write(&ioc4_devices_rwsem);
+
+        /* Add this IOC4 to all submodules */
+        down_read(&ioc4_submodules_rwsem);
+        list_for_each_entry(is, &ioc4_submodules, is_list) {
+                if (is->is_probe && is->is_probe(idd)) {
+                        printk(KERN_WARNING
+                               "%s: IOC4 submodule 0x%s probe failed "
+                               "for pci_dev %s.\n",
+                               __FUNCTION__, module_name(is->is_owner),
+                               pci_name(idd->idd_pdev));
+                }
+        }
+        up_read(&ioc4_submodules_rwsem);
+
+        return 0;
+
+out_misc_region:
+        release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+out_pci:
+        kfree(idd);
+out_idd:
+        pci_disable_device(pdev);
+out:
+        return ret;
 }
 
-/* pci device struct */
-static struct pci_device_id ioc4_s_id_table[] = {
+/* Removes a particular instance of an IOC4 card. */
+static void
+ioc4_remove(struct pci_dev *pdev)
+{
+        struct ioc4_submodule *is;
+        struct ioc4_driver_data *idd;
+
+        idd = pci_get_drvdata(pdev);
+
+        /* Remove this IOC4 from all submodules */
+        down_read(&ioc4_submodules_rwsem);
+        list_for_each_entry(is, &ioc4_submodules, is_list) {
+                if (is->is_remove && is->is_remove(idd)) {
+                        printk(KERN_WARNING
+                               "%s: IOC4 submodule 0x%s remove failed "
+                               "for pci_dev %s.\n",
+                               __FUNCTION__, module_name(is->is_owner),
+                               pci_name(idd->idd_pdev));
+                }
+        }
+        up_read(&ioc4_submodules_rwsem);
+
+        /* Release resources */
+        iounmap(idd->idd_misc_regs);
+        if (!idd->idd_bar0) {
+                printk(KERN_WARNING
+                       "%s: Unable to get IOC4 misc mapping for pci_dev %s. "
+                       "Device removal may be incomplete.\n",
+                       __FUNCTION__, pci_name(idd->idd_pdev));
+        }
+        release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+
+        /* Disable IOC4 and relinquish */
+        pci_disable_device(pdev);
+
+        /* Remove and free driver data */
+        down_write(&ioc4_devices_rwsem);
+        list_del(&idd->idd_list);
+        up_write(&ioc4_devices_rwsem);
+        kfree(idd);
+}
+
+static struct pci_device_id ioc4_id_table[] = {
         {PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC4, PCI_ANY_ID,
          PCI_ANY_ID, 0x0b4000, 0xFFFFFF},
         {0}
 };
-MODULE_DEVICE_TABLE(pci, ioc4_s_id_table);
 
-static struct pci_driver __devinitdata ioc4_s_driver = {
-        .name   = "IOC4",
-        .id_table = ioc4_s_id_table,
-        .probe  = ioc4_probe_one,
+static struct pci_driver __devinitdata ioc4_driver = {
+        .name = "IOC4",
+        .id_table = ioc4_id_table,
+        .probe = ioc4_probe,
+        .remove = ioc4_remove,
 };
 
-static int __devinit ioc4_detect(void)
+MODULE_DEVICE_TABLE(pci, ioc4_id_table);
+
+/*********************
+ * Module management *
+ *********************/
+
+/* Module load */
+static int __devinit
+ioc4_init(void)
 {
-        ioc4_serial_init();
+        return pci_register_driver(&ioc4_driver);
+}
 
-        return pci_register_driver(&ioc4_s_driver);
+/* Module unload */
+static void __devexit
+ioc4_exit(void)
+{
+        pci_unregister_driver(&ioc4_driver);
 }
-module_init(ioc4_detect);
 
-MODULE_AUTHOR("Pat Gefre - Silicon Graphics Inc. (SGI) <pfg@sgi.com>");
-MODULE_DESCRIPTION("PCI driver module for SGI IOC4 Base-IO Card");
+module_init(ioc4_init);
+module_exit(ioc4_exit);
+
+MODULE_AUTHOR("Brent Casavant - Silicon Graphics, Inc. <bcasavan@sgi.com>");
+MODULE_DESCRIPTION("PCI driver master module for SGI IOC4 Base-IO Card");
 MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(ioc4_register_submodule);
+EXPORT_SYMBOL(ioc4_unregister_submodule);
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index ef0b35731ff0..83e815d3cd52 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -239,7 +239,7 @@ static char *usb_dump_interface_descriptor(char *start, char *end,
         int setno)
 {
         const struct usb_interface_descriptor *desc = &intfc->altsetting[setno].desc;
-        char *driver_name = "";
+        const char *driver_name = "";
 
         if (start > end)
                 return start;
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 38ed2220c9fc..65ca131cc44c 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -68,7 +68,7 @@ static struct file_operations usb_fops = {
         .open =         usb_open,
 };
 
-static struct class_simple *usb_class;
+static struct class *usb_class;
 
 int usb_major_init(void)
 {
@@ -80,9 +80,10 @@ int usb_major_init(void)
                 goto out;
         }
 
-        usb_class = class_simple_create(THIS_MODULE, "usb");
+        usb_class = class_create(THIS_MODULE, "usb");
         if (IS_ERR(usb_class)) {
-                err("class_simple_create failed for usb devices");
+                error = PTR_ERR(usb_class);
+                err("class_create failed for usb devices");
                 unregister_chrdev(USB_MAJOR, "usb");
                 goto out;
         }
@@ -95,7 +96,7 @@ out:
 
 void usb_major_cleanup(void)
 {
-        class_simple_destroy(usb_class);
+        class_destroy(usb_class);
         devfs_remove("usb");
         unregister_chrdev(USB_MAJOR, "usb");
 }
@@ -171,7 +172,7 @@ int usb_register_dev(struct usb_interface *intf,
                 ++temp;
         else
                 temp = name;
-        intf->class_dev = class_simple_device_add(usb_class, MKDEV(USB_MAJOR, minor), &intf->dev, "%s", temp);
+        intf->class_dev = class_device_create(usb_class, MKDEV(USB_MAJOR, minor), &intf->dev, "%s", temp);
         if (IS_ERR(intf->class_dev)) {
                 spin_lock (&minor_lock);
                 usb_minors[intf->minor] = NULL;
@@ -220,7 +221,7 @@ void usb_deregister_dev(struct usb_interface *intf,
 
         snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
         devfs_remove (name);
-        class_simple_device_remove(MKDEV(USB_MAJOR, intf->minor));
+        class_device_destroy(usb_class, MKDEV(USB_MAJOR, intf->minor));
         intf->class_dev = NULL;
         intf->minor = -1;
 }
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 266e9e06a9f5..d041782e0c8b 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -651,50 +651,45 @@ static int usb_rh_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
 /*-------------------------------------------------------------------------*/
 
 /* exported only within usbcore */
-struct usb_bus *usb_bus_get (struct usb_bus *bus)
+struct usb_bus *usb_bus_get(struct usb_bus *bus)
 {
-        struct class_device *tmp;
+        if (bus)
+                kref_get(&bus->kref);
+        return bus;
+}
 
-        if (!bus)
-                return NULL;
+static void usb_host_release(struct kref *kref)
+{
+        struct usb_bus *bus = container_of(kref, struct usb_bus, kref);
 
-        tmp = class_device_get(&bus->class_dev);
-        if (tmp)        
-                return to_usb_bus(tmp);
-        else
-                return NULL;
+        if (bus->release)
+                bus->release(bus);
 }
 
 /* exported only within usbcore */
-void usb_bus_put (struct usb_bus *bus)
+void usb_bus_put(struct usb_bus *bus)
 {
         if (bus)
-                class_device_put(&bus->class_dev);
+                kref_put(&bus->kref, usb_host_release);
 }
 
 /*-------------------------------------------------------------------------*/
 
-static void usb_host_release(struct class_device *class_dev)
-{
-        struct usb_bus *bus = to_usb_bus(class_dev);
-
-        if (bus->release)
-                bus->release(bus);
-}
-
-static struct class usb_host_class = {
-        .name           = "usb_host",
-        .release        = &usb_host_release,
-};
+static struct class *usb_host_class;
 
 int usb_host_init(void)
 {
-        return class_register(&usb_host_class);
+        int retval = 0;
+
+        usb_host_class = class_create(THIS_MODULE, "usb_host");
+        if (IS_ERR(usb_host_class))
+                retval = PTR_ERR(usb_host_class);
+        return retval;
 }
 
 void usb_host_cleanup(void)
 {
-        class_unregister(&usb_host_class);
+        class_destroy(usb_host_class);
 }
 
 /**
@@ -719,8 +714,7 @@ static void usb_bus_init (struct usb_bus *bus)
 
         INIT_LIST_HEAD (&bus->bus_list);
 
-        class_device_initialize(&bus->class_dev);
-        bus->class_dev.class = &usb_host_class;
+        kref_init(&bus->kref);
 }
 
 /**
@@ -761,7 +755,6 @@ struct usb_bus *usb_alloc_bus (struct usb_operations *op)
 static int usb_register_bus(struct usb_bus *bus)
 {
         int busnum;
-        int retval;
 
         down (&usb_bus_list_lock);
         busnum = find_next_zero_bit (busmap.busmap, USB_MAXBUS, 1);
@@ -774,15 +767,15 @@ static int usb_register_bus(struct usb_bus *bus)
                 return -E2BIG;
         }
 
-        snprintf(bus->class_dev.class_id, BUS_ID_SIZE, "usb%d", busnum);
-        bus->class_dev.dev = bus->controller;
-        retval = class_device_add(&bus->class_dev);
-        if (retval) {
+        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb%d", busnum);
+        if (IS_ERR(bus->class_dev)) {
                 clear_bit(busnum, busmap.busmap);
                 up(&usb_bus_list_lock);
-                return retval;
+                return PTR_ERR(bus->class_dev);
         }
 
+        class_set_devdata(bus->class_dev, bus);
+
         /* Add it to the local list of buses */
         list_add (&bus->bus_list, &usb_bus_list);
         up (&usb_bus_list_lock);
@@ -820,7 +813,7 @@ static void usb_deregister_bus (struct usb_bus *bus)
 
         clear_bit (bus->busnum, busmap.busmap);
 
-        class_device_del(&bus->class_dev);
+        class_device_unregister(bus->class_dev);
 }
 
 /**
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 4ab50009291d..740cb4c668df 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -24,7 +24,7 @@
 
 /* Active configuration fields */
 #define usb_actconfig_show(field, multiplier, format_string)            \
-static ssize_t  show_##field (struct device *dev, char *buf)            \
+static ssize_t  show_##field (struct device *dev, struct device_attribute *attr, char *buf)             \
 {                                                                       \
         struct usb_device *udev;                                        \
         struct usb_host_config *actconfig;                              \
@@ -46,7 +46,7 @@ usb_actconfig_attr (bNumInterfaces, 1, "%2d\n")
 usb_actconfig_attr (bmAttributes, 1, "%2x\n")
 usb_actconfig_attr (bMaxPower, 2, "%3dmA\n")
 
-static ssize_t show_configuration_string(struct device *dev, char *buf)
+static ssize_t show_configuration_string(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_device *udev;
         struct usb_host_config *actconfig;
@@ -69,7 +69,7 @@ static DEVICE_ATTR(configuration, S_IRUGO, show_configuration_string, NULL);
 usb_actconfig_show(bConfigurationValue, 1, "%u\n");
 
 static ssize_t
-set_bConfigurationValue (struct device *dev, const char *buf, size_t count)
+set_bConfigurationValue (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_device       *udev = udev = to_usb_device (dev);
         int                     config, value;
@@ -87,7 +87,7 @@ static DEVICE_ATTR(bConfigurationValue, S_IRUGO | S_IWUSR,
 
 /* String fields */
 #define usb_string_attr(name)                                           \
-static ssize_t  show_##name(struct device *dev, char *buf)              \
+static ssize_t  show_##name(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct usb_device *udev;                                        \
         int len;                                                        \
@@ -107,7 +107,7 @@ usb_string_attr(manufacturer);
 usb_string_attr(serial);
 
 static ssize_t
-show_speed (struct device *dev, char *buf)
+show_speed (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_device *udev;
         char *speed;
@@ -133,7 +133,7 @@ show_speed (struct device *dev, char *buf)
 static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);
 
 static ssize_t
-show_devnum (struct device *dev, char *buf)
+show_devnum (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_device *udev;
 
@@ -143,7 +143,7 @@ show_devnum (struct device *dev, char *buf)
 static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
 
 static ssize_t
-show_version (struct device *dev, char *buf)
+show_version (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_device *udev;
         u16 bcdUSB;
@@ -155,7 +155,7 @@ show_version (struct device *dev, char *buf)
 static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
 
 static ssize_t
-show_maxchild (struct device *dev, char *buf)
+show_maxchild (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_device *udev;
 
@@ -167,7 +167,7 @@ static DEVICE_ATTR(maxchild, S_IRUGO, show_maxchild, NULL);
 /* Descriptor fields */
 #define usb_descriptor_attr_le16(field, format_string)                  \
 static ssize_t                                                          \
-show_##field (struct device *dev, char *buf)                            \
+show_##field (struct device *dev, struct device_attribute *attr, char *buf)                             \
 {                                                                       \
         struct usb_device *udev;                                        \
                                                                         \
@@ -183,7 +183,7 @@ usb_descriptor_attr_le16(bcdDevice, "%04x\n")
 
 #define usb_descriptor_attr(field, format_string)                       \
 static ssize_t                                                          \
-show_##field (struct device *dev, char *buf)                            \
+show_##field (struct device *dev, struct device_attribute *attr, char *buf)                             \
 {                                                                       \
         struct usb_device *udev;                                        \
                                                                         \
@@ -254,7 +254,7 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
 /* Interface fields */
 #define usb_intf_attr(field, format_string)                             \
 static ssize_t                                                          \
-show_##field (struct device *dev, char *buf)                            \
+show_##field (struct device *dev, struct device_attribute *attr, char *buf)                             \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface (dev);            \
                                                                         \
@@ -269,7 +269,7 @@ usb_intf_attr (bInterfaceClass, "%02x\n")
 usb_intf_attr (bInterfaceSubClass, "%02x\n")
 usb_intf_attr (bInterfaceProtocol, "%02x\n")
 
-static ssize_t show_interface_string(struct device *dev, char *buf)
+static ssize_t show_interface_string(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf;
         struct usb_device *udev;
@@ -286,36 +286,34 @@ static ssize_t show_interface_string(struct device *dev, char *buf)
 }
 static DEVICE_ATTR(interface, S_IRUGO, show_interface_string, NULL);
 
-static ssize_t show_modalias(struct device *dev, char *buf)
+static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf;
         struct usb_device *udev;
+        int len;
 
         intf = to_usb_interface(dev);
         udev = interface_to_usbdev(intf);
-        if (udev->descriptor.bDeviceClass == 0) {
-                struct usb_host_interface *alt = intf->cur_altsetting;
 
-                return sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic%02Xisc%02Xip%02X\n",
+        len = sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic",
                                le16_to_cpu(udev->descriptor.idVendor),
                                le16_to_cpu(udev->descriptor.idProduct),
                                le16_to_cpu(udev->descriptor.bcdDevice),
                                udev->descriptor.bDeviceClass,
                                udev->descriptor.bDeviceSubClass,
-                               udev->descriptor.bDeviceProtocol,
+                               udev->descriptor.bDeviceProtocol);
+        buf += len;
+
+        if (udev->descriptor.bDeviceClass == 0) {
+                struct usb_host_interface *alt = intf->cur_altsetting;
+
+                return len + sprintf(buf, "%02Xisc%02Xip%02X\n",
                                alt->desc.bInterfaceClass,
                                alt->desc.bInterfaceSubClass,
                                alt->desc.bInterfaceProtocol);
         } else {
-                return sprintf(buf, "usb:v%04Xp%04Xd%04Xdc%02Xdsc%02Xdp%02Xic*isc*ip*\n",
-                               le16_to_cpu(udev->descriptor.idVendor),
-                               le16_to_cpu(udev->descriptor.idProduct),
-                               le16_to_cpu(udev->descriptor.bcdDevice),
-                               udev->descriptor.bDeviceClass,
-                               udev->descriptor.bDeviceSubClass,
-                               udev->descriptor.bDeviceProtocol);
+                return len + sprintf(buf, "*isc*ip*\n");
         }
-
 }
 static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
 
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 25cf7e9eccfa..a3c42203213a 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -293,7 +293,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
         /* if interface was already added, bind now; else let
          * the future device_add() bind it, bypassing probe()
          */
-        if (!list_empty (&dev->bus_list))
+        if (klist_node_attached(&dev->knode_bus))
                 device_bind_driver(dev);
 
         return 0;
@@ -322,9 +322,15 @@ void usb_driver_release_interface(struct usb_driver *driver,
         if (!dev->driver || dev->driver != &driver->driver)
                 return;
 
-        /* don't disconnect from disconnect(), or before dev_add() */
-        if (!list_empty (&dev->driver_list) && !list_empty (&dev->bus_list))
+        /* don't release from within disconnect() */
+        if (iface->condition != USB_INTERFACE_BOUND)
+                return;
+
+        /* release only after device_add() */
+        if (klist_node_attached(&dev->knode_bus)) {
+                iface->condition = USB_INTERFACE_UNBINDING;
                 device_release_driver(dev);
+        }
 
         dev->driver = NULL;
         usb_set_intfdata(iface, NULL);
@@ -462,6 +468,25 @@ usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
         return NULL;
 }
 
+
+static int __find_interface(struct device * dev, void * data)
+{
+        struct usb_interface ** ret = (struct usb_interface **)data;
+        struct usb_interface * intf = *ret;
+        int *minor = (int *)data;
+
+        /* can't look at usb devices, only interfaces */
+        if (dev->driver == &usb_generic_driver)
+                return 0;
+
+        intf = to_usb_interface(dev);
+        if (intf->minor != -1 && intf->minor == *minor) {
+                *ret = intf;
+                return 1;
+        }
+        return 0;
+}
+
 /**
  * usb_find_interface - find usb_interface pointer for driver and device
  * @drv: the driver whose current configuration is considered
@@ -473,26 +498,12 @@ usb_match_id(struct usb_interface *interface, const struct usb_device_id *id)
  */
 struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)
 {
-        struct list_head *entry;
-        struct device *dev;
-        struct usb_interface *intf;
+        struct usb_interface *intf = (struct usb_interface *)(long)minor;
+        int ret;
 
-        list_for_each(entry, &drv->driver.devices) {
-                dev = container_of(entry, struct device, driver_list);
-
-                /* can't look at usb devices, only interfaces */
-                if (dev->driver == &usb_generic_driver)
-                        continue;
-
-                intf = to_usb_interface(dev);
-                if (intf->minor == -1)
-                        continue;
-                if (intf->minor == minor)
-                        return intf;
-        }
+        ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface);
 
-        /* no device found that matches */
-        return NULL;    
+        return ret ? intf : NULL;
 }
 
 static int usb_device_match (struct device *dev, struct device_driver *drv)
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 8ef8a9cd9ac4..c039d2fbe7ab 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -633,7 +633,7 @@ static const struct usb_gadget_ops dummy_ops = {
 
 /* "function" sysfs attribute */
 static ssize_t
-show_function (struct device *dev, char *buf)
+show_function (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct dummy    *dum = gadget_dev_to_dummy (dev);
 
@@ -1600,7 +1600,7 @@ show_urb (char *buf, size_t size, struct urb *urb)
 }
 
 static ssize_t
-show_urbs (struct device *dev, char *buf)
+show_urbs (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_hcd          *hcd = dev_get_drvdata (dev);
         struct dummy            *dum = hcd_to_dummy (hcd);
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 4857f0e4ef44..037a7f163822 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3554,14 +3554,14 @@ static void close_all_backing_files(struct fsg_dev *fsg)
 }
 
 
-static ssize_t show_ro(struct device *dev, char *buf)
+static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lun      *curlun = dev_to_lun(dev);
 
         return sprintf(buf, "%d\n", curlun->ro);
 }
 
-static ssize_t show_file(struct device *dev, char *buf)
+static ssize_t show_file(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lun      *curlun = dev_to_lun(dev);
         struct fsg_dev  *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
@@ -3589,7 +3589,7 @@ static ssize_t show_file(struct device *dev, char *buf)
 }
 
 
-static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
+static ssize_t store_ro(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         ssize_t         rc = count;
         struct lun      *curlun = dev_to_lun(dev);
@@ -3613,7 +3613,7 @@ static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
         return rc;
 }
 
-static ssize_t store_file(struct device *dev, const char *buf, size_t count)
+static ssize_t store_file(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct lun      *curlun = dev_to_lun(dev);
         struct fsg_dev  *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index e5457f2026cc..e47e398daeb5 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -1469,7 +1469,7 @@ static const struct usb_gadget_ops net2280_ops = {
 
 /* "function" sysfs attribute */
 static ssize_t
-show_function (struct device *_dev, char *buf)
+show_function (struct device *_dev, struct device_attribute *attr, char *buf)
 {
         struct net2280  *dev = dev_get_drvdata (_dev);
 
@@ -1482,7 +1482,7 @@ show_function (struct device *_dev, char *buf)
 static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
 
 static ssize_t
-show_registers (struct device *_dev, char *buf)
+show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
 {
         struct net2280          *dev;
         char                    *next;
@@ -1637,7 +1637,7 @@ show_registers (struct device *_dev, char *buf)
 static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
 
 static ssize_t
-show_queues (struct device *_dev, char *buf)
+show_queues (struct device *_dev, struct device_attribute *attr, char *buf)
 {
         struct net2280          *dev;
         char                    *next;
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 6390c5726d81..b8b4524ed746 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1429,7 +1429,7 @@ done:
 
 /* "function" sysfs attribute */
 static ssize_t
-show_function (struct device *_dev, char *buf)
+show_function (struct device *_dev, struct device_attribute *attr, char *buf)
 {
         struct pxa2xx_udc       *dev = dev_get_drvdata (_dev);
 
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3196c3265ff5..19e598c9641f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -124,3 +124,14 @@ config USB_SL811_HCD
           To compile this driver as a module, choose M here: the
           module will be called sl811-hcd.
 
+config USB_SL811_CS
+        tristate "CF/PCMCIA support for SL811HS HCD"
+        depends on USB_SL811_HCD && PCMCIA
+        default N
+        help
+          Wraps a PCMCIA driver around the SL811HS HCD, supporting the RATOC
+          REX-CFU1U CF card (often used with PDAs).  If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called "sl811_cs".
+
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index a574ca06cf6b..5dbd3e7a27c7 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -7,4 +7,5 @@ obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)      += ohci-hcd.o
 obj-$(CONFIG_USB_UHCI_HCD)      += uhci-hcd.o
 obj-$(CONFIG_USB_SL811_HCD)     += sl811-hcd.o
+obj-$(CONFIG_USB_SL811_CS)      += sl811_cs.o
 obj-$(CONFIG_ETRAX_ARCH_V10)    += hc_crisv10.o
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 9b347d765383..2ff11d53567b 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -450,7 +450,7 @@ show_async (struct class_device *class_dev, char *buf)
 
         *buf = 0;
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ehci = hcd_to_ehci (hcd);
         next = buf;
@@ -496,7 +496,7 @@ show_periodic (struct class_device *class_dev, char *buf)
                 return 0;
         seen_count = 0;
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ehci = hcd_to_ehci (hcd);
         next = buf;
@@ -633,7 +633,7 @@ show_registers (struct class_device *class_dev, char *buf)
         static char             fmt [] = "%*s\n";
         static char             label [] = "";
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ehci = hcd_to_ehci (hcd);
         next = buf;
@@ -735,7 +735,7 @@ static CLASS_DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
 
 static inline void create_debug_files (struct ehci_hcd *ehci)
 {
-        struct class_device *cldev = &ehci_to_hcd(ehci)->self.class_dev;
+        struct class_device *cldev = ehci_to_hcd(ehci)->self.class_dev;
 
         class_device_create_file(cldev, &class_device_attr_async);
         class_device_create_file(cldev, &class_device_attr_periodic);
@@ -744,7 +744,7 @@ static inline void create_debug_files (struct ehci_hcd *ehci)
 
 static inline void remove_debug_files (struct ehci_hcd *ehci)
 {
-        struct class_device *cldev = &ehci_to_hcd(ehci)->self.class_dev;
+        struct class_device *cldev = ehci_to_hcd(ehci)->self.class_dev;
 
         class_device_remove_file(cldev, &class_device_attr_async);
         class_device_remove_file(cldev, &class_device_attr_periodic);
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 429330bc38de..d7b4f7939ded 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -439,9 +439,12 @@ static int ehci_hub_control (
                         /* force reset to complete */
                         writel (temp & ~PORT_RESET,
                                         &ehci->regs->port_status [wIndex]);
+                        /* REVISIT:  some hardware needs 550+ usec to clear
+                         * this bit; seems too long to spin routinely...
+                         */
                         retval = handshake (
                                         &ehci->regs->port_status [wIndex],
-                                        PORT_RESET, 0, 500);
+                                        PORT_RESET, 0, 750);
                         if (retval != 0) {
                                 ehci_err (ehci, "port %d reset error %d\n",
                                         wIndex + 1, retval);
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 62f53a213808..c58408c95c3d 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -481,7 +481,7 @@ show_async (struct class_device *class_dev, char *buf)
         size_t                  temp;
         unsigned long           flags;
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ohci = hcd_to_ohci(hcd);
 
@@ -514,7 +514,7 @@ show_periodic (struct class_device *class_dev, char *buf)
                 return 0;
         seen_count = 0;
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ohci = hcd_to_ohci(hcd);
         next = buf;
@@ -611,7 +611,7 @@ show_registers (struct class_device *class_dev, char *buf)
         char                    *next;
         u32                     rdata;
 
-        bus = to_usb_bus(class_dev);
+        bus = class_get_devdata(class_dev);
         hcd = bus->hcpriv;
         ohci = hcd_to_ohci(hcd);
         regs = ohci->regs;
@@ -684,7 +684,7 @@ static CLASS_DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
 
 static inline void create_debug_files (struct ohci_hcd *ohci)
 {
-        struct class_device *cldev = &ohci_to_hcd(ohci)->self.class_dev;
+        struct class_device *cldev = ohci_to_hcd(ohci)->self.class_dev;
 
         class_device_create_file(cldev, &class_device_attr_async);
         class_device_create_file(cldev, &class_device_attr_periodic);
@@ -694,7 +694,7 @@ static inline void create_debug_files (struct ohci_hcd *ohci)
 
 static inline void remove_debug_files (struct ohci_hcd *ohci)
 {
-        struct class_device *cldev = &ohci_to_hcd(ohci)->self.class_dev;
+        struct class_device *cldev = ohci_to_hcd(ohci)->self.class_dev;
 
         class_device_remove_file(cldev, &class_device_attr_async);
         class_device_remove_file(cldev, &class_device_attr_periodic);
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index a374b7692073..99d43f758ad0 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -2,8 +2,8 @@
  * SL811HS HCD (Host Controller Driver) for USB.
  *
  * Copyright (C) 2004 Psion Teklogix (for NetBook PRO)
- * Copyright (C) 2004 David Brownell
- * 
+ * Copyright (C) 2004-2005 David Brownell
+ *
  * Periodic scheduling is based on Roman's OHCI code
  *      Copyright (C) 1999 Roman Weissgaerber
  *
@@ -15,7 +15,7 @@
  * For documentation, see the SL811HS spec and the "SL811HS Embedded Host"
  * document (providing significant pieces missing from that spec); plus
  * the SL811S spec if you want peripheral side info.
- */ 
+ */
 
 /*
  * Status:  Passed basic stress testing, works with hubs, mice, keyboards,
@@ -67,7 +67,7 @@
 MODULE_DESCRIPTION("SL811HS USB Host Controller Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION  "15 Dec 2004"
+#define DRIVER_VERSION  "19 May 2005"
 
 
 #ifndef DEBUG
@@ -121,6 +121,10 @@ static void port_power(struct sl811 *sl811, int is_on)
         /* reset as thoroughly as we can */
         if (sl811->board && sl811->board->reset)
                 sl811->board->reset(hcd->self.controller);
+        else {
+                sl811_write(sl811, SL11H_CTLREG1, SL11H_CTL1MASK_SE0);
+                mdelay(20);
+        }
 
         sl811_write(sl811, SL11H_IRQ_ENABLE, 0);
         sl811_write(sl811, SL11H_CTLREG1, sl811->ctrl1);
@@ -443,6 +447,7 @@ static void finish_request(
         spin_lock(&urb->lock);
         if (urb->status == -EINPROGRESS)
                 urb->status = status;
+        urb->hcpriv = NULL;
         spin_unlock(&urb->lock);
 
         spin_unlock(&sl811->lock);
@@ -472,7 +477,7 @@ static void finish_request(
                 if (*prev)
                         *prev = ep->next;
                 sl811->load[i] -= ep->load;
-        }       
+        }
         ep->branch = PERIODIC_SIZE;
         sl811->periodic_count--;
         sl811_to_hcd(sl811)->self.bandwidth_allocated
@@ -661,9 +666,9 @@ retry:
 
 #ifdef  QUIRK2
         /* this may no longer be necessary ... */
-        if (irqstat == 0 && ret == IRQ_NONE) {
+        if (irqstat == 0) {
                 irqstat = checkdone(sl811);
-                if (irqstat /* && irq != ~0 */ )
+                if (irqstat)
                         sl811->stat_lost++;
         }
 #endif
@@ -722,7 +727,8 @@ retry:
                 if (sl811->active_a) {
                         sl811_write(sl811, SL811_EP_A(SL11H_HOSTCTLREG), 0);
                         finish_request(sl811, sl811->active_a,
-                                container_of(sl811->active_a->hep->urb_list.next,
+                                container_of(sl811->active_a
+                                                ->hep->urb_list.next,
                                         struct urb, urb_list),
                                 NULL, -ESHUTDOWN);
                         sl811->active_a = NULL;
@@ -731,7 +737,8 @@ retry:
                 if (sl811->active_b) {
                         sl811_write(sl811, SL811_EP_B(SL11H_HOSTCTLREG), 0);
                         finish_request(sl811, sl811->active_b,
-                                container_of(sl811->active_b->hep->urb_list.next,
+                                container_of(sl811->active_b
+                                                ->hep->urb_list.next,
                                         struct urb, urb_list),
                                 NULL, -ESHUTDOWN);
                         sl811->active_b = NULL;
@@ -761,7 +768,7 @@ retry:
                         goto retry;
         }
 
-        if (sl811->periodic_count == 0 && list_empty(&sl811->async)) 
+        if (sl811->periodic_count == 0 && list_empty(&sl811->async))
                 sofirq_off(sl811);
         sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable);
 
@@ -796,7 +803,7 @@ static int balance(struct sl811 *sl811, u16 period, u16 load)
                         }
                         if (j < PERIODIC_SIZE)
                                 continue;
-                        branch = i; 
+                        branch = i;
                 }
         }
         return branch;
@@ -890,6 +897,7 @@ static int sl811h_urb_enqueue(
                         break;
                 }
 
+                ep->hep = hep;
                 hep->hcpriv = ep;
         }
 
@@ -961,15 +969,16 @@ fail:
 static int sl811h_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
 {
         struct sl811            *sl811 = hcd_to_sl811(hcd);
-        struct usb_host_endpoint *hep = urb->hcpriv;
+        struct usb_host_endpoint *hep;
         unsigned long           flags;
         struct sl811h_ep        *ep;
         int                     retval = 0;
 
+        spin_lock_irqsave(&sl811->lock, flags);
+        hep = urb->hcpriv;
         if (!hep)
-                return -EINVAL;
+                goto fail;
 
-        spin_lock_irqsave(&sl811->lock, flags);
         ep = hep->hcpriv;
         if (ep) {
                 /* finish right away if this urb can't be active ...
@@ -1017,6 +1026,7 @@ static int sl811h_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
                         VDBG("dequeue, urb %p active %s; wait4irq\n", urb,
                                 (sl811->active_a == ep) ? "A" : "B");
         } else
+fail:
                 retval = -EINVAL;
         spin_unlock_irqrestore(&sl811->lock, flags);
         return retval;
@@ -1576,6 +1586,9 @@ sl811h_start(struct usb_hcd *hcd)
         if (sl811->board && sl811->board->power)
                 hub_set_power_budget(udev, sl811->board->power * 2);
 
+        /* enable power and interupts */
+        port_power(sl811, 1);
+
         return 0;
 }
 
@@ -1618,7 +1631,7 @@ static struct hc_driver sl811h_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int __init_or_module
+static int __devexit
 sl811h_remove(struct device *dev)
 {
         struct usb_hcd          *hcd = dev_get_drvdata(dev);
@@ -1631,21 +1644,20 @@ sl811h_remove(struct device *dev)
         remove_debug_file(sl811);
         usb_remove_hcd(hcd);
 
-        iounmap(sl811->data_reg);
+        /* some platforms may use IORESOURCE_IO */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        release_mem_region(res->start, 1);
+        if (res)
+                iounmap(sl811->data_reg);
 
-        iounmap(sl811->addr_reg);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, 1);
+        if (res)
+                iounmap(sl811->addr_reg);
 
         usb_put_hcd(hcd);
         return 0;
 }
 
-#define resource_len(r) (((r)->end - (r)->start) + 1)
-
-static int __init
+static int __devinit
 sl811h_probe(struct device *dev)
 {
         struct usb_hcd          *hcd;
@@ -1656,7 +1668,7 @@ sl811h_probe(struct device *dev)
         void __iomem            *addr_reg;
         void __iomem            *data_reg;
         int                     retval;
-        u8                      tmp;
+        u8                      tmp, ioaddr = 0;
 
         /* basic sanity checks first.  board-specific init logic should
          * have initialized these three resources and probably board
@@ -1664,13 +1676,8 @@ sl811h_probe(struct device *dev)
          * minimal sanity checking.
          */
         pdev = container_of(dev, struct platform_device, dev);
-        if (pdev->num_resources < 3)
-                return -ENODEV;
-
-        addr = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         irq = platform_get_irq(pdev, 0);
-        if (!addr || !data || irq < 0)
+        if (pdev->num_resources < 3 || irq < 0)
                 return -ENODEV;
 
         /* refuse to confuse usbcore */
@@ -1679,24 +1686,31 @@ sl811h_probe(struct device *dev)
                 return -EINVAL;
         }
 
-        if (!request_mem_region(addr->start, 1, hcd_name)) {
-                retval = -EBUSY;
-                goto err1;
-        }
-        addr_reg = ioremap(addr->start, resource_len(addr));
-        if (addr_reg == NULL) {
-                retval = -ENOMEM;
-                goto err2;
-        }
+        /* the chip may be wired for either kind of addressing */
+        addr = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        retval = -EBUSY;
+        if (!addr || !data) {
+                addr = platform_get_resource(pdev, IORESOURCE_IO, 0);
+                data = platform_get_resource(pdev, IORESOURCE_IO, 1);
+                if (!addr || !data)
+                        return -ENODEV;
+                ioaddr = 1;
+
+                addr_reg = (void __iomem *) addr->start;
+                data_reg = (void __iomem *) data->start;
+        } else {
+                addr_reg = ioremap(addr->start, 1);
+                if (addr_reg == NULL) {
+                        retval = -ENOMEM;
+                        goto err2;
+                }
 
-        if (!request_mem_region(data->start, 1, hcd_name)) {
-                retval = -EBUSY;
-                goto err3;
-        }
-        data_reg = ioremap(data->start, resource_len(addr));
-        if (data_reg == NULL) {
-                retval = -ENOMEM;
-                goto err4;
+                data_reg = ioremap(data->start, 1);
+                if (data_reg == NULL) {
+                        retval = -ENOMEM;
+                        goto err4;
+                }
         }
 
         /* allocate and initialize hcd */
@@ -1737,12 +1751,14 @@ sl811h_probe(struct device *dev)
                 goto err6;
         }
 
-        /* sl811s would need a different handler for this irq */
-#ifdef  CONFIG_ARM
-        /* Cypress docs say the IRQ is IRQT_HIGH ... */
-        set_irq_type(irq, IRQT_RISING);
-#endif
-        retval = usb_add_hcd(hcd, irq, SA_INTERRUPT);
+        /* The chip's IRQ is level triggered, active high.  A requirement
+         * for platform device setup is to cope with things like signal
+         * inverters (e.g. CF is active low) or working only with edge
+         * triggers (e.g. most ARM CPUs).  Initial driver stress testing
+         * was on a system with single edge triggering, so most sorts of
+         * triggering arrangement should work.
+         */
+        retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ);
         if (retval != 0)
                 goto err6;
 
@@ -1752,14 +1768,12 @@ sl811h_probe(struct device *dev)
  err6:
         usb_put_hcd(hcd);
  err5:
-        iounmap(data_reg);
+        if (!ioaddr)
+                iounmap(data_reg);
  err4:
-        release_mem_region(data->start, 1);
- err3:
-        iounmap(addr_reg);
+        if (!ioaddr)
+                iounmap(addr_reg);
  err2:
-        release_mem_region(addr->start, 1);
- err1:
         DBG("init error, %d\n", retval);
         return retval;
 }
@@ -1767,7 +1781,7 @@ sl811h_probe(struct device *dev)
 #ifdef  CONFIG_PM
 
 /* for this device there's no useful distinction between the controller
- * and its root hub, except that the root hub only gets direct PM calls 
+ * and its root hub, except that the root hub only gets direct PM calls
  * when CONFIG_USB_SUSPEND is enabled.
  */
 
@@ -1821,20 +1835,22 @@ sl811h_resume(struct device *dev, u32 phase)
 #endif
 
 
-static struct device_driver sl811h_driver = {
+/* this driver is exported so sl811_cs can depend on it */
+struct device_driver sl811h_driver = {
         .name =         (char *) hcd_name,
         .bus =          &platform_bus_type,
 
         .probe =        sl811h_probe,
-        .remove =       sl811h_remove,
+        .remove =       __devexit_p(sl811h_remove),
 
         .suspend =      sl811h_suspend,
         .resume =       sl811h_resume,
 };
+EXPORT_SYMBOL(sl811h_driver);
 
 /*-------------------------------------------------------------------------*/
- 
-static int __init sl811h_init(void) 
+
+static int __init sl811h_init(void)
 {
         if (usb_disabled())
                 return -ENODEV;
@@ -1844,8 +1860,8 @@ static int __init sl811h_init(void)
 }
 module_init(sl811h_init);
 
-static void __exit sl811h_cleanup(void) 
-{       
+static void __exit sl811h_cleanup(void)
+{
         driver_unregister(&sl811h_driver);
 }
 module_exit(sl811h_cleanup);
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
new file mode 100644
index 000000000000..6e173265095c
--- /dev/null
+++ b/drivers/usb/host/sl811_cs.c
@@ -0,0 +1,442 @@
+/*
+ * PCMCIA driver for SL811HS (as found in REX-CFU1U)
+ * Filename: sl811_cs.c
+ * Author:   Yukio Yamamoto
+ *
+ *  Port to sl811-hcd and 2.6.x by
+ *    Botond Botyanszki <boti@rocketmail.com>
+ *    Simon Pickering
+ *
+ *  Last update: 2005-05-12
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/ioport.h>
+
+#include <pcmcia/version.h>
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
+
+#include <linux/usb_sl811.h>
+
+MODULE_AUTHOR("Botond Botyanszki");
+MODULE_DESCRIPTION("REX-CFU1U PCMCIA driver for 2.6");
+MODULE_LICENSE("GPL");
+
+
+/*====================================================================*/
+/* MACROS                                                             */
+/*====================================================================*/
+
+#if defined(DEBUG) || defined(CONFIG_USB_DEBUG) || defined(PCMCIA_DEBUG)
+
+static int pc_debug = 0;
+module_param(pc_debug, int, 0644);
+
+#define DBG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG "sl811_cs: " args)
+
+#else
+#define DBG(n, args...) do{}while(0)
+#endif  /* no debugging */
+
+#define INFO(args...) printk(KERN_INFO "sl811_cs: " args)
+
+#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
+
+#define CS_CHECK(fn, ret) \
+        do { \
+                last_fn = (fn); \
+                if ((last_ret = (ret)) != 0) \
+                        goto cs_failed; \
+        } while (0)
+
+/*====================================================================*/
+/* VARIABLES                                                          */
+/*====================================================================*/
+
+static const char driver_name[DEV_NAME_LEN]  = "sl811_cs";
+
+static dev_link_t *dev_list = NULL;
+
+static int irq_list[4] = { -1 };
+static int irq_list_count;
+
+module_param_array(irq_list, int, &irq_list_count, 0444);
+
+INT_MODULE_PARM(irq_mask, 0xdeb8);
+
+typedef struct local_info_t {
+        dev_link_t              link;
+        dev_node_t              node;
+} local_info_t;
+
+/*====================================================================*/
+
+static void release_platform_dev(struct device * dev)
+{
+        DBG(0, "sl811_cs platform_dev release\n");
+        dev->parent = NULL;
+}
+
+static struct sl811_platform_data platform_data = {
+        .potpg          = 100,
+        .power          = 50,           /* == 100mA */
+        // .reset       = ... FIXME:  invoke CF reset on the card
+};
+
+static struct resource resources[] = {
+        [0] = {
+                .flags  = IORESOURCE_IRQ,
+        },
+        [1] = {
+                // .name   = "address",
+                .flags  = IORESOURCE_IO,
+        },
+        [2] = {
+                // .name   = "data",
+                .flags  = IORESOURCE_IO,
+        },
+};
+
+extern struct device_driver sl811h_driver;
+
+static struct platform_device platform_dev = {
+        .id                     = -1,
+        .dev = {
+                .platform_data = &platform_data,
+                .release       = release_platform_dev,
+        },
+        .resource               = resources,
+        .num_resources          = ARRAY_SIZE(resources),
+};
+
+static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)
+{
+        if (platform_dev.dev.parent)
+                return -EBUSY;
+        platform_dev.dev.parent = parent;
+
+        /* finish seting up the platform device */
+        resources[0].start = irq;
+
+        resources[1].start = base_addr;
+        resources[1].end = base_addr;
+
+        resources[2].start = base_addr + 1;
+        resources[2].end   = base_addr + 1;
+
+        /* The driver core will probe for us.  We know sl811-hcd has been
+         * initialized already because of the link order dependency.
+         */
+        platform_dev.name = sl811h_driver.name;
+        return platform_device_register(&platform_dev);
+}
+
+/*====================================================================*/
+
+static void sl811_cs_detach(dev_link_t *link)
+{
+        dev_link_t **linkp;
+
+        DBG(0, "sl811_cs_detach(0x%p)\n", link);
+
+        /* Locate device structure */
+        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) {
+                if (*linkp == link)
+                        break;
+        }
+        if (*linkp == NULL)
+                return;
+
+        /* Break the link with Card Services */
+        if (link->handle)
+                pcmcia_deregister_client(link->handle);
+
+        /* Unlink device structure, and free it */
+        *linkp = link->next;
+        /* This points to the parent local_info_t struct */
+        kfree(link->priv);
+}
+
+static void sl811_cs_release(dev_link_t * link)
+{
+
+        DBG(0, "sl811_cs_release(0x%p)\n", link);
+
+        if (link->open) {
+                DBG(1, "sl811_cs: release postponed, '%s' still open\n",
+                    link->dev->dev_name);
+                link->state |= DEV_STALE_CONFIG;
+                return;
+        }
+
+        /* Unlink the device chain */
+        link->dev = NULL;
+
+        platform_device_unregister(&platform_dev);
+        pcmcia_release_configuration(link->handle);
+        if (link->io.NumPorts1)
+                pcmcia_release_io(link->handle, &link->io);
+        if (link->irq.AssignedIRQ)
+                pcmcia_release_irq(link->handle, &link->irq);
+        link->state &= ~DEV_CONFIG;
+
+        if (link->state & DEV_STALE_LINK)
+                sl811_cs_detach(link);
+}
+
+static void sl811_cs_config(dev_link_t *link)
+{
+        client_handle_t         handle = link->handle;
+        struct device           *parent = &handle_to_dev(handle);
+        local_info_t            *dev = link->priv;
+        tuple_t                 tuple;
+        cisparse_t              parse;
+        int                     last_fn, last_ret;
+        u_char                  buf[64];
+        config_info_t           conf;
+        cistpl_cftable_entry_t  dflt = { 0 };
+
+        DBG(0, "sl811_cs_config(0x%p)\n", link);
+
+        tuple.DesiredTuple = CISTPL_CONFIG;
+        tuple.Attributes = 0;
+        tuple.TupleData = buf;
+        tuple.TupleDataMax = sizeof(buf);
+        tuple.TupleOffset = 0;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        link->conf.ConfigBase = parse.config.base;
+        link->conf.Present = parse.config.rmask[0];
+
+        /* Configure card */
+        link->state |= DEV_CONFIG;
+
+        /* Look up the current Vcc */
+        CS_CHECK(GetConfigurationInfo,
+                        pcmcia_get_configuration_info(handle, &conf));
+        link->conf.Vcc = conf.Vcc;
+
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        while (1) {
+                cistpl_cftable_entry_t  *cfg = &(parse.cftable_entry);
+
+                if (pcmcia_get_tuple_data(handle, &tuple) != 0
+                                || pcmcia_parse_tuple(handle, &tuple, &parse)
+                                                != 0)
+                        goto next_entry;
+
+                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) {
+                        dflt = *cfg;
+                }
+
+                if (cfg->index == 0)
+                        goto next_entry;
+
+                link->conf.ConfigIndex = cfg->index;
+
+                /* Use power settings for Vcc and Vpp if present */
+                /*  Note that the CIS values need to be rescaled */
+                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                        if (cfg->vcc.param[CISTPL_POWER_VNOM]/10000
+                                        != conf.Vcc)
+                                goto next_entry;
+                } else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                        if (dflt.vcc.param[CISTPL_POWER_VNOM]/10000
+                                        != conf.Vcc)
+                                goto next_entry;
+                }
+
+                if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                                cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+                else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                                dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;
+
+                /* we need an interrupt */
+                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
+                        link->conf.Attributes |= CONF_ENABLE_IRQ;
+
+                /* IO window settings */
+                link->io.NumPorts1 = link->io.NumPorts2 = 0;
+                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
+
+                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                        link->io.BasePort1 = io->win[0].base;
+                        link->io.NumPorts1 = io->win[0].len;
+
+                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                                goto next_entry;
+                }
+                break;
+
+next_entry:
+                if (link->io.NumPorts1)
+                        pcmcia_release_io(link->handle, &link->io);
+                last_ret = pcmcia_get_next_tuple(handle, &tuple);
+        }
+
+        /* require an IRQ and two registers */
+        if (!link->io.NumPorts1 || link->io.NumPorts1 < 2)
+                goto cs_failed;
+        if (link->conf.Attributes & CONF_ENABLE_IRQ)
+                CS_CHECK(RequestIRQ,
+                        pcmcia_request_irq(link->handle, &link->irq));
+        else
+                goto cs_failed;
+
+        CS_CHECK(RequestConfiguration,
+                pcmcia_request_configuration(link->handle, &link->conf));
+
+        sprintf(dev->node.dev_name, driver_name);
+        dev->node.major = dev->node.minor = 0;
+        link->dev = &dev->node;
+
+        printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
+               dev->node.dev_name, link->conf.ConfigIndex,
+               link->conf.Vcc/10, link->conf.Vcc%10);
+        if (link->conf.Vpp1)
+                printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
+        printk(", irq %d", link->irq.AssignedIRQ);
+        printk(", io 0x%04x-0x%04x", link->io.BasePort1,
+               link->io.BasePort1+link->io.NumPorts1-1);
+        printk("\n");
+
+        link->state &= ~DEV_CONFIG_PENDING;
+
+        if (sl811_hc_init(parent, link->io.BasePort1, link->irq.AssignedIRQ)
+                        < 0) {
+cs_failed:
+                printk("sl811_cs_config failed\n");
+                cs_error(link->handle, last_fn, last_ret);
+                sl811_cs_release(link);
+                link->state &= ~DEV_CONFIG_PENDING;
+        }
+}
+
+static int
+sl811_cs_event(event_t event, int priority, event_callback_args_t *args)
+{
+        dev_link_t *link = args->client_data;
+
+        DBG(1, "sl811_cs_event(0x%06x)\n", event);
+
+        switch (event) {
+        case CS_EVENT_CARD_REMOVAL:
+                link->state &= ~DEV_PRESENT;
+                if (link->state & DEV_CONFIG)
+                        sl811_cs_release(link);
+                break;
+
+        case CS_EVENT_CARD_INSERTION:
+                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+                sl811_cs_config(link);
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
+                link->state |= DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_RESET_PHYSICAL:
+                if (link->state & DEV_CONFIG)
+                        pcmcia_release_configuration(link->handle);
+                break;
+
+        case CS_EVENT_PM_RESUME:
+                link->state &= ~DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_CARD_RESET:
+                if (link->state & DEV_CONFIG)
+                        pcmcia_request_configuration(link->handle, &link->conf);
+                DBG(0, "reset sl811-hcd here?\n");
+                break;
+        }
+        return 0;
+}
+
+static dev_link_t *sl811_cs_attach(void)
+{
+        local_info_t *local;
+        dev_link_t *link;
+        client_reg_t client_reg;
+        int ret, i;
+
+        local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+        if (!local)
+                return NULL;
+        memset(local, 0, sizeof(local_info_t));
+        link = &local->link;
+        link->priv = local;
+
+        /* Initialize */
+        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+        link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+        if (irq_list[0] == -1)
+                link->irq.IRQInfo2 = irq_mask;
+        else
+                for (i = 0; i < irq_list_count; i++)
+                        link->irq.IRQInfo2 |= 1 << irq_list[i];
+        link->irq.Handler = NULL;
+
+        link->conf.Attributes = 0;
+        link->conf.Vcc = 33;
+        link->conf.IntType = INT_MEMORY_AND_IO;
+
+        /* Register with Card Services */
+        link->next = dev_list;
+        dev_list = link;
+        client_reg.dev_info = (dev_info_t *) &driver_name;
+        client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
+        client_reg.EventMask =
+                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
+                CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
+                CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+        client_reg.event_handler = &sl811_cs_event;
+        client_reg.Version = 0x0210;
+        client_reg.event_callback_args.client_data = link;
+        ret = pcmcia_register_client(&link->handle, &client_reg);
+        if (ret != CS_SUCCESS) {
+                cs_error(link->handle, RegisterClient, ret);
+                sl811_cs_detach(link);
+                return NULL;
+        }
+
+        return link;
+}
+
+static struct pcmcia_driver sl811_cs_driver = {
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = (char *)driver_name,
+        },
+        .attach         = sl811_cs_attach,
+        .detach         = sl811_cs_detach,
+};
+
+/*====================================================================*/
+
+static int __init init_sl811_cs(void)
+{
+        return pcmcia_register_driver(&sl811_cs_driver);
+}
+module_init(init_sl811_cs);
+
+static void __exit exit_sl811_cs(void)
+{
+        pcmcia_unregister_driver(&sl811_cs_driver);
+}
+module_exit(exit_sl811_cs);
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 94ce2a9ad50f..e991f7ed7330 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -1025,7 +1025,7 @@ static int aiptek_program_tablet(struct aiptek *aiptek)
 /***********************************************************************
  * support the 'size' file -- display support
  */
-static ssize_t show_tabletSize(struct device *dev, char *buf)
+static ssize_t show_tabletSize(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1048,7 +1048,7 @@ static DEVICE_ATTR(size, S_IRUGO, show_tabletSize, NULL);
 /***********************************************************************
  * support routines for the 'product_id' file
  */
-static ssize_t show_tabletProductId(struct device *dev, char *buf)
+static ssize_t show_tabletProductId(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1064,7 +1064,7 @@ static DEVICE_ATTR(product_id, S_IRUGO, show_tabletProductId, NULL);
 /***********************************************************************
  * support routines for the 'vendor_id' file
  */
-static ssize_t show_tabletVendorId(struct device *dev, char *buf)
+static ssize_t show_tabletVendorId(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1079,7 +1079,7 @@ static DEVICE_ATTR(vendor_id, S_IRUGO, show_tabletVendorId, NULL);
 /***********************************************************************
  * support routines for the 'vendor' file
  */
-static ssize_t show_tabletManufacturer(struct device *dev, char *buf)
+static ssize_t show_tabletManufacturer(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         int retval;
@@ -1096,7 +1096,7 @@ static DEVICE_ATTR(vendor, S_IRUGO, show_tabletManufacturer, NULL);
 /***********************************************************************
  * support routines for the 'product' file
  */
-static ssize_t show_tabletProduct(struct device *dev, char *buf)
+static ssize_t show_tabletProduct(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         int retval;
@@ -1114,7 +1114,7 @@ static DEVICE_ATTR(product, S_IRUGO, show_tabletProduct, NULL);
  * support routines for the 'pointer_mode' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletPointerMode(struct device *dev, char *buf)
+static ssize_t show_tabletPointerMode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1143,7 +1143,7 @@ static ssize_t show_tabletPointerMode(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletPointerMode(struct device *dev, const char *buf, size_t count)
+store_tabletPointerMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         if (aiptek == NULL)
@@ -1168,7 +1168,7 @@ static DEVICE_ATTR(pointer_mode,
  * support routines for the 'coordinate_mode' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf)
+static ssize_t show_tabletCoordinateMode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1193,7 +1193,7 @@ static ssize_t show_tabletCoordinateMode(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletCoordinateMode(struct device *dev, const char *buf, size_t count)
+store_tabletCoordinateMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         if (aiptek == NULL)
@@ -1217,7 +1217,7 @@ static DEVICE_ATTR(coordinate_mode,
  * support routines for the 'tool_mode' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletToolMode(struct device *dev, char *buf)
+static ssize_t show_tabletToolMode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1262,7 +1262,7 @@ static ssize_t show_tabletToolMode(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletToolMode(struct device *dev, const char *buf, size_t count)
+store_tabletToolMode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         if (aiptek == NULL)
@@ -1295,7 +1295,7 @@ static DEVICE_ATTR(tool_mode,
  * support routines for the 'xtilt' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletXtilt(struct device *dev, char *buf)
+static ssize_t show_tabletXtilt(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1311,7 +1311,7 @@ static ssize_t show_tabletXtilt(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletXtilt(struct device *dev, const char *buf, size_t count)
+store_tabletXtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         int x;
@@ -1337,7 +1337,7 @@ static DEVICE_ATTR(xtilt,
  * support routines for the 'ytilt' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletYtilt(struct device *dev, char *buf)
+static ssize_t show_tabletYtilt(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1353,7 +1353,7 @@ static ssize_t show_tabletYtilt(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletYtilt(struct device *dev, const char *buf, size_t count)
+store_tabletYtilt(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         int y;
@@ -1379,7 +1379,7 @@ static DEVICE_ATTR(ytilt,
  * support routines for the 'jitter' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletJitterDelay(struct device *dev, char *buf)
+static ssize_t show_tabletJitterDelay(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1390,7 +1390,7 @@ static ssize_t show_tabletJitterDelay(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletJitterDelay(struct device *dev, const char *buf, size_t count)
+store_tabletJitterDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1409,7 +1409,7 @@ static DEVICE_ATTR(jitter,
  * support routines for the 'delay' file. Note that this file
  * both displays current setting and allows reprogramming.
  */
-static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf)
+static ssize_t show_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1421,7 +1421,7 @@ static ssize_t show_tabletProgrammableDelay(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletProgrammableDelay(struct device *dev, const char *buf, size_t count)
+store_tabletProgrammableDelay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1440,7 +1440,7 @@ static DEVICE_ATTR(delay,
  * support routines for the 'input_path' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_tabletInputDevice(struct device *dev, char *buf)
+static ssize_t show_tabletInputDevice(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1457,7 +1457,7 @@ static DEVICE_ATTR(input_path, S_IRUGO, show_tabletInputDevice, NULL);
  * support routines for the 'event_count' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_tabletEventsReceived(struct device *dev, char *buf)
+static ssize_t show_tabletEventsReceived(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1473,7 +1473,7 @@ static DEVICE_ATTR(event_count, S_IRUGO, show_tabletEventsReceived, NULL);
  * support routines for the 'diagnostic' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_tabletDiagnosticMessage(struct device *dev, char *buf)
+static ssize_t show_tabletDiagnosticMessage(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *retMsg;
@@ -1515,7 +1515,7 @@ static DEVICE_ATTR(diagnostic, S_IRUGO, show_tabletDiagnosticMessage, NULL);
  * support routines for the 'stylus_upper' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletStylusUpper(struct device *dev, char *buf)
+static ssize_t show_tabletStylusUpper(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1540,7 +1540,7 @@ static ssize_t show_tabletStylusUpper(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletStylusUpper(struct device *dev, const char *buf, size_t count)
+store_tabletStylusUpper(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1565,7 +1565,7 @@ static DEVICE_ATTR(stylus_upper,
  * support routines for the 'stylus_lower' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletStylusLower(struct device *dev, char *buf)
+static ssize_t show_tabletStylusLower(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1590,7 +1590,7 @@ static ssize_t show_tabletStylusLower(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletStylusLower(struct device *dev, const char *buf, size_t count)
+store_tabletStylusLower(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1615,7 +1615,7 @@ static DEVICE_ATTR(stylus_lower,
  * support routines for the 'mouse_left' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletMouseLeft(struct device *dev, char *buf)
+static ssize_t show_tabletMouseLeft(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1644,7 +1644,7 @@ static ssize_t show_tabletMouseLeft(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletMouseLeft(struct device *dev, const char *buf, size_t count)
+store_tabletMouseLeft(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1669,7 +1669,7 @@ static DEVICE_ATTR(mouse_left,
  * support routines for the 'mouse_middle' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf)
+static ssize_t show_tabletMouseMiddle(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1698,7 +1698,7 @@ static ssize_t show_tabletMouseMiddle(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletMouseMiddle(struct device *dev, const char *buf, size_t count)
+store_tabletMouseMiddle(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1725,7 +1725,7 @@ static DEVICE_ATTR(mouse_middle,
  * support routines for the 'mouse_right' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletMouseRight(struct device *dev, char *buf)
+static ssize_t show_tabletMouseRight(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
         char *s;
@@ -1754,7 +1754,7 @@ static ssize_t show_tabletMouseRight(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletMouseRight(struct device *dev, const char *buf, size_t count)
+store_tabletMouseRight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1780,7 +1780,7 @@ static DEVICE_ATTR(mouse_right,
  * support routines for the 'wheel' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletWheel(struct device *dev, char *buf)
+static ssize_t show_tabletWheel(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1796,7 +1796,7 @@ static ssize_t show_tabletWheel(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletWheel(struct device *dev, const char *buf, size_t count)
+store_tabletWheel(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1814,7 +1814,7 @@ static DEVICE_ATTR(wheel,
  * support routines for the 'execute' file. Note that this file
  * both displays current setting and allows for setting changing.
  */
-static ssize_t show_tabletExecute(struct device *dev, char *buf)
+static ssize_t show_tabletExecute(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1829,7 +1829,7 @@ static ssize_t show_tabletExecute(struct device *dev, char *buf)
 }
 
 static ssize_t
-store_tabletExecute(struct device *dev, const char *buf, size_t count)
+store_tabletExecute(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1855,7 +1855,7 @@ static DEVICE_ATTR(execute,
  * support routines for the 'odm_code' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_tabletODMCode(struct device *dev, char *buf)
+static ssize_t show_tabletODMCode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1871,7 +1871,7 @@ static DEVICE_ATTR(odm_code, S_IRUGO, show_tabletODMCode, NULL);
  * support routines for the 'model_code' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_tabletModelCode(struct device *dev, char *buf)
+static ssize_t show_tabletModelCode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
@@ -1887,7 +1887,7 @@ static DEVICE_ATTR(model_code, S_IRUGO, show_tabletModelCode, NULL);
  * support routines for the 'firmware_code' file. Note that this file
  * only displays current setting.
  */
-static ssize_t show_firmwareCode(struct device *dev, char *buf)
+static ssize_t show_firmwareCode(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct aiptek *aiptek = dev_get_drvdata(dev);
 
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 869ff73690ac..2d8bd9dcc6ed 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1315,6 +1315,8 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_DEVICE_ID_WACOM_INTUOS2     0x0040
 #define USB_DEVICE_ID_WACOM_VOLITO      0x0060
 #define USB_DEVICE_ID_WACOM_PTU         0x0003
+#define USB_DEVICE_ID_WACOM_INTUOS3     0x00B0
+#define USB_DEVICE_ID_WACOM_CINTIQ      0x003F
 
 #define USB_VENDOR_ID_KBGEAR            0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
@@ -1401,6 +1403,7 @@ void hid_init_reports(struct hid_device *hid)
 
 #define USB_VENDOR_ID_DELORME           0x1163
 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
+#define USB_DEVICE_ID_DELORME_EM_LT20   0x0200
 
 #define USB_VENDOR_ID_MCC               0x09db
 #define USB_DEVICE_ID_MCC_PMD1024LS     0x0076
@@ -1412,6 +1415,12 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_BTC               0x046e
 #define USB_DEVICE_ID_BTC_KEYBOARD      0x5303
 
+#define USB_VENDOR_ID_VERNIER           0x08f7
+#define USB_DEVICE_ID_VERNIER_LABPRO    0x0001
+#define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
+#define USB_DEVICE_ID_VERNIER_SKIP      0x0003
+#define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
+
 
 /*
  * Alphabetically sorted blacklist by quirk type.
@@ -1437,6 +1446,7 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30, HID_QUIRK_IGNORE },
@@ -1456,6 +1466,10 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PENPARTNER, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 1, HID_QUIRK_IGNORE },
@@ -1481,6 +1495,10 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 1, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 2, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_CINTIQ, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
 
diff --git a/drivers/usb/media/pwc/ChangeLog b/drivers/usb/media/pwc/ChangeLog
deleted file mode 100644
index b2eb71a9afb5..000000000000
--- a/drivers/usb/media/pwc/ChangeLog
+++ /dev/null
@@ -1,143 +0,0 @@
-9.0.2
-
-* Adding #ifdef to compile PWC before and after 2.6.5
-
-9.0.1
-
-9.0
-
-
-8.12
-
-* Implement motorized pan/tilt feature for Logitech QuickCam Orbit/Spere.
-
-8.11.1
-
-* Fix for PCVC720/40, would not be able to set videomode
-* Fix for Samsung MPC models, appearantly they are based on a newer chipset
-
-8.11
-
-* 20 dev_hints (per request)
-* Hot unplugging should be better, no more dangling pointers or memory leaks
-* Added reserved Logitech webcam IDs
-* Device now remembers size & fps between close()/open()
-* Removed palette stuff altogether
-
-8.10.1
-
-* Added IDs for PCVC720K/40 and Creative Labs Webcam Pro
-
-8.10
-
-* Fixed ID for QuickCam Notebook pro
-* Added GREALSIZE ioctl() call
-* Fixed bug in case PWCX was not loaded and invalid size was set
-
-8.9
-
-* Merging with kernel 2.5.49
-* Adding IDs for QuickCam Zoom & QuickCam Notebook
-
-8.8
-
-* Fixing 'leds' parameter
-* Adding IDs for Logitech QuickCam Pro 4000
-* Making URB init/cleanup a little nicer
-
-8.7
-
-* Incorporating changes in ioctl() parameter passing
-* Also changes to URB mechanism
-
-8.6
-
-* Added ID's for Visionite VCS UM100 and UC300
-* Removed YUV420-interlaced palette altogether (was confusing)
-* Removed MIRROR stuff as it didn't work anyway
-* Fixed a problem with the 'leds' parameter (wouldn't blink)
-* Added ioctl()s for advanced features: 'extended' whitebalance ioctl()s,
-  CONTOUR, BACKLIGHT, FLICKER, DYNNOISE.
-* VIDIOCGCAP.name now contains real camera model name instead of
-  'Philips xxx webcam'
-* Added PROBE ioctl (see previous point & API doc)
-
-8.5
-
-* Adding IDs for Creative Labs Webcam 5
-* Adding IDs for SOTEC CMS-001 webcam
-* Solving possible hang in VIDIOCSYNC when unplugging the cam 
-* Forgot to return structure in VIDIOCPWCGAWB, oops
-* Time interval for the LEDs are now in milliseconds
-
-8.4
-
-* Fixing power_save option for Vesta range
-* Handling new error codes in ISOC callback
-* Adding dev_hint module parameter, to specify /dev/videoX device nodes
-
-8.3
-
-* Adding Samsung C10 and C30 cameras
-* Removing palette module parameter
-* Fixed typo in ID of QuickCam 3000 Pro
-* Adding LED settings (blinking while in use) for ToUCam cameras.
-* Turns LED off when camera is not in use.
-
-8.2
-
-* Making module more silent when trace = 0 
-* Adding QuickCam 3000 Pro IDs
-* Chrominance control for the Vesta cameras
-* Hopefully fixed problems on machines with BIGMEM and > 1GB of RAM
-* Included Oliver Neukem's lock_kernel() patch
-* Allocates less memory for image buffers
-* Adds ioctl()s for the whitebalancing
-
-8.1
-
-* Adding support for 750
-* Adding V4L GAUDIO/SAUDIO/UNIT ioctl() calls
-
-8.0
-* 'damage control' after inclusion in 2.4.5.
-* Changed wait-queue mechanism in read/mmap/poll according to the book.
-* Included YUV420P palette.
-* Changed interface to decompressor module.
-* Cleaned up pwc structure a bit.
-
-7.0
-
-* Fixed bug in vcvt_420i_yuyv; extra variables on stack were misaligned.
-* There is now a clear error message when an image size is selected that
-  is only supported using the decompressor, and the decompressor isn't
-  loaded.
-* When the decompressor wasn't loaded, selecting large image size
-  would create skewed or double images.
-
-6.3
-
-* Introduced spinlocks for the buffer pointer manipulation; a number of
-  reports seem to suggest the down()/up() semaphores were the cause of
-  lockups, since they are not suitable for interrupt/user locking.
-* Separated decompressor and core code into 2 modules.
-
-6.2
-
-* Non-integral image sizes are now padded with gray or black.
-* Added SHUTTERSPEED ioctl().
-* Fixed buglet in VIDIOCPWCSAGC; the function would always return an error,
-  even though the call succeeded.
-* Added hotplug support for 2.4.*.
-* Memory: the 645/646 uses less memory now.
-
-6.1
-
-* VIDIOCSPICT returns -EINVAL with invalid palettes.
-* Added saturation control.
-* Split decompressors from rest.
-* Fixed bug that would reset the framerate to the default framerate if 
-  the rate field was set to 0 (which is not what I intended, nl. do not 
-  change the framerate!).
-* VIDIOCPWCSCQUAL (setting compression quality) now takes effect immediately.
-* Workaround for a bug in the 730 sensor.
diff --git a/drivers/usb/media/pwc/Makefile b/drivers/usb/media/pwc/Makefile
index e0b41ed4407f..2d93a775011a 100644
--- a/drivers/usb/media/pwc/Makefile
+++ b/drivers/usb/media/pwc/Makefile
@@ -1,6 +1,6 @@
 ifneq ($(KERNELRELEASE),)
 
-pwc-objs        := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o
+pwc-objs        := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o
 
 obj-$(CONFIG_USB_PWC) += pwc.o
 
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c
index 42ec468d52d6..53099190952c 100644
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
@@ -48,8 +48,6 @@
 #include "pwc-uncompress.h"
 #include "pwc-kiara.h"
 #include "pwc-timon.h"
-#include "pwc-dec1.h"
-#include "pwc-dec23.h"
 
 /* Request types: video */
 #define SET_LUM_CTL                     0x01
@@ -246,7 +244,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
            switch(pdev->type) {
              case 645:
              case 646:
-               pwc_dec1_init(pdev->type, pdev->release, buf, pdev->decompress_data);
+/*             pwc_dec1_init(pdev->type, pdev->release, buf, pdev->decompress_data); */
                break;
 
              case 675:
@@ -256,7 +254,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra
              case 730:
              case 740:
              case 750:
-               pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data);
+/*             pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */
                break;
            }
         }
@@ -318,8 +316,8 @@ static inline int set_video_mode_Timon(struct pwc_device *pdev, int size, int fr
         if (ret < 0)
                 return ret;
 
-        if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW)
-           pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data);
+/*      if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW)
+           pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */
 
         pdev->cmd_len = 13;
         memcpy(pdev->cmd_buf, buf, 13);
@@ -397,8 +395,8 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
         if (ret < 0)
                 return ret;
 
-        if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW)
-          pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data);
+/*      if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW)
+          pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */
 
         pdev->cmd_len = 12;
         memcpy(pdev->cmd_buf, buf, 12);
diff --git a/drivers/usb/media/pwc/pwc-dec1.c b/drivers/usb/media/pwc/pwc-dec1.c
deleted file mode 100644
index 57d03d9178f6..000000000000
--- a/drivers/usb/media/pwc/pwc-dec1.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Linux driver for Philips webcam
-   Decompression for chipset version 1
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   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 program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-
-#include "pwc-dec1.h"
-
-
-void pwc_dec1_init(int type, int release, void *buffer, void *table)
-{
-
-}
-
-void pwc_dec1_exit(void)
-{
-
-
-
-}
-
diff --git a/drivers/usb/media/pwc/pwc-dec1.h b/drivers/usb/media/pwc/pwc-dec1.h
deleted file mode 100644
index a7ffd9c45a2c..000000000000
--- a/drivers/usb/media/pwc/pwc-dec1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Linux driver for Philips webcam
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   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 program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-
-
-#ifndef PWC_DEC1_H
-#define PWC_DEC1_H
-
-void pwc_dec1_init(int type, int release, void *buffer, void *private_data);
-void pwc_dec1_exit(void);
-
-#endif
-
-
-
diff --git a/drivers/usb/media/pwc/pwc-dec23.c b/drivers/usb/media/pwc/pwc-dec23.c
deleted file mode 100644
index 98fa3f7a9eff..000000000000
--- a/drivers/usb/media/pwc/pwc-dec23.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/* Linux driver for Philips webcam
-   Decompression for chipset version 2 et 3
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   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 program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include "pwc-timon.h"
-#include "pwc-kiara.h"
-#include "pwc-dec23.h"
-#include "pwc-ioctl.h"
-
-#include <linux/string.h>
-
-/****
- *
- *
- *
- */
-
-
-static void fill_table_a000(unsigned int *p)
-{
-  static unsigned int initial_values[12] = {
-     0xFFAD9B00, 0xFFDDEE00, 0x00221200, 0x00526500,
-     0xFFC21E00, 0x003DE200, 0xFF924B80, 0xFFD2A300,
-     0x002D5D00, 0x006DB480, 0xFFED3E00, 0x0012C200
-  };
-  static unsigned int values_derivated[12] = {
-     0x0000A4CA, 0x00004424, 0xFFFFBBDC, 0xFFFF5B36,
-     0x00007BC4, 0xFFFF843C, 0x0000DB69, 0x00005ABA,
-     0xFFFFA546, 0xFFFF2497, 0x00002584, 0xFFFFDA7C
-  };
-  unsigned int temp_values[12];
-  int i,j;
-
-  memcpy(temp_values,initial_values,sizeof(initial_values));
-  for (i=0;i<256;i++)
-   {
-     for (j=0;j<12;j++)
-      {
-        *p++ = temp_values[j];
-        temp_values[j] += values_derivated[j];
-      }
-   }
-}
-
-static void fill_table_d000(unsigned char *p)
-{
-  int bit,byte;
-
-  for (bit=0; bit<8; bit++)
-   {
-     unsigned char bitpower = 1<<bit;
-     unsigned char mask = bitpower-1;
-     for (byte=0; byte<256; byte++)
-      {
-        if (byte & bitpower)
-          *p++ = -(byte & mask);
-        else
-          *p++ = (byte & mask);
-      }
-   }
-}
-
-/*
- *
- * Kiara: 0 <= ver <= 7
- * Timon: 0 <= ver <= 15
- *
- */
-static void fill_table_color(unsigned int version, const unsigned int *romtable, 
-    unsigned char *p0004, 
-    unsigned char *p8004)
-{
-  const unsigned int *table;
-  unsigned char *p0, *p8;
-  int i,j,k;
-  int dl,bit,pw;
-
-  romtable += version*256;
-
-  for (i=0; i<2; i++)
-   {
-     table = romtable + i*128;
-
-     for (dl=0; dl<16; dl++)
-      {
-        p0 = p0004 + (i<<14) + (dl<<10);
-        p8 = p8004 + (i<<12) + (dl<<8);
-
-        for (j=0; j<8; j++ , table++, p0+=128)
-         {
-           for (k=0; k<16; k++)
-            {
-              if (k==0)
-                bit=1;
-              else if (k>=1 && k<3)
-                bit=(table[0]>>15)&7;
-              else if (k>=3 && k<6)
-                bit=(table[0]>>12)&7;
-              else if (k>=6 && k<10)
-                bit=(table[0]>>9)&7;
-              else if (k>=10 && k<13)
-                bit=(table[0]>>6)&7;
-              else if (k>=13 && k<15)
-                bit=(table[0]>>3)&7;
-              else
-                bit=(table[0])&7;
-              if (k == 0)
-                *(unsigned char *)p8++ = 8;
-              else
-                *(unsigned char *)p8++ = j - bit;
-              *(unsigned char *)p8++ = bit;
-
-              pw = 1<<bit;
-              p0[k+0x00] = (1*pw)  + 0x80;
-              p0[k+0x10] = (2*pw)  + 0x80;
-              p0[k+0x20] = (3*pw)  + 0x80;
-              p0[k+0x30] = (4*pw)  + 0x80;
-              p0[k+0x40] = (-pw)   + 0x80;
-              p0[k+0x50] = (2*-pw) + 0x80;
-              p0[k+0x60] = (3*-pw) + 0x80;
-              p0[k+0x70] = (4*-pw) + 0x80;
-            } /* end of for (k=0; k<16; k++, p8++) */
-         } /* end of for (j=0; j<8; j++ , table++) */
-      } /* end of for (dl=0; dl<16; dl++) */
-   } /* end of for (i=0; i<2; i++) */
-}
-
-/*
- * precision = (pdev->xx + pdev->yy)
- *
- */
-static void fill_table_dc00_d800(unsigned int precision, unsigned int *pdc00, unsigned int *pd800)
-{
-  int i;
-  unsigned int offset1, offset2;
- 
-  for(i=0,offset1=0x4000, offset2=0; i<256 ; i++,offset1+=0x7BC4, offset2+=0x7BC4)
-   {
-     unsigned int msb = offset1 >> 15;
-
-     if ( msb > 255)
-      {
-        if (msb)
-          msb=0;
-        else
-          msb=255;
-      }
-
-     *pdc00++ = msb << precision;
-     *pd800++ = offset2;
-   }
-
-}
-
-/*
- * struct {
- *   unsigned char op;      // operation to execute
- *   unsigned char bits;    // bits use to perform operation
- *   unsigned char offset1; // offset to add to access in the table_0004 % 16
- *   unsigned char offset2; // offset to add to access in the table_0004
- * }
- *
- */
-static unsigned int table_ops[] = {
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x10, 0x00,0x06,0x01,0x30,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x01,0x20, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x50, 0x00,0x05,0x02,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x03,0x00, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x10, 0x00,0x06,0x02,0x10,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x01,0x60, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x50, 0x00,0x05,0x02,0x40,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x03,0x40, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x10, 0x00,0x06,0x01,0x70,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x01,0x20, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x50, 0x00,0x05,0x02,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x03,0x00, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x10, 0x00,0x06,0x02,0x50,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x01,0x60, 0x01,0x00,0x00,0x00,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x00, 0x00,0x04,0x01,0x50, 0x00,0x05,0x02,0x40,
-0x02,0x00,0x00,0x00, 0x00,0x03,0x01,0x40, 0x00,0x05,0x03,0x40, 0x01,0x00,0x00,0x00
-};
-
-/*
- * TODO: multiply by 4 all values
- *
- */
-static unsigned int MulIdx[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3,
- 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
- 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4,
- 6, 7, 8, 9, 7,10,11, 8, 8,11,10, 7, 9, 8, 7, 6,
- 4, 5, 5, 4, 4, 5, 5, 4, 4, 5, 5, 4, 4, 5, 5, 4,
- 1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3, 0, 2,
- 0, 3, 3, 0, 1, 2, 2, 1, 2, 1, 1, 2, 3, 0, 0, 3,
- 0, 1, 2, 3, 3, 2, 1, 0, 3, 2, 1, 0, 0, 1, 2, 3,
- 1, 1, 1, 1, 3, 3, 3, 3, 0, 0, 0, 0, 2, 2, 2, 2,
- 7,10,11, 8, 9, 8, 7, 6, 6, 7, 8, 9, 8,11,10, 7,
- 4, 5, 5, 4, 5, 4, 4, 5, 5, 4, 4, 5, 4, 5, 5, 4,
- 7, 9, 6, 8,10, 8, 7,11,11, 7, 8,10, 8, 6, 9, 7,
- 1, 3, 0, 2, 2, 0, 3, 1, 2, 0, 3, 1, 1, 3, 0, 2,
- 1, 2, 2, 1, 3, 0, 0, 3, 0, 3, 3, 0, 2, 1, 1, 2,
-10, 8, 7,11, 8, 6, 9, 7, 7, 9, 6, 8,11, 7, 8,10
-};
-
-
-
-void pwc_dec23_init(int type, int release, unsigned char *mode, void *data)
-{
-  int flags;
-  struct pwc_dec23_private *pdev = data;
-  release = release;
-
-  switch (type)
-   {
-    case 720:
-    case 730:
-    case 740:
-    case 750:
-      flags = mode[2]&0x18;     /* our: flags = 8, mode[2]==e8 */
-      if (flags==8)
-        pdev->zz = 7;
-      else if (flags==0x10)
-        pdev->zz = 8;
-      else
-        pdev->zz = 6;
-      flags = mode[2]>>5;       /* our: 7 */
-
-      fill_table_color(flags, (unsigned int *)KiaraRomTable, pdev->table_0004, pdev->table_8004);
-      break;
-
-
-    case 675:
-    case 680:
-    case 690:
-      flags = mode[2]&6;
-      if (flags==2)
-        pdev->zz = 7;
-      else if (flags==4)
-        pdev->zz = 8;
-      else
-        pdev->zz = 6;
-      flags = mode[2]>>3;
-
-      fill_table_color(flags, (unsigned int *)TimonRomTable, pdev->table_0004, pdev->table_8004);
-      break;
-
-    default:
-      /* Not supported */
-      return;
-   }
-
-  /* * * * ** */
-  pdev->xx = 8 - pdev->zz;
-  pdev->yy = 15 - pdev->xx;
-  pdev->zzmask = 0xFF>>pdev->xx;
-  //pdev->zzmask = (1U<<pdev->zz)-1;
-
-
-  fill_table_dc00_d800(pdev->xx + pdev->yy, pdev->table_dc00, pdev->table_d800);
-  fill_table_a000(pdev->table_a004);
-  fill_table_d000(pdev->table_d004);
-}
-
-
-/*
- * To manage the stream, we keep in a 32 bits variables,
- * the next bits in the stream. fill_reservoir() add to
- * the reservoir at least wanted nbits.
- *
- *
- */
-#define fill_nbits(reservoir,nbits_in_reservoir,stream,nbits_wanted) do { \
-   while (nbits_in_reservoir<nbits_wanted) \
-    { \
-      reservoir |= (*(stream)++) << nbits_in_reservoir; \
-      nbits_in_reservoir+=8; \
-    } \
-}  while(0);
-
-#define get_nbits(reservoir,nbits_in_reservoir,stream,nbits_wanted,result) do { \
-   fill_nbits(reservoir,nbits_in_reservoir,stream,nbits_wanted); \
-   result = (reservoir) & ((1U<<nbits_wanted)-1); \
-   reservoir >>= nbits_wanted; \
-   nbits_in_reservoir -= nbits_wanted; \
-}  while(0);
-
-
-
-static void DecompressBand23(const struct pwc_dec23_private *pdev,
-                             const unsigned char *rawyuv,
-                             unsigned char *planar_y,
-                             unsigned char *planar_u,
-                             unsigned char *planar_v,
-                             unsigned int image_x,              /* aka number of pixels wanted ??? */
-                             unsigned int pixels_per_line,      /* aka number of pixels per line */
-                             int flags)
-{
-
-
-  unsigned int reservoir, nbits_in_reservoir;
-  int first_4_bits;
-  unsigned int bytes_per_channel;
-  int line_size;        /* size of the line (4Y+U+V) */
-  int passes;
-  const unsigned char *ptable0004, *ptable8004;
-
-  int even_line;
-  unsigned int temp_colors[16];
-  int nblocks;
-
-  const unsigned char *stream;
-  unsigned char *dest_y, *dest_u=NULL, *dest_v=NULL;
-  unsigned int offset_to_plane_u, offset_to_plane_v;
-
-  int i;
-
-
-  reservoir = 0;
-  nbits_in_reservoir = 0;
-  stream = rawyuv+1;    /* The first byte of the stream is skipped */
-  even_line = 1;
-
-  get_nbits(reservoir,nbits_in_reservoir,stream,4,first_4_bits);
-
-  line_size = pixels_per_line*3;
-
-  for (passes=0;passes<2;passes++)
-   {
-     if (passes==0)
-      {
-        bytes_per_channel = pixels_per_line;
-        dest_y = planar_y;
-        nblocks = image_x/4;
-      }
-     else
-      {
-        /* Format planar: All Y, then all U, then all V */
-        bytes_per_channel = pixels_per_line/2;
-        dest_u = planar_u;
-        dest_v = planar_v;
-        dest_y = dest_u;
-        nblocks = image_x/8;
-      }
-
-     offset_to_plane_u = bytes_per_channel*2;
-     offset_to_plane_v = bytes_per_channel*3;
-     /*
-     printf("bytes_per_channel = %d\n",bytes_per_channel);
-     printf("offset_to_plane_u = %d\n",offset_to_plane_u);
-     printf("offset_to_plane_v = %d\n",offset_to_plane_v);
-     */
-
-     while (nblocks-->0)
-      {
-        unsigned int gray_index;
-
-        fill_nbits(reservoir,nbits_in_reservoir,stream,16);
-        gray_index = reservoir & pdev->zzmask;
-        reservoir >>= pdev->zz;
-        nbits_in_reservoir -= pdev->zz;
-
-        fill_nbits(reservoir,nbits_in_reservoir,stream,2);
-
-        if ( (reservoir & 3) == 0)
-         {
-           reservoir>>=2;
-           nbits_in_reservoir-=2;
-           for (i=0;i<16;i++)
-             temp_colors[i] = pdev->table_dc00[gray_index];
-
-         }
-        else
-         {
-           unsigned int channel_v, offset1;
-
-           /* swap bit 0 and 2 of offset_OR */
-           channel_v = ((reservoir & 1) << 2) | (reservoir & 2) | ((reservoir & 4)>>2);
-           reservoir>>=3;
-           nbits_in_reservoir-=3;
-
-           for (i=0;i<16;i++)
-             temp_colors[i] = pdev->table_d800[gray_index];
-
-           ptable0004 = pdev->table_0004 + (passes*16384) + (first_4_bits*1024) + (channel_v*128);
-           ptable8004 = pdev->table_8004 + (passes*4096)  + (first_4_bits*256)  + (channel_v*32);
-
-           offset1 = 0;
-           while(1) 
-            {
-              unsigned int index_in_table_ops, op, rows=0;
-              fill_nbits(reservoir,nbits_in_reservoir,stream,16);
-
-              /* mode is 0,1 or 2 */
-              index_in_table_ops = (reservoir&0x3F);
-              op = table_ops[ index_in_table_ops*4 ];
-              if (op == 2)
-               {
-                 reservoir >>= 2;
-                 nbits_in_reservoir -= 2;
-                 break; /* exit the while(1) */
-               }
-              if (op == 0)
-               {
-                 unsigned int shift;
-
-                 offset1 = (offset1 + table_ops[index_in_table_ops*4+2]) & 0x0F;
-                 shift = table_ops[ index_in_table_ops*4+1 ];
-                 reservoir >>= shift;
-                 nbits_in_reservoir -= shift;
-                 rows = ptable0004[ offset1 + table_ops[index_in_table_ops*4+3] ];
-               }
-              if (op == 1)
-               {
-                  /* 10bits [ xxxx xxxx yyyy 000 ]
-                   * yyy => offset in the table8004
-                   * xxx => offset in the tabled004
-                   */
-                 unsigned int mask, shift;
-                 unsigned int col1, row1, total_bits;
-
-                 offset1 = (offset1 + ((reservoir>>3)&0x0F)+1) & 0x0F;
-
-                 col1 = (reservoir>>7) & 0xFF;
-                 row1 = ptable8004 [ offset1*2 ];
-
-                 /* Bit mask table */
-                 mask = pdev->table_d004[ (row1<<8) + col1 ];
-                 shift = ptable8004 [ offset1*2 + 1];
-                 rows = ((mask << shift) + 0x80) & 0xFF;
-
-                 total_bits = row1 + 8;
-                 reservoir >>= total_bits;
-                 nbits_in_reservoir -= total_bits;
-               }
-               {
-                 const unsigned int *table_a004 = pdev->table_a004 + rows*12;
-                 unsigned int *poffset = MulIdx + offset1*16;   /* 64/4 (int) */
-                 for (i=0;i<16;i++)
-                  {
-                    temp_colors[i] += table_a004[ *poffset ];
-                    poffset++;
-                  }
-               }
-           }
-         }
-#define USE_SIGNED_INT_FOR_COLOR
-#ifdef USE_SIGNED_INT_FOR_COLOR
-#  define CLAMP(x) ((x)>255?255:((x)<0?0:x))
-#else
-#  define CLAMP(x) ((x)>255?255:x)
-#endif
-
-        if (passes == 0)
-         {
-#ifdef USE_SIGNED_INT_FOR_COLOR
-           const int *c = temp_colors;
-#else
-           const unsigned int *c = temp_colors;
-#endif
-           unsigned char *d;
-
-           d = dest_y;
-           for (i=0;i<4;i++,c++)
-             *d++ = CLAMP((*c) >> pdev->yy);
-
-           d = dest_y + bytes_per_channel;
-           for (i=0;i<4;i++,c++)
-             *d++ = CLAMP((*c) >> pdev->yy);
-
-           d = dest_y + offset_to_plane_u;
-           for (i=0;i<4;i++,c++)
-             *d++ = CLAMP((*c) >> pdev->yy);
-
-           d = dest_y + offset_to_plane_v;
-           for (i=0;i<4;i++,c++)
-             *d++ = CLAMP((*c) >> pdev->yy);
-
-           dest_y += 4;
-         }
-        else if (passes == 1)
-         {
-#ifdef USE_SIGNED_INT_FOR_COLOR
-           int *c1 = temp_colors;
-           int *c2 = temp_colors+4;
-#else
-           unsigned int *c1 = temp_colors;
-           unsigned int *c2 = temp_colors+4;
-#endif
-           unsigned char *d;
-
-           d = dest_y;
-           for (i=0;i<4;i++,c1++,c2++)
-            {
-              *d++ = CLAMP((*c1) >> pdev->yy);
-              *d++ = CLAMP((*c2) >> pdev->yy);
-            }
-           c1 = temp_colors+12;
-           //c2 = temp_colors+8;
-           d = dest_y + bytes_per_channel;
-           for (i=0;i<4;i++,c1++,c2++)
-            {
-              *d++ = CLAMP((*c1) >> pdev->yy);
-              *d++ = CLAMP((*c2) >> pdev->yy);
-            }
-
-           if (even_line)       /* Each line, swap u/v */
-            {
-              even_line=0;
-              dest_y = dest_v;
-              dest_u += 8;
-            }
-           else
-            {
-              even_line=1;
-              dest_y = dest_u;
-              dest_v += 8;
-            }
-         }
-
-      } /* end of while (nblocks-->0) */
-
-   } /* end of for (passes=0;passes<2;passes++) */
-
-}
-
-
-/**
- *
- * image: size of the image wanted
- * view : size of the image returned by the camera
- * offset: (x,y) to displayer image in the view
- *
- * src: raw data
- * dst: image output
- * flags: PWCX_FLAG_PLANAR
- * pdev: private buffer
- * bandlength:
- *
- */
-void pwc_dec23_decompress(const struct pwc_coord *image,
-                            const struct pwc_coord *view,
-                            const struct pwc_coord *offset,
-                            const void *src,
-                            void *dst,
-                            int flags,
-                            const void *data,
-                            int bandlength)
-{
-  const struct pwc_dec23_private *pdev = data;
-  unsigned char *pout, *pout_planar_y=NULL, *pout_planar_u=NULL, *pout_planar_v=NULL;
-  int i,n,stride,pixel_size;
-
-
-  if (flags & PWCX_FLAG_BAYER)
-   {
-     pout = dst + (view->x * offset->y) + offset->x;
-     pixel_size = view->x * 4;
-   }
-  else
-   {
-     n = view->x * view->y;
-
-     /* offset in Y plane */
-     stride = view->x * offset->y;
-     pout_planar_y = dst + stride + offset->x;
-
-     /* offsets in U/V planes */
-     stride = (view->x * offset->y)/4 + offset->x/2;
-     pout_planar_u = dst + n +     + stride;
-     pout_planar_v = dst + n + n/4 + stride;
-
-     pixel_size = view->x * 4;
-   }
-
-
-  for (i=0;i<image->y;i+=4)
-   {
-     if (flags & PWCX_FLAG_BAYER)
-      {
-        //TODO:
-        //DecompressBandBayer(pdev,src,pout,image.x,view->x,flags);
-        src += bandlength;
-        pout += pixel_size;
-      }
-     else
-      {
-        DecompressBand23(pdev,src,pout_planar_y,pout_planar_u,pout_planar_v,image->x,view->x,flags);
-        src += bandlength;
-        pout_planar_y += pixel_size;
-        pout_planar_u += view->x;
-        pout_planar_v += view->x;
-      }
-   }
-}
-
-void pwc_dec23_exit(void)
-{
-  /* Do nothing */
-
-}
-
diff --git a/drivers/usb/media/pwc/pwc-dec23.h b/drivers/usb/media/pwc/pwc-dec23.h
deleted file mode 100644
index 5b2aacdefa6c..000000000000
--- a/drivers/usb/media/pwc/pwc-dec23.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Linux driver for Philips webcam
-   (C) 2004      Luc Saillard (luc@saillard.org)
-
-   NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
-   driver and thus may have bugs that are not present in the original version.
-   Please send bug reports and support requests to <luc@saillard.org>.
-   The decompression routines have been implemented by reverse-engineering the
-   Nemosoft binary pwcx module. Caveat emptor.
-
-   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 program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef PWC_DEC23_H
-#define PWC_DEC23_H
-
-struct pwc_dec23_private
-{
-  unsigned char xx,yy,zz,zzmask;
-
-  unsigned char table_0004[2*0x4000];
-  unsigned char table_8004[2*0x1000];
-  unsigned int  table_a004[256*12];
-
-  unsigned char table_d004[8*256];
-  unsigned int  table_d800[256];
-  unsigned int  table_dc00[256];
-};
-
-
-void pwc_dec23_init(int type, int release, unsigned char *buffer, void *private_data);
-void pwc_dec23_exit(void);
-void pwc_dec23_decompress(const struct pwc_coord *image,
-                            const struct pwc_coord *view,
-                            const struct pwc_coord *offset,
-                            const void *src,
-                            void *dst,
-                            int flags,
-                            const void *data,
-                            int bandlength);
-
-
-
-#endif
-
-
-
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c
index cca47f480a8b..b77e65c03659 100644
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/usb/media/pwc/pwc-if.c
@@ -68,8 +68,6 @@
 #include "pwc-ioctl.h"
 #include "pwc-kiara.h"
 #include "pwc-timon.h"
-#include "pwc-dec23.h"
-#include "pwc-dec1.h"
 #include "pwc-uncompress.h"
 
 /* Function prototypes and driver templates */
@@ -322,6 +320,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
           case 730:
           case 740:
           case 750:
+#if 0     
             Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));
             kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);       /* Timon & Kiara */
             break;
@@ -330,11 +329,9 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
             /* TODO & FIXME */
             kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);
             break;
+#endif   
+        ;
          }
-        if (kbuf == NULL) {
-           Err("Failed to allocate decompress table.\n");
-           return -ENOMEM;
-        }
         pdev->decompress_data = kbuf;
         
         /* Allocate image buffer; double buffer for mmap() */
@@ -1131,11 +1128,11 @@ static int pwc_video_close(struct inode *inode, struct file *file)
           case 730:
           case 740:
           case 750:
-            pwc_dec23_exit();   /* Timon & Kiara */
+/*          pwc_dec23_exit();   *//* Timon & Kiara */
             break;
           case 645:
           case 646:
-            pwc_dec1_exit();
+/*          pwc_dec1_exit(); */
             break;
          }
 
diff --git a/drivers/usb/media/pwc/pwc-kiara.c b/drivers/usb/media/pwc/pwc-kiara.c
index 5485800efd83..c498c68bace1 100644
--- a/drivers/usb/media/pwc/pwc-kiara.c
+++ b/drivers/usb/media/pwc/pwc-kiara.c
@@ -316,576 +316,3 @@ const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4] =
    },
 };
 
-
-/*
- * Rom table for kiara chips
- *
- * 32 roms tables (one for each resolution ?)
- *  2 tables per roms (one for each passes) (Y, and U&V)
- * 128 bytes per passes
- */
-
-const unsigned int KiaraRomTable [8][2][16][8] =  
-{
- { /* version 0 */
-  { /* version 0, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000001,0x00000001},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x0000124a,0x00009252,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00009252,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009292,0x00009292,0x00009493,0x000124db},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x0000a493,0x000124db,0x000124db,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x000124db,0x000126dc,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 0, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000001,0x00000009,
-    0x00000009,0x00000009,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00001252},
-   {0x00000000,0x00000000,0x00000049,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009252,0x00009292,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009292,0x00009292,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00009292,
-    0x00009492,0x00009493,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009252,0x00009493,
-    0x000126dc,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x000136e4,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 1 */
-  { /* version 1, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000001},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009252,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00009252,
-    0x00009492,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 1, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000009,
-    0x00000049,0x00000009,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000000},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000049,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009252,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009292,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009292,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009292,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x0000924a,0x0000924a,
-    0x00009492,0x00009493,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 2 */
-  { /* version 2, passes 0 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009493,0x00009493,0x0000a49b},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000124db,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x000126dc,0x0001b724,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 2, passes 1 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x0000a49b,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00009252,0x0000a49b,
-    0x0001249b,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 3 */
-  { /* version 3, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000136e4,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x000136e4,0x0001b925,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 3, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 4 */
-  { /* version 4, passes 0 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00009252,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009252,0x00009493,
-    0x000124db,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009252,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 4, passes 1 */
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000049,0x00000049,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00000249,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009252,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009252,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009493,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 5 */
-  { /* version 5, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001c96e,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 5, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009252,0x00009252,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000126dc,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 6 */
-  { /* version 6, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x00012492,0x000126db,
-    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 6, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009252,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009292,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000126dc,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 7 */
-  { /* version 7, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x0000a49b,
-    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b725,0x000124db},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000136e4,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001c96e,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x00012492,0x000136db,
-    0x00024924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 7, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x00009492,0x00009292,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000136db,
-    0x0001b724,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000136db,
-    0x0001b724,0x000126dc,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00009292,0x000136db,
-    0x0001b724,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x0001c924,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- }
-};
-
diff --git a/drivers/usb/media/pwc/pwc-timon.c b/drivers/usb/media/pwc/pwc-timon.c
index f950a4e5ed96..dee967173d6c 100644
--- a/drivers/usb/media/pwc/pwc-timon.c
+++ b/drivers/usb/media/pwc/pwc-timon.c
@@ -314,1133 +314,3 @@ const struct Timon_table_entry Timon_table[PSZ_MAX][6][4] =
    },
 };
 
-/*
- * 16 versions:
- *   2 tables  (one for Y, and one for U&V)
- *   16 levels of details per tables
- *   8 blocs
- */
-
-const unsigned int TimonRomTable [16][2][16][8] =  
-{
- { /* version 0 */
-  { /* version 0, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000001},
-   {0x00000000,0x00000000,0x00000001,0x00000001,
-    0x00000001,0x00000001,0x00000001,0x00000001},
-   {0x00000000,0x00000000,0x00000001,0x00000001,
-    0x00000001,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000001,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000009,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x00000249,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x0000124a,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 0, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000001,0x00000001,
-    0x00000001,0x00000001,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000009,0x00000001,
-    0x00000001,0x00000009,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000009,
-    0x00000009,0x00000049,0x00000001,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000009,
-    0x00000009,0x00000049,0x00000001,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000249,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 1 */
-  { /* version 1, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000001},
-   {0x00000000,0x00000000,0x00000001,0x00000001,
-    0x00000001,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000009,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00001252},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 1, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000001,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000009,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000001,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000049,0x00000249,0x00000009,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000249,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00000049,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009252,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 2 */
-  { /* version 2, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000001},
-   {0x00000000,0x00000000,0x00000009,0x00000009,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009252,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00009252,
-    0x00009492,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 2, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000009,
-    0x00000049,0x00000009,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000000},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000049,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x0000024a,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009252,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009292,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009292,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009292,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x0000924a,0x0000924a,
-    0x00009492,0x00009493,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 3 */
-  { /* version 3, passes 0 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000001},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000049,0x00000249,
-    0x00000249,0x00000249,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009292,0x00009292,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009292,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00009252,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009292,0x0000a49b,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x0000a49b,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x0001b725,0x000136e4},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 3, passes 1 */
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000},
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000001,0x00000000},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x00000049,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00000001},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009252,0x00009292,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009252,0x00009292,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009493,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009493,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009493,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009292,
-    0x0000a493,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 4 */
-  { /* version 4, passes 0 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00009252,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009493,0x00009493,0x0000a49b},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000124db,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x000126dc,0x0001b724,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 4, passes 1 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x0000a49b,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00009252,0x0000a49b,
-    0x0001249b,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 5 */
-  { /* version 5, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x0000124a,0x00001252,0x00009292},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x0000124a,0x00009292,0x00009292,0x00009493},
-   {0x00000000,0x00000000,0x00000249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x000124db,0x000124db,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000126dc,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 5, passes 1 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x00009493,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x000124db,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009493,0x000124db,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x000124db,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x000126dc,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 6 */
-  { /* version 6, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x0000124a,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000136e4,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x000136e4,0x0001b925,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 6, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x0000a49b,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 7 */
-  { /* version 7, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x0000a49b,0x000124db,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0001249b,0x000126dc,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000126dc,0x0001b724,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001c96e,0x0002496e},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x0001b925,0x0001c96e,0x0002496e},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x0002496d,0x00025bb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 7, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000136e4,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x000136e4,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00012492,0x000126db,
-    0x0001b724,0x0001b925,0x0001b725,0x000136e4},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 8 */
-  { /* version 8, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009292,0x00009493,0x0000a49b,0x000124db},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x000124db,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000136e4},
-   {0x00000000,0x00000000,0x00001249,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000136e4,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b725,0x0001b925},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001c92d},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000126dc,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x00024b76,0x00024b77},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x0001b925,0x00024b76,0x00025bbf},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x000136e4,0x0001c92d,0x00024b76,0x00025bbf},
-   {0x00000000,0x00000000,0x00012492,0x000136db,
-    0x0001b724,0x00024b6d,0x0002ddb6,0x0002efff},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 8, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000126dc,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000136e4,0x0001b724,0x0001b725,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x0001b925,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x0001b925,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x0002496d,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 9 */
-  { /* version 9, passes 0 */
-   {0x00000000,0x00000000,0x00000049,0x00000049,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000249,0x00000249,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x0000124a,0x00009252,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009252,0x00009493,
-    0x000124db,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009252,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 9, passes 1 */
-   {0x00000000,0x00000000,0x00000249,0x00000049,
-    0x00000009,0x00000009,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000049,0x00000049,0x00000009,0x00000009},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00000249,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009252,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009252,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009493,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009252,0x000124db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 10 */
-  { /* version 10, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00000249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x00009493,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x000124db,0x000124db,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0001249b,0x000126dc,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000126dc,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009252,0x0000a49b,
-    0x000124db,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000126dc,0x0001b925,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x000136e4,0x0002496d,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 10, passes 1 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000049,0x00000049,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00000249,0x00000049,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x00009252,0x0000024a,0x00000049},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009493,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009252,
-    0x00009492,0x00009493,0x00001252,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009493,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x00009492,0x00009493,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009493,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009252,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 11 */
-  { /* version 11, passes 0 */
-   {0x00000000,0x00000000,0x00000249,0x00000249,
-    0x00000249,0x00000249,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009492,0x0000a49b,0x0000a49b,0x00009292},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x000136e4},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001c96e,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 11, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00000249,
-    0x00000249,0x00000249,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009252,0x00009252,0x0000024a,0x0000024a},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x0000a49b,0x00009292,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000126dc,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 12 */
-  { /* version 12, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x0000a493,0x0000a49b,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001b92d,0x0001b724},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001b925,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x00012492,0x000126db,
-    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 12, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x00001249,0x00009292,
-    0x00009492,0x00009252,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009292,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000124db,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000126dc,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x000136e4,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00009492,0x000126db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 13 */
-  { /* version 13, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x00009252,0x00009292,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x0000a49b,
-    0x0001249b,0x000126dc,0x000126dc,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x000136e4,0x0001b725,0x000124db},
-   {0x00000000,0x00000000,0x00009292,0x0000a49b,
-    0x000136e4,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000136e4,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001c96e,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x000136e4,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x00012492,0x000136db,
-    0x00024924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 13, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x00009492,0x00009292,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x0000a49b,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000124db,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000136db,
-    0x0001b724,0x000124db,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000136db,
-    0x0001b724,0x000126dc,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00009292,0x000136db,
-    0x0001b724,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000126dc,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x0001c924,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 14 */
-  { /* version 14, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x0000924a,
-    0x00009292,0x00009493,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00001249,0x0000a49b,
-    0x0000a493,0x000124db,0x000126dc,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x0000a49b},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x000136e4,0x0001b725,0x000124db},
-   {0x00000000,0x00000000,0x00009292,0x000124db,
-    0x000126dc,0x0001b724,0x0001b92d,0x000126dc},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b724,0x0001b92d,0x000126dc},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001c92d,0x0001c96e,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0001b925},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x0001c92d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b924,0x0002496d,0x00024b76,0x00024b77},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x00024924,0x0002db6d,0x00036db6,0x0002efff},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 14, passes 1 */
-   {0x00000000,0x00000000,0x00001249,0x00001249,
-    0x0000124a,0x0000124a,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x00009493,
-    0x0000a493,0x00009292,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x0000a49b,0x00001252,0x00001252},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000136e4,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000136e4,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x000136e4,0x00009493,0x00009292},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000136e4,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000136e4,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000136e4,0x0000a49b,0x00009493},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001b724,0x000136e4,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000124db,0x0000a49b},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b724,0x000136e4,0x000126dc,0x000124db},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x0001c924,0x0001b724,0x000136e4,0x000126dc},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- },
- { /* version 15 */
-  { /* version 15, passes 0 */
-   {0x00000000,0x00000000,0x00001249,0x00009493,
-    0x0000a493,0x0000a49b,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0001249b,0x000126dc,0x000136e4,0x000124db},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x000126dc,0x0001b724,0x0001b725,0x000126dc},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x0001b724,0x0001b92d,0x000126dc},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x000136e4,0x0001b925,0x0001c96e,0x000136e4},
-   {0x00000000,0x00000000,0x00009492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000124db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b724},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b724,0x0001c92d,0x0001c96e,0x0001b925},
-   {0x00000000,0x00000000,0x0000a492,0x000126db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b924,0x0001c92d,0x00024b76,0x0001c92d},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001b924,0x0002496d,0x00024b76,0x0002496e},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0002496d,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x00024b6d,0x00025bb6,0x00024b77},
-   {0x00000000,0x00000000,0x00012492,0x000136db,
-    0x0001c924,0x00024b6d,0x0002ddb6,0x00025bbf},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x00024924,0x0002db6d,0x00036db6,0x0002efff},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  },
-  { /* version 15, passes 1 */
-   {0x00000000,0x00000000,0x0000924a,0x0000924a,
-    0x00009292,0x00009292,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x0000a49b,
-    0x0000a493,0x000124db,0x00009292,0x00009292},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000124db,0x0001b724,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000126dc,0x0001b724,0x00009493,0x00009493},
-   {0x00000000,0x00000000,0x0000924a,0x000124db,
-    0x000136e4,0x0001b724,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00009292,0x000136db,
-    0x0001b724,0x0001b724,0x0000a49b,0x0000a49b},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001c924,0x0001b724,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x00009492,0x000136db,
-    0x0001c924,0x0001b724,0x000124db,0x000124db},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b724,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b925,0x000126dc,0x000126dc},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b925,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b925,0x000136e4,0x000136e4},
-   {0x00000000,0x00000000,0x0000a492,0x000136db,
-    0x0001c924,0x0001b925,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x00012492,0x000136db,
-    0x0001c924,0x0001b925,0x0001b725,0x0001b724},
-   {0x00000000,0x00000000,0x00012492,0x0001b6db,
-    0x00024924,0x0002496d,0x0001b92d,0x0001b925},
-   {0x00000000,0x00000000,0x00000000,0x00000000,
-    0x00000000,0x00000000,0x00000000,0x00000000}
-  }
- }
-};
diff --git a/drivers/usb/media/pwc/pwc-uncompress.c b/drivers/usb/media/pwc/pwc-uncompress.c
index c062e43b3ac5..bc3b1635eab0 100644
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/usb/media/pwc/pwc-uncompress.c
@@ -29,8 +29,6 @@
 
 #include "pwc.h"
 #include "pwc-uncompress.h"
-#include "pwc-dec1.h"
-#include "pwc-dec23.h"
 
 int pwc_decompress(struct pwc_device *pdev)
 {
@@ -122,6 +120,7 @@ int pwc_decompress(struct pwc_device *pdev)
 
                 switch (pdev->type)
                  {
+#if 0            
                   case 675:
                   case 680:
                   case 690:
@@ -137,6 +136,7 @@ int pwc_decompress(struct pwc_device *pdev)
                   case 645:
                   case 646:
                     /* TODO & FIXME */
+#endif              
                     return -ENXIO; /* No such device or address: missing decompressor */
                     break;
                  }
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 626e2b05f719..b33044d56a1e 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -85,7 +85,7 @@ static int vendor_command(struct usb_device *dev, unsigned char request,
 #define BRIGHTNESS 0x2c     /* RAM location for brightness value */
 #define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */
 
-static ssize_t show_brightness(struct device *dev, char *buf)
+static ssize_t show_brightness(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);    
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);     
@@ -93,7 +93,7 @@ static ssize_t show_brightness(struct device *dev, char *buf)
         return sprintf(buf, "%i", cytherm->brightness);
 }
 
-static ssize_t set_brightness(struct device *dev, const char *buf, 
+static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
@@ -138,7 +138,7 @@ static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP,
 #define TEMP 0x33 /* RAM location for temperature */
 #define SIGN 0x34 /* RAM location for temperature sign */
 
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
 
         struct usb_interface *intf = to_usb_interface(dev);
@@ -174,7 +174,7 @@ static ssize_t show_temp(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_temp(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         return count;
 }
@@ -184,7 +184,7 @@ static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp);
 
 #define BUTTON 0x7a
 
-static ssize_t show_button(struct device *dev, char *buf)
+static ssize_t show_button(struct device *dev, struct device_attribute *attr, char *buf)
 {
 
         struct usb_interface *intf = to_usb_interface(dev);
@@ -215,7 +215,7 @@ static ssize_t show_button(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_button(struct device *dev, const char *buf, size_t count)
+static ssize_t set_button(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         return count;
 }
@@ -223,7 +223,7 @@ static ssize_t set_button(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(button, S_IRUGO, show_button, set_button);
 
 
-static ssize_t show_port0(struct device *dev, char *buf)
+static ssize_t show_port0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -249,7 +249,7 @@ static ssize_t show_port0(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_port0(struct device *dev, const char *buf, size_t count)
+static ssize_t set_port0(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -283,7 +283,7 @@ static ssize_t set_port0(struct device *dev, const char *buf, size_t count)
 
 static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR | S_IWGRP, show_port0, set_port0);
 
-static ssize_t show_port1(struct device *dev, char *buf)
+static ssize_t show_port1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -309,7 +309,7 @@ static ssize_t show_port1(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_port1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_port1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index ddbf8e992368..067a81486921 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -173,7 +173,7 @@ exit:
 }
 
 #define set_lcd_line(number)    \
-static ssize_t lcd_line_##number(struct device *dev, const char *buf, size_t count)     \
+static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)      \
 {                                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);                             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);                      \
@@ -184,7 +184,7 @@ static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number);
 set_lcd_line(1);
 set_lcd_line(2);
 
-static ssize_t set_backlight(struct device *dev, const char *buf, size_t count)
+static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);
@@ -232,7 +232,7 @@ static void remove_lcd_files(struct phidget_interfacekit *kit)
         }
 }
 
-static ssize_t enable_lcd_files(struct device *dev, const char *buf, size_t count)
+static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);
@@ -307,7 +307,7 @@ resubmit:
 }
 
 #define show_set_output(value)          \
-static ssize_t set_output##value(struct device *dev, const char *buf,   \
+static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf,    \
                                                         size_t count)   \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
@@ -324,7 +324,7 @@ static ssize_t set_output##value(struct device *dev, const char *buf, 	\
         return retval ? retval : count;                                 \
 }                                                                       \
                                                                         \
-static ssize_t show_output##value(struct device *dev, char *buf)        \
+static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
@@ -343,7 +343,7 @@ show_set_output(7);
 show_set_output(8);     /* should be MAX_INTERFACES - 1 */
 
 #define show_input(value)       \
-static ssize_t show_input##value(struct device *dev, char *buf) \
+static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
@@ -362,7 +362,7 @@ show_input(7);
 show_input(8);          /* should be MAX_INTERFACES - 1 */
 
 #define show_sensor(value)      \
-static ssize_t show_sensor##value(struct device *dev, char *buf)        \
+static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 4bd291502a3c..b84eda631ab5 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees,
 }
 
 #define show_set(value) \
-static ssize_t set_servo##value (struct device *dev,                    \
+static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr,                     \
                                         const char *buf, size_t count)  \
 {                                                                       \
         int degrees, minutes, retval;                                   \
@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev,			\
         return retval < 0 ? retval : count;                             \
 }                                                                       \
                                                                         \
-static ssize_t show_servo##value (struct device *dev, char *buf)        \
+static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf)         \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface (dev);            \
         struct phidget_servo *servo = usb_get_intfdata (intf);          \
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index ee329d5e1c5e..f6ba4c788dbc 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -81,14 +81,14 @@ static void change_color(struct usb_led *led)
 }
 
 #define show_set(value) \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \
                                                                         \
         return sprintf(buf, "%d\n", led->value);                        \
 }                                                                       \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index a9a7cf4a38eb..fd6ff4cb2c62 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -520,7 +520,7 @@ static void int_callback(struct urb *u, struct pt_regs *regs)
 
         /* we check the link state to report changes */
         if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) {
-                if (!act_state)
+                if (act_state)
                         netif_carrier_on(kaweth->net);
                 else
                         netif_carrier_off(kaweth->net);
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 85476e76b244..4cbb408af727 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -2765,7 +2765,7 @@ static int blan_mdlm_bind (struct usbnet *dev, struct usb_interface *intf)
                         }
                         /* expect bcdVersion 1.0, ignore */
                         if (memcmp(&desc->bGUID, blan_guid, 16)
-                                    && memcmp(&desc->bGUID, blan_guid, 16) ) {
+                                    && memcmp(&desc->bGUID, safe_guid, 16) ) {
                                 /* hey, this one might _really_ be MDLM! */
                                 dev_dbg (&intf->dev, "MDLM guid\n");
                                 goto bad_desc;
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index bc798edf0358..9438909e87a5 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -455,6 +455,17 @@ config USB_SERIAL_XIRCOM
           To compile this driver as a module, choose M here: the
           module will be called keyspan_pda.
 
+config USB_SERIAL_OPTION
+        tristate "USB Option PCMCIA serial driver"
+        depends on USB_SERIAL && USB_OHCI_HCD && PCCARD
+        help
+          Say Y here if you want to use an Option card. This is a
+          GSM card, controlled by three serial ports which are connected
+          via an OHCI adapter located on a PC card.
+
+          To compile this driver as a module, choose M here: the
+          module will be called option.
+
 config USB_SERIAL_OMNINET
         tristate "USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)"
         depends on USB_SERIAL && EXPERIMENTAL
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index d56ff6d86cce..6c7cdcc99a9e 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_USB_SERIAL_KLSI)			+= kl5kusb105.o
 obj-$(CONFIG_USB_SERIAL_KOBIL_SCT)              += kobil_sct.o
 obj-$(CONFIG_USB_SERIAL_MCT_U232)               += mct_u232.o
 obj-$(CONFIG_USB_SERIAL_OMNINET)                += omninet.o
+obj-$(CONFIG_USB_SERIAL_OPTION)                 += option.o
 obj-$(CONFIG_USB_SERIAL_PL2303)                 += pl2303.o
 obj-$(CONFIG_USB_SERIAL_SAFE)                   += safe_serial.o
 obj-$(CONFIG_USB_SERIAL_TI)                     += ti_usb_3410_5052.o
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 7e9bb63eb466..4ace9964fc6b 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -7,6 +7,14 @@
  *      modify it under the terms of the GNU General Public License version
  *      2 as published by the Free Software Foundation.
  *
+ * Support to set flow control line levels using TIOCMGET and TIOCMSET
+ * thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
+ * control thanks to Munir Nassar nassarmu@real-time.com
+ *
+ * Outstanding Issues:
+ *  Buffers are not flushed when the port is opened.
+ *  Multiple calls to write() may fail with "Resource temporarily unavailable"
+ *
  */
 
 #include <linux/config.h>
@@ -24,7 +32,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.03"
+#define DRIVER_VERSION "v0.04"
 #define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver"
 
 /*
@@ -35,6 +43,9 @@ static void cp2101_cleanup(struct usb_serial_port*);
 static void cp2101_close(struct usb_serial_port*, struct file*);
 static void cp2101_get_termios(struct usb_serial_port*);
 static void cp2101_set_termios(struct usb_serial_port*, struct termios*);
+static int cp2101_tiocmget (struct usb_serial_port *, struct file *);
+static int cp2101_tiocmset (struct usb_serial_port *, struct file *,
+                unsigned int, unsigned int);
 static void cp2101_break_ctl(struct usb_serial_port*, int);
 static int cp2101_startup (struct usb_serial *);
 static void cp2101_shutdown(struct usb_serial*);
@@ -43,9 +54,10 @@ static void cp2101_shutdown(struct usb_serial*);
 static int debug;
 
 static struct usb_device_id id_table [] = {
-        {USB_DEVICE(0x10c4, 0xea60) },  /*Silicon labs factory default*/
-        {USB_DEVICE(0x10ab, 0x10c5) },  /*Siemens MC60 Cable*/
-        { } /* Terminating Entry*/
+        { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
+        { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
+        { } /* Terminating Entry */
 };
 
 MODULE_DEVICE_TABLE (usb, id_table);
@@ -70,32 +82,35 @@ static struct usb_serial_device_type cp2101_device = {
         .close                  = cp2101_close,
         .break_ctl              = cp2101_break_ctl,
         .set_termios            = cp2101_set_termios,
+        .tiocmget               = cp2101_tiocmget,
+        .tiocmset               = cp2101_tiocmset,
         .attach                 = cp2101_startup,
         .shutdown               = cp2101_shutdown,
 };
 
-/*Config request types*/
+/* Config request types */
 #define REQTYPE_HOST_TO_DEVICE  0x41
 #define REQTYPE_DEVICE_TO_HOST  0xc1
 
-/*Config SET requests. To GET, add 1 to the request number*/
-#define CP2101_UART             0x00    /*Enable / Disable*/
-#define CP2101_BAUDRATE         0x01    /*(BAUD_RATE_GEN_FREQ / baudrate)*/
-#define CP2101_BITS             0x03    /*0x(0)(data bits)(parity)(stop bits)*/
-#define CP2101_BREAK            0x05    /*On / Off*/
-#define CP2101_DTRRTS           0x07    /*101 / 202  ???*/
-#define CP2101_CONFIG_16        0x13    /*16 bytes of config data ???*/
-#define CP2101_CONFIG_6         0x19    /*6 bytes of config data ???*/
+/* Config SET requests. To GET, add 1 to the request number */
+#define CP2101_UART             0x00    /* Enable / Disable */
+#define CP2101_BAUDRATE         0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
+#define CP2101_BITS             0x03    /* 0x(0)(databits)(parity)(stopbits) */
+#define CP2101_BREAK            0x05    /* On / Off */
+#define CP2101_CONTROL          0x07    /* Flow control line states */
+#define CP2101_MODEMCTL         0x13    /* Modem controls */
+#define CP2101_CONFIG_6         0x19    /* 6 bytes of config data ??? */
 
-/*CP2101_UART*/
+/* CP2101_UART */
 #define UART_ENABLE             0x0001
 #define UART_DISABLE            0x0000
 
-/*CP2101_BAUDRATE*/
+/* CP2101_BAUDRATE */
 #define BAUD_RATE_GEN_FREQ      0x384000
 
-/*CP2101_BITS*/
+/* CP2101_BITS */
 #define BITS_DATA_MASK          0X0f00
+#define BITS_DATA_5             0X0500
 #define BITS_DATA_6             0X0600
 #define BITS_DATA_7             0X0700
 #define BITS_DATA_8             0X0800
@@ -112,64 +127,137 @@ static struct usb_serial_device_type cp2101_device = {
 #define BITS_STOP_1             0x0000
 #define BITS_STOP_1_5           0x0001
 #define BITS_STOP_2             0x0002
+
+/* CP2101_BREAK */
 #define BREAK_ON                0x0000
 #define BREAK_OFF               0x0001
 
+/* CP2101_CONTROL */
+#define CONTROL_DTR             0x0001
+#define CONTROL_RTS             0x0002
+#define CONTROL_CTS             0x0010
+#define CONTROL_DSR             0x0020
+#define CONTROL_RING            0x0040
+#define CONTROL_DCD             0x0080
+#define CONTROL_WRITE_DTR       0x0100
+#define CONTROL_WRITE_RTS       0x0200
 
-static int cp2101_get_config(struct usb_serial_port* port, u8 request)
+/*
+ * cp2101_get_config
+ * Reads from the CP2101 configuration registers
+ * 'size' is specified in bytes.
+ * 'data' is a pointer to a pre-allocated array of integers large
+ * enough to hold 'size' bytes (with 4 bytes to each integer)
+ */
+static int cp2101_get_config(struct usb_serial_port* port, u8 request,
+                unsigned int *data, int size)
 {
         struct usb_serial *serial = port->serial;
-        unsigned char buf[4];
-        unsigned int value;
-        int result, i;
+        u32 *buf;
+        int result, i, length;
+
+        /* Number of integers required to contain the array */
+        length = (((size - 1) | 3) + 1)/4;
+
+        buf = kmalloc (length * sizeof(u32), GFP_KERNEL);
+        memset(buf, 0, length * sizeof(u32));
+
+        if (!buf) {
+                dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
+                return -ENOMEM;
+        }
 
-        /*For get requests, the request number must be incremented*/
+        /* For get requests, the request number must be incremented */
         request++;
 
-        /*Issue the request, attempting to read 4 bytes*/
+        /* Issue the request, attempting to read 'size' bytes */
         result = usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev, 0),
                                 request, REQTYPE_DEVICE_TO_HOST, 0x0000,
-                                0, buf, 4, 300);
+                                0, buf, size, 300);
 
-        if (result < 0) {
-                dev_err(&port->dev, "%s - Unable to send config request, "
-                                "request=0x%x result=%d\n",
-                                __FUNCTION__, request, result);
-                return result;
-        }
+        /* Convert data into an array of integers */
+        for (i=0; i<length; i++)
+                data[i] = le32_to_cpu(buf[i]);
 
-        /*Assemble each byte read into an integer value*/
-        value = 0;
-        for (i=0; i<4 && i<result; i++)
-                value |= (buf[i] << (i * 8));
+        kfree(buf);
 
-        dbg( " %s - request=0x%x result=%d value=0x%x",
-                        __FUNCTION__, request, result, value);
+        if (result != size) {
+                dev_err(&port->dev, "%s - Unable to send config request, "
+                                "request=0x%x size=%d result=%d\n",
+                                __FUNCTION__, request, size, result);
+                return -EPROTO;
+        }
 
-        return value;
+        return 0;
 }
 
-static int cp2101_set_config(struct usb_serial_port* port, u8 request, u16 value)
+/*
+ * cp2101_set_config
+ * Writes to the CP2101 configuration registers
+ * Values less than 16 bits wide are sent directly
+ * 'size' is specified in bytes.
+ */
+static int cp2101_set_config(struct usb_serial_port* port, u8 request,
+                unsigned int *data, int size)
 {
         struct usb_serial *serial = port->serial;
-        int result;
-        result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0),
-                        request, REQTYPE_HOST_TO_DEVICE, value,
-                        0, NULL, 0, 300);
+        u32 *buf;
+        int result, i, length;
 
-        if (result <0) {
-                dev_err(&port->dev, "%s - Unable to send config request, "
-                                "request=0x%x value=0x%x result=%d\n",
-                                __FUNCTION__, request, value, result);
-                return result;
+        /* Number of integers required to contain the array */
+        length = (((size - 1) | 3) + 1)/4;
+
+        buf = kmalloc(length * sizeof(u32), GFP_KERNEL);
+        if (!buf) {
+                dev_err(&port->dev, "%s - out of memory.\n",
+                                __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        /* Array of integers into bytes */
+        for (i = 0; i < length; i++)
+                buf[i] = cpu_to_le32(data[i]);
+
+        if (size > 2) {
+                result = usb_control_msg (serial->dev,
+                                usb_sndctrlpipe(serial->dev, 0),
+                                request, REQTYPE_HOST_TO_DEVICE, 0x0000,
+                                0, buf, size, 300);
+        } else {
+                result = usb_control_msg (serial->dev,
+                                usb_sndctrlpipe(serial->dev, 0),
+                                request, REQTYPE_HOST_TO_DEVICE, data[0],
+                                0, NULL, 0, 300);
         }
 
-        dbg(" %s - request=0x%x value=0x%x result=%d",
-                        __FUNCTION__, request, value, result);
+        kfree(buf);
+
+        if ((size > 2 && result != size) || result < 0) {
+                dev_err(&port->dev, "%s - Unable to send request, "
+                                "request=0x%x size=%d result=%d\n",
+                                __FUNCTION__, request, size, result);
+                return -EPROTO;
+        }
 
+        /* Single data value */
+        result = usb_control_msg (serial->dev,
+                        usb_sndctrlpipe(serial->dev, 0),
+                        request, REQTYPE_HOST_TO_DEVICE, data[0],
+                        0, NULL, 0, 300);
         return 0;
 }
 
+/*
+ * cp2101_set_config_single
+ * Convenience function for calling cp2101_set_config on single data values
+ * without requiring an integer pointer
+ */
+static inline int cp2101_set_config_single(struct usb_serial_port* port,
+                u8 request, unsigned int data)
+{
+        return cp2101_set_config(port, request, &data, 2);
+}
+
 static int cp2101_open (struct usb_serial_port *port, struct file *filp)
 {
         struct usb_serial *serial = port->serial;
@@ -177,7 +265,7 @@ static int cp2101_open (struct usb_serial_port *port, struct file *filp)
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
-        if (cp2101_set_config(port, CP2101_UART, UART_ENABLE)) {
+        if (cp2101_set_config_single(port, CP2101_UART, UART_ENABLE)) {
                 dev_err(&port->dev, "%s - Unable to enable UART\n",
                                 __FUNCTION__);
                 return -EPROTO;
@@ -198,9 +286,12 @@ static int cp2101_open (struct usb_serial_port *port, struct file *filp)
                 return result;
         }
 
-        /*Configure the termios structure*/
+        /* Configure the termios structure */
         cp2101_get_termios(port);
 
+        /* Set the DTR and RTS pins low */
+        cp2101_tiocmset(port, NULL, TIOCM_DTR | TIOCM_RTS, 0);
+
         return 0;
 }
 
@@ -228,16 +319,18 @@ static void cp2101_close (struct usb_serial_port *port, struct file * filp)
         usb_kill_urb(port->write_urb);
         usb_kill_urb(port->read_urb);
 
-        cp2101_set_config(port, CP2101_UART, UART_DISABLE);
+        cp2101_set_config_single(port, CP2101_UART, UART_DISABLE);
 }
 
-/* cp2101_get_termios*/
-/* Reads the baud rate, data bits, parity and stop bits from the device*/
-/* Corrects any unsupported values*/
-/* Configures the termios structure to reflect the state of the device*/
+/*
+ * cp2101_get_termios
+ * Reads the baud rate, data bits, parity, stop bits and flow control mode
+ * from the device, corrects any unsupported values, and configures the
+ * termios structure to reflect the state of the device
+ */
 static void cp2101_get_termios (struct usb_serial_port *port)
 {
-        unsigned int cflag;
+        unsigned int cflag, modem_ctl[4];
         int baud;
         int bits;
 
@@ -249,15 +342,16 @@ static void cp2101_get_termios (struct usb_serial_port *port)
         }
         cflag = port->tty->termios->c_cflag;
 
-        baud = cp2101_get_config(port, CP2101_BAUDRATE);
-        /*Convert to baudrate*/
+        cp2101_get_config(port, CP2101_BAUDRATE, &baud, 2);
+        /* Convert to baudrate */
         if (baud)
                 baud = BAUD_RATE_GEN_FREQ / baud;
 
         dbg("%s - baud rate = %d", __FUNCTION__, baud);
         cflag &= ~CBAUD;
         switch (baud) {
-                /* The baud rates which are commented out below
+                /*
+                 * The baud rates which are commented out below
                  * appear to be supported by the device
                  * but are non-standard
                  */
@@ -284,14 +378,18 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                         dbg("%s - Baud rate is not supported, "
                                         "using 9600 baud", __FUNCTION__);
                         cflag |= B9600;
-                        cp2101_set_config(port, CP2101_BAUDRATE,
+                        cp2101_set_config_single(port, CP2101_BAUDRATE,
                                         (BAUD_RATE_GEN_FREQ/9600));
                         break;
         }
 
-        bits = cp2101_get_config(port, CP2101_BITS);
+        cp2101_get_config(port, CP2101_BITS, &bits, 2);
         cflag &= ~CSIZE;
         switch(bits & BITS_DATA_MASK) {
+                case BITS_DATA_5:
+                        dbg("%s - data bits = 5", __FUNCTION__);
+                        cflag |= CS5;
+                        break;
                 case BITS_DATA_6:
                         dbg("%s - data bits = 6", __FUNCTION__);
                         cflag |= CS6;
@@ -310,7 +408,7 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                         cflag |= CS8;
                         bits &= ~BITS_DATA_MASK;
                         bits |= BITS_DATA_8;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
                 default:
                         dbg("%s - Unknown number of data bits, "
@@ -318,7 +416,7 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                         cflag |= CS8;
                         bits &= ~BITS_DATA_MASK;
                         bits |= BITS_DATA_8;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
         }
 
@@ -341,21 +439,21 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                                         "disabling parity)", __FUNCTION__);
                         cflag &= ~PARENB;
                         bits &= ~BITS_PARITY_MASK;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
                 case BITS_PARITY_SPACE:
                         dbg("%s - parity = SPACE (not supported, "
                                         "disabling parity)", __FUNCTION__);
                         cflag &= ~PARENB;
                         bits &= ~BITS_PARITY_MASK;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
                 default:
                         dbg("%s - Unknown parity mode, "
                                         "disabling parity", __FUNCTION__);
                         cflag &= ~PARENB;
                         bits &= ~BITS_PARITY_MASK;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
         }
 
@@ -366,9 +464,9 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                         break;
                 case BITS_STOP_1_5:
                         dbg("%s - stop bits = 1.5 (not supported, "
-                                        "using 1 stop bit", __FUNCTION__);
+                                        "using 1 stop bit)", __FUNCTION__);
                         bits &= ~BITS_STOP_MASK;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
                 case BITS_STOP_2:
                         dbg("%s - stop bits = 2", __FUNCTION__);
@@ -378,10 +476,19 @@ static void cp2101_get_termios (struct usb_serial_port *port)
                         dbg("%s - Unknown number of stop bits, "
                                         "using 1 stop bit", __FUNCTION__);
                         bits &= ~BITS_STOP_MASK;
-                        cp2101_set_config(port, CP2101_BITS, bits);
+                        cp2101_set_config(port, CP2101_BITS, &bits, 2);
                         break;
         }
 
+        cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+        if (modem_ctl[0] & 0x0008) {
+                dbg("%s - flow control = CRTSCTS", __FUNCTION__);
+                cflag |= CRTSCTS;
+        } else {
+                dbg("%s - flow control = NONE", __FUNCTION__);
+                cflag &= ~CRTSCTS;
+        }
+
         port->tty->termios->c_cflag = cflag;
 }
 
@@ -389,8 +496,8 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                 struct termios *old_termios)
 {
         unsigned int cflag, old_cflag=0;
-        int baud=0;
-        int bits;
+        int baud=0, bits;
+        unsigned int modem_ctl[4];
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
@@ -400,7 +507,7 @@ static void cp2101_set_termios (struct usb_serial_port *port,
         }
         cflag = port->tty->termios->c_cflag;
 
-        /* check that they really want us to change something */
+        /* Check that they really want us to change something */
         if (old_termios) {
                 if ((cflag == old_termios->c_cflag) &&
                                 (RELEVANT_IFLAG(port->tty->termios->c_iflag)
@@ -415,7 +522,8 @@ static void cp2101_set_termios (struct usb_serial_port *port,
         /* If the baud rate is to be updated*/
         if ((cflag & CBAUD) != (old_cflag & CBAUD)) {
                 switch (cflag & CBAUD) {
-                        /* The baud rates which are commented out below
+                        /*
+                         * The baud rates which are commented out below
                          * appear to be supported by the device
                          * but are non-standard
                          */
@@ -448,18 +556,22 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                 if (baud) {
                         dbg("%s - Setting baud rate to %d baud", __FUNCTION__,
                                         baud);
-                        if (cp2101_set_config(port, CP2101_BAUDRATE,
+                        if (cp2101_set_config_single(port, CP2101_BAUDRATE,
                                                 (BAUD_RATE_GEN_FREQ / baud)))
                                 dev_err(&port->dev, "Baud rate requested not "
                                                 "supported by device\n");
                 }
         }
 
-        /*If the number of data bits is to be updated*/
+        /* If the number of data bits is to be updated */
         if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
-                bits = cp2101_get_config(port, CP2101_BITS);
+                cp2101_get_config(port, CP2101_BITS, &bits, 2);
                 bits &= ~BITS_DATA_MASK;
                 switch (cflag & CSIZE) {
+                        case CS5:
+                                bits |= BITS_DATA_5;
+                                dbg("%s - data bits = 5", __FUNCTION__);
+                                break;
                         case CS6:
                                 bits |= BITS_DATA_6;
                                 dbg("%s - data bits = 6", __FUNCTION__);
@@ -483,13 +595,13 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                                 bits |= BITS_DATA_8;
                                 break;
                 }
-                if (cp2101_set_config(port, CP2101_BITS, bits))
+                if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
                         dev_err(&port->dev, "Number of data bits requested "
                                         "not supported by device\n");
         }
 
         if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) {
-                bits = cp2101_get_config(port, CP2101_BITS);
+                cp2101_get_config(port, CP2101_BITS, &bits, 2);
                 bits &= ~BITS_PARITY_MASK;
                 if (cflag & PARENB) {
                         if (cflag & PARODD) {
@@ -500,13 +612,13 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                                 dbg("%s - parity = EVEN", __FUNCTION__);
                         }
                 }
-                if (cp2101_set_config(port, CP2101_BITS, bits))
+                if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
                         dev_err(&port->dev, "Parity mode not supported "
                                         "by device\n");
         }
 
         if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) {
-                bits = cp2101_get_config(port, CP2101_BITS);
+                cp2101_get_config(port, CP2101_BITS, &bits, 2);
                 bits &= ~BITS_STOP_MASK;
                 if (cflag & CSTOPB) {
                         bits |= BITS_STOP_2;
@@ -515,15 +627,90 @@ static void cp2101_set_termios (struct usb_serial_port *port,
                         bits |= BITS_STOP_1;
                         dbg("%s - stop bits = 1", __FUNCTION__);
                 }
-                if (cp2101_set_config(port, CP2101_BITS, bits))
+                if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
                         dev_err(&port->dev, "Number of stop bits requested "
                                         "not supported by device\n");
         }
+
+        if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) {
+                cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+                dbg("%s - read modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
+                                __FUNCTION__, modem_ctl[0], modem_ctl[1],
+                                modem_ctl[2], modem_ctl[3]);
+
+                if (cflag & CRTSCTS) {
+                        modem_ctl[0] &= ~0x7B;
+                        modem_ctl[0] |= 0x09;
+                        modem_ctl[1] = 0x80;
+                        dbg("%s - flow control = CRTSCTS", __FUNCTION__);
+                } else {
+                        modem_ctl[0] &= ~0x7B;
+                        modem_ctl[0] |= 0x01;
+                        modem_ctl[1] |= 0x40;
+                        dbg("%s - flow control = NONE", __FUNCTION__);
+                }
+
+                dbg("%s - write modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
+                                __FUNCTION__, modem_ctl[0], modem_ctl[1],
+                                modem_ctl[2], modem_ctl[3]);
+                cp2101_set_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+        }
+
+}
+
+static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file,
+                unsigned int set, unsigned int clear)
+{
+        int control = 0;
+
+        dbg("%s - port %d", __FUNCTION__, port->number);
+
+        if (set & TIOCM_RTS) {
+                control |= CONTROL_RTS;
+                control |= CONTROL_WRITE_RTS;
+        }
+        if (set & TIOCM_DTR) {
+                control |= CONTROL_DTR;
+                control |= CONTROL_WRITE_DTR;
+        }
+        if (clear & TIOCM_RTS) {
+                control &= ~CONTROL_RTS;
+                control |= CONTROL_WRITE_RTS;
+        }
+        if (clear & TIOCM_DTR) {
+                control &= ~CONTROL_DTR;
+                control |= CONTROL_WRITE_DTR;
+        }
+
+        dbg("%s - control = 0x%.4x", __FUNCTION__, control);
+
+        return cp2101_set_config(port, CP2101_CONTROL, &control, 2);
+
+}
+
+static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file)
+{
+        int control, result;
+
+        dbg("%s - port %d", __FUNCTION__, port->number);
+
+        cp2101_get_config(port, CP2101_CONTROL, &control, 1);
+
+        result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0)
+                |((control & CONTROL_RTS) ? TIOCM_RTS : 0)
+                |((control & CONTROL_CTS) ? TIOCM_CTS : 0)
+                |((control & CONTROL_DSR) ? TIOCM_DSR : 0)
+                |((control & CONTROL_RING)? TIOCM_RI  : 0)
+                |((control & CONTROL_DCD) ? TIOCM_CD  : 0);
+
+        dbg("%s - control = 0x%.2x", __FUNCTION__, control);
+
+        return result;
 }
 
 static void cp2101_break_ctl (struct usb_serial_port *port, int break_state)
 {
-        u16 state;
+        int state;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
         if (break_state == 0)
@@ -532,12 +719,12 @@ static void cp2101_break_ctl (struct usb_serial_port *port, int break_state)
                 state = BREAK_ON;
         dbg("%s - turning break %s", __FUNCTION__,
                         state==BREAK_OFF ? "off" : "on");
-        cp2101_set_config(port, CP2101_BREAK, state);
+        cp2101_set_config(port, CP2101_BREAK, &state, 2);
 }
 
 static int cp2101_startup (struct usb_serial *serial)
 {
-        /*CP2101 buffers behave strangely unless device is reset*/
+        /* CP2101 buffers behave strangely unless device is reset */
         usb_reset_device(serial->dev);
         return 0;
 }
@@ -548,7 +735,7 @@ static void cp2101_shutdown (struct usb_serial *serial)
 
         dbg("%s", __FUNCTION__);
 
-        /* stop reads and writes on all ports */
+        /* Stop reads and writes on all ports */
         for (i=0; i < serial->num_ports; ++i) {
                 cp2101_cleanup(serial->port[i]);
         }
@@ -560,16 +747,16 @@ static int __init cp2101_init (void)
 
         retval = usb_serial_register(&cp2101_device);
         if (retval)
-                return retval; /*Failed to register*/
+                return retval; /* Failed to register */
 
         retval = usb_register(&cp2101_driver);
         if (retval) {
-                /*Failed to register*/
+                /* Failed to register */
                 usb_serial_deregister(&cp2101_device);
                 return retval;
         }
 
-        /*Success*/
+        /* Success */
         info(DRIVER_DESC " " DRIVER_VERSION);
         return 0;
 }
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 52394f08a947..d882fa3ad19a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -264,7 +264,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v1.4.1"
+#define DRIVER_VERSION "v1.4.2"
 #define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Bill Ryder <bryder@sgi.com>, Kuba Ober <kuba@mareimbrium.org>"
 #define DRIVER_DESC "USB FTDI Serial Converters Driver"
 
@@ -364,6 +364,7 @@ static struct usb_device_id id_table_8U232AM [] = {
         { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_3, 0, 0x3ff) },
         { USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_4, 0, 0x3ff) },
         { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0, 0x3ff) },
+        { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UM100_PID, 0, 0x3ff) },
         { USB_DEVICE_VER(FTDI_VID, INSIDE_ACCESSO, 0, 0x3ff) },
         { USB_DEVICE_VER(INTREPID_VID, INTREPID_VALUECAN_PID, 0, 0x3ff) },
         { USB_DEVICE_VER(INTREPID_VID, INTREPID_NEOVI_PID, 0, 0x3ff) },
@@ -475,6 +476,7 @@ static struct usb_device_id id_table_FT232BM [] = {
         { USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88E_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88F_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0x400, 0xffff) },
+        { USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UM100_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
@@ -618,6 +620,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88E_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88F_PID, 0x400, 0xffff) },
         { USB_DEVICE(FTDI_VID, FTDI_ELV_UO100_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ELV_UM100_PID) },
         { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
         { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
@@ -684,6 +687,8 @@ struct ftdi_private {
         char prev_status, diff_status;        /* Used for TIOCMIWAIT */
         __u8 rx_flags;          /* receive state flags (throttling) */
         spinlock_t rx_lock;     /* spinlock for receive state */
+        struct work_struct rx_work;
+        int rx_processed;
 
         __u16 interface;        /* FT2232C port interface (0 for FT232/245) */
 
@@ -714,7 +719,7 @@ static int  ftdi_write_room		(struct usb_serial_port *port);
 static int  ftdi_chars_in_buffer        (struct usb_serial_port *port);
 static void ftdi_write_bulk_callback    (struct urb *urb, struct pt_regs *regs);
 static void ftdi_read_bulk_callback     (struct urb *urb, struct pt_regs *regs);
-static void ftdi_process_read           (struct usb_serial_port *port);
+static void ftdi_process_read           (void *param);
 static void ftdi_set_termios            (struct usb_serial_port *port, struct termios * old);
 static int  ftdi_tiocmget               (struct usb_serial_port *port, struct file *file);
 static int  ftdi_tiocmset               (struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear);
@@ -1213,7 +1218,7 @@ check_and_exit:
  * ***************************************************************************
  */
 
-static ssize_t show_latency_timer(struct device *dev, char *buf)
+static ssize_t show_latency_timer(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_serial_port *port = to_usb_serial_port(dev);
         struct ftdi_private *priv = usb_get_serial_port_data(port);
@@ -1240,7 +1245,7 @@ static ssize_t show_latency_timer(struct device *dev, char *buf)
 }
 
 /* Write a new value of the latency timer, in units of milliseconds. */
-static ssize_t store_latency_timer(struct device *dev, const char *valbuf,
+static ssize_t store_latency_timer(struct device *dev, struct device_attribute *attr, const char *valbuf,
                                    size_t count)
 {
         struct usb_serial_port *port = to_usb_serial_port(dev);
@@ -1271,7 +1276,7 @@ static ssize_t store_latency_timer(struct device *dev, const char *valbuf,
 
 /* Write an event character directly to the FTDI register.  The ASCII
    value is in the low 8 bits, with the enable bit in the 9th bit. */
-static ssize_t store_event_char(struct device *dev, const char *valbuf,
+static ssize_t store_event_char(struct device *dev, struct device_attribute *attr, const char *valbuf,
                                 size_t count)
 {
         struct usb_serial_port *port = to_usb_serial_port(dev);
@@ -1384,6 +1389,8 @@ static int ftdi_common_startup (struct usb_serial *serial)
                 port->read_urb->transfer_buffer_length = BUFSZ;
         }
 
+        INIT_WORK(&priv->rx_work, ftdi_process_read, port);
+
         /* Free port's existing write urb and transfer buffer. */
         if (port->write_urb) {
                 usb_free_urb (port->write_urb);
@@ -1614,6 +1621,7 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
         spin_unlock_irqrestore(&priv->rx_lock, flags);
 
         /* Start reading from the device */
+        priv->rx_processed = 0;
         usb_fill_bulk_urb(port->read_urb, dev,
                       usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress),
                       port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length,
@@ -1664,6 +1672,10 @@ static void ftdi_close (struct usb_serial_port *port, struct file *filp)
                         err("Error from RTS LOW urb");
                 }
         } /* Note change no line if hupcl is off */
+
+        /* cancel any scheduled reading */
+        cancel_delayed_work(&priv->rx_work);
+        flush_scheduled_work();
         
         /* shutdown our bulk read */
         if (port->read_urb)
@@ -1859,23 +1871,14 @@ static void ftdi_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 return;
         }
 
-        /* If throttled, delay receive processing until unthrottled. */
-        spin_lock(&priv->rx_lock);
-        if (priv->rx_flags & THROTTLED) {
-                dbg("Deferring read urb processing until unthrottled");
-                priv->rx_flags |= ACTUALLY_THROTTLED;
-                spin_unlock(&priv->rx_lock);
-                return;
-        }
-        spin_unlock(&priv->rx_lock);
-
         ftdi_process_read(port);
 
 } /* ftdi_read_bulk_callback */
 
 
-static void ftdi_process_read (struct usb_serial_port *port)
+static void ftdi_process_read (void *param)
 { /* ftdi_process_read */
+        struct usb_serial_port *port = (struct usb_serial_port*)param;
         struct urb *urb;
         struct tty_struct *tty;
         struct ftdi_private *priv;
@@ -1886,6 +1889,7 @@ static void ftdi_process_read (struct usb_serial_port *port)
         int result;
         int need_flip;
         int packet_offset;
+        unsigned long flags;
 
         dbg("%s - port %d", __FUNCTION__, port->number);
 
@@ -1912,12 +1916,18 @@ static void ftdi_process_read (struct usb_serial_port *port)
 
         data = urb->transfer_buffer;
 
-        /* The first two bytes of every read packet are status */
-        if (urb->actual_length > 2) {
-                usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
+        if (priv->rx_processed) {
+                dbg("%s - already processed: %d bytes, %d remain", __FUNCTION__,
+                                priv->rx_processed,
+                                urb->actual_length - priv->rx_processed);
         } else {
-                dbg("Status only: %03oo %03oo",data[0],data[1]);
-        }
+                /* The first two bytes of every read packet are status */
+                if (urb->actual_length > 2) {
+                        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
+                } else {
+                        dbg("Status only: %03oo %03oo",data[0],data[1]);
+                }
+        }
 
 
         /* TO DO -- check for hung up line and handle appropriately: */
@@ -1926,8 +1936,12 @@ static void ftdi_process_read (struct usb_serial_port *port)
         /* if CD is dropped and the line is not CLOCAL then we should hangup */
 
         need_flip = 0;
-        for (packet_offset=0; packet_offset < urb->actual_length; packet_offset += PKTSZ) {
+        for (packet_offset = priv->rx_processed; packet_offset < urb->actual_length; packet_offset += PKTSZ) {
+                int length;
+
                 /* Compare new line status to the old one, signal if different */
+                /* N.B. packet may be processed more than once, but differences
+                 * are only processed once.  */
                 if (priv != NULL) {
                         char new_status = data[packet_offset+0] & FTDI_STATUS_B0_MASK;
                         if (new_status != priv->prev_status) {
@@ -1937,6 +1951,35 @@ static void ftdi_process_read (struct usb_serial_port *port)
                         }
                 }
 
+                length = min(PKTSZ, urb->actual_length-packet_offset)-2;
+                if (length < 0) {
+                        err("%s - bad packet length: %d", __FUNCTION__, length+2);
+                        length = 0;
+                }
+
+                /* have to make sure we don't overflow the buffer
+                   with tty_insert_flip_char's */
+                if (tty->flip.count+length > TTY_FLIPBUF_SIZE) {
+                        tty_flip_buffer_push(tty);
+                        need_flip = 0;
+
+                        if (tty->flip.count != 0) {
+                                /* flip didn't work, this happens when ftdi_process_read() is
+                                 * called from ftdi_unthrottle, because TTY_DONT_FLIP is set */
+                                dbg("%s - flip buffer push failed", __FUNCTION__);
+                                break;
+                        }
+                }
+                if (priv->rx_flags & THROTTLED) {
+                        dbg("%s - throttled", __FUNCTION__);
+                        break;
+                }
+                if (tty->ldisc.receive_room(tty)-tty->flip.count < length) {
+                        /* break out & wait for throttling/unthrottling to happen */
+                        dbg("%s - receive room low", __FUNCTION__);
+                        break;
+                }
+
                 /* Handle errors and break */
                 error_flag = TTY_NORMAL;
                 /* Although the device uses a bitmask and hence can have multiple */
@@ -1959,13 +2002,8 @@ static void ftdi_process_read (struct usb_serial_port *port)
                         error_flag = TTY_FRAME;
                         dbg("FRAMING error");
                 }
-                if (urb->actual_length > packet_offset + 2) {
-                        for (i = 2; (i < PKTSZ) && ((i+packet_offset) < urb->actual_length); ++i) {
-                                /* have to make sure we don't overflow the buffer
-                                  with tty_insert_flip_char's */
-                                if(tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                                        tty_flip_buffer_push(tty);
-                                }
+                if (length > 0) {
+                        for (i = 2; i < length+2; i++) {
                                 /* Note that the error flag is duplicated for 
                                    every character received since we don't know
                                    which character it applied to */
@@ -2002,6 +2040,35 @@ static void ftdi_process_read (struct usb_serial_port *port)
                 tty_flip_buffer_push(tty);
         }
 
+        if (packet_offset < urb->actual_length) {
+                /* not completely processed - record progress */
+                priv->rx_processed = packet_offset;
+                dbg("%s - incomplete, %d bytes processed, %d remain",
+                                __FUNCTION__, packet_offset,
+                                urb->actual_length - packet_offset);
+                /* check if we were throttled while processing */
+                spin_lock_irqsave(&priv->rx_lock, flags);
+                if (priv->rx_flags & THROTTLED) {
+                        priv->rx_flags |= ACTUALLY_THROTTLED;
+                        spin_unlock_irqrestore(&priv->rx_lock, flags);
+                        dbg("%s - deferring remainder until unthrottled",
+                                        __FUNCTION__);
+                        return;
+                }
+                spin_unlock_irqrestore(&priv->rx_lock, flags);
+                /* if the port is closed stop trying to read */
+                if (port->open_count > 0){
+                        /* delay processing of remainder */
+                        schedule_delayed_work(&priv->rx_work, 1);
+                } else {
+                        dbg("%s - port is closed", __FUNCTION__);
+                }
+                return;
+        }
+
+        /* urb is completely processed */
+        priv->rx_processed = 0;
+
         /* if the port is closed stop trying to read */
         if (port->open_count > 0){
                 /* Continue trying to always read  */
@@ -2441,7 +2508,7 @@ static void ftdi_unthrottle (struct usb_serial_port *port)
         spin_unlock_irqrestore(&priv->rx_lock, flags);
 
         if (actually_throttled)
-                ftdi_process_read(port);
+                schedule_work(&priv->rx_work);
 }
 
 static int __init ftdi_init (void)
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index a52bb13a9ce4..8866376823a5 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -144,6 +144,8 @@
 
 /* ELV USB Module UO100 (PID sent by Stefan Frings) */
 #define FTDI_ELV_UO100_PID      0xFB58  /* Product Id */
+/* ELV USB Module UM100 (PID sent by Arnim Laeuger) */
+#define FTDI_ELV_UM100_PID      0xFB5A  /* Product Id */
 
 /*
  * Definitions for ID TECH (www.idt-net.com) devices
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
new file mode 100644
index 000000000000..b722175f108f
--- /dev/null
+++ b/drivers/usb/serial/option.c
@@ -0,0 +1,729 @@
+/*
+  Option Card (PCMCIA to) USB to Serial Driver
+
+  Copyright (C) 2005  Matthias Urlichs <smurf@smurf.noris.de>
+
+  This driver is free software; you can redistribute it and/or modify
+  it under the terms of Version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
+
+  History:
+
+  2005-05-19  v0.1   Initial version, based on incomplete docs
+                     and analysis of misbehavior of the standard driver
+  2005-05-20  v0.2   Extended the input buffer to avoid losing
+                     random 64-byte chunks of data
+  2005-05-21  v0.3   implemented chars_in_buffer()
+                     turned on low_latency
+                     simplified the code somewhat
+*/
+#define DRIVER_VERSION "v0.3"
+#define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
+#define DRIVER_DESC "Option Card (PC-Card to) USB to Serial Driver"
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/jiffies.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include "usb-serial.h"
+
+/* Function prototypes */
+static int  option_open (struct usb_serial_port *port, struct file *filp);
+static void option_close (struct usb_serial_port *port, struct file *filp);
+static int  option_startup (struct usb_serial *serial);
+static void option_shutdown (struct usb_serial *serial);
+static void option_rx_throttle (struct usb_serial_port *port);
+static void option_rx_unthrottle (struct usb_serial_port *port);
+static int  option_write_room (struct usb_serial_port *port);
+
+static void option_instat_callback(struct urb *urb, struct pt_regs *regs);
+
+
+static int  option_write (struct usb_serial_port *port,
+                          const unsigned char *buf, int count);
+
+static int  option_chars_in_buffer (struct usb_serial_port *port);
+static int  option_ioctl (struct usb_serial_port *port, struct file *file,
+                          unsigned int cmd, unsigned long arg);
+static void option_set_termios (struct usb_serial_port *port,
+                                struct termios *old);
+static void option_break_ctl (struct usb_serial_port *port, int break_state);
+static int  option_tiocmget (struct usb_serial_port *port, struct file *file);
+static int  option_tiocmset (struct usb_serial_port *port, struct file *file,
+                             unsigned int set, unsigned int clear);
+static int  option_send_setup (struct usb_serial_port *port);
+
+/* Vendor and product IDs */
+#define OPTION_VENDOR_ID                0x0AF0
+
+#define OPTION_PRODUCT_OLD              0x5000
+#define OPTION_PRODUCT_WLAN             0x6000
+
+static struct usb_device_id option_ids[] = {
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_WLAN) },
+        { } /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, option_ids);
+
+static struct usb_driver option_driver = {
+        .owner      = THIS_MODULE,
+        .name       = "option",
+        .probe      = usb_serial_probe,
+        .disconnect = usb_serial_disconnect,
+        .id_table   = option_ids,
+};
+
+/* The card has three separate interfaces, wich the serial driver
+ * recognizes separately, thus num_port=1.
+ */
+static struct usb_serial_device_type option_3port_device = {
+        .owner                  = THIS_MODULE,
+        .name                   = "Option 3-port card",
+        .short_name             = "option",
+        .id_table               = option_ids,
+        .num_interrupt_in       = NUM_DONT_CARE,
+        .num_bulk_in            = NUM_DONT_CARE,
+        .num_bulk_out           = NUM_DONT_CARE,
+        .num_ports              = 1, /* 3 */
+        .open                   = option_open,
+        .close                  = option_close,
+        .write                  = option_write,
+        .write_room             = option_write_room,
+        .chars_in_buffer        = option_chars_in_buffer,
+        .throttle               = option_rx_throttle,
+        .unthrottle             = option_rx_unthrottle,
+        .ioctl                  = option_ioctl,
+        .set_termios            = option_set_termios,
+        .break_ctl              = option_break_ctl,
+        .tiocmget               = option_tiocmget,
+        .tiocmset               = option_tiocmset,
+        .attach                 = option_startup,
+        .shutdown               = option_shutdown,
+        .read_int_callback      = option_instat_callback,
+};
+
+static int debug;
+
+/* per port private data */
+
+#define N_IN_URB        4
+#define N_OUT_URB       1
+#define IN_BUFLEN       1024
+#define OUT_BUFLEN      1024
+
+struct option_port_private {
+        /* Input endpoints and buffer for this port */
+        struct urb      *in_urbs[N_IN_URB];
+        char            in_buffer[N_IN_URB][IN_BUFLEN];
+        /* Output endpoints and buffer for this port */
+        struct urb      *out_urbs[N_OUT_URB];
+        char            out_buffer[N_OUT_URB][OUT_BUFLEN];
+
+        /* Settings for the port */
+        int             rts_state;      /* Handshaking pins (outputs) */
+        int             dtr_state;
+        int             cts_state;      /* Handshaking pins (inputs) */
+        int             dsr_state;
+        int             dcd_state;
+        int             ri_state;
+        // int          break_on;
+
+        unsigned long   tx_start_time[N_OUT_URB];
+};
+
+
+/* Functions used by new usb-serial code. */
+static int __init
+option_init (void)
+{
+        int retval;
+        retval = usb_serial_register(&option_3port_device);
+        if (retval)
+                goto failed_3port_device_register;
+        retval = usb_register(&option_driver);
+        if (retval)
+                goto failed_driver_register;
+
+        info(DRIVER_DESC ": " DRIVER_VERSION);
+
+        return 0;
+
+failed_driver_register:
+        usb_serial_deregister (&option_3port_device);
+failed_3port_device_register:
+        return retval;
+}
+
+static void __exit
+option_exit (void)
+{
+        usb_deregister (&option_driver);
+        usb_serial_deregister (&option_3port_device);
+}
+
+module_init(option_init);
+module_exit(option_exit);
+
+static void
+option_rx_throttle (struct usb_serial_port *port)
+{
+        dbg("%s", __FUNCTION__);
+}
+
+
+static void
+option_rx_unthrottle (struct usb_serial_port *port)
+{
+        dbg("%s", __FUNCTION__);
+}
+
+
+static void
+option_break_ctl (struct usb_serial_port *port, int break_state)
+{
+        /* Unfortunately, I don't know how to send a break */
+        dbg("%s", __FUNCTION__);
+}
+
+
+static void
+option_set_termios (struct usb_serial_port *port,
+                                     struct termios *old_termios)
+{
+        dbg("%s", __FUNCTION__);
+
+        option_send_setup(port);
+}
+
+static int
+option_tiocmget(struct usb_serial_port *port, struct file *file)
+{
+        unsigned int                    value;
+        struct option_port_private      *portdata;
+
+        portdata = usb_get_serial_port_data(port);
+
+        value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
+                ((portdata->dtr_state) ? TIOCM_DTR : 0) |
+                ((portdata->cts_state) ? TIOCM_CTS : 0) |
+                ((portdata->dsr_state) ? TIOCM_DSR : 0) |
+                ((portdata->dcd_state) ? TIOCM_CAR : 0) |
+                ((portdata->ri_state) ? TIOCM_RNG : 0);
+
+        return value;
+}
+
+static int
+option_tiocmset (struct usb_serial_port *port, struct file *file,
+                 unsigned int set, unsigned int clear)
+{
+        struct option_port_private      *portdata;
+
+        portdata = usb_get_serial_port_data(port);
+
+        if (set & TIOCM_RTS)
+                portdata->rts_state = 1;
+        if (set & TIOCM_DTR)
+                portdata->dtr_state = 1;
+
+        if (clear & TIOCM_RTS)
+                portdata->rts_state = 0;
+        if (clear & TIOCM_DTR)
+                portdata->dtr_state = 0;
+        return option_send_setup(port);
+}
+
+static int
+option_ioctl (struct usb_serial_port *port, struct file *file,
+              unsigned int cmd, unsigned long arg)
+{
+        return -ENOIOCTLCMD;
+}
+
+/* Write */
+static int
+option_write(struct usb_serial_port *port,
+                         const unsigned char *buf, int count)
+{
+        struct option_port_private      *portdata;
+        int                             i;
+        int                             left, todo;
+        struct urb                      *this_urb = NULL; /* spurious */
+        int                             err;
+
+        portdata = usb_get_serial_port_data(port);
+
+        dbg("%s: write (%d chars)", __FUNCTION__, count);
+
+#if 0
+        spin_lock(&port->lock);
+        if (port->write_urb_busy) {
+                spin_unlock(&port->lock);
+                dbg("%s: already writing", __FUNCTION__);
+                return 0;
+        }
+        port->write_urb_busy = 1;
+        spin_unlock(&port->lock);
+#endif
+
+        i = 0;
+        left = count;
+        while (left>0) {
+                todo = left;
+                if (todo > OUT_BUFLEN)
+                        todo = OUT_BUFLEN;
+
+                for (;i < N_OUT_URB; i++) {
+                        /* Check we have a valid urb/endpoint before we use it... */
+                        this_urb = portdata->out_urbs[i];
+                        if (this_urb->status != -EINPROGRESS)
+                                break;
+                        if (this_urb->transfer_flags & URB_ASYNC_UNLINK)
+                                continue;
+                        if (time_before(jiffies, portdata->tx_start_time[i] + 10 * HZ))
+                                continue;
+                        this_urb->transfer_flags |= URB_ASYNC_UNLINK;
+                        usb_unlink_urb(this_urb);
+                }
+
+                if (i == N_OUT_URB) {
+                        /* no bulk out free! */
+                        dbg("%s: no output urb -- left %d", __FUNCTION__,count-left);
+#if 0
+                        port->write_urb_busy = 0;
+#endif
+                        return count-left;
+                }
+
+                dbg("%s: endpoint %d buf %d", __FUNCTION__, usb_pipeendpoint(this_urb->pipe), i);
+
+                memcpy (this_urb->transfer_buffer, buf, todo);
+
+                /* send the data out the bulk port */
+                this_urb->transfer_buffer_length = todo;
+
+                this_urb->transfer_flags &= ~URB_ASYNC_UNLINK;
+                this_urb->dev = port->serial->dev;
+                err = usb_submit_urb(this_urb, GFP_ATOMIC);
+                if (err) {
+                        dbg("usb_submit_urb %p (write bulk) failed (%d,, has %d)", this_urb, err, this_urb->status);
+                        continue;
+                }
+                portdata->tx_start_time[i] = jiffies;
+                buf += todo;
+                left -= todo;
+        }
+
+        count -= left;
+#if 0
+        port->write_urb_busy = 0;
+#endif
+        dbg("%s: wrote (did %d)", __FUNCTION__, count);
+        return count;
+}
+
+static void
+option_indat_callback (struct urb *urb, struct pt_regs *regs)
+{
+        int     i, err;
+        int endpoint;
+        struct usb_serial_port *port;
+        struct tty_struct *tty;
+        unsigned char *data = urb->transfer_buffer;
+
+        dbg("%s: %p", __FUNCTION__, urb);
+
+        endpoint = usb_pipeendpoint(urb->pipe);
+        port = (struct usb_serial_port *) urb->context;
+
+        if (urb->status) {
+                dbg("%s: nonzero status: %d on endpoint %02x.",
+                    __FUNCTION__, urb->status, endpoint);
+        } else {
+                tty = port->tty;
+                if (urb->actual_length) {
+                        for (i = 0; i < urb->actual_length ; ++i) {
+                                if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+                                        tty_flip_buffer_push(tty);
+                                tty_insert_flip_char(tty, data[i], 0);
+                        }
+                        tty_flip_buffer_push(tty);
+                } else {
+                        dbg("%s: empty read urb received", __FUNCTION__);
+                }
+
+                /* Resubmit urb so we continue receiving */
+                if (port->open_count && urb->status != -ESHUTDOWN) {
+                        err = usb_submit_urb(urb, GFP_ATOMIC);
+                        if (err)
+                                printk(KERN_ERR "%s: resubmit read urb failed. (%d)", __FUNCTION__, err);
+                }
+        }
+        return;
+}
+
+static void
+option_outdat_callback (struct urb *urb, struct pt_regs *regs)
+{
+        struct usb_serial_port *port;
+
+        dbg("%s", __FUNCTION__);
+
+        port = (struct usb_serial_port *) urb->context;
+
+        if (port->open_count)
+                schedule_work(&port->work);
+}
+
+static void
+option_instat_callback (struct urb *urb, struct pt_regs *regs)
+{
+        int err;
+        struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
+        struct option_port_private *portdata = usb_get_serial_port_data(port);
+        struct usb_serial *serial = port->serial;
+
+        dbg("%s", __FUNCTION__);
+        dbg("%s: urb %p port %p has data %p", __FUNCTION__,urb,port,portdata);
+
+        if (urb->status == 0) {
+                struct usb_ctrlrequest *req_pkt =
+                                (struct usb_ctrlrequest *)urb->transfer_buffer;
+
+                if (!req_pkt) {
+                        dbg("%s: NULL req_pkt\n", __FUNCTION__);
+                        return;
+                }
+                if ((req_pkt->bRequestType == 0xA1) && (req_pkt->bRequest == 0x20)) {
+                        int old_dcd_state;
+                        unsigned char signals = *((unsigned char *)
+                                        urb->transfer_buffer + sizeof(struct usb_ctrlrequest));
+
+                        dbg("%s: signal x%x", __FUNCTION__, signals);
+
+                        old_dcd_state = portdata->dcd_state;
+                        portdata->cts_state = 1;
+                        portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
+                        portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
+                        portdata->ri_state = ((signals & 0x08) ? 1 : 0);
+
+                        if (port->tty && !C_CLOCAL(port->tty)
+                                        && old_dcd_state && !portdata->dcd_state) {
+                                tty_hangup(port->tty);
+                        }
+                } else
+                        dbg("%s: type %x req %x", __FUNCTION__, req_pkt->bRequestType,req_pkt->bRequest);
+        } else
+                dbg("%s: error %d", __FUNCTION__, urb->status);
+
+        /* Resubmit urb so we continue receiving IRQ data */
+        if (urb->status != -ESHUTDOWN) {
+                urb->dev = serial->dev;
+                err = usb_submit_urb(urb, GFP_ATOMIC);
+                if (err)
+                        dbg("%s: resubmit intr urb failed. (%d)", __FUNCTION__, err);
+        }
+}
+
+
+static int
+option_write_room (struct usb_serial_port *port)
+{
+        struct option_port_private *portdata;
+        int i;
+        int data_len = 0;
+        struct urb *this_urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        for (i=0; i < N_OUT_URB; i++)
+                this_urb = portdata->out_urbs[i];
+                if (this_urb && this_urb->status != -EINPROGRESS)
+                        data_len += OUT_BUFLEN;
+
+        dbg("%s: %d", __FUNCTION__, data_len);
+        return data_len;
+}
+
+
+static int
+option_chars_in_buffer (struct usb_serial_port *port)
+{
+        struct option_port_private *portdata;
+        int i;
+        int data_len = 0;
+        struct urb *this_urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        for (i=0; i < N_OUT_URB; i++)
+                this_urb = portdata->out_urbs[i];
+                if (this_urb && this_urb->status == -EINPROGRESS)
+                        data_len += this_urb->transfer_buffer_length;
+
+        dbg("%s: %d", __FUNCTION__, data_len);
+        return data_len;
+}
+
+
+static int
+option_open (struct usb_serial_port *port, struct file *filp)
+{
+        struct option_port_private      *portdata;
+        struct usb_serial               *serial = port->serial;
+        int                             i, err;
+        struct urb                      *urb;
+
+        portdata = usb_get_serial_port_data(port);
+
+        dbg("%s", __FUNCTION__);
+
+        /* Set some sane defaults */
+        portdata->rts_state = 1;
+        portdata->dtr_state = 1;
+
+        /* Reset low level data toggle and start reading from endpoints */
+        for (i = 0; i < N_IN_URB; i++) {
+                urb = portdata->in_urbs[i];
+                if (! urb)
+                        continue;
+                if (urb->dev != serial->dev) {
+                        dbg("%s: dev %p != %p", __FUNCTION__, urb->dev, serial->dev);
+                        continue;
+                }
+
+                /* make sure endpoint data toggle is synchronized with the device */
+
+                usb_clear_halt(urb->dev, urb->pipe);
+
+                err = usb_submit_urb(urb, GFP_KERNEL);
+                if (err) {
+                        dbg("%s: submit urb %d failed (%d) %d", __FUNCTION__, i, err,
+                                urb->transfer_buffer_length);
+                }
+        }
+
+        /* Reset low level data toggle on out endpoints */
+        for (i = 0; i < N_OUT_URB; i++) {
+                urb = portdata->out_urbs[i];
+                if (! urb)
+                        continue;
+                urb->dev = serial->dev;
+                /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0); */
+        }
+
+        port->tty->low_latency = 1;
+
+        option_send_setup(port);
+
+        return (0);
+}
+
+static inline void
+stop_urb(struct urb *urb)
+{
+        if (urb && urb->status == -EINPROGRESS) {
+                urb->transfer_flags &= ~URB_ASYNC_UNLINK;
+                usb_kill_urb(urb);
+        }
+}
+
+static void
+option_close(struct usb_serial_port *port, struct file *filp)
+{
+        int                     i;
+        struct usb_serial       *serial = port->serial;
+        struct option_port_private      *portdata;
+
+        dbg("%s", __FUNCTION__);
+        portdata = usb_get_serial_port_data(port);
+
+        portdata->rts_state = 0;
+        portdata->dtr_state = 0;
+
+        if (serial->dev) {
+                option_send_setup(port);
+
+                /* Stop reading/writing urbs */
+                for (i = 0; i < N_IN_URB; i++)
+                        stop_urb(portdata->in_urbs[i]);
+                for (i = 0; i < N_OUT_URB; i++)
+                        stop_urb(portdata->out_urbs[i]);
+        }
+        port->tty = NULL;
+}
+
+
+/* Helper functions used by option_setup_urbs */
+static struct urb *
+option_setup_urb (struct usb_serial *serial, int endpoint,
+                  int dir, void *ctx, char *buf, int len,
+                  void (*callback)(struct urb *, struct pt_regs *regs))
+{
+        struct urb *urb;
+
+        if (endpoint == -1)
+                return NULL;            /* endpoint not needed */
+
+        urb = usb_alloc_urb(0, GFP_KERNEL);             /* No ISO */
+        if (urb == NULL) {
+                dbg("%s: alloc for endpoint %d failed.", __FUNCTION__, endpoint);
+                return NULL;
+        }
+
+                /* Fill URB using supplied data. */
+        usb_fill_bulk_urb(urb, serial->dev,
+                      usb_sndbulkpipe(serial->dev, endpoint) | dir,
+                      buf, len, callback, ctx);
+
+        return urb;
+}
+
+/* Setup urbs */
+static void
+option_setup_urbs(struct usb_serial *serial)
+{
+        int                             j;
+        struct usb_serial_port          *port;
+        struct option_port_private      *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        port = serial->port[0];
+        portdata = usb_get_serial_port_data(port);
+
+        /* Do indat endpoints first */
+        for (j = 0; j <= N_IN_URB; ++j) {
+                portdata->in_urbs[j] = option_setup_urb (serial,
+                  port->bulk_in_endpointAddress, USB_DIR_IN, port,
+                  portdata->in_buffer[j], IN_BUFLEN, option_indat_callback);
+        }
+
+        /* outdat endpoints */
+        for (j = 0; j <= N_OUT_URB; ++j) {
+                portdata->out_urbs[j] = option_setup_urb (serial,
+                  port->bulk_out_endpointAddress, USB_DIR_OUT, port,
+                  portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback);
+        }
+}
+
+
+static int
+option_send_setup(struct usb_serial_port *port)
+{
+        struct usb_serial *serial = port->serial;
+        struct option_port_private *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        portdata = usb_get_serial_port_data(port);
+
+        if (port->tty) {
+                int val = 0;
+                if (portdata->dtr_state)
+                        val |= 0x01;
+                if (portdata->rts_state)
+                        val |= 0x02;
+
+                return usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+                                        0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
+        }
+
+        return 0;
+}
+
+
+static int
+option_startup (struct usb_serial *serial)
+{
+        int                             i, err;
+        struct usb_serial_port          *port;
+        struct option_port_private      *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        /* Now setup per port private data */
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                portdata = kmalloc(sizeof(struct option_port_private), GFP_KERNEL);
+                if (!portdata) {
+                        dbg("%s: kmalloc for option_port_private (%d) failed!.", __FUNCTION__, i);
+                        return (1);
+                }
+                memset(portdata, 0, sizeof(struct option_port_private));
+
+                usb_set_serial_port_data(port, portdata);
+
+                if (! port->interrupt_in_urb)
+                        continue;
+                err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
+                if (err)
+                        dbg("%s: submit irq_in urb failed %d", __FUNCTION__, err);
+        }
+
+        option_setup_urbs(serial);
+
+        return (0);
+}
+
+static void
+option_shutdown (struct usb_serial *serial)
+{
+        int                             i, j;
+        struct usb_serial_port          *port;
+        struct option_port_private      *portdata;
+
+        dbg("%s", __FUNCTION__);
+
+        /* Stop reading/writing urbs */
+        for (i = 0; i < serial->num_ports; ++i) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
+                for (j = 0; j < N_IN_URB; j++)
+                        stop_urb(portdata->in_urbs[j]);
+                for (j = 0; j < N_OUT_URB; j++)
+                        stop_urb(portdata->out_urbs[j]);
+        }
+
+        /* Now free them */
+        for (i = 0; i < serial->num_ports; ++i) {
+                port = serial->port[i];
+                portdata = usb_get_serial_port_data(port);
+
+                for (j = 0; j < N_IN_URB; j++) {
+                        if (portdata->in_urbs[j]) {
+                                usb_free_urb(portdata->in_urbs[j]);
+                                portdata->in_urbs[j] = NULL;
+                        }
+                }
+                for (j = 0; j < N_OUT_URB; j++) {
+                        if (portdata->out_urbs[j]) {
+                                usb_free_urb(portdata->out_urbs[j]);
+                                portdata->out_urbs[j] = NULL;
+                        }
+                }
+        }
+
+        /* Now free per port private data */
+        for (i = 0; i < serial->num_ports; i++) {
+                port = serial->port[i];
+                kfree(usb_get_serial_port_data(port));
+        }
+}
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug messages");
+
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 4536f63faaea..5da76dd8fb28 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1297,13 +1297,6 @@ static int __init usb_serial_init(void)
                 goto exit_bus;
         }
 
-        /* register the generic driver, if we should */
-        result = usb_serial_generic_register(debug);
-        if (result < 0) {
-                err("%s - registering generic driver failed", __FUNCTION__);
-                goto exit_generic;
-        }
-
         usb_serial_tty_driver->owner = THIS_MODULE;
         usb_serial_tty_driver->driver_name = "usbserial";
         usb_serial_tty_driver->devfs_name = "usb/tts/";
@@ -1329,17 +1322,24 @@ static int __init usb_serial_init(void)
                 goto exit_tty;
         }
 
+        /* register the generic driver, if we should */
+        result = usb_serial_generic_register(debug);
+        if (result < 0) {
+                err("%s - registering generic driver failed", __FUNCTION__);
+                goto exit_generic;
+        }
+
         info(DRIVER_DESC " " DRIVER_VERSION);
 
         return result;
 
+exit_generic:
+        usb_deregister(&usb_serial_driver);
+
 exit_tty:
         tty_unregister_driver(usb_serial_tty_driver);
 
 exit_reg_driver:
-        usb_serial_generic_deregister();
-
-exit_generic:
         bus_unregister(&usb_serial_bus_type);
 
 exit_bus:
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 22e48a2b0bd1..e43eddc3d44b 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -233,13 +233,11 @@ static int command_abort(struct scsi_cmnd *srb)
                 set_bit(US_FLIDX_ABORTING, &us->flags);
                 usb_stor_stop_transport(us);
         }
-        scsi_unlock(us_to_host(us));
 
         /* Wait for the aborted command to finish */
         wait_for_completion(&us->notify);
 
         /* Reacquire the lock and allow USB transfers to resume */
-        scsi_lock(us_to_host(us));
         clear_bit(US_FLIDX_ABORTING, &us->flags);
         clear_bit(US_FLIDX_TIMED_OUT, &us->flags);
         return SUCCESS;
@@ -255,8 +253,6 @@ static int device_reset(struct scsi_cmnd *srb)
 
         US_DEBUGP("%s called\n", __FUNCTION__);
 
-        scsi_unlock(us_to_host(us));
-
         /* lock the device pointers and do the reset */
         down(&(us->dev_semaphore));
         if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) {
@@ -266,8 +262,6 @@ static int device_reset(struct scsi_cmnd *srb)
                 result = us->transport_reset(us);
         up(&(us->dev_semaphore));
 
-        /* lock the host for the return */
-        scsi_lock(us_to_host(us));
         return result;
 }
 
@@ -282,8 +276,6 @@ static int bus_reset(struct scsi_cmnd *srb)
 
         US_DEBUGP("%s called\n", __FUNCTION__);
 
-        scsi_unlock(us_to_host(us));
-
         /* The USB subsystem doesn't handle synchronisation between
          * a device's several drivers. Therefore we reset only devices
          * with just one interface, which we of course own. */
@@ -310,7 +302,6 @@ static int bus_reset(struct scsi_cmnd *srb)
         up(&(us->dev_semaphore));
 
         /* lock the host for the return */
-        scsi_lock(us_to_host(us));
         return result < 0 ? FAILED : SUCCESS;
 }
 
@@ -407,7 +398,7 @@ US_DO_ALL_FLAGS
  ***********************************************************************/
 
 /* Output routine for the sysfs max_sectors file */
-static ssize_t show_max_sectors(struct device *dev, char *buf)
+static ssize_t show_max_sectors(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
 
@@ -415,7 +406,7 @@ static ssize_t show_max_sectors(struct device *dev, char *buf)
 }
 
 /* Input routine for the sysfs max_sectors file */
-static ssize_t store_max_sectors(struct device *dev, const char *buf,
+static ssize_t store_max_sectors(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index d2891f475793..9fcc7bd1fbe4 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -862,6 +862,15 @@ UNUSUAL_DEV(  0x090a, 0x1001, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_BULK, NULL,
                 US_FL_NEED_OVERRIDE ),
 
+/* Reported by Filippo Bardelli <filibard@libero.it>
+ * The device reports a subclass of RBC, which is wrong.
+ */
+UNUSUAL_DEV(  0x090a, 0x1050, 0x0100, 0x0100,
+                "Trumpion Microelectronics, Inc.",
+                "33520 USB Digital Voice Recorder",
+                US_SC_UFI, US_PR_DEVICE, NULL,
+                0),
+
 /* Trumpion Microelectronics MP3 player (felipe_alfaro@linuxmail.org) */
 UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999,
                 "Trumpion",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 6be8fbec0a0e..04d3120f7236 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -322,6 +322,22 @@ config FB_FM2
           This is the frame buffer device driver for the Amiga FrameMaster
           card from BSC (exhibited 1992 but not shipped as a CBM product).
 
+config FB_ARC
+        tristate "Arc Monochrome LCD board support"
+        depends on FB && X86
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select FB_SOFT_CURSOR
+        help
+          This enables support for the Arc Monochrome LCD board. The board
+          is based on the KS-108 lcd controller and is typically a matrix
+          of 2*n chips. This driver was tested with a 128x64 panel. This
+          driver supports it for use with x86 SBCs through a 16 bit GPIO
+          interface (8 bit data, 8 bit control). If you anticpate using
+          this driver, say Y or M; otherwise say N. You must specify the
+          GPIO IO address to be used for setting control and data.
+
 config FB_ATARI
         bool "Atari native chipset support"
         depends on (FB = y) && ATARI && BROKEN
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index bd8dc0ffe723..b018df4e95c8 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_FB_MACMODES)      += macmodes.o
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_RETINAZ3)         += retz3fb.o
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
+obj-$(CONFIG_FB_ARC)              += arcfb.o
 obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER)            += cyberfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
new file mode 100644
index 000000000000..d28457e0c063
--- /dev/null
+++ b/drivers/video/arcfb.c
@@ -0,0 +1,684 @@
+/*
+ * linux/drivers/video/arcfb.c -- FB driver for Arc monochrome LCD board
+ *
+ * Copyright (C) 2005, Jaya Kumar <jayalk@intworks.biz>
+ * http://www.intworks.biz/arclcd
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver was written to be used with the Arc LCD board. Arc uses a
+ * set of KS108 chips that control individual 64x64 LCD matrices. The board
+ * can be paneled in a variety of setups such as 2x1=128x64, 4x4=256x256 and
+ * so on. The interface between the board and the host is TTL based GPIO. The
+ * GPIO requirements are 8 writable data lines and 4+n lines for control. On a
+ * GPIO-less system, the board can be tested by connecting the respective sigs
+ * up to a parallel port connector. The driver requires the IO addresses for
+ * data and control GPIO at load time. It is unable to probe for the
+ * existence of the LCD so it must be told at load time whether it should
+ * be enabled or not.
+ *
+ * Todo:
+ * - testing with 4x4
+ * - testing with interrupt hw
+ *
+ * General notes:
+ * - User must set tuhold. It's in microseconds. According to the 108 spec,
+ *   the hold time is supposed to be at least 1 microsecond.
+ * - User must set num_cols=x num_rows=y, eg: x=2 means 128
+ * - User must set arcfb_enable=1 to enable it
+ * - User must set dio_addr=0xIOADDR cio_addr=0xIOADDR
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/arcfb.h>
+
+#include <asm/uaccess.h>
+
+#define floor8(a) (a&(~0x07))
+#define floorXres(a,xres) (a&(~(xres - 1)))
+#define iceil8(a) (((int)((a+7)/8))*8)
+#define ceil64(a) (a|0x3F)
+#define ceilXres(a,xres) (a|(xres - 1))
+
+/* ks108 chipset specific defines and code */
+
+#define KS_SET_DPY_START_LINE   0xC0
+#define KS_SET_PAGE_NUM         0xB8
+#define KS_SET_X                0x40
+#define KS_CEHI                 0x01
+#define KS_CELO                 0x00
+#define KS_SEL_CMD              0x08
+#define KS_SEL_DATA             0x00
+#define KS_DPY_ON               0x3F
+#define KS_DPY_OFF              0x3E
+#define KS_INTACK               0x40
+#define KS_CLRINT               0x02
+
+struct arcfb_par {
+        unsigned long dio_addr;
+        unsigned long cio_addr;
+        unsigned long c2io_addr;
+        atomic_t ref_count;
+        unsigned char cslut[9];
+        struct fb_info *info;
+        unsigned int irq;
+        spinlock_t lock;
+};
+
+static struct fb_fix_screeninfo arcfb_fix __initdata = {
+        .id =           "arcfb",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_MONO01,
+        .xpanstep =     0,
+        .ypanstep =     1,
+        .ywrapstep =    0,
+        .accel =        FB_ACCEL_NONE,
+};
+
+static struct fb_var_screeninfo arcfb_var __initdata = {
+        .xres           = 128,
+        .yres           = 64,
+        .xres_virtual   = 128,
+        .yres_virtual   = 64,
+        .bits_per_pixel = 1,
+        .nonstd         = 1,
+};
+
+static unsigned long num_cols;
+static unsigned long num_rows;
+static unsigned long dio_addr;
+static unsigned long cio_addr;
+static unsigned long c2io_addr;
+static unsigned long splashval;
+static unsigned long tuhold;
+static unsigned int nosplash;
+static unsigned int arcfb_enable;
+static unsigned int irq;
+
+static DECLARE_WAIT_QUEUE_HEAD(arcfb_waitq);
+
+static void ks108_writeb_ctl(struct arcfb_par *par,
+                                unsigned int chipindex, unsigned char value)
+{
+        unsigned char chipselval = par->cslut[chipindex];
+
+        outb(chipselval|KS_CEHI|KS_SEL_CMD, par->cio_addr);
+        outb(value, par->dio_addr);
+        udelay(tuhold);
+        outb(chipselval|KS_CELO|KS_SEL_CMD, par->cio_addr);
+}
+
+static void ks108_writeb_mainctl(struct arcfb_par *par, unsigned char value)
+{
+
+        outb(value, par->cio_addr);
+        udelay(tuhold);
+}
+
+static unsigned char ks108_readb_ctl2(struct arcfb_par *par)
+{
+        return inb(par->c2io_addr);
+}
+
+static void ks108_writeb_data(struct arcfb_par *par,
+                                unsigned int chipindex, unsigned char value)
+{
+        unsigned char chipselval = par->cslut[chipindex];
+
+        outb(chipselval|KS_CEHI|KS_SEL_DATA, par->cio_addr);
+        outb(value, par->dio_addr);
+        udelay(tuhold);
+        outb(chipselval|KS_CELO|KS_SEL_DATA, par->cio_addr);
+}
+
+static void ks108_set_start_line(struct arcfb_par *par,
+                                unsigned int chipindex, unsigned char y)
+{
+        ks108_writeb_ctl(par, chipindex, KS_SET_DPY_START_LINE|y);
+}
+
+static void ks108_set_yaddr(struct arcfb_par *par,
+                                unsigned int chipindex, unsigned char y)
+{
+        ks108_writeb_ctl(par, chipindex, KS_SET_PAGE_NUM|y);
+}
+
+static void ks108_set_xaddr(struct arcfb_par *par,
+                                unsigned int chipindex, unsigned char x)
+{
+        ks108_writeb_ctl(par, chipindex, KS_SET_X|x);
+}
+
+static void ks108_clear_lcd(struct arcfb_par *par, unsigned int chipindex)
+{
+        int i,j;
+
+        for (i = 0; i <= 8; i++) {
+                ks108_set_yaddr(par, chipindex, i);
+                ks108_set_xaddr(par, chipindex, 0);
+                for (j = 0; j < 64; j++) {
+                        ks108_writeb_data(par, chipindex,
+                                (unsigned char) splashval);
+                }
+        }
+}
+
+/* main arcfb functions */
+
+static int arcfb_open(struct fb_info *info, int user)
+{
+        struct arcfb_par *par = info->par;
+
+        atomic_inc(&par->ref_count);
+        return 0;
+}
+
+static int arcfb_release(struct fb_info *info, int user)
+{
+        struct arcfb_par *par = info->par;
+        int count = atomic_read(&par->ref_count);
+
+        if (!count)
+                return -EINVAL;
+        atomic_dec(&par->ref_count);
+        return 0;
+}
+
+static int arcfb_pan_display(struct fb_var_screeninfo *var,
+                                struct fb_info *info)
+{
+        int i;
+        struct arcfb_par *par = info->par;
+
+        if ((var->vmode & FB_VMODE_YWRAP) && (var->yoffset < 64)
+                && (info->var.yres <= 64)) {
+                for (i = 0; i < num_cols; i++) {
+                        ks108_set_start_line(par, i, var->yoffset);
+                }
+                info->var.yoffset = var->yoffset;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static irqreturn_t arcfb_interrupt(int vec, void *dev_instance,
+                struct pt_regs *regs)
+{
+        struct fb_info *info = dev_instance;
+        unsigned char ctl2status;
+        struct arcfb_par *par = info->par;
+
+        ctl2status = ks108_readb_ctl2(par);
+
+        if (!(ctl2status & KS_INTACK)) /* not arc generated interrupt */
+                return IRQ_NONE;
+
+        ks108_writeb_mainctl(par, KS_CLRINT);
+
+        spin_lock(&par->lock);
+        if (waitqueue_active(&arcfb_waitq)) {
+                wake_up(&arcfb_waitq);
+        }
+        spin_unlock(&par->lock);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * here we handle a specific page on the lcd. the complexity comes from
+ * the fact that the fb is laidout in 8xX vertical columns. we extract
+ * each write of 8 vertical pixels. then we shift out as we move along
+ * X. That's what rightshift does. bitmask selects the desired input bit.
+ */
+static void arcfb_lcd_update_page(struct arcfb_par *par, unsigned int upper,
+                unsigned int left, unsigned int right, unsigned int distance)
+{
+        unsigned char *src;
+        unsigned int xindex, yindex, chipindex, linesize;
+        int i, count;
+        unsigned char val;
+        unsigned char bitmask, rightshift;
+
+        xindex = left >> 6;
+        yindex = upper >> 6;
+        chipindex = (xindex + (yindex*num_cols));
+
+        ks108_set_yaddr(par, chipindex, upper/8);
+
+        linesize = par->info->var.xres/8;
+        src = par->info->screen_base + (left/8) + (upper * linesize);
+        ks108_set_xaddr(par, chipindex, left);
+
+        bitmask=1;
+        rightshift=0;
+        while (left <= right) {
+                val = 0;
+                for (i = 0; i < 8; i++) {
+                        if ( i > rightshift) {
+                                val |= (*(src + (i*linesize)) & bitmask)
+                                                << (i - rightshift);
+                        } else {
+                                val |= (*(src + (i*linesize)) & bitmask)
+                                                 >> (rightshift - i);
+                        }
+                }
+                ks108_writeb_data(par, chipindex, val);
+                left++;
+                count++;
+                if (bitmask == 0x80) {
+                        bitmask = 1;
+                        src++;
+                        rightshift=0;
+                } else {
+                        bitmask <<= 1;
+                        rightshift++;
+                }
+        }
+}
+
+/*
+ * here we handle the entire vertical page of the update. we write across
+ * lcd chips. update_page uses the upper/left values to decide which
+ * chip to select for the right. upper is needed for setting the page
+ * desired for the write.
+ */
+static void arcfb_lcd_update_vert(struct arcfb_par *par, unsigned int top,
+                unsigned int bottom, unsigned int left, unsigned int right)
+{
+        unsigned int distance, upper, lower;
+
+        distance = (bottom - top) + 1;
+        upper = top;
+        lower = top + 7;
+
+        while (distance > 0) {
+                distance -= 8;
+                arcfb_lcd_update_page(par, upper, left, right, 8);
+                upper = lower + 1;
+                lower = upper + 7;
+        }
+}
+
+/*
+ * here we handle horizontal blocks for the update. update_vert will
+ * handle spaning multiple pages. we break out each horizontal
+ * block in to individual blocks no taller than 64 pixels.
+ */
+static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left,
+                        unsigned int right, unsigned int top, unsigned int h)
+{
+        unsigned int distance, upper, lower;
+
+        distance = h;
+        upper = floor8(top);
+        lower = min(upper + distance - 1, ceil64(upper));
+
+        while (distance > 0) {
+                distance -= ((lower - upper) + 1 );
+                arcfb_lcd_update_vert(par, upper, lower, left, right);
+                upper = lower + 1;
+                lower = min(upper + distance - 1, ceil64(upper));
+        }
+}
+
+/*
+ * here we start the process of spliting out the fb update into
+ * individual blocks of pixels. we end up spliting into 64x64 blocks
+ * and finally down to 64x8 pages.
+ */
+static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx,
+                        unsigned int dy, unsigned int w, unsigned int h)
+{
+        unsigned int left, right, distance, y;
+
+        /* align the request first */
+        y = floor8(dy);
+        h += dy - y;
+        h = iceil8(h);
+
+        distance = w;
+        left = dx;
+        right = min(left + w - 1, ceil64(left));
+
+        while (distance > 0) {
+                arcfb_lcd_update_horiz(par, left, right, y, h);
+                distance -= ((right - left) + 1);
+                left = right + 1;
+                right = min(left + distance - 1, ceil64(left));
+        }
+}
+
+void arcfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        struct arcfb_par *par = info->par;
+
+        cfb_fillrect(info, rect);
+
+        /* update the physical lcd */
+        arcfb_lcd_update(par, rect->dx, rect->dy, rect->width, rect->height);
+}
+
+void arcfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+        struct arcfb_par *par = info->par;
+
+        cfb_copyarea(info, area);
+
+        /* update the physical lcd */
+        arcfb_lcd_update(par, area->dx, area->dy, area->width, area->height);
+}
+
+void arcfb_imageblit(struct fb_info *info, const struct fb_image *image)
+{
+        struct arcfb_par *par = info->par;
+
+        cfb_imageblit(info, image);
+
+        /* update the physical lcd */
+        arcfb_lcd_update(par, image->dx, image->dy, image->width,
+                                image->height);
+}
+
+static int arcfb_ioctl(struct inode *inode, struct file *file,
+                          unsigned int cmd, unsigned long arg,
+                          struct fb_info *info)
+{
+        void __user *argp = (void __user *)arg;
+        struct arcfb_par *par = info->par;
+        unsigned long flags;
+
+        switch (cmd) {
+                case FBIO_WAITEVENT:
+                {
+                        DEFINE_WAIT(wait);
+                        /* illegal to wait on arc if no irq will occur */
+                        if (!par->irq)
+                                return -EINVAL;
+
+                        /* wait until the Arc has generated an interrupt
+                         * which will wake us up */
+                        spin_lock_irqsave(&par->lock, flags);
+                        prepare_to_wait(&arcfb_waitq, &wait,
+                                        TASK_INTERRUPTIBLE);
+                        spin_unlock_irqrestore(&par->lock, flags);
+                        schedule();
+                        finish_wait(&arcfb_waitq, &wait);
+                }
+                case FBIO_GETCONTROL2:
+                {
+                        unsigned char ctl2;
+
+                        ctl2 = ks108_readb_ctl2(info->par);
+                        if (copy_to_user(argp, &ctl2, sizeof(ctl2)))
+                                return -EFAULT;
+                        return 0;
+                }
+                default:
+                        return -EINVAL;
+        }
+}
+
+/*
+ * this is the access path from userspace. they can seek and write to
+ * the fb. it's inefficient for them to do anything less than 64*8
+ * writes since we update the lcd in each write() anyway.
+ */
+static ssize_t arcfb_write(struct file *file, const char *buf, size_t count,
+                                loff_t *ppos)
+{
+        /* modded from epson 1355 */
+
+        struct inode *inode;
+        int fbidx;
+        struct fb_info *info;
+        unsigned long p;
+        int err=-EINVAL;
+        unsigned int fbmemlength,x,y,w,h, bitppos, startpos, endpos, bitcount;
+        struct arcfb_par *par;
+        unsigned int xres;
+
+        p = *ppos;
+        inode = file->f_dentry->d_inode;
+        fbidx = iminor(inode);
+        info = registered_fb[fbidx];
+        par = info->par;
+
+        if (!info || !info->screen_base)
+                return -ENODEV;
+
+        xres = info->var.xres;
+        fbmemlength = (xres * info->var.yres)/8;
+
+        if (p > fbmemlength)
+                return -ENOSPC;
+
+        err = 0;
+        if ((count + p) > fbmemlength) {
+                count = fbmemlength - p;
+                err = -ENOSPC;
+        }
+
+        if (count) {
+                char *base_addr;
+
+                base_addr = info->screen_base;
+                count -= copy_from_user(base_addr + p, buf, count);
+                *ppos += count;
+                err = -EFAULT;
+        }
+
+
+        bitppos = p*8;
+        startpos = floorXres(bitppos, xres);
+        endpos = ceilXres((bitppos + (count*8)), xres);
+        bitcount = endpos - startpos;
+
+        x = startpos % xres;
+        y = startpos / xres;
+        w = xres;
+        h = bitcount / xres;
+        arcfb_lcd_update(par, x, y, w, h);
+
+        if (count)
+                return count;
+        return err;
+}
+
+static void arcfb_platform_release(struct device *device)
+{
+}
+
+static struct fb_ops arcfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = arcfb_open,
+        .fb_write       = arcfb_write,
+        .fb_release     = arcfb_release,
+        .fb_pan_display = arcfb_pan_display,
+        .fb_fillrect    = arcfb_fillrect,
+        .fb_copyarea    = arcfb_copyarea,
+        .fb_imageblit   = arcfb_imageblit,
+        .fb_cursor      = soft_cursor,
+        .fb_ioctl       = arcfb_ioctl,
+};
+
+static int __init arcfb_probe(struct device *device)
+{
+        struct platform_device *dev = to_platform_device(device);
+        struct fb_info *info;
+        int retval = -ENOMEM;
+        int videomemorysize;
+        unsigned char *videomemory;
+        struct arcfb_par *par;
+        int i;
+
+        videomemorysize = (((64*64)*num_cols)*num_rows)/8;
+
+        /* We need a flat backing store for the Arc's
+           less-flat actual paged framebuffer */
+        if (!(videomemory = vmalloc(videomemorysize)))
+                return retval;
+
+        memset(videomemory, 0, videomemorysize);
+
+        info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
+        if (!info)
+                goto err;
+
+        info->screen_base = (char __iomem *)videomemory;
+        info->fbops = &arcfb_ops;
+
+        info->var = arcfb_var;
+        info->fix = arcfb_fix;
+        par = info->par;
+        par->info = info;
+
+        if (!dio_addr || !cio_addr || !c2io_addr) {
+                printk(KERN_WARNING "no IO addresses supplied\n");
+                goto err1;
+        }
+        par->dio_addr = dio_addr;
+        par->cio_addr = cio_addr;
+        par->c2io_addr = c2io_addr;
+        par->cslut[0] = 0x00;
+        par->cslut[1] = 0x06;
+        info->flags = FBINFO_FLAG_DEFAULT;
+        spin_lock_init(&par->lock);
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err1;
+        dev_set_drvdata(&dev->dev, info);
+        if (irq) {
+                par->irq = irq;
+                if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
+                                "arcfb", info)) {
+                        printk(KERN_INFO
+                                "arcfb: Failed req IRQ %d\n", par->irq);
+                        goto err1;
+                }
+        }
+        printk(KERN_INFO
+               "fb%d: Arc frame buffer device, using %dK of video memory\n",
+               info->node, videomemorysize >> 10);
+
+        /* this inits the lcd but doesn't clear dirty pixels */
+        for (i = 0; i < num_cols * num_rows; i++) {
+                ks108_writeb_ctl(par, i, KS_DPY_OFF);
+                ks108_set_start_line(par, i, 0);
+                ks108_set_yaddr(par, i, 0);
+                ks108_set_xaddr(par, i, 0);
+                ks108_writeb_ctl(par, i, KS_DPY_ON);
+        }
+
+        /* if we were told to splash the screen, we just clear it */
+        if (!nosplash) {
+                for (i = 0; i < num_cols * num_rows; i++) {
+                        printk(KERN_INFO "fb%d: splashing lcd %d\n",
+                                info->node, i);
+                        ks108_set_start_line(par, i, 0);
+                        ks108_clear_lcd(par, i);
+                }
+        }
+
+        return 0;
+err1:
+        framebuffer_release(info);
+err:
+        vfree(videomemory);
+        return retval;
+}
+
+static int arcfb_remove(struct device *device)
+{
+        struct fb_info *info = dev_get_drvdata(device);
+
+        if (info) {
+                unregister_framebuffer(info);
+                vfree(info->screen_base);
+                framebuffer_release(info);
+        }
+        return 0;
+}
+
+static struct device_driver arcfb_driver = {
+        .name   = "arcfb",
+        .bus    = &platform_bus_type,
+        .probe  = arcfb_probe,
+        .remove = arcfb_remove,
+};
+
+static struct platform_device arcfb_device = {
+        .name   = "arcfb",
+        .id     = 0,
+        .dev    = {
+                .release = arcfb_platform_release,
+        }
+};
+
+static int __init arcfb_init(void)
+{
+        int ret;
+
+        if (!arcfb_enable)
+                return -ENXIO;
+
+        ret = driver_register(&arcfb_driver);
+        if (!ret) {
+                ret = platform_device_register(&arcfb_device);
+                if (ret)
+                        driver_unregister(&arcfb_driver);
+        }
+        return ret;
+
+}
+
+static void __exit arcfb_exit(void)
+{
+        platform_device_unregister(&arcfb_device);
+        driver_unregister(&arcfb_driver);
+}
+
+module_param(num_cols, ulong, 0);
+MODULE_PARM_DESC(num_cols, "Num horiz panels, eg: 2 = 128 bit wide");
+module_param(num_rows, ulong, 0);
+MODULE_PARM_DESC(num_rows, "Num vert panels, eg: 1 = 64 bit high");
+module_param(nosplash, uint, 0);
+MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
+module_param(arcfb_enable, uint, 0);
+MODULE_PARM_DESC(arcfb_enable, "Enable communication with Arc board");
+module_param(dio_addr, ulong, 0);
+MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
+module_param(cio_addr, ulong, 0);
+MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
+module_param(c2io_addr, ulong, 0);
+MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
+module_param(splashval, ulong, 0);
+MODULE_PARM_DESC(splashval, "Splash pattern: 0xFF is black, 0x00 is green");
+module_param(tuhold, ulong, 0);
+MODULE_PARM_DESC(tuhold, "Time to hold between strobing data to Arc board");
+module_param(irq, uint, 0);
+MODULE_PARM_DESC(irq, "IRQ for the Arc board");
+
+module_init(arcfb_init);
+module_exit(arcfb_exit);
+
+MODULE_DESCRIPTION("fbdev driver for Arc monochrome LCD board");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index ee25b9e8db60..47a6b12bc968 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2374,10 +2374,9 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
         } while (   rinfo->fb_base == 0 &&
                   ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) );
 
-        if (rinfo->fb_base)
-                memset_io(rinfo->fb_base, 0, rinfo->mapped_vram);
-        else {
-                printk (KERN_ERR "radeonfb (%s): cannot map FB\n", pci_name(rinfo->pdev));
+        if (rinfo->fb_base == NULL) {
+                printk (KERN_ERR "radeonfb (%s): cannot map FB\n",
+                        pci_name(rinfo->pdev));
                 ret = -EIO;
                 goto err_unmap_rom;
         }
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index ab98f225fe3e..95e72550d43f 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -423,9 +423,6 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
         pmu_register_sleep_notifier(&chips_sleep_notifier);
 #endif /* CONFIG_PMAC_PBOOK */
 
-        /* Clear the entire framebuffer */
-        memset(p->screen_base, 0, 0x100000);
-
         pci_set_drvdata(dp, p);
         return 0;
 }
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index ccf55811d24f..e4b91a4b936c 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -153,6 +153,15 @@ config FONT_6x11
           Small console font with Macintosh-style high-half glyphs.  Some Mac
           framebuffer drivers don't support this one at all.
 
+config FONT_7x14
+        bool "console 7x14 font (not supported by all drivers)" if FONTS
+        depends on FRAMEBUFFER_CONSOLE
+        default y if !SPARC32 && !SPARC64 && !FONTS
+        help
+          Console font with characters just a bit smaller than the default.
+          If the standard 8x16 font is a little too big for you, say Y.
+          Otherwise, say N.
+
 config FONT_PEARL_8x8
         bool "Pearl (old m68k) console 8x8 font" if FONTS
         depends on FRAMEBUFFER_CONSOLE
@@ -187,5 +196,13 @@ config FONT_SUN12x22
           big letters (like the letters used in the SPARC PROM). If the
           standard font is unreadable for you, say Y, otherwise say N.
 
+config FONT_10x18
+        bool "console 10x18 font (not supported by all drivers)"
+        depends on FONTS
+        help
+          This is a high resolution console font for machines with very
+          big letters. It fits between the sun 12x22 and the normal 8x16 font.
+          If other fonts are too big or too small for you, say Y, otherwise say N.
+
 endmenu
 
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index 33516447f9f2..b562f6bb9d31 100644
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -10,6 +10,8 @@ font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
 font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
 font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
 font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
+font-objs-$(CONFIG_FONT_7x14)      += font_7x14.o
+font-objs-$(CONFIG_FONT_10x18)     += font_10x18.o
 font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
 font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
 font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index b28a4b0e395e..3c731577fed6 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -107,13 +107,6 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                       const unsigned short *s, int count, int yy, int xx,
                       int fg, int bg)
 {
-        void (*move_unaligned)(struct fb_info *info, struct fb_pixmap *buf,
-                               u8 *dst, u32 d_pitch, u8 *src, u32 idx,
-                               u32 height, u32 shift_high, u32 shift_low,
-                               u32 mod);
-        void (*move_aligned)(struct fb_info *info, struct fb_pixmap *buf,
-                             u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-                             u32 height);
         unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
         unsigned int width = (vc->vc_font.width + 7) >> 3;
         unsigned int cellsize = vc->vc_font.height * width;
@@ -141,13 +134,6 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
         image.height = vc->vc_font.height;
         image.depth = 1;
 
-        if (info->pixmap.outbuf && info->pixmap.inbuf) {
-                move_aligned = fb_iomove_buf_aligned;
-                move_unaligned = fb_iomove_buf_unaligned;
-        } else {
-                move_aligned = fb_sysmove_buf_aligned;
-                move_unaligned = fb_sysmove_buf_unaligned;
-        }
         while (count) {
                 if (count > maxcnt)
                         cnt = k = maxcnt;
@@ -171,9 +157,9 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                                         src = buf;
                                 }
 
-                                move_unaligned(info, &info->pixmap, dst, pitch,
-                                               src, idx, image.height,
-                                               shift_high, shift_low, mod);
+                                fb_pad_unaligned_buffer(dst, pitch, src, idx,
+                                                image.height, shift_high,
+                                                shift_low, mod);
                                 shift_low += mod;
                                 dst += (shift_low >= 8) ? width : width - 1;
                                 shift_low &= 7;
@@ -189,8 +175,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                                         src = buf;
                                 }
 
-                                move_aligned(info, &info->pixmap, dst, pitch,
-                                             src, idx, image.height);
+                                fb_pad_aligned_buffer(dst, pitch, src, idx, image.height);
                                 dst += width;
                         }
                 }
diff --git a/drivers/video/console/font_10x18.c b/drivers/video/console/font_10x18.c
new file mode 100644
index 000000000000..ff0af96e4dfc
--- /dev/null
+++ b/drivers/video/console/font_10x18.c
@@ -0,0 +1,5146 @@
+/********************************
+ * adapted from font_sun12x22.c *
+ * by Jurriaan Kalkman 06-2005  *
+ ********************************/
+
+#include <linux/font.h>
+
+#define FONTDATAMAX 9216
+
+static unsigned char fontdata_10x18[FONTDATAMAX] = {
+
+        /* 0 0x00 '^@' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 1 0x01 '^A' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x80, /* 0011111110 */
+        0x40, 0x40, /* 0100000001 */
+        0x5b, 0x40, /* 0101101101 */
+        0x40, 0x40, /* 0100000001 */
+        0x44, 0x40, /* 0100010001 */
+        0x44, 0x40, /* 0100010001 */
+        0x51, 0x40, /* 0101000101 */
+        0x4e, 0x40, /* 0100111001 */
+        0x40, 0x40, /* 0100000001 */
+        0x3f, 0x80, /* 0011111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 2 0x02 '^B' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x80, /* 0011111110 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x64, 0xc0, /* 0110010011 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x6e, 0xc0, /* 0110111011 */
+        0x71, 0xc0, /* 0111000111 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x3f, 0x80, /* 0011111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 3 0x03 '^C' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x11, 0x00, /* 0001000100 */
+        0x3b, 0x80, /* 0011101110 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x3f, 0x80, /* 0011111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x04, 0x00, /* 0000010000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 4 0x04 '^D' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x3f, 0x80, /* 0011111110 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x04, 0x00, /* 0000010000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 5 0x05 '^E' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x31, 0x80, /* 0011000110 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x35, 0x80, /* 0011010110 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 6 0x06 '^F' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x3f, 0x80, /* 0011111110 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x35, 0x80, /* 0011010110 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 7 0x07 '^G' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 8 0x08 '^H' */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xf3, 0xc0, /* 1111001111 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xf3, 0xc0, /* 1111001111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+
+        /* 9 0x09 '^I' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x12, 0x00, /* 0001001000 */
+        0x12, 0x00, /* 0001001000 */
+        0x21, 0x00, /* 0010000100 */
+        0x21, 0x00, /* 0010000100 */
+        0x12, 0x00, /* 0001001000 */
+        0x12, 0x00, /* 0001001000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 10 0x0a '^J' */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xf3, 0xc0, /* 1111001111 */
+        0xed, 0xc0, /* 1110110111 */
+        0xed, 0xc0, /* 1110110111 */
+        0xde, 0xc0, /* 1101111011 */
+        0xde, 0xc0, /* 1101111011 */
+        0xed, 0xc0, /* 1110110111 */
+        0xed, 0xc0, /* 1110110111 */
+        0xf3, 0xc0, /* 1111001111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+
+        /* 11 0x0b '^K' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x03, 0xc0, /* 0000001111 */
+        0x06, 0xc0, /* 0000011011 */
+        0x0c, 0xc0, /* 0000110011 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc3, 0x00, /* 1100001100 */
+        0x66, 0x00, /* 0110011000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 12 0x0c '^L' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 13 0x0d '^M' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0x80, /* 0000111110 */
+        0x08, 0x80, /* 0000100010 */
+        0x0f, 0x80, /* 0000111110 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x38, 0x00, /* 0011100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 14 0x0e '^N' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x80, /* 0001111110 */
+        0x10, 0x80, /* 0001000010 */
+        0x1f, 0x80, /* 0001111110 */
+        0x10, 0x80, /* 0001000010 */
+        0x10, 0x80, /* 0001000010 */
+        0x10, 0x80, /* 0001000010 */
+        0x10, 0x80, /* 0001000010 */
+        0x13, 0x80, /* 0001001110 */
+        0x17, 0x80, /* 0001011110 */
+        0x73, 0x00, /* 0111001100 */
+        0xf0, 0x00, /* 1111000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 15 0x0f '^O' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x24, 0x80, /* 0010010010 */
+        0x15, 0x00, /* 0001010100 */
+        0x55, 0x40, /* 0101010101 */
+        0x3f, 0x80, /* 0011111110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x3f, 0x80, /* 0011111110 */
+        0x55, 0x40, /* 0101010101 */
+        0x15, 0x00, /* 0001010100 */
+        0x24, 0x80, /* 0010010010 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 16 0x10 '^P' */
+        0x00, 0x80, /* 0000000010 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x80, /* 0000001110 */
+        0x07, 0x80, /* 0000011110 */
+        0x0f, 0x80, /* 0000111110 */
+        0x1f, 0x80, /* 0001111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0xff, 0x80, /* 1111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x1f, 0x80, /* 0001111110 */
+        0x0f, 0x80, /* 0000111110 */
+        0x07, 0x80, /* 0000011110 */
+        0x03, 0x80, /* 0000001110 */
+        0x01, 0x80, /* 0000000110 */
+        0x00, 0x80, /* 0000000010 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 17 0x11 '^Q' */
+        0x40, 0x00, /* 0100000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x70, 0x00, /* 0111000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x7c, 0x00, /* 0111110000 */
+        0x7e, 0x00, /* 0111111000 */
+        0x7f, 0x00, /* 0111111100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x00, /* 0111111100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x7c, 0x00, /* 0111110000 */
+        0x78, 0x00, /* 0111100000 */
+        0x70, 0x00, /* 0111000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 18 0x12 '^R' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 19 0x13 '^S' */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 20 0x14 '^T' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x39, 0x80, /* 0011100110 */
+        0x79, 0x80, /* 0111100110 */
+        0x79, 0x80, /* 0111100110 */
+        0x79, 0x80, /* 0111100110 */
+        0x39, 0x80, /* 0011100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x39, 0xc0, /* 0011100111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 21 0x15 '^U' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 22 0x16 '^V' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 23 0x17 '^W' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 24 0x18 '^X' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 25 0x19 '^Y' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 26 0x1a '^Z' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x06, 0x00, /* 0000011000 */
+        0x07, 0x00, /* 0000011100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x07, 0x00, /* 0000011100 */
+        0x06, 0x00, /* 0000011000 */
+        0x04, 0x00, /* 0000010000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 27 0x1b '^[' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x08, 0x00, /* 0000100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x38, 0x00, /* 0011100000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x38, 0x00, /* 0011100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 28 0x1c '^\' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 29 0x1d '^]' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x12, 0x00, /* 0001001000 */
+        0x33, 0x00, /* 0011001100 */
+        0x73, 0x80, /* 0111001110 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x73, 0x80, /* 0111001110 */
+        0x33, 0x00, /* 0011001100 */
+        0x12, 0x00, /* 0001001000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 30 0x1e '^^' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x3f, 0x80, /* 0011111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 31 0x1f '^_' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x3f, 0x80, /* 0011111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x04, 0x00, /* 0000010000 */
+        0x04, 0x00, /* 0000010000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 32 0x20 ' ' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 33 0x21 '!' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 34 0x22 '"' */
+        0x00, 0x00, /* 0000000000 */
+        0x63, 0x00, /* 0110001100 */
+        0xf7, 0x80, /* 1111011110 */
+        0xf7, 0x80, /* 1111011110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x42, 0x00, /* 0100001000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 35 0x23 '#' */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 36 0x24 '$' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x6f, 0x80, /* 0110111110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6c, 0x80, /* 0110110010 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0f, 0x00, /* 0000111100 */
+        0x0d, 0x80, /* 0000110110 */
+        0x4d, 0x80, /* 0100110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x7f, 0x00, /* 0111111100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 37 0x25 '%' */
+        0x00, 0x00, /* 0000000000 */
+        0x31, 0x80, /* 0011000110 */
+        0x7b, 0x00, /* 0111101100 */
+        0x7b, 0x00, /* 0111101100 */
+        0x36, 0x00, /* 0011011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x37, 0x80, /* 0011011110 */
+        0x37, 0x80, /* 0011011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 38 0x26 '&' */
+        0x00, 0x00, /* 0000000000 */
+        0x07, 0x00, /* 0000011100 */
+        0x0f, 0x80, /* 0000111110 */
+        0x19, 0x80, /* 0001100110 */
+        0x19, 0x80, /* 0001100110 */
+        0x0f, 0x80, /* 0000111110 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x76, 0x00, /* 0111011000 */
+        0x66, 0x40, /* 0110011001 */
+        0x63, 0xc0, /* 0110001111 */
+        0x63, 0x80, /* 0110001110 */
+        0x63, 0x00, /* 0110001100 */
+        0x3f, 0x80, /* 0011111110 */
+        0x1c, 0xc0, /* 0001110011 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 39 0x27 ''' */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 40 0x28 '(' */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x00, /* 0000001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 41 0x29 ')' */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 42 0x2a '*' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x4c, 0x80, /* 0100110010 */
+        0x6d, 0x80, /* 0110110110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x7f, 0x80, /* 0111111110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x6d, 0x80, /* 0110110110 */
+        0x4c, 0x80, /* 0100110010 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 43 0x2b '+' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 44 0x2c ',' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x40, 0x00, /* 0100000000 */
+
+        /* 45 0x2d '-' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 46 0x2e '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 47 0x2f '/' */
+        0x00, 0x00, /* 0000000000 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 48 0x30 '0' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x23, 0x00, /* 0010001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x63, 0x80, /* 0110001110 */
+        0x65, 0x80, /* 0110010110 */
+        0x65, 0x80, /* 0110010110 */
+        0x69, 0x80, /* 0110100110 */
+        0x69, 0x80, /* 0110100110 */
+        0x71, 0x80, /* 0111000110 */
+        0x61, 0x00, /* 0110000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 49 0x31 '1' */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 50 0x32 '2' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x63, 0x80, /* 0110001110 */
+        0x41, 0x80, /* 0100000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x80, /* 0011000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 51 0x33 '3' */
+        0x00, 0x00, /* 0000000000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x47, 0x00, /* 0100011100 */
+        0x03, 0x00, /* 0000001100 */
+        0x07, 0x00, /* 0000011100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x07, 0x00, /* 0000011100 */
+        0x03, 0x00, /* 0000001100 */
+        0x01, 0x80, /* 0000000110 */
+        0x41, 0x80, /* 0100000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 52 0x34 '4' */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc6, 0x00, /* 1100011000 */
+        0xc6, 0x00, /* 1100011000 */
+        0xff, 0x80, /* 1111111110 */
+        0xff, 0x80, /* 1111111110 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 53 0x35 '5' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x7e, 0x00, /* 0111111000 */
+        0x67, 0x00, /* 0110011100 */
+        0x03, 0x80, /* 0000001110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x41, 0x80, /* 0100000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 54 0x36 '6' */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x6e, 0x00, /* 0110111000 */
+        0x7f, 0x00, /* 0111111100 */
+        0x73, 0x80, /* 0111001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x00, /* 0111000100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 55 0x37 '7' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x80, /* 0001111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x61, 0x80, /* 0110000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 56 0x38 '8' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x23, 0x00, /* 0010001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x31, 0x00, /* 0011000100 */
+        0x1a, 0x00, /* 0001101000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x16, 0x00, /* 0001011000 */
+        0x23, 0x00, /* 0010001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x31, 0x00, /* 0011000100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 57 0x39 '9' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x17, 0x00, /* 0001011100 */
+        0x23, 0x80, /* 0010001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0x80, /* 0011110110 */
+        0x19, 0x80, /* 0001100110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 58 0x3a ':' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 59 0x3b ';' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x20, 0x00, /* 0010000000 */
+
+        /* 60 0x3c '<' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x00, /* 0000001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 61 0x3d '=' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 62 0x3e '>' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x00, /* 0000001100 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 63 0x3f '?' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x3b, 0x80, /* 0011101110 */
+        0x21, 0x80, /* 0010000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 64 0x40 '@' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x65, 0x80, /* 0110010110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6f, 0x80, /* 0110111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x31, 0x80, /* 0011000110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x0f, 0x00, /* 0000111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 65 0x41 'A' */
+        0x00, 0x00, /* 0000000000 */
+        0x04, 0x00, /* 0000010000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x19, 0x80, /* 0001100110 */
+        0x31, 0x80, /* 0011000110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x31, 0x80, /* 0011000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x60, 0xc0, /* 0110000011 */
+        0x60, 0xc0, /* 0110000011 */
+        0xf1, 0xc0, /* 1111000111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 66 0x42 'B' */
+        0x00, 0x00, /* 0000000000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x62, 0x00, /* 0110001000 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x66, 0x00, /* 0110011000 */
+        0x7e, 0x00, /* 0111111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x63, 0x00, /* 0110001100 */
+        0xfe, 0x00, /* 1111111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 67 0x43 'C' */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0x00, /* 0000111100 */
+        0x11, 0x80, /* 0001000110 */
+        0x20, 0x80, /* 0010000010 */
+        0x20, 0x00, /* 0010000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x19, 0x00, /* 0001100100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 68 0x44 'D' */
+        0x00, 0x00, /* 0000000000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x67, 0x00, /* 0110011100 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x00, /* 0110000100 */
+        0x66, 0x00, /* 0110011000 */
+        0xf8, 0x00, /* 1111100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 69 0x45 'E' */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x31, 0x00, /* 0011000100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x00, /* 0011000100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 70 0x46 'F' */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x31, 0x00, /* 0011000100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x00, /* 0011000100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 71 0x47 'G' */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0x00, /* 0000111100 */
+        0x11, 0x80, /* 0001000110 */
+        0x20, 0x80, /* 0010000010 */
+        0x20, 0x00, /* 0010000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x67, 0xc0, /* 0110011111 */
+        0x61, 0x80, /* 0110000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 72 0x48 'H' */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 73 0x49 'I' */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 74 0x4a 'J' */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x08, 0x00, /* 0000100000 */
+        0x70, 0x00, /* 0111000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 75 0x4b 'K' */
+        0x00, 0x00, /* 0000000000 */
+        0xf1, 0x80, /* 1111000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x66, 0x00, /* 0110011000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x78, 0x00, /* 0111100000 */
+        0x70, 0x00, /* 0111000000 */
+        0x70, 0x00, /* 0111000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x66, 0x00, /* 0110011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0xf0, 0xc0, /* 1111000011 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 76 0x4c 'L' */
+        0x00, 0x00, /* 0000000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 77 0x4d 'M' */
+        0x00, 0x00, /* 0000000000 */
+        0xe0, 0xc0, /* 1110000011 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x73, 0x80, /* 0111001110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 78 0x4e 'N' */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x80, /* 0111000110 */
+        0x79, 0x80, /* 0111100110 */
+        0x79, 0x80, /* 0111100110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x67, 0x80, /* 0110011110 */
+        0x67, 0x80, /* 0110011110 */
+        0x63, 0x80, /* 0110001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 79 0x4f 'O' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x17, 0x00, /* 0001011100 */
+        0x23, 0x00, /* 0010001100 */
+        0x21, 0x80, /* 0010000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x21, 0x00, /* 0010000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x1a, 0x00, /* 0001101000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 80 0x50 'P' */
+        0x00, 0x00, /* 0000000000 */
+        0xfe, 0x00, /* 1111111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0xf0, 0x00, /* 1111000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 81 0x51 'Q' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x13, 0x00, /* 0001001100 */
+        0x23, 0x00, /* 0010001100 */
+        0x21, 0x80, /* 0010000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x3b, 0x00, /* 0011101100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x26, 0x00, /* 0010011000 */
+        0x03, 0x80, /* 0000001110 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 82 0x52 'R' */
+        0x00, 0x00, /* 0000000000 */
+        0xfe, 0x00, /* 1111111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x00, /* 0110000100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x78, 0x00, /* 0111100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x6e, 0x00, /* 0110111000 */
+        0x67, 0x00, /* 0110011100 */
+        0x63, 0x80, /* 0110001110 */
+        0x61, 0xc0, /* 0110000111 */
+        0xf0, 0xc0, /* 1111000011 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 83 0x53 'S' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x00, /* 0000001100 */
+        0x01, 0x80, /* 0000000110 */
+        0x41, 0x80, /* 0100000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 84 0x54 'T' */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x4c, 0x80, /* 0100110010 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 85 0x55 'U' */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 86 0x56 'V' */
+        0x00, 0x00, /* 0000000000 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xc0, 0xc0, /* 1100000011 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x12, 0x00, /* 0001001000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 87 0x57 'W' */
+        0x00, 0x00, /* 0000000000 */
+        0xe1, 0xc0, /* 1110000111 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xe0, 0xc0, /* 1110000011 */
+        0x61, 0x80, /* 0110000110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x77, 0x00, /* 0111011100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 88 0x58 'X' */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0xf7, 0x80, /* 1111011110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 89 0x59 'Y' */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 90 0x5a 'Z' */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x80, /* 0011111110 */
+        0x21, 0x80, /* 0010000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x3f, 0x80, /* 0011111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 91 0x5b '[' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x1f, 0x00, /* 0001111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 92 0x5c '\' */
+        0x00, 0x00, /* 0000000000 */
+        0xc0, 0x00, /* 1100000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x00, 0xc0, /* 0000000011 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 93 0x5d ']' */
+        0x00, 0x00, /* 0000000000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 94 0x5e '^' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 95 0x5f '_' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 96 0x60 '`' */
+        0x04, 0x00, /* 0000010000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 97 0x61 'a' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 98 0x62 'b' */
+        0x20, 0x00, /* 0010000000 */
+        0x60, 0x00, /* 0110000000 */
+        0xe0, 0x00, /* 1110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x66, 0x00, /* 0110011000 */
+        0x6f, 0x00, /* 0110111100 */
+        0x73, 0x80, /* 0111001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x80, /* 0111000110 */
+        0x7b, 0x00, /* 0111101100 */
+        0x4e, 0x00, /* 0100111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 99 0x63 'c' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x37, 0x00, /* 0011011100 */
+        0x23, 0x00, /* 0010001100 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x71, 0x00, /* 0111000100 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 100 0x64 'd' */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x80, /* 0000001110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x0d, 0x80, /* 0000110110 */
+        0x37, 0x80, /* 0011011110 */
+        0x23, 0x80, /* 0010001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x35, 0x80, /* 0011010110 */
+        0x19, 0xc0, /* 0001100111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 101 0x65 'e' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 102 0x66 'f' */
+        0x07, 0x00, /* 0000011100 */
+        0x09, 0x80, /* 0000100110 */
+        0x09, 0x80, /* 0000100110 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x7f, 0x00, /* 0111111100 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 103 0x67 'g' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1c, 0x80, /* 0001110010 */
+        0x37, 0x80, /* 0011011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x36, 0x00, /* 0011011000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x60, 0x00, /* 0110000000 */
+        0x7f, 0x00, /* 0111111100 */
+        0x3f, 0x80, /* 0011111110 */
+        0x21, 0x80, /* 0010000110 */
+        0x40, 0x80, /* 0100000010 */
+        0x7f, 0x00, /* 0111111100 */
+        0x3e, 0x00, /* 0011111000 */
+
+        /* 104 0x68 'h' */
+        0x10, 0x00, /* 0001000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x70, 0x00, /* 0111000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x37, 0x00, /* 0011011100 */
+        0x3b, 0x80, /* 0011101110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 105 0x69 'i' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 106 0x6a 'j' */
+        0x00, 0x00, /* 0000000000 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x07, 0x80, /* 0000011110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x41, 0x80, /* 0100000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x80, /* 0111000110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1c, 0x00, /* 0001110000 */
+
+        /* 107 0x6b 'k' */
+        0x60, 0x00, /* 0110000000 */
+        0xe0, 0x00, /* 1110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x63, 0x80, /* 0110001110 */
+        0x66, 0x00, /* 0110011000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x78, 0x00, /* 0111100000 */
+        0x70, 0x00, /* 0111000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x6e, 0x00, /* 0110111000 */
+        0x67, 0x00, /* 0110011100 */
+        0xf3, 0x80, /* 1111001110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 108 0x6c 'l' */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 109 0x6d 'm' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xdb, 0x80, /* 1101101110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0xed, 0xc0, /* 1110110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 110 0x6e 'n' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x6f, 0x00, /* 0110111100 */
+        0x7b, 0x80, /* 0111101110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 111 0x6f 'o' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xe1, 0x80, /* 1110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 112 0x70 'p' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xde, 0x00, /* 1101111000 */
+        0x76, 0x00, /* 0111011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x80, /* 0111000110 */
+        0x7b, 0x00, /* 0111101100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0xf0, 0x00, /* 1111000000 */
+
+        /* 113 0x71 'q' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0xc0, /* 0000111011 */
+        0x1b, 0x80, /* 0001101110 */
+        0x33, 0x80, /* 0011001110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x71, 0x80, /* 0111000110 */
+        0x3b, 0x80, /* 0011101110 */
+        0x1f, 0x80, /* 0001111110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0xc0, /* 0000001111 */
+
+        /* 114 0x72 'r' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x73, 0x00, /* 0111001100 */
+        0x35, 0x80, /* 0011010110 */
+        0x39, 0x80, /* 0011100110 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x78, 0x00, /* 0111100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 115 0x73 's' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x00, /* 0110000100 */
+        0x70, 0x00, /* 0111000000 */
+        0x38, 0x00, /* 0011100000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x07, 0x00, /* 0000011100 */
+        0x43, 0x00, /* 0100001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 116 0x74 't' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x1c, 0x80, /* 0001110010 */
+        0x0f, 0x00, /* 0000111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 117 0x75 'u' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x77, 0x00, /* 0111011100 */
+        0x3d, 0x80, /* 0011110110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 118 0x76 'v' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf1, 0xc0, /* 1111000111 */
+        0x60, 0xc0, /* 0110000011 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x19, 0x80, /* 0001100110 */
+        0x1b, 0x00, /* 0001101100 */
+        0x0f, 0x00, /* 0000111100 */
+        0x0f, 0x00, /* 0000111100 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 119 0x77 'w' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xe3, 0xc0, /* 1110001111 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0x6b, 0x00, /* 0110101100 */
+        0x6b, 0x00, /* 0110101100 */
+        0x7e, 0x00, /* 0111111000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 120 0x78 'x' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x63, 0x00, /* 0110001100 */
+        0xf7, 0x80, /* 1111011110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 121 0x79 'y' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x70, 0x00, /* 0111000000 */
+
+        /* 122 0x7a 'z' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x61, 0x80, /* 0110000110 */
+        0x43, 0x00, /* 0100001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x80, /* 0110000010 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 123 0x7b '{' */
+        0x07, 0x00, /* 0000011100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x70, 0x00, /* 0111000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x07, 0x00, /* 0000011100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 124 0x7c '|' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 125 0x7d '}' */
+        0x38, 0x00, /* 0011100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x03, 0x80, /* 0000001110 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x38, 0x00, /* 0011100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 126 0x7e '~' */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x80, /* 0001100010 */
+        0x3d, 0x80, /* 0011110110 */
+        0x6f, 0x00, /* 0110111100 */
+        0x46, 0x00, /* 0100011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 127 0x7f '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x12, 0x00, /* 0001001000 */
+        0x21, 0x00, /* 0010000100 */
+        0x40, 0x80, /* 0100000010 */
+        0x40, 0x80, /* 0100000010 */
+        0x40, 0x80, /* 0100000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 128 0x80 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x21, 0x80, /* 0010000110 */
+        0x40, 0x80, /* 0100000010 */
+        0x40, 0x00, /* 0100000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x40, 0x00, /* 0100000000 */
+        0x60, 0x80, /* 0110000010 */
+        0x31, 0x00, /* 0011000100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x08, 0x00, /* 0000100000 */
+        0x04, 0x00, /* 0000010000 */
+        0x02, 0x00, /* 0000001000 */
+        0x02, 0x00, /* 0000001000 */
+        0x1c, 0x00, /* 0001110000 */
+
+        /* 129 0x81 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7b, 0x80, /* 0111101110 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x3b, 0x00, /* 0011101100 */
+        0x1c, 0x80, /* 0001110010 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 130 0x82 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x01, 0x00, /* 0000000100 */
+        0x02, 0x00, /* 0000001000 */
+        0x04, 0x00, /* 0000010000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 131 0x83 '.' */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x31, 0x80, /* 0011000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 132 0x84 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 133 0x85 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 134 0x86 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 135 0x87 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x20, 0x80, /* 0010000010 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x70, 0x80, /* 0111000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x1f, 0x00, /* 0001111100 */
+        0x04, 0x00, /* 0000010000 */
+        0x02, 0x00, /* 0000001000 */
+        0x01, 0x00, /* 0000000100 */
+        0x0e, 0x00, /* 0000111000 */
+
+        /* 136 0x88 '.' */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x31, 0x80, /* 0011000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 137 0x89 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 138 0x8a '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x19, 0x80, /* 0001100110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 139 0x8b '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x36, 0x00, /* 0011011000 */
+        0x36, 0x00, /* 0011011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 140 0x8c '.' */
+        0x08, 0x00, /* 0000100000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 141 0x8d '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 142 0x8e '.' */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x04, 0x00, /* 0000010000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x19, 0x00, /* 0001100100 */
+        0x19, 0x00, /* 0001100100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 143 0x8f '.' */
+        0x04, 0x00, /* 0000010000 */
+        0x0a, 0x00, /* 0000101000 */
+        0x0a, 0x00, /* 0000101000 */
+        0x04, 0x00, /* 0000010000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x19, 0x00, /* 0001100100 */
+        0x19, 0x00, /* 0001100100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 144 0x90 '.' */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x00, /* 0011000000 */
+        0x31, 0x00, /* 0011000100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x31, 0x00, /* 0011000100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x30, 0x80, /* 0011000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 145 0x91 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3b, 0x80, /* 0011101110 */
+        0x6c, 0xc0, /* 0110110011 */
+        0x4c, 0xc0, /* 0100110011 */
+        0x0c, 0xc0, /* 0000110011 */
+        0x3f, 0xc0, /* 0011111111 */
+        0x6c, 0x00, /* 0110110000 */
+        0xcc, 0x00, /* 1100110000 */
+        0xcc, 0x00, /* 1100110000 */
+        0xee, 0xc0, /* 1110111011 */
+        0x7b, 0x80, /* 0111101110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 146 0x92 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x07, 0xc0, /* 0000011111 */
+        0x0e, 0x40, /* 0000111001 */
+        0x0e, 0x40, /* 0000111001 */
+        0x0e, 0x00, /* 0000111000 */
+        0x16, 0x00, /* 0001011000 */
+        0x16, 0x80, /* 0001011010 */
+        0x17, 0x80, /* 0001011110 */
+        0x16, 0x80, /* 0001011010 */
+        0x3e, 0x00, /* 0011111000 */
+        0x26, 0x00, /* 0010011000 */
+        0x26, 0x00, /* 0010011000 */
+        0x46, 0x40, /* 0100011001 */
+        0x46, 0x40, /* 0100011001 */
+        0xef, 0xc0, /* 1110111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 147 0x93 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x08, 0x00, /* 0000100000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xe1, 0x80, /* 1110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 148 0x94 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xe1, 0x80, /* 1110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 149 0x95 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xe1, 0x80, /* 1110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 150 0x96 '.' */
+        0x08, 0x00, /* 0000100000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x77, 0x00, /* 0111011100 */
+        0x3d, 0x80, /* 0011110110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 151 0x97 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x77, 0x00, /* 0111011100 */
+        0x3d, 0x80, /* 0011110110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 152 0x98 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x78, 0x00, /* 0111100000 */
+        0x70, 0x00, /* 0111000000 */
+
+        /* 153 0x99 '.' */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x17, 0x00, /* 0001011100 */
+        0x23, 0x00, /* 0010001100 */
+        0x21, 0x80, /* 0010000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x21, 0x00, /* 0010000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x1a, 0x00, /* 0001101000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 154 0x9a '.' */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0xf1, 0xc0, /* 1111000111 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x60, 0x80, /* 0110000010 */
+        0x71, 0x00, /* 0111000100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 155 0x9b '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x1f, 0x80, /* 0001111110 */
+        0x36, 0x80, /* 0011011010 */
+        0x26, 0x00, /* 0010011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x66, 0x00, /* 0110011000 */
+        0x76, 0x00, /* 0111011000 */
+        0x36, 0x80, /* 0011011010 */
+        0x1f, 0x80, /* 0001111110 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 156 0x9c '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3b, 0x00, /* 0011101100 */
+        0x33, 0x00, /* 0011001100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x7e, 0x00, /* 0111111000 */
+        0x7e, 0x00, /* 0111111000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x7c, 0x80, /* 0111110010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x43, 0x00, /* 0100001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 157 0x9d '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x40, 0x80, /* 0100000010 */
+        0x40, 0x80, /* 0100000010 */
+        0x21, 0x00, /* 0010000100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 158 0x9e '.' */
+        0x00, 0x00, /* 0000000000 */
+        0xbf, 0x00, /* 1011111100 */
+        0x40, 0x80, /* 0100000010 */
+        0x40, 0x80, /* 0100000010 */
+        0x7f, 0x00, /* 0111111100 */
+        0x40, 0x00, /* 0100000000 */
+        0x48, 0x00, /* 0100100000 */
+        0x48, 0x00, /* 0100100000 */
+        0x5e, 0x00, /* 0101111000 */
+        0x48, 0x00, /* 0100100000 */
+        0x48, 0x00, /* 0100100000 */
+        0x48, 0x00, /* 0100100000 */
+        0x48, 0x80, /* 0100100010 */
+        0x47, 0x00, /* 0100011100 */
+        0xe0, 0x00, /* 1110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 159 0x9f '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x00, /* 0000001100 */
+        0x04, 0x80, /* 0000010010 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x09, 0x00, /* 0000100100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x48, 0x00, /* 0100100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x08, 0x00, /* 0000100000 */
+        0x90, 0x00, /* 1001000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 160 0xa0 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x21, 0x80, /* 0010000110 */
+        0x07, 0x80, /* 0000011110 */
+        0x39, 0x80, /* 0011100110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x3d, 0xc0, /* 0011110111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 161 0xa1 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x00, /* 0000001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 162 0xa2 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xc1, 0x80, /* 1100000110 */
+        0xe1, 0x80, /* 1110000110 */
+        0x73, 0x00, /* 0111001100 */
+        0x3c, 0x00, /* 0011110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 163 0xa3 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0xf7, 0x80, /* 1111011110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x77, 0x00, /* 0111011100 */
+        0x3d, 0x80, /* 0011110110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 164 0xa4 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x38, 0x80, /* 0011100010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x47, 0x00, /* 0100011100 */
+        0x00, 0x00, /* 0000000000 */
+        0x6f, 0x00, /* 0110111100 */
+        0x7b, 0x80, /* 0111101110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x7b, 0xc0, /* 0111101111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 165 0xa5 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x38, 0x80, /* 0011100010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x47, 0x00, /* 0100011100 */
+        0x00, 0x00, /* 0000000000 */
+        0xe3, 0xc0, /* 1110001111 */
+        0x71, 0x80, /* 0111000110 */
+        0x79, 0x80, /* 0111100110 */
+        0x79, 0x80, /* 0111100110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x67, 0x80, /* 0110011110 */
+        0x63, 0x80, /* 0110001110 */
+        0x61, 0x80, /* 0110000110 */
+        0xf0, 0xc0, /* 1111000011 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 166 0xa6 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x63, 0x00, /* 0110001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x0f, 0x00, /* 0000111100 */
+        0x33, 0x00, /* 0011001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x67, 0x00, /* 0110011100 */
+        0x3b, 0x80, /* 0011101110 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 167 0xa7 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x21, 0x80, /* 0010000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x00, /* 0110000100 */
+        0x33, 0x00, /* 0011001100 */
+        0x1c, 0x00, /* 0001110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 168 0xa8 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x00, 0x00, /* 0000000000 */
+        0x06, 0x00, /* 0000011000 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x80, /* 0110000010 */
+        0x73, 0x80, /* 0111001110 */
+        0x3f, 0x00, /* 0011111100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 169 0xa9 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 170 0xaa '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 171 0xab '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x20, 0x80, /* 0010000010 */
+        0x21, 0x00, /* 0010000100 */
+        0x22, 0x00, /* 0010001000 */
+        0x74, 0x00, /* 0111010000 */
+        0x08, 0x00, /* 0000100000 */
+        0x17, 0x00, /* 0001011100 */
+        0x28, 0x80, /* 0010100010 */
+        0x43, 0x00, /* 0100001100 */
+        0x04, 0x00, /* 0000010000 */
+        0x08, 0x00, /* 0000100000 */
+        0x0f, 0x80, /* 0000111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 172 0xac '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x20, 0x00, /* 0010000000 */
+        0x20, 0x80, /* 0010000010 */
+        0x21, 0x00, /* 0010000100 */
+        0x22, 0x00, /* 0010001000 */
+        0x74, 0x00, /* 0111010000 */
+        0x09, 0x00, /* 0000100100 */
+        0x13, 0x00, /* 0001001100 */
+        0x25, 0x00, /* 0010010100 */
+        0x49, 0x00, /* 0100100100 */
+        0x1f, 0x80, /* 0001111110 */
+        0x01, 0x00, /* 0000000100 */
+        0x01, 0x00, /* 0000000100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 173 0xad '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 174 0xae '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0d, 0x80, /* 0000110110 */
+        0x1b, 0x00, /* 0001101100 */
+        0x36, 0x00, /* 0011011000 */
+        0x6c, 0x00, /* 0110110000 */
+        0xd8, 0x00, /* 1101100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x0d, 0x80, /* 0000110110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 175 0xaf '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x36, 0x00, /* 0011011000 */
+        0x1b, 0x00, /* 0001101100 */
+        0x0d, 0x80, /* 0000110110 */
+        0x06, 0xc0, /* 0000011011 */
+        0x0d, 0x80, /* 0000110110 */
+        0x1b, 0x00, /* 0001101100 */
+        0x36, 0x00, /* 0011011000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 176 0xb0 '.' */
+        0xc3, 0x00, /* 1100001100 */
+        0x41, 0x00, /* 0100000100 */
+        0x18, 0x40, /* 0001100001 */
+        0x10, 0x40, /* 0001000001 */
+        0xc3, 0x00, /* 1100001100 */
+        0x41, 0x00, /* 0100000100 */
+        0x18, 0x40, /* 0001100001 */
+        0x10, 0x40, /* 0001000001 */
+        0xc3, 0x00, /* 1100001100 */
+        0x41, 0x00, /* 0100000100 */
+        0x18, 0x40, /* 0001100001 */
+        0x10, 0x40, /* 0001000001 */
+        0xc3, 0x00, /* 1100001100 */
+        0x41, 0x00, /* 0100000100 */
+        0x18, 0x40, /* 0001100001 */
+        0x10, 0x40, /* 0001000001 */
+        0xc3, 0x00, /* 1100001100 */
+        0x41, 0x00, /* 0100000100 */
+
+        /* 177 0xb1 '.' */
+        0x11, 0x00, /* 0001000100 */
+        0xbb, 0x80, /* 1011101110 */
+        0x11, 0x00, /* 0001000100 */
+        0x44, 0x40, /* 0100010001 */
+        0xee, 0xc0, /* 1110111011 */
+        0x44, 0x40, /* 0100010001 */
+        0x11, 0x00, /* 0001000100 */
+        0xbb, 0x80, /* 1011101110 */
+        0x11, 0x00, /* 0001000100 */
+        0x44, 0x40, /* 0100010001 */
+        0xee, 0xc0, /* 1110111011 */
+        0x44, 0x40, /* 0100010001 */
+        0x11, 0x00, /* 0001000100 */
+        0xbb, 0x80, /* 1011101110 */
+        0x11, 0x00, /* 0001000100 */
+        0x44, 0x40, /* 0100010001 */
+        0xee, 0xc0, /* 1110111011 */
+        0x44, 0x40, /* 0100010001 */
+
+        /* 178 0xb2 '.' */
+        0x3c, 0xc0, /* 0011110011 */
+        0xbe, 0xc0, /* 1011111011 */
+        0xe7, 0x80, /* 1110011110 */
+        0xef, 0x80, /* 1110111110 */
+        0x3c, 0xc0, /* 0011110011 */
+        0xbe, 0xc0, /* 1011111011 */
+        0xe7, 0x80, /* 1110011110 */
+        0xef, 0x80, /* 1110111110 */
+        0x3c, 0xc0, /* 0011110011 */
+        0xbe, 0xc0, /* 1011111011 */
+        0xe7, 0x80, /* 1110011110 */
+        0xef, 0x80, /* 1110111110 */
+        0x3c, 0xc0, /* 0011110011 */
+        0xbe, 0xc0, /* 1011111011 */
+        0xe7, 0x80, /* 1110011110 */
+        0xef, 0x80, /* 1110111110 */
+        0x3c, 0xc0, /* 0011110011 */
+        0xbe, 0xc0, /* 1011111011 */
+
+        /* 179 0xb3 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 180 0xb4 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 181 0xb5 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 182 0xb6 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 183 0xb7 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0x00, /* 1111111100 */
+        0xff, 0x00, /* 1111111100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 184 0xb8 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 185 0xb9 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0x03, 0x00, /* 0000001100 */
+        0xfb, 0x00, /* 1111101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 186 0xba '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 187 0xbb '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0x00, /* 1111111100 */
+        0xff, 0x00, /* 1111111100 */
+        0x03, 0x00, /* 0000001100 */
+        0xfb, 0x00, /* 1111101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 188 0xbc '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0xfb, 0x00, /* 1111101100 */
+        0x03, 0x00, /* 0000001100 */
+        0xff, 0x00, /* 1111111100 */
+        0xff, 0x00, /* 1111111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 189 0xbd '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xff, 0x00, /* 1111111100 */
+        0xff, 0x00, /* 1111111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 190 0xbe '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 191 0xbf '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 192 0xc0 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 193 0xc1 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 194 0xc2 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 195 0xc3 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 196 0xc4 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 197 0xc5 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 198 0xc6 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 199 0xc7 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 200 0xc8 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x18, 0x00, /* 0001100000 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 201 0xc9 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x18, 0x00, /* 0001100000 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 202 0xca '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xfb, 0xc0, /* 1111101111 */
+        0xfb, 0xc0, /* 1111101111 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 203 0xcb '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0xfb, 0xc0, /* 1111101111 */
+        0xfb, 0xc0, /* 1111101111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 204 0xcc '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x18, 0x00, /* 0001100000 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0xc0, /* 0001101111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 205 0xcd '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 206 0xce '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xfb, 0xc0, /* 1111101111 */
+        0xfb, 0xc0, /* 1111101111 */
+        0x00, 0x00, /* 0000000000 */
+        0xfb, 0xc0, /* 1111101111 */
+        0xfb, 0xc0, /* 1111101111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 207 0xcf '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 208 0xd0 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 209 0xd1 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 210 0xd2 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 211 0xd3 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 212 0xd4 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 213 0xd5 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 214 0xd6 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 215 0xd7 '.' */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+        0x1b, 0x00, /* 0001101100 */
+
+        /* 216 0xd8 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 217 0xd9 '.' */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0xfc, 0x00, /* 1111110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 218 0xda '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+
+        /* 219 0xdb '.' */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+
+        /* 220 0xdc '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+
+        /* 221 0xdd '.' */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+        0xf8, 0x00, /* 1111100000 */
+
+        /* 222 0xde '.' */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+        0x07, 0xc0, /* 0000011111 */
+
+        /* 223 0xdf '.' */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0xff, 0xc0, /* 1111111111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 224 0xe0 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1c, 0x80, /* 0001110010 */
+        0x35, 0x80, /* 0011010110 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x63, 0x00, /* 0110001100 */
+        0x37, 0x80, /* 0011011110 */
+        0x1c, 0x80, /* 0001110010 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 225 0xe1 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x6f, 0x00, /* 0110111100 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x63, 0x00, /* 0110001100 */
+        0x6e, 0x00, /* 0110111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 226 0xe2 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 227 0xe3 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 228 0xe4 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0x80, /* 1111111110 */
+        0x60, 0x00, /* 0110000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x80, /* 0011000010 */
+        0x61, 0x80, /* 0110000110 */
+        0xff, 0x80, /* 1111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 229 0xe5 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1f, 0xc0, /* 0001111111 */
+        0x36, 0x00, /* 0011011000 */
+        0x63, 0x00, /* 0110001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x3e, 0x00, /* 0011111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 230 0xe6 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x73, 0x80, /* 0111001110 */
+        0x6d, 0x80, /* 0110110110 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0xc0, 0x00, /* 1100000000 */
+
+        /* 231 0xe7 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x01, 0x80, /* 0000000110 */
+        0x36, 0x40, /* 0011011001 */
+        0x5e, 0x00, /* 0101111000 */
+        0x8c, 0x00, /* 1000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 232 0xe8 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 233 0xe9 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x1f, 0x00, /* 0001111100 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x60, 0xc0, /* 0110000011 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x7f, 0xc0, /* 0111111111 */
+        0x60, 0xc0, /* 0110000011 */
+        0x31, 0x80, /* 0011000110 */
+        0x31, 0x80, /* 0011000110 */
+        0x1f, 0x00, /* 0001111100 */
+        0x0e, 0x00, /* 0000111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 234 0xea '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xc0, 0xc0, /* 1100000011 */
+        0xc0, 0xc0, /* 1100000011 */
+        0x61, 0x80, /* 0110000110 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0xf3, 0xc0, /* 1111001111 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 235 0xeb '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x07, 0x00, /* 0000011100 */
+        0x1f, 0x80, /* 0001111110 */
+        0x30, 0xc0, /* 0011000011 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x3e, 0x00, /* 0011111000 */
+        0x66, 0x00, /* 0110011000 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc3, 0x00, /* 1100001100 */
+        0xc3, 0x00, /* 1100001100 */
+        0x66, 0x00, /* 0110011000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 236 0xec '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x33, 0x00, /* 0011001100 */
+        0x6d, 0x80, /* 0110110110 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0x6d, 0x80, /* 0110110110 */
+        0x33, 0x00, /* 0011001100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 237 0xed '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x01, 0x80, /* 0000000110 */
+        0x01, 0x80, /* 0000000110 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x37, 0x00, /* 0011011100 */
+        0x6d, 0x80, /* 0110110110 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0xcc, 0xc0, /* 1100110011 */
+        0x6d, 0x80, /* 0110110110 */
+        0x3b, 0x00, /* 0011101100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x60, 0x00, /* 0110000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 238 0xee '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x80, /* 0000001110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x3f, 0x80, /* 0011111110 */
+        0x3f, 0x80, /* 0011111110 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x18, 0x00, /* 0001100000 */
+        0x18, 0x00, /* 0001100000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x03, 0x80, /* 0000001110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 239 0xef '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x61, 0x80, /* 0110000110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 240 0xf0 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 241 0xf1 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 242 0xf2 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xe0, 0x00, /* 1110000000 */
+        0x38, 0x00, /* 0011100000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x03, 0x80, /* 0000001110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x38, 0x00, /* 0011100000 */
+        0xe0, 0x00, /* 1110000000 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0x00, /* 1111111100 */
+        0xff, 0x00, /* 1111111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 243 0xf3 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x03, 0x80, /* 0000001110 */
+        0x0e, 0x00, /* 0000111000 */
+        0x38, 0x00, /* 0011100000 */
+        0xe0, 0x00, /* 1110000000 */
+        0x38, 0x00, /* 0011100000 */
+        0x0e, 0x00, /* 0000111000 */
+        0x03, 0x80, /* 0000001110 */
+        0x00, 0x00, /* 0000000000 */
+        0xff, 0x80, /* 1111111110 */
+        0xff, 0x80, /* 1111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 244 0xf4 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x30, 0x00, /* 0011000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 245 0xf5 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x03, 0x00, /* 0000001100 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 246 0xf6 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 247 0xf7 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x38, 0x00, /* 0011100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x06, 0xc0, /* 0000011011 */
+        0x03, 0x80, /* 0000001110 */
+        0x38, 0x00, /* 0011100000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x06, 0xc0, /* 0000011011 */
+        0x03, 0x80, /* 0000001110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 248 0xf8 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x33, 0x00, /* 0011001100 */
+        0x33, 0x00, /* 0011001100 */
+        0x1e, 0x00, /* 0001111000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 249 0xf9 '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 250 0xfa '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 251 0xfb '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0f, 0xc0, /* 0000111111 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0xcc, 0x00, /* 1100110000 */
+        0x6c, 0x00, /* 0110110000 */
+        0x3c, 0x00, /* 0011110000 */
+        0x1c, 0x00, /* 0001110000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 252 0xfc '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x27, 0x00, /* 0010011100 */
+        0x7b, 0x00, /* 0111101100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x31, 0x00, /* 0011000100 */
+        0x7b, 0x80, /* 0111101110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 253 0xfd '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x1e, 0x00, /* 0001111000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x63, 0x00, /* 0110001100 */
+        0x43, 0x00, /* 0100001100 */
+        0x06, 0x00, /* 0000011000 */
+        0x0c, 0x00, /* 0000110000 */
+        0x18, 0x00, /* 0001100000 */
+        0x30, 0x80, /* 0011000010 */
+        0x7f, 0x80, /* 0111111110 */
+        0x7f, 0x80, /* 0111111110 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 254 0xfe '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x3f, 0x00, /* 0011111100 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+        /* 255 0xff '.' */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+        0x00, 0x00, /* 0000000000 */
+
+};
+
+
+struct font_desc font_10x18 = {
+        FONT10x18_IDX,
+        "10x18",
+        10,
+        18,
+        fontdata_10x18,
+#ifdef __sparc__
+        5
+#else
+        -1
+#endif
+};
diff --git a/drivers/video/console/font_7x14.c b/drivers/video/console/font_7x14.c
new file mode 100644
index 000000000000..1fa7fcf2ff72
--- /dev/null
+++ b/drivers/video/console/font_7x14.c
@@ -0,0 +1,4118 @@
+/**************************************/
+/* this file adapted from font_8x16.c */
+/* by Jurriaan Kalkman 05-2005        */
+/**************************************/
+
+#include <linux/font.h>
+
+#define FONTDATAMAX 3584
+
+static unsigned char fontdata_7x14[FONTDATAMAX] = {
+
+        /* 0 0x00 '^@' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 1 0x01 '^A' */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x82, /* 1000001 */
+        0xaa, /* 1010101 */
+        0x82, /* 1000001 */
+        0x82, /* 1000001 */
+        0xba, /* 1011101 */
+        0x92, /* 1001001 */
+        0x82, /* 1000001 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 2 0x02 '^B' */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0xfe, /* 1111111 */
+        0xd6, /* 1101011 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xc6, /* 1100011 */
+        0xee, /* 1110111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 3 0x03 '^C' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x7c, /* 0111110 */
+        0xfe, /* 1111111 */
+        0x7c, /* 0111110 */
+        0x38, /* 0011100 */
+        0x18, /* 0001100 */
+        0x10, /* 0001000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 4 0x04 '^D' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x7c, /* 0111110 */
+        0xfe, /* 1111111 */
+        0x7c, /* 0111110 */
+        0x38, /* 0011100 */
+        0x10, /* 0001000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 5 0x05 '^E' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x38, /* 0011100 */
+        0x38, /* 0011100 */
+        0xee, /* 1110111 */
+        0xee, /* 1110111 */
+        0xee, /* 1110111 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 6 0x06 '^F' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x7c, /* 0111110 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x7c, /* 0111110 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 7 0x07 '^G' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 8 0x08 '^H' */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xe6, /* 1110011 */
+        0xc2, /* 1100001 */
+        0xc2, /* 1100001 */
+        0xe6, /* 1110011 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+
+        /* 9 0x09 '^I' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x44, /* 0100010 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 10 0x0a '^J' */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xc6, /* 1100011 */
+        0x92, /* 1001001 */
+        0xba, /* 1011101 */
+        0x92, /* 1001001 */
+        0xc6, /* 1100011 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+
+        /* 11 0x0b '^K' */
+        0x00, /* 0000000 */
+        0x1e, /* 0001111 */
+        0x0e, /* 0000111 */
+        0x1a, /* 0001101 */
+        0x1a, /* 0001101 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 12 0x0c '^L' */
+        0x00, /* 0000000 */
+        0x3c, /* 0011110 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x7e, /* 0111111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 13 0x0d '^M' */
+        0x00, /* 0000000 */
+        0x3e, /* 0011111 */
+        0x36, /* 0011011 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x70, /* 0111000 */
+        0xf0, /* 1111000 */
+        0xe0, /* 1110000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 14 0x0e '^N' */
+        0x00, /* 0000000 */
+        0x7e, /* 0111111 */
+        0x66, /* 0110011 */
+        0x7e, /* 0111111 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x66, /* 0110011 */
+        0x6e, /* 0110111 */
+        0xee, /* 1110111 */
+        0xec, /* 1110110 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 15 0x0f '^O' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0xd6, /* 1101011 */
+        0x38, /* 0011100 */
+        0xee, /* 1110111 */
+        0x38, /* 0011100 */
+        0xd6, /* 1101011 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 16 0x10 '^P' */
+        0x00, /* 0000000 */
+        0x80, /* 1000000 */
+        0xc0, /* 1100000 */
+        0xe0, /* 1110000 */
+        0xf0, /* 1111000 */
+        0xfc, /* 1111110 */
+        0xf0, /* 1111000 */
+        0xe0, /* 1110000 */
+        0xc0, /* 1100000 */
+        0x80, /* 1000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 17 0x11 '^Q' */
+        0x00, /* 0000000 */
+        0x04, /* 0000010 */
+        0x0c, /* 0000110 */
+        0x1c, /* 0001110 */
+        0x3c, /* 0011110 */
+        0xfc, /* 1111110 */
+        0x3c, /* 0011110 */
+        0x1c, /* 0001110 */
+        0x0c, /* 0000110 */
+        0x04, /* 0000010 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 18 0x12 '^R' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x7e, /* 0111111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x7e, /* 0111111 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 19 0x13 '^S' */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 20 0x14 '^T' */
+        0x00, /* 0000000 */
+        0x7e, /* 0111111 */
+        0xd4, /* 1101010 */
+        0xd4, /* 1101010 */
+        0xd4, /* 1101010 */
+        0x74, /* 0111010 */
+        0x14, /* 0001010 */
+        0x14, /* 0001010 */
+        0x14, /* 0001010 */
+        0x14, /* 0001010 */
+        0x16, /* 0001011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 21 0x15 '^U' */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x60, /* 0110000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x18, /* 0001100 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 22 0x16 '^V' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 23 0x17 '^W' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x7e, /* 0111111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x7e, /* 0111111 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x7e, /* 0111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 24 0x18 '^X' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x7e, /* 0111111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 25 0x19 '^Y' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x7e, /* 0111111 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 26 0x1a '^Z' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0xfc, /* 1111110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 27 0x1b '^[' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xfc, /* 1111110 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 28 0x1c '^\' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 29 0x1d '^]' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x28, /* 0010100 */
+        0x6c, /* 0110110 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x28, /* 0010100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 30 0x1e '^^' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 31 0x1f '^_' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 32 0x20 ' ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 33 0x21 '!' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x3c, /* 0011110 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 34 0x22 '"' */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x28, /* 0010100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 35 0x23 '#' */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 36 0x24 '$' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xc4, /* 1100010 */
+        0xc0, /* 1100000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x8c, /* 1000110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+
+        /* 37 0x25 '%' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc4, /* 1100010 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xcc, /* 1100110 */
+        0x8c, /* 1000110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 38 0x26 '&' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x78, /* 0111100 */
+        0xde, /* 1101111 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xdc, /* 1101110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 39 0x27 ''' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 40 0x28 '(' */
+        0x00, /* 0000000 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x0c, /* 0000110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 41 0x29 ')' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 42 0x2a '*' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0xfe, /* 1111111 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 43 0x2b '+' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0x7c, /* 0111110 */
+        0x10, /* 0001000 */
+        0x10, /* 0001000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 44 0x2c ',' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 45 0x2d '-' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 46 0x2e '.' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 47 0x2f '/' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x04, /* 0000010 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0x80, /* 1000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 48 0x30 '0' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xdc, /* 1101110 */
+        0xec, /* 1110110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 49 0x31 '1' */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x38, /* 0011100 */
+        0x78, /* 0111100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 50 0x32 '2' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 51 0x33 '3' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x38, /* 0011100 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 52 0x34 '4' */
+        0x00, /* 0000000 */
+        0x0c, /* 0000110 */
+        0x1c, /* 0001110 */
+        0x3c, /* 0011110 */
+        0x6c, /* 0110110 */
+        0xcc, /* 1100110 */
+        0xfe, /* 1111111 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 53 0x35 '5' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xf8, /* 1111100 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 54 0x36 '6' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xf8, /* 1111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 55 0x37 '7' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 56 0x38 '8' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 57 0x39 '9' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 58 0x3a ':' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 59 0x3b ';' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 60 0x3c '<' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x04, /* 0000010 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x0c, /* 0000110 */
+        0x04, /* 0000010 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 61 0x3d '=' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 62 0x3e '>' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x40, /* 0100000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x40, /* 0100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 63 0x3f '?' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 64 0x40 '@' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xdc, /* 1101110 */
+        0xdc, /* 1101110 */
+        0xd8, /* 1101100 */
+        0xc0, /* 1100000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 65 0x41 'A' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 66 0x42 'B' */
+        0x00, /* 0000000 */
+        0xf8, /* 1111100 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x78, /* 0111100 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xf8, /* 1111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 67 0x43 'C' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc4, /* 1100010 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc4, /* 1100010 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 68 0x44 'D' */
+        0x00, /* 0000000 */
+        0xf0, /* 1111000 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xd8, /* 1101100 */
+        0xf0, /* 1111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 69 0x45 'E' */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x6c, /* 0110110 */
+        0x64, /* 0110010 */
+        0x68, /* 0110100 */
+        0x78, /* 0111100 */
+        0x68, /* 0110100 */
+        0x60, /* 0110000 */
+        0x64, /* 0110010 */
+        0x6c, /* 0110110 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 70 0x46 'F' */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x64, /* 0110010 */
+        0x60, /* 0110000 */
+        0x68, /* 0110100 */
+        0x78, /* 0111100 */
+        0x68, /* 0110100 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 71 0x47 'G' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc4, /* 1100010 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xdc, /* 1101110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x6c, /* 0110110 */
+        0x34, /* 0011010 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 72 0x48 'H' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 73 0x49 'I' */
+        0x00, /* 0000000 */
+        0x3c, /* 0011110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 74 0x4a 'J' */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 75 0x4b 'K' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xd8, /* 1101100 */
+        0xf0, /* 1111000 */
+        0xf0, /* 1111000 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 76 0x4c 'L' */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc4, /* 1100010 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 77 0x4d 'M' */
+        0x00, /* 0000000 */
+        0xc6, /* 1100011 */
+        0xee, /* 1110111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xd6, /* 1101011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 78 0x4e 'N' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xec, /* 1110110 */
+        0xec, /* 1110110 */
+        0xfc, /* 1111110 */
+        0xdc, /* 1101110 */
+        0xdc, /* 1101110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 79 0x4f 'O' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 80 0x50 'P' */
+        0x00, /* 0000000 */
+        0xf8, /* 1111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 81 0x51 'Q' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xdc, /* 1101110 */
+        0x78, /* 0111100 */
+        0x18, /* 0001100 */
+        0x1c, /* 0001110 */
+        0x00, /* 0000000 */
+
+        /* 82 0x52 'R' */
+        0x00, /* 0000000 */
+        0xf8, /* 1111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 83 0x53 'S' */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0xc4, /* 1100010 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x60, /* 0110000 */
+        0x38, /* 0011100 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x8c, /* 1000110 */
+        0xf8, /* 1111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 84 0x54 'T' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0xb4, /* 1011010 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 85 0x55 'U' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 86 0x56 'V' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 87 0x57 'W' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xfc, /* 1111110 */
+        0x48, /* 0100100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 88 0x58 'X' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 89 0x59 'Y' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 90 0x5a 'Z' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0x8c, /* 1000110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc4, /* 1100010 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 91 0x5b '[' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 92 0x5c '\' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x80, /* 1000000 */
+        0xc0, /* 1100000 */
+        0xe0, /* 1110000 */
+        0x70, /* 0111000 */
+        0x38, /* 0011100 */
+        0x1c, /* 0001110 */
+        0x0c, /* 0000110 */
+        0x04, /* 0000010 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 93 0x5d ']' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 94 0x5e '^' */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc6, /* 1100011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 95 0x5f '_' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+
+        /* 96 0x60 '`' */
+        0x00, /* 0000000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 97 0x61 'a' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 98 0x62 'b' */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xf0, /* 1111000 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 99 0x63 'c' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 100 0x64 'd' */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x3c, /* 0011110 */
+        0x6c, /* 0110110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 101 0x65 'e' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 102 0x66 'f' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x64, /* 0110010 */
+        0x60, /* 0110000 */
+        0xf0, /* 1111000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0xf0, /* 1111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 103 0x67 'g' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x0c, /* 0000110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+
+        /* 104 0x68 'h' */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xd8, /* 1101100 */
+        0xec, /* 1110110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 105 0x69 'i' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 106 0x6a 'j' */
+        0x00, /* 0000000 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+
+        /* 107 0x6b 'k' */
+        0x00, /* 0000000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0xd8, /* 1101100 */
+        0xf0, /* 1111000 */
+        0xf0, /* 1111000 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 108 0x6c 'l' */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 109 0x6d 'm' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xec, /* 1110110 */
+        0xfe, /* 1111111 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 110 0x6e 'n' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xb8, /* 1011100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 111 0x6f 'o' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 112 0x70 'p' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xb8, /* 1011100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+
+        /* 113 0x71 'q' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x74, /* 0111010 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+
+        /* 114 0x72 'r' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xb8, /* 1011100 */
+        0xec, /* 1110110 */
+        0xcc, /* 1100110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 115 0x73 's' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 116 0x74 't' */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x36, /* 0011011 */
+        0x1c, /* 0001110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 117 0x75 'u' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 118 0x76 'v' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 119 0x77 'w' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 120 0x78 'x' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 121 0x79 'y' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0xf0, /* 1111000 */
+
+        /* 122 0x7a 'z' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 123 0x7b '{' */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xe0, /* 1110000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x1c, /* 0001110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 124 0x7c '|' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 125 0x7d '}' */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x0e, /* 0000111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 126 0x7e '~' */
+        0x00, /* 0000000 */
+        0xec, /* 1110110 */
+        0xb8, /* 1011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 127 0x7f '' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 128 0x80 '€' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc4, /* 1100010 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc4, /* 1100010 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x18, /* 0001100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+
+        /* 129 0x81 '�' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 130 0x82 '‚' */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 131 0x83 'ƒ' */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 132 0x84 '„' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 133 0x85 '…' */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 134 0x86 '†' */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 135 0x87 '‡' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xe0, /* 1110000 */
+
+        /* 136 0x88 'ˆ' */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 137 0x89 '‰' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 138 0x8a 'Š' */
+        0xc0, /* 1100000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 139 0x8b '‹' */
+        0x00, /* 0000000 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x3c, /* 0011110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 140 0x8c 'Œ' */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 141 0x8d '�' */
+        0xc0, /* 1100000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 142 0x8e 'Ž' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 143 0x8f '�' */
+        0x30, /* 0011000 */
+        0x48, /* 0100100 */
+        0x48, /* 0100100 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 144 0x90 '�' */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xc4, /* 1100010 */
+        0xd0, /* 1101000 */
+        0xf0, /* 1111000 */
+        0xd0, /* 1101000 */
+        0xc4, /* 1100010 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 145 0x91 '‘' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xec, /* 1110110 */
+        0x36, /* 0011011 */
+        0x36, /* 0011011 */
+        0x7e, /* 0111111 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x6e, /* 0110111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 146 0x92 '’' */
+        0x00, /* 0000000 */
+        0x3e, /* 0011111 */
+        0x6c, /* 0110110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfe, /* 1111111 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xce, /* 1100111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 147 0x93 '“' */
+        0x10, /* 0001000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 148 0x94 '”' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 149 0x95 '•' */
+        0xc0, /* 1100000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 150 0x96 '–' */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 151 0x97 '—' */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 152 0x98 '˜' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x70, /* 0111000 */
+
+        /* 153 0x99 '™' */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 154 0x9a 'š' */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 155 0x9b '›' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0x7c, /* 0111110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 156 0x9c 'œ' */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x64, /* 0110010 */
+        0x60, /* 0110000 */
+        0xf0, /* 1111000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0xe6, /* 1110011 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 157 0x9d '�' */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 158 0x9e 'ž' */
+        0xf8, /* 1111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0xc4, /* 1100010 */
+        0xcc, /* 1100110 */
+        0xde, /* 1101111 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xc6, /* 1100011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 159 0x9f 'Ÿ' */
+        0x1c, /* 0001110 */
+        0x36, /* 0011011 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xb0, /* 1011000 */
+        0xe0, /* 1110000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 160 0xa0 ' ' */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 161 0xa1 '¡' */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 162 0xa2 '¢' */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 163 0xa3 '£' */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 164 0xa4 '¤' */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0x00, /* 0000000 */
+        0xb8, /* 1011100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 165 0xa5 '¥' */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xec, /* 1110110 */
+        0xec, /* 1110110 */
+        0xfc, /* 1111110 */
+        0xdc, /* 1101110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 166 0xa6 '¦' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 167 0xa7 '§' */
+        0x00, /* 0000000 */
+        0x70, /* 0111000 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0xf8, /* 1111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 168 0xa8 '¨' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 169 0xa9 '©' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 170 0xaa 'ª' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 171 0xab '«' */
+        0x60, /* 0110000 */
+        0xe0, /* 1110000 */
+        0x62, /* 0110001 */
+        0x66, /* 0110011 */
+        0x6c, /* 0110110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0xb8, /* 1011100 */
+        0x4c, /* 0100110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x7c, /* 0111110 */
+
+        /* 172 0xac '¬' */
+        0x60, /* 0110000 */
+        0xe0, /* 1110000 */
+        0x62, /* 0110001 */
+        0x66, /* 0110011 */
+        0x6c, /* 0110110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x6c, /* 0110110 */
+        0xdc, /* 1101110 */
+        0xb4, /* 1011010 */
+        0x7e, /* 0111111 */
+        0x0c, /* 0000110 */
+        0x0c, /* 0000110 */
+        0x00, /* 0000000 */
+
+        /* 173 0xad '­' */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 174 0xae '®' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x36, /* 0011011 */
+        0x6c, /* 0110110 */
+        0xd8, /* 1101100 */
+        0x6c, /* 0110110 */
+        0x36, /* 0011011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 175 0xaf '¯' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xd8, /* 1101100 */
+        0x6c, /* 0110110 */
+        0x36, /* 0011011 */
+        0x6c, /* 0110110 */
+        0xd8, /* 1101100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 176 0xb0 '°' */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+        0x88, /* 1000100 */
+        0x22, /* 0010001 */
+
+        /* 177 0xb1 '±' */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+        0x54, /* 0101010 */
+        0xaa, /* 1010101 */
+
+        /* 178 0xb2 '²' */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+        0xee, /* 1110111 */
+        0xba, /* 1011101 */
+
+        /* 179 0xb3 '³' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 180 0xb4 '´' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 181 0xb5 'µ' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 182 0xb6 '¶' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xec, /* 1110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 183 0xb7 '·' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 184 0xb8 '¸' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 185 0xb9 '¹' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xec, /* 1110110 */
+        0x0c, /* 0000110 */
+        0xec, /* 1110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 186 0xba 'º' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 187 0xbb '»' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x0c, /* 0000110 */
+        0xec, /* 1110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 188 0xbc '¼' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xec, /* 1110110 */
+        0x0c, /* 0000110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 189 0xbd '½' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 190 0xbe '¾' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 191 0xbf '¿' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xf0, /* 1111000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 192 0xc0 'À' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 193 0xc1 'Á' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 194 0xc2 'Â' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 195 0xc3 'Ã' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 196 0xc4 'Ä' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 197 0xc5 'Å' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfe, /* 1111111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 198 0xc6 'Æ' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 199 0xc7 'Ç' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6e, /* 0110111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 200 0xc8 'È' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6e, /* 0110111 */
+        0x60, /* 0110000 */
+        0x7e, /* 0111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 201 0xc9 'É' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7e, /* 0111111 */
+        0x60, /* 0110000 */
+        0x6e, /* 0110111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 202 0xca 'Ê' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xee, /* 1110111 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 203 0xcb 'Ë' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0xee, /* 1110111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 204 0xcc 'Ì' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6e, /* 0110111 */
+        0x60, /* 0110000 */
+        0x6e, /* 0110111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 205 0xcd 'Í' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 206 0xce 'Î' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xee, /* 1110111 */
+        0x00, /* 0000000 */
+        0xee, /* 1110111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 207 0xcf 'Ï' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 208 0xd0 'Ð' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 209 0xd1 'Ñ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 210 0xd2 'Ò' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 211 0xd3 'Ó' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x7e, /* 0111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 212 0xd4 'Ô' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 213 0xd5 'Õ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 214 0xd6 'Ö' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7e, /* 0111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 215 0xd7 '×' */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+
+        /* 216 0xd8 'Ø' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfe, /* 1111111 */
+        0x30, /* 0011000 */
+        0xfe, /* 1111111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 217 0xd9 'Ù' */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xf0, /* 1111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 218 0xda 'Ú' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x3e, /* 0011111 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 219 0xdb 'Û' */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+
+        /* 220 0xdc 'Ü' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+
+        /* 221 0xdd 'Ý' */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+        0xe0, /* 1110000 */
+
+        /* 222 0xde 'Þ' */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+        0x1e, /* 0001111 */
+
+        /* 223 0xdf 'ß' */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 224 0xe0 'à' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xdc, /* 1101110 */
+        0x76, /* 0111011 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 225 0xe1 'á' */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xd8, /* 1101100 */
+        0xcc, /* 1100110 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 226 0xe2 'â' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 227 0xe3 'ã' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfe, /* 1111111 */
+        0xfe, /* 1111111 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 228 0xe4 'ä' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 229 0xe5 'å' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7e, /* 0111111 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 230 0xe6 'æ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xf8, /* 1111100 */
+        0xc0, /* 1100000 */
+        0xc0, /* 1100000 */
+        0x80, /* 1000000 */
+
+        /* 231 0xe7 'ç' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 232 0xe8 'è' */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 233 0xe9 'é' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xfc, /* 1111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 234 0xea 'ê' */
+        0x00, /* 0000000 */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0xc6, /* 1100011 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0xee, /* 1110111 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 235 0xeb 'ë' */
+        0x00, /* 0000000 */
+        0x3c, /* 0011110 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x7c, /* 0111110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x78, /* 0111100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 236 0xec 'ì' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 237 0xed 'í' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x06, /* 0000011 */
+        0x0c, /* 0000110 */
+        0x7c, /* 0111110 */
+        0xd6, /* 1101011 */
+        0xd6, /* 1101011 */
+        0xe6, /* 1110011 */
+        0x7c, /* 0111110 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 238 0xee 'î' */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x7c, /* 0111110 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x1c, /* 0001110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 239 0xef 'ï' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0xcc, /* 1100110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 240 0xf0 'ð' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 241 0xf1 'ñ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0xfc, /* 1111110 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 242 0xf2 'ò' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x0c, /* 0000110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 243 0xf3 'ó' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x60, /* 0110000 */
+        0xc0, /* 1100000 */
+        0x60, /* 0110000 */
+        0x30, /* 0011000 */
+        0x18, /* 0001100 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 244 0xf4 'ô' */
+        0x00, /* 0000000 */
+        0x1c, /* 0001110 */
+        0x36, /* 0011011 */
+        0x36, /* 0011011 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+
+        /* 245 0xf5 'õ' */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x70, /* 0111000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 246 0xf6 'ö' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 247 0xf7 '÷' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0x00, /* 0000000 */
+        0x76, /* 0111011 */
+        0xdc, /* 1101110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 248 0xf8 'ø' */
+        0x38, /* 0011100 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 249 0xf9 'ù' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 250 0xfa 'ú' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x30, /* 0011000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 251 0xfb 'û' */
+        0x1e, /* 0001111 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0x18, /* 0001100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0xd8, /* 1101100 */
+        0x78, /* 0111100 */
+        0x38, /* 0011100 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 252 0xfc 'ü' */
+        0xd8, /* 1101100 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x6c, /* 0110110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 253 0xfd 'ý' */
+        0x78, /* 0111100 */
+        0xcc, /* 1100110 */
+        0x18, /* 0001100 */
+        0x30, /* 0011000 */
+        0x64, /* 0110010 */
+        0xfc, /* 1111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 254 0xfe 'þ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x7c, /* 0111110 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+        /* 255 0xff 'ÿ' */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+        0x00, /* 0000000 */
+
+};
+
+
+struct font_desc font_7x14 = {
+        FONT7x14_IDX,
+        "7x14",
+        7,
+        14,
+        fontdata_7x14,
+        0
+};
diff --git a/drivers/video/console/font_sun12x22.c b/drivers/video/console/font_sun12x22.c
index 05215d0c3e09..c7bd967ea100 100644
--- a/drivers/video/console/font_sun12x22.c
+++ b/drivers/video/console/font_sun12x22.c
@@ -29,24 +29,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 1 0x01 '^A' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x30, 0x60, /* 001100000110 */
+        0x65, 0x30, /* 011001010011 */
+        0x6d, 0xb0, /* 011011011011 */
+        0x60, 0x30, /* 011000000011 */
+        0x62, 0x30, /* 011000100011 */
+        0x62, 0x30, /* 011000100011 */
+        0x60, 0x30, /* 011000000011 */
+        0x6f, 0xb0, /* 011011111011 */
+        0x67, 0x30, /* 011001110011 */
+        0x30, 0x60, /* 001100000110 */
+        0x1f, 0xc0, /* 000111111100 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -54,24 +53,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 2 0x02 '^B' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x7a, 0xf0, /* 011110101111 */
+        0x72, 0x70, /* 011100100111 */
+        0x7f, 0xf0, /* 011111111111 */
+        0x7d, 0xf0, /* 011111011111 */
+        0x7d, 0xf0, /* 011111011111 */
+        0x7f, 0xf0, /* 011111111111 */
+        0x70, 0x70, /* 011100000111 */
+        0x78, 0xf0, /* 011110001111 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x1f, 0xc0, /* 000111111100 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -79,24 +77,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 3 0x03 '^C' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x19, 0x80, /* 000110011000 */
         0x3f, 0xc0, /* 001111111100 */
+        0x7f, 0xe0, /* 011111111110 */
         0x3f, 0xc0, /* 001111111100 */
         0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x1f, 0x80, /* 000111111000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x06, 0x00, /* 000001100000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -104,49 +101,47 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 4 0x04 '^D' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x02, 0x00, /* 000000100000 */
+        0x07, 0x00, /* 000001110000 */
+        0x0f, 0x80, /* 000011111000 */
+        0x0f, 0x80, /* 000011111000 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x0f, 0x80, /* 000011111000 */
+        0x0f, 0x80, /* 000011111000 */
+        0x07, 0x00, /* 000001110000 */
+        0x02, 0x00, /* 000000100000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 5 0x05 '^E' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x02, 0x00, /* 000000100000 */
+        0x07, 0x00, /* 000001110000 */
+        0x07, 0x00, /* 000001110000 */
+        0x02, 0x00, /* 000000100000 */
+        0x18, 0xc0, /* 000110001100 */
+        0x3d, 0xe0, /* 001111011110 */
+        0x3d, 0xe0, /* 001111011110 */
+        0x1a, 0xc0, /* 000110101100 */
+        0x02, 0x00, /* 000000100000 */
+        0x07, 0x00, /* 000001110000 */
+        0x0f, 0x80, /* 000011111000 */
+        0x1f, 0xc0, /* 000111111100 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -154,23 +149,22 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 6 0x06 '^F' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x1f, 0x80, /* 000111111000 */
         0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x36, 0xc0, /* 001101101100 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x1f, 0x80, /* 000111111000 */
         0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -179,24 +173,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 7 0x07 '^G' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x1f, 0x80, /* 000111111000 */
         0x3f, 0xc0, /* 001111111100 */
         0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x1f, 0x80, /* 000111111000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x06, 0x00, /* 000001100000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -204,49 +197,47 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 8 0x08 '^H' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xf9, 0xf0, /* 111110011111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xe0, 0x70, /* 111000000111 */
+        0xe0, 0x70, /* 111000000111 */
+        0xc0, 0x30, /* 110000000011 */
+        0xc0, 0x30, /* 110000000011 */
+        0xe0, 0x70, /* 111000000111 */
+        0xe0, 0x70, /* 111000000111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf9, 0xf0, /* 111110011111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
 
         /* 9 0x09 '^I' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x06, 0x00, /* 000001100000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -254,49 +245,47 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 10 0x0a '^J' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xf9, 0xf0, /* 111110011111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xe6, 0x70, /* 111001100111 */
+        0xe6, 0x70, /* 111001100111 */
+        0xcf, 0x30, /* 110011110011 */
+        0xcf, 0x30, /* 110011110011 */
+        0xe6, 0x70, /* 111001100111 */
+        0xe6, 0x70, /* 111001100111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf0, 0xf0, /* 111100001111 */
+        0xf9, 0xf0, /* 111110011111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
 
         /* 11 0x0b '^K' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x01, 0xe0, /* 000000011110 */
+        0x03, 0x60, /* 000000110110 */
+        0x06, 0x60, /* 000001100110 */
+        0x1e, 0x00, /* 000111100000 */
+        0x33, 0x00, /* 001100110000 */
+        0x33, 0x00, /* 001100110000 */
+        0x61, 0x80, /* 011000011000 */
+        0x61, 0x80, /* 011000011000 */
+        0x33, 0x00, /* 001100110000 */
+        0x33, 0x00, /* 001100110000 */
+        0x1e, 0x00, /* 000111100000 */
+        0x0c, 0x00, /* 000011000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -304,24 +293,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 12 0x0c '^L' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x19, 0x80, /* 000110011000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x19, 0x80, /* 000110011000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
         0x3f, 0xc0, /* 001111111100 */
         0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -329,149 +317,143 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 13 0x0d '^M' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x0c, 0x60, /* 000011000110 */
+        0x0c, 0x60, /* 000011000110 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x3c, 0x00, /* 001111000000 */
+        0x7c, 0x00, /* 011111000000 */
+        0x78, 0x00, /* 011110000000 */
+        0x30, 0x00, /* 001100000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 14 0x0e '^N' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1f, 0xe0, /* 000111111110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x1f, 0xe0, /* 000111111110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x60, /* 000110000110 */
+        0x19, 0xe0, /* 000110011110 */
+        0x1b, 0xe0, /* 000110111110 */
+        0x1b, 0xc0, /* 000110111100 */
+        0x79, 0x80, /* 011110011000 */
+        0xf8, 0x00, /* 111110000000 */
+        0xf0, 0x00, /* 111100000000 */
+        0x60, 0x00, /* 011000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 15 0x0f '^O' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 16 0x10 '^P' */
-        /* FIXME */
+        0x18, 0xc0, /* 000110001100 */
+        0x0d, 0x80, /* 000011011000 */
+        0x6d, 0xb0, /* 011011011011 */
+        0x3d, 0xe0, /* 001111011110 */
         0x00, 0x00, /* 000000000000 */
+        0x3d, 0xe0, /* 001111011110 */
+        0x6d, 0xb0, /* 011011011011 */
+        0x0d, 0x80, /* 000011011000 */
+        0x18, 0xc0, /* 000110001100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 16 0x10 '^P' */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0x20, /* 000000000010 */
+        0x00, 0x60, /* 000000000110 */
+        0x00, 0xe0, /* 000000001110 */
+        0x01, 0xe0, /* 000000011110 */
+        0x03, 0xe0, /* 000000111110 */
+        0x07, 0xe0, /* 000001111110 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x1f, 0xe0, /* 000111111110 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x1f, 0xe0, /* 000111111110 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x07, 0xe0, /* 000001111110 */
+        0x03, 0xe0, /* 000000111110 */
+        0x01, 0xe0, /* 000000011110 */
+        0x00, 0xe0, /* 000000001110 */
+        0x00, 0x60, /* 000000000110 */
+        0x00, 0x20, /* 000000000010 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 17 0x11 '^Q' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x40, 0x00, /* 010000000000 */
+        0x60, 0x00, /* 011000000000 */
+        0x70, 0x00, /* 011100000000 */
+        0x78, 0x00, /* 011110000000 */
+        0x7c, 0x00, /* 011111000000 */
+        0x7e, 0x00, /* 011111100000 */
+        0x7f, 0x00, /* 011111110000 */
+        0x7f, 0x80, /* 011111111000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x7f, 0x80, /* 011111111000 */
+        0x7f, 0x00, /* 011111110000 */
+        0x7e, 0x00, /* 011111100000 */
+        0x7c, 0x00, /* 011111000000 */
+        0x78, 0x00, /* 011110000000 */
+        0x70, 0x00, /* 011100000000 */
+        0x60, 0x00, /* 011000000000 */
+        0x40, 0x00, /* 010000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 18 0x12 '^R' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x04, 0x00, /* 000001000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x3f, 0x80, /* 001111111000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x04, 0x00, /* 000001000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -551,99 +533,95 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 22 0x16 '^V' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 23 0x17 '^W' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
-        /* 24 0x18 '^X' */
-        /* FIXME */
+        /* 23 0x17 '^W' */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x04, 0x00, /* 000001000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x3f, 0x80, /* 001111111000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x04, 0x00, /* 000001000000 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 24 0x18 '^X' */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 25 0x19 '^Y' */
-        /* FIXME */
+        0x04, 0x00, /* 000001000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+
+        /* 25 0x19 '^Y' */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x3f, 0x80, /* 001111111000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x04, 0x00, /* 000001000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -651,24 +629,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 26 0x1a '^Z' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x08, 0x00, /* 000010000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x38, 0x00, /* 001110000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0xff, 0xe0, /* 111111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x38, 0x00, /* 001110000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x08, 0x00, /* 000010000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -676,24 +653,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 27 0x1b '^[' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x01, 0x00, /* 000000010000 */
+        0x01, 0x80, /* 000000011000 */
+        0x01, 0xc0, /* 000000011100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xf0, /* 011111111111 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x01, 0xc0, /* 000000011100 */
+        0x01, 0x80, /* 000000011000 */
+        0x01, 0x00, /* 000000010000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -701,24 +677,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 28 0x1c '^\' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x3f, 0xe0, /* 001111111110 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -726,24 +701,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 29 0x1d '^]' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x09, 0x00, /* 000010010000 */
+        0x19, 0x80, /* 000110011000 */
+        0x39, 0xc0, /* 001110011100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0xff, 0xf0, /* 111111111111 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x39, 0xc0, /* 001110011100 */
+        0x19, 0x80, /* 000110011000 */
+        0x09, 0x00, /* 000010010000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -751,24 +725,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 30 0x1e '^^' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x04, 0x00, /* 000001000000 */
+        0x04, 0x00, /* 000001000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -776,24 +749,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 31 0x1f '^_' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x3f, 0x80, /* 001111111000 */
+        0x3f, 0x80, /* 001111111000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x04, 0x00, /* 000001000000 */
+        0x04, 0x00, /* 000001000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -3081,29 +3053,28 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 127 0x7f '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0xff, 0xf0, /* 111111111111 */
+        0xff, 0xf0, /* 111111111111 */
+        0x00, 0x00, /* 000000000000 */
 
         /* 128 0x80 '.' */
         0x00, 0x00, /* 000000000000 */
@@ -3826,24 +3797,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 158 0x9e '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0x80, /* 011111111000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0xc0, /* 001100001100 */
+        0x37, 0x80, /* 001101111000 */
+        0x30, 0x00, /* 001100000000 */
+        0x33, 0x00, /* 001100110000 */
+        0x37, 0x80, /* 001101111000 */
+        0x33, 0x00, /* 001100110000 */
+        0x33, 0x00, /* 001100110000 */
+        0x33, 0x30, /* 001100110011 */
+        0x31, 0xe0, /* 001100011110 */
+        0x78, 0xc0, /* 011110001100 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -3851,28 +3821,27 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 159 0x9f '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0xc0, /* 000000001100 */
+        0x01, 0xe0, /* 000000011110 */
+        0x03, 0x30, /* 000000110011 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x7f, 0xc0, /* 011111111100 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0xcc, 0x00, /* 110011000000 */
+        0x78, 0x00, /* 011110000000 */
+        0x30, 0x00, /* 001100000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 160 0xa0 '.' */
@@ -4092,24 +4061,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 169 0xa9 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x3f, 0xc0, /* 001111111100 */
         0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5413,24 +5381,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 224 0xe0 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x0f, 0x60, /* 000011110110 */
+        0x13, 0xe0, /* 000100111110 */
+        0x21, 0xc0, /* 001000011100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x70, 0x80, /* 011100001000 */
+        0x39, 0xc0, /* 001110011100 */
+        0x1f, 0x60, /* 000111110110 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5462,24 +5429,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 226 0xe2 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x3f, 0xe0, /* 001111111110 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5487,49 +5453,47 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 227 0xe3 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 228 0xe4 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 228 0xe4 '.' */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x60, 0x60, /* 011000000110 */
+        0x30, 0x60, /* 001100000110 */
+        0x30, 0x00, /* 001100000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x60, /* 001100000110 */
+        0x60, 0x60, /* 011000000110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5537,24 +5501,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 229 0xe5 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x07, 0xe0, /* 000001111110 */
+        0x0f, 0xe0, /* 000011111110 */
+        0x13, 0x80, /* 000100111000 */
+        0x21, 0xc0, /* 001000011100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x60, 0xc0, /* 011000001100 */
+        0x70, 0x80, /* 011100001000 */
+        0x39, 0x00, /* 001110010000 */
+        0x1e, 0x00, /* 000111100000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5586,24 +5549,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 231 0xe7 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x19, 0x80, /* 000110011000 */
         0x3f, 0xc0, /* 001111111100 */
+        0x66, 0x60, /* 011001100110 */
+        0x66, 0x60, /* 011001100110 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5611,24 +5573,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 232 0xe8 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x19, 0x80, /* 000110011000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x19, 0x80, /* 000110011000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5636,24 +5597,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 233 0xe9 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x0f, 0x00, /* 000011110000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x60, 0x60, /* 011000000110 */
+        0x60, 0x60, /* 011000000110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x60, 0x60, /* 011000000110 */
+        0x60, 0x60, /* 011000000110 */
+        0x30, 0xc0, /* 001100001100 */
+        0x1f, 0x80, /* 000111111000 */
+        0x0f, 0x00, /* 000011110000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5661,24 +5621,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 234 0xea '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1f, 0x00, /* 000111110000 */
+        0x31, 0x80, /* 001100011000 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x60, 0x60, /* 011000000110 */
+        0x60, 0x60, /* 011000000110 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x19, 0x80, /* 000110011000 */
+        0x19, 0x80, /* 000110011000 */
+        0xd9, 0xb0, /* 110110011011 */
+        0x79, 0xe0, /* 011110011110 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5686,24 +5645,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 235 0xeb '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x07, 0x80, /* 000001111000 */
+        0x0c, 0xc0, /* 000011001100 */
+        0x18, 0x60, /* 000110000110 */
+        0x18, 0x00, /* 000110000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x03, 0x00, /* 000000110000 */
+        0x0f, 0x80, /* 000011111000 */
+        0x11, 0xc0, /* 000100011100 */
+        0x20, 0xe0, /* 001000001110 */
+        0x60, 0x60, /* 011000000110 */
+        0x60, 0x60, /* 011000000110 */
+        0x70, 0x40, /* 011100000100 */
+        0x38, 0x80, /* 001110001000 */
+        0x1f, 0x00, /* 000111110000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5711,99 +5669,95 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 236 0xec '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x39, 0xc0, /* 001110011100 */
+        0x6f, 0x60, /* 011011110110 */
+        0x66, 0x60, /* 011001100110 */
+        0xc6, 0x30, /* 110001100011 */
+        0xc6, 0x30, /* 110001100011 */
+        0x66, 0x60, /* 011001100110 */
+        0x6f, 0x60, /* 011011110110 */
+        0x39, 0xc0, /* 001110011100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 237 0xed '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 237 0xed '.' */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0xc0, /* 000000001100 */
+        0x00, 0xc0, /* 000000001100 */
+        0x01, 0x80, /* 000000011000 */
+        0x01, 0x80, /* 000000011000 */
+        0x3b, 0xc0, /* 001110111100 */
+        0x6f, 0x60, /* 011011110110 */
+        0x66, 0x60, /* 011001100110 */
+        0xc6, 0x30, /* 110001100011 */
+        0xc6, 0x30, /* 110001100011 */
+        0x66, 0x60, /* 011001100110 */
+        0x6f, 0x60, /* 011011110110 */
+        0x3d, 0xc0, /* 001111011100 */
+        0x18, 0x00, /* 000110000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x30, 0x00, /* 001100000000 */
+        0x30, 0x00, /* 001100000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 238 0xee '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
+        0x01, 0xc0, /* 000000011100 */
+        0x03, 0x00, /* 000000110000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x1f, 0xc0, /* 000111111100 */
+        0x18, 0x00, /* 000110000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x03, 0x00, /* 000000110000 */
+        0x01, 0xc0, /* 000000011100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 239 0xef '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x0f, 0x00, /* 000011110000 */
+        0x1f, 0x80, /* 000111111000 */
+        0x39, 0xc0, /* 001110011100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
+        0x30, 0xc0, /* 001100001100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5811,24 +5765,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 240 0xf0 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5860,24 +5813,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 242 0xf2 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x60, 0x00, /* 011000000000 */
+        0x38, 0x00, /* 001110000000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x03, 0x80, /* 000000111000 */
+        0x00, 0xe0, /* 000000001110 */
+        0x00, 0xe0, /* 000000001110 */
+        0x03, 0x80, /* 000000111000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x38, 0x00, /* 001110000000 */
+        0x60, 0x00, /* 011000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5885,24 +5837,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 243 0xf3 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x00, 0x60, /* 000000000110 */
+        0x01, 0xc0, /* 000000011100 */
+        0x07, 0x00, /* 000001110000 */
+        0x1c, 0x00, /* 000111000000 */
+        0x70, 0x00, /* 011100000000 */
+        0x70, 0x00, /* 011100000000 */
+        0x1c, 0x00, /* 000111000000 */
+        0x07, 0x00, /* 000001110000 */
+        0x01, 0xc0, /* 000000011100 */
+        0x00, 0x60, /* 000000000110 */
         0x00, 0x00, /* 000000000000 */
+        0x7f, 0xe0, /* 011111111110 */
+        0x7f, 0xe0, /* 011111111110 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -5910,54 +5861,52 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 244 0xf4 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x03, 0x80, /* 000000111000 */
+        0x07, 0xc0, /* 000001111100 */
+        0x0c, 0x60, /* 000011000110 */
+        0x0c, 0x60, /* 000011000110 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
+        0x0c, 0x00, /* 000011000000 */
 
         /* 245 0xf5 '.' */
-        /* FIXME */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1c, 0x00, /* 000111000000 */
+        0x3e, 0x00, /* 001111100000 */
+        0x63, 0x00, /* 011000110000 */
+        0x63, 0x00, /* 011000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
+        0x03, 0x00, /* 000000110000 */
 
         /* 246 0xf6 '.' */
         0x00, 0x00, /* 000000000000 */
@@ -5984,24 +5933,23 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 247 0xf7 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x38, 0x00, /* 001110000000 */
+        0x6c, 0x00, /* 011011000000 */
+        0x06, 0x30, /* 000001100011 */
+        0x03, 0x60, /* 000000110110 */
+        0x39, 0xc0, /* 001110011100 */
+        0x6c, 0x00, /* 011011000000 */
+        0x06, 0x30, /* 000001100011 */
+        0x03, 0x60, /* 000000110110 */
+        0x01, 0xc0, /* 000000011100 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -6033,44 +5981,31 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
 
         /* 249 0xf9 '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 250 0xfa '.' */
-        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x1c, 0x00, /* 000111000000 */
+        0x3e, 0x00, /* 001111100000 */
+        0x3e, 0x00, /* 001111100000 */
+        0x3e, 0x00, /* 001111100000 */
+        0x1c, 0x00, /* 000111000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 250 0xfa '.' */
         0x00, 0x00, /* 000000000000 */
-        0x06, 0x00, /* 000001100000 */
-        0x0f, 0x00, /* 000011110000 */
-        0x0f, 0x00, /* 000011110000 */
-        0x06, 0x00, /* 000001100000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
@@ -6080,51 +6015,61 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-
-        /* 251 0xfb '.' */
-        /* FIXME */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+        0x18, 0x00, /* 000110000000 */
+        0x3c, 0x00, /* 001111000000 */
+        0x3c, 0x00, /* 001111000000 */
+        0x18, 0x00, /* 000110000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
+
+        /* 251 0xfb '.' */
         0x00, 0x00, /* 000000000000 */
+        0x07, 0xe0, /* 000001111110 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x06, 0x00, /* 000001100000 */
+        0xc6, 0x00, /* 110001100000 */
+        0x66, 0x00, /* 011001100000 */
+        0x36, 0x00, /* 001101100000 */
+        0x1e, 0x00, /* 000111100000 */
+        0x0e, 0x00, /* 000011100000 */
+        0x06, 0x00, /* 000001100000 */
+        0x02, 0x00, /* 000000100000 */
         0x00, 0x00, /* 000000000000 */
 
         /* 252 0xfc '.' */
-        /* FIXME */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x13, 0x80, /* 000100111000 */
+        0x3d, 0xc0, /* 001111011100 */
+        0x18, 0xc0, /* 000110001100 */
+        0x18, 0xc0, /* 000110001100 */
+        0x18, 0xc0, /* 000110001100 */
+        0x18, 0xc0, /* 000110001100 */
+        0x3d, 0xe0, /* 001111011110 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
+        0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
-        0x3f, 0xc0, /* 001111111100 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
         0x00, 0x00, /* 000000000000 */
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 465d678230ae..e79b29702649 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -36,6 +36,10 @@ static struct font_desc *fonts[] = {
 #undef NO_FONTS
     &font_vga_6x11,
 #endif
+#ifdef CONFIG_FONT_7x14
+#undef NO_FONTS
+    &font_7x14,
+#endif
 #ifdef CONFIG_FONT_SUN8x16
 #undef NO_FONTS
     &font_sun_8x16,
@@ -44,6 +48,10 @@ static struct font_desc *fonts[] = {
 #undef NO_FONTS
     &font_sun_12x22,
 #endif
+#ifdef CONFIG_FONT_10x18
+#undef NO_FONTS
+    &font_10x18,
+#endif
 #ifdef CONFIG_FONT_ACORN_8x8
 #undef NO_FONTS
     &font_acorn_8x8,
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index bcf59b28a14f..d27fa91e5886 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -95,6 +95,7 @@ static unsigned long vgacon_uni_pagedir[2];
 /* Description of the hardware situation */
 static unsigned long    vga_vram_base;          /* Base of video memory */
 static unsigned long    vga_vram_end;           /* End of video memory */
+static int              vga_vram_size;          /* Size of video memory */
 static u16              vga_video_port_reg;     /* Video register select port */
 static u16              vga_video_port_val;     /* Video register value port */
 static unsigned int     vga_video_num_columns;  /* Number of text columns */
@@ -288,6 +289,7 @@ static const char __init *vgacon_startup(void)
 
         vga_vram_base = VGA_MAP_MEM(vga_vram_base);
         vga_vram_end = VGA_MAP_MEM(vga_vram_end);
+        vga_vram_size = vga_vram_end - vga_vram_base;
 
         /*
          *      Find out if there is a graphics card present.
@@ -504,9 +506,13 @@ static int vgacon_switch(struct vc_data *c)
          */
         vga_video_num_columns = c->vc_cols;
         vga_video_num_lines = c->vc_rows;
+
+        /* We can only copy out the size of the video buffer here,
+         * otherwise we get into VGA BIOS */
+
         if (!vga_is_gfx)
                 scr_memcpyw((u16 *) c->vc_origin, (u16 *) c->vc_screenbuf,
-                            c->vc_screenbuf_size);
+                            c->vc_screenbuf_size > vga_vram_size ? vga_vram_size : c->vc_screenbuf_size);
         return 0;               /* Redrawing not needed */
 }
 
@@ -961,7 +967,6 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
         if (!lines)             /* Turn scrollback off */
                 c->vc_visible_origin = c->vc_origin;
         else {
-                int vram_size = vga_vram_end - vga_vram_base;
                 int margin = c->vc_size_row * 4;
                 int ul, we, p, st;
 
@@ -971,7 +976,7 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
                         we = vga_rolled_over + c->vc_size_row;
                 } else {
                         ul = 0;
-                        we = vram_size;
+                        we = vga_vram_size;
                 }
                 p = (c->vc_visible_origin - vga_vram_base - ul + we) % we +
                     lines * c->vc_size_row;
@@ -1012,9 +1017,13 @@ static void vgacon_save_screen(struct vc_data *c)
                 c->vc_x = ORIG_X;
                 c->vc_y = ORIG_Y;
         }
+
+        /* We can't copy in more then the size of the video buffer,
+         * or we'll be copying in VGA BIOS */
+
         if (!vga_is_gfx)
                 scr_memcpyw((u16 *) c->vc_screenbuf, (u16 *) c->vc_origin,
-                            c->vc_screenbuf_size);
+                            c->vc_screenbuf_size > vga_vram_size ? vga_vram_size : c->vc_screenbuf_size);
 }
 
 static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 7705070191d9..2222de6ad844 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -76,70 +76,22 @@ int fb_get_color_depth(struct fb_var_screeninfo *var)
 EXPORT_SYMBOL(fb_get_color_depth);
 
 /*
- * Drawing helpers.
+ * Data padding functions.
  */
-void fb_iomove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
-                           u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-                           u32 height)
+void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height)
 {
         int i;
 
         for (i = height; i--; ) {
-                buf->outbuf(info, dst, src, s_pitch);
+                memcpy(dst, src, s_pitch);
                 src += s_pitch;
                 dst += d_pitch;
         }
 }
+EXPORT_SYMBOL(fb_pad_aligned_buffer);
 
-void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
-                            u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-                            u32 height)
-{
-        int i, j;
-
-        for (i = height; i--; ) {
-                for (j = 0; j < s_pitch; j++)
-                        dst[j] = src[j];
-                src += s_pitch;
-                dst += d_pitch;
-        }
-}
-
-void fb_iomove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
-                             u8 *dst, u32 d_pitch, u8 *src, u32 idx,
-                             u32 height, u32 shift_high, u32 shift_low,
-                             u32 mod)
-{
-        u8 mask = (u8) (0xfff << shift_high), tmp;
-        int i, j;
-
-        for (i = height; i--; ) {
-                for (j = 0; j < idx; j++) {
-                        tmp = buf->inbuf(info, dst+j);
-                        tmp &= mask;
-                        tmp |= *src >> shift_low;
-                        buf->outbuf(info, dst+j, &tmp, 1);
-                        tmp = *src << shift_high;
-                        buf->outbuf(info, dst+j+1, &tmp, 1);
-                        src++;
-                }
-                tmp = buf->inbuf(info, dst+idx);
-                tmp &= mask;
-                tmp |= *src >> shift_low;
-                buf->outbuf(info, dst+idx, &tmp, 1);
-                if (shift_high < mod) {
-                        tmp = *src << shift_high;
-                        buf->outbuf(info, dst+idx+1, &tmp, 1);
-                }       
-                src++;
-                dst += d_pitch;
-        }
-}
-
-void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
-                              u8 *dst, u32 d_pitch, u8 *src, u32 idx,
-                              u32 height, u32 shift_high, u32 shift_low,
-                              u32 mod)
+void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height,
+                                u32 shift_high, u32 shift_low, u32 mod)
 {
         u8 mask = (u8) (0xfff << shift_high), tmp;
         int i, j;
@@ -166,6 +118,7 @@ void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
                 dst += d_pitch;
         }
 }
+EXPORT_SYMBOL(fb_pad_unaligned_buffer);
 
 /*
  * we need to lock this section since fb_cursor
@@ -1040,7 +993,7 @@ static struct file_operations fb_fops = {
 #endif
 };
 
-static struct class_simple *fb_class;
+static struct class *fb_class;
 
 /**
  *      register_framebuffer - registers a frame buffer device
@@ -1066,7 +1019,7 @@ register_framebuffer(struct fb_info *fb_info)
                         break;
         fb_info->node = i;
 
-        fb_info->class_device = class_simple_device_add(fb_class, MKDEV(FB_MAJOR, i),
+        fb_info->class_device = class_device_create(fb_class, MKDEV(FB_MAJOR, i),
                                     fb_info->device, "fb%d", i);
         if (IS_ERR(fb_info->class_device)) {
                 /* Not fatal */
@@ -1081,7 +1034,7 @@ register_framebuffer(struct fb_info *fb_info)
                         fb_info->pixmap.size = FBPIXMAPSIZE;
                         fb_info->pixmap.buf_align = 1;
                         fb_info->pixmap.scan_align = 1;
-                        fb_info->pixmap.access_align = 4;
+                        fb_info->pixmap.access_align = 32;
                         fb_info->pixmap.flags = FB_PIXMAP_DEFAULT;
                 }
         }       
@@ -1134,7 +1087,7 @@ unregister_framebuffer(struct fb_info *fb_info)
         registered_fb[i]=NULL;
         num_registered_fb--;
         fb_cleanup_class_device(fb_info);
-        class_simple_device_remove(MKDEV(FB_MAJOR, i));
+        class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
         return 0;
 }
 
@@ -1197,7 +1150,7 @@ fbmem_init(void)
         if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
                 printk("unable to get major %d for fb devs\n", FB_MAJOR);
 
-        fb_class = class_simple_create(THIS_MODULE, "graphics");
+        fb_class = class_create(THIS_MODULE, "graphics");
         if (IS_ERR(fb_class)) {
                 printk(KERN_WARNING "Unable to create fb class; errno = %ld\n", PTR_ERR(fb_class));
                 fb_class = NULL;
@@ -1210,7 +1163,7 @@ module_init(fbmem_init);
 static void __exit
 fbmem_exit(void)
 {
-        class_simple_destroy(fb_class);
+        class_destroy(fb_class);
 }
 
 module_exit(fbmem_exit);
@@ -1357,10 +1310,6 @@ EXPORT_SYMBOL(fb_set_var);
 EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
-EXPORT_SYMBOL(fb_iomove_buf_unaligned);
-EXPORT_SYMBOL(fb_iomove_buf_aligned);
-EXPORT_SYMBOL(fb_sysmove_buf_unaligned);
-EXPORT_SYMBOL(fb_sysmove_buf_aligned);
 EXPORT_SYMBOL(fb_set_suspend);
 EXPORT_SYMBOL(fb_register_client);
 EXPORT_SYMBOL(fb_unregister_client);
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index c78a2c5961d3..277d733c6d00 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -241,7 +241,7 @@ static ssize_t show_virtual(struct class_device *class_device, char *buf)
         struct fb_info *fb_info =
                 (struct fb_info *)class_get_devdata(class_device);
         return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
-                        fb_info->var.xres_virtual);
+                        fb_info->var.yres_virtual);
 }
 
 static ssize_t store_cmap(struct class_device *class_device, const char * buf,
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 2a023282d7a3..d3c1922cb13a 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -1045,14 +1045,14 @@ static struct fb_ops gbefb_ops = {
  * sysfs
  */
 
-static ssize_t gbefb_show_memsize(struct device *dev, char *buf)
+static ssize_t gbefb_show_memsize(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, PAGE_SIZE, "%d\n", gbe_mem_size);
 }
 
 static DEVICE_ATTR(size, S_IRUGO, gbefb_show_memsize, NULL);
 
-static ssize_t gbefb_show_rev(struct device *device, char *buf)
+static ssize_t gbefb_show_rev(struct device *device, struct device_attribute *attr, char *buf)
 {
         return snprintf(buf, PAGE_SIZE, "%d\n", gbe_revision);
 }
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index a9a618f2aa6a..7513fb9b19cf 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1885,6 +1885,7 @@ static int __devinit i810fb_init_pci (struct pci_dev *dev,
         memset(info->pixmap.addr, 0, 8*1024);
         info->pixmap.size = 8*1024;
         info->pixmap.buf_align = 8;
+        info->pixmap.access_align = 32;
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
         if ((err = i810_allocate_pci_resource(par, entry))) {
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 549e22939260..298bc9cd99e7 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -214,7 +214,7 @@ static struct fb_ops intel_fb_ops = {
 
 /* PCI driver module table */
 static struct pci_driver intelfb_driver = {
-        .name =         "Intel(R) " SUPPORTED_CHIPSETS " Framebuffer Driver",
+        .name =         "intelfb",
         .id_table =     intelfb_pci_table,
         .probe =        intelfb_pci_register,
         .remove =       __devexit_p(intelfb_pci_unregister)
@@ -228,22 +228,25 @@ MODULE_DESCRIPTION(
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DEVICE_TABLE(pci, intelfb_pci_table);
 
-static int accel        __initdata = 1;
-static int vram         __initdata = 4;
-static int hwcursor     __initdata = 1;
-static int mtrr         __initdata = 1;
-static int fixed        __initdata = 0;
-static int noinit       __initdata = 0;
-static int noregister   __initdata = 0;
-static int probeonly    __initdata = 0;
-static int idonly       __initdata = 0;
-static int bailearly    __initdata = 0;
-static char *mode       __initdata = NULL;
+static int accel        = 1;
+static int vram         = 4;
+static int hwcursor     = 1;
+static int mtrr         = 1;
+static int fixed        = 0;
+static int noinit       = 0;
+static int noregister   = 0;
+static int probeonly    = 0;
+static int idonly       = 0;
+static int bailearly    = 0;
+static int voffset      = 48;
+static char *mode       = NULL;
 
 module_param(accel, bool, S_IRUGO);
 MODULE_PARM_DESC(accel, "Enable console acceleration");
 module_param(vram, int, S_IRUGO);
 MODULE_PARM_DESC(vram, "System RAM to allocate to framebuffer in MiB");
+module_param(voffset, int, S_IRUGO);
+MODULE_PARM_DESC(voffset, "Offset of framebuffer in MiB");
 module_param(hwcursor, bool, S_IRUGO);
 MODULE_PARM_DESC(hwcursor, "Enable HW cursor");
 module_param(mtrr, bool, S_IRUGO);
@@ -503,6 +506,7 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct agp_bridge_data *bridge;
         int aperture_bar = 0;
         int mmio_bar = 1;
+        int offset;
 
         DBG_MSG("intelfb_pci_register\n");
 
@@ -659,17 +663,21 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return -ENODEV;
         }
 
+        if (MB(voffset) < stolen_size)
+                offset = (stolen_size >> 12);
+        else
+                offset = ROUND_UP_TO_PAGE(MB(voffset))/GTT_PAGE_SIZE;
+
         /* set the mem offsets - set them after the already used pages */
         if (dinfo->accel) {
-                dinfo->ring.offset = (stolen_size >> 12)
-                        + gtt_info.current_memory;
+                dinfo->ring.offset = offset + gtt_info.current_memory;
         }
         if (dinfo->hwcursor) {
-                dinfo->cursor.offset = (stolen_size >> 12) +
+                dinfo->cursor.offset = offset +
                         + gtt_info.current_memory + (dinfo->ring.size >> 12);
         }
         if (dinfo->fbmem_gart) {
-                dinfo->fb.offset = (stolen_size >> 12) +
+                dinfo->fb.offset = offset +
                         + gtt_info.current_memory + (dinfo->ring.size >> 12)
                         + (dinfo->cursor.size >> 12);
         }
@@ -1083,6 +1091,7 @@ intelfb_set_fbinfo(struct intelfb_info *dinfo)
 
         info->pixmap.size = 64*1024;
         info->pixmap.buf_align = 8;
+        info->pixmap.access_align = 32;
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
         if (intelfb_init_var(dinfo))
@@ -1293,7 +1302,7 @@ intelfb_set_par(struct fb_info *info)
 
         intelfb_blank(FB_BLANK_POWERDOWN, info);
 
-        if (dinfo->accel)
+        if (ACCEL(dinfo, info))
                 intelfbhw_2d_stop(dinfo);
 
         memcpy(hw, &dinfo->save_state, sizeof(*hw));
@@ -1309,7 +1318,7 @@ intelfb_set_par(struct fb_info *info)
 
         update_dinfo(dinfo, &info->var);
 
-        if (dinfo->accel)
+        if (ACCEL(dinfo, info))
                 intelfbhw_2d_start(dinfo);
 
         intelfb_pan_display(&info->var, info);
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index de5a0f383600..2fc71081f7e7 100644
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -387,3 +387,4 @@ int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
 }
 EXPORT_SYMBOL(mac_find_mode);
 
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 47733f58153b..b2e6b2407869 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -516,9 +516,9 @@ static struct backlight_controller nvidia_backlight_controller = {
 static void nvidiafb_load_cursor_image(struct nvidia_par *par, u8 * data8,
                                        u16 bg, u16 fg, u32 w, u32 h)
 {
+        u32 *data = (u32 *) data8;
         int i, j, k = 0;
         u32 b, tmp;
-        u32 *data = (u32 *) data8;
 
         w = (w + 1) & ~1;
 
@@ -890,11 +890,11 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         struct nvidia_par *par = info->par;
         u8 data[MAX_CURS * MAX_CURS / 8];
-        u16 fg, bg;
         int i, set = cursor->set;
+        u16 fg, bg;
 
         if (cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)
-                return soft_cursor(info, cursor);
+                return -ENXIO;
 
         NVShowHideCursor(par, 0);
 
@@ -931,21 +931,18 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 if (src) {
                         switch (cursor->rop) {
                         case ROP_XOR:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] ^ msk[i];
                                 break;
                         case ROP_COPY:
                         default:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] & msk[i];
                                 break;
                         }
 
-                        fb_sysmove_buf_aligned(info, &info->pixmap, data,
-                                               d_pitch, src, s_pitch,
-                                               cursor->image.height);
+                        fb_pad_aligned_buffer(data, d_pitch, src, s_pitch,
+                                                cursor->image.height);
 
                         bg = ((info->cmap.red[bg_idx] & 0xf8) << 7) |
                             ((info->cmap.green[bg_idx] & 0xf8) << 2) |
@@ -1348,6 +1345,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
 
         info->pixmap.scan_align = 4;
         info->pixmap.buf_align = 4;
+        info->pixmap.access_align = 32;
         info->pixmap.size = 8 * 1024;
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
 
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 8e024aad1b57..e0dad948467b 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -5,7 +5,7 @@
  *  Based on code written by:
  *           Sven Luther, <luther@dpt-info.u-strasbg.fr>
  *           Alan Hourihane, <alanh@fairlite.demon.co.uk>
- *           Russel King, <rmk@arm.linux.org.uk>
+ *           Russell King, <rmk@arm.linux.org.uk>
  *  Based on linux/drivers/video/skeletonfb.c:
  *      Copyright (C) 1997 Geert Uytterhoeven
  *  Based on linux/driver/video/pm2fb.c:
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index b0c886de0404..6a9e183be41b 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1582,12 +1582,11 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         struct riva_par *par = (struct riva_par *) info->par;
         u8 data[MAX_CURS * MAX_CURS/8];
-        u16 fg, bg;
         int i, set = cursor->set;
+        u16 fg, bg;
 
-        if (cursor->image.width > MAX_CURS ||
-            cursor->image.height > MAX_CURS)
-                return soft_cursor(info, cursor);
+        if (cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)
+                return -ENXIO;
 
         par->riva.ShowHideCursor(&par->riva, 0);
 
@@ -1625,21 +1624,18 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 if (src) {
                         switch (cursor->rop) {
                         case ROP_XOR:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] ^ msk[i];
                                 break;
                         case ROP_COPY:
                         default:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] & msk[i];
                                 break;
                         }
 
-                        fb_sysmove_buf_aligned(info, &info->pixmap, data,
-                                               d_pitch, src, s_pitch,
-                                               cursor->image.height);
+                        fb_pad_aligned_buffer(data, d_pitch, src, s_pitch,
+                                                cursor->image.height);
 
                         bg = ((info->cmap.red[bg_idx] & 0xf8) << 7) |
                                 ((info->cmap.green[bg_idx] & 0xf8) << 2) |
@@ -1727,6 +1723,7 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
 
         info->pixmap.size = 8 * 1024;
         info->pixmap.buf_align = 4;
+        info->pixmap.access_align = 32;
         info->pixmap.flags = FB_PIXMAP_SYSTEM;
         info->var.yres_virtual = -1;
         NVTRACE_LEAVE();
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index b637c389e4f4..789de13f461f 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -493,7 +493,7 @@ s1d13xxxfb_fetch_hw_state(struct fb_info *info)
 }
 
 
-static int __devexit
+static int
 s1d13xxxfb_remove(struct device *dev)
 {
         struct fb_info *info = dev_get_drvdata(dev);
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 03d74e8ee067..8fadcdae6f42 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1897,7 +1897,7 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
                 info->pixmap.size = 8*1024;
                 info->pixmap.scan_align = 4;
                 info->pixmap.buf_align = 4;
-                info->pixmap.access_align = 4;
+                info->pixmap.access_align = 32;
 
                 fb_alloc_cmap (&info->cmap, NR_PALETTE, 0);
                 info->flags |= FBINFO_HWACCEL_COPYAREA |
diff --git a/drivers/video/softcursor.c b/drivers/video/softcursor.c
index 13a4511539a1..229c4bc35079 100644
--- a/drivers/video/softcursor.c
+++ b/drivers/video/softcursor.c
@@ -58,17 +58,10 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
         } else 
                 memcpy(src, image->data, dsize);
         
-        if (info->pixmap.outbuf)
-                fb_iomove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
-                                  s_pitch, image->height);
-        else
-                fb_sysmove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
-                                   s_pitch, image->height);
-
+        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
         image->data = dst;
         info->fbops->fb_imageblit(info, image);
         kfree(src);
-
         return 0;
 }
 
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 3027841f9c24..f3069b01e248 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -271,7 +271,7 @@ static int __init vesafb_probe(struct device *device)
 
         if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
                 printk(KERN_WARNING
-                       "vesafb: abort, cannot reserve video memory at 0x%lx\n",
+                       "vesafb: cannot reserve video memory at 0x%lx\n",
                         vesafb_fix.smem_start);
                 /* We cannot make this fatal. Sometimes this comes from magic
                    spaces our resource handlers simply don't know about */
@@ -279,13 +279,13 @@ static int __init vesafb_probe(struct device *device)
 
         info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);
         if (!info) {
-                release_mem_region(vesafb_fix.smem_start, vesafb_fix.smem_len);
+                release_mem_region(vesafb_fix.smem_start, size_total);
                 return -ENOMEM;
         }
         info->pseudo_palette = info->par;
         info->par = NULL;
 
-        info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
+        info->screen_base = ioremap(vesafb_fix.smem_start, vesafb_fix.smem_len);
         if (!info->screen_base) {
                 printk(KERN_ERR
                        "vesafb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n",
@@ -386,7 +386,7 @@ static int __init vesafb_probe(struct device *device)
         request_region(0x3c0, 32, "vesafb");
 
         if (mtrr) {
-                int temp_size = size_total;
+                unsigned int temp_size = size_total;
                 /* Find the largest power-of-two */
                 while (temp_size & (temp_size - 1))
                         temp_size &= (temp_size - 1);
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 58cd2ad84afb..adcda697ea60 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -101,7 +101,7 @@ static void(*w100fb_ssp_send)(u8 adrs, u8 data);
  * Sysfs functions
  */
 
-static ssize_t rotation_show(struct device *dev, char *buf)
+static ssize_t rotation_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
@@ -109,7 +109,7 @@ static ssize_t rotation_show(struct device *dev, char *buf)
         return sprintf(buf, "%d\n",par->rotation_flag);
 }
 
-static ssize_t rotation_store(struct device *dev, const char *buf, size_t count)
+static ssize_t rotation_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned int rotate;
         struct fb_info *info = dev_get_drvdata(dev);
@@ -134,7 +134,7 @@ static ssize_t rotation_store(struct device *dev, const char *buf, size_t count)
 
 static DEVICE_ATTR(rotation, 0644, rotation_show, rotation_store);
 
-static ssize_t w100fb_reg_read(struct device *dev, const char *buf, size_t count)
+static ssize_t w100fb_reg_read(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned long param;
         unsigned long regs;
@@ -146,7 +146,7 @@ static ssize_t w100fb_reg_read(struct device *dev, const char *buf, size_t count
 
 static DEVICE_ATTR(reg_read, 0200, NULL, w100fb_reg_read);
 
-static ssize_t w100fb_reg_write(struct device *dev, const char *buf, size_t count)
+static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned long regs;
         unsigned long param;
@@ -163,7 +163,7 @@ static ssize_t w100fb_reg_write(struct device *dev, const char *buf, size_t coun
 static DEVICE_ATTR(reg_write, 0200, NULL, w100fb_reg_write);
 
 
-static ssize_t fastsysclk_show(struct device *dev, char *buf)
+static ssize_t fastsysclk_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
@@ -171,7 +171,7 @@ static ssize_t fastsysclk_show(struct device *dev, char *buf)
         return sprintf(buf, "%d\n",par->fastsysclk_mode);
 }
 
-static ssize_t fastsysclk_store(struct device *dev, const char *buf, size_t count)
+static ssize_t fastsysclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         int param;
         struct fb_info *info = dev_get_drvdata(dev);
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 8d7821899cc1..24a192e3b8b4 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -88,7 +88,7 @@ static void w1_slave_release(struct device *dev)
         complete(&sl->dev_released);
 }
 
-static ssize_t w1_default_read_name(struct device *dev, char *buf)
+static ssize_t w1_default_read_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return sprintf(buf, "No family registered.\n");
 }
@@ -137,7 +137,7 @@ static struct device_attribute w1_slave_attribute_val = {
         .show = &w1_default_read_name,
 };
 
-static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = container_of (dev, struct w1_master, dev);
         ssize_t count;
@@ -152,7 +152,7 @@ static ssize_t w1_master_attribute_show_name(struct device *dev, char *buf)
         return count;
 }
 
-static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
@@ -166,14 +166,14 @@ static ssize_t w1_master_attribute_show_pointer(struct device *dev, char *buf)
         return count;
 }
 
-static ssize_t w1_master_attribute_show_timeout(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_timeout(struct device *dev, struct device_attribute *attr, char *buf)
 {
         ssize_t count;
         count = sprintf(buf, "%d\n", w1_timeout);
         return count;
 }
 
-static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
@@ -187,7 +187,7 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, char
         return count;
 }
 
-static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
@@ -201,7 +201,7 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, char *buf)
         return count;
 }
 
-static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
@@ -215,7 +215,7 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, char *bu
         return count;
 }
 
-static ssize_t w1_master_attribute_show_slaves(struct device *dev, char *buf)
+static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)
 
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 03a2de7a601f..07fa49412a90 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -34,10 +34,10 @@
 
 struct w1_family_ops
 {
-        ssize_t (* rname)(struct device *, char *);
+        ssize_t (* rname)(struct device *, struct device_attribute *, char *);
         ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t);
         
-        ssize_t (* rval)(struct device *, char *);
+        ssize_t (* rval)(struct device *, struct device_attribute *, char *);
         unsigned char rvalname[MAXNAMELEN];
 };
 
diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c
index a54e425217a0..674eb75a9bad 100644
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/w1_smem.c
@@ -36,8 +36,8 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family.");
 
-static ssize_t w1_smem_read_name(struct device *, char *);
-static ssize_t w1_smem_read_val(struct device *, char *);
+static ssize_t w1_smem_read_name(struct device *, struct device_attribute *attr, char *);
+static ssize_t w1_smem_read_val(struct device *, struct device_attribute *attr, char *);
 static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t);
 
 static struct w1_family_ops w1_smem_fops = {
@@ -47,14 +47,14 @@ static struct w1_family_ops w1_smem_fops = {
         .rvalname = "id",
 };
 
-static ssize_t w1_smem_read_name(struct device *dev, char *buf)
+static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
 
         return sprintf(buf, "%s\n", sl->name);
 }
 
-static ssize_t w1_smem_read_val(struct device *dev, char *buf)
+static ssize_t w1_smem_read_val(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
         int i;
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
index 0b1817890503..70310f7a722e 100644
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/w1_therm.c
@@ -42,8 +42,8 @@ static u8 bad_roms[][9] = {
                                 {}
                         };
 
-static ssize_t w1_therm_read_name(struct device *, char *);
-static ssize_t w1_therm_read_temp(struct device *, char *);
+static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, char *);
+static ssize_t w1_therm_read_temp(struct device *, struct device_attribute *attr, char *);
 static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t);
 
 static struct w1_family_ops w1_therm_fops = {
@@ -53,7 +53,7 @@ static struct w1_family_ops w1_therm_fops = {
         .rvalname = "temp1_input",
 };
 
-static ssize_t w1_therm_read_name(struct device *dev, char *buf)
+static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
 
@@ -77,7 +77,7 @@ static inline int w1_convert_temp(u8 rom[9])
         return t;
 }
 
-static ssize_t w1_therm_read_temp(struct device *dev, char *buf)
+static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
 
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index dad03fc33a44..04ca8840acf1 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -21,7 +21,7 @@
 /* show configuration fields */
 #define zorro_config_attr(name, field, format_string)                   \
 static ssize_t                                                          \
-show_##name(struct device *dev, char *buf)                              \
+show_##name(struct device *dev, struct device_attribute *attr, char *buf)                               \
 {                                                                       \
         struct zorro_dev *z;                                            \
                                                                         \
@@ -36,7 +36,7 @@ zorro_config_attr(serial, rom.er_SerialNumber, "0x%08x\n");
 zorro_config_attr(slotaddr, slotaddr, "0x%04x\n");
 zorro_config_attr(slotsize, slotsize, "0x%04x\n");
 
-static ssize_t zorro_show_resource(struct device *dev, char *buf)
+static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct zorro_dev *z = to_zorro_dev(dev);